Changes in kernel/arch/mips32/include/exception.h [598f90e:e1f0fe9] in mainline

File:

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

kernel/arch/mips32/include/exception.h

@@ -27 +27 @@
  */
 
-/** @addtogroup mips32
+/** @addtogroup mips32  
  * @{
  */
@@ -36 +36 @@
 #define KERN_mips32_EXCEPTION_H_
 
-#include <typedefs.h>
-#include <arch/istate.h>
+#include <arch/types.h>
+#include <arch/cp0.h>
 
-#define EXC_Int    0
-#define EXC_Mod    1
-#define EXC_TLBL   2
-#define EXC_TLBS   3
-#define EXC_AdEL   4
-#define EXC_AdES   5
-#define EXC_IBE    6
-#define EXC_DBE    7
-#define EXC_Sys    8
-#define EXC_Bp     9
-#define EXC_RI     10
-#define EXC_CpU    11
-#define EXC_Ov     12
-#define EXC_Tr     13
-#define EXC_VCEI   14
-#define EXC_FPE    15
-#define EXC_WATCH  23
-#define EXC_VCED   31
+#define EXC_Int         0
+#define EXC_Mod         1
+#define EXC_TLBL        2
+#define EXC_TLBS        3
+#define EXC_AdEL        4
+#define EXC_AdES        5
+#define EXC_IBE         6
+#define EXC_DBE         7
+#define EXC_Sys         8
+#define EXC_Bp          9
+#define EXC_RI          10
+#define EXC_CpU         11
+#define EXC_Ov          12
+#define EXC_Tr          13
+#define EXC_VCEI        14
+#define EXC_FPE         15
+#define EXC_WATCH       23
+#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;
+
+static inline void istate_set_retaddr(istate_t *istate, uintptr_t retaddr)
+{
+        istate->epc = retaddr;
+}
+
+/** Return true if exception happened while in userspace */
+static inline int istate_from_uspace(istate_t *istate)
+{
+        return istate->status & cp0_status_um_bit;
+}
+static inline unative_t istate_get_pc(istate_t *istate)
+{
+        return istate->epc;
+}
+static inline unative_t istate_get_fp(istate_t *istate)
+{
+        return 0;       /* FIXME */
+}
 
 extern void exception(istate_t *istate);