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>
This commit is contained in:
hjk
2014-07-22 16:29:15 +02:00
parent 5a16eaca04
commit 9f18349678
2 changed files with 1 additions and 20 deletions

View File

@@ -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);
}