Changeset ce890ec9 in mainline

Timestamp:

2010-09-02T19:54:37Z (14 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

23c8be7f

Parents:

7b213f2

Message:

Fix mips32 build and make syscall_shortcut() use standard istate_t offsets.

Location:

kernel/arch/mips32

Files:

• include/exception.h (modified) (1 diff)
• src/exception.c (modified) (2 diffs)
• src/start.S (modified) (12 diffs)

kernel/arch/mips32/include/exception.h

@@ -79 +79 @@
         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 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;

kernel/arch/mips32/src/exception.c

@@ -83 +83 @@
         printf("lo=%p\thi=%p\t\n", istate->lo, istate->hi);
         printf("cp0_status=%p\tcp0_epc=%p\tk1=%p\n",
-            istate->status, istate->epc, istate->k1);
+            istate->status, istate->epc, istate->kt1);
 }
 
@@ -97 +97 @@
                 ASSERT(THREAD);
                 istate->epc += 4;
-                istate->v1 = istate->k1;
+                istate->v1 = istate->kt1;
         } else
                 unhandled_exception(n, istate);

kernel/arch/mips32/src/start.S

@@ -46 +46 @@
 
 /*
- * Which status bits should are thread-local:
+ * Which status bits are thread-local:
  * KSU(UM), EXL, ERL, IE
  */
@@ -97 +97 @@
  */
 .macro REGISTERS_STORE_AND_EXC_RESET r
-        sw $at, EOFFSET_AT(\r)
-        sw $v0, EOFFSET_V0(\r)
-        sw $v1, EOFFSET_V1(\r)
-        sw $a0, EOFFSET_A0(\r)
-        sw $a1, EOFFSET_A1(\r)
-        sw $a2, EOFFSET_A2(\r)
-        sw $a3, EOFFSET_A3(\r)
-        sw $t0, EOFFSET_T0(\r)
-        sw $t1, EOFFSET_T1(\r)
-        sw $t2, EOFFSET_T2(\r)
-        sw $t3, EOFFSET_T3(\r)
-        sw $t4, EOFFSET_T4(\r)
-        sw $t5, EOFFSET_T5(\r)
-        sw $t6, EOFFSET_T6(\r)
-        sw $t7, EOFFSET_T7(\r)
-        sw $t8, EOFFSET_T8(\r)
-        sw $t9, EOFFSET_T9(\r)
+        sw $at, ISTATE_OFFSET_AT(\r)
+        sw $v0, ISTATE_OFFSET_V0(\r)
+        sw $v1, ISTATE_OFFSET_V1(\r)
+        sw $a0, ISTATE_OFFSET_A0(\r)
+        sw $a1, ISTATE_OFFSET_A1(\r)
+        sw $a2, ISTATE_OFFSET_A2(\r)
+        sw $a3, ISTATE_OFFSET_A3(\r)
+        sw $t0, ISTATE_OFFSET_T0(\r)
+        sw $t1, ISTATE_OFFSET_T1(\r)
+        sw $t2, ISTATE_OFFSET_T2(\r)
+        sw $t3, ISTATE_OFFSET_T3(\r)
+        sw $t4, ISTATE_OFFSET_T4(\r)
+        sw $t5, ISTATE_OFFSET_T5(\r)
+        sw $t6, ISTATE_OFFSET_T6(\r)
+        sw $t7, ISTATE_OFFSET_T7(\r)
+        sw $t8, ISTATE_OFFSET_T8(\r)
+        sw $t9, ISTATE_OFFSET_T9(\r)
         
         mflo $at
-        sw $at, EOFFSET_LO(\r)
+        sw $at, ISTATE_OFFSET_LO(\r)
         mfhi $at
-        sw $at, EOFFSET_HI(\r)
-        
-        sw $gp, EOFFSET_GP(\r)
-        sw $ra, EOFFSET_RA(\r)
-        sw $k1, EOFFSET_K1(\r)
+        sw $at, ISTATE_OFFSET_HI(\r)
+        
+        sw $gp, ISTATE_OFFSET_GP(\r)
+        sw $ra, ISTATE_OFFSET_RA(\r)
+        sw $k1, ISTATE_OFFSET_KT1(\r)
         
         mfc0 $t0, $status
