mirrors/cdt
1
0
Fork 0
mirror of https://github.com/eclipse-cdt/cdt synced 2025-07-23 17:05:26 +02:00
Code Issues Wiki Activity

Bug 117754: Stack frame can't display address.

Browse source
This commit is contained in:
Mikhail Khodjaiants 2005-11-23 19:52:33 +00:00
parent 847a638e03
commit 4075cacd7d
2 changed files with 25 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
debug/org.eclipse.cdt.debug.ui/ChangeLog
View file

@ -1,3 +1,7 @@
2005-11-23 Mikhail Khodjaiants
Bug 117754: Stack frame can't display address.
* CDebugModelPresentation.java
2005-10-19 Mikhail Khodjaiants
Bug 113114: Expanding Modules View throws SWTError: No more handles.
* ModulesView.java

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

@ -13,6 +13,7 @@ package org.eclipse.cdt.debug.internal.ui;
import java.io.File;
import java.text.MessageFormat;
import java.util.HashMap;
import org.eclipse.cdt.core.IAddress;
import org.eclipse.cdt.core.resources.FileStorage;
import org.eclipse.cdt.debug.core.CDebugUtils;
import org.eclipse.cdt.debug.core.cdi.ICDIBreakpointHit;
@ -856,26 +857,30 @@ public class CDebugModelPresentation extends LabelProvider implements IDebugMode
label.append( frame.getLevel() );
label.append( ' ' );
String function = frame.getFunction();
if ( function != null ) {
if ( isEmpty( function ) ) {
label.append( CDebugUIMessages.getString( "CDTDebugModelPresentation.21" ) ); //$NON-NLS-1$
}
else {
function = function.trim();
if ( function.length() > 0 ) {
label.append( function );
label.append( "() " ); //$NON-NLS-1$
if ( frame.getFile() != null ) {
IPath path = new Path( frame.getFile() );
if ( !path.isEmpty() ) {
label.append( CDebugUIMessages.getString( "CDTDebugModelPresentation.20" ) ); //$NON-NLS-1$
label.append( ' ' );
label.append( (qualified ? path.toOSString() : path.lastSegment()) );
label.append( ':' );
if ( frame.getFrameLineNumber() != 0 )
label.append( frame.getFrameLineNumber() );
}
label.append( function );
label.append( "() " ); //$NON-NLS-1$
if ( frame.getFile() != null ) {
IPath path = new Path( frame.getFile() );
if ( !path.isEmpty() ) {
label.append( CDebugUIMessages.getString( "CDTDebugModelPresentation.20" ) ); //$NON-NLS-1$
label.append( ' ' );
label.append( (qualified ? path.toOSString() : path.lastSegment()) );
label.append( ':' );
if ( frame.getFrameLineNumber() != 0 )
label.append( frame.getFrameLineNumber() );
}
}
}
if ( isEmpty( function ) )
label.append( CDebugUIMessages.getString( "CDTDebugModelPresentation.21" ) ); //$NON-NLS-1$
IAddress address = frame.getAddress();
if ( address != null ) {
label.append( ' ' );
label.append( address.toHexAddressString() );
}
return label.toString();
}
return (f.getAdapter( IDummyStackFrame.class ) != null) ? getDummyStackFrameLabel( f ) : f.getName();