From 655d0606bb11a60046fd5ef58ce7c8f5f1e0d51d Mon Sep 17 00:00:00 2001 From: Mikhail Khodjaiants Date: Thu, 24 Oct 2002 23:01:36 +0000 Subject: [PATCH] Moved the memory format constants from IFormattedMemoryRetrieval.java to IFormattedMemoryBlock.java. --- debug/org.eclipse.cdt.debug.core/ChangeLog | 6 ++++++ .../cdt/debug/core/IFormattedMemoryBlock.java | 20 +++++++++++++++++++ .../debug/core/IFormattedMemoryRetrieval.java | 20 ------------------- 3 files changed, 26 insertions(+), 20 deletions(-) diff --git a/debug/org.eclipse.cdt.debug.core/ChangeLog b/debug/org.eclipse.cdt.debug.core/ChangeLog index f9106185162..15f8deddb1c 100644 --- a/debug/org.eclipse.cdt.debug.core/ChangeLog +++ b/debug/org.eclipse.cdt.debug.core/ChangeLog @@ -1,3 +1,9 @@ +2002-10-24 Mikhail Khodjaiants + Moved the memory format constants from IFormattedMemoryRetrieval.java + to IFormattedMemoryBlock.java. + * IFormattedMemoryRetrieval.java + * IFormattedMemoryBlock.java + 2002-10-24 David Inglis * CDebugTarget.java fix exception on shutdown with a connected target, CDI session diff --git a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/IFormattedMemoryBlock.java b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/IFormattedMemoryBlock.java index b30715aec40..8299e9dabdf 100644 --- a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/IFormattedMemoryBlock.java +++ b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/IFormattedMemoryBlock.java @@ -17,6 +17,26 @@ import org.eclipse.debug.core.model.IMemoryBlock; */ 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_BYTES_PER_ROW_4 = 4; + public static final int MEMORY_BYTES_PER_ROW_8 = 8; + public static final int MEMORY_BYTES_PER_ROW_16 = 16; + public static final int MEMORY_BYTES_PER_ROW_32 = 32; + public static final int MEMORY_BYTES_PER_ROW_64 = 64; + public static final int MEMORY_BYTES_PER_ROW_128 = 128; + /** * Returns the address expression specified to obtain this memory block. * diff --git a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/IFormattedMemoryRetrieval.java b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/IFormattedMemoryRetrieval.java index 50c36e5d1f3..0742ba784fa 100644 --- a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/IFormattedMemoryRetrieval.java +++ b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/IFormattedMemoryRetrieval.java @@ -15,26 +15,6 @@ import org.eclipse.debug.core.DebugException; */ public interface IFormattedMemoryRetrieval { - 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_BYTES_PER_ROW_4 = 4; - public static final int MEMORY_BYTES_PER_ROW_8 = 8; - public static final int MEMORY_BYTES_PER_ROW_16 = 16; - public static final int MEMORY_BYTES_PER_ROW_32 = 32; - public static final int MEMORY_BYTES_PER_ROW_64 = 64; - public static final int MEMORY_BYTES_PER_ROW_128 = 128; - int[] getSupportedFormats() throws DebugException; IFormattedMemoryBlock getFormattedMemoryBlock( long startAddress,