diff options
| author | Paolo Bonzini <pbonzini@redhat.com> | 2014-03-28 19:42:10 +0100 |
|---|---|---|
| committer | Paolo Bonzini <pbonzini@redhat.com> | 2014-06-05 16:10:33 +0200 |
| commit | f08b617018e424134a0a012b08253d567c62f7ee (patch) | |
| tree | 1f72a2dae3031c4d06bc301c8413c524ca24ef07 /target-arm | |
| parent | 1d854765dfdf9649c129af6d27e308fc638ede58 (diff) | |
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-arm')
| -rw-r--r-- | target-arm/arm_ldst.h | 1 | ||||
| -rw-r--r-- | target-arm/helper.c | 3 | ||||
| -rw-r--r-- | target-arm/op_helper.c | 3 |
3 files changed, 3 insertions, 4 deletions
diff --git a/target-arm/arm_ldst.h b/target-arm/arm_ldst.h index 007a7d7705..b1ece01731 100644 --- 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 861baf5d7b..95af624126 100644 --- 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 41fd6f6fd0..9c1ef525a3 100644 --- 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) |