diff options
author | Alex Auvolat <alex.auvolat@ens.fr> | 2014-12-04 10:43:58 +0100 |
---|---|---|
committer | Alex Auvolat <alex.auvolat@ens.fr> | 2014-12-04 10:43:58 +0100 |
commit | 292e4141078d18993b1395820631503ac852eb3d (patch) | |
tree | 3b3e5cb75d9bf3abb2639deedc247eba2cdeabe6 /kernel/include/sys.h | |
parent | d78a3d8be9c194554580cb3c73c1c5ebd0d82a9b (diff) | |
download | kogata-292e4141078d18993b1395820631503ac852eb3d.tar.gz kogata-292e4141078d18993b1395820631503ac852eb3d.zip |
Make paging work ! \o/
Diffstat (limited to 'kernel/include/sys.h')
-rw-r--r-- | kernel/include/sys.h | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/kernel/include/sys.h b/kernel/include/sys.h index a9d2d4c..ff98c60 100644 --- a/kernel/include/sys.h +++ b/kernel/include/sys.h @@ -22,6 +22,10 @@ static inline uint16_t inw(uint16_t port) { return ret; } +static inline void invlpg(size_t addr) { + asm volatile("invlpg (%0)" : : "r"(addr) : "memory"); +} + void panic(const char* message, const char* file, int line); void panic_assert(const char* assertion, const char* file, int line); #define PANIC(s) panic(s, __FILE__, __LINE__); @@ -37,6 +41,13 @@ void panic_assert(const char* assertion, const char* file, int line); #define PAGE_ALIGN_DOWN(x) (((size_t)x) & PAGE_MASK) #define PAGE_ALIGN_UP(x) ((((size_t)x)&(~PAGE_MASK)) == 0 ? ((size_t)x) : (((size_t)x) & PAGE_MASK) + PAGE_SIZE) #define PAGE_ID(x) (((size_t)x) / PAGE_SIZE) +#define PAGE_SHIFT 12 +#define PT_SHIFT 10 +// PAGE_SHIFT + PT_SHIFT + PT_SHIFT = 32 +#define N_PAGES_IN_PT 1024 +#define PD_MIRROR_ADDR 0xFFC00000 // last 4MB used for PD mirroring +#define LAST_KERNEL_ADDR PD_MIRROR_ADDR +#define FIRST_KERNEL_PT (K_HIGHHALF_ADDR >> (PAGE_SHIFT+PT_SHIFT)) // must be 768 #define MASK4 0xFFFFFFFC #define ALIGN4_UP(x) ((((size_t)x)&(~MASK4)) == 0 ? ((size_t)x) : (((size_t)x) & MASK4) + 4) |