diff options
| author | Paolo Bonzini | 2014-03-28 19:42:10 +0100 |
|---|---|---|
| committer | Paolo Bonzini | 2014-06-05 16:10:33 +0200 |
| commit | f08b617018e424134a0a012b08253d567c62f7ee (patch) | |
| tree | 1f72a2dae3031c4d06bc301c8413c524ca24ef07 /target-i386 | |
| parent | target-arm: move arm_*_code to a separate file (diff) | |
| download | qemu-f08b617018e424134a0a012b08253d567c62f7ee.tar.gz qemu-f08b617018e424134a0a012b08253d567c62f7ee.tar.xz qemu-f08b617018e424134a0a012b08253d567c62f7ee.zip | |
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>
Diffstat (limited to 'target-i386')
| -rw-r--r-- | target-i386/fpu_helper.c | 5 | ||||
| -rw-r--r-- | target-i386/mem_helper.c | 5 | ||||
| -rw-r--r-- | target-i386/misc_helper.c | 5 | ||||
| -rw-r--r-- | target-i386/seg_helper.c | 5 | ||||
| -rw-r--r-- | target-i386/svm_helper.c | 5 | ||||
| -rw-r--r-- | target-i386/translate.c | 1 |
6 files changed, 6 insertions, 20 deletions
diff --git a/target-i386/fpu_helper.c b/target-i386/fpu_helper.c index a04e754e61..1b2900d5d2 100644 --- 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 16bc91bcb4..1aec8a5f19 100644 --- 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 9cfa25f9ec..4f1e30f1fd 100644 --- 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 258aae806a..ba472154e8 100644 --- 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 852e2baf5d..d250d18e27 100644 --- 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 3aa52eb795..2359787b42 100644 --- 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" |