From 334175b693a1cbab8850f5faa6937e7c6ca3db7d Mon Sep 17 00:00:00 2001 From: Alan Modra Date: Wed, 11 Dec 2019 08:23:33 +1030 Subject: [PATCH] ubsan: m68k: left shift cannot be represented in type 'int' * m68k-dis.c (COERCE32): Cast value first. (NEXTLONG, NEXTULONG): Avoid signed overflow. --- opcodes/ChangeLog | 5 +++++ opcodes/m68k-dis.c | 8 +++++--- 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/opcodes/ChangeLog b/opcodes/ChangeLog index 8d48b5a8cd2..ffe57a45148 100644 --- a/opcodes/ChangeLog +++ b/opcodes/ChangeLog @@ -1,3 +1,8 @@ +2019-12-11 Alan Modra + + * m68k-dis.c (COERCE32): Cast value first. + (NEXTLONG, NEXTULONG): Avoid signed overflow. + 2019-12-11 Alan Modra * h8300-dis.c (extract_immediate): Avoid signed overflow. diff --git a/opcodes/m68k-dis.c b/opcodes/m68k-dis.c index 7584541402b..6e913d7abd6 100644 --- a/opcodes/m68k-dis.c +++ b/opcodes/m68k-dis.c @@ -96,7 +96,7 @@ enum print_insn_arg_error while (0) /* Get a 4 byte signed integer. */ -#define COERCE32(x) ((bfd_signed_vma) ((x) ^ 0x80000000) - 0x80000000) +#define COERCE32(x) (((bfd_vma) (x) ^ 0x80000000) - 0x80000000) #define NEXTLONG(p, val, ret_val) \ do \ @@ -104,7 +104,8 @@ enum print_insn_arg_error p += 4; \ if (!FETCH_DATA (info, p)) \ return ret_val; \ - val = COERCE32 ((((((p[-4] << 8) + p[-3]) << 8) + p[-2]) << 8) + p[-1]); \ + val = COERCE32 (((((((unsigned) p[-4] << 8) + p[-3]) << 8) \ + + p[-2]) << 8) + p[-1]); \ } \ while (0) @@ -115,7 +116,8 @@ enum print_insn_arg_error p += 4; \ if (!FETCH_DATA (info, p)) \ return PRINT_INSN_ARG_MEMORY_ERROR; \ - val = (unsigned int) ((((((p[-4] << 8) + p[-3]) << 8) + p[-2]) << 8) + p[-1]); \ + val = (((((((unsigned) p[-4] << 8) + p[-3]) << 8) \ + + p[-2]) << 8) + p[-1]); \ } \ while (0) -- 2.30.2