aboutsummaryrefslogtreecommitdiff
path: root/opcodes/moxie-dis.c
diff options
context:
space:
mode:
authorAlan Modra <amodra@gmail.com>2019-12-16 09:57:22 +1030
committerAlan Modra <amodra@gmail.com>2019-12-16 17:28:52 +1030
commitcf950fd4dd4581849a445a76b57514d72074927d (patch)
tree5c6efa491b1046d049fcb3b669af60e0e9d6c9f5 /opcodes/moxie-dis.c
parentd3ecddab5fc036fb57588a9bfff73575dc419052 (diff)
downloadgdb-cf950fd4dd4581849a445a76b57514d72074927d.zip
gdb-cf950fd4dd4581849a445a76b57514d72074927d.tar.gz
gdb-cf950fd4dd4581849a445a76b57514d72074927d.tar.bz2
ubsan: moxie: left shift of negative value
Commit 8c9b4171877df didn't remove a glaring left shift of a number that had just been sign extended. * moxie-dis.c (INST2OFFSET): Don't left shift a signed value. (print_insn_moxie): Remove unnecessary cast.
Diffstat (limited to 'opcodes/moxie-dis.c')
-rw-r--r--opcodes/moxie-dis.c5
1 files changed, 2 insertions, 3 deletions
diff --git a/opcodes/moxie-dis.c b/opcodes/moxie-dis.c
index cbfcf95..1d06e18 100644
--- a/opcodes/moxie-dis.c
+++ b/opcodes/moxie-dis.c
@@ -33,7 +33,7 @@ static void *stream;
/* Macros to extract operands from the instruction word. */
#define OP_A(i) ((i >> 4) & 0xf)
#define OP_B(i) (i & 0xf)
-#define INST2OFFSET(o) (((((o) & 0x3ff) ^ 0x200) - 0x200) << 1)
+#define INST2OFFSET(o) (((((o) & 0x3ff) ^ 0x200) - 0x200) * 2)
static const char * reg_names[16] =
{ "$fp", "$sp", "$r0", "$r1", "$r2", "$r3", "$r4", "$r5",
@@ -210,8 +210,7 @@ print_insn_moxie (bfd_vma addr, struct disassemble_info * info)
{
case MOXIE_F3_PCREL:
fpr (stream, "%s\t", opcode->name);
- info->print_address_func ((bfd_vma) (addr + INST2OFFSET(iword) + 2),
- info);
+ info->print_address_func (addr + INST2OFFSET (iword) + 2, info);
break;
case MOXIE_BAD:
fpr (stream, "bad");