[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/i386/chkstk_asm.s

@@ -7,8 +7,9 @@
  * PROGRAMER:         KJK::Hyperion <noog@libero.it>
  */
 
-#include <reactos/asm.h>
-#include <ndk/asm.h>
+#include <asm.inc>
+#include <ks386.inc>
+
 #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:
 

lib/sdk/crt/except/i386/prolog.s

@@ -8,20 +8,23 @@
 
 /* INCLUDES ******************************************************************/
 
-#include <ndk/asm.h>
+#include <asm.inc>
+#include <ks386.inc>
 
-/* 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

lib/sdk/crt/except/i386/seh.s

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