softmmu: introduce cpu_ldst.h

This will collect all load and store helpers soon.  For now
it is just a replacement for softmmu_exec.h, which this patch
stops including directly, but we also include it where this will
be necessary in order to simplify the next patch.

Reviewed-by: Richard Henderson <rth@twiddle.net>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>

diff --git a/bsd-user/qemu.h b/bsd-user/qemu.h
index ddc74ed0d725b791eba066f2ae2b46e5a3cf8442..9d90668ddda38324091b3ef3a12eaf1defeeafde 100644 (file)
--- a/bsd-user/qemu.h
+++ b/bsd-user/qemu.h
@@ -5,6 +5,7 @@
 #include <string.h>
 
 #include "cpu.h"
+#include "exec/cpu_ldst.h"
 
 #undef DEBUG_REMAP
 #ifdef DEBUG_REMAP

diff --git a/cputlb.c b/cputlb.c
index e70cf7a739dddcd0396d3d94e5883ac23bedef85..afd3705ff38f07bc3d3cb8fd758dde8614b53505 100644 (file)
--- a/cputlb.c
+++ b/cputlb.c
@@ -22,6 +22,7 @@
 #include "exec/exec-all.h"
 #include "exec/memory.h"
 #include "exec/address-spaces.h"
+#include "exec/cpu_ldst.h"
 
 #include "exec/cputlb.h"
 

diff --git a/include/exec/cpu_ldst.h b/include/exec/cpu_ldst.h
new file mode 100644 (file)
index 0000000..a6b7884
--- /dev/null
+++ b/include/exec/cpu_ldst.h
@@ -0,0 +1,35 @@
+/*
+ *  Software MMU support
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+
+/*
+ * Generate inline load/store functions for all MMU modes (typically
+ * at least _user and _kernel) as well as _data versions, for all data
+ * sizes.
+ *
+ * Used by target op helpers.
+ *
+ * MMU mode suffixes are defined in target cpu.h.
+ */
+#ifndef CPU_LDST_H
+#define CPU_LDST_H
+
+#if !defined(CONFIG_USER_ONLY)
+#include "exec/softmmu_exec.h"
+#endif
+
+#endif /* CPU_LDST_H */

diff --git a/linux-user/qemu.h b/linux-user/qemu.h
index 36d4a738ea2cd16264223e648f9d16ccc9f7401c..ba3d8ab378f4300a92d01aa0a482181b6638b74a 100644 (file)
--- a/linux-user/qemu.h
+++ b/linux-user/qemu.h
@@ -5,6 +5,7 @@
 #include <string.h>
 
 #include "cpu.h"
+#include "exec/cpu_ldst.h"
 
 #undef DEBUG_REMAP
 #ifdef DEBUG_REMAP

diff --git a/monitor.c b/monitor.c
index 593679a17a2fc62cddf33922c30062ac797ca17b..0565816910481ac4877e7175ea09f51de33a0d29 100644 (file)
--- a/monitor.c
+++ b/monitor.c
@@ -66,6 +66,7 @@
 #include "trace/simple.h"
 #endif
 #include "exec/memory.h"
+#include "exec/cpu_ldst.h"
 #include "qmp-commands.h"
 #include "hmp.h"
 #include "qemu/thread.h"

diff --git a/target-alpha/mem_helper.c b/target-alpha/mem_helper.c
index 7860c05e483746c8b17721e0cfd941bb63703070..fc4f57a64478d17863a8dedaff60782b00ec8908 100644 (file)
--- a/target-alpha/mem_helper.c
+++ b/target-alpha/mem_helper.c
@@ -19,7 +19,7 @@
 
 #include "cpu.h"
 #include "exec/helper-proto.h"
-
+#include "exec/cpu_ldst.h"
 
 /* Softmmu support */
 #ifndef CONFIG_USER_ONLY
@@ -131,8 +131,6 @@ void alpha_cpu_unassigned_access(CPUState *cs, hwaddr addr,
     dynamic_excp(env, 0, EXCP_MCHK, 0);
 }
 
-#include "exec/softmmu_exec.h"
-
 /* try to fill the TLB and return an exception if error. If retaddr is
    NULL, it means that the function was called in C code (i.e. not
    from generated code or from helper.c) */

