diff --git a/bx_enh_dbg.ini b/bx_enh_dbg.ini index 9de38a8..225592a 100644 --- a/bx_enh_dbg.ini +++ b/bx_enh_dbg.ini @@ -19,8 +19,8 @@ isLittleEndian = TRUE DefaultAsmLines = 512 DumpWSIndex = 0 DockOrder = 0x123 -ListWidthPix[0] = 487 -ListWidthPix[1] = 665 -ListWidthPix[2] = 760 -MainWindow = 1440, 23, 1916, 1030 +ListWidthPix[0] = 753 +ListWidthPix[1] = 541 +ListWidthPix[2] = 618 +MainWindow = 0, 0, 1419, 408 FontName = Normal diff --git a/src/kernel/core/memory/page.c b/src/kernel/core/memory/page.c index d33fb7e..f5412d5 100644 --- a/src/kernel/core/memory/page.c +++ b/src/kernel/core/memory/page.c @@ -33,9 +33,8 @@ void Memory_Page_Init() for(i=1; i<1024; i++) { Page_Directory[i] = 0 | 2; // attribute set to: supervisor level, read/write } - Enable_Paging(); + // Enable_Paging(); Write_CR3(Page_Directory); - // Write_CR0(Read_CR0() | 0x80000000); // set the paging bit in CR0 to 1 - /* THATS IT... I GIVE UP! */ - Serial_Printf(DEBUG_COM_PORT, "HERE!\n"); + Write_CR0(Read_CR0() | 0x60000001); // set the paging bit in CR0 to 1 + /* Holy Shit i Fixed Paging */ } \ No newline at end of file diff --git a/src/kernel/main.c b/src/kernel/main.c index efc7a64..ec64550 100644 --- a/src/kernel/main.c +++ b/src/kernel/main.c @@ -3,15 +3,12 @@ |Copyright (C) 2025| |Tyler McGurrin | \*----------------*/ -#define i686 // Architecture specific -#ifdef i686 #include #include #include -#endif #include #include @@ -67,7 +64,6 @@ void __attribute__((section(".entry"))) start(uint64_t multiboot_magic, void *mu // Floppy_Init(); // This should always be last; its slow as fuck printf("Done!\n"); - // unsure why this is not working, will look into it later... printf("Initializing Memory Paging..."); Memory_Page_Init(); printf("Done!\n"); diff --git a/src/kernel/version.h b/src/kernel/version.h index 8e03002..961a506 100644 --- a/src/kernel/version.h +++ b/src/kernel/version.h @@ -6,4 +6,4 @@ #pragma once #define LOGO " _ _____ _ __________________\n / | / / | / | / / _/_ __/ ____/\n / |/ / /| | / |/ // / / / / __/ \n / /| / ___ |/ /| // / / / / /___ \n/_/ |_/_/ |_/_/ |_/___/ /_/ /_____/ \n" -#define VERSION "RD-00045" \ No newline at end of file +#define VERSION "RD-00046" \ No newline at end of file