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

Use the new "createAddress" method of "IAddressFactory".

Browse source
This commit is contained in:
Mikhail Khodjaiants 2004-09-29 15:14:44 +00:00
parent bab0c22d3a
commit 4989ad3e7a
7 changed files with 23 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
debug/org.eclipse.cdt.debug.core/ChangeLog
View file

@ -1,3 +1,12 @@
2004-09-29 Mikhail Khodjaiants
Use the new "createAddress(BigInteger)" method of "IAddressFactory".
* CBreakpointManager.java
* AsmInstruction.java
* CFormattedMemoryBlock.java
* CSharedLibrary.java
* CStackFrame.java
* CValue.java
2004-09-28 Mikhail Khodjaiants 2004-09-28 Mikhail Khodjaiants
Synchronize the "getType" method of "CVariable.InternalVariable". Synchronize the "getType" method of "CVariable.InternalVariable".
* CVariable.java * CVariable.java

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

@ -268,7 +268,7 @@ public class CBreakpointManager implements IBreakpointManagerListener, ICDIEvent
ICDILocation location = ((ICDILocationBreakpoint)cdiBreakpoint).getLocation(); ICDILocation location = ((ICDILocationBreakpoint)cdiBreakpoint).getLocation();
if ( location != null ) { if ( location != null ) {
IAddressFactory factory = getDebugTarget().getAddressFactory(); IAddressFactory factory = getDebugTarget().getAddressFactory();
return factory.createAddress( location.getAddress().toString() ); return factory.createAddress( location.getAddress() );
} }
} }
catch( CDIException e ) { catch( CDIException e ) {
@ -630,7 +630,7 @@ public class CBreakpointManager implements IBreakpointManagerListener, ICDIEvent
private ICAddressBreakpoint createAddressBreakpoint( ICDILocationBreakpoint cdiBreakpoint ) throws CDIException, CoreException { private ICAddressBreakpoint createAddressBreakpoint( ICDILocationBreakpoint cdiBreakpoint ) throws CDIException, CoreException {
IFile execFile = getExecFile(); IFile execFile = getExecFile();
String sourceHandle = execFile.getFullPath().toOSString(); String sourceHandle = execFile.getFullPath().toOSString();
IAddress address = getDebugTarget().getAddressFactory().createAddress( cdiBreakpoint.getLocation().getAddress().toString() ); IAddress address = getDebugTarget().getAddressFactory().createAddress( cdiBreakpoint.getLocation().getAddress() );
ICAddressBreakpoint breakpoint = CDIDebugModel.createAddressBreakpoint( sourceHandle, ICAddressBreakpoint breakpoint = CDIDebugModel.createAddressBreakpoint( sourceHandle,
execFile, execFile,
address, address,

2
debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/model/AsmInstruction.java
View file

@ -29,7 +29,7 @@ public class AsmInstruction implements IAsmInstruction {
*/ */
public AsmInstruction( IAddressFactory factory, ICDIInstruction cdiInstruction ) { public AsmInstruction( IAddressFactory factory, ICDIInstruction cdiInstruction ) {
fCDIInstruction = cdiInstruction; fCDIInstruction = cdiInstruction;
fAddress = factory.createAddress( cdiInstruction.getAdress().toString() ); fAddress = factory.createAddress( cdiInstruction.getAdress() );
} }
/* (non-Javadoc) /* (non-Javadoc)

4
debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/model/CFormattedMemoryBlock.java
View file

@ -296,7 +296,7 @@ public class CFormattedMemoryBlock extends CDebugElement
IAddressFactory factory = ((CDebugTarget)getDebugTarget()).getAddressFactory(); IAddressFactory factory = ((CDebugTarget)getDebugTarget()).getAddressFactory();
if ( fCDIMemoryBlock != null ) if ( fCDIMemoryBlock != null )
{ {
return factory.createAddress( fCDIMemoryBlock.getStartAddress().toString() ); return factory.createAddress( fCDIMemoryBlock.getStartAddress() );
} }
return factory.getZero(); return factory.getZero();
} }
@ -506,7 +506,7 @@ public class CFormattedMemoryBlock extends CDebugElement
BigInteger[] bigs = event.getAddresses(); BigInteger[] bigs = event.getAddresses();
IAddress[] addresses = new IAddress[bigs.length]; IAddress[] addresses = new IAddress[bigs.length];
for (int i = 0; i < addresses.length; ++i) { for (int i = 0; i < addresses.length; ++i) {
addresses[i] = factory.createAddress( bigs[i].toString() ); addresses[i] = factory.createAddress( bigs[i] );
} }
setChangedAddresses( addresses ); setChangedAddresses( addresses );
fireChangeEvent( DebugEvent.CONTENT ); fireChangeEvent( DebugEvent.CONTENT );

4
debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/model/CSharedLibrary.java
View file

@ -58,7 +58,7 @@ public class CSharedLibrary extends CDebugElement
{ {
IAddressFactory factory = ((CDebugTarget)getDebugTarget()).getAddressFactory(); IAddressFactory factory = ((CDebugTarget)getDebugTarget()).getAddressFactory();
if ( getCDISharedLibrary() != null ) if ( getCDISharedLibrary() != null )
return factory.createAddress(getCDISharedLibrary().getStartAddress().toString()); return factory.createAddress( getCDISharedLibrary().getStartAddress() );
return factory.getZero(); return factory.getZero();
} }
@ -69,7 +69,7 @@ public class CSharedLibrary extends CDebugElement
{ {
IAddressFactory factory = ((CDebugTarget)getDebugTarget()).getAddressFactory(); IAddressFactory factory = ((CDebugTarget)getDebugTarget()).getAddressFactory();
if ( getCDISharedLibrary() != null ) if ( getCDISharedLibrary() != null )
return factory.createAddress(getCDISharedLibrary().getEndAddress().toString()); return factory.createAddress( getCDISharedLibrary().getEndAddress() );
return factory.getZero(); return factory.getZero();
} }

6
debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/model/CStackFrame.java
View file

@ -36,6 +36,7 @@ import org.eclipse.cdt.debug.internal.core.CExpressionTarget;
import org.eclipse.cdt.debug.internal.core.CGlobalVariableManager; import org.eclipse.cdt.debug.internal.core.CGlobalVariableManager;
import org.eclipse.core.runtime.IAdaptable; import org.eclipse.core.runtime.IAdaptable;
import org.eclipse.debug.core.DebugException; import org.eclipse.debug.core.DebugException;
import org.eclipse.debug.core.model.IMemoryBlockRetrieval;
import org.eclipse.debug.core.model.IRegisterGroup; import org.eclipse.debug.core.model.IRegisterGroup;
import org.eclipse.debug.core.model.ISourceLocator; import org.eclipse.debug.core.model.ISourceLocator;
import org.eclipse.debug.core.model.IStackFrame; import org.eclipse.debug.core.model.IStackFrame;
@ -469,6 +470,9 @@ public class CStackFrame extends CDebugElement implements ICStackFrame, IRestart
if ( adapter == ICDIStackFrame.class ) { if ( adapter == ICDIStackFrame.class ) {
return getCDIStackFrame(); return getCDIStackFrame();
} }
if ( adapter == IMemoryBlockRetrieval.class ) {
return getDebugTarget().getAdapter( adapter );
}
return super.getAdapter( adapter ); return super.getAdapter( adapter );
} }
@ -534,7 +538,7 @@ public class CStackFrame extends CDebugElement implements ICStackFrame, IRestart
*/ */
public IAddress getAddress() { public IAddress getAddress() {
IAddressFactory factory = ((CDebugTarget)getDebugTarget()).getAddressFactory(); IAddressFactory factory = ((CDebugTarget)getDebugTarget()).getAddressFactory();
return factory.createAddress( getCDIStackFrame().getLocation().getAddress().toString() ); return factory.createAddress( getCDIStackFrame().getLocation().getAddress() );
} }
/* (non-Javadoc) /* (non-Javadoc)

4
debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/model/CValue.java
View file

@ -354,7 +354,7 @@ public class CValue extends AbstractCValue {
private String getPointerValueString( ICDIPointerValue value ) throws CDIException { private String getPointerValueString( ICDIPointerValue value ) throws CDIException {
//TODO:IPF_TODO Workaround to solve incorrect handling of structures referenced by pointers or references //TODO:IPF_TODO Workaround to solve incorrect handling of structures referenced by pointers or references
IAddressFactory factory = ((CDebugTarget)getDebugTarget()).getAddressFactory(); IAddressFactory factory = ((CDebugTarget)getDebugTarget()).getAddressFactory();
IAddress address = factory.createAddress( value.pointerValue().toString() ); IAddress address = factory.createAddress( value.pointerValue() );
if ( address == null ) if ( address == null )
return ""; //$NON-NLS-1$ return ""; //$NON-NLS-1$
CVariableFormat format = getParentVariable().getFormat(); CVariableFormat format = getParentVariable().getFormat();
@ -372,7 +372,7 @@ public class CValue extends AbstractCValue {
BigInteger refValue = value.referenceValue(); BigInteger refValue = value.referenceValue();
if ( refValue == null ) if ( refValue == null )
return ""; //$NON-NLS-1$ return ""; //$NON-NLS-1$
IAddress address = factory.createAddress( refValue.toString() ); IAddress address = factory.createAddress( refValue );
if ( address == null ) if ( address == null )
return ""; //$NON-NLS-1$ return ""; //$NON-NLS-1$
CVariableFormat format = getParentVariable().getFormat(); CVariableFormat format = getParentVariable().getFormat();