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

removed obsolete until method

Browse source
This commit is contained in:
fros4943 2009-10-27 08:52:49 +00:00
parent 4a0973a95f
commit 8b136c0b35
1 changed files with 2 additions and 57 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

59
tools/cooja/apps/mspsim/src/se/sics/cooja/mspmote/plugins/MspCodeWatcher.java
View file

@ -26,7 +26,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE. * SUCH DAMAGE.
* *
* $Id: MspCodeWatcher.java,v 1.20 2009/09/23 08:22:36 fros4943 Exp $ * $Id: MspCodeWatcher.java,v 1.21 2009/10/27 08:52:49 fros4943 Exp $
*/ */
package se.sics.cooja.mspmote.plugins; package se.sics.cooja.mspmote.plugins;
@ -176,9 +176,6 @@ public class MspCodeWatcher extends VisPlugin {
JButton button = new JButton(stepAction); JButton button = new JButton(stepAction);
stepAction.putValue(Action.NAME, "Step instruction"); stepAction.putValue(Action.NAME, "Step instruction");
controlPanel.add(button); controlPanel.add(button);
button = new JButton(untilAction);
untilAction.putValue(Action.NAME, "Until function return");
/*controlPanel.add(button);*/
/* Main components: assembler and C code + breakpoints (center) */ /* Main components: assembler and C code + breakpoints (center) */
@ -210,11 +207,9 @@ public class MspCodeWatcher extends VisPlugin {
public void update(Observable obs, Object obj) { public void update(Observable obs, Object obj) {
if (!simulation.isRunning()) { if (!simulation.isRunning()) {
stepAction.setEnabled(true); stepAction.setEnabled(true);
untilAction.setEnabled(true);
updateInfo(); updateInfo();
} else { } else {
stepAction.setEnabled(false); stepAction.setEnabled(false);
untilAction.setEnabled(false);
} }
} }
}); });
@ -605,7 +600,7 @@ public class MspCodeWatcher extends VisPlugin {
private AbstractAction stepAction = new AbstractAction() { private AbstractAction stepAction = new AbstractAction() {
public void actionPerformed(ActionEvent e) { public void actionPerformed(ActionEvent e) {
try { try {
mspMote.getCPU().step(mspMote.getCPU().cycles+1); mspMote.getCPU().stepInstructions(1);
} catch (EmulationException ex) { } catch (EmulationException ex) {
logger.fatal("Error: ", ex); logger.fatal("Error: ", ex);
} }
@ -613,54 +608,4 @@ public class MspCodeWatcher extends VisPlugin {
} }
}; };
private AbstractAction untilAction = new AbstractAction() {
public void actionPerformed(ActionEvent e) {
/* XXX TODO Implement me */
final int max = 10000;
int count=0;
int pc, instruction;
MSP430 cpu = mspMote.getCPU();
int depth = 0;
/* Extract function name */
DebugInfo debugInfo = mspMote.getELF().getDebugInfo(mspMote.getCPU().reg[MSP430.PC]);
if (debugInfo == null || debugInfo.getFunction() == null) {
logger.fatal("Unknown function");
return;
}
String functionName = debugInfo.getFunction().split(":")[0];
logger.info("Function: '" + functionName + "'");
pc = cpu.readRegister(MSP430Core.PC);
instruction = cpu.memory[pc] + (cpu.memory[pc + 1] << 8);
if (instruction == MSP430.RETURN) {
logger.fatal("Already at return instruction");
return;
}
try {
while (count++ < max) {
cpu.step(mspMote.getCPU().cycles+1);
pc = cpu.readRegister(MSP430Core.PC);
instruction = cpu.memory[pc] + (cpu.memory[pc + 1] << 8);
if ((instruction & 0xff80) == MSP430.CALL) {
depth++;
} else if (instruction == MSP430.RETURN) {
depth--;
if (depth < 0) {
updateInfo();
return;
}
}
}
} catch (EmulationException e1) {
logger.fatal("Error: ", e1);
}
logger.fatal("Function '" + functionName + "' did not return within " + max + " instructions");
updateInfo();
}
};
} }