From 0892eb841c6400e74c10406edb7e234ab1843d01 Mon Sep 17 00:00:00 2001 From: spikey Date: Sun, 18 Feb 2024 11:14:38 -0500 Subject: [PATCH 1/2] memory thing --- sys/include/memory.h | 3 +++ sys/memory.c | 5 ++++- sys/sysinit.c | 3 --- 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/sys/include/memory.h b/sys/include/memory.h index 8bb51b2..b0c184a 100644 --- a/sys/include/memory.h +++ b/sys/include/memory.h @@ -28,6 +28,7 @@ #define STACK_START 0x000b8fa0 #define STACK_END 0x000fffff #define PR_START 0x00100000 +#define MALLOC_END 0x00100fff #define PHYSMEMTOP 0x0e000000 struct allocated { @@ -35,4 +36,6 @@ struct allocated { s32 size; } +void memory_init(void); + #endif diff --git a/sys/memory.c b/sys/memory.c index 3ad485e..8003d3b 100644 --- a/sys/memory.c +++ b/sys/memory.c @@ -7,7 +7,10 @@ void memory_init(void) { u32 esp, ebp; - ebp = 0x8B7F0; + ebp = STACK_START; + esp = STACK_START; + + } void *malloc(s32 size) { diff --git a/sys/sysinit.c b/sys/sysinit.c index 67b2d1c..f1c7b91 100644 --- a/sys/sysinit.c +++ b/sys/sysinit.c @@ -6,13 +6,10 @@ void sysinit(void) { char *howdy = "Om Smart."; - char *howday = "Om Smarter."; vga_clearscreen(); vga_write("Starting omOS...", 16, 0x0F); memory_init(); - s8 *start = (s8 *) 0xb8fa0; - start[0] = 'h'; } From b6a53875be15f07b711e90bf148bc4a8da1e240d Mon Sep 17 00:00:00 2001 From: spikey Date: Sun, 18 Feb 2024 11:17:06 -0500 Subject: [PATCH 2/2] wth --- sys/sysinit.c | 43 ------------------------------------------- 1 file changed, 43 deletions(-) diff --git a/sys/sysinit.c b/sys/sysinit.c index a5c35b5..1636443 100644 --- a/sys/sysinit.c +++ b/sys/sysinit.c @@ -8,50 +8,7 @@ sysinit(void) char *howdy = "Om Smart."; vga_clearscreen(); - /* - for (s16 i = 0; i < 100; i++) { - vga_write(howdy, strlen(howdy), 0x1f); - vga_write(howday, strlen(howday), 0x0f); - } - - vga_write("sid", 3, 0x07); - vga_write("did", 3, 0x07); - vga_write("fid", 3, 0x07); - */ - - vga_write( -"Om Smart.Om Smarter.Om Smart.Om Smarter.Om Smart.Om Smarter.Om Smart.Om Smarter." -"Om Smart.Om Smarter.Om Smart.Om Smarter.Om Smart.Om Smarter.Om Smart.Om Smarter." -"Om Smart.Om Smarter.Om Smart.Om Smarter.Om Smart.Om Smarter.Om Smart.Om Smarter." -"Om Smart.Om Smarter.Om Smart.Om Smarter.Om Smart.Om Smarter.Om Smart.Om Smarter." -"Om Smart.Om Smarter.Om Smart.Om Smarter.Om Smart.Om Smarter.Om Smart.Om Smarter." -"Om Smart.Om Smarter.Om Smart.Om Smarter.Om Smart.Om Smarter.Om Smart.Om Smarter." -"Om Smart.Om Smarter.Om Smart.Om Smarter.Om Smart.Om Smarter.Om Smart.Om Smarter." -"Om Smart.Om Smarter.Om Smart.Om Smarter.Om Smart.Om Smarter.Om Smart.Om Smarter." -"Om Smart.Om Smarter.Om Smart.Om Smarter.Om Smart.Om Smarter.Om Smart.Om Smarter." -"Om Smart.Om Smarter.Om Smart.Om Smarter.Om Smart.Om Smarter.Om Smart.Om Smarter." -"Om Smart.Om Smarter.Om Smart.Om Smarter.Om Smart.Om Smarter.Om Smart.Om Smarter." -"Om Smart.Om Smarter.Om Smart.Om Smarter.Om Smart.Om Smarter.Om Smart.Om Smarter." -"Om Smart.Om Smarter.Om Smart.Om Smarter.Om Smart.Om Smarter.Om Smart.Om Smarter." -"Om Smart.Om Smarter.Om Smart.Om Smarter.Om Smart.Om Smarter.Om Smart.Om Smarter." -"Om Smart.Om Smarter.Om Smart.Om Smarter.Om Smart.Om Smarter.Om Smart.Om Smarter." -"Om Smart.Om Smarter.Om Smart.Om Smarter.Om Smart.Om Smarter.Om Smart.Om Smarter." -"Om Smart.Om Smarter.Om Smart.Om Smarter.Om Smart.Om Smarter.Om Smart.Om Smarter." -"Om Smart.Om Smarter.Om Smart.Om Smarter.Om Smart.Om Smarter.Om Smart.Om Smarter." -"Om Smart.Om Smarter.Om Smart.Om Smarter.Om Smart.Om Smarter.Om Smart.Om Smarter." -"Om Smart.Om Smarter.Om Smart.Om Smarter.Om Smart.Om Smarter.Om Smart.Om Smarter." -"Om Smart.Om Smarter.Om Smart.Om Smarter.Om Smart.Om Smarter.Om Smart.Om Smarter." -"Om Smart.Om Smarter.Om Smart.Om Smarter.Om Smart.Om Smarter.Om Smart.Om Smarter." -"Om Smart.Om Smarter.Om Smart.Om Smarter.Om Smart.Om Smarter.Om Smart.Om Smarter." -"Om Smart.Om Smarter.Om Smart.Om Smarter.Om Smart.Om Smarter.Om Smart.Om Smarter." -"Om Smart.Om Smarter.Om Smart.Om Smarter.Om Smart.Om Smarter.Om Smart.Om Smarter." -"bob", 2003, 0x0F); - vga_write("indian", 6, 0x07); - vga_write("indian", 6, 0x07); - - printf("%s%x", "Omh", 0x2a); vga_write("Starting omOS...", 16, 0x0F); memory_init(); - }