Changeset e1a27be in mainline for kernel/arch/arm32/include

Timestamp:

2012-12-29T10:48:35Z (13 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:

8f88beb7 (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

Location:

kernel/arch/arm32/include

Files:

• cpu.h (modified) (1 diff)
• fpu_context.h (modified) (2 diffs)
• mach/testarm/testarm.h (deleted)

kernel/arch/arm32/include/cpu.h

@@ -43 +43 @@
 /** Struct representing ARM CPU identification. */
 typedef struct {
-        /** Implementator (vendor) number. */
+        /** Implementor (vendor) number. */
         uint32_t imp_num;
 

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.
  */
 
@@ -41 +39 @@
 #include <typedefs.h>
 
-#define FPU_CONTEXT_ALIGN    0
+#define FPU_CONTEXT_ALIGN    8
 
+/* ARM Architecture reference manual, p B-1529.
+ */
 typedef struct {
+        uint32_t fpexc;
+        uint32_t fpscr;
+        uint32_t s[64];
 } fpu_context_t;
+
+void fpu_setup(void);
+
+bool handle_if_fpu_exception(void);
 
 #endif