Changeset 89c57b6 in mainline for kernel/arch/arm32/src/mm/page_fault.c

Timestamp:

2011-04-13T14:45:41Z (14 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

88634420

Parents:

cefb126 (diff), 17279ead (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/arm32/src/mm/page_fault.c (modified) (4 diffs)

kernel/arch/arm32/src/mm/page_fault.c

@@ -141 +141 @@
         if (instr.condition == 0xf) {
                 panic("page_fault - instruction does not access memory "
-                    "(instr_code: %x, badvaddr:%x).", instr, badvaddr);
+                    "(instr_code: %#0" PRIx32 ", badvaddr:%p).",
+                    instr_union.pc, (void *) badvaddr);
                 return PF_ACCESS_EXEC;
         }
@@ -160 +161 @@
 
         panic("page_fault - instruction doesn't access memory "
-            "(instr_code: %x, badvaddr:%x).", instr, badvaddr);
+            "(instr_code: %#0" PRIx32 ", badvaddr:%p).",
+            instr_union.pc, (void *) badvaddr);
 
         return PF_ACCESS_EXEC;
@@ -183 +185 @@
         if (ret == AS_PF_FAULT) {
                 fault_if_from_uspace(istate, "Page fault: %#x.", badvaddr);
-                panic_memtrap(istate, access, badvaddr, "Page fault.");
+                panic_memtrap(istate, access, badvaddr, NULL);
         }
 }
@@ -198 +200 @@
 
         if (ret == AS_PF_FAULT) {
-                panic_memtrap(istate, PF_ACCESS_EXEC, istate->pc,
-                    "Page fault - prefetch_abort.");
+                fault_if_from_uspace(istate,
+                    "Page fault - prefetch_abort: %#x.", istate->pc);
+                panic_memtrap(istate, PF_ACCESS_EXEC, istate->pc, NULL);
         }
 }