mirrors/cdt
1
0
Fork 0
mirror of https://github.com/eclipse-cdt/cdt synced 2025-08-15 20:25:46 +02:00
Code Issues Wiki Activity

2004-10-26 Alain Magloire

Browse source 
Remove ICDIMemoryManager in CDI
	* cdi/org/eclipse/cdt/debug/mi/core/cdi/Session.java
	* cdi/org/eclipse/cdt/debug/mi/core/cdi/MemoryManager.java
	* cdi/org/eclipse/cdt/debug/mi/core/cdi/EventManager.java
	* cdi/org/eclipse/cdt/debug/mi/core/cdi/model/Target.java
	* cdi/org/eclipse/cdt/debug/mi/core/cdi/model/MemoryBlock.java
	* cdi/org/eclipse/cdt/debug/mi/core/cdi/event/CreatedEvent.java
This commit is contained in:
Alain Magloire 2004-10-27 00:59:02 +00:00
parent a885c2bd7f
commit 70c0a2d6ae
7 changed files with 60 additions and 53 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -1,3 +1,12 @@
2004-10-26 Alain Magloire
Remove ICDIMemoryManager in CDI
* cdi/org/eclipse/cdt/debug/mi/core/cdi/Session.java
* cdi/org/eclipse/cdt/debug/mi/core/cdi/MemoryManager.java
* cdi/org/eclipse/cdt/debug/mi/core/cdi/EventManager.java
* cdi/org/eclipse/cdt/debug/mi/core/cdi/model/Target.java
* cdi/org/eclipse/cdt/debug/mi/core/cdi/model/MemoryBlock.java
* cdi/org/eclipse/cdt/debug/mi/core/cdi/event/CreatedEvent.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/mi/core/cdi/Session.java * cdi/org/eclipse/cdt/debug/mi/core/cdi/Session.java

4
debug/org.eclipse.cdt.debug.mi.core/cdi/org/eclipse/cdt/debug/mi/core/cdi/EventManager.java
View file

