[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v2 11/13] target-sh4: Make copy_utlb_entry_itlb() ta
From: |
Andreas Färber |
Subject: |
[Qemu-devel] [PATCH v2 11/13] target-sh4: Make copy_utlb_entry_itlb() take SuperHCPU |
Date: |
Fri, 13 Apr 2012 23:30:16 +0200 |
Signed-off-by: Andreas Färber <address@hidden>
---
target-sh4/helper.c | 14 +++++++-------
1 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/target-sh4/helper.c b/target-sh4/helper.c
index d273097..ffe79ec 100644
--- a/target-sh4/helper.c
+++ b/target-sh4/helper.c
@@ -286,18 +286,18 @@ static void increment_urc(SuperHCPU *cpu)
/* Copy and utlb entry into itlb
Return entry
*/
-static int copy_utlb_entry_itlb(CPUSH4State *env, int utlb)
+static int copy_utlb_entry_itlb(SuperHCPU *cpu, int utlb)
{
int itlb;
tlb_t * ientry;
- itlb = itlb_replacement(env);
- ientry = &env->itlb[itlb];
+ itlb = itlb_replacement(&cpu->env);
+ ientry = &cpu->env.itlb[itlb];
if (ientry->v) {
- tlb_flush_page(env, ientry->vpn << 10);
+ tlb_flush_page(&cpu->env, ientry->vpn << 10);
}
- *ientry = env->utlb[utlb];
- update_itlb_use(env, itlb);
+ *ientry = cpu->env.utlb[utlb];
+ update_itlb_use(&cpu->env, itlb);
return itlb;
}
@@ -360,7 +360,7 @@ static int get_mmu_address(SuperHCPU *cpu, target_ulong
*physical,
} else {
n = find_utlb_entry(cpu, address, use_asid);
if (n >= 0) {
- n = copy_utlb_entry_itlb(&cpu->env, n);
+ n = copy_utlb_entry_itlb(cpu, n);
matching = &cpu->env.itlb[n];
if (!(cpu->env.sr & SR_MD) && !(matching->pr & 2)) {
n = MMU_ITLB_VIOLATION;
--
1.7.7
- [Qemu-devel] [PATCH v2 05/13] hw/sh7750: Use SuperHCPU, (continued)
- [Qemu-devel] [PATCH v2 05/13] hw/sh7750: Use SuperHCPU, Andreas Färber, 2012/04/13
- [Qemu-devel] [PATCH v2 06/13] target-sh4: Make cpu_sh4_invalidate_tlb() take SuperHCPU, Andreas Färber, 2012/04/13
- [Qemu-devel] [PATCH v2 07/13] target-sh4: Make increment_urc() take SuperHCPU, Andreas Färber, 2012/04/13
- [Qemu-devel] [PATCH v2 10/13] target-sh4: Make get_{physical, mmu}_address() take SuperHCPU, Andreas Färber, 2012/04/13
- [Qemu-devel] [PATCH v2 02/13] target-sh4: QOM'ify CPU reset, Andreas Färber, 2012/04/13
- [Qemu-devel] [PATCH v2 03/13] target-sh4: Start QOM'ifying CPU init, Andreas Färber, 2012/04/13
- [Qemu-devel] [PATCH v2 08/13] target-sh4: Make find_*tlb_entry() take SuperHCPU, Andreas Färber, 2012/04/13
- [Qemu-devel] [PATCH v2 04/13] target-sh4: Do not reset CPU feature flags on reset, Andreas Färber, 2012/04/13
- [Qemu-devel] [PATCH v2 11/13] target-sh4: Make copy_utlb_entry_itlb() take SuperHCPU,
Andreas Färber <=
- [Qemu-devel] [PATCH v2 01/13] target-sh4: QOM'ify CPU, Andreas Färber, 2012/04/13
- [Qemu-devel] [PATCH v2 12/13] target-sh4: Make update_itlb_use() take SuperHCPU, Andreas Färber, 2012/04/13
- [Qemu-devel] [PATCH v2 13/13] target-sh4: Make itlb_replacement() use SuperHCPU, Andreas Färber, 2012/04/13
- [Qemu-devel] [PATCH v2 09/13] target-sh4: Make cpu_sh4_{read, write}_mmaped_{i, u}tlb_addr() take CPU, Andreas Färber, 2012/04/13