fix: revert to new linker

Mrgoblings · Dec 31, 2024 · f38d518 · f38d518
1 parent 391cc52
commit f38d518
Show file tree

Hide file tree

Showing 3 changed files with 59 additions and 59 deletions.
diff --git a/anasos-kernel/linker copy.ld b/anasos-kernel/linker copy.ld
diff --git a/anasos-kernel/linker-old.ld b/anasos-kernel/linker-old.ld
@@ -0,0 +1,17 @@
+ENTRY(start_protected_mode)
+
+SECTIONS
+{
+	. = 1M;
+
+	.boot :
+	{
+		KEEP(*(.multiboot_header))
+        *(.boot)
+	}
+
+	.text :
+	{
+		*(.text)
+	}
+}
diff --git a/anasos-kernel/linker.ld b/anasos-kernel/linker.ld
@@ -2,16 +2,48 @@ ENTRY(start_protected_mode)
 
 SECTIONS
 {
-	. = 1M;
-
-	.boot :
-	{
-		KEEP(*(.multiboot_header))
+    . = 0x0;
+    .boot :
+    {
+        KEEP(*(.multiboot_header));
         *(.boot)
-	}
+    }
+
+    /* Page table addresses already defined in boot.asm, but ensure alignment */
+    . = ALIGN(4096); /* Page size */
+    __page_table_start = .;
+	_p4 = PML4;         /* Reference PML4 address from boot.asm */
+	_p3 = PDPT;         /* Reference PDPT address from boot.asm */
+	_p2 = PD;           /* Reference PD address from boot.asm */
+	_p1 = PT;           /* Reference PT address from boot.asm */
+	__page_table_end = .;
+
+    /* Stack setup handled in boot.asm */
+    _stack_start = stack_bottom; /* Stack defined in boot.asm */
+    _stack_end = stack_top;
+
+    /* Memory map section for bootloader metadata */
+    __bootloader_start = .;
+    _memory_map = .;  /* Memory map entry */
+    . += 4096;		/* Reserve 4KB for memory map */
+
+    /* Kernel metadata section */
+    .kernel :
+    {
+        KEEP(*(.kernel))
+    }
+
+    /* Text section: contains code */
+    .text :
+    {
+        *(.text)
+    }
 
-	.text :
-	{
-		*(.text)
-	}
+    .bss ALIGN(4096):
+    {
+        __bss_start = .;
+        *(.bss)
+        *(COMMON)
+        __bss_end = .;
+    }
 }