Changeset 8a1afd2 in mainline for kernel/arch/ia32

Timestamp:

2018-10-17T22:51:33Z (7 years ago)

Author:

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

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

1d18bbc0, d723a80

Parents:

7900e5d

Message:

Remove hardcoded data variables from kernel linker scripts

Location:

kernel/arch/ia32

Files:

• _link.ld.in (modified) (3 diffs)
• include/arch/boot/boot.h (modified) (1 diff)
• src/boot/multiboot.S (modified) (1 diff)
• src/ia32.c (modified) (1 diff)
• src/mm/frame.c (modified) (3 diffs)

kernel/arch/ia32/_link.ld.in

@@ -13 +13 @@
 
 SECTIONS {
+        kernel_load_address = PA2KA(BOOT_OFFSET);
+
         .unmapped BOOT_OFFSET: AT (0) {
                 unmapped_ktext_start = .;
@@ -32 +34 @@
                 *(.rodata .rodata.*);   /* string literals */
                 *(COMMON);              /* global variables */
-                hardcoded_load_address = .;
-                LONG(PA2KA(BOOT_OFFSET));
-                hardcoded_ktext_size = .;
-                LONG((ktext_end - ktext_start) + (unmapped_ktext_end - unmapped_ktext_start));
-                hardcoded_kdata_size = .;
-                LONG((kdata_end - kdata_start) + (unmapped_kdata_end - unmapped_kdata_start));
-                hardcoded_unmapped_ktext_size = .;
-                LONG(unmapped_ktext_end - unmapped_ktext_start);
-                hardcoded_unmapped_kdata_size = .;
-                LONG(unmapped_kdata_end - unmapped_kdata_start);
                 . = ALIGN(8);
                 symbol_table = .;
@@ -68 +60 @@
 #ifdef CONFIG_SMP
 
-        _hardcoded_unmapped_size = (unmapped_ktext_end - unmapped_ktext_start) + (unmapped_kdata_end - unmapped_kdata_start);
         ap_boot = unmapped_ap_boot - BOOT_OFFSET + AP_BOOT_OFFSET;
         ap_gdtr = unmapped_ap_gdtr - BOOT_OFFSET + AP_BOOT_OFFSET;

kernel/arch/ia32/include/arch/boot/boot.h

@@ -44 +44 @@
 #ifdef CONFIG_SMP
 
-/* This is only a symbol so the type is dummy. Obtain the value using &. */
-extern int _hardcoded_unmapped_size;
+extern uint8_t unmapped_kdata_end[];
 
 #endif /* CONFIG_SMP */

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

@@ -285 +285 @@
 /** Calculate unmapped address of the end of the kernel. */
 calc_kernel_end:
-        movl $KA2PA(hardcoded_load_address), %edi
-        movl (%edi), %esi
-        leal KA2PA(0)(%esi), %esi
-
-        movl $KA2PA(hardcoded_ktext_size), %edi
-        addl (%edi), %esi
-        leal KA2PA(0)(%esi), %esi
-
-        movl $KA2PA(hardcoded_kdata_size), %edi
-        addl (%edi), %esi
-        leal KA2PA(0)(%esi), %esi
-        movl %esi, kernel_end
-
+        movl $KA2PA(kdata_end), %edi
+        movl %edi, kernel_end
         ret
 

kernel/arch/ia32/src/ia32.c

@@ -94 +94 @@
 
 #ifdef CONFIG_SMP
+        size_t unmapped_size = (uintptr_t) unmapped_kdata_end - BOOT_OFFSET;
         /* Copy AP bootstrap routines below 1 MB. */
-        memcpy((void *) AP_BOOT_OFFSET, (void *) BOOT_OFFSET,
-            (size_t) &_hardcoded_unmapped_size);
+        memcpy((void *) AP_BOOT_OFFSET, (void *) BOOT_OFFSET, unmapped_size);
 #endif
 }

kernel/arch/ia32/src/mm/frame.c

@@ -47 +47 @@
 
 #define PHYSMEM_LIMIT32  UINT64_C(0x100000000)
-
-size_t hardcoded_unmapped_ktext_size = 0;
-size_t hardcoded_unmapped_kdata_size = 0;
 
 static void init_e820_memory(pfn_t minconf, bool low)
@@ -155 +152 @@
 
 #ifdef CONFIG_SMP
+                size_t unmapped_size =
+                    (uintptr_t) unmapped_kdata_end - BOOT_OFFSET;
+
                 minconf = max(minconf,
-                    ADDR2PFN(AP_BOOT_OFFSET + hardcoded_unmapped_ktext_size +
-                    hardcoded_unmapped_kdata_size));
+                    ADDR2PFN(AP_BOOT_OFFSET + unmapped_size));
 #endif
 
@@ -168 +167 @@
                 /* Reserve AP real mode bootstrap memory */
                 frame_mark_unavailable(AP_BOOT_OFFSET >> FRAME_WIDTH,
-                    (hardcoded_unmapped_ktext_size +
-                    hardcoded_unmapped_kdata_size) >> FRAME_WIDTH);
+                    unmapped_size >> FRAME_WIDTH);
 #endif
         }