[Libreoffice-commits] core.git: 2 commits - bridges/source
Tor Lillqvist
tml at collabora.com
Sun Dec 22 00:51:05 PST 2013
bridges/source/cpp_uno/gcc3_ios_arm/cpp2uno-arm64.cxx | 189 +++++++--------
bridges/source/cpp_uno/gcc3_ios_arm/generate-snippets.pl | 12
bridges/source/cpp_uno/gcc3_ios_arm/helper.s | 16 +
bridges/source/cpp_uno/gcc3_ios_arm/share.hxx | 9
bridges/source/cpp_uno/gcc3_ios_arm/uno2cpp-arm64.cxx | 2
5 files changed, 131 insertions(+), 97 deletions(-)
New commits:
commit a1a76eface98e1050fd0df1a6934e4d3a3fae5b2
Author: Tor Lillqvist <tml at collabora.com>
Date: Sun Dec 22 10:49:21 2013 +0200
Fix build break for (32-bit) arm
Change-Id: I21c81aa1791cab8ac510c87b4a78ad1367fe8b78
diff --git a/bridges/source/cpp_uno/gcc3_ios_arm/share.hxx b/bridges/source/cpp_uno/gcc3_ios_arm/share.hxx
index c719aa2..0a0a4fb 100644
--- a/bridges/source/cpp_uno/gcc3_ios_arm/share.hxx
+++ b/bridges/source/cpp_uno/gcc3_ios_arm/share.hxx
@@ -47,18 +47,21 @@ namespace CPPU_CURRENT_NAMESPACE
namespace arm
{
- enum armlimits {
#if defined(__arm)
+ enum armlimits {
MAX_GPR_REGS = 4,
MAX_FPR_REGS = 8
+ };
+ bool return_in_hidden_param( typelib_TypeDescriptionReference *pTypeRef );
#elif defined(__arm64)
+ enum armlimits {
MAX_GPR_REGS = 8,
MAX_FPR_REGS = 8
+ };
+ bool return_in_x8( typelib_TypeDescriptionReference *pTypeRef );
#else
#error wtf
#endif
- };
- bool return_in_x8( typelib_TypeDescriptionReference *pTypeRef );
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
commit 77f1f2209cfecc0af2d1e1db460b2614068748da
Author: Tor Lillqvist <tml at collabora.com>
Date: Sun Dec 22 02:29:48 2013 +0200
iOS arm64 C++/UNO bridge WIP
Change-Id: I786cc64fc814c755ba215898026365af26b56205
diff --git a/bridges/source/cpp_uno/gcc3_ios_arm/cpp2uno-arm64.cxx b/bridges/source/cpp_uno/gcc3_ios_arm/cpp2uno-arm64.cxx
index 1b68c1e..a82628a 100644
--- a/bridges/source/cpp_uno/gcc3_ios_arm/cpp2uno-arm64.cxx
+++ b/bridges/source/cpp_uno/gcc3_ios_arm/cpp2uno-arm64.cxx
@@ -56,9 +56,14 @@ namespace
void ** pCallStack,
sal_Int64 * pRegisterReturn /* space for register return */ )
{
- // pCallStack: x8, ret, [return ptr], this, params
- char * pTopStack = (char *)(pCallStack + 0);
- char * pCppStack = pTopStack;
+ // pCallStack: x8, lr, d0..d7, x0..x7, rest of params originally on stack
+ char *pTopStack = (char *)pCallStack;
+ char *pFloatRegs = pTopStack + 2;
+ char *pGPRegs = pTopStack + (2+8)*8;
+ char *pStackedArgs = pTopStack + (2+8+8)*8;
+
+ int nGPR = 0;
+ int nFPR = 0;
// return
typelib_TypeDescription * pReturnTypeDescr = 0;
@@ -73,10 +78,9 @@ namespace
{
if (!arm::return_in_x8(pReturnTypeRef))
pUnoReturn = pRegisterReturn; // direct way for simple types
- else // complex return via ptr (pCppReturn)
+ else // complex return via x8
{
- pCppReturn = *(void **)pCppStack;
- pCppStack += 16;
+ pCppReturn = pCallStack[0];
pUnoReturn = (bridges::cpp_uno::shared::relatesToInterfaceType(
pReturnTypeDescr )
@@ -84,8 +88,10 @@ namespace
: pCppReturn); // direct way
}
}
- // pop this
- pCppStack += sizeof( void* );
+
+ // Skip 'this'
+ pGPRegs += 8;
+ nGPR++;
// Parameters
void ** pUnoArgs = (void **)alloca( sizeof(void *) * nParams );
@@ -109,52 +115,67 @@ namespace
if (!rParam.bOut &&
bridges::cpp_uno::shared::isSimpleType( pParamTypeDescr ))
{
-#ifdef __ARM_EABI__
- switch (pParamTypeDescr->eTypeClass)
+ if (nFPR < 8 && (pParamTypeDescr->eTypeClass == typelib_TypeClass_FLOAT ||
+ pParamTypeDescr->eTypeClass == typelib_TypeClass_DOUBLE))
{
- case typelib_TypeClass_HYPER:
- case typelib_TypeClass_UNSIGNED_HYPER:
-#ifndef __ARM_PCS_VFP
- case typelib_TypeClass_DOUBLE:
-#endif
- if ((pCppStack - pTopStack) % 8) pCppStack+=sizeof(sal_Int32); //align to 8
- break;
- default:
- break;
+ pCppArgs[nPos] = pUnoArgs[nPos] = pFloatRegs;
+ pFloatRegs += 8;
+ nFPR++;
}
-#endif
-
-// For armhf we get the floating point arguments from a different area of the stack
-#ifdef __ARM_PCS_VFP
- if (pParamTypeDescr->eTypeClass == typelib_TypeClass_FLOAT)
+ else if (pParamTypeDescr->eTypeClass == typelib_TypeClass_FLOAT)
{
- pCppArgs[nPos] = pUnoArgs[nPos] = pFloatArgs;
- pFloatArgs += sizeof(float);
- } else
- if (pParamTypeDescr->eTypeClass == typelib_TypeClass_DOUBLE)
+ if ((pStackedArgs - pTopStack) % 4)
+ pStackedArgs += 4 - ((pStackedArgs - pTopStack) % 4);
+ pCppArgs[nPos] = pUnoArgs[nPos] = pStackedArgs;
+ pStackedArgs += 4;
+ }
+ else if (pParamTypeDescr->eTypeClass == typelib_TypeClass_DOUBLE)
{
- if ((pFloatArgs - pTopStack) % 8) pFloatArgs+=sizeof(float); //align to 8
- pCppArgs[nPos] = pUnoArgs[nPos] = pFloatArgs;
- pFloatArgs += sizeof(double);
- if (++dc == arm::MAX_FPR_REGS) {
- if (pCppStack - pTopStack < 16)
- pCppStack = pTopStack + 16;
- pFloatArgs = pCppStack;
- }
- } else
-#endif
- pCppArgs[nPos] = pUnoArgs[nPos] = pCppStack;
-
+ if ((pStackedArgs - pTopStack) % 8)
+ pStackedArgs += 8 - ((pStackedArgs - pTopStack) % 8);
+ pCppArgs[nPos] = pUnoArgs[nPos] = pStackedArgs;
+ pStackedArgs += 8;
+ }
+ else if (nGPR < 8)
+ {
+ pCppArgs[nPos] = pUnoArgs[nPos] = pGPRegs;
+ pGPRegs += 8;
+ nGPR++;
+ }
+ else
switch (pParamTypeDescr->eTypeClass)
{
case typelib_TypeClass_HYPER:
case typelib_TypeClass_UNSIGNED_HYPER:
-#ifndef __ARM_PCS_VFP
- case typelib_TypeClass_DOUBLE:
-#endif
- pCppStack += sizeof(sal_Int32); // extra long
+ if ((pStackedArgs - pTopStack) % 8)
+ pStackedArgs += 8 - ((pStackedArgs - pTopStack) % 8);
+ pCppArgs[nPos] = pUnoArgs[nPos] = pStackedArgs;
+ pStackedArgs += 8;
+ break;
+ case typelib_TypeClass_ENUM:
+ case typelib_TypeClass_LONG:
+ case typelib_TypeClass_UNSIGNED_LONG:
+ if ((pStackedArgs - pTopStack) % 4)
+ pStackedArgs += 4 - ((pStackedArgs - pTopStack) % 4);
+ pCppArgs[nPos] = pUnoArgs[nPos] = pStackedArgs;
+ pStackedArgs += 4;
+ break;
+ case typelib_TypeClass_CHAR:
+ case typelib_TypeClass_SHORT:
+ case typelib_TypeClass_UNSIGNED_SHORT:
+ if ((pStackedArgs - pTopStack) % 2)
+ pStackedArgs += 1;
+ pCppArgs[nPos] = pUnoArgs[nPos] = pStackedArgs;
+ pStackedArgs += 2;
+ break;
+ break;
+ case typelib_TypeClass_BOOLEAN:
+ case typelib_TypeClass_BYTE:
+ pCppArgs[nPos] = pUnoArgs[nPos] = pStackedArgs;
+ pStackedArgs += 1;
break;
default:
+ assert(!"should not happen");
break;
}
// no longer needed
@@ -162,7 +183,18 @@ namespace
}
else // ptr to complex value | ref
{
- pCppArgs[nPos] = *(void **)pCppStack;
+ if (nGPR < 8)
+ {
+ pCppArgs[nPos] = *(void **)pGPRegs;
+ pGPRegs += 8;
+ }
+ else
+ {
+ if ((pStackedArgs - pTopStack) % 8)
+ pStackedArgs += 8 - ((pStackedArgs - pTopStack) % 8);
+ pCppArgs[nPos] = pStackedArgs;
+ pStackedArgs += 8;
+ }
if (! rParam.bIn) // is pure out
{
@@ -173,12 +205,11 @@ namespace
ppTempParamTypeDescr[nTempIndices++] = pParamTypeDescr;
}
// is in/inout
- else if (bridges::cpp_uno::shared::relatesToInterfaceType(
- pParamTypeDescr ))
+ else if (bridges::cpp_uno::shared::relatesToInterfaceType( pParamTypeDescr ))
{
uno_copyAndConvertData( pUnoArgs[nPos] =
alloca( pParamTypeDescr->nSize ),
- *(void **)pCppStack, pParamTypeDescr,
+ pCppArgs[nPos], pParamTypeDescr,
pThis->getBridge()->getCpp2Uno() );
pTempIndices[nTempIndices] = nPos; // has to be reconverted
// will be released at reconversion
@@ -186,19 +217,11 @@ namespace
}
else // direct way
{
- pUnoArgs[nPos] = *(void **)pCppStack;
+ pUnoArgs[nPos] = pCppArgs[nPos];
// no longer needed
TYPELIB_DANGER_RELEASE( pParamTypeDescr );
}
}
-#ifdef __ARM_PCS_VFP
- // use the stack for output parameters or non floating point values
- if (rParam.bOut ||
- ((pParamTypeDescr->eTypeClass != typelib_TypeClass_DOUBLE)
- && (pParamTypeDescr->eTypeClass != typelib_TypeClass_FLOAT))
- )
-#endif
- pCppStack += sizeof(sal_Int32); // standard parameter length
}
// ExceptionHolder
@@ -262,7 +285,6 @@ namespace
// destroy temp uno return
uno_destructData( pUnoReturn, pReturnTypeDescr, 0 );
}
- // complex return ptr is set to eax
*(void **)pRegisterReturn = pCppReturn;
}
if (pReturnTypeDescr)
@@ -284,10 +306,9 @@ namespace
void ** pCallStack,
sal_Int64 * pRegisterReturn )
{
- // pCallStack: x8, ret *, this, params
+ // pCallStack: x8, lr, d0..d7, x0..x7, rest of params originally on stack
// _this_ ptr is patched cppu_XInterfaceProxy object
- nFunctionIndex &= 0x7fffffff;
- void *pThis = pCallStack[2];
+ void *pThis = pCallStack[2 + 8];
pThis = static_cast< char * >(pThis) - nVtableOffset;
bridges::cpp_uno::shared::CppInterfaceProxy * pCppI =
@@ -296,20 +317,17 @@ namespace
typelib_InterfaceTypeDescription * pTypeDescr = pCppI->getTypeDescr();
- OSL_ENSURE( nFunctionIndex < pTypeDescr->nMapFunctionIndexToMemberIndex,
- "### illegal vtable index!" );
+ // determine called method
+ assert( nFunctionIndex < pTypeDescr->nMapFunctionIndexToMemberIndex );
+
if (nFunctionIndex >= pTypeDescr->nMapFunctionIndexToMemberIndex)
{
throw RuntimeException( "illegal vtable index!", (XInterface *)pCppI );
}
- // determine called method
- OSL_ENSURE( nFunctionIndex < pTypeDescr->nMapFunctionIndexToMemberIndex,
- "### illegal vtable index!" );
sal_Int32 nMemberPos =
pTypeDescr->pMapFunctionIndexToMemberIndex[nFunctionIndex];
- OSL_ENSURE( nMemberPos < pTypeDescr->nAllMembers,
- "### illegal member index!" );
+ assert( nMemberPos < pTypeDescr->nAllMembers );
TypeDescription aMemberDescr( pTypeDescr->ppAllMembers[nMemberPos] );
@@ -444,7 +462,7 @@ extern "C" sal_Int64 cpp_vtable_call( sal_Int32 *pFunctionAndOffset,
namespace
{
unsigned char *codeSnippet(sal_Int32 functionIndex,
- sal_Int32 vtableOffset, bool bReturnThroughX8)
+ sal_Int32 vtableOffset)
{
assert(functionIndex < nFunIndexes);
if (!(functionIndex < nFunIndexes))
@@ -454,16 +472,12 @@ namespace
if (!(vtableOffset < nVtableOffsets))
return NULL;
- // The codeSnippets table is indexed by functionIndex,
- // vtableOffset, and the return-through-x8 flag
+ // The codeSnippets table is indexed by functionIndex and vtableOffset
- int index = functionIndex*nVtableOffsets*2 + vtableOffset*2 + bReturnThroughX8;
+ int index = functionIndex*nVtableOffsets + vtableOffset;
unsigned char *result = ((unsigned char *) &codeSnippets) + codeSnippets[index];
- SAL_INFO( "bridges.ios",
- "codeSnippet: [" <<
- functionIndex << "," << vtableOffset << "," << bReturnThroughX8 << "]=" <<
- (void *) result);
+ SAL_INFO( "bridges.ios", "codeSnippet: [" << functionIndex << "," << vtableOffset << "]=" << (void *) result << " (" << std::hex << ((int*)result)[0] << "," << ((int*)result)[1] << "," << ((int*)result)[2] << "," << ((int*)result)[3] << ")");
return result;
}
@@ -494,9 +508,12 @@ bridges::cpp_uno::shared::VtableFactory::initializeBlock(
}
unsigned char * bridges::cpp_uno::shared::VtableFactory::addLocalFunctions(
- Slot ** slots, unsigned char * code,
- typelib_InterfaceTypeDescription const * type, sal_Int32 functionOffset,
- sal_Int32 functionCount, sal_Int32 vtableOffset)
+ Slot ** slots,
+ unsigned char * code,
+ typelib_InterfaceTypeDescription const * type,
+ sal_Int32 functionOffset,
+ sal_Int32 functionCount,
+ sal_Int32 vtableOffset)
{
(*slots) -= functionCount;
Slot * s = *slots;
@@ -513,26 +530,18 @@ unsigned char * bridges::cpp_uno::shared::VtableFactory::addLocalFunctions(
reinterpret_cast<typelib_InterfaceAttributeTypeDescription *>( member );
// Getter:
- (s++)->fn = codeSnippet(
- functionOffset++, vtableOffset,
- arm::return_in_x8( pAttrTD->pAttributeTypeRef ));
+ (s++)->fn = codeSnippet( functionOffset++, vtableOffset );
// Setter:
if (!pAttrTD->bReadOnly)
{
- (s++)->fn = codeSnippet(
- functionOffset++, vtableOffset, false);
+ (s++)->fn = codeSnippet( functionOffset++, vtableOffset );
}
break;
}
case typelib_TypeClass_INTERFACE_METHOD:
{
- typelib_InterfaceMethodTypeDescription *pMethodTD =
- reinterpret_cast<
- typelib_InterfaceMethodTypeDescription * >(member);
-
- (s++)->fn = codeSnippet(functionOffset++, vtableOffset,
- arm::return_in_x8(pMethodTD->pReturnTypeRef));
+ (s++)->fn = codeSnippet( functionOffset++, vtableOffset );
break;
}
default:
diff --git a/bridges/source/cpp_uno/gcc3_ios_arm/generate-snippets.pl b/bridges/source/cpp_uno/gcc3_ios_arm/generate-snippets.pl
index b6ffc07..5150686 100755
--- a/bridges/source/cpp_uno/gcc3_ios_arm/generate-snippets.pl
+++ b/bridges/source/cpp_uno/gcc3_ios_arm/generate-snippets.pl
@@ -13,6 +13,9 @@ my $nVtableOffsets = 4;
sub gen_arm ($$)
{
my ($funIndex, $vtableOffset) = @_;
+ if ($funIndex & 0x80000000) {
+ printf ("#ifndef __arm64\n");
+ }
printf ("codeSnippet_%08x_%d:\n", $funIndex, $vtableOffset);
printf ("#ifdef __arm\n");
# Note: pc is the address of instruction being executed plus 8
@@ -23,6 +26,9 @@ sub gen_arm ($$)
printf (" b _privateSnippetExecutor\n");
printf (" .long %#08x\n", $funIndex);
printf (" .long %d\n", $vtableOffset);
+ if ($funIndex & 0x80000000) {
+ printf ("#endif\n");
+ }
}
sub gen_x86 ($$$)
@@ -41,8 +47,8 @@ printf ("#if defined(__arm) || defined(__arm64)\n");
printf ("\n");
printf ("// Each codeSnippetX function stores into ip (arm64: x15) an address and branches to _privateSnippetExecutor\n");
printf ("// The address is that following the branch instruction, containing two 32-bit ints:\n");
-printf ("// - the function index, as such or with the 0x80000000 bit set\n");
-printf ("// (to indicate that a hidden parameter (arm64: x8) is used for returning large values)\n");
+printf ("// - the function index (for 32-bit can have the 0x80000000 bit set\n");
+printf ("// to indicate that a hidden parameter is used for returning large values)\n");
printf ("// - the vtable offset\n");
printf ("\n");
@@ -92,7 +98,9 @@ foreach my $funIndex (0 .. $nFunIndexes-1)
{
printf ("#if defined(__arm) || defined(__arm64)\n");
printf (" .long codeSnippet_%08x_%d - _codeSnippets\n", $funIndex, $vtableOffset);
+ printf ("#ifndef __arm64\n");
printf (" .long codeSnippet_%08x_%d - _codeSnippets\n", $funIndex|0x80000000, $vtableOffset);
+ printf ("#endif\n");
printf ("#else\n");
foreach my $executor ('General', 'Void', 'Hyper', 'Float', 'Double', 'Class')
{
diff --git a/bridges/source/cpp_uno/gcc3_ios_arm/helper.s b/bridges/source/cpp_uno/gcc3_ios_arm/helper.s
index bf84f65..6c0cd5e 100644
--- a/bridges/source/cpp_uno/gcc3_ios_arm/helper.s
+++ b/bridges/source/cpp_uno/gcc3_ios_arm/helper.s
@@ -49,22 +49,36 @@ _privateSnippetExecutor:
_privateSnippetExecutor:
+ // _privateSnippetExecutor is jumped to from each of the
+ // codeSnippet_* generated by generate-snippets.pl
+
+ // Store potential args in general purpose registers
stp x6, x7, [sp, #-16]!
stp x4, x5, [sp, #-16]!
stp x2, x3, [sp, #-16]!
stp x0, x1, [sp, #-16]!
+ // Store potential args in floating point/SIMD registers
+ stp d6, d7, [sp, #-16]!
+ stp d4, d5, [sp, #-16]!
+ stp d2, d3, [sp, #-16]!
+ stp d0, d1, [sp, #-16]!
+
+ // First argument to cpp_vtable_call: The x15 set up in the codeSnippet instance
mov x0, x15
+ // Store x8 (potential pointer to return value storage) and lr
stp x8, lr, [sp, #-16]!
+ // Second argument: The pointer to all the above
mov x1, sp
bl _cpp_vtable_call
ldp x8, lr, [sp, #0]
- add sp, sp, #80
+ add sp, sp, #144
ret lr
#else
+ // i386 code, for the simulator
.text
.align 1, 0x90
diff --git a/bridges/source/cpp_uno/gcc3_ios_arm/uno2cpp-arm64.cxx b/bridges/source/cpp_uno/gcc3_ios_arm/uno2cpp-arm64.cxx
index e3c9e81..49e0191 100644
--- a/bridges/source/cpp_uno/gcc3_ios_arm/uno2cpp-arm64.cxx
+++ b/bridges/source/cpp_uno/gcc3_ios_arm/uno2cpp-arm64.cxx
@@ -152,7 +152,7 @@ void callVirtualMethod(
sal_uInt64 x0;
sal_uInt64 x1;
- __asm__ __volatile__
+ __asm__ __volatile__
(
" ldp x0, x1, %[pgpr_0]\n"
" ldp x2, x3, %[pgpr_2]\n"
More information about the Libreoffice-commits
mailing list