From bcd9f578a96b9776e34e5cec963928f5a96b80e7 Mon Sep 17 00:00:00 2001
From: Alan Modra <amodra@gmail.com>
Date: Fri, 20 Dec 2019 14:37:44 +1030
Subject: [PATCH] ubsan: or1k: left shift of negative value

cpu/
	* or1korbis.cpu (f-disp26, f-disp21): Don't left shift negative values.
opcodes/
	* or1k-ibld.c: Regenerate.
---
 cpu/ChangeLog       | 4 ++++
 cpu/or1korbis.cpu   | 4 ++--
 opcodes/ChangeLog   | 4 ++++
 opcodes/or1k-ibld.c | 4 ++--
 4 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/cpu/ChangeLog b/cpu/ChangeLog
index 8755ee70a4..1729efd266 100644
--- a/cpu/ChangeLog
+++ b/cpu/ChangeLog
@@ -1,3 +1,7 @@
+2019-12-20  Alan Modra  <amodra@gmail.com>
+
+	* or1korbis.cpu (f-disp26, f-disp21): Don't left shift negative values.
+
 2019-12-17  Alan Modra  <amodra@gmail.com>
 
 	* bpf.cpu (f-imm64): Avoid signed overflow.
diff --git a/cpu/or1korbis.cpu b/cpu/or1korbis.cpu
index 3741d4c8f7..a8002a3718 100644
--- a/cpu/or1korbis.cpu
+++ b/cpu/or1korbis.cpu
@@ -76,7 +76,7 @@
     26
     INT
     ((value pc) (sra IAI (sub IAI value pc) (const 2)))
-    ((value pc) (add IAI (sll IAI value (const 2)) pc))
+    ((value pc) (add IAI (mul IAI value (const 4)) pc))
     )
 
 ; PC relative, 21-bit, 13 shifted to right, aligned.
@@ -91,7 +91,7 @@
     ((value pc)
      (sub IAI (sra IAI value (const 13)) (sra IAI pc (const 13))))
     ((value pc)
-     (sll IAI (add IAI value (sra IAI pc (const 13))) (const 13)))
+     (mul IAI (add IAI value (sra IAI pc (const 13))) (const 8192)))
     )
 
 ; Immediates.
diff --git a/opcodes/ChangeLog b/opcodes/ChangeLog
index e0d2fab410..377f548e9c 100644
--- a/opcodes/ChangeLog
+++ b/opcodes/ChangeLog
@@ -1,3 +1,7 @@
+2019-12-20  Alan Modra  <amodra@gmail.com>
+
+	* or1k-ibld.c: Regenerate.
+
 2019-12-20  Alan Modra  <amodra@gmail.com>
 
 	* hppa-dis.c (extract_16, extract_21, print_insn_hppa): Use
diff --git a/opcodes/or1k-ibld.c b/opcodes/or1k-ibld.c
index 6271f5c6d1..57eeb522a6 100644
--- a/opcodes/or1k-ibld.c
+++ b/opcodes/or1k-ibld.c
@@ -783,7 +783,7 @@ or1k_cgen_extract_operand (CGEN_CPU_DESC cd,
       {
         long value;
         length = extract_normal (cd, ex_info, insn_value, 0|(1<<CGEN_IFLD_SIGNED)|(1<<CGEN_IFLD_ABS_ADDR), 0, 20, 21, 32, total_length, pc, & value);
-        value = ((((value) + (((DI) (pc) >> (13))))) << (13));
+        value = ((((value) + (((DI) (pc) >> (13))))) * (MAKEDI (0, 8192)));
         fields->f_disp21 = value;
       }
       break;
@@ -791,7 +791,7 @@ or1k_cgen_extract_operand (CGEN_CPU_DESC cd,
       {
         long value;
         length = extract_normal (cd, ex_info, insn_value, 0|(1<<CGEN_IFLD_SIGNED)|(1<<CGEN_IFLD_PCREL_ADDR), 0, 25, 26, 32, total_length, pc, & value);
-        value = ((((value) << (2))) + (pc));
+        value = ((((value) * (MAKEDI (0, 4)))) + (pc));
         fields->f_disp26 = value;
       }
       break;
-- 
2.34.1