Changeset 296 for trunk/hal/tsar_mips32/core/hal_kentry.S

Timestamp:

Jul 31, 2017, 1:59:52 PM (7 years ago)

Author:

alain

Message:

Several modifs in the generic scheduler and in the hal_context to
fix the context switch mechanism.

File:

• trunk/hal/tsar_mips32/core/hal_kentry.S (modified) (4 diffs)

trunk/hal/tsar_mips32/core/hal_kentry.S

@@ -30 +30 @@
 # or syscall for the TSAR_MIPS32 architecture.  
 #
-# When we enter the kernel, we test the ststus register:
+# When we enter the kernel, we test the status register:
 # - If the core is in user mode, we desactivate the MMU, and we save
 #   the core context in the uzone of the calling thread descriptor.
@@ -42 +42 @@
 #---------------------------------------------------------------------------------
 
-        .section   .kgiet, "ax", @progbits
+        .section   .kentry, "ax", @progbits
 
         .extern    hal_do_interrupt
@@ -204 +204 @@
 # The uzone pointer is saved in $19 to be used by kernel_exit.
 
-        mfc0    $17,    $13                 # $1 <= CR
-        andi    $1,     $1,   0x3F          # $1 <= XCODE
+        mfc0    $17,    $13                 # $17 <= CR
+        andi    $17,    $17,   0x3F         # $17 <= XCODE
 
         mfc0    $4,     $4,   2             # $4 <= thread pointer (first arg)
@@ -212 +212 @@
 
         ori         $8,     $0,   0x20          # $8 <= cause syscall
-    beq     $8,     $1,   cause_sys
-    nop
-        beq     $1,     $0,       cause_int
+    beq     $8,     $17,  cause_sys     # go to syscall handler
+    nop
+        beq     $17,    $0,       cause_int     # go to interrupt handler
     nop