Kernel: Link SMP trampoline as normal ELF object

Author: fido2020

Kernel/bintoelf.sh

@@ -40,9 +40,6 @@ SECTIONS
    {
         _data = .;
         *(.data)
-        _trampoline = .;
-        *(.trampoline)
-        _trampoline_end = .;
         . = ALIGN(4096);
    }
 

Kernel/linkscript-x86_64.ld

@@ -12,14 +12,10 @@ asmg = generator(nasm,
     arguments : [
         '-f', 'elf64',
         '-g', '-F', 'dwarf', '-w+gnu-elf-extensions',
+        '-i' + meson.current_source_dir() + '/src/Arch/x86_64/',
         '@INPUT@',
         '-o', '@OUTPUT@'])
 
-bintoelf = find_program('bintoelf.sh', './bintoelf.sh')
-bing = generator(bintoelf,
-output : '@BASENAME@.bin.o',
-arguments : ['@INPUT@','@OUTPUT@', meson.current_source_dir() + '/src/Arch/x86_64/', '@BASENAME@'])
-
 kernel_c_args = [
     '-g',
     '-Wno-write-strings', '-Wno-unused-parameter', '-Wno-sign-compare',
@@ -145,9 +141,6 @@ kernel_asm_files_x86_64 = [
     'src/Arch/x86_64/Memcpy.asm',
     'src/Arch/x86_64/SignalTrampoline.asm',
     'src/Arch/x86_64/TSS.asm',
-]
-
-kernel_asm_bin_files_x86_64 = [
     'src/Arch/x86_64/SMPTrampoline.asm',
 ]
 
@@ -160,7 +153,7 @@ kernel_link_args = [
 kernel_link_args += kernel_c_args
 
 kernel = executable('kernel.sys',
-    [asmg.process(kernel_asm_files_x86_64), bing.process(kernel_asm_bin_files_x86_64), kernel_cpp_files, kernel_cpp_files_x86_64, lai.get_variable('sources')],
+    [asmg.process(kernel_asm_files_x86_64), kernel_cpp_files, kernel_cpp_files_x86_64, lai.get_variable('sources')],
     include_directories : [kernel_include_dirs], 
     c_args : kernel_c_args, cpp_args : [kernel_c_args, kernel_cpp_args], link_args: kernel_link_args, link_depends: 'linkscript-x86_64.ld',
     install_dir : 'lemon/', install : true)

Kernel/meson.build

@@ -17,8 +17,8 @@ static inline void wait(uint64_t ms) {
     Timer::Wait(ms);
 }
 
-extern void* _binary_SMPTrampoline_bin_start;
-extern void* _binary_SMPTrampoline_bin_size;
+extern void* _smp_trampoline_entry16;
+extern void* _smp_trampoline_end;
 
 volatile uint16_t* smpMagic = (uint16_t*)SMP_TRAMPOLINE_DATA_START_FLAG;
 volatile uint16_t* smpID = (uint16_t*)SMP_TRAMPOLINE_CPU_ID;
@@ -134,7 +134,7 @@ void Initialize() {
 
     processorCount = ACPI::processorCount;
 
-    memcpy((void*)SMP_TRAMPOLINE_ENTRY, &_binary_SMPTrampoline_bin_start, ((uint64_t)&_binary_SMPTrampoline_bin_size));
+    memcpy((void*)SMP_TRAMPOLINE_ENTRY, &_smp_trampoline_entry16, ((uint64_t)&_smp_trampoline_end) - (uint64_t)(&_smp_trampoline_entry16));
 
     for (int i = 0; i < processorCount; i++) {
         if (ACPI::processors[i] != 0) {

Kernel/src/Arch/x86_64/SMP.cpp

@@ -1,6 +1,15 @@
+%include "smpdefines.inc"
+
+SMP_TRAMPOLINE_ENTRY64 equ (_smp_trampoline_entry64 - _smp_trampoline_entry16 + SMP_TRAMPOLINE_ENTRY)
+
+global _smp_trampoline_entry16
+global _smp_trampoline_end
+
+section .data
+_smp_trampoline_entry16:
 BITS 16
 
-%include "smpdefines.inc"
+; This will get moved to 0x2000 in physical RAM
 
 cli
 cld
@@ -26,13 +35,12 @@ mov cr0, eax
 
 lgdt [SMP_TRAMPOLINE_GDT_PTR]
 
-jmp 0x08:(smpentry64 + SMP_TRAMPOLINE_ENTRY)
+jmp 0x08:(SMP_TRAMPOLINE_ENTRY64)
 
 hlt
 
 BITS 64
-
-smpentry64:
+_smp_trampoline_entry64:
     mov ax, 0x10
     mov ds, ax
     mov es, ax
@@ -58,4 +66,6 @@ smpentry64:
     call [SMP_TRAMPOLINE_ENTRY2]
 
     cli
-    hlt
+    hlt
+
+_smp_trampoline_end: