aboutsummaryrefslogtreecommitdiff
path: root/opcodes/m32c-ibld.c
diff options
context:
space:
mode:
authorAlan Modra <amodra@gmail.com>2020-08-28 23:43:16 +0930
committerAlan Modra <amodra@gmail.com>2020-08-28 23:52:26 +0930
commita1e60a1bdce8f555f45b5f94c059d83abf883567 (patch)
tree5537dd112ecf11c9b73f5e87023915a73846177a /opcodes/m32c-ibld.c
parented2ed4dcf4ae20b9a7c38ffdf379fef383c6b8f9 (diff)
downloadgdb-a1e60a1bdce8f555f45b5f94c059d83abf883567.zip
gdb-a1e60a1bdce8f555f45b5f94c059d83abf883567.tar.gz
gdb-a1e60a1bdce8f555f45b5f94c059d83abf883567.tar.bz2
PR26449, PR26450 UBSAN: frv-ibld.c:135 left shift
Eh well, I guess the code didn't quite live up to the comment. PR 26449 PR 26450 * cgen-ibld.in (insert_1): Use 1UL in forming mask. (extract_normal): Likewise. (insert_normal): Likewise, and move past zero length test. (put_insn_int_value): Handle mask for zero length, use 1UL. * bpf-ibld.c, * epiphany-ibld.c, * fr30-ibld.c, * frv-ibld.c, * ip2k-ibld.c, * iq2000-ibld.c, * lm32-ibld.c, * m32c-ibld.c, * m32r-ibld.c, * mep-ibld.c, * mt-ibld.c, * or1k-ibld.c, * xc16x-ibld.c, * xstormy16-ibld.c: Regenerate.
Diffstat (limited to 'opcodes/m32c-ibld.c')
-rw-r--r--opcodes/m32c-ibld.c14
1 files changed, 8 insertions, 6 deletions
diff --git a/opcodes/m32c-ibld.c b/opcodes/m32c-ibld.c
index 6ad4da9..67bfb48 100644
--- a/opcodes/m32c-ibld.c
+++ b/opcodes/m32c-ibld.c
@@ -85,13 +85,13 @@ insert_1 (CGEN_CPU_DESC cd,
int word_length,
unsigned char *bufp)
{
- unsigned long x,mask;
+ unsigned long x, mask;
int shift;
x = cgen_get_insn_value (cd, bufp, word_length, cd->endian);
/* Written this way to avoid undefined behaviour. */
- mask = (((1L << (length - 1)) - 1) << 1) | 1;
+ mask = (1UL << (length - 1) << 1) - 1;
if (CGEN_INSN_LSB0_P)
shift = (start + 1) - length;
else
@@ -131,13 +131,15 @@ insert_normal (CGEN_CPU_DESC cd,
CGEN_INSN_BYTES_PTR buffer)
{
static char errbuf[100];
- /* Written this way to avoid undefined behaviour. */
- unsigned long mask = (((1L << (length - 1)) - 1) << 1) | 1;
+ unsigned long mask;
/* If LENGTH is zero, this operand doesn't contribute to the value. */
if (length == 0)
return NULL;
+ /* Written this way to avoid undefined behaviour. */
+ mask = (1UL << (length - 1) << 1) - 1;
+
if (word_length > 8 * sizeof (CGEN_INSN_INT))
abort ();
@@ -314,7 +316,7 @@ put_insn_int_value (CGEN_CPU_DESC cd ATTRIBUTE_UNUSED,
{
int shift = insn_length - length;
/* Written this way to avoid undefined behaviour. */
- CGEN_INSN_INT mask = (((1L << (length - 1)) - 1) << 1) | 1;
+ CGEN_INSN_INT mask = length == 0 ? 0 : (1UL << (length - 1) << 1) - 1;
*buf = (*buf & ~(mask << shift)) | ((value & mask) << shift);
}
@@ -491,7 +493,7 @@ extract_normal (CGEN_CPU_DESC cd,
#endif /* ! CGEN_INT_INSN_P */
/* Written this way to avoid undefined behaviour. */
- mask = (((1L << (length - 1)) - 1) << 1) | 1;
+ mask = (1UL << (length - 1) << 1) - 1;
value &= mask;
/* sign extend? */