From 6dc9b768e84d0639438f0bcbe860e14ee18e7817 Mon Sep 17 00:00:00 2001 From: Mikhail Khodjaiants Date: Thu, 24 Feb 2005 21:17:11 +0000 Subject: [PATCH] Applied patch from Tracy Miranda (bug 86533: Breakpoint is set on the wrong line in Disassembly view). --- debug/org.eclipse.cdt.debug.ui/ChangeLog | 4 ++++ .../internal/ui/views/disassembly/DisassemblyEditorInput.java | 4 +++- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/debug/org.eclipse.cdt.debug.ui/ChangeLog b/debug/org.eclipse.cdt.debug.ui/ChangeLog index a57afbfc539..a29ce234317 100644 --- a/debug/org.eclipse.cdt.debug.ui/ChangeLog +++ b/debug/org.eclipse.cdt.debug.ui/ChangeLog @@ -1,3 +1,7 @@ +2005-02-24 Mikhail Khodjaiants + Applied patch from Tracy Miranda (bug 86533: Breakpoint is set on the wrong line in Disassembly view). + * DisassemblyEditorInput.java + 2005-02-22 Mikhail Khodjaiants Bug 84799: Implement Memory View and renderings with new rendering APIs. * plugin.xml diff --git a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/views/disassembly/DisassemblyEditorInput.java b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/views/disassembly/DisassemblyEditorInput.java index 85c70d0fcce..81314b1e9ee 100644 --- a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/views/disassembly/DisassemblyEditorInput.java +++ b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/views/disassembly/DisassemblyEditorInput.java @@ -169,7 +169,9 @@ public class DisassemblyEditorInput implements IEditorInput { int current = 0; for ( int i = 0; i < lines.length; ++i ) { IAsmInstruction[] instructions = lines[i].getInstructions(); - ++current; + if ( fBlock.isMixedMode() ) { + ++current; + } if ( lineNumber == current && instructions.length > 0 ) return instructions[0].getAdress(); if ( lineNumber > current && lineNumber <= current + instructions.length )