diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2014-07-07 11:52:57 +0200 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2014-07-07 12:01:03 +0200 |
| commit | 8a85f9f29f13805af449943990af8af8399ab7b5 (patch) | |
| tree | 388f6d9cfacbdbbfafe3ef1f8d9b04f03b609267 /bridges/source | |
| parent | aa04177e7c43d75bc87875a9d8ce2393d7263822 (diff) | |
Drop unnecessary nFPR parameter
...as passing (an upper bound on) the number of vector registers used in %al is
only required for variable-argument function calls, according to
<http://www.x86-64.org/documentation/abi.pdf> "System V Application Binary
Interface: AMD64 Architecture Processor Supplement, Draft Version 0.99.6."
Unclear why this got added in f424e55b4e66ffbee5b34f45ef5ea18d77c4d15c
"INTEGRATION: CWS sixtyfour11," maybe on the basis of "doesn't hurt."
Change-Id: If6f8359d5bf6458274905d64adf82634bf90a24d
Diffstat (limited to 'bridges/source')
3 files changed, 7 insertions, 17 deletions
diff --git a/bridges/source/cpp_uno/gcc3_linux_x86-64/callvirtualmethod.cxx b/bridges/source/cpp_uno/gcc3_linux_x86-64/callvirtualmethod.cxx index dba9bfed45f2..6dae025d3174 100644 --- a/bridges/source/cpp_uno/gcc3_linux_x86-64/callvirtualmethod.cxx +++ b/bridges/source/cpp_uno/gcc3_linux_x86-64/callvirtualmethod.cxx @@ -48,20 +48,14 @@ 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, double * pFPR, - sal_uInt32 nFPR) + sal_uInt64 *pStack, sal_uInt32 nStack, sal_uInt64 *pGPR, double * pFPR) { - // Should not happen, but... - if ( nFPR > x86_64::MAX_SSE_REGS ) - nFPR = x86_64::MAX_SSE_REGS; - // Work around Clang -fsanitize=address "inline assembly requires more // registers than available" error: struct Data { sal_uInt64 pMethod; sal_uInt64 * pGPR; double * pFPR; - sal_uInt64 nFPR; // Return values: sal_uInt64 rax; sal_uInt64 rdx; @@ -70,7 +64,6 @@ void CPPU_CURRENT_NAMESPACE::callVirtualMethod( } data; data.pGPR = pGPR; data.pFPR = pFPR; - data.nFPR = nFPR; // Get pointer to method sal_uInt64 pMethod = *((sal_uInt64 *)pThis); @@ -113,14 +106,13 @@ void CPPU_CURRENT_NAMESPACE::callVirtualMethod( // Perform the call "movq 0%0, %%r11\n\t" - "movq 24%0, %%rax\n\t" "call *%%r11\n\t" // Fill the return values - "movq %%rax, 32%0\n\t" - "movq %%rdx, 40%0\n\t" - "movsd %%xmm0, 48%0\n\t" - "movsd %%xmm1, 56%0\n\t" + "movq %%rax, 24%0\n\t" + "movq %%rdx, 32%0\n\t" + "movsd %%xmm0, 40%0\n\t" + "movsd %%xmm1, 48%0\n\t" :: "o" (data), "m" ( pCallStack ) // dummy input to prevent the compiler from optimizing the alloca out : "rax", "rdi", "rsi", "rdx", "rcx", "r8", "r9", "r10", "r11", diff --git a/bridges/source/cpp_uno/gcc3_linux_x86-64/callvirtualmethod.hxx b/bridges/source/cpp_uno/gcc3_linux_x86-64/callvirtualmethod.hxx index 162f9af4d782..4a48692c5c46 100644 --- a/bridges/source/cpp_uno/gcc3_linux_x86-64/callvirtualmethod.hxx +++ b/bridges/source/cpp_uno/gcc3_linux_x86-64/callvirtualmethod.hxx @@ -31,8 +31,7 @@ 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, double * pFPR, - sal_uInt32 nFPR); + sal_uInt64 *pStack, sal_uInt32 nStack, sal_uInt64 *pGPR, double * pFPR); } diff --git a/bridges/source/cpp_uno/gcc3_linux_x86-64/uno2cpp.cxx b/bridges/source/cpp_uno/gcc3_linux_x86-64/uno2cpp.cxx index dea6fef5e44e..33ffe8e1b970 100644 --- a/bridges/source/cpp_uno/gcc3_linux_x86-64/uno2cpp.cxx +++ b/bridges/source/cpp_uno/gcc3_linux_x86-64/uno2cpp.cxx @@ -232,8 +232,7 @@ static void cpp_call( pAdjustedThisPtr, aVtableSlot.index, pCppReturn, pReturnTypeRef, bSimpleReturn, pStackStart, ( pStack - pStackStart ), - pGPR, - pFPR, nFPR ); + pGPR, pFPR ); } catch (const Exception &) { throw; } catch (const std::exception & e) { |