diff options
| author | Andreas Färber <afaerber@suse.de> | 2013-08-27 00:28:06 +0200 |
|---|---|---|
| committer | Andreas Färber <afaerber@suse.de> | 2014-03-13 19:20:47 +0100 |
| commit | d5a11fefef1eeed86a8f06021067ba9990729a5a (patch) | |
| tree | 7a99e0676de042609104c21d98ff2a94be017c9a /target-unicore32 | |
| parent | f0c3c505a8ec1a948006b3a16a35864a2270a84b (diff) | |
| download | qemu-d5a11fefef1eeed86a8f06021067ba9990729a5a.tar.gz | |
exec: Change tlb_fill() argument to CPUState
Signed-off-by: Andreas Färber <afaerber@suse.de>
Diffstat (limited to 'target-unicore32')
| -rw-r--r-- | target-unicore32/op_helper.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/target-unicore32/op_helper.c b/target-unicore32/op_helper.c index cd2cbef34f..3efc6a80a4 100644 --- a/target-unicore32/op_helper.c +++ b/target-unicore32/op_helper.c @@ -257,14 +257,16 @@ uint32_t HELPER(ror_cc)(CPUUniCore32State *env, uint32_t x, uint32_t i) #define SHIFT 3 #include "exec/softmmu_template.h" -void tlb_fill(CPUUniCore32State *env, target_ulong addr, int is_write, +void tlb_fill(CPUState *cs, target_ulong addr, int is_write, int mmu_idx, uintptr_t retaddr) { - UniCore32CPU *cpu = uc32_env_get_cpu(env); int ret; - ret = uc32_cpu_handle_mmu_fault(CPU(cpu), addr, is_write, mmu_idx); + ret = uc32_cpu_handle_mmu_fault(cs, addr, is_write, mmu_idx); if (unlikely(ret)) { + UniCore32CPU *cpu = UNICORE32_CPU(cs); + CPUUniCore32State *env = &cpu->env; + if (retaddr) { /* now we have a real cpu fault */ cpu_restore_state(env, retaddr); |