Changeset 41874 in vbox for trunk/src/VBox/Disassembler/testcase/tstDisasm-2.cpp

Timestamp:

Jun 22, 2012 12:14:56 AM (12 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.

File:

• trunk/src/VBox/Disassembler/testcase/tstDisasm-2.cpp (modified) (1 diff)

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 */