Changeset 5301662 in mainline

Timestamp:

2014-09-08T20:56:13Z (11 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

24c394b

Parents:

9827b5b

Message:

Autogenerate mips32 fpu_context_t and its #defines.

Location:

kernel/arch/mips32

Files:

• Makefile.inc (modified) (1 diff)
• include/arch/fpu_context.h (modified) (1 diff)
• include/arch/fpu_context_struct.ag (added)
• src/asm.S (modified) (3 diffs)

kernel/arch/mips32/Makefile.inc

@@ -87 +87 @@
 ARCH_AUTOGENS_AG = \
         arch/$(KARCH)/include/arch/istate_struct.ag \
-        arch/$(KARCH)/include/arch/context_struct.ag
+        arch/$(KARCH)/include/arch/context_struct.ag \
+        arch/$(KARCH)/include/arch/fpu_context_struct.ag
 

kernel/arch/mips32/include/arch/fpu_context.h

@@ -37 +37 @@
 
 #include <typedefs.h>
+#include <arch/fpu_context_struct.h>
 
 #define FPU_CONTEXT_ALIGN    sizeof(sysarg_t)
-
-typedef struct {
-        sysarg_t dregs[32];
-        sysarg_t cregs[32];
-} fpu_context_t;
 
 #endif

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