Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
Marco Bubke
flatpak-qt-creator
Commits
81977e2d
Commit
81977e2d
authored
Jan 15, 2010
by
hjk
Committed by
con
Jan 15, 2010
Browse files
debugger: combine memory blocks more aggressively
(cherry picked from commit
85b39966
)
parent
6fc1bfb2
Changes
1
Hide whitespace changes
Inline
Side-by-side
src/plugins/debugger/gdb/trkgdbadapter.cpp
View file @
81977e2d
...
...
@@ -166,8 +166,8 @@ void Snapshot::insertMemory(const MemoryRange &range, const QByteArray &ba)
data
.
append
(
ba
);
const
MemoryRange
res
(
it
.
key
().
from
,
range
.
to
);
memory
.
remove
(
it
.
key
());
memory
.
insert
(
res
,
data
);
MEMORY_DEBUG
(
" TO(1) "
<<
res
);
insertMemory
(
res
,
data
);
return
;
}
if
(
it
.
key
().
from
==
range
.
to
)
{
...
...
@@ -176,8 +176,8 @@ void Snapshot::insertMemory(const MemoryRange &range, const QByteArray &ba)
data
.
append
(
*
it
);
const
MemoryRange
res
(
range
.
from
,
it
.
key
().
to
);
memory
.
remove
(
it
.
key
());
memory
.
insert
(
res
,
data
);
MEMORY_DEBUG
(
" TO(2) "
<<
res
);
insertMemory
(
res
,
data
);
return
;
}
}
...
...
@@ -1330,6 +1330,16 @@ void TrkGdbAdapter::tryAnswerGdbMemoryRequest(bool buffered)
}
// Happens when chunks are not comnbined
QTC_ASSERT
(
false
,
/**/
);
debugMessage
(
"CHUNKS NOT COMBINED"
);
#ifdef MEMORY_DEBUG
qDebug
()
<<
"CHUNKS NOT COMBINED"
;
it
=
m_snapshot
.
memory
.
begin
();
et
=
m_snapshot
.
memory
.
end
();
for
(
;
it
!=
et
;
++
it
)
qDebug
()
<<
it
.
key
().
from
<<
it
.
key
().
to
;
qDebug
()
<<
"WANTED"
<<
wanted
.
from
<<
wanted
.
to
;
#endif
sendGdbServerMessage
(
"E22"
,
""
);
return
;
}
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new 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