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

Timestamp:

2010-07-12T10:53:30Z (14 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

bd11d3e

Parents:

c40e6ef (diff), bee2d4c (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/mips32/include/exception.h (modified) (4 diffs)

kernel/arch/mips32/include/exception.h

@@ -27 +27 @@
  */
 
-/** @addtogroup mips32  
+/** @addtogroup mips32
  * @{
  */
@@ -38 +38 @@
 #include <typedefs.h>
 #include <arch/cp0.h>
+#include <trace.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 {
@@ -82 +83 @@
         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 */
+        
+        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)
+NO_TRACE static inline void istate_set_retaddr(istate_t *istate,
+    uintptr_t retaddr)
 {
         istate->epc = retaddr;
@@ -94 +96 @@
 
 /** Return true if exception happened while in userspace */
-static inline int istate_from_uspace(istate_t *istate)
+NO_TRACE 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)
+
+NO_TRACE static inline unative_t istate_get_pc(istate_t *istate)
 {
         return istate->epc;
 }
-static inline unative_t istate_get_fp(istate_t *istate)
+
+NO_TRACE static inline unative_t istate_get_fp(istate_t *istate)
 {
-        return 0;       /* FIXME */
+        /* FIXME */
+        
+        return 0;
 }