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

Timestamp:

2011-04-13T14:45:41Z (14 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/sparc64/include/interrupt.h (modified) (1 diff)

kernel/arch/sparc64/include/interrupt.h

@@ -38 +38 @@
 
 #include <typedefs.h>
-#include <arch/regdef.h>
+#include <arch/istate.h>
 
-#define IVT_ITEMS       15
-#define IVT_FIRST       1
+#define IVT_ITEMS  15
+#define IVT_FIRST  1
 
 /* This needs to be defined for inter-architecture API portability. */
-#define VECTOR_TLB_SHOOTDOWN_IPI        0
+#define VECTOR_TLB_SHOOTDOWN_IPI  0
 
 enum {
         IPI_TLB_SHOOTDOWN = VECTOR_TLB_SHOOTDOWN_IPI
-};              
-
-typedef struct istate {
-        uint64_t        tnpc;
-        uint64_t        tpc;
-        uint64_t        tstate;
-} istate_t;
-
-static inline void istate_set_retaddr(istate_t *istate, uintptr_t retaddr)
-{
-        istate->tpc = retaddr;
-}
-
-static inline int istate_from_uspace(istate_t *istate)
-{
-        return !(istate->tstate & TSTATE_PRIV_BIT);
-}
-
-static inline unative_t istate_get_pc(istate_t *istate)
-{
-        return istate->tpc;
-}
-
-static inline unative_t istate_get_fp(istate_t *istate)
-{
-        return 0;       /* TODO */
-}
+};
 
 #endif