diff options
| author | j_mayer <j_mayer@c046a42c-6fe2-441c-8c8c-71466251a162> | 2007-10-14 07:07:08 +0000 |
|---|---|---|
| committer | j_mayer <j_mayer@c046a42c-6fe2-441c-8c8c-71466251a162> | 2007-10-14 07:07:08 +0000 |
| commit | 6ebbf390003270afece028facef4d9834df81a8c (patch) | |
| tree | adc8e9a3d586d5b1b550543fceb6ffdaeda03f6a /target-sh4/helper.c | |
| parent | d0f48074dbc21248f3b0a9fb48126cb0d95991b5 (diff) | |
Replace is_user variable with mmu_idx in softmmu core,
allowing support of more than 2 mmu access modes.
Add backward compatibility is_user variable in targets code when needed.
Implement per target cpu_mmu_index function, avoiding duplicated code
and #ifdef TARGET_xxx in softmmu core functions.
Implement per target mmu modes definitions. As an example, add PowerPC
hypervisor mode definition and Alpha executive and kernel modes definitions.
Optimize PowerPC case, precomputing mmu_idx when MSR register changes
and using the same definition in code translation code.
git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@3384 c046a42c-6fe2-441c-8c8c-71466251a162
Diffstat (limited to 'target-sh4/helper.c')
| -rw-r--r-- | target-sh4/helper.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/target-sh4/helper.c b/target-sh4/helper.c index a5af5ba153..b8a05e124c 100644 --- a/target-sh4/helper.c +++ b/target-sh4/helper.c @@ -36,7 +36,7 @@ void do_interrupt (CPUState *env) } int cpu_sh4_handle_mmu_fault(CPUState * env, target_ulong address, int rw, - int is_user, int is_softmmu) + int mmu_idx, int is_softmmu) { env->tea = address; switch (rw) { @@ -372,15 +372,15 @@ int get_physical_address(CPUState * env, target_ulong * physical, } int cpu_sh4_handle_mmu_fault(CPUState * env, target_ulong address, int rw, - int is_user, int is_softmmu) + int mmu_idx, int is_softmmu) { target_ulong physical, page_offset, page_size; int prot, ret, access_type; /* XXXXX */ #if 0 - fprintf(stderr, "%s pc %08x ad %08x rw %d is_user %d smmu %d\n", - __func__, env->pc, address, rw, is_user, is_softmmu); + fprintf(stderr, "%s pc %08x ad %08x rw %d mmu_idx %d smmu %d\n", + __func__, env->pc, address, rw, mmu_idx, is_softmmu); #endif access_type = ACCESS_INT; @@ -426,7 +426,7 @@ int cpu_sh4_handle_mmu_fault(CPUState * env, target_ulong address, int rw, address = (address & TARGET_PAGE_MASK) + page_offset; physical = (physical & TARGET_PAGE_MASK) + page_offset; - return tlb_set_page(env, address, physical, prot, is_user, is_softmmu); + return tlb_set_page(env, address, physical, prot, mmu_idx, is_softmmu); } target_phys_addr_t cpu_get_phys_page_debug(CPUState * env, target_ulong addr) |