June 2018 - Wine-Devel - list.winehq.org

[PATCH v3 2/2] msvcrt: Avoid using inline assembly in __ExceptionPtrCopyException() and copy_exception().

by Zebediah Figura

Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> --- dlls/msvcrt/cpp.c | 12 +----------- dlls/msvcrt/except_i386.c | 30 +++++++++++++++++++----------- 2 files changed, 20 insertions(+), 22 deletions(-) diff --git a/dlls/msvcrt/cpp.c b/dlls/msvcrt/cpp.c index 3402d13..4857d29 100644 --- a/dlls/msvcrt/cpp.c +++ b/dlls/msvcrt/cpp.c @@ -1820,17 +1820,7 @@ 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 ); #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

June 1, 2018

Re: [PATCH v2 2/2] msvcrt: Avoid using inline assembly in __ExceptionPtrCopyException() and copy_exception().

by Piotr Caban

Hi, I don't think it will compile. Assembler function are global so this will redefine the function. You can put the implementation in except_i386 file only. Thanks, Piotr On 06/01/18 18:44, Zebediah Figura wrote: > Signed-off-by: Zebediah Figura <zfigura(a)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 ) >

June 1, 2018

[PATCH v2 2/2] msvcrt: Avoid using inline assembly in __ExceptionPtrCopyException() and copy_exception().

by Zebediah Figura

Signed-off-by: Zebediah Figura <zfigura(a)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

June 1, 2018

[PATCH v2 2/2] msvcrt: Avoid using inline assembly in __ExceptionPtrCopyException() and copy_exception().

by Zebediah Figura

Signed-off-by: Zebediah Figura <zfigura(a)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

June 1, 2018

Re: [PATCH 2/2] msvcrt: Avoid using inline assembly in __ExceptionPtrCopyException().

by Zebediah Figura

On 06/01/2018 11:18 AM, Piotr Caban wrote: > Hi Zebediah, > > Could you please also change the implementation in except_i386.c > (there's identical call_copy_ctor function there). > > Thanks, > Piotr > Sure, I'll send patches to change those as well.

June 1, 2018

Re: [PATCH 2/2] msvcrt: Avoid using inline assembly in __ExceptionPtrCopyException().

by Piotr Caban

Hi Zebediah, Could you please also change the implementation in except_i386.c (there's identical call_copy_ctor function there). Thanks, Piotr On 06/01/18 00:13, Zebediah Figura wrote: > Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> > --- > dlls/msvcrt/cpp.c | 30 +++++++++++++++++++----------- > 1 file changed, 19 insertions(+), 11 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 ) > { >

June 1, 2018

Re: [PATCH 1/2] msvcrt: Avoid using inline assembly in __ExceptionPtrDestroy().

by Piotr Caban

Signed-off-by: Piotr Caban <piotr(a)codeweavers.com>

June 1, 2018

Re: [PATCH 5/5] d3d12/tests: Add visual test for rendering to swapchain.

by Henri Verbeet

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com>

June 1, 2018

Re: [PATCH 4/5] dxgi/tests: Run test_swapchain_backbuffer_index() also on D3D12.

by Henri Verbeet

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com>

June 1, 2018

Re: [PATCH 3/5] include/d3d12: Add PFN_D3D12_CREATE_DEVICE.

by Henri Verbeet

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com>

June 1, 2018