Changeset 1079 in vbox for trunk

Timestamp:

Feb 28, 2007 8:25:33 AM (18 years ago)

Author:

vboxsync

Message:

Corrected parameter parsing for LDS, LES, LFS, LGS and LSS instructions

Location:

trunk/src/VBox/Disassembler

Files:

• DisasmCore.cpp (modified) (1 diff)
• DisasmTables.cpp (modified) (2 diffs)

trunk/src/VBox/Disassembler/DisasmCore.cpp

@@ -2484 +2484 @@
 
     case OP_PARM_p:
-        if(pCpu->addrmode == CPUMODE_32BIT)
-        {
-            disasmAddString(pParam->szParam, "far ptr ");
-        }
-        else
-        {
-            disasmAddString(pParam->szParam, "near ptr ");
-        }
-        break;
-
+        disasmAddString(pParam->szParam, "far ptr ");
+        break;
 
     case OP_PARM_s:

trunk/src/VBox/Disassembler/DisasmTables.cpp

@@ -303 +303 @@
 
     /* C */
-    OP("Shift Grp2 %Eb,%Ib", IDX_ParseShiftGrp2, 0,          0,          OP_SHIFT_GRP2, OP_PARM_Eb,      OP_PARM_Ib,     OP_PARM_NONE,   OPTYPE_HARMLESS),
-    OP("Shift Grp2 %Ev,%Ib", IDX_ParseShiftGrp2, 0,          0,          OP_SHIFT_GRP2, OP_PARM_Ev,      OP_PARM_Ib,     OP_PARM_NONE,   OPTYPE_HARMLESS),
-    OP("retn %Iw",           IDX_ParseImmUshort, 0,          0,          OP_RETN,    OP_PARM_Iw,         OP_PARM_NONE,   OP_PARM_NONE,   OPTYPE_CONTROLFLOW | OPTYPE_UNCOND_CONTROLFLOW),
-    OP("retn",               0,              0,          0,          OP_RETN,    OP_PARM_NONE,       OP_PARM_NONE,   OP_PARM_NONE,   OPTYPE_CONTROLFLOW | OPTYPE_UNCOND_CONTROLFLOW),
-    OP("les %Gv,%Mp",        IDX_ParseModRM,     IDX_UseModRM,   0,          OP_LES,     OP_PARM_Gv,         OP_PARM_Mp,     OP_PARM_NONE,   OPTYPE_HARMLESS),
-    OP("lds %Gv,%Mp",        IDX_ParseModRM,     IDX_UseModRM,   0,          OP_LDS,     OP_PARM_Gv,         OP_PARM_Mp,     OP_PARM_NONE,   OPTYPE_HARMLESS | OPTYPE_RRM_DANGEROUS),
-    OP("mov %Eb,%Ib",        IDX_ParseModRM,     IDX_ParseImmByte,0,         OP_MOV,     OP_PARM_Eb,         OP_PARM_Ib,     OP_PARM_NONE,   OPTYPE_HARMLESS),
-    OP("mov %Ev,%Iv",        IDX_ParseModRM,     IDX_ParseImmV,  0,          OP_MOV,     OP_PARM_Ev,         OP_PARM_Iv,     OP_PARM_NONE,   OPTYPE_HARMLESS),
-    OP("enter %Iw,%Ib",      IDX_ParseImmUshort, IDX_ParseImmByte,0,         OP_ENTER,   OP_PARM_Iw,         OP_PARM_Ib,     OP_PARM_NONE,   OPTYPE_HARMLESS),
-    OP("leave",              0,              0,          0,          OP_LEAVE,   OP_PARM_NONE,       OP_PARM_NONE,   OP_PARM_NONE,   OPTYPE_HARMLESS),
-    OP("retf %Iw",           IDX_ParseImmUshort, 0,          0,          OP_RETF,    OP_PARM_Iw,         OP_PARM_NONE,   OP_PARM_NONE,   OPTYPE_CONTROLFLOW | OPTYPE_UNCOND_CONTROLFLOW),
-    OP("retf",               0,              0,          0,          OP_RETF,    OP_PARM_NONE,       OP_PARM_NONE,   OP_PARM_NONE,   OPTYPE_CONTROLFLOW | OPTYPE_UNCOND_CONTROLFLOW),
-    OP("int 3",              0,              0,          0,          OP_INT3,    OP_PARM_NONE,       OP_PARM_NONE,   OP_PARM_NONE,   OPTYPE_INTERRUPT),
-    OP("int %Ib",            IDX_ParseImmByte,   0,          0,          OP_INT,     OP_PARM_Ib,         OP_PARM_NONE,   OP_PARM_NONE,   OPTYPE_INTERRUPT),
-    OP("into",               0,              0,          0,          OP_INTO,    OP_PARM_NONE,       OP_PARM_NONE,   OP_PARM_NONE,   OPTYPE_INTERRUPT),
-    OP("iret",               0,              0,          0,          OP_IRET,    OP_PARM_NONE,       OP_PARM_NONE,   OP_PARM_NONE,   OPTYPE_CONTROLFLOW | OPTYPE_UNCOND_CONTROLFLOW),
+    OP("Shift Grp2 %Eb,%Ib", IDX_ParseShiftGrp2, 0,          0,             OP_SHIFT_GRP2, OP_PARM_Eb,      OP_PARM_Ib,     OP_PARM_NONE,   OPTYPE_HARMLESS),
+    OP("Shift Grp2 %Ev,%Ib", IDX_ParseShiftGrp2, 0,          0,             OP_SHIFT_GRP2, OP_PARM_Ev,      OP_PARM_Ib,     OP_PARM_NONE,   OPTYPE_HARMLESS),
+    OP("retn %Iw",           IDX_ParseImmUshort, 0,          0,             OP_RETN,     OP_PARM_Iw,         OP_PARM_NONE,   OP_PARM_NONE,   OPTYPE_CONTROLFLOW | OPTYPE_UNCOND_CONTROLFLOW),
+    OP("retn",               0,                  0,          0,             OP_RETN,     OP_PARM_NONE,       OP_PARM_NONE,   OP_PARM_NONE,   OPTYPE_CONTROLFLOW | OPTYPE_UNCOND_CONTROLFLOW),
+    OP("les %Gv,%Mp",        IDX_ParseModRM,     IDX_ParseImmAddr,          0,           OP_LES,     OP_PARM_Gv,         OP_PARM_Mp,     OP_PARM_NONE,   OPTYPE_HARMLESS),
+    OP("lds %Gv,%Mp",        IDX_ParseModRM,     IDX_ParseImmAddr,          0,           OP_LDS,     OP_PARM_Gv,         OP_PARM_Mp,     OP_PARM_NONE,   OPTYPE_HARMLESS | OPTYPE_RRM_DANGEROUS),
+    OP("mov %Eb,%Ib",        IDX_ParseModRM,     IDX_ParseImmByte,          0,           OP_MOV,     OP_PARM_Eb,         OP_PARM_Ib,     OP_PARM_NONE,   OPTYPE_HARMLESS),
+    OP("mov %Ev,%Iv",        IDX_ParseModRM,     IDX_ParseImmV,             0,           OP_MOV,     OP_PARM_Ev,         OP_PARM_Iv,     OP_PARM_NONE,   OPTYPE_HARMLESS),
+    OP("enter %Iw,%Ib",      IDX_ParseImmUshort, IDX_ParseImmByte,          0,           OP_ENTER,   OP_PARM_Iw,         OP_PARM_Ib,     OP_PARM_NONE,   OPTYPE_HARMLESS),
+    OP("leave",              0,                  0,                         0,           OP_LEAVE,   OP_PARM_NONE,       OP_PARM_NONE,   OP_PARM_NONE,   OPTYPE_HARMLESS),
+    OP("retf %Iw",           IDX_ParseImmUshort, 0,                         0,           OP_RETF,    OP_PARM_Iw,         OP_PARM_NONE,   OP_PARM_NONE,   OPTYPE_CONTROLFLOW | OPTYPE_UNCOND_CONTROLFLOW),
+    OP("retf",               0,                  0,                         0,           OP_RETF,    OP_PARM_NONE,       OP_PARM_NONE,   OP_PARM_NONE,   OPTYPE_CONTROLFLOW | OPTYPE_UNCOND_CONTROLFLOW),
+    OP("int 3",              0,                  0,                         0,           OP_INT3,    OP_PARM_NONE,       OP_PARM_NONE,   OP_PARM_NONE,   OPTYPE_INTERRUPT),
+    OP("int %Ib",            IDX_ParseImmByte,   0,                         0,           OP_INT,     OP_PARM_Ib,         OP_PARM_NONE,   OP_PARM_NONE,   OPTYPE_INTERRUPT),
+    OP("into",               0,                  0,                         0,           OP_INTO,    OP_PARM_NONE,       OP_PARM_NONE,   OP_PARM_NONE,   OPTYPE_INTERRUPT),
+    OP("iret",               0,                  0,                         0,           OP_IRET,    OP_PARM_NONE,       OP_PARM_NONE,   OP_PARM_NONE,   OPTYPE_CONTROLFLOW | OPTYPE_UNCOND_CONTROLFLOW),
 
 
@@ -591 +591 @@
     OP("cmpxchg %Eb,%Gb",    IDX_ParseModRM,     IDX_UseModRM,   0,          OP_CMPXCHG, OP_PARM_Eb,         OP_PARM_Gb,     OP_PARM_NONE,   OPTYPE_HARMLESS),
     OP("cmpxchg %Ev,%Gv",    IDX_ParseModRM,     IDX_UseModRM,   0,          OP_CMPXCHG, OP_PARM_Ev,         OP_PARM_Gv,     OP_PARM_NONE,   OPTYPE_HARMLESS),
