diff --git a/src/compiler/isaspec/isaspec.h b/src/compiler/isaspec/isaspec.h index 74902ed6366..a4e77487960 100644 --- a/src/compiler/isaspec/isaspec.h +++ b/src/compiler/isaspec/isaspec.h @@ -121,7 +121,7 @@ struct isa_decode_options { const struct isa_entrypoint *entrypoints; }; -void isa_decode(void *bin, int sz, FILE *out, const struct isa_decode_options *options); +void isa_disasm(void *bin, int sz, FILE *out, const struct isa_decode_options *options); #ifdef __cplusplus } diff --git a/src/compiler/isaspec/isaspec_decode_impl.c b/src/compiler/isaspec/isaspec_decode_impl.c index 3fd356b1b09..11db9f43dd5 100644 --- a/src/compiler/isaspec/isaspec_decode_impl.c +++ b/src/compiler/isaspec/isaspec_decode_impl.c @@ -741,7 +741,7 @@ display(struct decode_scope *scope) } static void -decode(struct decode_state *state, void *bin, int sz) +disasm(struct decode_state *state, void *bin, int sz) { BITSET_WORD *instrs = bin; unsigned errors = 0; /* number of consecutive unmatched instructions */ @@ -848,7 +848,7 @@ cmp_entrypoints(const void *_a, const void *_b) } void -isa_decode(void *bin, int sz, FILE *out, const struct isa_decode_options *options) +isa_disasm(void *bin, int sz, FILE *out, const struct isa_decode_options *options) { const struct isa_decode_options default_options = { .gpu_id = options ? options->gpu_id : 0, @@ -872,7 +872,7 @@ isa_decode(void *bin, int sz, FILE *out, const struct isa_decode_options *option /* Do a pre-pass to find all the branch targets: */ state->print.out = fopen("/dev/null", "w"); state->options = &default_options; /* skip hooks for prepass */ - decode(state, bin, sz); + disasm(state, bin, sz); fclose(state->print.out); if (options) { state->options = options; @@ -896,7 +896,7 @@ isa_decode(void *bin, int sz, FILE *out, const struct isa_decode_options *option state->print.out = out; - decode(state, bin, sz); + disasm(state, bin, sz); ralloc_free(state); } diff --git a/src/freedreno/ir3/disasm-a3xx.c b/src/freedreno/ir3/disasm-a3xx.c index b2f16a42806..489e45b038b 100644 --- a/src/freedreno/ir3/disasm-a3xx.c +++ b/src/freedreno/ir3/disasm-a3xx.c @@ -595,7 +595,7 @@ disasm_a3xx_stat(uint32_t *dwords, int sizedwords, int level, FILE *out, decode_options.cbdata = &ctx; - isa_decode(dwords, sizedwords * 4, out, &decode_options); + isa_disasm(dwords, sizedwords * 4, out, &decode_options); disasm_handle_last(&ctx); diff --git a/src/freedreno/ir3/ir3_shader.c b/src/freedreno/ir3/ir3_shader.c index f945886505a..50a05981663 100644 --- a/src/freedreno/ir3/ir3_shader.c +++ b/src/freedreno/ir3/ir3_shader.c @@ -836,7 +836,7 @@ ir3_shader_disasm(struct ir3_shader_variant *so, uint32_t *bin, FILE *out) const_state->immediates[i * 4 + 3]); } - isa_decode(bin, so->info.sizedwords * 4, out, + isa_disasm(bin, so->info.sizedwords * 4, out, &(struct isa_decode_options){ .gpu_id = ir->compiler->gen * 100, .show_errors = true, diff --git a/src/freedreno/ir3/tests/disasm.c b/src/freedreno/ir3/tests/disasm.c index e6003108602..9b809f70966 100644 --- a/src/freedreno/ir3/tests/disasm.c +++ b/src/freedreno/ir3/tests/disasm.c @@ -496,7 +496,7 @@ main(int argc, char **argv) strtoll(&test->instr[9], NULL, 16), strtoll(&test->instr[0], NULL, 16), }; - isa_decode(code, 8, fdisasm, + isa_disasm(code, 8, fdisasm, &(struct isa_decode_options){ .gpu_id = test->gpu_id, .show_errors = true, diff --git a/src/freedreno/isa/ir3-disasm.c b/src/freedreno/isa/ir3-disasm.c index d49f23815df..a6c6a9c60d3 100644 --- a/src/freedreno/isa/ir3-disasm.c +++ b/src/freedreno/isa/ir3-disasm.c @@ -47,7 +47,7 @@ main(int argc, char **argv) size_t sz; void *raw = os_read_file(argv[1], &sz); - isa_decode(raw, sz, stdout, &(struct isa_decode_options) { + isa_disasm(raw, sz, stdout, &(struct isa_decode_options) { .show_errors = true, .branch_labels = true, .pre_instr_cb = disasm_instr_cb,