Merge pull request #196 from serpilliere/fix_pushw

Fix pushw

3 files changed, 121 insertions, 6 deletions

diff --git a/test/arch/x86/arch.py b/test/arch/x86/arch.py
index 9d4e464d..93b651c0 100644
--- a/test/arch/x86/arch.py
+++ b/test/arch/x86/arch.py
@@ -1075,14 +1075,20 @@ reg_tests = [
     # "f390"),
 
 
-    (m16, "00000000    POP        WORD PTR [BX+SI]",
+    (m16, "00000000    POPW       WORD PTR [BX+SI]",
      "8f00"),
+    (m32, "00000000    POPW       WORD PTR [BX+SI]",
+     "66678f00"),
     (m32, "00000000    POP        DWORD PTR [EAX]",
      "8f00"),
     (m64, "00000000    POP        QWORD PTR [RAX]",
      "8f00"),
 
 
+    (m16, "00000000    POPW       AX",
+     "8fC0"),
+    (m32, "00000000    POPW       AX",
+     "668fC0"),
     (m32, "00000000    POP        EAX",
      "8fC0"),
     (m64, "00000000    POP        RAX",
@@ -1106,6 +1112,28 @@ reg_tests = [
     (m32, "00000000    POP        GS",
      "0fa9"),
 
+    (m16, "00000000    POPW       DS",
+     "1f"),
+    (m16, "00000000    POPW       ES",
+     "07"),
+    (m16, "00000000    POPW       SS",
+     "17"),
+    (m16, "00000000    POPW       FS",
+     "0fa1"),
+    (m16, "00000000    POPW       GS",
+     "0fa9"),
+
+    (m32, "00000000    POPW       DS",
+     "661f"),
+    (m32, "00000000    POPW       ES",
+     "6607"),
+    (m32, "00000000    POPW       SS",
+     "6617"),
+    (m32, "00000000    POPW       FS",
+     "660fa1"),
+    (m32, "00000000    POPW       GS",
+     "660fa9"),
+
     (m16, "00000000    POPA",
      "61"),
     (m32, "00000000    POPAD",
@@ -1130,7 +1158,7 @@ reg_tests = [
      "0f1800"),
 
 
-    (m16, "00000000    PUSH       AX",
+    (m16, "00000000    PUSHW      AX",
      "50"),
     (m32, "00000000    PUSH       EAX",
      "50"),
@@ -1138,9 +1166,9 @@ reg_tests = [
      "50"),
     (m64, "00000000    PUSH       R10",
      "4152"),
-    (m16, "00000000    PUSH       WORD PTR [BX+SI]",
+    (m16, "00000000    PUSHW      WORD PTR [BX+SI]",
      "FF30"),
-    (m16, "00000000    PUSH       WORD PTR [EAX]",
+    (m16, "00000000    PUSHW      WORD PTR [EAX]",
      "67FF30"),
     (m16, "00000000    PUSH       DWORD PTR [EAX]",
      "6667FF30"),
@@ -1149,11 +1177,11 @@ reg_tests = [
     (m64, "00000000    PUSH       QWORD PTR [RAX]",
      "FF30"),
 
-    (m16, "00000000    PUSH       0x11",
+    (m16, "00000000    PUSHW      0x11",
      "6a11"),
     (m32, "00000000    PUSH       0x11223344",
      "6844332211"),
-    (m32, "00000000    PUSH       0x1122",
+    (m32, "00000000    PUSHW      0x1122",
      "66682211"),
     (m32, "00000000    PUSH       0x80",
      "6880000000"),
@@ -1177,6 +1205,32 @@ reg_tests = [
     (m32, "00000000    PUSH       GS",
      "0fa8"),
 
+    (m32, "00000000    PUSHW      CS",
+     "660e"),
+    (m32, "00000000    PUSHW      SS",
+     "6616"),
+    (m32, "00000000    PUSHW      DS",
+     "661E"),
+    (m32, "00000000    PUSHW      ES",
+     "6606"),
+    (m32, "00000000    PUSHW      FS",
+     "660fa0"),
+    (m32, "00000000    PUSHW      GS",
+     "660fa8"),
+
+    (m16, "00000000    PUSHW      CS",
+     "0e"),
+    (m16, "00000000    PUSHW      SS",
+     "16"),
+    (m16, "00000000    PUSHW      DS",
+     "1E"),
+    (m16, "00000000    PUSHW      ES",
+     "06"),
+    (m16, "00000000    PUSHW      FS",
+     "0fa0"),
+    (m16, "00000000    PUSHW      GS",
+     "0fa8"),
+
     (m16, "00000000    PUSHA",
      "60"),
     (m32, "00000000    PUSHAD",
diff --git a/test/arch/x86/unit/mn_stack.py b/test/arch/x86/unit/mn_stack.py
new file mode 100644
index 00000000..dd349d54
--- /dev/null
+++ b/test/arch/x86/unit/mn_stack.py
@@ -0,0 +1,60 @@
+#! /usr/bin/env python
+from asm_test import Asm_Test
+
+
+class Test_PUSHPOP(Asm_Test):
+    TXT = '''
+    main:
+       MOV     EBP, ESP
+       PUSH    0x11223344
+       POP     EAX
+       CMP     EBP, ESP
+       JNZ     BAD
+
+       PUSHW   0x1122
+       POPW    AX
+       CMP     EBP, ESP
+       JNZ     BAD
+
+       PUSH    SS
+       POP     EAX
+       CMP     EBP, ESP
+       JNZ     BAD
+
+       PUSHW   SS
+       POPW    AX
+       CMP     EBP, ESP
+       JNZ     BAD
+
+       PUSHFD
+       POP     EAX
+       CMP     EBP, ESP
+       JNZ     BAD
+
+       PUSHFW
+       POPW    AX
+       CMP     EBP, ESP
+       JNZ     BAD
+
+       PUSH    EAX
+       POPFD
+       CMP     EBP, ESP
+       JNZ     BAD
+
+       PUSHW   AX
+       POPFW
+       CMP     EBP, ESP
+       JNZ     BAD
+
+       RET
+
+BAD:
+       INT     0x3
+       RET
+    '''
+    def check(self):
+        assert(self.myjit.cpu.ESP-4 == self.myjit.cpu.EBP)
+
+
+if __name__ == "__main__":
+    [test()() for test in [Test_PUSHPOP]]
diff --git a/test/test_all.py b/test/test_all.py
index 895dbdac..f59e3781 100644
--- a/test/test_all.py
+++ b/test/test_all.py
@@ -35,6 +35,7 @@ testset += RegressionTest(["x86/arch.py"], base_dir="arch",
 for script in ["x86/sem.py",
                "x86/unit/mn_strings.py",
                "x86/unit/mn_float.py",
+               "x86/unit/mn_stack.py",
                "arm/arch.py",
                "arm/sem.py",
                "msp430/arch.py",