Changeset 92809 in vbox for trunk/src/VBox/Disassembler/testcase/tstDisasm-1.cpp

Timestamp:

Dec 8, 2021 10:50:51 AM (3 years ago)

Author:

vboxsync

Message:

Disasm: Better packing of DISOPCODE in DIS_CORE_ONLY mode. Build tstDisasm-1 in DIS_CORE_ONLY mode too.

File:

• trunk/src/VBox/Disassembler/testcase/tstDisasm-1.cpp (modified) (3 diffs)

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

@@ -42 +42 @@
     for (size_t off = 0; off < cbInstrs;)
     {
+        DISSTATE        Dis;
+        uint32_t        cb = 1;
+#ifndef DIS_CORE_ONLY
         uint32_t const  cErrBefore = RTTestIErrorCount();
-        uint32_t        cb = 1;
-        DISSTATE        Dis;
         char            szOutput[256] = {0};
         int rc = DISInstrToStr(&pabInstrs[off], enmDisCpuMode, &Dis, &cb, szOutput, sizeof(szOutput));
@@ -84 +85 @@
         RTTESTI_CHECK_MSG(cbOnly == cb, ("%#x vs %#x\n", cbOnly, cb));
 
+#else  /* DIS_CORE_ONLY */
+        int rc = DISInstr(&pabInstrs[off], enmDisCpuMode,  &Dis, &cb);
+        RTTESTI_CHECK_RC(rc, VINF_SUCCESS);
+        RTTESTI_CHECK(cb == Dis.cbInstr);
+#endif /* DIS_CORE_ONLY */
+
         off += cb;
     }
@@ -145 +152 @@
             RTTESTI_CHECK_MSG((cb2 = DISGetParamSize(&Dis, &Dis.Param1)) == s_gInstrs[i].cbParam1,
                               ("%u: %#x vs %#x\n", i , cb2, s_gInstrs[i].cbParam1));
+#ifndef DIS_CORE_ONLY
             RTTESTI_CHECK_MSG((cb2 = DISGetParamSize(&Dis, &Dis.Param2)) == s_gInstrs[i].cbParam2,
                               ("%u: %#x vs %#x (%s)\n", i , cb2, s_gInstrs[i].cbParam2, Dis.pCurInstr->pszOpcode));
+#else
+            RTTESTI_CHECK_MSG((cb2 = DISGetParamSize(&Dis, &Dis.Param2)) == s_gInstrs[i].cbParam2,
+                              ("%u: %#x vs %#x\n", i , cb2, s_gInstrs[i].cbParam2));
+#endif
             RTTESTI_CHECK_MSG((cb2 = DISGetParamSize(&Dis, &Dis.Param3)) == s_gInstrs[i].cbParam3,
                               ("%u: %#x vs %#x\n", i , cb2, s_gInstrs[i].cbParam3));