Changeset fd3c9e5 in mainline

Timestamp:

2005-10-07T09:53:17Z (19 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

92e5431

Parents:

cc205f1

Message:

Small changes to mips32 mm.
Small changes in mm mapping test #1.

Files:

• arch/mips32/src/mm/tlb.c (modified) (1 diff)
• arch/mips32/src/mm/vm.c (modified) (1 diff)
• test/mm/mapping1/test.c (modified) (1 diff)

arch/mips32/src/mm/tlb.c

@@ -87 +87 @@
         __address badvaddr;
         pte_t *pte;
-        
+
+// debug        
+        entry_hi_t hi;
+
         badvaddr = cp0_badvaddr_read();
+
+// debug
+        hi.value = cp0_entry_hi_read();
+        printf("TLB Refill: hi.vnp2=%X\n", hi.vpn2);
         
         spinlock_lock(&VM->lock);               

arch/mips32/src/mm/vm.c

@@ -49 +49 @@
         spinlock_lock(&vm->lock);
         hi.asid = vm->asid;
-        cp0_entry_hi_write(*((__u32 *) &hi));   
+        cp0_entry_hi_write(hi.value);   
         spinlock_lock(&vm->unlock);
         cpu_priority_restore(pri);

test/mm/mapping1/test.c

@@ -53 +53 @@
         *((__u32 *) frame1) = VALUE1;
         
-        printf("Mapping %X to %X.\n", PAGE0, KA2PA(frame0));
+        printf("Mapping %P to %P.\n", PAGE0, KA2PA(frame0));
         map_page_to_frame(PAGE0, KA2PA(frame0), PAGE_PRESENT, 0);
-        printf("Mapping %X to %X.\n", PAGE1, KA2PA(frame1));    
+        printf("Mapping %P to %P.\n", PAGE1, KA2PA(frame1));    
         map_page_to_frame(PAGE1, KA2PA(frame1), PAGE_PRESENT, 0);
         
-        printf("Value at %X is %X.\n", PAGE0, v0 = *((__u32 *) PAGE0));
-        printf("Value at %X is %X.\n", PAGE1, v1 = *((__u32 *) PAGE1));
+        printf("Value at %P is %L.\n", PAGE0, v0 = *((__u32 *) PAGE0));
+        printf("Value at %P is %L.\n", PAGE1, v1 = *((__u32 *) PAGE1));
         
         ASSERT(v0 == VALUE0);
         ASSERT(v1 == VALUE1);
 
-        printf("Writing 0 to %X.\n", PAGE0);
+        printf("Writing 0 to %P.\n", PAGE0);
         *((__u32 *) PAGE0) = 0;
-        printf("Writing 0 to %X.\n", PAGE1);
+        printf("Writing 0 to %P.\n", PAGE1);
         *((__u32 *) PAGE1) = 0; 
         
-        printf("Value at %X is %X.\n", PAGE0, v0 = *((__u32 *) PAGE0)); 
-        printf("Value at %X is %X.\n", PAGE1, v1 = *((__u32 *) PAGE1));
+        printf("Value at %P is %L.\n", PAGE0, v0 = *((__u32 *) PAGE0)); 
+        printf("Value at %P is %L.\n", PAGE1, v1 = *((__u32 *) PAGE1));
 
         ASSERT(v0 == 0);