Index: kernel/Makefile =================================================================== --- kernel/Makefile (revision a8bb38ceab1997348c644ee294eac3e8badf5d0b) +++ kernel/Makefile (revision b538ca5cefd42f154f31ac8a6eaeb314a2eb8bf9) @@ -59,4 +59,5 @@ REAL_MAP = generic/src/debug/real_map +ABI_INCLUDE = generic/include/abi ARCH_INCLUDE = generic/include/arch GENARCH_INCLUDE = generic/include/genarch @@ -75,5 +76,5 @@ clean: - rm -f $(DEPEND) $(DEPEND_PREV) $(RAW) $(BIN) $(MAP) $(JOB) $(MAP_PREV) $(DISASM) $(DUMP) $(REAL_MAP).* $(ARCH_INCLUDE) $(GENARCH_INCLUDE) arch/*/_link.ld arch/*/include/common.h + rm -f $(DEPEND) $(DEPEND_PREV) $(RAW) $(BIN) $(MAP) $(JOB) $(MAP_PREV) $(DISASM) $(DUMP) $(REAL_MAP).* $(ABI_INCLUDE) $(ARCH_INCLUDE) $(GENARCH_INCLUDE) arch/*/_link.ld arch/*/include/common.h find generic/src/ arch/*/src/ genarch/src/ test/ -name '*.o' -follow -exec rm \{\} \; @@ -432,8 +433,11 @@ $(GENMAP) $(MAP_PREV) $(DUMP) $@ -$(DEPEND): $(ARCH_INCLUDE) $(GENARCH_INCLUDE) $(COMMON_HEADER_ARCH) +$(DEPEND): $(ABI_INCLUDE) $(ARCH_INCLUDE) $(GENARCH_INCLUDE) $(COMMON_HEADER_ARCH) makedepend -f - -- $(DEPEND_DEFS) $(CFLAGS) -- $(ARCH_SOURCES) $(GENARCH_SOURCES) $(GENERIC_SOURCES) > $@ 2> /dev/null -[ -f $(DEPEND_PREV) ] && diff -q $(DEPEND_PREV) $@ && mv -f $(DEPEND_PREV) $@ +$(ABI_INCLUDE): ../abi/include/ + ln -sfn ../../$< $@ + $(ARCH_INCLUDE): arch/$(KARCH)/include/ ln -sfn ../../$< $@ Index: kernel/arch/abs32le/include/istate.h =================================================================== --- kernel/arch/abs32le/include/istate.h (revision a8bb38ceab1997348c644ee294eac3e8badf5d0b) +++ kernel/arch/abs32le/include/istate.h (revision b538ca5cefd42f154f31ac8a6eaeb314a2eb8bf9) @@ -36,15 +36,12 @@ #define KERN_abs32le_ISTATE_H_ +#include + #ifdef KERNEL -#include #include -#include #else /* KERNEL */ -#include - -#define NO_TRACE #define REQUIRES_EXTENT_MUTABLE(arg) #define WRITES(arg) Index: kernel/arch/abs32le/include/mm/frame.h =================================================================== --- kernel/arch/abs32le/include/mm/frame.h (revision a8bb38ceab1997348c644ee294eac3e8badf5d0b) +++ kernel/arch/abs32le/include/mm/frame.h (revision b538ca5cefd42f154f31ac8a6eaeb314a2eb8bf9) @@ -39,6 +39,4 @@ #define FRAME_SIZE (1 << FRAME_WIDTH) -#ifdef KERNEL - #include @@ -46,6 +44,4 @@ extern void physmem_print(void); -#endif /* KERNEL */ - #endif Index: kernel/arch/abs32le/include/mm/page.h =================================================================== --- kernel/arch/abs32le/include/mm/page.h (revision a8bb38ceab1997348c644ee294eac3e8badf5d0b) +++ kernel/arch/abs32le/include/mm/page.h (revision b538ca5cefd42f154f31ac8a6eaeb314a2eb8bf9) @@ -41,6 +41,4 @@ #define PAGE_WIDTH FRAME_WIDTH #define PAGE_SIZE FRAME_SIZE - -#ifdef KERNEL #define KA2PA(x) (((uintptr_t) (x)) - UINT32_C(0x80000000)) @@ -178,6 +176,4 @@ extern void page_fault(unsigned int, istate_t *); -#endif /* KERNEL */ - #endif Index: kernel/arch/abs32le/src/userspace.c =================================================================== --- kernel/arch/abs32le/src/userspace.c (revision a8bb38ceab1997348c644ee294eac3e8badf5d0b) +++ kernel/arch/abs32le/src/userspace.c (revision b538ca5cefd42f154f31ac8a6eaeb314a2eb8bf9) @@ -36,7 +36,6 @@ #include #include -#include +#include #include - void userspace(uspace_arg_t *kernel_uarg) Index: kernel/arch/amd64/include/context.h =================================================================== --- kernel/arch/amd64/include/context.h (revision a8bb38ceab1997348c644ee294eac3e8badf5d0b) +++ kernel/arch/amd64/include/context.h (revision b538ca5cefd42f154f31ac8a6eaeb314a2eb8bf9) @@ -36,6 +36,4 @@ #define KERN_amd64_CONTEXT_H_ -#ifdef KERNEL - #include @@ -52,6 +50,4 @@ (c)->rbp = 0; \ } while (0) - -#endif /* KERNEL */ /* We include only registers that must be preserved Index: kernel/arch/amd64/include/istate.h =================================================================== --- kernel/arch/amd64/include/istate.h (revision a8bb38ceab1997348c644ee294eac3e8badf5d0b) +++ kernel/arch/amd64/include/istate.h (revision b538ca5cefd42f154f31ac8a6eaeb314a2eb8bf9) @@ -36,16 +36,5 @@ #define KERN_amd64_ISTATE_H_ -#ifdef KERNEL - -#include #include - -#else /* KERNEL */ - -#include - -#define NO_TRACE - -#endif /* KERNEL */ /** This is passed to interrupt handlers */ Index: kernel/arch/amd64/include/mm/frame.h =================================================================== --- kernel/arch/amd64/include/mm/frame.h (revision a8bb38ceab1997348c644ee294eac3e8badf5d0b) +++ kernel/arch/amd64/include/mm/frame.h (revision b538ca5cefd42f154f31ac8a6eaeb314a2eb8bf9) @@ -39,5 +39,4 @@ #define FRAME_SIZE (1 << FRAME_WIDTH) -#ifdef KERNEL #ifndef __ASM__ @@ -49,5 +48,4 @@ #endif /* __ASM__ */ -#endif /* KERNEL */ #endif Index: kernel/arch/amd64/include/mm/page.h =================================================================== --- kernel/arch/amd64/include/mm/page.h (revision a8bb38ceab1997348c644ee294eac3e8badf5d0b) +++ kernel/arch/amd64/include/mm/page.h (revision b538ca5cefd42f154f31ac8a6eaeb314a2eb8bf9) @@ -50,6 +50,4 @@ #define PAGE_WIDTH FRAME_WIDTH #define PAGE_SIZE FRAME_SIZE - -#ifdef KERNEL #ifndef __ASM__ @@ -231,6 +229,4 @@ #endif /* __ASM__ */ -#endif /* KERNEL */ - #endif Index: kernel/arch/amd64/src/userspace.c =================================================================== --- kernel/arch/amd64/src/userspace.c (revision a8bb38ceab1997348c644ee294eac3e8badf5d0b) +++ kernel/arch/amd64/src/userspace.c (revision b538ca5cefd42f154f31ac8a6eaeb314a2eb8bf9) @@ -38,7 +38,6 @@ #include #include -#include +#include #include - /** Enter userspace Index: kernel/arch/arm32/include/istate.h =================================================================== --- kernel/arch/arm32/include/istate.h (revision a8bb38ceab1997348c644ee294eac3e8badf5d0b) +++ kernel/arch/arm32/include/istate.h (revision b538ca5cefd42f154f31ac8a6eaeb314a2eb8bf9) @@ -35,13 +35,15 @@ #define KERN_arm32_ISTATE_H_ +#include + +#ifdef KERNEL + #include -#ifdef KERNEL -#include -#include -#else -#include -#define NO_TRACE -#endif +#else /* KERNEL */ + +#include + +#endif /* KERNEL */ /** Struct representing CPU state saved when an exception occurs. */ Index: kernel/arch/arm32/include/mm/frame.h =================================================================== --- kernel/arch/arm32/include/mm/frame.h (revision a8bb38ceab1997348c644ee294eac3e8badf5d0b) +++ kernel/arch/arm32/include/mm/frame.h (revision b538ca5cefd42f154f31ac8a6eaeb314a2eb8bf9) @@ -40,5 +40,4 @@ #define FRAME_SIZE (1 << FRAME_WIDTH) -#ifdef KERNEL #ifndef __ASM__ @@ -69,5 +68,4 @@ #endif /* __ASM__ */ -#endif /* KERNEL */ #endif Index: kernel/arch/arm32/include/mm/page.h =================================================================== --- kernel/arch/arm32/include/mm/page.h (revision a8bb38ceab1997348c644ee294eac3e8badf5d0b) +++ kernel/arch/arm32/include/mm/page.h (revision b538ca5cefd42f154f31ac8a6eaeb314a2eb8bf9) @@ -52,6 +52,4 @@ # define PA2KA(x) ((x) + 0x80000000) #endif - -#ifdef KERNEL /* Number of entries in each level. */ @@ -320,6 +318,4 @@ #endif /* __ASM__ */ -#endif /* KERNEL */ - #endif Index: kernel/arch/arm32/include/regutils.h =================================================================== --- kernel/arch/arm32/include/regutils.h (revision a8bb38ceab1997348c644ee294eac3e8badf5d0b) +++ kernel/arch/arm32/include/regutils.h (revision b538ca5cefd42f154f31ac8a6eaeb314a2eb8bf9) @@ -30,5 +30,5 @@ * @{ */ -/** +/** * @file * @brief Utilities for convenient manipulation with ARM registers. @@ -38,52 +38,49 @@ #define KERN_arm32_REGUTILS_H_ -#define STATUS_REG_IRQ_DISABLED_BIT (1 << 7) -#define STATUS_REG_MODE_MASK 0x1f +#define STATUS_REG_IRQ_DISABLED_BIT (1 << 7) +#define STATUS_REG_MODE_MASK 0x1f -#define CP15_R1_HIGH_VECTORS_BIT (1 << 13) - +#define CP15_R1_HIGH_VECTORS_BIT (1 << 13) /* ARM Processor Operation Modes */ -#define USER_MODE 0x10 -#define FIQ_MODE 0x11 -#define IRQ_MODE 0x12 -#define SUPERVISOR_MODE 0x13 -#define ABORT_MODE 0x17 -#define UNDEFINED_MODE 0x1b -#define SYSTEM_MODE 0x1f +#define USER_MODE 0x10 +#define FIQ_MODE 0x11 +#define IRQ_MODE 0x12 +#define SUPERVISOR_MODE 0x13 +#define ABORT_MODE 0x17 +#define UNDEFINED_MODE 0x1b +#define SYSTEM_MODE 0x1f /* [CS]PRS manipulation macros */ -#define GEN_STATUS_READ(nm,reg) \ -static inline uint32_t nm## _status_reg_read(void) \ -{ \ - uint32_t retval; \ - asm volatile( \ - "mrs %[retval], " #reg \ - : [retval] "=r" (retval) \ - ); \ - return retval; \ -} +#define GEN_STATUS_READ(nm, reg) \ + static inline uint32_t nm## _status_reg_read(void) \ + { \ + uint32_t retval; \ + \ + asm volatile ( \ + "mrs %[retval], " #reg \ + : [retval] "=r" (retval) \ + ); \ + \ + return retval; \ + } -#define GEN_STATUS_WRITE(nm,reg,fieldname, field) \ -static inline void nm## _status_reg_ ##fieldname## _write(uint32_t value) \ -{ \ - asm volatile( \ - "msr " #reg "_" #field ", %[value]" \ - :: [value] "r" (value) \ - ); \ -} +#define GEN_STATUS_WRITE(nm, reg, fieldname, field) \ + static inline void nm## _status_reg_ ##fieldname## _write(uint32_t value) \ + { \ + asm volatile ( \ + "msr " #reg "_" #field ", %[value]" \ + :: [value] "r" (value) \ + ); \ + } +/** Return the value of CPSR (Current Program Status Register). */ +GEN_STATUS_READ(current, cpsr); -/** Returns the value of CPSR (Current Program Status Register). */ -GEN_STATUS_READ(current, cpsr) - - -/** Sets control bits of CPSR. */ +/** Set control bits of CPSR. */ GEN_STATUS_WRITE(current, cpsr, control, c); - -/** Returns the value of SPSR (Saved Program Status Register). */ -GEN_STATUS_READ(saved, spsr) - +/** Return the value of SPSR (Saved Program Status Register). */ +GEN_STATUS_READ(saved, spsr); #endif Index: kernel/arch/arm32/src/arm32.c =================================================================== --- kernel/arch/arm32/src/arm32.c (revision a8bb38ceab1997348c644ee294eac3e8badf5d0b) +++ kernel/arch/arm32/src/arm32.c (revision b538ca5cefd42f154f31ac8a6eaeb314a2eb8bf9) @@ -37,5 +37,5 @@ #include #include -#include +#include #include #include Index: kernel/arch/arm32/src/mach/gta02/gta02.c =================================================================== --- kernel/arch/arm32/src/mach/gta02/gta02.c (revision a8bb38ceab1997348c644ee294eac3e8badf5d0b) +++ kernel/arch/arm32/src/mach/gta02/gta02.c (revision b538ca5cefd42f154f31ac8a6eaeb314a2eb8bf9) @@ -39,5 +39,5 @@ #include #include -#include +#include #include #include Index: kernel/arch/arm32/src/mach/integratorcp/integratorcp.c =================================================================== --- kernel/arch/arm32/src/mach/integratorcp/integratorcp.c (revision a8bb38ceab1997348c644ee294eac3e8badf5d0b) +++ kernel/arch/arm32/src/mach/integratorcp/integratorcp.c (revision b538ca5cefd42f154f31ac8a6eaeb314a2eb8bf9) @@ -48,5 +48,5 @@ #include #include -#include +#include #include #include Index: kernel/arch/arm32/src/mach/testarm/testarm.c =================================================================== --- kernel/arch/arm32/src/mach/testarm/testarm.c (revision a8bb38ceab1997348c644ee294eac3e8badf5d0b) +++ kernel/arch/arm32/src/mach/testarm/testarm.c (revision b538ca5cefd42f154f31ac8a6eaeb314a2eb8bf9) @@ -38,5 +38,5 @@ #include #include -#include +#include #include #include Index: kernel/arch/ia32/include/context.h =================================================================== --- kernel/arch/ia32/include/context.h (revision a8bb38ceab1997348c644ee294eac3e8badf5d0b) +++ kernel/arch/ia32/include/context.h (revision b538ca5cefd42f154f31ac8a6eaeb314a2eb8bf9) @@ -36,6 +36,4 @@ #define KERN_ia32_CONTEXT_H_ -#ifdef KERNEL - #include @@ -57,6 +55,4 @@ } while (0) -#endif /* KERNEL */ - /* * Only save registers that must be preserved across Index: kernel/arch/ia32/include/elf.h =================================================================== --- kernel/arch/ia32/include/elf.h (revision a8bb38ceab1997348c644ee294eac3e8badf5d0b) +++ kernel/arch/ia32/include/elf.h (revision b538ca5cefd42f154f31ac8a6eaeb314a2eb8bf9) @@ -27,5 +27,5 @@ */ -/** @addtogroup ia32 +/** @addtogroup ia32 * @{ */ @@ -36,7 +36,7 @@ #define KERN_ia32_ELF_H_ -#define ELF_MACHINE EM_386 -#define ELF_DATA_ENCODING ELFDATA2LSB -#define ELF_CLASS ELFCLASS32 +#define ELF_MACHINE EM_386 +#define ELF_DATA_ENCODING ELFDATA2LSB +#define ELF_CLASS ELFCLASS32 #endif Index: kernel/arch/ia32/include/istate.h =================================================================== --- kernel/arch/ia32/include/istate.h (revision a8bb38ceab1997348c644ee294eac3e8badf5d0b) +++ kernel/arch/ia32/include/istate.h (revision b538ca5cefd42f154f31ac8a6eaeb314a2eb8bf9) @@ -36,16 +36,5 @@ #define KERN_ia32_ISTATE_H_ -#ifdef KERNEL - -#include #include - -#else /* KERNEL */ - -#include - -#define NO_TRACE - -#endif /* KERNEL */ typedef struct istate { Index: kernel/arch/ia32/include/mm/frame.h =================================================================== --- kernel/arch/ia32/include/mm/frame.h (revision a8bb38ceab1997348c644ee294eac3e8badf5d0b) +++ kernel/arch/ia32/include/mm/frame.h (revision b538ca5cefd42f154f31ac8a6eaeb314a2eb8bf9) @@ -39,5 +39,4 @@ #define FRAME_SIZE (1 << FRAME_WIDTH) -#ifdef KERNEL #ifndef __ASM__ @@ -50,5 +49,4 @@ #endif /* __ASM__ */ -#endif /* KERNEL */ #endif Index: kernel/arch/ia32/include/mm/page.h =================================================================== --- kernel/arch/ia32/include/mm/page.h (revision a8bb38ceab1997348c644ee294eac3e8badf5d0b) +++ kernel/arch/ia32/include/mm/page.h (revision b538ca5cefd42f154f31ac8a6eaeb314a2eb8bf9) @@ -42,6 +42,4 @@ #define PAGE_SIZE FRAME_SIZE -#ifdef KERNEL - #ifndef __ASM__ @@ -201,6 +199,4 @@ #endif /* __ASM__ */ -#endif /* KERNEL */ - #endif Index: kernel/arch/ia32/src/drivers/vesa.c =================================================================== --- kernel/arch/ia32/src/drivers/vesa.c (revision a8bb38ceab1997348c644ee294eac3e8badf5d0b) +++ kernel/arch/ia32/src/drivers/vesa.c (revision b538ca5cefd42f154f31ac8a6eaeb314a2eb8bf9) @@ -38,5 +38,4 @@ #include -#include #include #include Index: kernel/arch/ia32/src/smp/smp.c =================================================================== --- kernel/arch/ia32/src/smp/smp.c (revision a8bb38ceab1997348c644ee294eac3e8badf5d0b) +++ kernel/arch/ia32/src/smp/smp.c (revision b538ca5cefd42f154f31ac8a6eaeb314a2eb8bf9) @@ -42,5 +42,4 @@ #include #include -#include #include #include Index: kernel/arch/ia32/src/userspace.c =================================================================== --- kernel/arch/ia32/src/userspace.c (revision a8bb38ceab1997348c644ee294eac3e8badf5d0b) +++ kernel/arch/ia32/src/userspace.c (revision b538ca5cefd42f154f31ac8a6eaeb314a2eb8bf9) @@ -37,7 +37,6 @@ #include #include -#include +#include #include - /** Enter userspace Index: kernel/arch/ia64/include/elf.h =================================================================== --- kernel/arch/ia64/include/elf.h (revision a8bb38ceab1997348c644ee294eac3e8badf5d0b) +++ kernel/arch/ia64/include/elf.h (revision b538ca5cefd42f154f31ac8a6eaeb314a2eb8bf9) @@ -27,5 +27,5 @@ */ -/** @addtogroup ia64 +/** @addtogroup ia64 * @{ */ @@ -36,7 +36,7 @@ #define KERN_ia64_ELF_H_ -#define ELF_MACHINE EM_IA_64 -#define ELF_DATA_ENCODING ELFDATA2LSB -#define ELF_CLASS ELFCLASS64 +#define ELF_MACHINE EM_IA_64 +#define ELF_DATA_ENCODING ELFDATA2LSB +#define ELF_CLASS ELFCLASS64 #endif Index: kernel/arch/ia64/include/istate.h =================================================================== --- kernel/arch/ia64/include/istate.h (revision a8bb38ceab1997348c644ee294eac3e8badf5d0b) +++ kernel/arch/ia64/include/istate.h (revision b538ca5cefd42f154f31ac8a6eaeb314a2eb8bf9) @@ -36,13 +36,15 @@ #define KERN_ia64_ISTATE_H_ +#include + +#ifdef KERNEL + #include -#ifdef KERNEL -#include -#include -#else -#include -#define NO_TRACE -#endif +#else /* KERNEL */ + +#include + +#endif /* KERNEL */ typedef struct istate { Index: kernel/arch/ia64/include/mm/frame.h =================================================================== --- kernel/arch/ia64/include/mm/frame.h (revision a8bb38ceab1997348c644ee294eac3e8badf5d0b) +++ kernel/arch/ia64/include/mm/frame.h (revision b538ca5cefd42f154f31ac8a6eaeb314a2eb8bf9) @@ -39,5 +39,4 @@ #define FRAME_SIZE (1 << FRAME_WIDTH) -#ifdef KERNEL #ifndef __ASM__ @@ -50,5 +49,4 @@ #endif /* __ASM__ */ -#endif /* KERNEL */ #endif Index: kernel/arch/ia64/include/mm/page.h =================================================================== --- kernel/arch/ia64/include/mm/page.h (revision a8bb38ceab1997348c644ee294eac3e8badf5d0b) +++ kernel/arch/ia64/include/mm/page.h (revision b538ca5cefd42f154f31ac8a6eaeb314a2eb8bf9) @@ -41,6 +41,4 @@ #define PAGE_SIZE FRAME_SIZE #define PAGE_WIDTH FRAME_WIDTH - -#ifdef KERNEL /** Bit width of the TLB-locked portion of kernel address space. */ @@ -316,6 +314,4 @@ #endif /* __ASM__ */ -#endif /* KERNEL */ - #endif Index: kernel/arch/ia64/include/register.h =================================================================== --- kernel/arch/ia64/include/register.h (revision a8bb38ceab1997348c644ee294eac3e8badf5d0b) +++ kernel/arch/ia64/include/register.h (revision b538ca5cefd42f154f31ac8a6eaeb314a2eb8bf9) @@ -61,6 +61,6 @@ #define PSR_CPL_MASK_SHIFTED 3 -#define PSR_RI_SHIFT 41 -#define PSR_RI_LEN 2 +#define PSR_RI_SHIFT 41 +#define PSR_RI_LEN 2 #define PFM_MASK (~0x3fffffffff) @@ -145,10 +145,4 @@ #ifndef __ASM__ -#ifdef KERNEL -#include -#else -#include -#endif - /** Processor Status Register. */ typedef union { Index: kernel/arch/ia64/src/ia64.c =================================================================== --- kernel/arch/ia64/src/ia64.c (revision a8bb38ceab1997348c644ee294eac3e8badf5d0b) +++ kernel/arch/ia64/src/ia64.c (revision b538ca5cefd42f154f31ac8a6eaeb314a2eb8bf9) @@ -50,5 +50,5 @@ #include #include -#include +#include #include #include Index: kernel/arch/mips32/include/context_offset.h =================================================================== --- kernel/arch/mips32/include/context_offset.h (revision a8bb38ceab1997348c644ee294eac3e8badf5d0b) +++ kernel/arch/mips32/include/context_offset.h (revision b538ca5cefd42f154f31ac8a6eaeb314a2eb8bf9) @@ -63,119 +63,126 @@ #ifdef __ASM__ +#ifdef KERNEL + #include -# ctx: address of the structure with saved context +#else /* KERNEL */ + +#include + +#endif /* KERNEL */ + +/* ctx: address of the structure with saved context */ .macro CONTEXT_SAVE_ARCH_CORE ctx:req - sw $s0,OFFSET_S0(\ctx) - sw $s1,OFFSET_S1(\ctx) - sw $s2,OFFSET_S2(\ctx) - sw $s3,OFFSET_S3(\ctx) - sw $s4,OFFSET_S4(\ctx) - sw $s5,OFFSET_S5(\ctx) - sw $s6,OFFSET_S6(\ctx) - sw $s7,OFFSET_S7(\ctx) - sw $s8,OFFSET_S8(\ctx) - sw $gp,OFFSET_GP(\ctx) - + sw $s0, OFFSET_S0(\ctx) + sw $s1, OFFSET_S1(\ctx) + sw $s2, OFFSET_S2(\ctx) + sw $s3, OFFSET_S3(\ctx) + sw $s4, OFFSET_S4(\ctx) + sw $s5, OFFSET_S5(\ctx) + sw $s6, OFFSET_S6(\ctx) + sw $s7, OFFSET_S7(\ctx) + sw $s8, OFFSET_S8(\ctx) + sw $gp, OFFSET_GP(\ctx) + #ifndef KERNEL - sw $k1,OFFSET_TLS(\ctx) - + sw $k1, OFFSET_TLS(\ctx) + #ifdef CONFIG_FPU - mfc1 $t0,$20 + mfc1 $t0, $20 sw $t0, OFFSET_F20(\ctx) - - mfc1 $t0,$21 + + mfc1 $t0, $21 sw $t0, OFFSET_F21(\ctx) - - mfc1 $t0,$22 + + mfc1 $t0, $22 sw $t0, OFFSET_F22(\ctx) - - mfc1 $t0,$23 + + mfc1 $t0, $23 sw $t0, OFFSET_F23(\ctx) - - mfc1 $t0,$24 + + mfc1 $t0, $24 sw $t0, OFFSET_F24(\ctx) - - mfc1 $t0,$25 + + mfc1 $t0, $25 sw $t0, OFFSET_F25(\ctx) - - mfc1 $t0,$26 + + mfc1 $t0, $26 sw $t0, OFFSET_F26(\ctx) - - mfc1 $t0,$27 + + mfc1 $t0, $27 sw $t0, OFFSET_F27(\ctx) - - mfc1 $t0,$28 + + mfc1 $t0, $28 sw $t0, OFFSET_F28(\ctx) - - mfc1 $t0,$29 + + mfc1 $t0, $29 sw $t0, OFFSET_F29(\ctx) - mfc1 $t0,$30 + mfc1 $t0, $30 sw $t0, OFFSET_F30(\ctx) #endif /* CONFIG_FPU */ #endif /* KERNEL */ - - sw $ra,OFFSET_PC(\ctx) - sw $sp,OFFSET_SP(\ctx) + + sw $ra, OFFSET_PC(\ctx) + sw $sp, OFFSET_SP(\ctx) .endm -# ctx: address of the structure with saved context +/* ctx: address of the structure with saved context */ .macro CONTEXT_RESTORE_ARCH_CORE ctx:req - lw $s0,OFFSET_S0(\ctx) - lw $s1,OFFSET_S1(\ctx) - lw $s2,OFFSET_S2(\ctx) - lw $s3,OFFSET_S3(\ctx) - lw $s4,OFFSET_S4(\ctx) - lw $s5,OFFSET_S5(\ctx) - lw $s6,OFFSET_S6(\ctx) - lw $s7,OFFSET_S7(\ctx) - lw $s8,OFFSET_S8(\ctx) - lw $gp,OFFSET_GP(\ctx) + lw $s0, OFFSET_S0(\ctx) + lw $s1, OFFSET_S1(\ctx) + lw $s2, OFFSET_S2(\ctx) + lw $s3, OFFSET_S3(\ctx) + lw $s4, OFFSET_S4(\ctx) + lw $s5, OFFSET_S5(\ctx) + lw $s6, OFFSET_S6(\ctx) + lw $s7, OFFSET_S7(\ctx) + lw $s8, OFFSET_S8(\ctx) + lw $gp, OFFSET_GP(\ctx) #ifndef KERNEL - lw $k1,OFFSET_TLS(\ctx) - + lw $k1, OFFSET_TLS(\ctx) + #ifdef CONFIG_FPU lw $t0, OFFSET_F20(\ctx) - mtc1 $t0,$20 - + mtc1 $t0, $20 + lw $t0, OFFSET_F21(\ctx) - mtc1 $t0,$21 - + mtc1 $t0, $21 + lw $t0, OFFSET_F22(\ctx) - mtc1 $t0,$22 - + mtc1 $t0, $22 + lw $t0, OFFSET_F23(\ctx) - mtc1 $t0,$23 - + mtc1 $t0, $23 + lw $t0, OFFSET_F24(\ctx) - mtc1 $t0,$24 - + mtc1 $t0, $24 + lw $t0, OFFSET_F25(\ctx) - mtc1 $t0,$25 - + mtc1 $t0, $25 + lw $t0, OFFSET_F26(\ctx) - mtc1 $t0,$26 - + mtc1 $t0, $26 + lw $t0, OFFSET_F27(\ctx) - mtc1 $t0,$27 - + mtc1 $t0, $27 + lw $t0, OFFSET_F28(\ctx) - mtc1 $t0,$28 - + mtc1 $t0, $28 + lw $t0, OFFSET_F29(\ctx) - mtc1 $t0,$29 - + mtc1 $t0, $29 + lw $t0, OFFSET_F30(\ctx) - mtc1 $t0,$30 + mtc1 $t0, $30 #endif /* CONFIG_FPU */ #endif /* KERNEL */ - - lw $ra,OFFSET_PC(\ctx) - lw $sp,OFFSET_SP(\ctx) + + lw $ra, OFFSET_PC(\ctx) + lw $sp, OFFSET_SP(\ctx) .endm -#endif - +#endif /* __ASM__ */ #endif Index: kernel/arch/mips32/include/cp0.h =================================================================== --- kernel/arch/mips32/include/cp0.h (revision a8bb38ceab1997348c644ee294eac3e8badf5d0b) +++ kernel/arch/mips32/include/cp0.h (revision b538ca5cefd42f154f31ac8a6eaeb314a2eb8bf9) @@ -36,10 +36,4 @@ #define KERN_mips32_CP0_H_ -#ifdef KERNEL -#include -#else -#include -#endif - #define cp0_status_ie_enabled_bit (1 << 0) #define cp0_status_exl_exception_bit (1 << 1) @@ -49,33 +43,50 @@ #define cp0_status_fpu_bit (1 << 29) -#define cp0_status_im_shift 8 -#define cp0_status_im_mask 0xff00 +#define cp0_status_im_shift 8 +#define cp0_status_im_mask 0xff00 -#define cp0_cause_excno(cause) ((cause >> 2) & 0x1f) -#define cp0_cause_coperr(cause) ((cause >> 28) & 0x3) +#define cp0_cause_excno(cause) ((cause >> 2) & 0x1f) +#define cp0_cause_coperr(cause) ((cause >> 28) & 0x3) -#define fpu_cop_id 1 +#define fpu_cop_id 1 /* * Magic value for use in msim. */ -#define cp0_compare_value 100000 +#define cp0_compare_value 100000 -#define cp0_mask_all_int() cp0_status_write(cp0_status_read() & ~(cp0_status_im_mask)) -#define cp0_unmask_all_int() cp0_status_write(cp0_status_read() | cp0_status_im_mask) -#define cp0_mask_int(it) cp0_status_write(cp0_status_read() & ~(1 << (cp0_status_im_shift + (it)))) -#define cp0_unmask_int(it) cp0_status_write(cp0_status_read() | (1 << (cp0_status_im_shift + (it)))) +#define cp0_mask_all_int() \ + cp0_status_write(cp0_status_read() & ~(cp0_status_im_mask)) -#define GEN_READ_CP0(nm,reg) static inline uint32_t cp0_ ##nm##_read(void) \ - { \ - uint32_t retval; \ - asm volatile ("mfc0 %0, $" #reg : "=r"(retval)); \ - return retval; \ - } +#define cp0_unmask_all_int() \ + cp0_status_write(cp0_status_read() | cp0_status_im_mask) -#define GEN_WRITE_CP0(nm,reg) static inline void cp0_ ##nm##_write(uint32_t val) \ - { \ - asm volatile ("mtc0 %0, $" #reg : : "r"(val) ); \ - } +#define cp0_mask_int(it) \ + cp0_status_write(cp0_status_read() & ~(1 << (cp0_status_im_shift + (it)))) + +#define cp0_unmask_int(it) \ + cp0_status_write(cp0_status_read() | (1 << (cp0_status_im_shift + (it)))) + +#define GEN_READ_CP0(nm, reg) \ + static inline uint32_t cp0_ ##nm##_read(void) \ + { \ + uint32_t retval; \ + \ + asm volatile ( \ + "mfc0 %0, $" #reg \ + : "=r"(retval) \ + ); \ + \ + return retval; \ + } + +#define GEN_WRITE_CP0(nm, reg) \ + static inline void cp0_ ##nm##_write(uint32_t val) \ + { \ + asm volatile ( \ + "mtc0 %0, $" #reg \ + :: "r"(val) \ + ); \ + } GEN_READ_CP0(index, 0); Index: kernel/arch/mips32/include/istate.h =================================================================== --- kernel/arch/mips32/include/istate.h (revision a8bb38ceab1997348c644ee294eac3e8badf5d0b) +++ kernel/arch/mips32/include/istate.h (revision b538ca5cefd42f154f31ac8a6eaeb314a2eb8bf9) @@ -36,13 +36,15 @@ #define KERN_mips32_ISTATE_H_ +#include + +#ifdef KERNEL + #include -#ifdef KERNEL -#include -#include -#else -#include -#define NO_TRACE -#endif +#else /* KERNEL */ + +#include + +#endif /* KERNEL */ typedef struct istate { Index: kernel/arch/mips32/include/mm/frame.h =================================================================== --- kernel/arch/mips32/include/mm/frame.h (revision a8bb38ceab1997348c644ee294eac3e8badf5d0b) +++ kernel/arch/mips32/include/mm/frame.h (revision b538ca5cefd42f154f31ac8a6eaeb314a2eb8bf9) @@ -39,5 +39,4 @@ #define FRAME_SIZE (1 << FRAME_WIDTH) -#ifdef KERNEL #ifndef __ASM__ @@ -46,5 +45,4 @@ #endif /* __ASM__ */ -#endif /* KERNEL */ #endif Index: kernel/arch/mips32/include/mm/page.h =================================================================== --- kernel/arch/mips32/include/mm/page.h (revision a8bb38ceab1997348c644ee294eac3e8badf5d0b) +++ kernel/arch/mips32/include/mm/page.h (revision b538ca5cefd42f154f31ac8a6eaeb314a2eb8bf9) @@ -49,6 +49,4 @@ # define PA2KA(x) ((x) + 0x80000000) #endif - -#ifdef KERNEL /* @@ -188,6 +186,4 @@ #endif /* __ASM__ */ -#endif /* KERNEL */ - #endif Index: kernel/arch/mips32/src/mips32.c =================================================================== --- kernel/arch/mips32/src/mips32.c (revision a8bb38ceab1997348c644ee294eac3e8badf5d0b) +++ kernel/arch/mips32/src/mips32.c (revision b538ca5cefd42f154f31ac8a6eaeb314a2eb8bf9) @@ -41,5 +41,5 @@ #include #include -#include +#include #include #include @@ -52,5 +52,5 @@ #include #include -#include +#include #include #include Index: kernel/arch/mips64/include/context_offset.h =================================================================== --- kernel/arch/mips64/include/context_offset.h (revision a8bb38ceab1997348c644ee294eac3e8badf5d0b) +++ kernel/arch/mips64/include/context_offset.h (revision b538ca5cefd42f154f31ac8a6eaeb314a2eb8bf9) @@ -63,7 +63,15 @@ #ifdef __ASM__ +#ifdef KERNEL + #include -# ctx: address of the structure with saved context +#else /* KERNEL */ + +#include + +#endif /* KERNEL */ + +/* ctx: address of the structure with saved context */ .macro CONTEXT_SAVE_ARCH_CORE ctx:req sd $s0, OFFSET_S0(\ctx) @@ -121,5 +129,5 @@ .endm -# ctx: address of the structure with saved context +/* ctx: address of the structure with saved context */ .macro CONTEXT_RESTORE_ARCH_CORE ctx:req ld $s0, OFFSET_S0(\ctx) Index: kernel/arch/mips64/include/cp0.h =================================================================== --- kernel/arch/mips64/include/cp0.h (revision a8bb38ceab1997348c644ee294eac3e8badf5d0b) +++ kernel/arch/mips64/include/cp0.h (revision b538ca5cefd42f154f31ac8a6eaeb314a2eb8bf9) @@ -35,14 +35,4 @@ #ifndef KERN_mips64_CP0_H_ #define KERN_mips64_CP0_H_ - -#ifdef KERNEL - -#include - -#else - -#include - -#endif #define cp0_status_ie_enabled_bit (1 << 0) Index: kernel/arch/mips64/include/istate.h =================================================================== --- kernel/arch/mips64/include/istate.h (revision a8bb38ceab1997348c644ee294eac3e8badf5d0b) +++ kernel/arch/mips64/include/istate.h (revision b538ca5cefd42f154f31ac8a6eaeb314a2eb8bf9) @@ -36,17 +36,15 @@ #define KERN_mips64_ISTATE_H_ -#include +#include #ifdef KERNEL -#include -#include +#include -#else +#else /* KERNEL */ -#include -#define NO_TRACE +#include -#endif +#endif /* KERNEL */ typedef struct istate { Index: kernel/arch/mips64/include/mm/frame.h =================================================================== --- kernel/arch/mips64/include/mm/frame.h (revision a8bb38ceab1997348c644ee294eac3e8badf5d0b) +++ kernel/arch/mips64/include/mm/frame.h (revision b538ca5cefd42f154f31ac8a6eaeb314a2eb8bf9) @@ -39,5 +39,4 @@ #define FRAME_SIZE (1 << FRAME_WIDTH) -#ifdef KERNEL #ifndef __ASM__ @@ -46,5 +45,4 @@ #endif /* __ASM__ */ -#endif /* KERNEL */ #endif Index: kernel/arch/mips64/include/mm/page.h =================================================================== --- kernel/arch/mips64/include/mm/page.h (revision a8bb38ceab1997348c644ee294eac3e8badf5d0b) +++ kernel/arch/mips64/include/mm/page.h (revision b538ca5cefd42f154f31ac8a6eaeb314a2eb8bf9) @@ -50,5 +50,4 @@ #endif -#ifdef KERNEL #ifndef __ASM__ @@ -56,5 +55,4 @@ #endif /* __ASM__ */ -#endif /* KERNEL */ #endif Index: kernel/arch/mips64/src/mips64.c =================================================================== --- kernel/arch/mips64/src/mips64.c (revision a8bb38ceab1997348c644ee294eac3e8badf5d0b) +++ kernel/arch/mips64/src/mips64.c (revision b538ca5cefd42f154f31ac8a6eaeb314a2eb8bf9) @@ -41,5 +41,5 @@ #include #include -#include +#include #include #include @@ -52,5 +52,5 @@ #include #include -#include +#include #include #include Index: kernel/arch/ppc32/include/asm.h =================================================================== --- kernel/arch/ppc32/include/asm.h (revision a8bb38ceab1997348c644ee294eac3e8badf5d0b) +++ kernel/arch/ppc32/include/asm.h (revision b538ca5cefd42f154f31ac8a6eaeb314a2eb8bf9) @@ -38,5 +38,5 @@ #include #include -#include +#include #include #include Index: kernel/arch/ppc32/include/context_offset.h =================================================================== --- kernel/arch/ppc32/include/context_offset.h (revision a8bb38ceab1997348c644ee294eac3e8badf5d0b) +++ kernel/arch/ppc32/include/context_offset.h (revision b538ca5cefd42f154f31ac8a6eaeb314a2eb8bf9) @@ -75,7 +75,16 @@ #ifdef __ASM__ -# include -# ctx: address of the structure with saved context +#ifdef KERNEL + +#include + +#else /* KERNEL */ + +#include + +#endif /* KERNEL */ + +/* ctx: address of the structure with saved context */ .macro CONTEXT_SAVE_ARCH_CORE ctx:req stw sp, OFFSET_SP(\ctx) @@ -102,5 +111,5 @@ .endm -# ctx: address of the structure with saved context +/* ctx: address of the structure with saved context */ .macro CONTEXT_RESTORE_ARCH_CORE ctx:req lwz sp, OFFSET_SP(\ctx) Index: kernel/arch/ppc32/include/cpu.h =================================================================== --- kernel/arch/ppc32/include/cpu.h (revision a8bb38ceab1997348c644ee294eac3e8badf5d0b) +++ kernel/arch/ppc32/include/cpu.h (revision b538ca5cefd42f154f31ac8a6eaeb314a2eb8bf9) @@ -36,19 +36,4 @@ #define KERN_ppc32_CPU_H_ -/* MSR bits */ -#define MSR_DR (1 << 4) -#define MSR_IR (1 << 5) -#define MSR_PR (1 << 14) -#define MSR_EE (1 << 15) - -/* HID0 bits */ -#define HID0_STEN (1 << 24) -#define HID0_ICE (1 << 15) -#define HID0_DCE (1 << 14) -#define HID0_ICFI (1 << 11) -#define HID0_DCI (1 << 10) - -#ifndef __ASM__ - #include #include @@ -67,6 +52,4 @@ } -#endif /* __ASM__ */ - #endif Index: kernel/arch/ppc32/include/exception.h =================================================================== --- kernel/arch/ppc32/include/exception.h (revision a8bb38ceab1997348c644ee294eac3e8badf5d0b) +++ kernel/arch/ppc32/include/exception.h (revision b538ca5cefd42f154f31ac8a6eaeb314a2eb8bf9) @@ -37,5 +37,5 @@ #include -#include +#include #include Index: kernel/arch/ppc32/include/istate.h =================================================================== --- kernel/arch/ppc32/include/istate.h (revision a8bb38ceab1997348c644ee294eac3e8badf5d0b) +++ kernel/arch/ppc32/include/istate.h (revision b538ca5cefd42f154f31ac8a6eaeb314a2eb8bf9) @@ -36,7 +36,15 @@ #define KERN_ppc32_EXCEPTION_H_ -#include -#include #include + +#ifdef KERNEL + +#include + +#else /* KERNEL */ + +#include + +#endif /* KERNEL */ typedef struct istate { Index: kernel/arch/ppc32/include/mm/frame.h =================================================================== --- kernel/arch/ppc32/include/mm/frame.h (revision a8bb38ceab1997348c644ee294eac3e8badf5d0b) +++ kernel/arch/ppc32/include/mm/frame.h (revision b538ca5cefd42f154f31ac8a6eaeb314a2eb8bf9) @@ -39,5 +39,4 @@ #define FRAME_SIZE (1 << FRAME_WIDTH) -#ifdef KERNEL #ifndef __ASM__ @@ -63,5 +62,4 @@ #endif /* __ASM__ */ -#endif /* KERNEL */ #endif Index: kernel/arch/ppc32/include/mm/page.h =================================================================== --- kernel/arch/ppc32/include/mm/page.h (revision a8bb38ceab1997348c644ee294eac3e8badf5d0b) +++ kernel/arch/ppc32/include/mm/page.h (revision b538ca5cefd42f154f31ac8a6eaeb314a2eb8bf9) @@ -41,6 +41,4 @@ #define PAGE_WIDTH FRAME_WIDTH #define PAGE_SIZE FRAME_SIZE - -#ifdef KERNEL #ifndef __ASM__ @@ -181,6 +179,4 @@ #endif /* __ASM__ */ -#endif /* KERNEL */ - #endif Index: kernel/arch/ppc32/include/msr.h =================================================================== --- kernel/arch/ppc32/include/msr.h (revision b538ca5cefd42f154f31ac8a6eaeb314a2eb8bf9) +++ kernel/arch/ppc32/include/msr.h (revision b538ca5cefd42f154f31ac8a6eaeb314a2eb8bf9) @@ -0,0 +1,54 @@ +/* + * Copyright (c) 2005 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_MSR_H_ +#define KERN_ppc32_MSR_H_ + +/* MSR bits */ +#define MSR_DR (1 << 4) +#define MSR_IR (1 << 5) +#define MSR_PR (1 << 14) +#define MSR_EE (1 << 15) + +/* HID0 bits */ +#define HID0_STEN (1 << 24) +#define HID0_ICE (1 << 15) +#define HID0_DCE (1 << 14) +#define HID0_ICFI (1 << 11) +#define HID0_DCI (1 << 10) + +#endif + +/** @} + */ Index: kernel/arch/ppc32/src/asm.S =================================================================== --- kernel/arch/ppc32/src/asm.S (revision a8bb38ceab1997348c644ee294eac3e8badf5d0b) +++ kernel/arch/ppc32/src/asm.S (revision b538ca5cefd42f154f31ac8a6eaeb314a2eb8bf9) @@ -28,5 +28,5 @@ #include -#include +#include .text Index: kernel/arch/ppc32/src/exception.S =================================================================== --- kernel/arch/ppc32/src/exception.S (revision a8bb38ceab1997348c644ee294eac3e8badf5d0b) +++ kernel/arch/ppc32/src/exception.S (revision b538ca5cefd42f154f31ac8a6eaeb314a2eb8bf9) @@ -28,5 +28,5 @@ #include -#include +#include #include Index: kernel/arch/ppc32/src/ppc32.c =================================================================== --- kernel/arch/ppc32/src/ppc32.c (revision a8bb38ceab1997348c644ee294eac3e8badf5d0b) +++ kernel/arch/ppc32/src/ppc32.c (revision b538ca5cefd42f154f31ac8a6eaeb314a2eb8bf9) @@ -41,10 +41,10 @@ #include #include -#include +#include #include #include #include #include -#include +#include #include #include Index: kernel/arch/sparc64/include/barrier.h =================================================================== --- kernel/arch/sparc64/include/barrier.h (revision a8bb38ceab1997348c644ee294eac3e8badf5d0b) +++ kernel/arch/sparc64/include/barrier.h (revision b538ca5cefd42f154f31ac8a6eaeb314a2eb8bf9) @@ -37,14 +37,4 @@ #include - -#ifdef KERNEL - -#include - -#else - -#include - -#endif /* Index: kernel/arch/sparc64/include/elf.h =================================================================== --- kernel/arch/sparc64/include/elf.h (revision a8bb38ceab1997348c644ee294eac3e8badf5d0b) +++ kernel/arch/sparc64/include/elf.h (revision b538ca5cefd42f154f31ac8a6eaeb314a2eb8bf9) @@ -27,5 +27,5 @@ */ -/** @addtogroup sparc64 +/** @addtogroup sparc64 * @{ */ @@ -36,7 +36,7 @@ #define KERN_sparc64_ELF_H_ -#define ELF_MACHINE EM_SPARCV9 -#define ELF_DATA_ENCODING ELFDATA2MSB -#define ELF_CLASS ELFCLASS64 +#define ELF_MACHINE EM_SPARCV9 +#define ELF_DATA_ENCODING ELFDATA2MSB +#define ELF_CLASS ELFCLASS64 #endif Index: kernel/arch/sparc64/include/istate.h =================================================================== --- kernel/arch/sparc64/include/istate.h (revision a8bb38ceab1997348c644ee294eac3e8badf5d0b) +++ kernel/arch/sparc64/include/istate.h (revision b538ca5cefd42f154f31ac8a6eaeb314a2eb8bf9) @@ -37,13 +37,15 @@ #define KERN_sparc64_ISTATE_H_ +#include + +#ifdef KERNEL + #include -#ifdef KERNEL -#include -#include -#else -#include -#define NO_TRACE -#endif +#else /* KERNEL */ + +#include + +#endif /* KERNEL */ typedef struct istate { Index: kernel/arch/sparc64/include/mm/page.h =================================================================== --- kernel/arch/sparc64/include/mm/page.h (revision a8bb38ceab1997348c644ee294eac3e8badf5d0b) +++ kernel/arch/sparc64/include/mm/page.h (revision b538ca5cefd42f154f31ac8a6eaeb314a2eb8bf9) @@ -54,6 +54,4 @@ #define MMU_PAGES_PER_PAGE (1 << (PAGE_WIDTH - MMU_PAGE_WIDTH)) -#ifdef KERNEL - #ifndef __ASM__ @@ -77,6 +75,4 @@ #endif /* !def __ASM__ */ -#endif /* KERNEL */ - #endif Index: kernel/arch/sparc64/include/mm/sun4u/frame.h =================================================================== --- kernel/arch/sparc64/include/mm/sun4u/frame.h (revision a8bb38ceab1997348c644ee294eac3e8badf5d0b) +++ kernel/arch/sparc64/include/mm/sun4u/frame.h (revision b538ca5cefd42f154f31ac8a6eaeb314a2eb8bf9) @@ -52,5 +52,4 @@ #define FRAME_SIZE (1 << FRAME_WIDTH) -#ifdef KERNEL #ifndef __ASM__ @@ -80,5 +79,4 @@ #endif -#endif #endif Index: kernel/arch/sparc64/include/mm/sun4v/frame.h =================================================================== --- kernel/arch/sparc64/include/mm/sun4v/frame.h (revision a8bb38ceab1997348c644ee294eac3e8badf5d0b) +++ kernel/arch/sparc64/include/mm/sun4v/frame.h (revision b538ca5cefd42f154f31ac8a6eaeb314a2eb8bf9) @@ -42,5 +42,4 @@ #define FRAME_SIZE (1 << FRAME_WIDTH) -#ifdef KERNEL #ifndef __ASM__ @@ -52,5 +51,4 @@ #endif -#endif #endif Index: kernel/arch/sparc64/include/mm/sun4v/page.h =================================================================== --- kernel/arch/sparc64/include/mm/sun4v/page.h (revision a8bb38ceab1997348c644ee294eac3e8badf5d0b) +++ kernel/arch/sparc64/include/mm/sun4v/page.h (revision b538ca5cefd42f154f31ac8a6eaeb314a2eb8bf9) @@ -46,6 +46,4 @@ #define MMU_PAGES_PER_PAGE (1 << (PAGE_WIDTH - MMU_PAGE_WIDTH)) -#ifdef KERNEL - #ifndef __ASM__ @@ -69,6 +67,4 @@ #endif /* !def __ASM__ */ -#endif /* KERNEL */ - #endif Index: kernel/arch/sparc64/include/sun4v/regdef.h =================================================================== --- kernel/arch/sparc64/include/sun4v/regdef.h (revision a8bb38ceab1997348c644ee294eac3e8badf5d0b) +++ kernel/arch/sparc64/include/sun4v/regdef.h (revision b538ca5cefd42f154f31ac8a6eaeb314a2eb8bf9) @@ -28,5 +28,5 @@ */ -/** @addtogroup sparc64 +/** @addtogroup sparc64 * @{ */ @@ -37,17 +37,8 @@ #define KERN_sparc64_sun4v_REGDEF_H_ -#define PSTATE_IE_BIT (1 << 1) -#define PSTATE_PRIV_BIT (1 << 2) -#define PSTATE_PEF_BIT (1 << 4) +#define TSTATE_CWP_MASK 0x1f -#define TSTATE_PSTATE_SHIFT 8 -#define TSTATE_PRIV_BIT (PSTATE_PRIV_BIT << TSTATE_PSTATE_SHIFT) -#define TSTATE_CWP_MASK 0x1f -#define TSTATE_IE_BIT (PSTATE_IE_BIT << TSTATE_PSTATE_SHIFT) - -#define WSTATE_NORMAL(n) (n) -#define WSTATE_OTHER(n) ((n) << 3) - -#define TSTATE_PEF_BIT (PSTATE_PEF_BIT << TSTATE_PSTATE_SHIFT) +#define WSTATE_NORMAL(n) (n) +#define WSTATE_OTHER(n) ((n) << 3) #endif Index: kernel/arch/sparc64/src/drivers/scr.c =================================================================== --- kernel/arch/sparc64/src/drivers/scr.c (revision a8bb38ceab1997348c644ee294eac3e8badf5d0b) +++ kernel/arch/sparc64/src/drivers/scr.c (revision b538ca5cefd42f154f31ac8a6eaeb314a2eb8bf9) @@ -39,5 +39,5 @@ #include #include -#include +#include #include #include Index: kernel/arch/sparc64/src/smp/sun4u/smp.c =================================================================== --- kernel/arch/sparc64/src/smp/sun4u/smp.c (revision a8bb38ceab1997348c644ee294eac3e8badf5d0b) +++ kernel/arch/sparc64/src/smp/sun4u/smp.c (revision b538ca5cefd42f154f31ac8a6eaeb314a2eb8bf9) @@ -42,5 +42,4 @@ #include #include -#include #include #include Index: kernel/arch/sparc64/src/smp/sun4v/smp.c =================================================================== --- kernel/arch/sparc64/src/smp/sun4v/smp.c (revision a8bb38ceab1997348c644ee294eac3e8badf5d0b) +++ kernel/arch/sparc64/src/smp/sun4v/smp.c (revision b538ca5cefd42f154f31ac8a6eaeb314a2eb8bf9) @@ -45,5 +45,4 @@ #include #include -#include #include #include Index: kernel/arch/sparc64/src/sun4v/start.S =================================================================== --- kernel/arch/sparc64/src/sun4v/start.S (revision a8bb38ceab1997348c644ee294eac3e8badf5d0b) +++ kernel/arch/sparc64/src/sun4v/start.S (revision b538ca5cefd42f154f31ac8a6eaeb314a2eb8bf9) @@ -30,4 +30,5 @@ #include #include +#include #include #include Index: kernel/genarch/include/fb/fb.h =================================================================== --- kernel/genarch/include/fb/fb.h (revision a8bb38ceab1997348c644ee294eac3e8badf5d0b) +++ kernel/genarch/include/fb/fb.h (revision b538ca5cefd42f154f31ac8a6eaeb314a2eb8bf9) @@ -37,6 +37,6 @@ #include +#include #include -#include /** Index: kernel/genarch/include/fb/visuals.h =================================================================== --- kernel/genarch/include/fb/visuals.h (revision a8bb38ceab1997348c644ee294eac3e8badf5d0b) +++ (revision ) @@ -1,56 +1,0 @@ -/* - * 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 genarch - * @{ - */ -/** @file - */ - -#ifndef KERN_VISUALS_H_ -#define KERN_VISUALS_H_ - -typedef enum { - VISUAL_UNKNOWN = 0, - VISUAL_INDIRECT_8, - VISUAL_RGB_5_5_5_LE, - VISUAL_RGB_5_5_5_BE, - VISUAL_RGB_5_6_5_LE, - VISUAL_RGB_5_6_5_BE, - VISUAL_BGR_8_8_8, - VISUAL_BGR_0_8_8_8, - VISUAL_BGR_8_8_8_0, - VISUAL_RGB_8_8_8, - VISUAL_RGB_0_8_8_8, - VISUAL_RGB_8_8_8_0 -} visual_t; - -#endif - -/** @} - */ Index: kernel/genarch/src/fb/fb.c =================================================================== --- kernel/genarch/src/fb/fb.c (revision a8bb38ceab1997348c644ee294eac3e8badf5d0b) +++ kernel/genarch/src/fb/fb.c (revision b538ca5cefd42f154f31ac8a6eaeb314a2eb8bf9) @@ -36,5 +36,4 @@ #include #include -#include #include #include Index: kernel/generic/include/ddi/ddi.h =================================================================== --- kernel/generic/include/ddi/ddi.h (revision a8bb38ceab1997348c644ee294eac3e8badf5d0b) +++ kernel/generic/include/ddi/ddi.h (revision b538ca5cefd42f154f31ac8a6eaeb314a2eb8bf9) @@ -36,6 +36,6 @@ #define KERN_DDI_H_ -#include #include +#include #include #include Index: kernel/generic/include/ddi/ddi_arg.h =================================================================== --- kernel/generic/include/ddi/ddi_arg.h (revision a8bb38ceab1997348c644ee294eac3e8badf5d0b) +++ (revision ) @@ -1,68 +1,0 @@ -/* - * Copyright (c) 2006 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 genericddi - * @{ - */ -/** @file - */ - -#ifndef KERN_DDI_ARG_H_ -#define KERN_DDI_ARG_H_ - -#ifdef KERNEL - -#include - -#endif /* KERNEL */ - -/** Structure encapsulating arguments for SYS_PHYSMEM_MAP syscall. */ -typedef struct { - /** ID of the destination task. */ - uint64_t task_id; - /** Physical address of starting frame. */ - void *phys_base; - /** Virtual address of starting page. */ - void *virt_base; - /** Number of pages to map. */ - size_t pages; - /** Address space area flags for the mapping. */ - unsigned int flags; -} ddi_memarg_t; - -/** Structure encapsulating arguments for SYS_ENABLE_IOSPACE syscall. */ -typedef struct { - uint64_t task_id; /**< ID of the destination task. */ - void *ioaddr; /**< Starting I/O space address. */ - size_t size; /**< Number of bytes. */ -} ddi_ioarg_t; - -#endif - -/** @} - */ Index: kernel/generic/include/ddi/irq.h =================================================================== --- kernel/generic/include/ddi/irq.h (revision a8bb38ceab1997348c644ee294eac3e8badf5d0b) +++ kernel/generic/include/ddi/irq.h (revision b538ca5cefd42f154f31ac8a6eaeb314a2eb8bf9) @@ -33,10 +33,9 @@ */ -#ifndef KERN_IRQ_H_ -#define KERN_IRQ_H_ - -#ifdef KERNEL +#ifndef KERN_DDI_IRQ_H_ +#define KERN_DDI_IRQ_H_ #include +#include #include #include @@ -44,94 +43,4 @@ #include #include - -#endif /* KERNEL */ - -typedef enum { - /** Read 1 byte from the I/O space. */ - CMD_PIO_READ_8 = 1, - /** Read 2 bytes from the I/O space. */ - CMD_PIO_READ_16, - /** Read 4 bytes from the I/O space. */ - CMD_PIO_READ_32, - - /** Write 1 byte to the I/O space. */ - CMD_PIO_WRITE_8, - /** Write 2 bytes to the I/O space. */ - CMD_PIO_WRITE_16, - /** Write 4 bytes to the I/O space. */ - CMD_PIO_WRITE_32, - - /** - * Write 1 byte from the source argument - * to the I/O space. - */ - CMD_PIO_WRITE_A_8, - /** - * Write 2 bytes from the source argument - * to the I/O space. - */ - CMD_PIO_WRITE_A_16, - /** - * Write 4 bytes from the source argument - * to the I/O space. - */ - CMD_PIO_WRITE_A_32, - - /** Read 1 byte from the memory space. */ - CMD_MEM_READ_8, - /** Read 2 bytes from the memory space. */ - CMD_MEM_READ_16, - /** Read 4 bytes from the memory space. */ - CMD_MEM_READ_32, - - /** Write 1 byte to the memory space. */ - CMD_MEM_WRITE_8, - /** Write 2 bytes to the memory space. */ - CMD_MEM_WRITE_16, - /** Write 4 bytes to the memory space. */ - CMD_MEM_WRITE_32, - - /** Write 1 byte from the source argument to the memory space. */ - CMD_MEM_WRITE_A_8, - /** Write 2 bytes from the source argument to the memory space. */ - CMD_MEM_WRITE_A_16, - /** Write 4 bytes from the source argument to the memory space. */ - CMD_MEM_WRITE_A_32, - - /** - * Perform a bit masking on the source argument - * and store the result into the destination argument. - */ - CMD_BTEST, - - /** - * Predicate the execution of the following - * N commands by the boolean value of the source - * argument. - */ - CMD_PREDICATE, - - /** Accept the interrupt. */ - CMD_ACCEPT, - - /** Decline the interrupt. */ - CMD_DECLINE, - CMD_LAST -} irq_cmd_type; - -typedef struct { - irq_cmd_type cmd; - void *addr; - uint32_t value; - uintptr_t srcarg; - uintptr_t dstarg; -} irq_cmd_t; - -typedef struct { - size_t cmdcount; - irq_cmd_t *cmds; -} irq_code_t; - -#ifdef KERNEL typedef enum { @@ -146,4 +55,5 @@ struct irq; + typedef void (* irq_handler_t)(struct irq *); @@ -224,5 +134,5 @@ /** Notification configuration structure. */ ipc_notif_cfg_t notif_cfg; - + as_t *driver_as; } irq_t; @@ -238,6 +148,4 @@ extern irq_t *irq_dispatch_and_lock(inr_t); -#endif /* KERNEL */ - #endif Index: kernel/generic/include/errno.h =================================================================== --- kernel/generic/include/errno.h (revision a8bb38ceab1997348c644ee294eac3e8badf5d0b) +++ kernel/generic/include/errno.h (revision b538ca5cefd42f154f31ac8a6eaeb314a2eb8bf9) @@ -27,5 +27,5 @@ */ -/** @addtogroup generic +/** @addtogroup generic * @{ */ @@ -36,29 +36,5 @@ #define KERN_ERRNO_H_ -/* 1-255 are kernel error codes, 256-512 are user error codes */ - -#define EOK 0 /* No error */ -#define ENOENT -1 /* No such entry */ -#define ENOMEM -2 /* Not enough memory */ -#define ELIMIT -3 /* Limit exceeded */ -#define EREFUSED -4 /* Connection refused */ -#define EFORWARD -5 /* Forward error */ -#define EPERM -6 /* Permission denied */ -#define EHANGUP -7 /* Answerbox closed connection, call - * sys_ipc_hangup() to close the connection. - * Used by answerbox to close the connection. - */ -#define EPARTY -8 /* The other party encountered an error when - * receiving the call. - */ -#define EEXISTS -9 /* Entry already exists */ -#define EBADMEM -10 /* Bad memory pointer */ -#define ENOTSUP -11 /* Not supported */ -#define EADDRNOTAVAIL -12 /* Address not available. */ -#define ETIMEOUT -13 /* Timeout expired */ -#define EINVAL -14 /* Invalid value */ -#define EBUSY -15 /* Resource is busy */ -#define EOVERFLOW -16 /* The result does not fit its size. */ -#define EINTR -17 /* Operation was interrupted. */ +#include #endif Index: kernel/generic/include/ipc/event.h =================================================================== --- kernel/generic/include/ipc/event.h (revision a8bb38ceab1997348c644ee294eac3e8badf5d0b) +++ kernel/generic/include/ipc/event.h (revision b538ca5cefd42f154f31ac8a6eaeb314a2eb8bf9) @@ -36,5 +36,5 @@ #define KERN_EVENT_H_ -#include +#include #include #include Index: kernel/generic/include/ipc/event_types.h =================================================================== --- kernel/generic/include/ipc/event_types.h (revision a8bb38ceab1997348c644ee294eac3e8badf5d0b) +++ (revision ) @@ -1,51 +1,0 @@ -/* - * Copyright (c) 2009 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 generic - * @{ - */ -/** @file - */ - -#ifndef KERN_EVENT_TYPES_H_ -#define KERN_EVENT_TYPES_H_ - -typedef enum event_type { - /** New data available in kernel log */ - EVENT_KLOG = 0, - /** Returning from kernel console to uspace */ - EVENT_KCONSOLE, - /** A task/thread has faulted and will be terminated */ - EVENT_FAULT, - EVENT_END -} event_type_t; - -#endif - -/** @} - */ Index: kernel/generic/include/ipc/ipc.h =================================================================== --- kernel/generic/include/ipc/ipc.h (revision a8bb38ceab1997348c644ee294eac3e8badf5d0b) +++ kernel/generic/include/ipc/ipc.h (revision b538ca5cefd42f154f31ac8a6eaeb314a2eb8bf9) @@ -36,97 +36,10 @@ #define KERN_IPC_H_ -/** Length of data being transfered with IPC call - * - * The uspace may not be able to utilize full length - * - */ -#define IPC_CALL_LEN 6 - -/** Maximum active async calls per phone */ -#define IPC_MAX_ASYNC_CALLS 4 - -/* Flags for calls */ - -/** This is answer to a call */ -#define IPC_CALL_ANSWERED (1 << 0) - -/** Answer will not be passed to userspace, will be discarded */ -#define IPC_CALL_DISCARD_ANSWER (1 << 1) - -/** Call was forwarded */ -#define IPC_CALL_FORWARDED (1 << 2) - -/** Identify connect_me_to answer */ -#define IPC_CALL_CONN_ME_TO (1 << 3) - -/** Interrupt notification */ -#define IPC_CALL_NOTIF (1 << 4) - - -/** Bits used in call hashes. - * - * The addresses are aligned at least to 4 that is why we can use the 2 least - * significant bits of the call address. - * - */ - -/** Type of this call is 'answer' */ -#define IPC_CALLID_ANSWERED 1 - -/** Type of this call is 'notification' */ -#define IPC_CALLID_NOTIFICATION 2 - -/* Return values from sys_ipc_call_async(). */ -#define IPC_CALLRET_FATAL -1 -#define IPC_CALLRET_TEMPORARY -2 - - -/* Macros for manipulating calling data */ -#define IPC_SET_RETVAL(data, retval) ((data).args[0] = (retval)) -#define IPC_SET_IMETHOD(data, val) ((data).args[0] = (val)) -#define IPC_SET_ARG1(data, val) ((data).args[1] = (val)) -#define IPC_SET_ARG2(data, val) ((data).args[2] = (val)) -#define IPC_SET_ARG3(data, val) ((data).args[3] = (val)) -#define IPC_SET_ARG4(data, val) ((data).args[4] = (val)) -#define IPC_SET_ARG5(data, val) ((data).args[5] = (val)) - -#define IPC_GET_IMETHOD(data) ((data).args[0]) -#define IPC_GET_RETVAL(data) ((data).args[0]) - -#define IPC_GET_ARG1(data) ((data).args[1]) -#define IPC_GET_ARG2(data) ((data).args[2]) -#define IPC_GET_ARG3(data) ((data).args[3]) -#define IPC_GET_ARG4(data) ((data).args[4]) -#define IPC_GET_ARG5(data) ((data).args[5]) - -/* Forwarding flags. */ -#define IPC_FF_NONE 0 - -/** - * The call will be routed as though it was initially sent via the phone used to - * forward it. This feature is intended to support the situation in which the - * forwarded call needs to be handled by the same connection fibril as any other - * calls that were initially sent by the forwarder to the same destination. This - * flag has no imapct on routing replies. - * - */ -#define IPC_FF_ROUTE_FROM_ME (1 << 0) - -/* Data transfer flags. */ -#define IPC_XF_NONE 0 - -/** Restrict the transfer size if necessary. */ -#define IPC_XF_RESTRICT (1 << 0) - -/** User-defined IPC methods */ -#define IPC_FIRST_USER_METHOD 1024 - -#ifdef KERNEL - -#define IPC_MAX_PHONES 32 - +#include #include #include #include + +#define IPC_MAX_PHONES 32 struct answerbox; @@ -247,6 +160,4 @@ extern void ipc_print_task(task_id_t); -#endif /* KERNEL */ - #endif Index: kernel/generic/include/ipc/ipc_methods.h =================================================================== --- kernel/generic/include/ipc/ipc_methods.h (revision a8bb38ceab1997348c644ee294eac3e8badf5d0b) +++ (revision ) @@ -1,186 +1,0 @@ -/* - * Copyright (c) 2006 Ondrej Palkovsky - * 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 genericipc - * @{ - */ -/** @file - */ - -#ifndef KERN_IPC_METHODS_H_ -#define KERN_IPC_METHODS_H_ - -/* Well known phone descriptors */ -#define PHONE_NS 0 - -/** Kernel IPC interfaces - * - */ -#define IPC_IF_KERNEL 0 - -/** System-specific IPC methods - * - * These methods have special behaviour. These methods also - * have the implicit kernel interface zero (0). - * - */ - -/** This message is sent to answerbox when the phone is hung up - * - * The numerical value zero (0) of this method is important, - * so as the value can be easily tested in conditions. - * - */ -#define IPC_M_PHONE_HUNGUP 0 - -/** Clone connection. - * - * The calling task clones one of its phones for the callee. - * - * - ARG1 - The caller sets ARG1 to the phone of the cloned connection. - * - The callee gets the new phone from ARG1. - * - * - on answer, the callee acknowledges the new connection by sending EOK back - * or the kernel closes it - * - */ -#define IPC_M_CONNECTION_CLONE 1 - -/** Protocol for CONNECT - ME - * - * Through this call, the recipient learns about the new cloned connection. - * - * - ARG5 - the kernel sets ARG5 to contain the hash of the used phone - * - on answer, the callee acknowledges the new connection by sending EOK back - * or the kernel closes it - * - */ -#define IPC_M_CONNECT_ME 2 - -/** Protocol for CONNECT - TO - ME - * - * Calling process asks the callee to create a callback connection, - * so that it can start initiating new messages. - * - * The protocol for negotiating is: - * - sys_connect_to_me - sends a message IPC_M_CONNECT_TO_ME - * - recipient - upon receipt tries to allocate new phone - * - if it fails, responds with ELIMIT - * - passes call to userspace. If userspace - * responds with error, phone is deallocated and - * error is sent back to caller. Otherwise - * the call is accepted and the response is sent back. - * - the hash of the client task is passed to userspace - * (on the receiving side) as ARG4 of the call. - * - the hash of the allocated phone is passed to userspace - * (on the receiving side) as ARG5 of the call. - * - */ -#define IPC_M_CONNECT_TO_ME 3 - -/** Protocol for CONNECT - ME - TO - * - * Calling process asks the callee to create for him a new connection. - * E.g. the caller wants a name server to connect him to print server. - * - * The protocol for negotiating is: - * - sys_connect_me_to - send a synchronous message to name server - * indicating that it wants to be connected to some - * service - * - arg1/2/3 are user specified, arg5 contains - * address of the phone that should be connected - * (TODO: it leaks to userspace) - * - recipient - if ipc_answer == 0, then accept connection - * - otherwise connection refused - * - recepient may forward message. - * - */ -#define IPC_M_CONNECT_ME_TO 4 - -/** Send as_area over IPC. - * - ARG1 - source as_area base address - * - ARG2 - size of source as_area (filled automatically by kernel) - * - ARG3 - flags of the as_area being sent - * - * on answer, the recipient must set: - * - ARG1 - dst as_area base adress - * - */ -#define IPC_M_SHARE_OUT 5 - -/** Receive as_area over IPC. - * - ARG1 - destination as_area base address - * - ARG2 - destination as_area size - * - ARG3 - user defined argument - * - * on answer, the recipient must set: - * - * - ARG1 - source as_area base address - * - ARG2 - flags that will be used for sharing - * - */ -#define IPC_M_SHARE_IN 6 - -/** Send data to another address space over IPC. - * - ARG1 - source address space virtual address - * - ARG2 - size of data to be copied, may be overriden by the recipient - * - * on answer, the recipient must set: - * - * - ARG1 - final destination address space virtual address - * - ARG2 - final size of data to be copied - * - */ -#define IPC_M_DATA_WRITE 7 - -/** Receive data from another address space over IPC. - * - ARG1 - destination virtual address in the source address space - * - ARG2 - size of data to be received, may be cropped by the recipient - * - * on answer, the recipient must set: - * - * - ARG1 - source virtual address in the destination address space - * - ARG2 - final size of data to be copied - * - */ -#define IPC_M_DATA_READ 8 - -/** Debug the recipient. - * - ARG1 - specifies the debug method (from udebug_method_t) - * - other arguments are specific to the debug method - * - */ -#define IPC_M_DEBUG 9 - -/** Last system IPC method */ -#define IPC_M_LAST_SYSTEM 511 - -#endif - -/** @} - */ Index: kernel/generic/include/lib/elf.h =================================================================== --- kernel/generic/include/lib/elf.h (revision a8bb38ceab1997348c644ee294eac3e8badf5d0b) +++ kernel/generic/include/lib/elf.h (revision b538ca5cefd42f154f31ac8a6eaeb314a2eb8bf9) @@ -36,328 +36,7 @@ #define KERN_ELF_H_ +#include +#include #include -#include - -/** - * current ELF version - */ -#define EV_CURRENT 1 - -/** - * ELF types - */ -#define ET_NONE 0 /* No type */ -#define ET_REL 1 /* Relocatable file */ -#define ET_EXEC 2 /* Executable */ -#define ET_DYN 3 /* Shared object */ -#define ET_CORE 4 /* Core */ -#define ET_LOPROC 0xff00 /* Processor specific */ -#define ET_HIPROC 0xffff /* Processor specific */ - -/** - * ELF machine types - */ -#define EM_NO 0 /* No machine */ -#define EM_SPARC 2 /* SPARC */ -#define EM_386 3 /* i386 */ -#define EM_MIPS 8 /* MIPS RS3000 */ -#define EM_MIPS_RS3_LE 10 /* MIPS RS3000 LE */ -#define EM_PPC 20 /* PPC32 */ -#define EM_PPC64 21 /* PPC64 */ -#define EM_ARM 40 /* ARM */ -#define EM_SPARCV9 43 /* SPARC64 */ -#define EM_IA_64 50 /* IA-64 */ -#define EM_X86_64 62 /* AMD64/EMT64 */ - -/** - * ELF identification indexes - */ -#define EI_MAG0 0 -#define EI_MAG1 1 -#define EI_MAG2 2 -#define EI_MAG3 3 -#define EI_CLASS 4 /* File class */ -#define EI_DATA 5 /* Data encoding */ -#define EI_VERSION 6 /* File version */ -#define EI_OSABI 7 -#define EI_ABIVERSION 8 -#define EI_PAD 9 /* Start of padding bytes */ -#define EI_NIDENT 16 /* ELF identification table size */ - -/** - * ELF magic number - */ -#define ELFMAG0 0x7f -#define ELFMAG1 'E' -#define ELFMAG2 'L' -#define ELFMAG3 'F' - -/** - * ELF file classes - */ -#define ELFCLASSNONE 0 -#define ELFCLASS32 1 -#define ELFCLASS64 2 - -/** - * ELF data encoding types - */ -#define ELFDATANONE 0 -#define ELFDATA2LSB 1 /* Least significant byte first (little endian) */ -#define ELFDATA2MSB 2 /* Most signigicant byte first (big endian) */ - -/** - * ELF section types - */ -#define SHT_NULL 0 -#define SHT_PROGBITS 1 -#define SHT_SYMTAB 2 -#define SHT_STRTAB 3 -#define SHT_RELA 4 -#define SHT_HASH 5 -#define SHT_DYNAMIC 6 -#define SHT_NOTE 7 -#define SHT_NOBITS 8 -#define SHT_REL 9 -#define SHT_SHLIB 10 -#define SHT_DYNSYM 11 -#define SHT_LOOS 0x60000000 -#define SHT_HIOS 0x6fffffff -#define SHT_LOPROC 0x70000000 -#define SHT_HIPROC 0x7fffffff -#define SHT_LOUSER 0x80000000 -#define SHT_HIUSER 0xffffffff - -/** - * ELF section flags - */ -#define SHF_WRITE 0x1 -#define SHF_ALLOC 0x2 -#define SHF_EXECINSTR 0x4 -#define SHF_TLS 0x400 -#define SHF_MASKPROC 0xf0000000 - -/** Macros for decomposing elf_symbol.st_info into binging and type */ -#define ELF_ST_BIND(i) ((i) >> 4) -#define ELF_ST_TYPE(i) ((i) & 0x0f) -#define ELF_ST_INFO(b, t) (((b) << 4) + ((t) & 0x0f)) - -/** - * Symbol binding - */ -#define STB_LOCAL 0 -#define STB_GLOBAL 1 -#define STB_WEAK 2 -#define STB_LOPROC 13 -#define STB_HIPROC 15 - -/** - * Symbol types - */ -#define STT_NOTYPE 0 -#define STT_OBJECT 1 -#define STT_FUNC 2 -#define STT_SECTION 3 -#define STT_FILE 4 -#define STT_LOPROC 13 -#define STT_HIPROC 15 - -/** - * Program segment types - */ -#define PT_NULL 0 -#define PT_LOAD 1 -#define PT_DYNAMIC 2 -#define PT_INTERP 3 -#define PT_NOTE 4 -#define PT_SHLIB 5 -#define PT_PHDR 6 -#define PT_LOPROC 0x70000000 -#define PT_HIPROC 0x7fffffff - -/** - * Program segment attributes. - */ -#define PF_X 1 -#define PF_W 2 -#define PF_R 4 - -/** - * ELF data types - * - * These types are found to be identical in both 32-bit and 64-bit - * ELF object file specifications. They are the only types used - * in ELF header. - */ -typedef uint64_t elf_xword; -typedef int64_t elf_sxword; -typedef uint32_t elf_word; -typedef int32_t elf_sword; -typedef uint16_t elf_half; - -/** - * 32-bit ELF data types. - * - * These types are specific for 32-bit format. - */ -typedef uint32_t elf32_addr; -typedef uint32_t elf32_off; - -/** - * 64-bit ELF data types. - * - * These types are specific for 64-bit format. - */ -typedef uint64_t elf64_addr; -typedef uint64_t elf64_off; - -/** ELF header */ -struct elf32_header { - uint8_t e_ident[EI_NIDENT]; - elf_half e_type; - elf_half e_machine; - elf_word e_version; - elf32_addr e_entry; - elf32_off e_phoff; - elf32_off e_shoff; - elf_word e_flags; - elf_half e_ehsize; - elf_half e_phentsize; - elf_half e_phnum; - elf_half e_shentsize; - elf_half e_shnum; - elf_half e_shstrndx; -}; - -struct elf64_header { - uint8_t e_ident[EI_NIDENT]; - elf_half e_type; - elf_half e_machine; - elf_word e_version; - elf64_addr e_entry; - elf64_off e_phoff; - elf64_off e_shoff; - elf_word e_flags; - elf_half e_ehsize; - elf_half e_phentsize; - elf_half e_phnum; - elf_half e_shentsize; - elf_half e_shnum; - elf_half e_shstrndx; -}; - -/** - * ELF segment header. - * Segments headers are also known as program headers. - */ -struct elf32_segment_header { - elf_word p_type; - elf32_off p_offset; - elf32_addr p_vaddr; - elf32_addr p_paddr; - elf_word p_filesz; - elf_word p_memsz; - elf_word p_flags; - elf_word p_align; -}; - -struct elf64_segment_header { - elf_word p_type; - elf_word p_flags; - elf64_off p_offset; - elf64_addr p_vaddr; - elf64_addr p_paddr; - elf_xword p_filesz; - elf_xword p_memsz; - elf_xword p_align; -}; - -/** - * ELF section header - */ -struct elf32_section_header { - elf_word sh_name; - elf_word sh_type; - elf_word sh_flags; - elf32_addr sh_addr; - elf32_off sh_offset; - elf_word sh_size; - elf_word sh_link; - elf_word sh_info; - elf_word sh_addralign; - elf_word sh_entsize; -}; - -struct elf64_section_header { - elf_word sh_name; - elf_word sh_type; - elf_xword sh_flags; - elf64_addr sh_addr; - elf64_off sh_offset; - elf_xword sh_size; - elf_word sh_link; - elf_word sh_info; - elf_xword sh_addralign; - elf_xword sh_entsize; -}; - -/** - * ELF symbol table entry - */ -struct elf32_symbol { - elf_word st_name; - elf32_addr st_value; - elf_word st_size; - uint8_t st_info; - uint8_t st_other; - elf_half st_shndx; -}; - -struct elf64_symbol { - elf_word st_name; - uint8_t st_info; - uint8_t st_other; - elf_half st_shndx; - elf64_addr st_value; - elf_xword st_size; -}; - -/* - * ELF note segment entry - */ -struct elf32_note { - elf_word namesz; - elf_word descsz; - elf_word type; -}; - -/* - * NOTE: namesz, descsz and type should be 64-bits wide (elf_xword) - * per the 64-bit ELF spec. The Linux kernel however screws up and - * defines them as Elf64_Word, which is 32-bits wide(!). We are trying - * to make our core files compatible with Linux GDB target so we copy - * the blunder here. - */ -struct elf64_note { - elf_word namesz; - elf_word descsz; - elf_word type; -}; - -#ifdef __32_BITS__ -typedef struct elf32_header elf_header_t; -typedef struct elf32_segment_header elf_segment_header_t; -typedef struct elf32_section_header elf_section_header_t; -typedef struct elf32_symbol elf_symbol_t; -typedef struct elf32_note elf_note_t; -#endif - -#ifdef __64_BITS__ -typedef struct elf64_header elf_header_t; -typedef struct elf64_segment_header elf_segment_header_t; -typedef struct elf64_section_header elf_section_header_t; -typedef struct elf64_symbol elf_symbol_t; -typedef struct elf64_note elf_note_t; -#endif /** Interpreter string used to recognize the program loader */ Index: kernel/generic/include/mm/as.h =================================================================== --- kernel/generic/include/mm/as.h (revision a8bb38ceab1997348c644ee294eac3e8badf5d0b) +++ kernel/generic/include/mm/as.h (revision b538ca5cefd42f154f31ac8a6eaeb314a2eb8bf9) @@ -36,30 +36,6 @@ #define KERN_AS_H_ -#ifdef KERNEL - #include -#else - #include -#endif - -/** Address space area flags. */ -#define AS_AREA_READ 1 -#define AS_AREA_WRITE 2 -#define AS_AREA_EXEC 4 -#define AS_AREA_CACHEABLE 8 - -/** Address space area info exported to userspace. */ -typedef struct { - /** Starting address */ - uintptr_t start_addr; - - /** Area size */ - size_t size; - - /** Area flags */ - unsigned int flags; -} as_area_info_t; - -#ifdef KERNEL - +#include +#include #include #include @@ -318,6 +294,4 @@ extern void as_print(as_t *); -#endif /* KERNEL */ - #endif Index: kernel/generic/include/proc/task.h =================================================================== --- kernel/generic/include/proc/task.h (revision a8bb38ceab1997348c644ee294eac3e8badf5d0b) +++ kernel/generic/include/proc/task.h (revision b538ca5cefd42f154f31ac8a6eaeb314a2eb8bf9) @@ -55,5 +55,5 @@ #include #include -#include +#include struct thread; Index: kernel/generic/include/proc/thread.h =================================================================== --- kernel/generic/include/proc/thread.h (revision a8bb38ceab1997348c644ee294eac3e8badf5d0b) +++ kernel/generic/include/proc/thread.h (revision b538ca5cefd42f154f31ac8a6eaeb314a2eb8bf9) @@ -45,7 +45,7 @@ #include #include -#include +#include #include -#include +#include #define THREAD_NAME_BUFLEN 20 Index: kernel/generic/include/proc/uarg.h =================================================================== --- kernel/generic/include/proc/uarg.h (revision a8bb38ceab1997348c644ee294eac3e8badf5d0b) +++ (revision ) @@ -1,52 +1,0 @@ -/* - * Copyright (c) 2006 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 genericproc - * @{ - */ -/** @file - */ - -#ifndef KERN_UARG_H_ -#define KERN_UARG_H_ - -/** Structure passed to uinit kernel thread as argument. */ -typedef struct uspace_arg { - void *uspace_entry; - void *uspace_stack; - - void (* uspace_thread_function)(); - void *uspace_thread_arg; - - struct uspace_arg *uspace_uarg; -} uspace_arg_t; - -#endif - -/** @} - */ Index: kernel/generic/include/synch/condvar.h =================================================================== --- kernel/generic/include/synch/condvar.h (revision a8bb38ceab1997348c644ee294eac3e8badf5d0b) +++ kernel/generic/include/synch/condvar.h (revision b538ca5cefd42f154f31ac8a6eaeb314a2eb8bf9) @@ -39,5 +39,5 @@ #include #include -#include +#include typedef struct { Index: kernel/generic/include/synch/mutex.h =================================================================== --- kernel/generic/include/synch/mutex.h (revision a8bb38ceab1997348c644ee294eac3e8badf5d0b) +++ kernel/generic/include/synch/mutex.h (revision b538ca5cefd42f154f31ac8a6eaeb314a2eb8bf9) @@ -38,5 +38,5 @@ #include #include -#include +#include typedef enum { Index: kernel/generic/include/synch/semaphore.h =================================================================== --- kernel/generic/include/synch/semaphore.h (revision a8bb38ceab1997348c644ee294eac3e8badf5d0b) +++ kernel/generic/include/synch/semaphore.h (revision b538ca5cefd42f154f31ac8a6eaeb314a2eb8bf9) @@ -38,5 +38,5 @@ #include #include -#include +#include typedef struct { Index: kernel/generic/include/synch/synch.h =================================================================== --- kernel/generic/include/synch/synch.h (revision a8bb38ceab1997348c644ee294eac3e8badf5d0b) +++ (revision ) @@ -1,67 +1,0 @@ -/* - * 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 sync - * @{ - */ -/** @file - */ - -#ifndef KERN_SYNCH_H_ -#define KERN_SYNCH_H_ - -/** Request with no timeout. */ -#define SYNCH_NO_TIMEOUT 0 - -/** No flags specified. */ -#define SYNCH_FLAGS_NONE 0 -/** Non-blocking operation request. */ -#define SYNCH_FLAGS_NON_BLOCKING (1 << 0) -/** Interruptible operation. */ -#define SYNCH_FLAGS_INTERRUPTIBLE (1 << 1) - -/** Could not satisfy the request without going to sleep. */ -#define ESYNCH_WOULD_BLOCK 1 -/** Timeout occurred. */ -#define ESYNCH_TIMEOUT 2 -/** Sleep was interrupted. */ -#define ESYNCH_INTERRUPTED 4 -/** Operation succeeded without sleeping. */ -#define ESYNCH_OK_ATOMIC 8 -/** Operation succeeded and did sleep. */ -#define ESYNCH_OK_BLOCKED 16 - -#define SYNCH_FAILED(rc) \ - ((rc) & (ESYNCH_WOULD_BLOCK | ESYNCH_TIMEOUT | ESYNCH_INTERRUPTED)) -#define SYNCH_OK(rc) \ - ((rc) & (ESYNCH_OK_ATOMIC | ESYNCH_OK_BLOCKED)) - -#endif - -/** @} - */ Index: kernel/generic/include/synch/waitq.h =================================================================== --- kernel/generic/include/synch/waitq.h (revision a8bb38ceab1997348c644ee294eac3e8badf5d0b) +++ kernel/generic/include/synch/waitq.h (revision b538ca5cefd42f154f31ac8a6eaeb314a2eb8bf9) @@ -38,5 +38,5 @@ #include #include -#include +#include #include Index: kernel/generic/include/syscall/syscall.h =================================================================== --- kernel/generic/include/syscall/syscall.h (revision a8bb38ceab1997348c644ee294eac3e8badf5d0b) +++ kernel/generic/include/syscall/syscall.h (revision b538ca5cefd42f154f31ac8a6eaeb314a2eb8bf9) @@ -36,70 +36,6 @@ #define KERN_SYSCALL_H_ -typedef enum { - SYS_KLOG = 0, - SYS_TLS_SET = 1, /* Hardcoded for AMD64, IA-32 (fibril.S in uspace) */ - - SYS_THREAD_CREATE, - SYS_THREAD_EXIT, - SYS_THREAD_GET_ID, - SYS_THREAD_USLEEP, - SYS_THREAD_UDELAY, - - SYS_TASK_GET_ID, - SYS_TASK_SET_NAME, - SYS_TASK_KILL, - SYS_TASK_EXIT, - SYS_PROGRAM_SPAWN_LOADER, - - SYS_FUTEX_SLEEP, - SYS_FUTEX_WAKEUP, - SYS_SMC_COHERENCE, - - SYS_AS_AREA_CREATE, - SYS_AS_AREA_RESIZE, - SYS_AS_AREA_CHANGE_FLAGS, - SYS_AS_AREA_DESTROY, - SYS_AS_GET_UNMAPPED_AREA, - - SYS_PAGE_FIND_MAPPING, - - SYS_IPC_CALL_SYNC_FAST, - SYS_IPC_CALL_SYNC_SLOW, - SYS_IPC_CALL_ASYNC_FAST, - SYS_IPC_CALL_ASYNC_SLOW, - SYS_IPC_ANSWER_FAST, - SYS_IPC_ANSWER_SLOW, - SYS_IPC_FORWARD_FAST, - SYS_IPC_FORWARD_SLOW, - SYS_IPC_WAIT, - SYS_IPC_POKE, - SYS_IPC_HANGUP, - SYS_IPC_CONNECT_KBOX, - - SYS_EVENT_SUBSCRIBE, - SYS_EVENT_UNMASK, - - SYS_CAP_GRANT, - SYS_CAP_REVOKE, - - SYS_DEVICE_ASSIGN_DEVNO, - SYS_PHYSMEM_MAP, - SYS_IOSPACE_ENABLE, - SYS_REGISTER_IRQ, - SYS_UNREGISTER_IRQ, - - SYS_SYSINFO_GET_TAG, - SYS_SYSINFO_GET_VALUE, - SYS_SYSINFO_GET_DATA_SIZE, - SYS_SYSINFO_GET_DATA, - - SYS_DEBUG_ACTIVATE_CONSOLE, - - SYSCALL_END -} syscall_t; - -#ifdef KERNEL - #include +#include typedef sysarg_t (*syshandler_t)(sysarg_t, sysarg_t, sysarg_t, sysarg_t, @@ -113,6 +49,4 @@ #endif -#endif - /** @} */ Index: kernel/generic/include/sysinfo/abi.h =================================================================== --- kernel/generic/include/sysinfo/abi.h (revision a8bb38ceab1997348c644ee294eac3e8badf5d0b) +++ (revision ) @@ -1,144 +1,0 @@ -/* - * 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 generic - * @{ - */ -/** @file - * Data structures passed between kernel sysinfo and user space. - */ - -#ifndef KERN_ABI_H_ -#define KERN_ABI_H_ - -/** Number of load components */ -#define LOAD_STEPS 3 - -/** Maximum name sizes */ -#define TASK_NAME_BUFLEN 20 -#define EXC_NAME_BUFLEN 20 - -/** Thread states */ -typedef enum { - /** It is an error, if thread is found in this state. */ - Invalid, - /** State of a thread that is currently executing on some CPU. */ - Running, - /** Thread in this state is waiting for an event. */ - Sleeping, - /** State of threads in a run queue. */ - Ready, - /** Threads are in this state before they are first readied. */ - Entering, - /** After a thread calls thread_exit(), it is put into Exiting state. */ - Exiting, - /** Threads that were not detached but exited are Lingering. */ - Lingering -} state_t; - -/** Statistics about a single CPU - * - */ -typedef struct { - unsigned int id; /**< CPU ID as stored by kernel */ - bool active; /**< CPU is activate */ - uint16_t frequency_mhz; /**< Frequency in MHz */ - uint64_t idle_cycles; /**< Number of idle cycles */ - uint64_t busy_cycles; /**< Number of busy cycles */ -} stats_cpu_t; - -/** Physical memory statistics - * - */ -typedef struct { - uint64_t total; /**< Total physical memory (bytes) */ - uint64_t unavail; /**< Unavailable (reserved, firmware) bytes */ - uint64_t used; /**< Allocated physical memory (bytes) */ - uint64_t free; /**< Free physical memory (bytes) */ -} stats_physmem_t; - -/** IPC statistics - * - * Associated with a task. - * - */ -typedef struct { - uint64_t call_sent; /**< IPC calls sent */ - uint64_t call_received; /**< IPC calls received */ - uint64_t answer_sent; /**< IPC answers sent */ - uint64_t answer_received; /**< IPC answers received */ - uint64_t irq_notif_received; /**< IPC IRQ notifications */ - uint64_t forwarded; /**< IPC messages forwarded */ -} stats_ipc_t; - -/** Statistics about a single task - * - */ -typedef struct { - task_id_t task_id; /**< Task ID */ - char name[TASK_NAME_BUFLEN]; /**< Task name (in kernel) */ - size_t virtmem; /**< Size of VAS (bytes) */ - size_t resmem; /**< Size of resident (used) memory (bytes) */ - size_t threads; /**< Number of threads */ - uint64_t ucycles; /**< Number of CPU cycles in user space */ - uint64_t kcycles; /**< Number of CPU cycles in kernel */ - stats_ipc_t ipc_info; /**< IPC statistics */ -} stats_task_t; - -/** Statistics about a single thread - * - */ -typedef struct { - thread_id_t thread_id; /**< Thread ID */ - task_id_t task_id; /**< Associated task ID */ - state_t state; /**< Thread state */ - int priority; /**< Thread priority */ - uint64_t ucycles; /**< Number of CPU cycles in user space */ - uint64_t kcycles; /**< Number of CPU cycles in kernel */ - bool on_cpu; /**< Associated with a CPU */ - unsigned int cpu; /**< Associated CPU ID (if on_cpu is true) */ -} stats_thread_t; - -/** Statistics about a single exception - * - */ -typedef struct { - unsigned int id; /**< Exception ID */ - char desc[EXC_NAME_BUFLEN]; /**< Description */ - bool hot; /**< Active or inactive exception */ - uint64_t cycles; /**< Number of CPU cycles in the handler */ - uint64_t count; /**< Number of handled exceptions */ -} stats_exc_t; - -/** Load fixed-point value */ -typedef uint32_t load_t; - -#endif - -/** @} - */ Index: kernel/generic/include/udebug/udebug.h =================================================================== --- kernel/generic/include/udebug/udebug.h (revision a8bb38ceab1997348c644ee294eac3e8badf5d0b) +++ kernel/generic/include/udebug/udebug.h (revision b538ca5cefd42f154f31ac8a6eaeb314a2eb8bf9) @@ -36,149 +36,5 @@ #define KERN_UDEBUG_H_ -#define UDEBUG_EVMASK(event) (1 << ((event) - 1)) - -typedef enum { /* udebug_method_t */ - - /** Start debugging the recipient. - * - * Causes all threads in the receiving task to stop. When they - * are all stoped, an answer with retval 0 is generated. - * - */ - UDEBUG_M_BEGIN = 1, - - /** Finish debugging the recipient. - * - * Answers all pending GO and GUARD messages. - * - */ - UDEBUG_M_END, - - /** Set which events should be captured. */ - UDEBUG_M_SET_EVMASK, - - /** Make sure the debugged task is still there. - * - * This message is answered when the debugged task dies - * or the debugging session ends. - * - */ - UDEBUG_M_GUARD, - - /** Run a thread until a debugging event occurs. - * - * This message is answered when the thread stops - * in a debugging event. - * - * - ARG2 - id of the thread to run - * - */ - UDEBUG_M_GO, - - /** Stop a thread being debugged. - * - * Creates a special STOP event in the thread, causing - * it to answer a pending GO message (if any). - * - */ - UDEBUG_M_STOP, - - /** Read arguments of a syscall. - * - * - ARG2 - thread identification - * - ARG3 - destination address in the caller's address space - * - */ - UDEBUG_M_ARGS_READ, - - /** Read thread's userspace register state (istate_t). - * - * - ARG2 - thread identification - * - ARG3 - destination address in the caller's address space - * - * or, on error, retval will be - * - ENOENT - thread does not exist - * - EBUSY - register state not available - */ - UDEBUG_M_REGS_READ, - - /** Read the list of the debugged tasks's threads. - * - * - ARG2 - destination address in the caller's address space - * - ARG3 - size of receiving buffer in bytes - * - * The kernel fills the buffer with a series of sysarg_t values - * (thread ids). On answer, the kernel will set: - * - * - ARG2 - number of bytes that were actually copied - * - ARG3 - number of bytes of the complete data - * - */ - UDEBUG_M_THREAD_READ, - - /** Read the name of the debugged task. - * - * - ARG2 - destination address in the caller's address space - * - ARG3 - size of receiving buffer in bytes - * - * The kernel fills the buffer with a non-terminated string. - * - * - ARG2 - number of bytes that were actually copied - * - ARG3 - number of bytes of the complete data - * - */ - UDEBUG_M_NAME_READ, - - /** Read the list of the debugged task's address space areas. - * - * - ARG2 - destination address in the caller's address space - * - ARG3 - size of receiving buffer in bytes - * - * The kernel fills the buffer with a series of as_area_info_t structures. - * Upon answer, the kernel will set: - * - * - ARG2 - number of bytes that were actually copied - * - ARG3 - number of bytes of the complete data - * - */ - UDEBUG_M_AREAS_READ, - - /** Read the debugged tasks's memory. - * - * - ARG2 - destination address in the caller's address space - * - ARG3 - source address in the recipient's address space - * - ARG4 - size of receiving buffer in bytes - * - */ - UDEBUG_M_MEM_READ -} udebug_method_t; - -typedef enum { - UDEBUG_EVENT_FINISHED = 1, /**< Debuging session has finished */ - UDEBUG_EVENT_STOP, /**< Stopped on DEBUG_STOP request */ - UDEBUG_EVENT_SYSCALL_B, /**< Before beginning syscall execution */ - UDEBUG_EVENT_SYSCALL_E, /**< After finishing syscall execution */ - UDEBUG_EVENT_THREAD_B, /**< The task created a new thread */ - UDEBUG_EVENT_THREAD_E /**< A thread exited */ -} udebug_event_t; - -typedef enum { - UDEBUG_EM_FINISHED = UDEBUG_EVMASK(UDEBUG_EVENT_FINISHED), - UDEBUG_EM_STOP = UDEBUG_EVMASK(UDEBUG_EVENT_STOP), - UDEBUG_EM_SYSCALL_B = UDEBUG_EVMASK(UDEBUG_EVENT_SYSCALL_B), - UDEBUG_EM_SYSCALL_E = UDEBUG_EVMASK(UDEBUG_EVENT_SYSCALL_E), - UDEBUG_EM_THREAD_B = UDEBUG_EVMASK(UDEBUG_EVENT_THREAD_B), - UDEBUG_EM_THREAD_E = UDEBUG_EVMASK(UDEBUG_EVENT_THREAD_E), - UDEBUG_EM_ALL = - (UDEBUG_EVMASK(UDEBUG_EVENT_FINISHED) | - UDEBUG_EVMASK(UDEBUG_EVENT_STOP) | - UDEBUG_EVMASK(UDEBUG_EVENT_SYSCALL_B) | - UDEBUG_EVMASK(UDEBUG_EVENT_SYSCALL_E) | - UDEBUG_EVMASK(UDEBUG_EVENT_THREAD_B) | - UDEBUG_EVMASK(UDEBUG_EVENT_THREAD_E)) -} udebug_evmask_t; - -#ifdef KERNEL - +#include #include #include @@ -251,6 +107,4 @@ #endif -#endif - /** @} */ Index: kernel/generic/src/ddi/ddi.c =================================================================== --- kernel/generic/src/ddi/ddi.c (revision a8bb38ceab1997348c644ee294eac3e8badf5d0b) +++ kernel/generic/src/ddi/ddi.c (revision b538ca5cefd42f154f31ac8a6eaeb314a2eb8bf9) @@ -41,5 +41,4 @@ #include -#include #include #include Index: kernel/generic/src/ipc/event.c =================================================================== --- kernel/generic/src/ipc/event.c (revision a8bb38ceab1997348c644ee294eac3e8badf5d0b) +++ kernel/generic/src/ipc/event.c (revision b538ca5cefd42f154f31ac8a6eaeb314a2eb8bf9) @@ -36,5 +36,4 @@ #include -#include #include #include Index: kernel/generic/src/ipc/ipc.c =================================================================== --- kernel/generic/src/ipc/ipc.c (revision a8bb38ceab1997348c644ee294eac3e8badf5d0b) +++ kernel/generic/src/ipc/ipc.c (revision b538ca5cefd42f154f31ac8a6eaeb314a2eb8bf9) @@ -38,11 +38,9 @@ */ -#include #include #include #include -#include #include -#include +#include #include #include Index: kernel/generic/src/ipc/kbox.c =================================================================== --- kernel/generic/src/ipc/kbox.c (revision a8bb38ceab1997348c644ee294eac3e8badf5d0b) +++ kernel/generic/src/ipc/kbox.c (revision b538ca5cefd42f154f31ac8a6eaeb314a2eb8bf9) @@ -33,9 +33,8 @@ */ -#include #include #include #include -#include +#include #include #include Index: kernel/generic/src/ipc/sysipc.c =================================================================== --- kernel/generic/src/ipc/sysipc.c (revision a8bb38ceab1997348c644ee294eac3e8badf5d0b) +++ kernel/generic/src/ipc/sysipc.c (revision b538ca5cefd42f154f31ac8a6eaeb314a2eb8bf9) @@ -40,5 +40,5 @@ #include #include -#include +#include #include #include Index: kernel/generic/src/proc/program.c =================================================================== --- kernel/generic/src/proc/program.c (revision a8bb38ceab1997348c644ee294eac3e8badf5d0b) +++ kernel/generic/src/proc/program.c (revision b538ca5cefd42f154f31ac8a6eaeb314a2eb8bf9) @@ -40,5 +40,4 @@ #include #include -#include #include #include Index: kernel/generic/src/proc/thread.c =================================================================== --- kernel/generic/src/proc/thread.c (revision a8bb38ceab1997348c644ee294eac3e8badf5d0b) +++ kernel/generic/src/proc/thread.c (revision b538ca5cefd42f154f31ac8a6eaeb314a2eb8bf9) @@ -39,5 +39,4 @@ #include #include -#include #include #include @@ -45,5 +44,4 @@ #include #include -#include #include #include Index: kernel/generic/src/synch/condvar.c =================================================================== --- kernel/generic/src/synch/condvar.c (revision a8bb38ceab1997348c644ee294eac3e8badf5d0b) +++ kernel/generic/src/synch/condvar.c (revision b538ca5cefd42f154f31ac8a6eaeb314a2eb8bf9) @@ -39,5 +39,4 @@ #include #include -#include #include Index: kernel/generic/src/synch/futex.c =================================================================== --- kernel/generic/src/synch/futex.c (revision a8bb38ceab1997348c644ee294eac3e8badf5d0b) +++ kernel/generic/src/synch/futex.c (revision b538ca5cefd42f154f31ac8a6eaeb314a2eb8bf9) @@ -39,5 +39,4 @@ #include #include -#include #include #include Index: kernel/generic/src/synch/mutex.c =================================================================== --- kernel/generic/src/synch/mutex.c (revision a8bb38ceab1997348c644ee294eac3e8badf5d0b) +++ kernel/generic/src/synch/mutex.c (revision b538ca5cefd42f154f31ac8a6eaeb314a2eb8bf9) @@ -38,5 +38,4 @@ #include #include -#include #include #include Index: kernel/generic/src/synch/semaphore.c =================================================================== --- kernel/generic/src/synch/semaphore.c (revision a8bb38ceab1997348c644ee294eac3e8badf5d0b) +++ kernel/generic/src/synch/semaphore.c (revision b538ca5cefd42f154f31ac8a6eaeb314a2eb8bf9) @@ -39,5 +39,4 @@ #include #include -#include #include #include Index: kernel/generic/src/synch/waitq.c =================================================================== --- kernel/generic/src/synch/waitq.c (revision a8bb38ceab1997348c644ee294eac3e8badf5d0b) +++ kernel/generic/src/synch/waitq.c (revision b538ca5cefd42f154f31ac8a6eaeb314a2eb8bf9) @@ -45,5 +45,4 @@ #include -#include #include #include Index: kernel/generic/src/sysinfo/stats.c =================================================================== --- kernel/generic/src/sysinfo/stats.c (revision a8bb38ceab1997348c644ee294eac3e8badf5d0b) +++ kernel/generic/src/sysinfo/stats.c (revision b538ca5cefd42f154f31ac8a6eaeb314a2eb8bf9) @@ -35,5 +35,5 @@ #include -#include +#include #include #include Index: kernel/test/synch/semaphore2.c =================================================================== --- kernel/test/synch/semaphore2.c (revision a8bb38ceab1997348c644ee294eac3e8badf5d0b) +++ kernel/test/synch/semaphore2.c (revision b538ca5cefd42f154f31ac8a6eaeb314a2eb8bf9) @@ -37,5 +37,4 @@ #include #include -#include #include