Index: kernel/arch/riscv64/include/arch/context.h =================================================================== --- kernel/arch/riscv64/include/arch/context.h (revision 05b36407e88f9d6e36b2d526e7b7d09c1cadaf8a) +++ kernel/arch/riscv64/include/arch/context.h (revision 5f2926acac3aac0189c2e023e444e47c0b541951) @@ -40,6 +40,4 @@ #define SP_DELTA 16 -// FIXME - #define context_set(context, pc, stack, size) \ context_set_generic(context, pc, stack, size) Index: kernel/arch/riscv64/include/arch/context_struct.ag =================================================================== --- kernel/arch/riscv64/include/arch/context_struct.ag (revision 05b36407e88f9d6e36b2d526e7b7d09c1cadaf8a) +++ kernel/arch/riscv64/include/arch/context_struct.ag (revision 5f2926acac3aac0189c2e023e444e47c0b541951) @@ -38,6 +38,6 @@ members : [ # - # There is a room for optimization (we can store just those - # registers that must be preserved during ABI function call). + # Only save registers that must be preserved across function + # calls. # @@ -52,126 +52,57 @@ { - name : zero, + name : gp, type : uint64_t }, { - name : ra, - type : uint64_t - }, - - { - name : x3, + name : tp, type : uint64_t }, { - name : x4, + name : s0, type : uint64_t }, { - name : x5, + name : s1, type : uint64_t }, { - name : x6, + name : s2, type : uint64_t }, { - name : x7, + name : s3, type : uint64_t }, { - name : x8, + name : s4, type : uint64_t }, { - name : x9, + name : s5, type : uint64_t }, { - name : x10, + name : s6, type : uint64_t }, { - name : x11, + name : s7, type : uint64_t }, { - name : x12, + name : s8, type : uint64_t }, { - name : x13, + name : s9, type : uint64_t }, { - name : x14, + name : s10, type : uint64_t }, { - name : x15, - type : uint64_t - }, - { - name : x16, - type : uint64_t - }, - { - name : x17, - type : uint64_t - }, - { - name : x18, - type : uint64_t - }, - { - name : x19, - type : uint64_t - }, - { - name : x20, - type : uint64_t - }, - { - name : x21, - type : uint64_t - }, - { - name : x22, - type : uint64_t - }, - { - name : x23, - type : uint64_t - }, - { - name : x24, - type : uint64_t - }, - { - name : x25, - type : uint64_t - }, - { - name : x26, - type : uint64_t - }, - { - name : x27, - type : uint64_t - }, - { - name : x28, - type : uint64_t - }, - { - name : x29, - type : uint64_t - }, - { - name : x30, - type : uint64_t - }, - { - name : x31, + name : s11, type : uint64_t }, Index: kernel/arch/riscv64/src/context.S =================================================================== --- kernel/arch/riscv64/src/context.S (revision 5f2926acac3aac0189c2e023e444e47c0b541951) +++ kernel/arch/riscv64/src/context.S (revision 5f2926acac3aac0189c2e023e444e47c0b541951) @@ -0,0 +1,80 @@ +# +# Copyright (c) 2003-2004 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. +# + +#include +#include + +.text + +FUNCTION_BEGIN(context_save_arch) + sd gp, CONTEXT_OFFSET_GP(a0) + sd tp, CONTEXT_OFFSET_TP(a0) + sd s0, CONTEXT_OFFSET_S0(a0) + sd s1, CONTEXT_OFFSET_S1(a0) + sd s2, CONTEXT_OFFSET_S2(a0) + sd s3, CONTEXT_OFFSET_S3(a0) + sd s4, CONTEXT_OFFSET_S4(a0) + sd s5, CONTEXT_OFFSET_S5(a0) + sd s6, CONTEXT_OFFSET_S6(a0) + sd s7, CONTEXT_OFFSET_S7(a0) + sd s8, CONTEXT_OFFSET_S8(a0) + sd s9, CONTEXT_OFFSET_S9(a0) + sd s10, CONTEXT_OFFSET_S10(a0) + sd s11, CONTEXT_OFFSET_S11(a0) + + sd ra, CONTEXT_OFFSET_PC(a0) + sd sp, CONTEXT_OFFSET_SP(a0) + + # context_save returns 1 + li a0, 1 + ret +FUNCTION_END(context_save_arch) + +FUNCTION_BEGIN(context_restore_arch) + ld gp, CONTEXT_OFFSET_GP(a0) + ld tp, CONTEXT_OFFSET_TP(a0) + ld s0, CONTEXT_OFFSET_S0(a0) + ld s1, CONTEXT_OFFSET_S1(a0) + ld s2, CONTEXT_OFFSET_S2(a0) + ld s3, CONTEXT_OFFSET_S3(a0) + ld s4, CONTEXT_OFFSET_S4(a0) + ld s5, CONTEXT_OFFSET_S5(a0) + ld s6, CONTEXT_OFFSET_S6(a0) + ld s7, CONTEXT_OFFSET_S7(a0) + ld s8, CONTEXT_OFFSET_S8(a0) + ld s9, CONTEXT_OFFSET_S9(a0) + ld s10, CONTEXT_OFFSET_S10(a0) + ld s11, CONTEXT_OFFSET_S11(a0) + + ld ra, CONTEXT_OFFSET_PC(a0) + ld sp, CONTEXT_OFFSET_SP(a0) + + # context_restore returns 0 + li a0, 0 + ret +FUNCTION_END(context_restore_arch)