summaryrefslogtreecommitdiff
path: root/kernel
diff options
context:
space:
mode:
authorMiguel <m.i@gmx.at>2018-10-10 10:15:49 +0200
committerMiguel <m.i@gmx.at>2018-10-10 10:15:49 +0200
commite9495844291a85a1f7ba3c76742a0dd1bf574e5f (patch)
treea0d2ba779ed8e471758a77745250731a1596182b /kernel
parent63e5017d9863d4ed215782e469e8ee2c6ff8473d (diff)
hosted gcc compiler
Diffstat (limited to 'kernel')
-rw-r--r--kernel/kernel.h11
-rw-r--r--kernel/vmem.c2
2 files changed, 8 insertions, 5 deletions
diff --git a/kernel/kernel.h b/kernel/kernel.h
index fad803c..acd3451 100644
--- a/kernel/kernel.h
+++ b/kernel/kernel.h
@@ -63,15 +63,16 @@ REFERENCES
// minimal space between user and kernel pages 1024 pages!
#define VMEM_KERNEL 0x00000000 // 8192 pages (32megs) / identity mapped
-#define VMEM_KERNEL_PAGES (1024*8)
+#define VMEM_KERNEL_PAGES (1024*16)
// VMEM_KERNEL END 0x02000000
#define VMEM_USER_ENV 0x07000000 // 1 page / per user process
-#define VMEM_USER_PROG_PAGES (256*16)
+//#define VMEM_USER_PROG_PAGES (256*16)
+#define VMEM_USER_PROG_PAGES (1024*16)
#define VMEM_USER_PROG 0x08048000 // ? pages / per user process (usual entry: 0x8048080)
-#define VMEM_USER_STACK_PAGES 4 // 4 pages / per thread
+#define VMEM_USER_STACK_PAGES (1024*16) // 4 pages / per thread
#define VMEM_USER_STACK_TOP 0xF0000000 // 4 pages / per thread
#define VMEM_LAPIC 0xF0005000 // 1 pages / identity mapped
@@ -88,9 +89,11 @@ REFERENCES
#define VMEM_FRAMEBUFFER 0xF6000000 // 8192 pages (32megs) / identity mapped
#define VMEM_FRAMEBUFFER_PAGES (1024*8)
+
#define VMEM_EXT2_RAMIMAGE 0xF8000000 // 8192 pages (32megs) / identity mapped
+#define VMEM_EXT2_PAGES (1024*16)
-#define VMEM_USER_FRAMEBUFFER 0xFA000000
+#define VMEM_USER_FRAMEBUFFER 0xFC000000
#define VMEM_USER_FRAMEBUFFER_PAGES 300// 4*320*480 bytes per app (one extra?)
#endif
diff --git a/kernel/vmem.c b/kernel/vmem.c
index 704b45e..30109ba 100644
--- a/kernel/vmem.c
+++ b/kernel/vmem.c
@@ -350,7 +350,7 @@ pdirectory* vmem_kernel_dir() // we create thie once for each cpu
vmem_add_remap(dir,local_apic_addr,VMEM_LAPIC,1,false); //apic addr should be at pagestart, right? TODO: check.
vmem_add_remap(dir,io_apic_addr,VMEM_IOAPIC,1,false);
- vmem_add_remap(dir,mod_start,VMEM_EXT2_RAMIMAGE,1024*8,false);//32megs for ramimage: TODO: check if enough?
+ vmem_add_remap(dir,mod_start,VMEM_EXT2_RAMIMAGE,VMEM_EXT2_PAGES,false);//32megs for ramimage: TODO: check if enough?
vmem_add_alloc(dir,VMEM_CPU_PRIVATE,4,false);
vmem_add_alloc(dir,VMEM_CPU_STACK_TOP-4096*VMEM_CPU_STACK_PAGES,VMEM_CPU_STACK_PAGES,false);