mirrors/cdt
1
0
Fork 0
mirror of https://github.com/eclipse-cdt/cdt synced 2025-04-23 22:52:11 +02:00
Code Issues Wiki Activity

org.eclipse.cdt.debug.internal.core/CBreakpointManager.java

Browse source 
219863 nor P3 Wind regression: Address breakpoints inserted from console do not resolve location properly


Patch from Elena.
This commit is contained in:
Alain Magloire 2008-03-28 15:15:24 +00:00
parent ae2edb62e6
commit 1ffac28c6d
1 changed files with 39 additions and 29 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

66
debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/CBreakpointManager.java
View file

@ -826,10 +826,10 @@ public class CBreakpointManager implements IBreakpointsListener, IBreakpointMana
try {
ICDILocator location = cdiBreakpoint.getLocator();
String file = location.getFile();
if ( cdiBreakpoint instanceof ICDILineBreakpoint ) {
Object sourceElement = getSourceElement( file );
String sourceHandle = file;
IResource resource = getProject();
String sourceHandle = file;
IResource resource = getProject();
if (file != null && file.length() > 0) {
Object sourceElement = getSourceElement(file);
if ( sourceElement instanceof IFile ) {
sourceHandle = ((IFile)sourceElement).getLocation().toOSString();
resource = (IResource)sourceElement;
@ -848,14 +848,17 @@ public class CBreakpointManager implements IBreakpointsListener, IBreakpointMana
resource = getProject();
}
}
} else {
sourceHandle = getExecFileHandle();
}
if ( cdiBreakpoint instanceof ICDILineBreakpoint ) {
breakpoint = createLineBreakpoint( sourceHandle, resource, cdiBreakpoint );
}
else if ( cdiBreakpoint instanceof ICDIFunctionBreakpoint ) {
breakpoint = createFunctionBreakpoint( cdiBreakpoint );
breakpoint = createFunctionBreakpoint( sourceHandle, resource,cdiBreakpoint );
}
else if ( cdiBreakpoint instanceof ICDIAddressBreakpoint ) {
breakpoint = createAddressBreakpoint( cdiBreakpoint );
breakpoint = createAddressBreakpoint( sourceHandle, resource,cdiBreakpoint );
}
}
catch( CDIException e ) {
@ -883,31 +886,38 @@ public class CBreakpointManager implements IBreakpointsListener, IBreakpointMana
return breakpoint;
}
private ICFunctionBreakpoint createFunctionBreakpoint( ICDILocationBreakpoint cdiBreakpoint ) throws CDIException, CoreException {
ICFunctionBreakpoint breakpoint = CDIDebugModel.createFunctionBreakpoint( getExecFileHandle(),
getProject(),
cdiBreakpoint.getLocator().getFunction(),
-1,
-1,
-1,
cdiBreakpoint.isEnabled(),
cdiBreakpoint.getCondition().getIgnoreCount(),
cdiBreakpoint.getCondition().getExpression(),
false );
private ICFunctionBreakpoint createFunctionBreakpoint( String sourceHandle, IResource resource, ICDILocationBreakpoint cdiBreakpoint ) throws CDIException, CoreException {
ICDILocator location = cdiBreakpoint.getLocator();
int line = location.getLineNumber();
ICFunctionBreakpoint breakpoint = CDIDebugModel.createFunctionBreakpoint(
sourceHandle,
resource,
location.getFunction(),
-1,
-1,
line,
cdiBreakpoint.isEnabled(),
cdiBreakpoint.getCondition().getIgnoreCount(),
cdiBreakpoint.getCondition().getExpression(),
false);
return breakpoint;
}
private ICAddressBreakpoint createAddressBreakpoint( ICDILocationBreakpoint cdiBreakpoint ) throws CDIException, CoreException {
String sourceHandle = getExecFileHandle();
private ICAddressBreakpoint createAddressBreakpoint( String sourceHandle, IResource resource, ICDILocationBreakpoint cdiBreakpoint ) throws CDIException, CoreException {
String binary = getExecFileHandle();
IAddress address = getDebugTarget().getAddressFactory().createAddress( cdiBreakpoint.getLocator().getAddress() );
ICAddressBreakpoint breakpoint = CDIDebugModel.createAddressBreakpoint( sourceHandle,
sourceHandle,
ResourcesPlugin.getWorkspace().getRoot(),
address,
cdiBreakpoint.isEnabled(),
cdiBreakpoint.getCondition().getIgnoreCount(),
cdiBreakpoint.getCondition().getExpression(),
false );
ICDILocator location = cdiBreakpoint.getLocator();
int line = location.getLineNumber();
ICAddressBreakpoint breakpoint = CDIDebugModel.createAddressBreakpoint(
binary,
sourceHandle,
resource,
line,
address,
cdiBreakpoint.isEnabled(),
cdiBreakpoint.getCondition().getIgnoreCount(),
cdiBreakpoint.getCondition().getExpression(),
false);
return breakpoint;
}