Merge remote-tracking branch 'remotes/mst/tags/for_upstream' into staging

[qemu.git] / target / arm / arm_ldst.h

diff --git a/target/arm/arm_ldst.h b/target/arm/arm_ldst.h
index a76d89f62ce4e2c4324f08300f630b3609db4857..45edb108f6aaa37f69ee6f953ec3bcf38081d38e 100644 (file)
--- a/target/arm/arm_ldst.h
+++ b/target/arm/arm_ldst.h
@@ -20,30 +20,28 @@
 #ifndef ARM_LDST_H
 #define ARM_LDST_H
 
-#include "exec/exec-all.h"
-#include "exec/cpu_ldst.h"
+#include "exec/translator.h"
 #include "qemu/bswap.h"
 
 /* Load an instruction and return it in the standard little-endian order */
 static inline uint32_t arm_ldl_code(CPUARMState *env, target_ulong addr,
                                     bool sctlr_b)
 {
-    uint32_t insn = cpu_ldl_code(env, addr);
-    if (bswap_code(sctlr_b)) {
-        return bswap32(insn);
-    }
-    return insn;
+    return translator_ldl_swap(env, addr, bswap_code(sctlr_b));
 }
 
 /* Ditto, for a halfword (Thumb) instruction */
 static inline uint16_t arm_lduw_code(CPUARMState *env, target_ulong addr,
                                      bool sctlr_b)
 {
-    uint16_t insn = cpu_lduw_code(env, addr);
-    if (bswap_code(sctlr_b)) {
-        return bswap16(insn);
+#ifndef CONFIG_USER_ONLY
+    /* In big-endian (BE32) mode, adjacent Thumb instructions have been swapped
+       within each word.  Undo that now.  */
+    if (sctlr_b) {
+        addr ^= 2;
     }
-    return insn;
+#endif
+    return translator_lduw_swap(env, addr, bswap_code(sctlr_b));
 }
 
 #endif