Index: kernel/arch/arm32/include/arch/context_struct.ag =================================================================== --- kernel/arch/arm32/include/arch/context_struct.ag (revision 18b6a8849d630cc3bca153fb21bd225eebb16f4c) +++ (revision ) @@ -1,95 +1,0 @@ -# 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 : - }, - ], - - # - # Thread context containing registers that must be preserved across - # function calls. - # - members : [ - { - name : cpu_mode, - type : uint32_t - }, - { - name : sp, - type : uintptr_t - }, - { - name : pc, - type : uintptr_t - }, - - { - name : r4, - type : uint32_t - }, - { - name : r5, - type : uint32_t - }, - { - name : r6, - type : uint32_t - }, - { - name : r7, - type : uint32_t - }, - { - name : r8, - type : uint32_t - }, - { - name : r9, - type : uint32_t - }, - { - name : r10, - type : uint32_t - }, - { - # r11 - name : fp, - type : uint32_t - }, - - { - name : ipl, - type : ipl_t - } - ] -} - Index: kernel/arch/arm32/include/arch/context_struct.h =================================================================== --- kernel/arch/arm32/include/arch/context_struct.h (revision e63468473345cf0a982276dc4d69b496d2a0f7ec) +++ kernel/arch/arm32/include/arch/context_struct.h (revision e63468473345cf0a982276dc4d69b496d2a0f7ec) @@ -0,0 +1,56 @@ +/* + * 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. + */ + +#ifndef KERN_ARCH_CONTEXT_STRUCT_H_ +#define KERN_ARCH_CONTEXT_STRUCT_H_ + +#include + +// XXX: This struct must match assembly code in src/context.S + +/* Thread context containing registers that must be preserved across + * function calls. + */ +typedef struct context { + uint32_t cpu_mode; + uintptr_t sp; + uintptr_t pc; + uint32_t r4; + uint32_t r5; + uint32_t r6; + uint32_t r7; + uint32_t r8; + uint32_t r9; + uint32_t r10; + /* r11 */ + uint32_t fp; + ipl_t ipl; +} context_t; + +#endif + Index: kernel/arch/arm32/include/arch/istate_struct.ag =================================================================== --- kernel/arch/arm32/include/arch/istate_struct.ag (revision 18b6a8849d630cc3bca153fb21bd225eebb16f4c) +++ (revision ) @@ -1,123 +1,0 @@ -# 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 : istate, - - includes : [ - { - guard : KERNEL, - include : - }, - { - negative-guard : KERNEL, - include : - }, - { - negative-guard : KERNEL, - include : - } - ], - - members : [ - { - name : dummy, - type : uint32_t - }, - { - name : spsr, - type : uint32_t - }, - { - name : sp, - type : uint32_t - }, - { - name : lr, - type : uint32_t - }, - - { - name : r0, - type : uint32_t - }, - { - name : r1, - type : uint32_t - }, - { - name : r2, - type : uint32_t - }, - { - name : r3, - type : uint32_t - }, - { - name : r4, - type : uint32_t - }, - { - name : r5, - type : uint32_t - }, - { - name : r6, - type : uint32_t - }, - { - name : r7, - type : uint32_t - }, - { - name : r8, - type : uint32_t - }, - { - name : r9, - type : uint32_t - }, - { - name : r10, - type : uint32_t - }, - { - name : fp, - type : uint32_t - }, - { - name : r12, - type : uint32_t - }, - - { - name : pc, - type : uint32_t - } - ] -} - Index: kernel/arch/arm32/include/arch/istate_struct.h =================================================================== --- kernel/arch/arm32/include/arch/istate_struct.h (revision e63468473345cf0a982276dc4d69b496d2a0f7ec) +++ kernel/arch/arm32/include/arch/istate_struct.h (revision e63468473345cf0a982276dc4d69b496d2a0f7ec) @@ -0,0 +1,58 @@ +/* + * 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. + */ + +#ifndef KERN_ARCH_ISTATE_STRUCT_H_ +#define KERN_ARCH_ISTATE_STRUCT_H_ + +#include + +// XXX: Must match assembly code in src/exc_handler.S + +typedef struct istate { + uint32_t dummy; + uint32_t spsr; + uint32_t sp; + uint32_t lr; + uint32_t r0; + uint32_t r1; + uint32_t r2; + uint32_t r3; + uint32_t r4; + uint32_t r5; + uint32_t r6; + uint32_t r7; + uint32_t r8; + uint32_t r9; + uint32_t r10; + uint32_t fp; + uint32_t r12; + uint32_t pc; +} istate_t; + +#endif +