Mesa (master): intel/tools: avoid 'unused variable' warnings

[GitLab Mirror]

Module: Mesa
Branch: master
Commit: 69ee49ac4678a60e2ae762b9f7752e61d27347c6
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=69ee49ac4678a60e2ae762b9f7752e61d27347c6

Author: Andrii Simiklit <andrii.simiklit at globallogic.com>
Date:   Tue Nov 13 14:19:28 2018 +0200

intel/tools: avoid 'unused variable' warnings

1. tools/aub_read.c:271:31: warning: unused variable ‘end’
    const uint32_t *p = data, *end = data + data_len, *next;

2. tools/aub_mem.c:292:13: warning: unused variable ‘res’
       void *res = mmap((uint8_t *)bo.map + map_offset, 4096, PROT_READ,
   tools/aub_mem.c:357:13: warning: unused variable ‘res’
       void *res = mmap((uint8_t *)bo.map + (page - bo.addr), 4096, PROT_READ,

v2: The i965_disasm.c changes was moved into a separate patch
    The 'end' variable declared separately with MAYBE_UNUSED
    to avoid effect of it to other variables.
       ( Eric Engestrom <eric.engestrom at intel.com> )

Signed-off-by: Andrii Simiklit <andrii.simiklit at globallogic.com>
Reviewed-by: Eric Engestrom <eric.engestrom at intel.com>

---

 src/intel/tools/aub_mem.c  | 10 ++++++----
 src/intel/tools/aub_read.c |  3 ++-
 2 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/src/intel/tools/aub_mem.c b/src/intel/tools/aub_mem.c
index 58b51b78a5..98e14219c5 100644
--- a/src/intel/tools/aub_mem.c
+++ b/src/intel/tools/aub_mem.c
@@ -289,8 +289,9 @@ aub_mem_get_ggtt_bo(void *_mem, uint64_t address)
          continue;
 
       uint32_t map_offset = i->virt_addr - address;
-      void *res = mmap((uint8_t *)bo.map + map_offset, 4096, PROT_READ,
-                       MAP_SHARED | MAP_FIXED, mem->mem_fd, phys_mem->fd_offset);
+      MAYBE_UNUSED void *res =
+            mmap((uint8_t *)bo.map + map_offset, 4096, PROT_READ,
+                  MAP_SHARED | MAP_FIXED, mem->mem_fd, phys_mem->fd_offset);
       assert(res != MAP_FAILED);
    }
 
@@ -354,8 +355,9 @@ aub_mem_get_ppgtt_bo(void *_mem, uint64_t address)
    for (uint64_t page = address; page < end; page += 4096) {
       struct phys_mem *phys_mem = ppgtt_walk(mem, mem->pml4, page);
 
-      void *res = mmap((uint8_t *)bo.map + (page - bo.addr), 4096, PROT_READ,
-                       MAP_SHARED | MAP_FIXED, mem->mem_fd, phys_mem->fd_offset);
+      MAYBE_UNUSED void *res =
+            mmap((uint8_t *)bo.map + (page - bo.addr), 4096, PROT_READ,
+                  MAP_SHARED | MAP_FIXED, mem->mem_fd, phys_mem->fd_offset);
       assert(res != MAP_FAILED);
    }
 
diff --git a/src/intel/tools/aub_read.c b/src/intel/tools/aub_read.c
index 20cb515376..513da3bf84 100644
--- a/src/intel/tools/aub_read.c
+++ b/src/intel/tools/aub_read.c
@@ -288,7 +288,8 @@ handle_memtrace_mem_write(struct aub_read *read, const uint32_t *p)
 int
 aub_read_command(struct aub_read *read, const void *data, uint32_t data_len)
 {
-   const uint32_t *p = data, *end = data + data_len, *next;
+   const uint32_t *p = data, *next;
+   MAYBE_UNUSED const uint32_t *end = data + data_len;
    uint32_t h, header_length, bias;
 
    assert(data_len >= 4);