From ab6c2ee54cfbedb4ef003aa747561787264d4072 Mon Sep 17 00:00:00 2001 From: Timo Kreuzer Date: Mon, 15 Nov 2010 01:29:12 +0000 Subject: [PATCH] [CRT] incude asm.inc instead of reactos/asm.h Fix a bug that smeaked into _chkstk svn path=/branches/cmake-bringup/; revision=49591 --- lib/sdk/crt/except/amd64/chkstk_asm.s | 6 +++--- lib/sdk/crt/except/amd64/seh.s | 6 ++++-- lib/sdk/crt/except/i386/chkstk_asm.s | 10 +++++----- lib/sdk/crt/except/i386/prolog.s | 27 +++++++++++++++------------ lib/sdk/crt/except/i386/seh.s | 2 +- lib/sdk/crt/math/amd64/alldiv.S | 3 +-- lib/sdk/crt/math/amd64/atan.S | 4 ++-- lib/sdk/crt/math/amd64/atan2.S | 4 ++-- lib/sdk/crt/math/amd64/ceil.S | 4 ++-- lib/sdk/crt/math/amd64/ceilf.S | 10 ++++++---- lib/sdk/crt/math/amd64/exp.S | 5 +++-- lib/sdk/crt/math/amd64/fabs.S | 3 +-- lib/sdk/crt/math/amd64/floor.S | 6 ++++-- lib/sdk/crt/math/amd64/floorf.S | 4 ++-- lib/sdk/crt/math/amd64/fmod.S | 5 +++-- lib/sdk/crt/math/amd64/fmodf.S | 5 +++-- lib/sdk/crt/math/amd64/ldexp.S | 5 +++-- lib/sdk/crt/math/amd64/log.S | 3 +-- lib/sdk/crt/math/amd64/log10.S | 3 +-- lib/sdk/crt/math/amd64/pow.S | 4 ++-- lib/sdk/crt/math/amd64/sqrt.S | 6 ++++-- lib/sdk/crt/math/amd64/sqrtf.S | 6 ++++-- lib/sdk/crt/math/amd64/tan.S | 6 ++++-- lib/sdk/crt/math/i386/alldiv_asm.s | 2 +- lib/sdk/crt/math/i386/alldvrm_asm.s | 2 +- lib/sdk/crt/math/i386/allmul_asm.s | 2 +- lib/sdk/crt/math/i386/allrem_asm.s | 2 +- lib/sdk/crt/math/i386/allshl_asm.s | 2 +- lib/sdk/crt/math/i386/allshr_asm.s | 2 +- lib/sdk/crt/math/i386/atan2_asm.s | 2 +- lib/sdk/crt/math/i386/atan_asm.s | 2 +- lib/sdk/crt/math/i386/aulldiv_asm.s | 2 +- lib/sdk/crt/math/i386/aulldvrm_asm.s | 2 +- lib/sdk/crt/math/i386/aullrem_asm.s | 2 +- lib/sdk/crt/math/i386/aullshr_asm.s | 2 +- lib/sdk/crt/math/i386/ceil_asm.s | 2 +- lib/sdk/crt/math/i386/ceilf.S | 2 +- lib/sdk/crt/math/i386/cos_asm.s | 2 +- lib/sdk/crt/math/i386/exp_asm.s | 2 +- lib/sdk/crt/math/i386/fabs_asm.s | 2 +- lib/sdk/crt/math/i386/floor_asm.s | 2 +- lib/sdk/crt/math/i386/floorf.S | 2 +- lib/sdk/crt/math/i386/fmod_asm.s | 2 +- lib/sdk/crt/math/i386/fmodf_asm.s | 2 +- lib/sdk/crt/math/i386/ftol_asm.s | 2 +- lib/sdk/crt/math/i386/log10_asm.s | 2 +- lib/sdk/crt/math/i386/log_asm.s | 2 +- lib/sdk/crt/math/i386/pow_asm.s | 10 ++++------ lib/sdk/crt/math/i386/sin_asm.s | 2 +- lib/sdk/crt/math/i386/sqrt_asm.s | 2 +- lib/sdk/crt/math/i386/tan_asm.s | 2 +- lib/sdk/crt/mem/i386/memchr_asm.s | 3 ++- lib/sdk/crt/mem/i386/memmove_asm.s | 4 ++-- lib/sdk/crt/mem/i386/memset_asm.s | 3 ++- lib/sdk/crt/setjmp/amd64/setjmp.s | 6 ++++-- lib/sdk/crt/setjmp/i386/setjmp.s | 3 +-- lib/sdk/crt/string/i386/tcscat.inc | 2 +- lib/sdk/crt/string/i386/tcschr.inc | 2 +- lib/sdk/crt/string/i386/tcscmp.inc | 2 +- lib/sdk/crt/string/i386/tcscpy.inc | 2 +- lib/sdk/crt/string/i386/tcslen.inc | 2 +- lib/sdk/crt/string/i386/tcsncat.inc | 2 +- lib/sdk/crt/string/i386/tcsncmp.inc | 2 +- lib/sdk/crt/string/i386/tcsncpy.inc | 2 +- lib/sdk/crt/string/i386/tcsnlen.inc | 2 +- lib/sdk/crt/string/i386/tcsrchr.inc | 2 +- 66 files changed, 128 insertions(+), 112 deletions(-) diff --git a/lib/sdk/crt/except/amd64/chkstk_asm.s b/lib/sdk/crt/except/amd64/chkstk_asm.s index 4008d4f5eab..b1486dea898 100644 --- a/lib/sdk/crt/except/amd64/chkstk_asm.s +++ b/lib/sdk/crt/except/amd64/chkstk_asm.s @@ -8,11 +8,10 @@ /* INCLUDES ******************************************************************/ -#include +#include -.intel_syntax noprefix -.global MsgUnimplemented +PUBLIC MsgUnimplemented MsgUnimplemented: .asciz "WARNING: %s at %s:%d is UNIMPLEMENTED!\n" @@ -27,4 +26,5 @@ MsgUnimplemented: ret .endp +END /* EOF */ diff --git a/lib/sdk/crt/except/amd64/seh.s b/lib/sdk/crt/except/amd64/seh.s index e784457e9f8..9d44d3ffd4d 100644 --- a/lib/sdk/crt/except/amd64/seh.s +++ b/lib/sdk/crt/except/amd64/seh.s @@ -8,8 +8,8 @@ /* INCLUDES ******************************************************************/ -#include -.intel_syntax noprefix +#include +#include #define DISPOSITION_DISMISS 0 #define DISPOSITION_CONTINUE_SEARCH 1 @@ -54,3 +54,5 @@ _except_handler2: _except_handler3: ret .endfunc + +END diff --git a/lib/sdk/crt/except/i386/chkstk_asm.s b/lib/sdk/crt/except/i386/chkstk_asm.s index 5e41d42d020..80c9b7317f8 100644 --- a/lib/sdk/crt/except/i386/chkstk_asm.s +++ b/lib/sdk/crt/except/i386/chkstk_asm.s @@ -7,8 +7,9 @@ * PROGRAMER: KJK::Hyperion */ -#include -#include +#include +#include + #define PAGE_SIZE 4096 PUBLIC __chkstk @@ -28,12 +29,11 @@ __alloca_probe: push ecx /* ECX = top of the previous stack frame */ - lea eax, [esp + 8] + lea ecx, [esp + 8] /* probe the desired memory, page by page */ cmp eax, PAGE_SIZE - jge .l_MoreThanAPage - jmp .l_LessThanAPage + jl .l_LessThanAPage .l_MoreThanAPage: diff --git a/lib/sdk/crt/except/i386/prolog.s b/lib/sdk/crt/except/i386/prolog.s index 5ff588d6746..ebbf4ee412d 100644 --- a/lib/sdk/crt/except/i386/prolog.s +++ b/lib/sdk/crt/except/i386/prolog.s @@ -8,20 +8,23 @@ /* INCLUDES ******************************************************************/ -#include +#include +#include -/* GLOBALS *******************************************************************/ - -.globl __EH_prolog +/* FUNCTIONS *****************************************************************/ +.code +PUBLIC __EH_prolog // Copied from Wine. __EH_prolog: - pushl $-1 - pushl %eax - pushl %fs:0 - movl %esp, %fs:0 - movl 12(%esp), %eax - movl %ebp, 12(%esp) - leal 12(%esp), %ebp - pushl %eax + push -1 + push eax + push fs:0 + mov fs:0, esp + mov eax, [esp + 12] + mov [esp + 12], ebp + lea ebp, [esp + 12] + push eax ret + +END diff --git a/lib/sdk/crt/except/i386/seh.s b/lib/sdk/crt/except/i386/seh.s index 57049a41fd2..6fde1e181f7 100644 --- a/lib/sdk/crt/except/i386/seh.s +++ b/lib/sdk/crt/except/i386/seh.s @@ -8,7 +8,7 @@ /* INCLUDES ******************************************************************/ -#include +#include #define DISPOSITION_DISMISS 0 #define DISPOSITION_CONTINUE_SEARCH 1 diff --git a/lib/sdk/crt/math/amd64/alldiv.S b/lib/sdk/crt/math/amd64/alldiv.S index 831ef50981b..b4018cc4739 100644 --- a/lib/sdk/crt/math/amd64/alldiv.S +++ b/lib/sdk/crt/math/amd64/alldiv.S @@ -8,8 +8,7 @@ /* INCLUDES ******************************************************************/ -#include -#include +#include /* DATA *********************************************************************/ diff --git a/lib/sdk/crt/math/amd64/atan.S b/lib/sdk/crt/math/amd64/atan.S index 3ba194931f4..889f10e2825 100644 --- a/lib/sdk/crt/math/amd64/atan.S +++ b/lib/sdk/crt/math/amd64/atan.S @@ -8,8 +8,8 @@ /* INCLUDES ******************************************************************/ -#include -#include +#include +#include /* FUNCTIONS ****************************************************************/ diff --git a/lib/sdk/crt/math/amd64/atan2.S b/lib/sdk/crt/math/amd64/atan2.S index 7cd29b93269..fd611101f0a 100644 --- a/lib/sdk/crt/math/amd64/atan2.S +++ b/lib/sdk/crt/math/amd64/atan2.S @@ -8,8 +8,8 @@ /* INCLUDES ******************************************************************/ -#include -#include +#include +#include /* FUNCTIONS ****************************************************************/ diff --git a/lib/sdk/crt/math/amd64/ceil.S b/lib/sdk/crt/math/amd64/ceil.S index dbee413f491..17ae0150717 100644 --- a/lib/sdk/crt/math/amd64/ceil.S +++ b/lib/sdk/crt/math/amd64/ceil.S @@ -8,8 +8,8 @@ /* INCLUDES ******************************************************************/ -#include -#include +#include +#include /* FUNCTIONS ****************************************************************/ diff --git a/lib/sdk/crt/math/amd64/ceilf.S b/lib/sdk/crt/math/amd64/ceilf.S index 8a8242e8893..2b2d14b03f0 100644 --- a/lib/sdk/crt/math/amd64/ceilf.S +++ b/lib/sdk/crt/math/amd64/ceilf.S @@ -8,8 +8,8 @@ /* INCLUDES ******************************************************************/ -#include -#include +#include +#include /* FUNCTIONS ****************************************************************/ @@ -26,8 +26,8 @@ ceilf: /* Change fpu control word to round up */ fstcw [rsp + 8] mov eax, [rsp + 8] - or eax, 0x00800 - and eax, 0x0fbff + or eax, HEX(00800) + and eax, HEX(0fbff) mov [rsp + 12], eax fldcw [rsp + 12] @@ -42,3 +42,5 @@ ceilf: add rsp, 16 ret + +END diff --git a/lib/sdk/crt/math/amd64/exp.S b/lib/sdk/crt/math/amd64/exp.S index ca3dc993182..44b324e4267 100644 --- a/lib/sdk/crt/math/amd64/exp.S +++ b/lib/sdk/crt/math/amd64/exp.S @@ -8,8 +8,8 @@ /* INCLUDES ******************************************************************/ -#include -#include +#include +#include /* FUNCTIONS ****************************************************************/ @@ -20,3 +20,4 @@ exp: UNIMPLEMENTED exp ret +END diff --git a/lib/sdk/crt/math/amd64/fabs.S b/lib/sdk/crt/math/amd64/fabs.S index e58b960ecab..3c1e8f2dcf1 100644 --- a/lib/sdk/crt/math/amd64/fabs.S +++ b/lib/sdk/crt/math/amd64/fabs.S @@ -8,8 +8,7 @@ /* INCLUDES ******************************************************************/ -#include -#include +#include /* FUNCTIONS ****************************************************************/ diff --git a/lib/sdk/crt/math/amd64/floor.S b/lib/sdk/crt/math/amd64/floor.S index f1c3b9305af..c0fba3dd066 100644 --- a/lib/sdk/crt/math/amd64/floor.S +++ b/lib/sdk/crt/math/amd64/floor.S @@ -8,8 +8,8 @@ /* INCLUDES ******************************************************************/ -#include -#include +#include +#include /* FUNCTIONS ****************************************************************/ @@ -19,3 +19,5 @@ PUBLIC floor floor: UNIMPLEMENTED floor ret + +END diff --git a/lib/sdk/crt/math/amd64/floorf.S b/lib/sdk/crt/math/amd64/floorf.S index 4a17c9643ba..0ac9098b9a3 100644 --- a/lib/sdk/crt/math/amd64/floorf.S +++ b/lib/sdk/crt/math/amd64/floorf.S @@ -8,8 +8,8 @@ /* INCLUDES ******************************************************************/ -#include -#include +#include +#include /* FUNCTIONS ****************************************************************/ diff --git a/lib/sdk/crt/math/amd64/fmod.S b/lib/sdk/crt/math/amd64/fmod.S index 4ca67f55bfb..697257ab368 100644 --- a/lib/sdk/crt/math/amd64/fmod.S +++ b/lib/sdk/crt/math/amd64/fmod.S @@ -8,8 +8,7 @@ /* INCLUDES ******************************************************************/ -#include -#include +#include /* DATA *********************************************************************/ @@ -17,3 +16,5 @@ PUBLIC fmod fmod: UNIMPLEMENTED fmod ret + +END diff --git a/lib/sdk/crt/math/amd64/fmodf.S b/lib/sdk/crt/math/amd64/fmodf.S index e109c387cc8..d0e24ef9529 100644 --- a/lib/sdk/crt/math/amd64/fmodf.S +++ b/lib/sdk/crt/math/amd64/fmodf.S @@ -8,8 +8,7 @@ /* INCLUDES ******************************************************************/ -#include -#include +#include /* DATA *********************************************************************/ @@ -17,3 +16,5 @@ PUBLIC fmodf fmodf: UNIMPLEMENTED fmodf ret + +END diff --git a/lib/sdk/crt/math/amd64/ldexp.S b/lib/sdk/crt/math/amd64/ldexp.S index d0265629bf6..a83660ae7a3 100644 --- a/lib/sdk/crt/math/amd64/ldexp.S +++ b/lib/sdk/crt/math/amd64/ldexp.S @@ -8,8 +8,7 @@ /* INCLUDES ******************************************************************/ -#include -#include +#include /* DATA *********************************************************************/ @@ -17,3 +16,5 @@ PUBLIC ldexp ldexp: UNIMPLEMENTED ldexp ret + +END diff --git a/lib/sdk/crt/math/amd64/log.S b/lib/sdk/crt/math/amd64/log.S index 9fa02763b9e..1289a745cba 100644 --- a/lib/sdk/crt/math/amd64/log.S +++ b/lib/sdk/crt/math/amd64/log.S @@ -8,8 +8,7 @@ /* INCLUDES ******************************************************************/ -#include -#include +#include /* DATA *********************************************************************/ diff --git a/lib/sdk/crt/math/amd64/log10.S b/lib/sdk/crt/math/amd64/log10.S index 007f0d80e98..f8014aa5bc6 100644 --- a/lib/sdk/crt/math/amd64/log10.S +++ b/lib/sdk/crt/math/amd64/log10.S @@ -8,8 +8,7 @@ /* INCLUDES ******************************************************************/ -#include -#include +#include /* DATA *********************************************************************/ diff --git a/lib/sdk/crt/math/amd64/pow.S b/lib/sdk/crt/math/amd64/pow.S index 37988801b11..48adf3961f3 100644 --- a/lib/sdk/crt/math/amd64/pow.S +++ b/lib/sdk/crt/math/amd64/pow.S @@ -8,8 +8,8 @@ /* INCLUDES ******************************************************************/ -#include -#include +#include +#include /* DATA *********************************************************************/ diff --git a/lib/sdk/crt/math/amd64/sqrt.S b/lib/sdk/crt/math/amd64/sqrt.S index 758d8768d4f..282419e78a5 100644 --- a/lib/sdk/crt/math/amd64/sqrt.S +++ b/lib/sdk/crt/math/amd64/sqrt.S @@ -8,8 +8,8 @@ /* INCLUDES ******************************************************************/ -#include -#include +#include +#include /* DATA *********************************************************************/ @@ -17,3 +17,5 @@ PUBLIC sqrt sqrt: UNIMPLEMENTED sqrt ret + +END diff --git a/lib/sdk/crt/math/amd64/sqrtf.S b/lib/sdk/crt/math/amd64/sqrtf.S index a4ee3fa6cc5..da75fcf42f5 100644 --- a/lib/sdk/crt/math/amd64/sqrtf.S +++ b/lib/sdk/crt/math/amd64/sqrtf.S @@ -8,8 +8,8 @@ /* INCLUDES ******************************************************************/ -#include -#include +#include +#include /* DATA *********************************************************************/ @@ -17,3 +17,5 @@ PUBLIC sqrtf sqrtf: sqrtss xmm0, xmm0 ret + +END diff --git a/lib/sdk/crt/math/amd64/tan.S b/lib/sdk/crt/math/amd64/tan.S index a7c66d0ccd7..93e5d01d762 100644 --- a/lib/sdk/crt/math/amd64/tan.S +++ b/lib/sdk/crt/math/amd64/tan.S @@ -8,8 +8,8 @@ /* INCLUDES ******************************************************************/ -#include -#include +#include +#include /* DATA *********************************************************************/ @@ -17,3 +17,5 @@ PUBLIC tan tan: UNIMPLEMENTED tan ret + +END diff --git a/lib/sdk/crt/math/i386/alldiv_asm.s b/lib/sdk/crt/math/i386/alldiv_asm.s index eb7cb7566a7..5061fb7c21f 100644 --- a/lib/sdk/crt/math/i386/alldiv_asm.s +++ b/lib/sdk/crt/math/i386/alldiv_asm.s @@ -34,7 +34,7 @@ * SUCH DAMAGE. */ -#include +#include PUBLIC __alldiv PUBLIC __fltused diff --git a/lib/sdk/crt/math/i386/alldvrm_asm.s b/lib/sdk/crt/math/i386/alldvrm_asm.s index bff43509c0c..a055d55d62e 100644 --- a/lib/sdk/crt/math/i386/alldvrm_asm.s +++ b/lib/sdk/crt/math/i386/alldvrm_asm.s @@ -34,7 +34,7 @@ * SUCH DAMAGE. */ -#include +#include PUBLIC __alldvrm diff --git a/lib/sdk/crt/math/i386/allmul_asm.s b/lib/sdk/crt/math/i386/allmul_asm.s index 369aa068376..b9a47baafcc 100644 --- a/lib/sdk/crt/math/i386/allmul_asm.s +++ b/lib/sdk/crt/math/i386/allmul_asm.s @@ -34,7 +34,7 @@ * SUCH DAMAGE. */ -#include +#include PUBLIC __allmul diff --git a/lib/sdk/crt/math/i386/allrem_asm.s b/lib/sdk/crt/math/i386/allrem_asm.s index 6ffa481199b..2c3e68c5578 100644 --- a/lib/sdk/crt/math/i386/allrem_asm.s +++ b/lib/sdk/crt/math/i386/allrem_asm.s @@ -34,7 +34,7 @@ * SUCH DAMAGE. */ -#include +#include PUBLIC __allrem diff --git a/lib/sdk/crt/math/i386/allshl_asm.s b/lib/sdk/crt/math/i386/allshl_asm.s index e5ce4a63506..48d06b7dd5a 100644 --- a/lib/sdk/crt/math/i386/allshl_asm.s +++ b/lib/sdk/crt/math/i386/allshl_asm.s @@ -34,7 +34,7 @@ * SUCH DAMAGE. */ -#include +#include PUBLIC __allshl diff --git a/lib/sdk/crt/math/i386/allshr_asm.s b/lib/sdk/crt/math/i386/allshr_asm.s index 69295738fef..e2b60bd97aa 100644 --- a/lib/sdk/crt/math/i386/allshr_asm.s +++ b/lib/sdk/crt/math/i386/allshr_asm.s @@ -34,7 +34,7 @@ * SUCH DAMAGE. */ -#include +#include PUBLIC __allshr diff --git a/lib/sdk/crt/math/i386/atan2_asm.s b/lib/sdk/crt/math/i386/atan2_asm.s index 171ef21c78d..699b02d3530 100644 --- a/lib/sdk/crt/math/i386/atan2_asm.s +++ b/lib/sdk/crt/math/i386/atan2_asm.s @@ -1,5 +1,5 @@ -#include +#include PUBLIC _atan2 diff --git a/lib/sdk/crt/math/i386/atan_asm.s b/lib/sdk/crt/math/i386/atan_asm.s index df9f37c0ce7..9cd08752369 100644 --- a/lib/sdk/crt/math/i386/atan_asm.s +++ b/lib/sdk/crt/math/i386/atan_asm.s @@ -34,7 +34,7 @@ * SUCH DAMAGE. */ -#include +#include PUBLIC _atan diff --git a/lib/sdk/crt/math/i386/aulldiv_asm.s b/lib/sdk/crt/math/i386/aulldiv_asm.s index 2721bfddf9f..b3a08787c1c 100644 --- a/lib/sdk/crt/math/i386/aulldiv_asm.s +++ b/lib/sdk/crt/math/i386/aulldiv_asm.s @@ -34,7 +34,7 @@ * SUCH DAMAGE. */ -#include +#include PUBLIC __aulldiv diff --git a/lib/sdk/crt/math/i386/aulldvrm_asm.s b/lib/sdk/crt/math/i386/aulldvrm_asm.s index 14c76a5b99c..ed1d4a10832 100644 --- a/lib/sdk/crt/math/i386/aulldvrm_asm.s +++ b/lib/sdk/crt/math/i386/aulldvrm_asm.s @@ -34,7 +34,7 @@ * SUCH DAMAGE. */ -#include +#include PUBLIC __aulldvrm diff --git a/lib/sdk/crt/math/i386/aullrem_asm.s b/lib/sdk/crt/math/i386/aullrem_asm.s index 3f0cd379a11..4fde84a01ba 100644 --- a/lib/sdk/crt/math/i386/aullrem_asm.s +++ b/lib/sdk/crt/math/i386/aullrem_asm.s @@ -34,7 +34,7 @@ * SUCH DAMAGE. */ -#include +#include PUBLIC __aullrem diff --git a/lib/sdk/crt/math/i386/aullshr_asm.s b/lib/sdk/crt/math/i386/aullshr_asm.s index b838e46847b..5d65f4b2eea 100644 --- a/lib/sdk/crt/math/i386/aullshr_asm.s +++ b/lib/sdk/crt/math/i386/aullshr_asm.s @@ -34,7 +34,7 @@ * SUCH DAMAGE. */ -#include +#include PUBLIC __aullshr diff --git a/lib/sdk/crt/math/i386/ceil_asm.s b/lib/sdk/crt/math/i386/ceil_asm.s index b98df48d52d..0b6d2ffb7b3 100644 --- a/lib/sdk/crt/math/i386/ceil_asm.s +++ b/lib/sdk/crt/math/i386/ceil_asm.s @@ -34,7 +34,7 @@ * SUCH DAMAGE. */ -#include +#include PUBLIC _ceil diff --git a/lib/sdk/crt/math/i386/ceilf.S b/lib/sdk/crt/math/i386/ceilf.S index d8cc324708e..79d66ce1cf2 100644 --- a/lib/sdk/crt/math/i386/ceilf.S +++ b/lib/sdk/crt/math/i386/ceilf.S @@ -4,7 +4,7 @@ * No warranty is given; refer to the file DISCLAIMER.PD within this package. */ -#include +#include .code .align 4 diff --git a/lib/sdk/crt/math/i386/cos_asm.s b/lib/sdk/crt/math/i386/cos_asm.s index a14f3e5f8c7..7732fe78734 100644 --- a/lib/sdk/crt/math/i386/cos_asm.s +++ b/lib/sdk/crt/math/i386/cos_asm.s @@ -34,7 +34,7 @@ * SUCH DAMAGE. */ -#include +#include PUBLIC _cos diff --git a/lib/sdk/crt/math/i386/exp_asm.s b/lib/sdk/crt/math/i386/exp_asm.s index be62027e10a..3dd5be060b9 100644 --- a/lib/sdk/crt/math/i386/exp_asm.s +++ b/lib/sdk/crt/math/i386/exp_asm.s @@ -1,5 +1,5 @@ -#include +#include PUBLIC _exp diff --git a/lib/sdk/crt/math/i386/fabs_asm.s b/lib/sdk/crt/math/i386/fabs_asm.s index 6f16dbf5f90..c121f5205db 100644 --- a/lib/sdk/crt/math/i386/fabs_asm.s +++ b/lib/sdk/crt/math/i386/fabs_asm.s @@ -34,7 +34,7 @@ * SUCH DAMAGE. */ -#include +#include PUBLIC _fabs diff --git a/lib/sdk/crt/math/i386/floor_asm.s b/lib/sdk/crt/math/i386/floor_asm.s index 87ebaf246e6..7a2ed174eb3 100644 --- a/lib/sdk/crt/math/i386/floor_asm.s +++ b/lib/sdk/crt/math/i386/floor_asm.s @@ -34,7 +34,7 @@ * SUCH DAMAGE. */ -#include +#include PUBLIC _floor diff --git a/lib/sdk/crt/math/i386/floorf.S b/lib/sdk/crt/math/i386/floorf.S index ff2561d1bb7..99ef5522038 100644 --- a/lib/sdk/crt/math/i386/floorf.S +++ b/lib/sdk/crt/math/i386/floorf.S @@ -8,7 +8,7 @@ * Danny Smith */ -#include +#include .code .align 4 diff --git a/lib/sdk/crt/math/i386/fmod_asm.s b/lib/sdk/crt/math/i386/fmod_asm.s index 53136b6b3c4..44be4c0b24a 100644 --- a/lib/sdk/crt/math/i386/fmod_asm.s +++ b/lib/sdk/crt/math/i386/fmod_asm.s @@ -1,5 +1,5 @@ -#include +#include PUBLIC _fmod diff --git a/lib/sdk/crt/math/i386/fmodf_asm.s b/lib/sdk/crt/math/i386/fmodf_asm.s index c75df1ef3eb..1a06ef98671 100644 --- a/lib/sdk/crt/math/i386/fmodf_asm.s +++ b/lib/sdk/crt/math/i386/fmodf_asm.s @@ -1,5 +1,5 @@ -#include +#include PUBLIC _fmodf diff --git a/lib/sdk/crt/math/i386/ftol_asm.s b/lib/sdk/crt/math/i386/ftol_asm.s index a83665009f8..9942f389f88 100644 --- a/lib/sdk/crt/math/i386/ftol_asm.s +++ b/lib/sdk/crt/math/i386/ftol_asm.s @@ -34,7 +34,7 @@ * SUCH DAMAGE. */ -#include +#include PUBLIC __ftol diff --git a/lib/sdk/crt/math/i386/log10_asm.s b/lib/sdk/crt/math/i386/log10_asm.s index dc328aa679a..a627ace1090 100644 --- a/lib/sdk/crt/math/i386/log10_asm.s +++ b/lib/sdk/crt/math/i386/log10_asm.s @@ -8,7 +8,7 @@ * */ -#include +#include PUBLIC _log10 diff --git a/lib/sdk/crt/math/i386/log_asm.s b/lib/sdk/crt/math/i386/log_asm.s index d0f5ec78534..472202fee92 100644 --- a/lib/sdk/crt/math/i386/log_asm.s +++ b/lib/sdk/crt/math/i386/log_asm.s @@ -34,7 +34,7 @@ * SUCH DAMAGE. */ -#include +#include PUBLIC _log diff --git a/lib/sdk/crt/math/i386/pow_asm.s b/lib/sdk/crt/math/i386/pow_asm.s index e775e60f740..f418cd38c6e 100644 --- a/lib/sdk/crt/math/i386/pow_asm.s +++ b/lib/sdk/crt/math/i386/pow_asm.s @@ -20,7 +20,7 @@ 02111-1307 USA. */ /* Reactos modifications */ -#include +#include #define ALIGNARG(log2) log2 #define ASM_TYPE_DIRECTIVE(name,typearg) @@ -29,9 +29,8 @@ PUBLIC _pow - .data - .text -ASSUME CS:NOTHING, DS:NOTHING, ES:NOTHING, FS:NOTHING, GS:NOTHING +.data +ASSUME nothing .align ALIGNARG(4) ASM_TYPE_DIRECTIVE(infinity,@object) @@ -77,8 +76,7 @@ p63: #define MOX(op,x,f) op[x*f] #endif - .code - .text +.code _pow: fld qword ptr [esp + 12] // y fxam diff --git a/lib/sdk/crt/math/i386/sin_asm.s b/lib/sdk/crt/math/i386/sin_asm.s index 4d7a1f4f47e..4a27af804b2 100644 --- a/lib/sdk/crt/math/i386/sin_asm.s +++ b/lib/sdk/crt/math/i386/sin_asm.s @@ -34,7 +34,7 @@ * SUCH DAMAGE. */ -#include +#include PUBLIC _sin diff --git a/lib/sdk/crt/math/i386/sqrt_asm.s b/lib/sdk/crt/math/i386/sqrt_asm.s index ecc5ba96577..3385204d572 100644 --- a/lib/sdk/crt/math/i386/sqrt_asm.s +++ b/lib/sdk/crt/math/i386/sqrt_asm.s @@ -34,7 +34,7 @@ * SUCH DAMAGE. */ -#include +#include PUBLIC _sqrt diff --git a/lib/sdk/crt/math/i386/tan_asm.s b/lib/sdk/crt/math/i386/tan_asm.s index 6882fde51a3..3b64b360f17 100644 --- a/lib/sdk/crt/math/i386/tan_asm.s +++ b/lib/sdk/crt/math/i386/tan_asm.s @@ -34,7 +34,7 @@ * SUCH DAMAGE. */ -#include +#include PUBLIC _tan diff --git a/lib/sdk/crt/mem/i386/memchr_asm.s b/lib/sdk/crt/mem/i386/memchr_asm.s index aa644433458..40cd3dc8cef 100644 --- a/lib/sdk/crt/mem/i386/memchr_asm.s +++ b/lib/sdk/crt/mem/i386/memchr_asm.s @@ -5,7 +5,8 @@ * FILE: lib/sdk/crt/mem/i386/memchr.s */ -#include +#include +#include /* * void* memchr(const void* s, int c, size_t n) diff --git a/lib/sdk/crt/mem/i386/memmove_asm.s b/lib/sdk/crt/mem/i386/memmove_asm.s index 6804f22e93d..476f843befe 100644 --- a/lib/sdk/crt/mem/i386/memmove_asm.s +++ b/lib/sdk/crt/mem/i386/memmove_asm.s @@ -1,10 +1,10 @@ /* * void *memcpy (void *to, const void *from, size_t count) * - * NOTE: This code is a duplicate of memmove function from memmove_asm.s */ -#include +#include +#include PUBLIC _memcpy PUBLIC _memmove diff --git a/lib/sdk/crt/mem/i386/memset_asm.s b/lib/sdk/crt/mem/i386/memset_asm.s index 4608846b714..81430472f4a 100644 --- a/lib/sdk/crt/mem/i386/memset_asm.s +++ b/lib/sdk/crt/mem/i386/memset_asm.s @@ -2,7 +2,8 @@ * $Id$ */ -#include +#include +#include /* * void *memset (void *src, int val, size_t count) diff --git a/lib/sdk/crt/setjmp/amd64/setjmp.s b/lib/sdk/crt/setjmp/amd64/setjmp.s index 56459ae7665..a969bc43db5 100644 --- a/lib/sdk/crt/setjmp/amd64/setjmp.s +++ b/lib/sdk/crt/setjmp/amd64/setjmp.s @@ -8,8 +8,8 @@ /* INCLUDES ******************************************************************/ -#include -#include +#include +#include #define JUMP_BUFFER_Frame 0x00 #define JUMP_BUFFER_Rbx 0x08 @@ -156,3 +156,5 @@ PUBLIC longjmp inc rax 2: jmp r8 .endp longjmp + +END diff --git a/lib/sdk/crt/setjmp/i386/setjmp.s b/lib/sdk/crt/setjmp/i386/setjmp.s index c4b9e1c0793..dc0e9656b3a 100644 --- a/lib/sdk/crt/setjmp/i386/setjmp.s +++ b/lib/sdk/crt/setjmp/i386/setjmp.s @@ -9,8 +9,7 @@ * complete implementation */ -#include -#include +#include #define JB_BP 0 #define JB_BX 1 diff --git a/lib/sdk/crt/string/i386/tcscat.inc b/lib/sdk/crt/string/i386/tcscat.inc index 878197c8722..5312891b69b 100644 --- a/lib/sdk/crt/string/i386/tcscat.inc +++ b/lib/sdk/crt/string/i386/tcscat.inc @@ -2,7 +2,7 @@ */ #include "tchar.h" -#include +#include PUBLIC _tcscat .code diff --git a/lib/sdk/crt/string/i386/tcschr.inc b/lib/sdk/crt/string/i386/tcschr.inc index a1a04155f84..45da9861577 100644 --- a/lib/sdk/crt/string/i386/tcschr.inc +++ b/lib/sdk/crt/string/i386/tcschr.inc @@ -2,7 +2,7 @@ */ #include "tchar.h" -#include +#include PUBLIC _tcschr .code diff --git a/lib/sdk/crt/string/i386/tcscmp.inc b/lib/sdk/crt/string/i386/tcscmp.inc index 8164455a57d..e43f706328e 100644 --- a/lib/sdk/crt/string/i386/tcscmp.inc +++ b/lib/sdk/crt/string/i386/tcscmp.inc @@ -2,7 +2,7 @@ */ #include "tchar.h" -#include +#include PUBLIC _tcscmp .code diff --git a/lib/sdk/crt/string/i386/tcscpy.inc b/lib/sdk/crt/string/i386/tcscpy.inc index 33702b6960d..3f8faaf6241 100644 --- a/lib/sdk/crt/string/i386/tcscpy.inc +++ b/lib/sdk/crt/string/i386/tcscpy.inc @@ -2,7 +2,7 @@ */ #include "tchar.h" -#include +#include PUBLIC _tcscpy .code diff --git a/lib/sdk/crt/string/i386/tcslen.inc b/lib/sdk/crt/string/i386/tcslen.inc index 2f9301b3666..b641d81dd42 100644 --- a/lib/sdk/crt/string/i386/tcslen.inc +++ b/lib/sdk/crt/string/i386/tcslen.inc @@ -2,7 +2,7 @@ */ #include "tchar.h" -#include +#include PUBLIC _tcslen .code diff --git a/lib/sdk/crt/string/i386/tcsncat.inc b/lib/sdk/crt/string/i386/tcsncat.inc index 8c181b33fea..978108ed78a 100644 --- a/lib/sdk/crt/string/i386/tcsncat.inc +++ b/lib/sdk/crt/string/i386/tcsncat.inc @@ -2,7 +2,7 @@ */ #include "tchar.h" -#include +#include PUBLIC _tcsncat .code diff --git a/lib/sdk/crt/string/i386/tcsncmp.inc b/lib/sdk/crt/string/i386/tcsncmp.inc index 9e2a098ce26..72f1d5bf331 100644 --- a/lib/sdk/crt/string/i386/tcsncmp.inc +++ b/lib/sdk/crt/string/i386/tcsncmp.inc @@ -2,7 +2,7 @@ */ #include "tchar.h" -#include +#include PUBLIC _tcsncmp .code diff --git a/lib/sdk/crt/string/i386/tcsncpy.inc b/lib/sdk/crt/string/i386/tcsncpy.inc index 9cb03e5a775..1d515f6a3a7 100644 --- a/lib/sdk/crt/string/i386/tcsncpy.inc +++ b/lib/sdk/crt/string/i386/tcsncpy.inc @@ -2,7 +2,7 @@ */ #include "tchar.h" -#include +#include PUBLIC _tcsncpy .code diff --git a/lib/sdk/crt/string/i386/tcsnlen.inc b/lib/sdk/crt/string/i386/tcsnlen.inc index 8f9b8fe6080..dabeab183df 100644 --- a/lib/sdk/crt/string/i386/tcsnlen.inc +++ b/lib/sdk/crt/string/i386/tcsnlen.inc @@ -2,7 +2,7 @@ */ #include "tchar.h" -#include +#include PUBLIC _tcsnlen .code diff --git a/lib/sdk/crt/string/i386/tcsrchr.inc b/lib/sdk/crt/string/i386/tcsrchr.inc index 116061b6fd2..1e5886a8248 100644 --- a/lib/sdk/crt/string/i386/tcsrchr.inc +++ b/lib/sdk/crt/string/i386/tcsrchr.inc @@ -2,7 +2,7 @@ */ #include "tchar.h" -#include +#include PUBLIC _tcsrchr .code -- 2.17.1