diff options
author | Max Filippov <jcmvbkbc@gmail.com> | 2014-02-12 14:35:56 +0400 |
---|---|---|
committer | Max Filippov <jcmvbkbc@gmail.com> | 2015-03-07 15:27:54 +0300 |
commit | 4246e225c0e8fbcf17051aa83a4198293c007cc4 (patch) | |
tree | cc8c67e8d16153d47bbd60971c49ca5e6a25bffa /target-xtensa | |
parent | 8bb3b575448aeff086b2849943da47dce3c2b6ec (diff) |
target-xtensa: implement do_unassigned_access callback
Depending on access type raise either InstrPIFDataError or
LoadStorePIFDataError exception.
Signed-off-by: Max Filippov <jcmvbkbc@gmail.com>
Diffstat (limited to 'target-xtensa')
-rw-r--r-- | target-xtensa/cpu-qom.h | 3 | ||||
-rw-r--r-- | target-xtensa/cpu.c | 1 | ||||
-rw-r--r-- | target-xtensa/op_helper.c | 14 |
3 files changed, 18 insertions, 0 deletions
diff --git a/target-xtensa/cpu-qom.h b/target-xtensa/cpu-qom.h index 9de5c6eb9f..2258224d09 100644 --- a/target-xtensa/cpu-qom.h +++ b/target-xtensa/cpu-qom.h @@ -85,6 +85,9 @@ static inline XtensaCPU *xtensa_env_get_cpu(const CPUXtensaState *env) void xtensa_cpu_do_interrupt(CPUState *cpu); bool xtensa_cpu_exec_interrupt(CPUState *cpu, int interrupt_request); +void xtensa_cpu_do_unassigned_access(CPUState *cpu, hwaddr addr, + bool is_write, bool is_exec, int opaque, + unsigned size); void xtensa_cpu_dump_state(CPUState *cpu, FILE *f, fprintf_function cpu_fprintf, int flags); hwaddr xtensa_cpu_get_phys_page_debug(CPUState *cpu, vaddr addr); diff --git a/target-xtensa/cpu.c b/target-xtensa/cpu.c index 6a5414f815..2b75678995 100644 --- a/target-xtensa/cpu.c +++ b/target-xtensa/cpu.c @@ -151,6 +151,7 @@ static void xtensa_cpu_class_init(ObjectClass *oc, void *data) #ifndef CONFIG_USER_ONLY cc->do_unaligned_access = xtensa_cpu_do_unaligned_access; cc->get_phys_page_debug = xtensa_cpu_get_phys_page_debug; + cc->do_unassigned_access = xtensa_cpu_do_unassigned_access; #endif cc->debug_excp_handler = xtensa_breakpoint_handler; dc->vmsd = &vmstate_xtensa_cpu; diff --git a/target-xtensa/op_helper.c b/target-xtensa/op_helper.c index 49e86343ed..be657e615d 100644 --- a/target-xtensa/op_helper.c +++ b/target-xtensa/op_helper.c @@ -71,6 +71,20 @@ void tlb_fill(CPUState *cs, } } +void xtensa_cpu_do_unassigned_access(CPUState *cs, hwaddr addr, + bool is_write, bool is_exec, int opaque, + unsigned size) +{ + XtensaCPU *cpu = XTENSA_CPU(cs); + CPUXtensaState *env = &cpu->env; + + HELPER(exception_cause_vaddr)(env, env->pc, + is_exec ? + INSTR_PIF_ADDR_ERROR_CAUSE : + LOAD_STORE_PIF_ADDR_ERROR_CAUSE, + is_exec ? addr : cs->mem_io_vaddr); +} + static void tb_invalidate_virtual_addr(CPUXtensaState *env, uint32_t vaddr) { uint32_t paddr; |