Commit 2b6e32f3 authored by Alexandre Julliard's avatar Alexandre Julliard

ntdll: Don't define stdcall functions on non-i386.

parent c908ad6f
...@@ -670,7 +670,6 @@ BOOL WINAPI IsBadStringPtrA( LPCSTR str, UINT_PTR max ) ...@@ -670,7 +670,6 @@ BOOL WINAPI IsBadStringPtrA( LPCSTR str, UINT_PTR max )
__ENDTRY __ENDTRY
return FALSE; return FALSE;
} }
__ASM_STDCALL_IMPORT(IsBadStringPtrA,8)
/************************************************************* /*************************************************************
* IsBadStringPtrW * IsBadStringPtrW
...@@ -692,8 +691,14 @@ BOOL WINAPI IsBadStringPtrW( LPCWSTR str, UINT_PTR max ) ...@@ -692,8 +691,14 @@ BOOL WINAPI IsBadStringPtrW( LPCWSTR str, UINT_PTR max )
__ENDTRY __ENDTRY
return FALSE; return FALSE;
} }
__ASM_STDCALL_IMPORT(IsBadStringPtrW,8)
#ifdef __i386__
__ASM_STDCALL_IMPORT(IsBadStringPtrA,8)
__ASM_STDCALL_IMPORT(IsBadStringPtrW,8)
#else
__ASM_GLOBAL_IMPORT(IsBadStringPtrA)
__ASM_GLOBAL_IMPORT(IsBadStringPtrW)
#endif
/********************************************************************** /**********************************************************************
* RtlGetEnabledExtendedFeatures (NTDLL.@) * RtlGetEnabledExtendedFeatures (NTDLL.@)
......
...@@ -103,7 +103,7 @@ __ASM_GLOBAL_FUNC( __chkstk, "lsl r4, r4, #2\n\t" ...@@ -103,7 +103,7 @@ __ASM_GLOBAL_FUNC( __chkstk, "lsl r4, r4, #2\n\t"
/*********************************************************************** /***********************************************************************
* RtlCaptureContext (NTDLL.@) * RtlCaptureContext (NTDLL.@)
*/ */
__ASM_STDCALL_FUNC( RtlCaptureContext, 4, __ASM_GLOBAL_FUNC( RtlCaptureContext,
"str r1, [r0, #0x8]\n\t" /* context->R1 */ "str r1, [r0, #0x8]\n\t" /* context->R1 */
"mov r1, #0x0200000\n\t" /* CONTEXT_ARM */ "mov r1, #0x0200000\n\t" /* CONTEXT_ARM */
"add r1, r1, #0x7\n\t" /* CONTEXT_CONTROL|CONTEXT_INTEGER|CONTEXT_FLOATING_POINT */ "add r1, r1, #0x7\n\t" /* CONTEXT_CONTROL|CONTEXT_INTEGER|CONTEXT_FLOATING_POINT */
...@@ -1451,7 +1451,7 @@ EXCEPTION_DISPOSITION WINAPI __C_specific_handler( EXCEPTION_RECORD *rec, ...@@ -1451,7 +1451,7 @@ EXCEPTION_DISPOSITION WINAPI __C_specific_handler( EXCEPTION_RECORD *rec,
/*********************************************************************** /***********************************************************************
* RtlRaiseException (NTDLL.@) * RtlRaiseException (NTDLL.@)
*/ */
__ASM_STDCALL_FUNC( RtlRaiseException, 4, __ASM_GLOBAL_FUNC( RtlRaiseException,
"push {r0, lr}\n\t" "push {r0, lr}\n\t"
__ASM_EHABI(".save {r0, lr}\n\t") __ASM_EHABI(".save {r0, lr}\n\t")
__ASM_SEH(".seh_save_regs {r0, lr}\n\t") __ASM_SEH(".seh_save_regs {r0, lr}\n\t")
...@@ -1498,11 +1498,11 @@ __ASM_GLOBAL_FUNC( signal_start_thread, ...@@ -1498,11 +1498,11 @@ __ASM_GLOBAL_FUNC( signal_start_thread,
/********************************************************************** /**********************************************************************
* DbgBreakPoint (NTDLL.@) * DbgBreakPoint (NTDLL.@)
*/ */
__ASM_STDCALL_FUNC( DbgBreakPoint, 0, "udf #0xfe; bx lr; nop; nop; nop; nop" ); __ASM_GLOBAL_FUNC( DbgBreakPoint, "udf #0xfe; bx lr; nop; nop; nop; nop" );
/********************************************************************** /**********************************************************************
* DbgUserBreakPoint (NTDLL.@) * DbgUserBreakPoint (NTDLL.@)
*/ */
__ASM_STDCALL_FUNC( DbgUserBreakPoint, 0, "udf #0xfe; bx lr; nop; nop; nop; nop" ); __ASM_GLOBAL_FUNC( DbgUserBreakPoint, "udf #0xfe; bx lr; nop; nop; nop; nop" );
#endif /* __arm__ */ #endif /* __arm__ */
...@@ -110,7 +110,7 @@ __ASM_GLOBAL_FUNC( __chkstk, "ret") ...@@ -110,7 +110,7 @@ __ASM_GLOBAL_FUNC( __chkstk, "ret")
/*********************************************************************** /***********************************************************************
* RtlCaptureContext (NTDLL.@) * RtlCaptureContext (NTDLL.@)
*/ */
__ASM_STDCALL_FUNC( RtlCaptureContext, 8, __ASM_GLOBAL_FUNC( RtlCaptureContext,
"str xzr, [x0, #0x8]\n\t" /* context->X0 */ "str xzr, [x0, #0x8]\n\t" /* context->X0 */
"stp x1, x2, [x0, #0x10]\n\t" /* context->X1,X2 */ "stp x1, x2, [x0, #0x10]\n\t" /* context->X1,X2 */
"stp x3, x4, [x0, #0x20]\n\t" /* context->X3,X4 */ "stp x3, x4, [x0, #0x20]\n\t" /* context->X3,X4 */
...@@ -1489,7 +1489,7 @@ EXCEPTION_DISPOSITION WINAPI __C_specific_handler( EXCEPTION_RECORD *rec, ...@@ -1489,7 +1489,7 @@ EXCEPTION_DISPOSITION WINAPI __C_specific_handler( EXCEPTION_RECORD *rec,
/*********************************************************************** /***********************************************************************
* RtlRaiseException (NTDLL.@) * RtlRaiseException (NTDLL.@)
*/ */
__ASM_STDCALL_FUNC( RtlRaiseException, 4, __ASM_GLOBAL_FUNC( RtlRaiseException,
"sub sp, sp, #0x3b0\n\t" /* 0x390 (context) + 0x20 */ "sub sp, sp, #0x3b0\n\t" /* 0x390 (context) + 0x20 */
"stp x29, x30, [sp]\n\t" "stp x29, x30, [sp]\n\t"
__ASM_SEH(".seh_stackalloc 0x3b0\n\t") __ASM_SEH(".seh_stackalloc 0x3b0\n\t")
...@@ -1535,14 +1535,14 @@ __ASM_GLOBAL_FUNC( signal_start_thread, ...@@ -1535,14 +1535,14 @@ __ASM_GLOBAL_FUNC( signal_start_thread,
/********************************************************************** /**********************************************************************
* DbgBreakPoint (NTDLL.@) * DbgBreakPoint (NTDLL.@)
*/ */
__ASM_STDCALL_FUNC( DbgBreakPoint, 0, "brk #0xf000; ret" __ASM_GLOBAL_FUNC( DbgBreakPoint, "brk #0xf000; ret"
"\n\tnop; nop; nop; nop; nop; nop; nop; nop" "\n\tnop; nop; nop; nop; nop; nop; nop; nop"
"\n\tnop; nop; nop; nop; nop; nop" ); "\n\tnop; nop; nop; nop; nop; nop" );
/********************************************************************** /**********************************************************************
* DbgUserBreakPoint (NTDLL.@) * DbgUserBreakPoint (NTDLL.@)
*/ */
__ASM_STDCALL_FUNC( DbgUserBreakPoint, 0, "brk #0xf000; ret" __ASM_GLOBAL_FUNC( DbgUserBreakPoint, "brk #0xf000; ret"
"\n\tnop; nop; nop; nop; nop; nop; nop; nop" "\n\tnop; nop; nop; nop; nop; nop; nop; nop"
"\n\tnop; nop; nop; nop; nop; nop" ); "\n\tnop; nop; nop; nop; nop; nop" );
......
...@@ -1614,14 +1614,14 @@ __ASM_GLOBAL_FUNC( signal_start_thread, ...@@ -1614,14 +1614,14 @@ __ASM_GLOBAL_FUNC( signal_start_thread,
/********************************************************************** /**********************************************************************
* DbgBreakPoint (NTDLL.@) * DbgBreakPoint (NTDLL.@)
*/ */
__ASM_STDCALL_FUNC( DbgBreakPoint, 0, "int $3; ret" __ASM_GLOBAL_FUNC( DbgBreakPoint, "int $3; ret"
"\n\tnop; nop; nop; nop; nop; nop; nop; nop" "\n\tnop; nop; nop; nop; nop; nop; nop; nop"
"\n\tnop; nop; nop; nop; nop; nop" ); "\n\tnop; nop; nop; nop; nop; nop" );
/********************************************************************** /**********************************************************************
* DbgUserBreakPoint (NTDLL.@) * DbgUserBreakPoint (NTDLL.@)
*/ */
__ASM_STDCALL_FUNC( DbgUserBreakPoint, 0, "int $3; ret" __ASM_GLOBAL_FUNC( DbgUserBreakPoint, "int $3; ret"
"\n\tnop; nop; nop; nop; nop; nop; nop; nop" "\n\tnop; nop; nop; nop; nop; nop; nop; nop"
"\n\tnop; nop; nop; nop; nop; nop" ); "\n\tnop; nop; nop; nop; nop; nop" );
......
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