Changeset 40509 in vbox for trunk/src/libs/xpcom18a4/xpcom/reflect

Timestamp:

Mar 16, 2012 10:19:28 PM (13 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

76895

Message:

Config.kmk,xpcom: Solaris 11 / gcc 4.5.2 build fixes.

File:

• trunk/src/libs/xpcom18a4/xpcom/reflect/xptcall/src/md/unix/xptcstubs_x86_64_solaris.cpp (copied) (copied from trunk/src/libs/xpcom18a4/xpcom/reflect/xptcall/src/md/unix/xptcstubs_x86_64_linux.cpp ) (4 diffs)

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

@@ -46 +46 @@
 // caller.  The rest of the parameters are passed in the callers stack
 // area.
+// Solaris does the same, just the assembler may differ.
 
 const PRUint32 PARAM_BUFFER_COUNT   = 16;
@@ -164 +165 @@
 }
 
+#include <iprt/cdefs.h>
+
 #if defined(__GXX_ABI_VERSION) && __GXX_ABI_VERSION >= 100 /* G++ V3 ABI */
-// Linux/x86-64 uses gcc >= 3.1
-#define STUB_ENTRY(n) \
-asm(".section   \".text\"\n\t" \
+// Solaris/x86-64 uses gcc >= 3.1
+#define STUB_ENTRY(n,m) \
+asm(".section   .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" \
-    ".elseif    " #n " < 100\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" \
-    ".else\n\t" \
-    ".err       \"stub number " #n " >= 1000 not yet supported\"\n\t" \
-    ".endif\n\t" \
+    ".globl     _ZN14nsXPTCStubBase" #m "Stub" #n "Ev\n\t" \
+    ".type      _ZN14nsXPTCStubBase" #m "Stub" #n "Ev,@function\n" \
+    "_ZN14nsXPTCStubBase" #m "Stub" #n "Ev:\n\t" \
     "movl       $" #n ", %eax\n\t" \
     "jmp        SharedStub\n\t" \
-    ".if        " #n " < 10\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" \
-    ".else\n\t" \
-    ".size      _ZN14nsXPTCStubBase7Stub" #n "Ev,.-_ZN14nsXPTCStubBase7Stub" #n "Ev\n\t" \
-    ".endif");
+    ".size      _ZN14nsXPTCStubBase" #m "Stub" #n "Ev,.-_ZN14nsXPTCStubBase" #m "Stub" #n "Ev\n\t" \
+    )
+
+#define STUB_ENTRY_10(n10,m) \
+    STUB_ENTRY(n10##0,m); \
+    STUB_ENTRY(n10##1,m); \
+    STUB_ENTRY(n10##2,m); \
+    STUB_ENTRY(n10##3,m); \
+    STUB_ENTRY(n10##4,m); \
+    STUB_ENTRY(n10##5,m); \
+    STUB_ENTRY(n10##6,m); \
+    STUB_ENTRY(n10##7,m); \
+    STUB_ENTRY(n10##8,m); \
+    STUB_ENTRY(n10##9,m)
+STUB_ENTRY_10(,5);
+STUB_ENTRY_10(1,6);
+STUB_ENTRY_10(2,6);
+STUB_ENTRY_10(3,6);
+STUB_ENTRY_10(4,6);
+STUB_ENTRY_10(5,6);
+STUB_ENTRY_10(6,6);
+STUB_ENTRY_10(7,6);
+STUB_ENTRY_10(8,6);
+STUB_ENTRY_10(9,6);
+STUB_ENTRY_10(10,7);
+STUB_ENTRY_10(11,7);
+STUB_ENTRY_10(12,7);
+STUB_ENTRY_10(13,7);
+STUB_ENTRY_10(14,7);
+STUB_ENTRY_10(15,7);
+STUB_ENTRY_10(16,7);
+STUB_ENTRY_10(17,7);
+STUB_ENTRY_10(18,7);
+STUB_ENTRY_10(19,7);
+STUB_ENTRY_10(20,7);
+STUB_ENTRY_10(21,7);
+STUB_ENTRY_10(22,7);
+STUB_ENTRY_10(23,7);
+STUB_ENTRY_10(24,7);
+
 
 // static nsresult SharedStub(PRUint32 methodIndex)
-asm(".section   \".text\"\n\t"
+asm(".section   .text\n\t"
     ".align     2\n\t"
     ".type      SharedStub,@function\n\t"
@@ -229 +253 @@
     ".size      SharedStub,.-SharedStub");
 
+
 #define SENTINEL_ENTRY(n) \
 nsresult nsXPTCStubBase::Sentinel##n() \
@@ -236 +261 @@
 }
 
-#include "xptcstubsdef.inc"
+SENTINEL_ENTRY(0)
+SENTINEL_ENTRY(1)
+SENTINEL_ENTRY(2)
+SENTINEL_ENTRY(3)
+SENTINEL_ENTRY(4)
 
 #else