Changeset 8e7c9fe in mainline for kernel/arch/mips32/src/context.S

Timestamp:

2014-09-12T03:45:25Z (11 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

c53b58e

Parents:

3eb0c85 (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

most usb changes were reverted. blink and usbmass were fixed
known problems:
ehci won't initialize
usbmast asserts on unmount (happens on mainline too)

File:

• kernel/arch/mips32/src/context.S (modified) (3 diffs)

kernel/arch/mips32/src/context.S

@@ -27 +27 @@
 #
 
-#include <arch/context_offset.h>
+#include <arch/context_struct.h>
 
 .text
@@ -39 +39 @@
 
 context_save_arch:
-        CONTEXT_SAVE_ARCH_CORE $a0
+        sw $s0, CONTEXT_OFFSET_S0($a0)
+        sw $s1, CONTEXT_OFFSET_S1($a0)
+        sw $s2, CONTEXT_OFFSET_S2($a0)
+        sw $s3, CONTEXT_OFFSET_S3($a0)
+        sw $s4, CONTEXT_OFFSET_S4($a0)
+        sw $s5, CONTEXT_OFFSET_S5($a0)
+        sw $s6, CONTEXT_OFFSET_S6($a0)
+        sw $s7, CONTEXT_OFFSET_S7($a0)
+        sw $s8, CONTEXT_OFFSET_S8($a0)
+        sw $gp, CONTEXT_OFFSET_GP($a0)
+        
+        sw $ra, CONTEXT_OFFSET_PC($a0)
+        sw $sp, CONTEXT_OFFSET_SP($a0)
         
         # context_save returns 1
@@ -46 +58 @@
 
 context_restore_arch:
-        CONTEXT_RESTORE_ARCH_CORE $a0
+        lw $s0, CONTEXT_OFFSET_S0($a0)
+        lw $s1, CONTEXT_OFFSET_S1($a0)
+        lw $s2, CONTEXT_OFFSET_S2($a0)
+        lw $s3, CONTEXT_OFFSET_S3($a0)
+        lw $s4, CONTEXT_OFFSET_S4($a0)
+        lw $s5, CONTEXT_OFFSET_S5($a0)
+        lw $s6, CONTEXT_OFFSET_S6($a0)
+        lw $s7, CONTEXT_OFFSET_S7($a0)
+        lw $s8, CONTEXT_OFFSET_S8($a0)
+        lw $gp, CONTEXT_OFFSET_GP($a0)
+        
+        lw $ra, CONTEXT_OFFSET_PC($a0)
+        lw $sp, CONTEXT_OFFSET_SP($a0)
         
         # context_restore returns 0