- Timestamp:
- Mar 16, 2023 6:12:43 PM (21 months ago)
- Location:
- trunk/src/VBox/Debugger
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/src/VBox/Debugger/DBGCEmulateCodeView.cpp
r98103 r99010 1343 1343 if (!DBGCVAR_ISPOINTER(pDbgc->DisasmPos.enmType)) 1344 1344 { 1345 #if defined(VBOX_VMM_TARGET_ARMV8) 1346 AssertReleaseFailed(); 1347 #else 1345 1348 /** @todo Batch query CS, RIP, CPU mode and flags. */ 1346 1349 PVMCPU pVCpu = VMMR3GetCpuByIdU(pUVM, pDbgc->idCpu); … … 1362 1365 } 1363 1366 } 1367 #endif 1364 1368 1365 1369 fFlags |= DBGF_DISAS_FLAGS_CURRENT_GUEST; … … 2108 2112 if (!DBGCVAR_ISPOINTER(pDbgc->DisasmPos.enmType)) 2109 2113 { 2114 #if defined(VBOX_VMM_TARGET_ARMV8) 2115 AssertReleaseFailed(); 2116 #else 2110 2117 /** @todo Batch query CS, RIP, CPU mode and flags. */ 2111 2118 PVMCPU pVCpu = VMMR3GetCpuByIdU(pUVM, pDbgc->idCpu); … … 2127 2134 } 2128 2135 } 2136 #endif 2129 2137 2130 2138 fFlags |= DBGF_DISAS_FLAGS_CURRENT_GUEST; … … 2244 2252 if (!DBGCVAR_ISPOINTER(pDbgc->SourcePos.enmType)) 2245 2253 { 2254 #if defined(VBOX_VMM_TARGET_ARMV8) 2255 AssertReleaseFailed(); 2256 #else 2246 2257 PVMCPU pVCpu = VMMR3GetCpuByIdU(pUVM, pDbgc->idCpu); 2247 2258 pDbgc->SourcePos.enmType = DBGCVAR_TYPE_GC_FAR; 2248 2259 pDbgc->SourcePos.u.GCFar.off = CPUMGetGuestEIP(pVCpu); 2249 2260 pDbgc->SourcePos.u.GCFar.sel = CPUMGetGuestCS(pVCpu); 2261 #endif 2250 2262 } 2251 2263 pDbgc->SourcePos.enmRangeType = DBGCVAR_RANGE_NONE; … … 3691 3703 static RTGCPHYS dbgcGetGuestPageMode(PDBGC pDbgc, bool *pfPAE, bool *pfLME, bool *pfPSE, bool *pfPGE, bool *pfNXE) 3692 3704 { 3705 #if defined(VBOX_VMM_TARGET_ARMV8) 3706 AssertReleaseFailed(); 3707 RT_NOREF(pDbgc, pfPAE, pfLME, pfPSE, pfPGE, pfNXE); 3708 return ~(RTGCPHYS)0; 3709 #else 3693 3710 PVMCPU pVCpu = VMMR3GetCpuByIdU(pDbgc->pUVM, pDbgc->idCpu); 3694 3711 RTGCUINTREG cr4 = CPUMGetGuestCR4(pVCpu); … … 3706 3723 *pfNXE = false; /* GUEST64 GUESTNX */ 3707 3724 return CPUMGetGuestCR3(pVCpu); 3725 #endif 3708 3726 } 3709 3727 … … 6442 6460 if (!DBGCVAR_ISPOINTER(pDbgc->DisasmPos.enmType)) 6443 6461 { 6462 #if defined(VBOX_VMM_TARGET_ARMV8) 6463 AssertReleaseFailed(); 6464 #else 6444 6465 /** @todo Batch query CS, RIP, CPU mode and flags. */ 6445 6466 PVMCPU pVCpu = VMMR3GetCpuByIdU(pUVM, pDbgc->idCpu); … … 6461 6482 } 6462 6483 } 6484 #endif 6463 6485 6464 6486 fFlags |= DBGF_DISAS_FLAGS_CURRENT_GUEST; -
trunk/src/VBox/Debugger/Makefile.kmk
r98439 r99010 66 66 DBGCIoProvIpc.cpp \ 67 67 DBGCScreenAscii.cpp 68 69 ifdef VBOX_WITH_VIRT_ARMV8 70 ifdef VBOX_WITH_DEBUGGER 71 LIBRARIES += Debugger-armv8 72 endif # VBOX_WITH_DEBUGGER 73 74 # 75 # Debugger library - linked into VBoxVMM, ARMv8 variant. 76 # 77 # @todo Can this be merged into one library later maybe? 78 Debugger-armv8_TEMPLATE = VBoxR3Dll 79 Debugger-armv8_DEFS = VBOX_VMM_TARGET_ARMV8 IN_VMM_R3 IN_DBG_R3 IN_DIS 80 ifneq ($(KBUILD_TYPE),release) 81 Debugger-armv8_DEFS += VBOX_WITH_DEBUGGER_TCP_BY_DEFAULT 82 endif 83 Debugger-armv8_SOURCES = \ 84 DBGConsole.cpp \ 85 DBGCEval.cpp \ 86 DBGCBuiltInSymbols.cpp \ 87 DBGCCmdHlp.cpp \ 88 DBGCCmdWorkers.cpp \ 89 DBGCCommands.cpp \ 90 DBGCDumpImage.cpp \ 91 DBGCFunctions.cpp \ 92 DBGCEmulateCodeView.cpp \ 93 DBGCOps.cpp \ 94 DBGCGdbRemoteStub.cpp \ 95 DBGCRemoteKd.cpp \ 96 DBGCIo.cpp \ 97 DBGCIoProvTcp.cpp \ 98 DBGCIoProvUdp.cpp \ 99 DBGCIoProvIpc.cpp \ 100 DBGCScreenAscii.cpp 101 endif 68 102 69 103 #
Note:
See TracChangeset
for help on using the changeset viewer.