diff --git a/target-alpha/translate.c b/target-alpha/translate.c
index e31d56c629f9c78273709c765de1890cf30bc5d8..cc81e774df5d77d500d1ea6f52e65bed75161a96 100644 (file)
--- a/target-alpha/translate.c
+++ b/target-alpha/translate.c
@@ -21,6 +21,7 @@
 #include "disas/disas.h"
 #include "qemu/host-utils.h"
 #include "tcg-op.h"
+#include "exec/cpu_ldst.h"
 
 #include "exec/helper-proto.h"
 #include "exec/helper-gen.h"

diff --git a/target-arm/arm_ldst.h b/target-arm/arm_ldst.h
index 007a7d7705f1c623fb2f61ba13858ad65a6a29ed..b1ece01731f56bfdab94d30fa120c23345e129e5 100644 (file)
--- a/target-arm/arm_ldst.h
+++ b/target-arm/arm_ldst.h
@@ -20,6 +20,7 @@
 #ifndef ARM_LDST_H
 #define ARM_LDST_H
 
+#include "exec/cpu_ldst.h"
 #include "qemu/bswap.h"
 
 /* Load an instruction and return it in the standard little-endian order */

diff --git a/target-arm/helper.c b/target-arm/helper.c
index 861baf5d7b7c8d50cc38cd495421acda80b48d73..95af6241265323cde87b8d644faa785fe696d1ec 100644 (file)
--- a/target-arm/helper.c
+++ b/target-arm/helper.c
@@ -7,12 +7,11 @@
 #include "sysemu/sysemu.h"
 #include "qemu/bitops.h"
 #include "qemu/crc32c.h"
+#include "exec/cpu_ldst.h"
 #include "arm_ldst.h"
 #include <zlib.h> /* For crc32 */
 
 #ifndef CONFIG_USER_ONLY
