mirror of
https://github.com/Motorhead1991/qemu.git
synced 2025-08-04 00:03:54 -06:00
avoid using physical accesses in user emulation
git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@1592 c046a42c-6fe2-441c-8c8c-71466251a162
This commit is contained in:
parent
74c33bed31
commit
24741ef3de
4 changed files with 156 additions and 142 deletions
|
@ -36,6 +36,32 @@
|
|||
/*****************************************************************************/
|
||||
/* PowerPC MMU emulation */
|
||||
|
||||
#if defined(CONFIG_USER_ONLY)
|
||||
int cpu_ppc_handle_mmu_fault (CPUState *env, uint32_t address, int rw,
|
||||
int is_user, int is_softmmu)
|
||||
{
|
||||
int exception, error_code;
|
||||
|
||||
if (rw == 2) {
|
||||
exception = EXCP_ISI;
|
||||
error_code = 0;
|
||||
} else {
|
||||
exception = EXCP_DSI;
|
||||
error_code = 0;
|
||||
if (rw)
|
||||
error_code |= 0x02000000;
|
||||
env->spr[SPR_DAR] = address;
|
||||
env->spr[SPR_DSISR] = error_code;
|
||||
}
|
||||
env->exception_index = exception;
|
||||
env->error_code = error_code;
|
||||
return 1;
|
||||
}
|
||||
target_ulong cpu_get_phys_page_debug(CPUState *env, target_ulong addr)
|
||||
{
|
||||
return addr;
|
||||
}
|
||||
#else
|
||||
/* Perform BAT hit & translation */
|
||||
static int get_bat (CPUState *env, uint32_t *real, int *prot,
|
||||
uint32_t virtual, int rw, int type)
|
||||
|
@ -355,8 +381,8 @@ static int get_segment (CPUState *env, uint32_t *real, int *prot,
|
|||
return ret;
|
||||
}
|
||||
|
||||
int get_physical_address (CPUState *env, uint32_t *physical, int *prot,
|
||||
uint32_t address, int rw, int access_type)
|
||||
static int get_physical_address (CPUState *env, uint32_t *physical, int *prot,
|
||||
uint32_t address, int rw, int access_type)
|
||||
{
|
||||
int ret;
|
||||
#if 0
|
||||
|
@ -387,12 +413,6 @@ int get_physical_address (CPUState *env, uint32_t *physical, int *prot,
|
|||
return ret;
|
||||
}
|
||||
|
||||
#if defined(CONFIG_USER_ONLY)
|
||||
target_ulong cpu_get_phys_page_debug(CPUState *env, target_ulong addr)
|
||||
{
|
||||
return addr;
|
||||
}
|
||||
#else
|
||||
target_ulong cpu_get_phys_page_debug(CPUState *env, target_ulong addr)
|
||||
{
|
||||
uint32_t phys_addr;
|
||||
|
@ -402,7 +422,6 @@ target_ulong cpu_get_phys_page_debug(CPUState *env, target_ulong addr)
|
|||
return -1;
|
||||
return phys_addr;
|
||||
}
|
||||
#endif
|
||||
|
||||
/* Perform address translation */
|
||||
int cpu_ppc_handle_mmu_fault (CPUState *env, uint32_t address, int rw,
|
||||
|
@ -523,6 +542,7 @@ int cpu_ppc_handle_mmu_fault (CPUState *env, uint32_t address, int rw,
|
|||
}
|
||||
return ret;
|
||||
}
|
||||
#endif
|
||||
|
||||
/*****************************************************************************/
|
||||
/* BATs management */
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue