From 14bdcd2bffd69e5121d1791a07cd27eb28441af7 Mon Sep 17 00:00:00 2001 From: Orgad Shaneh Date: Sun, 18 Nov 2018 20:12:40 +0200 Subject: [PATCH] GDB: Support operate by instruction also for core dump + Deduplicate common capabilities. Task-number: QTCREATORBUG-21454 Change-Id: Icd53b88274136c885b929030f1cfb71819667cc3 Reviewed-by: hjk --- src/plugins/debugger/gdb/gdbengine.cpp | 40 +++++++++++--------------- 1 file changed, 17 insertions(+), 23 deletions(-) diff --git a/src/plugins/debugger/gdb/gdbengine.cpp b/src/plugins/debugger/gdb/gdbengine.cpp index 68f2a75d6fa..1306cf6fea8 100644 --- a/src/plugins/debugger/gdb/gdbengine.cpp +++ b/src/plugins/debugger/gdb/gdbengine.cpp @@ -1769,25 +1769,25 @@ static QString msgNoGdbBinaryForToolChain(const Abi &tc) bool GdbEngine::hasCapability(unsigned cap) const { - if (runParameters().startMode == AttachCore) { - return cap & (AutoDerefPointersCapability - | DisassemblerCapability - | RegisterCapability - | ShowMemoryCapability - | CreateFullBacktraceCapability - | AddWatcherCapability - | ShowModuleSymbolsCapability - | ShowModuleSectionsCapability - | WatchComplexExpressionsCapability - | MemoryAddressCapability - | AdditionalQmlStackCapability); + if (cap & (AutoDerefPointersCapability + | DisassemblerCapability + | RegisterCapability + | ShowMemoryCapability + | CreateFullBacktraceCapability + | AddWatcherCapability + | ShowModuleSymbolsCapability + | ShowModuleSectionsCapability + | OperateByInstructionCapability + | WatchComplexExpressionsCapability + | MemoryAddressCapability + | AdditionalQmlStackCapability)) { + return true; } - return cap & (AutoDerefPointersCapability - | DisassemblerCapability - | RegisterCapability - | ShowMemoryCapability - | JumpToLineCapability + if (runParameters().startMode == AttachCore) + return false; + + return cap & (JumpToLineCapability | ReloadModuleCapability | ReloadModuleSymbolsCapability | BreakOnThrowAndCatchCapability @@ -1795,18 +1795,12 @@ bool GdbEngine::hasCapability(unsigned cap) const | BreakIndividualLocationsCapability | TracePointCapability | ReturnFromFunctionCapability - | CreateFullBacktraceCapability | WatchpointByAddressCapability | WatchpointByExpressionCapability - | AddWatcherCapability | AddWatcherWhileRunningCapability | WatchWidgetsCapability - | ShowModuleSymbolsCapability - | ShowModuleSectionsCapability | CatchCapability - | OperateByInstructionCapability | RunToLineCapability - | WatchComplexExpressionsCapability | MemoryAddressCapability | AdditionalQmlStackCapability | NativeMixedCapability