diff --git a/bridges/Library_cpp_uno.mk b/bridges/Library_cpp_uno.mk index becb9f66dabe..ca7a3d908ed9 100644 --- a/bridges/Library_cpp_uno.mk +++ b/bridges/Library_cpp_uno.mk @@ -148,13 +148,6 @@ bridge_noopt_objects := cpp2uno uno2cpp bridge_exception_objects := except endif -else ifeq ($(CPUNAME),S390) - -ifneq ($(filter DRAGONFLY FREEBSD LINUX NETBSD OPENBSD,$(OS)),) -bridges_SELECTED_BRIDGE := gcc3_linux_s390 -bridge_exception_objects := cpp2uno except uno2cpp -endif - else ifeq ($(CPUNAME),S390X) ifneq ($(filter DRAGONFLY FREEBSD LINUX NETBSD OPENBSD,$(OS)),) diff --git a/bridges/source/cpp_uno/gcc3_linux_s390/cpp2uno.cxx b/bridges/source/cpp_uno/gcc3_linux_s390/cpp2uno.cxx deleted file mode 100644 index aca33d1ae511..000000000000 --- a/bridges/source/cpp_uno/gcc3_linux_s390/cpp2uno.cxx +++ /dev/null @@ -1,693 +0,0 @@ -/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/* - * This file is part of the LibreOffice project. - * - * This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at http://mozilla.org/MPL/2.0/. - * - * This file incorporates work covered by the following license notice: - * - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed - * with this work for additional information regarding copyright - * ownership. The ASF licenses this file to you under the Apache - * License, Version 2.0 (the "License"); you may not use this file - * except in compliance with the License. You may obtain a copy of - * the License at http://www.apache.org/licenses/LICENSE-2.0 . - */ - - -#include -#include -#include -#include - -#include "bridge.hxx" -#include "cppinterfaceproxy.hxx" -#include "types.hxx" -#include "vtablefactory.hxx" - -#include "share.hxx" -#include -#include -#include - -using namespace ::com::sun::star::uno; - -namespace -{ - -static typelib_TypeClass cpp2uno_call( - bridges::cpp_uno::shared::CppInterfaceProxy * pThis, - const typelib_TypeDescription * pMemberTypeDescr, - typelib_TypeDescriptionReference * pReturnTypeRef, // 0 indicates void return - sal_Int32 nParams, typelib_MethodParameter * pParams, - void ** gpreg, void ** fpreg, void ** ovrflw, - sal_Int64 * pRegisterReturn /* space for register return */ ) -{ - int ng = 0; //number of gpr registers used - int nf = 0; //number of fpr registers used - void ** pCppStack; //temporary stack pointer - - // gpreg: [ret *], this, [gpr params] - // fpreg: [fpr params] - // ovrflw: [gpr or fpr params (properly aligned)] - - // return - typelib_TypeDescription * pReturnTypeDescr = 0; - if (pReturnTypeRef) - TYPELIB_DANGER_GET( &pReturnTypeDescr, pReturnTypeRef ); - - void * pUnoReturn = 0; - void * pCppReturn = 0; // complex return ptr: if != 0 && != pUnoReturn, reconversion need - - if (pReturnTypeDescr) - { - if (bridges::cpp_uno::shared::isSimpleType( pReturnTypeDescr )) - { - pUnoReturn = pRegisterReturn; // direct way for simple types - } - else // complex return via ptr (pCppReturn) - { - pCppReturn = *(void **)gpreg; - gpreg++; - ng++; - - pUnoReturn = (bridges::cpp_uno::shared::relatesToInterfaceType( pReturnTypeDescr ) - ? alloca( pReturnTypeDescr->nSize ) - : pCppReturn); // direct way - } - } - // pop this - gpreg++; - ng++; - - // stack space - static_assert(sizeof(void *) == sizeof(sal_Int32), "### unexpected size!"); - // parameters - void ** pUnoArgs = (void **)alloca( 4 * sizeof(void *) * nParams ); - void ** pCppArgs = pUnoArgs + nParams; - // indices of values this have to be converted (interface conversion cpp<=>uno) - sal_Int32 * pTempIndices = (sal_Int32 *)(pUnoArgs + (2 * nParams)); - // type descriptions for reconversions - typelib_TypeDescription ** ppTempParamTypeDescr = (typelib_TypeDescription **)(pUnoArgs + (3 * nParams)); - - sal_Int32 nTempIndices = 0; - - for ( sal_Int32 nPos = 0; nPos < nParams; ++nPos ) - { - const typelib_MethodParameter & rParam = pParams[nPos]; - typelib_TypeDescription * pParamTypeDescr = 0; - TYPELIB_DANGER_GET( &pParamTypeDescr, rParam.pTypeRef ); - - if (!rParam.bOut && bridges::cpp_uno::shared::isSimpleType( pParamTypeDescr )) // value - { - - switch (pParamTypeDescr->eTypeClass) - { - - case typelib_TypeClass_DOUBLE: - if (nf < 2) { - pCppArgs[nPos] = fpreg; - pUnoArgs[nPos] = fpreg; - nf++; - fpreg += 2; - } else { - pCppArgs[nPos] = ovrflw; - pUnoArgs[nPos] = ovrflw; - ovrflw += 2; - } - break; - - case typelib_TypeClass_FLOAT: - // fpreg are all double values so need to - // modify fpreg to be a single word float value - if (nf < 2) { -// float tmp = (float) (*((double *)fpreg)); -// (*((float *) fpreg)) = tmp; - pCppArgs[nPos] = fpreg; - pUnoArgs[nPos] = fpreg; - nf++; - fpreg += 2; - } else { - pCppArgs[nPos] = ovrflw; - pUnoArgs[nPos] = ovrflw; - ovrflw += 1; - } - break; - - case typelib_TypeClass_HYPER: - case typelib_TypeClass_UNSIGNED_HYPER: - if (ng < 4) { - pCppArgs[nPos] = gpreg; - pUnoArgs[nPos] = gpreg; - ng += 2; - gpreg += 2; - } else { - pCppArgs[nPos] = ovrflw; - pUnoArgs[nPos] = ovrflw; - ovrflw += 2; - } - break; - - case typelib_TypeClass_BYTE: - case typelib_TypeClass_BOOLEAN: - if (ng < 5) { - pCppArgs[nPos] = (((char *)gpreg) + 3); - pUnoArgs[nPos] = (((char *)gpreg) + 3); - ng++; - gpreg++; - } else { - pCppArgs[nPos] = (((char *)ovrflw) + 3); - pUnoArgs[nPos] = (((char *)ovrflw) + 3); - ovrflw++; - } - break; - - - case typelib_TypeClass_CHAR: - case typelib_TypeClass_SHORT: - case typelib_TypeClass_UNSIGNED_SHORT: - if (ng < 5) { - pCppArgs[nPos] = (((char *)gpreg)+ 2); - pUnoArgs[nPos] = (((char *)gpreg)+ 2); - ng++; - gpreg++; - } else { - pCppArgs[nPos] = (((char *)ovrflw) + 2); - pUnoArgs[nPos] = (((char *)ovrflw) + 2); - ovrflw++; - } - break; - - - default: - if (ng < 5) { - pCppArgs[nPos] = gpreg; - pUnoArgs[nPos] = gpreg; - ng++; - gpreg++; - } else { - pCppArgs[nPos] = ovrflw; - pUnoArgs[nPos] = ovrflw; - ovrflw++; - } - break; - - } - // no longer needed - TYPELIB_DANGER_RELEASE( pParamTypeDescr ); - } - else // ptr to complex value | ref - { - - if (ng < 5) { - pCppArgs[nPos] = *(void **)gpreg; - pCppStack = gpreg; - ng++; - gpreg++; - } else { - pCppArgs[nPos] = *(void **)ovrflw; - pCppStack = ovrflw; - ovrflw++; - } - - if (! rParam.bIn) // is pure out - { - // uno out is unconstructed mem! - pUnoArgs[nPos] = alloca( pParamTypeDescr->nSize ); - pTempIndices[nTempIndices] = nPos; - // will be released at reconversion - ppTempParamTypeDescr[nTempIndices++] = pParamTypeDescr; - } - // is in/inout - else if (bridges::cpp_uno::shared::relatesToInterfaceType( pParamTypeDescr )) - { - uno_copyAndConvertData( pUnoArgs[nPos] = alloca( pParamTypeDescr->nSize ), - *(void **)pCppStack, pParamTypeDescr, - pThis->getBridge()->getCpp2Uno() ); - pTempIndices[nTempIndices] = nPos; // has to be reconverted - // will be released at reconversion - ppTempParamTypeDescr[nTempIndices++] = pParamTypeDescr; - } - else // direct way - { - pUnoArgs[nPos] = *(void **)pCppStack; - // no longer needed - TYPELIB_DANGER_RELEASE( pParamTypeDescr ); - } - } - } - - // ExceptionHolder - uno_Any aUnoExc; // Any will be constructed by callee - uno_Any * pUnoExc = &aUnoExc; - - // invoke uno dispatch call - (*pThis->getUnoI()->pDispatcher)( pThis->getUnoI(), pMemberTypeDescr, pUnoReturn, pUnoArgs, &pUnoExc ); - - // in case an exception occurred... - if (pUnoExc) - { - // destruct temporary in/inout params - for ( ; nTempIndices--; ) - { - sal_Int32 nIndex = pTempIndices[nTempIndices]; - - if (pParams[nIndex].bIn) // is in/inout => was constructed - uno_destructData( pUnoArgs[nIndex], ppTempParamTypeDescr[nTempIndices], 0 ); - TYPELIB_DANGER_RELEASE( ppTempParamTypeDescr[nTempIndices] ); - } - if (pReturnTypeDescr) - TYPELIB_DANGER_RELEASE( pReturnTypeDescr ); - - CPPU_CURRENT_NAMESPACE::raiseException( &aUnoExc, pThis->getBridge()->getUno2Cpp() ); // has to destruct the any - // is here for dummy - return typelib_TypeClass_VOID; - } - else // else no exception occurred... - { - // temporary params - for ( ; nTempIndices--; ) - { - sal_Int32 nIndex = pTempIndices[nTempIndices]; - typelib_TypeDescription * pParamTypeDescr = ppTempParamTypeDescr[nTempIndices]; - - if (pParams[nIndex].bOut) // inout/out - { - // convert and assign - uno_destructData( pCppArgs[nIndex], pParamTypeDescr, cpp_release ); - uno_copyAndConvertData( pCppArgs[nIndex], pUnoArgs[nIndex], pParamTypeDescr, - pThis->getBridge()->getUno2Cpp() ); - } - // destroy temp uno param - uno_destructData( pUnoArgs[nIndex], pParamTypeDescr, 0 ); - - TYPELIB_DANGER_RELEASE( pParamTypeDescr ); - } - // return - if (pCppReturn) // has complex return - { - if (pUnoReturn != pCppReturn) // needs reconversion - { - uno_copyAndConvertData( pCppReturn, pUnoReturn, pReturnTypeDescr, - pThis->getBridge()->getUno2Cpp() ); - // destroy temp uno return - uno_destructData( pUnoReturn, pReturnTypeDescr, 0 ); - } - // complex return ptr is set to return reg - *(void **)pRegisterReturn = pCppReturn; - } - if (pReturnTypeDescr) - { - typelib_TypeClass eRet = (typelib_TypeClass)pReturnTypeDescr->eTypeClass; - TYPELIB_DANGER_RELEASE( pReturnTypeDescr ); - return eRet; - } - else - return typelib_TypeClass_VOID; - } -} - - -static typelib_TypeClass cpp_mediate( - sal_uInt32 nOffsetAndIndex, - void ** gpreg, void ** fpreg, void ** ovrflw, - sal_Int64 * pRegisterReturn /* space for register return */ ) -{ - static_assert(sizeof(sal_Int32)==sizeof(void *), "### unexpected!"); - - sal_Int16 nVtableOffset = (nOffsetAndIndex >> 16); - sal_Int16 nFunctionIndex = (nOffsetAndIndex & 0xFFFF); - - // gpreg: [ret *], this, [other gpr params] - // fpreg: [fpr params] - // ovrflw: [gpr or fpr params (properly aligned)] - - // _this_ ptr is patched cppu_XInterfaceProxy object - void * pThis; - if( nFunctionIndex & 0x8000 ) - { - nFunctionIndex &= 0x7fff; - pThis = gpreg[1]; - } - else - { - pThis = gpreg[0]; - } - - pThis = static_cast< char * >(pThis) - nVtableOffset; - - bridges::cpp_uno::shared::CppInterfaceProxy * pCppI - = bridges::cpp_uno::shared::CppInterfaceProxy::castInterfaceToProxy( - pThis); - - typelib_InterfaceTypeDescription * pTypeDescr = pCppI->getTypeDescr(); - - - if (nFunctionIndex >= pTypeDescr->nMapFunctionIndexToMemberIndex) - { - SAL_WARN( - "bridges", - "illegal " << OUString::unacquired(&pTypeDescr->aBase.pTypeName) - << " vtable index " << nFunctionIndex << "/" - << pTypeDescr->nMapFunctionIndexToMemberIndex); - throw RuntimeException( - ("illegal " + OUString::unacquired(&pTypeDescr->aBase.pTypeName) - + " vtable index " + OUString::number(nFunctionIndex) + "/" - + OUString::number(pTypeDescr->nMapFunctionIndexToMemberIndex)), - (XInterface *)pCppI); - } - - // determine called method - sal_Int32 nMemberPos = pTypeDescr->pMapFunctionIndexToMemberIndex[nFunctionIndex]; - assert(nMemberPos < pTypeDescr->nAllMembers); - - TypeDescription aMemberDescr( pTypeDescr->ppAllMembers[nMemberPos] ); - - typelib_TypeClass eRet; - switch (aMemberDescr.get()->eTypeClass) - { - case typelib_TypeClass_INTERFACE_ATTRIBUTE: - { - if (pTypeDescr->pMapMemberIndexToFunctionIndex[nMemberPos] == nFunctionIndex) - { - // is GET method - eRet = cpp2uno_call( - pCppI, aMemberDescr.get(), - ((typelib_InterfaceAttributeTypeDescription *)aMemberDescr.get())->pAttributeTypeRef, - 0, 0, // no params - gpreg, fpreg, ovrflw, pRegisterReturn ); - } - else - { - // is SET method - typelib_MethodParameter aParam; - aParam.pTypeRef = - ((typelib_InterfaceAttributeTypeDescription *)aMemberDescr.get())->pAttributeTypeRef; - aParam.bIn = sal_True; - aParam.bOut = sal_False; - - eRet = cpp2uno_call( - pCppI, aMemberDescr.get(), - 0, // indicates void return - 1, &aParam, - gpreg, fpreg, ovrflw, pRegisterReturn ); - } - break; - } - case typelib_TypeClass_INTERFACE_METHOD: - { - // is METHOD - switch (nFunctionIndex) - { - case 1: // acquire() - pCppI->acquireProxy(); // non virtual call! - eRet = typelib_TypeClass_VOID; - break; - case 2: // release() - pCppI->releaseProxy(); // non virtual call! - eRet = typelib_TypeClass_VOID; - break; - case 0: // queryInterface() opt - { - typelib_TypeDescription * pTD = 0; - TYPELIB_DANGER_GET( &pTD, reinterpret_cast< Type * >( gpreg[2] )->getTypeLibType() ); - if (pTD) - { - XInterface * pInterface = 0; - (*pCppI->getBridge()->getCppEnv()->getRegisteredInterface)( - pCppI->getBridge()->getCppEnv(), - (void **)&pInterface, pCppI->getOid().pData, - (typelib_InterfaceTypeDescription *)pTD ); - - if (pInterface) - { - ::uno_any_construct( - reinterpret_cast< uno_Any * >( gpreg[0] ), - &pInterface, pTD, cpp_acquire ); - pInterface->release(); - TYPELIB_DANGER_RELEASE( pTD ); - *(void **)pRegisterReturn = gpreg[0]; - eRet = typelib_TypeClass_ANY; - break; - } - TYPELIB_DANGER_RELEASE( pTD ); - } - } // else perform queryInterface() - default: - eRet = cpp2uno_call( - pCppI, aMemberDescr.get(), - ((typelib_InterfaceMethodTypeDescription *)aMemberDescr.get())->pReturnTypeRef, - ((typelib_InterfaceMethodTypeDescription *)aMemberDescr.get())->nParams, - ((typelib_InterfaceMethodTypeDescription *)aMemberDescr.get())->pParams, - gpreg, fpreg, ovrflw, pRegisterReturn ); - } - break; - } - default: - { - throw RuntimeException( "no member description found!", (XInterface *)pCppI ); - } - } - - return eRet; -} - -/** - * is called on incoming vtable calls - * (called by asm snippets) - */ -static void privateSnippetExecutor( sal_uInt32 nOffsetAndIndex, void** gpregptr, void** fpregptr, void** ovrflw) -{ -#if OSL_DEBUG_LEVEL > 2 - fprintf(stderr, "privateSnippetExecutor\n"); -#endif - - - sal_Int32 gpreg[8]; - double fpreg[8]; - - memcpy( gpreg, gpregptr, 32); - memcpy( fpreg, fpregptr, 64); - - volatile long nRegReturn[2]; - - typelib_TypeClass aType = - cpp_mediate( nOffsetAndIndex, (void**)gpreg, (void**)fpreg, ovrflw, - (sal_Int64*)nRegReturn ); - - switch( aType ) - { - - // move return value into register space - // (will be loaded by machine code snippet) - - case typelib_TypeClass_BOOLEAN: - { - unsigned long tmp = (unsigned long)(*(unsigned char *)nRegReturn); - __asm__ volatile ( "l 2,%0\n\t" : : - "m"(tmp) : "2" ); - break; - } - case typelib_TypeClass_BYTE: - { - long tmp = (long)(*(signed char *)nRegReturn); - __asm__ volatile ( "l 2,%0\n\t" : : - "m"(tmp) : "2" ); - break; - } - case typelib_TypeClass_CHAR: - case typelib_TypeClass_UNSIGNED_SHORT: - { - unsigned long tmp = (unsigned long)(*(unsigned short *)nRegReturn); - __asm__ volatile ( "l 2,%0\n\t" : : - "m"(tmp) : "2" ); - break; - } - case typelib_TypeClass_SHORT: - { - long tmp = (long)(*(short *)nRegReturn); - __asm__ volatile ( "l 2,%0\n\t" : : - "m"(tmp) : "2" ); - break; - } - case typelib_TypeClass_FLOAT: - __asm__ volatile ( "le 0,%0\n\t" : : - "m" (*((float*)nRegReturn)) : "16" ); - break; - - case typelib_TypeClass_DOUBLE: - __asm__ volatile ( "ld 0,%0\n\t" : : - "m" (*((double*)nRegReturn)) : "16" ); - break; - - case typelib_TypeClass_HYPER: - case typelib_TypeClass_UNSIGNED_HYPER: - __asm__ volatile ( "lm 2,3,%0\n\t" : : - "m"(nRegReturn[0]) : "2", "3" ); - break; - - default: - __asm__ volatile ( "l 2,%0\n\t" : : - "m"(nRegReturn[0]) : "2" ); - break; - } -} - -const int codeSnippetSize = 50; - -unsigned char* codeSnippet( unsigned char * code, sal_Int16 nFunctionIndex, sal_Int16 nVtableOffset, bool simple_ret_type ) -{ - sal_uInt32 nOffsetAndIndex = ( ( nVtableOffset ) << 16 ) | ( nFunctionIndex ); - - if (! simple_ret_type) - nOffsetAndIndex |= 0x8000; - - static_assert(sizeof (long) == 4, "boo"); - - /* generate this code */ - // lr %r0,%r13 - // bras %r13,0x6 - // .long privateSnippetExecutor - // .long nOffsetAndIndex - // stm %r2,%r6,8(%r15) - // std %f0,64(%r15) - // std %f2,72(%r15) - - // l %r2,4(%r13) - // la %r3,8(%r15) - // la %r4,64(%r15) - // la %r5,96(%r15) - // l %r1,0(%r13) - // lr %r13,%r0 - // br %r1 - - unsigned char * p = code; - *reinterpret_cast< sal_Int16 * >(p) = 0x180d; - p += sizeof(sal_Int16); - *reinterpret_cast< sal_Int32 * >(p) = 0xa7d50006; - p += sizeof(sal_Int32); - *reinterpret_cast< sal_Int32 * >(p) = - reinterpret_cast< sal_Int32 >(privateSnippetExecutor); - p += sizeof(sal_Int32); - *reinterpret_cast< sal_Int32 * >(p) = nOffsetAndIndex; - p += sizeof(sal_Int32); - *reinterpret_cast< sal_Int32 * >(p) = 0x9026f008; - p += sizeof(sal_Int32); - *reinterpret_cast< sal_Int32 * >(p) = 0x6000f040; - p += sizeof(sal_Int32); - *reinterpret_cast< sal_Int32 * >(p) = 0x6020f048; - p += sizeof(sal_Int32); - *reinterpret_cast< sal_Int32 * >(p) = 0x5820d004; - p += sizeof(sal_Int32); - *reinterpret_cast< sal_Int32 * >(p) = 0x4130f008; - p += sizeof(sal_Int32); - *reinterpret_cast< sal_Int32 * >(p) = 0x4140f040; - p += sizeof(sal_Int32); - *reinterpret_cast< sal_Int32 * >(p) = 0x4150f060; - p += sizeof(sal_Int32); - *reinterpret_cast< sal_Int32 * >(p) = 0x5810d000; - p += sizeof(sal_Int32); - *reinterpret_cast< sal_Int16 * >(p) = 0x18d0; - p += sizeof(sal_Int16); - *reinterpret_cast< sal_Int16 * >(p) = 0x07f1; - p += sizeof(sal_Int16); - - return (code + codeSnippetSize); -} -} - -void bridges::cpp_uno::shared::VtableFactory::flushCode(unsigned char const *, unsigned char const *) -{ -} - -struct bridges::cpp_uno::shared::VtableFactory::Slot { void const * fn; }; - -bridges::cpp_uno::shared::VtableFactory::Slot * -bridges::cpp_uno::shared::VtableFactory::mapBlockToVtable(void * block) -{ - return static_cast< Slot * >(block) + 2; -} - -std::size_t bridges::cpp_uno::shared::VtableFactory::getBlockSize( - sal_Int32 slotCount) -{ - return (slotCount + 2) * sizeof (Slot) + slotCount * codeSnippetSize; -} - -namespace { -// Some dummy type whose RTTI is used in the synthesized proxy vtables to make uses of dynamic_cast -// on such proxy objects not crash: -struct ProxyRtti {}; -} - -bridges::cpp_uno::shared::VtableFactory::Slot * -bridges::cpp_uno::shared::VtableFactory::initializeBlock( - void * block, sal_Int32 slotCount, sal_Int32, - typelib_InterfaceTypeDescription *) -{ - Slot * slots = mapBlockToVtable(block); - slots[-2].fn = 0; - slots[-1].fn = &typeid(ProxyRtti); - return slots + slotCount; -} - -unsigned char * bridges::cpp_uno::shared::VtableFactory::addLocalFunctions( - Slot ** slots, unsigned char * code, sal_PtrDiff writetoexecdiff, - typelib_InterfaceTypeDescription const * type, sal_Int32 functionOffset, - sal_Int32 functionCount, sal_Int32 vtableOffset) -{ - (*slots) -= functionCount; - Slot * s = *slots; -#if OSL_DEBUG_LEVEL > 2 - fprintf(stderr, "in addLocalFunctions functionOffset is %x\n",functionOffset); - fprintf(stderr, "in addLocalFunctions vtableOffset is %x\n",vtableOffset); -#endif - - for (sal_Int32 i = 0; i < type->nMembers; ++i) { - typelib_TypeDescription * member = 0; - TYPELIB_DANGER_GET(&member, type->ppMembers[i]); - assert(member != 0); - switch (member->eTypeClass) { - case typelib_TypeClass_INTERFACE_ATTRIBUTE: - // Getter: - (s++)->fn = code + writetoexecdiff; - code = codeSnippet( - code, functionOffset++, vtableOffset, - bridges::cpp_uno::shared::isSimpleType( - reinterpret_cast< - typelib_InterfaceAttributeTypeDescription * >( - member)->pAttributeTypeRef)); - - // Setter: - if (!reinterpret_cast< - typelib_InterfaceAttributeTypeDescription * >( - member)->bReadOnly) - { - (s++)->fn = code + writetoexecdiff; - code = codeSnippet(code, functionOffset++, vtableOffset, true); - } - break; - - case typelib_TypeClass_INTERFACE_METHOD: - (s++)->fn = code + writetoexecdiff; - code = codeSnippet( - code, functionOffset++, vtableOffset, - bridges::cpp_uno::shared::isSimpleType( - reinterpret_cast< - typelib_InterfaceMethodTypeDescription * >( - member)->pReturnTypeRef)); - break; - - default: - assert(false); - break; - } - TYPELIB_DANGER_RELEASE(member); - } - return code; -} - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/bridges/source/cpp_uno/gcc3_linux_s390/except.cxx b/bridges/source/cpp_uno/gcc3_linux_s390/except.cxx deleted file mode 100644 index 9331665fab7f..000000000000 --- a/bridges/source/cpp_uno/gcc3_linux_s390/except.cxx +++ /dev/null @@ -1,257 +0,0 @@ -/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/* - * This file is part of the LibreOffice project. - * - * This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at http://mozilla.org/MPL/2.0/. - * - * This file incorporates work covered by the following license notice: - * - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed - * with this work for additional information regarding copyright - * ownership. The ASF licenses this file to you under the Apache - * License, Version 2.0 (the "License"); you may not use this file - * except in compliance with the License. You may obtain a copy of - * the License at http://www.apache.org/licenses/LICENSE-2.0 . - */ - - -#include -#include -#include -#include -#include -#include -#include - -#include -#include -#include -#include -#include "share.hxx" - - -using namespace ::std; -using namespace ::osl; -using namespace ::com::sun::star::uno; -using namespace ::__cxxabiv1; - - -namespace CPPU_CURRENT_NAMESPACE -{ - -void dummy_can_throw_anything( char const * ) -{ -} - -static OUString toUNOname( char const * p ) -{ -#if OSL_DEBUG_LEVEL > 1 - char const * start = p; -#endif - - // example: N3com3sun4star4lang24IllegalArgumentExceptionE - - OUStringBuffer buf( 64 ); - assert( 'N' == *p ); - ++p; // skip N - - while ('E' != *p) - { - // read chars count - long n = (*p++ - '0'); - while ('0' <= *p && '9' >= *p) - { - n *= 10; - n += (*p++ - '0'); - } - buf.appendAscii( p, n ); - p += n; - if ('E' != *p) - buf.append( '.' ); - } - -#if OSL_DEBUG_LEVEL > 1 - OUString ret( buf.makeStringAndClear() ); - OString c_ret( OUStringToOString( ret, RTL_TEXTENCODING_ASCII_US ) ); - fprintf( stderr, "> toUNOname(): %s => %s\n", start, c_ret.getStr() ); - return ret; -#else - return buf.makeStringAndClear(); -#endif -} - -class RTTI -{ - typedef std::unordered_map< OUString, type_info * > t_rtti_map; - - Mutex m_mutex; - t_rtti_map m_rttis; - t_rtti_map m_generatedRttis; - - void * m_hApp; - -public: - RTTI(); - ~RTTI(); - - type_info * getRTTI( typelib_CompoundTypeDescription * ); -}; - -RTTI::RTTI() - : m_hApp( dlopen( 0, RTLD_LAZY ) ) -{ -} - -RTTI::~RTTI() -{ - dlclose( m_hApp ); -} - - -type_info * RTTI::getRTTI( typelib_CompoundTypeDescription *pTypeDescr ) -{ - type_info * rtti; - - OUString const & unoName = *(OUString const *)&pTypeDescr->aBase.pTypeName; - - MutexGuard guard( m_mutex ); - t_rtti_map::const_iterator iRttiFind( m_rttis.find( unoName ) ); - if (iRttiFind == m_rttis.end()) - { - // RTTI symbol - OStringBuffer buf( 64 ); - buf.append( "_ZTIN" ); - sal_Int32 index = 0; - do - { - OUString token( unoName.getToken( 0, '.', index ) ); - buf.append( token.getLength() ); - OString c_token( OUStringToOString( token, RTL_TEXTENCODING_ASCII_US ) ); - buf.append( c_token ); - } - while (index >= 0); - buf.append( 'E' ); - - OString symName( buf.makeStringAndClear() ); - rtti = (type_info *)dlsym( m_hApp, symName.getStr() ); - - if (rtti) - { - pair< t_rtti_map::iterator, bool > insertion( - m_rttis.insert( t_rtti_map::value_type( unoName, rtti ) ) ); - assert(insertion.second && "### inserting new rtti failed?!"); - } - else - { - // try to lookup the symbol in the generated rtti map - t_rtti_map::const_iterator iFind( m_generatedRttis.find( unoName ) ); - if (iFind == m_generatedRttis.end()) - { - // we must generate it ! - // symbol and rtti-name is nearly identical, - // the symbol is prefixed with _ZTI - char const * rttiName = symName.getStr() +4; -#if OSL_DEBUG_LEVEL > 1 - fprintf( stderr,"generated rtti for %s\n", rttiName ); -#endif - if (pTypeDescr->pBaseTypeDescription) - { - // ensure availability of base - type_info * base_rtti = getRTTI( - (typelib_CompoundTypeDescription *)pTypeDescr->pBaseTypeDescription ); - rtti = new __si_class_type_info( - strdup( rttiName ), (__class_type_info *)base_rtti ); - } - else - { - // this class has no base class - rtti = new __class_type_info( strdup( rttiName ) ); - } - - pair< t_rtti_map::iterator, bool > insertion( - m_generatedRttis.insert( t_rtti_map::value_type( unoName, rtti ) ) ); - assert(insertion.second && "### inserting new generated rtti failed?!"); - } - else // taking already generated rtti - { - rtti = iFind->second; - } - } - } - else - { - rtti = iRttiFind->second; - } - - return rtti; -} - - -static void deleteException( void * pExc ) -{ - __cxa_exception const * header = ((__cxa_exception const *)pExc - 1); - typelib_TypeDescription * pTD = 0; - OUString unoName( toUNOname( header->exceptionType->name() ) ); - ::typelib_typedescription_getByName( &pTD, unoName.pData ); - assert(pTD && "### unknown exception type! leaving out destruction => leaking!!!"); - if (pTD) - { - ::uno_destructData( pExc, pTD, cpp_release ); - ::typelib_typedescription_release( pTD ); - } -} - -void raiseException( uno_Any * pUnoExc, uno_Mapping * pUno2Cpp ) -{ - void * pCppExc; - type_info * rtti; - - { - // construct cpp exception object - typelib_TypeDescription * pTypeDescr = 0; - TYPELIB_DANGER_GET( &pTypeDescr, pUnoExc->pType ); - assert(pTypeDescr); - if (! pTypeDescr) - terminate(); - - pCppExc = __cxa_allocate_exception( pTypeDescr->nSize ); - ::uno_copyAndConvertData( pCppExc, pUnoExc->pData, pTypeDescr, pUno2Cpp ); - - // destruct uno exception - ::uno_any_destruct( pUnoExc, 0 ); - // avoiding locked counts - static RTTI rtti_data; - rtti = (type_info*)rtti_data.getRTTI((typelib_CompoundTypeDescription*)pTypeDescr); - TYPELIB_DANGER_RELEASE( pTypeDescr ); - if (! rtti) - terminate(); - } - - __cxa_throw( pCppExc, rtti, deleteException ); -} - -void fillUnoException(uno_Any * pExc, uno_Mapping * pCpp2Uno) -{ - __cxa_exception * header = __cxa_get_globals()->caughtExceptions; - if (! header) - terminate(); - - std::type_info *exceptionType = __cxa_current_exception_type(); - - typelib_TypeDescription * pExcTypeDescr = 0; - OUString unoName( toUNOname( exceptionType->name() ) ); - ::typelib_typedescription_getByName( &pExcTypeDescr, unoName.pData ); - if (! pExcTypeDescr) - terminate(); - - // construct uno exception any - ::uno_any_constructAndConvert( pExc, header->adjustedPtr, pExcTypeDescr, pCpp2Uno ); - ::typelib_typedescription_release( pExcTypeDescr ); -} - -} - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/bridges/source/cpp_uno/gcc3_linux_s390/share.hxx b/bridges/source/cpp_uno/gcc3_linux_s390/share.hxx deleted file mode 100644 index 63e4f2bcd629..000000000000 --- a/bridges/source/cpp_uno/gcc3_linux_s390/share.hxx +++ /dev/null @@ -1,83 +0,0 @@ -/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/* - * This file is part of the LibreOffice project. - * - * This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at http://mozilla.org/MPL/2.0/. - * - * This file incorporates work covered by the following license notice: - * - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed - * with this work for additional information regarding copyright - * ownership. The ASF licenses this file to you under the Apache - * License, Version 2.0 (the "License"); you may not use this file - * except in compliance with the License. You may obtain a copy of - * the License at http://www.apache.org/licenses/LICENSE-2.0 . - */ -#pragma once - -#include "uno/mapping.h" - -#include -#include -#include - -namespace CPPU_CURRENT_NAMESPACE -{ - - void dummy_can_throw_anything( char const * ); - - -// ----- following decl from libstdc++-v3/libsupc++/unwind-cxx.h and unwind.h - -struct _Unwind_Exception -{ - unsigned exception_class __attribute__((__mode__(__DI__))); - void * exception_cleanup; - unsigned private_1 __attribute__((__mode__(__word__))); - unsigned private_2 __attribute__((__mode__(__word__))); -} __attribute__((__aligned__)); - -struct __cxa_exception -{ - std::type_info *exceptionType; - void (*exceptionDestructor)(void *); - - void (*unexpectedHandler)(); // std::unexpected_handler dropped from C++17 - std::terminate_handler terminateHandler; - - __cxa_exception *nextException; - - int handlerCount; - - int handlerSwitchValue; - const unsigned char *actionRecord; - const unsigned char *languageSpecificData; - void *catchTemp; - void *adjustedPtr; - - _Unwind_Exception unwindHeader; -}; - -extern "C" void *__cxa_allocate_exception( - std::size_t thrown_size ) throw(); -extern "C" void __cxa_throw ( - void *thrown_exception, std::type_info *tinfo, void (*dest) (void *) ) __attribute__((noreturn)); - -struct __cxa_eh_globals -{ - __cxa_exception *caughtExceptions; - unsigned int uncaughtExceptions; -}; - -extern "C" __cxa_eh_globals *__cxa_get_globals () throw(); -extern "C" std::type_info *__cxa_current_exception_type() throw(); - -void raiseException( - uno_Any * pUnoExc, uno_Mapping * pUno2Cpp ); -void fillUnoException(uno_Any *, uno_Mapping * pCpp2Uno); -} - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/bridges/source/cpp_uno/gcc3_linux_s390/uno2cpp.cxx b/bridges/source/cpp_uno/gcc3_linux_s390/uno2cpp.cxx deleted file mode 100644 index 27d773706df1..000000000000 --- a/bridges/source/cpp_uno/gcc3_linux_s390/uno2cpp.cxx +++ /dev/null @@ -1,637 +0,0 @@ -/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/* - * This file is part of the LibreOffice project. - * - * This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at http://mozilla.org/MPL/2.0/. - * - * This file incorporates work covered by the following license notice: - * - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed - * with this work for additional information regarding copyright - * ownership. The ASF licenses this file to you under the Apache - * License, Version 2.0 (the "License"); you may not use this file - * except in compliance with the License. You may obtain a copy of - * the License at http://www.apache.org/licenses/LICENSE-2.0 . - */ - -#include - -#include -#include -#include - -#include -#include -#include -#include -#include - -#include "bridge.hxx" -#include "types.hxx" -#include "unointerfaceproxy.hxx" -#include "vtables.hxx" - -#include "share.hxx" - -#include -#include - - -using namespace ::com::sun::star::uno; - -namespace -{ -static sal_Int32 -invoke_count_words(char * pPT) -{ - sal_Int32 overflow = 0, gpr = 0, fpr = 0; - - while (*pPT != 'X') { - // character of parameter type being decoded - const int c = *pPT; - - switch (c) { - case 'D': /* type is double */ - if (fpr < 2) fpr++; else overflow+=2; - break; - - case 'F': /* type is float */ - if (fpr < 2) fpr++; else overflow++; - break; - - case 'H': /* type is long long */ - if (gpr < 4) gpr+=2; else gpr=5, overflow+=2; - break; - - case 'S': - case 'T': - case 'B': - case 'C': - if (gpr < 5) gpr++; else overflow++; - break; - - default: - if (gpr < 5) gpr++; else overflow++; - break; - } - pPT++; - } - /* Round up number of overflow words to ensure stack - stays aligned to 8 bytes. */ - return (overflow + 1) & ~1; -} - -static void -//invoke_copy_to_stack(sal_Int32 paramCount, sal_Int32 * pStackLongs, char * pPT, sal_Int32* d_ov, sal_Int32 overflow) -invoke_copy_to_stack(sal_Int32 * pStackLongs, char * pPT, sal_Int32* d_ov, sal_Int32 overflow) -{ - sal_Int32 *d_gpr = d_ov + overflow; - sal_Int64 *d_fpr = (sal_Int64 *)(d_gpr + 5); - sal_Int32 gpr = 0, fpr = 0; - - while (*pPT != 'X') { - const char c = *pPT; - switch (c) { - case 'D': /* type is double */ - if (fpr < 2) - *((double*) d_fpr) = *((double *)pStackLongs), d_fpr++, fpr++; - else - *((double*) d_ov ) = *((double *)pStackLongs), d_ov+=2; - - pStackLongs += 2; - break; - - case 'F': /* type is float */ - if (fpr < 2) { - *((sal_Int64*) d_fpr) = 0; - *((float*) d_fpr) = *((float *)pStackLongs), d_fpr++, fpr++; - } - else { - *((sal_Int64*) d_ov) = 0; - *((float*) d_ov ) = *((float *)pStackLongs), d_ov++; - } - - pStackLongs += 1; - break; - - case 'H': /* type is long long */ - if (gpr < 4) { - *((sal_Int64*) d_gpr) = *((sal_Int64*) pStackLongs), d_gpr+=2, gpr+=2; - } - else { - *((sal_Int64*) d_ov ) = *((sal_Int64*) pStackLongs), d_ov+=2, gpr=5; - } - pStackLongs += 2; - break; - - case 'S': - if (gpr < 5) - *((sal_uInt32*)d_gpr) = *((unsigned short*)pStackLongs), d_gpr++, gpr++; - else - *((sal_uInt32*)d_ov ) = *((unsigned short*)pStackLongs), d_ov++; - pStackLongs += 1; - break; - - case 'T': - if (gpr < 5) - *((sal_Int32*)d_gpr) = *((signed short*)pStackLongs), d_gpr++, gpr++; - else - *((sal_Int32*)d_ov ) = *((signed short*)pStackLongs), d_ov++; - pStackLongs += 1; - break; - - case 'B': - if (gpr < 5) - *((sal_uInt32*)d_gpr) = *((unsigned char*)pStackLongs), d_gpr++, gpr++; - else - *((sal_uInt32*)d_ov ) = *((unsigned char*)pStackLongs), d_ov++; - pStackLongs += 1; - break; - - case 'C': - if (gpr < 5) - *((sal_Int32*)d_gpr) = *((signed char*)pStackLongs), d_gpr++, gpr++; - else - *((sal_Int32*)d_ov ) = *((signed char*)pStackLongs), d_ov++; - pStackLongs += 1; - break; - - default: - if (gpr < 5) - *((sal_Int32*)d_gpr) = *pStackLongs, d_gpr++, gpr++; - else - *((sal_Int32*)d_ov ) = *pStackLongs, d_ov++; - pStackLongs += 1; - break; - } - pPT++; - } -} - -static void callVirtualMethod( - void * pThis, - sal_Int32 nVtableIndex, - void * pRegisterReturn, - typelib_TypeClass eReturnType, - char * pPT, - sal_Int32 * pStackLongs, - sal_Int32 nStackLongs) -{ - - // parameter list is mixed list of * and values - // reference parameters are pointers - - // the basic idea here is to use gpr[5] as a storage area for - // the future values of registers r2 to r6 needed for the call, - // and similarly fpr[2] as a storage area for the future values - // of floating point registers f0 to f2 - - sal_Int32 *vtable = *(sal_Int32 **)pThis; -// sal_Int32 method = vtable[nVtableIndex + 2]; - sal_Int32 method = vtable[nVtableIndex]; - sal_Int32 overflow = invoke_count_words (pPT); - sal_Int32 result; - volatile double dret; // temporary function return values - volatile float fret; - volatile int iret, iret2; - - void * dummy = alloca(32); // dummy alloca to force r11 usage for exception handling - - __asm__ __volatile__ - ( - "lr 7,15\n\t" - "ahi 7,-48\n\t" - - "lr 3,%2\n\t" - "sll 3,2\n\t" - "lcr 3,3\n\t" - "l 2,0(15)\n\t" - "la 15,0(3,7)\n\t" - "st 2,0(15)\n\t" - - "lr 2,%0\n\t" - "lr 3,%1\n\t" - "la 4,96(15)\n\t" - "lr 5,%2\n\t" - "basr 14,%3\n\t" - - "ld 0,116(7)\n\t" - "ld 2,124(7)\n\t" - "lm 2,6,96(7)\n\t" - : - : "r" (pStackLongs), - "r" (pPT), - "r" (overflow), - "a" (invoke_copy_to_stack), - "a" (method), - "X" (dummy) - : "2", "3", "4", "5", "6", "7", "memory" - ); -// "basr 14,%8\n\t" - - (*(void (*)())method)(); - - __asm__ __volatile__ - ( - "la 15,48(7)\n\t" - - "lr %2,2\n\t" - "lr %3,3\n\t" - "ler %0,0\n\t" - "ldr %1,0\n\t" - - : "=f" (fret), "=f" (dret), "=r" (iret), "=r" (iret2) - ); - - switch( eReturnType ) - { - case typelib_TypeClass_HYPER: - case typelib_TypeClass_UNSIGNED_HYPER: -// ((long*)pRegisterReturn)[0] = iret; - ((long*)pRegisterReturn)[1] = iret2; - case typelib_TypeClass_LONG: - case typelib_TypeClass_UNSIGNED_LONG: - case typelib_TypeClass_ENUM: - ((long*)pRegisterReturn)[0] = iret; - break; - case typelib_TypeClass_CHAR: - case typelib_TypeClass_SHORT: - case typelib_TypeClass_UNSIGNED_SHORT: - *(unsigned short*)pRegisterReturn = (unsigned short)iret; - break; - case typelib_TypeClass_BOOLEAN: - case typelib_TypeClass_BYTE: - *(unsigned char*)pRegisterReturn = (unsigned char)iret; - break; - case typelib_TypeClass_FLOAT: - *(float*)pRegisterReturn = fret; - break; - case typelib_TypeClass_DOUBLE: - *(double*)pRegisterReturn = dret; - break; - } -} - - -static void cpp_call( - bridges::cpp_uno::shared::UnoInterfaceProxy * pThis, - bridges::cpp_uno::shared::VtableSlot aVtableSlot, - typelib_TypeDescriptionReference * pReturnTypeRef, - sal_Int32 nParams, typelib_MethodParameter * pParams, - void * pUnoReturn, void * pUnoArgs[], uno_Any ** ppUnoExc ) -{ - // max space for: [complex ret ptr], values|ptr ... - char * pCppStack = - (char *)alloca( sizeof(sal_Int32) + ((nParams+2) * sizeof(sal_Int64)) ); - char * pCppStackStart = pCppStack; - - // need to know parameter types for callVirtualMethod so generate a signature string - char * pParamType = (char *) alloca(nParams+2); - char * pPT = pParamType; - - // return - typelib_TypeDescription * pReturnTypeDescr = 0; - TYPELIB_DANGER_GET( &pReturnTypeDescr, pReturnTypeRef ); - assert(pReturnTypeDescr); - - void * pCppReturn = 0; // if != 0 && != pUnoReturn, needs reconversion - - if (pReturnTypeDescr) - { - if (bridges::cpp_uno::shared::isSimpleType( pReturnTypeDescr )) - { - pCppReturn = pUnoReturn; // direct way for simple types - } - else - { - // complex return via ptr - pCppReturn = *(void **)pCppStack = (bridges::cpp_uno::shared::relatesToInterfaceType( pReturnTypeDescr ) - ? alloca( pReturnTypeDescr->nSize ) - : pUnoReturn); // direct way - *pPT++ = 'I'; //signify that a complex return type on stack - pCppStack += sizeof(void *); - } - } - // push "this" pointer - void * pAdjustedThisPtr = reinterpret_cast< void ** >( pThis->getCppI() ) + aVtableSlot.offset; - *(void**)pCppStack = pAdjustedThisPtr; - pCppStack += sizeof( void* ); - *pPT++ = 'I'; - - // stack space - static_assert(sizeof(void *) == sizeof(sal_Int32), "### unexpected size!"); - // args - void ** pCppArgs = (void **)alloca( 3 * sizeof(void *) * nParams ); - // indices of values this have to be converted (interface conversion cpp<=>uno) - sal_Int32 * pTempIndices = (sal_Int32 *)(pCppArgs + nParams); - // type descriptions for reconversions - typelib_TypeDescription ** ppTempParamTypeDescr = (typelib_TypeDescription **)(pCppArgs + (2 * nParams)); - - sal_Int32 nTempIndices = 0; - - for ( sal_Int32 nPos = 0; nPos < nParams; ++nPos ) - { - const typelib_MethodParameter & rParam = pParams[nPos]; - typelib_TypeDescription * pParamTypeDescr = 0; - TYPELIB_DANGER_GET( &pParamTypeDescr, rParam.pTypeRef ); - - if (!rParam.bOut && bridges::cpp_uno::shared::isSimpleType( pParamTypeDescr )) - { - uno_copyAndConvertData( pCppArgs[nPos] = pCppStack, pUnoArgs[nPos], pParamTypeDescr, - pThis->getBridge()->getUno2Cpp() ); - - switch (pParamTypeDescr->eTypeClass) - { - - // we need to know type of each param so that we know whether to use - // gpr or fpr to pass in parameters: - // Key: I - int, long, pointer, etc means pass in gpr - // B - byte value passed in gpr - // S - short value passed in gpr - // F - float value pass in fpr - // D - double value pass in fpr - // H - long long int pass in proper pairs of gpr (3,4) (5,6), etc - // X - indicates end of parameter description string - - case typelib_TypeClass_LONG: - case typelib_TypeClass_UNSIGNED_LONG: - case typelib_TypeClass_ENUM: - *pPT++ = 'I'; - break; - case typelib_TypeClass_SHORT: - *pPT++ = 'T'; - break; - case typelib_TypeClass_CHAR: - case typelib_TypeClass_UNSIGNED_SHORT: - *pPT++ = 'S'; - break; - case typelib_TypeClass_BOOLEAN: - *pPT++ = 'B'; - break; - case typelib_TypeClass_BYTE: - *pPT++ = 'C'; - break; - case typelib_TypeClass_FLOAT: - *pPT++ = 'F'; - break; - case typelib_TypeClass_DOUBLE: - *pPT++ = 'D'; - pCppStack += sizeof(sal_Int32); // extra long - break; - case typelib_TypeClass_HYPER: - case typelib_TypeClass_UNSIGNED_HYPER: - *pPT++ = 'H'; - pCppStack += sizeof(sal_Int32); // extra long - } - - // no longer needed - TYPELIB_DANGER_RELEASE( pParamTypeDescr ); - } - else // ptr to complex value | ref - { - if (! rParam.bIn) // is pure out - { - // cpp out is constructed mem, uno out is not! - uno_constructData( - *(void **)pCppStack = pCppArgs[nPos] = alloca( pParamTypeDescr->nSize ), - pParamTypeDescr ); - pTempIndices[nTempIndices] = nPos; // default constructed for cpp call - // will be released at reconversion - ppTempParamTypeDescr[nTempIndices++] = pParamTypeDescr; - } - // is in/inout - else if (bridges::cpp_uno::shared::relatesToInterfaceType( pParamTypeDescr )) - { - uno_copyAndConvertData( - *(void **)pCppStack = pCppArgs[nPos] = alloca( pParamTypeDescr->nSize ), - pUnoArgs[nPos], pParamTypeDescr, pThis->getBridge()->getUno2Cpp() ); - - pTempIndices[nTempIndices] = nPos; // has to be reconverted - // will be released at reconversion - ppTempParamTypeDescr[nTempIndices++] = pParamTypeDescr; - } - else // direct way - { - *(void **)pCppStack = pCppArgs[nPos] = pUnoArgs[nPos]; - // no longer needed - TYPELIB_DANGER_RELEASE( pParamTypeDescr ); - } - // KBH: FIXME: is this the right way to pass these - *pPT++='I'; - } - pCppStack += sizeof(sal_Int32); // standard parameter length - } - - // terminate the signature string - *pPT++='X'; - *pPT=0; - - try - { - assert( !( (pCppStack - pCppStackStart ) & 3) && "UNALIGNED STACK !!! (Please DO panic)" ); - try { - callVirtualMethod( - pAdjustedThisPtr, aVtableSlot.index, - pCppReturn, pReturnTypeDescr->eTypeClass, pParamType, - (sal_Int32 *)pCppStackStart, (pCppStack - pCppStackStart) / sizeof(sal_Int32) ); - } catch (css::uno::Exception &) { - throw; - } catch (std::exception & e) { - throw css::uno::RuntimeException( - "C++ code threw " + o3tl::runtimeToOUString(typeid(e).name()) + ": " - + o3tl::runtimeToOUString(e.what())); - } catch (...) { - throw css::uno::RuntimeException("C++ code threw unknown exception"); - } - // NO exception occurred... - *ppUnoExc = 0; - - // reconvert temporary params - for ( ; nTempIndices--; ) - { - sal_Int32 nIndex = pTempIndices[nTempIndices]; - typelib_TypeDescription * pParamTypeDescr = ppTempParamTypeDescr[nTempIndices]; - - if (pParams[nIndex].bIn) - { - if (pParams[nIndex].bOut) // inout - { - uno_destructData( pUnoArgs[nIndex], pParamTypeDescr, 0 ); // destroy uno value - uno_copyAndConvertData( pUnoArgs[nIndex], pCppArgs[nIndex], pParamTypeDescr, - pThis->getBridge()->getCpp2Uno() ); - } - } - else // pure out - { - uno_copyAndConvertData( pUnoArgs[nIndex], pCppArgs[nIndex], pParamTypeDescr, - pThis->getBridge()->getCpp2Uno() ); - } - // destroy temp cpp param => cpp: every param was constructed - uno_destructData( pCppArgs[nIndex], pParamTypeDescr, cpp_release ); - - TYPELIB_DANGER_RELEASE( pParamTypeDescr ); - } - // return value - if (pCppReturn && pUnoReturn != pCppReturn) - { - uno_copyAndConvertData( pUnoReturn, pCppReturn, pReturnTypeDescr, - pThis->getBridge()->getCpp2Uno() ); - uno_destructData( pCppReturn, pReturnTypeDescr, cpp_release ); - } - } - catch (...) - { - // fill uno exception - CPPU_CURRENT_NAMESPACE::fillUnoException(*ppUnoExc, pThis->getBridge()->getCpp2Uno()); - - - // temporary params - for ( ; nTempIndices--; ) - { - sal_Int32 nIndex = pTempIndices[nTempIndices]; - // destroy temp cpp param => cpp: every param was constructed - uno_destructData( pCppArgs[nIndex], ppTempParamTypeDescr[nTempIndices], cpp_release ); - TYPELIB_DANGER_RELEASE( ppTempParamTypeDescr[nTempIndices] ); - } - // return type - if (pReturnTypeDescr) - TYPELIB_DANGER_RELEASE( pReturnTypeDescr ); - } -} -} - -namespace bridges::cpp_uno::shared { - -void unoInterfaceProxyDispatch( - uno_Interface * pUnoI, const typelib_TypeDescription * pMemberDescr, - void * pReturn, void * pArgs[], uno_Any ** ppException ) -{ -#if OSL_DEBUG_LEVEL > 2 - fprintf(stderr, "unoInterfaceProxyDispatch\n"); -#endif - - - // is my surrogate - bridges::cpp_uno::shared::UnoInterfaceProxy * pThis - = static_cast< bridges::cpp_uno::shared::UnoInterfaceProxy *> (pUnoI); - - switch (pMemberDescr->eTypeClass) - { - case typelib_TypeClass_INTERFACE_ATTRIBUTE: - { - - VtableSlot aVtableSlot( - getVtableSlot( - reinterpret_cast< - typelib_InterfaceAttributeTypeDescription const * >( - pMemberDescr))); - - if (pReturn) - { - // dependent dispatch - cpp_call( - pThis, aVtableSlot, - ((typelib_InterfaceAttributeTypeDescription *)pMemberDescr)->pAttributeTypeRef, - 0, 0, // no params - pReturn, pArgs, ppException ); - } - else - { - // is SET - typelib_MethodParameter aParam; - aParam.pTypeRef = - ((typelib_InterfaceAttributeTypeDescription *)pMemberDescr)->pAttributeTypeRef; - aParam.bIn = sal_True; - aParam.bOut = sal_False; - - typelib_TypeDescriptionReference * pReturnTypeRef = 0; - OUString aVoidName("void"); - typelib_typedescriptionreference_new( - &pReturnTypeRef, typelib_TypeClass_VOID, aVoidName.pData ); - - // dependent dispatch - aVtableSlot.index += 1; //get then set method - cpp_call( - pThis, aVtableSlot, - pReturnTypeRef, - 1, &aParam, - pReturn, pArgs, ppException ); - - typelib_typedescriptionreference_release( pReturnTypeRef ); - } - - break; - } - case typelib_TypeClass_INTERFACE_METHOD: - { - - VtableSlot aVtableSlot( - getVtableSlot( - reinterpret_cast< - typelib_InterfaceMethodTypeDescription const * >( - pMemberDescr))); - switch (aVtableSlot.index) - { - // standard calls - case 1: // acquire uno interface - (*pUnoI->acquire)( pUnoI ); - *ppException = 0; - break; - case 2: // release uno interface - (*pUnoI->release)( pUnoI ); - *ppException = 0; - break; - case 0: // queryInterface() opt - { - typelib_TypeDescription * pTD = 0; - TYPELIB_DANGER_GET( &pTD, reinterpret_cast< Type * >( pArgs[0] )->getTypeLibType() ); - if (pTD) - { - uno_Interface * pInterface = 0; - (*pThis->pBridge->getUnoEnv()->getRegisteredInterface)( - pThis->pBridge->getUnoEnv(), - (void **)&pInterface, pThis->oid.pData, (typelib_InterfaceTypeDescription *)pTD ); - - if (pInterface) - { - ::uno_any_construct( - reinterpret_cast< uno_Any * >( pReturn ), - &pInterface, pTD, 0 ); - (*pInterface->release)( pInterface ); - TYPELIB_DANGER_RELEASE( pTD ); - *ppException = 0; - break; - } - TYPELIB_DANGER_RELEASE( pTD ); - } - } // else perform queryInterface() - default: - // dependent dispatch - cpp_call( - pThis, aVtableSlot, - ((typelib_InterfaceMethodTypeDescription *)pMemberDescr)->pReturnTypeRef, - ((typelib_InterfaceMethodTypeDescription *)pMemberDescr)->nParams, - ((typelib_InterfaceMethodTypeDescription *)pMemberDescr)->pParams, - pReturn, pArgs, ppException ); - } - break; - } - default: - { - ::com::sun::star::uno::RuntimeException aExc( - "illegal member type description!", - ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >() ); - - Type const & rExcType = cppu::UnoType::get(); - // binary identical null reference - ::uno_type_any_construct( *ppException, &aExc, rExcType.getTypeLibType(), 0 ); - } - } -} - -} - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/configure.ac b/configure.ac index b7107fb75e53..d6291f7f4fc5 100644 --- a/configure.ac +++ b/configure.ac @@ -5216,11 +5216,6 @@ linux-gnu*|linux-musl*) RTL_ARCH=SPARC64 PLATFORMID=linux_sparc64 ;; - s390) - CPUNAME=S390 - RTL_ARCH=S390 - PLATFORMID=linux_s390 - ;; s390x) CPUNAME=S390X RTL_ARCH=S390x diff --git a/desktop/source/deployment/misc/dp_platform.cxx b/desktop/source/deployment/misc/dp_platform.cxx index 1f83bed37756..d42cfe436b90 100644 --- a/desktop/source/deployment/misc/dp_platform.cxx +++ b/desktop/source/deployment/misc/dp_platform.cxx @@ -115,8 +115,6 @@ namespace ret = checkOSandCPU(u"Linux", u"IA64"); else if (token == u"linux_m68k") ret = checkOSandCPU(u"Linux", u"M68K"); - else if (token == u"linux_s390") - ret = checkOSandCPU(u"Linux", u"S390"); else if (token == u"linux_s390x") ret = checkOSandCPU(u"Linux", u"S390x"); else if (token == u"linux_hppa") diff --git a/desktop/test/deployment/update/platform/linux_s390.oxt b/desktop/test/deployment/update/platform/linux_s390.oxt deleted file mode 100644 index 199702ebf056..000000000000 Binary files a/desktop/test/deployment/update/platform/linux_s390.oxt and /dev/null differ diff --git a/desktop/test/deployment/update/platform/readme.txt b/desktop/test/deployment/update/platform/readme.txt index 30c028f9931d..222895ad73c9 100644 --- a/desktop/test/deployment/update/platform/readme.txt +++ b/desktop/test/deployment/update/platform/readme.txt @@ -12,7 +12,6 @@ linux_mips_el.oxt: linux_mips_el linux_mips64_el.oxt: linux_mips64_el linux_powerpc64.oxt: linux_powerpc64 linux_powerpc.oxt: linux_powerpc -linux_s390.oxt: linux_s390 linux_s390x.oxt: linux_s390x linux_sparc.oxt: linux_sparc linux_x86.oxt: linux_x86 diff --git a/jvmfwk/inc/vendorbase.hxx b/jvmfwk/inc/vendorbase.hxx index dca8f3fb02d8..210b2f1da204 100644 --- a/jvmfwk/inc/vendorbase.hxx +++ b/jvmfwk/inc/vendorbase.hxx @@ -63,8 +63,6 @@ OpenJDK at least, but probably not true for Lemotes JDK */ #define JFW_PLUGIN_ARCH "riscv64" #elif defined S390X #define JFW_PLUGIN_ARCH "s390x" -#elif defined S390 -#define JFW_PLUGIN_ARCH "s390" #elif defined ARM #define JFW_PLUGIN_ARCH "arm" #elif defined IA64 diff --git a/postprocess/CustomTarget_registry.mk b/postprocess/CustomTarget_registry.mk index 66b205f9771c..2a7099daa2da 100644 --- a/postprocess/CustomTarget_registry.mk +++ b/postprocess/CustomTarget_registry.mk @@ -322,7 +322,7 @@ else postprocess_FILES_main += $(postprocess_MOD)/org/openoffice/Office/Paths-internallibnumbertextdata.xcu endif -ifneq ($(filter POWERPC INTEL ARM HPPA MIPS M68K SPARC S390,$(CPUNAME)),) +ifneq ($(filter POWERPC INTEL ARM HPPA MIPS M68K SPARC,$(CPUNAME)),) postprocess_FILES_main += \ $(postprocess_MOD)/org/openoffice/Office/Common-32bit.xcu endif diff --git a/sal/osl/unx/system.cxx b/sal/osl/unx/system.cxx index 875f4101667c..19c32226df2f 100644 --- a/sal/osl/unx/system.cxx +++ b/sal/osl/unx/system.cxx @@ -155,7 +155,7 @@ int macxp_resolveAlias(char *path, int buflen) //libuno_sal so that dlopening of the libgcj provided libjvm.so on some //platforms where it needs that symbol will succeed. e.g. Debian mips/lenny //with gcc 4.3. With this in place the smoketest succeeds with libgcj provided -//java. Quite possibly also required/helpful for s390x/s390 and maybe some +//java. Quite possibly also required/helpful for s390x and maybe some //others. Without it the dlopen of libjvm.so will fail with __data_start //not found extern int __data_start[] __attribute__((weak)); diff --git a/solenv/clang-format/excludelist b/solenv/clang-format/excludelist index 155f88ee1a15..36ea57aeb2d9 100644 --- a/solenv/clang-format/excludelist +++ b/solenv/clang-format/excludelist @@ -488,10 +488,6 @@ bridges/source/cpp_uno/gcc3_linux_powerpc64/cpp2uno.cxx bridges/source/cpp_uno/gcc3_linux_powerpc64/except.cxx bridges/source/cpp_uno/gcc3_linux_powerpc64/share.hxx bridges/source/cpp_uno/gcc3_linux_powerpc64/uno2cpp.cxx -bridges/source/cpp_uno/gcc3_linux_s390/cpp2uno.cxx -bridges/source/cpp_uno/gcc3_linux_s390/except.cxx -bridges/source/cpp_uno/gcc3_linux_s390/share.hxx -bridges/source/cpp_uno/gcc3_linux_s390/uno2cpp.cxx bridges/source/cpp_uno/gcc3_linux_s390x/cpp2uno.cxx bridges/source/cpp_uno/gcc3_linux_s390x/except.cxx bridges/source/cpp_uno/gcc3_linux_s390x/share.hxx