ubsan: loongarch : signed integer shift overflow.

opcodes/
	* loongarch-coder.c :
	  int32_t ret = 0;
	  ret <<= sizeof (ret) * 8 - len;
	  ret >>= sizeof (ret) * 8 - len;
	  ...
	  Avoid ubsan warning.
This commit is contained in:
liuzhensong
2021-11-16 19:15:29 +08:00
parent 1ab7a698a8
commit e36144c932

View File

@ -106,11 +106,13 @@ loongarch_decode_imm (const char *bit_field, insn_t insn, int si)
else if (*bit_field_1 == '+') else if (*bit_field_1 == '+')
ret += atoi (bit_field_1 + 1); ret += atoi (bit_field_1 + 1);
/* Extend signed bit. */
if (si) if (si)
{ {
ret <<= sizeof (ret) * 8 - len; uint32_t sign = 1u << (len - 1);
ret >>= sizeof (ret) * 8 - len; ret = (ret ^ sign) - sign;
} }
return ret; return ret;
} }
@ -133,7 +135,8 @@ loongarch_encode_imm (const char *bit_field, int32_t imm)
else if (*t == '+') else if (*t == '+')
uimm -= atoi (t + 1); uimm -= atoi (t + 1);
uimm <<= sizeof (uimm) * 8 - width; uimm = width ? (uimm << (sizeof (uimm) * 8 - width)) : 0;
while (1) while (1)
{ {
b_start = strtol (bit_field_1, &bit_field_1, 10); b_start = strtol (bit_field_1, &bit_field_1, 10);
@ -141,10 +144,10 @@ loongarch_encode_imm (const char *bit_field, int32_t imm)
break; break;
width = strtol (bit_field_1 + 1, &bit_field_1, 10); width = strtol (bit_field_1 + 1, &bit_field_1, 10);
i = uimm; i = uimm;
i >>= sizeof (i) * 8 - width; i = width ? (i >> (sizeof (i) * 8 - width)) : 0;
i <<= b_start; i = (b_start == 32) ? 0 : (i << b_start);
ret |= i; ret |= i;
uimm <<= width; uimm = (width == 32) ? 0 : (uimm << width);
if (*bit_field_1 != '|') if (*bit_field_1 != '|')
break; break;