Changeset cf84d72a in mainline

Timestamp:

2006-06-18T01:04:26Z (18 years ago)

Author:

Martin Decky <martin@…>

Branches:

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

Children:

281994b

Parents:

1bb2e7a

Message:

fix segment register values, ppc32 works again (both w/ and w/o BAT)

Location:

arch/ppc32/src/mm

Files:

• as.c (modified) (3 diffs)
• tlb.c (modified) (1 diff)

arch/ppc32/src/mm/as.c

@@ -56 +56 @@
         asid_t asid;
         ipl_t ipl;
-        __u8 sr;
+        __u32 sr;
 
         ipl = interrupts_disable();
@@ -68 +68 @@
                         "mtsrin %0, %1\n"
                         :
-                        : "r" (0x6000 + (asid << 4) + sr), "r" (sr * 0x1000)
+                        : "r" ((0x6000 << 16) + (asid << 4) + sr), "r" (sr << 28)
                 );
         }
@@ -77 +77 @@
                         "mtsrin %0, %1\n"
                         :
-                        : "r" (0x4000 + (asid << 4) + sr), "r" (sr * 0x1000)
+                        : "r" ((0x4000 << 16) + (asid << 4) + sr), "r" (sr << 28)
                 );
         }

arch/ppc32/src/mm/tlb.c

@@ -378 +378 @@
 void tlb_print(void)
 {
-        // TODO
+        __u32 sr;
+        
+        for (sr = 0; sr < 16; sr++) {
+                __u32 vsid;
+                asm volatile (
+                        "mfsrin %0, %1\n"
+                        : "=r" (vsid)
+                        : "r" (sr << 28)
+                );
+                printf("vsid[%#x]=%#x\n", sr << 28, vsid);
+        }
 }