Index: kernel/arch/riscv64/include/arch/context_struct.ag =================================================================== --- kernel/arch/riscv64/include/arch/context_struct.ag (revision 1433ecda9b732f3f185f902feb26826ec2496e03) +++ (revision ) @@ -1,115 +1,0 @@ -# -# Copyright (c) 2016 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. -# - -{ - name : context, - - includes : [ - { - include : - } - ], - - members : [ - # - # Only save registers that must be preserved across function - # calls. - # - - { - name : sp, - type : uint64_t - }, - { - name : pc, - type : uint64_t - }, - - { - name : gp, - type : uint64_t - }, - { - name : tp, - type : uint64_t - }, - { - name : s0, - type : uint64_t - }, - { - name : s1, - type : uint64_t - }, - { - name : s2, - type : uint64_t - }, - { - name : s3, - type : uint64_t - }, - { - name : s4, - type : uint64_t - }, - { - name : s5, - type : uint64_t - }, - { - name : s6, - type : uint64_t - }, - { - name : s7, - type : uint64_t - }, - { - name : s8, - type : uint64_t - }, - { - name : s9, - type : uint64_t - }, - { - name : s10, - type : uint64_t - }, - { - name : s11, - type : uint64_t - }, - - { - name : ipl, - type : ipl_t - } - ] -} Index: kernel/arch/riscv64/include/arch/context_struct.h =================================================================== --- kernel/arch/riscv64/include/arch/context_struct.h (revision 4c4b53c4c79a79546306e9d3966c284e8853b2fb) +++ kernel/arch/riscv64/include/arch/context_struct.h (revision 4c4b53c4c79a79546306e9d3966c284e8853b2fb) @@ -0,0 +1,77 @@ +/* + * Copyright (c) 2016 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_ARCH_CONTEXT_STRUCT_H_ +#define KERN_ARCH_CONTEXT_STRUCT_H_ + +#define CONTEXT_OFFSET_SP 0x00 +#define CONTEXT_OFFSET_PC 0x08 +#define CONTEXT_OFFSET_GP 0x10 +#define CONTEXT_OFFSET_TP 0x18 +#define CONTEXT_OFFSET_S0 0x20 +#define CONTEXT_OFFSET_S1 0x28 +#define CONTEXT_OFFSET_S2 0x30 +#define CONTEXT_OFFSET_S3 0x38 +#define CONTEXT_OFFSET_S4 0x40 +#define CONTEXT_OFFSET_S5 0x48 +#define CONTEXT_OFFSET_S6 0x50 +#define CONTEXT_OFFSET_S7 0x58 +#define CONTEXT_OFFSET_S8 0x60 +#define CONTEXT_OFFSET_S9 0x68 +#define CONTEXT_OFFSET_S10 0x70 +#define CONTEXT_OFFSET_S11 0x78 +#define CONTEXT_OFFSET_IPL 0x80 +#define CONTEXT_SIZE 0x88 + +#ifndef __ASSEMBLER__ + +#include + +typedef struct context { + uint64_t sp; + uint64_t pc; + uint64_t gp; + uint64_t tp; + uint64_t s0; + uint64_t s1; + uint64_t s2; + uint64_t s3; + uint64_t s4; + uint64_t s5; + uint64_t s6; + uint64_t s7; + uint64_t s8; + uint64_t s9; + uint64_t s10; + uint64_t s11; + ipl_t ipl; +} context_t; + +#endif +#endif + Index: kernel/arch/riscv64/include/arch/istate_struct.ag =================================================================== --- kernel/arch/riscv64/include/arch/istate_struct.ag (revision 1433ecda9b732f3f185f902feb26826ec2496e03) +++ (revision ) @@ -1,181 +1,0 @@ -# -# Copyright (c) 2016 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. -# - -{ - name : istate, - - includes : [ - { - guard : KERNEL, - include : - }, - { - negative-guard : KERNEL, - include : - }, - { - negative-guard : KERNEL, - include : - } - ], - - members : [ - { - name : zero, - type : uint64_t - }, - { - name : ra, - type : uint64_t - }, - { - name : sp, - type : uint64_t - }, - { - name : x3, - type : uint64_t - }, - { - name : x4, - type : uint64_t - }, - { - name : x5, - type : uint64_t - }, - { - name : x6, - type : uint64_t - }, - { - name : x7, - type : uint64_t - }, - { - name : x8, - type : uint64_t - }, - { - name : x9, - type : uint64_t - }, - { - name : x10, - type : uint64_t - }, - { - name : x11, - type : uint64_t - }, - { - name : x12, - type : uint64_t - }, - { - name : x13, - type : uint64_t - }, - { - name : x14, - 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, - type : uint64_t - }, - { - name : pc, - type : uint64_t - }, - ] -} Index: kernel/arch/riscv64/include/arch/istate_struct.h =================================================================== --- kernel/arch/riscv64/include/arch/istate_struct.h (revision 4c4b53c4c79a79546306e9d3966c284e8853b2fb) +++ kernel/arch/riscv64/include/arch/istate_struct.h (revision 4c4b53c4c79a79546306e9d3966c284e8853b2fb) @@ -0,0 +1,115 @@ +/* + * Copyright (c) 2016 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_ARCH_ISTATE_STRUCT_H_ +#define KERN_ARCH_ISTATE_STRUCT_H_ + +#define ISTATE_OFFSET_ZERO 0x00 +#define ISTATE_OFFSET_RA 0x08 +#define ISTATE_OFFSET_SP 0x10 +#define ISTATE_OFFSET_X3 0x18 +#define ISTATE_OFFSET_X4 0x20 +#define ISTATE_OFFSET_X5 0x28 +#define ISTATE_OFFSET_X6 0x30 +#define ISTATE_OFFSET_X7 0x38 +#define ISTATE_OFFSET_X8 0x40 +#define ISTATE_OFFSET_X9 0x48 +#define ISTATE_OFFSET_X10 0x50 +#define ISTATE_OFFSET_X11 0x58 +#define ISTATE_OFFSET_X12 0x60 +#define ISTATE_OFFSET_X13 0x68 +#define ISTATE_OFFSET_X14 0x70 +#define ISTATE_OFFSET_X15 0x78 +#define ISTATE_OFFSET_X16 0x80 +#define ISTATE_OFFSET_X17 0x88 +#define ISTATE_OFFSET_X18 0x90 +#define ISTATE_OFFSET_X19 0x98 +#define ISTATE_OFFSET_X20 0xa0 +#define ISTATE_OFFSET_X21 0xa8 +#define ISTATE_OFFSET_X22 0xb0 +#define ISTATE_OFFSET_X23 0xb8 +#define ISTATE_OFFSET_X24 0xc0 +#define ISTATE_OFFSET_X25 0xc8 +#define ISTATE_OFFSET_X26 0xd0 +#define ISTATE_OFFSET_X27 0xd8 +#define ISTATE_OFFSET_X28 0xe0 +#define ISTATE_OFFSET_X29 0xe8 +#define ISTATE_OFFSET_X30 0xf0 +#define ISTATE_OFFSET_X31 0xf8 +#define ISTATE_OFFSET_PC 0x100 +#define ISTATE_SIZE 0x108 + +#ifndef __ASSEMBLER__ + +#include + +#ifdef KERNEL +#include +#else +#include +#endif + +typedef struct istate { + uint64_t zero; + uint64_t ra; + uint64_t sp; + uint64_t x3; + uint64_t x4; + uint64_t x5; + uint64_t x6; + uint64_t x7; + uint64_t x8; + uint64_t x9; + uint64_t x10; + uint64_t x11; + uint64_t x12; + uint64_t x13; + uint64_t x14; + uint64_t x15; + uint64_t x16; + uint64_t x17; + uint64_t x18; + uint64_t x19; + uint64_t x20; + uint64_t x21; + uint64_t x22; + uint64_t x23; + uint64_t x24; + uint64_t x25; + uint64_t x26; + uint64_t x27; + uint64_t x28; + uint64_t x29; + uint64_t x30; + uint64_t x31; + uint64_t pc; +} istate_t; + +#endif +#endif +