X-Git-Url: https://scm.lunaixsky.com/lunaix-os.git/blobdiff_plain/87067c7f16425837971f5c1b5fd0fc5338757377..32b9a6d76790c73d3d2d36d9081a2581cc65d184:/lunaix-os/link/linker.ld?ds=sidebyside

diff --git a/lunaix-os/link/linker.ld b/lunaix-os/link/linker.ld
index d2d39f0..c3d57da 100644
--- a/lunaix-os/link/linker.ld
+++ b/lunaix-os/link/linker.ld
@@ -1,76 +1,203 @@
 ENTRY(start_)
 
-/*
-    FUTURE: Use disk reader
-    A bit of messy here.
-    We will pull our higher half kernel out of this shit
-      and load it separately once we have our disk reader.
-*/
-
 SECTIONS {
     . = 0x100000;
+    __kboot_start = .;
 
     /* 这里是我们的高半核初始化代码段和数据段 */
+    .boot.text BLOCK(4K) : 
+    {
+        *(.multiboot)
+        *(.boot.text)
+    }
 
-    .hhk_init_text BLOCK(4K) : {
-        * (.multiboot)
-        arch/*.o (.hhk_init)
-        arch/*.o (.text)
+    .boot.bss BLOCK(4K) : 
+    {
+        *(.boot.bss)
     }
 
-    .hhk_init_bss BLOCK(4K) : {
-        arch/*.o (.bss)
+    .boot.data BLOCK(4K) : 
+    {
+        *(.boot.data)
     }
 
-    .hhk_init_data BLOCK(4K) : {
-        arch/*.o (.data)
+    .boot.rodata BLOCK(4K) : 
+    {
+        *(.boot.rodata)
     }
 
-    .hhk_init_rodata BLOCK(4K) : {
-        arch/*.o (.rodata)
+    .boot.bss BLOCK(4K) : 
+    {
+        *(.boot.rodata)
     }
-    __init_hhk_end = ALIGN(4K);
+    __kboot_end = ALIGN(4K);
+
+    /* ---- boot end ---- */
+
+    /* ---- kernel start ---- */
 
-    /* Relocation of our higher half kernel */
     . += 0xC0000000;
 
     /* 好了，我们的内核…… */
-    .text BLOCK(4K) : AT ( ADDR(.text) - 0xC0000000 ) {
-        __kernel_start = .;
-        PROVIDE(__ktext_start = .);
+    
+    PROVIDE(__kexec_text_start = ALIGN(4K));
+    
+    .text BLOCK(4K) : AT ( ADDR(.text) - 0xC0000000 ) 
+    {
+        __kexec_start = .;
         
-        kernel/*.o (.text)
-        hal/*.o (.text)
-        debug/*.o (.text)
-        libs/*.o (.text)
+        *(.text)
+    }
 
-        PROVIDE(__ktext_end = .);
+    .kf.preempt BLOCK(4K) : AT ( ADDR(.kf.preempt) - 0xC0000000 ) 
+    {
+        PROVIDE(__kf_preempt_start = .);
+        
+        KEEP(*(.kf.preempt));
+
+        PROVIDE(__kf_preempt_end = .);
     }
 
-    .data BLOCK(4K) : AT ( ADDR(.data) - 0xC0000000 ) {
-        kernel/*.o (.data)
-        hal/*.o (.data)
-        debug/*.o (.data)
-        libs/*.o (.data)
+    PROVIDE(__kexec_text_end = .);
+
+    .data BLOCK(4K) : AT ( ADDR(.data) - 0xC0000000 ) 
+    {
+        *(.data)
+    }
+
+    .rodata BLOCK(4K) : AT ( ADDR(.rodata) - 0xC0000000 ) 
+    {
+        *(.rodata)
+    }
+
+    .kpg BLOCK(4K) : AT ( ADDR(.kpg) - 0xC0000000 ) 
+    {
+        *(.kpg)
+    }
+
+    . = ALIGN(4K);
+
+    /* for generated array, we align to address line size */
+
+    .lga BLOCK(4K) : AT ( ADDR(.lga) - 0xC0000000 ) 
+    {
+        PROVIDE(__lga_twiplugin_inits_start = .);
+        
+        KEEP(*(.lga.twiplugin_inits));
+
+        PROVIDE(__lga_twiplugin_inits_end = .);
+
+        /* ---- */
+
+        /* align to 8 bytes, so it can cover both 32 and 64 bits address line*/
+        . = ALIGN(8);
+
+        PROVIDE(__lga_devdefs_start = .);
+        
+        KEEP(*(.lga.devdefs));
+
+        PROVIDE(__lga_devdefs_end = .);
+
+        /* ---- */
+
+        . = ALIGN(8);
+
+        PROVIDE(__lga_dev_ld_kboot_start = .);
+        
+        KEEP(*(.lga.devdefs.ld_kboot));
+
+        PROVIDE(__lga_dev_ld_kboot_end = .);
+
+        /* ---- */
+
+        . = ALIGN(8);
+
+        PROVIDE(__lga_dev_ld_sysconf_start = .);
+        
+        KEEP(*(.lga.devdefs.ld_sysconf));
+
+        PROVIDE(__lga_dev_ld_sysconf_end = .);
+
+        /* ---- */
+
+        . = ALIGN(8);
+
+        PROVIDE(__lga_dev_ld_timedev_start = .);
+        
+        KEEP(*(.lga.devdefs.ld_timedev));
+
+        PROVIDE(__lga_dev_ld_timedev_end = .);
+
+        /* ---- */
+
+        . = ALIGN(8);
+
+        PROVIDE(__lga_dev_ld_post_start = .);
+        
+        KEEP(*(.lga.devdefs.ld_post));
+
+        PROVIDE(__lga_dev_ld_post_end = .);
+
+        /* ---- */
+
+        . = ALIGN(8);
+
+        PROVIDE(__lga_fs_start = .);
+        
+        KEEP(*(.lga.fs));
+
+        PROVIDE(__lga_fs_end = .);
+
+        /* ---- */
+
+        . = ALIGN(8);
+
+        PROVIDE(__lga_lunainit_on_earlyboot_start = .);
+        
+        KEEP(*(.lga.lunainit.c_earlyboot));
+
+        PROVIDE(__lga_lunainit_on_earlyboot_end = .);
+
+        /* ---- */
+
+        . = ALIGN(8);
+
+        PROVIDE(__lga_lunainit_on_boot_start = .);
+        
+        KEEP(*(.lga.lunainit.c_boot));
+
+        PROVIDE(__lga_lunainit_on_boot_end = .);
+
+        /* ---- */
+
+        . = ALIGN(8);
+
+        PROVIDE(__lga_lunainit_on_postboot_start = .);
+        
+        KEEP(*(.lga.lunainit.c_postboot));
+
+        PROVIDE(__lga_lunainit_on_postboot_end = .);
+
     }
 
-    .rodata BLOCK(4K) : AT ( ADDR(.rodata) - 0xC0000000 ) {
-        kernel/*.o (.rodata)
-        hal/*.o (.rodata)
-        debug/*.o (.rodata)
-        libs/*.o (.rodata)
+    .ksymtable BLOCK(4K) : AT ( ADDR(.ksymtable) - 0xC0000000 )
+    {
+        *(.ksymtable)
     }
 
-    .kpg BLOCK(4K) : AT ( ADDR(.kpg) - 0xC0000000 ) {
-        arch/*.o (.kpg)
+    .bss BLOCK(4K) : AT ( ADDR(.bss) - 0xC0000000 ) 
+    {
+        *(.bss)
     }
 
-    .bss BLOCK(4K) : AT ( ADDR(.bss) - 0xC0000000 ) {
-        kernel/*.o (.bss)
-        hal/*.o (.bss)
-        debug/*.o (.bss)
-        libs/*.o (.bss)
+    .bss.kstack BLOCK(4K) : AT ( ADDR(.bss.kstack) - 0xC0000000)
+    {
+        PROVIDE(__bsskstack_start = .);
+
+        *(.bss.kstack)
+
+        PROVIDE(__bsskstack_end = .);
     }
 
-    __kernel_end = ALIGN(4K);
+    __kexec_end = ALIGN(4K);
 }
\ No newline at end of file