Move static init to asm bootstrap code

djphoenix · Nov 9, 2016 · 56a68c6 · 56a68c6
1 parent 09b4327
commit 56a68c6
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 13 deletions.
diff --git a/src/boot/boot.cpp b/src/boot/boot.cpp
@@ -23,7 +23,6 @@
 #include "processmanager.hpp"
 
 void NORETURN main() {
-  static_init();
   Display::getInstance()->clean();
   Pagetable::init();
   SMP::init();

diff --git a/src/boot/x32to64.s b/src/boot/x32to64.s
@@ -190,6 +190,24 @@ _efi_start: # EFI
   jmp .
 
 x64_entry:
+  mov $__INIT_LIST__, %rbp
+1:
+  add $8, %rbp
+  mov (%rbp), %rax
+  test %rax, %rax
+  je 2f
+  callq *%rax
+  jmp 1b
+2:
+  mov $__CTOR_LIST__, %rbp
+3:
+  add $8, %rbp
+  mov (%rbp), %rax
+  test %rax, %rax
+  je 4f
+  callq *%rax
+  jmp 3b
+4:
   mov %rsp, %rbp
   jmp main
 

diff --git a/src/kernlib/include/kernlib/std.hpp b/src/kernlib/include/kernlib/std.hpp
@@ -32,8 +32,6 @@ template<typename T> T ABS(T a) { return a > 0 ? a : -a; }
 
 extern "C" {
 
-  void static_init();
-
   size_t strlen(const char*, size_t limit = -1);
   char* strdup(const char*);
   int strcmp(const char*, const char*);

diff --git a/src/kernlib/std.cpp b/src/kernlib/std.cpp
@@ -21,16 +21,6 @@ extern "C" {
 
   void __cxa_pure_virtual() {}
   int __cxa_atexit(void (*)(void*), void*, void*) { return 0; }
-
-  extern void (*__INIT_LIST__)();
-  extern void (*__CTOR_LIST__)();
-}
-
-void static_init() {
-  for (void (**p)() = &__INIT_LIST__ + 1; *p != 0; ++p)
-    (*p)();
-  for (void (**p)() = &__CTOR_LIST__ + 1; *p != 0; ++p)
-    (*p)();
 }
 
 size_t strlen(const char* c, size_t limit) {