diff options
Diffstat (limited to 'target-unicore32/softmmu.c')
| -rw-r--r-- | target-unicore32/softmmu.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/target-unicore32/softmmu.c b/target-unicore32/softmmu.c index 373f94b274..fc27100f27 100644 --- a/target-unicore32/softmmu.c +++ b/target-unicore32/softmmu.c @@ -31,7 +31,7 @@ /* Map CPU modes onto saved register banks. */ -static inline int bank_number(int mode) +static inline int bank_number(CPUUniCore32State *env, int mode) { switch (mode) { case ASR_MODE_USER: @@ -46,7 +46,7 @@ static inline int bank_number(int mode) case ASR_MODE_INTR: return 4; } - cpu_abort(cpu_single_env, "Bad mode %x\n", mode); + cpu_abort(env, "Bad mode %x\n", mode); return -1; } @@ -60,12 +60,12 @@ void switch_mode(CPUUniCore32State *env, int mode) return; } - i = bank_number(old_mode); + i = bank_number(env, old_mode); env->banked_r29[i] = env->regs[29]; env->banked_r30[i] = env->regs[30]; env->banked_bsr[i] = env->bsr; - i = bank_number(mode); + i = bank_number(env, mode); env->regs[29] = env->banked_r29[i]; env->regs[30] = env->banked_r30[i]; env->bsr = env->banked_bsr[i]; @@ -259,7 +259,7 @@ int uc32_cpu_handle_mmu_fault(CPUUniCore32State *env, target_ulong address, return ret; } -target_phys_addr_t cpu_get_phys_page_debug(CPUUniCore32State *env, +hwaddr cpu_get_phys_page_debug(CPUUniCore32State *env, target_ulong addr) { cpu_abort(env, "%s not supported yet\n", __func__); |