Index: kernel/arch/mips32/Makefile.inc =================================================================== --- kernel/arch/mips32/Makefile.inc (revision 5eae56aa8eba23f4d7a263543454b0317c7727a1) +++ kernel/arch/mips32/Makefile.inc (revision fe124d6347cc9a0f69d7f0f159b0793d0472406c) @@ -86,4 +86,5 @@ ARCH_AUTOGENS_AG = \ - arch/$(KARCH)/include/arch/istate_struct.ag + arch/$(KARCH)/include/arch/istate_struct.ag \ + arch/$(KARCH)/include/arch/context_struct.ag Index: kernel/arch/mips32/include/arch/context.h =================================================================== --- kernel/arch/mips32/include/arch/context.h (revision 5eae56aa8eba23f4d7a263543454b0317c7727a1) +++ kernel/arch/mips32/include/arch/context.h (revision fe124d6347cc9a0f69d7f0f159b0793d0472406c) @@ -38,4 +38,6 @@ #include #include +#include +#include /* @@ -44,34 +46,6 @@ #define SP_DELTA (ABI_STACK_FRAME + ALIGN_UP(STACK_ITEM_SIZE, STACK_ALIGNMENT)) -#ifndef __ASM__ - -#include - #define context_set(ctx, pc, stack, size) \ context_set_generic(ctx, pc, stack, size) - -/* - * Only save registers that must be preserved across - * function calls. - */ -typedef struct { - uintptr_t sp; - uintptr_t pc; - - uint32_t s0; - uint32_t s1; - uint32_t s2; - uint32_t s3; - uint32_t s4; - uint32_t s5; - uint32_t s6; - uint32_t s7; - uint32_t s8; - uint32_t gp; - - ipl_t ipl; -} context_t; - -#endif /* __ASM__ */ #endif Index: kernel/arch/mips32/include/arch/context_offset.h =================================================================== --- kernel/arch/mips32/include/arch/context_offset.h (revision 5eae56aa8eba23f4d7a263543454b0317c7727a1) +++ (revision ) @@ -1,188 +1,0 @@ -/* - * Copyright (c) 2005 Martin Decky - * 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. - */ - -#ifndef KERN_mips32_CONTEXT_OFFSET_H_ -#define KERN_mips32_CONTEXT_OFFSET_H_ - -#define OFFSET_SP 0x0 -#define OFFSET_PC 0x4 -#define OFFSET_S0 0x8 -#define OFFSET_S1 0xc -#define OFFSET_S2 0x10 -#define OFFSET_S3 0x14 -#define OFFSET_S4 0x18 -#define OFFSET_S5 0x1c -#define OFFSET_S6 0x20 -#define OFFSET_S7 0x24 -#define OFFSET_S8 0x28 -#define OFFSET_GP 0x2c - -#ifdef KERNEL -# define OFFSET_IPL 0x30 -#else -# define OFFSET_TLS 0x30 - -# define OFFSET_F20 0x34 -# define OFFSET_F21 0x38 -# define OFFSET_F22 0x3c -# define OFFSET_F23 0x40 -# define OFFSET_F24 0x44 -# define OFFSET_F25 0x48 -# define OFFSET_F26 0x4c -# define OFFSET_F27 0x50 -# define OFFSET_F28 0x54 -# define OFFSET_F29 0x58 -# define OFFSET_F30 0x5c -#endif /* KERNEL */ - -#ifdef __ASM__ - -#ifdef KERNEL - -#include - -#else /* KERNEL */ - -#include - -#endif /* KERNEL */ - -/* ctx: address of the structure with saved context */ -.macro CONTEXT_SAVE_ARCH_CORE ctx:req - sw $s0, OFFSET_S0(\ctx) - sw $s1, OFFSET_S1(\ctx) - sw $s2, OFFSET_S2(\ctx) - sw $s3, OFFSET_S3(\ctx) - sw $s4, OFFSET_S4(\ctx) - sw $s5, OFFSET_S5(\ctx) - sw $s6, OFFSET_S6(\ctx) - sw $s7, OFFSET_S7(\ctx) - sw $s8, OFFSET_S8(\ctx) - sw $gp, OFFSET_GP(\ctx) - -#ifndef KERNEL - sw $k1, OFFSET_TLS(\ctx) - -#ifdef CONFIG_FPU - mfc1 $t0, $20 - sw $t0, OFFSET_F20(\ctx) - - mfc1 $t0, $21 - sw $t0, OFFSET_F21(\ctx) - - mfc1 $t0, $22 - sw $t0, OFFSET_F22(\ctx) - - mfc1 $t0, $23 - sw $t0, OFFSET_F23(\ctx) - - mfc1 $t0, $24 - sw $t0, OFFSET_F24(\ctx) - - mfc1 $t0, $25 - sw $t0, OFFSET_F25(\ctx) - - mfc1 $t0, $26 - sw $t0, OFFSET_F26(\ctx) - - mfc1 $t0, $27 - sw $t0, OFFSET_F27(\ctx) - - mfc1 $t0, $28 - sw $t0, OFFSET_F28(\ctx) - - mfc1 $t0, $29 - sw $t0, OFFSET_F29(\ctx) - - mfc1 $t0, $30 - sw $t0, OFFSET_F30(\ctx) -#endif /* CONFIG_FPU */ -#endif /* KERNEL */ - - sw $ra, OFFSET_PC(\ctx) - sw $sp, OFFSET_SP(\ctx) -.endm - -/* ctx: address of the structure with saved context */ -.macro CONTEXT_RESTORE_ARCH_CORE ctx:req - lw $s0, OFFSET_S0(\ctx) - lw $s1, OFFSET_S1(\ctx) - lw $s2, OFFSET_S2(\ctx) - lw $s3, OFFSET_S3(\ctx) - lw $s4, OFFSET_S4(\ctx) - lw $s5, OFFSET_S5(\ctx) - lw $s6, OFFSET_S6(\ctx) - lw $s7, OFFSET_S7(\ctx) - lw $s8, OFFSET_S8(\ctx) - lw $gp, OFFSET_GP(\ctx) -#ifndef KERNEL - lw $k1, OFFSET_TLS(\ctx) - -#ifdef CONFIG_FPU - lw $t0, OFFSET_F20(\ctx) - mtc1 $t0, $20 - - lw $t0, OFFSET_F21(\ctx) - mtc1 $t0, $21 - - lw $t0, OFFSET_F22(\ctx) - mtc1 $t0, $22 - - lw $t0, OFFSET_F23(\ctx) - mtc1 $t0, $23 - - lw $t0, OFFSET_F24(\ctx) - mtc1 $t0, $24 - - lw $t0, OFFSET_F25(\ctx) - mtc1 $t0, $25 - - lw $t0, OFFSET_F26(\ctx) - mtc1 $t0, $26 - - lw $t0, OFFSET_F27(\ctx) - mtc1 $t0, $27 - - lw $t0, OFFSET_F28(\ctx) - mtc1 $t0, $28 - - lw $t0, OFFSET_F29(\ctx) - mtc1 $t0, $29 - - lw $t0, OFFSET_F30(\ctx) - mtc1 $t0, $30 -#endif /* CONFIG_FPU */ -#endif /* KERNEL */ - - lw $ra, OFFSET_PC(\ctx) - lw $sp, OFFSET_SP(\ctx) -.endm - -#endif /* __ASM__ */ - -#endif Index: kernel/arch/mips32/include/arch/context_struct.ag =================================================================== --- kernel/arch/mips32/include/arch/context_struct.ag (revision fe124d6347cc9a0f69d7f0f159b0793d0472406c) +++ kernel/arch/mips32/include/arch/context_struct.ag (revision fe124d6347cc9a0f69d7f0f159b0793d0472406c) @@ -0,0 +1,97 @@ +# 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 : context, + + includes : [ + { + include : + } + ], + + members : [ + # + # Only save registers that must be preserved across function + # calls. + # + { + name : sp, + type : uint32_t + }, + { + name : pc, + type : uint32_t + }, + + { + name : s0, + type : uint32_t + }, + { + name : s1, + type : uint32_t + }, + { + name : s2, + type : uint32_t + }, + { + name : s3, + type : uint32_t + }, + { + name : s4, + type : uint32_t + }, + { + name : s5, + type : uint32_t + }, + { + name : s6, + type : uint32_t + }, + { + name : s7, + type : uint32_t + }, + { + name : s8, + type : uint32_t + }, + { + name : gp, + type : uint32_t + }, + + { + name : ipl, + type : ipl_t + } + ] +} Index: kernel/arch/mips32/src/context.S =================================================================== --- kernel/arch/mips32/src/context.S (revision 5eae56aa8eba23f4d7a263543454b0317c7727a1) +++ kernel/arch/mips32/src/context.S (revision fe124d6347cc9a0f69d7f0f159b0793d0472406c) @@ -27,5 +27,5 @@ # -#include +#include .text @@ -39,5 +39,17 @@ 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,5 +58,17 @@ 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 Index: kernel/arch/mips32/src/start.S =================================================================== --- kernel/arch/mips32/src/start.S (revision 5eae56aa8eba23f4d7a263543454b0317c7727a1) +++ kernel/arch/mips32/src/start.S (revision fe124d6347cc9a0f69d7f0f159b0793d0472406c) @@ -30,5 +30,4 @@ #include #include -#include #include #include