[tkreuzer] 49648: [KERNEL32] Switch to new asm syntax Add dependency to asm

Author: tkreuzer
Date: Fri Nov 19 23:40:01 2010
New Revision: 49648

URL: http://svn.reactos.org/svn/reactos?rev=49648&view=rev
Log:
[KERNEL32]
Switch to new asm syntax
Add dependency to asm

Modified:
    branches/cmake-bringup/dll/win32/kernel32/CMakeLists.txt
    branches/cmake-bringup/dll/win32/kernel32/thread/amd64/fiber.S
    branches/cmake-bringup/dll/win32/kernel32/thread/amd64/thread.S
    branches/cmake-bringup/dll/win32/kernel32/thread/i386/fiber.S
    branches/cmake-bringup/dll/win32/kernel32/thread/i386/thread.S

Modified: branches/cmake-bringup/dll/win32/kernel32/CMakeLists.txt
URL:
http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/kernel3…
==============================================================================
--- branches/cmake-bringup/dll/win32/kernel32/CMakeLists.txt [iso-8859-1] (original)
+++ branches/cmake-bringup/dll/win32/kernel32/CMakeLists.txt [iso-8859-1] Fri Nov 19
23:40:01 2010
@@ -119,6 +119,6 @@
 
 add_importlibs(kernel32 ntdll)
 add_pch(kernel32 ${CMAKE_CURRENT_SOURCE_DIR}/k32.h ${SOURCE})
-add_dependencies(kernel32 errcodes)
+add_dependencies(kernel32 errcodes asm)
 add_cab_target(kernel32 1)
 add_importlib_target(kernel32.spec)

Modified: branches/cmake-bringup/dll/win32/kernel32/thread/amd64/fiber.S
URL:
http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/kernel3…
==============================================================================
--- branches/cmake-bringup/dll/win32/kernel32/thread/amd64/fiber.S [iso-8859-1]
(original)
+++ branches/cmake-bringup/dll/win32/kernel32/thread/amd64/fiber.S [iso-8859-1] Fri Nov 19
23:40:01 2010
@@ -7,11 +7,13 @@
  *              KJK::Hyperion <noog(a)libero.it>
  */
 
-#include <ndk/asm.h>
+#include <asm.inc>
 
-.globl SwitchToFiber
-.intel_syntax noprefix
+
+PUBLIC SwitchToFiber
 
 SwitchToFiber:
     /* FIXME: TODO */
     ret 4
+
+END

Modified: branches/cmake-bringup/dll/win32/kernel32/thread/amd64/thread.S
URL:
http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/kernel3…
==============================================================================
--- branches/cmake-bringup/dll/win32/kernel32/thread/amd64/thread.S [iso-8859-1]
(original)
+++ branches/cmake-bringup/dll/win32/kernel32/thread/amd64/thread.S [iso-8859-1] Fri Nov
19 23:40:01 2010
@@ -6,9 +6,11 @@
  * PROGRAMMER: Alex Ionescu (alex(a)relsoft.net)
  */
 
-.globl BaseThreadStartupThunk
-.globl BaseProcessStartThunk
-.intel_syntax noprefix
+#include <asm.inc>
+
+
+PUBLIC BaseThreadStartupThunk
+PUBLIC BaseProcessStartThunk
 
 BaseThreadStartupThunk:
     
@@ -29,4 +31,5 @@
     push 0                    /* Return RIP */
     jmp BaseProcessStartup
 
+END
 /* EOF */

Modified: branches/cmake-bringup/dll/win32/kernel32/thread/i386/fiber.S
URL:
http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/kernel3…
==============================================================================
--- branches/cmake-bringup/dll/win32/kernel32/thread/i386/fiber.S [iso-8859-1] (original)
+++ branches/cmake-bringup/dll/win32/kernel32/thread/i386/fiber.S [iso-8859-1] Fri Nov 19
23:40:01 2010
@@ -7,11 +7,12 @@
  *              KJK::Hyperion &lt;noog(a)libero.it&gt;
  */
 
-#include <ndk/asm.h>
+#include <asm.inc>
+#include <ks386.inc>
 
-.globl _SwitchToFiber@4
-.intel_syntax noprefix
+.code
 
+PUBLIC _SwitchToFiber@4
 _SwitchToFiber@4:
     /* Get the TEB */
     mov edx, fs:[TEB_SELF]
@@ -30,7 +31,7 @@
     mov [eax+FIBER_CONTEXT_EIP], ebx
 
     /* Check if we're to save FPU State */
-    cmp dword ptr [eax+FIBER_CONTEXT_FLAGS], CONTEXT_FULL | CONTEXT_FLOATING_POINT
+    cmp dword ptr [eax+FIBER_CONTEXT_FLAGS], CONTEXT_FULL OR CONTEXT_FLOATING_POINT
     jnz NoFpuStateSave
     
     /* Save the FPU State (Status and Control)*/
@@ -80,7 +81,7 @@
     mov [edx+TEB_ACTIVATION_CONTEXT_STACK_POINTER], esi
     
     /* Restore FPU State */
-    cmp dword ptr [eax+FIBER_CONTEXT_FLAGS], CONTEXT_FULL | CONTEXT_FLOATING_POINT
+    cmp dword ptr [eax+FIBER_CONTEXT_FLAGS], CONTEXT_FULL OR CONTEXT_FLOATING_POINT
     jnz NoFpuStateRestore
     
     /* Check if the Status Word Changed */
@@ -96,7 +97,7 @@
 StatusWordChanged:
 
     /* Load the new one */
-    mov word ptr [ecx+FIBER_CONTEXT_FLOAT_SAVE_TAG_WORD], 0xFFFF
+    mov word ptr [ecx+FIBER_CONTEXT_FLOAT_SAVE_TAG_WORD], HEX(0FFFF)
     fldenv [ecx+FIBER_CONTEXT_FLOAT_SAVE_CONTROL_WORD]
     
 ControlWordEqual:
@@ -120,6 +121,7 @@
     mov [edx+TEB_FLS_DATA], eax
 
     /* Jump to new fiber */
-    jmp [ecx+FIBER_CONTEXT_EIP]
+    jmp dword ptr [ecx+FIBER_CONTEXT_EIP]
 
+END
 /* EOF */

Modified: branches/cmake-bringup/dll/win32/kernel32/thread/i386/thread.S
URL:
http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/kernel3…
==============================================================================
--- branches/cmake-bringup/dll/win32/kernel32/thread/i386/thread.S [iso-8859-1]
(original)
+++ branches/cmake-bringup/dll/win32/kernel32/thread/i386/thread.S [iso-8859-1] Fri Nov 19
23:40:01 2010
@@ -6,9 +6,15 @@
  * PROGRAMMER: Alex Ionescu (alex(a)relsoft.net)
  */
 
-.globl _BaseThreadStartupThunk@0
-.globl _BaseProcessStartThunk@0
-.intel_syntax noprefix
+#include <asm.inc>
+
+.code
+
+EXTERN _BaseThreadStartup@8:PROC
+EXTERN _BaseProcessStartup@4:PROC
+
+PUBLIC _BaseThreadStartupThunk@0
+PUBLIC _BaseProcessStartThunk@0
 
 _BaseThreadStartupThunk@0:
     
@@ -29,4 +35,5 @@
     push 0                    /* Return EIP */
     jmp _BaseProcessStartup@4
 
+END
 /* EOF */