Changeset b5e68c8 in mainline for kernel/arch/sparc64/src/mm/sun4u/tlb.c

Timestamp:

2011-05-12T16:49:44Z (14 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

f36787d7

Parents:

e80329d6 (diff), 750636a (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge mainline changes.

File:

• kernel/arch/sparc64/src/mm/sun4u/tlb.c (modified) (7 diffs)

kernel/arch/sparc64/src/mm/sun4u/tlb.c

@@ -200 +200 @@
 
 /** ITLB miss handler. */
-void fast_instruction_access_mmu_miss(unative_t unused, istate_t *istate)
+void fast_instruction_access_mmu_miss(sysarg_t unused, istate_t *istate)
 {
         uintptr_t page_16k = ALIGN_DOWN(istate->tpc, PAGE_SIZE);
@@ -360 +360 @@
 static void print_tlb_entry(int i, tlb_tag_read_reg_t t, tlb_data_t d)
 {
-        printf("%d: vpn=%#llx, context=%d, v=%d, size=%d, nfo=%d, "
-            "ie=%d, soft2=%#x, pfn=%#x, soft=%#x, l=%d, "
-            "cp=%d, cv=%d, e=%d, p=%d, w=%d, g=%d\n", i, t.vpn,
+        printf("%u: vpn=%#" PRIx64 ", context=%u, v=%u, size=%u, nfo=%u, "
+            "ie=%u, soft2=%#x, pfn=%#x, soft=%#x, l=%u, "
+            "cp=%u, cv=%u, e=%u, p=%u, w=%u, g=%u\n", i, (uint64_t) t.vpn,
             t.context, d.v, d.size, d.nfo, d.ie, d.soft2,
             d.pfn, d.soft, d.l, d.cp, d.cv, d.e, d.p, d.w, d.g);
@@ -441 +441 @@
     uintptr_t va, const char *str)
 {
-        fault_if_from_uspace(istate, "%s, Address=%p.", str, va);
+        fault_if_from_uspace(istate, "%s, address=%p.", str, (void *) va);
         panic_memtrap(istate, PF_ACCESS_EXEC, va, str);
 }
@@ -451 +451 @@
 
         va = tag.vpn << MMU_PAGE_WIDTH;
-        fault_if_from_uspace(istate, "%s, Page=%p (ASID=%d).", str, va,
-            tag.context);
+        fault_if_from_uspace(istate, "%s, page=%p (asid=%u).", str,
+            (void *) va, tag.context);
         panic_memtrap(istate, PF_ACCESS_UNKNOWN, va, str);
 }
@@ -462 +462 @@
 
         va = tag.vpn << MMU_PAGE_WIDTH;
-        fault_if_from_uspace(istate, "%s, Page=%p (ASID=%d).", str, va,
-            tag.context);
+        fault_if_from_uspace(istate, "%s, page=%p (asid=%u).", str,
+            (void *) va, tag.context);
         panic_memtrap(istate, PF_ACCESS_WRITE, va, str);
 }
@@ -484 +484 @@
             sfsr.e, sfsr.ct, sfsr.pr, sfsr.w, sfsr.ow, sfsr.fv);
 #endif
-            
-        printf("DTLB SFAR: address=%p\n", sfar);
+        
+        printf("DTLB SFAR: address=%p\n", (void *) sfar);
         
         dtlb_sfsr_write(0);
@@ -508 +508 @@
 #endif
             
-        printf("DTLB SFAR: address=%p\n", sfar);
+        printf("DTLB SFAR: address=%p\n", (void *) sfar);
         
         dtlb_sfsr_write(0);