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

Timestamp:

May 20, 2008 12:52:26 AM (17 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

31001

Message:

Wrote up the makefile bits or the dissassembler test 'framework' and hacked together a yasmification of the DIS output sufficient to make the current tests work.

File:

• trunk/src/VBox/Disassembler/testcase/tstDisasm-2.cpp (modified) (10 diffs)

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

@@ -72 +72 @@
 static void MyDisasYasmFormatter(PMYDISSTATE pState)
 {
-    RTPrintf("yasm not implemented: %s", pState->szLine);
+    /* a very quick hack. */
+    char szTmp[256];
+    strcpy(szTmp, RTStrStripL(strchr(pState->szLine, ':') + 1));
+
+    char *psz = strrchr(szTmp, '[');
+    *psz = '\0';
+    RTStrStripR(szTmp);
+
+    psz = strstr(szTmp, " ptr ");
+    if (psz)
+        memset(psz, ' ', 5);
+
+    char *pszEnd = strchr(szTmp, '\0');
+    while (pszEnd - &szTmp[0] < 71)
+        *pszEnd++ = ' ';
+    *pszEnd = '\0';
+
+    RTPrintf("    %s ; %s", szTmp, pState->szLine);
 }
 
@@ -223 +240 @@
 
         case kAsmStyle_yasm:
+            RTPrintf("    BITS %d\n", enmCpuMode == CPUMODE_16BIT ? 16 : enmCpuMode == CPUMODE_32BIT ? 32 : 64);
             pfnFormatter = MyDisasYasmFormatter;
             break;
@@ -257 +275 @@
             else
             {
-                RTPrintf("%s: error at %#RX64: unexpected valid instruction\n", argv0, State.uAddress);
+                RTPrintf("%s: error at %#RX64: unexpected valid instruction (op=%d)\n", argv0, State.uAddress, State.Cpu.pCurInstr->opcode);
                 pfnFormatter(&State);
                 rcRet = VERR_GENERAL_FAILURE;
@@ -325 +343 @@
 {
     RTR3Init();
+    const char * const argv0 = RTPathFilename(argv[0]);
 
     /* options */
@@ -378 +397 @@
                 else
                 {
-                    RTStrmPrintf(g_pStdErr, "%s: Invalid CPU mode value %RU32\n", argv[0], ValueUnion.u32);
+                    RTStrmPrintf(g_pStdErr, "%s: Invalid CPU mode value %RU32\n", argv0, ValueUnion.u32);
                     return 1;
                 }
@@ -384 +403 @@
 
             case 'h':
-                return Usage(argv[0]);
+                return Usage(argv0);
 
             case 'i':
@@ -418 +437 @@
                 {
                     enmStyle = kAsmStyle_masm;
-                    RTStrmPrintf(g_pStdErr, "%s: masm style isn't implemented yet\n", argv[0]);
+                    RTStrmPrintf(g_pStdErr, "%s: masm style isn't implemented yet\n", argv0);
                     return 1;
                 }
                 else
                 {
-                    RTStrmPrintf(g_pStdErr, "%s: unknown assembly style: %s\n", argv[0], ValueUnion.psz);
+                    RTStrmPrintf(g_pStdErr, "%s: unknown assembly style: %s\n", argv0, ValueUnion.psz);
                     return 1;
                 }
@@ -429 +448 @@
 
             default:
-                RTStrmPrintf(g_pStdErr, "%s: syntax error: %Rrc\n", argv[0], ch);
+                RTStrmPrintf(g_pStdErr, "%s: syntax error: %Rrc\n", argv0, ch);
                 return 1;
         }
     }
     if (iArg >= argc)
-        return Usage(argv[0]);
+        return Usage(argv0);
 
     /*
@@ -450 +469 @@
         if (RT_FAILURE(rc))
         {
-            RTStrmPrintf(g_pStdErr, "%s: %s: %Rrc\n", argv[0], argv[iArg], rc);
+            RTStrmPrintf(g_pStdErr, "%s: %s: %Rrc\n", argv0, argv[iArg], rc);
             break;
         }
@@ -457 +476 @@
          * Disassemble it.
          */
-        rc = MyDisasmBlock(argv[0], enmCpuMode, uAddress, (uint8_t *)pvFile, cbFile, enmStyle, fListing, fRaw, fAllInvalid);
+        rc = MyDisasmBlock(argv0, enmCpuMode, uAddress, (uint8_t *)pvFile, cbFile, enmStyle, fListing, fRaw, fAllInvalid);
         if (RT_FAILURE(rc))
             break;