Patch was reversed.

This commit is contained in:
Martin Blapp 2003-03-28 10:03:24 +00:00
parent 2200228502
commit ba6a959a52
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=77609
17 changed files with 204 additions and 408 deletions

View File

@ -102,42 +102,30 @@
}
--- ../bridges/source/cpp_uno/gcc3_freebsd_intel/uno2cpp.cxx.orig Thu Mar 27 22:05:43 2003
+++ ../bridges/source/cpp_uno/gcc3_freebsd_intel/uno2cpp.cxx Thu Mar 27 22:08:18 2003
@@ -2,9 +2,9 @@
*
* $RCSfile: uno2cpp.cxx,v $
*
- * $Revision: 1.3.48.1 $
+ * $Revision: 1.1.4.1 $
*
- * last change: $Author: sb $ $Date: 2003/03/27 14:40:32 $
+ * last change: $Author: rt $ $Date: 2003/02/20 16:02:18 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -97,9 +97,7 @@
@@ -97,7 +97,9 @@
if (! pThis) dummy_can_throw_anything("xxx"); // address something
volatile long edx = 0, eax = 0; // for register returns
- void * stackptr;
+ void * stackptr;
asm volatile (
- "mov %%esp, %6\n\t"
+ "mov %%esp, %6\n\t"
// copy values
"mov %0, %%eax\n\t"
"mov %%eax, %%edx\n\t"
@@ -123,11 +121,13 @@
@@ -121,13 +123,11 @@
"mov %%eax, %4\n\t"
"mov %%edx, %5\n\t"
// cleanup stack
- "mov %6, %%esp\n\t"
+ "mov %0, %%eax\n\t"
+ "shl $2, %%eax\n\t"
+ "add %%eax, %%esp\n\t"
- "mov %0, %%eax\n\t"
- "shl $2, %%eax\n\t"
- "add %%eax, %%esp\n\t"
+ "mov %6, %%esp\n\t"
:
- : "m"(nStackLongs), "m"(pStackLongs), "m"(pThis), "m"(nVtableIndex),
- "m"(eax), "m"(edx), "m"(stackptr)
+ : "m"(nStackLongs), "m"(pStackLongs), "m"(pThis), "m"(nVtableIndex), "m"(eax), "m"(edx)
- : "m"(nStackLongs), "m"(pStackLongs), "m"(pThis), "m"(nVtableIndex), "m"(eax), "m"(edx)
+ : "m"(nStackLongs), "m"(pStackLongs), "m"(pThis), "m"(nVtableIndex),
+ "m"(eax), "m"(edx), "m"(stackptr)
: "eax", "edx" );
+
-
switch( eReturnType )
{
case typelib_TypeClass_HYPER:

View File

@ -102,42 +102,30 @@
}
--- ../bridges/source/cpp_uno/gcc3_freebsd_intel/uno2cpp.cxx.orig Thu Mar 27 22:05:43 2003
+++ ../bridges/source/cpp_uno/gcc3_freebsd_intel/uno2cpp.cxx Thu Mar 27 22:08:18 2003
@@ -2,9 +2,9 @@
*
* $RCSfile: uno2cpp.cxx,v $
*
- * $Revision: 1.3.48.1 $
+ * $Revision: 1.1.4.1 $
*
- * last change: $Author: sb $ $Date: 2003/03/27 14:40:32 $
+ * last change: $Author: rt $ $Date: 2003/02/20 16:02:18 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -97,9 +97,7 @@
@@ -97,7 +97,9 @@
if (! pThis) dummy_can_throw_anything("xxx"); // address something
volatile long edx = 0, eax = 0; // for register returns
- void * stackptr;
+ void * stackptr;
asm volatile (
- "mov %%esp, %6\n\t"
+ "mov %%esp, %6\n\t"
// copy values
"mov %0, %%eax\n\t"
"mov %%eax, %%edx\n\t"
@@ -123,11 +121,13 @@
@@ -121,13 +123,11 @@
"mov %%eax, %4\n\t"
"mov %%edx, %5\n\t"
// cleanup stack
- "mov %6, %%esp\n\t"
+ "mov %0, %%eax\n\t"
+ "shl $2, %%eax\n\t"
+ "add %%eax, %%esp\n\t"
- "mov %0, %%eax\n\t"
- "shl $2, %%eax\n\t"
- "add %%eax, %%esp\n\t"
+ "mov %6, %%esp\n\t"
:
- : "m"(nStackLongs), "m"(pStackLongs), "m"(pThis), "m"(nVtableIndex),
- "m"(eax), "m"(edx), "m"(stackptr)
+ : "m"(nStackLongs), "m"(pStackLongs), "m"(pThis), "m"(nVtableIndex), "m"(eax), "m"(edx)
- : "m"(nStackLongs), "m"(pStackLongs), "m"(pThis), "m"(nVtableIndex), "m"(eax), "m"(edx)
+ : "m"(nStackLongs), "m"(pStackLongs), "m"(pThis), "m"(nVtableIndex),
+ "m"(eax), "m"(edx), "m"(stackptr)
: "eax", "edx" );
+
-
switch( eReturnType )
{
case typelib_TypeClass_HYPER:

View File

@ -102,42 +102,30 @@
}
--- ../bridges/source/cpp_uno/gcc3_freebsd_intel/uno2cpp.cxx.orig Thu Mar 27 22:05:43 2003
+++ ../bridges/source/cpp_uno/gcc3_freebsd_intel/uno2cpp.cxx Thu Mar 27 22:08:18 2003
@@ -2,9 +2,9 @@
*
* $RCSfile: uno2cpp.cxx,v $
*
- * $Revision: 1.3.48.1 $
+ * $Revision: 1.1.4.1 $
*
- * last change: $Author: sb $ $Date: 2003/03/27 14:40:32 $
+ * last change: $Author: rt $ $Date: 2003/02/20 16:02:18 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -97,9 +97,7 @@
@@ -97,7 +97,9 @@
if (! pThis) dummy_can_throw_anything("xxx"); // address something
volatile long edx = 0, eax = 0; // for register returns
- void * stackptr;
+ void * stackptr;
asm volatile (
- "mov %%esp, %6\n\t"
+ "mov %%esp, %6\n\t"
// copy values
"mov %0, %%eax\n\t"
"mov %%eax, %%edx\n\t"
@@ -123,11 +121,13 @@
@@ -121,13 +123,11 @@
"mov %%eax, %4\n\t"
"mov %%edx, %5\n\t"
// cleanup stack
- "mov %6, %%esp\n\t"
+ "mov %0, %%eax\n\t"
+ "shl $2, %%eax\n\t"
+ "add %%eax, %%esp\n\t"
- "mov %0, %%eax\n\t"
- "shl $2, %%eax\n\t"
- "add %%eax, %%esp\n\t"
+ "mov %6, %%esp\n\t"
:
- : "m"(nStackLongs), "m"(pStackLongs), "m"(pThis), "m"(nVtableIndex),
- "m"(eax), "m"(edx), "m"(stackptr)
+ : "m"(nStackLongs), "m"(pStackLongs), "m"(pThis), "m"(nVtableIndex), "m"(eax), "m"(edx)
- : "m"(nStackLongs), "m"(pStackLongs), "m"(pThis), "m"(nVtableIndex), "m"(eax), "m"(edx)
+ : "m"(nStackLongs), "m"(pStackLongs), "m"(pThis), "m"(nVtableIndex),
+ "m"(eax), "m"(edx), "m"(stackptr)
: "eax", "edx" );
+
-
switch( eReturnType )
{
case typelib_TypeClass_HYPER:

View File

@ -102,42 +102,30 @@
}
--- ../bridges/source/cpp_uno/gcc3_freebsd_intel/uno2cpp.cxx.orig Thu Mar 27 22:05:43 2003
+++ ../bridges/source/cpp_uno/gcc3_freebsd_intel/uno2cpp.cxx Thu Mar 27 22:08:18 2003
@@ -2,9 +2,9 @@
*
* $RCSfile: uno2cpp.cxx,v $
*
- * $Revision: 1.3.48.1 $
+ * $Revision: 1.1.4.1 $
*
- * last change: $Author: sb $ $Date: 2003/03/27 14:40:32 $
+ * last change: $Author: rt $ $Date: 2003/02/20 16:02:18 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -97,9 +97,7 @@
@@ -97,7 +97,9 @@
if (! pThis) dummy_can_throw_anything("xxx"); // address something
volatile long edx = 0, eax = 0; // for register returns
- void * stackptr;
+ void * stackptr;
asm volatile (
- "mov %%esp, %6\n\t"
+ "mov %%esp, %6\n\t"
// copy values
"mov %0, %%eax\n\t"
"mov %%eax, %%edx\n\t"
@@ -123,11 +121,13 @@
@@ -121,13 +123,11 @@
"mov %%eax, %4\n\t"
"mov %%edx, %5\n\t"
// cleanup stack
- "mov %6, %%esp\n\t"
+ "mov %0, %%eax\n\t"
+ "shl $2, %%eax\n\t"
+ "add %%eax, %%esp\n\t"
- "mov %0, %%eax\n\t"
- "shl $2, %%eax\n\t"
- "add %%eax, %%esp\n\t"
+ "mov %6, %%esp\n\t"
:
- : "m"(nStackLongs), "m"(pStackLongs), "m"(pThis), "m"(nVtableIndex),
- "m"(eax), "m"(edx), "m"(stackptr)
+ : "m"(nStackLongs), "m"(pStackLongs), "m"(pThis), "m"(nVtableIndex), "m"(eax), "m"(edx)
- : "m"(nStackLongs), "m"(pStackLongs), "m"(pThis), "m"(nVtableIndex), "m"(eax), "m"(edx)
+ : "m"(nStackLongs), "m"(pStackLongs), "m"(pThis), "m"(nVtableIndex),
+ "m"(eax), "m"(edx), "m"(stackptr)
: "eax", "edx" );
+
-
switch( eReturnType )
{
case typelib_TypeClass_HYPER:

View File

@ -102,42 +102,30 @@
}
--- ../bridges/source/cpp_uno/gcc3_freebsd_intel/uno2cpp.cxx.orig Thu Mar 27 22:05:43 2003
+++ ../bridges/source/cpp_uno/gcc3_freebsd_intel/uno2cpp.cxx Thu Mar 27 22:08:18 2003
@@ -2,9 +2,9 @@
*
* $RCSfile: uno2cpp.cxx,v $
*
- * $Revision: 1.3.48.1 $
+ * $Revision: 1.1.4.1 $
*
- * last change: $Author: sb $ $Date: 2003/03/27 14:40:32 $
+ * last change: $Author: rt $ $Date: 2003/02/20 16:02:18 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -97,9 +97,7 @@
@@ -97,7 +97,9 @@
if (! pThis) dummy_can_throw_anything("xxx"); // address something
volatile long edx = 0, eax = 0; // for register returns
- void * stackptr;
+ void * stackptr;
asm volatile (
- "mov %%esp, %6\n\t"
+ "mov %%esp, %6\n\t"
// copy values
"mov %0, %%eax\n\t"
"mov %%eax, %%edx\n\t"
@@ -123,11 +121,13 @@
@@ -121,13 +123,11 @@
"mov %%eax, %4\n\t"
"mov %%edx, %5\n\t"
// cleanup stack
- "mov %6, %%esp\n\t"
+ "mov %0, %%eax\n\t"
+ "shl $2, %%eax\n\t"
+ "add %%eax, %%esp\n\t"
- "mov %0, %%eax\n\t"
- "shl $2, %%eax\n\t"
- "add %%eax, %%esp\n\t"
+ "mov %6, %%esp\n\t"
:
- : "m"(nStackLongs), "m"(pStackLongs), "m"(pThis), "m"(nVtableIndex),
- "m"(eax), "m"(edx), "m"(stackptr)
+ : "m"(nStackLongs), "m"(pStackLongs), "m"(pThis), "m"(nVtableIndex), "m"(eax), "m"(edx)
- : "m"(nStackLongs), "m"(pStackLongs), "m"(pThis), "m"(nVtableIndex), "m"(eax), "m"(edx)
+ : "m"(nStackLongs), "m"(pStackLongs), "m"(pThis), "m"(nVtableIndex),
+ "m"(eax), "m"(edx), "m"(stackptr)
: "eax", "edx" );
+
-
switch( eReturnType )
{
case typelib_TypeClass_HYPER:

View File

@ -102,42 +102,30 @@
}
--- ../bridges/source/cpp_uno/gcc3_freebsd_intel/uno2cpp.cxx.orig Thu Mar 27 22:05:43 2003
+++ ../bridges/source/cpp_uno/gcc3_freebsd_intel/uno2cpp.cxx Thu Mar 27 22:08:18 2003
@@ -2,9 +2,9 @@
*
* $RCSfile: uno2cpp.cxx,v $
*
- * $Revision: 1.3.48.1 $
+ * $Revision: 1.1.4.1 $
*
- * last change: $Author: sb $ $Date: 2003/03/27 14:40:32 $
+ * last change: $Author: rt $ $Date: 2003/02/20 16:02:18 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -97,9 +97,7 @@
@@ -97,7 +97,9 @@
if (! pThis) dummy_can_throw_anything("xxx"); // address something
volatile long edx = 0, eax = 0; // for register returns
- void * stackptr;
+ void * stackptr;
asm volatile (
- "mov %%esp, %6\n\t"
+ "mov %%esp, %6\n\t"
// copy values
"mov %0, %%eax\n\t"
"mov %%eax, %%edx\n\t"
@@ -123,11 +121,13 @@
@@ -121,13 +123,11 @@
"mov %%eax, %4\n\t"
"mov %%edx, %5\n\t"
// cleanup stack
- "mov %6, %%esp\n\t"
+ "mov %0, %%eax\n\t"
+ "shl $2, %%eax\n\t"
+ "add %%eax, %%esp\n\t"
- "mov %0, %%eax\n\t"
- "shl $2, %%eax\n\t"
- "add %%eax, %%esp\n\t"
+ "mov %6, %%esp\n\t"
:
- : "m"(nStackLongs), "m"(pStackLongs), "m"(pThis), "m"(nVtableIndex),
- "m"(eax), "m"(edx), "m"(stackptr)
+ : "m"(nStackLongs), "m"(pStackLongs), "m"(pThis), "m"(nVtableIndex), "m"(eax), "m"(edx)
- : "m"(nStackLongs), "m"(pStackLongs), "m"(pThis), "m"(nVtableIndex), "m"(eax), "m"(edx)
+ : "m"(nStackLongs), "m"(pStackLongs), "m"(pThis), "m"(nVtableIndex),
+ "m"(eax), "m"(edx), "m"(stackptr)
: "eax", "edx" );
+
-
switch( eReturnType )
{
case typelib_TypeClass_HYPER:

View File

@ -102,42 +102,30 @@
}
--- ../bridges/source/cpp_uno/gcc3_freebsd_intel/uno2cpp.cxx.orig Thu Mar 27 22:05:43 2003
+++ ../bridges/source/cpp_uno/gcc3_freebsd_intel/uno2cpp.cxx Thu Mar 27 22:08:18 2003
@@ -2,9 +2,9 @@
*
* $RCSfile: uno2cpp.cxx,v $
*
- * $Revision: 1.3.48.1 $
+ * $Revision: 1.1.4.1 $
*
- * last change: $Author: sb $ $Date: 2003/03/27 14:40:32 $
+ * last change: $Author: rt $ $Date: 2003/02/20 16:02:18 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -97,9 +97,7 @@
@@ -97,7 +97,9 @@
if (! pThis) dummy_can_throw_anything("xxx"); // address something
volatile long edx = 0, eax = 0; // for register returns
- void * stackptr;
+ void * stackptr;
asm volatile (
- "mov %%esp, %6\n\t"
+ "mov %%esp, %6\n\t"
// copy values
"mov %0, %%eax\n\t"
"mov %%eax, %%edx\n\t"
@@ -123,11 +121,13 @@
@@ -121,13 +123,11 @@
"mov %%eax, %4\n\t"
"mov %%edx, %5\n\t"
// cleanup stack
- "mov %6, %%esp\n\t"
+ "mov %0, %%eax\n\t"
+ "shl $2, %%eax\n\t"
+ "add %%eax, %%esp\n\t"
- "mov %0, %%eax\n\t"
- "shl $2, %%eax\n\t"
- "add %%eax, %%esp\n\t"
+ "mov %6, %%esp\n\t"
:
- : "m"(nStackLongs), "m"(pStackLongs), "m"(pThis), "m"(nVtableIndex),
- "m"(eax), "m"(edx), "m"(stackptr)
+ : "m"(nStackLongs), "m"(pStackLongs), "m"(pThis), "m"(nVtableIndex), "m"(eax), "m"(edx)
- : "m"(nStackLongs), "m"(pStackLongs), "m"(pThis), "m"(nVtableIndex), "m"(eax), "m"(edx)
+ : "m"(nStackLongs), "m"(pStackLongs), "m"(pThis), "m"(nVtableIndex),
+ "m"(eax), "m"(edx), "m"(stackptr)
: "eax", "edx" );
+
-
switch( eReturnType )
{
case typelib_TypeClass_HYPER:

View File

@ -102,42 +102,30 @@
}
--- ../bridges/source/cpp_uno/gcc3_freebsd_intel/uno2cpp.cxx.orig Thu Mar 27 22:05:43 2003
+++ ../bridges/source/cpp_uno/gcc3_freebsd_intel/uno2cpp.cxx Thu Mar 27 22:08:18 2003
@@ -2,9 +2,9 @@
*
* $RCSfile: uno2cpp.cxx,v $
*
- * $Revision: 1.3.48.1 $
+ * $Revision: 1.1.4.1 $
*
- * last change: $Author: sb $ $Date: 2003/03/27 14:40:32 $
+ * last change: $Author: rt $ $Date: 2003/02/20 16:02:18 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -97,9 +97,7 @@
@@ -97,7 +97,9 @@
if (! pThis) dummy_can_throw_anything("xxx"); // address something
volatile long edx = 0, eax = 0; // for register returns
- void * stackptr;
+ void * stackptr;
asm volatile (
- "mov %%esp, %6\n\t"
+ "mov %%esp, %6\n\t"
// copy values
"mov %0, %%eax\n\t"
"mov %%eax, %%edx\n\t"
@@ -123,11 +121,13 @@
@@ -121,13 +123,11 @@
"mov %%eax, %4\n\t"
"mov %%edx, %5\n\t"
// cleanup stack
- "mov %6, %%esp\n\t"
+ "mov %0, %%eax\n\t"
+ "shl $2, %%eax\n\t"
+ "add %%eax, %%esp\n\t"
- "mov %0, %%eax\n\t"
- "shl $2, %%eax\n\t"
- "add %%eax, %%esp\n\t"
+ "mov %6, %%esp\n\t"
:
- : "m"(nStackLongs), "m"(pStackLongs), "m"(pThis), "m"(nVtableIndex),
- "m"(eax), "m"(edx), "m"(stackptr)
+ : "m"(nStackLongs), "m"(pStackLongs), "m"(pThis), "m"(nVtableIndex), "m"(eax), "m"(edx)
- : "m"(nStackLongs), "m"(pStackLongs), "m"(pThis), "m"(nVtableIndex), "m"(eax), "m"(edx)
+ : "m"(nStackLongs), "m"(pStackLongs), "m"(pThis), "m"(nVtableIndex),
+ "m"(eax), "m"(edx), "m"(stackptr)
: "eax", "edx" );
+
-
switch( eReturnType )
{
case typelib_TypeClass_HYPER:

View File

@ -102,42 +102,30 @@
}
--- ../bridges/source/cpp_uno/gcc3_freebsd_intel/uno2cpp.cxx.orig Thu Mar 27 22:05:43 2003
+++ ../bridges/source/cpp_uno/gcc3_freebsd_intel/uno2cpp.cxx Thu Mar 27 22:08:18 2003
@@ -2,9 +2,9 @@
*
* $RCSfile: uno2cpp.cxx,v $
*
- * $Revision: 1.3.48.1 $
+ * $Revision: 1.1.4.1 $
*
- * last change: $Author: sb $ $Date: 2003/03/27 14:40:32 $
+ * last change: $Author: rt $ $Date: 2003/02/20 16:02:18 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -97,9 +97,7 @@
@@ -97,7 +97,9 @@
if (! pThis) dummy_can_throw_anything("xxx"); // address something
volatile long edx = 0, eax = 0; // for register returns
- void * stackptr;
+ void * stackptr;
asm volatile (
- "mov %%esp, %6\n\t"
+ "mov %%esp, %6\n\t"
// copy values
"mov %0, %%eax\n\t"
"mov %%eax, %%edx\n\t"
@@ -123,11 +121,13 @@
@@ -121,13 +123,11 @@
"mov %%eax, %4\n\t"
"mov %%edx, %5\n\t"
// cleanup stack
- "mov %6, %%esp\n\t"
+ "mov %0, %%eax\n\t"
+ "shl $2, %%eax\n\t"
+ "add %%eax, %%esp\n\t"
- "mov %0, %%eax\n\t"
- "shl $2, %%eax\n\t"
- "add %%eax, %%esp\n\t"
+ "mov %6, %%esp\n\t"
:
- : "m"(nStackLongs), "m"(pStackLongs), "m"(pThis), "m"(nVtableIndex),
- "m"(eax), "m"(edx), "m"(stackptr)
+ : "m"(nStackLongs), "m"(pStackLongs), "m"(pThis), "m"(nVtableIndex), "m"(eax), "m"(edx)
- : "m"(nStackLongs), "m"(pStackLongs), "m"(pThis), "m"(nVtableIndex), "m"(eax), "m"(edx)
+ : "m"(nStackLongs), "m"(pStackLongs), "m"(pThis), "m"(nVtableIndex),
+ "m"(eax), "m"(edx), "m"(stackptr)
: "eax", "edx" );
+
-
switch( eReturnType )
{
case typelib_TypeClass_HYPER:

View File

@ -102,42 +102,30 @@
}
--- ../bridges/source/cpp_uno/gcc3_freebsd_intel/uno2cpp.cxx.orig Thu Mar 27 22:05:43 2003
+++ ../bridges/source/cpp_uno/gcc3_freebsd_intel/uno2cpp.cxx Thu Mar 27 22:08:18 2003
@@ -2,9 +2,9 @@
*
* $RCSfile: uno2cpp.cxx,v $
*
- * $Revision: 1.3.48.1 $
+ * $Revision: 1.1.4.1 $
*
- * last change: $Author: sb $ $Date: 2003/03/27 14:40:32 $
+ * last change: $Author: rt $ $Date: 2003/02/20 16:02:18 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -97,9 +97,7 @@
@@ -97,7 +97,9 @@
if (! pThis) dummy_can_throw_anything("xxx"); // address something
volatile long edx = 0, eax = 0; // for register returns
- void * stackptr;
+ void * stackptr;
asm volatile (
- "mov %%esp, %6\n\t"
+ "mov %%esp, %6\n\t"
// copy values
"mov %0, %%eax\n\t"
"mov %%eax, %%edx\n\t"
@@ -123,11 +121,13 @@
@@ -121,13 +123,11 @@
"mov %%eax, %4\n\t"
"mov %%edx, %5\n\t"
// cleanup stack
- "mov %6, %%esp\n\t"
+ "mov %0, %%eax\n\t"
+ "shl $2, %%eax\n\t"
+ "add %%eax, %%esp\n\t"
- "mov %0, %%eax\n\t"
- "shl $2, %%eax\n\t"
- "add %%eax, %%esp\n\t"
+ "mov %6, %%esp\n\t"
:
- : "m"(nStackLongs), "m"(pStackLongs), "m"(pThis), "m"(nVtableIndex),
- "m"(eax), "m"(edx), "m"(stackptr)
+ : "m"(nStackLongs), "m"(pStackLongs), "m"(pThis), "m"(nVtableIndex), "m"(eax), "m"(edx)
- : "m"(nStackLongs), "m"(pStackLongs), "m"(pThis), "m"(nVtableIndex), "m"(eax), "m"(edx)
+ : "m"(nStackLongs), "m"(pStackLongs), "m"(pThis), "m"(nVtableIndex),
+ "m"(eax), "m"(edx), "m"(stackptr)
: "eax", "edx" );
+
-
switch( eReturnType )
{
case typelib_TypeClass_HYPER:

View File

@ -102,42 +102,30 @@
}
--- ../bridges/source/cpp_uno/gcc3_freebsd_intel/uno2cpp.cxx.orig Thu Mar 27 22:05:43 2003
+++ ../bridges/source/cpp_uno/gcc3_freebsd_intel/uno2cpp.cxx Thu Mar 27 22:08:18 2003
@@ -2,9 +2,9 @@
*
* $RCSfile: uno2cpp.cxx,v $
*
- * $Revision: 1.3.48.1 $
+ * $Revision: 1.1.4.1 $
*
- * last change: $Author: sb $ $Date: 2003/03/27 14:40:32 $
+ * last change: $Author: rt $ $Date: 2003/02/20 16:02:18 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -97,9 +97,7 @@
@@ -97,7 +97,9 @@
if (! pThis) dummy_can_throw_anything("xxx"); // address something
volatile long edx = 0, eax = 0; // for register returns
- void * stackptr;
+ void * stackptr;
asm volatile (
- "mov %%esp, %6\n\t"
+ "mov %%esp, %6\n\t"
// copy values
"mov %0, %%eax\n\t"
"mov %%eax, %%edx\n\t"
@@ -123,11 +121,13 @@
@@ -121,13 +123,11 @@
"mov %%eax, %4\n\t"
"mov %%edx, %5\n\t"
// cleanup stack
- "mov %6, %%esp\n\t"
+ "mov %0, %%eax\n\t"
+ "shl $2, %%eax\n\t"
+ "add %%eax, %%esp\n\t"
- "mov %0, %%eax\n\t"
- "shl $2, %%eax\n\t"
- "add %%eax, %%esp\n\t"
+ "mov %6, %%esp\n\t"
:
- : "m"(nStackLongs), "m"(pStackLongs), "m"(pThis), "m"(nVtableIndex),
- "m"(eax), "m"(edx), "m"(stackptr)
+ : "m"(nStackLongs), "m"(pStackLongs), "m"(pThis), "m"(nVtableIndex), "m"(eax), "m"(edx)
- : "m"(nStackLongs), "m"(pStackLongs), "m"(pThis), "m"(nVtableIndex), "m"(eax), "m"(edx)
+ : "m"(nStackLongs), "m"(pStackLongs), "m"(pThis), "m"(nVtableIndex),
+ "m"(eax), "m"(edx), "m"(stackptr)
: "eax", "edx" );
+
-
switch( eReturnType )
{
case typelib_TypeClass_HYPER:

View File

@ -102,42 +102,30 @@
}
--- ../bridges/source/cpp_uno/gcc3_freebsd_intel/uno2cpp.cxx.orig Thu Mar 27 22:05:43 2003
+++ ../bridges/source/cpp_uno/gcc3_freebsd_intel/uno2cpp.cxx Thu Mar 27 22:08:18 2003
@@ -2,9 +2,9 @@
*
* $RCSfile: uno2cpp.cxx,v $
*
- * $Revision: 1.3.48.1 $
+ * $Revision: 1.1.4.1 $
*
- * last change: $Author: sb $ $Date: 2003/03/27 14:40:32 $
+ * last change: $Author: rt $ $Date: 2003/02/20 16:02:18 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -97,9 +97,7 @@
@@ -97,7 +97,9 @@
if (! pThis) dummy_can_throw_anything("xxx"); // address something
volatile long edx = 0, eax = 0; // for register returns
- void * stackptr;
+ void * stackptr;
asm volatile (
- "mov %%esp, %6\n\t"
+ "mov %%esp, %6\n\t"
// copy values
"mov %0, %%eax\n\t"
"mov %%eax, %%edx\n\t"
@@ -123,11 +121,13 @@
@@ -121,13 +123,11 @@
"mov %%eax, %4\n\t"
"mov %%edx, %5\n\t"
// cleanup stack
- "mov %6, %%esp\n\t"
+ "mov %0, %%eax\n\t"
+ "shl $2, %%eax\n\t"
+ "add %%eax, %%esp\n\t"
- "mov %0, %%eax\n\t"
- "shl $2, %%eax\n\t"
- "add %%eax, %%esp\n\t"
+ "mov %6, %%esp\n\t"
:
- : "m"(nStackLongs), "m"(pStackLongs), "m"(pThis), "m"(nVtableIndex),
- "m"(eax), "m"(edx), "m"(stackptr)
+ : "m"(nStackLongs), "m"(pStackLongs), "m"(pThis), "m"(nVtableIndex), "m"(eax), "m"(edx)
- : "m"(nStackLongs), "m"(pStackLongs), "m"(pThis), "m"(nVtableIndex), "m"(eax), "m"(edx)
+ : "m"(nStackLongs), "m"(pStackLongs), "m"(pThis), "m"(nVtableIndex),
+ "m"(eax), "m"(edx), "m"(stackptr)
: "eax", "edx" );
+
-
switch( eReturnType )
{
case typelib_TypeClass_HYPER:

View File

@ -102,42 +102,30 @@
}
--- ../bridges/source/cpp_uno/gcc3_freebsd_intel/uno2cpp.cxx.orig Thu Mar 27 22:05:43 2003
+++ ../bridges/source/cpp_uno/gcc3_freebsd_intel/uno2cpp.cxx Thu Mar 27 22:08:18 2003
@@ -2,9 +2,9 @@
*
* $RCSfile: uno2cpp.cxx,v $
*
- * $Revision: 1.3.48.1 $
+ * $Revision: 1.1.4.1 $
*
- * last change: $Author: sb $ $Date: 2003/03/27 14:40:32 $
+ * last change: $Author: rt $ $Date: 2003/02/20 16:02:18 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -97,9 +97,7 @@
@@ -97,7 +97,9 @@
if (! pThis) dummy_can_throw_anything("xxx"); // address something
volatile long edx = 0, eax = 0; // for register returns
- void * stackptr;
+ void * stackptr;
asm volatile (
- "mov %%esp, %6\n\t"
+ "mov %%esp, %6\n\t"
// copy values
"mov %0, %%eax\n\t"
"mov %%eax, %%edx\n\t"
@@ -123,11 +121,13 @@
@@ -121,13 +123,11 @@
"mov %%eax, %4\n\t"
"mov %%edx, %5\n\t"
// cleanup stack
- "mov %6, %%esp\n\t"
+ "mov %0, %%eax\n\t"
+ "shl $2, %%eax\n\t"
+ "add %%eax, %%esp\n\t"
- "mov %0, %%eax\n\t"
- "shl $2, %%eax\n\t"
- "add %%eax, %%esp\n\t"
+ "mov %6, %%esp\n\t"
:
- : "m"(nStackLongs), "m"(pStackLongs), "m"(pThis), "m"(nVtableIndex),
- "m"(eax), "m"(edx), "m"(stackptr)
+ : "m"(nStackLongs), "m"(pStackLongs), "m"(pThis), "m"(nVtableIndex), "m"(eax), "m"(edx)
- : "m"(nStackLongs), "m"(pStackLongs), "m"(pThis), "m"(nVtableIndex), "m"(eax), "m"(edx)
+ : "m"(nStackLongs), "m"(pStackLongs), "m"(pThis), "m"(nVtableIndex),
+ "m"(eax), "m"(edx), "m"(stackptr)
: "eax", "edx" );
+
-
switch( eReturnType )
{
case typelib_TypeClass_HYPER:

View File

@ -102,42 +102,30 @@
}
--- ../bridges/source/cpp_uno/gcc3_freebsd_intel/uno2cpp.cxx.orig Thu Mar 27 22:05:43 2003
+++ ../bridges/source/cpp_uno/gcc3_freebsd_intel/uno2cpp.cxx Thu Mar 27 22:08:18 2003
@@ -2,9 +2,9 @@
*
* $RCSfile: uno2cpp.cxx,v $
*
- * $Revision: 1.3.48.1 $
+ * $Revision: 1.1.4.1 $
*
- * last change: $Author: sb $ $Date: 2003/03/27 14:40:32 $
+ * last change: $Author: rt $ $Date: 2003/02/20 16:02:18 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -97,9 +97,7 @@
@@ -97,7 +97,9 @@
if (! pThis) dummy_can_throw_anything("xxx"); // address something
volatile long edx = 0, eax = 0; // for register returns
- void * stackptr;
+ void * stackptr;
asm volatile (
- "mov %%esp, %6\n\t"
+ "mov %%esp, %6\n\t"
// copy values
"mov %0, %%eax\n\t"
"mov %%eax, %%edx\n\t"
@@ -123,11 +121,13 @@
@@ -121,13 +123,11 @@
"mov %%eax, %4\n\t"
"mov %%edx, %5\n\t"
// cleanup stack
- "mov %6, %%esp\n\t"
+ "mov %0, %%eax\n\t"
+ "shl $2, %%eax\n\t"
+ "add %%eax, %%esp\n\t"
- "mov %0, %%eax\n\t"
- "shl $2, %%eax\n\t"
- "add %%eax, %%esp\n\t"
+ "mov %6, %%esp\n\t"
:
- : "m"(nStackLongs), "m"(pStackLongs), "m"(pThis), "m"(nVtableIndex),
- "m"(eax), "m"(edx), "m"(stackptr)
+ : "m"(nStackLongs), "m"(pStackLongs), "m"(pThis), "m"(nVtableIndex), "m"(eax), "m"(edx)
- : "m"(nStackLongs), "m"(pStackLongs), "m"(pThis), "m"(nVtableIndex), "m"(eax), "m"(edx)
+ : "m"(nStackLongs), "m"(pStackLongs), "m"(pThis), "m"(nVtableIndex),
+ "m"(eax), "m"(edx), "m"(stackptr)
: "eax", "edx" );
+
-
switch( eReturnType )
{
case typelib_TypeClass_HYPER:

View File

@ -102,42 +102,30 @@
}
--- ../bridges/source/cpp_uno/gcc3_freebsd_intel/uno2cpp.cxx.orig Thu Mar 27 22:05:43 2003
+++ ../bridges/source/cpp_uno/gcc3_freebsd_intel/uno2cpp.cxx Thu Mar 27 22:08:18 2003
@@ -2,9 +2,9 @@
*
* $RCSfile: uno2cpp.cxx,v $
*
- * $Revision: 1.3.48.1 $
+ * $Revision: 1.1.4.1 $
*
- * last change: $Author: sb $ $Date: 2003/03/27 14:40:32 $
+ * last change: $Author: rt $ $Date: 2003/02/20 16:02:18 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -97,9 +97,7 @@
@@ -97,7 +97,9 @@
if (! pThis) dummy_can_throw_anything("xxx"); // address something
volatile long edx = 0, eax = 0; // for register returns
- void * stackptr;
+ void * stackptr;
asm volatile (
- "mov %%esp, %6\n\t"
+ "mov %%esp, %6\n\t"
// copy values
"mov %0, %%eax\n\t"
"mov %%eax, %%edx\n\t"
@@ -123,11 +121,13 @@
@@ -121,13 +123,11 @@
"mov %%eax, %4\n\t"
"mov %%edx, %5\n\t"
// cleanup stack
- "mov %6, %%esp\n\t"
+ "mov %0, %%eax\n\t"
+ "shl $2, %%eax\n\t"
+ "add %%eax, %%esp\n\t"
- "mov %0, %%eax\n\t"
- "shl $2, %%eax\n\t"
- "add %%eax, %%esp\n\t"
+ "mov %6, %%esp\n\t"
:
- : "m"(nStackLongs), "m"(pStackLongs), "m"(pThis), "m"(nVtableIndex),
- "m"(eax), "m"(edx), "m"(stackptr)
+ : "m"(nStackLongs), "m"(pStackLongs), "m"(pThis), "m"(nVtableIndex), "m"(eax), "m"(edx)
- : "m"(nStackLongs), "m"(pStackLongs), "m"(pThis), "m"(nVtableIndex), "m"(eax), "m"(edx)
+ : "m"(nStackLongs), "m"(pStackLongs), "m"(pThis), "m"(nVtableIndex),
+ "m"(eax), "m"(edx), "m"(stackptr)
: "eax", "edx" );
+
-
switch( eReturnType )
{
case typelib_TypeClass_HYPER:

View File

@ -102,42 +102,30 @@
}
--- ../bridges/source/cpp_uno/gcc3_freebsd_intel/uno2cpp.cxx.orig Thu Mar 27 22:05:43 2003
+++ ../bridges/source/cpp_uno/gcc3_freebsd_intel/uno2cpp.cxx Thu Mar 27 22:08:18 2003
@@ -2,9 +2,9 @@
*
* $RCSfile: uno2cpp.cxx,v $
*
- * $Revision: 1.3.48.1 $
+ * $Revision: 1.1.4.1 $
*
- * last change: $Author: sb $ $Date: 2003/03/27 14:40:32 $
+ * last change: $Author: rt $ $Date: 2003/02/20 16:02:18 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -97,9 +97,7 @@
@@ -97,7 +97,9 @@
if (! pThis) dummy_can_throw_anything("xxx"); // address something
volatile long edx = 0, eax = 0; // for register returns
- void * stackptr;
+ void * stackptr;
asm volatile (
- "mov %%esp, %6\n\t"
+ "mov %%esp, %6\n\t"
// copy values
"mov %0, %%eax\n\t"
"mov %%eax, %%edx\n\t"
@@ -123,11 +121,13 @@
@@ -121,13 +123,11 @@
"mov %%eax, %4\n\t"
"mov %%edx, %5\n\t"
// cleanup stack
- "mov %6, %%esp\n\t"
+ "mov %0, %%eax\n\t"
+ "shl $2, %%eax\n\t"
+ "add %%eax, %%esp\n\t"
- "mov %0, %%eax\n\t"
- "shl $2, %%eax\n\t"
- "add %%eax, %%esp\n\t"
+ "mov %6, %%esp\n\t"
:
- : "m"(nStackLongs), "m"(pStackLongs), "m"(pThis), "m"(nVtableIndex),
- "m"(eax), "m"(edx), "m"(stackptr)
+ : "m"(nStackLongs), "m"(pStackLongs), "m"(pThis), "m"(nVtableIndex), "m"(eax), "m"(edx)
- : "m"(nStackLongs), "m"(pStackLongs), "m"(pThis), "m"(nVtableIndex), "m"(eax), "m"(edx)
+ : "m"(nStackLongs), "m"(pStackLongs), "m"(pThis), "m"(nVtableIndex),
+ "m"(eax), "m"(edx), "m"(stackptr)
: "eax", "edx" );
+
-
switch( eReturnType )
{
case typelib_TypeClass_HYPER:

View File

@ -102,42 +102,30 @@
}
--- ../bridges/source/cpp_uno/gcc3_freebsd_intel/uno2cpp.cxx.orig Thu Mar 27 22:05:43 2003
+++ ../bridges/source/cpp_uno/gcc3_freebsd_intel/uno2cpp.cxx Thu Mar 27 22:08:18 2003
@@ -2,9 +2,9 @@
*
* $RCSfile: uno2cpp.cxx,v $
*
- * $Revision: 1.3.48.1 $
+ * $Revision: 1.1.4.1 $
*
- * last change: $Author: sb $ $Date: 2003/03/27 14:40:32 $
+ * last change: $Author: rt $ $Date: 2003/02/20 16:02:18 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -97,9 +97,7 @@
@@ -97,7 +97,9 @@
if (! pThis) dummy_can_throw_anything("xxx"); // address something
volatile long edx = 0, eax = 0; // for register returns
- void * stackptr;
+ void * stackptr;
asm volatile (
- "mov %%esp, %6\n\t"
+ "mov %%esp, %6\n\t"
// copy values
"mov %0, %%eax\n\t"
"mov %%eax, %%edx\n\t"
@@ -123,11 +121,13 @@
@@ -121,13 +123,11 @@
"mov %%eax, %4\n\t"
"mov %%edx, %5\n\t"
// cleanup stack
- "mov %6, %%esp\n\t"
+ "mov %0, %%eax\n\t"
+ "shl $2, %%eax\n\t"
+ "add %%eax, %%esp\n\t"
- "mov %0, %%eax\n\t"
- "shl $2, %%eax\n\t"
- "add %%eax, %%esp\n\t"
+ "mov %6, %%esp\n\t"
:
- : "m"(nStackLongs), "m"(pStackLongs), "m"(pThis), "m"(nVtableIndex),
- "m"(eax), "m"(edx), "m"(stackptr)
+ : "m"(nStackLongs), "m"(pStackLongs), "m"(pThis), "m"(nVtableIndex), "m"(eax), "m"(edx)
- : "m"(nStackLongs), "m"(pStackLongs), "m"(pThis), "m"(nVtableIndex), "m"(eax), "m"(edx)
+ : "m"(nStackLongs), "m"(pStackLongs), "m"(pThis), "m"(nVtableIndex),
+ "m"(eax), "m"(edx), "m"(stackptr)
: "eax", "edx" );
+
-
switch( eReturnType )
{
case typelib_TypeClass_HYPER: