[ros-diffs] [tkreuzer] 50311: [NTDLL_APITEST] Convert asm to GAS/ML compatible format

Author: tkreuzer
Date: Fri Jan  7 20:11:56 2011
New Revision: 50311

URL: http://svn.reactos.org/svn/reactos?rev=50311&view=rev
Log:
[NTDLL_APITEST]
Convert asm to GAS/ML compatible format

Added:
    trunk/rostests/apitests/ntdll/i386/ZwContinue.S
      - copied, changed from r50248, trunk/rostests/apitests/ntdll/i386/ZwContinue.asm
Removed:
    trunk/rostests/apitests/ntdll/i386/ZwContinue.asm
Modified:
    trunk/rostests/apitests/ntdll/ntdll_apitest.rbuild

Copied: trunk/rostests/apitests/ntdll/i386/ZwContinue.S (from r50248,
trunk/rostests/apitests/ntdll/i386/ZwContinue.asm)
URL:
http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/ntdll/i386/ZwCon…
==============================================================================
--- trunk/rostests/apitests/ntdll/i386/ZwContinue.asm [iso-8859-1] (original)
+++ trunk/rostests/apitests/ntdll/i386/ZwContinue.S [iso-8859-1] Fri Jan  7 20:11:56 2011
@@ -1,15 +1,20 @@
-; cpu 486
-segment .text use32
+
+#include <asm.inc>
+#include <ks386.inc>
+
+
+// cpu 486
+.text
 
 extern _check
 
-global _continuePoint
+PUBLIC _continuePoint
 _continuePoint:
  push ss
- push dword 0
+ push 0
  pushfd
  push cs
- push dword _continuePoint
+ push offset _continuePoint
  push ebp
 
  push eax
@@ -24,25 +29,26 @@
  push fs
  push gs
 
- ; TODO: floating point state
- sub esp, 70h
+ // TODO: floating point state
+ sub esp, 112
 
- ; Debug registers
- sub esp, 18h
+ // Debug registers
+ sub esp, 24
 
- push dword 00010007h
+ push HEX(00010007)
 
- ; Fill the Esp field
- lea eax, [esp+0CCh]
- lea ecx, [esp+0C4h]
+ // Fill the Esp field
+ lea eax, [esp + HEX(0CC)]
+ lea ecx, [esp + HEX(0C4)]
  mov [ecx], eax
 
- ; Call the function that will compare the current context with the expected one
+ // Call the function that will compare the current context with the expected one
  cld
  push esp
  call _check
 
- ; check() must not return
+ // check() must not return
  int 3
 
-; EOF
+// EOF
+END

Removed: trunk/rostests/apitests/ntdll/i386/ZwContinue.asm
URL:
http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/ntdll/i386/ZwCon…
==============================================================================
--- trunk/rostests/apitests/ntdll/i386/ZwContinue.asm [iso-8859-1] (original)
+++ trunk/rostests/apitests/ntdll/i386/ZwContinue.asm (removed)
@@ -1,48 +1,0 @@
-; cpu 486
-segment .text use32
-
-extern _check
-
-global _continuePoint
-_continuePoint:
- push ss
- push dword 0
- pushfd
- push cs
- push dword _continuePoint
- push ebp
-
- push eax
- push ecx
- push edx
- push ebx
- push esi
- push edi
-
- push ds
- push es
- push fs
- push gs
-
- ; TODO: floating point state
- sub esp, 70h
-
- ; Debug registers
- sub esp, 18h
-
- push dword 00010007h
-
- ; Fill the Esp field
- lea eax, [esp+0CCh]
- lea ecx, [esp+0C4h]
- mov [ecx], eax
-
- ; Call the function that will compare the current context with the expected one
- cld
- push esp
- call _check
-
- ; check() must not return
- int 3
-
-; EOF

Modified: trunk/rostests/apitests/ntdll/ntdll_apitest.rbuild
URL:
http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/ntdll/ntdll_apit…
==============================================================================
--- trunk/rostests/apitests/ntdll/ntdll_apitest.rbuild [iso-8859-1] (original)
+++ trunk/rostests/apitests/ntdll/ntdll_apitest.rbuild [iso-8859-1] Fri Jan  7 20:11:56
2011
@@ -12,7 +12,7 @@
 	<file>ZwContinue.c</file>
 	<if property="ARCH" value="i386">
 		<directory name="i386">
-			<file>ZwContinue.asm</file>
+			<file>ZwContinue.S</file>
 		</directory>
 	</if>
 </module>