deac/osd-contiki
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

all mote memories now support symbol addresses

Browse source 
added memory monitor methods (was previously only supported by emulated motes)
This commit is contained in:
Fredrik Osterlind 2012-03-09 14:56:09 +01:00
parent ab39b84010
commit 129a854b54
2 changed files with 12 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
tools/cooja/java/se/sics/cooja/MoteMemory.java
View file

@ -31,6 +31,7 @@
package se.sics.cooja; package se.sics.cooja;
/** /**
* This interface represents a mote memory. * This interface represents a mote memory.
* *
@ -44,7 +45,7 @@ package se.sics.cooja;
* @see se.sics.cooja.SectionMoteMemory * @see se.sics.cooja.SectionMoteMemory
* @author Fredrik Osterlind * @author Fredrik Osterlind
*/ */
public interface MoteMemory { public interface MoteMemory extends AddressMemory {
/** /**
* Clears the entire memory. * Clears the entire memory.
@ -77,4 +78,14 @@ public interface MoteMemory {
*/ */
public int getTotalSize(); public int getTotalSize();
public abstract int parseInt(byte[] memorySegment);
public enum MemoryEventType { READ, WRITE };
public interface MemoryMonitor {
public void memoryChanged(MoteMemory memory, MemoryEventType type, int address);
}
public boolean addMemoryMonitor(int address, int size, MemoryMonitor mm);
public void removeMemoryMonitor(int address, int size, MemoryMonitor mm);
} }

23
tools/cooja/java/se/sics/cooja/motes/AbstractEmulatedMote.java
View file

@ -64,27 +64,4 @@ public abstract class AbstractEmulatedMote extends AbstractWakeupMote implements
public String getStackTrace() { public String getStackTrace() {
return null; return null;
} }
public interface MemoryMonitor {
public boolean start(int address, int size);
public void stop();
public Mote getMote();
public int getAddress();
public int getSize();
public void setLastBufferAccess(BufferAccess ba);
public BufferAccess getLastBufferAccess();
public boolean isPointer();
public void setPointer(boolean isPointer, MemoryMonitor pointedMemory);
public MemoryMonitor getPointedMemory();
}
public enum MemoryEventType { READ, WRITE, UNKNOWN };
public interface MemoryEventHandler {
public void event(MemoryMonitor mm, MemoryEventType type, int adr, int data);
}
public abstract MemoryMonitor createMemoryMonitor(MemoryEventHandler meh);
} }