Changeset 64586 in vbox for trunk/src/VBox/Debugger

Timestamp:

Nov 6, 2016 1:56:36 PM (8 years ago)

Author:

vboxsync

Message:

DBGFR3Flow: Started working on resolving indirect branches. Compilers tend to create a branch table for large switch() {} statements to avoid loads of conditional branches

Location:

trunk/src/VBox/Debugger

Files:

• DBGCEmulateCodeView.cpp (modified) (4 diffs)
• testcase/tstDBGCStubs.cpp (modified) (4 diffs)

trunk/src/VBox/Debugger/DBGCEmulateCodeView.cpp

@@ -1636 +1636 @@
                             cchRightExtra++;
                         break;
+                    case DBGFFLOWBBENDTYPE_UNCOND_INDIRECT_JMP:
                     default:
                         AssertFailed();
@@ -1666 +1667 @@
                         case DBGFFLOWBBENDTYPE_LAST_DISASSEMBLED:
                         case DBGFFLOWBBENDTYPE_UNCOND_JMP:
+                        case DBGFFLOWBBENDTYPE_UNCOND_INDIRECT_JMP:
                             break;
                         case DBGFFLOWBBENDTYPE_UNCOND:
@@ -1778 +1780 @@
                             break;
                         }
+                        case DBGFFLOWBBENDTYPE_UNCOND_INDIRECT_JMP:
                         default:
                             AssertFailed();
@@ -1942 +1945 @@
 
     DBGFFLOW hCfg;
-    rc = DBGFR3FlowCreate(pUVM, pDbgc->idCpu, &CurAddr, 0 /*cbDisasmMax*/, fFlags, &hCfg);
+    rc = DBGFR3FlowCreate(pUVM, pDbgc->idCpu, &CurAddr, 0 /*cbDisasmMax*/,
+                          DBGF_FLOW_CREATE_F_DEFAULT, fFlags, &hCfg);
     if (RT_SUCCESS(rc))
     {

trunk/src/VBox/Debugger/testcase/tstDBGCStubs.cpp

@@ -382 +382 @@
 
 VMMR3DECL(int) DBGFR3FlowCreate(PUVM pUVM, VMCPUID idCpu, PDBGFADDRESS pAddressStart, uint32_t cbDisasmMax,
-                               uint32_t fFlags, PDBGFFLOW phFlow)
+                                uint32_t fFlagsFlow, uint32_t fFlagsDisasm, PDBGFFLOW phFlow)
 {
     return VERR_INTERNAL_ERROR;
@@ -402 +402 @@
     return VERR_INTERNAL_ERROR;
 }
+VMMR3DECL(int) DBGFR3FlowQueryBranchTblByAddress(DBGFFLOW hFlow, PDBGFADDRESS pAddr, PDBGFFLOWBRANCHTBL phFlowBranchTbl)
+{
+    return VERR_INTERNAL_ERROR;
+}
 VMMR3DECL(uint32_t) DBGFR3FlowGetBbCount(DBGFFLOW hFlow)
 {
     return 0;
 }
+VMMR3DECL(uint32_t) DBGFR3FlowGetBranchTblCount(DBGFFLOW hFlow)
+{
+    return 0;
+}
 VMMR3DECL(uint32_t) DBGFR3FlowBbRetain(DBGFFLOWBB hFlowBb)
 {
@@ -441 +449 @@
 {
     return 0;
+}
+VMMR3DECL(int) DBGFR3FlowBbQueryBranchTbl(DBGFFLOWBB hFlowBb, PDBGFFLOWBRANCHTBL phBranchTbl)
+{
+    return VERR_INTERNAL_ERROR;
 }
 VMMR3DECL(int) DBGFR3FlowBbQueryError(DBGFFLOWBB hFlowBb, const char **ppszErr)
@@ -461 +473 @@
 }
 VMMR3DECL(int) DBGFR3FlowBbGetRefBb(DBGFFLOWBB hFlowBb, PDBGFFLOWBB pahFlowBbRef, uint32_t cRef)
+{
+    return VERR_INTERNAL_ERROR;
+}
+VMMR3DECL(uint32_t) DBGFR3FlowBranchTblRetain(DBGFFLOWBRANCHTBL hFlowBranchTbl)
+{
+    return 0;
+}
+VMMR3DECL(uint32_t) DBGFR3FlowBranchTblRelease(DBGFFLOWBRANCHTBL hFlowBranchTbl)
+{
+    return 0;
+}
+VMMR3DECL(uint32_t) DBGFR3FlowBranchTblGetSlots(DBGFFLOWBRANCHTBL hFlowBranchTbl)
+{
+    return 0;
+}
+VMMR3DECL(PDBGFADDRESS) DBGFR3FlowBranchTblGetStartAddress(DBGFFLOWBRANCHTBL hFlowBranchTbl, PDBGFADDRESS pAddrStart)
+{
+    return NULL;
+}
+VMMR3DECL(int) DBGFR3FlowBranchTblQueryAddresses(DBGFFLOWBRANCHTBL hFlowBranchTbl, PDBGFADDRESS paAddrs, uint32_t cAddrs)
 {
     return VERR_INTERNAL_ERROR;