summaryrefslogtreecommitdiff
path: root/kernel/include
diff options
context:
space:
mode:
authorAleksa Vuckovic <aleksav013@gmail.com>2022-09-05 23:54:12 +0200
committerAleksa Vuckovic <aleksav013@gmail.com>2022-09-07 17:46:10 +0200
commit956bb743a3ba6939aaff2372fc45628cda6a9840 (patch)
tree0d1fd304eb584c892e28e43bbc851cf66786d9da /kernel/include
parent59f86fe8dd237e50c7fea03b506125e3abff0157 (diff)
userspace finally working
Diffstat (limited to 'kernel/include')
-rw-r--r--kernel/include/heap.h6
-rw-r--r--kernel/include/paging.h1
2 files changed, 4 insertions, 3 deletions
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 <types.h>
-#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