ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

msvcrt: Avoid using inline assembly in call_finally_block(). 

Signed-off-by: Zebediah Figura <zfigura@codeweavers.com>
Signed-off-by: Piotr Caban <piotr@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
Zebediah Figura 2018-06-04 17:23:33 -05:00 committed by Alexandre Julliard
parent 701e1b6f81
commit f96a3b735b
1 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
dlls/msvcrt/except_i386.c
View File

@ -181,11 +181,11 @@ __ASM_GLOBAL_FUNC( continue_after_catch,
"leal 12(%edx), %ebp\n\t" "leal 12(%edx), %ebp\n\t"
"jmp *%eax" ); "jmp *%eax" );
static inline void call_finally_block( void *code_block, void *base_ptr ) extern void DECLSPEC_NORETURN call_finally_block( void *code_block, void *base_ptr );
{
__asm__ __volatile__ ("movl %1,%%ebp; call *%%eax" __ASM_GLOBAL_FUNC( call_finally_block,
: : "a" (code_block), "g" (base_ptr)); "movl 8(%esp), %ebp\n\t"
} "jmp *4(%esp)" );
static inline int call_filter( int (*func)(PEXCEPTION_POINTERS), void *arg, void *ebp ) static inline int call_filter( int (*func)(PEXCEPTION_POINTERS), void *arg, void *ebp )
{ {
@ -938,7 +938,6 @@ int CDECL _except_handler3(PEXCEPTION_RECORD rec,
frame->trylevel = pScopeTable[trylevel].previousTryLevel; frame->trylevel = pScopeTable[trylevel].previousTryLevel;
TRACE("__finally block %p\n",pScopeTable[trylevel].lpfnHandler); TRACE("__finally block %p\n",pScopeTable[trylevel].lpfnHandler);
call_finally_block(pScopeTable[trylevel].lpfnHandler, &frame->_ebp); call_finally_block(pScopeTable[trylevel].lpfnHandler, &frame->_ebp);
ERR("Returned from __finally block - expect crash!\n");
} }
} }
trylevel = pScopeTable[trylevel].previousTryLevel; trylevel = pScopeTable[trylevel].previousTryLevel;
@ -1012,7 +1011,6 @@ int CDECL _except_handler4_common( ULONG *cookie, void (*check_cookie)(void),
frame->trylevel = scope_table->entries[trylevel].previousTryLevel; frame->trylevel = scope_table->entries[trylevel].previousTryLevel;
TRACE("__finally block %p\n",scope_table->entries[trylevel].lpfnHandler); TRACE("__finally block %p\n",scope_table->entries[trylevel].lpfnHandler);
call_finally_block(scope_table->entries[trylevel].lpfnHandler, &frame->_ebp); call_finally_block(scope_table->entries[trylevel].lpfnHandler, &frame->_ebp);
ERR("Returned from __finally block - expect crash!\n");
} }
} }
trylevel = scope_table->entries[trylevel].previousTryLevel; trylevel = scope_table->entries[trylevel].previousTryLevel;