Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
W
wine-winehq
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Registry
Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
wine
wine-winehq
Commits
2319999a
Commit
2319999a
authored
Jan 12, 2007
by
Joel Parker
Committed by
Alexandre Julliard
Jan 17, 2007
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Remove redundant semicolons for ANSI compatibility.
parent
6ee85a61
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
20 changed files
with
106 additions
and
106 deletions
+106
-106
ne_module.c
dlls/kernel32/ne_module.c
+4
-4
relay16.c
dlls/kernel32/relay16.c
+1
-1
selector.c
dlls/kernel32/selector.c
+22
-22
thunk.c
dlls/kernel32/thunk.c
+17
-17
cpp.c
dlls/msvcrt/cpp.c
+0
-0
cppexcept.c
dlls/msvcrt/cppexcept.c
+1
-1
except.c
dlls/msvcrt/except.c
+4
-4
misc.c
dlls/msvcrt/misc.c
+1
-1
loader.c
dlls/ntdll/loader.c
+1
-1
relay.c
dlls/ntdll/relay.c
+1
-1
resource.c
dlls/ntdll/resource.c
+1
-1
rtl.c
dlls/ntdll/rtl.c
+4
-4
signal_i386.c
dlls/ntdll/signal_i386.c
+5
-5
signal_x86_64.c
dlls/ntdll/signal_x86_64.c
+2
-2
thread.c
dlls/ntdll/thread.c
+1
-1
txtsrv.c
dlls/riched20/txtsrv.c
+18
-18
ndr_stubless.c
dlls/rpcrt4/ndr_stubless.c
+1
-1
winproc.c
dlls/user32/winproc.c
+1
-1
interlocked.c
libs/port/interlocked.c
+15
-15
port.c
libs/wine/port.c
+6
-6
No files found.
dlls/kernel32/ne_module.c
View file @
2319999a
...
...
@@ -2161,7 +2161,7 @@ void WINAPI MapHInstSL16( CONTEXT86 *context )
__ASM_GLOBAL_FUNC
(
MapHInstLS
,
"pushl %eax
\n\t
"
"call "
__ASM_NAME
(
"MapHModuleLS"
)
"
\n\t
"
"ret"
)
;
"ret"
)
/***************************************************************************
* MapHInstSL (KERNEL32.@)
...
...
@@ -2169,7 +2169,7 @@ __ASM_GLOBAL_FUNC( MapHInstLS,
__ASM_GLOBAL_FUNC
(
MapHInstSL
,
"pushl %eax
\n\t
"
"call "
__ASM_NAME
(
"MapHModuleSL"
)
"
\n\t
"
"ret"
)
;
"ret"
)
/***************************************************************************
* MapHInstLS_PN (KERNEL32.@)
...
...
@@ -2179,7 +2179,7 @@ __ASM_GLOBAL_FUNC( MapHInstLS_PN,
"jz 1f
\n\t
"
"pushl %eax
\n\t
"
"call "
__ASM_NAME
(
"MapHModuleLS"
)
"
\n
"
"1:
\t
ret"
)
;
"1:
\t
ret"
)
/***************************************************************************
* MapHInstSL_PN (KERNEL32.@)
...
...
@@ -2189,6 +2189,6 @@ __ASM_GLOBAL_FUNC( MapHInstSL_PN,
"jz 1f
\n\t
"
"pushl %eax
\n\t
"
"call "
__ASM_NAME
(
"MapHModuleSL"
)
"
\n
"
"1:
\t
ret"
)
;
"1:
\t
ret"
)
#endif
/* __i386__ */
dlls/kernel32/relay16.c
View file @
2319999a
...
...
@@ -302,7 +302,7 @@ __ASM_GLOBAL_FUNC( call_entry_point,
"
\t
popl %edi
\n
"
"
\t
popl %esi
\n
"
"
\t
popl %ebp
\n
"
"
\t
ret"
)
;
"
\t
ret"
)
/***********************************************************************
...
...
dlls/kernel32/selector.c
View file @
2319999a
...
...
@@ -566,7 +566,7 @@ LPVOID WINAPI MapSLFix( SEGPTR sptr )
* Must not change EAX, hence defined as asm function.
*/
#ifdef __i386__
__ASM_GLOBAL_FUNC
(
UnMapSLFixArray
,
"ret $8"
)
;
__ASM_GLOBAL_FUNC
(
UnMapSLFixArray
,
"ret $8"
)
#endif
...
...
@@ -603,7 +603,7 @@ __ASM_GLOBAL_FUNC( SMapLS,
"pushl %eax
\n\t
"
"call "
__ASM_NAME
(
"MapLS"
)
"
\n\t
"
"movl %eax,%edx
\n
"
"1:
\t
ret"
)
;
"1:
\t
ret"
)
/***********************************************************************
* SUnMapLS (KERNEL32.@)
...
...
@@ -613,7 +613,7 @@ __ASM_GLOBAL_FUNC( SUnMapLS,
"pushl %eax
\n\t
"
"call "
__ASM_NAME
(
"UnMapLS"
)
"
\n\t
"
"popl %eax
\n\t
"
"ret"
)
;
"ret"
)
/***********************************************************************
* SMapLS_IP_EBP_8 (KERNEL32.@)
...
...
@@ -636,17 +636,17 @@ __ASM_GLOBAL_FUNC( SUnMapLS,
"movl " #n "(%ebp),%eax\n\t" \
"call " __ASM_NAME("SMapLS") "\n\t" \
"movl %edx," #n "(%ebp)\n\t" \
"ret" )
;
"ret" )
DEFINE_SMapLS
(
8
)
;
DEFINE_SMapLS
(
12
)
;
DEFINE_SMapLS
(
16
)
;
DEFINE_SMapLS
(
20
)
;
DEFINE_SMapLS
(
24
)
;
DEFINE_SMapLS
(
28
)
;
DEFINE_SMapLS
(
32
)
;
DEFINE_SMapLS
(
36
)
;
DEFINE_SMapLS
(
40
)
;
DEFINE_SMapLS
(
8
)
DEFINE_SMapLS
(
12
)
DEFINE_SMapLS
(
16
)
DEFINE_SMapLS
(
20
)
DEFINE_SMapLS
(
24
)
DEFINE_SMapLS
(
28
)
DEFINE_SMapLS
(
32
)
DEFINE_SMapLS
(
36
)
DEFINE_SMapLS
(
40
)
/***********************************************************************
...
...
@@ -670,14 +670,14 @@ DEFINE_SMapLS(40);
"popl %eax\n\t" \
"ret" )
DEFINE_SUnMapLS
(
8
)
;
DEFINE_SUnMapLS
(
12
)
;
DEFINE_SUnMapLS
(
16
)
;
DEFINE_SUnMapLS
(
20
)
;
DEFINE_SUnMapLS
(
24
)
;
DEFINE_SUnMapLS
(
28
)
;
DEFINE_SUnMapLS
(
32
)
;
DEFINE_SUnMapLS
(
36
)
;
DEFINE_SUnMapLS
(
40
)
;
DEFINE_SUnMapLS
(
8
)
DEFINE_SUnMapLS
(
12
)
DEFINE_SUnMapLS
(
16
)
DEFINE_SUnMapLS
(
20
)
DEFINE_SUnMapLS
(
24
)
DEFINE_SUnMapLS
(
28
)
DEFINE_SUnMapLS
(
32
)
DEFINE_SUnMapLS
(
36
)
DEFINE_SUnMapLS
(
40
)
#endif
/* __i386__ */
dlls/kernel32/thunk.c
View file @
2319999a
...
...
@@ -661,23 +661,23 @@ DEFINE_REGS_ENTRYPOINT( FT_Thunk, 0, 0 );
"leave\n\t"
#define DEFINE_FT_Exit(n) \
__ASM_GLOBAL_FUNC( FT_Exit ## n, FT_EXIT_RESTORE_REGS "ret $" #n )
;
DEFINE_FT_Exit
(
0
)
;
DEFINE_FT_Exit
(
4
)
;
DEFINE_FT_Exit
(
8
)
;
DEFINE_FT_Exit
(
12
)
;
DEFINE_FT_Exit
(
16
)
;
DEFINE_FT_Exit
(
20
)
;
DEFINE_FT_Exit
(
24
)
;
DEFINE_FT_Exit
(
28
)
;
DEFINE_FT_Exit
(
32
)
;
DEFINE_FT_Exit
(
36
)
;
DEFINE_FT_Exit
(
40
)
;
DEFINE_FT_Exit
(
44
)
;
DEFINE_FT_Exit
(
48
)
;
DEFINE_FT_Exit
(
52
)
;
DEFINE_FT_Exit
(
56
)
;
__ASM_GLOBAL_FUNC( FT_Exit ## n, FT_EXIT_RESTORE_REGS "ret $" #n )
DEFINE_FT_Exit
(
0
)
DEFINE_FT_Exit
(
4
)
DEFINE_FT_Exit
(
8
)
DEFINE_FT_Exit
(
12
)
DEFINE_FT_Exit
(
16
)
DEFINE_FT_Exit
(
20
)
DEFINE_FT_Exit
(
24
)
DEFINE_FT_Exit
(
28
)
DEFINE_FT_Exit
(
32
)
DEFINE_FT_Exit
(
36
)
DEFINE_FT_Exit
(
40
)
DEFINE_FT_Exit
(
44
)
DEFINE_FT_Exit
(
48
)
DEFINE_FT_Exit
(
52
)
DEFINE_FT_Exit
(
56
)
#endif
/* __i386__ */
...
...
dlls/msvcrt/cpp.c
View file @
2319999a
This diff is collapsed.
Click to expand it.
dlls/msvcrt/cppexcept.c
View file @
2319999a
...
...
@@ -422,7 +422,7 @@ __ASM_GLOBAL_FUNC( __CxxFrameHandler,
"pushl 28(%esp)
\n\t
"
/* rec */
"call "
__ASM_NAME
(
"cxx_frame_handler"
)
"
\n\t
"
"add $28,%esp
\n\t
"
"ret"
)
;
"ret"
)
/*********************************************************************
...
...
dlls/msvcrt/except.c
View file @
2319999a
...
...
@@ -109,7 +109,7 @@ __ASM_GLOBAL_FUNC(_EH_prolog,
"movl %ebp, 12(%esp)
\n\t
"
"leal 12(%esp), %ebp
\n\t
"
"pushl %eax
\n\t
"
"ret"
)
;
"ret"
)
#endif
/*******************************************************************
...
...
@@ -286,7 +286,7 @@ __ASM_GLOBAL_FUNC( longjmp_set_regs,
"movl 12(%ecx),%esi
\n\t
"
/* jmp_buf.Esi */
"movl 16(%ecx),%esp
\n\t
"
/* jmp_buf.Esp */
"addl $4,%esp
\n\t
"
/* get rid of return address */
"jmp *20(%ecx)
\n\t
"
/* jmp_buf.Eip */
)
;
"jmp *20(%ecx)
\n\t
"
/* jmp_buf.Eip */
)
/*
* The signatures of the setjmp/longjmp functions do not match that
...
...
@@ -297,7 +297,7 @@ __ASM_GLOBAL_FUNC( longjmp_set_regs,
/*******************************************************************
* _setjmp (MSVCRT.@)
*/
DEFINE_SETJMP_ENTRYPOINT
(
MSVCRT__setjmp
)
;
DEFINE_SETJMP_ENTRYPOINT
(
MSVCRT__setjmp
)
int
CDECL
__regs_MSVCRT__setjmp
(
struct
MSVCRT___JUMP_BUFFER
*
jmp
)
{
jmp
->
Registration
=
(
unsigned
long
)
NtCurrentTeb
()
->
Tib
.
ExceptionList
;
...
...
@@ -314,7 +314,7 @@ int CDECL __regs_MSVCRT__setjmp(struct MSVCRT___JUMP_BUFFER *jmp)
/*******************************************************************
* _setjmp3 (MSVCRT.@)
*/
DEFINE_SETJMP_ENTRYPOINT
(
MSVCRT__setjmp3
)
;
DEFINE_SETJMP_ENTRYPOINT
(
MSVCRT__setjmp3
)
int
CDECL
__regs_MSVCRT__setjmp3
(
struct
MSVCRT___JUMP_BUFFER
*
jmp
,
int
nb_args
,
...)
{
jmp
->
Cookie
=
MSVCRT_JMP_MAGIC
;
...
...
dlls/msvcrt/misc.c
View file @
2319999a
...
...
@@ -148,7 +148,7 @@ __ASM_GLOBAL_FUNC(_chkesp,
"popl %ecx
\n\t
"
"popl %eax
\n\t
"
"leave
\n\t
"
"ret"
)
;
"ret"
)
void
CDECL
MSVCRT_chkesp_fail
(
void
)
{
...
...
dlls/ntdll/loader.c
View file @
2319999a
...
...
@@ -150,7 +150,7 @@ __ASM_GLOBAL_FUNC(call_dll_entry_point,
"leal -4(%ebp),%esp
\n\t
"
"popl %ebx
\n\t
"
"popl %ebp
\n\t
"
"ret"
)
;
"ret"
)
#else
/* __i386__ */
static
inline
BOOL
call_dll_entry_point
(
DLLENTRYPROC
proc
,
void
*
module
,
UINT
reason
,
void
*
reserved
)
...
...
dlls/ntdll/relay.c
View file @
2319999a
...
...
@@ -360,7 +360,7 @@ __ASM_GLOBAL_FUNC( call_entry_point,
"
\t
popl %edi
\n
"
"
\t
popl %esi
\n
"
"
\t
popl %ebp
\n
"
"
\t
ret"
)
;
"
\t
ret"
)
/***********************************************************************
...
...
dlls/ntdll/resource.c
View file @
2319999a
...
...
@@ -371,7 +371,7 @@ __ASM_GLOBAL_FUNC( LdrAccessResource,
"call "
__ASM_NAME
(
"access_resource"
)
"
\n\t
"
"leave
\n\t
"
"ret $16"
)
;
)
#else
NTSTATUS
WINAPI
LdrAccessResource
(
HMODULE
hmod
,
const
IMAGE_RESOURCE_DATA_ENTRY
*
entry
,
void
**
ptr
,
ULONG
*
size
)
...
...
dlls/ntdll/rtl.c
View file @
2319999a
...
...
@@ -407,7 +407,7 @@ __ASM_GLOBAL_FUNC( _chkstk,
"xchgl %esp,%eax
\n\t
"
"movl 0(%eax),%eax
\n\t
"
/* copy return address from old location */
"movl %eax,0(%esp)
\n\t
"
"ret"
)
;
"ret"
)
#endif
/**************************************************************************
...
...
@@ -422,7 +422,7 @@ __ASM_GLOBAL_FUNC( _alloca_probe,
"xchgl %esp,%eax
\n\t
"
"movl 0(%eax),%eax
\n\t
"
/* copy return address from old location */
"movl %eax,0(%esp)
\n\t
"
"ret"
)
;
"ret"
)
#endif
...
...
@@ -627,7 +627,7 @@ ULONGLONG __cdecl RtlUlonglongByteSwap(ULONGLONG i)
__ASM_GLOBAL_FUNC
(
NTDLL_RtlUlongByteSwap
,
"movl %ecx,%eax
\n\t
"
"bswap %eax
\n\t
"
"ret"
)
;
"ret"
)
#endif
/*************************************************************************
...
...
@@ -642,7 +642,7 @@ __ASM_GLOBAL_FUNC(NTDLL_RtlUlongByteSwap,
__ASM_GLOBAL_FUNC
(
NTDLL_RtlUshortByteSwap
,
"movb %ch,%al
\n\t
"
"movb %cl,%ah
\n\t
"
"ret"
)
;
"ret"
)
#endif
...
...
dlls/ntdll/signal_i386.c
View file @
2319999a
...
...
@@ -130,7 +130,7 @@ __ASM_GLOBAL_FUNC(vm86_enter,
".globl "
__ASM_NAME
(
"vm86_return_end"
)
"
\n\t
"
__ASM_FUNC
(
"vm86_return_end"
)
"
\n
"
__ASM_NAME
(
"vm86_return_end"
)
":
\n\t
"
"ret"
)
;
"ret"
)
#ifdef HAVE_SYS_VM86_H
# define __HAVE_VM86
...
...
@@ -1477,12 +1477,12 @@ void __wine_enter_vm86( CONTEXT *context )
/**********************************************************************
* DbgBreakPoint (NTDLL.@)
*/
__ASM_GLOBAL_FUNC
(
DbgBreakPoint
,
"int $3; ret"
)
;
__ASM_GLOBAL_FUNC
(
DbgBreakPoint
,
"int $3; ret"
)
/**********************************************************************
* DbgUserBreakPoint (NTDLL.@)
*/
__ASM_GLOBAL_FUNC
(
DbgUserBreakPoint
,
"int $3; ret"
)
;
__ASM_GLOBAL_FUNC
(
DbgUserBreakPoint
,
"int $3; ret"
)
/**********************************************************************
...
...
@@ -1509,7 +1509,7 @@ __ASM_GLOBAL_FUNC( EXC_CallHandler,
" popl %ebx
\n
"
" leave
\n
"
" ret
\n
"
)
;
)
__ASM_GLOBAL_FUNC
(
call_exception_handler
,
" pushl %ebp
\n
"
" movl %esp, %ebp
\n
"
...
...
@@ -1533,5 +1533,5 @@ __ASM_GLOBAL_FUNC(call_exception_handler,
" movl %ebp, %esp
\n
"
/* restore saved stack, in case it was corrupted */
" popl %ebp
\n
"
" ret $20
\n
"
/* (*4) */
)
;
)
#endif
/* __i386__ */
dlls/ntdll/signal_x86_64.c
View file @
2319999a
...
...
@@ -520,11 +520,11 @@ void __wine_enter_vm86( CONTEXT *context )
/**********************************************************************
* DbgBreakPoint (NTDLL.@)
*/
__ASM_GLOBAL_FUNC
(
DbgBreakPoint
,
"int $3; ret"
)
;
__ASM_GLOBAL_FUNC
(
DbgBreakPoint
,
"int $3; ret"
)
/**********************************************************************
* DbgUserBreakPoint (NTDLL.@)
*/
__ASM_GLOBAL_FUNC
(
DbgUserBreakPoint
,
"int $3; ret"
)
;
__ASM_GLOBAL_FUNC
(
DbgUserBreakPoint
,
"int $3; ret"
)
#endif
/* __x86_64__ */
dlls/ntdll/thread.c
View file @
2319999a
...
...
@@ -1309,7 +1309,7 @@ NTSTATUS WINAPI NtSetInformationThread( HANDLE handle, THREADINFOCLASS class,
*/
#if defined(__i386__) && defined(__GNUC__)
__ASM_GLOBAL_FUNC
(
NtCurrentTeb
,
".byte 0x64
\n\t
movl 0x18,%eax
\n\t
ret"
)
;
__ASM_GLOBAL_FUNC
(
NtCurrentTeb
,
".byte 0x64
\n\t
movl 0x18,%eax
\n\t
ret"
)
#elif defined(__i386__) && defined(_MSC_VER)
...
...
dlls/riched20/txtsrv.c
View file @
2319999a
...
...
@@ -346,24 +346,24 @@ HRESULT WINAPI fnTextSrv_TxGetCachedSize(ITextServices *iface,
return
E_NOTIMPL
;
}
DEFINE_THISCALL_WRAPPER
(
fnTextSrv_TxSendMessage
)
;
DEFINE_THISCALL_WRAPPER
(
fnTextSrv_TxDraw
)
;
DEFINE_THISCALL_WRAPPER
(
fnTextSrv_TxGetHScroll
)
;
DEFINE_THISCALL_WRAPPER
(
fnTextSrv_TxGetVScroll
)
;
DEFINE_THISCALL_WRAPPER
(
fnTextSrv_OnTxSetCursor
)
;
DEFINE_THISCALL_WRAPPER
(
fnTextSrv_TxQueryHitPoint
)
;
DEFINE_THISCALL_WRAPPER
(
fnTextSrv_OnTxInplaceActivate
)
;
DEFINE_THISCALL_WRAPPER
(
fnTextSrv_OnTxInplaceDeactivate
)
;
DEFINE_THISCALL_WRAPPER
(
fnTextSrv_OnTxUIActivate
)
;
DEFINE_THISCALL_WRAPPER
(
fnTextSrv_OnTxUIDeactivate
)
;
DEFINE_THISCALL_WRAPPER
(
fnTextSrv_TxGetText
)
;
DEFINE_THISCALL_WRAPPER
(
fnTextSrv_TxSetText
)
;
DEFINE_THISCALL_WRAPPER
(
fnTextSrv_TxGetCurrentTargetX
)
;
DEFINE_THISCALL_WRAPPER
(
fnTextSrv_TxGetBaseLinePos
)
;
DEFINE_THISCALL_WRAPPER
(
fnTextSrv_TxGetNaturalSize
)
;
DEFINE_THISCALL_WRAPPER
(
fnTextSrv_TxGetDropTarget
)
;
DEFINE_THISCALL_WRAPPER
(
fnTextSrv_OnTxPropertyBitsChange
)
;
DEFINE_THISCALL_WRAPPER
(
fnTextSrv_TxGetCachedSize
)
;
DEFINE_THISCALL_WRAPPER
(
fnTextSrv_TxSendMessage
)
DEFINE_THISCALL_WRAPPER
(
fnTextSrv_TxDraw
)
DEFINE_THISCALL_WRAPPER
(
fnTextSrv_TxGetHScroll
)
DEFINE_THISCALL_WRAPPER
(
fnTextSrv_TxGetVScroll
)
DEFINE_THISCALL_WRAPPER
(
fnTextSrv_OnTxSetCursor
)
DEFINE_THISCALL_WRAPPER
(
fnTextSrv_TxQueryHitPoint
)
DEFINE_THISCALL_WRAPPER
(
fnTextSrv_OnTxInplaceActivate
)
DEFINE_THISCALL_WRAPPER
(
fnTextSrv_OnTxInplaceDeactivate
)
DEFINE_THISCALL_WRAPPER
(
fnTextSrv_OnTxUIActivate
)
DEFINE_THISCALL_WRAPPER
(
fnTextSrv_OnTxUIDeactivate
)
DEFINE_THISCALL_WRAPPER
(
fnTextSrv_TxGetText
)
DEFINE_THISCALL_WRAPPER
(
fnTextSrv_TxSetText
)
DEFINE_THISCALL_WRAPPER
(
fnTextSrv_TxGetCurrentTargetX
)
DEFINE_THISCALL_WRAPPER
(
fnTextSrv_TxGetBaseLinePos
)
DEFINE_THISCALL_WRAPPER
(
fnTextSrv_TxGetNaturalSize
)
DEFINE_THISCALL_WRAPPER
(
fnTextSrv_TxGetDropTarget
)
DEFINE_THISCALL_WRAPPER
(
fnTextSrv_OnTxPropertyBitsChange
)
DEFINE_THISCALL_WRAPPER
(
fnTextSrv_TxGetCachedSize
)
static
const
ITextServicesVtbl
textservices_Vtbl
=
{
...
...
dlls/rpcrt4/ndr_stubless.c
View file @
2319999a
...
...
@@ -1036,7 +1036,7 @@ __ASM_GLOBAL_FUNC(call_server_func,
"popl %esi
\n\t
"
/* Restore registers */
"popl %edi
\n\t
"
"popl %ebp
\n\t
"
"ret
\n
"
)
;
"ret
\n
"
)
#else
#warning call_server_func not implemented for your architecture
LONG_PTR
__cdecl
call_server_func
(
SERVER_ROUTINE
func
,
unsigned
char
*
args
,
unsigned
short
stack_size
)
...
...
dlls/user32/winproc.c
View file @
2319999a
...
...
@@ -278,7 +278,7 @@ __ASM_GLOBAL_FUNC( WINPROC_wrapper,
"popl %esi
\n\t
"
"popl %edi
\n\t
"
"leave
\n\t
"
"ret"
)
;
"ret"
)
#else
static
inline
LRESULT
WINPROC_wrapper
(
WNDPROC
proc
,
HWND
hwnd
,
UINT
msg
,
WPARAM
wParam
,
LPARAM
lParam
)
...
...
libs/port/interlocked.c
View file @
2319999a
...
...
@@ -30,28 +30,28 @@ __ASM_GLOBAL_FUNC(interlocked_cmpxchg,
"movl 8(%esp),%ecx
\n\t
"
"movl 4(%esp),%edx
\n\t
"
"lock; cmpxchgl %ecx,(%edx)
\n\t
"
"ret"
)
;
"ret"
)
__ASM_GLOBAL_FUNC
(
interlocked_cmpxchg_ptr
,
"movl 12(%esp),%eax
\n\t
"
"movl 8(%esp),%ecx
\n\t
"
"movl 4(%esp),%edx
\n\t
"
"lock; cmpxchgl %ecx,(%edx)
\n\t
"
"ret"
)
;
"ret"
)
__ASM_GLOBAL_FUNC
(
interlocked_xchg
,
"movl 8(%esp),%eax
\n\t
"
"movl 4(%esp),%edx
\n\t
"
"lock; xchgl %eax,(%edx)
\n\t
"
"ret"
)
;
"ret"
)
__ASM_GLOBAL_FUNC
(
interlocked_xchg_ptr
,
"movl 8(%esp),%eax
\n\t
"
"movl 4(%esp),%edx
\n\t
"
"lock; xchgl %eax,(%edx)
\n\t
"
"ret"
)
;
"ret"
)
__ASM_GLOBAL_FUNC
(
interlocked_xchg_add
,
"movl 8(%esp),%eax
\n\t
"
"movl 4(%esp),%edx
\n\t
"
"lock; xaddl %eax,(%edx)
\n\t
"
"ret"
)
;
"ret"
)
#elif defined(_MSC_VER)
...
...
@@ -108,23 +108,23 @@ __declspec(naked) int interlocked_xchg_add( int *dest, int incr )
__ASM_GLOBAL_FUNC
(
interlocked_cmpxchg
,
"mov %edx, %eax
\n\t
"
"lock cmpxchgl %esi,(%rdi)
\n\t
"
"ret"
)
;
"ret"
)
__ASM_GLOBAL_FUNC
(
interlocked_cmpxchg_ptr
,
"mov %rdx, %rax
\n\t
"
"lock cmpxchgq %rsi,(%rdi)
\n\t
"
"ret"
)
;
"ret"
)
__ASM_GLOBAL_FUNC
(
interlocked_xchg
,
"mov %esi, %eax
\n\t
"
"lock xchgl %eax, (%rdi)
\n\t
"
"ret"
)
;
"ret"
)
__ASM_GLOBAL_FUNC
(
interlocked_xchg_ptr
,
"mov %rsi, %rax
\n\t
"
"lock xchgq %rax,(%rdi)
\n\t
"
"ret"
)
;
"ret"
)
__ASM_GLOBAL_FUNC
(
interlocked_xchg_add
,
"mov %esi, %eax
\n\t
"
"lock xaddl %eax, (%rdi)
\n\t
"
"ret"
)
;
"ret"
)
#else
# error You must implement the interlocked* functions for your compiler
...
...
@@ -286,7 +286,7 @@ __ASM_GLOBAL_FUNC(interlocked_cmpxchg,
"beq $0,L0cmpxchg
\n\t
"
"mov $18,$0
\n
"
"L1cmpxchg:
\n\t
"
"mb"
)
;
"mb"
)
__ASM_GLOBAL_FUNC
(
interlocked_cmpxchg_ptr
,
"L0cmpxchg_ptr:
\n\t
"
...
...
@@ -298,7 +298,7 @@ __ASM_GLOBAL_FUNC(interlocked_cmpxchg_ptr,
"beq $0,L0cmpxchg_ptr
\n\t
"
"mov $18,$0
\n
"
"L1cmpxchg_ptr:
\n\t
"
"mb"
)
;
"mb"
)
__ASM_GLOBAL_FUNC
(
interlocked_xchg
,
"L0xchg:
\n\t
"
...
...
@@ -306,7 +306,7 @@ __ASM_GLOBAL_FUNC(interlocked_xchg,
"mov $17,$1
\n\t
"
"stl_c $1,0($16)
\n\t
"
"beq $1,L0xchg
\n\t
"
"mb"
)
;
"mb"
)
__ASM_GLOBAL_FUNC
(
interlocked_xchg_ptr
,
"L0xchg_ptr:
\n\t
"
...
...
@@ -314,7 +314,7 @@ __ASM_GLOBAL_FUNC(interlocked_xchg_ptr,
"mov $17,$1
\n\t
"
"stq_c $1,0($16)
\n\t
"
"beq $1,L0xchg_ptr
\n\t
"
"mb"
)
;
"mb"
)
__ASM_GLOBAL_FUNC
(
interlocked_xchg_add
,
"L0xchg_add:
\n\t
"
...
...
@@ -322,7 +322,7 @@ __ASM_GLOBAL_FUNC(interlocked_xchg_add,
"addl $0,$17,$1
\n\t
"
"stl_c $1,0($16)
\n\t
"
"beq $1,L0xchg_add
\n\t
"
"mb"
)
;
"mb"
)
#else
# error You must implement the interlocked* functions for your CPU
...
...
libs/wine/port.c
View file @
2319999a
...
...
@@ -64,7 +64,7 @@ __ASM_GLOBAL_FUNC( wine_switch_to_stack,
"pushl %edx
\n\t
"
"xorl %ebp,%ebp
\n\t
"
"call *%ecx
\n\t
"
"int $3"
/* we never return here */
)
;
"int $3"
/* we never return here */
)
#elif defined(__i386__) && defined(_MSC_VER)
__declspec
(
naked
)
void
wine_switch_to_stack
(
void
(
*
func
)(
void
*
),
void
*
arg
,
void
*
stack
)
{
...
...
@@ -83,7 +83,7 @@ __ASM_GLOBAL_FUNC( wine_switch_to_stack,
"sub %o2, 96, %sp
\n\t
"
/* store stack */
"call %l0, 0
\n\t
"
/* call func */
"mov %l1, %o0
\n\t
"
/* delay slot: arg for func */
"ta 0x01"
)
;
/* breakpoint - we never get here */
"ta 0x01"
)
/* breakpoint - we never get here */
#elif defined(__powerpc__) && defined(__APPLE__)
__ASM_GLOBAL_FUNC
(
wine_switch_to_stack
,
"mtctr r3
\n\t
"
/* func -> ctr */
...
...
@@ -91,21 +91,21 @@ __ASM_GLOBAL_FUNC( wine_switch_to_stack,
"mr r1,r5
\n\t
"
/* stack */
"subi r1,r1,0x100
\n\t
"
/* adjust stack pointer */
"bctr
\n
"
/* call ctr */
"1:
\t
b 1b"
)
;
/* loop */
"1:
\t
b 1b"
)
/* loop */
#elif defined(__powerpc__) && defined(__GNUC__)
__ASM_GLOBAL_FUNC
(
wine_switch_to_stack
,
"mtctr 3
\n\t
"
/* func -> ctr */
"mr 3,4
\n\t
"
/* args -> function param 1 (r3) */
"mr 1,5
\n\t
"
/* stack */
"bctr
\n\t
"
/* call ctr */
"1:
\t
b 1b"
)
;
/* loop */
"1:
\t
b 1b"
)
/* loop */
#elif defined(__ALPHA__) && defined(__GNUC__)
__ASM_GLOBAL_FUNC
(
wine_switch_to_stack
,
"mov $16,$0
\n\t
"
/* func */
"mov $17,$16
\n\t
"
/* arg */
"mov $18,$30
\n\t
"
/* stack */
"jsr $31,($0),0
\n\t
"
/* call func */
"L1:
\t
br $31,L1"
)
;
/* loop */
"L1:
\t
br $31,L1"
)
/* loop */
#elif defined(__x86_64__) && defined(__GNUC__)
__ASM_GLOBAL_FUNC
(
wine_switch_to_stack
,
"movq %rdi,%rax
\n\t
"
/* func */
...
...
@@ -114,7 +114,7 @@ __ASM_GLOBAL_FUNC( wine_switch_to_stack,
"movq %rdx,%rsp
\n\t
"
"xorq %rbp,%rbp
\n\t
"
"callq *%rax
\n\t
"
/* call func */
"int $3"
)
;
"int $3"
)
#else
#error You must implement wine_switch_to_stack for your platform
#endif
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment