Changeset 8986 in vbox

Timestamp:

May 21, 2008 12:08:29 AM (17 years ago)

Author:

vboxsync

Message:

Changed the undefined opcode handling; the default now is to fail. --all-invalid got changed to --undef-op=all. --raw got changed to --undef-op=db (define byte).

Location:

trunk/src/VBox/Disassembler/testcase

Files:

• Makefile.kmk (modified) (3 diffs)
• tstDisasm-2.cpp (modified) (14 diffs)

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

@@ -34 +34 @@
         $(LIB_RUNTIME)
 
-# Tests that
+# Tests that will be build, disassembled and re-build from disassembly.
 VBOX_DISAS_TESTS_BUILD = \
         tstAsmLock-1.asm \
 
-# Tests that makes use of --all-invalid.
+# Tests that only contains invalid/undefined instructions.
 VBOX_DISAS_TESTS_INVALID = \
         tstAsmLock-2.asm \
@@ -120 +120 @@
         $(CMP) $(@:.tst=.bin) $<
         @$(APPEND) $@ "done"
+        @$(ECHO) "PASSED:  $(<F) [re-assembled]"
 
 
@@ -127 +128 @@
 
 $(addprefix $(VBOX_DISAS_TEST_PATH)/, $(VBOX_DISAS_TESTS_INVALID:.asm=-16.tst)): $$(patsubst %.tst,%.bin,$$@) $$(INSTARGET_tstDisasm-2) | $$(call DIRDEP,$$(@D))
-        @$(ECHO) "Verifying all-invalid: $(@F)"
+        @$(ECHO) "TESTING: $(@F) [--undef-op=all]"
         @$(RM) -f $@
-        $(INSTARGET_tstDisasm-2) --all-invalid --cpumode=16 $<
+        $(INSTARGET_tstDisasm-2) --undef-op=all --cpumode=16 $<
         @$(APPEND) $@ "done"
+        @$(ECHO) "PASSED:  $(@F) [--undef-op=all]"
 
 $(addprefix $(VBOX_DISAS_TEST_PATH)/, $(VBOX_DISAS_TESTS_INVALID:.asm=-32.tst)): $$(patsubst %.tst,%.bin,$$@) $$(INSTARGET_tstDisasm-2) | $$(call DIRDEP,$$(@D))
-        @$(ECHO) "Verifying all-invalid: $(@F)"
+        @$(ECHO) "TESTING: $(@F) [--undef-op=all]"
         @$(RM) -f $@
-        $(INSTARGET_tstDisasm-2) --all-invalid --cpumode=32 $<
+        $(INSTARGET_tstDisasm-2) --undef-op=all --cpumode=32 $<
         @$(APPEND) $@ "done"
+        @$(ECHO) "PASSED:  $(@F) [--undef-op=all]"
 
 $(addprefix $(VBOX_DISAS_TEST_PATH)/, $(VBOX_DISAS_TESTS_INVALID:.asm=-64.tst)): $$(patsubst %.tst,%.bin,$$@) $$(INSTARGET_tstDisasm-2) | $$(call DIRDEP,$$(@D))
-        @$(ECHO) "Verifying all-invalid: $(@F)"
+        @$(ECHO) "TESTING: $(@F) [--undef-op=all]"
         @$(RM) -f $@
-        $(INSTARGET_tstDisasm-2) --all-invalid --cpumode=64 $<
+        $(INSTARGET_tstDisasm-2) --undef-op=all --cpumode=64 $<
         @$(APPEND) $@ "done"
+        @$(ECHO) "PASSED:  $(@F) [--undef-op=all]"
 
 # Add the .tst to the clean up.

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

@@ -36 +36 @@
 *******************************************************************************/
 typedef enum { kAsmStyle_Default, kAsmStyle_yasm, kAsmStyle_masm, kAsmStyle_invalid } ASMSTYLE;
+typedef enum { kUndefOp_Fail, kUndefOp_All, kUndefOp_DefineByte, kUndefOp_End } UNDEFOPHANDLING;
 
 typedef struct MYDISSTATE
@@ -43 +44 @@
     uint8_t        *pbInstr;            /**< The current instruction (pointer). */
     uint32_t        cbInstr;            /**< The size of the current instruction. */
-    bool            fInvalid;           /**< Whether the instruction is invalid/illegal or not. */
-    bool            fRaw;               /**< Whether invalid instructions are printed as byte defintions or not. */
+    bool            fUndefOp;           /**< Whether the current instruction is really an undefined opcode.*/
+    UNDEFOPHANDLING enmUndefOp;         /**< How to treat undefined opcodes. */
     int             rc;                 /**< Set if we hit EOF. */
     size_t          cbLeft;             /**< The number of bytes left. (read) */
@@ -135 +136 @@
         /*
          * Jumping up the stream.
+         * This occures when the byte sequence is added to the output string.
          */
         uint64_t offReq64 = uSrcAddr - pState->uAddress;
@@ -210 +212 @@
  * @param   enmStyle    The assembly output style.
  * @param   fListing    Whether to print in a listing like mode.
