Changeset 5481a22e in mainline


Ignore:
Timestamp:
2012-12-02T21:54:57Z (12 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:
2 edited

Legend:

Unmodified
Added
Removed
  • kernel/arch/arm32/Makefile.inc

    re1326cf r5481a22e  
    5252        arch/$(KARCH)/src/machine_func.c \
    5353        arch/$(KARCH)/src/context.S \
    54         arch/$(KARCH)/src/fpu_context.c \
    5554        arch/$(KARCH)/src/dummy.S \
    5655        arch/$(KARCH)/src/cpu/cpu.c \
     
    6867        arch/$(KARCH)/src/mm/page_fault.c \
    6968        arch/$(KARCH)/src/ras.c
     69
     70ifeq ($(CONFIG_FPU),y)
     71        ARCH_SOURCES += arch/$(KARCH)/src/fpu_context.c
     72endif
    7073
    7174ifeq ($(MACHINE),gta02)
  • kernel/arch/arm32/src/exception.c

    re1326cf r5481a22e  
    167167static void undef_insn_exception(unsigned int exc_no, istate_t *istate)
    168168{
    169         if (!handle_if_fpu_exception()) {
    170                 fault_if_from_uspace(istate, "Undefined instruction.");
    171                 panic_badtrap(istate, exc_no, "Undefined instruction.");
    172         } else {
     169#ifdef CONFIG_FPU
     170        if (handle_if_fpu_exception()) {
    173171                /*
    174172                 * Retry the failing instruction,
     
    177175                 */
    178176                istate->pc -= 4;
     177                return;
    179178        }
     179#endif
     180        fault_if_from_uspace(istate, "Undefined instruction.");
     181        panic_badtrap(istate, exc_no, "Undefined instruction.");
    180182}
    181183
Note: See TracChangeset for help on using the changeset viewer.