Changeset 15d0046 in mainline for kernel/arch/mips32/src/asm.S

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/src/asm.S (modified) (3 diffs)

kernel/arch/mips32/src/asm.S

@@ -28 +28 @@
 
 #include <arch/asm/regname.h>
+#include <arch/fpu_context_struct.h>
 
 .text
@@ -136 +137 @@
 .macro fpu_gp_save reg ctx
         mfc1 $t0, $\reg
-        sw $t0, \reg * 4(\ctx)
+        sw $t0, FPU_CONTEXT_OFFSET_DREGS + \reg * FPU_CONTEXT_DREGS_ITEM_SIZE(\ctx)
 .endm
 
 .macro fpu_gp_restore reg ctx
-        lw $t0, \reg * 4(\ctx)
+        lw $t0, FPU_CONTEXT_OFFSET_DREGS + \reg * FPU_CONTEXT_DREGS_ITEM_SIZE(\ctx)
         mtc1 $t0, $\reg
 .endm
@@ -146 +147 @@
 .macro fpu_ct_save reg ctx
         cfc1 $t0, $1
-        sw $t0, (\reg + 32) * 4(\ctx)
+        sw $t0, FPU_CONTEXT_OFFSET_CREGS + \reg * FPU_CONTEXT_CREGS_ITEM_SIZE(\ctx)
 .endm
 
 .macro fpu_ct_restore reg ctx
-        lw $t0, (\reg + 32) * 4(\ctx)
+        lw $t0, FPU_CONTEXT_OFFSET_CREGS + \reg * FPU_CONTEZT_CREGS_ITEM_SIZE(\ctx)
         ctc1 $t0, $\reg
 .endm