From 956bb743a3ba6939aaff2372fc45628cda6a9840 Mon Sep 17 00:00:00 2001 From: Aleksa Vuckovic Date: Mon, 5 Sep 2022 23:54:12 +0200 Subject: userspace finally working --- kernel/include/heap.h | 6 +++--- kernel/include/paging.h | 1 + 2 files changed, 4 insertions(+), 3 deletions(-) (limited to 'kernel/include') diff --git a/kernel/include/heap.h b/kernel/include/heap.h index 62d3b6f..b2d9a00 100644 --- a/kernel/include/heap.h +++ b/kernel/include/heap.h @@ -3,9 +3,9 @@ #include -#define HEAP_VMEM_ADDR 0xc1000000 -#define HEAP_PMEM_ADDR 0x01000000 -#define HEAP_SIZE 0x01000000 +#define HEAP_VMEM_ADDR 0xc2000000 +#define HEAP_PMEM_ADDR 0x02000000 +#define HEAP_SIZE 0x02000000 #define HEAP_BLOCK_SIZE 0x00000010 struct kheapblock_t { diff --git a/kernel/include/paging.h b/kernel/include/paging.h index 7c9fcd5..8f69224 100644 --- a/kernel/include/paging.h +++ b/kernel/include/paging.h @@ -6,6 +6,7 @@ #define PAGE_SIZE 0x00200000 #define FLAG_PRESENT 0x1 #define FLAG_WRITABLE 0x2 +#define FLAG_USER 0x4 #define FLAG_HUGE 0x80 #define KERNEL_VMA 0xc0000000 -- cgit v1.2.3