Changeset 45428 in vbox

Timestamp:

Apr 9, 2013 12:32:35 PM (11 years ago)

Author:

vboxsync

Message:

VMM: Propagate errors from PGM through the disassembler. Get rid of VERR_EM_INTERNAL_DISAS_ERROR and dependents.

Location:

trunk

Files:

• include/VBox/err.h (modified) (2 diffs)
• src/VBox/Disassembler/DisasmCore.cpp (modified) (2 diffs)
• src/VBox/VMM/VMMAll/EMAll.cpp (modified) (1 diff)
• src/VBox/VMM/VMMAll/PGMAllPhys.cpp (modified) (1 diff)

trunk/include/VBox/err.h

@@ -238 +238 @@
 #define VINF_EM_RAW_EMULATE_DBG_STEP        1151
 /** Patch TPR access instruction. */
-#define VINF_EM_HM_PATCH_TPR_INSTR      1152
-/** The EMInterpretDisasOne / EMInterpretDisasOneEx methods failed to
- * disassemble the instruction. */
-#define VERR_EM_INTERNAL_DISAS_ERROR        (-1153)
+#define VINF_EM_HM_PATCH_TPR_INSTR          1152
 /** Unexpected guest mapping conflict detected. */
 #define VERR_EM_UNEXPECTED_MAPPING_CONFLICT (-1154)
@@ -1969 +1966 @@
 /** Invalid parameter index. */
 #define VERR_DIS_INVALID_PARAMETER                  (-4204)
-/** Reading opcode bytes failed. */
-#define VERR_DIS_MEM_READ                           (-4205)
 /** The instruction is too long. */
 #define VERR_DIS_TOO_LONG_INSTR                     (-4206)

trunk/src/VBox/Disassembler/DisasmCore.cpp

@@ -293 +293 @@
     {
         Log(("disReadMore failed with rc=%Rrc!!\n", rc));
-        pDis->rc = VERR_DIS_MEM_READ;
+        pDis->rc = rc;
     }
 }
@@ -2608 +2608 @@
     {
         Log(("Initial read failed with rc=%Rrc!!\n", rc));
-        pDis->rc = VERR_DIS_MEM_READ;
+        pDis->rc = rc;
     }
 }

trunk/src/VBox/VMM/VMMAll/EMAll.cpp

@@ -461 +461 @@
     if (RT_SUCCESS(rc))
         return VINF_SUCCESS;
-    AssertMsgFailed(("DISCoreOne failed to GCPtrInstr=%RGv rc=%Rrc\n", GCPtrInstr, rc));
-    return VERR_EM_INTERNAL_DISAS_ERROR;
+    AssertMsg(rc == VERR_PAGE_NOT_PRESENT || rc == VERR_PAGE_TABLE_NOT_PRESENT, ("DISCoreOne failed to GCPtrInstr=%RGv rc=%Rrc\n", GCPtrInstr, rc));
+    return rc;
 }
 

trunk/src/VBox/VMM/VMMAll/PGMAllPhys.cpp

@@ -120 +120 @@
                 }
             }
-            else if (RT_UNLIKELY(rc == VERR_EM_INTERNAL_DISAS_ERROR))
-                return rc;
             break;
         }