ubsan: z8k: left shift cannot be represented in type 'int'

	* z8k-dis.c (unpack_instr): Formatting.  Cast unsigned short
	values to unsigned before shifting.

diff --git a/opcodes/ChangeLog b/opcodes/ChangeLog
index 8f3f94414b2e73a8ee5b5c4683916fa66036328a..54619fa7d9934f85fafef4af52d704f2d3361308 100644 (file)
--- a/opcodes/ChangeLog
+++ b/opcodes/ChangeLog
@@ -1,3 +1,8 @@
+2020-01-14  Alan Modra  <amodra@gmail.com>
+
+       * z8k-dis.c (unpack_instr): Formatting.  Cast unsigned short
+       values to unsigned before shifting.
+
 2020-01-13  Thomas Troeger  <tstroege@gmx.de>
 
        * arm-dis.c (print_insn_arm): Fill in insn info fields for control

diff --git a/opcodes/z8k-dis.c b/opcodes/z8k-dis.c
index cb871decfaba7033f601b5b347171db068940135..ba9331fc8ba10378423a9d4e8c13160558f465c4 100644 (file)
--- a/opcodes/z8k-dis.c
+++ b/opcodes/z8k-dis.c
@@ -369,8 +369,8 @@ unpack_instr (instr_data_s *instr_data, int is_segmented, disassemble_info *info
              break;
            case ARG_IMM32:
              FETCH_DATA (info, nibl_count + 8);
-             instr_long = (instr_data->words[nibl_count] << 16)
-               | (instr_data->words[nibl_count + 4]);
+             instr_long = ((unsigned) instr_data->words[nibl_count] << 16
+                           | instr_data->words[nibl_count + 4]);
              instr_data->immediate = instr_long;
              nibl_count += 7;
              break;
@@ -402,17 +402,17 @@ unpack_instr (instr_data_s *instr_data, int is_segmented, disassemble_info *info
              if (instr_nibl & 0x8)
                {
                  FETCH_DATA (info, nibl_count + 8);
-                 instr_long = (instr_data->words[nibl_count] << 16)
-                   | (instr_data->words[nibl_count + 4]);
-                 instr_data->address = ((instr_word & 0x7f00) << 16)
-                   + (instr_long & 0xffff);
+                 instr_long = ((unsigned) instr_data->words[nibl_count] << 16
+                               | instr_data->words[nibl_count + 4]);
+                 instr_data->address = ((instr_word & 0x7f00) << 16
+                                        | (instr_long & 0xffff));
                  nibl_count += 7;
                  seg_length = 2;
                }
              else
                {
-                 instr_data->address = ((instr_word & 0x7f00) << 16)
-                   + (instr_word & 0x00ff);
+                 instr_data->address = ((instr_word & 0x7f00) << 16
+                                        | (instr_word & 0x00ff));
                  nibl_count += 3;
                }
            }