Changeset 46c20c8 in mainline for kernel/arch/arm32/src/mm/page_fault.c

Timestamp:

2010-11-26T20:08:10Z (15 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

45df59a

Parents:

fb150d78 (diff), ffdd2b9 (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) (5 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;
@@ -167 +169 @@
 /** Handles "data abort" exception (load or store at invalid address).
  *
- * @param exc_no        Exception number.
- * @param istate        CPU state when exception occured.
- */
-void data_abort(int exc_no, istate_t *istate)
+ * @param exc_no Exception number.
+ * @param istate CPU state when exception occured.
+ *
+ */
+void data_abort(unsigned int exc_no, istate_t *istate)
 {
         fault_status_t fsr __attribute__ ((unused)) =
@@ -182 +185 @@
         if (ret == AS_PF_FAULT) {
                 fault_if_from_uspace(istate, "Page fault: %#x.", badvaddr);
-                print_istate(istate);
-                printf("page fault - pc: %x, va: %x, status: %x(%x), "
-                    "access:%d\n", istate->pc, badvaddr, fsr.status, fsr,
-                    access);
-                
-                panic("Page fault.");
+                panic_memtrap(istate, access, badvaddr, NULL);
         }
 }
@@ -193 +191 @@
 /** Handles "prefetch abort" exception (instruction couldn't be executed).
  *
- * @param exc_no        Exception number.
- * @param istate        CPU state when exception occured.
- */
-void prefetch_abort(int exc_no, istate_t *istate)
+ * @param exc_no Exception number.
+ * @param istate CPU state when exception occured.
+ *
+ */
+void prefetch_abort(unsigned int exc_no, istate_t *istate)
 {
         int ret = as_page_fault(istate->pc, PF_ACCESS_EXEC, istate);
 
         if (ret == AS_PF_FAULT) {
-                printf("prefetch_abort\n");
-                print_istate(istate);
-                panic("page fault - prefetch_abort at address: %x.",
-                    istate->pc);
+                fault_if_from_uspace(istate,
+                    "Page fault - prefetch_abort: %#x.", istate->pc);
+                panic_memtrap(istate, PF_ACCESS_EXEC, istate->pc, NULL);
         }
 }