-    OP("lss %Gv,%Mp",        IDX_ParseModRM,     IDX_UseModRM,   0,          OP_LSS,     OP_PARM_Gv,         OP_PARM_Mp,     OP_PARM_NONE,   OPTYPE_HARMLESS | OPTYPE_RRM_DANGEROUS),
+    OP("lss %Gv,%Mp",        IDX_ParseModRM,     IDX_ParseImmAddr,   0,          OP_LSS,     OP_PARM_Gv,         OP_PARM_Mp,     OP_PARM_NONE,   OPTYPE_HARMLESS | OPTYPE_RRM_DANGEROUS),
     OP("btr %Ev,%Gv",        IDX_ParseModRM,     IDX_UseModRM,   0,          OP_BTR,     OP_PARM_Ev,         OP_PARM_Gv,     OP_PARM_NONE,   OPTYPE_HARMLESS),
-    OP("lfs %Gv,%Mp",        IDX_ParseModRM,     IDX_UseModRM,   0,          OP_LFS,     OP_PARM_Gv,         OP_PARM_Mp,     OP_PARM_NONE,   OPTYPE_HARMLESS),
-    OP("lgs %Gv,%Mp",        IDX_ParseModRM,     IDX_UseModRM,   0,          OP_LGS,     OP_PARM_Gv,         OP_PARM_Mp,     OP_PARM_NONE,   OPTYPE_HARMLESS),
+    OP("lfs %Gv,%Mp",        IDX_ParseModRM,     IDX_ParseImmAddr,   0,          OP_LFS,     OP_PARM_Gv,         OP_PARM_Mp,     OP_PARM_NONE,   OPTYPE_HARMLESS),
+    OP("lgs %Gv,%Mp",        IDX_ParseModRM,     IDX_ParseImmAddr,   0,          OP_LGS,     OP_PARM_Gv,         OP_PARM_Mp,     OP_PARM_NONE,   OPTYPE_HARMLESS),
     OP("movzx %Gv,%Eb",      IDX_ParseModRM,     IDX_UseModRM,   0,          OP_MOVZX,   OP_PARM_Gv,         OP_PARM_Eb,     OP_PARM_NONE,   OPTYPE_HARMLESS),
     OP("movzx %Gv,%Ew",      IDX_ParseModRM,     IDX_UseModRM,   0,          OP_MOVZX,   OP_PARM_Gv,         OP_PARM_Ew,     OP_PARM_NONE,   OPTYPE_HARMLESS),