@@ -134 +134 @@
         and $t0, $t0, $t3
         
-        sw $t2, EOFFSET_STATUS(\r)
-        sw $t1, EOFFSET_EPC(\r)
+        sw $t2, ISTATE_OFFSET_STATUS(\r)
+        sw $t1, ISTATE_OFFSET_EPC(\r)
         mtc0 $t0, $status
 .endm
@@ -145 +145 @@
          */
         mfc0 $t0, $status
-        lw $t1,EOFFSET_STATUS(\r)
+        lw $t1, ISTATE_OFFSET_STATUS(\r)
         
         /* mask UM, EXL, ERL, IE */
@@ -155 +155 @@
         mtc0 $t0, $status
         
-        lw $v0, EOFFSET_V0(\r)
-        lw $v1, EOFFSET_V1(\r)
-        lw $a0, EOFFSET_A0(\r)
-        lw $a1, EOFFSET_A1(\r)
-        lw $a2, EOFFSET_A2(\r)
-        lw $a3, EOFFSET_A3(\r)
-        lw $t0, EOFFSET_T0(\r)
-        lw $t1, EOFFSET_T1(\r)
-        lw $t2, EOFFSET_T2(\r)
-        lw $t3, EOFFSET_T3(\r)
-        lw $t4, EOFFSET_T4(\r)
-        lw $t5, EOFFSET_T5(\r)
-        lw $t6, EOFFSET_T6(\r)
-        lw $t7, EOFFSET_T7(\r)
-        lw $t8, EOFFSET_T8(\r)
-        lw $t9, EOFFSET_T9(\r)
-        
-        lw $gp, EOFFSET_GP(\r)
-        lw $ra, EOFFSET_RA(\r)
-        lw $k1, EOFFSET_K1(\r)
-        
-        lw $at, EOFFSET_LO(\r)
+        lw $v0, ISTATE_OFFSET_V0(\r)
+        lw $v1, ISTATE_OFFSET_V1(\r)
+        lw $a0, ISTATE_OFFSET_A0(\r)
+        lw $a1, ISTATE_OFFSET_A1(\r)
+        lw $a2, ISTATE_OFFSET_A2(\r)
+        lw $a3, ISTATE_OFFSET_A3(\r)
+        lw $t0, ISTATE_OFFSET_T0(\r)
+        lw $t1, ISTATE_OFFSET_T1(\r)
+        lw $t2, ISTATE_OFFSET_T2(\r)
+        lw $t3, ISTATE_OFFSET_T3(\r)
+        lw $t4, ISTATE_OFFSET_T4(\r)
+        lw $t5, ISTATE_OFFSET_T5(\r)
+        lw $t6, ISTATE_OFFSET_T6(\r)
+        lw $t7, ISTATE_OFFSET_T7(\r)
+        lw $t8, ISTATE_OFFSET_T8(\r)
+        lw $t9, ISTATE_OFFSET_T9(\r)
+        
+        lw $gp, ISTATE_OFFSET_GP(\r)
+        lw $ra, ISTATE_OFFSET_RA(\r)
+        lw $k1, ISTATE_OFFSET_KT1(\r)
+        
+        lw $at, ISTATE_OFFSET_LO(\r)
         mtlo $at
-        lw $at, EOFFSET_HI(\r)
+        lw $at, ISTATE_OFFSET_HI(\r)
         mthi $at
         
-        lw $at, EOFFSET_EPC(\r)
+        lw $at, ISTATE_OFFSET_EPC(\r)
         mtc0 $at, $epc
         
-        lw $at, EOFFSET_AT(\r)
-        lw $sp, EOFFSET_SP(\r)
+        lw $at, ISTATE_OFFSET_AT(\r)
+        lw $sp, ISTATE_OFFSET_SP(\r)
 .endm
 
@@ -198 +198 @@
         
         beq $k0, $0, 1f
