Changeset e1a27be in mainline for kernel/arch/arm32/src/exception.c

Timestamp:

2012-12-29T10:48:35Z (12 years ago)

Author:

Maurizio Lombardi <m.lombardi85@…>

Branches:

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

Children:

17cc8f4f

Parents:

8f88beb (diff), c928bb7 (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/exception.c (modified) (2 diffs)

kernel/arch/arm32/src/exception.c

@@ -161 +161 @@
 }
 
+/** Undefined instruction exception handler.
+ *
+ * Calls scheduler_fpu_lazy_request
+ */
+static void undef_insn_exception(unsigned int exc_no, istate_t *istate)
+{
+#ifdef CONFIG_FPU
+        if (handle_if_fpu_exception()) {
+                /*
+                 * Retry the failing instruction,
+                 * ARM Architecture Reference Manual says on p.B1-1169
+                 * that offset for undef instruction exception is 4
+                 */
+                istate->pc -= 4;
+                return;
+        }
+#endif
+        fault_if_from_uspace(istate, "Undefined instruction.");
+        panic_badtrap(istate, exc_no, "Undefined instruction.");
+}
+
 /** Initializes exception handling.
  *
@@ -174 +195 @@
         install_exception_handlers();
         
+        exc_register(EXC_UNDEF_INSTR, "undefined instruction", true,
+            (iroutine_t) undef_insn_exception);
         exc_register(EXC_IRQ, "interrupt", true,
             (iroutine_t) irq_exception);