mirrors/cdt
1
0
Fork 0
mirror of https://github.com/eclipse-cdt/cdt synced 2025-06-07 17:56:01 +02:00
Code Issues Wiki Activity

[302925] Apply partial workaround for excessive data from GDB also to CDI back-end

Browse source
This commit is contained in:
Anton Leherbauer 2010-03-12 08:00:12 +00:00
parent e68ed6d712
commit bd8092d830
1 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/disassembly/dsf/DisassemblyBackendCdi.java
View file

@ -272,7 +272,7 @@ public class DisassemblyBackendCdi implements IDisassemblyBackend, IDebugEventSe
@Override @Override
public void done() { public void done() {
if (isSuccess() && getDisassemblyBlock() != null) { if (isSuccess() && getDisassemblyBlock() != null) {
if (!insertDisassembly(startAddress, getDisassemblyBlock(), mixed, showSymbols, showDisassembly)) { if (!insertDisassembly(startAddress, finalEndAddress, getDisassemblyBlock(), mixed, showSymbols, showDisassembly)) {
// did not get disassembly data for startAddress - try fallbacks // did not get disassembly data for startAddress - try fallbacks
if (file != null) { if (file != null) {
// previous attempt used the file; retry using the address // previous attempt used the file; retry using the address
@ -394,13 +394,13 @@ public class DisassemblyBackendCdi implements IDisassemblyBackend, IDebugEventSe
* @see org.eclipse.cdt.dsf.debug.internal.ui.disassembly.IDisassemblyBackend#retrieveDisassembly(java.lang.String, int, java.math.BigInteger, boolean, boolean, boolean) * @see org.eclipse.cdt.dsf.debug.internal.ui.disassembly.IDisassemblyBackend#retrieveDisassembly(java.lang.String, int, java.math.BigInteger, boolean, boolean, boolean)
*/ */
public void retrieveDisassembly(String file, int lines, public void retrieveDisassembly(String file, int lines,
BigInteger endAddress, final boolean mixed, final boolean showSymbols, final BigInteger endAddress, final boolean mixed, final boolean showSymbols,
final boolean showDisassembly) { final boolean showDisassembly) {
final IDisassemblyRetrieval.DisassemblyRequest disassemblyRequest= new DisassemblyRequest() { final IDisassemblyRetrieval.DisassemblyRequest disassemblyRequest= new DisassemblyRequest() {
@Override @Override
public void done() { public void done() {
if (isSuccess() && getDisassemblyBlock() != null) { if (isSuccess() && getDisassemblyBlock() != null) {
insertDisassembly(null, getDisassemblyBlock(), mixed, showSymbols, showDisassembly); insertDisassembly(null, endAddress, getDisassemblyBlock(), mixed, showSymbols, showDisassembly);
} else { } else {
final IStatus status= getStatus(); final IStatus status= getStatus();
if (status != null && !status.isOK()) { if (status != null && !status.isOK()) {
@ -436,7 +436,7 @@ public class DisassemblyBackendCdi implements IDisassemblyBackend, IDebugEventSe
* @param showDisassembly * @param showDisassembly
* @return whether [startAddress] was inserted * @return whether [startAddress] was inserted
*/ */
private boolean insertDisassembly(BigInteger startAddress, IDisassemblyBlock disassemblyBlock, boolean mixed, boolean showSymbols, boolean showDisassembly) { private boolean insertDisassembly(BigInteger startAddress, BigInteger endAddress, IDisassemblyBlock disassemblyBlock, boolean mixed, boolean showSymbols, boolean showDisassembly) {
if (!fCallback.hasViewer() || fCdiSessionId == null) { if (!fCallback.hasViewer() || fCdiSessionId == null) {
// return true to avoid a retry // return true to avoid a retry
return true; return true;
@ -480,7 +480,7 @@ public class DisassemblyBackendCdi implements IDisassemblyBackend, IDebugEventSe
if (p instanceof ErrorPosition && p.fValid) { if (p instanceof ErrorPosition && p.fValid) {
p.fValid = false; p.fValid = false;
document.addInvalidAddressRange(p); document.addInvalidAddressRange(p);
} else if (p == null) { } else if (p == null || address.compareTo(endAddress) > 0) {
return insertedStartAddress; return insertedStartAddress;
} else if (p.fValid) { } else if (p.fValid) {
if (srcElement != null && lineNumber >= 0 || p.fAddressLength == BigInteger.ONE) { if (srcElement != null && lineNumber >= 0 || p.fAddressLength == BigInteger.ONE) {