Changeset 60d931d in mainline

Timestamp:

2012-09-07T15:00:02Z (12 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

1dbd189, 3451129

Parents:

23c1fae

Message:

arm32: Print instruction code instead of pc.

The text says it is instruction code.

File:

• kernel/arch/arm32/src/mm/page_fault.c (modified) (3 diffs)

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

@@ -83 +83 @@
  *
  * @return Type of access into memory, PF_ACCESS_EXEC if no memory access is
- *         requested.
+ *         requested.
  */
 static pf_access_t get_memory_access_type(uint32_t instr_addr,
@@ -125 +125 @@
                 { 0x0fb00000, 0x01000000, PF_ACCESS_WRITE },
         };
-        uint32_t inst = *(uint32_t*)instr_addr;
+        const uint32_t inst = *(uint32_t*)instr_addr;
         for (unsigned i = 0; i < sizeof(ls_inst) / sizeof(ls_inst[0]); ++i) {
                 if ((inst & ls_inst[i].mask) == ls_inst[i].value) {
@@ -134 +134 @@
         panic("page_fault - instruction doesn't access memory "
             "(instr_code: %#0" PRIx32 ", badvaddr:%p).",
-            instr_union.pc, (void *) badvaddr);
+            inst, (void *) badvaddr);
 }