Changes in kernel/arch/mips32/src/mm/tlb.c [346b12a2:59fb782] in mainline

File:

• kernel/arch/mips32/src/mm/tlb.c (modified) (12 diffs)

kernel/arch/mips32/src/mm/tlb.c

@@ -43 +43 @@
 #include <synch/mutex.h>
 #include <print.h>
-#include <log.h>
 #include <debug.h>
 #include <align.h>
@@ -49 +48 @@
 #include <symtab.h>
 
-#define PFN_SHIFT  12
-#define VPN_SHIFT  12
-
-#define ADDR2HI_VPN(a)   ((a) >> VPN_SHIFT)
-#define ADDR2HI_VPN2(a)  (ADDR2HI_VPN((a)) >> 1)
-
-#define HI_VPN2ADDR(vpn)    ((vpn) << VPN_SHIFT)
-#define HI_VPN22ADDR(vpn2)  (HI_VPN2ADDR(vpn2) << 1)
-
-#define LO_PFN2ADDR(pfn)  ((pfn) << PFN_SHIFT)
-
-#define BANK_SELECT_BIT(a)  (((a) >> PAGE_WIDTH) & 1)
+#define PFN_SHIFT       12
+#define VPN_SHIFT       12
+#define ADDR2VPN(a)     ((a) >> VPN_SHIFT)
+#define ADDR2VPN2(a)    (ADDR2VPN((a)) >> 1)
+#define VPN2ADDR(vpn)   ((vpn) << VPN_SHIFT)
+#define VPN22ADDR(vpn2) (VPN2ADDR(vpn2) << 1)
+#define PFN2ADDR(pfn)   ((pfn) << PFN_SHIFT)
+
+#define BANK_SELECT_BIT(a)      (((a) >> PAGE_WIDTH) & 1) 
+        
 
 /** Initialize TLB.
@@ -97 +94 @@
         entry_lo_t lo;
         uintptr_t badvaddr;
-        pte_t pte;
+        pte_t *pte;
         
         badvaddr = cp0_badvaddr_read();
 
-        bool found = page_mapping_find(AS, badvaddr, true, &pte);
-        if (found && pte.p) {
+        pte = page_mapping_find(AS, badvaddr, true);
+        if (pte && pte->p) {
                 /*
                  * Record access to PTE.
                  */
-                pte.a = 1;
-
-                tlb_prepare_entry_lo(&lo, pte.g, pte.p, pte.d,
-                    pte.cacheable, pte.pfn);
-
-                page_mapping_update(AS, badvaddr, true, &pte);
+                pte->a = 1;
+
+                tlb_prepare_entry_lo(&lo, pte->g, pte->p, pte->d,
+                    pte->cacheable, pte->pfn);
 
                 /*
@@ -140 +135 @@
         tlb_index_t index;
         uintptr_t badvaddr;
-        pte_t pte;
+        pte_t *pte;
 
         /*
@@ -164 +159 @@
         badvaddr = cp0_badvaddr_read();
 
-        bool found = page_mapping_find(AS, badvaddr, true, &pte);
-        if (found && pte.p) {
+        pte = page_mapping_find(AS, badvaddr, true);
+        if (pte && pte->p) {
                 /*
                  * Read the faulting TLB entry.
@@ -174 +169 @@
                  * Record access to PTE.
                  */
-                pte.a = 1;
-
-                tlb_prepare_entry_lo(&lo, pte.g, pte.p, pte.d,
-                    pte.cacheable, pte.pfn);
-
-                page_mapping_update(AS, badvaddr, true, &pte);
+                pte->a = 1;
+
+                tlb_prepare_entry_lo(&lo, pte->g, pte->p, pte->d,
+                    pte->cacheable, pte->pfn);
 
                 /*
@@ -204 +197 @@
         tlb_index_t index;
         uintptr_t badvaddr;
-        pte_t pte;
+        pte_t *pte;
 
         badvaddr = cp0_badvaddr_read();
@@ -222 +215 @@
          */
         if (index.p) {
-                log(LF_ARCH, LVL_WARN, "%s: TLBP failed in exception handler (badvaddr=%#"
+                printf("%s: TLBP failed in exception handler (badvaddr=%#"
                     PRIxn ", ASID=%d).\n", __func__, badvaddr,
                     AS ? AS->asid : -1);
@@ -228 +221 @@
         }
 
-        bool found = page_mapping_find(AS, badvaddr, true, &pte);
-        if (found && pte.p && pte.w) {
+        pte = page_mapping_find(AS, badvaddr, true);
+        if (pte && pte->p && pte->w) {
                 /*
                  * Read the faulting TLB entry.
@@ -238 +231 @@
                  * Record access and write to PTE.
                  */
-                pte.a = 1;
-                pte.d = 1;
-
-                tlb_prepare_entry_lo(&lo, pte.g, pte.p, pte.w,
-                    pte.cacheable, pte.pfn);
-
-                page_mapping_update(AS, badvaddr, true, &pte);
+                pte->a = 1;
+                pte->d = 1;
+
+                tlb_prepare_entry_lo(&lo, pte->g, pte->p, pte->w,
+                    pte->cacheable, pte->pfn);
 
                 /*
@@ -275 +266 @@
 {
         hi->value = 0;
-        hi->vpn2 = ADDR2HI_VPN2(ALIGN_DOWN(addr, PAGE_SIZE));
+        hi->vpn2 = ADDR2VPN2(ALIGN_DOWN(addr, PAGE_SIZE));
         hi->asid = asid;
 }
@@ -304 +295 @@
                 
                 printf("%-4u %-6u %0#10x %-#6x  %1u%1u%1u%1u  %0#10x\n",
-                    i, hi.asid, HI_VPN22ADDR(hi.vpn2), mask.mask,
-                    lo0.g, lo0.v, lo0.d, lo0.c, LO_PFN2ADDR(lo0.pfn));
+                    i, hi.asid, VPN22ADDR(hi.vpn2), mask.mask,
+                    lo0.g, lo0.v, lo0.d, lo0.c, PFN2ADDR(lo0.pfn));
                 printf("                               %1u%1u%1u%1u  %0#10x\n",
-                    lo1.g, lo1.v, lo1.d, lo1.c, LO_PFN2ADDR(lo1.pfn));
+                    lo1.g, lo1.v, lo1.d, lo1.c, PFN2ADDR(lo1.pfn));
         }