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

Timestamp:

2012-12-29T22:16:16Z (11 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

26e550c2

Parents:

ce60be1 (diff), b55877d (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:

Mainline changes

File:

• kernel/arch/arm32/src/exception.c (modified) (2 diffs)

kernel/arch/arm32/src/exception.c

@@ -167 +167 @@
 static void undef_insn_exception(unsigned int exc_no, istate_t *istate)
 {
-        if (!handle_if_fpu_exception()) {
-                fault_if_from_uspace(istate, "Undefined instruction.");
-                panic_badtrap(istate, exc_no, "Undefined instruction.");
-        } else {
+#ifdef CONFIG_FPU
+        if (handle_if_fpu_exception()) {
                 /*
                  * Retry the failing instruction,
@@ -177 +175 @@
                  */
                 istate->pc -= 4;
+                return;
         }
+#endif
+        fault_if_from_uspace(istate, "Undefined instruction.");
+        panic_badtrap(istate, exc_no, "Undefined instruction.");
 }