natas_hw
/
mspsim
mirror of https://github.com/contiki-ng/mspsim
0
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

* Changed command 'log' to both list and handle multiple loggables 

* Removed now obsolete command 'loggable' (replaced by 'log')
* Minor cleanup of command output

git-svn-id: https://mspsim.svn.sourceforge.net/svnroot/mspsim/mspsim@771 23d1a52b-0c3c-0410-b72d-8f29ab48fe35
This commit is contained in:
nifi 2011-01-17 14:51:17 +00:00
parent 7bea26150b
commit f0e4ac16a4
1 changed files with 46 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

80
se/sics/mspsim/cli/DebugCommands.java
View File

@ -40,7 +40,6 @@
*/
package se.sics.mspsim.cli;
import se.sics.mspsim.core.CPUMonitor;
import se.sics.mspsim.core.Chip;
import se.sics.mspsim.core.DbgInstruction;
import se.sics.mspsim.core.DisAsm;
import se.sics.mspsim.core.EmulationException;
@ -86,7 +85,7 @@ public class DebugCommands implements CommandBundle {
cpu.stop();
}
});
context.out.println("Breakpoint set at $" + Utils.hex16(baddr));
context.err.println("Breakpoint set at $" + Utils.hex16(baddr));
return 0;
}
public void stopCommand(CommandContext context) {
@ -196,7 +195,7 @@ public class DebugCommands implements CommandBundle {
}
}
});
context.out.println("Watch set for register " + getRegisterName(register));
context.err.println("Watch set for register " + getRegisterName(register));
return 0;
}
@ -521,32 +520,48 @@ public class DebugCommands implements CommandBundle {
}
});
ch.registerCommand("loggable", new BasicCommand("list loggable objects", "") {
@Override
public int executeCommand(CommandContext context) {
Loggable[] chips = cpu.getLoggables();
for (int i = 0; i < chips.length; i++) {
context.out.println(chips[i].getName());
}
return 0;
}
});
ch.registerCommand("log", new BasicAsyncCommand("log a loggable object", "<loggable>" ) {
Loggable chip = null;
@Override
public int executeCommand(CommandContext context) {
chip = cpu.getLoggable(context.getArgument(0));
if (chip == null) {
context.err.println("Can not find loggable: " + context.getArgument(0));
}
chip.setLogStream(context.out);
return 0;
}
ch.registerCommand("log", new BasicAsyncCommand("log a loggable object", "[loggable...]" ) {
private Loggable[] loggables = null;
public void stopCommand(CommandContext context) {
chip.clearLogStream();
}
@Override
public int executeCommand(CommandContext context) {
if (context.getArgumentCount() == 0) {
Loggable[] loggable = cpu.getLoggables();
for (Loggable unit : loggable) {
String id = unit.getID();
String name = unit.getName();
if (id == name) {
context.out.println(" " + id);
} else {
context.out.println(" " + id + " (" + name + ')');
}
}
context.exit(0);
return 0;
}
Loggable[] logs = new Loggable[context.getArgumentCount()];
for(int i = 0, n = context.getArgumentCount(); i < n; i++) {
logs[i] = cpu.getLoggable(context.getArgument(i));
if (logs[i] == null) {
context.err.println("Can not find loggable '" + context.getArgument(i) + '\'');
return 1;
}
}
for(Loggable l : logs) {
l.setLogStream(context.out);
}
this.loggables = logs;
return 0;
}
public void stopCommand(CommandContext context) {
if (loggables != null) {
for(Loggable l : loggables) {
l.clearLogStream();
}
}
}
});
ch.registerCommand("trace", new BasicCommand("store a trace of execution positions.", "<trace size | show>") {
@ -583,25 +598,22 @@ public class DebugCommands implements CommandBundle {
MapEntry me = context.getMapTable().getEntry(adr);
if (me != null) {
return me.getName();
} else {
return Utils.hex16(adr);
}
return '$' + Utils.hex16(adr);
}
private static String getSymOrAddrELF(ELF elf, int adr) {
DebugInfo me = elf.getDebugInfo(adr);
if (me != null) {
return me.toString();
} else {
return Utils.hex16(adr);
}
return '$' + Utils.hex16(adr);
}
private static String getRegisterName(int register) {
if (register >= 0 && register < MSP430Constants.REGISTER_NAMES.length) {
return MSP430Constants.REGISTER_NAMES[register];
} else {
return "R" + register;
}
return "R" + register;
}
}