OpenHarmony/third_party_mesa3d
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

intel/elk: Fix undefined left shift of negative value in update_uip_jip

Browse Source 
v2: Add comment and assertion to explain why the shift is
safe. Suggested by Caio.

Reviewed-by: Caio Oliveira <caio.oliveira@intel.com>
Reviewed-by: Matt Turner <mattst88@gmail.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/30333>
This commit is contained in:
Ian Romanick
2024-07-22 19:28:39 -07:00
parent c2dda8c8e7
commit 0e5ac7d6b0
1 changed files with 10 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/intel/compiler/elk/elk_eu_compact.c
View File

@@ -1796,11 +1796,19 @@ update_uip_jip(const struct elk_isa_info *isa, elk_inst *insn,
*/
int shift = devinfo->ver >= 8 ? 3 : 0;
/* Even though the values are signed, we don't need the rounding behavior
* of integer division. The shifts are safe.
*/
if (devinfo->ver >= 8) {
assert(elk_inst_jip(devinfo, insn) % 8 == 0 &&
elk_inst_uip(devinfo, insn) % 8 == 0);
}
int32_t jip_compacted = elk_inst_jip(devinfo, insn) >> shift;
jip_compacted -= compacted_between(this_old_ip,
this_old_ip + (jip_compacted / 2),
compacted_counts);
elk_inst_set_jip(devinfo, insn, jip_compacted << shift);
elk_inst_set_jip(devinfo, insn, (uint32_t)jip_compacted << shift);
if (elk_inst_opcode(isa, insn) == ELK_OPCODE_ENDIF ||
elk_inst_opcode(isa, insn) == ELK_OPCODE_WHILE ||
@@ -1811,7 +1819,7 @@ update_uip_jip(const struct elk_isa_info *isa, elk_inst *insn,
uip_compacted -= compacted_between(this_old_ip,
this_old_ip + (uip_compacted / 2),
compacted_counts);
elk_inst_set_uip(devinfo, insn, uip_compacted << shift);
elk_inst_set_uip(devinfo, insn, (uint32_t)uip_compacted << shift);
}
static void