diff options
| author | Matt Turner <[email protected]> | 2017-07-25 14:05:44 -0700 |
|---|---|---|
| committer | Matt Turner <[email protected]> | 2017-08-21 14:05:23 -0700 |
| commit | deae25ce3783a770f2e4e8f73f935656791121ae (patch) | |
| tree | 56c98192b8f9e03f714b3e10dce04943c086dd46 /src/intel/compiler/brw_disasm.c | |
| parent | 8815b9677ff70723ee55f2e567d50c1d4e9762b3 (diff) | |
i965: Use separate enums for register vs immediate types
The hardware encodings often mean different things depending on whether
the source is an immediate.
Reviewed-by: Scott D Phillips <[email protected]>
Diffstat (limited to 'src/intel/compiler/brw_disasm.c')
| -rw-r--r-- | src/intel/compiler/brw_disasm.c | 46 |
1 files changed, 24 insertions, 22 deletions
diff --git a/src/intel/compiler/brw_disasm.c b/src/intel/compiler/brw_disasm.c index 3a33614523c..b5c283058ab 100644 --- a/src/intel/compiler/brw_disasm.c +++ b/src/intel/compiler/brw_disasm.c @@ -238,17 +238,18 @@ static const char *const access_mode[2] = { }; static const char * const reg_encoding[] = { - [BRW_HW_REG_TYPE_UD] = "UD", - [BRW_HW_REG_TYPE_D] = "D", - [BRW_HW_REG_TYPE_UW] = "UW", - [BRW_HW_REG_TYPE_W] = "W", - [BRW_HW_REG_NON_IMM_TYPE_UB] = "UB", - [BRW_HW_REG_NON_IMM_TYPE_B] = "B", - [GEN7_HW_REG_NON_IMM_TYPE_DF] = "DF", - [BRW_HW_REG_TYPE_F] = "F", - [GEN8_HW_REG_TYPE_UQ] = "UQ", - [GEN8_HW_REG_TYPE_Q] = "Q", - [GEN8_HW_REG_NON_IMM_TYPE_HF] = "HF", + [BRW_HW_REG_TYPE_UD] = "UD", + [BRW_HW_REG_TYPE_D] = "D", + [BRW_HW_REG_TYPE_UW] = "UW", + [BRW_HW_REG_TYPE_W] = "W", + [BRW_HW_REG_TYPE_F] = "F", + [GEN8_HW_REG_TYPE_UQ] = "UQ", + [GEN8_HW_REG_TYPE_Q] = "Q", + + [BRW_HW_REG_TYPE_UB] = "UB", + [BRW_HW_REG_TYPE_B] = "B", + [GEN7_HW_REG_TYPE_DF] = "DF", + [GEN8_HW_REG_TYPE_HF] = "HF", }; static const char *const three_source_reg_encoding[] = { @@ -1024,41 +1025,42 @@ src2_3src(FILE *file, const struct gen_device_info *devinfo, const brw_inst *ins } static int -imm(FILE *file, const struct gen_device_info *devinfo, unsigned type, const brw_inst *inst) +imm(FILE *file, const struct gen_device_info *devinfo, enum hw_imm_type type, + const brw_inst *inst) { switch (type) { - case BRW_HW_REG_TYPE_UD: + case BRW_HW_IMM_TYPE_UD: format(file, "0x%08xUD", brw_inst_imm_ud(devinfo, inst)); break; - case BRW_HW_REG_TYPE_D: + case BRW_HW_IMM_TYPE_D: format(file, "%dD", brw_inst_imm_d(devinfo, inst)); break; - case BRW_HW_REG_TYPE_UW: + case BRW_HW_IMM_TYPE_UW: format(file, "0x%04xUW", (uint16_t) brw_inst_imm_ud(devinfo, inst)); break; - case BRW_HW_REG_TYPE_W: + case BRW_HW_IMM_TYPE_W: format(file, "%dW", (int16_t) brw_inst_imm_d(devinfo, inst)); break; - case BRW_HW_REG_IMM_TYPE_UV: + case BRW_HW_IMM_TYPE_UV: format(file, "0x%08xUV", brw_inst_imm_ud(devinfo, inst)); break; - case BRW_HW_REG_IMM_TYPE_VF: + case BRW_HW_IMM_TYPE_VF: format(file, "[%-gF, %-gF, %-gF, %-gF]VF", brw_vf_to_float(brw_inst_imm_ud(devinfo, inst)), brw_vf_to_float(brw_inst_imm_ud(devinfo, inst) >> 8), brw_vf_to_float(brw_inst_imm_ud(devinfo, inst) >> 16), brw_vf_to_float(brw_inst_imm_ud(devinfo, inst) >> 24)); break; - case BRW_HW_REG_IMM_TYPE_V: + case BRW_HW_IMM_TYPE_V: format(file, "0x%08xV", brw_inst_imm_ud(devinfo, inst)); break; - case BRW_HW_REG_TYPE_F: + case BRW_HW_IMM_TYPE_F: format(file, "%-gF", brw_inst_imm_f(devinfo, inst)); break; - case GEN8_HW_REG_IMM_TYPE_DF: + case GEN8_HW_IMM_TYPE_DF: format(file, "%-gDF", brw_inst_imm_df(devinfo, inst)); break; - case GEN8_HW_REG_IMM_TYPE_HF: + case GEN8_HW_IMM_TYPE_HF: string(file, "Half Float IMM"); break; } |