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

Applied patch to 204028. Setting an address breakpoint in a session with no symbolics (executable) would NPE.

Browse source
This commit is contained in:
John Cortell 2008-01-04 21:16:32 +00:00
parent e1478e3c72
commit 048b012111
2 changed files with 52 additions and 31 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -26,6 +26,7 @@ import java.util.Map;
import java.util.Set;
import org.eclipse.cdt.core.IAddress;
import org.eclipse.cdt.core.IAddressFactory;
import org.eclipse.cdt.core.IBinaryParser.IBinaryObject;
import org.eclipse.cdt.debug.core.CDIDebugModel;
import org.eclipse.cdt.debug.core.CDebugUtils;
import org.eclipse.cdt.debug.core.cdi.CDIException;
@ -847,9 +848,7 @@ public class CBreakpointManager implements IBreakpointsListener, IBreakpointMana
}
private ICFunctionBreakpoint createFunctionBreakpoint( ICDILocationBreakpoint cdiBreakpoint ) throws CDIException, CoreException {
IPath execFile = getExecFilePath();
String sourceHandle = execFile.toOSString();
ICFunctionBreakpoint breakpoint = CDIDebugModel.createFunctionBreakpoint( sourceHandle,
ICFunctionBreakpoint breakpoint = CDIDebugModel.createFunctionBreakpoint( getExecFileHandle(),
getProject(),
cdiBreakpoint.getLocator().getFunction(),
-1,
@ -863,8 +862,7 @@ public class CBreakpointManager implements IBreakpointsListener, IBreakpointMana
}
private ICAddressBreakpoint createAddressBreakpoint( ICDILocationBreakpoint cdiBreakpoint ) throws CDIException, CoreException {
IPath execFile = getExecFilePath();
String sourceHandle = execFile.toOSString();
String sourceHandle = getExecFileHandle();
IAddress address = getDebugTarget().getAddressFactory().createAddress( cdiBreakpoint.getLocator().getAddress() );
ICAddressBreakpoint breakpoint = CDIDebugModel.createAddressBreakpoint( sourceHandle,
sourceHandle,
@ -878,8 +876,7 @@ public class CBreakpointManager implements IBreakpointsListener, IBreakpointMana
}
private ICWatchpoint createWatchpoint( ICDIWatchpoint cdiWatchpoint ) throws CDIException, CoreException {
IPath execFile = getExecFilePath();
String sourceHandle = execFile.toOSString();
String sourceHandle = getExecFileHandle();
ICWatchpoint watchpoint = null;
if ( cdiWatchpoint instanceof ICDIWatchpoint2 ){
watchpoint = CDIDebugModel.createWatchpoint( sourceHandle,
@ -1058,28 +1055,42 @@ public class CBreakpointManager implements IBreakpointsListener, IBreakpointMana
return s;
}
/**
* Checks for a match between the symbolics referenced by the breakpoint
* and the symbolics of the contained CDebugTarget.
* @param breakpoint
* @return true if the symbolics match or if the breakpoint has no symbolics
*/
public boolean supportsAddressBreakpoint( ICAddressBreakpoint breakpoint ) {
String module = null;
boolean sessionHasSymbols = getExecFileHandle() != null && getExecFileHandle().length() > 0;
boolean bpHasSymbols = false;
try {
module = breakpoint.getModule();
String module = breakpoint.getModule();
if ( module != null && module.length() > 0 ) {
bpHasSymbols = true;
if ( sessionHasSymbols ) {
return getExecFileHandle().equals( module );
}
}
}
catch( CoreException e ) {
}
if ( module != null && getExecFilePath() != null )
return getExecFilePath().toOSString().equals( module );
// supporting old breakpoints (> 3.0)
String sourceHandle = null;
try {
sourceHandle = breakpoint.getSourceHandle();
String sourceHandle = breakpoint.getSourceHandle();
if ( sourceHandle != null && sourceHandle.length() > 0 ) {
bpHasSymbols = true;
if ( sessionHasSymbols ) {
return getExecFileHandle().equals( sourceHandle );
}
}
}
catch( CoreException e ) {
}
if ( sourceHandle != null && getExecFilePath() != null )
return getExecFilePath().toOSString().equals( sourceHandle );
return module != null && module.length() == 0 &&
sourceHandle != null && sourceHandle.length() == 0;
// an address breakpoint can also be set in the absence of any symbols
return !bpHasSymbols;
}
public void skipBreakpoints( boolean enabled ) {
@ -1131,10 +1142,18 @@ public class CBreakpointManager implements IBreakpointsListener, IBreakpointMana
return getDebugTarget().getProject();
}
private IPath getExecFilePath() {
if (getDebugTarget() == null || getDebugTarget().getExecFile() == null)
return null;
return getDebugTarget().getExecFile().getPath();
private String getExecFileHandle() {
CDebugTarget target = getDebugTarget();
if ( target != null ) {
IBinaryObject binary = target.getExecFile();
if ( binary != null ) {
IPath path = binary.getPath();
if ( path != null ) {
return path.toOSString();
}
}
}
return null;
}
private ISourceLocator getSourceLocator() {

22
debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/CDebugModelPresentation.java
View file

@ -147,16 +147,18 @@ public class CDebugModelPresentation extends LabelProvider implements IDebugMode
IFile file = null;
try {
String handle = b.getSourceHandle();
IPath path = new Path( handle );
if ( path.isValidPath( handle ) ) {
IFile[] files = ResourcesPlugin.getWorkspace().getRoot().findFilesForLocation( path );
if ( files.length > 0 ) {
file = files[0];
}
else {
File fsfile = new File( handle );
if ( fsfile.isFile() && fsfile.exists() ) {
return new ExternalEditorInput( new LocalFileStorage( fsfile ) );
if ( handle != null ) {
IPath path = new Path( handle );
if ( path.isValidPath( handle ) ) {
IFile[] files = ResourcesPlugin.getWorkspace().getRoot().findFilesForLocation( path );
if ( files.length > 0 ) {
file = files[0];
}
else {
File fsfile = new File( handle );
if ( fsfile.isFile() && fsfile.exists() ) {
return new ExternalEditorInput( new LocalFileStorage( fsfile ) );
}
}
}
}