SYS-OSS/FRET-qemu
4
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

target/m68k: Make m68k_cpu_tlb_fill sysemu only

Browse Source 
The fallback code in cpu_loop_exit_sigsegv is sufficient
for m68k linux-user.

Remove the code from cpu_loop that handled EXCP_ACCESS.

Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
This commit is contained in:
Richard Henderson 2021-09-14 16:56:32 -07:00
parent f74bd157c6
commit 028772c45c
3 changed files with 2 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
linux-user/m68k/cpu_loop.c
View File

@ -90,16 +90,6 @@ void cpu_loop(CPUM68KState *env)
case EXCP_INTERRUPT: case EXCP_INTERRUPT:
/* just indicate that signals should be handled asap */ /* just indicate that signals should be handled asap */
break; break;
case EXCP_ACCESS:
{
info.si_signo = TARGET_SIGSEGV;
info.si_errno = 0;
/* XXX: check env->error_code */
info.si_code = TARGET_SEGV_MAPERR;
info._sifields._sigfault._addr = env->mmu.ar;
queue_signal(env, info.si_signo, QEMU_SI_FAULT, &info);
}
break;
case EXCP_DEBUG: case EXCP_DEBUG:
info.si_signo = TARGET_SIGTRAP; info.si_signo = TARGET_SIGTRAP;
info.si_errno = 0; info.si_errno = 0;

2
target/m68k/cpu.c
View File

@ -515,9 +515,9 @@ static const struct SysemuCPUOps m68k_sysemu_ops = {
static const struct TCGCPUOps m68k_tcg_ops = { static const struct TCGCPUOps m68k_tcg_ops = {
.initialize = m68k_tcg_init, .initialize = m68k_tcg_init,
.tlb_fill = m68k_cpu_tlb_fill,
#ifndef CONFIG_USER_ONLY #ifndef CONFIG_USER_ONLY
.tlb_fill = m68k_cpu_tlb_fill,
.cpu_exec_interrupt = m68k_cpu_exec_interrupt, .cpu_exec_interrupt = m68k_cpu_exec_interrupt,
.do_interrupt = m68k_cpu_do_interrupt, .do_interrupt = m68k_cpu_do_interrupt,
.do_transaction_failed = m68k_cpu_transaction_failed, .do_transaction_failed = m68k_cpu_transaction_failed,

6
target/m68k/helper.c
View File

@ -978,16 +978,12 @@ void m68k_set_irq_level(M68kCPU *cpu, int level, uint8_t vector)
} }
} }
#endif
bool m68k_cpu_tlb_fill(CPUState *cs, vaddr address, int size, bool m68k_cpu_tlb_fill(CPUState *cs, vaddr address, int size,
MMUAccessType qemu_access_type, int mmu_idx, MMUAccessType qemu_access_type, int mmu_idx,
bool probe, uintptr_t retaddr) bool probe, uintptr_t retaddr)
{ {
M68kCPU *cpu = M68K_CPU(cs); M68kCPU *cpu = M68K_CPU(cs);
CPUM68KState *env = &cpu->env; CPUM68KState *env = &cpu->env;
#ifndef CONFIG_USER_ONLY
hwaddr physical; hwaddr physical;
int prot; int prot;
int access_type; int access_type;
@ -1051,12 +1047,12 @@ bool m68k_cpu_tlb_fill(CPUState *cs, vaddr address, int size,
if (!(access_type & ACCESS_STORE)) { if (!(access_type & ACCESS_STORE)) {
env->mmu.ssw |= M68K_RW_040; env->mmu.ssw |= M68K_RW_040;
} }
#endif
cs->exception_index = EXCP_ACCESS; cs->exception_index = EXCP_ACCESS;
env->mmu.ar = address; env->mmu.ar = address;
cpu_loop_exit_restore(cs, retaddr); cpu_loop_exit_restore(cs, retaddr);
} }
#endif /* !CONFIG_USER_ONLY */
uint32_t HELPER(bitrev)(uint32_t x) uint32_t HELPER(bitrev)(uint32_t x)
{ {