Index: kernel/arch/abs32le/include/interrupt.h =================================================================== --- kernel/arch/abs32le/include/interrupt.h (revision 5c0889751538969abfb6f515b8ac7a0770490947) +++ kernel/arch/abs32le/include/interrupt.h (revision 458619f79d2015d51ba730dc3853632b671a9005) @@ -37,6 +37,5 @@ #include -#include -#include +#include #define IVT_ITEMS 0 @@ -45,48 +44,4 @@ #define VECTOR_TLB_SHOOTDOWN_IPI 0 -/* - * On real hardware this stores the registers which - * need to be preserved during interupts. - */ -typedef struct istate { - uintptr_t ip; - uintptr_t fp; - uint32_t stack[]; -} istate_t; - -NO_TRACE static inline int istate_from_uspace(istate_t *istate) - REQUIRES_EXTENT_MUTABLE(istate) -{ - /* On real hardware this checks whether the interrupted - context originated from user space. */ - - return !(istate->ip & 0x80000000); -} - -NO_TRACE static inline void istate_set_retaddr(istate_t *istate, - uintptr_t retaddr) - WRITES(&istate->ip) -{ - /* On real hardware this sets the instruction pointer. */ - - istate->ip = retaddr; -} - -NO_TRACE static inline unative_t istate_get_pc(istate_t *istate) - REQUIRES_EXTENT_MUTABLE(istate) -{ - /* On real hardware this returns the instruction pointer. */ - - return istate->ip; -} - -NO_TRACE static inline unative_t istate_get_fp(istate_t *istate) - REQUIRES_EXTENT_MUTABLE(istate) -{ - /* On real hardware this returns the frame pointer. */ - - return istate->fp; -} - #endif Index: kernel/arch/abs32le/include/istate.h =================================================================== --- kernel/arch/abs32le/include/istate.h (revision 458619f79d2015d51ba730dc3853632b671a9005) +++ kernel/arch/abs32le/include/istate.h (revision 458619f79d2015d51ba730dc3853632b671a9005) @@ -0,0 +1,96 @@ +/* + * Copyright (c) 2010 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. + */ + +/** @addtogroup abs32leinterrupt + * @{ + */ +/** @file + */ + +#ifndef KERN_abs32le_ISTATE_H_ +#define KERN_abs32le_ISTATE_H_ + +#ifdef KERNEL +#include +#include +#include +#else +#include +#define NO_TRACE +#define REQUIRES_EXTENT_MUTABLE(arg) +#define WRITES(arg) +#endif + +/* + * On real hardware this stores the registers which + * need to be preserved during interupts. + */ +typedef struct istate { + uintptr_t ip; + uintptr_t fp; + uint32_t stack[]; +} istate_t; + +NO_TRACE static inline int istate_from_uspace(istate_t *istate) + REQUIRES_EXTENT_MUTABLE(istate) +{ + /* On real hardware this checks whether the interrupted + context originated from user space. */ + + return !(istate->ip & 0x80000000); +} + +NO_TRACE static inline void istate_set_retaddr(istate_t *istate, + uintptr_t retaddr) + WRITES(&istate->ip) +{ + /* On real hardware this sets the instruction pointer. */ + + istate->ip = retaddr; +} + +NO_TRACE static inline uintptr_t istate_get_pc(istate_t *istate) + REQUIRES_EXTENT_MUTABLE(istate) +{ + /* On real hardware this returns the instruction pointer. */ + + return istate->ip; +} + +NO_TRACE static inline uintptr_t istate_get_fp(istate_t *istate) + REQUIRES_EXTENT_MUTABLE(istate) +{ + /* On real hardware this returns the frame pointer. */ + + return istate->fp; +} + +#endif + +/** @} + */ Index: kernel/arch/amd64/include/interrupt.h =================================================================== --- kernel/arch/amd64/include/interrupt.h (revision 5c0889751538969abfb6f515b8ac7a0770490947) +++ kernel/arch/amd64/include/interrupt.h (revision 458619f79d2015d51ba730dc3853632b671a9005) @@ -37,6 +37,6 @@ #include +#include #include -#include #define IVT_ITEMS IDT_ITEMS @@ -71,54 +71,4 @@ #define VECTOR_DEBUG_IPI (IVT_FREEBASE + 2) -/** This is passed to interrupt handlers */ -typedef struct istate { - uint64_t rax; - uint64_t rbx; - uint64_t rcx; - uint64_t rdx; - uint64_t rsi; - uint64_t rdi; - uint64_t rbp; - uint64_t r8; - uint64_t r9; - uint64_t r10; - uint64_t r11; - uint64_t r12; - uint64_t r13; - uint64_t r14; - uint64_t r15; - uint64_t alignment; /* align rbp_frame on multiple of 16 */ - uint64_t rbp_frame; /* imitation of frame pointer linkage */ - uint64_t rip_frame; /* imitation of return address linkage */ - uint64_t error_word; /* real or fake error word */ - uint64_t rip; - uint64_t cs; - uint64_t rflags; - uint64_t rsp; /* only if istate_t is from uspace */ - uint64_t ss; /* only if istate_t is from uspace */ -} istate_t; - -/** Return true if exception happened while in userspace */ -NO_TRACE static inline int istate_from_uspace(istate_t *istate) -{ - return !(istate->rip & 0x8000000000000000); -} - -NO_TRACE static inline void istate_set_retaddr(istate_t *istate, - uintptr_t retaddr) -{ - istate->rip = retaddr; -} - -NO_TRACE static inline unative_t istate_get_pc(istate_t *istate) -{ - return istate->rip; -} - -NO_TRACE static inline unative_t istate_get_fp(istate_t *istate) -{ - return istate->rbp; -} - extern void (* disable_irqs_function)(uint16_t); extern void (* enable_irqs_function)(uint16_t); Index: kernel/arch/amd64/include/istate.h =================================================================== --- kernel/arch/amd64/include/istate.h (revision 458619f79d2015d51ba730dc3853632b671a9005) +++ kernel/arch/amd64/include/istate.h (revision 458619f79d2015d51ba730dc3853632b671a9005) @@ -0,0 +1,99 @@ +/* + * Copyright (c) 2001-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. + */ + +/** @addtogroup amd64interrupt + * @{ + */ +/** @file + */ + +#ifndef KERN_amd64_ISTATE_H_ +#define KERN_amd64_ISTATE_H_ + +#ifdef KERNEL +#include +#include +#else +#include +#define NO_TRACE +#endif + +/** This is passed to interrupt handlers */ +typedef struct istate { + uint64_t rax; + uint64_t rbx; + uint64_t rcx; + uint64_t rdx; + uint64_t rsi; + uint64_t rdi; + uint64_t rbp; + uint64_t r8; + uint64_t r9; + uint64_t r10; + uint64_t r11; + uint64_t r12; + uint64_t r13; + uint64_t r14; + uint64_t r15; + uint64_t alignment; /* align rbp_frame on multiple of 16 */ + uint64_t rbp_frame; /* imitation of frame pointer linkage */ + uint64_t rip_frame; /* imitation of return address linkage */ + uint64_t error_word; /* real or fake error word */ + uint64_t rip; + uint64_t cs; + uint64_t rflags; + uint64_t rsp; /* only if istate_t is from uspace */ + uint64_t ss; /* only if istate_t is from uspace */ +} istate_t; + +/** Return true if exception happened while in userspace */ +NO_TRACE static inline int istate_from_uspace(istate_t *istate) +{ + return !(istate->rip & 0x8000000000000000); +} + +NO_TRACE static inline void istate_set_retaddr(istate_t *istate, + uintptr_t retaddr) +{ + istate->rip = retaddr; +} + +NO_TRACE static inline uintptr_t istate_get_pc(istate_t *istate) +{ + return istate->rip; +} + +NO_TRACE static inline uintptr_t istate_get_fp(istate_t *istate) +{ + return istate->rbp; +} + +#endif + +/** @} + */ Index: kernel/arch/arm32/include/exception.h =================================================================== --- kernel/arch/arm32/include/exception.h (revision 5c0889751538969abfb6f515b8ac7a0770490947) +++ kernel/arch/arm32/include/exception.h (revision 458619f79d2015d51ba730dc3853632b671a9005) @@ -39,6 +39,5 @@ #include -#include -#include +#include /** If defined, forces using of high exception vectors. */ @@ -85,56 +84,4 @@ extern uintptr_t exc_stack; -/** Struct representing CPU state saved when an exception occurs. */ -typedef struct istate { - 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; - -/** Set Program Counter member of given istate structure. - * - * @param istate istate structure - * @param retaddr new value of istate's PC member - * - */ -NO_TRACE static inline void istate_set_retaddr(istate_t *istate, - uintptr_t retaddr) -{ - istate->pc = retaddr; -} - -/** Return true if exception happened while in userspace. */ -NO_TRACE static inline int istate_from_uspace(istate_t *istate) -{ - return (istate->spsr & STATUS_REG_MODE_MASK) == USER_MODE; -} - -/** Return Program Counter member of given istate structure. */ -NO_TRACE static inline unative_t istate_get_pc(istate_t *istate) -{ - return istate->pc; -} - -NO_TRACE static inline unative_t istate_get_fp(istate_t *istate) -{ - return istate->fp; -} - extern void install_exception_handlers(void); extern void exception_init(void); Index: kernel/arch/arm32/include/istate.h =================================================================== --- kernel/arch/arm32/include/istate.h (revision 458619f79d2015d51ba730dc3853632b671a9005) +++ kernel/arch/arm32/include/istate.h (revision 458619f79d2015d51ba730dc3853632b671a9005) @@ -0,0 +1,102 @@ +/* + * Copyright (c) 2007 Michal Kebrt, Petr Stepan + * + * 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. + */ + +/** @addtogroup arm32interrupt + * @{ + */ + +#ifndef KERN_arm32_ISTATE_H_ +#define KERN_arm32_ISTATE_H_ + +#include + +#ifdef KERNEL +#include +#include +#else +#include +#define NO_TRACE +#endif + +/** Struct representing CPU state saved when an exception occurs. */ +typedef struct istate { + 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; + +/** Set Program Counter member of given istate structure. + * + * @param istate istate structure + * @param retaddr new value of istate's PC member + * + */ +NO_TRACE static inline void istate_set_retaddr(istate_t *istate, + uintptr_t retaddr) +{ + istate->pc = retaddr; +} + +/** Return true if exception happened while in userspace. */ +NO_TRACE static inline int istate_from_uspace(istate_t *istate) +{ + return (istate->spsr & STATUS_REG_MODE_MASK) == USER_MODE; +} + +/** Return Program Counter member of given istate structure. */ +NO_TRACE static inline uintptr_t istate_get_pc(istate_t *istate) +{ + return istate->pc; +} + +NO_TRACE static inline uintptr_t istate_get_fp(istate_t *istate) +{ + return istate->fp; +} + +#endif + +/** @} + */ Index: kernel/arch/ia32/include/interrupt.h =================================================================== --- kernel/arch/ia32/include/interrupt.h (revision 5c0889751538969abfb6f515b8ac7a0770490947) +++ kernel/arch/ia32/include/interrupt.h (revision 458619f79d2015d51ba730dc3853632b671a9005) @@ -37,6 +37,6 @@ #include +#include #include -#include #define IVT_ITEMS IDT_ITEMS @@ -71,56 +71,4 @@ #define VECTOR_DEBUG_IPI (IVT_FREEBASE + 2) -typedef struct istate { - /* - * The strange order of the GPRs is given by the requirement to use the - * istate structure for both regular interrupts and exceptions as well - * as for syscall handlers which use this order as an optimization. - */ - uint32_t edx; - uint32_t ecx; - uint32_t ebx; - uint32_t esi; - uint32_t edi; - uint32_t ebp; - uint32_t eax; - - uint32_t ebp_frame; /* imitation of frame pointer linkage */ - uint32_t eip_frame; /* imitation of return address linkage */ - - uint32_t gs; - uint32_t fs; - uint32_t es; - uint32_t ds; - - uint32_t error_word; /* real or fake error word */ - uint32_t eip; - uint32_t cs; - uint32_t eflags; - uint32_t esp; /* only if istate_t is from uspace */ - uint32_t ss; /* only if istate_t is from uspace */ -} istate_t; - -/** Return true if exception happened while in userspace */ -NO_TRACE static inline int istate_from_uspace(istate_t *istate) -{ - return !(istate->eip & 0x80000000); -} - -NO_TRACE static inline void istate_set_retaddr(istate_t *istate, - uintptr_t retaddr) -{ - istate->eip = retaddr; -} - -NO_TRACE static inline unative_t istate_get_pc(istate_t *istate) -{ - return istate->eip; -} - -NO_TRACE static inline unative_t istate_get_fp(istate_t *istate) -{ - return istate->ebp; -} - extern void (* disable_irqs_function)(uint16_t); extern void (* enable_irqs_function)(uint16_t); Index: kernel/arch/ia32/include/istate.h =================================================================== --- kernel/arch/ia32/include/istate.h (revision 458619f79d2015d51ba730dc3853632b671a9005) +++ kernel/arch/ia32/include/istate.h (revision 458619f79d2015d51ba730dc3853632b671a9005) @@ -0,0 +1,101 @@ +/* + * Copyright (c) 2001-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. + */ + +/** @addtogroup ia32interrupt + * @{ + */ +/** @file + */ + +#ifndef KERN_ia32_ISTATE_H_ +#define KERN_ia32_ISTATE_H_ + +#ifdef KERNEL +#include +#include +#else +#include +#define NO_TRACE +#endif + +typedef struct istate { + /* + * The strange order of the GPRs is given by the requirement to use the + * istate structure for both regular interrupts and exceptions as well + * as for syscall handlers which use this order as an optimization. + */ + uint32_t edx; + uint32_t ecx; + uint32_t ebx; + uint32_t esi; + uint32_t edi; + uint32_t ebp; + uint32_t eax; + + uint32_t ebp_frame; /* imitation of frame pointer linkage */ + uint32_t eip_frame; /* imitation of return address linkage */ + + uint32_t gs; + uint32_t fs; + uint32_t es; + uint32_t ds; + + uint32_t error_word; /* real or fake error word */ + uint32_t eip; + uint32_t cs; + uint32_t eflags; + uint32_t esp; /* only if istate_t is from uspace */ + uint32_t ss; /* only if istate_t is from uspace */ +} istate_t; + +/** Return true if exception happened while in userspace */ +NO_TRACE static inline int istate_from_uspace(istate_t *istate) +{ + return !(istate->eip & 0x80000000); +} + +NO_TRACE static inline void istate_set_retaddr(istate_t *istate, + uintptr_t retaddr) +{ + istate->eip = retaddr; +} + +NO_TRACE static inline uintptr_t istate_get_pc(istate_t *istate) +{ + return istate->eip; +} + +NO_TRACE static inline uintptr_t istate_get_fp(istate_t *istate) +{ + return istate->ebp; +} + +#endif + +/** @} + */ Index: kernel/arch/ia64/include/interrupt.h =================================================================== --- kernel/arch/ia64/include/interrupt.h (revision 5c0889751538969abfb6f515b8ac7a0770490947) +++ kernel/arch/ia64/include/interrupt.h (revision 458619f79d2015d51ba730dc3853632b671a9005) @@ -37,6 +37,5 @@ #include -#include -#include +#include /** ia64 has 256 INRs. */ @@ -74,89 +73,5 @@ #define EOI 0 /**< The actual value doesn't matter. */ -typedef struct istate { - uint128_t f2; - uint128_t f3; - uint128_t f4; - uint128_t f5; - uint128_t f6; - uint128_t f7; - uint128_t f8; - uint128_t f9; - uint128_t f10; - uint128_t f11; - uint128_t f12; - uint128_t f13; - uint128_t f14; - uint128_t f15; - uint128_t f16; - uint128_t f17; - uint128_t f18; - uint128_t f19; - uint128_t f20; - uint128_t f21; - uint128_t f22; - uint128_t f23; - uint128_t f24; - uint128_t f25; - uint128_t f26; - uint128_t f27; - uint128_t f28; - uint128_t f29; - uint128_t f30; - uint128_t f31; - - uintptr_t ar_bsp; - uintptr_t ar_bspstore; - uintptr_t ar_bspstore_new; - uint64_t ar_rnat; - uint64_t ar_ifs; - uint64_t ar_pfs; - uint64_t ar_rsc; - uintptr_t cr_ifa; - cr_isr_t cr_isr; - uintptr_t cr_iipa; - psr_t cr_ipsr; - uintptr_t cr_iip; - uint64_t pr; - uintptr_t sp; - - /* - * The following variables are defined only for break_instruction - * handler. - */ - uint64_t in0; - uint64_t in1; - uint64_t in2; - uint64_t in3; - uint64_t in4; - uint64_t in5; - uint64_t in6; -} istate_t; - extern void *ivt; - -NO_TRACE static inline void istate_set_retaddr(istate_t *istate, - uintptr_t retaddr) -{ - istate->cr_iip = retaddr; - istate->cr_ipsr.ri = 0; /* return to instruction slot #0 */ -} - -NO_TRACE static inline unative_t istate_get_pc(istate_t *istate) -{ - return istate->cr_iip; -} - -NO_TRACE static inline unative_t istate_get_fp(istate_t *istate) -{ - /* FIXME */ - - return 0; -} - -NO_TRACE static inline int istate_from_uspace(istate_t *istate) -{ - return (istate->cr_iip) < 0xe000000000000000ULL; -} extern void general_exception(uint64_t, istate_t *); Index: kernel/arch/ia64/include/istate.h =================================================================== --- kernel/arch/ia64/include/istate.h (revision 458619f79d2015d51ba730dc3853632b671a9005) +++ kernel/arch/ia64/include/istate.h (revision 458619f79d2015d51ba730dc3853632b671a9005) @@ -0,0 +1,135 @@ +/* + * Copyright (c) 2005 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. + */ + +/** @addtogroup ia64interrupt + * @{ + */ +/** @file + */ + +#ifndef KERN_ia64_ISTATE_H_ +#define KERN_ia64_ISTATE_H_ + +#include + +#ifdef KERNEL +#include +#include +#else +#include +#define NO_TRACE +#endif + +typedef struct istate { + uint128_t f2; + uint128_t f3; + uint128_t f4; + uint128_t f5; + uint128_t f6; + uint128_t f7; + uint128_t f8; + uint128_t f9; + uint128_t f10; + uint128_t f11; + uint128_t f12; + uint128_t f13; + uint128_t f14; + uint128_t f15; + uint128_t f16; + uint128_t f17; + uint128_t f18; + uint128_t f19; + uint128_t f20; + uint128_t f21; + uint128_t f22; + uint128_t f23; + uint128_t f24; + uint128_t f25; + uint128_t f26; + uint128_t f27; + uint128_t f28; + uint128_t f29; + uint128_t f30; + uint128_t f31; + + uintptr_t ar_bsp; + uintptr_t ar_bspstore; + uintptr_t ar_bspstore_new; + uint64_t ar_rnat; + uint64_t ar_ifs; + uint64_t ar_pfs; + uint64_t ar_rsc; + uintptr_t cr_ifa; + cr_isr_t cr_isr; + uintptr_t cr_iipa; + psr_t cr_ipsr; + uintptr_t cr_iip; + uint64_t pr; + uintptr_t sp; + + /* + * The following variables are defined only for break_instruction + * handler. + */ + uint64_t in0; + uint64_t in1; + uint64_t in2; + uint64_t in3; + uint64_t in4; + uint64_t in5; + uint64_t in6; +} istate_t; + +NO_TRACE static inline void istate_set_retaddr(istate_t *istate, + uintptr_t retaddr) +{ + istate->cr_iip = retaddr; + istate->cr_ipsr.ri = 0; /* return to instruction slot #0 */ +} + +NO_TRACE static inline uintptr_t istate_get_pc(istate_t *istate) +{ + return istate->cr_iip; +} + +NO_TRACE static inline uintptr_t istate_get_fp(istate_t *istate) +{ + /* FIXME */ + + return 0; +} + +NO_TRACE static inline int istate_from_uspace(istate_t *istate) +{ + return (istate->cr_iip) < 0xe000000000000000ULL; +} + +#endif + +/** @} + */ Index: kernel/arch/ia64/include/register.h =================================================================== --- kernel/arch/ia64/include/register.h (revision 5c0889751538969abfb6f515b8ac7a0770490947) +++ kernel/arch/ia64/include/register.h (revision 458619f79d2015d51ba730dc3853632b671a9005) @@ -142,5 +142,9 @@ #ifndef __ASM__ +#ifdef KERNEL #include +#else +#include +#endif /** Processor Status Register. */ Index: kernel/arch/mips32/include/cp0.h =================================================================== --- kernel/arch/mips32/include/cp0.h (revision 5c0889751538969abfb6f515b8ac7a0770490947) +++ kernel/arch/mips32/include/cp0.h (revision 458619f79d2015d51ba730dc3853632b671a9005) @@ -36,5 +36,9 @@ #define KERN_mips32_CP0_H_ +#ifdef KERNEL #include +#else +#include +#endif #define cp0_status_ie_enabled_bit (1 << 0) Index: kernel/arch/mips32/include/exception.h =================================================================== --- kernel/arch/mips32/include/exception.h (revision 5c0889751538969abfb6f515b8ac7a0770490947) +++ kernel/arch/mips32/include/exception.h (revision 458619f79d2015d51ba730dc3853632b671a9005) @@ -37,6 +37,5 @@ #include -#include -#include +#include #define EXC_Int 0 @@ -59,72 +58,4 @@ #define EXC_VCED 31 -typedef struct istate { - /* - * The first seven registers are arranged so that the istate structure - * can be used both for exception handlers and for the syscall handler. - */ - uint32_t a0; /* arg1 */ - uint32_t a1; /* arg2 */ - uint32_t a2; /* arg3 */ - uint32_t a3; /* arg4 */ - uint32_t t0; /* arg5 */ - uint32_t t1; /* arg6 */ - uint32_t v0; /* arg7 */ - uint32_t v1; - uint32_t at; - uint32_t t2; - uint32_t t3; - uint32_t t4; - uint32_t t5; - uint32_t t6; - uint32_t t7; - 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 t8; - uint32_t t9; - uint32_t kt0; - uint32_t kt1; /* We use it as thread-local pointer */ - uint32_t gp; - uint32_t sp; - uint32_t s8; - uint32_t ra; - - uint32_t lo; - uint32_t hi; - - uint32_t status; /* cp0_status */ - uint32_t epc; /* cp0_epc */ - - uint32_t alignment; /* to make sizeof(istate_t) a multiple of 8 */ -} istate_t; - -NO_TRACE static inline void istate_set_retaddr(istate_t *istate, - uintptr_t retaddr) -{ - istate->epc = retaddr; -} - -/** Return true if exception happened while in userspace */ -NO_TRACE static inline int istate_from_uspace(istate_t *istate) -{ - return istate->status & cp0_status_um_bit; -} - -NO_TRACE static inline unative_t istate_get_pc(istate_t *istate) -{ - return istate->epc; -} - -NO_TRACE static inline unative_t istate_get_fp(istate_t *istate) -{ - return istate->sp; -} - extern void exception(istate_t *istate); extern void tlb_refill_entry(void); Index: kernel/arch/mips32/include/istate.h =================================================================== --- kernel/arch/mips32/include/istate.h (revision 458619f79d2015d51ba730dc3853632b671a9005) +++ kernel/arch/mips32/include/istate.h (revision 458619f79d2015d51ba730dc3853632b671a9005) @@ -0,0 +1,119 @@ +/* + * 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. + */ + +/** @addtogroup mips32interrupt + * @{ + */ +/** @file + */ + +#ifndef KERN_mips32_ISTATE_H_ +#define KERN_mips32_ISTATE_H_ + +#include + +#ifdef KERNEL +#include +#include +#else +#include +#define NO_TRACE +#endif + +typedef struct istate { + /* + * The first seven registers are arranged so that the istate structure + * can be used both for exception handlers and for the syscall handler. + */ + uint32_t a0; /* arg1 */ + uint32_t a1; /* arg2 */ + uint32_t a2; /* arg3 */ + uint32_t a3; /* arg4 */ + uint32_t t0; /* arg5 */ + uint32_t t1; /* arg6 */ + uint32_t v0; /* arg7 */ + uint32_t v1; + uint32_t at; + uint32_t t2; + uint32_t t3; + uint32_t t4; + uint32_t t5; + uint32_t t6; + uint32_t t7; + 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 t8; + uint32_t t9; + uint32_t kt0; + uint32_t kt1; /* We use it as thread-local pointer */ + uint32_t gp; + uint32_t sp; + uint32_t s8; + uint32_t ra; + + uint32_t lo; + uint32_t hi; + + uint32_t status; /* cp0_status */ + uint32_t epc; /* cp0_epc */ + + uint32_t alignment; /* to make sizeof(istate_t) a multiple of 8 */ +} istate_t; + +NO_TRACE static inline void istate_set_retaddr(istate_t *istate, + uintptr_t retaddr) +{ + istate->epc = retaddr; +} + +/** Return true if exception happened while in userspace */ +NO_TRACE static inline int istate_from_uspace(istate_t *istate) +{ + return istate->status & cp0_status_um_bit; +} + +NO_TRACE static inline uintptr_t istate_get_pc(istate_t *istate) +{ + return istate->epc; +} + +NO_TRACE static inline uintptr_t istate_get_fp(istate_t *istate) +{ + return istate->sp; +} + +#endif + +/** @} + */ Index: kernel/arch/ppc32/include/istate.h =================================================================== --- kernel/arch/ppc32/include/istate.h (revision 458619f79d2015d51ba730dc3853632b671a9005) +++ kernel/arch/ppc32/include/istate.h (revision 458619f79d2015d51ba730dc3853632b671a9005) @@ -0,0 +1,113 @@ +/* + * Copyright (c) 2006 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. + */ + +/** @addtogroup ppc32 + * @{ + */ +/** @file + */ + +#ifndef KERN_ppc32_EXCEPTION_H_ +#define KERN_ppc32_EXCEPTION_H_ + +#include +#include +#include + +typedef struct istate { + uint32_t r0; + 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 r11; + uint32_t r13; + uint32_t r14; + uint32_t r15; + uint32_t r16; + uint32_t r17; + uint32_t r18; + uint32_t r19; + uint32_t r20; + uint32_t r21; + uint32_t r22; + uint32_t r23; + uint32_t r24; + uint32_t r25; + uint32_t r26; + uint32_t r27; + uint32_t r28; + uint32_t r29; + uint32_t r30; + uint32_t r31; + uint32_t cr; + uint32_t pc; + uint32_t srr1; + uint32_t lr; + uint32_t ctr; + uint32_t xer; + uint32_t dar; + uint32_t r12; + uint32_t sp; +} istate_t; + +NO_TRACE static inline void istate_set_retaddr(istate_t *istate, + uintptr_t retaddr) +{ + istate->pc = retaddr; +} + +/** Return true if exception happened while in userspace + * + * The contexts of MSR register was stored in SRR1. + * + */ +NO_TRACE static inline int istate_from_uspace(istate_t *istate) +{ + return (istate->srr1 & MSR_PR) != 0; +} + +NO_TRACE static inline uintptr_t istate_get_pc(istate_t *istate) +{ + return istate->pc; +} + +NO_TRACE static inline uintptr_t istate_get_fp(istate_t *istate) +{ + return istate->sp; +} + +#endif + +/** @} + */ Index: kernel/arch/sparc64/include/interrupt.h =================================================================== --- kernel/arch/sparc64/include/interrupt.h (revision 5c0889751538969abfb6f515b8ac7a0770490947) +++ kernel/arch/sparc64/include/interrupt.h (revision 458619f79d2015d51ba730dc3853632b671a9005) @@ -38,6 +38,5 @@ #include -#include -#include +#include #define IVT_ITEMS 15 @@ -51,33 +50,4 @@ }; -typedef struct istate { - uint64_t tnpc; - uint64_t tpc; - uint64_t tstate; -} istate_t; - -NO_TRACE static inline void istate_set_retaddr(istate_t *istate, - uintptr_t retaddr) -{ - istate->tpc = retaddr; -} - -NO_TRACE static inline int istate_from_uspace(istate_t *istate) -{ - return !(istate->tstate & TSTATE_PRIV_BIT); -} - -NO_TRACE static inline unative_t istate_get_pc(istate_t *istate) -{ - return istate->tpc; -} - -NO_TRACE static inline unative_t istate_get_fp(istate_t *istate) -{ - /* TODO */ - - return 0; -} - #endif Index: kernel/arch/sparc64/include/istate.h =================================================================== --- kernel/arch/sparc64/include/istate.h (revision 458619f79d2015d51ba730dc3853632b671a9005) +++ kernel/arch/sparc64/include/istate.h (revision 458619f79d2015d51ba730dc3853632b671a9005) @@ -0,0 +1,80 @@ +/* + * Copyright (c) 2005 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. + */ + +/** @addtogroup sparc64interrupt sparc64 + * @ingroup interrupt + * @{ + */ +/** @file + */ + +#ifndef KERN_sparc64_ISTATE_H_ +#define KERN_sparc64_ISTATE_H_ + +#include + +#ifdef KERNEL +#include +#include +#else +#include +#define NO_TRACE +#endif + +typedef struct istate { + uint64_t tnpc; + uint64_t tpc; + uint64_t tstate; +} istate_t; + +NO_TRACE static inline void istate_set_retaddr(istate_t *istate, + uintptr_t retaddr) +{ + istate->tpc = retaddr; +} + +NO_TRACE static inline int istate_from_uspace(istate_t *istate) +{ + return !(istate->tstate & TSTATE_PRIV_BIT); +} + +NO_TRACE static inline uintptr_t istate_get_pc(istate_t *istate) +{ + return istate->tpc; +} + +NO_TRACE static inline uintptr_t istate_get_fp(istate_t *istate) +{ + /* TODO */ + return 0; +} + +#endif + +/** @} + */