From 298c2e03d78c3abeb588306acd67aa88b197ee61 Mon Sep 17 00:00:00 2001
From: Timothy Arceri <timothy.arceri@collabora.com>
Date: Tue, 4 Oct 2016 12:03:14 +1100
Subject: [PATCH] intel: use the correct format specifier for printing uint64_t

Fixes a bunch of warnings in 32-bit builds.

Reviewed-by: Iago Toral Quiroga <itoral@igalia.com>
---
 src/intel/tools/aubinator.c | 17 +++++++++--------
 src/intel/tools/decoder.c   |  7 ++++---
 2 files changed, 13 insertions(+), 11 deletions(-)

diff --git a/src/intel/tools/aubinator.c b/src/intel/tools/aubinator.c
index a31dcb22602..9b32e5bbfad 100644
--- a/src/intel/tools/aubinator.c
+++ b/src/intel/tools/aubinator.c
@@ -30,6 +30,7 @@
 #include <string.h>
 #include <signal.h>
 #include <errno.h>
+#include <inttypes.h>
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <sys/wait.h>
@@ -96,7 +97,7 @@ print_dword_val(struct gen_field_iterator *iter, uint64_t offset,
    const int dword = f->start / 32;
 
    if (*dword_num != dword) {
-      printf("0x%08lx:  0x%08x : Dword %d\n",
+      printf("0x%08"PRIx64":  0x%08x : Dword %d\n",
              offset + 4 * dword,  iter->p[dword], dword);
       *dword_num = dword;
    }
@@ -296,10 +297,10 @@ handle_media_interface_descriptor_load(struct gen_spec *spec, uint32_t *p)
 
       start = instruction_base + descriptors[0];
       if (!valid_offset(start)) {
-         printf("kernel: %08lx <not valid>\n", start);
+         printf("kernel: %08"PRIx64" <not valid>\n", start);
          continue;
       } else {
-         printf("kernel: %08lx\n", start);
+         printf("kernel: %08"PRIx64"\n", start);
       }
 
       insns = (struct brw_instruction *) (gtt + start);
@@ -397,7 +398,7 @@ handle_3dstate_vs(struct gen_spec *spec, uint32_t *p)
    }
 
    if (vs_enable) {
-      printf("instruction_base %08lx, start %08lx\n",
+      printf("instruction_base %08"PRIx64", start %08"PRIx64"\n",
              instruction_base, start);
 
       insns = (struct brw_instruction *) (gtt + instruction_base + start);
@@ -421,7 +422,7 @@ handle_3dstate_hs(struct gen_spec *spec, uint32_t *p)
    hs_enable = p[2] & 0x80000000;
 
    if (hs_enable) {
-      printf("instruction_base %08lx, start %08lx\n",
+      printf("instruction_base %08"PRIx64", start %08"PRIx64"\n",
              instruction_base, start);
 
       insns = (struct brw_instruction *) (gtt + instruction_base + start);
@@ -739,7 +740,7 @@ parse_commands(struct gen_spec *spec, uint32_t *cmds, int size, int engine)
       else
          offset = 0;
 
-      printf("%s0x%08lx:  0x%08x:  %s%s\n",
+      printf("%s0x%08"PRIx64":  0x%08x:  %s%s\n",
              color, offset, p[0],
              gen_group_get_name(inst), reset_color);
 
@@ -754,7 +755,7 @@ parse_commands(struct gen_spec *spec, uint32_t *cmds, int size, int engine)
             if (dword_num > 0)
                 token = print_iterator_values(&iter, &idx);
             if (token != NULL) {
-                printf("0x%08lx:  0x%08x : Dword %d\n",
+                printf("0x%08"PRIx64":  0x%08x : Dword %d\n",
                        offset + 4 * idx, p[idx], idx);
                 handle_struct_decode(spec,token, &p[idx]);
                 token = NULL;
@@ -971,7 +972,7 @@ aub_file_decode_batch(struct aub_file *file, struct gen_spec *spec)
       break;
    case MAKE_HEADER(TYPE_AUB, OPCODE_NEW_AUB, SUBOPCODE_MEM_WRITE):
       printf("memory write block (dwords %d):\n", h & 0xffff);
-      printf("  address 0x%lx\n", *(uint64_t *) &p[1]);
+      printf("  address 0x%"PRIx64"\n", *(uint64_t *) &p[1]);
       data_type = (p[3] >> 20) & 0xff;
       if (data_type != 0)
          printf("  data type 0x%x\n", data_type);
diff --git a/src/intel/tools/decoder.c b/src/intel/tools/decoder.c
index be3558b6d0a..4cbaab2e0c3 100644
--- a/src/intel/tools/decoder.c
+++ b/src/intel/tools/decoder.c
@@ -27,6 +27,7 @@
 #include <stdarg.h>
 #include <string.h>
 #include <expat.h>
+#include <inttypes.h>
 
 #include <util/macros.h>
 
@@ -529,11 +530,11 @@ gen_field_iterator_next(struct gen_field_iterator *iter)
    case GEN_TYPE_UNKNOWN:
    case GEN_TYPE_INT:
       snprintf(iter->value, sizeof(iter->value),
-               "%ld", field(v.qw, f->start, f->end));
+               "%"PRId64, field(v.qw, f->start, f->end));
       break;
    case GEN_TYPE_UINT:
       snprintf(iter->value, sizeof(iter->value),
-               "%lu", field(v.qw, f->start, f->end));
+               "%"PRIu64, field(v.qw, f->start, f->end));
       break;
    case GEN_TYPE_BOOL:
       snprintf(iter->value, sizeof(iter->value),
@@ -545,7 +546,7 @@ gen_field_iterator_next(struct gen_field_iterator *iter)
    case GEN_TYPE_ADDRESS:
    case GEN_TYPE_OFFSET:
       snprintf(iter->value, sizeof(iter->value),
-               "0x%08lx", field_address(v.qw, f->start, f->end));
+               "0x%08"PRIx64, field_address(v.qw, f->start, f->end));
       break;
    case GEN_TYPE_STRUCT:
       snprintf(iter->value, sizeof(iter->value),