-        add $k0, $sp, 0
+        move $k0, $sp
         
         /* move $k0 pointer to kernel stack */
@@ -205 +205 @@
         
         /* move $k0 (supervisor_sp) */
-        lw $k0, 0($k0)
+        lw $k0, ($k0)
         
         1:
@@ -266 +266 @@
         /* the $sp is automatically restored to former value */
         eret
-
-#define SS_SP      EOFFSET_SP
-#define SS_STATUS  EOFFSET_STATUS
-#define SS_EPC     EOFFSET_EPC
-#define SS_K1      EOFFSET_K1
 
 /** Syscall entry
@@ -291 +286 @@
         mfc0 $t3, $epc
         mfc0 $t2, $status
-        sw $t3, SS_EPC($sp)  /* save EPC */
-        sw $k1, SS_K1($sp)   /* save $k1 not saved on context switch */
+        sw $t3, ISTATE_OFFSET_EPC($sp)  /* save EPC */
+        sw $k1, ISTATE_OFFSET_KT1($sp)  /* save $k1 not saved on context switch */
         
         and $t4, $t2, REG_SAVE_MASK  /* save only KSU, EXL, ERL, IE */
@@ -299 +294 @@
         ori $t2, $t2, 0x1  /* set IE */
         
-        sw $t4, SS_STATUS($sp)
+        sw $t4, ISTATE_OFFSET_STATUS($sp)
         mtc0 $t2, $status
         
         /*
          * Call the higher level system call handler.
-         * We are going to reuse part of the unused exception stack frame.
          *
          */
-        sw $t0, STACK_ARG4($sp)  /* save the 5th argument on the stack */
-        sw $t1, STACK_ARG5($sp)  /* save the 6th argument on the stack */
+        sw $t0, ISTATE_OFFSET_T0($sp)  /* save the 5th argument on the stack */
+        sw $t1, ISTATE_OFFSET_T1($sp)  /* save the 6th argument on the stack */
         jal syscall_handler
-        sw $v0, STACK_ARG6($sp)  /* save the syscall number on the stack */
+        sw $v0, ISTATE_OFFSET_V0($sp)  /* save the syscall number on the stack */
         
         /* restore status */
         mfc0 $t2, $status
-        lw $t3, SS_STATUS($sp)
+        lw $t3, ISTATE_OFFSET_STATUS($sp)
         
         /*
@@ -327 +321 @@
         
         /* restore epc + 4 */
-        lw $t2, SS_EPC($sp)
-        lw $k1, SS_K1($sp)
+        lw $t2, ISTATE_OFFSET_EPC($sp)
+        lw $k1, ISTATE_OFFSET_KT1($sp)
         addi $t2, $t2, 4
         mtc0 $t2, $epc
         
-        lw $sp, SS_SP($sp)  /* restore $sp */
+        lw $sp, ISTATE_OFFSET_SP($sp)  /* restore $sp */
         eret
 
 tlb_refill_handler:
         KERNEL_STACK_TO_K0
-        sub $k0, REGISTER_SPACE
+        sub $k0, ISTATE_SOFT_SIZE
         REGISTERS_STORE_AND_EXC_RESET $k0
-        sw $sp,EOFFSET_SP($k0)
-        add $sp, $k0, 0
+        sw $sp, ISTATE_OFFSET_SP($k0)
+        move $sp, $k0
         
         jal tlb_refill
-        add $a0, $sp, 0 
+        move $a0, $sp 
         
         REGISTERS_LOAD $sp
@@ -350 +344 @@
 cache_error_handler:
         KERNEL_STACK_TO_K0
-        sub $k0, REGISTER_SPACE
+        sub $k0, ISTATE_SOFT_SIZE 
         REGISTERS_STORE_AND_EXC_RESET $k0
-        sw $sp,EOFFSET_SP($k0)
-        add $sp, $k0, 0
+        sw $sp, ISTATE_OFFSET_SP($k0)
+        move $sp, $k0
         
         jal cache_error
-        add $a0, $sp, 0
+        move $a0, $sp
         
         REGISTERS_LOAD $sp