aboutsummaryrefslogtreecommitdiff
path: root/target/hexagon
diff options
context:
space:
mode:
authorTaylor Simpson <tsimpson@quicinc.com>2021-07-13 10:51:33 -0500
committerTaylor Simpson <tsimpson@quicinc.com>2021-07-21 15:53:09 -0500
commit4699a9277932a0e5b5a22ffed18a753c51a0f3cb (patch)
tree7b441aaab9de5d03b9aadf94eafe4f8546854a30 /target/hexagon
parent7457b407edd6e8555e4b46488aab2f13959fccf8 (diff)
downloadqemu-4699a9277932a0e5b5a22ffed18a753c51a0f3cb.zip
qemu-4699a9277932a0e5b5a22ffed18a753c51a0f3cb.tar.gz
qemu-4699a9277932a0e5b5a22ffed18a753c51a0f3cb.tar.bz2
Hexagon (target/hexagon) remove put_user_*/get_user_*
Replace put_user_* with cpu_st*_data_ra Replace get_user_* with cpu_ld*_data_ra Suggested-by: Richard Henderson <richard.henderson@linaro.org> Reviewed-by: Richard Henderson <richard.henderson@linaro.org> Signed-off-by: Taylor Simpson <tsimpson@quicinc.com> Message-Id: <1626384156-6248-2-git-send-email-tsimpson@quicinc.com>
Diffstat (limited to 'target/hexagon')
-rw-r--r--target/hexagon/op_helper.c39
1 files changed, 18 insertions, 21 deletions
diff --git a/target/hexagon/op_helper.c b/target/hexagon/op_helper.c
index 4595559..a959dba 100644
--- a/target/hexagon/op_helper.c
+++ b/target/hexagon/op_helper.c
@@ -17,6 +17,7 @@
#include "qemu/osdep.h"
#include "qemu.h"
+#include "exec/cpu_ldst.h"
#include "exec/helper-proto.h"
#include "fpu/softfloat.h"
#include "cpu.h"
@@ -140,22 +141,22 @@ void HELPER(debug_check_store_width)(CPUHexagonState *env, int slot, int check)
void HELPER(commit_store)(CPUHexagonState *env, int slot_num)
{
- switch (env->mem_log_stores[slot_num].width) {
+ uintptr_t ra = GETPC();
+ uint8_t width = env->mem_log_stores[slot_num].width;
+ target_ulong va = env->mem_log_stores[slot_num].va;
+
+ switch (width) {
case 1:
- put_user_u8(env->mem_log_stores[slot_num].data32,
- env->mem_log_stores[slot_num].va);
+ cpu_stb_data_ra(env, va, env->mem_log_stores[slot_num].data32, ra);
break;
case 2:
- put_user_u16(env->mem_log_stores[slot_num].data32,
- env->mem_log_stores[slot_num].va);
+ cpu_stw_data_ra(env, va, env->mem_log_stores[slot_num].data32, ra);
break;
case 4:
- put_user_u32(env->mem_log_stores[slot_num].data32,
- env->mem_log_stores[slot_num].va);
+ cpu_stl_data_ra(env, va, env->mem_log_stores[slot_num].data32, ra);
break;
case 8:
- put_user_u64(env->mem_log_stores[slot_num].data64,
- env->mem_log_stores[slot_num].va);
+ cpu_stq_data_ra(env, va, env->mem_log_stores[slot_num].data64, ra);
break;
default:
g_assert_not_reached();
@@ -393,37 +394,33 @@ static void check_noshuf(CPUHexagonState *env, uint32_t slot)
static uint8_t mem_load1(CPUHexagonState *env, uint32_t slot,
target_ulong vaddr)
{
- uint8_t retval;
+ uintptr_t ra = GETPC();
check_noshuf(env, slot);
- get_user_u8(retval, vaddr);
- return retval;
+ return cpu_ldub_data_ra(env, vaddr, ra);
}
static uint16_t mem_load2(CPUHexagonState *env, uint32_t slot,
target_ulong vaddr)
{
- uint16_t retval;
+ uintptr_t ra = GETPC();
check_noshuf(env, slot);
- get_user_u16(retval, vaddr);
- return retval;
+ return cpu_lduw_data_ra(env, vaddr, ra);
}
static uint32_t mem_load4(CPUHexagonState *env, uint32_t slot,
target_ulong vaddr)
{
- uint32_t retval;
+ uintptr_t ra = GETPC();
check_noshuf(env, slot);
- get_user_u32(retval, vaddr);
- return retval;
+ return cpu_ldl_data_ra(env, vaddr, ra);
}
static uint64_t mem_load8(CPUHexagonState *env, uint32_t slot,
target_ulong vaddr)
{
- uint64_t retval;
+ uintptr_t ra = GETPC();
check_noshuf(env, slot);
- get_user_u64(retval, vaddr);
- return retval;
+ return cpu_ldq_data_ra(env, vaddr, ra);
}
/* Floating point */