Skip to content

W
wine-winehq
Commit f2e886a0 authored by Jacek Caban's avatar Jacek Caban Committed by Alexandre Julliard
Browse files
Options

ntdll: Export builtin functions as cdecl.

Signed-off-by: 's avatarJacek Caban <jacek@codeweavers.com> Signed-off-by: 's avatarAlexandre Julliard <julliard@winehq.org>
parent a8f02f00
Show whitespace changes
Inline Side-by-side
Showing with 27 additions and 18 deletions
dlls/ntdll/large_int.c
View file @ f2e886a0
...@@ -545,6 +545,15 @@ NTSTATUS WINAPI RtlInt64ToUnicodeString( ...@@ -545,6 +545,15 @@ NTSTATUS WINAPI RtlInt64ToUnicodeString(
#ifdef __i386__ #ifdef __i386__
/* those builtin functions use stdcall calling convention, but compilers reference them without stdcall declarations */
#if defined(__MINGW32__) || defined(_MSC_VER)
LONGLONG WINAPI _alldiv( LONGLONG a, LONGLONG b ) asm("_alldiv");
LONGLONG WINAPI _allmul( LONGLONG a, LONGLONG b ) asm("_allmul");
LONGLONG WINAPI _allrem( LONGLONG a, LONGLONG b ) asm("_allrem");
ULONGLONG WINAPI _aulldiv( ULONGLONG a, ULONGLONG b ) asm("_aulldiv");
ULONGLONG WINAPI _aullrem( ULONGLONG a, ULONGLONG b ) asm("_aullrem");
#endif
static ULONGLONG udivmod(ULONGLONG a, ULONGLONG b, ULONGLONG *rem) static ULONGLONG udivmod(ULONGLONG a, ULONGLONG b, ULONGLONG *rem)
{ {
const ULARGE_INTEGER n = { .QuadPart = a }; const ULARGE_INTEGER n = { .QuadPart = a };
...@@ -873,7 +882,7 @@ LONGLONG WINAPI _allshr( LONGLONG a, LONG b ) ...@@ -873,7 +882,7 @@ LONGLONG WINAPI _allshr( LONGLONG a, LONG b )
* Returns the quotient of a and b in edx:eax. * Returns the quotient of a and b in edx:eax.
* Returns the remainder of a and b in ebx:ecx. * Returns the remainder of a and b in ebx:ecx.
*/ */
__ASM_STDCALL_FUNC( _alldvrm, 16, __ASM_GLOBAL_FUNC( _alldvrm,
"pushl %ebp\n\t" "pushl %ebp\n\t"
__ASM_CFI(".cfi_adjust_cfa_offset 4\n\t") __ASM_CFI(".cfi_adjust_cfa_offset 4\n\t")
__ASM_CFI(".cfi_rel_offset %ebp,0\n\t") __ASM_CFI(".cfi_rel_offset %ebp,0\n\t")
...@@ -946,7 +955,7 @@ ULONGLONG WINAPI _aullshr( ULONGLONG a, LONG b ) ...@@ -946,7 +955,7 @@ ULONGLONG WINAPI _aullshr( ULONGLONG a, LONG b )
* Returns the quotient of a and b in edx:eax. * Returns the quotient of a and b in edx:eax.
* Returns the remainder of a and b in ebx:ecx. * Returns the remainder of a and b in ebx:ecx.
*/ */
__ASM_STDCALL_FUNC( _aulldvrm, 16, __ASM_GLOBAL_FUNC( _aulldvrm,
"pushl %ebp\n\t" "pushl %ebp\n\t"
__ASM_CFI(".cfi_adjust_cfa_offset 4\n\t") __ASM_CFI(".cfi_adjust_cfa_offset 4\n\t")
__ASM_CFI(".cfi_rel_offset %ebp,0\n\t") __ASM_CFI(".cfi_rel_offset %ebp,0\n\t")
......
dlls/ntdll/ntdll.spec
View file @ f2e886a0
...@@ -1427,17 +1427,17 @@ ...@@ -1427,17 +1427,17 @@
@ cdecl __iscsym(long) NTDLL___iscsym @ cdecl __iscsym(long) NTDLL___iscsym
@ cdecl __iscsymf(long) NTDLL___iscsymf @ cdecl __iscsymf(long) NTDLL___iscsymf
@ cdecl __toascii(long) NTDLL___toascii @ cdecl __toascii(long) NTDLL___toascii
@ stdcall -arch=i386 -ret64 _alldiv(int64 int64) @ cdecl -arch=i386 -ret64 _alldiv(int64 int64)
@ stdcall -arch=i386 -norelay _alldvrm(int64 int64) @ cdecl -arch=i386 -norelay _alldvrm(int64 int64)
@ stdcall -arch=i386 -ret64 _allmul(int64 int64) @ cdecl -arch=i386 -ret64 _allmul(int64 int64)
@ stdcall -arch=i386 -norelay _alloca_probe() @ cdecl -arch=i386 -norelay _alloca_probe()
@ stdcall -arch=i386 -ret64 _allrem(int64 int64) @ cdecl -arch=i386 -ret64 _allrem(int64 int64)
@ stdcall -arch=i386 -ret64 _allshl(int64 long) @ stdcall -arch=i386 -ret64 _allshl(int64 long)
@ stdcall -arch=i386 -ret64 _allshr(int64 long) @ stdcall -arch=i386 -ret64 _allshr(int64 long)
@ cdecl -ret64 _atoi64(str) @ cdecl -ret64 _atoi64(str)
@ stdcall -arch=i386 -ret64 _aulldiv(int64 int64) @ cdecl -arch=i386 -ret64 _aulldiv(int64 int64)
@ stdcall -arch=i386 -norelay _aulldvrm(int64 int64) @ cdecl -arch=i386 -norelay _aulldvrm(int64 int64)
@ stdcall -arch=i386 -ret64 _aullrem(int64 int64) @ cdecl -arch=i386 -ret64 _aullrem(int64 int64)
@ stdcall -arch=i386 -ret64 _aullshr(int64 long) @ stdcall -arch=i386 -ret64 _aullshr(int64 long)
@ cdecl -arch=i386 -norelay _chkstk() @ cdecl -arch=i386 -norelay _chkstk()
@ stub _fltused @ stub _fltused
......
dlls/ntoskrnl.exe/ntoskrnl.exe.spec
View file @ f2e886a0
...@@ -1514,16 +1514,16 @@ ...@@ -1514,16 +1514,16 @@
@ cdecl -private -arch=i386 _CIsin() @ cdecl -private -arch=i386 _CIsin()
@ cdecl -private -arch=i386 _CIsqrt() @ cdecl -private -arch=i386 _CIsqrt()
@ cdecl -private _abnormal_termination() @ cdecl -private _abnormal_termination()
@ stdcall -arch=i386 -ret64 _alldiv(int64 int64) @ cdecl -arch=i386 -ret64 _alldiv(int64 int64)
@ stdcall -arch=i386 -norelay _alldvrm(int64 int64) @ cdecl -arch=i386 -norelay _alldvrm(int64 int64)
@ stdcall -arch=i386 -ret64 _allmul(int64 int64) @ cdecl -arch=i386 -ret64 _allmul(int64 int64)
@ stdcall -arch=i386 -norelay _alloca_probe() @ cdecl -arch=i386 -norelay _alloca_probe()
@ stdcall -arch=i386 -ret64 _allrem(int64 int64) @ cdecl -arch=i386 -ret64 _allrem(int64 int64)
@ stdcall -arch=i386 -ret64 _allshl(int64 long) @ stdcall -arch=i386 -ret64 _allshl(int64 long)
@ stdcall -arch=i386 -ret64 _allshr(int64 long) @ stdcall -arch=i386 -ret64 _allshr(int64 long)
@ stdcall -arch=i386 -ret64 _aulldiv(int64 int64) @ cdecl -arch=i386 -ret64 _aulldiv(int64 int64)
@ stdcall -arch=i386 -norelay _aulldvrm(int64 int64) @ cdecl -arch=i386 -norelay _aulldvrm(int64 int64)
@ stdcall -arch=i386 -ret64 _aullrem(int64 int64) @ cdecl -arch=i386 -ret64 _aullrem(int64 int64)
@ stdcall -arch=i386 -ret64 _aullshr(int64 long) @ stdcall -arch=i386 -ret64 _aullshr(int64 long)
@ cdecl -arch=i386 -norelay _chkstk() @ cdecl -arch=i386 -norelay _chkstk()
@ cdecl -arch=i386 _except_handler2(ptr ptr ptr ptr) @ cdecl -arch=i386 _except_handler2(ptr ptr ptr ptr)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment