Changeset 16396 in vbox for trunk/src/libs/xpcom18a4/xpcom

Timestamp:

Jan 29, 2009 11:38:53 PM (16 years ago)

Author:

vboxsync

Message:

XPCOM-darwin/amd64: Shot at the xptcall fun.

Location:

trunk/src/libs/xpcom18a4/xpcom/reflect/xptcall/src/md/unix

Files:

• xptcinvoke_amd64_darwin.cpp (copied) (copied from trunk/src/libs/xpcom18a4/xpcom/reflect/xptcall/src/md/unix/xptcinvoke_x86_64_linux.cpp )
• xptcstubs_amd64_darwin.cpp (copied) (copied from trunk/src/libs/xpcom18a4/xpcom/reflect/xptcall/src/md/unix/xptcstubs_x86_64_linux.cpp ) (6 diffs)

trunk/src/libs/xpcom18a4/xpcom/reflect/xptcall/src/md/unix/xptcstubs_amd64_darwin.cpp

@@ -56 +56 @@
 // - 'gpregs[]' contains the arguments passed in integer registers
 // - 'fpregs[]' contains the arguments passed in floating point registers
-// 
+//
 // The parameters are mapped into an array of type 'nsXPTCMiniVariant'
 // and then the method gets called.
@@ -105 +105 @@
         const nsXPTType& type = param.GetType();
         nsXPTCMiniVariant* dp = &dispatchParams[i];
-        
+
         if (!param.IsOut() && type == nsXPTType::T_DOUBLE) {
             if (nr_fpr < FPR_COUNT)
@@ -165 +165 @@
 
 #if defined(__GXX_ABI_VERSION) && __GXX_ABI_VERSION >= 100 /* G++ V3 ABI */
-// Linux/x86-64 uses gcc >= 3.1
+// Darwin/AMD64 uses gcc >= 3.1
 #define STUB_ENTRY(n) \
-asm(".section   \".text\"\n\t" \
+asm(".text\n\t" \
     ".align     2\n\t" \
     ".if        " #n " < 10\n\t" \
-    ".globl     _ZN14nsXPTCStubBase5Stub" #n "Ev\n\t" \
-    ".type      _ZN14nsXPTCStubBase5Stub" #n "Ev,@function\n" \
-    "_ZN14nsXPTCStubBase5Stub" #n "Ev:\n\t" \
+    ".globl     __ZN14nsXPTCStubBase5Stub" #n "Ev\n\t" \
+    /*".type    __ZN14nsXPTCStubBase5Stub" #n "Ev,@function\n"*/ \
+    "__ZN14nsXPTCStubBase5Stub" #n "Ev:\n\t" \
     ".elseif    " #n " < 100\n\t" \
-    ".globl     _ZN14nsXPTCStubBase6Stub" #n "Ev\n\t" \
-    ".type      _ZN14nsXPTCStubBase6Stub" #n "Ev,@function\n" \
-    "_ZN14nsXPTCStubBase6Stub" #n "Ev:\n\t" \
+    ".globl     __ZN14nsXPTCStubBase6Stub" #n "Ev\n\t" \
+    /*".type    __ZN14nsXPTCStubBase6Stub" #n "Ev,@function\n"*/ \
+    "__ZN14nsXPTCStubBase6Stub" #n "Ev:\n\t" \
     ".elseif    " #n " < 1000\n\t" \
-    ".globl     _ZN14nsXPTCStubBase7Stub" #n "Ev\n\t" \
-    ".type      _ZN14nsXPTCStubBase7Stub" #n "Ev,@function\n" \
-    "_ZN14nsXPTCStubBase7Stub" #n "Ev:\n\t" \
+    ".globl     __ZN14nsXPTCStubBase7Stub" #n "Ev\n\t" \
+    /*".type      __ZN14nsXPTCStubBase7Stub" #n "Ev,@function\n"*/ \
+    "__ZN14nsXPTCStubBase7Stub" #n "Ev:\n\t" \
     ".else\n\t" \
     ".err       \"stub number " #n " >= 1000 not yet supported\"\n\t" \
@@ -187 +187 @@
     "jmp        SharedStub\n\t" \
     ".if        " #n " < 10\n\t" \
-    ".size      _ZN14nsXPTCStubBase5Stub" #n "Ev,.-_ZN14nsXPTCStubBase5Stub" #n "Ev\n\t" \
+    /*".size    __ZN14nsXPTCStubBase5Stub" #n "Ev,.-__ZN14nsXPTCStubBase5Stub" #n "Ev\n\t"*/ \
     ".elseif    " #n " < 100\n\t" \
-    ".size      _ZN14nsXPTCStubBase6Stub" #n "Ev,.-_ZN14nsXPTCStubBase6Stub" #n "Ev\n\t" \
+    /*".size    __ZN14nsXPTCStubBase6Stub" #n "Ev,.-__ZN14nsXPTCStubBase6Stub" #n "Ev\n\t"*/ \
     ".else\n\t" \
-    ".size      _ZN14nsXPTCStubBase7Stub" #n "Ev,.-_ZN14nsXPTCStubBase7Stub" #n "Ev\n\t" \
+    /*".size    __ZN14nsXPTCStubBase7Stub" #n "Ev,.-__ZN14nsXPTCStubBase7Stub" #n "Ev\n\t"*/ \
     ".endif");
 
-// static nsresult SharedStub(PRUint32 methodIndex)
-asm(".section   \".text\"\n\t"
+// static nsresult SharedStub(PRUint32 methodIndex) [methodIndex is in eax].
+asm(".text\n\t"
     ".align     2\n\t"
-    ".type      SharedStub,@function\n\t"
+/*    ".type      SharedStub,@function\n\t" */
     "SharedStub:\n\t"
     // make room for gpregs (48), fpregs (64)
@@ -224 +224 @@
     "movl       %eax,%esi\n\t"
     "leaq       16(%rbp),%rdx\n\t"
-    "call       PrepareAndDispatch@plt\n\t"
+    "call       _PrepareAndDispatch\n\t"
     "leave\n\t"
     "ret\n\t"
-    ".size      SharedStub,.-SharedStub");
+/*   ".size      SharedStub,.-SharedStub" */
+    );
 
 #define SENTINEL_ENTRY(n) \
@@ -239 +240 @@
 
 #else
-#error "Unsupported compiler. Use gcc >= 3.1 for Linux/x86-64."
+#error "Unsupported compiler. Use gcc >= 3.1 for Darwin/AMD64."
 #endif /* __GNUC__ */