[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH 42/43] target/ppc/mmu-hash32.c: Change parameter type of ppc_hash
|
From: |
BALATON Zoltan |
|
Subject: |
[PATCH 42/43] target/ppc/mmu-hash32.c: Change parameter type of ppc_hash32_set_[rc] |
|
Date: |
Mon, 27 May 2024 01:13:19 +0200 (CEST) |
These functions need AddressSpace from CPUState but take PowerPCCPU
instead and cast that. We have the right type in the caller so change
the parameter type and pass the needed value to avoid casting.
Signed-off-by: BALATON Zoltan <balaton@eik.bme.hu>
---
target/ppc/mmu-hash32.c | 14 ++++++++------
1 file changed, 8 insertions(+), 6 deletions(-)
diff --git a/target/ppc/mmu-hash32.c b/target/ppc/mmu-hash32.c
index 82a02881c2..0f9c61bf89 100644
--- a/target/ppc/mmu-hash32.c
+++ b/target/ppc/mmu-hash32.c
@@ -228,16 +228,18 @@ static hwaddr ppc_hash32_pteg_search(PowerPCCPU *cpu,
hwaddr pte_addr,
return -1;
}
-static void ppc_hash32_set_r(PowerPCCPU *cpu, hwaddr pte_addr, uint32_t pte1)
+static void ppc_hash32_set_r(AddressSpace *cpu_as, hwaddr pte_addr,
+ uint32_t pte1)
{
/* The HW performs a non-atomic byte update */
- stb_phys(CPU(cpu)->as, pte_addr + 6, ((pte1 >> 8) & 0xff) | 0x01);
+ stb_phys(cpu_as, pte_addr + 6, ((pte1 >> 8) & 0xff) | 0x01);
}
-static void ppc_hash32_set_c(PowerPCCPU *cpu, hwaddr pte_addr, uint64_t pte1)
+static void ppc_hash32_set_c(AddressSpace *cpu_as, hwaddr pte_addr,
+ uint64_t pte1)
{
/* The HW performs a non-atomic byte update */
- stb_phys(CPU(cpu)->as, pte_addr + 7, (pte1 & 0xff) | 0x80);
+ stb_phys(cpu_as, pte_addr + 7, (pte1 & 0xff) | 0x80);
}
static hwaddr ppc_hash32_htab_lookup(PowerPCCPU *cpu,
@@ -399,11 +401,11 @@ bool ppc_hash32_xlate(CPUState *cs, vaddr eaddr,
MMUAccessType access_type,
/* 8. Update PTE referenced and changed bits if necessary */
if (!(pte.pte1 & HPTE32_R_R)) {
- ppc_hash32_set_r(cpu, pte_addr, pte.pte1);
+ ppc_hash32_set_r(cs->as, pte_addr, pte.pte1);
}
if (!(pte.pte1 & HPTE32_R_C)) {
if (access_type == MMU_DATA_STORE) {
- ppc_hash32_set_c(cpu, pte_addr, pte.pte1);
+ ppc_hash32_set_c(cs->as, pte_addr, pte.pte1);
} else {
/*
* Treat the page as read-only for now, so that a later write
--
2.30.9
- [PATCH 39/43] target/ppc: Change parameter type of some inline functions, (continued)
- [PATCH 39/43] target/ppc: Change parameter type of some inline functions, BALATON Zoltan, 2024/05/26
- [PATCH 41/43] target/ppc: Change MMU xlate functions to take CPUState, BALATON Zoltan, 2024/05/26
- [PATCH 23/43] target/ppc/mmu_common.c: Rename function parameter, BALATON Zoltan, 2024/05/26
- [PATCH 22/43] target/ppc/mmu_common.c: Stop using ctx in ppc6xx_tlb_check(), BALATON Zoltan, 2024/05/26
- [PATCH 26/43] target/ppc/mmu_common.c: Stop using ctx in get_bat_6xx_tlb(), BALATON Zoltan, 2024/05/26
- [PATCH 25/43] target/ppc: Remove bat_size_prot(), BALATON Zoltan, 2024/05/26
- [PATCH 32/43] target/ppc: Remove includes from mmu-book3s-v3.h, BALATON Zoltan, 2024/05/26
- [PATCH 13/43] target/ppc/mmu_common.c: Convert local variable to bool, BALATON Zoltan, 2024/05/26
- [PATCH 43/43] target/ppc/mmu-hash32.c: Change parameter type of ppc_hash32_direct_store, BALATON Zoltan, 2024/05/26
- [PATCH 38/43] target/ppc/mmu-hash32.c: Use pte address as parameter instead of offset, BALATON Zoltan, 2024/05/26
- [PATCH 42/43] target/ppc/mmu-hash32.c: Change parameter type of ppc_hash32_set_[rc],
BALATON Zoltan <=
- [PATCH 37/43] target/ppc/mmu-hash32.c: Return and use pte address instead of base + offset, BALATON Zoltan, 2024/05/26
- [PATCH 19/43] target/ppc/mmu-hash32.c: Inline and remove ppc_hash32_pte_prot(), BALATON Zoltan, 2024/05/26
- [PATCH 40/43] target/ppc: Change parameter type of ppc64_v3_radix(), BALATON Zoltan, 2024/05/26
- [PATCH 36/43] target/ppc/mmu-hash32: Remove some static inlines from header, BALATON Zoltan, 2024/05/26
- [PATCH 29/43] target/ppc/mmu-hash32.c: Move get_pteg_offset32() to the header, BALATON Zoltan, 2024/05/26
- [PATCH 35/43] target/ppc/mmu-hash32.c: Change parameter type of ppc_hash32_bat_lookup(), BALATON Zoltan, 2024/05/26
- Re: [PATCH 00/43] Remaining MMU clean up patches, BALATON Zoltan, 2024/05/27