From 40282af492e7530385e436325a73f4054c69ce15 Mon Sep 17 00:00:00 2001
From: Richard Henderson <richard.henderson@linaro.org>
Date: Wed, 20 Nov 2019 12:22:38 -0500
Subject: [PATCH] target/arm: Convert T16 adjust sp (immediate)

Backports commit 2e6a646d7b1304d9106baad73c655132e2736c6c from qemu
---
 qemu/target/arm/t16.decode  |  9 +++++++++
 qemu/target/arm/translate.c | 15 ++-------------
 2 files changed, 11 insertions(+), 13 deletions(-)

diff --git a/qemu/target/arm/t16.decode b/qemu/target/arm/t16.decode
index 5a570484..b425b867 100644
--- a/qemu/target/arm/t16.decode
+++ b/qemu/target/arm/t16.decode
@@ -156,6 +156,15 @@ ADD_rrri        0100 0100 . .... ...            @addsub_2h s=0
 CMP_xrri        0100 0101 . .... ...            @addsub_2h s=1
 MOV_rxri        0100 0110 . .... ...            @addsub_2h s=0
 
+# Adjust SP (immediate)
+
+%imm7_0x4       0:7 !function=times_4
+@addsub_sp_i    .... .... . ....... \
+                &s_rri_rot s=0 rd=13 rn=13 rot=0 imm=%imm7_0x4
+
+ADD_rri         1011 0000 0 .......             @addsub_sp_i
+SUB_rri         1011 0000 1 .......             @addsub_sp_i
+
 # Branch and exchange
 
 @branchr        .... .... . rm:4 ...            &r
diff --git a/qemu/target/arm/translate.c b/qemu/target/arm/translate.c
index b2ead5c5..f2876ae3 100644
--- a/qemu/target/arm/translate.c
+++ b/qemu/target/arm/translate.c
@@ -11118,19 +11118,8 @@ static void disas_thumb_insn(DisasContext *s, uint32_t insn)
         /* misc */
         op = (insn >> 8) & 0xf;
         switch (op) {
-        case 0:
-            /*
-             * 0b1011_0000_xxxx_xxxx
-             *  - ADD (SP plus immediate)
-             *  - SUB (SP minus immediate)
-             */
-            tmp = load_reg(s, 13);
-            val = (insn & 0x7f) * 4;
-            if (insn & (1 << 7))
-                val = -(int32_t)val;
-            tcg_gen_addi_i32(tcg_ctx, tmp, tmp, val);
-            store_sp_checked(s, tmp);
-            break;
+        case 0: /* add/sub (sp, immediate), in decodetree */
+            goto illegal_op;
 
         case 2: /* sign/zero extend.  */
             ARCH(6);