From 8c9b4171877df495a55b75365203258785da0041 Mon Sep 17 00:00:00 2001 From: Alan Modra Date: Wed, 11 Dec 2019 08:26:58 +1030 Subject: [PATCH] ubsan: moxie: left shift of negative value * moxie-dis.c (INST2OFFSET): Don't sign extend using shifts. --- opcodes/ChangeLog | 4 ++++ opcodes/moxie-dis.c | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/opcodes/ChangeLog b/opcodes/ChangeLog index ffe57a45148..60dfe76ef12 100644 --- a/opcodes/ChangeLog +++ b/opcodes/ChangeLog @@ -1,3 +1,7 @@ +2019-12-11 Alan Modra + + * moxie-dis.c (INST2OFFSET): Don't sign extend using shifts. + 2019-12-11 Alan Modra * m68k-dis.c (COERCE32): Cast value first. diff --git a/opcodes/moxie-dis.c b/opcodes/moxie-dis.c index 3097fa09778..cbfcf958806 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", -- 2.30.2