-#include "exec/softmmu_exec.h"
-
 static inline int get_phys_addr(CPUARMState *env, target_ulong address,
                                 int access_type, int is_user,
                                 hwaddr *phys_ptr, int *prot,

diff --git a/target-arm/op_helper.c b/target-arm/op_helper.c
index 41fd6f6fd0560faf8f2e70d06ee9261187385dd4..9c1ef525a3966ba82aaa645e68132e62fc9fa2b1 100644 (file)
--- a/target-arm/op_helper.c
+++ b/target-arm/op_helper.c
@@ -19,6 +19,7 @@
 #include "cpu.h"
 #include "exec/helper-proto.h"
 #include "internals.h"
+#include "exec/cpu_ldst.h"
 
 #define SIGNBIT (uint32_t)0x80000000
 #define SIGNBIT64 ((uint64_t)1 << 63)
@@ -56,8 +57,6 @@ uint32_t HELPER(neon_tbl)(CPUARMState *env, uint32_t ireg, uint32_t def,
 
 #if !defined(CONFIG_USER_ONLY)
 
-#include "exec/softmmu_exec.h"
-
 /* try to fill the TLB and return an exception if error. If retaddr is
  * NULL, it means that the function was called in C code (i.e. not
  * from generated code or from helper.c)

diff --git a/target-cris/helper.c b/target-cris/helper.c
index 4092d279ba8a685b87aba4dff78d0805a99ef1dc..e8b8261fe9e258254eec0c838b1954751e7d2e50 100644 (file)
--- a/target-cris/helper.c
+++ b/target-cris/helper.c
@@ -21,6 +21,7 @@
 #include "cpu.h"
 #include "mmu.h"
 #include "qemu/host-utils.h"
+#include "exec/cpu_ldst.h"
 
 
 //#define CRIS_HELPER_DEBUG

diff --git a/target-cris/op_helper.c b/target-cris/op_helper.c
index 0ce5f09fa9a1044eaf4a8a40c44cdf4f6e0590be..5c0c14d9928f5fb5a8e616f72ef1f8933e2cc03f 100644 (file)
--- a/target-cris/op_helper.c
+++ b/target-cris/op_helper.c
@@ -22,6 +22,7 @@
 #include "mmu.h"
 #include "exec/helper-proto.h"
 #include "qemu/host-utils.h"
+#include "exec/cpu_ldst.h"
 
 //#define CRIS_OP_HELPER_DEBUG
 
@@ -35,8 +36,6 @@
 #endif
 
 #if !defined(CONFIG_USER_ONLY)
-#include "exec/softmmu_exec.h"
-
 /* Try to fill the TLB and return an exception if error. If retaddr is
    NULL, it means that the function was called in C code (i.e. not
    from generated code or from helper.c) */

diff --git a/target-cris/translate.c b/target-cris/translate.c
index 90fe0a24b52c75edebaafe225b7174dcc39f15b0..f26c3236864d855abc9c6bc0be31012e613f6144 100644 (file)
--- a/target-cris/translate.c
+++ b/target-cris/translate.c
@@ -28,6 +28,7 @@
 #include "tcg-op.h"
 #include "exec/helper-proto.h"
 #include "mmu.h"
+#include "exec/cpu_ldst.h"
 #include "crisv32-decode.h"
 
 #include "exec/helper-gen.h"

diff --git a/target-i386/fpu_helper.c b/target-i386/fpu_helper.c
index a04e754e61cd5f35db219534045e58344187f82d..1b2900d5d2f0d07eb6aa10ef7d72d6b31bd84cc9 100644 (file)
--- a/target-i386/fpu_helper.c
+++ b/target-i386/fpu_helper.c
@@ -22,10 +22,7 @@
 #include "exec/helper-proto.h"
 #include "qemu/aes.h"
 #include "qemu/host-utils.h"
-
-#if !defined(CONFIG_USER_ONLY)
-#include "exec/softmmu_exec.h"
-#endif /* !defined(CONFIG_USER_ONLY) */
+#include "exec/cpu_ldst.h"
 
 #define FPU_RC_MASK         0xc00
 #define FPU_RC_NEAR         0x000

diff --git a/target-i386/mem_helper.c b/target-i386/mem_helper.c
index 16bc91bcb4651d77bbf42437b421e50ea884e2eb..1aec8a5f1914955ce096fde3ae09f4d46d74107d 100644 (file)
--- a/target-i386/mem_helper.c
+++ b/target-i386/mem_helper.c
@@ -19,10 +19,7 @@
 
 #include "cpu.h"
 #include "exec/helper-proto.h"
-
-#if !defined(CONFIG_USER_ONLY)
-#include "exec/softmmu_exec.h"
-#endif /* !defined(CONFIG_USER_ONLY) */
+#include "exec/cpu_ldst.h"
 
 /* broken thread support */
 

diff --git a/target-i386/misc_helper.c b/target-i386/misc_helper.c
index 9cfa25f9ec35165b9d51093d8a6aece3167c5c3f..4f1e30f1fd8f57909fb3f3dd2132a2e4153c8ffa 100644 (file)
--- a/target-i386/misc_helper.c
+++ b/target-i386/misc_helper.c
@@ -20,10 +20,7 @@
 #include "cpu.h"
 #include "exec/ioport.h"
 #include "exec/helper-proto.h"
-
-#if !defined(CONFIG_USER_ONLY)
-#include "exec/softmmu_exec.h"
-#endif /* !defined(CONFIG_USER_ONLY) */
+#include "exec/cpu_ldst.h"
 
 /* check if Port I/O is allowed in TSS */
 static inline void check_io(CPUX86State *env, int addr, int size)

diff --git a/target-i386/seg_helper.c b/target-i386/seg_helper.c
index 258aae806a739252687cc36c8b57357e801dd0a7..ba472154e8883f6d1e4b41958c709bc89a900b5e 100644 (file)
--- a/target-i386/seg_helper.c
+++ b/target-i386/seg_helper.c
@@ -21,13 +21,10 @@
 #include "cpu.h"
 #include "qemu/log.h"
 #include "exec/helper-proto.h"
+#include "exec/cpu_ldst.h"
 
 //#define DEBUG_PCALL
 
-#if !defined(CONFIG_USER_ONLY)
-#include "exec/softmmu_exec.h"
-#endif /* !defined(CONFIG_USER_ONLY) */
-
 #ifdef DEBUG_PCALL
 # define LOG_PCALL(...) qemu_log_mask(CPU_LOG_PCALL, ## __VA_ARGS__)
 # define LOG_PCALL_STATE(cpu)                                  \

diff --git a/target-i386/svm_helper.c b/target-i386/svm_helper.c
index 852e2baf5dcef2c098d4ba241bce6100e602380d..d250d18e27709ac48d595c0ca5480a3440156b30 100644 (file)
--- a/target-i386/svm_helper.c
+++ b/target-i386/svm_helper.c
@@ -20,10 +20,7 @@
 #include "cpu.h"
 #include "exec/cpu-all.h"
 #include "exec/helper-proto.h"
-
-#if !defined(CONFIG_USER_ONLY)
-#include "exec/softmmu_exec.h"
-#endif /* !defined(CONFIG_USER_ONLY) */
+#include "exec/cpu_ldst.h"
 
 /* Secure Virtual Machine helpers */
 

diff --git a/target-i386/translate.c b/target-i386/translate.c
index 3aa52eb795d9218b931e14a2dd4528c3bd1f3bd2..2359787b42b218960f6ebabea1daf02edc5d89c7 100644 (file)
--- a/target-i386/translate.c
+++ b/target-i386/translate.c
@@ -27,6 +27,7 @@
 #include "cpu.h"
 #include "disas/disas.h"
 #include "tcg-op.h"
+#include "exec/cpu_ldst.h"
 
 #include "exec/helper-proto.h"
 #include "exec/helper-gen.h"

diff --git a/target-lm32/op_helper.c b/target-lm32/op_helper.c
index c54de3e0e68826483ccd8b0285f3b0e96039e5ab..308742a74eadde8f475d0fdd6d98a17c6ec05c05 100644 (file)
--- a/target-lm32/op_helper.c
+++ b/target-lm32/op_helper.c
@@ -6,7 +6,7 @@
 #include "hw/lm32/lm32_pic.h"
 #include "hw/char/lm32_juart.h"
 
-#include "exec/softmmu_exec.h"
+#include "exec/cpu_ldst.h"
 
 #ifndef CONFIG_USER_ONLY
 #include "sysemu/sysemu.h"

diff --git a/target-lm32/translate.c b/target-lm32/translate.c
index 51eca06591275607559c7a0e9b01f07c4aff1eef..a51ade9a1566a45f32b02bc647061f6f2e40fb1e 100644 (file)
--- a/target-lm32/translate.c
+++ b/target-lm32/translate.c
@@ -22,6 +22,7 @@
 #include "exec/helper-proto.h"
 #include "tcg-op.h"
 
+#include "exec/cpu_ldst.h"
 #include "hw/lm32/lm32_pic.h"
 
 #include "exec/helper-gen.h"

diff --git a/target-m68k/op_helper.c b/target-m68k/op_helper.c
index e11990c539686337ef93a02955544c43efb43a2e..9dd3e74ab8c7e6e37c46bfc04a39833a5890b63f 100644 (file)
--- a/target-m68k/op_helper.c
+++ b/target-m68k/op_helper.c
@@ -18,6 +18,7 @@
  */
 #include "cpu.h"
 #include "exec/helper-proto.h"
+#include "exec/cpu_ldst.h"
 
 #if defined(CONFIG_USER_ONLY)
 
@@ -34,8 +35,6 @@ void do_interrupt_m68k_hardirq(CPUM68KState *env)
 
 extern int semihosting_enabled;
 
-#include "exec/softmmu_exec.h"
-
 /* Try to fill the TLB and return an exception if error. If retaddr is
    NULL, it means that the function was called in C code (i.e. not
    from generated code or from helper.c) */

diff --git a/target-m68k/translate.c b/target-m68k/translate.c
index fa248d96b53ffe3d9368726a2c143b3776a1b1b9..50df4d384411249770e753826b7858e191df4848 100644 (file)
--- a/target-m68k/translate.c
+++ b/target-m68k/translate.c
@@ -22,6 +22,7 @@
 #include "disas/disas.h"
 #include "tcg-op.h"
 #include "qemu/log.h"
+#include "exec/cpu_ldst.h"
 
 #include "exec/helper-proto.h"
 #include "exec/helper-gen.h"

diff --git a/target-microblaze/op_helper.c b/target-microblaze/op_helper.c
index 72c1bdf61d6e060e9652d8862e656e98d0eae57e..a4c8f047057bc99387938f0e0062028feddce663 100644 (file)
--- a/target-microblaze/op_helper.c
+++ b/target-microblaze/op_helper.c
@@ -22,11 +22,11 @@
 #include "cpu.h"
 #include "exec/helper-proto.h"
 #include "qemu/host-utils.h"
+#include "exec/cpu_ldst.h"
 
 #define D(x)
 
 #if !defined(CONFIG_USER_ONLY)
-#include "exec/softmmu_exec.h"
 
 /* Try to fill the TLB and return an exception if error. If retaddr is
  * NULL, it means that the function was called in C code (i.e. not

diff --git a/target-microblaze/translate.c b/target-microblaze/translate.c
index 488df2d60d533c589dc1caac9589685e2cf094ac..c422bdc71894202acd83979c460f9dc20e503e45 100644 (file)
--- a/target-microblaze/translate.c
+++ b/target-microblaze/translate.c
@@ -23,6 +23,7 @@
 #include "tcg-op.h"
 #include "exec/helper-proto.h"
 #include "microblaze-decode.h"
+#include "exec/cpu_ldst.h"
 #include "exec/helper-gen.h"
 
 #define SIM_COMPAT 0

diff --git a/target-mips/op_helper.c b/target-mips/op_helper.c
index f1ec18b0b39cf2fe37e6ac4387f58681c794e3e0..4704216834c2174b39615dc6848b257e7440736f 100644 (file)
--- a/target-mips/op_helper.c
+++ b/target-mips/op_helper.c
@@ -19,12 +19,8 @@
 #include <stdlib.h>
 #include "cpu.h"
 #include "qemu/host-utils.h"
-
 #include "exec/helper-proto.h"
-
-#if !defined(CONFIG_USER_ONLY)
-#include "exec/softmmu_exec.h"
-#endif /* !defined(CONFIG_USER_ONLY) */
+#include "exec/cpu_ldst.h"
 
 #ifndef CONFIG_USER_ONLY
 static inline void cpu_mips_tlb_flush (CPUMIPSState *env, int flush_global);

diff --git a/target-mips/translate.c b/target-mips/translate.c
index 13cf29b9d9130dabacc3c04fa188ab1648189d5a..76deb7b138c84d34e2f61fda8516dfcdaa62e297 100644 (file)
--- a/target-mips/translate.c
+++ b/target-mips/translate.c
@@ -24,6 +24,7 @@
 #include "cpu.h"
 #include "disas/disas.h"
 #include "tcg-op.h"
+#include "exec/cpu_ldst.h"
 
 #include "exec/helper-proto.h"
 #include "exec/helper-gen.h"

diff --git a/target-moxie/helper.c b/target-moxie/helper.c
index 481a33039cc0a5009839541d6fa83ae577244be1..6c98965b93201806d82d61ba088a44730339504d 100644 (file)
--- a/target-moxie/helper.c
+++ b/target-moxie/helper.c
@@ -25,7 +25,7 @@
 #include "cpu.h"
 #include "mmu.h"
 #include "exec/exec-all.h"
-#include "exec/softmmu_exec.h"
+#include "exec/cpu_ldst.h"
 #include "qemu/host-utils.h"
 #include "exec/helper-proto.h"
 

diff --git a/target-moxie/translate.c b/target-moxie/translate.c
index 7f0dfb66f258b24bd1e0b326c0f1026b137109b6..4541b9bff4ce13bfb61aa0d440951e25ba5890bf 100644 (file)
--- a/target-moxie/translate.c
+++ b/target-moxie/translate.c
@@ -32,6 +32,7 @@
 #include "exec/exec-all.h"
 #include "disas/disas.h"
 #include "tcg-op.h"
+#include "exec/cpu_ldst.h"
 
 #include "exec/helper-proto.h"
 #include "exec/helper-gen.h"

diff --git a/target-openrisc/mmu_helper.c b/target-openrisc/mmu_helper.c
index 526363435b45084ec916dc804fd5421affa80112..ee1c6f61184f561637b2a6b9a053378f7d78a0a1 100644 (file)
--- a/target-openrisc/mmu_helper.c
+++ b/target-openrisc/mmu_helper.c
@@ -19,9 +19,9 @@
  */
 
 #include "cpu.h"
+#include "exec/cpu_ldst.h"
 
 #ifndef CONFIG_USER_ONLY
-#include "exec/softmmu_exec.h"
 
 void tlb_fill(CPUState *cs, target_ulong addr, int is_write,
               int mmu_idx, uintptr_t retaddr)

diff --git a/target-openrisc/translate.c b/target-openrisc/translate.c
index 40084f9a527b44809f2176f8b01224e4e56e4a20..b728718b641f451900cc9ac3640d78bb00779839 100644 (file)
--- a/target-openrisc/translate.c
+++ b/target-openrisc/translate.c
@@ -26,6 +26,7 @@
 #include "qemu/log.h"
 #include "config.h"
 #include "qemu/bitops.h"
+#include "exec/cpu_ldst.h"
 
 #include "exec/helper-proto.h"
 #include "exec/helper-gen.h"

diff --git a/target-ppc/excp_helper.c b/target-ppc/excp_helper.c
index a0c9fdc84b27b4d69965baaeeb0d78d208703f18..7dfc52d1598da26fb235cd70f6f975ffe1470002 100644 (file)
--- a/target-ppc/excp_helper.c
+++ b/target-ppc/excp_helper.c
@@ -18,6 +18,7 @@
  */
 #include "cpu.h"
 #include "exec/helper-proto.h"
+#include "exec/cpu_ldst.h"
 
 #include "helper_regs.h"
 

diff --git a/target-ppc/mem_helper.c b/target-ppc/mem_helper.c
index d9c8c367120890c1fd55e16649035ee0653ffc86..02b627e47b08a6642f198c9df83a25d41ff54258 100644 (file)
--- a/target-ppc/mem_helper.c
+++ b/target-ppc/mem_helper.c
@@ -21,10 +21,7 @@
 #include "exec/helper-proto.h"
 
 #include "helper_regs.h"
-
-#if !defined(CONFIG_USER_ONLY)
-#include "exec/softmmu_exec.h"
-#endif /* !defined(CONFIG_USER_ONLY) */
+#include "exec/cpu_ldst.h"
 
 //#define DEBUG_OP
 

diff --git a/target-ppc/mmu_helper.c b/target-ppc/mmu_helper.c
index 1875636621ace447addd5a496cc9382ef6f6a775..f029f41965a83d7b0aa3f08a74877cb5060c91de 100644 (file)
--- a/target-ppc/mmu_helper.c
+++ b/target-ppc/mmu_helper.c
@@ -22,6 +22,7 @@
 #include "kvm_ppc.h"
 #include "mmu-hash64.h"
 #include "mmu-hash32.h"
+#include "exec/cpu_ldst.h"
 
 //#define DEBUG_MMU
 //#define DEBUG_BATS
@@ -2903,8 +2904,6 @@ void helper_booke206_tlbflush(CPUPPCState *env, uint32_t type)
 
 /*****************************************************************************/
 
-#include "exec/softmmu_exec.h"
-
 /* try to fill the TLB and return an exception if error. If retaddr is
    NULL, it means that the function was called in C code (i.e. not
    from generated code or from helper.c) */

diff --git a/target-ppc/translate.c b/target-ppc/translate.c
index 6283b2c36c6c2ceec6f65edd89490136a566bb8a..f08901470b11453160d749885d5a396a063d6625 100644 (file)
--- a/target-ppc/translate.c
+++ b/target-ppc/translate.c
@@ -22,6 +22,7 @@
 #include "disas/disas.h"
 #include "tcg-op.h"
 #include "qemu/host-utils.h"
+#include "exec/cpu_ldst.h"
 
 #include "exec/helper-proto.h"
 #include "exec/helper-gen.h"

diff --git a/target-s390x/fpu_helper.c b/target-s390x/fpu_helper.c
index d879ad63a16b9df31adce57e3aecb76c567398b5..b946ec1d5143c4e198b74f41c5e1644c7d2ffba1 100644 (file)
--- a/target-s390x/fpu_helper.c
+++ b/target-s390x/fpu_helper.c
@@ -19,12 +19,9 @@
  */
 
 #include "cpu.h"
+#include "exec/cpu_ldst.h"
 #include "exec/helper-proto.h"
 
-#if !defined(CONFIG_USER_ONLY)
-#include "exec/softmmu_exec.h"
-#endif
-
 /* #define DEBUG_HELPER */
 #ifdef DEBUG_HELPER
 #define HELPER_LOG(x...) qemu_log(x)

diff --git a/target-s390x/helper.c b/target-s390x/helper.c
index 3d756cae6ceba7bf87ea553bffb2cb5f8bba12c4..67ab1065aa45d4eac3b352931e61280cb44a08e8 100644 (file)
--- a/target-s390x/helper.c
+++ b/target-s390x/helper.c
@@ -21,6 +21,7 @@
 #include "cpu.h"
 #include "exec/gdbstub.h"
 #include "qemu/timer.h"
+#include "exec/cpu_ldst.h"
 #ifndef CONFIG_USER_ONLY
 #include "sysemu/sysemu.h"
 #endif

diff --git a/target-s390x/mem_helper.c b/target-s390x/mem_helper.c
index 3a0376ead30206a1dd5be224b965cefd8033d597..5a55de86a13e469f4b64b6f8b77a216492f5f786 100644 (file)
--- a/target-s390x/mem_helper.c
+++ b/target-s390x/mem_helper.c
@@ -20,11 +20,11 @@
 
 #include "cpu.h"
 #include "exec/helper-proto.h"
+#include "exec/cpu_ldst.h"
 
 /*****************************************************************************/
 /* Softmmu support */
 #if !defined(CONFIG_USER_ONLY)
-#include "exec/softmmu_exec.h"
 
 /* try to fill the TLB and return an exception if error. If retaddr is
    NULL, it means that the function was called in C code (i.e. not

diff --git a/target-s390x/misc_helper.c b/target-s390x/misc_helper.c
index 44c08f370d6aac58adf9f51eab628caddf1f0a57..9dae0256fac1d04b42ed63ccc0a3cd3114b365df 100644 (file)
--- a/target-s390x/misc_helper.c
+++ b/target-s390x/misc_helper.c
@@ -28,9 +28,9 @@
 #ifdef CONFIG_KVM
 #include <linux/kvm.h>
 #endif
+#include "exec/cpu_ldst.h"
 
 #if !defined(CONFIG_USER_ONLY)
-#include "exec/softmmu_exec.h"
 #include "sysemu/cpus.h"
 #include "sysemu/sysemu.h"
 #include "hw/s390x/ebcdic.h"

diff --git a/target-s390x/translate.c b/target-s390x/translate.c
index cf65f01f60626403b841fb2288fe40674794f707..8ca4824d60992bcae766fef4f24480e52f4dab41 100644 (file)
--- a/target-s390x/translate.c
+++ b/target-s390x/translate.c
@@ -33,6 +33,7 @@
 #include "tcg-op.h"
 #include "qemu/log.h"
 #include "qemu/host-utils.h"
+#include "exec/cpu_ldst.h"
 
 /* global register indexes */
 static TCGv_ptr cpu_env;

diff --git a/target-sh4/op_helper.c b/target-sh4/op_helper.c
index ddd4186c7bf71ee9ff3ef40339664e05e2a479fc..74a5c4ea779532734b5f821c8377d05ba75e8bc7 100644 (file)
--- a/target-sh4/op_helper.c
+++ b/target-sh4/op_helper.c
@@ -20,9 +20,9 @@
 #include <stdlib.h>
 #include "cpu.h"
 #include "exec/helper-proto.h"
+#include "exec/cpu_ldst.h"
 
 #ifndef CONFIG_USER_ONLY
-#include "exec/softmmu_exec.h"
 
 void tlb_fill(CPUState *cs, target_ulong addr, int is_write, int mmu_idx,
               uintptr_t retaddr)

diff --git a/target-sh4/translate.c b/target-sh4/translate.c
index 169c87fc1b02ecb256e4a04b12c1d5ea437fedb5..8126818142099e9fa8e4e42173fd8d7fd83d2638 100644 (file)
--- a/target-sh4/translate.c
+++ b/target-sh4/translate.c
@@ -23,6 +23,7 @@
 #include "cpu.h"
 #include "disas/disas.h"
 #include "tcg-op.h"
+#include "exec/cpu_ldst.h"
 
 #include "exec/helper-proto.h"
 #include "exec/helper-gen.h"

diff --git a/target-sparc/ldst_helper.c b/target-sparc/ldst_helper.c
index 0843c77244e92b6edf061f5bd780f77fc3ab5d09..03bd9f970652ea1de75979b381a38a238ea11071 100644 (file)
--- a/target-sparc/ldst_helper.c
+++ b/target-sparc/ldst_helper.c
@@ -19,6 +19,7 @@
 
 #include "cpu.h"
 #include "exec/helper-proto.h"
+#include "exec/cpu_ldst.h"
 
 //#define DEBUG_MMU
 //#define DEBUG_MXCC
@@ -64,10 +65,6 @@
 #define QT0 (env->qt0)
 #define QT1 (env->qt1)
 
-#if !defined(CONFIG_USER_ONLY)
-#include "exec/softmmu_exec.h"
-#endif
-
 #if defined(TARGET_SPARC64) && !defined(CONFIG_USER_ONLY)
 /* Calculates TSB pointer value for fault page size 8k or 64k */
 static uint64_t ultrasparc_tsb_pointer(uint64_t tsb_register,

diff --git a/target-sparc/translate.c b/target-sparc/translate.c
index 652a181763e24586729f89987e6edd936eedf8a1..1ab07a18a2b5313d3c9a5b861024b306d2b0a49a 100644 (file)
--- a/target-sparc/translate.c
+++ b/target-sparc/translate.c
@@ -28,6 +28,7 @@
 #include "disas/disas.h"
 #include "exec/helper-proto.h"
 #include "tcg-op.h"
+#include "exec/cpu_ldst.h"
 
 #include "exec/helper-gen.h"
 

diff --git a/target-unicore32/op_helper.c b/target-unicore32/op_helper.c
index a369ac6464a75ef5c10b0188d5f0ee97b259aca4..0266dbdf7b9caacb9f51da8eca8d0c328182ecf8 100644 (file)
--- a/target-unicore32/op_helper.c
+++ b/target-unicore32/op_helper.c
@@ -10,6 +10,7 @@
  */
 #include "cpu.h"
 #include "exec/helper-proto.h"
+#include "exec/cpu_ldst.h"
 
 #define SIGNBIT (uint32_t)0x80000000
 #define SIGNBIT64 ((uint64_t)1 << 63)
@@ -241,8 +242,6 @@ uint32_t HELPER(ror_cc)(CPUUniCore32State *env, uint32_t x, uint32_t i)
 }
 
 #ifndef CONFIG_USER_ONLY
-#include "exec/softmmu_exec.h"
-
 void tlb_fill(CPUState *cs, target_ulong addr, int is_write,
               int mmu_idx, uintptr_t retaddr)
 {

diff --git a/target-unicore32/translate.c b/target-unicore32/translate.c
index 3cccafe5ad9f0e97a9867290153dc69db6680a9d..5a8c7c89eebc840848e6d1cda18b9318787f2b1c 100644 (file)
--- a/target-unicore32/translate.c
+++ b/target-unicore32/translate.c
@@ -18,6 +18,7 @@
 #include "disas/disas.h"
 #include "tcg-op.h"
 #include "qemu/log.h"
+#include "exec/cpu_ldst.h"
 
 #include "exec/helper-proto.h"
 #include "exec/helper-gen.h"

diff --git a/target-xtensa/op_helper.c b/target-xtensa/op_helper.c
index a772295109e9b485a63dd9633f65df4db05bd8b1..dae13866efb16a9ef64fd2ea743bcf46bf2a1b4d 100644 (file)
--- a/target-xtensa/op_helper.c
+++ b/target-xtensa/op_helper.c
@@ -28,7 +28,7 @@
 #include "cpu.h"
 #include "exec/helper-proto.h"
 #include "qemu/host-utils.h"
-#include "exec/softmmu_exec.h"
+#include "exec/cpu_ldst.h"
 #include "exec/address-spaces.h"
 #include "qemu/timer.h"
 

diff --git a/target-xtensa/translate.c b/target-xtensa/translate.c
index 57e56bd34dcb20b530448534dff859ffa9fe5d95..2f22cce845068e68b4659c12ffdca73f76c5a068 100644 (file)
--- a/target-xtensa/translate.c
+++ b/target-xtensa/translate.c
@@ -36,6 +36,7 @@
 #include "tcg-op.h"
 #include "qemu/log.h"
 #include "sysemu/sysemu.h"
+#include "exec/cpu_ldst.h"
 
 #include "exec/helper-proto.h"
 #include "exec/helper-gen.h"

diff --git a/tci.c b/tci.c
index 6523ab82f4de5d33c8d1adbb73139f5fa85ffe57..0acf1a177e9739ee69af958cd2c910f68a65b037 100644 (file)
--- a/tci.c
+++ b/tci.c
@@ -26,6 +26,7 @@
 
 #include "qemu-common.h"
 #include "exec/exec-all.h"           /* MAX_OPC_PARAM_IARGS */
+#include "exec/cpu_ldst.h"
 #include "tcg-op.h"
 
 /* Marker for missing code. */

diff --git a/user-exec.c b/user-exec.c
index 8ed6fec81472d8cb17662bc3958e5883bdebed8d..1ff8673acbd17e10715bf5b8ca749f8eda01c9d4 100644 (file)
--- a/user-exec.c
+++ b/user-exec.c
@@ -21,6 +21,7 @@
 #include "disas/disas.h"
 #include "tcg.h"
 #include "qemu/bitops.h"
+#include "exec/cpu_ldst.h"
 
 #undef EAX
 #undef ECX