[Qemu-commits] [COMMIT b11ebf6] Replace REGX with PRIx64

[Anthony Liguori]

From: Blue Swirl <address@hidden>

Signed-off-by: Blue Swirl <address@hidden>

diff --git a/hw/ppc_oldworld.c b/hw/ppc_oldworld.c
index 549ba0c..6a28305 100644
--- a/hw/ppc_oldworld.c
+++ b/hw/ppc_oldworld.c
@@ -48,7 +48,9 @@ static int vga_osi_call (CPUState *env)
     static int vga_vbl_enabled;
     int linesize;
 
-    //    printf("osi_call R5=" REGX "\n", ppc_dump_gpr(env, 5));
+#if 0
+    printf("osi_call R5=%016" PRIx64 "\n", ppc_dump_gpr(env, 5));
+#endif
 
     /* same handler as PearPC, coming from the original MOL video
        driver. */
@@ -100,7 +102,7 @@ static int vga_osi_call (CPUState *env)
         /* R6 = x, R7 = y, R8 = visible, R9 = data */
         break;
     default:
-        fprintf(stderr, "unsupported OSI call R5=" REGX "\n",
+        fprintf(stderr, "unsupported OSI call R5=%016" PRIx64 "\n",
                 ppc_dump_gpr(env, 5));
         break;
     }
diff --git a/target-ppc/cpu.h b/target-ppc/cpu.h
index 1c6c060..420ea86 100644
--- a/target-ppc/cpu.h
+++ b/target-ppc/cpu.h
@@ -56,8 +56,6 @@
 
 #include "cpu-defs.h"
 
-#define REGX "%016" PRIx64
-
 #include <setjmp.h>
 
 #include "softfloat.h"
diff --git a/target-ppc/helper.c b/target-ppc/helper.c
index e049dab..5c85c61 100644
--- a/target-ppc/helper.c
+++ b/target-ppc/helper.c
@@ -2031,8 +2031,9 @@ void ppc_hw_interrupt (CPUState *env)
 #else /* defined (CONFIG_USER_ONLY) */
 static inline void dump_syscall(CPUState *env)
 {
-    qemu_log_mask(CPU_LOG_INT, "syscall r0=" REGX " r3=" REGX " r4=" REGX
-                  " r5=" REGX " r6=" REGX " nip=" TARGET_FMT_lx "\n",
+    qemu_log_mask(CPU_LOG_INT, "syscall r0=%016" PRIx64 " r3=%016" PRIx64
+                  " r4=%016" PRIx64 " r5=%016" PRIx64 " r6=%016" PRIx64
+                  " nip=" TARGET_FMT_lx "\n",
                   ppc_dump_gpr(env, 0), ppc_dump_gpr(env, 3),
                   ppc_dump_gpr(env, 4), ppc_dump_gpr(env, 5),
                   ppc_dump_gpr(env, 6), env->nip);
diff --git a/target-ppc/translate.c b/target-ppc/translate.c
index dcd0537..1c54fa7 100644
--- a/target-ppc/translate.c
+++ b/target-ppc/translate.c
@@ -8860,7 +8860,7 @@ void cpu_dump_state (CPUState *env, FILE *f,
     for (i = 0; i < 32; i++) {
         if ((i & (RGPL - 1)) == 0)
             cpu_fprintf(f, "GPR%02d", i);
-        cpu_fprintf(f, " " REGX, ppc_dump_gpr(env, i));
+        cpu_fprintf(f, " %016" PRIx64, ppc_dump_gpr(env, i));
         if ((i & (RGPL - 1)) == (RGPL - 1))
             cpu_fprintf(f, "\n");
     }