Skip to main content
summaryrefslogtreecommitdiffstats
path: root/dsf
diff options
context:
space:
mode:
authorAnton Leherbauer2011-04-07 10:35:30 -0400
committerAnton Leherbauer2011-04-07 10:35:30 -0400
commit4d0e215d55d0a0db616d3ae5057f2ac08410a33c (patch)
tree67c5833e4f5d3634a9bf3a62eef2a9f1679f96c8 /dsf
parent7b8fb761448b5c3a9af4608c962d4a362c61d265 (diff)
downloadorg.eclipse.cdt-4d0e215d55d0a0db616d3ae5057f2ac08410a33c.tar.gz
org.eclipse.cdt-4d0e215d55d0a0db616d3ae5057f2ac08410a33c.tar.xz
org.eclipse.cdt-4d0e215d55d0a0db616d3ae5057f2ac08410a33c.zip
Bug 342169 - [disassembly] Breakpoints on external source files are not displayed
Diffstat (limited to 'dsf')
-rw-r--r--dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/internal/ui/disassembly/model/BreakpointsAnnotationModel.java19
1 files changed, 7 insertions, 12 deletions
diff --git a/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/internal/ui/disassembly/model/BreakpointsAnnotationModel.java b/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/internal/ui/disassembly/model/BreakpointsAnnotationModel.java
index 86ea16680f..6e5067b95c 100644
--- a/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/internal/ui/disassembly/model/BreakpointsAnnotationModel.java
+++ b/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/internal/ui/disassembly/model/BreakpointsAnnotationModel.java
@@ -201,24 +201,19 @@ public class BreakpointsAnnotationModel extends AnnotationModel implements IBrea
return position;
}
}
- if (breakpoint instanceof ICLineBreakpoint) {
+ String fileName= marker.getAttribute(ICLineBreakpoint.SOURCE_HANDLE, null);
+ position= createPositionFromSourceLine(fileName, lineNumber);
+ if (position == null && breakpoint instanceof ICLineBreakpoint) {
ICLineBreakpoint cBreakpoint= (ICLineBreakpoint) breakpoint;
- position= createPositionFromSourceLine(cBreakpoint.getFileName(), lineNumber);
- if (position == null) {
- if (breakpoint instanceof ICFunctionBreakpoint) {
- position= createPositionFromLabel(cBreakpoint.getFunction());
- } else {
- position= createPositionFromAddress(decodeAddress(cBreakpoint.getAddress()));
- }
+ if (breakpoint instanceof ICFunctionBreakpoint) {
+ position= createPositionFromLabel(cBreakpoint.getFunction());
+ } else {
+ position= createPositionFromAddress(decodeAddress(cBreakpoint.getAddress()));
}
- } else {
- String fileName= marker.getAttribute(ICLineBreakpoint.SOURCE_HANDLE, null);
- position= createPositionFromSourceLine(fileName, lineNumber);
}
return position;
}
}
-
return null;
}

Back to the top