Changeset b26396e in mainline for kernel/arch/arm32

Timestamp:

2012-12-29T22:16:16Z (13 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

Location:

kernel/arch/arm32

Files:

• Makefile.inc (modified) (2 diffs)
• include/fpu_context.h (modified) (1 diff)
• include/mach/testarm/testarm.h (deleted)
• src/exception.c (modified) (2 diffs)
• src/mach/gta02/gta02.c (modified) (1 diff)
• src/mach/testarm/testarm.c (deleted)
• src/machine_func.c (modified) (2 diffs)
• src/ras.c (modified) (3 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 \
@@ -69 +68 @@
         arch/$(KARCH)/src/ras.c
 
+ifeq ($(CONFIG_FPU),y)
+        ARCH_SOURCES += arch/$(KARCH)/src/fpu_context.c
+endif
+
 ifeq ($(MACHINE),gta02)
         ARCH_SOURCES += arch/$(KARCH)/src/mach/gta02/gta02.c
-endif
-
-ifeq ($(MACHINE),testarm)
-        ARCH_SOURCES += arch/$(KARCH)/src/mach/testarm/testarm.c
 endif
 

kernel/arch/arm32/include/fpu_context.h

@@ -31 +31 @@
  */
 /** @file
- *  @brief FPU context (not implemented).
- *
- *  GXemul doesn't support FPU on its ARM CPU.
+ *  @brief FPU context.
  */
 

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

kernel/arch/arm32/src/mach/gta02/gta02.c

@@ -27 +27 @@
  */
 
-/** @addtogroup arm32gxemul
+/** @addtogroup arm32gta02
  * @{
  */

kernel/arch/arm32/src/machine_func.c

@@ -41 +41 @@
 #include <arch/mach/gta02/gta02.h>
 #include <arch/mach/integratorcp/integratorcp.h>
-#include <arch/mach/testarm/testarm.h>
 #include <arch/mach/beagleboardxm/beagleboardxm.h>
 
@@ -52 +51 @@
 #if defined(MACHINE_gta02)
         machine_ops = &gta02_machine_ops;
-#elif defined(MACHINE_testarm)
-        machine_ops = &gxemul_machine_ops;
 #elif defined(MACHINE_integratorcp)
         machine_ops = &icp_machine_ops;

kernel/arch/arm32/src/ras.c

@@ -67 +67 @@
 void ras_check(unsigned int n, istate_t *istate)
 {
-        bool restart = false;
+        bool restart_needed = false;
+        uintptr_t restart_pc = 0;
 
         if (istate_from_uspace(istate)) {
@@ -73 +74 @@
                         if ((ras_page[RAS_START] < istate->pc) &&
                             (ras_page[RAS_END] > istate->pc)) {
-                                restart = true;
+                                restart_needed = true;
+                                restart_pc = ras_page[RAS_START];
                         }
                         ras_page[RAS_START] = 0;
@@ -81 +83 @@
 
         exc_dispatch(n, istate);
-        if (restart)
-                istate->pc = ras_page[RAS_START];
+        if (restart_needed)
+                istate->pc = restart_pc;
 }