mirrors/cdt
1
0
Fork 0
mirror of https://github.com/eclipse-cdt/cdt synced 2025-08-11 02:05:39 +02:00
Code Issues Wiki Activity

2004-10-26 Alain Magloire

Browse source 
Remove ICDIMemoryManager for ICDIMemoryBlockManagement
	* cdi/org/eclipse/cdt/debug/core/cdi/ICDISession.java
	* cdi/org/eclipse/cdt/debug/core/cdi/ICDIMemoryManager.java
	* cdi/org/eclipse/cdt/debug/core/cdi/model/ICDITarget.java
	* cdi/org/eclipse/cdt/debug/core/cdi/model/ICDIMemoryBlockManagement.java

	* CDebugModel.java
	* CExtendedMemoryBlock.java
	* CFormattedMemoryBlock.java
This commit is contained in:
Alain Magloire 2004-10-27 00:59:13 +00:00
parent 70c0a2d6ae
commit 888b941a92
7 changed files with 30 additions and 36 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -1,3 +1,14 @@
2004-10-26 Alain Magloire
Remove ICDIMemoryManager for ICDIMemoryBlockManagement
* cdi/org/eclipse/cdt/debug/core/cdi/ICDISession.java
* cdi/org/eclipse/cdt/debug/core/cdi/ICDIMemoryManager.java
* cdi/org/eclipse/cdt/debug/core/cdi/model/ICDITarget.java
* cdi/org/eclipse/cdt/debug/core/cdi/model/ICDIMemoryBlockManagement.java
* CDebugModel.java
* CExtendedMemoryBlock.java
* CFormattedMemoryBlock.java
2004-10-26 Alain Magloire 2004-10-26 Alain Magloire
Remove of ICDISourceManager in CDI Remove of ICDISourceManager in CDI
* cdi/org/eclipse/cdt/debug/core/cdi/ICDISession.java * cdi/org/eclipse/cdt/debug/core/cdi/ICDISession.java

8
debug/org.eclipse.cdt.debug.core/cdi/org/eclipse/cdt/debug/core/cdi/ICDISession.java
View file

