c++ global constructors calling from crt

1 files changed, 37 insertions, 13 deletions

diff --git a/interface/crt0.s b/interface/crt0.s
index 65123b7..914a99d 100644
--- a/interface/crt0.s
+++ b/interface/crt0.s
@@ -1,11 +1,8 @@
 .global _start
-.global myinit //temporary quickfix / test
 
 _start:
 
-// ALIGN stack
-
-//push %ebx
+//push %ebx // do we need to persist them???
 //push %ecx
 
 //cmp $0,_impure_ptr
@@ -22,7 +19,8 @@ _start:
 
 //skipzero:
 
-/*
+// move impure pointer to our special page (check if not htere already!)
+
 mov _impure_ptr,%eax
 mov $0xf5000000,%ebx
 
@@ -34,11 +32,30 @@ add $4, %eax
 cmp $0xf5001000,%ebx
 jne copy
 
-*/
-
 movl $0xf5000000, _impure_ptr
 
-//call _init
+call _init // constructors 
+
+// constructors from array_init
+mov $__init_array_start,%eax
+
+nextctor: 
+
+//cmp (__init_array_end),%eax
+cmp $__init_array_end,%eax
+je finctor
+
+push %eax
+call *(%eax)
+pop %eax
+
+add $4, %eax
+jmp nextctor
+
+finctor:
+
+//pop %ecx
+//pop %ebx
 
 # environment adress was passed on stack
 
@@ -61,15 +78,22 @@ call main
 and $-16,%esp
 sub $4,%esp
 
+push %eax
+
+call _fini //desctructors
+
+// pop programmm return value
+pop %eax
+
+// ALIGN stack
+and $-16,%esp
+sub $4,%esp
+
 # push exit code and pass to _exit syscall
 push %eax
 call exit
 
-# this should never be reached!
+# and this should never be reached!!
 .wait:
     hlt
 jmp .wait
-
-myinit:
-call _init
-ret