ShuriZma
/
xemu
mirror of https://github.com/xemu-project/xemu.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

target/nios2: Implement nios2_cpu_record_sigsegv 

Because the linux-user kuser page handling is currently implemented
by detecting magic addresses in the unnamed 0xaa trap, we cannot
simply remove nios2_cpu_tlb_fill and rely on the fallback code.

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-30 13:41:43 -04:00
parent 52d4899bf3
commit fac94cb36d
3 changed files with 14 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
target/nios2/cpu.c
View File

@ -216,9 +216,11 @@ static const struct SysemuCPUOps nios2_sysemu_ops = {
static const struct TCGCPUOps nios2_tcg_ops = { static const struct TCGCPUOps nios2_tcg_ops = {
.initialize = nios2_tcg_init, .initialize = nios2_tcg_init,
.tlb_fill = nios2_cpu_tlb_fill,
#ifndef CONFIG_USER_ONLY #ifdef CONFIG_USER_ONLY
.record_sigsegv = nios2_cpu_record_sigsegv,
#else
.tlb_fill = nios2_cpu_tlb_fill,
.cpu_exec_interrupt = nios2_cpu_exec_interrupt, .cpu_exec_interrupt = nios2_cpu_exec_interrupt,
.do_interrupt = nios2_cpu_do_interrupt, .do_interrupt = nios2_cpu_do_interrupt,
.do_unaligned_access = nios2_cpu_do_unaligned_access, .do_unaligned_access = nios2_cpu_do_unaligned_access,

6
target/nios2/cpu.h
View File

@ -218,9 +218,15 @@ static inline int cpu_mmu_index(CPUNios2State *env, bool ifetch)
MMU_SUPERVISOR_IDX; MMU_SUPERVISOR_IDX;
} }
#ifdef CONFIG_USER_ONLY
void nios2_cpu_record_sigsegv(CPUState *cpu, vaddr addr,
MMUAccessType access_type,
bool maperr, uintptr_t ra);
#else
bool nios2_cpu_tlb_fill(CPUState *cs, vaddr address, int size, bool nios2_cpu_tlb_fill(CPUState *cs, vaddr address, int size,
MMUAccessType access_type, int mmu_idx, MMUAccessType access_type, int mmu_idx,
bool probe, uintptr_t retaddr); bool probe, uintptr_t retaddr);
#endif
static inline int cpu_interrupts_enabled(CPUNios2State *env) static inline int cpu_interrupts_enabled(CPUNios2State *env)
{ {

7
target/nios2/helper.c
View File

@ -38,10 +38,11 @@ void nios2_cpu_do_interrupt(CPUState *cs)
env->regs[R_EA] = env->regs[R_PC] + 4; env->regs[R_EA] = env->regs[R_PC] + 4;
} }
bool nios2_cpu_tlb_fill(CPUState *cs, vaddr address, int size, void nios2_cpu_record_sigsegv(CPUState *cs, vaddr addr,
MMUAccessType access_type, int mmu_idx, MMUAccessType access_type,
bool probe, uintptr_t retaddr) bool maperr, uintptr_t retaddr)
{ {
/* FIXME: Disentangle kuser page from linux-user sigsegv handling. */
cs->exception_index = 0xaa; cs->exception_index = 0xaa;
cpu_loop_exit_restore(cs, retaddr); cpu_loop_exit_restore(cs, retaddr);
} }