[binutils-gdb] ubsan: score: left shift of 2 by 31 places cannot be represented in type 'int'
Alan Modra
amodra@sourceware.org
Mon Dec 23 07:38:00 GMT 2019
https://sourceware.org/git/gitweb.cgi?p=binutils-gdb.git;h=7936714c0c5030f872ced475f848692ce835708a
commit 7936714c0c5030f872ced475f848692ce835708a
Author: Alan Modra <amodra@gmail.com>
Date: Mon Dec 23 18:05:19 2019 +1030
ubsan: score: left shift of 2 by 31 places cannot be represented in type 'int'
* score-dis.c (print_insn_score32): Avoid signed overflow.
(print_insn_score48): Likewise. Don't cast to int when printing
hex values.
Diff:
---
opcodes/ChangeLog | 6 ++++++
opcodes/score-dis.c | 47 ++++++++++++++++++++++-------------------------
2 files changed, 28 insertions(+), 25 deletions(-)
diff --git a/opcodes/ChangeLog b/opcodes/ChangeLog
index c3a9752..a374397 100644
--- a/opcodes/ChangeLog
+++ b/opcodes/ChangeLog
@@ -1,5 +1,11 @@
2019-12-23 Alan Modra <amodra@gmail.com>
+ * score-dis.c (print_insn_score32): Avoid signed overflow.
+ (print_insn_score48): Likewise. Don't cast to int when printing
+ hex values.
+
+2019-12-23 Alan Modra <amodra@gmail.com>
+
* iq2000-ibld.c: Regenerate.
2019-12-23 Alan Modra <amodra@gmail.com>
diff --git a/opcodes/score-dis.c b/opcodes/score-dis.c
index 74a1f1d..e760b92 100644
--- a/opcodes/score-dis.c
+++ b/opcodes/score-dis.c
@@ -568,7 +568,7 @@ print_insn_score48 (struct disassemble_info *info, bfd_vma given)
long reg;
reg = given >> bitstart;
- reg &= (2 << (bitend - bitstart)) - 1;
+ reg &= (2u << (bitend - bitstart)) - 1;
func (stream, "%s", score_regnames[reg]);
}
@@ -578,7 +578,7 @@ print_insn_score48 (struct disassemble_info *info, bfd_vma given)
long reg;
reg = given >> bitstart;
- reg &= (2 << (bitend - bitstart)) - 1;
+ reg &= (2u << (bitend - bitstart)) - 1;
func (stream, "%ld", reg);
}
@@ -587,9 +587,9 @@ print_insn_score48 (struct disassemble_info *info, bfd_vma given)
{
long reg;
reg = given >> bitstart;
- reg &= (2 << (bitend - bitstart)) - 1;
- reg = ((reg ^ (1 << (bitend - bitstart))) -
- (1 << (bitend - bitstart)));
+ reg &= (2u << (bitend - bitstart)) - 1;
+ reg = ((reg ^ (1u << (bitend - bitstart)))
+ - (1u << (bitend - bitstart)));
/* Fix bug: s3_testsuite 64-bit.
Remove high 32 bits. */
reg = (int) reg;
@@ -610,10 +610,7 @@ print_insn_score48 (struct disassemble_info *info, bfd_vma given)
long reg;
reg = given >> bitstart;
- reg &= (2 << (bitend - bitstart)) - 1;
- /* Fix bug: s3_testsuite 64-bit.
- Remove high 32 bits. */
- reg = (int) reg;
+ reg &= (2u << (bitend - bitstart)) - 1;
func (stream, "%lx", reg);
}
@@ -622,8 +619,8 @@ print_insn_score48 (struct disassemble_info *info, bfd_vma given)
{
long reg;
reg = given >> bitstart;
- reg &= (2 << (bitend - bitstart)) - 1;
- reg <<=2;
+ reg &= (2u << (bitend - bitstart)) - 1;
+ reg <<= 2;
func (stream, "%lx", reg);
}
break;
@@ -635,12 +632,12 @@ print_insn_score48 (struct disassemble_info *info, bfd_vma given)
case '`':
c++;
- if ((given & (1 << bitstart)) == 0)
+ if ((given & (1u << bitstart)) == 0)
func (stream, "%c", *c);
break;
case '\'':
c++;
- if ((given & (1 << bitstart)) != 0)
+ if ((given & (1u << bitstart)) != 0)
func (stream, "%c", *c);
break;
default:
@@ -738,7 +735,7 @@ print_insn_score32 (bfd_vma pc, struct disassemble_info *info, long given)
int bitstart = 10;
int bitend = 14;
reg = given >> bitstart;
- reg &= (2 << (bitend - bitstart)) - 1;
+ reg &= (2u << (bitend - bitstart)) - 1;
/* Sign-extend a 20-bit number. */
int disp = (given&1)<<1 |((given>>7)&7)<<2 |((given>>20)&0x1f)<<5;
int target = (pc + SEXT10 (disp));
@@ -790,7 +787,7 @@ print_insn_score32 (bfd_vma pc, struct disassemble_info *info, long given)
long reg;
reg = given >> bitstart;
- reg &= (2 << (bitend - bitstart)) - 1;
+ reg &= (2u << (bitend - bitstart)) - 1;
func (stream, "%s", score_regnames[reg]);
}
@@ -800,7 +797,7 @@ print_insn_score32 (bfd_vma pc, struct disassemble_info *info, long given)
long reg;
reg = given >> bitstart;
- reg &= (2 << (bitend - bitstart)) - 1;
+ reg &= (2u << (bitend - bitstart)) - 1;
func (stream, "%ld", reg);
}
@@ -810,9 +807,9 @@ print_insn_score32 (bfd_vma pc, struct disassemble_info *info, long given)
long reg;
reg = given >> bitstart;
- reg &= (2 << (bitend - bitstart)) - 1;
- reg = ((reg ^ (1 << (bitend - bitstart))) -
- (1 << (bitend - bitstart)));
+ reg &= (2u << (bitend - bitstart)) - 1;
+ reg = ((reg ^ (1u << (bitend - bitstart)))
+ - (1u << (bitend - bitstart)));
if (((given & insn->mask) == 0x0c00000a) /* ldc1 */
|| ((given & insn->mask) == 0x0c000012) /* ldc2 */
@@ -830,7 +827,7 @@ print_insn_score32 (bfd_vma pc, struct disassemble_info *info, long given)
long reg;
reg = given >> bitstart;
- reg &= (2 << (bitend - bitstart)) - 1;
+ reg &= (2u << (bitend - bitstart)) - 1;
func (stream, "%lx", reg);
}
@@ -842,12 +839,12 @@ print_insn_score32 (bfd_vma pc, struct disassemble_info *info, long given)
case '`':
c++;
- if ((given & (1 << bitstart)) == 0)
+ if ((given & (1u << bitstart)) == 0)
func (stream, "%c", *c);
break;
case '\'':
c++;
- if ((given & (1 << bitstart)) != 0)
+ if ((given & (1u << bitstart)) != 0)
func (stream, "%c", *c);
break;
default:
@@ -952,7 +949,7 @@ print_insn_score16 (bfd_vma pc, struct disassemble_info *info, long given)
if (!bitend)
abort ();
reg = given >> bitstart;
- reg &= (2 << (bitend - bitstart)) - 1;
+ reg &= (2u << (bitend - bitstart)) - 1;
switch (*c)
{
@@ -995,7 +992,7 @@ print_insn_score16 (bfd_vma pc, struct disassemble_info *info, long given)
}
break;
case 'i':
- reg = ((reg ^ (1 << bitend)) - (1 << bitend));
+ reg = (reg ^ (1u << bitend)) - (1u << bitend);
func (stream, "%ld", reg);
break;
default:
@@ -1006,7 +1003,7 @@ print_insn_score16 (bfd_vma pc, struct disassemble_info *info, long given)
case '\'':
c++;
- if ((given & (1 << bitstart)) != 0)
+ if ((given & (1u << bitstart)) != 0)
func (stream, "%c", *c);
break;
default:
More information about the Binutils-cvs
mailing list