incude asm.inc instead of reactos/asm.h
Fix a bug that smeaked into _chkstk

svn path=/branches/cmake-bringup/; revision=49591
This commit is contained in:
Timo Kreuzer 2010-11-15 01:29:12 +00:00
parent 0c7d0cbc07
commit ab6c2ee54c
66 changed files with 128 additions and 112 deletions

View file

@ -8,11 +8,10 @@
/* INCLUDES ******************************************************************/ /* INCLUDES ******************************************************************/
#include <reactos/asm.h> #include <asm.inc>
.intel_syntax noprefix
.global MsgUnimplemented PUBLIC MsgUnimplemented
MsgUnimplemented: MsgUnimplemented:
.asciz "WARNING: %s at %s:%d is UNIMPLEMENTED!\n" .asciz "WARNING: %s at %s:%d is UNIMPLEMENTED!\n"
@ -27,4 +26,5 @@ MsgUnimplemented:
ret ret
.endp .endp
END
/* EOF */ /* EOF */

View file

@ -8,8 +8,8 @@
/* INCLUDES ******************************************************************/ /* INCLUDES ******************************************************************/
#include <ndk/asm.h> #include <asm.inc>
.intel_syntax noprefix #include <ksamd64.inc>
#define DISPOSITION_DISMISS 0 #define DISPOSITION_DISMISS 0
#define DISPOSITION_CONTINUE_SEARCH 1 #define DISPOSITION_CONTINUE_SEARCH 1
@ -54,3 +54,5 @@ _except_handler2:
_except_handler3: _except_handler3:
ret ret
.endfunc .endfunc
END

View file

@ -7,8 +7,9 @@
* PROGRAMER: KJK::Hyperion <noog@libero.it> * PROGRAMER: KJK::Hyperion <noog@libero.it>
*/ */
#include <reactos/asm.h> #include <asm.inc>
#include <ndk/asm.h> #include <ks386.inc>
#define PAGE_SIZE 4096 #define PAGE_SIZE 4096
PUBLIC __chkstk PUBLIC __chkstk
@ -28,12 +29,11 @@ __alloca_probe:
push ecx push ecx
/* ECX = top of the previous stack frame */ /* ECX = top of the previous stack frame */
lea eax, [esp + 8] lea ecx, [esp + 8]
/* probe the desired memory, page by page */ /* probe the desired memory, page by page */
cmp eax, PAGE_SIZE cmp eax, PAGE_SIZE
jge .l_MoreThanAPage jl .l_LessThanAPage
jmp .l_LessThanAPage
.l_MoreThanAPage: .l_MoreThanAPage:

View file

@ -8,20 +8,23 @@
/* INCLUDES ******************************************************************/ /* INCLUDES ******************************************************************/
#include <ndk/asm.h> #include <asm.inc>
#include <ks386.inc>
/* GLOBALS *******************************************************************/ /* FUNCTIONS *****************************************************************/
.code
.globl __EH_prolog
PUBLIC __EH_prolog
// Copied from Wine. // Copied from Wine.
__EH_prolog: __EH_prolog:
pushl $-1 push -1
pushl %eax push eax
pushl %fs:0 push fs:0
movl %esp, %fs:0 mov fs:0, esp
movl 12(%esp), %eax mov eax, [esp + 12]
movl %ebp, 12(%esp) mov [esp + 12], ebp
leal 12(%esp), %ebp lea ebp, [esp + 12]
pushl %eax push eax
ret ret
END

View file

@ -8,7 +8,7 @@
/* INCLUDES ******************************************************************/ /* INCLUDES ******************************************************************/
#include <reactos/asm.h> #include <asm.inc>
#define DISPOSITION_DISMISS 0 #define DISPOSITION_DISMISS 0
#define DISPOSITION_CONTINUE_SEARCH 1 #define DISPOSITION_CONTINUE_SEARCH 1

View file

@ -8,8 +8,7 @@
/* INCLUDES ******************************************************************/ /* INCLUDES ******************************************************************/
#include <reactos/asm.h> #include <asm.inc>
#include <ndk/amd64/asm.h>
/* DATA *********************************************************************/ /* DATA *********************************************************************/

View file

@ -8,8 +8,8 @@
/* INCLUDES ******************************************************************/ /* INCLUDES ******************************************************************/
#include <reactos/asm.h> #include <asm.inc>
#include <ndk/amd64/asm.h> #include <ksamd64.inc>
/* FUNCTIONS ****************************************************************/ /* FUNCTIONS ****************************************************************/

View file

@ -8,8 +8,8 @@
/* INCLUDES ******************************************************************/ /* INCLUDES ******************************************************************/
#include <reactos/asm.h> #include <asm.inc>
#include <ndk/amd64/asm.h> #include <ksamd64.inc>
/* FUNCTIONS ****************************************************************/ /* FUNCTIONS ****************************************************************/

View file

@ -8,8 +8,8 @@
/* INCLUDES ******************************************************************/ /* INCLUDES ******************************************************************/
#include <reactos/asm.h> #include <asm.inc>
#include <ndk/amd64/asm.h> #include <ksamd64.inc>
/* FUNCTIONS ****************************************************************/ /* FUNCTIONS ****************************************************************/

View file

@ -8,8 +8,8 @@
/* INCLUDES ******************************************************************/ /* INCLUDES ******************************************************************/
#include <reactos/asm.h> #include <asm.inc>
#include <ndk/amd64/asm.h> #include <ksamd64.inc>
/* FUNCTIONS ****************************************************************/ /* FUNCTIONS ****************************************************************/
@ -26,8 +26,8 @@ ceilf:
/* Change fpu control word to round up */ /* Change fpu control word to round up */
fstcw [rsp + 8] fstcw [rsp + 8]
mov eax, [rsp + 8] mov eax, [rsp + 8]
or eax, 0x00800 or eax, HEX(00800)
and eax, 0x0fbff and eax, HEX(0fbff)
mov [rsp + 12], eax mov [rsp + 12], eax
fldcw [rsp + 12] fldcw [rsp + 12]
@ -42,3 +42,5 @@ ceilf:
add rsp, 16 add rsp, 16
ret ret
END

View file

@ -8,8 +8,8 @@
/* INCLUDES ******************************************************************/ /* INCLUDES ******************************************************************/
#include <reactos/asm.h> #include <asm.inc>
#include <ndk/amd64/asm.h> #include <ksamd64.inc>
/* FUNCTIONS ****************************************************************/ /* FUNCTIONS ****************************************************************/
@ -20,3 +20,4 @@ exp:
UNIMPLEMENTED exp UNIMPLEMENTED exp
ret ret
END

View file

@ -8,8 +8,7 @@
/* INCLUDES ******************************************************************/ /* INCLUDES ******************************************************************/
#include <reactos/asm.h> #include <asm.inc>
#include <ndk/amd64/asm.h>
/* FUNCTIONS ****************************************************************/ /* FUNCTIONS ****************************************************************/

View file

@ -8,8 +8,8 @@
/* INCLUDES ******************************************************************/ /* INCLUDES ******************************************************************/
#include <reactos/asm.h> #include <asm.inc>
#include <ndk/amd64/asm.h> #include <ksamd64.inc>
/* FUNCTIONS ****************************************************************/ /* FUNCTIONS ****************************************************************/
@ -19,3 +19,5 @@ PUBLIC floor
floor: floor:
UNIMPLEMENTED floor UNIMPLEMENTED floor
ret ret
END

View file

@ -8,8 +8,8 @@
/* INCLUDES ******************************************************************/ /* INCLUDES ******************************************************************/
#include <reactos/asm.h> #include <asm.inc>
#include <ndk/amd64/asm.h> #include <ksamd64.inc>
/* FUNCTIONS ****************************************************************/ /* FUNCTIONS ****************************************************************/

View file

@ -8,8 +8,7 @@
/* INCLUDES ******************************************************************/ /* INCLUDES ******************************************************************/
#include <reactos/asm.h> #include <asm.inc>
#include <ndk/amd64/asm.h>
/* DATA *********************************************************************/ /* DATA *********************************************************************/
@ -17,3 +16,5 @@ PUBLIC fmod
fmod: fmod:
UNIMPLEMENTED fmod UNIMPLEMENTED fmod
ret ret
END

View file

@ -8,8 +8,7 @@
/* INCLUDES ******************************************************************/ /* INCLUDES ******************************************************************/
#include <reactos/asm.h> #include <asm.inc>
#include <ndk/amd64/asm.h>
/* DATA *********************************************************************/ /* DATA *********************************************************************/
@ -17,3 +16,5 @@ PUBLIC fmodf
fmodf: fmodf:
UNIMPLEMENTED fmodf UNIMPLEMENTED fmodf
ret ret
END

View file

@ -8,8 +8,7 @@
/* INCLUDES ******************************************************************/ /* INCLUDES ******************************************************************/
#include <reactos/asm.h> #include <asm.inc>
#include <ndk/amd64/asm.h>
/* DATA *********************************************************************/ /* DATA *********************************************************************/
@ -17,3 +16,5 @@ PUBLIC ldexp
ldexp: ldexp:
UNIMPLEMENTED ldexp UNIMPLEMENTED ldexp
ret ret
END

View file

@ -8,8 +8,7 @@
/* INCLUDES ******************************************************************/ /* INCLUDES ******************************************************************/
#include <reactos/asm.h> #include <asm.inc>
#include <ndk/amd64/asm.h>
/* DATA *********************************************************************/ /* DATA *********************************************************************/

View file

@ -8,8 +8,7 @@
/* INCLUDES ******************************************************************/ /* INCLUDES ******************************************************************/
#include <reactos/asm.h> #include <asm.inc>
#include <ndk/amd64/asm.h>
/* DATA *********************************************************************/ /* DATA *********************************************************************/

View file

@ -8,8 +8,8 @@
/* INCLUDES ******************************************************************/ /* INCLUDES ******************************************************************/
#include <reactos/asm.h> #include <asm.inc>
#include <ndk/amd64/asm.h> #include <ksamd64.inc>
/* DATA *********************************************************************/ /* DATA *********************************************************************/

View file

@ -8,8 +8,8 @@
/* INCLUDES ******************************************************************/ /* INCLUDES ******************************************************************/
#include <reactos/asm.h> #include <asm.inc>
#include <ndk/amd64/asm.h> #include <ksamd64.inc>
/* DATA *********************************************************************/ /* DATA *********************************************************************/
@ -17,3 +17,5 @@ PUBLIC sqrt
sqrt: sqrt:
UNIMPLEMENTED sqrt UNIMPLEMENTED sqrt
ret ret
END

View file

@ -8,8 +8,8 @@
/* INCLUDES ******************************************************************/ /* INCLUDES ******************************************************************/
#include <reactos/asm.h> #include <asm.inc>
#include <ndk/amd64/asm.h> #include <ksamd64.inc>
/* DATA *********************************************************************/ /* DATA *********************************************************************/
@ -17,3 +17,5 @@ PUBLIC sqrtf
sqrtf: sqrtf:
sqrtss xmm0, xmm0 sqrtss xmm0, xmm0
ret ret
END

View file

@ -8,8 +8,8 @@
/* INCLUDES ******************************************************************/ /* INCLUDES ******************************************************************/
#include <reactos/asm.h> #include <asm.inc>
#include <ndk/amd64/asm.h> #include <ksamd64.inc>
/* DATA *********************************************************************/ /* DATA *********************************************************************/
@ -17,3 +17,5 @@ PUBLIC tan
tan: tan:
UNIMPLEMENTED tan UNIMPLEMENTED tan
ret ret
END

View file

@ -34,7 +34,7 @@
* SUCH DAMAGE. * SUCH DAMAGE.
*/ */
#include <reactos/asm.h> #include <asm.inc>
PUBLIC __alldiv PUBLIC __alldiv
PUBLIC __fltused PUBLIC __fltused

View file

@ -34,7 +34,7 @@
* SUCH DAMAGE. * SUCH DAMAGE.
*/ */
#include <reactos/asm.h> #include <asm.inc>
PUBLIC __alldvrm PUBLIC __alldvrm

View file

@ -34,7 +34,7 @@
* SUCH DAMAGE. * SUCH DAMAGE.
*/ */
#include <reactos/asm.h> #include <asm.inc>
PUBLIC __allmul PUBLIC __allmul

View file

@ -34,7 +34,7 @@
* SUCH DAMAGE. * SUCH DAMAGE.
*/ */
#include <reactos/asm.h> #include <asm.inc>
PUBLIC __allrem PUBLIC __allrem

View file

@ -34,7 +34,7 @@
* SUCH DAMAGE. * SUCH DAMAGE.
*/ */
#include <reactos/asm.h> #include <asm.inc>
PUBLIC __allshl PUBLIC __allshl

View file

@ -34,7 +34,7 @@
* SUCH DAMAGE. * SUCH DAMAGE.
*/ */
#include <reactos/asm.h> #include <asm.inc>
PUBLIC __allshr PUBLIC __allshr

View file

@ -1,5 +1,5 @@
#include <reactos/asm.h> #include <asm.inc>
PUBLIC _atan2 PUBLIC _atan2

View file

@ -34,7 +34,7 @@
* SUCH DAMAGE. * SUCH DAMAGE.
*/ */
#include <reactos/asm.h> #include <asm.inc>
PUBLIC _atan PUBLIC _atan

View file

@ -34,7 +34,7 @@
* SUCH DAMAGE. * SUCH DAMAGE.
*/ */
#include <reactos/asm.h> #include <asm.inc>
PUBLIC __aulldiv PUBLIC __aulldiv

View file

@ -34,7 +34,7 @@
* SUCH DAMAGE. * SUCH DAMAGE.
*/ */
#include <reactos/asm.h> #include <asm.inc>
PUBLIC __aulldvrm PUBLIC __aulldvrm

View file

@ -34,7 +34,7 @@
* SUCH DAMAGE. * SUCH DAMAGE.
*/ */
#include <reactos/asm.h> #include <asm.inc>
PUBLIC __aullrem PUBLIC __aullrem

View file

@ -34,7 +34,7 @@
* SUCH DAMAGE. * SUCH DAMAGE.
*/ */
#include <reactos/asm.h> #include <asm.inc>
PUBLIC __aullshr PUBLIC __aullshr

View file

@ -34,7 +34,7 @@
* SUCH DAMAGE. * SUCH DAMAGE.
*/ */
#include <reactos/asm.h> #include <asm.inc>
PUBLIC _ceil PUBLIC _ceil

View file

@ -4,7 +4,7 @@
* No warranty is given; refer to the file DISCLAIMER.PD within this package. * No warranty is given; refer to the file DISCLAIMER.PD within this package.
*/ */
#include <reactos/asm.h> #include <asm.inc>
.code .code
.align 4 .align 4

View file

@ -34,7 +34,7 @@
* SUCH DAMAGE. * SUCH DAMAGE.
*/ */
#include <reactos/asm.h> #include <asm.inc>
PUBLIC _cos PUBLIC _cos

View file

@ -1,5 +1,5 @@
#include <reactos/asm.h> #include <asm.inc>
PUBLIC _exp PUBLIC _exp

View file

@ -34,7 +34,7 @@
* SUCH DAMAGE. * SUCH DAMAGE.
*/ */
#include <reactos/asm.h> #include <asm.inc>
PUBLIC _fabs PUBLIC _fabs

View file

@ -34,7 +34,7 @@
* SUCH DAMAGE. * SUCH DAMAGE.
*/ */
#include <reactos/asm.h> #include <asm.inc>
PUBLIC _floor PUBLIC _floor

View file

@ -8,7 +8,7 @@
* Danny Smith <dannysmith@users.sourceforge.net> * Danny Smith <dannysmith@users.sourceforge.net>
*/ */
#include <reactos/asm.h> #include <asm.inc>
.code .code
.align 4 .align 4

View file

@ -1,5 +1,5 @@
#include <reactos/asm.h> #include <asm.inc>
PUBLIC _fmod PUBLIC _fmod

View file

@ -1,5 +1,5 @@
#include <reactos/asm.h> #include <asm.inc>
PUBLIC _fmodf PUBLIC _fmodf

View file

@ -34,7 +34,7 @@
* SUCH DAMAGE. * SUCH DAMAGE.
*/ */
#include <reactos/asm.h> #include <asm.inc>
PUBLIC __ftol PUBLIC __ftol

View file

@ -8,7 +8,7 @@
* *
*/ */
#include <reactos/asm.h> #include <asm.inc>
PUBLIC _log10 PUBLIC _log10

View file

@ -34,7 +34,7 @@
* SUCH DAMAGE. * SUCH DAMAGE.
*/ */
#include <reactos/asm.h> #include <asm.inc>
PUBLIC _log PUBLIC _log

View file

@ -20,7 +20,7 @@
02111-1307 USA. */ 02111-1307 USA. */
/* Reactos modifications */ /* Reactos modifications */
#include <reactos/asm.h> #include <asm.inc>
#define ALIGNARG(log2) log2 #define ALIGNARG(log2) log2
#define ASM_TYPE_DIRECTIVE(name,typearg) #define ASM_TYPE_DIRECTIVE(name,typearg)
@ -29,9 +29,8 @@
PUBLIC _pow PUBLIC _pow
.data .data
.text ASSUME nothing
ASSUME CS:NOTHING, DS:NOTHING, ES:NOTHING, FS:NOTHING, GS:NOTHING
.align ALIGNARG(4) .align ALIGNARG(4)
ASM_TYPE_DIRECTIVE(infinity,@object) ASM_TYPE_DIRECTIVE(infinity,@object)
@ -77,8 +76,7 @@ p63:
#define MOX(op,x,f) op[x*f] #define MOX(op,x,f) op[x*f]
#endif #endif
.code .code
.text
_pow: _pow:
fld qword ptr [esp + 12] // y fld qword ptr [esp + 12] // y
fxam fxam

View file

@ -34,7 +34,7 @@
* SUCH DAMAGE. * SUCH DAMAGE.
*/ */
#include <reactos/asm.h> #include <asm.inc>
PUBLIC _sin PUBLIC _sin

View file

@ -34,7 +34,7 @@
* SUCH DAMAGE. * SUCH DAMAGE.
*/ */
#include <reactos/asm.h> #include <asm.inc>
PUBLIC _sqrt PUBLIC _sqrt

View file

@ -34,7 +34,7 @@
* SUCH DAMAGE. * SUCH DAMAGE.
*/ */
#include <reactos/asm.h> #include <asm.inc>
PUBLIC _tan PUBLIC _tan

View file

@ -5,7 +5,8 @@
* FILE: lib/sdk/crt/mem/i386/memchr.s * FILE: lib/sdk/crt/mem/i386/memchr.s
*/ */
#include <reactos/asm.h> #include <asm.inc>
#include <ks386.inc>
/* /*
* void* memchr(const void* s, int c, size_t n) * void* memchr(const void* s, int c, size_t n)

View file

@ -1,10 +1,10 @@
/* /*
* void *memcpy (void *to, const void *from, size_t count) * void *memcpy (void *to, const void *from, size_t count)
* *
* NOTE: This code is a duplicate of memmove function from memmove_asm.s
*/ */
#include <reactos/asm.h> #include <asm.inc>
#include <ks386.inc>
PUBLIC _memcpy PUBLIC _memcpy
PUBLIC _memmove PUBLIC _memmove

View file

@ -2,7 +2,8 @@
* $Id$ * $Id$
*/ */
#include <reactos/asm.h> #include <asm.inc>
#include <ks386.inc>
/* /*
* void *memset (void *src, int val, size_t count) * void *memset (void *src, int val, size_t count)

View file

@ -8,8 +8,8 @@
/* INCLUDES ******************************************************************/ /* INCLUDES ******************************************************************/
#include <reactos/asm.h> #include <asm.inc>
#include <ndk/amd64/asm.h> #include <ksamd64.inc>
#define JUMP_BUFFER_Frame 0x00 #define JUMP_BUFFER_Frame 0x00
#define JUMP_BUFFER_Rbx 0x08 #define JUMP_BUFFER_Rbx 0x08
@ -156,3 +156,5 @@ PUBLIC longjmp
inc rax inc rax
2: jmp r8 2: jmp r8
.endp longjmp .endp longjmp
END

View file

@ -9,8 +9,7 @@
* complete implementation * complete implementation
*/ */
#include <reactos/asm.h> #include <asm.inc>
#include <ndk/asm.h>
#define JB_BP 0 #define JB_BP 0
#define JB_BX 1 #define JB_BX 1

View file

@ -2,7 +2,7 @@
*/ */
#include "tchar.h" #include "tchar.h"
#include <reactos/asm.h> #include <asm.inc>
PUBLIC _tcscat PUBLIC _tcscat
.code .code

View file

@ -2,7 +2,7 @@
*/ */
#include "tchar.h" #include "tchar.h"
#include <reactos/asm.h> #include <asm.inc>
PUBLIC _tcschr PUBLIC _tcschr
.code .code

View file

@ -2,7 +2,7 @@
*/ */
#include "tchar.h" #include "tchar.h"
#include <reactos/asm.h> #include <asm.inc>
PUBLIC _tcscmp PUBLIC _tcscmp
.code .code

View file

@ -2,7 +2,7 @@
*/ */
#include "tchar.h" #include "tchar.h"
#include <reactos/asm.h> #include <asm.inc>
PUBLIC _tcscpy PUBLIC _tcscpy
.code .code

View file

@ -2,7 +2,7 @@
*/ */
#include "tchar.h" #include "tchar.h"
#include <reactos/asm.h> #include <asm.inc>
PUBLIC _tcslen PUBLIC _tcslen
.code .code

View file

@ -2,7 +2,7 @@
*/ */
#include "tchar.h" #include "tchar.h"
#include <reactos/asm.h> #include <asm.inc>
PUBLIC _tcsncat PUBLIC _tcsncat
.code .code

View file

@ -2,7 +2,7 @@
*/ */
#include "tchar.h" #include "tchar.h"
#include <reactos/asm.h> #include <asm.inc>
PUBLIC _tcsncmp PUBLIC _tcsncmp
.code .code

View file

@ -2,7 +2,7 @@
*/ */
#include "tchar.h" #include "tchar.h"
#include <reactos/asm.h> #include <asm.inc>
PUBLIC _tcsncpy PUBLIC _tcsncpy
.code .code

View file

@ -2,7 +2,7 @@
*/ */
#include "tchar.h" #include "tchar.h"
#include <reactos/asm.h> #include <asm.inc>
PUBLIC _tcsnlen PUBLIC _tcsnlen
.code .code

View file

@ -2,7 +2,7 @@
*/ */
#include "tchar.h" #include "tchar.h"
#include <reactos/asm.h> #include <asm.inc>
PUBLIC _tcsrchr PUBLIC _tcsrchr
.code .code