@ -59,14 +59,6 @@ public interface ICDISession {
*/ */
ICDIRegisterManager getRegisterManager(); ICDIRegisterManager getRegisterManager();
/**
* Returns the memory manager of this debug session.
*
* @return the memory manager
*/
ICDIMemoryManager getMemoryManager();
/** /**
* Returns the event manager of this debug session. * Returns the event manager of this debug session.
* *

31
debug/org.eclipse.cdt.debug.core/cdi/org/eclipse/cdt/debug/core/cdi/ICDIMemoryManager.java → debug/org.eclipse.cdt.debug.core/cdi/org/eclipse/cdt/debug/core/cdi/model/ICDIMemoryBlockManagement.java
View file

@ -1,28 +1,28 @@
/******************************************************************************* /**********************************************************************
* Copyright (c) 2000, 2004 QNX Software Systems and others. * Copyright (c) 2002,2003,2004 QNX Software Systems and others.
* All rights reserved. This program and the accompanying materials * All rights reserved. This program and the accompanying materials
* are made available under the terms of the Common Public License v1.0 * are made available under the terms of the Common Public License v1.0
* which accompanies this distribution, and is available at * which accompanies this distribution, and is available at
* http://www.eclipse.org/legal/cpl-v10.html * http://www.eclipse.org/legal/cpl-v10.html
* *
* Contributors: * Contributors:
* QNX Software Systems - Initial API and implementation * QNX Software Systems - Initial API and implementation
*******************************************************************************/ ***********************************************************************/
package org.eclipse.cdt.debug.core.cdi; package org.eclipse.cdt.debug.core.cdi.model;
import java.math.BigInteger; import java.math.BigInteger;
import org.eclipse.cdt.debug.core.cdi.model.ICDIMemoryBlock; import org.eclipse.cdt.debug.core.cdi.CDIException;
/** /**
*
* The memory manager manages the collection of memory blocks * The memory manager manages the collection of memory blocks
* specified for the debug session. * specified for the debug session.
* Auto update is on by default. *
* @since Jul 9, 2002 * ICDIMemoryBlockManagement
*
*/ */
public interface ICDIMemoryManager extends ICDIManager { public interface ICDIMemoryBlockManagement {
/** /**
* Returns a memory block specified by given identifier. * Returns a memory block specified by given identifier.
@ -46,14 +46,6 @@ public interface ICDIMemoryManager extends ICDIManager {
ICDIMemoryBlock createMemoryBlock(BigInteger address, int length) ICDIMemoryBlock createMemoryBlock(BigInteger address, int length)
throws CDIException; throws CDIException;
/**
* Removes the given memory block from the debug session.
*
* @param memoryBlock - the memory block to be removed
* @exception CDIException on failure. Reasons include:
*/
void removeBlock(ICDIMemoryBlock memoryBlock) throws CDIException;
/** /**
* Removes the given array of memory blocks from the debug session. * Removes the given array of memory blocks from the debug session.
* *
@ -61,7 +53,6 @@ public interface ICDIMemoryManager extends ICDIManager {
* @exception CDIException on failure. Reasons include: * @exception CDIException on failure. Reasons include:
*/ */
void removeBlocks(ICDIMemoryBlock[] memoryBlocks) throws CDIException; void removeBlocks(ICDIMemoryBlock[] memoryBlocks) throws CDIException;
;
/** /**
* Removes all memory blocks from the debug session. * Removes all memory blocks from the debug session.

2
debug/org.eclipse.cdt.debug.core/cdi/org/eclipse/cdt/debug/core/cdi/model/ICDITarget.java
View file

@ -26,7 +26,7 @@ import org.eclipse.cdt.debug.core.cdi.ICDISessionObject;
* @since Jul 8, 2002 * @since Jul 8, 2002
*/ */
public interface ICDITarget extends ICDIThreadGroup, ICDIExpressionManagement, public interface ICDITarget extends ICDIThreadGroup, ICDIExpressionManagement,
ICDISourceManagement, ICDISessionObject { ICDISourceManagement, ICDIMemoryBlockManagement, ICDISessionObject {
/** /**
* Gets the target process. * Gets the target process.

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

@ -97,7 +97,7 @@ public class CDebugModel {
if ( target != null && target instanceof CDebugTarget ) { if ( target != null && target instanceof CDebugTarget ) {
try { try {
ICDIExpression expression = ((CDebugTarget)target).getCDITarget().createExpression( addressExpression ); ICDIExpression expression = ((CDebugTarget)target).getCDITarget().createExpression( addressExpression );
ICDIMemoryBlock cdiMemoryBlock = ((CDebugTarget)target).getCDISession().getMemoryManager().createMemoryBlock( expression.getExpressionText(), wordSize * numberOfRows * numberOfColumns ); ICDIMemoryBlock cdiMemoryBlock = ((CDebugTarget)target).getCDITarget().createMemoryBlock( expression.getExpressionText(), wordSize * numberOfRows * numberOfColumns );
return new CFormattedMemoryBlock( (CDebugTarget)target, cdiMemoryBlock, expression, format, wordSize, numberOfRows, numberOfColumns, paddingChar ); return new CFormattedMemoryBlock( (CDebugTarget)target, cdiMemoryBlock, expression, format, wordSize, numberOfRows, numberOfColumns, paddingChar );
} }
catch( CDIException e ) { catch( CDIException e ) {
@ -111,7 +111,7 @@ public class CDebugModel {
if ( target != null && target instanceof CDebugTarget ) { if ( target != null && target instanceof CDebugTarget ) {
try { try {
ICDIExpression expression = ((CDebugTarget)target).getCDITarget().createExpression( addressExpression ); ICDIExpression expression = ((CDebugTarget)target).getCDITarget().createExpression( addressExpression );
ICDIMemoryBlock cdiMemoryBlock = ((CDebugTarget)target).getCDISession().getMemoryManager().createMemoryBlock( expression.getExpressionText(), wordSize * numberOfRows * numberOfColumns ); ICDIMemoryBlock cdiMemoryBlock = ((CDebugTarget)target).getCDITarget().createMemoryBlock( expression.getExpressionText(), wordSize * numberOfRows * numberOfColumns );
return new CFormattedMemoryBlock( (CDebugTarget)target, cdiMemoryBlock, expression, format, wordSize, numberOfRows, numberOfColumns ); return new CFormattedMemoryBlock( (CDebugTarget)target, cdiMemoryBlock, expression, format, wordSize, numberOfRows, numberOfColumns );
} }
catch( CDIException e ) { catch( CDIException e ) {

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

@ -232,7 +232,7 @@ public class CExtendedMemoryBlock extends CDebugElement implements IExtendedMemo
ICDIMemoryBlock cdiBlock = getCDIBlock(); ICDIMemoryBlock cdiBlock = getCDIBlock();
if ( cdiBlock != null ) { if ( cdiBlock != null ) {
try { try {
((CDebugTarget)getDebugTarget()).getCDISession().getMemoryManager().removeBlock( cdiBlock ); ((CDebugTarget)getDebugTarget()).getCDITarget().removeBlocks( new ICDIMemoryBlock[] {cdiBlock} );
} }
catch( CDIException e ) { catch( CDIException e ) {
CDebugCorePlugin.log( e ); CDebugCorePlugin.log( e );
@ -322,7 +322,7 @@ public class CExtendedMemoryBlock extends CDebugElement implements IExtendedMemo
} }
private ICDIMemoryBlock createCDIBlock( BigInteger address, long length ) throws CDIException { private ICDIMemoryBlock createCDIBlock( BigInteger address, long length ) throws CDIException {
ICDIMemoryBlock block = ((CDebugTarget)getDebugTarget()).getCDISession().getMemoryManager().createMemoryBlock( address.toString(), (int)length ); ICDIMemoryBlock block = ((CDebugTarget)getDebugTarget()).getCDITarget().createMemoryBlock( address.toString(), (int)length );
getCDISession().getEventManager().addEventListener( this ); getCDISession().getEventManager().addEventListener( this );
return block; return block;
} }
@ -331,7 +331,7 @@ public class CExtendedMemoryBlock extends CDebugElement implements IExtendedMemo
ICDIMemoryBlock block = getCDIBlock(); ICDIMemoryBlock block = getCDIBlock();
if ( block != null ) { if ( block != null ) {
try { try {
((CDebugTarget)getDebugTarget()).getCDISession().getMemoryManager().removeBlock( block ); ((CDebugTarget)getDebugTarget()).getCDITarget().removeBlocks( new ICDIMemoryBlock[]{ block });
} }
catch( CDIException e ) { catch( CDIException e ) {
DebugPlugin.log( e ); DebugPlugin.log( e );

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

@ -373,7 +373,7 @@ public class CFormattedMemoryBlock extends CDebugElement
{ {
try try
{ {
((CDebugTarget)getDebugTarget()).getCDISession().getMemoryManager().removeBlock( fCDIMemoryBlock ); ((CDebugTarget)getDebugTarget()).getCDITarget().removeBlocks( new ICDIMemoryBlock[] { fCDIMemoryBlock } );
} }
catch( CDIException e ) catch( CDIException e )
{ {