[NTDLL_APITEST]

Convert asm to GAS/ML compatible format

svn path=/trunk/; revision=50311

diff --git a/rostests/apitests/ntdll/i386/ZwContinue.S b/rostests/apitests/ntdll/i386/ZwContinue.S
new file mode 100644 (file)
index 0000000..7f18286
--- /dev/null
+++ b/rostests/apitests/ntdll/i386/ZwContinue.S
@@ -0,0 +1,54 @@
+
+#include <asm.inc>
+#include <ks386.inc>
+
+
+// cpu 486
+.text
+
+extern _check
+
+PUBLIC _continuePoint
+_continuePoint:
+ push ss
+ push 0
+ pushfd
+ push cs
+ push offset _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, 112
+
+ // Debug registers
+ sub esp, 24
+
+ push HEX(00010007)
+
+ // 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
+ cld
+ push esp
+ call _check
+
+ // check() must not return
+ int 3
+
+// EOF
+END

diff --git a/rostests/apitests/ntdll/i386/ZwContinue.asm b/rostests/apitests/ntdll/i386/ZwContinue.asm
deleted file mode 100644 (file)
index 829fd24..0000000
--- a/rostests/apitests/ntdll/i386/ZwContinue.asm
+++ /dev/null
@@ -1,48 +0,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

diff --git a/rostests/apitests/ntdll/ntdll_apitest.rbuild b/rostests/apitests/ntdll/ntdll_apitest.rbuild
index 2ed30fe..bde4c9e 100644 (file)
--- a/rostests/apitests/ntdll/ntdll_apitest.rbuild
+++ b/rostests/apitests/ntdll/ntdll_apitest.rbuild
@@ -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>