aboutsummaryrefslogtreecommitdiffstats
path: root/softmmu_header.h
diff options
context:
space:
mode:
authorVladimir Chtchetkine <vchtchetkine@google.com>2010-02-16 10:38:35 -0800
committerVladimir Chtchetkine <vchtchetkine@google.com>2010-02-18 15:22:07 -0800
commit5389aa19033153c09556d1362a8b8a56abccb8f5 (patch)
tree5d731effe5bd5d2f162f06aadec7212045eaef3d /softmmu_header.h
parent76dbca0489ab98a46f2954bc7b77c3df6f9d8264 (diff)
downloadexternal_qemu-5389aa19033153c09556d1362a8b8a56abccb8f5.zip
external_qemu-5389aa19033153c09556d1362a8b8a56abccb8f5.tar.gz
external_qemu-5389aa19033153c09556d1362a8b8a56abccb8f5.tar.bz2
Merge memory checking from sandbox
Change-id: Ibce845d0
Diffstat (limited to 'softmmu_header.h')
-rw-r--r--softmmu_header.h10
1 files changed, 9 insertions, 1 deletions
diff --git a/softmmu_header.h b/softmmu_header.h
index a1b3808..f96b512 100644
--- a/softmmu_header.h
+++ b/softmmu_header.h
@@ -41,8 +41,16 @@
#if ACCESS_TYPE < (NB_MMU_MODES)
-#define CPU_MMU_INDEX ACCESS_TYPE
+#if defined(OUTSIDE_JIT)
+/* Dispatch calls to __ldx_outside_jit / __stx_outside_jit, which don't
+ * expect CPU environment. to be cached in ebp register, but rather uses
+ * cpu_single_env variable for that purpose.
+ */
+#define MMUSUFFIX _outside_jit
+#else // OUTSIDE_JIT
#define MMUSUFFIX _mmu
+#endif // OUTSIDE_JIT
+#define CPU_MMU_INDEX ACCESS_TYPE
#elif ACCESS_TYPE == (NB_MMU_MODES)