[xen staging] tools/gdbsx: use inttypes.h instead of custom macros

classic Classic list List threaded Threaded
1 message Options
Reply | Threaded
Open this post in threaded view
|

[xen staging] tools/gdbsx: use inttypes.h instead of custom macros

patchbot
commit ed5f8d9ca47e69e30221c37ec812f2b38af19d83
Author:     Marek Marczykowski-Górecki <[hidden email]>
AuthorDate: Tue Jul 31 22:19:05 2018 +0200
Commit:     Wei Liu <[hidden email]>
CommitDate: Wed Aug 1 10:39:47 2018 +0100

    tools/gdbsx: use inttypes.h instead of custom macros
   
    Signed-off-by: Marek Marczykowski-Górecki <[hidden email]>
    Acked-by: Wei Liu <[hidden email]>
    [ wei: fix up patch ]
    Signed-off-by: Wei Liu <[hidden email]>
---
 tools/debugger/gdbsx/gx/gx_local.c  | 17 +++++++++--------
 tools/debugger/gdbsx/gx/gx_main.c   |  5 +++--
 tools/debugger/gdbsx/xg/xg_public.h |  8 --------
 3 files changed, 12 insertions(+), 18 deletions(-)

diff --git a/tools/debugger/gdbsx/gx/gx_local.c b/tools/debugger/gdbsx/gx/gx_local.c
index 33556a582d..023f5a391f 100644
--- a/tools/debugger/gdbsx/gx/gx_local.c
+++ b/tools/debugger/gdbsx/gx/gx_local.c
@@ -21,6 +21,7 @@
 #include <stdio.h>
 #include <stdint.h>
 #include <stdarg.h>
+#include <inttypes.h>
 #include <errno.h>
 
 #include "gx.h"
@@ -45,17 +46,17 @@ prnt_32regs(struct xg_gdb_regs32 *r32p)
 static void
 prnt_64regs(struct xg_gdb_regs64 *r64p)
 {
-    printf("rip:"XGF64" rsp:"XGF64" flags:%08x\n", r64p->rip, r64p->rsp,
+    printf("rip:%016"PRIx64" rsp:%016"PRIx64" flags:%08x\n", r64p->rip, r64p->rsp,
            r64p->eflags);
-    printf("rax:"XGF64" rbx:"XGF64" rcx:"XGF64"\n", r64p->rax, r64p->rbx,
+    printf("rax:%016"PRIx64" rbx:%016"PRIx64" rcx:%016"PRIx64"\n", r64p->rax, r64p->rbx,
            r64p->rcx);
-    printf("rdx:"XGF64" rsi:"XGF64" rdi:"XGF64"\n", r64p->rdx, r64p->rsi,
+    printf("rdx:%016"PRIx64" rsi:%016"PRIx64" rdi:%016"PRIx64"\n", r64p->rdx, r64p->rsi,
            r64p->rdi);
-    printf("r08:"XGF64" r09:"XGF64" r10:"XGF64"\n", r64p->r8, r64p->r9,
+    printf("r08:%016"PRIx64" r09:%016"PRIx64" r10:%016"PRIx64"\n", r64p->r8, r64p->r9,
            r64p->r10);
-    printf("r11:"XGF64" r12:"XGF64" r13:"XGF64"\n", r64p->r11, r64p->r12,
+    printf("r11:%016"PRIx64" r12:%016"PRIx64" r13:%016"PRIx64"\n", r64p->r11, r64p->r12,
            r64p->r13);
-    printf("r14:"XGF64" r15:"XGF64" rbp:"XGF64"\n", r64p->r14, r64p->r15,
+    printf("r14:%016"PRIx64" r15:%016"PRIx64" rbp:%016"PRIx64"\n", r64p->r14, r64p->r15,
            r64p->rbp);
     printf("cs:%08x ds:%08x fs:%08x gs:%08x\n", r64p->cs,
            r64p->ds, r64p->fs, r64p->gs);
@@ -92,13 +93,13 @@ prnt_call_trace64(uint64_t ip, uint64_t sp)
     uint64_t loopmax=0, val;
 
     printf("Call Trace:\n");
-    printf("   ["XGF64"]\n", ip);
+    printf("   [%016"PRIx64"]\n", ip);
 
     while(stack_max > 0) {
         if (xg_read_mem(sp, (char *)&val, sizeof(val),0) != 0)
             return;
         if (val > 0xffffffff80000000UL) {    /* kernel addr */
-            printf("   ["XGF64"]\n", val);
+            printf("   [%016"PRIx64"]\n", val);
             --stack_max;
         }
         sp += sizeof(sp);
diff --git a/tools/debugger/gdbsx/gx/gx_main.c b/tools/debugger/gdbsx/gx/gx_main.c
index 6dfa501145..15de2c3501 100644
--- a/tools/debugger/gdbsx/gx/gx_main.c
+++ b/tools/debugger/gdbsx/gx/gx_main.c
@@ -21,6 +21,7 @@
 #include <stdio.h>
 #include <stdint.h>
 #include <stdlib.h>
+#include <inttypes.h>
 #include <unistd.h>
 #include <string.h>
 #include <errno.h>
@@ -114,9 +115,9 @@ _do_qRcmd_req(char *remote_buf)
         XGTRC("buf+5:%s pgd3val:0x%llx\n", buf+5, pgd3val);
 
         if (*endp == '\0' && pgd3val > 0) {
-            sprintf(buf1, "pgd3val set to: "XGF64"\n", pgd3val);
+            sprintf(buf1, "pgd3val set to: %016"PRIx64"\n", pgd3val);
         } else {
-            sprintf(buf1, "Invalid  pgd3val "XGF64"\n", pgd3val);
+            sprintf(buf1, "Invalid  pgd3val %016"PRIx64"\n", pgd3val);
             pgd3val = 0;
         }
     } else {
diff --git a/tools/debugger/gdbsx/xg/xg_public.h b/tools/debugger/gdbsx/xg/xg_public.h
index cffb2f7532..31513c8177 100644
--- a/tools/debugger/gdbsx/xg/xg_public.h
+++ b/tools/debugger/gdbsx/xg/xg_public.h
@@ -21,14 +21,6 @@
 #define XGTRC1(...)  \
            do {(xgtrc_on==2) ? (xgtrc(__FUNCTION__,__VA_ARGS__)):0;} while (0)
 
-#if defined(__x86_64__)
-    #define  XGFM64  "%lx"
-    #define  XGF64   "%016lx"
-#else
-    #define  XGFM64  "%llx"
-    #define  XGF64   "%016llx"
-#endif
-
 
 typedef enum {
     XG_GPRS=1,          /* general purpose user regs */
--
generated by git-patchbot for /home/xen/git/xen.git#staging


_______________________________________________
Xen-changelog mailing list
[hidden email]
https://lists.xenproject.org/xen-changelog