diff options
author | David Gibson <david@gibson.dropbear.id.au> | 2013-03-12 00:31:34 +0000 |
---|---|---|
committer | Alexander Graf <agraf@suse.de> | 2013-03-22 15:28:51 +0100 |
commit | e1d4951593426c886c1856211bc6ca81ed7c435d (patch) | |
tree | 3657e494a3da2469e77d48ef01f0c33d7375e9ce /target-ppc/mmu-hash32.c | |
parent | 9986ed1ed07a01bdd236524b1a5cee695e68954a (diff) | |
download | hqemu-e1d4951593426c886c1856211bc6ca81ed7c435d.zip hqemu-e1d4951593426c886c1856211bc6ca81ed7c435d.tar.gz |
mmu-hash32: Split BAT size logic from permissions logic
hash32_bat_size_prot() and its 601 variant, as the name suggests, returns
both a BAT's size - needed to search for a matching BAT - and its
permissions, only relevant once a matching BAT has been located.
There's no particular advantage to combining these, so we split these roles
into seperate functions for clarity.
Signed-off-by: David Gibson <david@gibson.dropbear.id.au>
Signed-off-by: Alexander Graf <agraf@suse.de>
Diffstat (limited to 'target-ppc/mmu-hash32.c')
-rw-r--r-- | target-ppc/mmu-hash32.c | 71 |
1 files changed, 40 insertions, 31 deletions
diff --git a/target-ppc/mmu-hash32.c b/target-ppc/mmu-hash32.c index b7f6e8f..6c71ebd 100644 --- a/target-ppc/mmu-hash32.c +++ b/target-ppc/mmu-hash32.c @@ -113,57 +113,64 @@ static int ppc_hash32_check_prot(int prot, int rwx) return ret; } -/* Perform BAT hit & translation */ -static void hash32_bat_size_prot(CPUPPCState *env, target_ulong *blp, - int *validp, int *protp, - target_ulong batu, target_ulong batl) +static void hash32_bat_size(CPUPPCState *env, target_ulong *blp, int *validp, + target_ulong batu, target_ulong batl) { target_ulong bl; - int pp, valid, prot; + int valid; bl = (batu & BATU32_BL) << 15; valid = 0; - prot = 0; if (((msr_pr == 0) && (batu & BATU32_VS)) || ((msr_pr != 0) && (batu & BATU32_VP))) { valid = 1; - pp = batl & BATL32_PP; - if (pp != 0) { - prot = PAGE_READ | PAGE_EXEC; - if (pp == 0x2) { - prot |= PAGE_WRITE; - } - } } *blp = bl; *validp = valid; - *protp = prot; } -static void hash32_bat_601_size_prot(CPUPPCState *env, target_ulong *blp, - int *validp, int *protp, - target_ulong batu, target_ulong batl) +static int hash32_bat_prot(CPUPPCState *env, + target_ulong batu, target_ulong batl) +{ + int pp, prot; + + prot = 0; + pp = batl & BATL32_PP; + if (pp != 0) { + prot = PAGE_READ | PAGE_EXEC; + if (pp == 0x2) { + prot |= PAGE_WRITE; + } + } + return prot; +} + +static void hash32_bat_601_size(CPUPPCState *env, target_ulong *blp, int *validp, + target_ulong batu, target_ulong batl) { target_ulong bl; - int key, pp, valid, prot; + int valid; bl = (batl & BATL32_601_BL) << 17; LOG_BATS("b %02x ==> bl " TARGET_FMT_lx " msk " TARGET_FMT_lx "\n", (uint8_t)(batl & BATL32_601_BL), bl, ~bl); - prot = 0; valid = !!(batl & BATL32_601_V); - if (valid) { - pp = batu & BATU32_601_PP; - if (msr_pr == 0) { - key = !!(batu & BATU32_601_KS); - } else { - key = !!(batu & BATU32_601_KP); - } - prot = ppc_hash32_pp_check(key, pp, 0); - } *blp = bl; *validp = valid; - *protp = prot; +} + +static int hash32_bat_601_prot(CPUPPCState *env, + target_ulong batu, target_ulong batl) +{ + int key, pp; + + pp = batu & BATU32_601_PP; + if (msr_pr == 0) { + key = !!(batu & BATU32_601_KS); + } else { + key = !!(batu & BATU32_601_KP); + } + return ppc_hash32_pp_check(key, pp, 0); } static int ppc_hash32_get_bat(CPUPPCState *env, struct mmu_ctx_hash32 *ctx, @@ -190,9 +197,11 @@ static int ppc_hash32_get_bat(CPUPPCState *env, struct mmu_ctx_hash32 *ctx, BEPIu = batu & BATU32_BEPIU; BEPIl = batu & BATU32_BEPIL; if (unlikely(env->mmu_model == POWERPC_MMU_601)) { - hash32_bat_601_size_prot(env, &bl, &valid, &prot, batu, batl); + hash32_bat_601_size(env, &bl, &valid, batu, batl); + prot = hash32_bat_601_prot(env, batu, batl); } else { - hash32_bat_size_prot(env, &bl, &valid, &prot, batu, batl); + hash32_bat_size(env, &bl, &valid, batu, batl); + prot = hash32_bat_prot(env, batu, batl); } LOG_BATS("%s: %cBAT%d v " TARGET_FMT_lx " BATu " TARGET_FMT_lx " BATl " TARGET_FMT_lx "\n", __func__, |