Better SuperSPARC emulation (Robert Reif)

[qemu] / target-cris / mmu.c

diff --git a/target-cris/mmu.c b/target-cris/mmu.c
index bec89e6..f270d5b 100644 (file)
--- a/target-cris/mmu.c
+++ b/target-cris/mmu.c
@@ -30,7 +30,11 @@
 #include "mmu.h"
 #include "exec-all.h"
 
+#ifdef DEBUG
+#define D(x) x
+#else
 #define D(x)
+#endif
 
 void cris_mmu_init(CPUState *env)
 {
@@ -95,6 +99,7 @@ static inline void set_field(uint32_t *dst, unsigned int val,
        *dst |= val;
 }
 
+#ifdef DEBUG
 static void dump_tlb(CPUState *env, int mmu)
 {
        int set;
@@ -113,6 +118,7 @@ static void dump_tlb(CPUState *env, int mmu)
                }
        }
 }
+#endif
 
 /* rw 0 = read, 1 = write, 2 = exec.  */
 static int cris_mmu_translate_page(struct cris_mmu_result_t *res,
@@ -121,7 +127,7 @@ static int cris_mmu_translate_page(struct cris_mmu_result_t *res,
 {
        unsigned int vpage;
        unsigned int idx;
-       uint32_t lo, hi;
+       uint32_t pid, lo, hi;
        uint32_t tlb_vpn, tlb_pfn = 0;
        int tlb_pid, tlb_g, tlb_v, tlb_k, tlb_w, tlb_x;
        int cfg_v, cfg_k, cfg_w, cfg_x; 
@@ -134,6 +140,7 @@ static int cris_mmu_translate_page(struct cris_mmu_result_t *res,
 
        r_cause = env->sregs[SFR_R_MM_CAUSE];
        r_cfg = env->sregs[SFR_RW_MM_CFG];
+       pid = env->pregs[PR_PID] & 0xff;
 
        switch (rw) {
                case 2: rwcause = CRIS_MMU_ERR_EXEC; mmu = 0; break;
@@ -169,14 +176,14 @@ static int cris_mmu_translate_page(struct cris_mmu_result_t *res,
                lo = env->tlbsets[mmu][set][idx].lo;
                hi = env->tlbsets[mmu][set][idx].hi;
 
-               tlb_vpn = EXTRACT_FIELD(hi, 13, 31);
+               tlb_vpn = hi >> 13;
                tlb_pid = EXTRACT_FIELD(hi, 0, 7);
-               tlb_pfn = EXTRACT_FIELD(lo, 13, 31);
                tlb_g  = EXTRACT_FIELD(lo, 4, 4);
 
-               D(printf("TLB[%d][%d] v=%x vpage=%x -> pfn=%x lo=%x hi=%x\n", 
-                               i, idx, tlb_vpn, vpage, tlb_pfn, lo, hi));
-               if ((tlb_g || (tlb_pid == (env->pregs[PR_PID] & 0xff)))
+               D(fprintf(logfile, 
+                        "TLB[%d][%d][%d] v=%x vpage=%x lo=%x hi=%x\n", 
+                        mmu, set, idx, tlb_vpn, vpage, lo, hi));
+               if ((tlb_g || (tlb_pid == pid))
                    && tlb_vpn == vpage) {
                        match = 1;
                        break;
@@ -224,7 +231,6 @@ static int cris_mmu_translate_page(struct cris_mmu_result_t *res,
                        res->bf_vec = vect_base + 3;
                } else if (cfg_v && !tlb_v) {
                        D(printf ("tlb: invalid %x\n", vaddr));
-                       set_field(&r_cause, rwcause, 8, 9);
                        match = 0;
                        res->bf_vec = vect_base + 1;
                }
@@ -239,9 +245,6 @@ static int cris_mmu_translate_page(struct cris_mmu_result_t *res,
                }
                else
                        D(dump_tlb(env, mmu));
-
-               env->sregs[SFR_RW_MM_TLB_HI] = hi;
-               env->sregs[SFR_RW_MM_TLB_LO] = lo;
        } else {
                /* If refill, provide a randomized set.  */
                set = env->mmu_rand_lfsr & 3;
@@ -267,18 +270,17 @@ static int cris_mmu_translate_page(struct cris_mmu_result_t *res,
                /* Update RW_MM_CAUSE.  */
                set_field(&r_cause, rwcause, 8, 2);
                set_field(&r_cause, vpage, 13, 19);
-               set_field(&r_cause, env->pregs[PR_PID], 0, 8);
+               set_field(&r_cause, pid, 0, 8);
                env->sregs[SFR_R_MM_CAUSE] = r_cause;
                D(printf("refill vaddr=%x pc=%x\n", vaddr, env->pc));
        }
 
-
        D(printf ("%s rw=%d mtch=%d pc=%x va=%x vpn=%x tlbvpn=%x pfn=%x pid=%x"
                  " %x cause=%x sel=%x sp=%x %x %x\n",
                  __func__, rw, match, env->pc,
                  vaddr, vpage,
                  tlb_vpn, tlb_pfn, tlb_pid, 
-                 env->pregs[PR_PID],
+                 pid,
                  r_cause,
                  env->sregs[SFR_RW_MM_TLB_SEL],
                  env->regs[R_SP], env->pregs[PR_USP], env->ksp));
@@ -287,21 +289,42 @@ static int cris_mmu_translate_page(struct cris_mmu_result_t *res,
        return !match;
 }
 
-/* Give us the vaddr corresponding to the latest TLB update.  */
-target_ulong cris_mmu_tlb_latest_update(CPUState *env)
+void cris_mmu_flush_pid(CPUState *env, uint32_t pid)
 {
-       uint32_t sel = env->sregs[SFR_RW_MM_TLB_SEL];
-       uint32_t vaddr;
-       uint32_t hi;
-       int set;
-       int idx;
-
-       idx = EXTRACT_FIELD(sel, 0, 4);
-       set = EXTRACT_FIELD(sel, 4, 5);
-
-       hi = env->tlbsets[1][set][idx].hi;
-       vaddr = EXTRACT_FIELD(hi, 13, 31);
-       return vaddr << TARGET_PAGE_BITS;
+       target_ulong vaddr;
+       unsigned int idx;
+       uint32_t lo, hi;
+       uint32_t tlb_vpn;
+       int tlb_pid, tlb_g, tlb_v, tlb_k;
+       unsigned int set;
+       unsigned int mmu;
+
+       pid &= 0xff;
+       for (mmu = 0; mmu < 2; mmu++) {
+               for (set = 0; set < 4; set++)
+               {
+                       for (idx = 0; idx < 16; idx++) {
+                               lo = env->tlbsets[mmu][set][idx].lo;
+                               hi = env->tlbsets[mmu][set][idx].hi;
+                               
+                               tlb_vpn = EXTRACT_FIELD(hi, 13, 31);
+                               tlb_pid = EXTRACT_FIELD(hi, 0, 7);
+                               tlb_g  = EXTRACT_FIELD(lo, 4, 4);
+                               tlb_v = EXTRACT_FIELD(lo, 3, 3);
+                               tlb_k = EXTRACT_FIELD(lo, 2, 2);
+
+                               /* Kernel protected areas need to be flushed
+                                  as well.  */
+                               if (tlb_v && !tlb_g && (tlb_pid == pid || tlb_k)) {
+                                       vaddr = tlb_vpn << TARGET_PAGE_BITS;
+                                       D(fprintf(logfile,
+                                                 "flush pid=%x vaddr=%x\n", 
+                                                 pid, vaddr));
+                                       tlb_flush_page(env, vaddr);
+                               }
+                       }
+               }
+       }
 }
 
 int cris_mmu_translate(struct cris_mmu_result_t *res,
@@ -321,7 +344,7 @@ int cris_mmu_translate(struct cris_mmu_result_t *res,
 
        if (!cris_mmu_enabled(env->sregs[SFR_RW_GC_CFG])) {
                res->phy = vaddr;
-               res->prot = PAGE_BITS;          
+               res->prot = PAGE_BITS;
                goto done;
        }
 
@@ -334,7 +357,7 @@ int cris_mmu_translate(struct cris_mmu_result_t *res,
                base = cris_mmu_translate_seg(env, seg);
                phy = base | (0x0fffffff & vaddr);
                res->phy = phy;
-               res->prot = PAGE_BITS;          
+               res->prot = PAGE_BITS;
        }
        else
        {