Changeset 156bae23 in mainline

Timestamp:

2018-11-13T20:22:20Z (6 years ago)

Author:

Jiří Zárevúcky <zarevucky.jiri@…>

Children:

87db879

Parents:

6e5252a

git-author:

Jiří Zárevúcky <zarevucky.jiri@…> (2018-10-24 00:27:26)

git-committer:

Jiří Zárevúcky <zarevucky.jiri@…> (2018-11-13 20:22:20)

Message:

Allocate boot stack properly on x86

Location:

kernel/arch

Files:

• amd64/_link.ld.in (modified) (1 diff)
• amd64/src/asm.S (modified) (1 diff)
• amd64/src/boot/multiboot.S (modified) (3 diffs)
• ia32/_link.ld.in (modified) (1 diff)
• ia32/src/asm.S (modified) (1 diff)
• ia32/src/boot/multiboot.S (modified) (4 diffs)

kernel/arch/amd64/_link.ld.in

@@ -42 +42 @@
         } :unmapped
 
-        .mapped (PA2KA(BOOT_OFFSET) + SIZEOF(.unmapped)) : AT (BOOT_OFFSET + SIZEOF(.unmapped)) {
+        .unmapped_bss : {
+                *(.bootstack);
+        } :unmapped
+
+        .mapped (PA2KA(BOOT_OFFSET) + SIZEOF(.unmapped) + SIZEOF(.unmapped_bss)) : AT (BOOT_OFFSET + SIZEOF(.unmapped) + SIZEOF(.unmapped_bss)) {
                 ktext_start = .;
                 *(.text .text.*);

kernel/arch/amd64/src/asm.S

@@ -34 +34 @@
 #include <arch/cpu.h>
 #include <arch/smp/apic.h>
+#include <arch/boot/boot.h>
+
+.section .bootstack, "a", @nobits
+.align 16
+SYMBOL(bootstack_bottom)
+.skip BOOT_STACK_SIZE
+SYMBOL(bootstack_top)
 
 .text

kernel/arch/amd64/src/boot/multiboot.S

@@ -44 +44 @@
 //       the image to get very early debug output.
 
-#define START_STACK  (BOOT_OFFSET - BOOT_STACK_SIZE)
-
 .section .multiboot, "a"
 
@@ -99 +97 @@
 
         /* Initialize stack pointer */
-        movl $START_STACK, %esp
+        movl $bootstack_top, %esp
 
         /*
@@ -436 +434 @@
          */
 
-        movq $(PA2KA(START_STACK)), %rsp
+        movq $(PA2KA(bootstack_top)), %rsp
 
         /* Create the first stack frame */

kernel/arch/ia32/_link.ld.in

@@ -41 +41 @@
         } :unmapped
 
-        .mapped (PA2KA(BOOT_OFFSET) + SIZEOF(.unmapped)): AT (BOOT_OFFSET + SIZEOF(.unmapped)) {
+        .unmapped_bss : {
+                *(.bootstack);
+        } :unmapped
+
+        .mapped (PA2KA(BOOT_OFFSET) + SIZEOF(.unmapped) + SIZEOF(.unmapped_bss)): AT (BOOT_OFFSET + SIZEOF(.unmapped) + SIZEOF(.unmapped_bss)) {
                 ktext_start = .;
                 *(.text .text.*);

kernel/arch/ia32/src/asm.S

@@ -37 +37 @@
 #include <arch/istate_struct.h>
 #include <arch/smp/apic.h>
+#include <arch/boot/boot.h>
+
+.section .bootstack, "a", @nobits
+.align 16
+SYMBOL(bootstack_bottom)
+.skip BOOT_STACK_SIZE
+SYMBOL(bootstack_top)
 
 .text

kernel/arch/ia32/src/boot/multiboot.S

@@ -44 +44 @@
 //       the image to get very early debug output.
 
-#define START_STACK  (BOOT_OFFSET - BOOT_STACK_SIZE)
-
 .section .multiboot, "a"
 
@@ -93 +91 @@
 
         /* Initialize stack pointer */
-        movl $START_STACK, %esp
+        movl $bootstack_top, %esp
 
         /*
@@ -147 +145 @@
 
         stack_init:
+        movl $PA2KA(bootstack_top), %esp
 
         /* Create the first stack frame */
@@ -300 +299 @@
         movl %edi, kernel_end
         ret
+
+// TODO: remove this cruft
 
 /** Find free 2M (+4k for alignment) region where to store page tables */