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

Work around Clang -fsanitize=address inline asm error

Browse Source 
same as 08947735f9 for gcc_linux_x86-64

Change-Id: I28d138dd13adc9a3e09d46befe69ac86ab1fffb6
This commit is contained in:
Stephan Bergmann
2014-05-21 08:55:48 +02:00
parent c354deac3c
commit 00468b48e8
1 changed files with 38 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -57,10 +57,27 @@ void CPPU_CURRENT_NAMESPACE::callVirtualMethod(
if ( nGPR > x86_64::MAX_GPR_REGS ) if ( nGPR > x86_64::MAX_GPR_REGS )
nGPR = x86_64::MAX_GPR_REGS; nGPR = x86_64::MAX_GPR_REGS;
// Work around -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;
double xmm0;
double xmm1;
} data;
data.pGPR = pGPR;
data.pFPR = pFPR;
data.nFPR = nFPR;
// Get pointer to method // Get pointer to method
sal_uInt64 pMethod = *((sal_uInt64 *)pThis); sal_uInt64 pMethod = *((sal_uInt64 *)pThis);
pMethod += 8 * nVtableIndex; pMethod += 8 * nVtableIndex;
pMethod = *((sal_uInt64 *)pMethod); data.pMethod = *((sal_uInt64 *)pMethod);
// Load parameters to stack, if necessary // Load parameters to stack, if necessary
if ( nStack ) if ( nStack )
@@ -71,16 +88,10 @@ void CPPU_CURRENT_NAMESPACE::callVirtualMethod(
std::memcpy( pCallStack, pStack, nStackBytes ); std::memcpy( pCallStack, pStack, nStackBytes );
} }
// Return values
sal_uInt64 rax;
sal_uInt64 rdx;
double xmm0;
double xmm1;
asm volatile ( asm volatile (
// Fill the xmm registers // Fill the xmm registers
"movq %6, %%rax\n\t" "movq 16%0, %%rax\n\t"
"movsd (%%rax), %%xmm0\n\t" "movsd (%%rax), %%xmm0\n\t"
"movsd 8(%%rax), %%xmm1\n\t" "movsd 8(%%rax), %%xmm1\n\t"
@@ -92,7 +103,7 @@ void CPPU_CURRENT_NAMESPACE::callVirtualMethod(
"movsd 56(%%rax), %%xmm7\n\t" "movsd 56(%%rax), %%xmm7\n\t"
// Fill the general purpose registers // Fill the general purpose registers
"movq %5, %%rax\n\t" "movq 8%0, %%rax\n\t"
"movq (%%rax), %%rdi\n\t" "movq (%%rax), %%rdi\n\t"
"movq 8(%%rax), %%rsi\n\t" "movq 8(%%rax), %%rsi\n\t"
@@ -102,45 +113,45 @@ void CPPU_CURRENT_NAMESPACE::callVirtualMethod(
"movq 40(%%rax), %%r9\n\t" "movq 40(%%rax), %%r9\n\t"
// Perform the call // Perform the call
"movq %4, %%r11\n\t" "movq 0%0, %%r11\n\t"
"movq %7, %%rax\n\t" "movq 24%0, %%rax\n\t"
"call *%%r11\n\t" "call *%%r11\n\t"
// Fill the return values // Fill the return values
"movq %%rax, %0\n\t" "movq %%rax, 32%0\n\t"
"movq %%rdx, %1\n\t" "movq %%rdx, 40%0\n\t"
"movsd %%xmm0, %2\n\t" "movsd %%xmm0, 48%0\n\t"
"movsd %%xmm1, %3\n\t" "movsd %%xmm1, 56%0\n\t"
: "=m" ( rax ), "=m" ( rdx ), "=m" ( xmm0 ), "=m" ( xmm1 ) :: "o" (data)
: "m" ( pMethod ), "m" ( pGPR ), "m" ( pFPR ), "m" ( nFPR )
: "rax", "rdi", "rsi", "rdx", "rcx", "r8", "r9", "r10", "r11", : "rax", "rdi", "rsi", "rdx", "rcx", "r8", "r9", "r10", "r11",
"xmm0", "xmm1", "xmm2", "xmm3", "xmm4", "xmm5", "xmm6", "xmm7", "xmm0", "xmm1", "xmm2", "xmm3", "xmm4", "xmm5", "xmm6", "xmm7",
"xmm8", "xmm9", "xmm10", "xmm11", "xmm12", "xmm13", "xmm14", "xmm15" "xmm8", "xmm9", "xmm10", "xmm11", "xmm12", "xmm13", "xmm14", "xmm15",
"memory"
); );
switch (pReturnTypeRef->eTypeClass) switch (pReturnTypeRef->eTypeClass)
{ {
case typelib_TypeClass_HYPER: case typelib_TypeClass_HYPER:
case typelib_TypeClass_UNSIGNED_HYPER: case typelib_TypeClass_UNSIGNED_HYPER:
*reinterpret_cast<sal_uInt64 *>( pRegisterReturn ) = rax; *reinterpret_cast<sal_uInt64 *>( pRegisterReturn ) = data.rax;
break; break;
case typelib_TypeClass_LONG: case typelib_TypeClass_LONG:
case typelib_TypeClass_UNSIGNED_LONG: case typelib_TypeClass_UNSIGNED_LONG:
case typelib_TypeClass_ENUM: case typelib_TypeClass_ENUM:
*reinterpret_cast<sal_uInt32 *>( pRegisterReturn ) = *reinterpret_cast<sal_uInt32*>( &rax ); *reinterpret_cast<sal_uInt32 *>( pRegisterReturn ) = *reinterpret_cast<sal_uInt32 *>( &data.rax );
break; break;
case typelib_TypeClass_CHAR: case typelib_TypeClass_CHAR:
case typelib_TypeClass_SHORT: case typelib_TypeClass_SHORT:
case typelib_TypeClass_UNSIGNED_SHORT: case typelib_TypeClass_UNSIGNED_SHORT:
*reinterpret_cast<sal_uInt16 *>( pRegisterReturn ) = *reinterpret_cast<sal_uInt16*>( &rax ); *reinterpret_cast<sal_uInt16 *>( pRegisterReturn ) = *reinterpret_cast<sal_uInt16 *>( &data.rax );
break; break;
case typelib_TypeClass_BOOLEAN: case typelib_TypeClass_BOOLEAN:
case typelib_TypeClass_BYTE: case typelib_TypeClass_BYTE:
*reinterpret_cast<sal_uInt8 *>( pRegisterReturn ) = *reinterpret_cast<sal_uInt8*>( &rax ); *reinterpret_cast<sal_uInt8 *>( pRegisterReturn ) = *reinterpret_cast<sal_uInt8 *>( &data.rax );
break; break;
case typelib_TypeClass_FLOAT: case typelib_TypeClass_FLOAT:
case typelib_TypeClass_DOUBLE: case typelib_TypeClass_DOUBLE:
*reinterpret_cast<double *>( pRegisterReturn ) = xmm0; *reinterpret_cast<double *>( pRegisterReturn ) = data.xmm0;
break; break;
default: default:
{ {
@@ -148,12 +159,12 @@ void CPPU_CURRENT_NAMESPACE::callVirtualMethod(
if (bSimpleReturn && nRetSize <= 16 && nRetSize > 0) if (bSimpleReturn && nRetSize <= 16 && nRetSize > 0)
{ {
sal_uInt64 longs[2]; sal_uInt64 longs[2];
longs[0] = rax; longs[0] = data.rax;
longs[1] = rdx; longs[1] = data.rdx;
double doubles[2]; double doubles[2];
doubles[0] = xmm0; doubles[0] = data.xmm0;
doubles[1] = xmm1; doubles[1] = data.xmm1;
x86_64::fill_struct( pReturnTypeRef, &longs[0], &doubles[0], pRegisterReturn); x86_64::fill_struct( pReturnTypeRef, &longs[0], &doubles[0], pRegisterReturn);
} }
break; break;