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

Drop unused nGPR parameter

Browse Source 
same as aa04177e7c for gcc_linux_x86-64

Change-Id: I2c1e203271aa0038b83c3c55a37eab59411a6857
This commit is contained in:
Stephan Bergmann
2016-11-02 21:27:20 +01:00
parent f996a5a153
commit 6daac9adb4
3 changed files with 5 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
bridges/source/cpp_uno/gcc3_macosx_x86-64/callvirtualmethod.cxx
View File

@@ -48,14 +48,12 @@
void CPPU_CURRENT_NAMESPACE::callVirtualMethod(
void * pThis, sal_uInt32 nVtableIndex, void * pRegisterReturn,
typelib_TypeDescriptionReference * pReturnTypeRef, bool bSimpleReturn,
sal_uInt64 *pStack, sal_uInt32 nStack, sal_uInt64 *pGPR, sal_uInt32 nGPR,
double * pFPR, sal_uInt32 nFPR)
sal_uInt64 *pStack, sal_uInt32 nStack, sal_uInt64 *pGPR, double * pFPR,
sal_uInt32 nFPR)
{
// Should not happen, but...
if ( nFPR > x86_64::MAX_SSE_REGS )
nFPR = x86_64::MAX_SSE_REGS;
if ( nGPR > x86_64::MAX_GPR_REGS )
nGPR = x86_64::MAX_GPR_REGS;
// Work around -fsanitize=address "inline assembly requires more registers
// than available" error:

4
bridges/source/cpp_uno/gcc3_macosx_x86-64/callvirtualmethod.hxx
View File

@@ -31,8 +31,8 @@ namespace CPPU_CURRENT_NAMESPACE {
void callVirtualMethod(
void * pThis, sal_uInt32 nVtableIndex, void * pRegisterReturn,
typelib_TypeDescriptionReference * pReturnTypeRef, bool bSimpleReturn,
sal_uInt64 *pStack, sal_uInt32 nStack, sal_uInt64 *pGPR, sal_uInt32 nGPR,
double * pFPR, sal_uInt32 nFPR);
sal_uInt64 *pStack, sal_uInt32 nStack, sal_uInt64 *pGPR, double * pFPR,
sal_uInt32 nFPR);
}

2
bridges/source/cpp_uno/gcc3_macosx_x86-64/uno2cpp.cxx
View File

@@ -242,7 +242,7 @@ static void cpp_call(
pAdjustedThisPtr, aVtableSlot.index,
pCppReturn, pReturnTypeRef, bSimpleReturn,
pStackStart, ( pStack - pStackStart ),
pGPR, nGPR,
pGPR,
pFPR, nFPR );
} catch (const Exception &) {
throw;