Changeset 308cdd1 in mainline for kernel/arch

Timestamp:

2008-03-15T12:21:09Z (18 years ago)

Author:

Josef Cejka <malyzelenyhnus@…>

Branches:

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

Children:

ca21eb4b

Parents:

8476a8d

Message:

Context saving/restoring macros used for mips32.

Location:

kernel/arch/mips32

Files:

• include/context_offset.h (modified) (2 diffs)
• src/context.S (modified) (3 diffs)

kernel/arch/mips32/include/context_offset.h

@@ -42 +42 @@
 #define OFFSET_S8      0x28
 #define OFFSET_GP      0x2c
+
+#ifdef KERNEL
+# define OFFSET_IPL     0x30
+#else
+# define OFFSET_TLS     0x30
+
+# define OFFSET_F20     0x34
+# define OFFSET_F21     0x38
+# define OFFSET_F22     0x3c
+# define OFFSET_F23     0x40
+# define OFFSET_F24     0x44
+# define OFFSET_F25     0x48
+# define OFFSET_F26     0x4c
+# define OFFSET_F27     0x50
+# define OFFSET_F28     0x54
+# define OFFSET_F29     0x58
+# define OFFSET_F30     0x5c
+#endif /* KERNEL */
 
 /* istate_t */
@@ -80 +98 @@
 #define REGISTER_SPACE 136
 
+#ifdef __ASM__
+
+#include <arch/asm/regname.h>
+
+# ctx: address of the structure with saved context
+.macro CONTEXT_SAVE_ARCH_CORE ctx:req
+        sw $s0,OFFSET_S0(\ctx)
+        sw $s1,OFFSET_S1(\ctx)
+        sw $s2,OFFSET_S2(\ctx)
+        sw $s3,OFFSET_S3(\ctx)
+        sw $s4,OFFSET_S4(\ctx)
+        sw $s5,OFFSET_S5(\ctx)
+        sw $s6,OFFSET_S6(\ctx)
+        sw $s7,OFFSET_S7(\ctx)
+        sw $s8,OFFSET_S8(\ctx)
+        sw $gp,OFFSET_GP(\ctx)
+
+#ifndef KERNEL          
+        sw $k1,OFFSET_TLS(\ctx)
+
+# ifdef CONFIG_MIPS_FPU 
+        mfc1 $t0,$20
+        sw $t0, OFFSET_F20(\ctx)
+
+        mfc1 $t0,$21
+        sw $t0, OFFSET_F21(\ctx)
+
+        mfc1 $t0,$22
+        sw $t0, OFFSET_F22(\ctx)
+
+        mfc1 $t0,$23
+        sw $t0, OFFSET_F23(\ctx)
+
+        mfc1 $t0,$24
+        sw $t0, OFFSET_F24(\ctx)
+
+        mfc1 $t0,$25
+        sw $t0, OFFSET_F25(\ctx)
+
+        mfc1 $t0,$26
+        sw $t0, OFFSET_F26(\ctx)
+
+        mfc1 $t0,$27
+        sw $t0, OFFSET_F27(\ctx)
+
+        mfc1 $t0,$28
+        sw $t0, OFFSET_F28(\ctx)
+
+        mfc1 $t0,$29
+        sw $t0, OFFSET_F29(\ctx)
+        
+        mfc1 $t0,$30
+        sw $t0, OFFSET_F30(\ctx)
+# endif /* CONFIG_MIPS_FPU */   
+#endif /* KERNEL */
+
+        sw $ra,OFFSET_PC(\ctx)
+        sw $sp,OFFSET_SP(\ctx)
+.endm
+
+# ctx: address of the structure with saved context
+.macro CONTEXT_RESTORE_ARCH_CORE ctx:req
+        lw $s0,OFFSET_S0(\ctx)
+        lw $s1,OFFSET_S1(\ctx)
+        lw $s2,OFFSET_S2(\ctx)
+        lw $s3,OFFSET_S3(\ctx)
+        lw $s4,OFFSET_S4(\ctx)
+        lw $s5,OFFSET_S5(\ctx)
+        lw $s6,OFFSET_S6(\ctx)
+        lw $s7,OFFSET_S7(\ctx)
+        lw $s8,OFFSET_S8(\ctx)
+        lw $gp,OFFSET_GP(\ctx)
+#ifndef KERNEL
+        lw $k1,OFFSET_TLS(\ctx)
+
+# ifdef CONFIG_MIPS_FPU 
+        lw $t0, OFFSET_F20(\ctx)
+        mtc1 $t0,$20
+
+        lw $t0, OFFSET_F21(\ctx)
+        mtc1 $t0,$21
+
+        lw $t0, OFFSET_F22(\ctx)
+        mtc1 $t0,$22
+
+        lw $t0, OFFSET_F23(\ctx)
+        mtc1 $t0,$23
+
+        lw $t0, OFFSET_F24(\ctx)
+        mtc1 $t0,$24
+
+        lw $t0, OFFSET_F25(\ctx)
+        mtc1 $t0,$25
+
+        lw $t0, OFFSET_F26(\ctx)
+        mtc1 $t0,$26
+
+        lw $t0, OFFSET_F27(\ctx)
+        mtc1 $t0,$27
+
+        lw $t0, OFFSET_F28(\ctx)
+        mtc1 $t0,$28
+
+        lw $t0, OFFSET_F29(\ctx)
+        mtc1 $t0,$29
+
+        lw $t0, OFFSET_F30(\ctx)
+        mtc1 $t0,$30
+# endif /* CONFIG_MIPS_FPU */
+        
+#endif /* KERNEL */
+        lw $ra,OFFSET_PC(\ctx)
+        lw $sp,OFFSET_SP(\ctx)
+.endm
+
 #endif
