Changeset 15d0046 in mainline for kernel/arch/mips32/include/arch/istate.h

Timestamp:

2014-09-12T13:22:33Z (10 years ago)

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

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

Children:

9b20126

Parents:

8db09e4 (diff), 105d8d6 (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/arch/istate.h (modified) (1 diff)

kernel/arch/mips32/include/arch/istate.h

@@ -41 +41 @@
 
 #include <arch/cp0.h>
+#include <arch/istate_struct.h>
 
 #else /* KERNEL */
 
 #include <libarch/cp0.h>
+#include <libarch/istate_struct.h>
 
 #endif /* KERNEL */
-
-typedef struct istate {
-        /*
-         * The first seven registers are arranged so that the istate structure
-         * can be used both for exception handlers and for the syscall handler.
-         */
-        uint32_t a0;    /* arg1 */
-        uint32_t a1;    /* arg2 */
-        uint32_t a2;    /* arg3 */
-        uint32_t a3;    /* arg4 */
-        uint32_t t0;    /* arg5 */
-        uint32_t t1;    /* arg6 */
-        uint32_t v0;    /* arg7 */
-        uint32_t v1;
-        uint32_t at;
-        uint32_t t2;
-        uint32_t t3;
-        uint32_t t4;
-        uint32_t t5;
-        uint32_t t6;
-        uint32_t t7;
-        uint32_t s0;
-        uint32_t s1;
-        uint32_t s2;
-        uint32_t s3;
-        uint32_t s4;
-        uint32_t s5;
-        uint32_t s6;
-        uint32_t s7;
-        uint32_t t8;
-        uint32_t t9;
-        uint32_t kt0;
-        uint32_t kt1;   /* We use it as thread-local pointer */
-        uint32_t gp;
-        uint32_t sp;
-        uint32_t s8;
-        uint32_t ra;
-        
-        uint32_t lo;
-        uint32_t hi;
-        
-        uint32_t status;        /* cp0_status */
-        uint32_t epc;           /* cp0_epc */
-
-        uint32_t alignment;     /* to make sizeof(istate_t) a multiple of 8 */
-} istate_t;
 
 NO_TRACE static inline void istate_set_retaddr(istate_t *istate,