| [cdt-patch] Refactoring org.eclipse.cdt.debug.core |
|
Index:
ChangeLog
=================================================================== RCS file: /home/tools/org.eclipse.cdt.debug.core/ChangeLog,v retrieving revision 1.68 diff -u -r1.68 ChangeLog --- ChangeLog 2 Dec 2002 20:32:46 -0000 1.68 +++ ChangeLog 2 Dec 2002 23:16:37 -0000 @@ -1,4 +1,30 @@ 2002-12-02 Mikhail Khodjaiants + Refactoring - files moved from org.eclipse.cdt.debug.core to the new package: org.eclipse.cdt.debug.core.model: + * ICBreakpoint.java + * ICDebugTarget.java + * ICExpressionEvaluator.java + * ICFunctionBreakpoint.java + * ICLineBreakpoint.java + * ICValue.java + * ICWatchpoint.java + * IDebuggerProcessSupport.java + * IDummyStackFrame.java + * IExecFileInfo.java + * IFormattedMemoryBlock.java + * IFormattedMemoryBlockRow.java + * IGlobalVariable.java + * IInstructionStep.java + * IRestart.java + * IRunToLine.java + * IStackFrameInfo.java + * IState.java + * ISwitchToFrame.java + * ISwitchToThread.java + * ICDebugTargetType.java: new interface + * IFormattedMemoryRetrieval: removed + + +2002-12-02 Mikhail Khodjaiants Check if the underlying IFile exists when retrieving the path of global variable. * CDebugTarget.java Index: src/org/eclipse/cdt/debug/core/CDebugModel.java =================================================================== RCS file: /home/tools/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/CDebugModel.java,v retrieving revision 1.37 diff -u -r1.37 CDebugModel.java --- src/org/eclipse/cdt/debug/core/CDebugModel.java 20 Nov 2002 21:51:43 -0000 1.37 +++ src/org/eclipse/cdt/debug/core/CDebugModel.java 2 Dec 2002 23:16:37 -0000 @@ -18,6 +18,11 @@ import org.eclipse.cdt.debug.core.cdi.model.ICDIMemoryBlock; import org.eclipse.cdt.debug.core.cdi.model.ICDIObject; import org.eclipse.cdt.debug.core.cdi.model.ICDITarget; +import org.eclipse.cdt.debug.core.model.ICBreakpoint; +import org.eclipse.cdt.debug.core.model.ICDebugTargetType; +import org.eclipse.cdt.debug.core.model.ICLineBreakpoint; +import org.eclipse.cdt.debug.core.model.ICWatchpoint; +import org.eclipse.cdt.debug.core.model.IFormattedMemoryBlock; import org.eclipse.cdt.debug.internal.core.CDebugUtils; import org.eclipse.cdt.debug.internal.core.ICDebugInternalConstants; import org.eclipse.cdt.debug.internal.core.breakpoints.CLineBreakpoint; Index: src/org/eclipse/cdt/debug/core/ICAddressBreakpoint.java =================================================================== RCS file: src/org/eclipse/cdt/debug/core/ICAddressBreakpoint.java diff -N src/org/eclipse/cdt/debug/core/ICAddressBreakpoint.java --- src/org/eclipse/cdt/debug/core/ICAddressBreakpoint.java 21 Aug 2002 22:19:11 -0000 1.1 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,35 +0,0 @@ -/* - *(c) Copyright QNX Software Systems Ltd. 2002. - * All Rights Reserved. - * - */ -package org.eclipse.cdt.debug.core; - -import org.eclipse.core.runtime.CoreException; - -/** - * - * A breakpoint that suspend execution when a particular address is reached. - * - * @since Aug 21, 2002 - */ -public interface ICAddressBreakpoint extends ICLineBreakpoint -{ - /** - * Returns the address this breakpoint suspends execution at. - * - * @return the address this breakpoint suspends execution at - * @exception CoreException if unable to access the property - * on this breakpoint's underlying marker - */ - public String getAddress() throws CoreException; - - /** - * Sets the address this breakpoint suspends execution at. - * - * @param address the address this breakpoint suspends execution at - * @exception CoreException if unable to access the property - * on this breakpoint's underlying marker - */ - public void setAddress( String address ) throws CoreException; -} Index: src/org/eclipse/cdt/debug/core/ICBreakpoint.java =================================================================== RCS file: src/org/eclipse/cdt/debug/core/ICBreakpoint.java diff -N src/org/eclipse/cdt/debug/core/ICBreakpoint.java --- src/org/eclipse/cdt/debug/core/ICBreakpoint.java 4 Sep 2002 20:50:20 -0000 1.4 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,119 +0,0 @@ -/* - *(c) Copyright QNX Software Systems Ltd. 2002. - * All Rights Reserved. - * - */ - -package org.eclipse.cdt.debug.core; - -import org.eclipse.core.runtime.CoreException; -import org.eclipse.debug.core.model.IBreakpoint; - -/** - * - * A breakpoint specific to the C/C++ debug model. A C/C++ breakpoint supports: - * <ul> - * <li>a condition</li> - * <li>an ignore count</li> - * <li>a thread filter to restrict a breakpoin to a specific thread</li> - * <li>an installed property that indicates a breakpoint was successfully - * installed in debug target</li> - * </ul> - * - * @since Aug 21, 2002 - */ -public interface ICBreakpoint extends IBreakpoint -{ - /** - * Breakpoint attribute storing the number of debug targets a - * breakpoint is installed in (value <code>"org.eclipse.cdt.debug.core.installCount"</code>). - * This attribute is a <code>int</code>. - */ - public static final String INSTALL_COUNT = "org.eclipse.cdt.debug.core.installCount"; //$NON-NLS-1$ - - /** - * Breakpoint attribute storing the conditional _expression_ - * associated with this breakpoint (value <code>"org.eclipse.cdt.debug.core.condition"</code>). - * This attribute is a <code>String</code>. - */ - public static final String CONDITION = "org.eclipse.cdt.debug.core.condition"; //$NON-NLS-1$ - - /** - * Breakpoint attribute storing a breakpoint's ignore count value - * (value <code>"org.eclipse.cdt.debug.core.ignoreCount"</code>). - * This attribute is a <code>int</code>. - */ - public static final String IGNORE_COUNT = "org.eclipse.cdt.debug.core.ignoreCount"; //$NON-NLS-1$ - - /** - * Breakpoint attribute storing an identifier of the thread this - * breakpoint is restricted in (value <code>"org.eclipse.cdt.debug.core.threadId"</code>). - * This attribute is a <code>String</code>. - */ - public static final String THREAD_ID = "org.eclipse.cdt.debug.core.threadId"; //$NON-NLS-1$ - - /** - * Returns whether this breakpoint is installed in at least - * one debug target. - * - * @return whether this breakpoint is installed - * @exception CoreException if unable to access the property - * on this breakpoint's underlying marker - */ - public boolean isInstalled() throws CoreException; - - /** - * Returns the conditional _expression_ associated with this breakpoint. - * - * @return this breakpoint's conditional _expression_ - * @exception CoreException if unable to access the property - * on this breakpoint's underlying marker - */ - public String getCondition() throws CoreException; - - /** - * Sets the condition associated with this breakpoint. - * - * @param condition the conditional _expression_ - * @exception CoreException if unable to access the property - * on this breakpoint's underlying marker - */ - public void setCondition( String condition ) throws CoreException; - - /** - * Returns the ignore count used by this breakpoint. - * - * @return the ignore count used by this breakpoint - * @exception CoreException if unable to access the property - * on this breakpoint's underlying marker - */ - public int getIgnoreCount() throws CoreException; - - /** - * Sets the ignore count attribute for this breakpoint. - * - * @param ignoreCount the new ignore count - * @exception CoreException if unable to access the property - * on this breakpoint's underlying marker - */ - public void setIgnoreCount( int ignoreCount ) throws CoreException; - - /** - * Returns the identifier of the thread this breakpoint is restricted in. - * - * @return the thread identifier - * @exception CoreException if unable to access the property - * on this breakpoint's underlying marker - */ - public String getThreadId() throws CoreException; - - /** - * Restricts this breakpoint to suspend only in the given thread - * when encounterd in the given thread's target. - * - * @param threadId the thread identifier - * @exception CoreException if unable to access the property - * on this breakpoint's underlying marker - */ - public void setThreadId( String threadId ) throws CoreException; -} Index: src/org/eclipse/cdt/debug/core/ICDebugTarget.java =================================================================== RCS file: src/org/eclipse/cdt/debug/core/ICDebugTarget.java diff -N src/org/eclipse/cdt/debug/core/ICDebugTarget.java --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ src/org/eclipse/cdt/debug/core/ICDebugTarget.java 2 Dec 2002 23:16:37 -0000 @@ -0,0 +1,25 @@ +/* + *(c) Copyright QNX Software Systems Ltd. 2002. + * All Rights Reserved. + * + */ +package org.eclipse.cdt.debug.core.model; + +import org.eclipse.debug.core.model.IDebugTarget; + +/** + * A C/C++ specific extension of IDebugTarget. + * + * @since: Dec 2, 2002 + */ +public interface ICDebugTarget extends IDebugTarget, + ICDebugTargetType, + ICExpressionEvaluator, + IDebuggerProcessSupport, + IExecFileInfo, + IRestart, + IRunToLine, + IState, + ISwitchToThread +{ +} Index: src/org/eclipse/cdt/debug/core/ICDebugTargetType.java =================================================================== RCS file: src/org/eclipse/cdt/debug/core/ICDebugTargetType.java diff -N src/org/eclipse/cdt/debug/core/ICDebugTargetType.java --- src/org/eclipse/cdt/debug/core/ICDebugTargetType.java 30 Sep 2002 20:21:01 -0000 1.1 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,22 +0,0 @@ -package org.eclipse.cdt.debug.core; - -/** - * - * Enter type comment. - * - * @since: Sep 30, 2002 - */ -public interface ICDebugTargetType -{ - public static final int TARGET_TYPE_UNKNOWN = 0; - public static final int TARGET_TYPE_LOCAL_RUN = 1; - public static final int TARGET_TYPE_LOCAL_ATTACH = 2; - public static final int TARGET_TYPE_LOCAL_CORE_DUMP = 3; - - /** - * Returns the type of this target. - * - * @return the type of this target - */ - int getTargetType(); -} Index: src/org/eclipse/cdt/debug/core/ICExpressionEvaluator.java =================================================================== RCS file: src/org/eclipse/cdt/debug/core/ICExpressionEvaluator.java diff -N src/org/eclipse/cdt/debug/core/ICExpressionEvaluator.java --- src/org/eclipse/cdt/debug/core/ICExpressionEvaluator.java 13 Sep 2002 18:32:40 -0000 1.1 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,34 +0,0 @@ -/* - *(c) Copyright QNX Software Systems Ltd. 2002. - * All Rights Reserved. - * - */ -package org.eclipse.cdt.debug.core; - -import org.eclipse.debug.core.DebugException; - -/** - * - * Supports the evaluation of C/C++ expressions. - * - * @since Sep 13, 2002 - */ -public interface ICExpressionEvaluator -{ - /** - * Evaluates the specified _expression_ and returns evaluation result - * as a string. - * - * @param _expression_ the _expression_ to evaluate - * @return the evaluation result - * @throws DebugException on failure. Reasons include: - */ - String evaluateExpressionToString( String _expression_ ) throws DebugException; - - /** - * Returns whether this object can currently evaluate an _expression_. - * - * @return whether this object can currently evaluate an _expression_ - */ - boolean canEvaluate(); -} Index: src/org/eclipse/cdt/debug/core/ICFunctionBreakpoint.java =================================================================== RCS file: src/org/eclipse/cdt/debug/core/ICFunctionBreakpoint.java diff -N src/org/eclipse/cdt/debug/core/ICFunctionBreakpoint.java --- src/org/eclipse/cdt/debug/core/ICFunctionBreakpoint.java 21 Aug 2002 22:19:11 -0000 1.1 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,35 +0,0 @@ -/* - *(c) Copyright QNX Software Systems Ltd. 2002. - * All Rights Reserved. - * - */ -package org.eclipse.cdt.debug.core; - -import org.eclipse.core.runtime.CoreException; - -/** - * - * A breakpoint that suspend execution when a function is entered. - * - * @since Aug 21, 2002 - */ -public interface ICFunctionBreakpoint extends ICLineBreakpoint -{ - /** - * Returns the function this breakpoint suspends execution in. - * - * @return the function this breakpoint suspends execution in - * @exception CoreException if unable to access the property - * on this breakpoint's underlying marker - */ - public String getFunction() throws CoreException; - - /** - * Sets the function this breakpoint suspends execution in. - * - * @param function the function this breakpoint suspends execution in - * @exception CoreException if unable to access the property - * on this breakpoint's underlying marker - */ - public void setFunction( String function ) throws CoreException; -} Index: src/org/eclipse/cdt/debug/core/ICLineBreakpoint.java =================================================================== RCS file: src/org/eclipse/cdt/debug/core/ICLineBreakpoint.java diff -N src/org/eclipse/cdt/debug/core/ICLineBreakpoint.java --- src/org/eclipse/cdt/debug/core/ICLineBreakpoint.java 21 Aug 2002 22:19:11 -0000 1.1 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,20 +0,0 @@ -/* - *(c) Copyright QNX Software Systems Ltd. 2002. - * All Rights Reserved. - * - */ - -package org.eclipse.cdt.debug.core; - -import org.eclipse.debug.core.model.ILineBreakpoint; - -/** - * - * A breakpoint that suspend execution when a particular line of code - * is reached. - * - * @since Aug 21, 2002 - */ -public interface ICLineBreakpoint extends ICBreakpoint, ILineBreakpoint -{ -} Index: src/org/eclipse/cdt/debug/core/ICMemoryManager.java =================================================================== RCS file: /home/tools/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/ICMemoryManager.java,v retrieving revision 1.2 diff -u -r1.2 ICMemoryManager.java --- src/org/eclipse/cdt/debug/core/ICMemoryManager.java 17 Oct 2002 23:17:01 -0000 1.2 +++ src/org/eclipse/cdt/debug/core/ICMemoryManager.java 2 Dec 2002 23:16:37 -0000 @@ -5,6 +5,7 @@ */ package org.eclipse.cdt.debug.core; +import org.eclipse.cdt.debug.core.model.IFormattedMemoryBlock; import org.eclipse.core.runtime.IAdaptable; import org.eclipse.debug.core.DebugException; Index: src/org/eclipse/cdt/debug/core/ICValue.java =================================================================== RCS file: src/org/eclipse/cdt/debug/core/ICValue.java diff -N src/org/eclipse/cdt/debug/core/ICValue.java --- src/org/eclipse/cdt/debug/core/ICValue.java 12 Sep 2002 22:22:39 -0000 1.3 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,41 +0,0 @@ -/* - *(c) Copyright QNX Software Systems Ltd. 2002. - * All Rights Reserved. - * - */ - -package org.eclipse.cdt.debug.core; - -import org.eclipse.cdt.debug.core.cdi.model.ICDIValue; -import org.eclipse.debug.core.model.IValue; - -/** - * - * Extends the IValue interface by C/C++ specific functionality. - * - * @since Sep 9, 2002 - */ -public interface ICValue extends IValue -{ - static final public int TYPE_SIMPLE = 0; - static final public int TYPE_ARRAY = 1; - static final public int TYPE_STRUCTURE = 2; - static final public int TYPE_STRING = 3; - static final public int TYPE_POINTER = 4; - static final public int TYPE_ARRAY_PARTITION = 5; - static final public int TYPE_ARRAY_ENTRY = 7; - static final public int TYPE_CHAR = 8; - static final public int TYPE_KEYWORD = 9; - - /** - * Returns the type of this value. - * - * @return the type of this value - */ - int getType(); - - /** - * Returns the underlying CDI value for this value. - */ - ICDIValue getUnderlyingValue(); -} Index: src/org/eclipse/cdt/debug/core/ICWatchpoint.java =================================================================== RCS file: src/org/eclipse/cdt/debug/core/ICWatchpoint.java diff -N src/org/eclipse/cdt/debug/core/ICWatchpoint.java --- src/org/eclipse/cdt/debug/core/ICWatchpoint.java 4 Sep 2002 20:50:20 -0000 1.1 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,58 +0,0 @@ -/* - *(c) Copyright QNX Software Systems Ltd. 2002. - * All Rights Reserved. - * - */ -package org.eclipse.cdt.debug.core; - -import org.eclipse.core.runtime.CoreException; - -/** - * - * A watchpoint specific to the C/C++ debug model. - * - * @since Sep 4, 2002 - */ -public interface ICWatchpoint extends ICBreakpoint -{ - /** - * Watchpoint attribute storing the _expression_ associated with this - * watchpoint (value <code>"org.eclipse.cdt.debug.core._expression_"</code>). - * This attribute is a <code>String</code>. - */ - public static final String _expression_ = "org.eclipse.cdt.debug.core._expression_"; //$NON-NLS-1$ - - /** - * Write access watchpoint attribute (value <code>"org.eclipse.cdt.debug.core.write"</code>). - * This attribute is a <code>boolean</code>. - */ - public static final String WRITE = "org.eclipse.cdt.debug.core.write"; //$NON-NLS-1$ - - /** - * Read access watchpoint attribute (value <code>"org.eclipse.cdt.debug.core.read"</code>). - * This attribute is a <code>boolean</code>. - */ - public static final String READ = "org.eclipse.cdt.debug.core.read"; //$NON-NLS-1$ - - /** - * Returns whether this watchppoint is a write watchpoint. - * - * @return whether this watchppoint is a write watchpoint - */ - boolean isWriteType() throws CoreException; - - /** - * Returns whether this watchppoint is a read watchpoint. - * - * @return whether this watchppoint is a read watchpoint - */ - boolean isReadType() throws CoreException; - - /** - * Returns the watchpoint's _expression_. - * - * @return the _expression_ of this watchpoint - * @throws CDIException if this method fails. Reasons include: - */ - String getExpression() throws CoreException; -} Index: src/org/eclipse/cdt/debug/core/IDebuggerProcessSupport.java =================================================================== RCS file: src/org/eclipse/cdt/debug/core/IDebuggerProcessSupport.java diff -N src/org/eclipse/cdt/debug/core/IDebuggerProcessSupport.java --- src/org/eclipse/cdt/debug/core/IDebuggerProcessSupport.java 23 Oct 2002 17:20:29 -0000 1.1 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,20 +0,0 @@ -/* - *(c) Copyright QNX Software Systems Ltd. 2002. - * All Rights Reserved. - * - */ -package org.eclipse.cdt.debug.core; - -/** - * Provides the functionality to support debugger console. - * - * @since: Oct 23, 2002 - */ -public interface IDebuggerProcessSupport -{ - boolean supportsDebuggerProcess(); - - boolean isDebuggerProcessDefault(); - - void setDebuggerProcessDefault( boolean value ); -} Index: src/org/eclipse/cdt/debug/core/IDisassemblyStorage.java =================================================================== RCS file: src/org/eclipse/cdt/debug/core/IDisassemblyStorage.java diff -N src/org/eclipse/cdt/debug/core/IDisassemblyStorage.java --- src/org/eclipse/cdt/debug/core/IDisassemblyStorage.java 8 Oct 2002 22:03:21 -0000 1.1 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,40 +0,0 @@ -/* - *(c) Copyright QNX Software Systems Ltd. 2002. - * All Rights Reserved. - * - */ - -package org.eclipse.cdt.debug.core; - -import org.eclipse.core.resources.IStorage; -import org.eclipse.debug.core.model.IDebugTarget; - -/** - * Defines methods specific to disassembly. - * - * @since: Oct 8, 2002 - */ -public interface IDisassemblyStorage extends IStorage -{ - /** - * Returns the debug target of this disassembly. - * - * @return the debug target of this disassembly - */ - IDebugTarget getDebugTarget(); - - /** - * Returns whether this storage contains the instructions at given address. - * - * @param address - an address - * @return whether this storage contains the instructions at given address - */ - boolean containsAddress( long address ); - - /** - * Returns the line number for given address. - * @param address - an address - * @return the line number for given address - */ - int getLineNumber( long address ) ; -} Index: src/org/eclipse/cdt/debug/core/IDummyStackFrame.java =================================================================== RCS file: src/org/eclipse/cdt/debug/core/IDummyStackFrame.java diff -N src/org/eclipse/cdt/debug/core/IDummyStackFrame.java --- src/org/eclipse/cdt/debug/core/IDummyStackFrame.java 16 Nov 2002 00:48:31 -0000 1.1 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,15 +0,0 @@ -/* - *(c) Copyright QNX Software Systems Ltd. 2002. - * All Rights Reserved. - * - */ -package org.eclipse.cdt.debug.core; - -/** - * Enter type comment. - * - * @since: Nov 13, 2002 - */ -public interface IDummyStackFrame -{ -} Index: src/org/eclipse/cdt/debug/core/IExecFileInfo.java =================================================================== RCS file: src/org/eclipse/cdt/debug/core/IExecFileInfo.java diff -N src/org/eclipse/cdt/debug/core/IExecFileInfo.java --- src/org/eclipse/cdt/debug/core/IExecFileInfo.java 5 Nov 2002 20:16:15 -0000 1.2 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,19 +0,0 @@ -/* - *(c) Copyright QNX Software Systems Ltd. 2002. - * All Rights Reserved. - * - */ - -package org.eclipse.cdt.debug.core; - -/** - * Provides access to executable file information. - * - * @since: Nov 1, 2002 - */ -public interface IExecFileInfo -{ - public boolean isLittleEndian(); - - public IGlobalVariable[] getGlobals(); -} Index: src/org/eclipse/cdt/debug/core/IFormattedMemoryBlock.java =================================================================== RCS file: src/org/eclipse/cdt/debug/core/IFormattedMemoryBlock.java diff -N src/org/eclipse/cdt/debug/core/IFormattedMemoryBlock.java --- src/org/eclipse/cdt/debug/core/IFormattedMemoryBlock.java 28 Nov 2002 19:12:27 -0000 1.15 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,135 +0,0 @@ -/* - *(c) Copyright QNX Software Systems Ltd. 2002. - * All Rights Reserved. - * - */ -package org.eclipse.cdt.debug.core; - -import org.eclipse.debug.core.DebugException; -import org.eclipse.debug.core.model.IMemoryBlock; - -/** - * - * A contiguos segment of memory in an execution context represented - * as a table of values. - * - * @since Jul 31, 2002 - */ -public interface IFormattedMemoryBlock extends IMemoryBlock -{ - public static final int MEMORY_SIZE_BYTE = 1; - public static final int MEMORY_SIZE_HALF_WORD = 2; - public static final int MEMORY_SIZE_WORD = 4; - public static final int MEMORY_SIZE_DOUBLE_WORD = 8; - public static final int MEMORY_SIZE_FLOAT = 8; - public static final int MEMORY_SIZE_DOUBLE_FLOAT = 16; - - public static final int MEMORY_FORMAT_HEX = 0; - public static final int MEMORY_FORMAT_BINARY = 1; - public static final int MEMORY_FORMAT_OCTAL = 2; - public static final int MEMORY_FORMAT_SIGNED_DECIMAL = 3; - public static final int MEMORY_FORMAT_UNSIGNED_DECIMAL = 4; - - public static final int MEMORY_NUMBER_OF_COLUMNS_1 = 1; - public static final int MEMORY_NUMBER_OF_COLUMNS_2 = 2; - public static final int MEMORY_NUMBER_OF_COLUMNS_4 = 4; - public static final int MEMORY_NUMBER_OF_COLUMNS_8 = 8; - public static final int MEMORY_NUMBER_OF_COLUMNS_16 = 16; - - /** - * Returns the address _expression_ specified to obtain this memory block. - * - * @return the address _expression_ - */ - public String getAddressExpression(); - - /** - * Returns the format of the memory words of this block. - * - * @return The format of the memory words of this block - */ - int getFormat(); - - /** - * Returns the size of each memory word in bytes. - * - * @return the size of each memory word in bytes - */ - int getWordSize(); - - /** - * Returns the number of rows in the output table. - * - * @return the number of rows in the output table - */ - int getNumberOfRows(); - - /** - * Returns the number of columns in the output table. - * - * @return the number of columns in the output table - */ - int getNumberOfColumns(); - - /** - * Returns whether each row should include an ASCII dump. - * - * @return whether each row should include an ASCII dump - */ - boolean displayASCII(); - - /** - * Returns the array of rows. - * - * @return the array of rows - */ - IFormattedMemoryBlockRow[] getRows(); - - - /** - * Sets the value of data item in this block at the specified - * index within this block to the spcified value. - * The index is zero based. - * - * @param index the index of item to change - * @param newValue the new value - * @throws DebugException if this method fails. Reasons include: - */ - void setItemValue( int index, String newValue ) throws DebugException; - - char getPaddingCharacter(); - - long nextRowAddress(); - - long previousRowAddress(); - - long nextPageAddress(); - - long previousPageAddress(); - - void reformat( int format, - int wordSize, - int numberOfRows, - int numberOfColumns ) throws DebugException; - - void reformat( int format, - int wordSize, - int numberOfRows, - int numberOfColumns, - char paddingChar ) throws DebugException; - void dispose(); - - Long[] getChangedAddresses(); - - boolean isFrozen(); - - void setFrozen( boolean frozen ); - - void refresh() throws DebugException; - - boolean canChangeFormat( int format ); - - boolean isLittleEndian(); - - boolean isStartAddressChanged(); -} Index: src/org/eclipse/cdt/debug/core/IFormattedMemoryBlockRow.java =================================================================== RCS file: src/org/eclipse/cdt/debug/core/IFormattedMemoryBlockRow.java diff -N src/org/eclipse/cdt/debug/core/IFormattedMemoryBlockRow.java --- src/org/eclipse/cdt/debug/core/IFormattedMemoryBlockRow.java 30 Oct 2002 05:00:01 -0000 1.3 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,37 +0,0 @@ -/* - *(c) Copyright QNX Software Systems Ltd. 2002. - * All Rights Reserved. - * - */ - -package org.eclipse.cdt.debug.core; - -/** - * - * Represents a row in the output table of formatted memory block. - * - * @since Jul 31, 2002 - */ -public interface IFormattedMemoryBlockRow -{ - /** - * Returns the address of this row. - * - * @return the address of this row - */ - long getAddress(); - - /** - * Returns the array of memory words. - * - * @return the array of memory words - */ - String[] getData(); - - /** - * Returns the ASCII dump for this row. - * - * @return the ASCII dump for this row - */ - String getASCII(); -} Index: src/org/eclipse/cdt/debug/core/IFormattedMemoryRetrieval.java =================================================================== RCS file: src/org/eclipse/cdt/debug/core/IFormattedMemoryRetrieval.java diff -N src/org/eclipse/cdt/debug/core/IFormattedMemoryRetrieval.java --- src/org/eclipse/cdt/debug/core/IFormattedMemoryRetrieval.java 24 Oct 2002 23:01:36 -0000 1.2 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,32 +0,0 @@ -/* - *(c) Copyright QNX Software Systems Ltd. 2002. - * All Rights Reserved. - * - */ -package org.eclipse.cdt.debug.core; - -import org.eclipse.debug.core.DebugException; - -/** - * - * Supports the retrieval of formatted blocks of memory. - * - * @since Jul 31, 2002 - */ -public interface IFormattedMemoryRetrieval -{ - int[] getSupportedFormats() throws DebugException; - - IFormattedMemoryBlock getFormattedMemoryBlock( long startAddress, - int format, - int wordSize, - int numberOfRows, - int numberOfColumns ) throws DebugException; - - IFormattedMemoryBlock getFormattedMemoryBlock( long startAddress, - int format, - int wordSize, - int numberOfRows, - int numberOfColumns, - char paddingChar ) throws DebugException; -} Index: src/org/eclipse/cdt/debug/core/IGlobalVariable.java =================================================================== RCS file: src/org/eclipse/cdt/debug/core/IGlobalVariable.java diff -N src/org/eclipse/cdt/debug/core/IGlobalVariable.java --- src/org/eclipse/cdt/debug/core/IGlobalVariable.java 5 Nov 2002 20:16:15 -0000 1.1 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,19 +0,0 @@ -/* - *(c) Copyright QNX Software Systems Ltd. 2002. - * All Rights Reserved. - * - */ -package org.eclipse.cdt.debug.core; - -import org.eclipse.core.runtime.IPath; - -/** - * Enter type comment. - * - * @since: Nov 4, 2002 - */ -public interface IGlobalVariable -{ - String getName(); - IPath getPath(); -} Index: src/org/eclipse/cdt/debug/core/IInstructionStep.java =================================================================== RCS file: src/org/eclipse/cdt/debug/core/IInstructionStep.java diff -N src/org/eclipse/cdt/debug/core/IInstructionStep.java --- src/org/eclipse/cdt/debug/core/IInstructionStep.java 6 Aug 2002 18:56:15 -0000 1.1 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,50 +0,0 @@ -/* - *(c) Copyright QNX Software Systems Ltd. 2002. - * All Rights Reserved. - * - */ - -package org.eclipse.cdt.debug.core; -import org.eclipse.debug.core.DebugException; - -/** - * Provides the ability to step into and over machine instruction - * at the current execution location. - * - */ -public interface IInstructionStep -{ - /** - * Returns whether this element can currently perform a step - * into the instruction. - * - * @return whether this element can currently perform a step - * into the instruction - */ - boolean canStepIntoInstruction(); - - /** - * Returns whether this element can currently perform a step - * over the instruction (nexti command). - * - * @return whether this element can currently perform a step - * over the instruction - */ - boolean canStepOverInstruction(); - - /** - * Steps into the current instruction. - * - * @exception DebugException on failure. Reasons include:<ul> - * </ul> - */ - void stepIntoInstruction() throws DebugException; - - /** - * Steps over the current instruction. - * - * @exception DebugException on failure. Reasons include:<ul> - * </ul> - */ - void stepOverInstruction() throws DebugException; -} Index: src/org/eclipse/cdt/debug/core/IRestart.java =================================================================== RCS file: src/org/eclipse/cdt/debug/core/IRestart.java diff -N src/org/eclipse/cdt/debug/core/IRestart.java --- src/org/eclipse/cdt/debug/core/IRestart.java 6 Aug 2002 18:56:15 -0000 1.1 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,30 +0,0 @@ -/* - *(c) Copyright QNX Software Systems Ltd. 2002. - * All Rights Reserved. - * - */ - -package org.eclipse.cdt.debug.core; - -import org.eclipse.debug.core.DebugException; -/** - * Provides the ability to restart a debug target. - * - */ -public interface IRestart -{ - /** - * Returns whether this element can currently be restarted. - * - * @return whether this element can currently be restarted - */ - public boolean canRestart(); - - /** - * Causes this element to restart its execution. - * - * @exception DebugException on failure. Reasons include: - */ - public void restart() throws DebugException; -} - Index: src/org/eclipse/cdt/debug/core/IRunToLine.java =================================================================== RCS file: src/org/eclipse/cdt/debug/core/IRunToLine.java diff -N src/org/eclipse/cdt/debug/core/IRunToLine.java --- src/org/eclipse/cdt/debug/core/IRunToLine.java 19 Sep 2002 19:21:19 -0000 1.1 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,32 +0,0 @@ -/* - *(c) Copyright QNX Software Systems Ltd. 2002. - * All Rights Reserved. - * - */ -package org.eclipse.cdt.debug.core; - -import org.eclipse.core.resources.IResource; -import org.eclipse.debug.core.DebugException; - -/** - * - * Provides the ability to run a debug target to the given line. - * - * @since Sep 19, 2002 - */ -public interface IRunToLine -{ - /** - * Returns whether this operation is currently available for this element. - * - * @return whether this operation is currently available - */ - public boolean canRunToLine( IResource resource, int lineNumber ); - - /** - * Causes this element to run to specified location. - * - * @exception DebugException on failure. Reasons include: - */ - public void runToLine( IResource resource, int lineNumber ) throws DebugException; -} Index: src/org/eclipse/cdt/debug/core/IStackFrameInfo.java =================================================================== RCS file: src/org/eclipse/cdt/debug/core/IStackFrameInfo.java diff -N src/org/eclipse/cdt/debug/core/IStackFrameInfo.java --- src/org/eclipse/cdt/debug/core/IStackFrameInfo.java 22 Aug 2002 23:06:47 -0000 1.2 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,63 +0,0 @@ -/* - *(c) Copyright QNX Software Systems Ltd. 2002. - * All Rights Reserved. - * - */ - -package org.eclipse.cdt.debug.core; - -import org.eclipse.debug.core.model.IVariable; - -/** - * - * Provides the access to the stack frame information. - * - * @since Aug 16, 2002 - */ -public interface IStackFrameInfo -{ - /** - * Returns the address of this stack frame. - * - * @return the address of this stack frame - */ - long getAddress(); - - /** - * Returns the source file of this stack frame or <code>null</code> - * if the source file is unknown. - * - * @return the source file of this stack frame - */ - String getFile(); - - /** - * Returns the function of this stack frame or <code>null</code> - * if the function is unknown. - * - * @return the function of this stack frame - */ - String getFunction(); - - /** - * Returns the line number of this stack frame or <code>0</code> - * if the line number is unknown. - * - * @return the line number of this stack frame - */ - int getFrameLineNumber(); - - /** - * Returns the level of this stack frame. - * - * @return the level of this stack frame - */ - int getLevel(); - - /** - * Returns the arguments of this stack frame. - * - * @return the arguments of this stack frame - */ - IVariable[] getArguments(); -} Index: src/org/eclipse/cdt/debug/core/IState.java =================================================================== RCS file: src/org/eclipse/cdt/debug/core/IState.java diff -N src/org/eclipse/cdt/debug/core/IState.java --- src/org/eclipse/cdt/debug/core/IState.java 2 Oct 2002 19:37:13 -0000 1.3 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,43 +0,0 @@ -/* - *(c) Copyright QNX Software Systems Ltd. 2002. - * All Rights Reserved. - * - */ - -package org.eclipse.cdt.debug.core; - -/** - * - * Represents the current state of debug element. - * - * @since Aug 6, 2002 - */ -public interface IState -{ - public static final int UNKNOWN = 0; - public static final int NOT_RESPONDING = 1; - public static final int STARTING = 2; - public static final int ATTACHING = 3; - public static final int DISCONNECTING = 4; - public static final int RUNNING = 5; - public static final int STEPPING = 6; - public static final int SUSPENDED = 7; - public static final int EXITED = 8; - public static final int DISCONNECTED = 9; - public static final int TERMINATED = 10; - public static final int CORE_DUMP_FILE = 11; - - /** - * Returns the identifier of the current state. - * - * @return the identifier of the current state - */ - int getCurrentStateId(); - - /** - * Returns the info object associated with the current state. - * - * @return the info object associated with the current state - */ - Object getCurrentStateInfo(); -} Index: src/org/eclipse/cdt/debug/core/ISwitchToFrame.java =================================================================== RCS file: src/org/eclipse/cdt/debug/core/ISwitchToFrame.java diff -N src/org/eclipse/cdt/debug/core/ISwitchToFrame.java --- src/org/eclipse/cdt/debug/core/ISwitchToFrame.java 20 Sep 2002 15:12:53 -0000 1.1 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,20 +0,0 @@ -/* - *(c) Copyright QNX Software Systems Ltd. 2002. - * All Rights Reserved. - * - */ -package org.eclipse.cdt.debug.core; - -import org.eclipse.debug.core.DebugException; -import org.eclipse.debug.core.model.IStackFrame; - -/** - * - * Enter type comment. - * - * @since Sep 20, 2002 - */ -public interface ISwitchToFrame -{ - void switchToFrame( IStackFrame frame ) throws DebugException; -} Index: src/org/eclipse/cdt/debug/core/ISwitchToThread.java =================================================================== RCS file: src/org/eclipse/cdt/debug/core/ISwitchToThread.java diff -N src/org/eclipse/cdt/debug/core/ISwitchToThread.java --- src/org/eclipse/cdt/debug/core/ISwitchToThread.java 14 Oct 2002 05:03:22 -0000 1.2 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,21 +0,0 @@ -/* - *(c) Copyright QNX Software Systems Ltd. 2002. - * All Rights Reserved. - * - */ -package org.eclipse.cdt.debug.core; - -import org.eclipse.debug.core.DebugException; -import org.eclipse.debug.core.model.IThread; - -/** - * - * Enter type comment. - * - * @since Sep 20, 2002 - */ -public interface ISwitchToThread -{ - IThread getCurrentThread() throws DebugException; - void setCurrentThread( IThread thread ) throws DebugException; -} Index: src/org/eclipse/cdt/debug/core/sourcelookup/ICSourceLocator.java =================================================================== RCS file: /home/tools/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/sourcelookup/ICSourceLocator.java,v retrieving revision 1.4 diff -u -r1.4 ICSourceLocator.java --- src/org/eclipse/cdt/debug/core/sourcelookup/ICSourceLocator.java 9 Oct 2002 17:56:16 -0000 1.4 +++ src/org/eclipse/cdt/debug/core/sourcelookup/ICSourceLocator.java 2 Dec 2002 23:16:37 -0000 @@ -5,7 +5,7 @@ */ package org.eclipse.cdt.debug.core.sourcelookup; -import org.eclipse.cdt.debug.core.IStackFrameInfo; +import org.eclipse.cdt.debug.core.model.IStackFrameInfo; import org.eclipse.core.resources.IResource; import org.eclipse.debug.core.model.ISourceLocator; Index: src/org/eclipse/cdt/debug/core/sourcelookup/IDisassemblyStorage.java =================================================================== RCS file: src/org/eclipse/cdt/debug/core/sourcelookup/IDisassemblyStorage.java diff -N src/org/eclipse/cdt/debug/core/sourcelookup/IDisassemblyStorage.java --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ src/org/eclipse/cdt/debug/core/sourcelookup/IDisassemblyStorage.java 2 Dec 2002 23:16:37 -0000 @@ -0,0 +1,40 @@ +/* + *(c) Copyright QNX Software Systems Ltd. 2002. + * All Rights Reserved. + * + */ + +package org.eclipse.cdt.debug.core.sourcelookup; + +import org.eclipse.core.resources.IStorage; +import org.eclipse.debug.core.model.IDebugTarget; + +/** + * Defines methods specific to disassembly. + * + * @since: Oct 8, 2002 + */ +public interface IDisassemblyStorage extends IStorage +{ + /** + * Returns the debug target of this disassembly. + * + * @return the debug target of this disassembly + */ + IDebugTarget getDebugTarget(); + + /** + * Returns whether this storage contains the instructions at given address. + * + * @param address - an address + * @return whether this storage contains the instructions at given address + */ + boolean containsAddress( long address ); + + /** + * Returns the line number for given address. + * @param address - an address + * @return the line number for given address + */ + int getLineNumber( long address ) ; +} Index: src/org/eclipse/cdt/debug/internal/core/CMemoryManager.java =================================================================== RCS file: /home/tools/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/CMemoryManager.java,v retrieving revision 1.2 diff -u -r1.2 CMemoryManager.java --- src/org/eclipse/cdt/debug/internal/core/CMemoryManager.java 17 Oct 2002 23:17:01 -0000 1.2 +++ src/org/eclipse/cdt/debug/internal/core/CMemoryManager.java 2 Dec 2002 23:16:37 -0000 @@ -8,7 +8,7 @@ import java.util.Arrays; import org.eclipse.cdt.debug.core.ICMemoryManager; -import org.eclipse.cdt.debug.core.IFormattedMemoryBlock; +import org.eclipse.cdt.debug.core.model.IFormattedMemoryBlock; import org.eclipse.cdt.debug.internal.core.model.CDebugTarget; import org.eclipse.debug.core.DebugException; import org.eclipse.debug.core.model.IDebugTarget; Index: src/org/eclipse/cdt/debug/internal/core/DisassemblyStorage.java =================================================================== RCS file: /home/tools/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/DisassemblyStorage.java,v retrieving revision 1.5 diff -u -r1.5 DisassemblyStorage.java --- src/org/eclipse/cdt/debug/internal/core/DisassemblyStorage.java 11 Oct 2002 14:59:18 -0000 1.5 +++ src/org/eclipse/cdt/debug/internal/core/DisassemblyStorage.java 2 Dec 2002 23:16:38 -0000 @@ -10,8 +10,8 @@ import java.io.InputStream; import java.util.Arrays; -import org.eclipse.cdt.debug.core.IDisassemblyStorage; import org.eclipse.cdt.debug.core.cdi.model.ICDIInstruction; +import org.eclipse.cdt.debug.core.sourcelookup.IDisassemblyStorage; import org.eclipse.core.resources.IStorage; import org.eclipse.core.runtime.CoreException; import org.eclipse.core.runtime.IPath; Index: src/org/eclipse/cdt/debug/internal/core/breakpoints/CAddressBreakpoint.java =================================================================== RCS file: /home/tools/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/breakpoints/CAddressBreakpoint.java,v retrieving revision 1.3 diff -u -r1.3 CAddressBreakpoint.java --- src/org/eclipse/cdt/debug/internal/core/breakpoints/CAddressBreakpoint.java 3 Sep 2002 22:55:20 -0000 1.3 +++ src/org/eclipse/cdt/debug/internal/core/breakpoints/CAddressBreakpoint.java 2 Dec 2002 23:16:39 -0000 @@ -7,7 +7,7 @@ import java.util.Map; -import org.eclipse.cdt.debug.core.ICAddressBreakpoint; +import org.eclipse.cdt.debug.core.model.ICAddressBreakpoint; import org.eclipse.core.resources.IMarker; import org.eclipse.core.resources.IResource; import org.eclipse.core.runtime.CoreException; Index: src/org/eclipse/cdt/debug/internal/core/breakpoints/CBreakpoint.java =================================================================== RCS file: /home/tools/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/breakpoints/CBreakpoint.java,v retrieving revision 1.8 diff -u -r1.8 CBreakpoint.java --- src/org/eclipse/cdt/debug/internal/core/breakpoints/CBreakpoint.java 8 Oct 2002 20:20:22 -0000 1.8 +++ src/org/eclipse/cdt/debug/internal/core/breakpoints/CBreakpoint.java 2 Dec 2002 23:16:39 -0000 @@ -9,7 +9,7 @@ import java.util.Map; import org.eclipse.cdt.debug.core.CDebugModel; -import org.eclipse.cdt.debug.core.ICBreakpoint; +import org.eclipse.cdt.debug.core.model.ICBreakpoint; import org.eclipse.core.resources.IMarker; import org.eclipse.core.resources.IResource; import org.eclipse.core.resources.IWorkspaceRunnable; Index: src/org/eclipse/cdt/debug/internal/core/breakpoints/CFunctionBreakpoint.java =================================================================== RCS file: /home/tools/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/breakpoints/CFunctionBreakpoint.java,v retrieving revision 1.3 diff -u -r1.3 CFunctionBreakpoint.java --- src/org/eclipse/cdt/debug/internal/core/breakpoints/CFunctionBreakpoint.java 3 Sep 2002 22:55:20 -0000 1.3 +++ src/org/eclipse/cdt/debug/internal/core/breakpoints/CFunctionBreakpoint.java 2 Dec 2002 23:16:39 -0000 @@ -7,7 +7,7 @@ import java.util.Map; -import org.eclipse.cdt.debug.core.ICFunctionBreakpoint; +import org.eclipse.cdt.debug.core.model.ICFunctionBreakpoint; import org.eclipse.core.resources.IMarker; import org.eclipse.core.resources.IResource; import org.eclipse.core.runtime.CoreException; Index: src/org/eclipse/cdt/debug/internal/core/breakpoints/CLineBreakpoint.java =================================================================== RCS file: /home/tools/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/breakpoints/CLineBreakpoint.java,v retrieving revision 1.4 diff -u -r1.4 CLineBreakpoint.java --- src/org/eclipse/cdt/debug/internal/core/breakpoints/CLineBreakpoint.java 2 Oct 2002 19:37:13 -0000 1.4 +++ src/org/eclipse/cdt/debug/internal/core/breakpoints/CLineBreakpoint.java 2 Dec 2002 23:16:39 -0000 @@ -7,7 +7,7 @@ import java.util.Map; -import org.eclipse.cdt.debug.core.ICLineBreakpoint; +import org.eclipse.cdt.debug.core.model.ICLineBreakpoint; import org.eclipse.core.resources.IMarker; import org.eclipse.core.resources.IResource; import org.eclipse.core.runtime.CoreException; Index: src/org/eclipse/cdt/debug/internal/core/breakpoints/CWatchpoint.java =================================================================== RCS file: /home/tools/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/breakpoints/CWatchpoint.java,v retrieving revision 1.1 diff -u -r1.1 CWatchpoint.java --- src/org/eclipse/cdt/debug/internal/core/breakpoints/CWatchpoint.java 4 Sep 2002 20:50:20 -0000 1.1 +++ src/org/eclipse/cdt/debug/internal/core/breakpoints/CWatchpoint.java 2 Dec 2002 23:16:39 -0000 @@ -7,7 +7,7 @@ import java.util.Map; -import org.eclipse.cdt.debug.core.ICWatchpoint; +import org.eclipse.cdt.debug.core.model.ICWatchpoint; import org.eclipse.core.resources.IResource; import org.eclipse.core.runtime.CoreException; import org.eclipse.debug.core.DebugException; Index: src/org/eclipse/cdt/debug/internal/core/model/CArrayPartitionValue.java =================================================================== RCS file: /home/tools/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/model/CArrayPartitionValue.java,v retrieving revision 1.3 diff -u -r1.3 CArrayPartitionValue.java --- src/org/eclipse/cdt/debug/internal/core/model/CArrayPartitionValue.java 11 Sep 2002 18:46:36 -0000 1.3 +++ src/org/eclipse/cdt/debug/internal/core/model/CArrayPartitionValue.java 2 Dec 2002 23:16:38 -0000 @@ -10,9 +10,9 @@ import java.util.Collections; import java.util.List; -import org.eclipse.cdt.debug.core.ICValue; import org.eclipse.cdt.debug.core.cdi.model.ICDIValue; import org.eclipse.cdt.debug.core.cdi.model.ICDIVariable; +import org.eclipse.cdt.debug.core.model.ICValue; import org.eclipse.debug.core.DebugException; import org.eclipse.debug.core.model.IVariable; Index: src/org/eclipse/cdt/debug/internal/core/model/CDebugElement.java =================================================================== RCS file: /home/tools/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/model/CDebugElement.java,v retrieving revision 1.4 diff -u -r1.4 CDebugElement.java --- src/org/eclipse/cdt/debug/internal/core/model/CDebugElement.java 1 Oct 2002 17:35:49 -0000 1.4 +++ src/org/eclipse/cdt/debug/internal/core/model/CDebugElement.java 2 Dec 2002 23:16:38 -0000 @@ -274,4 +274,14 @@ null ); CDebugUtils.info( newStatus, getDebugTarget() ); } + + /* (non-Javadoc) + * @see org.eclipse.core.runtime.IAdaptable#getAdapter(Class) + */ + public Object getAdapter( Class adapter ) + { + if ( adapter.equals( ICDISession.class ) ) + return getCDISession(); + return super.getAdapter(adapter); + } } Index: src/org/eclipse/cdt/debug/internal/core/model/CDebugTarget.java =================================================================== RCS file: /home/tools/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/model/CDebugTarget.java,v retrieving revision 1.58 diff -u -r1.58 CDebugTarget.java --- src/org/eclipse/cdt/debug/internal/core/model/CDebugTarget.java 2 Dec 2002 20:32:46 -0000 1.58 +++ src/org/eclipse/cdt/debug/internal/core/model/CDebugTarget.java 2 Dec 2002 23:16:38 -0000 @@ -17,21 +17,7 @@ import org.eclipse.cdt.core.model.ICFile; import org.eclipse.cdt.debug.core.CDebugCorePlugin; import org.eclipse.cdt.debug.core.CDebugModel; -import org.eclipse.cdt.debug.core.ICBreakpoint; -import org.eclipse.cdt.debug.core.ICDebugTargetType; -import org.eclipse.cdt.debug.core.ICExpressionEvaluator; -import org.eclipse.cdt.debug.core.ICLineBreakpoint; import org.eclipse.cdt.debug.core.ICMemoryManager; -import org.eclipse.cdt.debug.core.ICWatchpoint; -import org.eclipse.cdt.debug.core.IDebuggerProcessSupport; -import org.eclipse.cdt.debug.core.IExecFileInfo; -import org.eclipse.cdt.debug.core.IFormattedMemoryBlock; -import org.eclipse.cdt.debug.core.IFormattedMemoryRetrieval; -import org.eclipse.cdt.debug.core.IGlobalVariable; -import org.eclipse.cdt.debug.core.IRestart; -import org.eclipse.cdt.debug.core.IRunToLine; -import org.eclipse.cdt.debug.core.IState; -import org.eclipse.cdt.debug.core.ISwitchToThread; import org.eclipse.cdt.debug.core.cdi.CDIException; import org.eclipse.cdt.debug.core.cdi.ICDIBreakpointHit; import org.eclipse.cdt.debug.core.cdi.ICDIBreakpointManager; @@ -62,6 +48,17 @@ import org.eclipse.cdt.debug.core.cdi.model.ICDITarget; import org.eclipse.cdt.debug.core.cdi.model.ICDIThread; import org.eclipse.cdt.debug.core.cdi.model.ICDIWatchpoint; +import org.eclipse.cdt.debug.core.model.ICBreakpoint; +import org.eclipse.cdt.debug.core.model.ICDebugTarget; +import org.eclipse.cdt.debug.core.model.ICDebugTargetType; +import org.eclipse.cdt.debug.core.model.ICExpressionEvaluator; +import org.eclipse.cdt.debug.core.model.ICLineBreakpoint; +import org.eclipse.cdt.debug.core.model.ICWatchpoint; +import org.eclipse.cdt.debug.core.model.IDebuggerProcessSupport; +import org.eclipse.cdt.debug.core.model.IExecFileInfo; +import org.eclipse.cdt.debug.core.model.IGlobalVariable; +import org.eclipse.cdt.debug.core.model.IRunToLine; +import org.eclipse.cdt.debug.core.model.IState; import org.eclipse.cdt.debug.core.sourcelookup.ICSourceLocation; import org.eclipse.cdt.debug.core.sourcelookup.ICSourceLocator; import org.eclipse.cdt.debug.core.sourcelookup.ISourceMode; @@ -100,19 +97,10 @@ * @since Aug 1, 2002 */ public class CDebugTarget extends CDebugElement - implements IDebugTarget, - ICDebugTargetType, + implements ICDebugTarget, ICDIEventListener, - IRestart, - IRunToLine, - IFormattedMemoryRetrieval, - IState, ILaunchListener, - ISwitchToThread, - IExpressionListener, - ICExpressionEvaluator, - IDebuggerProcessSupport, - IExecFileInfo + IExpressionListener { /** * The type of this target. @@ -963,31 +951,6 @@ */ protected void restarted() { - } - - /* (non-Javadoc) - * @see org.eclipse.cdt.debug.core.IFormattedMemoryRetrieval#getFormattedMemoryBlock(long, int, int, int, int, char) - */ - public IFormattedMemoryBlock getFormattedMemoryBlock( long startAddress, - int format, - int wordSize, - int numberOfRows, - int numberOfColumns, - char paddingChar ) throws DebugException - { - return null; - } - - /* (non-Javadoc) - * @see org.eclipse.cdt.debug.core.IFormattedMemoryRetrieval#getFormattedMemoryBlock(long, int, int, int, int) - */ - public IFormattedMemoryBlock getFormattedMemoryBlock( long startAddress, - int format, - int wordSize, - int numberOfRows, - int numberOfColumns ) throws DebugException - { - return null; } /* (non-Javadoc) Index: src/org/eclipse/cdt/debug/internal/core/model/CDummyStackFrame.java =================================================================== RCS file: /home/tools/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/model/CDummyStackFrame.java,v retrieving revision 1.1 diff -u -r1.1 CDummyStackFrame.java --- src/org/eclipse/cdt/debug/internal/core/model/CDummyStackFrame.java 16 Nov 2002 00:48:31 -0000 1.1 +++ src/org/eclipse/cdt/debug/internal/core/model/CDummyStackFrame.java 2 Dec 2002 23:16:38 -0000 @@ -5,7 +5,7 @@ */ package org.eclipse.cdt.debug.internal.core.model; -import org.eclipse.cdt.debug.core.IDummyStackFrame; +import org.eclipse.cdt.debug.core.model.IDummyStackFrame; import org.eclipse.debug.core.DebugException; import org.eclipse.debug.core.model.IRegisterGroup; import org.eclipse.debug.core.model.IStackFrame; Index: src/org/eclipse/cdt/debug/internal/core/model/CFormattedMemoryBlock.java =================================================================== RCS file: /home/tools/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/model/CFormattedMemoryBlock.java,v retrieving revision 1.18 diff -u -r1.18 CFormattedMemoryBlock.java --- src/org/eclipse/cdt/debug/internal/core/model/CFormattedMemoryBlock.java 28 Nov 2002 19:12:27 -0000 1.18 +++ src/org/eclipse/cdt/debug/internal/core/model/CFormattedMemoryBlock.java 2 Dec 2002 23:16:38 -0000 @@ -9,9 +9,6 @@ import java.util.List; import org.eclipse.cdt.debug.core.CDebugCorePlugin; -import org.eclipse.cdt.debug.core.IExecFileInfo; -import org.eclipse.cdt.debug.core.IFormattedMemoryBlock; -import org.eclipse.cdt.debug.core.IFormattedMemoryBlockRow; import org.eclipse.cdt.debug.core.cdi.CDIException; import org.eclipse.cdt.debug.core.cdi.event.ICDIChangedEvent; import org.eclipse.cdt.debug.core.cdi.event.ICDIDestroyedEvent; @@ -23,6 +20,9 @@ import org.eclipse.cdt.debug.core.cdi.model.ICDIMemoryBlock; import org.eclipse.cdt.debug.core.cdi.model.ICDIObject; import org.eclipse.cdt.debug.core.cdi.model.ICDITarget; +import org.eclipse.cdt.debug.core.model.IExecFileInfo; +import org.eclipse.cdt.debug.core.model.IFormattedMemoryBlock; +import org.eclipse.cdt.debug.core.model.IFormattedMemoryBlockRow; import org.eclipse.cdt.debug.internal.core.CDebugUtils; import org.eclipse.debug.core.DebugEvent; import org.eclipse.debug.core.DebugException; Index: src/org/eclipse/cdt/debug/internal/core/model/CModificationVariable.java =================================================================== RCS file: /home/tools/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/model/CModificationVariable.java,v retrieving revision 1.6 diff -u -r1.6 CModificationVariable.java --- src/org/eclipse/cdt/debug/internal/core/model/CModificationVariable.java 2 Oct 2002 19:37:13 -0000 1.6 +++ src/org/eclipse/cdt/debug/internal/core/model/CModificationVariable.java 2 Dec 2002 23:16:38 -0000 @@ -8,10 +8,10 @@ import java.text.MessageFormat; -import org.eclipse.cdt.debug.core.ICValue; import org.eclipse.cdt.debug.core.cdi.CDIException; import org.eclipse.cdt.debug.core.cdi.model.ICDIValue; import org.eclipse.cdt.debug.core.cdi.model.ICDIVariable; +import org.eclipse.cdt.debug.core.model.ICValue; import org.eclipse.debug.core.DebugException; import org.eclipse.debug.core.model.IValue; Index: src/org/eclipse/cdt/debug/internal/core/model/CStackFrame.java =================================================================== RCS file: /home/tools/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/model/CStackFrame.java,v retrieving revision 1.11 diff -u -r1.11 CStackFrame.java --- src/org/eclipse/cdt/debug/internal/core/model/CStackFrame.java 16 Nov 2002 00:48:31 -0000 1.11 +++ src/org/eclipse/cdt/debug/internal/core/model/CStackFrame.java 2 Dec 2002 23:16:39 -0000 @@ -12,8 +12,6 @@ import java.util.List; import org.eclipse.cdt.debug.core.CDebugCorePlugin; -import org.eclipse.cdt.debug.core.IRestart; -import org.eclipse.cdt.debug.core.IStackFrameInfo; import org.eclipse.cdt.debug.core.cdi.CDIException; import org.eclipse.cdt.debug.core.cdi.ICDILocation; import org.eclipse.cdt.debug.core.cdi.event.ICDIEvent; @@ -21,6 +19,8 @@ import org.eclipse.cdt.debug.core.cdi.model.ICDIArgument; import org.eclipse.cdt.debug.core.cdi.model.ICDIStackFrame; import org.eclipse.cdt.debug.core.cdi.model.ICDIVariable; +import org.eclipse.cdt.debug.core.model.IRestart; +import org.eclipse.cdt.debug.core.model.IStackFrameInfo; import org.eclipse.cdt.debug.core.sourcelookup.ICSourceLocator; import org.eclipse.debug.core.DebugException; import org.eclipse.debug.core.model.IRegisterGroup; Index: src/org/eclipse/cdt/debug/internal/core/model/CThread.java =================================================================== RCS file: /home/tools/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/model/CThread.java,v retrieving revision 1.19 diff -u -r1.19 CThread.java --- src/org/eclipse/cdt/debug/internal/core/model/CThread.java 28 Nov 2002 23:45:16 -0000 1.19 +++ src/org/eclipse/cdt/debug/internal/core/model/CThread.java 2 Dec 2002 23:16:39 -0000 @@ -10,12 +10,6 @@ import java.util.Iterator; import java.util.List; -import org.eclipse.cdt.debug.core.IDummyStackFrame; -import org.eclipse.cdt.debug.core.IInstructionStep; -import org.eclipse.cdt.debug.core.IRestart; -import org.eclipse.cdt.debug.core.IRunToLine; -import org.eclipse.cdt.debug.core.IState; -import org.eclipse.cdt.debug.core.ISwitchToFrame; import org.eclipse.cdt.debug.core.cdi.CDIException; import org.eclipse.cdt.debug.core.cdi.ICDIConfiguration; import org.eclipse.cdt.debug.core.cdi.ICDIEndSteppingRange; @@ -34,6 +28,12 @@ import org.eclipse.cdt.debug.core.cdi.model.ICDIStackFrame; import org.eclipse.cdt.debug.core.cdi.model.ICDITarget; import org.eclipse.cdt.debug.core.cdi.model.ICDIThread; +import org.eclipse.cdt.debug.core.model.IDummyStackFrame; +import org.eclipse.cdt.debug.core.model.IInstructionStep; +import org.eclipse.cdt.debug.core.model.IRestart; +import org.eclipse.cdt.debug.core.model.IRunToLine; +import org.eclipse.cdt.debug.core.model.IState; +import org.eclipse.cdt.debug.core.model.ISwitchToFrame; import org.eclipse.cdt.debug.core.sourcelookup.ISourceMode; import org.eclipse.core.resources.IResource; import org.eclipse.core.runtime.IAdaptable; Index: src/org/eclipse/cdt/debug/internal/core/model/CValue.java =================================================================== RCS file: /home/tools/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/model/CValue.java,v retrieving revision 1.11 diff -u -r1.11 CValue.java --- src/org/eclipse/cdt/debug/internal/core/model/CValue.java 7 Oct 2002 18:02:48 -0000 1.11 +++ src/org/eclipse/cdt/debug/internal/core/model/CValue.java 2 Dec 2002 23:16:38 -0000 @@ -12,10 +12,10 @@ import java.util.Iterator; import java.util.List; -import org.eclipse.cdt.debug.core.ICValue; import org.eclipse.cdt.debug.core.cdi.CDIException; import org.eclipse.cdt.debug.core.cdi.model.ICDIValue; import org.eclipse.cdt.debug.core.cdi.model.ICDIVariable; +import org.eclipse.cdt.debug.core.model.ICValue; import org.eclipse.debug.core.DebugException; import org.eclipse.debug.core.model.IVariable; Index: src/org/eclipse/cdt/debug/internal/core/model/CValueFactory.java =================================================================== RCS file: /home/tools/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/model/CValueFactory.java,v retrieving revision 1.4 diff -u -r1.4 CValueFactory.java --- src/org/eclipse/cdt/debug/internal/core/model/CValueFactory.java 2 Oct 2002 19:25:14 -0000 1.4 +++ src/org/eclipse/cdt/debug/internal/core/model/CValueFactory.java 2 Dec 2002 23:16:38 -0000 @@ -6,8 +6,8 @@ package org.eclipse.cdt.debug.internal.core.model; -import org.eclipse.cdt.debug.core.ICValue; import org.eclipse.cdt.debug.core.cdi.model.ICDIValue; +import org.eclipse.cdt.debug.core.model.ICValue; import org.eclipse.debug.core.DebugException; /** Index: src/org/eclipse/cdt/debug/internal/core/model/CVariable.java =================================================================== RCS file: /home/tools/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/model/CVariable.java,v retrieving revision 1.10 diff -u -r1.10 CVariable.java --- src/org/eclipse/cdt/debug/internal/core/model/CVariable.java 10 Oct 2002 22:29:59 -0000 1.10 +++ src/org/eclipse/cdt/debug/internal/core/model/CVariable.java 2 Dec 2002 23:16:38 -0000 @@ -5,7 +5,6 @@ */ package org.eclipse.cdt.debug.internal.core.model; -import org.eclipse.cdt.debug.core.ICValue; import org.eclipse.cdt.debug.core.cdi.CDIException; import org.eclipse.cdt.debug.core.cdi.event.ICDIChangedEvent; import org.eclipse.cdt.debug.core.cdi.event.ICDIEvent; @@ -13,6 +12,7 @@ import org.eclipse.cdt.debug.core.cdi.model.ICDIObject; import org.eclipse.cdt.debug.core.cdi.model.ICDIValue; import org.eclipse.cdt.debug.core.cdi.model.ICDIVariable; +import org.eclipse.cdt.debug.core.model.ICValue; import org.eclipse.debug.core.DebugEvent; import org.eclipse.debug.core.DebugException; import org.eclipse.debug.core.model.IDebugTarget; Index: src/org/eclipse/cdt/debug/internal/core/sourcelookup/CSourceLocator.java =================================================================== RCS file: /home/tools/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/sourcelookup/CSourceLocator.java,v retrieving revision 1.2 diff -u -r1.2 CSourceLocator.java --- src/org/eclipse/cdt/debug/internal/core/sourcelookup/CSourceLocator.java 24 Nov 2002 23:18:01 -0000 1.2 +++ src/org/eclipse/cdt/debug/internal/core/sourcelookup/CSourceLocator.java 2 Dec 2002 23:16:38 -0000 @@ -8,7 +8,7 @@ import java.util.ArrayList; -import org.eclipse.cdt.debug.core.IStackFrameInfo; +import org.eclipse.cdt.debug.core.model.IStackFrameInfo; import org.eclipse.cdt.debug.core.sourcelookup.ICSourceLocation; import org.eclipse.cdt.debug.core.sourcelookup.ICSourceLocator; import org.eclipse.core.resources.IFile; Index: src/org/eclipse/cdt/debug/internal/core/sourcelookup/CSourceManager.java =================================================================== RCS file: /home/tools/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/sourcelookup/CSourceManager.java,v retrieving revision 1.4 diff -u -r1.4 CSourceManager.java --- src/org/eclipse/cdt/debug/internal/core/sourcelookup/CSourceManager.java 15 Oct 2002 18:29:04 -0000 1.4 +++ src/org/eclipse/cdt/debug/internal/core/sourcelookup/CSourceManager.java 2 Dec 2002 23:16:38 -0000 @@ -8,7 +8,7 @@ import org.eclipse.cdt.debug.core.CDebugCorePlugin; import org.eclipse.cdt.debug.core.ICDebugConstants; -import org.eclipse.cdt.debug.core.IStackFrameInfo; +import org.eclipse.cdt.debug.core.model.IStackFrameInfo; import org.eclipse.cdt.debug.core.sourcelookup.ICSourceLocation; import org.eclipse.cdt.debug.core.sourcelookup.ICSourceLocator; import org.eclipse.cdt.debug.core.sourcelookup.ISourceMode; Index: src/org/eclipse/cdt/debug/internal/core/sourcelookup/DisassemblyManager.java =================================================================== RCS file: /home/tools/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/sourcelookup/DisassemblyManager.java,v retrieving revision 1.5 diff -u -r1.5 DisassemblyManager.java --- src/org/eclipse/cdt/debug/internal/core/sourcelookup/DisassemblyManager.java 19 Nov 2002 22:55:00 -0000 1.5 +++ src/org/eclipse/cdt/debug/internal/core/sourcelookup/DisassemblyManager.java 2 Dec 2002 23:16:38 -0000 @@ -9,10 +9,10 @@ import java.util.ArrayList; import org.eclipse.cdt.debug.core.CDebugCorePlugin; -import org.eclipse.cdt.debug.core.IStackFrameInfo; import org.eclipse.cdt.debug.core.cdi.CDIException; import org.eclipse.cdt.debug.core.cdi.ICDISourceManager; import org.eclipse.cdt.debug.core.cdi.model.ICDIInstruction; +import org.eclipse.cdt.debug.core.model.IStackFrameInfo; import org.eclipse.cdt.debug.internal.core.DisassemblyStorage; import org.eclipse.cdt.debug.internal.core.model.CDebugTarget; import org.eclipse.debug.core.model.IStackFrame; |