forked from qt-creator/qt-creator
		
	debugger: add option to use intel-style disassembly
Change-Id: I549981e8314b52fafe2da387a0bb6312670578fa Reviewed-by: hjk <qthjk@ovi.com>
This commit is contained in:
		@@ -279,6 +279,8 @@ GdbEngine::GdbEngine(const DebuggerStartParameters &startParameters)
 | 
			
		||||
            SLOT(reloadLocals()));
 | 
			
		||||
    connect(debuggerCore()->action(UseDynamicType), SIGNAL(valueChanged(QVariant)),
 | 
			
		||||
            SLOT(reloadLocals()));
 | 
			
		||||
    connect(debuggerCore()->action(IntelFlavor), SIGNAL(valueChanged(QVariant)),
 | 
			
		||||
            SLOT(reloadDisassembly()));
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
GdbEngine::~GdbEngine()
 | 
			
		||||
@@ -4582,6 +4584,12 @@ DisassemblerLines GdbEngine::parseDisassembler(const GdbResponse &response)
 | 
			
		||||
    return parseCliDisassembler(response.consoleStreamOutput);
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
void GdbEngine::reloadDisassembly()
 | 
			
		||||
{
 | 
			
		||||
    setTokenBarrier();
 | 
			
		||||
    updateLocals();
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
void GdbEngine::handleDisassemblerCheck(const GdbResponse &response)
 | 
			
		||||
{
 | 
			
		||||
    m_disassembleUsesComma = response.resultClass != GdbResultDone;
 | 
			
		||||
@@ -4999,6 +5007,11 @@ void GdbEngine::handleInferiorPrepared()
 | 
			
		||||
 | 
			
		||||
    QTC_ASSERT(state() == InferiorSetupRequested, qDebug() << state());
 | 
			
		||||
 | 
			
		||||
    if (debuggerCore()->boolSetting(IntelFlavor)) {
 | 
			
		||||
        //postCommand("set follow-exec-mode new");
 | 
			
		||||
        postCommand("set disassembly-flavor intel");
 | 
			
		||||
    }
 | 
			
		||||
 | 
			
		||||
    if (sp.breakOnMain) {
 | 
			
		||||
        QByteArray cmd = "tbreak ";
 | 
			
		||||
        cmd += sp.toolChainAbi.os() == Abi::WindowsOS ? "qMain" : "main";
 | 
			
		||||
 
 | 
			
		||||
		Reference in New Issue
	
	Block a user