Changeset 5481a22e in mainline

Timestamp:

2012-12-02T21:54:57Z (11 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

f9ab562

Parents:

e1326cf

Message:

arm32: Compile fpu routines only if CONFIG_FPU is set.

Location:

kernel/arch/arm32

Files:

• Makefile.inc (modified) (2 diffs)
• src/exception.c (modified) (2 diffs)

kernel/arch/arm32/Makefile.inc

@@ -52 +52 @@
         arch/$(KARCH)/src/machine_func.c \
         arch/$(KARCH)/src/context.S \
-        arch/$(KARCH)/src/fpu_context.c \
         arch/$(KARCH)/src/dummy.S \
         arch/$(KARCH)/src/cpu/cpu.c \
@@ -68 +67 @@
         arch/$(KARCH)/src/mm/page_fault.c \
         arch/$(KARCH)/src/ras.c
+
+ifeq ($(CONFIG_FPU),y)
+        ARCH_SOURCES += arch/$(KARCH)/src/fpu_context.c
+endif
 
 ifeq ($(MACHINE),gta02)

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.");
 }