From c1c8430638dfa1a323c17eba98f5d1e402b9d061 Mon Sep 17 00:00:00 2001 From: Mikhail Khodjaiants Date: Wed, 10 Nov 2004 22:52:50 +0000 Subject: [PATCH] Fix for bug 77437: Disassembly blocks with no associated source code has PC pointer on wrong line. --- debug/org.eclipse.cdt.debug.ui/ChangeLog | 4 ++++ .../internal/ui/views/disassembly/DisassemblyEditorInput.java | 3 ++- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/debug/org.eclipse.cdt.debug.ui/ChangeLog b/debug/org.eclipse.cdt.debug.ui/ChangeLog index 5370656e4e4..9362f8efe48 100644 --- a/debug/org.eclipse.cdt.debug.ui/ChangeLog +++ b/debug/org.eclipse.cdt.debug.ui/ChangeLog @@ -1,3 +1,7 @@ +2004-11-10 Mikhail Khodjaiants + Fix for bug 77437: Disassembly blocks with no associated source code has PC pointer on wrong line. + * DisassemblyEditorInput.java + 2004-11-09 Mikhail Khodjaiants Partial fix for bug 41725: I can't set a breakpoint in a function where I used attach source. * CDTDebugModelPresentation.java 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 a49aec8aaf7..75e52eac7dd 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 @@ -132,7 +132,8 @@ public class DisassemblyEditorInput implements IEditorInput { int result = 0; for ( int i = 0; i < lines.length; ++i ) { IAsmInstruction[] instructions = lines[i].getInstructions(); - ++result; + if ( fBlock.isMixedMode() ) + ++result; for ( int j = 0; j < instructions.length; ++j ) { ++result; if ( address.equals( instructions[j].getAdress() ) ) {