Changeset f9425006 in mainline

Timestamp:

2006-01-13T16:29:20Z (19 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

214e89e3

Parents:

20d50a1

Message:

Make various mips32 tlb manipulation functions preserve EntryHi register.

Cleanup and more precise comments for previous commit.

Files:

• arch/mips32/src/mm/tlb.c (modified) (8 diffs)
• generic/src/mm/as.c (modified) (6 diffs)

arch/mips32/src/mm/tlb.c

@@ -400 +400 @@
         page_mask_t mask;
         entry_lo_t lo0, lo1;
-        entry_hi_t hi;
+        entry_hi_t hi, hi_save;
         int i;
+
+        hi_save.value = cp0_entry_hi_read();
 
         printf("TLB:\n");
@@ -418 +420 @@
                        lo1.g, lo1.v, lo1.d, lo1.c, lo1.pfn);
         }
+        
+        cp0_entry_hi_write(hi_save.value);
 }
 
@@ -425 +429 @@
         ipl_t ipl;
         entry_lo_t lo0, lo1;
+        entry_hi_t hi_save;
         int i;
 
+        hi_save.value = cp0_entry_hi_read();
         ipl = interrupts_disable();
 
@@ -446 +452 @@
         
         interrupts_restore(ipl);
+        cp0_entry_hi_write(hi_save.value);
 }
 
@@ -456 +463 @@
         ipl_t ipl;
         entry_lo_t lo0, lo1;
-        entry_hi_t hi;
+        entry_hi_t hi, hi_save;
         int i;
 
         ASSERT(asid != ASID_INVALID);
 
+        hi_save.value = cp0_entry_hi_read();
         ipl = interrupts_disable();
         
@@ -484 +492 @@
         
         interrupts_restore(ipl);
+        cp0_entry_hi_write(hi_save.value);
 }
 
@@ -495 +504 @@
         ipl_t ipl;
         entry_lo_t lo0, lo1;
-        entry_hi_t hi;
+        entry_hi_t hi, hi_save;
         tlb_index_t index;
 
         ASSERT(asid != ASID_INVALID);
 
+        hi_save.value = cp0_entry_hi_read();
         ipl = interrupts_disable();
 
@@ -526 +536 @@
         
         interrupts_restore(ipl);
-}
+        cp0_entry_hi_write(hi_save.value);
+}

generic/src/mm/as.c

@@ -59 +59 @@
 
 /*
- * Here we assume that PFN (Physical Frame Numbers) space
+ * Here we assume that PFN (Physical Frame Number) space
  * is smaller than the width of index_t. UNALLOCATED_PFN
  * can be then used to mark mappings wich were not
- * allocated a physical frame.
+ * yet allocated a physical frame.
  */
 #define UNALLOCATED_PFN         ((index_t) -1)
@@ -142 +142 @@
                         /*
                          * Frames will be allocated on-demand by
-                         * as_page_fault().
+                         * as_page_fault() or preloaded by
+                         * as_area_load_mapping().
                          */
                         a->mapping[i] = UNALLOCATED_PFN;
@@ -160 +161 @@
         spinlock_unlock(&as->lock);
         interrupts_restore(ipl);
-        
+
         return a;
 }
@@ -181 +182 @@
         for (i = 0; i < a->size; i++) {
                 ASSERT(a->mapping[i] == UNALLOCATED_PFN);
+                ASSERT(pfn[i] != UNALLOCATED_PFN);
                 a->mapping[i] = pfn[i];
         }
@@ -195 +197 @@
  * @param page Faulting page.
  *
- * @return 0 on page fault, 1 if address space operation
+ * @return 0 on page fault, 1 on success.
  */
 int as_page_fault(__address page)
@@ -251 +253 @@
                 memsetb(frame, FRAME_SIZE, 0);
                 area->mapping[vpn] = frame / FRAME_SIZE;
+                ASSERT(area->mapping[vpn] != UNALLOCATED_PFN);
         } else {
                 frame = area->mapping[vpn] * FRAME_SIZE;