[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 42/48] target/ppc: Remove type argument from ppc6xx_tlb_check
From: |
David Gibson |
Subject: |
[PULL 42/48] target/ppc: Remove type argument from ppc6xx_tlb_check |
Date: |
Wed, 19 May 2021 22:51:42 +1000 |
From: Richard Henderson <richard.henderson@linaro.org>
We can now use MMU_INST_FETCH from access_type for this.
Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
Message-Id: <20210518201146.794854-10-richard.henderson@linaro.org>
Signed-off-by: David Gibson <david@gibson.dropbear.id.au>
---
target/ppc/mmu_helper.c | 10 ++++------
1 file changed, 4 insertions(+), 6 deletions(-)
diff --git a/target/ppc/mmu_helper.c b/target/ppc/mmu_helper.c
index 0c10677ade..2f00955b80 100644
--- a/target/ppc/mmu_helper.c
+++ b/target/ppc/mmu_helper.c
@@ -288,8 +288,7 @@ static void ppc6xx_tlb_store(CPUPPCState *env, target_ulong
EPN, int way,
}
static int ppc6xx_tlb_check(CPUPPCState *env, mmu_ctx_t *ctx,
- target_ulong eaddr,
- MMUAccessType access_type, int type)
+ target_ulong eaddr, MMUAccessType access_type)
{
ppc6xx_tlb_t *tlb;
int nr, best, way;
@@ -298,8 +297,7 @@ static int ppc6xx_tlb_check(CPUPPCState *env, mmu_ctx_t
*ctx,
best = -1;
ret = -1; /* No TLB found */
for (way = 0; way < env->nb_ways; way++) {
- nr = ppc6xx_tlb_getnum(env, eaddr, way,
- type == ACCESS_CODE ? 1 : 0);
+ nr = ppc6xx_tlb_getnum(env, eaddr, way, access_type == MMU_INST_FETCH);
tlb = &env->tlb.tlb6[nr];
/* This test "emulates" the PTE index match for hardware TLBs */
if ((eaddr & TARGET_PAGE_MASK) != tlb->EPN) {
@@ -314,7 +312,7 @@ static int ppc6xx_tlb_check(CPUPPCState *env, mmu_ctx_t
*ctx,
pte_is_valid(tlb->pte0) ? "valid" : "inval",
tlb->EPN, eaddr, tlb->pte1,
access_type == MMU_DATA_STORE ? 'S' : 'L',
- type == ACCESS_CODE ? 'I' : 'D');
+ access_type == MMU_INST_FETCH ? 'I' : 'D');
switch (ppc6xx_tlb_pte_check(ctx, tlb->pte0, tlb->pte1,
0, access_type)) {
case -3:
@@ -503,7 +501,7 @@ static int get_segment_6xx_tlb(CPUPPCState *env, mmu_ctx_t
*ctx,
/* Initialize real address with an invalid value */
ctx->raddr = (hwaddr)-1ULL;
/* Software TLB search */
- ret = ppc6xx_tlb_check(env, ctx, eaddr, access_type, type);
+ ret = ppc6xx_tlb_check(env, ctx, eaddr, access_type);
#if defined(DUMP_PAGE_TABLES)
if (qemu_loglevel_mask(CPU_LOG_MMU)) {
CPUState *cs = env_cpu(env);
--
2.31.1
- [PULL 33/48] target/ppc: Fix load endianness for lxvwsx/lxvdsx, (continued)
- [PULL 33/48] target/ppc: Fix load endianness for lxvwsx/lxvdsx, David Gibson, 2021/05/19
- [PULL 37/48] target/ppc: Use MMUAccessType in mmu-hash32.c, David Gibson, 2021/05/19
- [PULL 35/48] target/ppc: Use MMUAccessType in mmu-radix64.c, David Gibson, 2021/05/19
- [PULL 38/48] target/ppc: Rename access_type to type in mmu_helper.c, David Gibson, 2021/05/19
- [PULL 39/48] target/ppc: Use MMUAccessType in mmu_helper.c, David Gibson, 2021/05/19
- [PULL 45/48] target/ppc: Remove type argument from mmubooke_check_tlb, David Gibson, 2021/05/19
- [PULL 40/48] target/ppc: Remove type argument from check_prot, David Gibson, 2021/05/19
- [PULL 44/48] target/ppc: Remove type argument from mmu40x_get_physical_address, David Gibson, 2021/05/19
- [PULL 36/48] target/ppc: Use MMUAccessType in mmu-hash64.c, David Gibson, 2021/05/19
- [PULL 43/48] target/ppc: Remove type argument from get_bat_6xx_tlb, David Gibson, 2021/05/19
- [PULL 42/48] target/ppc: Remove type argument from ppc6xx_tlb_check,
David Gibson <=
- [PULL 46/48] target/ppc: Remove type argument from mmubooke_get_physical_address, David Gibson, 2021/05/19
- [PULL 47/48] target/ppc: Remove type argument from mmubooke206_check_tlb, David Gibson, 2021/05/19
- [PULL 48/48] target/ppc: Remove type argument for mmubooke206_get_physical_address, David Gibson, 2021/05/19
- Re: [PULL 00/48] ppc-for-6.1 queue 20210519, no-reply, 2021/05/19
- Re: [PULL 00/48] ppc-for-6.1 queue 20210519, Peter Maydell, 2021/05/20