Changeset 371bd7d in mainline for kernel/arch/arm32/include/exception.h

Timestamp:

2010-03-27T09:22:17Z (16 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

36a75a2

Parents:

cd82bb1 (diff), eaf22d4 (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.

File:

• kernel/arch/arm32/include/exception.h (modified) (4 diffs)

kernel/arch/arm32/include/exception.h

@@ -38 +38 @@
 #define KERN_arm32_EXCEPTION_H_
 
-#include <arch/types.h>
+#include <typedefs.h>
 #include <arch/regutils.h>
 
@@ -86 +86 @@
 
 /** Struct representing CPU state saved when an exception occurs. */
-typedef struct {
+typedef struct istate {
         uint32_t spsr;
         uint32_t sp;
@@ -102 +102 @@
         uint32_t r9;
         uint32_t r10;
-        uint32_t r11;
+        uint32_t fp;
         uint32_t r12;
 
@@ -133 +133 @@
 }
 
+static inline unative_t istate_get_fp(istate_t *istate)
+{
+        return istate->fp;
+}
+
 
 extern void install_exception_handlers(void);