From: Alan Modra <amodra@gmail.com>
Date: Tue, 10 Dec 2019 21:56:58 +0000 (+1030)
Subject: ubsan: moxie: left shift of negative value
X-Git-Url: http://git.efficios.com/?a=commitdiff_plain;h=8c9b4171877df;p=deliverable%2Fbinutils-gdb.git

ubsan: moxie: left shift of negative value

	* moxie-dis.c (INST2OFFSET): Don't sign extend using shifts.
---

diff --git a/opcodes/ChangeLog b/opcodes/ChangeLog
index ffe57a4514..60dfe76ef1 100644
--- a/opcodes/ChangeLog
+++ b/opcodes/ChangeLog
@@ -1,3 +1,7 @@
+2019-12-11  Alan Modra  <amodra@gmail.com>
+
+	* moxie-dis.c (INST2OFFSET): Don't sign extend using shifts.
+
 2019-12-11  Alan Modra  <amodra@gmail.com>
 
 	* m68k-dis.c (COERCE32): Cast value first.
diff --git a/opcodes/moxie-dis.c b/opcodes/moxie-dis.c
index 3097fa0977..cbfcf95880 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) ((((signed short)((o & ((1<<10)-1))<<6))>>6)<<1)
+#define INST2OFFSET(o) (((((o) & 0x3ff) ^ 0x200) - 0x200) << 1)
 
 static const char * reg_names[16] =
   { "$fp", "$sp", "$r0", "$r1", "$r2", "$r3", "$r4", "$r5",