intel/inst: Fix the ia16_addr_imm helpers

These have clearly never seen any use.... On gen8, the bottom 4 bits are
missing so we need to shift them off before we call set_bits and shift
again when we get the bits.  Found by inspection.

Reviewed-by: Iago Toral Quiroga <itoral@igalia.com>
This commit is contained in:
Jason Ekstrand
2018-11-16 13:03:31 -06:00
committed by Jason Ekstrand
parent e46fb33143
commit d96969120d

View File

@@ -933,10 +933,11 @@ brw_inst_set_##reg##_ia16_addr_imm(const struct gen_device_info *devinfo, \
{ \ { \
assert((value & ~0x3ff) == 0); \ assert((value & ~0x3ff) == 0); \
if (devinfo->gen >= 8) { \ if (devinfo->gen >= 8) { \
brw_inst_set_bits(inst, g8_high, g8_low, value & 0x1ff); \ assert(GET_BITS(value, 3, 0) == 0); \
brw_inst_set_bits(inst, g8_nine, g8_nine, value >> 9); \ brw_inst_set_bits(inst, g8_high, g8_low, GET_BITS(value, 8, 4)); \
brw_inst_set_bits(inst, g8_nine, g8_nine, GET_BITS(value, 9, 9)); \
} else { \ } else { \
brw_inst_set_bits(inst, g4_high, g4_low, value >> 9); \ brw_inst_set_bits(inst, g4_high, g4_low, value); \
} \ } \
} \ } \
static inline unsigned \ static inline unsigned \
@@ -944,7 +945,7 @@ brw_inst_##reg##_ia16_addr_imm(const struct gen_device_info *devinfo, \
const brw_inst *inst) \ const brw_inst *inst) \
{ \ { \
if (devinfo->gen >= 8) { \ if (devinfo->gen >= 8) { \
return brw_inst_bits(inst, g8_high, g8_low) | \ return (brw_inst_bits(inst, g8_high, g8_low) << 4) | \
(brw_inst_bits(inst, g8_nine, g8_nine) << 9); \ (brw_inst_bits(inst, g8_nine, g8_nine) << 9); \
} else { \ } else { \
return brw_inst_bits(inst, g4_high, g4_low); \ return brw_inst_bits(inst, g4_high, g4_low); \