Revision 26a76461 target-i386/helper2.c

b/target-i386/helper2.c
264 264 
#ifdef TARGET_X86_64
265 265 
    if (env->hflags & HF_CS64_MASK) {
266 266 
        cpu_fprintf(f,
267 
                    "RAX=%016llx RBX=%016llx RCX=%016llx RDX=%016llx\n"
268 
                    "RSI=%016llx RDI=%016llx RBP=%016llx RSP=%016llx\n"
269 
                    "R8 =%016llx R9 =%016llx R10=%016llx R11=%016llx\n"
270 
                    "R12=%016llx R13=%016llx R14=%016llx R15=%016llx\n"
271 
                    "RIP=%016llx RFL=%08x [%c%c%c%c%c%c%c] CPL=%d II=%d A20=%d HLT=%d\n",
267 
                    "RAX=%016" PRIx64 " RBX=%016" PRIx64 " RCX=%016" PRIx64 " RDX=%016" PRIx64 "\n"
268 
                    "RSI=%016" PRIx64 " RDI=%016" PRIx64 " RBP=%016" PRIx64 " RSP=%016" PRIx64 "\n"
269 
                    "R8 =%016" PRIx64 " R9 =%016" PRIx64 " R10=%016" PRIx64 " R11=%016" PRIx64 "\n"
270 
                    "R12=%016" PRIx64 " R13=%016" PRIx64 " R14=%016" PRIx64 " R15=%016" PRIx64 "\n"
271 
                    "RIP=%016" PRIx64 " RFL=%08x [%c%c%c%c%c%c%c] CPL=%d II=%d A20=%d HLT=%d\n",
272 272 
                    env->regs[R_EAX],
273 273 
                    env->regs[R_EBX],
274 274 
                    env->regs[R_ECX],
......
329 329 
    if (env->hflags & HF_LMA_MASK) {
330 330 
        for(i = 0; i < 6; i++) {
331 331 
            SegmentCache *sc = &env->segs[i];
332 
            cpu_fprintf(f, "%s =%04x %016llx %08x %08x\n",
332 
            cpu_fprintf(f, "%s =%04x %016" PRIx64 " %08x %08x\n",
333 333 
                        seg_name[i],
334 334 
                        sc->selector,
335 335 
                        sc->base,
336 336 
                        sc->limit,
337 337 
                        sc->flags);
338 338 
        }
339 
        cpu_fprintf(f, "LDT=%04x %016llx %08x %08x\n",
339 
        cpu_fprintf(f, "LDT=%04x %016" PRIx64 " %08x %08x\n",
340 340 
                    env->ldt.selector,
341 341 
                    env->ldt.base,
342 342 
                    env->ldt.limit,
343 343 
                    env->ldt.flags);
344 
        cpu_fprintf(f, "TR =%04x %016llx %08x %08x\n",
344 
        cpu_fprintf(f, "TR =%04x %016" PRIx64 " %08x %08x\n",
345 345 
                    env->tr.selector,
346 346 
                    env->tr.base,
347 347 
                    env->tr.limit,
348 348 
                    env->tr.flags);
349 
        cpu_fprintf(f, "GDT=     %016llx %08x\n",
349 
        cpu_fprintf(f, "GDT=     %016" PRIx64 " %08x\n",
350 350 
                    env->gdt.base, env->gdt.limit);
351 
        cpu_fprintf(f, "IDT=     %016llx %08x\n",
351 
        cpu_fprintf(f, "IDT=     %016" PRIx64 " %08x\n",
352 352 
                    env->idt.base, env->idt.limit);
353 
        cpu_fprintf(f, "CR0=%08x CR2=%016llx CR3=%016llx CR4=%08x\n",
353 
        cpu_fprintf(f, "CR0=%08x CR2=%016" PRIx64 " CR3=%016" PRIx64 " CR4=%08x\n",
354 354 
                    (uint32_t)env->cr[0],
355 355 
                    env->cr[2],
356 356 
                    env->cr[3],
......
394 394 
            snprintf(cc_op_name, sizeof(cc_op_name), "[%d]", env->cc_op);
395 395 
#ifdef TARGET_X86_64
396 396 
        if (env->hflags & HF_CS64_MASK) {
397 
            cpu_fprintf(f, "CCS=%016llx CCD=%016llx CCO=%-8s\n",
397 
            cpu_fprintf(f, "CCS=%016" PRIx64 " CCD=%016" PRIx64 " CCO=%-8s\n",
398 398 
                        env->cc_src, env->cc_dst,
399 399 
                        cc_op_name);
400 400 
        } else
......
427 427 
                } l;
428 428 
            } tmp;
429 429 
            tmp.d = env->fpregs[i].d;
430 
            cpu_fprintf(f, "FPR%d=%016llx %04x",
430 
            cpu_fprintf(f, "FPR%d=%016" PRIx64 " %04x",
431 431 
                        i, tmp.l.lower, tmp.l.upper);
432 432 
#else
433 
            cpu_fprintf(f, "FPR%d=%016llx",
433 
            cpu_fprintf(f, "FPR%d=%016" PRIx64,
434 434 
                        i, env->fpregs[i].mmx.q);
435 435 
#endif
436 436 
            if ((i & 1) == 1)

Also available in: Unified diff