+
+
+#endif

kernel/arch/mips32/src/context.S

@@ -27 +27 @@
 #
 
-#include <arch/asm/regname.h>
 #include <arch/context_offset.h>
         
@@ -39 +38 @@
 .global context_restore_arch
 
-.macro CONTEXT_STORE r
-        sw $s0,OFFSET_S0(\r)
-        sw $s1,OFFSET_S1(\r)
-        sw $s2,OFFSET_S2(\r)
-        sw $s3,OFFSET_S3(\r)
-        sw $s4,OFFSET_S4(\r)
-        sw $s5,OFFSET_S5(\r)
-        sw $s6,OFFSET_S6(\r)
-        sw $s7,OFFSET_S7(\r)
-        sw $s8,OFFSET_S8(\r)
-        sw $gp,OFFSET_GP(\r)
-        
-        sw $ra,OFFSET_PC(\r)
-        sw $sp,OFFSET_SP(\r)
-.endm
-
-.macro CONTEXT_LOAD r
-        lw $s0,OFFSET_S0(\r)
-        lw $s1,OFFSET_S1(\r)
-        lw $s2,OFFSET_S2(\r)
-        lw $s3,OFFSET_S3(\r)
-        lw $s4,OFFSET_S4(\r)
-        lw $s5,OFFSET_S5(\r)
-        lw $s6,OFFSET_S6(\r)
-        lw $s7,OFFSET_S7(\r)
-        lw $s8,OFFSET_S8(\r)
-        lw $gp,OFFSET_GP(\r)
-        
-        lw $ra,OFFSET_PC(\r)
-        lw $sp,OFFSET_SP(\r)
-.endm
-
         
 context_save_arch:
-        CONTEXT_STORE $a0
+        CONTEXT_SAVE_ARCH_CORE $a0
 
         # context_save returns 1
@@ -80 +47 @@
         
 context_restore_arch:
-        CONTEXT_LOAD $a0
+        CONTEXT_RESTORE_ARCH_CORE $a0
 
         # context_restore returns 0