dyld-96.2.tar.gz

[apple/dyld.git] / src / dyldStartup.s

diff --git a/src/dyldStartup.s b/src/dyldStartup.s
index e69b9c9dbedd0804a04be101163c5e83d06899ad..1bf79318ccc2aaf644220839f25cc82ed1096589 100644 (file)
--- a/src/dyldStartup.s
+++ b/src/dyldStartup.s
@@ -113,7 +113,7 @@ L__dyld_start_picbase:
        addl    $8,%esp         # remove the mh argument, and debugger end
                                #  frame marker
        movl    $0,%ebp         # restore ebp back to zero
        addl    $8,%esp         # remove the mh argument, and debugger end
                                #  frame marker
        movl    $0,%ebp         # restore ebp back to zero

-       jmp     %eax            # jump to the entry point
+       jmp     *%eax           # jump to the entry point

 
 
        .globl dyld_stub_binding_helper
 
 
        .globl dyld_stub_binding_helper


@@ -122,6 +122,52 @@ dyld_stub_binding_helper:
 L_end:
 #endif /* __i386__ */
 
 L_end:
 #endif /* __i386__ */
 

+
+#if __x86_64__
+       .data
+       .align 3
+__dyld_start_static: 
+       .quad   __dyld_start
+
+# stable entry points into dyld
+       .text
+       .align 2
+       .globl  _stub_binding_helper
+_stub_binding_helper:
+       jmp     _stub_binding_helper_interface
+       nop
+       nop
+       nop
+       .globl  _dyld_func_lookup
+_dyld_func_lookup:
+       jmp     __Z18lookupDyldFunctionPKcPm
+
+       .text
+       .align 2,0x90
+       .globl __dyld_start
+__dyld_start:
+       pushq   $0              # push a zero for debugger end of frames marker
+       movq    %rsp,%rbp       # pointer to base of kernel frame
+       andq    $-16,%rsp       # force SSE alignment
+       
+       # call dyldbootstrap::start(app_mh, argc, argv, slide)
+       movq    8(%rbp),%rdi    # param1 = mh into %rdi
+       movl    16(%rbp),%esi   # param2 = argc into %esi
+       leaq    24(%rbp),%rdx   # param3 = &argv[0] into %rdx
+       movq    __dyld_start_static(%rip), %r8
+       leaq    __dyld_start(%rip), %rcx
+       subq     %r8, %rcx      # param4 = slide into %rcx
+       call    __ZN13dyldbootstrap5startEPK11mach_headeriPPKcl 
+
+       # clean up stack and jump to result
+       movq    %rbp,%rsp       # restore the unaligned stack pointer
+       addq    $16,%rsp        # remove the mh argument, and debugger end frame marker
+       movq    $0,%rbp         # restore ebp back to zero
+       jmp     *%rax           # jump to the entry point
+       
+#endif /* __x86_64__ */
+
+

 #if __ppc__ || __ppc64__
 #include <architecture/ppc/mode_independent_asm.h>
 
 #if __ppc__ || __ppc64__
 #include <architecture/ppc/mode_independent_asm.h>
 


@@ -189,3 +235,24 @@ L_end:
 #endif /* __ppc__ */
 
 
 #endif /* __ppc__ */
 
 

+/*
+ * dyld calls this function to terminate a process.
+ * It has a label so that CrashReporter can distinguish this
+ * termination from a random crash.  rdar://problem/4764143
+ */
+       .text
+       .align 2
+       .globl  _dyld_fatal_error
+_dyld_fatal_error:
+#if __ppc__ || __ppc64__
+    trap
+#elif __x86_64__ || __i386__
+    int3
+#else
+    #error unknown architecture
+#endif
+
+    
+    
+
+