fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-05-07 15:48:36 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

i965: Fix register types in dump_instructions(), again.

Browse source 
In commit e57d77280e, I fixed this for
destinations in the Vec4 backend, and sources in the scalar backend.
But not both types in both backends.

To prevent this mess from continuing, make the reg_encoding table
static, so only the disassembler can use it.

Signed-off-by: Kenneth Graunke <kenneth@whitecape.org>
Reviewed-by: Matt Turner <mattst88@gmail.com>
This commit is contained in:
Kenneth Graunke 2014-03-11 00:04:35 -07:00
parent 4d2e79269a
commit 01d9023a9b
4 changed files with 3 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
src/mesa/drivers/dri/i965/brw_context.h
View file

@ -1843,7 +1843,6 @@ struct opcode_desc {
extern const struct opcode_desc opcode_descs[128];
extern const char * const conditional_modifier[16];
extern const char * const reg_encoding[8];
void
brw_emit_depthbuffer(struct brw_context *brw);

2
src/mesa/drivers/dri/i965/brw_disasm.c
View file

@ -244,7 +244,7 @@ static const char * const access_mode[2] = {
[1] = "align16",
};
const char * const reg_encoding[8] = {
static const char * const reg_encoding[8] = {
[0] = "UD",
[1] = "D",
[2] = "UW",

2
src/mesa/drivers/dri/i965/brw_fs.cpp
View file

@ -3068,7 +3068,7 @@ fs_visitor::dump_instruction(backend_instruction *be_inst)
fprintf(stderr, "???");
break;
}
fprintf(stderr, ":%s, ", reg_encoding[inst->dst.type]);
fprintf(stderr, ":%s, ", brw_reg_type_letters(inst->dst.type));
for (int i = 0; i < 3 && inst->src[i].file != BAD_FILE; i++) {
if (inst->src[i].negate)

2
src/mesa/drivers/dri/i965/brw_vec4.cpp
View file

@ -1269,7 +1269,7 @@ vec4_visitor::dump_instruction(backend_instruction *be_inst)
fprintf(stderr, "|");
if (inst->src[i].file != IMM) {
fprintf(stderr, ":%s", reg_encoding[inst->src[i].type]);
fprintf(stderr, ":%s", brw_reg_type_letters(inst->src[i].type));
}
if (i < 2 && inst->src[i + 1].file != BAD_FILE)