tools/aubdump: remove void pointer arithmetic
PATCH 1/2 tools/aubdump: remove void pointer arithmetic
A gcc extension allows void pointer arithmetic by treating the size of void as 1, but this generates a warning when -Wpointer-arith is used.
Signed-off-by Thomas Wood <[email protected]>
--- tools/aubdump.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
tools/aubdump.c +2 -2
@@ -191,7 +191,7 @@ aub_write_trace_block(uint32_t type, void *virtual, uint32_t size, uint64_t gtt_dword_out ((gtt_offset + offset) >>32 );if (virtual) -data_out (GET_PTR (virtual) + offset, block_size); +data_out (((char *)GET_PTR (virtual)) + offset, block_size);else data_out (null_block, block_size);
@@ -261,7 +261,7 @@ relocate_bo(struct bo *bo, const struct drm_i915_gem_execbuffer2 *execbuffer2,else handle = relocs[i].target_handle; - dw = relocated + relocs[i].offset; + dw = (uint32_t *)(((char *) relocated) + relocs[i].offset); *dw = bos[handle].offset + relocs[i].delta; }
Signature · 6 lines
1.9.1 _______________________________________________ Intel-gfx mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH 2/2 null_state_gen: add const to intel_batch_state_copy data
The data is not modified by the function and is often declared const.
Signed-off-by Thomas Wood <[email protected]>
--- tools/null_state_gen/intel_batchbuffer.c | 6 +++--- tools/null_state_gen/intel_batchbuffer.h | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-)
tools/null_state_gen/intel_batchbuffer.c +3 -3
@@ -202,7 +202,7 @@ uint32_t intel_batch_state_alloc(struct intel_batchbuffer *batch, unsigned bytes }uint32_t intel_batch_state_copy (struct intel_batchbuffer *batch, -void *d,unsigned bytes, +const void *d,unsigned bytes,unsigned align,const char *str) {
@@ -217,10 +217,10 @@ uint32_t intel_batch_state_copy(struct intel_batchbuffer *batch,for (i =0 ; i < dwords; i++) {char offsetinside[80 ]; -uint32_t *s; +const uint32_t *s;sprintf (offsetinside,"%s: 0x%x" , str, i *4 ); - s = (uint32_t *)(uint8_t *)d + i; + s = (const uint32_t *)(const uint8_t *)d + i;bb_area_emit (batch->state, *s,STATE , offsetinside); }
tools/null_state_gen/intel_batchbuffer.h +1 -1
@@ -80,7 +80,7 @@ struct intel_batchbuffer *intel_batchbuffer_create(void);#define OUT_STATE_OFFSET (offset) bb_area_emit(batch->state, offset, STATE_OFFSET, #offset)#define OUT_STATE_STRUCT (name, align) intel_batch_state_copy(batch, &name, sizeof(name), align, #name " " #align) -uint32_t intel_batch_state_copy (struct intel_batchbuffer *batch,void *d,unsigned bytes,unsigned align, +uint32_t intel_batch_state_copy (struct intel_batchbuffer *batch,const void *d,unsigned bytes,unsigned align,const char *name);uint32_t intel_batch_state_alloc (struct intel_batchbuffer *batch,unsigned bytes,unsigned align,const char *name);
Signature · 6 lines
1.9.1 _______________________________________________ Intel-gfx mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/intel-gfx