mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

armeabi02: #i105359# fix arm-eabi uno bridge, fix exception handling, and fix struct returning rules

Browse Source
This commit is contained in:
Caolán McNamara
2010-04-27 11:17:28 +01:00
parent 39ca722d12
commit dce434e245
7 changed files with 132 additions and 70 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
bridges/source/cpp_uno/gcc3_linux_arm/cpp2uno.cxx
View File

@@ -76,10 +76,8 @@ namespace
if (pReturnTypeDescr)
{
if (bridges::cpp_uno::shared::isSimpleType( pReturnTypeDescr ))
{
if (!arm::return_in_hidden_param(pReturnTypeRef))
pUnoReturn = pRegisterReturn; // direct way for simple types
}
else // complex return via ptr (pCppReturn)
{
pCppReturn = *(void **)pCppStack;
@@ -422,9 +420,9 @@ namespace
const int codeSnippetSize = 20;
unsigned char *codeSnippet(unsigned char* code, sal_Int32 functionIndex,
sal_Int32 vtableOffset, bool simple_ret_type )
sal_Int32 vtableOffset, bool bHasHiddenParam)
{
if (!simple_ret_type)
if (bHasHiddenParam)
functionIndex |= 0x80000000;
unsigned long * p = (unsigned long *)code;
@@ -478,24 +476,25 @@ unsigned char * bridges::cpp_uno::shared::VtableFactory::addLocalFunctions(
switch (member->eTypeClass)
{
case typelib_TypeClass_INTERFACE_ATTRIBUTE:
{
typelib_InterfaceAttributeTypeDescription *pAttrTD =
reinterpret_cast<typelib_InterfaceAttributeTypeDescription *>( member );
// Getter:
(s++)->fn = code + writetoexecdiff;
code = codeSnippet(
code, functionOffset++, vtableOffset,
bridges::cpp_uno::shared::isSimpleType(
reinterpret_cast<
typelib_InterfaceAttributeTypeDescription * >(
member)->pAttributeTypeRef));
arm::return_in_hidden_param( pAttrTD->pAttributeTypeRef ));
// Setter:
if (!reinterpret_cast<
typelib_InterfaceAttributeTypeDescription * >(
member)->bReadOnly)
if (!pAttrTD->bReadOnly)
{
(s++)->fn = code + writetoexecdiff;
code = codeSnippet(
code, functionOffset++, vtableOffset, true);
code, functionOffset++, vtableOffset, false);
}
break;
}
case typelib_TypeClass_INTERFACE_METHOD:
{
(s++)->fn = code + writetoexecdiff;
@@ -504,11 +503,8 @@ unsigned char * bridges::cpp_uno::shared::VtableFactory::addLocalFunctions(
reinterpret_cast<
typelib_InterfaceMethodTypeDescription * >(member);
bool issimple = bridges::cpp_uno::shared::isSimpleType(
pMethodTD->pReturnTypeRef);
code = codeSnippet(code, functionOffset++, vtableOffset,
issimple);
arm::return_in_hidden_param(pMethodTD->pReturnTypeRef));
break;
}
default: