ilo: make toy_compiler_disassemble() more useful

Do not require a toy_compiler so that it can be used in other places, such as
state dumping.  Add a bool to control whether the raw instruction words are
shown.
This commit is contained in:
Chia-I Wu 2014-09-05 12:01:34 +08:00
parent 4ea1565bbc
commit 43bf14eaeb
5 changed files with 11 additions and 9 deletions

View file

@ -1425,7 +1425,7 @@ fs_compile(struct fs_compile_context *fcc)
if (ilo_debug & ILO_DEBUG_FS) {
ilo_printf("disassembly:\n");
toy_compiler_disassemble(tc, sh->kernel, sh->kernel_size);
toy_compiler_disassemble(tc->dev, sh->kernel, sh->kernel_size, false);
ilo_printf("\n");
}

View file

@ -902,7 +902,7 @@ gs_compile(struct gs_compile_context *gcc)
if (ilo_debug & ILO_DEBUG_GS) {
ilo_printf("disassembly:\n");
toy_compiler_disassemble(tc, sh->kernel, sh->kernel_size);
toy_compiler_disassemble(tc->dev, sh->kernel, sh->kernel_size, false);
ilo_printf("\n");
}
@ -986,7 +986,7 @@ gs_compile_passthrough(struct gs_compile_context *gcc)
if (ilo_debug & ILO_DEBUG_GS) {
ilo_printf("disassembly:\n");
toy_compiler_disassemble(tc, sh->kernel, sh->kernel_size);
toy_compiler_disassemble(tc->dev, sh->kernel, sh->kernel_size, false);
ilo_printf("\n");
}

View file

@ -789,7 +789,7 @@ vs_compile(struct vs_compile_context *vcc)
if (ilo_debug & ILO_DEBUG_VS) {
ilo_printf("disassembly:\n");
toy_compiler_disassemble(tc, sh->kernel, sh->kernel_size);
toy_compiler_disassemble(tc->dev, sh->kernel, sh->kernel_size, false);
ilo_printf("\n");
}

View file

@ -470,6 +470,8 @@ void *
toy_compiler_assemble(struct toy_compiler *tc, int *size);
void
toy_compiler_disassemble(struct toy_compiler *tc, const void *kernel, int size);
toy_compiler_disassemble(const struct ilo_dev_info *dev,
const void *kernel, int size,
bool dump_hex);
#endif /* TOY_COMPILER_H */

View file

@ -40,10 +40,10 @@ static int brw_disasm (FILE *file, struct brw_instruction *inst, int gen);
#include "toy_compiler.h"
void
toy_compiler_disassemble(struct toy_compiler *tc, const void *kernel, int size)
toy_compiler_disassemble(const struct ilo_dev_info *dev,
const void *kernel, int size,
bool dump_hex)
{
/* set this to true to dump the hex */
const bool dump_hex = false;
const struct brw_instruction *instructions = kernel;
int i;
@ -55,7 +55,7 @@ toy_compiler_disassemble(struct toy_compiler *tc, const void *kernel, int size)
}
brw_disasm(stderr, (struct brw_instruction *) &instructions[i],
ILO_GEN_GET_MAJOR(tc->dev->gen));
ILO_GEN_GET_MAJOR(dev->gen));
}
}