Changeset 92809 in vbox for trunk/src/VBox

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.

Location:

trunk/src/VBox/Disassembler

Files:

• DisasmInternal.h (modified) (2 diffs)
• testcase/Makefile.kmk (modified) (1 diff)
• testcase/tstDisasm-1.cpp (modified) (3 diffs)

trunk/src/VBox/Disassembler/DisasmInternal.h

@@ -82 +82 @@
   IDX_ParseMax
 };
+AssertCompile(IDX_ParseMax < 64 /* Packed DISOPCODE assumption. */);
 /** @}  */
 
@@ -194 +195 @@
  * @internal
  */
-#ifndef DIS_CORE_ONLY
+#if DISOPCODE_FORMAT == 0
 # define OP(pszOpcode, idxParse1, idxParse2, idxParse3, opcode, param1, param2, param3, optype) \
     { pszOpcode, idxParse1, idxParse2, idxParse3, 0, opcode, param1, param2, param3, 0, 0, optype }
 # define OPVEX(pszOpcode, idxParse1, idxParse2, idxParse3, idxParse4, opcode, param1, param2, param3, param4, optype) \
     { pszOpcode, idxParse1, idxParse2, idxParse3, idxParse4, opcode, param1, param2, param3, param4, 0, optype | DISOPTYPE_SSE }
-#elif defined(RT_ARCH_X86) || defined(RT_ARCH_AMD64)
+
+#elif DISOPCODE_FORMAT == 16
 # define OP(pszOpcode, idxParse1, idxParse2, idxParse3, opcode, param1, param2, param3, optype) \
-    { idxParse1, idxParse2, idxParse3, 0, opcode, param1, param2, param3, 0, optype }
+    { optype,                 opcode, idxParse1, idxParse2, param1, param2, idxParse3, param3, 0,      0         }
 # define OPVEX(pszOpcode, idxParse1, idxParse2, idxParse3, idxParse4, opcode, param1, param2, param3, param4, optype) \
-    { idxParse1, idxParse2, idxParse3, idxParse4, opcode, param1, param2, param3, param4, optype | DISOPTYPE_SSE}
+    { optype | DISOPTYPE_SSE, opcode, idxParse1, idxParse2, param1, param2, idxParse3, param3, param4, idxParse4 }
+
+#elif DISOPCODE_FORMAT == 15
+# define OP(pszOpcode, idxParse1, idxParse2, idxParse3, opcode, param1, param2, param3, optype) \
+    { opcode, idxParse1, idxParse2, idxParse3, param1, param2, param3, optype,                 0,      0         }
+# define OPVEX(pszOpcode, idxParse1, idxParse2, idxParse3, idxParse4, opcode, param1, param2, param3, param4, optype) \
+    { opcode, idxParse1, idxParse2, idxParse3, param1, param2, param3, optype | DISOPTYPE_SSE, param4, idxParse4 }
 #else
-# define OP(pszOpcode, idxParse1, idxParse2, idxParse3, opcode, param1, param2, param3, optype) \
-    { idxParse1, idxParse2, idxParse3, 0, opcode, param1, param2, param3, 0, 0, optype }
-# define OPVEX(pszOpcode, idxParse1, idxParse2, idxParse3, idxParse4, opcode, param1, param2, param3, param4, optype) \
-    { idxParse1, idxParse2, idxParse3, idxParse4, opcode, param1, param2, param3, param4, 0, optype | DISOPTYPE_SSE}
+# error Unsupported DISOPCODE_FORMAT value
 #endif
 

trunk/src/VBox/Disassembler/testcase/Makefile.kmk

@@ -30 +30 @@
 tstDisasm-1_LIBS        = \
         $(PATH_STAGE_LIB)/DisasmR3$(VBOX_SUFF_LIB) \
+        $(LIB_RUNTIME)
+
+PROGRAMS               += tstDisasmCore-1
+tstDisasmCore-1_EXTENDS = tstDisasm-1
+tstDisasmCore-1_DEFS    = IN_DIS DIS_CORE_ONLY
+tstDisasmCore-1_LIBS    = \
+        $(PATH_STAGE_LIB)/DisasmCoreR3$(VBOX_SUFF_LIB) \
         $(LIB_RUNTIME)
 endif

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));