qcow2: Stop overwriting compressed clusters one by one

[qemu.git] / target / nios2 / mmu.c

diff --git a/target/nios2/mmu.c b/target/nios2/mmu.c
index 5acf442d8b8ef97f52f046887538d9a1e3782b45..2545c06761f3b4138787e478960a403afc06e92a 100644 (file)
--- a/target/nios2/mmu.c
+++ b/target/nios2/mmu.c
@@ -19,7 +19,6 @@
  */
 
 #include "qemu/osdep.h"
  */
 
 #include "qemu/osdep.h"

-#include "qemu-common.h"

 #include "qemu/qemu-print.h"
 #include "cpu.h"
 #include "exec/exec-all.h"
 #include "qemu/qemu-print.h"
 #include "cpu.h"
 #include "exec/exec-all.h"


@@ -36,18 +35,6 @@
 #define MMU_LOG(x)
 #endif
 
 #define MMU_LOG(x)
 #endif
 

-void tlb_fill(CPUState *cs, target_ulong addr, int size,
-              MMUAccessType access_type, int mmu_idx, uintptr_t retaddr)
-{
-    int ret;
-
-    ret = nios2_cpu_handle_mmu_fault(cs, addr, size, access_type, mmu_idx);
-    if (unlikely(ret)) {
-        /* now we have a real cpu fault */
-        cpu_loop_exit_restore(cs, retaddr);
-    }
-}
-

 void mmu_read_debug(CPUNios2State *env, uint32_t rn)
 {
     switch (rn) {
 void mmu_read_debug(CPUNios2State *env, uint32_t rn)
 {
     switch (rn) {


@@ -73,7 +60,7 @@ unsigned int mmu_translate(CPUNios2State *env,
                            Nios2MMULookup *lu,
                            target_ulong vaddr, int rw, int mmu_idx)
 {
                            Nios2MMULookup *lu,
                            target_ulong vaddr, int rw, int mmu_idx)
 {

-    Nios2CPU *cpu = nios2_env_get_cpu(env);
+    Nios2CPU *cpu = env_archcpu(env);

     int pid = (env->mmu.tlbmisc_wr & CR_TLBMISC_PID_MASK) >> 4;
     int vpn = vaddr >> 12;
 
     int pid = (env->mmu.tlbmisc_wr & CR_TLBMISC_PID_MASK) >> 4;
     int vpn = vaddr >> 12;
 


@@ -114,8 +101,8 @@ unsigned int mmu_translate(CPUNios2State *env,
 
 static void mmu_flush_pid(CPUNios2State *env, uint32_t pid)
 {
 
 static void mmu_flush_pid(CPUNios2State *env, uint32_t pid)
 {

-    CPUState *cs = ENV_GET_CPU(env);
-    Nios2CPU *cpu = nios2_env_get_cpu(env);
+    CPUState *cs = env_cpu(env);
+    Nios2CPU *cpu = env_archcpu(env);

     int idx;
     MMU_LOG(qemu_log("TLB Flush PID %d\n", pid));
 
     int idx;
     MMU_LOG(qemu_log("TLB Flush PID %d\n", pid));
 


@@ -138,8 +125,8 @@ static void mmu_flush_pid(CPUNios2State *env, uint32_t pid)
 
 void mmu_write(CPUNios2State *env, uint32_t rn, uint32_t v)
 {
 
 void mmu_write(CPUNios2State *env, uint32_t rn, uint32_t v)
 {

-    CPUState *cs = ENV_GET_CPU(env);
-    Nios2CPU *cpu = nios2_env_get_cpu(env);
+    CPUState *cs = env_cpu(env);
+    Nios2CPU *cpu = env_archcpu(env);

 
     MMU_LOG(qemu_log("mmu_write %08X = %08X\n", rn, v));
 
 
     MMU_LOG(qemu_log("mmu_write %08X = %08X\n", rn, v));
 


@@ -256,7 +243,7 @@ void mmu_write(CPUNios2State *env, uint32_t rn, uint32_t v)
 
 void mmu_init(CPUNios2State *env)
 {
 
 void mmu_init(CPUNios2State *env)
 {

-    Nios2CPU *cpu = nios2_env_get_cpu(env);
+    Nios2CPU *cpu = env_archcpu(env);

     Nios2MMU *mmu = &env->mmu;
 
     MMU_LOG(qemu_log("mmu_init\n"));
     Nios2MMU *mmu = &env->mmu;
 
     MMU_LOG(qemu_log("mmu_init\n"));


@@ -267,7 +254,7 @@ void mmu_init(CPUNios2State *env)
 
 void dump_mmu(CPUNios2State *env)
 {
 
 void dump_mmu(CPUNios2State *env)
 {

-    Nios2CPU *cpu = nios2_env_get_cpu(env);
+    Nios2CPU *cpu = env_archcpu(env);

     int i;
 
     qemu_printf("MMU: ways %d, entries %d, pid bits %d\n",
     int i;
 
     qemu_printf("MMU: ways %d, entries %d, pid bits %d\n",