Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
What's new
10
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Open sidebar
Marco Bubke
flatpak-qt-creator
Commits
7082c04e
Commit
7082c04e
authored
Apr 11, 2011
by
hjk
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
debugger: fix disassembler address display on Mac
Reviewed-by: con
parent
a924bc25
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
6 additions
and
3 deletions
+6
-3
src/plugins/debugger/gdb/gdbengine.cpp
src/plugins/debugger/gdb/gdbengine.cpp
+6
-3
No files found.
src/plugins/debugger/gdb/gdbengine.cpp
View file @
7082c04e
...
...
@@ -4124,7 +4124,7 @@ static DisassemblerLine parseLine(const GdbMi &line)
{
DisassemblerLine
dl
;
QByteArray
address
=
line
.
findChild
(
"address"
).
data
();
dl
.
address
=
address
.
toULongLong
();
dl
.
address
=
address
.
toULongLong
(
0
,
0
);
dl
.
data
=
_
(
line
.
findChild
(
"inst"
).
data
());
return
dl
;
}
...
...
@@ -4137,10 +4137,13 @@ DisassemblerLines GdbEngine::parseMiDisassembler(const GdbMi &lines)
// src_and_asm_line={line="1244",file=".../app.cpp",
// line_asm_insn=[{address="0x0805485c",func-name="main",offset="32",
//inst="call 0x804cba1 <_Z11testObject1v>"}]}]}
// - or -
// - or -
(non-Mac)
// ^done,asm_insns=[
// {address="0x0805acf8",func-name="...",offset="25",inst="and $0xe8,%al"},
// {address="0x0805acfa",func-name="...",offset="27",inst="pop %esp"},
// {address="0x0805acfa",func-name="...",offset="27",inst="pop %esp"}, ..]
// - or - (MAC)
// ^done,asm_insns={
// {address="0x0d8f69e0",func-name="...",offset="1952",inst="add $0x0,%al"},..}
QStringList
fileContents
;
bool
fileLoaded
=
false
;
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment