From 989d77bf7ae15a3b608efcaf7db202e125367aa8 Mon Sep 17 00:00:00 2001 From: Simon Marchi Date: Wed, 11 Feb 2015 14:11:56 -0500 Subject: [PATCH] Make disassembly default end address relative to start As it is now, if you pass a start address but no end address (null), the disassembled range will be [startAddress, $pc + 100], which does not quite make sense. I think the intention was to have the default end address be whatever the start address is, + 100. Change-Id: I1399cc116ecde6cfbdb2f1ec54a181e64a7f4c5f Signed-off-by: Simon Marchi --- .../src/org/eclipse/cdt/dsf/mi/service/MIDisassembly.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/mi/service/MIDisassembly.java b/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/mi/service/MIDisassembly.java index 7c7106b55c0..f9dc5e8c21b 100644 --- a/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/mi/service/MIDisassembly.java +++ b/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/mi/service/MIDisassembly.java @@ -124,7 +124,7 @@ public class MIDisassembly extends AbstractDsfService implements IDisassembly { } String start = (startAddress != null) ? startAddress.toString() : "$pc"; //$NON-NLS-1$ - String end = (endAddress != null) ? endAddress.toString() : "$pc + 100"; //$NON-NLS-1$ + String end = (endAddress != null) ? endAddress.toString() : start + " + 100"; //$NON-NLS-1$ fConnection.queueCommand(fCommandFactory.createMIDataDisassemble(context, start, end, mode), new DataRequestMonitor(getExecutor(), drm) { @Override @@ -206,7 +206,7 @@ public class MIDisassembly extends AbstractDsfService implements IDisassembly { } String start = (startAddress != null) ? startAddress.toString() : "$pc"; //$NON-NLS-1$ - String end = (endAddress != null) ? endAddress.toString() : "$pc + 100"; //$NON-NLS-1$ + String end = (endAddress != null) ? endAddress.toString() : start + " + 100"; //$NON-NLS-1$ fConnection.queueCommand(fCommandFactory.createMIDataDisassemble(context, start, end, mode), new DataRequestMonitor(getExecutor(), drm) { @Override