[PATCH v2 2/2] msvcrt: Avoid using inline assembly in __ExceptionPtrCopyException() and copy_exception().
Zebediah Figura
zfigura at codeweavers.com
Fri Jun 1 11:44:42 CDT 2018
Signed-off-by: Zebediah Figura <zfigura at codeweavers.com>
---
dlls/msvcrt/cpp.c | 30 +++++++++++++++++++-----------
dlls/msvcrt/except_i386.c | 30 +++++++++++++++++++-----------
2 files changed, 38 insertions(+), 22 deletions(-)
diff --git a/dlls/msvcrt/cpp.c b/dlls/msvcrt/cpp.c
index 3402d13..ea5dffe 100644
--- a/dlls/msvcrt/cpp.c
+++ b/dlls/msvcrt/cpp.c
@@ -1820,17 +1820,25 @@ void __cdecl __ExceptionPtrRethrow(const exception_ptr *ep)
#if _MSVCR_VER >= 100
#ifdef __i386__
-static inline void call_copy_ctor( void *func, void *this, void *src, int has_vbase )
-{
- TRACE( "calling copy ctor %p object %p src %p\n", func, this, src );
- if (has_vbase)
- /* in that case copy ctor takes an extra bool indicating whether to copy the base class */
- __asm__ __volatile__("pushl $1; pushl %2; call *%0"
- : : "m" (func), "c" (this), "m" (src) : "eax", "edx", "memory" );
- else
- __asm__ __volatile__("pushl %2; call *%0"
- : : "m" (func), "c" (this), "m" (src) : "eax", "edx", "memory" );
-}
+extern void call_copy_ctor( void *func, void *this, void *src, int has_vbase );
+
+__ASM_GLOBAL_FUNC( call_copy_ctor,
+ "pushl %ebp\n\t"
+ __ASM_CFI(".cfi_adjust_cfa_offset 4\n\t")
+ __ASM_CFI(".cfi_rel_offset %ebp,0\n\t")
+ "movl %esp, %ebp\n\t"
+ __ASM_CFI(".cfi_def_cfa_register %ebp\n\t")
+ "cmpl $0, 20(%ebp)\n\t"
+ "jz 1f\n\t"
+ "pushl $1\n\t"
+ "1:\n\t"
+ "movl 12(%ebp), %ecx\n\t"
+ "pushl 16(%ebp)\n\t"
+ "call *8(%ebp)\n\t"
+ "leave\n"
+ __ASM_CFI(".cfi_def_cfa %esp,4\n\t")
+ __ASM_CFI(".cfi_same_value %ebp\n\t")
+ "ret" );
#else
static inline void call_copy_ctor( void *func, void *this, void *src, int has_vbase )
{
diff --git a/dlls/msvcrt/except_i386.c b/dlls/msvcrt/except_i386.c
index 5121301..fad5227 100644
--- a/dlls/msvcrt/except_i386.c
+++ b/dlls/msvcrt/except_i386.c
@@ -154,17 +154,25 @@ static inline void *call_ebp_func( void *func, void *ebp )
}
/* call a copy constructor */
-static inline void call_copy_ctor( void *func, void *this, void *src, int has_vbase )
-{
- TRACE( "calling copy ctor %p object %p src %p\n", func, this, src );
- if (has_vbase)
- /* in that case copy ctor takes an extra bool indicating whether to copy the base class */
- __asm__ __volatile__("pushl $1; pushl %2; call *%0"
- : : "r" (func), "c" (this), "r" (src) : "eax", "edx", "memory" );
- else
- __asm__ __volatile__("pushl %2; call *%0"
- : : "r" (func), "c" (this), "r" (src) : "eax", "edx", "memory" );
-}
+extern void call_copy_ctor( void *func, void *this, void *src, int has_vbase );
+
+__ASM_GLOBAL_FUNC( call_copy_ctor,
+ "pushl %ebp\n\t"
+ __ASM_CFI(".cfi_adjust_cfa_offset 4\n\t")
+ __ASM_CFI(".cfi_rel_offset %ebp,0\n\t")
+ "movl %esp, %ebp\n\t"
+ __ASM_CFI(".cfi_def_cfa_register %ebp\n\t")
+ "cmpl $0, 20(%ebp)\n\t"
+ "jz 1f\n\t"
+ "pushl $1\n\t"
+ "1:\n\t"
+ "movl 12(%ebp), %ecx\n\t"
+ "pushl 16(%ebp)\n\t"
+ "call *8(%ebp)\n\t"
+ "leave\n"
+ __ASM_CFI(".cfi_def_cfa %esp,4\n\t")
+ __ASM_CFI(".cfi_same_value %ebp\n\t")
+ "ret" );
/* continue execution to the specified address after exception is caught */
static inline void DECLSPEC_NORETURN continue_after_catch( cxx_exception_frame* frame, void *addr )
--
2.7.4
More information about the wine-devel
mailing list