Changeset 41874 in vbox for trunk/src/VBox

Timestamp:

Jun 22, 2012 12:14:56 AM (13 years ago)

Author:

vboxsync

Message:

DIS: Fixed two bugs in the size-only parsers that was introduced when changing the return from size to offset late in the refactoring. Added tests to make sure this doesn't break again so easily.

Location:

trunk/src/VBox/Disassembler

Files:

• DisasmCore.cpp (modified) (3 diffs)
• testcase/tstDisasm-1.cpp (modified) (1 diff)
• testcase/tstDisasm-1A.asm (modified) (1 diff)
• testcase/tstDisasm-2.cpp (modified) (1 diff)

trunk/src/VBox/Disassembler/DisasmCore.cpp

@@ -910 +910 @@
 
 
-static size_t UseModRM(size_t offInstr, PCDISOPCODE pOp, PDISSTATE pDis, PDISOPPARAM pParam)
+static size_t UseModRM(size_t const offInstr, PCDISOPCODE pOp, PDISSTATE pDis, PDISOPPARAM pParam)
 {
     unsigned vtype = OP_PARM_VTYPE(pParam->fParam);
@@ -1310 +1310 @@
     }
 
-    offInstr += QueryModRM_SizeOnly(offInstr, pOp, pDis, pParam);
+    offInstr = QueryModRM_SizeOnly(offInstr, pOp, pDis, pParam);
 
     /* UseModRM is not necessary here; we're only interested in the opcode size */
@@ -1497 +1497 @@
     /* Word for 16-bit operand-size or doubleword for 32 or 64-bit operand-size. */
     if (pDis->uOpMode == DISCPUMODE_16BIT)
-        return sizeof(uint16_t);
+        return offInstr + 2;
     return offInstr + 4;
 }

trunk/src/VBox/Disassembler/testcase/tstDisasm-1.cpp

@@ -72 +72 @@
                                   rc, off, Dis.cbInstr, enmDisCpuMode);
         RTTestIPrintf(RTTESTLVL_ALWAYS, "%s\n", szOutput);
+
+        /* Check with size-only. */
+        uint32_t        cbOnly = 1;
+        DISSTATE        DisOnly;
+        rc = DISInstWithPrefetchedBytes((uintptr_t)&pabInstrs[off], enmDisCpuMode,  0 /*fFilter - none */,
+                                        Dis.abInstr, Dis.cbCachedInstr, NULL, NULL, &DisOnly, &cbOnly);
+
+        RTTESTI_CHECK_RC(rc, VINF_SUCCESS);
+        RTTESTI_CHECK(cbOnly == DisOnly.cbInstr);
+        RTTESTI_CHECK_MSG(cbOnly == cb, ("%#x vs %#x\n", cbOnly, cb));
+
         off += cb;
     }

trunk/src/VBox/Disassembler/testcase/tstDisasm-1A.asm

@@ -137 +137 @@
         pswapd      mm2, qword [es:esi*8]
 
-        pmulhrwa mm0, qword [ds:ebp+edi*8+00f000001h]
-
+        pmulhrwa    mm0, qword [ds:ebp+edi*8+00f000001h]
 
         ; MMX

trunk/src/VBox/Disassembler/testcase/tstDisasm-2.cpp

@@ -357 +357 @@
         if (uHighlightAddr - State.uAddress < State.cbInstr)
             RTPrintf("; ^^^^^^^^^^^^^^^^^^^^^\n");
+
+        /* Check that the size-only mode returns the smae size on success. */
+        if (RT_SUCCESS(rc))
+        {
+            uint32_t cbInstrOnly = 32;
+            uint8_t  abInstr[sizeof(State.Dis.abInstr)];
+            memcpy(abInstr, State.Dis.abInstr, sizeof(State.Dis.abInstr));
+            int rcOnly = DISInstWithPrefetchedBytes(State.uAddress, enmCpuMode, 0 /*fFilter - none */,
+                                                    abInstr, State.Dis.cbCachedInstr, MyDisasInstrRead, &State,
+                                                    &State.Dis, &cbInstrOnly);
+            if (   rcOnly != rc
+                || cbInstrOnly != State.cbInstr)
+            {
+                RTPrintf("; Instruction size only check failed rc=%Rrc cbInstrOnly=%#x exepcted %Rrc and %#x\n",
+                         rcOnly, cbInstrOnly, rc, State.cbInstr);
+                rcRet = VERR_GENERAL_FAILURE;
+                break;
+            }
+        }
 
         /* next */