Changeset 0b749a3 in mainline for kernel/arch/mips32/include/exception.h

Timestamp:

2010-11-22T15:39:53Z (13 years ago)

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

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

Children:

0eddb76, aae339e9

Parents:

9a1d8ab (diff), 8cd1aa5e (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 development/ changes

File:

• kernel/arch/mips32/include/exception.h (modified) (2 diffs)

kernel/arch/mips32/include/exception.h

@@ -37 +37 @@
 
 #include <typedefs.h>
-#include <arch/cp0.h>
-#include <trace.h>
+#include <arch/istate.h>
 
 #define EXC_Int    0
@@ -59 +58 @@
 #define EXC_VCED   31
 
-typedef struct istate {
-        uint32_t at;
-        uint32_t v0;
-        uint32_t v1;
-        uint32_t a0;
-        uint32_t a1;
-        uint32_t a2;
-        uint32_t a3;
-        uint32_t t0;
-        uint32_t t1;
-        uint32_t t2;
-        uint32_t t3;
-        uint32_t t4;
-        uint32_t t5;
-        uint32_t t6;
-        uint32_t t7;
-        uint32_t t8;
-        uint32_t t9;
-        uint32_t gp;
-        uint32_t sp;
-        uint32_t ra;
-        
-        uint32_t lo;
-        uint32_t hi;
-        
-        uint32_t status;  /* cp0_status */
-        uint32_t epc;     /* cp0_epc */
-        uint32_t k1;      /* We use it as thread-local pointer */
-} istate_t;
-
-NO_TRACE static inline void istate_set_retaddr(istate_t *istate,
-    uintptr_t retaddr)
-{
-        istate->epc = retaddr;
-}
-
-/** Return true if exception happened while in userspace */
-NO_TRACE static inline int istate_from_uspace(istate_t *istate)
-{
-        return istate->status & cp0_status_um_bit;
-}
-
-NO_TRACE static inline unative_t istate_get_pc(istate_t *istate)
-{
-        return istate->epc;
-}
-
-NO_TRACE static inline unative_t istate_get_fp(istate_t *istate)
-{
-        /* FIXME */
-        
-        return 0;
-}
-
 extern void exception(istate_t *istate);
 extern void tlb_refill_entry(void);