Commit d00dc3c2 authored by Friedemann Kleint's avatar Friedemann Kleint
Browse files

Debugger[gdb/Mac]: Show location marker in Mac OS disassembly.

Account for "0x0000000100002682sub    $0x68,%rsp", convert
hex address correctly to match the location.

Reviewed-by: hjk
parent 5a5ba58d
......@@ -409,7 +409,9 @@ quint64 DisassemblerViewAgent::address() const
// Return address of an assembly line "0x0dfd bla"
quint64 DisassemblerViewAgent::addressFromDisassemblyLine(const QString &line)
{
const int pos = line.indexOf(QLatin1Char(' '));
// Mac gdb has an overflow reporting 64bit addresses causing the instruction
// to follow the last digit "0x000000013fff4810mov 1,1". Truncate here.
const int pos = qMin(line.indexOf(QLatin1Char(' ')), 19);
if (pos < 0)
return 0;
QString addressS = line.left(pos);
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment