diff --git a/src/plugins/debugger/cdb/cdbassembler.cpp b/src/plugins/debugger/cdb/cdbassembler.cpp index 590b82ee23b360095c19d6b1e1f1b4e5b3649f04..aeb1ffec05fca750b47e9fa54915bc5833076611 100644 --- a/src/plugins/debugger/cdb/cdbassembler.cpp +++ b/src/plugins/debugger/cdb/cdbassembler.cpp @@ -192,17 +192,17 @@ void DisassemblerOutputParser::parse(const QStringList &l) } } -bool dissassemble(CdbCore::CoreEngine *engine, - ULONG64 offset, - unsigned long beforeLines, - unsigned long afterLines, - QTextStream &str, - QString *errorMessage) +bool disassemble(CdbCore::CoreEngine *engine, + ULONG64 offset, + unsigned long beforeLines, + unsigned long afterLines, + QTextStream &str, + QString *errorMessage) { if (debugCDB) qDebug() << Q_FUNC_INFO << offset; QString lines; - if (!engine->dissassemble(offset, beforeLines, afterLines, &lines, errorMessage)) + if (!engine->disassemble(offset, beforeLines, afterLines, &lines, errorMessage)) return false; DisassemblerOutputParser parser(str); parser.parse(lines.split(QLatin1Char('\n'))); diff --git a/src/plugins/debugger/cdb/cdbassembler.h b/src/plugins/debugger/cdb/cdbassembler.h index 71ec8227a7fd34b87a211fecaf961f31295cac4c..5aa962e71a2bc9ff8acad419635870871ef033d6 100644 --- a/src/plugins/debugger/cdb/cdbassembler.h +++ b/src/plugins/debugger/cdb/cdbassembler.h @@ -54,12 +54,12 @@ Registers getRegisters(CIDebugControl *ctl, QString *errorMessage, int base = 10 /* 16 for hex, etc */); -bool dissassemble(CdbCore::CoreEngine *engine, - ULONG64 offset, - unsigned long beforeLines, - unsigned long afterLines, - QTextStream &str, - QString *errorMessage); +bool disassemble(CdbCore::CoreEngine *engine, + ULONG64 offset, + unsigned long beforeLines, + unsigned long afterLines, + QTextStream &str, + QString *errorMessage); } // namespace Internal } // namespace Debugger diff --git a/src/plugins/debugger/cdb/cdbengine.cpp b/src/plugins/debugger/cdb/cdbengine.cpp index 0f6d45076ac06b948018f44ae7a3e84d9b867fcb..9d862240b1b03aaea7075a900fce6441c7d9f43a 100644 --- a/src/plugins/debugger/cdb/cdbengine.cpp +++ b/src/plugins/debugger/cdb/cdbengine.cpp @@ -1241,7 +1241,7 @@ void CdbEngine::fetchDisassembler(DisassemblerViewAgent *agent) } QString disassembly; QApplication::setOverrideCursor(Qt::WaitCursor); - const bool ok = dissassemble(m_d, address, ContextLines, ContextLines, QTextStream(&disassembly), &errorMessage); + const bool ok = disassemble(m_d, address, ContextLines, ContextLines, QTextStream(&disassembly), &errorMessage); QApplication::restoreOverrideCursor(); if (ok) { agent->setContents(disassembly); diff --git a/src/plugins/debugger/cdb/coreengine.cpp b/src/plugins/debugger/cdb/coreengine.cpp index ba8e0089251c8336f2aa1ca19a8cbda9eb9bd216..f4b4168bdee7df463faccddbd4f7730b7d910d0a 100644 --- a/src/plugins/debugger/cdb/coreengine.cpp +++ b/src/plugins/debugger/cdb/coreengine.cpp @@ -844,11 +844,11 @@ bool CoreEngine::writeToDebuggee(const QByteArray &buffer, quint64 address, QStr return true; } -bool CoreEngine::dissassemble(ULONG64 offset, - unsigned long beforeLines, - unsigned long afterLines, - QString *target, - QString *errorMessage) +bool CoreEngine::disassemble(ULONG64 offset, + unsigned long beforeLines, + unsigned long afterLines, + QString *target, + QString *errorMessage) { const ULONG flags = DEBUG_DISASM_MATCHING_SYMBOLS|DEBUG_DISASM_SOURCE_LINE_NUMBER|DEBUG_DISASM_SOURCE_FILE_NAME; // Catch the output by temporarily setting another handler. diff --git a/src/plugins/debugger/cdb/coreengine.h b/src/plugins/debugger/cdb/coreengine.h index dfed69756f4fde003c9f3ebbf72b35ff7cf7a97d..36d8e9601f6c0687c9ea399e75258e9e703c8ff6 100644 --- a/src/plugins/debugger/cdb/coreengine.h +++ b/src/plugins/debugger/cdb/coreengine.h @@ -147,8 +147,8 @@ public: bool createDebuggeeAscIIString(const QString &s, ULONG64 *address, QString *errorMessage); bool writeToDebuggee(const QByteArray &buffer, quint64 address, QString *errorMessage); // Write to debuggee memory in chunks - bool dissassemble(ULONG64 offset, unsigned long beforeLines, unsigned long afterLines, - QString *target, QString *errorMessage); + bool disassemble(ULONG64 offset, unsigned long beforeLines, unsigned long afterLines, + QString *target, QString *errorMessage); quint64 getSourceLineAddress(const QString &file, int line, QString *errorMessage) const;