[Qemu-devel] [PATCH] Undefine SWP instruction unless SCTLR.SW bit is set

[Alexey Starikovskiy]

Signed-off-by: Alexey Starikovskiy <address@hidden>
---
 target-arm/translate.c |    6 ++++++
 1 files changed, 6 insertions(+), 0 deletions(-)

diff --git a/target-arm/translate.c b/target-arm/translate.c
index 7a3c7d6..b35c85f 100644
--- a/target-arm/translate.c
+++ b/target-arm/translate.c
@@ -7415,6 +7415,12 @@ static void disas_arm_insn(CPUARMState * env, 
DisasContext *s)
                         }
                         tcg_temp_free(addr);
                     } else {
+                        if (!(env->cp15.c1_sys & (1 << 10))) {
+                            /* Check if SCTLR.SW is set. Any change to SCTLR
+                             * invalidates all translations, so we are safe.
+                             */
+                            goto illegal_op;
+                        }
                         /* SWP instruction */
                         rm = (insn) & 0xf;