Changeset 89c57b6 in mainline for kernel/arch/abs32le/include/interrupt.h

Timestamp:

2011-04-13T14:45:41Z (13 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

88634420

Parents:

cefb126 (diff), 17279ead (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/abs32le/include/interrupt.h (modified) (2 diffs)

kernel/arch/abs32le/include/interrupt.h

@@ -37 +37 @@
 
 #include <typedefs.h>
-#include <verify.h>
+#include <arch/istate.h>
 
 #define IVT_ITEMS  0
@@ -44 +44 @@
 #define VECTOR_TLB_SHOOTDOWN_IPI  0
 
-/*
- * On real hardware this stores the registers which
- * need to be preserved during interupts.
- */
-typedef struct istate {
-        uintptr_t ip;
-        uintptr_t fp;
-        uint32_t stack[];
-} istate_t;
-
-static inline int istate_from_uspace(istate_t *istate)
-    REQUIRES_EXTENT_MUTABLE(istate)
-{
-        /* On real hardware this checks whether the interrupted
-           context originated from user space. */
-        
-        return !(istate->ip & 0x80000000);
-}
-
-static inline void istate_set_retaddr(istate_t *istate, uintptr_t retaddr)
-    WRITES(&istate->ip)
-{
-        /* On real hardware this sets the instruction pointer. */
-        
-        istate->ip = retaddr;
-}
-
-static inline unative_t istate_get_pc(istate_t *istate)
-    REQUIRES_EXTENT_MUTABLE(istate)
-{
-        /* On real hardware this returns the instruction pointer. */
-        
-        return istate->ip;
-}
-
-static inline unative_t istate_get_fp(istate_t *istate)
-    REQUIRES_EXTENT_MUTABLE(istate)
-{
-        /* On real hardware this returns the frame pointer. */
-        
-        return istate->fp;
-}
-
 #endif