[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v2 14/55] target/sh4: Implement do_unaligned_access for user-only
From: |
Richard Henderson |
Subject: |
[PATCH v2 14/55] target/sh4: Implement do_unaligned_access for user-only |
Date: |
Mon, 2 Aug 2021 18:14:02 -1000 |
Cc: Yoshinori Sato <ysato@users.sourceforge.jp>
Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
---
linux-user/sh4/cpu_loop.c | 8 ++++++++
target/sh4/cpu.c | 2 +-
target/sh4/op_helper.c | 3 ---
3 files changed, 9 insertions(+), 4 deletions(-)
diff --git a/linux-user/sh4/cpu_loop.c b/linux-user/sh4/cpu_loop.c
index 222ed1c670..21d97250a8 100644
--- a/linux-user/sh4/cpu_loop.c
+++ b/linux-user/sh4/cpu_loop.c
@@ -71,6 +71,14 @@ void cpu_loop(CPUSH4State *env)
info._sifields._sigfault._addr = env->tea;
queue_signal(env, info.si_signo, QEMU_SI_FAULT, &info);
break;
+ case 0xe0:
+ case 0x100:
+ info.si_signo = TARGET_SIGBUS;
+ info.si_errno = 0;
+ info.si_code = TARGET_BUS_ADRALN;
+ info._sifields._sigfault._addr = env->tea;
+ queue_signal(env, info.si_signo, QEMU_SI_FAULT, &info);
+ break;
case EXCP_ATOMIC:
cpu_exec_step_atomic(cs);
arch_interrupt = false;
diff --git a/target/sh4/cpu.c b/target/sh4/cpu.c
index 8326922942..b60234cd31 100644
--- a/target/sh4/cpu.c
+++ b/target/sh4/cpu.c
@@ -238,10 +238,10 @@ static const struct TCGCPUOps superh_tcg_ops = {
.synchronize_from_tb = superh_cpu_synchronize_from_tb,
.cpu_exec_interrupt = superh_cpu_exec_interrupt,
.tlb_fill = superh_cpu_tlb_fill,
+ .do_unaligned_access = superh_cpu_do_unaligned_access,
#ifndef CONFIG_USER_ONLY
.do_interrupt = superh_cpu_do_interrupt,
- .do_unaligned_access = superh_cpu_do_unaligned_access,
.io_recompile_replay_branch = superh_io_recompile_replay_branch,
#endif /* !CONFIG_USER_ONLY */
};
diff --git a/target/sh4/op_helper.c b/target/sh4/op_helper.c
index d6d70c339f..b46fc1bf11 100644
--- a/target/sh4/op_helper.c
+++ b/target/sh4/op_helper.c
@@ -23,7 +23,6 @@
#include "exec/cpu_ldst.h"
#include "fpu/softfloat.h"
-#ifndef CONFIG_USER_ONLY
void superh_cpu_do_unaligned_access(CPUState *cs, vaddr addr,
MMUAccessType access_type,
@@ -46,8 +45,6 @@ void superh_cpu_do_unaligned_access(CPUState *cs, vaddr addr,
cpu_loop_exit_restore(cs, retaddr);
}
-#endif
-
void helper_ldtlb(CPUSH4State *env)
{
#ifdef CONFIG_USER_ONLY
--
2.25.1
- Re: [PATCH v2 05/55] target/hppa: Implement do_unaligned_access for user-only, (continued)
- [PATCH v2 06/55] target/microblaze: Do not set MO_ALIGN for user-only, Richard Henderson, 2021/08/03
- [PATCH v2 07/55] target/mips: Implement do_unaligned_access for user-only, Richard Henderson, 2021/08/03
- [PATCH v2 08/55] target/ppc: Move SPR_DSISR setting to powerpc_excp, Richard Henderson, 2021/08/03
- [PATCH v2 10/55] target/ppc: Implement do_unaligned_access for user-only, Richard Henderson, 2021/08/03
- [PATCH v2 11/55] target/riscv: Implement do_unaligned_access for user-only, Richard Henderson, 2021/08/03
- [PATCH v2 09/55] target/ppc: Set fault address in ppc_cpu_do_unaligned_access, Richard Henderson, 2021/08/03
- [PATCH v2 13/55] target/sh4: Set fault address in superh_cpu_do_unaligned_access, Richard Henderson, 2021/08/03
- [PATCH v2 14/55] target/sh4: Implement do_unaligned_access for user-only,
Richard Henderson <=
- [PATCH v2 16/55] target/sparc: Split out build_sfsr, Richard Henderson, 2021/08/03
- [PATCH v2 12/55] target/s390x: Implement do_unaligned_access for user-only, Richard Henderson, 2021/08/03
- [PATCH v2 15/55] target/sparc: Remove DEBUG_UNALIGNED, Richard Henderson, 2021/08/03
- [PATCH v2 17/55] target/sparc: Set fault address in sparc_cpu_do_unaligned_access, Richard Henderson, 2021/08/03
- [PATCH v2 18/55] target/sparc: Implement do_unaligned_access for user-only, Richard Henderson, 2021/08/03