Changeset f9425006 in mainline for arch/mips32/src/mm/tlb.c

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.

File:

• arch/mips32/src/mm/tlb.c (modified) (8 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);
+}