summaryrefslogtreecommitdiff
path: root/src/plugins/debugger/disassembleragent.cpp
diff options
context:
space:
mode:
authorhjk <hjk121@nokiamail.com>2014-07-22 16:29:15 +0200
committerhjk <hjk121@nokiamail.com>2014-07-23 12:40:14 +0200
commit9f18349678303ae21c16f535e12b9fa0c0d3ffeb (patch)
treedf673abce8982900de2890430c74b87db223a8b3 /src/plugins/debugger/disassembleragent.cpp
parent5a16eaca04886433a6e380f7acb742861a266298 (diff)
downloadqt-creator-9f18349678303ae21c16f535e12b9fa0c0d3ffeb.tar.gz
Debugger: Remove traces of mixed mode handling from debugger agent
The agent is now fed with fully parsed content from the engine and has no notion of 'mixed mode' anymore. Change-Id: I15e3b16d5deb173564aa2e91737841366507358e Reviewed-by: Christian Stenger <christian.stenger@digia.com>
Diffstat (limited to 'src/plugins/debugger/disassembleragent.cpp')
-rw-r--r--src/plugins/debugger/disassembleragent.cpp20
1 files changed, 1 insertions, 19 deletions
diff --git a/src/plugins/debugger/disassembleragent.cpp b/src/plugins/debugger/disassembleragent.cpp
index b0bbd4771f..54fb20cdd9 100644
--- a/src/plugins/debugger/disassembleragent.cpp
+++ b/src/plugins/debugger/disassembleragent.cpp
@@ -107,8 +107,6 @@ public:
QList<ITextMark *> breakpointMarks;
QList<CacheEntry> cache;
QString mimeType;
- bool tryMixedInitialized;
- bool tryMixed;
bool resetLocationScheduled;
};
@@ -116,8 +114,6 @@ DisassemblerAgentPrivate::DisassemblerAgentPrivate()
: document(0),
locationMark(0),
mimeType(_("text/x-qtcreator-generic-asm")),
- tryMixedInitialized(false),
- tryMixed(true),
resetLocationScheduled(false)
{
locationMark.setIcon(debuggerCore()->locationMarkIcon());
@@ -201,20 +197,6 @@ const Location &DisassemblerAgent::location() const
return d->location;
}
-bool DisassemblerAgent::isMixed() const
-{
- if (!d->tryMixedInitialized) {
- if (d->engine->startParameters().toolChainAbi.os() == ProjectExplorer::Abi::MacOS)
- d->tryMixed = false;
- d->tryMixedInitialized = true;
- }
-
- return d->tryMixed
- && d->location.lineNumber() > 0
- && !d->location.functionName().isEmpty()
- && d->location.functionName() != _("??");
-}
-
void DisassemblerAgent::reload()
{
d->cache.clear();
@@ -228,7 +210,7 @@ void DisassemblerAgent::setLocation(const Location &loc)
if (index != -1) {
// Refresh when not displaying a function and there is not sufficient
// context left past the address.
- if (!isMixed() && d->cache.at(index).first.endAddress - loc.address() < 24) {
+ if (d->cache.at(index).first.endAddress - loc.address() < 24) {
index = -1;
d->cache.removeAt(index);
}