bugfix: mspsim may not have pc information, causing exception in buffer listener
bugfix: mote interfaces were incorrectly initialized twice, causing an mote id error in tinyos
This commit is contained in:
parent
ea42d590ea
commit
e22bf837fc
1 changed files with 17 additions and 10 deletions
|
@ -387,7 +387,9 @@ public abstract class MspMote extends AbstractEmulatedMote implements Mote, Watc
|
|||
|
||||
public boolean setConfigXML(Simulation simulation, Collection<Element> configXML, boolean visAvailable) {
|
||||
setSimulation(simulation);
|
||||
if (myMoteInterfaceHandler == null) {
|
||||
myMoteInterfaceHandler = createMoteInterfaceHandler();
|
||||
}
|
||||
|
||||
/* Create watchpoint container */
|
||||
try {
|
||||
|
@ -497,7 +499,9 @@ public abstract class MspMote extends AbstractEmulatedMote implements Mote, Watc
|
|||
}
|
||||
if (di == null) {
|
||||
/* Return PC value */
|
||||
MapEntry mapEntry = ((SimpleProfiler)myCpu.getProfiler()).getCallMapEntry(0);
|
||||
SimpleProfiler sp = (SimpleProfiler)myCpu.getProfiler();
|
||||
try {
|
||||
MapEntry mapEntry = sp.getCallMapEntry(0);
|
||||
if (mapEntry != null) {
|
||||
String file = mapEntry.getFile();
|
||||
if (file != null) {
|
||||
|
@ -509,6 +513,9 @@ public abstract class MspMote extends AbstractEmulatedMote implements Mote, Watc
|
|||
return file + ":?:" + name;
|
||||
}
|
||||
return String.format("*%02x", myCpu.reg[MSP430Constants.PC]);
|
||||
} catch (Exception e) {
|
||||
return null;
|
||||
}
|
||||
}
|
||||
|
||||
int lineNo = di.getLine();
|
||||
|
|
Loading…
Reference in a new issue