Index: kernel/arch/mips32/Makefile.inc
===================================================================
--- kernel/arch/mips32/Makefile.inc	(revision 33add3a8e1974ac8117cfbec11267a0c35a85660)
+++ kernel/arch/mips32/Makefile.inc	(revision 105d8d64febd9f6d4257fc2be7aafd3278e7f5f7)
@@ -87,4 +87,5 @@
 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
 
Index: kernel/arch/mips32/include/arch/fpu_context.h
===================================================================
--- kernel/arch/mips32/include/arch/fpu_context.h	(revision 33add3a8e1974ac8117cfbec11267a0c35a85660)
+++ kernel/arch/mips32/include/arch/fpu_context.h	(revision 105d8d64febd9f6d4257fc2be7aafd3278e7f5f7)
@@ -37,11 +37,7 @@
 
 #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
Index: kernel/arch/mips32/include/arch/fpu_context_struct.ag
===================================================================
--- kernel/arch/mips32/include/arch/fpu_context_struct.ag	(revision 105d8d64febd9f6d4257fc2be7aafd3278e7f5f7)
+++ kernel/arch/mips32/include/arch/fpu_context_struct.ag	(revision 105d8d64febd9f6d4257fc2be7aafd3278e7f5f7)
@@ -0,0 +1,49 @@
+# Copyright (c) 2014 Jakub Jermar 
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions
+# are met:
+#
+# - Redistributions of source code must retain the above copyright
+#   notice, this list of conditions and the following disclaimer.
+# - Redistributions in binary form must reproduce the above copyright
+#   notice, this list of conditions and the following disclaimer in the
+#   documentation and/or other materials provided with the distribution.
+# - The name of the author may not be used to endorse or promote products
+#   derived from this software without specific prior written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
+# IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+# OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+# IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
+# INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+# NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+# THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+#
+
+{
+        name : fpu_context,
+
+        includes : [
+                {
+                        include : <typedefs.h>
+                }
+        ],
+
+        members : [
+                {
+                        name : dregs,
+                        type : sysarg_t,
+                        elements: 32
+                },
+                {
+                        name : cregs,
+                        type : sysarg_t,
+                        elements : 32
+                }
+        ]
+}
Index: kernel/arch/mips32/src/asm.S
===================================================================
--- kernel/arch/mips32/src/asm.S	(revision 33add3a8e1974ac8117cfbec11267a0c35a85660)
+++ kernel/arch/mips32/src/asm.S	(revision 105d8d64febd9f6d4257fc2be7aafd3278e7f5f7)
@@ -28,4 +28,5 @@
 
 #include <arch/asm/regname.h>
+#include <arch/fpu_context_struct.h>
 
 .text
@@ -136,9 +137,9 @@
 .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,9 +147,9 @@
 .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