GDB: Support operate by instruction also for core dump

+ Deduplicate common capabilities.

Task-number: QTCREATORBUG-21454
Change-Id: Icd53b88274136c885b929030f1cfb71819667cc3
Reviewed-by: hjk <hjk@qt.io>
This commit is contained in:
Orgad Shaneh
2018-11-18 20:12:40 +02:00
committed by Orgad Shaneh
parent bd539f7f77
commit 14bdcd2bff

View File

@@ -1769,8 +1769,7 @@ static QString msgNoGdbBinaryForToolChain(const Abi &tc)
bool GdbEngine::hasCapability(unsigned cap) const bool GdbEngine::hasCapability(unsigned cap) const
{ {
if (runParameters().startMode == AttachCore) { if (cap & (AutoDerefPointersCapability
return cap & (AutoDerefPointersCapability
| DisassemblerCapability | DisassemblerCapability
| RegisterCapability | RegisterCapability
| ShowMemoryCapability | ShowMemoryCapability
@@ -1778,16 +1777,17 @@ bool GdbEngine::hasCapability(unsigned cap) const
| AddWatcherCapability | AddWatcherCapability
| ShowModuleSymbolsCapability | ShowModuleSymbolsCapability
| ShowModuleSectionsCapability | ShowModuleSectionsCapability
| OperateByInstructionCapability
| WatchComplexExpressionsCapability | WatchComplexExpressionsCapability
| MemoryAddressCapability | MemoryAddressCapability
| AdditionalQmlStackCapability); | AdditionalQmlStackCapability)) {
return true;
} }
return cap & (AutoDerefPointersCapability if (runParameters().startMode == AttachCore)
| DisassemblerCapability return false;
| RegisterCapability
| ShowMemoryCapability return cap & (JumpToLineCapability
| JumpToLineCapability
| ReloadModuleCapability | ReloadModuleCapability
| ReloadModuleSymbolsCapability | ReloadModuleSymbolsCapability
| BreakOnThrowAndCatchCapability | BreakOnThrowAndCatchCapability
@@ -1795,18 +1795,12 @@ bool GdbEngine::hasCapability(unsigned cap) const
| BreakIndividualLocationsCapability | BreakIndividualLocationsCapability
| TracePointCapability | TracePointCapability
| ReturnFromFunctionCapability | ReturnFromFunctionCapability
| CreateFullBacktraceCapability
| WatchpointByAddressCapability | WatchpointByAddressCapability
| WatchpointByExpressionCapability | WatchpointByExpressionCapability
| AddWatcherCapability
| AddWatcherWhileRunningCapability | AddWatcherWhileRunningCapability
| WatchWidgetsCapability | WatchWidgetsCapability
| ShowModuleSymbolsCapability
| ShowModuleSectionsCapability
| CatchCapability | CatchCapability
| OperateByInstructionCapability
| RunToLineCapability | RunToLineCapability
| WatchComplexExpressionsCapability
| MemoryAddressCapability | MemoryAddressCapability
| AdditionalQmlStackCapability | AdditionalQmlStackCapability
| NativeMixedCapability | NativeMixedCapability