Kaydet (Commit) 1e3e7b07 authored tarafından Herbert Dürr's avatar Herbert Dürr Kaydeden (comit) Caolán McNamara

Resolves: #i124086# preserve 16byte stack alignment...

in gcc3-solaris-intel's uno2cpp bridge
Patch-by: 's avatarApostolos Syropoulos <asyropoulos123@hotmail.com>
Review-by: 's avatarHerbert Dürr <hdu@apache.org>
(cherry picked from commit 95eeed58)

Conflicts:
	bridges/source/cpp_uno/gcc3_solaris_intel/uno2cpp.cxx

Change-Id: I92a151c5d65f685a6249954b84da31471501ff9b
üst f7e335dd
...@@ -39,7 +39,15 @@ namespace ...@@ -39,7 +39,15 @@ namespace
{ {
//================================================================================================== //==================================================================================================
static void callVirtualMethod( void callVirtualMethod(
void * pAdjustedThisPtr,
sal_Int32 nVtableIndex,
void * pRegisterReturn,
typelib_TypeClass eReturnType,
sal_Int32 * pStackLongs,
sal_Int32 nStackLongs ) __attribute__((noinline));
void callVirtualMethod(
void * pAdjustedThisPtr, void * pAdjustedThisPtr,
sal_Int32 nVtableIndex, sal_Int32 nVtableIndex,
void * pRegisterReturn, void * pRegisterReturn,
...@@ -61,6 +69,13 @@ static void callVirtualMethod( ...@@ -61,6 +69,13 @@ static void callVirtualMethod(
void * stackptr; void * stackptr;
asm volatile ( asm volatile (
"mov %%esp, %2\n\t" "mov %%esp, %2\n\t"
// preserve potential 128bit stack alignment
"and $0xfffffff0, %%esp\n\t"
"mov %3, %%eax\n\t"
"lea -4(,%%eax,4), %%eax\n\t"
"and $0xf, %%eax\n\t"
"sub $0xc, %%eax\n\t"
"add %%eax, %%esp\n\t"
// copy values // copy values
"mov %3, %%eax\n\t" "mov %3, %%eax\n\t"
"mov %%eax, %%edx\n\t" "mov %%eax, %%edx\n\t"
......
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