We're going to use "disassemble" for the function that disassembles
the whole program.
Signed-off-by: Kenneth Graunke <kenn...@whitecape.org>
---
src/mesa/drivers/dri/i965/brw_context.h | 3 ++-
src/mesa/drivers/dri/i965/brw_disasm.c | 4 +++-
src/mesa/drivers/dri/i965/brw_eu.c | 2 +-
src/mesa/drivers/dri/i965/brw_eu_compact.c | 4 ++--
src/mesa/drivers/dri/i965/gen8_disasm.c | 2 +-
src/mesa/drivers/dri/i965/gen8_generator.cpp | 2 +-
src/mesa/drivers/dri/i965/gen8_instruction.h | 2 +-
7 files changed, 11 insertions(+), 8 deletions(-)
diff --git a/src/mesa/drivers/dri/i965/brw_context.h
b/src/mesa/drivers/dri/i965/brw_context.h
index 9e459cd..283c576 100644
--- a/src/mesa/drivers/dri/i965/brw_context.h
+++ b/src/mesa/drivers/dri/i965/brw_context.h
@@ -1573,7 +1573,8 @@ void brw_fs_alloc_reg_sets(struct intel_screen *screen);
void brw_vec4_alloc_reg_set(struct intel_screen *screen);
/* brw_disasm.c */
-int brw_disasm (FILE *file, struct brw_instruction *inst, int gen, bool
is_compacted);
+int brw_disassemble_inst(FILE *file, struct brw_instruction *inst,
+ int gen, bool is_compacted);
/* brw_vs.c */
gl_clip_plane *brw_select_clip_planes(struct gl_context *ctx);
diff --git a/src/mesa/drivers/dri/i965/brw_disasm.c
b/src/mesa/drivers/dri/i965/brw_disasm.c
index 1de02e9..68fb786 100644
--- a/src/mesa/drivers/dri/i965/brw_disasm.c
+++ b/src/mesa/drivers/dri/i965/brw_disasm.c
@@ -1119,7 +1119,9 @@ static int qtr_ctrl(FILE *file, struct brw_instruction
*inst)
return 0;
}
-int brw_disasm (FILE *file, struct brw_instruction *inst, int gen, bool
is_compacted)
+int
+brw_disassemble_inst(FILE *file,
+ struct brw_instruction *inst, int gen, bool is_compacted)
{
int err = 0;
int space = 0;
diff --git a/src/mesa/drivers/dri/i965/brw_eu.c
b/src/mesa/drivers/dri/i965/brw_eu.c
index 90e84f8..a97ea35 100644
--- a/src/mesa/drivers/dri/i965/brw_eu.c
+++ b/src/mesa/drivers/dri/i965/brw_eu.c
@@ -286,6 +286,6 @@ brw_dump_compile(struct brw_context *brw, void *assembly,
int start, int end, FI
offset += 16;
}
- brw_disasm(out, insn, brw->gen, compacted);
+ brw_disassemble_inst(out, insn, brw->gen, compacted);
}
}
diff --git a/src/mesa/drivers/dri/i965/brw_eu_compact.c
b/src/mesa/drivers/dri/i965/brw_eu_compact.c
index 2667ca6..ade27c8 100644
--- a/src/mesa/drivers/dri/i965/brw_eu_compact.c
+++ b/src/mesa/drivers/dri/i965/brw_eu_compact.c
@@ -585,10 +585,10 @@ void brw_debug_compact_uncompact(struct brw_context *brw,
brw->gen);
fprintf(stderr, " before: ");
- brw_disasm(stderr, orig, brw->gen, true);
+ brw_disassemble_inst(stderr, orig, brw->gen, true);
fprintf(stderr, " after: ");
- brw_disasm(stderr, uncompacted, brw->gen, false);
+ brw_disassemble_inst(stderr, uncompacted, brw->gen, false);
uint32_t *before_bits = (uint32_t *)orig;
uint32_t *after_bits = (uint32_t *)uncompacted;
diff --git a/src/mesa/drivers/dri/i965/gen8_disasm.c
b/src/mesa/drivers/dri/i965/gen8_disasm.c
index ba9f1ac..04f8538 100644
--- a/src/mesa/drivers/dri/i965/gen8_disasm.c
+++ b/src/mesa/drivers/dri/i965/gen8_disasm.c
@@ -806,7 +806,7 @@ qtr_ctrl(FILE *file, struct gen8_instruction *inst)
}
int
-gen8_disassemble(FILE *file, struct gen8_instruction *inst, int gen)
+gen8_disassemble_inst(FILE *file, struct gen8_instruction *inst, int gen)
{
int err = 0;
int space = 0;
diff --git a/src/mesa/drivers/dri/i965/gen8_generator.cpp
b/src/mesa/drivers/dri/i965/gen8_generator.cpp
index 774df18..f6d8529 100644
--- a/src/mesa/drivers/dri/i965/gen8_generator.cpp
+++ b/src/mesa/drivers/dri/i965/gen8_generator.cpp
@@ -638,6 +638,6 @@ gen8_dump_compile(struct brw_context *brw, void *assembly,
((uint32_t *) inst)[0]);
}
- gen8_disassemble(stderr, inst, brw->gen);
+ gen8_disassemble_inst(stderr, inst, brw->gen);
}
}
diff --git a/src/mesa/drivers/dri/i965/gen8_instruction.h
b/src/mesa/drivers/dri/i965/gen8_instruction.h
index 89f2364..ca536ef 100644
--- a/src/mesa/drivers/dri/i965/gen8_instruction.h
+++ b/src/mesa/drivers/dri/i965/gen8_instruction.h
@@ -367,7 +367,7 @@ void gen8_set_dp_scratch_message(const struct brw_context
*brw,
bool end_of_thread);
/** Disassemble the instruction. */
-int gen8_disassemble(FILE *file, struct gen8_instruction *inst, int gen);
+int gen8_disassemble_inst(FILE *file, struct gen8_instruction *inst, int gen);
/**
--
1.9.2
_______________________________________________
mesa-dev mailing list
mesa-dev@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/mesa-dev
