From: Peter Chubb <peter.chubb@nicta.com.au>
Date: Fri, 19 Apr 2013 11:24:18 +0000 (+0100)
Subject: target-arm: Reinsert missing return statement in ARM mode SRS decode
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=3b3284486be6898937395fac3ddbd2e68c5cb52f;p=qemu.git

target-arm: Reinsert missing return statement in ARM mode SRS decode

Since patch
   81465888c5306cd94abb9847e560796fd13d3c2f
   target-arm: factor out handling of SRS instruction
the ARM mode SRS instruction has not worked in QEMU.

The problem is a missing return directive that was removed in the
refactoring, so after decoding the instruction, qemu would fall through
to generate an UNDEF exception for an illegal instruction.

Signed-off-by: Peter Chubb <peter.chubb@nicta.com.au>
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
---

diff --git a/target-arm/translate.c b/target-arm/translate.c
index 35a21be931..a1b7b8c1a8 100644
--- a/target-arm/translate.c
+++ b/target-arm/translate.c
@@ -6762,6 +6762,7 @@ static void disas_arm_insn(CPUARMState * env, DisasContext *s)
             }
             ARCH(6);
             gen_srs(s, (insn & 0x1f), (insn >> 23) & 3, insn & (1 << 21));
+            return;
         } else if ((insn & 0x0e50ffe0) == 0x08100a00) {
             /* rfe */
             int32_t offset;