diff --git a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/disassembly/dsf/AddressRangePosition.java b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/disassembly/dsf/AddressRangePosition.java index b4552a551d6..20bcedf4782 100644 --- a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/disassembly/dsf/AddressRangePosition.java +++ b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/disassembly/dsf/AddressRangePosition.java @@ -71,7 +71,7 @@ public class AddressRangePosition extends Position { public String toString() { return getClass().getSimpleName() + '@' + Integer.toHexString(System.identityHashCode(this)) + (fValid ? "" : "[INVALID]") //$NON-NLS-1$ //$NON-NLS-2$ - + '[' + offset + ':' + length + "]->[" + fAddressOffset //$NON-NLS-1$ - + ':' + fAddressLength + ']'; + + '[' + offset + ':' + length + "]->[" + fAddressOffset.toString(16) //$NON-NLS-1$ + + ':' + fAddressLength.toString(16) + ']'; } } diff --git a/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/mi/service/command/output/MIInstruction.java b/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/mi/service/command/output/MIInstruction.java index fd07c36a2e2..69b8250ee70 100644 --- a/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/mi/service/command/output/MIInstruction.java +++ b/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/mi/service/command/output/MIInstruction.java @@ -27,6 +27,7 @@ public class MIInstruction extends AbstractInstruction { String opcode = ""; //$NON-NLS-1$ String args = ""; //$NON-NLS-1$ BigInteger rawOpcodes = null; + Integer opcodeSize = null; public MIInstruction(MITuple tuple) { parse(tuple); @@ -154,6 +155,7 @@ public class MIInstruction extends AbstractInstruction { if (var.equals("opcodes")) { //$NON-NLS-1$ try { rawOpcodes = decodeOpcodes(str); + opcodeSize = Integer.valueOf(str.replace(" ", "").length() / 2); //$NON-NLS-1$//$NON-NLS-2$ } catch (NumberFormatException e) { } continue; @@ -189,4 +191,12 @@ public class MIInstruction extends AbstractInstruction { // Removing space separation and parse as single big integer return new BigInteger(string.replace(" ", ""), 16); //$NON-NLS-1$ //$NON-NLS-2$ } + + /* (non-Javadoc) + * @see org.eclipse.cdt.dsf.debug.service.AbstractInstruction#getSize() + */ + @Override + public Integer getSize() { + return opcodeSize; + } } diff --git a/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/internal/ui/disassembly/DisassemblyPart.java b/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/internal/ui/disassembly/DisassemblyPart.java index 269700af495..8476a4d1b10 100644 --- a/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/internal/ui/disassembly/DisassemblyPart.java +++ b/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/internal/ui/disassembly/DisassemblyPart.java @@ -1732,7 +1732,7 @@ public abstract class DisassemblyPart extends WorkbenchPart implements IDisassem lineNumber= fBackend.getFrameLine(); } } - if (DEBUG) System.out.println("Asking backend to retrieve disassembly: sa=" + startAddress + ",ea=" + endAddress + ",file=" + file + ",lineNumber=" + lineNumber + ",lines=" + lines); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ //$NON-NLS-5$ + if (DEBUG) System.out.println("Asking backend to retrieve disassembly: sa=0x" + startAddress.toString(16) + ",ea=0x" + endAddress.toString(16) + ",file=" + file + ",lineNumber=" + lineNumber + ",lines=" + lines); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ //$NON-NLS-5$ fBackend.retrieveDisassembly(startAddress, endAddress, file, lineNumber, lines, mixed, fShowSymbols, fShowDisassembly, linesHint); }