Index: uspace/lib/c/arch/abs32le/include/istate.h =================================================================== --- uspace/lib/c/arch/abs32le/include/istate.h (revision f2d2c6049aba8476777148ca9a6e2daaf5b9a771) +++ uspace/lib/c/arch/abs32le/include/istate.h (revision 4f35b9ff312815d8d10bd15cf522c3dc2d914ff2) @@ -36,26 +36,5 @@ #define LIBC_abs32le__ISTATE_H_ -#include - -/** Interrupt context. - * - * 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; - -static inline uintptr_t istate_get_pc(istate_t *istate) -{ - return istate->ip; -} - -static inline uintptr_t istate_get_fp(istate_t *istate) -{ - return istate->fp; -} +#include #endif Index: uspace/lib/c/arch/amd64/include/istate.h =================================================================== --- uspace/lib/c/arch/amd64/include/istate.h (revision f2d2c6049aba8476777148ca9a6e2daaf5b9a771) +++ uspace/lib/c/arch/amd64/include/istate.h (revision 4f35b9ff312815d8d10bd15cf522c3dc2d914ff2) @@ -36,37 +36,5 @@ #define LIBC_amd64_ISTATE_H_ -#include - -/** Interrupt context. - * - * This is a copy of the kernel definition with which it must be kept in sync. - */ -typedef struct istate { - uint64_t rax; - uint64_t rcx; - uint64_t rdx; - uint64_t rsi; - uint64_t rdi; - uint64_t r8; - uint64_t r9; - uint64_t r10; - uint64_t r11; - uint64_t rbp; - uint64_t error_word; - uint64_t rip; - uint64_t cs; - uint64_t rflags; - uint64_t stack[]; /* Additional data on stack */ -} istate_t; - -static inline uintptr_t istate_get_pc(istate_t *istate) -{ - return istate->rip; -} - -static inline uintptr_t istate_get_fp(istate_t *istate) -{ - return istate->rbp; -} +#include #endif Index: uspace/lib/c/arch/arm32/include/istate.h =================================================================== --- uspace/lib/c/arch/arm32/include/istate.h (revision f2d2c6049aba8476777148ca9a6e2daaf5b9a771) +++ uspace/lib/c/arch/arm32/include/istate.h (revision 4f35b9ff312815d8d10bd15cf522c3dc2d914ff2) @@ -36,41 +36,5 @@ #define LIBC_arm32__ISTATE_H_ -#include - -/** Interrupt context. - * - * This is a copy of the kernel definition with which it must be kept in sync. - */ -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; - -static inline uintptr_t istate_get_pc(istate_t *istate) -{ - return istate->pc; -} - -static inline uintptr_t istate_get_fp(istate_t *istate) -{ - return istate->fp; -} +#include #endif Index: uspace/lib/c/arch/ia32/include/istate.h =================================================================== --- uspace/lib/c/arch/ia32/include/istate.h (revision f2d2c6049aba8476777148ca9a6e2daaf5b9a771) +++ uspace/lib/c/arch/ia32/include/istate.h (revision 4f35b9ff312815d8d10bd15cf522c3dc2d914ff2) @@ -36,37 +36,5 @@ #define LIBC_ia32__ISTATE_H_ -#include - -/** Interrupt context. - * - * This is a copy of the kernel definition with which it must be kept in sync. - */ -typedef struct istate { - uint32_t eax; - uint32_t ecx; - uint32_t edx; - uint32_t ebp; - - uint32_t gs; - uint32_t fs; - uint32_t es; - uint32_t ds; - - uint32_t error_word; - uint32_t eip; - uint32_t cs; - uint32_t eflags; - uint32_t stack[]; -} istate_t; - -static inline uintptr_t istate_get_pc(istate_t *istate) -{ - return istate->eip; -} - -static inline uintptr_t istate_get_fp(istate_t *istate) -{ - return istate->ebp; -} +#include #endif Index: uspace/lib/c/arch/ia64/include/istate.h =================================================================== --- uspace/lib/c/arch/ia64/include/istate.h (revision f2d2c6049aba8476777148ca9a6e2daaf5b9a771) +++ uspace/lib/c/arch/ia64/include/istate.h (revision 4f35b9ff312815d8d10bd15cf522c3dc2d914ff2) @@ -36,25 +36,5 @@ #define LIBC_ia64_ISTATE_H_ -#include - -/** Interrupt context. - * - * This is a copy of the kernel definition with which it must be kept in sync. - */ -typedef struct istate { - /* TODO */ -} istate_t; - -static inline uintptr_t istate_get_pc(istate_t *istate) -{ - /* TODO */ - return 0; -} - -static inline uintptr_t istate_get_fp(istate_t *istate) -{ - /* TODO */ - return 0; -} +#include #endif Index: uspace/lib/c/arch/mips32/include/istate.h =================================================================== --- uspace/lib/c/arch/mips32/include/istate.h (revision f2d2c6049aba8476777148ca9a6e2daaf5b9a771) +++ uspace/lib/c/arch/mips32/include/istate.h (revision 4f35b9ff312815d8d10bd15cf522c3dc2d914ff2) @@ -36,50 +36,5 @@ #define LIBC_mips32__ISTATE_H_ -#include - -/** Interrupt context. - * - * This is a copy of the kernel definition with which it must be kept in sync. - */ -typedef struct istate { - uint32_t at; - uint32_t v0; - uint32_t v1; - uint32_t a0; - uint32_t a1; - uint32_t a2; - uint32_t a3; - uint32_t t0; - uint32_t t1; - uint32_t t2; - uint32_t t3; - uint32_t t4; - uint32_t t5; - uint32_t t6; - uint32_t t7; - uint32_t t8; - uint32_t t9; - uint32_t gp; - uint32_t sp; - uint32_t ra; - - uint32_t lo; - uint32_t hi; - - uint32_t status; /* cp0_status */ - uint32_t epc; /* cp0_epc */ - uint32_t k1; /* We use it as thread-local pointer */ -} istate_t; - -static inline uintptr_t istate_get_pc(istate_t *istate) -{ - return istate->epc; -} - -static inline uintptr_t istate_get_fp(istate_t *istate) -{ - /* TODO */ - return 0; -} +#include #endif Index: uspace/lib/c/arch/sparc64/include/istate.h =================================================================== --- uspace/lib/c/arch/sparc64/include/istate.h (revision f2d2c6049aba8476777148ca9a6e2daaf5b9a771) +++ uspace/lib/c/arch/sparc64/include/istate.h (revision 4f35b9ff312815d8d10bd15cf522c3dc2d914ff2) @@ -36,25 +36,5 @@ #define LIBC_sparc64_ISTATE_H_ -#include - -/** Interrupt context. - * - * This is a copy of the kernel definition with which it must be kept in sync. - */ -typedef struct istate { - /* TODO */ -} istate_t; - -static inline uintptr_t istate_get_pc(istate_t *istate) -{ - /* TODO */ - return 0; -} - -static inline uintptr_t istate_get_fp(istate_t *istate) -{ - /* TODO */ - return 0; -} +#include #endif