@ -118,7 +118,7 @@ public class EventManager extends SessionObject implements ICDIEventManager, Obs
} else if (miEvent instanceof MIMemoryChangedEvent) { } else if (miEvent instanceof MIMemoryChangedEvent) {
// We need to fire an event for all the register blocks // We need to fire an event for all the register blocks
// that may contain the modified addresses. // that may contain the modified addresses.
MemoryManager mgr = (MemoryManager)session.getMemoryManager(); MemoryManager mgr = session.getMemoryManager();
MemoryBlock[] blocks = mgr.getMemoryBlocks(miEvent.getMISession()); MemoryBlock[] blocks = mgr.getMemoryBlocks(miEvent.getMISession());
MIMemoryChangedEvent miMem = (MIMemoryChangedEvent)miEvent; MIMemoryChangedEvent miMem = (MIMemoryChangedEvent)miEvent;
BigInteger[] addresses = miMem.getAddresses(); BigInteger[] addresses = miMem.getAddresses();
@ -301,7 +301,7 @@ public class EventManager extends SessionObject implements ICDIEventManager, Obs
VariableManager varMgr = (VariableManager)session.getVariableManager(); VariableManager varMgr = (VariableManager)session.getVariableManager();
ExpressionManager expMgr = session.getExpressionManager(); ExpressionManager expMgr = session.getExpressionManager();
RegisterManager regMgr = (RegisterManager)session.getRegisterManager(); RegisterManager regMgr = (RegisterManager)session.getRegisterManager();
MemoryManager memMgr = (MemoryManager)session.getMemoryManager(); MemoryManager memMgr = session.getMemoryManager();
BreakpointManager bpMgr = session.getBreakpointManager(); BreakpointManager bpMgr = session.getBreakpointManager();
SignalManager sigMgr = (SignalManager)session.getSignalManager(); SignalManager sigMgr = (SignalManager)session.getSignalManager();
SourceManager srcMgr = (SourceManager)session.getSourceManager(); SourceManager srcMgr = (SourceManager)session.getSourceManager();

47
debug/org.eclipse.cdt.debug.mi.core/cdi/org/eclipse/cdt/debug/mi/core/cdi/MemoryManager.java
View file

@ -19,7 +19,6 @@ import java.util.List;
import java.util.Map; import java.util.Map;
import org.eclipse.cdt.debug.core.cdi.CDIException; import org.eclipse.cdt.debug.core.cdi.CDIException;
import org.eclipse.cdt.debug.core.cdi.ICDIMemoryManager;
import org.eclipse.cdt.debug.core.cdi.model.ICDIMemoryBlock; import org.eclipse.cdt.debug.core.cdi.model.ICDIMemoryBlock;
import org.eclipse.cdt.debug.mi.core.MIException; import org.eclipse.cdt.debug.mi.core.MIException;
import org.eclipse.cdt.debug.mi.core.MIFormat; import org.eclipse.cdt.debug.mi.core.MIFormat;
@ -36,7 +35,7 @@ import org.eclipse.cdt.debug.mi.core.output.MIDataReadMemoryInfo;
/** /**
*/ */
public class MemoryManager extends Manager implements ICDIMemoryManager { public class MemoryManager extends Manager {
ICDIMemoryBlock[] EMPTY_MEMORY_BLOCKS = {}; ICDIMemoryBlock[] EMPTY_MEMORY_BLOCKS = {};
Map blockMap; Map blockMap;
@ -157,21 +156,11 @@ public class MemoryManager extends Manager implements ICDIMemoryManager {
} }
} }
/** public ICDIMemoryBlock createMemoryBlock(Target target, BigInteger address, int length)
* @see org.eclipse.cdt.debug.core.cdi.ICDIMemoryManager#createMemoryBlock(long, int)
*/
public ICDIMemoryBlock createMemoryBlock(BigInteger address, int length)
throws CDIException { throws CDIException {
return createMemoryBlock(address.toString(16), length); return createMemoryBlock(target, address.toString(16), length);
} }
/**
* @see org.eclipse.cdt.debug.core.cdi.ICDIMemoryManager#createMemoryBlock(string, int)
*/
public ICDIMemoryBlock createMemoryBlock(String address, int length) throws CDIException {
Session session = (Session)getSession();
return createMemoryBlock(session.getCurrentTarget(), address, length);
}
public ICDIMemoryBlock createMemoryBlock(Target target, String address, int length) throws CDIException { public ICDIMemoryBlock createMemoryBlock(Target target, String address, int length) throws CDIException {
MIDataReadMemoryInfo info = createMIDataReadMemoryInfo(target.getMISession(), address, length); MIDataReadMemoryInfo info = createMIDataReadMemoryInfo(target.getMISession(), address, length);
ICDIMemoryBlock block = new MemoryBlock(target, address, info); ICDIMemoryBlock block = new MemoryBlock(target, address, info);
@ -182,13 +171,6 @@ public class MemoryManager extends Manager implements ICDIMemoryManager {
return block; return block;
} }
/**
* @see org.eclipse.cdt.debug.core.cdi.ICDIMemoryManager#getBlocks()
*/
public ICDIMemoryBlock[] getMemoryBlocks() throws CDIException {
Target target = ((Session)getSession()).getCurrentTarget();
return getMemoryBlocks(target);
}
public MemoryBlock[] getMemoryBlocks(MISession miSession) { public MemoryBlock[] getMemoryBlocks(MISession miSession) {
Session session = (Session)getSession(); Session session = (Session)getSession();
Target target = session.getTarget(miSession); Target target = session.getTarget(miSession);
@ -200,33 +182,10 @@ public class MemoryManager extends Manager implements ICDIMemoryManager {
return (ICDIMemoryBlock[]) blockList.toArray(new ICDIMemoryBlock[blockList.size()]); return (ICDIMemoryBlock[]) blockList.toArray(new ICDIMemoryBlock[blockList.size()]);
} }
/**
* @see org.eclipse.cdt.debug.core.cdi.ICDIMemoryManager#removeAllBlocks()
*/
public void removeAllBlocks() throws CDIException {
Target target = ((Session)getSession()).getCurrentTarget();
removeAllBlocks(target);
}
public void removeAllBlocks(Target target) throws CDIException { public void removeAllBlocks(Target target) throws CDIException {
ICDIMemoryBlock[] blocks = getMemoryBlocks(target); ICDIMemoryBlock[] blocks = getMemoryBlocks(target);
removeBlocks(target, blocks); removeBlocks(target, blocks);
} }
/**
* @see org.eclipse.cdt.debug.core.cdi.ICDIMemoryManager#removeBlock(ICDIMemoryBlock)
*/
public void removeBlock(ICDIMemoryBlock memoryBlock) throws CDIException {
removeBlocks((Target)memoryBlock.getTarget(), new ICDIMemoryBlock[] { memoryBlock });
}
/**
* @see org.eclipse.cdt.debug.core.cdi.ICDIMemoryManager#removeBlocks(ICDIMemoryBlock[])
*/
public void removeBlocks(ICDIMemoryBlock[] memoryBlocks) throws CDIException {
for (int i = 0; i < memoryBlocks.length; i++) {
removeBlock(memoryBlocks[i]);
}
}
public void removeBlocks(Target target, ICDIMemoryBlock[] memoryBlocks) throws CDIException { public void removeBlocks(Target target, ICDIMemoryBlock[] memoryBlocks) throws CDIException {
List blockList = (List)blockMap.get(target); List blockList = (List)blockMap.get(target);

6
debug/org.eclipse.cdt.debug.mi.core/cdi/org/eclipse/cdt/debug/mi/core/cdi/Session.java
View file

@ -16,7 +16,6 @@ import java.util.Properties;
import org.eclipse.cdt.debug.core.cdi.CDIException; import org.eclipse.cdt.debug.core.cdi.CDIException;
import org.eclipse.cdt.debug.core.cdi.ICDIConfiguration; import org.eclipse.cdt.debug.core.cdi.ICDIConfiguration;
import org.eclipse.cdt.debug.core.cdi.ICDIEventManager; import org.eclipse.cdt.debug.core.cdi.ICDIEventManager;
import org.eclipse.cdt.debug.core.cdi.ICDIMemoryManager;
import org.eclipse.cdt.debug.core.cdi.ICDIRegisterManager; import org.eclipse.cdt.debug.core.cdi.ICDIRegisterManager;
import org.eclipse.cdt.debug.core.cdi.ICDISession; import org.eclipse.cdt.debug.core.cdi.ICDISession;
import org.eclipse.cdt.debug.core.cdi.ICDISessionObject; import org.eclipse.cdt.debug.core.cdi.ICDISessionObject;
@ -163,10 +162,7 @@ public class Session implements ICDISession, ICDISessionObject {
return sharedLibraryManager; return sharedLibraryManager;
} }
/** public MemoryManager getMemoryManager() {
* @see org.eclipse.cdt.debug.core.cdi.ICDISession#getMemoryManager()
*/
public ICDIMemoryManager getMemoryManager() {
return memoryManager; return memoryManager;
} }

2
debug/org.eclipse.cdt.debug.mi.core/cdi/org/eclipse/cdt/debug/mi/core/cdi/event/CreatedEvent.java
View file

@ -91,7 +91,7 @@ public class CreatedEvent implements ICDICreatedEvent {
public CreatedEvent(Session s, MIMemoryCreatedEvent mblock) { public CreatedEvent(Session s, MIMemoryCreatedEvent mblock) {
session = s; session = s;
MemoryManager mgr = (MemoryManager)session.getMemoryManager(); MemoryManager mgr = session.getMemoryManager();
MISession miSession = mblock.getMISession(); MISession miSession = mblock.getMISession();
ICDIMemoryBlock[] blocks = mgr.getMemoryBlocks(miSession); ICDIMemoryBlock[] blocks = mgr.getMemoryBlocks(miSession);
for (int i = 0; i < blocks.length; i++) { for (int i = 0; i < blocks.length; i++) {

3
debug/org.eclipse.cdt.debug.mi.core/cdi/org/eclipse/cdt/debug/mi/core/cdi/model/MemoryBlock.java
View file

@ -23,6 +23,7 @@ import org.eclipse.cdt.debug.mi.core.MISession;
import org.eclipse.cdt.debug.mi.core.cdi.CdiResources; import org.eclipse.cdt.debug.mi.core.cdi.CdiResources;
import org.eclipse.cdt.debug.mi.core.cdi.MI2CDIException; import org.eclipse.cdt.debug.mi.core.cdi.MI2CDIException;
import org.eclipse.cdt.debug.mi.core.cdi.MemoryManager; import org.eclipse.cdt.debug.mi.core.cdi.MemoryManager;
import org.eclipse.cdt.debug.mi.core.cdi.Session;
import org.eclipse.cdt.debug.mi.core.command.CommandFactory; import org.eclipse.cdt.debug.mi.core.command.CommandFactory;
import org.eclipse.cdt.debug.mi.core.command.MIDataWriteMemory; import org.eclipse.cdt.debug.mi.core.command.MIDataWriteMemory;
import org.eclipse.cdt.debug.mi.core.output.MIDataReadMemoryInfo; import org.eclipse.cdt.debug.mi.core.output.MIDataReadMemoryInfo;
@ -141,7 +142,7 @@ public class MemoryBlock extends CObject implements ICDIMemoryBlock {
*/ */
public void refresh() throws CDIException { public void refresh() throws CDIException {
Target target = (Target)getTarget(); Target target = (Target)getTarget();
MemoryManager mgr = (MemoryManager)target.getSession().getMemoryManager(); MemoryManager mgr = ((Session)target.getSession()).getMemoryManager();
setDirty(true); setDirty(true);
BigInteger[] addresses = mgr.update(this, null); BigInteger[] addresses = mgr.update(this, null);
// Check if this affects other blocks. // Check if this affects other blocks.

42
debug/org.eclipse.cdt.debug.mi.core/cdi/org/eclipse/cdt/debug/mi/core/cdi/model/Target.java
View file

@ -22,6 +22,7 @@ import org.eclipse.cdt.debug.core.cdi.model.ICDIBreakpoint;
import org.eclipse.cdt.debug.core.cdi.model.ICDIExpression; import org.eclipse.cdt.debug.core.cdi.model.ICDIExpression;
import org.eclipse.cdt.debug.core.cdi.model.ICDIInstruction; import org.eclipse.cdt.debug.core.cdi.model.ICDIInstruction;
import org.eclipse.cdt.debug.core.cdi.model.ICDILocationBreakpoint; import org.eclipse.cdt.debug.core.cdi.model.ICDILocationBreakpoint;
import org.eclipse.cdt.debug.core.cdi.model.ICDIMemoryBlock;
import org.eclipse.cdt.debug.core.cdi.model.ICDIMixedInstruction; import org.eclipse.cdt.debug.core.cdi.model.ICDIMixedInstruction;
import org.eclipse.cdt.debug.core.cdi.model.ICDIRuntimeOptions; import org.eclipse.cdt.debug.core.cdi.model.ICDIRuntimeOptions;
import org.eclipse.cdt.debug.core.cdi.model.ICDISignal; import org.eclipse.cdt.debug.core.cdi.model.ICDISignal;
@ -36,6 +37,7 @@ import org.eclipse.cdt.debug.mi.core.cdi.BreakpointManager;
import org.eclipse.cdt.debug.mi.core.cdi.CdiResources; import org.eclipse.cdt.debug.mi.core.cdi.CdiResources;
import org.eclipse.cdt.debug.mi.core.cdi.ExpressionManager; import org.eclipse.cdt.debug.mi.core.cdi.ExpressionManager;
import org.eclipse.cdt.debug.mi.core.cdi.MI2CDIException; import org.eclipse.cdt.debug.mi.core.cdi.MI2CDIException;
import org.eclipse.cdt.debug.mi.core.cdi.MemoryManager;
import org.eclipse.cdt.debug.mi.core.cdi.RegisterManager; import org.eclipse.cdt.debug.mi.core.cdi.RegisterManager;
import org.eclipse.cdt.debug.mi.core.cdi.Session; import org.eclipse.cdt.debug.mi.core.cdi.Session;
import org.eclipse.cdt.debug.mi.core.cdi.SignalManager; import org.eclipse.cdt.debug.mi.core.cdi.SignalManager;
@ -881,4 +883,44 @@ public class Target implements ICDITarget {
return srcMgr.getMixedInstructions(this, filename, linenum, lines); return srcMgr.getMixedInstructions(this, filename, linenum, lines);
} }
/* (non-Javadoc)
* @see org.eclipse.cdt.debug.core.cdi.model.ICDIMemoryBlockManagement#createMemoryBlock(java.lang.String, int)
*/
public ICDIMemoryBlock createMemoryBlock(String address, int length) throws CDIException {
MemoryManager memMgr = ((Session)getSession()).getMemoryManager();
return memMgr.createMemoryBlock(this, address, length);
}
/* (non-Javadoc)
* @see org.eclipse.cdt.debug.core.cdi.model.ICDIMemoryBlockManagement#createMemoryBlock(java.math.BigInteger, int)
*/
public ICDIMemoryBlock createMemoryBlock(BigInteger address, int length) throws CDIException {
MemoryManager memMgr = ((Session)getSession()).getMemoryManager();
return memMgr.createMemoryBlock(this, address, length);
}
/* (non-Javadoc)
* @see org.eclipse.cdt.debug.core.cdi.model.ICDIMemoryBlockManagement#removeBlocks(org.eclipse.cdt.debug.core.cdi.model.ICDIMemoryBlock[])
*/
public void removeBlocks(ICDIMemoryBlock[] memoryBlocks) throws CDIException {
MemoryManager memMgr = ((Session)getSession()).getMemoryManager();
memMgr.removeBlocks(this, memoryBlocks);
}
/* (non-Javadoc)
* @see org.eclipse.cdt.debug.core.cdi.model.ICDIMemoryBlockManagement#removeAllBlocks()
*/
public void removeAllBlocks() throws CDIException {
MemoryManager memMgr = ((Session)getSession()).getMemoryManager();
memMgr.removeAllBlocks(this);
}
/* (non-Javadoc)
* @see org.eclipse.cdt.debug.core.cdi.model.ICDIMemoryBlockManagement#getMemoryBlocks()
*/
public ICDIMemoryBlock[] getMemoryBlocks() throws CDIException {
MemoryManager memMgr = ((Session)getSession()).getMemoryManager();
return memMgr.getMemoryBlocks(this);
}
} }