wine-commits June 2009

wine-commits@winehq.org

5 participants
1115 discussions

Alexandre Julliard : kernel32: Add appropriate stdcall decorations to assembly functions.
by Alexandre Julliard 15 Jun '09

15 Jun '09

Module: wine Branch: master Commit: d303d9dc29203026eb4312bd39df76d795def329 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d303d9dc29203026eb4312bd3… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sun Jun 14 15:34:09 2009 +0200 kernel32: Add appropriate stdcall decorations to assembly functions. --- dlls/kernel32/ne_module.c | 16 ++++++++-------- dlls/kernel32/process.c | 4 ++-- dlls/kernel32/selector.c | 18 +++++++++--------- dlls/kernel32/sync.c | 10 +++++----- dlls/kernel32/thread.c | 8 ++++---- dlls/kernel32/thunk.c | 2 +- 6 files changed, 29 insertions(+), 29 deletions(-) diff --git a/dlls/kernel32/ne_module.c b/dlls/kernel32/ne_module.c index 47c3f4d..4b45e7b 100644 --- a/dlls/kernel32/ne_module.c +++ b/dlls/kernel32/ne_module.c @@ -2210,37 +2210,37 @@ void WINAPI MapHInstSL16( CONTEXT86 *context ) /*************************************************************************** * MapHInstLS (KERNEL32.@) */ -__ASM_GLOBAL_FUNC( MapHInstLS, +__ASM_STDCALL_FUNC( MapHInstLS, 0, "pushl %eax\n\t" - "call " __ASM_NAME("MapHModuleLS") "\n\t" + "call " __ASM_NAME("MapHModuleLS") __ASM_STDCALL(4) "\n\t" "ret" ) /*************************************************************************** * MapHInstSL (KERNEL32.@) */ -__ASM_GLOBAL_FUNC( MapHInstSL, +__ASM_STDCALL_FUNC( MapHInstSL, 0, "pushl %eax\n\t" - "call " __ASM_NAME("MapHModuleSL") "\n\t" + "call " __ASM_NAME("MapHModuleSL") __ASM_STDCALL(4) "\n\t" "ret" ) /*************************************************************************** * MapHInstLS_PN (KERNEL32.@) */ -__ASM_GLOBAL_FUNC( MapHInstLS_PN, +__ASM_STDCALL_FUNC( MapHInstLS_PN, 0, "testl %eax,%eax\n\t" "jz 1f\n\t" "pushl %eax\n\t" - "call " __ASM_NAME("MapHModuleLS") "\n" + "call " __ASM_NAME("MapHModuleLS") __ASM_STDCALL(4) "\n" "1:\tret" ) /*************************************************************************** * MapHInstSL_PN (KERNEL32.@) */ -__ASM_GLOBAL_FUNC( MapHInstSL_PN, +__ASM_STDCALL_FUNC( MapHInstSL_PN, 0, "andl $0xffff,%eax\n\t" "jz 1f\n\t" "pushl %eax\n\t" - "call " __ASM_NAME("MapHModuleSL") "\n" + "call " __ASM_NAME("MapHModuleSL") __ASM_STDCALL(4) "\n" "1:\tret" ) #endif /* __i386__ */ diff --git a/dlls/kernel32/process.c b/dlls/kernel32/process.c index 31faf73..83d1aa5 100644 --- a/dlls/kernel32/process.c +++ b/dlls/kernel32/process.c @@ -2215,13 +2215,13 @@ BOOL WINAPI TerminateProcess( HANDLE handle, DWORD exit_code ) * Nothing. */ #ifdef __i386__ -__ASM_GLOBAL_FUNC( ExitProcess, /* Shrinker depend on this particular ExitProcess implementation */ +__ASM_STDCALL_FUNC( ExitProcess, 4, /* Shrinker depend on this particular ExitProcess implementation */ "pushl %ebp\n\t" ".byte 0x8B, 0xEC\n\t" /* movl %esp, %ebp */ ".byte 0x6A, 0x00\n\t" /* pushl $0 */ ".byte 0x68, 0x00, 0x00, 0x00, 0x00\n\t" /* pushl $0 - 4 bytes immediate */ "pushl 8(%ebp)\n\t" - "call " __ASM_NAME("process_ExitProcess") "\n\t" + "call " __ASM_NAME("process_ExitProcess") __ASM_STDCALL(4) "\n\t" "leave\n\t" "ret $4" ) diff --git a/dlls/kernel32/selector.c b/dlls/kernel32/selector.c index c8841b1..4a642c0 100644 --- a/dlls/kernel32/selector.c +++ b/dlls/kernel32/selector.c @@ -565,7 +565,7 @@ LPVOID WINAPI MapSLFix( SEGPTR sptr ) * Must not change EAX, hence defined as asm function. */ #ifdef __i386__ -__ASM_GLOBAL_FUNC( UnMapSLFixArray, "ret $8" ) +__ASM_STDCALL_FUNC( UnMapSLFixArray, 8, "ret $8" ) #endif @@ -595,22 +595,22 @@ BOOL WINAPI GetThreadSelectorEntry( HANDLE hthread, DWORD sel, LPLDT_ENTRY ldten /*********************************************************************** * SMapLS (KERNEL32.@) */ -__ASM_GLOBAL_FUNC( SMapLS, +__ASM_STDCALL_FUNC( SMapLS, 0, "xor %edx,%edx\n\t" "testl $0xffff0000,%eax\n\t" "jz 1f\n\t" "pushl %eax\n\t" - "call " __ASM_NAME("MapLS") "\n\t" + "call " __ASM_NAME("MapLS") __ASM_STDCALL(4) "\n\t" "movl %eax,%edx\n" "1:\tret" ) /*********************************************************************** * SUnMapLS (KERNEL32.@) */ -__ASM_GLOBAL_FUNC( SUnMapLS, +__ASM_STDCALL_FUNC( SUnMapLS, 0, "pushl %eax\n\t" /* preserve eax */ "pushl %eax\n\t" - "call " __ASM_NAME("UnMapLS") "\n\t" + "call " __ASM_NAME("UnMapLS") __ASM_STDCALL(4) "\n\t" "popl %eax\n\t" "ret" ) @@ -631,9 +631,9 @@ __ASM_GLOBAL_FUNC( SUnMapLS, * unravel them at SUnMapLS. We just store the segmented pointer there. */ #define DEFINE_SMapLS(n) \ - __ASM_GLOBAL_FUNC( SMapLS_IP_EBP_ ## n, \ + __ASM_STDCALL_FUNC( SMapLS_IP_EBP_ ## n, 0, \ "movl " #n "(%ebp),%eax\n\t" \ - "call " __ASM_NAME("SMapLS") "\n\t" \ + "call " __ASM_NAME("SMapLS") __ASM_STDCALL(4) "\n\t" \ "movl %edx," #n "(%ebp)\n\t" \ "ret" ) @@ -661,10 +661,10 @@ DEFINE_SMapLS(40) */ #define DEFINE_SUnMapLS(n) \ - __ASM_GLOBAL_FUNC( SUnMapLS_IP_EBP_ ## n, \ + __ASM_STDCALL_FUNC( SUnMapLS_IP_EBP_ ## n, 0, \ "pushl %eax\n\t" /* preserve eax */ \ "pushl " #n "(%ebp)\n\t" \ - "call " __ASM_NAME("UnMapLS") "\n\t" \ + "call " __ASM_NAME("UnMapLS") __ASM_STDCALL(4) "\n\t" \ "movl $0," #n "(%ebp)\n\t" \ "popl %eax\n\t" \ "ret" ) diff --git a/dlls/kernel32/sync.c b/dlls/kernel32/sync.c index ab59688..e45f1bc 100644 --- a/dlls/kernel32/sync.c +++ b/dlls/kernel32/sync.c @@ -2275,7 +2275,7 @@ BOOL WINAPI BindIoCompletionCallback( HANDLE FileHandle, LPOVERLAPPED_COMPLETION * InterlockedCompareExchange (KERNEL32.@) */ /* LONG WINAPI InterlockedCompareExchange( PLONG dest, LONG xchg, LONG compare ); */ -__ASM_GLOBAL_FUNC(InterlockedCompareExchange, +__ASM_STDCALL_FUNC(InterlockedCompareExchange, 12, "movl 12(%esp),%eax\n\t" "movl 8(%esp),%ecx\n\t" "movl 4(%esp),%edx\n\t" @@ -2286,7 +2286,7 @@ __ASM_GLOBAL_FUNC(InterlockedCompareExchange, * InterlockedExchange (KERNEL32.@) */ /* LONG WINAPI InterlockedExchange( PLONG dest, LONG val ); */ -__ASM_GLOBAL_FUNC(InterlockedExchange, +__ASM_STDCALL_FUNC(InterlockedExchange, 8, "movl 8(%esp),%eax\n\t" "movl 4(%esp),%edx\n\t" "lock; xchgl %eax,(%edx)\n\t" @@ -2296,7 +2296,7 @@ __ASM_GLOBAL_FUNC(InterlockedExchange, * InterlockedExchangeAdd (KERNEL32.@) */ /* LONG WINAPI InterlockedExchangeAdd( PLONG dest, LONG incr ); */ -__ASM_GLOBAL_FUNC(InterlockedExchangeAdd, +__ASM_STDCALL_FUNC(InterlockedExchangeAdd, 8, "movl 8(%esp),%eax\n\t" "movl 4(%esp),%edx\n\t" "lock; xaddl %eax,(%edx)\n\t" @@ -2306,7 +2306,7 @@ __ASM_GLOBAL_FUNC(InterlockedExchangeAdd, * InterlockedIncrement (KERNEL32.@) */ /* LONG WINAPI InterlockedIncrement( PLONG dest ); */ -__ASM_GLOBAL_FUNC(InterlockedIncrement, +__ASM_STDCALL_FUNC(InterlockedIncrement, 4, "movl 4(%esp),%edx\n\t" "movl $1,%eax\n\t" "lock; xaddl %eax,(%edx)\n\t" @@ -2316,7 +2316,7 @@ __ASM_GLOBAL_FUNC(InterlockedIncrement, /*********************************************************************** * InterlockedDecrement (KERNEL32.@) */ -__ASM_GLOBAL_FUNC(InterlockedDecrement, +__ASM_STDCALL_FUNC(InterlockedDecrement, 4, "movl 4(%esp),%edx\n\t" "movl $-1,%eax\n\t" "lock; xaddl %eax,(%edx)\n\t" diff --git a/dlls/kernel32/thread.c b/dlls/kernel32/thread.c index 8cd2fb1..0b899c2 100644 --- a/dlls/kernel32/thread.c +++ b/dlls/kernel32/thread.c @@ -568,7 +568,7 @@ HANDLE WINAPI GetCurrentThread(void) * SetLastError (KERNEL32.@) */ /* void WINAPI SetLastError( DWORD error ); */ -__ASM_GLOBAL_FUNC( SetLastError, +__ASM_STDCALL_FUNC( SetLastError, 4, "movl 4(%esp),%eax\n\t" ".byte 0x64\n\t" "movl %eax,0x34\n\t" @@ -579,21 +579,21 @@ __ASM_GLOBAL_FUNC( SetLastError, * GetLastError (KERNEL32.@) */ /* DWORD WINAPI GetLastError(void); */ -__ASM_GLOBAL_FUNC( GetLastError, ".byte 0x64\n\tmovl 0x34,%eax\n\tret" ) +__ASM_STDCALL_FUNC( GetLastError, 0, ".byte 0x64\n\tmovl 0x34,%eax\n\tret" ) /*********************************************************************** * GetCurrentProcessId (KERNEL.471) * GetCurrentProcessId (KERNEL32.@) */ /* DWORD WINAPI GetCurrentProcessId(void) */ -__ASM_GLOBAL_FUNC( GetCurrentProcessId, ".byte 0x64\n\tmovl 0x20,%eax\n\tret" ) +__ASM_STDCALL_FUNC( GetCurrentProcessId, 0, ".byte 0x64\n\tmovl 0x20,%eax\n\tret" ) /*********************************************************************** * GetCurrentThreadId (KERNEL.462) * GetCurrentThreadId (KERNEL32.@) */ /* DWORD WINAPI GetCurrentThreadId(void) */ -__ASM_GLOBAL_FUNC( GetCurrentThreadId, ".byte 0x64\n\tmovl 0x24,%eax\n\tret" ) +__ASM_STDCALL_FUNC( GetCurrentThreadId, 0, ".byte 0x64\n\tmovl 0x24,%eax\n\tret" ) #else /* __i386__ */ diff --git a/dlls/kernel32/thunk.c b/dlls/kernel32/thunk.c index 8785644..be098b5 100644 --- a/dlls/kernel32/thunk.c +++ b/dlls/kernel32/thunk.c @@ -645,7 +645,7 @@ DEFINE_REGS_ENTRYPOINT( FT_Thunk, 0 ) "leave\n\t" #define DEFINE_FT_Exit(n) \ - __ASM_GLOBAL_FUNC( FT_Exit ## n, FT_EXIT_RESTORE_REGS "ret $" #n ) + __ASM_STDCALL_FUNC( FT_Exit ## n, 0, FT_EXIT_RESTORE_REGS "ret $" #n ) DEFINE_FT_Exit(0) DEFINE_FT_Exit(4)

1 0

Alexandre Julliard : ntoskrnl.exe: Add appropriate stdcall decorations to assembly functions.
by Alexandre Julliard 15 Jun '09

15 Jun '09

Module: wine Branch: master Commit: 5c4612b3fae73cca176c970b5dbfdcc3f35c9044 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5c4612b3fae73cca176c970b5… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sun Jun 14 15:34:34 2009 +0200 ntoskrnl.exe: Add appropriate stdcall decorations to assembly functions. --- dlls/ntoskrnl.exe/ntoskrnl.c | 19 +++++++++++++------ 1 files changed, 13 insertions(+), 6 deletions(-) diff --git a/dlls/ntoskrnl.exe/ntoskrnl.c b/dlls/ntoskrnl.exe/ntoskrnl.c index 6371d85..714164e 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/ntoskrnl.c @@ -66,18 +66,25 @@ struct IrpInstance #ifdef __i386__ #define DEFINE_FASTCALL1_ENTRYPOINT( name ) \ - __ASM_GLOBAL_FUNC( name, \ + __ASM_STDCALL_FUNC( name, 4, \ "popl %eax\n\t" \ "pushl %ecx\n\t" \ "pushl %eax\n\t" \ - "jmp " __ASM_NAME("__regs_") #name ) + "jmp " __ASM_NAME("__regs_") #name __ASM_STDCALL(4)) #define DEFINE_FASTCALL2_ENTRYPOINT( name ) \ - __ASM_GLOBAL_FUNC( name, \ + __ASM_STDCALL_FUNC( name, 8, \ "popl %eax\n\t" \ "pushl %edx\n\t" \ "pushl %ecx\n\t" \ "pushl %eax\n\t" \ - "jmp " __ASM_NAME("__regs_") #name ) + "jmp " __ASM_NAME("__regs_") #name __ASM_STDCALL(8)) +#define DEFINE_FASTCALL3_ENTRYPOINT( name ) \ + __ASM_STDCALL_FUNC( name, 12, \ + "popl %eax\n\t" \ + "pushl %edx\n\t" \ + "pushl %ecx\n\t" \ + "pushl %eax\n\t" \ + "jmp " __ASM_NAME("__regs_") #name __ASM_STDCALL(12)) #endif static inline LPCSTR debugstr_us( const UNICODE_STRING *us ) @@ -745,8 +752,8 @@ void WINAPI IofCompleteRequest( IRP *irp, UCHAR priority_boost ) /*********************************************************************** * InterlockedCompareExchange (NTOSKRNL.EXE.@) */ -#ifdef DEFINE_FASTCALL2_ENTRYPOINT -DEFINE_FASTCALL2_ENTRYPOINT( NTOSKRNL_InterlockedCompareExchange ) +#ifdef DEFINE_FASTCALL3_ENTRYPOINT +DEFINE_FASTCALL3_ENTRYPOINT( NTOSKRNL_InterlockedCompareExchange ) LONG WINAPI __regs_NTOSKRNL_InterlockedCompareExchange( LONG volatile *dest, LONG xchg, LONG compare ) #else LONG WINAPI NTOSKRNL_InterlockedCompareExchange( LONG volatile *dest, LONG xchg, LONG compare )

1 0

Alexandre Julliard : hal: Add appropriate stdcall decorations to assembly functions.
by Alexandre Julliard 15 Jun '09

15 Jun '09

Module: wine Branch: master Commit: 34ac93b78bf8dd937f7123a0599b2c48dc18af8c URL: http://source.winehq.org/git/wine.git/?a=commit;h=34ac93b78bf8dd937f7123a05… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sun Jun 14 15:34:28 2009 +0200 hal: Add appropriate stdcall decorations to assembly functions. --- dlls/hal/hal.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/hal/hal.c b/dlls/hal/hal.c index 82ba80c..ed38e6c 100644 --- a/dlls/hal/hal.c +++ b/dlls/hal/hal.c @@ -38,18 +38,18 @@ WINE_DEFAULT_DEBUG_CHANNEL(ntoskrnl); #ifdef __i386__ #define DEFINE_FASTCALL1_ENTRYPOINT( name ) \ - __ASM_GLOBAL_FUNC( name, \ + __ASM_STDCALL_FUNC( name, 4, \ "popl %eax\n\t" \ "pushl %ecx\n\t" \ "pushl %eax\n\t" \ - "jmp " __ASM_NAME("__regs_") #name ) + "jmp " __ASM_NAME("__regs_") #name __ASM_STDCALL(4)) #define DEFINE_FASTCALL2_ENTRYPOINT( name ) \ - __ASM_GLOBAL_FUNC( name, \ + __ASM_STDCALL_FUNC( name, 8, \ "popl %eax\n\t" \ "pushl %edx\n\t" \ "pushl %ecx\n\t" \ "pushl %eax\n\t" \ - "jmp " __ASM_NAME("__regs_") #name ) + "jmp " __ASM_NAME("__regs_") #name __ASM_STDCALL(8)) #endif

1 0

Alexandre Julliard : rpcrt4: Add appropriate stdcall decorations to assembly functions.
by Alexandre Julliard 15 Jun '09

15 Jun '09

Module: wine Branch: master Commit: f2d65b5563f2040e5f0ac14807a728626e6b78e4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f2d65b5563f2040e5f0ac1480… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sun Jun 14 15:34:24 2009 +0200 rpcrt4: Add appropriate stdcall decorations to assembly functions. --- dlls/rpcrt4/cproxy.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/rpcrt4/cproxy.c b/dlls/rpcrt4/cproxy.c index 5186ea6..0887aa2 100644 --- a/dlls/rpcrt4/cproxy.c +++ b/dlls/rpcrt4/cproxy.c @@ -76,7 +76,7 @@ struct thunk { extern void call_stubless_func(void); __ASM_GLOBAL_FUNC(call_stubless_func, "pushl %esp\n\t" /* pointer to index */ - "call " __ASM_NAME("ObjectStubless") "\n\t" + "call " __ASM_NAME("ObjectStubless") __ASM_STDCALL(4) "\n\t" "popl %edx\n\t" /* args size */ "movl (%esp),%ecx\n\t" /* return address */ "addl %edx,%esp\n\t"

1 0

Alexandre Julliard : riched20: Add appropriate stdcall decorations to assembly functions.
by Alexandre Julliard 15 Jun '09

15 Jun '09

Module: wine Branch: master Commit: eb08df3a901f6de5d3767c9514b103889828f01e URL: http://source.winehq.org/git/wine.git/?a=commit;h=eb08df3a901f6de5d3767c951… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sun Jun 14 15:34:20 2009 +0200 riched20: Add appropriate stdcall decorations to assembly functions. --- dlls/riched20/txthost.c | 168 +++++++++++++++++++++++----------------------- dlls/riched20/txtsrv.c | 44 ++++++------ 2 files changed, 106 insertions(+), 106 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=eb08df3a901f6de5d3767…

1 0

Alexandre Julliard : msvcrt: Add appropriate stdcall decorations to assembly functions.
by Alexandre Julliard 15 Jun '09

15 Jun '09

Module: wine Branch: master Commit: 2b012c98860df91bb815238a5187fe51eabce237 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2b012c98860df91bb815238a5… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sun Jun 14 15:34:14 2009 +0200 msvcrt: Add appropriate stdcall decorations to assembly functions. --- dlls/msvcirt/msvcirt.c | 10 +++--- dlls/msvcrt/cpp.c | 72 ++++++++++++++++++++++++------------------------ 2 files changed, 41 insertions(+), 41 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=2b012c98860df91bb8152…

1 0

Alexandre Julliard : configure: Add a macro to define an stdcall function in assembly.
by Alexandre Julliard 15 Jun '09

15 Jun '09

Module: wine Branch: master Commit: ea9cf9e49d394cd661adb0207555f36105185f13 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ea9cf9e49d394cd661adb0207… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sun Jun 14 16:03:46 2009 +0200 configure: Add a macro to define an stdcall function in assembly. --- configure | 22 ++++++++++++++++------ configure.ac | 18 +++++++++++------- include/config.h.in | 10 +++++++++- 3 files changed, 36 insertions(+), 14 deletions(-) diff --git a/configure b/configure index 1536001..dcc43b6 100755 --- a/configure +++ b/configure @@ -17867,19 +17867,19 @@ case "$ac_cv_asm_func_def" in #define __ASM_FUNC(name) ".def " __ASM_NAME(name) "; .scl 2; .type 32; .endef" _ACEOF - asm_func_header=".def $asm_name_prefix\" #name \"; .scl 2; .type 32; .endef" ;; + asm_func_header=".def $asm_name_prefix\" #name suffix \"; .scl 2; .type 32; .endef" ;; ".type @function") cat >>confdefs.h <<\_ACEOF #define __ASM_FUNC(name) ".type " __ASM_NAME(name) ",@function" _ACEOF - asm_func_header=".type $asm_name_prefix\" #name \",@function" ;; + asm_func_header=".type $asm_name_prefix\" #name suffix \",@function" ;; ".type 2") cat >>confdefs.h <<\_ACEOF #define __ASM_FUNC(name) ".type " __ASM_NAME(name) ",2" _ACEOF - asm_func_header=".type $asm_name_prefix\" #name \",2" ;; + asm_func_header=".type $asm_name_prefix\" #name suffix \",2" ;; *) cat >>confdefs.h <<\_ACEOF #define __ASM_FUNC(name) "" @@ -18046,7 +18046,7 @@ fi { $as_echo "$as_me:$LINENO: result: $ac_cv_c_cfi_support" >&5 $as_echo "$ac_cv_c_cfi_support" >&6; } -asm_func_header=".globl $asm_name_prefix\" #name \"\\n\\t$asm_func_header\\n$asm_name_prefix\" #name \":\\n\\t" +asm_func_header=".globl $asm_name_prefix\" #name suffix \"\\n\\t$asm_func_header\\n$asm_name_prefix\" #name suffix \":\\n\\t" asm_func_trailer="" if test "$ac_cv_c_dot_previous" = "yes" then @@ -18065,16 +18065,26 @@ asm_func_code="$asm_func_header\" code \"$asm_func_trailer" if test "$ac_cv_c_asm_outside_funcs" = "yes" then cat >>confdefs.h <<_ACEOF -#define __ASM_GLOBAL_FUNC(name,code) asm(".text\n\t.align 4\n\t$asm_func_code"); +#define __ASM_DEFINE_FUNC(name,suffix,code) asm(".text\n\t.align 4\n\t$asm_func_code"); _ACEOF else cat >>confdefs.h <<_ACEOF -#define __ASM_GLOBAL_FUNC(name,code) void __asm_dummy_##name(void) { asm(".text\n\t.align 4\n\t$asm_func_code"); } +#define __ASM_DEFINE_FUNC(name,suffix,code) void __asm_dummy_##name(void) { asm(".text\n\t.align 4\n\t$asm_func_code"); } _ACEOF fi +cat >>confdefs.h <<\_ACEOF +#define __ASM_GLOBAL_FUNC(name,code) __ASM_DEFINE_FUNC(name,"",code) +_ACEOF + + +cat >>confdefs.h <<\_ACEOF +#define __ASM_STDCALL_FUNC(name,args,code) __ASM_DEFINE_FUNC(name,__ASM_STDCALL(args),code) +_ACEOF + + LDPATH="" diff --git a/configure.ac b/configure.ac index aa3b892..5fc708e 100644 --- a/configure.ac +++ b/configure.ac @@ -1447,13 +1447,13 @@ AH_TEMPLATE(__ASM_FUNC,[Define to a macro to generate an assembly function direc case "$ac_cv_asm_func_def" in ".def") AC_DEFINE([__ASM_FUNC(name)], [".def " __ASM_NAME(name) "; .scl 2; .type 32; .endef"]) - asm_func_header=".def $asm_name_prefix\" #name \"; .scl 2; .type 32; .endef" ;; + asm_func_header=".def $asm_name_prefix\" #name suffix \"; .scl 2; .type 32; .endef" ;; ".type @function") AC_DEFINE([__ASM_FUNC(name)], [".type " __ASM_NAME(name) ",@function"]) - asm_func_header=".type $asm_name_prefix\" #name \",@function" ;; + asm_func_header=".type $asm_name_prefix\" #name suffix \",@function" ;; ".type 2") AC_DEFINE([__ASM_FUNC(name)], [".type " __ASM_NAME(name) ",2"]) - asm_func_header=".type $asm_name_prefix\" #name \",2" ;; + asm_func_header=".type $asm_name_prefix\" #name suffix \",2" ;; *) AC_DEFINE([__ASM_FUNC(name)], [""]) asm_func_header="" ;; @@ -1471,7 +1471,7 @@ AC_CACHE_CHECK([whether CFI directives are supported in assembly code], ac_cv_c_ AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[asm(".text\nac_test:\t.cfi_startproc\n\t.long 0\n\t.cfi_endproc");]])], ac_cv_c_cfi_support="yes",ac_cv_c_cfi_support="no")) -asm_func_header=".globl $asm_name_prefix\" #name \"\\n\\t$asm_func_header\\n$asm_name_prefix\" #name \":\\n\\t" +asm_func_header=".globl $asm_name_prefix\" #name suffix \"\\n\\t$asm_func_header\\n$asm_name_prefix\" #name suffix \":\\n\\t" asm_func_trailer="" if test "$ac_cv_c_dot_previous" = "yes" then @@ -1485,13 +1485,17 @@ fi asm_func_code="$asm_func_header\" code \"$asm_func_trailer" -AH_TEMPLATE(__ASM_GLOBAL_FUNC,[Define to a macro to generate an assembly function]) +AH_TEMPLATE(__ASM_DEFINE_FUNC,[Define to a macro to define an assembly function]) if test "$ac_cv_c_asm_outside_funcs" = "yes" then - AC_DEFINE_UNQUOTED([__ASM_GLOBAL_FUNC(name,code)],[asm(".text\n\t.align 4\n\t$asm_func_code");]) + AC_DEFINE_UNQUOTED([__ASM_DEFINE_FUNC(name,suffix,code)],[asm(".text\n\t.align 4\n\t$asm_func_code");]) else - AC_DEFINE_UNQUOTED([__ASM_GLOBAL_FUNC(name,code)],[void __asm_dummy_##name(void) { asm(".text\n\t.align 4\n\t$asm_func_code"); }]) + AC_DEFINE_UNQUOTED([__ASM_DEFINE_FUNC(name,suffix,code)],[void __asm_dummy_##name(void) { asm(".text\n\t.align 4\n\t$asm_func_code"); }]) fi +AC_DEFINE([__ASM_GLOBAL_FUNC(name,code)],[__ASM_DEFINE_FUNC(name,"",code)], + [Define to a macro to generate an assembly function with C calling convention]) +AC_DEFINE([__ASM_STDCALL_FUNC(name,args,code)],[__ASM_DEFINE_FUNC(name,__ASM_STDCALL(args),code)], + [Define to a macro to generate an assembly function with stdcall calling convention]) dnl **** Platform-specific checks **** diff --git a/include/config.h.in b/include/config.h.in index 5b5f7c8..aab0591 100644 --- a/include/config.h.in +++ b/include/config.h.in @@ -1188,10 +1188,14 @@ /* Define to 1 if the X Window System is missing or not being used. */ #undef X_DISPLAY_MISSING +/* Define to a macro to define an assembly function */ +#undef __ASM_DEFINE_FUNC + /* Define to a macro to generate an assembly function directive */ #undef __ASM_FUNC -/* Define to a macro to generate an assembly function */ +/* Define to a macro to generate an assembly function with C calling + convention */ #undef __ASM_GLOBAL_FUNC /* Define to a macro to generate an assembly name from a C symbol */ @@ -1200,6 +1204,10 @@ /* Define to a macro to generate an stdcall suffix */ #undef __ASM_STDCALL +/* Define to a macro to generate an assembly function with stdcall calling + convention */ +#undef __ASM_STDCALL_FUNC + /* Define to empty if `const' does not conform to ANSI C. */ #undef const

1 0

Alexandre Julliard : configure: Add a macro to define an stdcall suffix in assembly code.
by Alexandre Julliard 15 Jun '09

15 Jun '09

Module: wine Branch: master Commit: 9cebf090af110a4760470d16da1b5b076cbe8c78 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9cebf090af110a4760470d16d… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sun Jun 14 11:24:20 2009 +0200 configure: Add a macro to define an stdcall suffix in assembly code. --- configure | 78 +++++++++++++++++++++++++++++++++++++++++++++++++++ configure.ac | 21 +++++++++++++ include/config.h.in | 3 ++ 3 files changed, 102 insertions(+), 0 deletions(-) diff --git a/configure b/configure index 5b973e4..1536001 100755 --- a/configure +++ b/configure @@ -17615,6 +17615,69 @@ fi { $as_echo "$as_me:$LINENO: result: $ac_cv_c_extern_prefix" >&5 $as_echo "$ac_cv_c_extern_prefix" >&6; } +case $host_cpu in + *i[3456789]86*) + { $as_echo "$as_me:$LINENO: checking whether external symbols need stdcall decoration" >&5 +$as_echo_n "checking whether external symbols need stdcall decoration... " >&6; } +if test "${ac_cv_c_stdcall_suffix+set}" = set; then + $as_echo_n "(cached) " >&6 +else + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +#ifndef _MSC_VER +#define __stdcall __attribute__((__stdcall__)) +#endif +int __stdcall ac_test(int i) { return i; } +int +main () +{ +asm("jmp _ac_test@4"); if (ac_test(1)) return 1 + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext conftest$ac_exeext +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$ac_try_echo") >&5 + (eval "$ac_link") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest$ac_exeext && { + test "$cross_compiling" = yes || + $as_test_x conftest$ac_exeext + }; then + ac_cv_c_stdcall_suffix="yes" +else + $as_echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + ac_cv_c_stdcall_suffix="no" +fi + +rm -rf conftest.dSYM +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ + conftest$ac_exeext conftest.$ac_ext +fi +{ $as_echo "$as_me:$LINENO: result: $ac_cv_c_stdcall_suffix" >&5 +$as_echo "$ac_cv_c_stdcall_suffix" >&6; } ;; + *) ac_cv_c_stdcall_suffix="no" ;; +esac + if test "$ac_cv_c_extern_prefix" = "yes" @@ -17633,6 +17696,21 @@ _ACEOF fi + +if test "$ac_cv_c_stdcall_suffix" = "yes" +then + cat >>confdefs.h <<\_ACEOF +#define __ASM_STDCALL(args) "@" #args +_ACEOF + +else + cat >>confdefs.h <<\_ACEOF +#define __ASM_STDCALL(args) "" +_ACEOF + +fi + + { $as_echo "$as_me:$LINENO: checking how to define a function in assembly code" >&5 $as_echo_n "checking how to define a function in assembly code... " >&6; } if test "${ac_cv_asm_func_def+set}" = set; then diff --git a/configure.ac b/configure.ac index 48c76fe..aa3b892 100644 --- a/configure.ac +++ b/configure.ac @@ -1400,6 +1400,19 @@ AC_CACHE_CHECK([whether external symbols need an underscore prefix], ac_cv_c_ext [if (ac_test) return 1], ac_cv_c_extern_prefix="yes",ac_cv_c_extern_prefix="no")) +case $host_cpu in + *i[[3456789]]86*) + AC_CACHE_CHECK([whether external symbols need stdcall decoration], ac_cv_c_stdcall_suffix, + WINE_TRY_ASM_LINK(["jmp _ac_test@4"], +[#ifndef _MSC_VER +#define __stdcall __attribute__((__stdcall__)) +#endif +int __stdcall ac_test(int i) { return i; }], + [if (ac_test(1)) return 1], + ac_cv_c_stdcall_suffix="yes",ac_cv_c_stdcall_suffix="no")) ;; + *) ac_cv_c_stdcall_suffix="no" ;; +esac + AH_TEMPLATE(__ASM_NAME,[Define to a macro to generate an assembly name from a C symbol]) if test "$ac_cv_c_extern_prefix" = "yes" then @@ -1410,6 +1423,14 @@ else asm_name_prefix="" fi +AH_TEMPLATE(__ASM_STDCALL,[Define to a macro to generate an stdcall suffix]) +if test "$ac_cv_c_stdcall_suffix" = "yes" +then + AC_DEFINE([__ASM_STDCALL(args)],["@" #args]) +else + AC_DEFINE([__ASM_STDCALL(args)],[""]) +fi + dnl **** Check how to define a function in assembly code **** AC_CACHE_CHECK([how to define a function in assembly code], ac_cv_asm_func_def, diff --git a/include/config.h.in b/include/config.h.in index c94523e..5b5f7c8 100644 --- a/include/config.h.in +++ b/include/config.h.in @@ -1197,6 +1197,9 @@ /* Define to a macro to generate an assembly name from a C symbol */ #undef __ASM_NAME +/* Define to a macro to generate an stdcall suffix */ +#undef __ASM_STDCALL + /* Define to empty if `const' does not conform to ANSI C. */ #undef const

1 0

Alexandre Julliard : configure: Make sure that gcc is recent enough for building 64-bit code.
by Alexandre Julliard 15 Jun '09

15 Jun '09

Module: wine Branch: master Commit: 8812d241f0fb55293b9559eb3475f24b2f17c590 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8812d241f0fb55293b9559eb3… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sun Jun 14 11:19:54 2009 +0200 configure: Make sure that gcc is recent enough for building 64-bit code. --- configure | 52 ++++++++++++++++++++++++++++++++++++++++++++++++++++ configure.ac | 8 ++++++++ 2 files changed, 60 insertions(+), 0 deletions(-) diff --git a/configure b/configure index 3130f70..5b973e4 100755 --- a/configure +++ b/configure @@ -3897,6 +3897,58 @@ rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ enable_win16=${enable_win16:-yes} else + if test "x${GCC}" = "xyes" + then + { $as_echo "$as_me:$LINENO: checking whether $CC supports __builtin_ms_va_list" >&5 +$as_echo_n "checking whether $CC supports __builtin_ms_va_list... " >&6; } + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +#include <stdarg.h> +int +main () +{ +void func(__builtin_ms_va_list *args); + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$ac_try_echo") >&5 + (eval "$ac_compile") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then + { $as_echo "$as_me:$LINENO: result: yes" >&5 +$as_echo "yes" >&6; } +else + $as_echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + { $as_echo "$as_me:$LINENO: result: no" >&5 +$as_echo "no" >&6; } + { { $as_echo "$as_me:$LINENO: error: You need gcc >= 4.4 to build Wine as 64-bit." >&5 +$as_echo "$as_me: error: You need gcc >= 4.4 to build Wine as 64-bit." >&2;} + { (exit 1); exit 1; }; } +fi + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + fi TARGETFLAGS="-m64" fi diff --git a/configure.ac b/configure.ac index 4b89c19..48c76fe 100644 --- a/configure.ac +++ b/configure.ac @@ -139,6 +139,14 @@ case $host in AC_SUBST(TARGETFLAGS,"-m32") enable_win16=${enable_win16:-yes} else + if test "x${GCC}" = "xyes" + then + AC_MSG_CHECKING([whether $CC supports __builtin_ms_va_list]) + AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <stdarg.h>]], [[void func(__builtin_ms_va_list *args);]])], + [AC_MSG_RESULT([yes])], + [AC_MSG_RESULT([no]) + AC_MSG_ERROR([You need gcc >= 4.4 to build Wine as 64-bit.])]) + fi AC_SUBST(TARGETFLAGS,"-m64") fi ;;

1 0

Alexandre Julliard : server: Restart at the head of the wait queue when we woke a thread, since this can modify the queue.
by Alexandre Julliard 15 Jun '09

15 Jun '09

Module: wine Branch: master Commit: fd78e6e3a51091a8cbe049237a55347390d9570b URL: http://source.winehq.org/git/wine.git/?a=commit;h=fd78e6e3a51091a8cbe049237… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sat Jun 13 12:20:49 2009 +0200 server: Restart at the head of the wait queue when we woke a thread, since this can modify the queue. --- server/thread.c | 12 ++++++------ 1 files changed, 6 insertions(+), 6 deletions(-) diff --git a/server/thread.c b/server/thread.c index e931e81..2ea8929 100644 --- a/server/thread.c +++ b/server/thread.c @@ -712,15 +712,15 @@ done: /* attempt to wake threads sleeping on the object wait queue */ void wake_up( struct object *obj, int max ) { - struct list *ptr, *next; + struct list *ptr; - LIST_FOR_EACH_SAFE( ptr, next, &obj->wait_queue ) + LIST_FOR_EACH( ptr, &obj->wait_queue ) { struct wait_queue_entry *entry = LIST_ENTRY( ptr, struct wait_queue_entry, entry ); - if (wake_thread( entry->thread )) - { - if (max && !--max) break; - } + if (!wake_thread( entry->thread )) continue; + if (max && !--max) break; + /* restart at the head of the list since a wake up can change the object wait queue */ + ptr = &obj->wait_queue; } }

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits June 2009