- * @param   fRaw        Whether to output byte definitions for invalid sequences.
- * @param   fAllInvalid Whether all instructions are expected to be invalid.
+ * @param   enmUndefOp  How to deal with undefined opcodes.
  */
 static int MyDisasmBlock(const char *argv0, DISCPUMODE enmCpuMode, uint64_t uAddress, uint8_t *pbFile, size_t cbFile,
-                         ASMSTYLE enmStyle, bool fListing, bool fRaw, bool fAllInvalid)
+                         ASMSTYLE enmStyle, bool fListing, UNDEFOPHANDLING enmUndefOp)
 {
     /*
@@ -225 +226 @@
     State.pbInstr = pbFile;
     State.cbInstr = 0;
-    State.fInvalid = false;
-    State.fRaw = fRaw;
+    State.enmUndefOp = enmUndefOp;
     State.rc = VINF_SUCCESS;
     State.cbLeft = cbFile;
@@ -269 +269 @@
         if (RT_SUCCESS(rc))
         {
-            State.fInvalid = State.Cpu.pCurInstr->opcode == OP_INVALID
+            State.fUndefOp = State.Cpu.pCurInstr->opcode == OP_INVALID
                           || State.Cpu.pCurInstr->opcode == OP_ILLUD2;
-            if (!fAllInvalid || State.fInvalid)
-                pfnFormatter(&State);
-            else
+            if (!State.fUndefOp && State.enmUndefOp == kUndefOp_All)
             {
                 RTPrintf("%s: error at %#RX64: unexpected valid instruction (op=%d)\n", argv0, State.uAddress, State.Cpu.pCurInstr->opcode);
@@ -279 +277 @@
                 rcRet = VERR_GENERAL_FAILURE;
             }
+            else if (State.fUndefOp && State.enmUndefOp == kUndefOp_Fail)
+            {
+                RTPrintf("%s: error at %#RX64: undefined opcode (op=%d)\n", argv0, State.uAddress, State.Cpu.pCurInstr->opcode);
+                pfnFormatter(&State);
+                rcRet = VERR_GENERAL_FAILURE;
+            }
+            else
+                pfnFormatter(&State);
         }
         else
@@ -325 +331 @@
 "  --cpumode|-c <16|32|64>\n"
 "    The cpu mode. Default: 32\n"
-"  --all-invalid|-i\n"
-"    When specified all instructions are expected to be invalid.\n"
 "  --listing|-l, --no-listing|-L\n"
 "    Enables or disables listing mode. Default: --no-listing\n"
 "  --offset|-o <offset>\n"
 "    The file offset at which to start disassembling. Default: 0\n"
-"  --raw|-r, --no-raw|-R\n"
-"    Whether to employ byte defines for unknown bits. Default: --no-raw\n"
 "  --style|-s <default|yasm|masm>\n"
 "    The assembly output style. Default: default\n"
+"  --undef-op|-u <fail|all|db>\n"
+"    How to treat undefined opcodes. Default: fail\n"
              , argv0, argv0);
     return 1;
@@ -348 +352 @@
     uint64_t uAddress = 0;
     ASMSTYLE enmStyle = kAsmStyle_Default;
+    UNDEFOPHANDLING enmUndefOp = kUndefOp_Fail;
     bool fListing = true;
-    bool fRaw = false;
-    bool fAllInvalid = false;
     DISCPUMODE enmCpuMode = CPUMODE_32BIT;
     RTFOFF off = 0;
@@ -364 +367 @@
         { "--help",         'h', 0 },
         { "--bytes",        'b', RTGETOPT_REQ_INT64 },
-        { "--all-invalid",  'i', 0, },
         { "--listing",      'l', 0 },
         { "--no-listing",   'L', 0 },
         { "--offset",       'o', RTGETOPT_REQ_INT64 },
-        { "--raw",          'r', 0 },
-        { "--no-raw",       'R', 0 },
         { "--style",        's', RTGETOPT_REQ_STRING },
+        { "--undef-op",     'u', RTGETOPT_REQ_STRING },
     };
 
@@ -405 +406 @@
                 return Usage(argv0);
 
-            case 'i':
-                fAllInvalid = true;
-                break;
-
             case 'l':
                 fListing = true;
@@ -419 +416 @@
             case 'o':
                 off = ValueUnion.i;
-                break;
-
-            case 'r':
-                fRaw = true;
-                break;
-
-            case 'R':
-                fRaw = false;
                 break;
 
@@ -447 +436 @@
                 break;
 
+            case 'u':
+                if (!strcmp(ValueUnion.psz, "fail"))
+                    enmUndefOp = kUndefOp_Fail;
+                else if (!strcmp(ValueUnion.psz, "all"))
+                    enmUndefOp = kUndefOp_All;
+                else if (!strcmp(ValueUnion.psz, "db"))
+                    enmUndefOp = kUndefOp_DefineByte;
+                else
+                {
+                    RTStrmPrintf(g_pStdErr, "%s: unknown undefined opcode handling method: %s\n", argv0, ValueUnion.psz);
+                    return 1;
+                }
+                break;
+
             default:
                 RTStrmPrintf(g_pStdErr, "%s: syntax error: %Rrc\n", argv0, ch);
@@ -476 +479 @@
          * Disassemble it.
          */
-        rc = MyDisasmBlock(argv0, enmCpuMode, uAddress, (uint8_t *)pvFile, cbFile, enmStyle, fListing, fRaw, fAllInvalid);
+        rc = MyDisasmBlock(argv0, enmCpuMode, uAddress, (uint8_t *)pvFile, cbFile, enmStyle, fListing, enmUndefOp);
         if (RT_FAILURE(rc))
             break;