diff options
| author | Blue Swirl <blauwirbel@gmail.com> | 2011-07-04 20:34:28 +0000 |
|---|---|---|
| committer | Blue Swirl <blauwirbel@gmail.com> | 2012-03-18 12:22:00 +0000 |
| commit | fe8d8f0f1c3ed0f5e84edffbbc8fcdf3b7da589b (patch) | |
| tree | cfca47af264c78b35cce720ff37e2c2bcccbf0f1 /target-sparc/op_helper.c | |
| parent | 57d585f7d14fefc8ebf2b29b2b5a955bec77b5da (diff) | |
Sparc: avoid AREG0 for memory access helpers
Make memory access helpers take a parameter for CPUState instead
of relying on global env. Introduce wrappers for load and store ops.
Signed-off-by: Blue Swirl <blauwirbel@gmail.com>
Diffstat (limited to 'target-sparc/op_helper.c')
| -rw-r--r-- | target-sparc/op_helper.c | 102 |
1 files changed, 101 insertions, 1 deletions
diff --git a/target-sparc/op_helper.c b/target-sparc/op_helper.c index 1aff12516e..b7171d8b94 100644 --- a/target-sparc/op_helper.c +++ b/target-sparc/op_helper.c @@ -3,6 +3,7 @@ #include "helper.h" #if !defined(CONFIG_USER_ONLY) +#include "softmmu_exec.h" static void do_unaligned_access(target_ulong addr, int is_write, int is_user, void *retaddr); @@ -71,4 +72,103 @@ void tlb_fill(CPUSPARCState *env1, target_ulong addr, int is_write, int mmu_idx, env = saved_env; } -#endif /* !CONFIG_USER_ONLY */ +#define WRAP_LD(rettype, fn) \ + rettype cpu_ ## fn (CPUSPARCState *env1, target_ulong addr) \ + { \ + CPUSPARCState *saved_env; \ + rettype ret; \ + \ + saved_env = env; \ + env = env1; \ + ret = fn(addr); \ + env = saved_env; \ + return ret; \ + } + +WRAP_LD(uint32_t, ldub_kernel) +WRAP_LD(uint32_t, lduw_kernel) +WRAP_LD(uint32_t, ldl_kernel) +WRAP_LD(uint64_t, ldq_kernel) + +WRAP_LD(uint32_t, ldub_user) +WRAP_LD(uint32_t, lduw_user) +WRAP_LD(uint32_t, ldl_user) +WRAP_LD(uint64_t, ldq_user) + +WRAP_LD(uint64_t, ldfq_kernel) +WRAP_LD(uint64_t, ldfq_user) +#ifdef TARGET_SPARC64 +WRAP_LD(uint32_t, ldub_hypv) +WRAP_LD(uint32_t, lduw_hypv) +WRAP_LD(uint32_t, ldl_hypv) +WRAP_LD(uint64_t, ldq_hypv) + +WRAP_LD(uint64_t, ldfq_hypv) + +WRAP_LD(uint32_t, ldub_nucleus) +WRAP_LD(uint32_t, lduw_nucleus) +WRAP_LD(uint32_t, ldl_nucleus) +WRAP_LD(uint64_t, ldq_nucleus) + +WRAP_LD(uint32_t, ldub_kernel_secondary) +WRAP_LD(uint32_t, lduw_kernel_secondary) +WRAP_LD(uint32_t, ldl_kernel_secondary) +WRAP_LD(uint64_t, ldq_kernel_secondary) + +WRAP_LD(uint32_t, ldub_user_secondary) +WRAP_LD(uint32_t, lduw_user_secondary) +WRAP_LD(uint32_t, ldl_user_secondary) +WRAP_LD(uint64_t, ldq_user_secondary) +#endif +#undef WRAP_LD + +#define WRAP_ST(datatype, fn) \ + void cpu_ ## fn (CPUSPARCState *env1, target_ulong addr, datatype val) \ + { \ + CPUSPARCState *saved_env; \ + \ + saved_env = env; \ + env = env1; \ + fn(addr, val); \ + env = saved_env; \ + } + +WRAP_ST(uint32_t, stb_kernel) +WRAP_ST(uint32_t, stw_kernel) +WRAP_ST(uint32_t, stl_kernel) +WRAP_ST(uint64_t, stq_kernel) + +WRAP_ST(uint32_t, stb_user) +WRAP_ST(uint32_t, stw_user) +WRAP_ST(uint32_t, stl_user) +WRAP_ST(uint64_t, stq_user) + +WRAP_ST(uint64_t, stfq_kernel) +WRAP_ST(uint64_t, stfq_user) + +#ifdef TARGET_SPARC64 +WRAP_ST(uint32_t, stb_hypv) +WRAP_ST(uint32_t, stw_hypv) +WRAP_ST(uint32_t, stl_hypv) +WRAP_ST(uint64_t, stq_hypv) + +WRAP_ST(uint64_t, stfq_hypv) + +WRAP_ST(uint32_t, stb_nucleus) +WRAP_ST(uint32_t, stw_nucleus) +WRAP_ST(uint32_t, stl_nucleus) +WRAP_ST(uint64_t, stq_nucleus) + +WRAP_ST(uint32_t, stb_kernel_secondary) +WRAP_ST(uint32_t, stw_kernel_secondary) +WRAP_ST(uint32_t, stl_kernel_secondary) +WRAP_ST(uint64_t, stq_kernel_secondary) + +WRAP_ST(uint32_t, stb_user_secondary) +WRAP_ST(uint32_t, stw_user_secondary) +WRAP_ST(uint32_t, stl_user_secondary) +WRAP_ST(uint64_t, stq_user_secondary) +#endif + +#undef WRAP_ST +#endif |