Index: kernel/arch/amd64/include/arch.h =================================================================== --- kernel/arch/amd64/include/arch.h (revision 22a28a696141d62f28e48ed72d1d255ff519795c) +++ kernel/arch/amd64/include/arch.h (revision 6473d41b400a0e37add4151c14a275fde0f6c28b) @@ -27,5 +27,5 @@ */ -/** @addtogroup amd64 +/** @addtogroup amd64 * @{ */ Index: kernel/arch/amd64/include/boot/boot.h =================================================================== --- kernel/arch/amd64/include/boot/boot.h (revision 22a28a696141d62f28e48ed72d1d255ff519795c) +++ kernel/arch/amd64/include/boot/boot.h (revision 6473d41b400a0e37add4151c14a275fde0f6c28b) @@ -27,5 +27,5 @@ */ -/** @addtogroup amd64 +/** @addtogroup amd64 * @{ */ @@ -36,10 +36,10 @@ #define KERN_amd64_BOOT_H_ -#define BOOT_OFFSET 0x108000 -#define AP_BOOT_OFFSET 0x8000 -#define BOOT_STACK_SIZE 0x400 +#define BOOT_OFFSET 0x108000 +#define AP_BOOT_OFFSET 0x008000 +#define BOOT_STACK_SIZE 0x000400 -#define MULTIBOOT_HEADER_MAGIC 0x1BADB002 -#define MULTIBOOT_HEADER_FLAGS 0x00010003 +#define MULTIBOOT_HEADER_MAGIC 0x1BADB002 +#define MULTIBOOT_HEADER_FLAGS 0x00010003 #ifndef __ASM__ Index: kernel/arch/amd64/include/context.h =================================================================== --- kernel/arch/amd64/include/context.h (revision 22a28a696141d62f28e48ed72d1d255ff519795c) +++ kernel/arch/amd64/include/context.h (revision 6473d41b400a0e37add4151c14a275fde0f6c28b) @@ -59,16 +59,16 @@ */ typedef struct { - uintptr_t sp; - uintptr_t pc; - - uint64_t rbx; - uint64_t rbp; - - uint64_t r12; - uint64_t r13; - uint64_t r14; - uint64_t r15; - - ipl_t ipl; + uintptr_t sp; + uintptr_t pc; + + uint64_t rbx; + uint64_t rbp; + + uint64_t r12; + uint64_t r13; + uint64_t r14; + uint64_t r15; + + ipl_t ipl; } __attribute__ ((packed)) context_t; Index: kernel/arch/amd64/include/elf.h =================================================================== --- kernel/arch/amd64/include/elf.h (revision 22a28a696141d62f28e48ed72d1d255ff519795c) +++ kernel/arch/amd64/include/elf.h (revision 6473d41b400a0e37add4151c14a275fde0f6c28b) @@ -27,5 +27,5 @@ */ -/** @addtogroup amd64 +/** @addtogroup amd64 * @{ */ @@ -36,7 +36,7 @@ #define KERN_amd64_ELF_H_ -#define ELF_MACHINE EM_X86_64 -#define ELF_DATA_ENCODING ELFDATA2LSB -#define ELF_CLASS ELFCLASS64 +#define ELF_MACHINE EM_X86_64 +#define ELF_DATA_ENCODING ELFDATA2LSB +#define ELF_CLASS ELFCLASS64 #endif Index: kernel/arch/amd64/include/faddr.h =================================================================== --- kernel/arch/amd64/include/faddr.h (revision 22a28a696141d62f28e48ed72d1d255ff519795c) +++ kernel/arch/amd64/include/faddr.h (revision 6473d41b400a0e37add4151c14a275fde0f6c28b) @@ -27,5 +27,5 @@ */ -/** @addtogroup amd64 +/** @addtogroup amd64 * @{ */ @@ -38,5 +38,5 @@ #include -#define FADDR(fptr) ((uintptr_t) (fptr)) +#define FADDR(fptr) ((uintptr_t) (fptr)) #endif Index: kernel/arch/amd64/include/interrupt.h =================================================================== --- kernel/arch/amd64/include/interrupt.h (revision 22a28a696141d62f28e48ed72d1d255ff519795c) +++ kernel/arch/amd64/include/interrupt.h (revision 6473d41b400a0e37add4151c14a275fde0f6c28b) @@ -116,7 +116,4 @@ extern void trap_virtual_disable_irqs(uint16_t irqmask); -/* AMD64 - specific page handler */ -extern void ident_page_fault(unsigned int, istate_t *); - #endif Index: kernel/arch/amd64/include/mm/as.h =================================================================== --- kernel/arch/amd64/include/mm/as.h (revision 22a28a696141d62f28e48ed72d1d255ff519795c) +++ kernel/arch/amd64/include/mm/as.h (revision 6473d41b400a0e37add4151c14a275fde0f6c28b) @@ -27,5 +27,5 @@ */ -/** @addtogroup amd64mm +/** @addtogroup amd64mm * @{ */ @@ -36,16 +36,18 @@ #define KERN_amd64_AS_H_ -#define KERNEL_ADDRESS_SPACE_SHADOWED_ARCH 0 +#define KERNEL_ADDRESS_SPACE_SHADOWED_ARCH 0 -#define KERNEL_ADDRESS_SPACE_START_ARCH (unsigned long) 0xffff800000000000 -#define KERNEL_ADDRESS_SPACE_END_ARCH (unsigned long) 0xffffffff80000000 -#define USER_ADDRESS_SPACE_START_ARCH (unsigned long) 0x0000000000000000 -#define USER_ADDRESS_SPACE_END_ARCH (unsigned long) 0x00007fffffffffff +#define KERNEL_ADDRESS_SPACE_START_ARCH (unsigned long) 0xffff800000000000 +#define KERNEL_ADDRESS_SPACE_END_ARCH (unsigned long) 0xffffffffffffffff -#define USTACK_ADDRESS_ARCH (USER_ADDRESS_SPACE_END_ARCH-(PAGE_SIZE-1)) +#define USER_ADDRESS_SPACE_START_ARCH (unsigned long) 0x0000000000000000 +#define USER_ADDRESS_SPACE_END_ARCH (unsigned long) 0x00007fffffffffff -#define as_constructor_arch(as, flags) (as != as) -#define as_destructor_arch(as) (as != as) -#define as_create_arch(as, flags) (as != as) +#define USTACK_ADDRESS_ARCH (USER_ADDRESS_SPACE_END_ARCH - (PAGE_SIZE - 1)) + +#define as_constructor_arch(as, flags) (as != as) +#define as_destructor_arch(as) (as != as) +#define as_create_arch(as, flags) (as != as) + #define as_install_arch(as) #define as_deinstall_arch(as) Index: kernel/arch/amd64/include/mm/page.h =================================================================== --- kernel/arch/amd64/include/mm/page.h (revision 22a28a696141d62f28e48ed72d1d255ff519795c) +++ kernel/arch/amd64/include/mm/page.h (revision 6473d41b400a0e37add4151c14a275fde0f6c28b) @@ -35,12 +35,9 @@ /** Paging on AMD64 * - * The space is divided in positive numbers - userspace and - * negative numbers - kernel space. The 'negative' space starting - * with 0xffff800000000000 and ending with 0xffffffff80000000 - * (-2GB) is identically mapped physical memory. The area - * (0xffffffff80000000 ... 0xffffffffffffffff is again identically - * mapped first 2GB. - * - * ATTENTION - PA2KA(KA2PA(x)) != x if 'x' is in kernel + * The space is divided in positive numbers (uspace) and + * negative numbers (kernel). The 'negative' space starting + * with 0xffff800000000000 and ending with 0xffffffffffffffff + * is identically mapped physical memory. + * */ @@ -50,47 +47,38 @@ #include -#define PAGE_WIDTH FRAME_WIDTH -#define PAGE_SIZE FRAME_SIZE +#define PAGE_WIDTH FRAME_WIDTH +#define PAGE_SIZE FRAME_SIZE #ifdef KERNEL #ifndef __ASM__ -# include -# include -# include - -static inline uintptr_t ka2pa(uintptr_t x) -{ - if (x > 0xffffffff80000000) - return x - 0xffffffff80000000; - else - return x - 0xffff800000000000; -} - -# define KA2PA(x) ka2pa((uintptr_t) x) -# define PA2KA_CODE(x) (((uintptr_t) (x)) + 0xffffffff80000000) -# define PA2KA(x) (((uintptr_t) (x)) + 0xffff800000000000) -#else -# define KA2PA(x) ((x) - 0xffffffff80000000) -# define PA2KA(x) ((x) + 0xffffffff80000000) -#endif + +#define KA2PA(x) (((uintptr_t) (x)) - 0xffff800000000000) +#define PA2KA(x) (((uintptr_t) (x)) + 0xffff800000000000) + +#else /* __ASM__ */ + +#define KA2PA(x) ((x) - 0xffff800000000000) +#define PA2KA(x) ((x) + 0xffff800000000000) + +#endif /* __ASM__ */ /* Number of entries in each level. */ -#define PTL0_ENTRIES_ARCH 512 -#define PTL1_ENTRIES_ARCH 512 -#define PTL2_ENTRIES_ARCH 512 -#define PTL3_ENTRIES_ARCH 512 +#define PTL0_ENTRIES_ARCH 512 +#define PTL1_ENTRIES_ARCH 512 +#define PTL2_ENTRIES_ARCH 512 +#define PTL3_ENTRIES_ARCH 512 /* Page table sizes for each level. */ -#define PTL0_SIZE_ARCH ONE_FRAME -#define PTL1_SIZE_ARCH ONE_FRAME -#define PTL2_SIZE_ARCH ONE_FRAME -#define PTL3_SIZE_ARCH ONE_FRAME +#define PTL0_SIZE_ARCH ONE_FRAME +#define PTL1_SIZE_ARCH ONE_FRAME +#define PTL2_SIZE_ARCH ONE_FRAME +#define PTL3_SIZE_ARCH ONE_FRAME /* Macros calculating indices into page tables in each level. */ -#define PTL0_INDEX_ARCH(vaddr) (((vaddr) >> 39) & 0x1ff) -#define PTL1_INDEX_ARCH(vaddr) (((vaddr) >> 30) & 0x1ff) -#define PTL2_INDEX_ARCH(vaddr) (((vaddr) >> 21) & 0x1ff) -#define PTL3_INDEX_ARCH(vaddr) (((vaddr) >> 12) & 0x1ff) +#define PTL0_INDEX_ARCH(vaddr) (((vaddr) >> 39) & 0x1ff) +#define PTL1_INDEX_ARCH(vaddr) (((vaddr) >> 30) & 0x1ff) +#define PTL2_INDEX_ARCH(vaddr) (((vaddr) >> 21) & 0x1ff) +#define PTL3_INDEX_ARCH(vaddr) (((vaddr) >> 12) & 0x1ff) /* Get PTE address accessors for each level. */ @@ -156,4 +144,8 @@ #ifndef __ASM__ +#include +#include +#include + /* Page fault error codes. */ @@ -161,36 +153,36 @@ * page. */ -#define PFERR_CODE_P (1 << 0) +#define PFERR_CODE_P (1 << 0) /** When bit on this position is 1, the page fault was caused by a write. */ -#define PFERR_CODE_RW (1 << 1) +#define PFERR_CODE_RW (1 << 1) /** When bit on this position is 1, the page fault was caused in user mode. */ -#define PFERR_CODE_US (1 << 2) +#define PFERR_CODE_US (1 << 2) /** When bit on this position is 1, a reserved bit was set in page directory. */ -#define PFERR_CODE_RSVD (1 << 3) +#define PFERR_CODE_RSVD (1 << 3) /** When bit on this position os 1, the page fault was caused during instruction * fecth. */ -#define PFERR_CODE_ID (1 << 4) +#define PFERR_CODE_ID (1 << 4) /** Page Table Entry. */ typedef struct { - unsigned present : 1; - unsigned writeable : 1; - unsigned uaccessible : 1; - unsigned page_write_through : 1; - unsigned page_cache_disable : 1; - unsigned accessed : 1; - unsigned dirty : 1; - unsigned unused: 1; - unsigned global : 1; - unsigned soft_valid : 1; /**< Valid content even if present bit is cleared. */ - unsigned avl : 2; - unsigned addr_12_31 : 30; - unsigned addr_32_51 : 21; - unsigned no_execute : 1; + unsigned int present : 1; + unsigned int writeable : 1; + unsigned int uaccessible : 1; + unsigned int page_write_through : 1; + unsigned int page_cache_disable : 1; + unsigned int accessed : 1; + unsigned int dirty : 1; + unsigned int unused: 1; + unsigned int global : 1; + unsigned int soft_valid : 1; /**< Valid content even if present bit is cleared. */ + unsigned int avl : 2; + unsigned int addr_12_31 : 30; + unsigned int addr_32_51 : 21; + unsigned int no_execute : 1; } __attribute__ ((packed)) pte_t; @@ -211,5 +203,5 @@ { pte_t *p = &pt[i]; - + p->addr_12_31 = (a >> 12) & 0xfffff; p->addr_32_51 = a >> 32; Index: kernel/arch/amd64/include/mm/ptl.h =================================================================== --- kernel/arch/amd64/include/mm/ptl.h (revision 22a28a696141d62f28e48ed72d1d255ff519795c) +++ kernel/arch/amd64/include/mm/ptl.h (revision 6473d41b400a0e37add4151c14a275fde0f6c28b) @@ -27,5 +27,5 @@ */ -/** @addtogroup amd64mm +/** @addtogroup amd64mm * @{ */ @@ -36,12 +36,12 @@ #define KERN_amd64_PTL_H_ -#define PTL_NO_EXEC (1<<63) -#define PTL_ACCESSED (1<<5) -#define PTL_CACHE_DISABLE (1<<4) -#define PTL_CACHE_THROUGH (1<<3) -#define PTL_USER (1<<2) -#define PTL_WRITABLE (1<<1) -#define PTL_PRESENT 1 -#define PTL_2MB_PAGE (1<<7) +#define PTL_NO_EXEC (1 << 63) +#define PTL_ACCESSED (1 << 5) +#define PTL_CACHE_DISABLE (1 << 4) +#define PTL_CACHE_THROUGH (1 << 3) +#define PTL_USER (1 << 2) +#define PTL_WRITABLE (1 << 1) +#define PTL_PRESENT 1 +#define PTL_2MB_PAGE (1 << 7) Index: kernel/arch/amd64/include/mm/tlb.h =================================================================== --- kernel/arch/amd64/include/mm/tlb.h (revision 22a28a696141d62f28e48ed72d1d255ff519795c) +++ kernel/arch/amd64/include/mm/tlb.h (revision 6473d41b400a0e37add4151c14a275fde0f6c28b) @@ -27,5 +27,5 @@ */ -/** @addtogroup amd64mm +/** @addtogroup amd64mm * @{ */ Index: kernel/arch/amd64/include/pm.h =================================================================== --- kernel/arch/amd64/include/pm.h (revision 22a28a696141d62f28e48ed72d1d255ff519795c) +++ kernel/arch/amd64/include/pm.h (revision 6473d41b400a0e37add4151c14a275fde0f6c28b) @@ -71,5 +71,5 @@ #define PL_USER 3 -#define AR_PRESENT ( 1 << 7) +#define AR_PRESENT (1 << 7) #define AR_DATA (2 << 3) #define AR_CODE (3 << 3) Index: kernel/arch/amd64/include/proc/thread.h =================================================================== --- kernel/arch/amd64/include/proc/thread.h (revision 22a28a696141d62f28e48ed72d1d255ff519795c) +++ kernel/arch/amd64/include/proc/thread.h (revision 6473d41b400a0e37add4151c14a275fde0f6c28b) @@ -37,11 +37,11 @@ /* CAUTION: keep these in sync with low level assembly code in syscall_entry */ -#define SYSCALL_USTACK_RSP 0 -#define SYSCALL_KSTACK_RSP 1 +#define SYSCALL_USTACK_RSP 0 +#define SYSCALL_KSTACK_RSP 1 typedef struct { unative_t tls; /** User and kernel RSP for syscalls. */ - uint64_t syscall_rsp[2]; + uint64_t syscall_rsp[2]; } thread_arch_t;