Revision 1b9eb036 target-ppc/translate.c

b/target-ppc/translate.c
5374 5374

  
5375 5375
    int i;
5376 5376

  
5377
    cpu_fprintf(f, "NIP " REGX " LR " REGX " CTR " REGX "\n",
5377
    cpu_fprintf(f, "NIP " ADDRX " LR " ADDRX " CTR " ADDRX "\n",
5378 5378
                env->nip, env->lr, env->ctr);
5379 5379
    cpu_fprintf(f, "MSR " REGX FILL " XER %08x      "
5380 5380
#if !defined(NO_TIMER_DUMP)
......
5545 5545
#if defined PPC_DEBUG_DISAS
5546 5546
        if (loglevel & CPU_LOG_TB_IN_ASM) {
5547 5547
            fprintf(logfile, "----------------\n");
5548
            fprintf(logfile, "nip=%08x super=%d ir=%d\n",
5548
            fprintf(logfile, "nip=" ADDRX " super=%d ir=%d\n",
5549 5549
                    ctx.nip, 1 - msr_pr, msr_ir);
5550 5550
        }
5551 5551
#endif
......
5578 5578
        if (unlikely(handler->handler == &gen_invalid)) {
5579 5579
            if (loglevel > 0) {
5580 5580
                fprintf(logfile, "invalid/unsupported opcode: "
5581
                        "%02x - %02x - %02x (%08x) 0x" REGX " %d\n",
5581
                        "%02x - %02x - %02x (%08x) 0x" ADDRX " %d\n",
5582 5582
                        opc1(ctx.opcode), opc2(ctx.opcode),
5583 5583
                        opc3(ctx.opcode), ctx.opcode, ctx.nip - 4, msr_ir);
5584 5584
            } else {
5585 5585
                printf("invalid/unsupported opcode: "
5586
                       "%02x - %02x - %02x (%08x) 0x" REGX " %d\n",
5586
                       "%02x - %02x - %02x (%08x) 0x" ADDRX " %d\n",
5587 5587
                       opc1(ctx.opcode), opc2(ctx.opcode),
5588 5588
                       opc3(ctx.opcode), ctx.opcode, ctx.nip - 4, msr_ir);
5589 5589
            }
......
5591 5591
            if (unlikely((ctx.opcode & handler->inval) != 0)) {
5592 5592
                if (loglevel > 0) {
5593 5593
                    fprintf(logfile, "invalid bits: %08x for opcode: "
5594
                            "%02x -%02x - %02x (%08x) " REGX "\n",
5594
                            "%02x -%02x - %02x (%08x) 0x" ADDRX "\n",
5595 5595
                            ctx.opcode & handler->inval, opc1(ctx.opcode),
5596 5596
                            opc2(ctx.opcode), opc3(ctx.opcode),
5597 5597
                            ctx.opcode, ctx.nip - 4);
5598 5598
                } else {
5599 5599
                    printf("invalid bits: %08x for opcode: "
5600
                           "%02x -%02x - %02x (%08x) " REGX "\n",
5600
                           "%02x -%02x - %02x (%08x) 0x" ADDRX "\n",
5601 5601
                           ctx.opcode & handler->inval, opc1(ctx.opcode),
5602 5602
                           opc2(ctx.opcode), opc3(ctx.opcode),
5603 5603
                           ctx.opcode, ctx.nip - 4);

Also available in: Unified diff