Kaydet (Commit) 6daac9ad authored tarafından Stephan Bergmann's avatar Stephan Bergmann

Drop unused nGPR parameter

same as aa04177e for gcc_linux_x86-64

Change-Id: I2c1e203271aa0038b83c3c55a37eab59411a6857
üst f996a5a1
...@@ -48,14 +48,12 @@ ...@@ -48,14 +48,12 @@
void CPPU_CURRENT_NAMESPACE::callVirtualMethod( void CPPU_CURRENT_NAMESPACE::callVirtualMethod(
void * pThis, sal_uInt32 nVtableIndex, void * pRegisterReturn, void * pThis, sal_uInt32 nVtableIndex, void * pRegisterReturn,
typelib_TypeDescriptionReference * pReturnTypeRef, bool bSimpleReturn, typelib_TypeDescriptionReference * pReturnTypeRef, bool bSimpleReturn,
sal_uInt64 *pStack, sal_uInt32 nStack, sal_uInt64 *pGPR, sal_uInt32 nGPR, sal_uInt64 *pStack, sal_uInt32 nStack, sal_uInt64 *pGPR, double * pFPR,
double * pFPR, sal_uInt32 nFPR) sal_uInt32 nFPR)
{ {
// Should not happen, but... // Should not happen, but...
if ( nFPR > x86_64::MAX_SSE_REGS ) if ( nFPR > x86_64::MAX_SSE_REGS )
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 // Work around -fsanitize=address "inline assembly requires more registers
// than available" error: // than available" error:
......
...@@ -31,8 +31,8 @@ namespace CPPU_CURRENT_NAMESPACE { ...@@ -31,8 +31,8 @@ namespace CPPU_CURRENT_NAMESPACE {
void callVirtualMethod( void callVirtualMethod(
void * pThis, sal_uInt32 nVtableIndex, void * pRegisterReturn, void * pThis, sal_uInt32 nVtableIndex, void * pRegisterReturn,
typelib_TypeDescriptionReference * pReturnTypeRef, bool bSimpleReturn, typelib_TypeDescriptionReference * pReturnTypeRef, bool bSimpleReturn,
sal_uInt64 *pStack, sal_uInt32 nStack, sal_uInt64 *pGPR, sal_uInt32 nGPR, sal_uInt64 *pStack, sal_uInt32 nStack, sal_uInt64 *pGPR, double * pFPR,
double * pFPR, sal_uInt32 nFPR); sal_uInt32 nFPR);
} }
......
...@@ -242,7 +242,7 @@ static void cpp_call( ...@@ -242,7 +242,7 @@ static void cpp_call(
pAdjustedThisPtr, aVtableSlot.index, pAdjustedThisPtr, aVtableSlot.index,
pCppReturn, pReturnTypeRef, bSimpleReturn, pCppReturn, pReturnTypeRef, bSimpleReturn,
pStackStart, ( pStack - pStackStart ), pStackStart, ( pStack - pStackStart ),
pGPR, nGPR, pGPR,
pFPR, nFPR ); pFPR, nFPR );
} catch (const Exception &) { } catch (const Exception &) {
throw; throw;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment