[ros-diffs] [tkreuzer] 49591: [CRT] incude asm.inc instead of reactos/asm.h Fix a bug that smeaked into _chkstk

Author: tkreuzer
Date: Mon Nov 15 01:29:12 2010
New Revision: 49591

URL: http://svn.reactos.org/svn/reactos?rev=49591&view=rev
Log:
[CRT]
incude asm.inc instead of reactos/asm.h
Fix a bug that smeaked into _chkstk

Modified:
    branches/cmake-bringup/lib/sdk/crt/except/amd64/chkstk_asm.s
    branches/cmake-bringup/lib/sdk/crt/except/amd64/seh.s
    branches/cmake-bringup/lib/sdk/crt/except/i386/chkstk_asm.s
    branches/cmake-bringup/lib/sdk/crt/except/i386/prolog.s
    branches/cmake-bringup/lib/sdk/crt/except/i386/seh.s
    branches/cmake-bringup/lib/sdk/crt/math/amd64/alldiv.S
    branches/cmake-bringup/lib/sdk/crt/math/amd64/atan.S
    branches/cmake-bringup/lib/sdk/crt/math/amd64/atan2.S
    branches/cmake-bringup/lib/sdk/crt/math/amd64/ceil.S
    branches/cmake-bringup/lib/sdk/crt/math/amd64/ceilf.S
    branches/cmake-bringup/lib/sdk/crt/math/amd64/exp.S
    branches/cmake-bringup/lib/sdk/crt/math/amd64/fabs.S
    branches/cmake-bringup/lib/sdk/crt/math/amd64/floor.S
    branches/cmake-bringup/lib/sdk/crt/math/amd64/floorf.S
    branches/cmake-bringup/lib/sdk/crt/math/amd64/fmod.S
    branches/cmake-bringup/lib/sdk/crt/math/amd64/fmodf.S
    branches/cmake-bringup/lib/sdk/crt/math/amd64/ldexp.S
    branches/cmake-bringup/lib/sdk/crt/math/amd64/log.S
    branches/cmake-bringup/lib/sdk/crt/math/amd64/log10.S
    branches/cmake-bringup/lib/sdk/crt/math/amd64/pow.S
    branches/cmake-bringup/lib/sdk/crt/math/amd64/sqrt.S
    branches/cmake-bringup/lib/sdk/crt/math/amd64/sqrtf.S
    branches/cmake-bringup/lib/sdk/crt/math/amd64/tan.S
    branches/cmake-bringup/lib/sdk/crt/math/i386/alldiv_asm.s
    branches/cmake-bringup/lib/sdk/crt/math/i386/alldvrm_asm.s
    branches/cmake-bringup/lib/sdk/crt/math/i386/allmul_asm.s
    branches/cmake-bringup/lib/sdk/crt/math/i386/allrem_asm.s
    branches/cmake-bringup/lib/sdk/crt/math/i386/allshl_asm.s
    branches/cmake-bringup/lib/sdk/crt/math/i386/allshr_asm.s
    branches/cmake-bringup/lib/sdk/crt/math/i386/atan2_asm.s
    branches/cmake-bringup/lib/sdk/crt/math/i386/atan_asm.s
    branches/cmake-bringup/lib/sdk/crt/math/i386/aulldiv_asm.s
    branches/cmake-bringup/lib/sdk/crt/math/i386/aulldvrm_asm.s
    branches/cmake-bringup/lib/sdk/crt/math/i386/aullrem_asm.s
    branches/cmake-bringup/lib/sdk/crt/math/i386/aullshr_asm.s
    branches/cmake-bringup/lib/sdk/crt/math/i386/ceil_asm.s
    branches/cmake-bringup/lib/sdk/crt/math/i386/ceilf.S
    branches/cmake-bringup/lib/sdk/crt/math/i386/cos_asm.s
    branches/cmake-bringup/lib/sdk/crt/math/i386/exp_asm.s
    branches/cmake-bringup/lib/sdk/crt/math/i386/fabs_asm.s
    branches/cmake-bringup/lib/sdk/crt/math/i386/floor_asm.s
    branches/cmake-bringup/lib/sdk/crt/math/i386/floorf.S
    branches/cmake-bringup/lib/sdk/crt/math/i386/fmod_asm.s
    branches/cmake-bringup/lib/sdk/crt/math/i386/fmodf_asm.s
    branches/cmake-bringup/lib/sdk/crt/math/i386/ftol_asm.s
    branches/cmake-bringup/lib/sdk/crt/math/i386/log10_asm.s
    branches/cmake-bringup/lib/sdk/crt/math/i386/log_asm.s
    branches/cmake-bringup/lib/sdk/crt/math/i386/pow_asm.s
    branches/cmake-bringup/lib/sdk/crt/math/i386/sin_asm.s
    branches/cmake-bringup/lib/sdk/crt/math/i386/sqrt_asm.s
    branches/cmake-bringup/lib/sdk/crt/math/i386/tan_asm.s
    branches/cmake-bringup/lib/sdk/crt/mem/i386/memchr_asm.s
    branches/cmake-bringup/lib/sdk/crt/mem/i386/memmove_asm.s
    branches/cmake-bringup/lib/sdk/crt/mem/i386/memset_asm.s
    branches/cmake-bringup/lib/sdk/crt/setjmp/amd64/setjmp.s
    branches/cmake-bringup/lib/sdk/crt/setjmp/i386/setjmp.s
    branches/cmake-bringup/lib/sdk/crt/string/i386/tcscat.inc
    branches/cmake-bringup/lib/sdk/crt/string/i386/tcschr.inc
    branches/cmake-bringup/lib/sdk/crt/string/i386/tcscmp.inc
    branches/cmake-bringup/lib/sdk/crt/string/i386/tcscpy.inc
    branches/cmake-bringup/lib/sdk/crt/string/i386/tcslen.inc
    branches/cmake-bringup/lib/sdk/crt/string/i386/tcsncat.inc
    branches/cmake-bringup/lib/sdk/crt/string/i386/tcsncmp.inc
    branches/cmake-bringup/lib/sdk/crt/string/i386/tcsncpy.inc
    branches/cmake-bringup/lib/sdk/crt/string/i386/tcsnlen.inc
    branches/cmake-bringup/lib/sdk/crt/string/i386/tcsrchr.inc

Modified: branches/cmake-bringup/lib/sdk/crt/except/amd64/chkstk_asm.s
URL:
http://svn.reactos.org/svn/reactos/branches/cmake-bringup/lib/sdk/crt/excep…
==============================================================================
--- branches/cmake-bringup/lib/sdk/crt/except/amd64/chkstk_asm.s [iso-8859-1] (original)
+++ branches/cmake-bringup/lib/sdk/crt/except/amd64/chkstk_asm.s [iso-8859-1] Mon Nov 15
01:29:12 2010
@@ -8,11 +8,10 @@
 
 /* INCLUDES ******************************************************************/
 
-#include <reactos/asm.h>
+#include <asm.inc>
 
-.intel_syntax noprefix
 
-.global MsgUnimplemented
+PUBLIC MsgUnimplemented
 MsgUnimplemented:
 .asciz "WARNING:  %s at %s:%d is UNIMPLEMENTED!\n"
 
@@ -27,4 +26,5 @@
     ret
 .endp
 
+END
 /* EOF */

Modified: branches/cmake-bringup/lib/sdk/crt/except/amd64/seh.s
URL:
http://svn.reactos.org/svn/reactos/branches/cmake-bringup/lib/sdk/crt/excep…
==============================================================================
--- branches/cmake-bringup/lib/sdk/crt/except/amd64/seh.s [iso-8859-1] (original)
+++ branches/cmake-bringup/lib/sdk/crt/except/amd64/seh.s [iso-8859-1] Mon Nov 15 01:29:12
2010
@@ -8,8 +8,8 @@
 
 /* INCLUDES ******************************************************************/
 
-#include <ndk/asm.h>
-.intel_syntax noprefix
+#include <asm.inc>
+#include <ksamd64.inc>
 
 #define DISPOSITION_DISMISS         0
 #define DISPOSITION_CONTINUE_SEARCH 1
@@ -54,3 +54,5 @@
 _except_handler3:
     ret
 .endfunc
+
+END

Modified: branches/cmake-bringup/lib/sdk/crt/except/i386/chkstk_asm.s
URL:
http://svn.reactos.org/svn/reactos/branches/cmake-bringup/lib/sdk/crt/excep…
==============================================================================
--- branches/cmake-bringup/lib/sdk/crt/except/i386/chkstk_asm.s [iso-8859-1] (original)
+++ branches/cmake-bringup/lib/sdk/crt/except/i386/chkstk_asm.s [iso-8859-1] Mon Nov 15
01:29:12 2010
@@ -7,8 +7,9 @@
  * PROGRAMER:         KJK::Hyperion &lt;noog(a)libero.it&gt;
  */
 
-#include <reactos/asm.h>
-#include <ndk/asm.h>
+#include <asm.inc>
+#include <ks386.inc>
+
 #define PAGE_SIZE 4096
 
 PUBLIC __chkstk
@@ -28,12 +29,11 @@
     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:
 

Modified: branches/cmake-bringup/lib/sdk/crt/except/i386/prolog.s
URL:
http://svn.reactos.org/svn/reactos/branches/cmake-bringup/lib/sdk/crt/excep…
==============================================================================
--- branches/cmake-bringup/lib/sdk/crt/except/i386/prolog.s [iso-8859-1] (original)
+++ branches/cmake-bringup/lib/sdk/crt/except/i386/prolog.s [iso-8859-1] Mon Nov 15
01:29:12 2010
@@ -8,20 +8,23 @@
 
 /* INCLUDES ******************************************************************/
 
-#include <ndk/asm.h>
+#include <asm.inc>
+#include <ks386.inc>
 
-/* GLOBALS *******************************************************************/
+/* FUNCTIONS *****************************************************************/
+.code
 
-.globl __EH_prolog
-
+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

Modified: branches/cmake-bringup/lib/sdk/crt/except/i386/seh.s
URL:
http://svn.reactos.org/svn/reactos/branches/cmake-bringup/lib/sdk/crt/excep…
==============================================================================
--- branches/cmake-bringup/lib/sdk/crt/except/i386/seh.s [iso-8859-1] (original)
+++ branches/cmake-bringup/lib/sdk/crt/except/i386/seh.s [iso-8859-1] Mon Nov 15 01:29:12
2010
@@ -8,7 +8,7 @@
 
 /* INCLUDES ******************************************************************/
 
-#include <reactos/asm.h>
+#include <asm.inc>
 
 #define DISPOSITION_DISMISS         0
 #define DISPOSITION_CONTINUE_SEARCH 1

Modified: branches/cmake-bringup/lib/sdk/crt/math/amd64/alldiv.S
URL:
http://svn.reactos.org/svn/reactos/branches/cmake-bringup/lib/sdk/crt/math/…
==============================================================================
--- branches/cmake-bringup/lib/sdk/crt/math/amd64/alldiv.S [iso-8859-1] (original)
+++ branches/cmake-bringup/lib/sdk/crt/math/amd64/alldiv.S [iso-8859-1] Mon Nov 15
01:29:12 2010
@@ -8,8 +8,7 @@
 
 /* INCLUDES ******************************************************************/
 
-#include <reactos/asm.h>
-#include <ndk/amd64/asm.h>
+#include <asm.inc>
 
 /* DATA *********************************************************************/
 

Modified: branches/cmake-bringup/lib/sdk/crt/math/amd64/atan.S
URL:
http://svn.reactos.org/svn/reactos/branches/cmake-bringup/lib/sdk/crt/math/…
==============================================================================
--- branches/cmake-bringup/lib/sdk/crt/math/amd64/atan.S [iso-8859-1] (original)
+++ branches/cmake-bringup/lib/sdk/crt/math/amd64/atan.S [iso-8859-1] Mon Nov 15 01:29:12
2010
@@ -8,8 +8,8 @@
 
 /* INCLUDES ******************************************************************/
 
-#include <reactos/asm.h>
-#include <ndk/amd64/asm.h>
+#include <asm.inc>
+#include <ksamd64.inc>
 
 /* FUNCTIONS ****************************************************************/
 

Modified: branches/cmake-bringup/lib/sdk/crt/math/amd64/atan2.S
URL:
http://svn.reactos.org/svn/reactos/branches/cmake-bringup/lib/sdk/crt/math/…
==============================================================================
--- branches/cmake-bringup/lib/sdk/crt/math/amd64/atan2.S [iso-8859-1] (original)
+++ branches/cmake-bringup/lib/sdk/crt/math/amd64/atan2.S [iso-8859-1] Mon Nov 15 01:29:12
2010
@@ -8,8 +8,8 @@
 
 /* INCLUDES ******************************************************************/
 
-#include <reactos/asm.h>
-#include <ndk/amd64/asm.h>
+#include <asm.inc>
+#include <ksamd64.inc>
 
 /* FUNCTIONS ****************************************************************/
 

Modified: branches/cmake-bringup/lib/sdk/crt/math/amd64/ceil.S
URL:
http://svn.reactos.org/svn/reactos/branches/cmake-bringup/lib/sdk/crt/math/…
==============================================================================
--- branches/cmake-bringup/lib/sdk/crt/math/amd64/ceil.S [iso-8859-1] (original)
+++ branches/cmake-bringup/lib/sdk/crt/math/amd64/ceil.S [iso-8859-1] Mon Nov 15 01:29:12
2010
@@ -8,8 +8,8 @@
 
 /* INCLUDES ******************************************************************/
 
-#include <reactos/asm.h>
-#include <ndk/amd64/asm.h>
+#include <asm.inc>
+#include <ksamd64.inc>
 
 /* FUNCTIONS ****************************************************************/
 

Modified: branches/cmake-bringup/lib/sdk/crt/math/amd64/ceilf.S
URL:
http://svn.reactos.org/svn/reactos/branches/cmake-bringup/lib/sdk/crt/math/…
==============================================================================
--- branches/cmake-bringup/lib/sdk/crt/math/amd64/ceilf.S [iso-8859-1] (original)
+++ branches/cmake-bringup/lib/sdk/crt/math/amd64/ceilf.S [iso-8859-1] Mon Nov 15 01:29:12
2010
@@ -8,8 +8,8 @@
 
 /* INCLUDES ******************************************************************/
 
-#include <reactos/asm.h>
-#include <ndk/amd64/asm.h>
+#include <asm.inc>
+#include <ksamd64.inc>
 
 /* FUNCTIONS ****************************************************************/
 
@@ -26,8 +26,8 @@
     /* 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 @@
     
     add rsp, 16
     ret
+
+END

Modified: branches/cmake-bringup/lib/sdk/crt/math/amd64/exp.S
URL:
http://svn.reactos.org/svn/reactos/branches/cmake-bringup/lib/sdk/crt/math/…
==============================================================================
--- branches/cmake-bringup/lib/sdk/crt/math/amd64/exp.S [iso-8859-1] (original)
+++ branches/cmake-bringup/lib/sdk/crt/math/amd64/exp.S [iso-8859-1] Mon Nov 15 01:29:12
2010
@@ -8,8 +8,8 @@
 
 /* INCLUDES ******************************************************************/
 
-#include <reactos/asm.h>
-#include <ndk/amd64/asm.h>
+#include <asm.inc>
+#include <ksamd64.inc>
 
 /* FUNCTIONS ****************************************************************/
 
@@ -20,3 +20,4 @@
     UNIMPLEMENTED exp
     ret
 
+END

Modified: branches/cmake-bringup/lib/sdk/crt/math/amd64/fabs.S
URL:
http://svn.reactos.org/svn/reactos/branches/cmake-bringup/lib/sdk/crt/math/…
==============================================================================
--- branches/cmake-bringup/lib/sdk/crt/math/amd64/fabs.S [iso-8859-1] (original)
+++ branches/cmake-bringup/lib/sdk/crt/math/amd64/fabs.S [iso-8859-1] Mon Nov 15 01:29:12
2010
@@ -8,8 +8,7 @@
 
 /* INCLUDES ******************************************************************/
 
-#include <reactos/asm.h>
-#include <ndk/amd64/asm.h>
+#include <asm.inc>
 
 /* FUNCTIONS ****************************************************************/
 

Modified: branches/cmake-bringup/lib/sdk/crt/math/amd64/floor.S
URL:
http://svn.reactos.org/svn/reactos/branches/cmake-bringup/lib/sdk/crt/math/…
==============================================================================
--- branches/cmake-bringup/lib/sdk/crt/math/amd64/floor.S [iso-8859-1] (original)
+++ branches/cmake-bringup/lib/sdk/crt/math/amd64/floor.S [iso-8859-1] Mon Nov 15 01:29:12
2010
@@ -8,8 +8,8 @@
 
 /* INCLUDES ******************************************************************/
 
-#include <reactos/asm.h>
-#include <ndk/amd64/asm.h>
+#include <asm.inc>
+#include <ksamd64.inc>
 
 /* FUNCTIONS ****************************************************************/
 
@@ -19,3 +19,5 @@
 floor:
     UNIMPLEMENTED floor
     ret
+
+END

Modified: branches/cmake-bringup/lib/sdk/crt/math/amd64/floorf.S
URL:
http://svn.reactos.org/svn/reactos/branches/cmake-bringup/lib/sdk/crt/math/…
==============================================================================
--- branches/cmake-bringup/lib/sdk/crt/math/amd64/floorf.S [iso-8859-1] (original)
+++ branches/cmake-bringup/lib/sdk/crt/math/amd64/floorf.S [iso-8859-1] Mon Nov 15
01:29:12 2010
@@ -8,8 +8,8 @@
 
 /* INCLUDES ******************************************************************/
 
-#include <reactos/asm.h>
-#include <ndk/amd64/asm.h>
+#include <asm.inc>
+#include <ksamd64.inc>
 
 /* FUNCTIONS ****************************************************************/
 

Modified: branches/cmake-bringup/lib/sdk/crt/math/amd64/fmod.S
URL:
http://svn.reactos.org/svn/reactos/branches/cmake-bringup/lib/sdk/crt/math/…
==============================================================================
--- branches/cmake-bringup/lib/sdk/crt/math/amd64/fmod.S [iso-8859-1] (original)
+++ branches/cmake-bringup/lib/sdk/crt/math/amd64/fmod.S [iso-8859-1] Mon Nov 15 01:29:12
2010
@@ -8,8 +8,7 @@
 
 /* INCLUDES ******************************************************************/
 
-#include <reactos/asm.h>
-#include <ndk/amd64/asm.h>
+#include <asm.inc>
 
 /* DATA *********************************************************************/
 
@@ -17,3 +16,5 @@
 fmod:
     UNIMPLEMENTED fmod
     ret
+
+END

Modified: branches/cmake-bringup/lib/sdk/crt/math/amd64/fmodf.S
URL:
http://svn.reactos.org/svn/reactos/branches/cmake-bringup/lib/sdk/crt/math/…
==============================================================================
--- branches/cmake-bringup/lib/sdk/crt/math/amd64/fmodf.S [iso-8859-1] (original)
+++ branches/cmake-bringup/lib/sdk/crt/math/amd64/fmodf.S [iso-8859-1] Mon Nov 15 01:29:12
2010
@@ -8,8 +8,7 @@
 
 /* INCLUDES ******************************************************************/
 
-#include <reactos/asm.h>
-#include <ndk/amd64/asm.h>
+#include <asm.inc>
 
 /* DATA *********************************************************************/
 
@@ -17,3 +16,5 @@
 fmodf:
     UNIMPLEMENTED fmodf
     ret
+
+END

Modified: branches/cmake-bringup/lib/sdk/crt/math/amd64/ldexp.S
URL:
http://svn.reactos.org/svn/reactos/branches/cmake-bringup/lib/sdk/crt/math/…
==============================================================================
--- branches/cmake-bringup/lib/sdk/crt/math/amd64/ldexp.S [iso-8859-1] (original)
+++ branches/cmake-bringup/lib/sdk/crt/math/amd64/ldexp.S [iso-8859-1] Mon Nov 15 01:29:12
2010
@@ -8,8 +8,7 @@
 
 /* INCLUDES ******************************************************************/
 
-#include <reactos/asm.h>
-#include <ndk/amd64/asm.h>
+#include <asm.inc>
 
 /* DATA *********************************************************************/
 
@@ -17,3 +16,5 @@
 ldexp:
     UNIMPLEMENTED ldexp
     ret
+
+END

Modified: branches/cmake-bringup/lib/sdk/crt/math/amd64/log.S
URL:
http://svn.reactos.org/svn/reactos/branches/cmake-bringup/lib/sdk/crt/math/…
==============================================================================
--- branches/cmake-bringup/lib/sdk/crt/math/amd64/log.S [iso-8859-1] (original)
+++ branches/cmake-bringup/lib/sdk/crt/math/amd64/log.S [iso-8859-1] Mon Nov 15 01:29:12
2010
@@ -8,8 +8,7 @@
 
 /* INCLUDES ******************************************************************/
 
-#include <reactos/asm.h>
-#include <ndk/amd64/asm.h>
+#include <asm.inc>
 
 /* DATA *********************************************************************/
 

Modified: branches/cmake-bringup/lib/sdk/crt/math/amd64/log10.S
URL:
http://svn.reactos.org/svn/reactos/branches/cmake-bringup/lib/sdk/crt/math/…
==============================================================================
--- branches/cmake-bringup/lib/sdk/crt/math/amd64/log10.S [iso-8859-1] (original)
+++ branches/cmake-bringup/lib/sdk/crt/math/amd64/log10.S [iso-8859-1] Mon Nov 15 01:29:12
2010
@@ -8,8 +8,7 @@
 
 /* INCLUDES ******************************************************************/
 
-#include <reactos/asm.h>
-#include <ndk/amd64/asm.h>
+#include <asm.inc>
 
 /* DATA *********************************************************************/
 

Modified: branches/cmake-bringup/lib/sdk/crt/math/amd64/pow.S
URL:
http://svn.reactos.org/svn/reactos/branches/cmake-bringup/lib/sdk/crt/math/…
==============================================================================
--- branches/cmake-bringup/lib/sdk/crt/math/amd64/pow.S [iso-8859-1] (original)
+++ branches/cmake-bringup/lib/sdk/crt/math/amd64/pow.S [iso-8859-1] Mon Nov 15 01:29:12
2010
@@ -8,8 +8,8 @@
 
 /* INCLUDES ******************************************************************/
 
-#include <reactos/asm.h>
-#include <ndk/amd64/asm.h>
+#include <asm.inc>
+#include <ksamd64.inc>
 
 /* DATA *********************************************************************/
 

Modified: branches/cmake-bringup/lib/sdk/crt/math/amd64/sqrt.S
URL:
http://svn.reactos.org/svn/reactos/branches/cmake-bringup/lib/sdk/crt/math/…
==============================================================================
--- branches/cmake-bringup/lib/sdk/crt/math/amd64/sqrt.S [iso-8859-1] (original)
+++ branches/cmake-bringup/lib/sdk/crt/math/amd64/sqrt.S [iso-8859-1] Mon Nov 15 01:29:12
2010
@@ -8,8 +8,8 @@
 
 /* INCLUDES ******************************************************************/
 
-#include <reactos/asm.h>
-#include <ndk/amd64/asm.h>
+#include <asm.inc>
+#include <ksamd64.inc>
 
 /* DATA *********************************************************************/
 
@@ -17,3 +17,5 @@
 sqrt:
     UNIMPLEMENTED sqrt
     ret
+
+END

Modified: branches/cmake-bringup/lib/sdk/crt/math/amd64/sqrtf.S
URL:
http://svn.reactos.org/svn/reactos/branches/cmake-bringup/lib/sdk/crt/math/…
==============================================================================
--- branches/cmake-bringup/lib/sdk/crt/math/amd64/sqrtf.S [iso-8859-1] (original)
+++ branches/cmake-bringup/lib/sdk/crt/math/amd64/sqrtf.S [iso-8859-1] Mon Nov 15 01:29:12
2010
@@ -8,8 +8,8 @@
 
 /* INCLUDES ******************************************************************/
 
-#include <reactos/asm.h>
-#include <ndk/amd64/asm.h>
+#include <asm.inc>
+#include <ksamd64.inc>
 
 /* DATA *********************************************************************/
 
@@ -17,3 +17,5 @@
 sqrtf:
     sqrtss	xmm0, xmm0
     ret
+
+END

Modified: branches/cmake-bringup/lib/sdk/crt/math/amd64/tan.S
URL:
http://svn.reactos.org/svn/reactos/branches/cmake-bringup/lib/sdk/crt/math/…
==============================================================================
--- branches/cmake-bringup/lib/sdk/crt/math/amd64/tan.S [iso-8859-1] (original)
+++ branches/cmake-bringup/lib/sdk/crt/math/amd64/tan.S [iso-8859-1] Mon Nov 15 01:29:12
2010
@@ -8,8 +8,8 @@
 
 /* INCLUDES ******************************************************************/
 
-#include <reactos/asm.h>
-#include <ndk/amd64/asm.h>
+#include <asm.inc>
+#include <ksamd64.inc>
 
 /* DATA *********************************************************************/
 
@@ -17,3 +17,5 @@
 tan:
     UNIMPLEMENTED tan
     ret
+
+END

Modified: branches/cmake-bringup/lib/sdk/crt/math/i386/alldiv_asm.s
URL:
http://svn.reactos.org/svn/reactos/branches/cmake-bringup/lib/sdk/crt/math/…
==============================================================================
--- branches/cmake-bringup/lib/sdk/crt/math/i386/alldiv_asm.s [iso-8859-1] (original)
+++ branches/cmake-bringup/lib/sdk/crt/math/i386/alldiv_asm.s [iso-8859-1] Mon Nov 15
01:29:12 2010
@@ -34,7 +34,7 @@
  * SUCH DAMAGE.
  */
 
-#include <reactos/asm.h>
+#include <asm.inc>
 
 PUBLIC __alldiv
 PUBLIC __fltused

Modified: branches/cmake-bringup/lib/sdk/crt/math/i386/alldvrm_asm.s
URL:
http://svn.reactos.org/svn/reactos/branches/cmake-bringup/lib/sdk/crt/math/…
==============================================================================
--- branches/cmake-bringup/lib/sdk/crt/math/i386/alldvrm_asm.s [iso-8859-1] (original)
+++ branches/cmake-bringup/lib/sdk/crt/math/i386/alldvrm_asm.s [iso-8859-1] Mon Nov 15
01:29:12 2010
@@ -34,7 +34,7 @@
  * SUCH DAMAGE.
  */
 
-#include <reactos/asm.h>
+#include <asm.inc>
 
 PUBLIC __alldvrm
  

Modified: branches/cmake-bringup/lib/sdk/crt/math/i386/allmul_asm.s
URL:
http://svn.reactos.org/svn/reactos/branches/cmake-bringup/lib/sdk/crt/math/…
==============================================================================
--- branches/cmake-bringup/lib/sdk/crt/math/i386/allmul_asm.s [iso-8859-1] (original)
+++ branches/cmake-bringup/lib/sdk/crt/math/i386/allmul_asm.s [iso-8859-1] Mon Nov 15
01:29:12 2010
@@ -34,7 +34,7 @@
  * SUCH DAMAGE.
  */
 
-#include <reactos/asm.h>
+#include <asm.inc>
 
 PUBLIC __allmul
 

Modified: branches/cmake-bringup/lib/sdk/crt/math/i386/allrem_asm.s
URL:
http://svn.reactos.org/svn/reactos/branches/cmake-bringup/lib/sdk/crt/math/…
==============================================================================
--- branches/cmake-bringup/lib/sdk/crt/math/i386/allrem_asm.s [iso-8859-1] (original)
+++ branches/cmake-bringup/lib/sdk/crt/math/i386/allrem_asm.s [iso-8859-1] Mon Nov 15
01:29:12 2010
@@ -34,7 +34,7 @@
  * SUCH DAMAGE.
  */
 
-#include <reactos/asm.h>
+#include <asm.inc>
 
 PUBLIC __allrem
  

Modified: branches/cmake-bringup/lib/sdk/crt/math/i386/allshl_asm.s
URL:
http://svn.reactos.org/svn/reactos/branches/cmake-bringup/lib/sdk/crt/math/…
==============================================================================
--- branches/cmake-bringup/lib/sdk/crt/math/i386/allshl_asm.s [iso-8859-1] (original)
+++ branches/cmake-bringup/lib/sdk/crt/math/i386/allshl_asm.s [iso-8859-1] Mon Nov 15
01:29:12 2010
@@ -34,7 +34,7 @@
  * SUCH DAMAGE.
  */
 
-#include <reactos/asm.h>
+#include <asm.inc>
 
 PUBLIC __allshl
 

Modified: branches/cmake-bringup/lib/sdk/crt/math/i386/allshr_asm.s
URL:
http://svn.reactos.org/svn/reactos/branches/cmake-bringup/lib/sdk/crt/math/…
==============================================================================
--- branches/cmake-bringup/lib/sdk/crt/math/i386/allshr_asm.s [iso-8859-1] (original)
+++ branches/cmake-bringup/lib/sdk/crt/math/i386/allshr_asm.s [iso-8859-1] Mon Nov 15
01:29:12 2010
@@ -34,7 +34,7 @@
  * SUCH DAMAGE.
  */
 
-#include <reactos/asm.h>
+#include <asm.inc>
 
 PUBLIC __allshr
  

Modified: branches/cmake-bringup/lib/sdk/crt/math/i386/atan2_asm.s
URL:
http://svn.reactos.org/svn/reactos/branches/cmake-bringup/lib/sdk/crt/math/…
==============================================================================
--- branches/cmake-bringup/lib/sdk/crt/math/i386/atan2_asm.s [iso-8859-1] (original)
+++ branches/cmake-bringup/lib/sdk/crt/math/i386/atan2_asm.s [iso-8859-1] Mon Nov 15
01:29:12 2010
@@ -1,5 +1,5 @@
 
-#include <reactos/asm.h>
+#include <asm.inc>
 
 PUBLIC _atan2
 

Modified: branches/cmake-bringup/lib/sdk/crt/math/i386/atan_asm.s
URL:
http://svn.reactos.org/svn/reactos/branches/cmake-bringup/lib/sdk/crt/math/…
==============================================================================
--- branches/cmake-bringup/lib/sdk/crt/math/i386/atan_asm.s [iso-8859-1] (original)
+++ branches/cmake-bringup/lib/sdk/crt/math/i386/atan_asm.s [iso-8859-1] Mon Nov 15
01:29:12 2010
@@ -34,7 +34,7 @@
  * SUCH DAMAGE.
  */
 
-#include <reactos/asm.h>
+#include <asm.inc>
 
 PUBLIC _atan
  

Modified: branches/cmake-bringup/lib/sdk/crt/math/i386/aulldiv_asm.s
URL:
http://svn.reactos.org/svn/reactos/branches/cmake-bringup/lib/sdk/crt/math/…
==============================================================================
--- branches/cmake-bringup/lib/sdk/crt/math/i386/aulldiv_asm.s [iso-8859-1] (original)
+++ branches/cmake-bringup/lib/sdk/crt/math/i386/aulldiv_asm.s [iso-8859-1] Mon Nov 15
01:29:12 2010
@@ -34,7 +34,7 @@
  * SUCH DAMAGE.
  */
 
-#include <reactos/asm.h>
+#include <asm.inc>
 
 PUBLIC __aulldiv
 

Modified: branches/cmake-bringup/lib/sdk/crt/math/i386/aulldvrm_asm.s
URL:
http://svn.reactos.org/svn/reactos/branches/cmake-bringup/lib/sdk/crt/math/…
==============================================================================
--- branches/cmake-bringup/lib/sdk/crt/math/i386/aulldvrm_asm.s [iso-8859-1] (original)
+++ branches/cmake-bringup/lib/sdk/crt/math/i386/aulldvrm_asm.s [iso-8859-1] Mon Nov 15
01:29:12 2010
@@ -34,7 +34,7 @@
  * SUCH DAMAGE.
  */
 
-#include <reactos/asm.h>
+#include <asm.inc>
 
 PUBLIC __aulldvrm
  

Modified: branches/cmake-bringup/lib/sdk/crt/math/i386/aullrem_asm.s
URL:
http://svn.reactos.org/svn/reactos/branches/cmake-bringup/lib/sdk/crt/math/…
==============================================================================
--- branches/cmake-bringup/lib/sdk/crt/math/i386/aullrem_asm.s [iso-8859-1] (original)
+++ branches/cmake-bringup/lib/sdk/crt/math/i386/aullrem_asm.s [iso-8859-1] Mon Nov 15
01:29:12 2010
@@ -34,7 +34,7 @@
  * SUCH DAMAGE.
  */
 
-#include <reactos/asm.h>
+#include <asm.inc>
 
 PUBLIC __aullrem
  

Modified: branches/cmake-bringup/lib/sdk/crt/math/i386/aullshr_asm.s
URL:
http://svn.reactos.org/svn/reactos/branches/cmake-bringup/lib/sdk/crt/math/…
==============================================================================
--- branches/cmake-bringup/lib/sdk/crt/math/i386/aullshr_asm.s [iso-8859-1] (original)
+++ branches/cmake-bringup/lib/sdk/crt/math/i386/aullshr_asm.s [iso-8859-1] Mon Nov 15
01:29:12 2010
@@ -34,7 +34,7 @@
  * SUCH DAMAGE.
  */
 
-#include <reactos/asm.h>
+#include <asm.inc>
 
 PUBLIC __aullshr
  

Modified: branches/cmake-bringup/lib/sdk/crt/math/i386/ceil_asm.s
URL:
http://svn.reactos.org/svn/reactos/branches/cmake-bringup/lib/sdk/crt/math/…
==============================================================================
--- branches/cmake-bringup/lib/sdk/crt/math/i386/ceil_asm.s [iso-8859-1] (original)
+++ branches/cmake-bringup/lib/sdk/crt/math/i386/ceil_asm.s [iso-8859-1] Mon Nov 15
01:29:12 2010
@@ -34,7 +34,7 @@
  * SUCH DAMAGE.
  */
 
-#include <reactos/asm.h>
+#include <asm.inc>
 
 PUBLIC _ceil
 

Modified: branches/cmake-bringup/lib/sdk/crt/math/i386/ceilf.S
URL:
http://svn.reactos.org/svn/reactos/branches/cmake-bringup/lib/sdk/crt/math/…
==============================================================================
--- branches/cmake-bringup/lib/sdk/crt/math/i386/ceilf.S [iso-8859-1] (original)
+++ branches/cmake-bringup/lib/sdk/crt/math/i386/ceilf.S [iso-8859-1] Mon Nov 15 01:29:12
2010
@@ -4,7 +4,7 @@
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 
-#include <reactos/asm.h>
+#include <asm.inc>
 
 .code
 .align 4

Modified: branches/cmake-bringup/lib/sdk/crt/math/i386/cos_asm.s
URL:
http://svn.reactos.org/svn/reactos/branches/cmake-bringup/lib/sdk/crt/math/…
==============================================================================
--- branches/cmake-bringup/lib/sdk/crt/math/i386/cos_asm.s [iso-8859-1] (original)
+++ branches/cmake-bringup/lib/sdk/crt/math/i386/cos_asm.s [iso-8859-1] Mon Nov 15
01:29:12 2010
@@ -34,7 +34,7 @@
  * SUCH DAMAGE.
  */
 
-#include <reactos/asm.h>
+#include <asm.inc>
 
 PUBLIC _cos
 

Modified: branches/cmake-bringup/lib/sdk/crt/math/i386/exp_asm.s
URL:
http://svn.reactos.org/svn/reactos/branches/cmake-bringup/lib/sdk/crt/math/…
==============================================================================
--- branches/cmake-bringup/lib/sdk/crt/math/i386/exp_asm.s [iso-8859-1] (original)
+++ branches/cmake-bringup/lib/sdk/crt/math/i386/exp_asm.s [iso-8859-1] Mon Nov 15
01:29:12 2010
@@ -1,5 +1,5 @@
 
-#include <reactos/asm.h>
+#include <asm.inc>
 
 PUBLIC _exp
  

Modified: branches/cmake-bringup/lib/sdk/crt/math/i386/fabs_asm.s
URL:
http://svn.reactos.org/svn/reactos/branches/cmake-bringup/lib/sdk/crt/math/…
==============================================================================
--- branches/cmake-bringup/lib/sdk/crt/math/i386/fabs_asm.s [iso-8859-1] (original)
+++ branches/cmake-bringup/lib/sdk/crt/math/i386/fabs_asm.s [iso-8859-1] Mon Nov 15
01:29:12 2010
@@ -34,7 +34,7 @@
  * SUCH DAMAGE.
  */
 
-#include <reactos/asm.h>
+#include <asm.inc>
 
 PUBLIC _fabs
  

Modified: branches/cmake-bringup/lib/sdk/crt/math/i386/floor_asm.s
URL:
http://svn.reactos.org/svn/reactos/branches/cmake-bringup/lib/sdk/crt/math/…
==============================================================================
--- branches/cmake-bringup/lib/sdk/crt/math/i386/floor_asm.s [iso-8859-1] (original)
+++ branches/cmake-bringup/lib/sdk/crt/math/i386/floor_asm.s [iso-8859-1] Mon Nov 15
01:29:12 2010
@@ -34,7 +34,7 @@
  * SUCH DAMAGE.
  */
 
-#include <reactos/asm.h>
+#include <asm.inc>
 
 PUBLIC _floor
  

Modified: branches/cmake-bringup/lib/sdk/crt/math/i386/floorf.S
URL:
http://svn.reactos.org/svn/reactos/branches/cmake-bringup/lib/sdk/crt/math/…
==============================================================================
--- branches/cmake-bringup/lib/sdk/crt/math/i386/floorf.S [iso-8859-1] (original)
+++ branches/cmake-bringup/lib/sdk/crt/math/i386/floorf.S [iso-8859-1] Mon Nov 15 01:29:12
2010
@@ -8,7 +8,7 @@
  *   Danny Smith &lt;dannysmith(a)users.sourceforge.net&gt;
  */
 
-#include <reactos/asm.h>
+#include <asm.inc>
 
 .code
 .align 4

Modified: branches/cmake-bringup/lib/sdk/crt/math/i386/fmod_asm.s
URL:
http://svn.reactos.org/svn/reactos/branches/cmake-bringup/lib/sdk/crt/math/…
==============================================================================
--- branches/cmake-bringup/lib/sdk/crt/math/i386/fmod_asm.s [iso-8859-1] (original)
+++ branches/cmake-bringup/lib/sdk/crt/math/i386/fmod_asm.s [iso-8859-1] Mon Nov 15
01:29:12 2010
@@ -1,5 +1,5 @@
 
-#include <reactos/asm.h>
+#include <asm.inc>
 
 PUBLIC _fmod
  

Modified: branches/cmake-bringup/lib/sdk/crt/math/i386/fmodf_asm.s
URL:
http://svn.reactos.org/svn/reactos/branches/cmake-bringup/lib/sdk/crt/math/…
==============================================================================
--- branches/cmake-bringup/lib/sdk/crt/math/i386/fmodf_asm.s [iso-8859-1] (original)
+++ branches/cmake-bringup/lib/sdk/crt/math/i386/fmodf_asm.s [iso-8859-1] Mon Nov 15
01:29:12 2010
@@ -1,5 +1,5 @@
 
-#include <reactos/asm.h>
+#include <asm.inc>
 
 PUBLIC _fmodf
  

Modified: branches/cmake-bringup/lib/sdk/crt/math/i386/ftol_asm.s
URL:
http://svn.reactos.org/svn/reactos/branches/cmake-bringup/lib/sdk/crt/math/…
==============================================================================
--- branches/cmake-bringup/lib/sdk/crt/math/i386/ftol_asm.s [iso-8859-1] (original)
+++ branches/cmake-bringup/lib/sdk/crt/math/i386/ftol_asm.s [iso-8859-1] Mon Nov 15
01:29:12 2010
@@ -34,7 +34,7 @@
  * SUCH DAMAGE.
  */
 
-#include <reactos/asm.h>
+#include <asm.inc>
 
 PUBLIC __ftol
  

Modified: branches/cmake-bringup/lib/sdk/crt/math/i386/log10_asm.s
URL:
http://svn.reactos.org/svn/reactos/branches/cmake-bringup/lib/sdk/crt/math/…
==============================================================================
--- branches/cmake-bringup/lib/sdk/crt/math/i386/log10_asm.s [iso-8859-1] (original)
+++ branches/cmake-bringup/lib/sdk/crt/math/i386/log10_asm.s [iso-8859-1] Mon Nov 15
01:29:12 2010
@@ -8,7 +8,7 @@
  *                    
  */
 
-#include <reactos/asm.h>
+#include <asm.inc>
 
 PUBLIC _log10
 

Modified: branches/cmake-bringup/lib/sdk/crt/math/i386/log_asm.s
URL:
http://svn.reactos.org/svn/reactos/branches/cmake-bringup/lib/sdk/crt/math/…
==============================================================================
--- branches/cmake-bringup/lib/sdk/crt/math/i386/log_asm.s [iso-8859-1] (original)
+++ branches/cmake-bringup/lib/sdk/crt/math/i386/log_asm.s [iso-8859-1] Mon Nov 15
01:29:12 2010
@@ -34,7 +34,7 @@
  * SUCH DAMAGE.
  */
 
-#include <reactos/asm.h>
+#include <asm.inc>
 
 PUBLIC _log
  

Modified: branches/cmake-bringup/lib/sdk/crt/math/i386/pow_asm.s
URL:
http://svn.reactos.org/svn/reactos/branches/cmake-bringup/lib/sdk/crt/math/…
==============================================================================
--- branches/cmake-bringup/lib/sdk/crt/math/i386/pow_asm.s [iso-8859-1] (original)
+++ branches/cmake-bringup/lib/sdk/crt/math/i386/pow_asm.s [iso-8859-1] Mon Nov 15
01:29:12 2010
@@ -20,7 +20,7 @@
    02111-1307 USA.  */
 
 /* Reactos modifications */
-#include <reactos/asm.h>
+#include <asm.inc>
 
 #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 @@
 #define MOX(op,x,f) op[x*f]
 #endif
 
-    .code
-	.text
+.code
 _pow:
 	fld qword ptr [esp + 12]	// y
 	fxam

Modified: branches/cmake-bringup/lib/sdk/crt/math/i386/sin_asm.s
URL:
http://svn.reactos.org/svn/reactos/branches/cmake-bringup/lib/sdk/crt/math/…
==============================================================================
--- branches/cmake-bringup/lib/sdk/crt/math/i386/sin_asm.s [iso-8859-1] (original)
+++ branches/cmake-bringup/lib/sdk/crt/math/i386/sin_asm.s [iso-8859-1] Mon Nov 15
01:29:12 2010
@@ -34,7 +34,7 @@
  * SUCH DAMAGE.
  */
 
-#include <reactos/asm.h>
+#include <asm.inc>
 
 PUBLIC _sin
 

Modified: branches/cmake-bringup/lib/sdk/crt/math/i386/sqrt_asm.s
URL:
http://svn.reactos.org/svn/reactos/branches/cmake-bringup/lib/sdk/crt/math/…
==============================================================================
--- branches/cmake-bringup/lib/sdk/crt/math/i386/sqrt_asm.s [iso-8859-1] (original)
+++ branches/cmake-bringup/lib/sdk/crt/math/i386/sqrt_asm.s [iso-8859-1] Mon Nov 15
01:29:12 2010
@@ -34,7 +34,7 @@
  * SUCH DAMAGE.
  */
 
-#include <reactos/asm.h>
+#include <asm.inc>
 
 PUBLIC _sqrt
  

Modified: branches/cmake-bringup/lib/sdk/crt/math/i386/tan_asm.s
URL:
http://svn.reactos.org/svn/reactos/branches/cmake-bringup/lib/sdk/crt/math/…
==============================================================================
--- branches/cmake-bringup/lib/sdk/crt/math/i386/tan_asm.s [iso-8859-1] (original)
+++ branches/cmake-bringup/lib/sdk/crt/math/i386/tan_asm.s [iso-8859-1] Mon Nov 15
01:29:12 2010
@@ -34,7 +34,7 @@
  * SUCH DAMAGE.
  */
 
-#include <reactos/asm.h>
+#include <asm.inc>
 
 PUBLIC _tan
  

Modified: branches/cmake-bringup/lib/sdk/crt/mem/i386/memchr_asm.s
URL:
http://svn.reactos.org/svn/reactos/branches/cmake-bringup/lib/sdk/crt/mem/i…
==============================================================================
--- branches/cmake-bringup/lib/sdk/crt/mem/i386/memchr_asm.s [iso-8859-1] (original)
+++ branches/cmake-bringup/lib/sdk/crt/mem/i386/memchr_asm.s [iso-8859-1] Mon Nov 15
01:29:12 2010
@@ -5,7 +5,8 @@
  * 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)

Modified: branches/cmake-bringup/lib/sdk/crt/mem/i386/memmove_asm.s
URL:
http://svn.reactos.org/svn/reactos/branches/cmake-bringup/lib/sdk/crt/mem/i…
==============================================================================
--- branches/cmake-bringup/lib/sdk/crt/mem/i386/memmove_asm.s [iso-8859-1] (original)
+++ branches/cmake-bringup/lib/sdk/crt/mem/i386/memmove_asm.s [iso-8859-1] Mon Nov 15
01:29:12 2010
@@ -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 <reactos/asm.h>
+#include <asm.inc>
+#include <ks386.inc>
 
 PUBLIC _memcpy
 PUBLIC _memmove

Modified: branches/cmake-bringup/lib/sdk/crt/mem/i386/memset_asm.s
URL:
http://svn.reactos.org/svn/reactos/branches/cmake-bringup/lib/sdk/crt/mem/i…
==============================================================================
--- branches/cmake-bringup/lib/sdk/crt/mem/i386/memset_asm.s [iso-8859-1] (original)
+++ branches/cmake-bringup/lib/sdk/crt/mem/i386/memset_asm.s [iso-8859-1] Mon Nov 15
01:29:12 2010
@@ -2,7 +2,8 @@
  * $Id$
  */
 
-#include <reactos/asm.h>
+#include <asm.inc>
+#include <ks386.inc>
 
 /*
  * void *memset (void *src, int val, size_t count)

Modified: branches/cmake-bringup/lib/sdk/crt/setjmp/amd64/setjmp.s
URL:
http://svn.reactos.org/svn/reactos/branches/cmake-bringup/lib/sdk/crt/setjm…
==============================================================================
--- branches/cmake-bringup/lib/sdk/crt/setjmp/amd64/setjmp.s [iso-8859-1] (original)
+++ branches/cmake-bringup/lib/sdk/crt/setjmp/amd64/setjmp.s [iso-8859-1] Mon Nov 15
01:29:12 2010
@@ -8,8 +8,8 @@
 
 /* INCLUDES ******************************************************************/
 
-#include <reactos/asm.h>
-#include <ndk/amd64/asm.h>
+#include <asm.inc>
+#include <ksamd64.inc>
 
 #define JUMP_BUFFER_Frame 0x00
 #define JUMP_BUFFER_Rbx   0x08
@@ -156,3 +156,5 @@
     inc rax
 2:  jmp r8
 .endp longjmp
+
+END

Modified: branches/cmake-bringup/lib/sdk/crt/setjmp/i386/setjmp.s
URL:
http://svn.reactos.org/svn/reactos/branches/cmake-bringup/lib/sdk/crt/setjm…
==============================================================================
--- branches/cmake-bringup/lib/sdk/crt/setjmp/i386/setjmp.s [iso-8859-1] (original)
+++ branches/cmake-bringup/lib/sdk/crt/setjmp/i386/setjmp.s [iso-8859-1] Mon Nov 15
01:29:12 2010
@@ -9,8 +9,7 @@
  *                    complete implementation
  */
 
-#include <reactos/asm.h>
-#include <ndk/asm.h>
+#include <asm.inc>
 
 #define JB_BP  0
 #define JB_BX  1

Modified: branches/cmake-bringup/lib/sdk/crt/string/i386/tcscat.inc
URL:
http://svn.reactos.org/svn/reactos/branches/cmake-bringup/lib/sdk/crt/strin…
==============================================================================
--- branches/cmake-bringup/lib/sdk/crt/string/i386/tcscat.inc [iso-8859-1] (original)
+++ branches/cmake-bringup/lib/sdk/crt/string/i386/tcscat.inc [iso-8859-1] Mon Nov 15
01:29:12 2010
@@ -2,7 +2,7 @@
  */
 
 #include "tchar.h"
-#include <reactos/asm.h>
+#include <asm.inc>
 
 PUBLIC _tcscat
 .code

Modified: branches/cmake-bringup/lib/sdk/crt/string/i386/tcschr.inc
URL:
http://svn.reactos.org/svn/reactos/branches/cmake-bringup/lib/sdk/crt/strin…
==============================================================================
--- branches/cmake-bringup/lib/sdk/crt/string/i386/tcschr.inc [iso-8859-1] (original)
+++ branches/cmake-bringup/lib/sdk/crt/string/i386/tcschr.inc [iso-8859-1] Mon Nov 15
01:29:12 2010
@@ -2,7 +2,7 @@
  */
 
 #include "tchar.h"
-#include <reactos/asm.h>
+#include <asm.inc>
 
 PUBLIC _tcschr
 .code

Modified: branches/cmake-bringup/lib/sdk/crt/string/i386/tcscmp.inc
URL:
http://svn.reactos.org/svn/reactos/branches/cmake-bringup/lib/sdk/crt/strin…
==============================================================================
--- branches/cmake-bringup/lib/sdk/crt/string/i386/tcscmp.inc [iso-8859-1] (original)
+++ branches/cmake-bringup/lib/sdk/crt/string/i386/tcscmp.inc [iso-8859-1] Mon Nov 15
01:29:12 2010
@@ -2,7 +2,7 @@
  */
 
 #include "tchar.h"
-#include <reactos/asm.h>
+#include <asm.inc>
 
 PUBLIC _tcscmp
 .code

Modified: branches/cmake-bringup/lib/sdk/crt/string/i386/tcscpy.inc
URL:
http://svn.reactos.org/svn/reactos/branches/cmake-bringup/lib/sdk/crt/strin…
==============================================================================
--- branches/cmake-bringup/lib/sdk/crt/string/i386/tcscpy.inc [iso-8859-1] (original)
+++ branches/cmake-bringup/lib/sdk/crt/string/i386/tcscpy.inc [iso-8859-1] Mon Nov 15
01:29:12 2010
@@ -2,7 +2,7 @@
  */
 
 #include "tchar.h"
-#include <reactos/asm.h>
+#include <asm.inc>
 
 PUBLIC _tcscpy
 .code

Modified: branches/cmake-bringup/lib/sdk/crt/string/i386/tcslen.inc
URL:
http://svn.reactos.org/svn/reactos/branches/cmake-bringup/lib/sdk/crt/strin…
==============================================================================
--- branches/cmake-bringup/lib/sdk/crt/string/i386/tcslen.inc [iso-8859-1] (original)
+++ branches/cmake-bringup/lib/sdk/crt/string/i386/tcslen.inc [iso-8859-1] Mon Nov 15
01:29:12 2010
@@ -2,7 +2,7 @@
 */
 
 #include "tchar.h"
-#include <reactos/asm.h>
+#include <asm.inc>
 
 PUBLIC _tcslen
 .code

Modified: branches/cmake-bringup/lib/sdk/crt/string/i386/tcsncat.inc
URL:
http://svn.reactos.org/svn/reactos/branches/cmake-bringup/lib/sdk/crt/strin…
==============================================================================
--- branches/cmake-bringup/lib/sdk/crt/string/i386/tcsncat.inc [iso-8859-1] (original)
+++ branches/cmake-bringup/lib/sdk/crt/string/i386/tcsncat.inc [iso-8859-1] Mon Nov 15
01:29:12 2010
@@ -2,7 +2,7 @@
  */
 
 #include "tchar.h"
-#include <reactos/asm.h>
+#include <asm.inc>
 
 PUBLIC _tcsncat
 .code

Modified: branches/cmake-bringup/lib/sdk/crt/string/i386/tcsncmp.inc
URL:
http://svn.reactos.org/svn/reactos/branches/cmake-bringup/lib/sdk/crt/strin…
==============================================================================
--- branches/cmake-bringup/lib/sdk/crt/string/i386/tcsncmp.inc [iso-8859-1] (original)
+++ branches/cmake-bringup/lib/sdk/crt/string/i386/tcsncmp.inc [iso-8859-1] Mon Nov 15
01:29:12 2010
@@ -2,7 +2,7 @@
  */
 
 #include "tchar.h"
-#include <reactos/asm.h>
+#include <asm.inc>
 
 PUBLIC _tcsncmp
 .code

Modified: branches/cmake-bringup/lib/sdk/crt/string/i386/tcsncpy.inc
URL:
http://svn.reactos.org/svn/reactos/branches/cmake-bringup/lib/sdk/crt/strin…
==============================================================================
--- branches/cmake-bringup/lib/sdk/crt/string/i386/tcsncpy.inc [iso-8859-1] (original)
+++ branches/cmake-bringup/lib/sdk/crt/string/i386/tcsncpy.inc [iso-8859-1] Mon Nov 15
01:29:12 2010
@@ -2,7 +2,7 @@
  */
 
 #include "tchar.h"
-#include <reactos/asm.h>
+#include <asm.inc>
 
 PUBLIC _tcsncpy
 .code

Modified: branches/cmake-bringup/lib/sdk/crt/string/i386/tcsnlen.inc
URL:
http://svn.reactos.org/svn/reactos/branches/cmake-bringup/lib/sdk/crt/strin…
==============================================================================
--- branches/cmake-bringup/lib/sdk/crt/string/i386/tcsnlen.inc [iso-8859-1] (original)
+++ branches/cmake-bringup/lib/sdk/crt/string/i386/tcsnlen.inc [iso-8859-1] Mon Nov 15
01:29:12 2010
@@ -2,7 +2,7 @@
 */
 
 #include "tchar.h"
-#include <reactos/asm.h>
+#include <asm.inc>
 
 PUBLIC _tcsnlen
 .code

Modified: branches/cmake-bringup/lib/sdk/crt/string/i386/tcsrchr.inc
URL:
http://svn.reactos.org/svn/reactos/branches/cmake-bringup/lib/sdk/crt/strin…
==============================================================================
--- branches/cmake-bringup/lib/sdk/crt/string/i386/tcsrchr.inc [iso-8859-1] (original)
+++ branches/cmake-bringup/lib/sdk/crt/string/i386/tcsrchr.inc [iso-8859-1] Mon Nov 15
01:29:12 2010
@@ -2,7 +2,7 @@
  */
 
 #include "tchar.h"
-#include <reactos/asm.h>
+#include <asm.inc>
 
 PUBLIC _tcsrchr
 .code