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

Timestamp:

2010-07-02T14:19:30Z (14 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

89c57b6

Parents:

fe7abd0 (diff), e3ee9b9 (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

@@ -27 +27 @@
  */
 
-/** @addtogroup sparc64mm       
+/** @addtogroup sparc64mm
  * @{
  */
@@ -58 +58 @@
 static void dtlb_pte_copy(pte_t *, size_t, bool);
 static void itlb_pte_copy(pte_t *, size_t);
-static void do_fast_instruction_access_mmu_miss_fault(istate_t *, const char *);
+static void do_fast_instruction_access_mmu_miss_fault(istate_t *, uintptr_t,
+    const char *);
 static void do_fast_data_access_mmu_miss_fault(istate_t *, tlb_tag_access_reg_t,
     const char *);
@@ -222 +223 @@
                  * Forward the page fault to the address space page fault
                  * handler.
-                 */             
+                 */
                 page_table_unlock(AS, true);
                 if (as_page_fault(page_16k, PF_ACCESS_EXEC, istate) ==
                     AS_PF_FAULT) {
                         do_fast_instruction_access_mmu_miss_fault(istate,
-                            __func__);
+                            istate->tpc, __func__);
                 }
         }
@@ -258 +259 @@
                         /* NULL access in kernel */
                         do_fast_data_access_mmu_miss_fault(istate, tag,
-                            __func__);
+                            "Dereferencing NULL pointer");
                 } else if (page_8k >= end_of_identity) {
                         /*
@@ -438 +439 @@
 
 void do_fast_instruction_access_mmu_miss_fault(istate_t *istate,
-    const char *str)
-{
-        fault_if_from_uspace(istate, "%s.", str);
-        dump_istate(istate);
-        panic("%s.", str);
+    uintptr_t va, const char *str)
+{
+        fault_if_from_uspace(istate, "%s, Address=%p.", str, va);
+        panic_memtrap(istate, PF_ACCESS_EXEC, va, "%s.", str);
 }
 
@@ -451 +451 @@
 
         va = tag.vpn << MMU_PAGE_WIDTH;
-        if (tag.context) {
-                fault_if_from_uspace(istate, "%s, Page=%p (ASID=%d).", str, va,
-                    tag.context);
-        }
-        dump_istate(istate);
-        printf("Faulting page: %p, ASID=%d.\n", va, tag.context);
-        panic("%s.", str);
+        fault_if_from_uspace(istate, "%s, Page=%p (ASID=%d).", str, va,
+            tag.context);
+        panic_memtrap(istate, PF_ACCESS_READ, va, "%s.", str);
 }
 
@@ -466 +462 @@
 
         va = tag.vpn << MMU_PAGE_WIDTH;
-
-        if (tag.context) {
-                fault_if_from_uspace(istate, "%s, Page=%p (ASID=%d).", str, va,
-                    tag.context);
-        }
-        printf("Faulting page: %p, ASID=%d\n", va, tag.context);
-        dump_istate(istate);
-        panic("%s.", str);
+        fault_if_from_uspace(istate, "%s, Page=%p (ASID=%d).", str, va,
+            tag.context);
+        panic_memtrap(istate, PF_ACCESS_WRITE, va, "%s.", str);
 }