mspsim-commit Mailing List for mspsim (Page 29)

SourceForge Headquarters 225 Broadway Suite 1600 San Diego, CA 92101 +1 (858) 422-6466

Revision: 211
          http://mspsim.svn.sourceforge.net/mspsim/?rev=211&view=rev
Author:   nifi
Date:     2008-03-25 03:30:14 -0700 (Tue, 25 Mar 2008)

Log Message:
-----------
CLI help text cleanup + improved error handling

Modified Paths:
--------------
    mspsim/se/sics/mspsim/cli/CommandHandler.java
    mspsim/se/sics/mspsim/cli/DebugCommands.java
    mspsim/se/sics/mspsim/cli/ExecCommand.java
    mspsim/se/sics/mspsim/cli/MiscCommands.java
    mspsim/se/sics/mspsim/util/StatCommands.java

Modified: mspsim/se/sics/mspsim/cli/CommandHandler.java
===================================================================

--- mspsim/se/sics/mspsim/cli/CommandHandler.java	2008-03-25 10:29:00 UTC (rev 210)
+++ mspsim/se/sics/mspsim/cli/CommandHandler.java	2008-03-25 10:30:14 UTC (rev 211)
@@ -74,8 +74,15 @@
         out.flush();
         String line = readLine(inReader);//.readLine();
         if (line != null && line.length() > 0) {
-          String[][] parts = CommandParser.parseLine(line);
-          if(parts.length > 0 && checkCommands(parts) == 0) {
+          String[][] parts;
+          try {
+            parts = CommandParser.parseLine(line);
+          } catch (Exception e) {
+            err.println("Error: failed to parse command:");
+            e.printStackTrace(err);
+            parts = null;
+          }
+          if(parts != null && parts.length > 0 && checkCommands(parts) == 0) {
             CommandContext[] commands = new CommandContext[parts.length];
 	    boolean error = false;
 	    int pid = -1;
@@ -145,11 +152,11 @@
     for (int i = 0; i < cmds.length; i++) {
       Command command = commands.get(cmds[i][0]);
       if (command == null) {
-        err.println("CLI: Command not found: " + cmds[i][0]);
+        err.println("CLI: Command not found: \"" + cmds[i][0] + "\". Try \"help\".");
         return -1;
       }
       if (i > 0 && !(command instanceof LineListener)) {
-        err.println("CLI: Error " + cmds[i][0] + " does not take input");
+        err.println("CLI: Error, command \"" + cmds[i][0] + "\" does not take input.");
         return -1;
       }
       // TODO replace with command name
@@ -200,20 +207,23 @@
           for(Map.Entry<String,Command> entry: commands.entrySet()) {
             String name = entry.getKey();
             Command command = entry.getValue();
-            String prefix = ' ' + name + ' ' + command.getArgumentHelp(name);
             String helpText = command.getCommandHelp(name);
-            int n;
-            if (helpText != null && (n = helpText.indexOf('\n')) > 0) {
-              helpText = helpText.substring(0, n);
+            if (helpText != null) {
+              String argHelp = command.getArgumentHelp(name);
+              String prefix = argHelp != null ? (' ' + name + ' ' + argHelp) : (' ' + name);
+              int n;
+              if (helpText != null && (n = helpText.indexOf('\n')) > 0) {
+                helpText = helpText.substring(0, n);
+              }
+              context.out.print(prefix);
+              if (prefix.length() < 8) {
+                context.out.print('\t');
+              }
+              if (prefix.length() < 16) {
+                context.out.print('\t');
+              }
+              context.out.println("\t " + helpText);
             }
-            context.out.print(prefix);
-            if (prefix.length() < 8) {
-              context.out.print('\t');
-            }
-            if (prefix.length() < 16) {
-              context.out.print('\t');
-            }
-            context.out.println("\t " + helpText);
           }
           return 0;
         }
@@ -221,15 +231,23 @@
         String cmd = context.getArgument(0);
         Command command = commands.get(cmd);
         if (command != null) {
-          context.out.println(cmd + ' ' + command.getArgumentHelp(cmd));
-          context.out.println("  " + command.getCommandHelp(cmd));
+          String helpText = command.getCommandHelp(cmd);
+          String argHelp = command.getArgumentHelp(cmd);
+          context.out.print(cmd);
+          if (argHelp != null) {
+            context.out.print(' ' + argHelp);
+          }
+          context.out.println();
+          if (helpText != null && helpText.length() > 0) {
+            context.out.println("  " + helpText);
+          }
           return 0;
         }
         context.err.println("Error: unknown command '" + cmd + '\'');
         return 1;
       }
     });
-    registerCommand("workaround", new BasicCommand("", "") {
+    registerCommand("workaround", new BasicCommand("activate workaround for Java console input bug", "") {
       public int executeCommand(CommandContext context) {
         workaround = true;
         return 0;

Modified: mspsim/se/sics/mspsim/cli/DebugCommands.java
===================================================================
--- mspsim/se/sics/mspsim/cli/DebugCommands.java	2008-03-25 10:29:00 UTC (rev 210)
+++ mspsim/se/sics/mspsim/cli/DebugCommands.java	2008-03-25 10:30:14 UTC (rev 211)
@@ -52,13 +52,13 @@
 public class DebugCommands implements CommandBundle {
   private long lastCall = 0;
   private long lastWall = 0;
-  
+
   public void setupCommands(ComponentRegistry registry, CommandHandler ch) {
     final MSP430 cpu = (MSP430) registry.getComponent(MSP430.class);
     final ELF elf = (ELF) registry.getComponent(ELF.class);
     final GenericNode node = (GenericNode) registry.getComponent("node");
     if (cpu != null) {
-      ch.registerCommand("break", new BasicAsyncCommand("adds a breakpoint to a given address or symbol",
+      ch.registerCommand("break", new BasicAsyncCommand("add a breakpoint to a given address or symbol",
           "<address or symbol>") { 
         int address = 0; 
         public int executeCommand(final CommandContext context) {
@@ -78,7 +78,7 @@
       });
 
       ch.registerCommand("watch",
-          new BasicAsyncCommand("adds a write watch to a given address or symbol", "<address or symbol>") {
+          new BasicAsyncCommand("add a write watch to a given address or symbol", "<address or symbol>") {
         int mode = 0;
         int address = 0;
         public int executeCommand(final CommandContext context) {
@@ -118,7 +118,7 @@
       });
 
       ch.registerCommand("watchreg",
-          new BasicAsyncCommand("adds a write watch to a given register", "<register> [int]") {
+          new BasicAsyncCommand("add a write watch to a given register", "<register> [int]") {
         int mode = 0;
         int register = 0;
         public int executeCommand(final CommandContext context) {
@@ -169,13 +169,13 @@
         }
 
         public String getCommandHelp(String commandName) {
-          return "clears a breakpoint or watch from a given address or symbol";
+          return "clear a breakpoint or watch from a given address or symbol";
         }
       });
 
       
       
-      ch.registerCommand("symbol", new BasicCommand("lists matching symbold", "<regexp>") {
+      ch.registerCommand("symbol", new BasicCommand("list matching symbold", "<regexp>") {
         public int executeCommand(final CommandContext context) {
           String regExp = context.getArgument(0);
           MapEntry[] entries = context.getMapTable().getEntries(regExp);
@@ -189,29 +189,29 @@
       });
       
       if (node != null) {
-        ch.registerCommand("stop", new BasicCommand("stops mspsim", "") {
+        ch.registerCommand("stop", new BasicCommand("stop the CPU", "") {
           public int executeCommand(CommandContext context) {
             node.stop();
             context.out.println("CPU stopped at: $" + Utils.hex16(cpu.readRegister(0)));
             return 0;
           }
         });
-        ch.registerCommand("start", new BasicCommand("starts mspsim", "") {
+        ch.registerCommand("start", new BasicCommand("start the CPU", "") {
           public int executeCommand(CommandContext context) {
             node.start();
             return 0;
           }
         });
-        ch.registerCommand("step", new BasicCommand("singlesteps mspsim", "<number of lines>") {
+        ch.registerCommand("step", new BasicCommand("singlestep the CPU", "[number of instructions]") {
           public int executeCommand(CommandContext context) {
             int nr = context.getArgumentCount() > 0 ? context.getArgumentAsInt(0) : 1;
             while(nr-- > 0)
               node.step();
-            context.out.println("CPU stepped to: " + Utils.hex16(cpu.readRegister(0)));
+            context.out.println("CPU stepped to: $" + Utils.hex16(cpu.readRegister(0)));
             return 0;
           }
         });
-        ch.registerCommand("print", new BasicCommand("prints value of an address or symbol", "<address or symbol>") {
+        ch.registerCommand("print", new BasicCommand("print value of an address or symbol", "<address or symbol>") {
           public int executeCommand(CommandContext context) {
             int adr = context.getArgumentAsAddress(0);
             if (adr != -1) { 
@@ -222,7 +222,7 @@
             return 0;
           }
         });
-        ch.registerCommand("printreg", new BasicCommand("prints value of an register", "<register>") {
+        ch.registerCommand("printreg", new BasicCommand("print value of an register", "<register>") {
           public int executeCommand(CommandContext context) {
             int register = context.getArgumentAsRegister(0);
             if (register >= 0) {
@@ -232,14 +232,14 @@
             return -1;
           }
         });
-        ch.registerCommand("reset", new BasicCommand("resets the CPU", "") {
+        ch.registerCommand("reset", new BasicCommand("reset the CPU", "") {
           public int executeCommand(CommandContext context) {
             cpu.reset();
             return 0;
           }
         });
 
-        ch.registerCommand("time", new BasicCommand("prints the elapse time and cycles", "") {
+        ch.registerCommand("time", new BasicCommand("print the elapse time and cycles", "") {
           public int executeCommand(CommandContext context) {
             long time = ((long)(cpu.getTimeMillis()));
             context.out.println("Emulated time elapsed: " + time + "(ms)  since last: " + (time - lastCall) + " ms" + " wallTime: " +

Modified: mspsim/se/sics/mspsim/cli/ExecCommand.java
===================================================================
--- mspsim/se/sics/mspsim/cli/ExecCommand.java	2008-03-25 10:29:00 UTC (rev 210)
+++ mspsim/se/sics/mspsim/cli/ExecCommand.java	2008-03-25 10:30:14 UTC (rev 211)
@@ -52,7 +52,7 @@
   private PrintStream output;
 
   public ExecCommand() {
-    super("executes the specified command", "<cmd> [args...]");
+    super("execute the specified command", "<cmd> [args...]");
   }
 
   public int executeCommand(CommandContext context) {

Modified: mspsim/se/sics/mspsim/cli/MiscCommands.java
===================================================================
--- mspsim/se/sics/mspsim/cli/MiscCommands.java	2008-03-25 10:29:00 UTC (rev 210)
+++ mspsim/se/sics/mspsim/cli/MiscCommands.java	2008-03-25 10:30:14 UTC (rev 211)
@@ -39,14 +39,11 @@
  *           $Revision$
  */
 package se.sics.mspsim.cli;
-
-import java.io.FileNotFoundException;
 import java.io.IOException;
 import java.io.PrintStream;
 import java.util.Hashtable;
 import java.util.Iterator;
 import java.util.regex.Pattern;
-
 import se.sics.mspsim.core.MSP430;
 import se.sics.mspsim.util.ComponentRegistry;
 
@@ -55,10 +52,11 @@
  *
  */
 public class MiscCommands implements CommandBundle {
-  Hashtable <String, FileTarget> fileTargets = new Hashtable<String, FileTarget>();
 
+  private Hashtable <String, FileTarget> fileTargets = new Hashtable<String, FileTarget>();
+
   public void setupCommands(final ComponentRegistry registry, CommandHandler handler) {
-    handler.registerCommand("grep", new BasicLineCommand("grep", "<regexp>") {
+    handler.registerCommand("grep", new BasicLineCommand("print lines matching the specified pattern", "<regexp>") {
       private PrintStream out;
       private Pattern pattern;
       public int executeCommand(CommandContext context) {
@@ -77,14 +75,14 @@
 
     // TODO: this should also be "registered" as a "sink".
     // probably this should be handled using ">" instead!
-    handler.registerCommand(">", new BasicLineCommand(">", "<filename>") {
+    handler.registerCommand(">", new BasicLineCommand(null, "<filename>") {
       FileTarget ft;
       public int executeCommand(CommandContext context) {
         String fileName = context.getArgument(0);
         ft = fileTargets.get(fileName);
         if (ft == null) {
           try {
-            System.out.println("Creating new file target: " + fileName);
+//            System.out.println("Creating new file target: " + fileName);
             ft = new FileTarget(fileName);
             fileTargets.put(fileName, ft);
           } catch (IOException e) {
@@ -102,22 +100,23 @@
       }
     });
 
-    handler.registerCommand("fclose", new BasicCommand("fclose", "<filename>") {
+    handler.registerCommand("fclose", new BasicCommand("close the specified file", "<filename>") {
       public int executeCommand(CommandContext context) {
         String name = context.getArgument(0);
         FileTarget ft = fileTargets.get(name);
         if (ft != null) {
-          context.out.println("Closing file:" + name);
+          context.out.println("Closing file " + name);
           fileTargets.remove(name);
           ft.close();
+          return 0;
         } else {
-          context.err.println("No file named: " + name + " open");
+          context.err.println("Could not find the open file " + name);
+          return 1;
         }
-        return 0;
       }
     });
 
-    handler.registerCommand("files", new BasicCommand("files", "") {
+    handler.registerCommand("files", new BasicCommand("list open files", "") {
       public int executeCommand(CommandContext context) {
         for (Iterator<FileTarget> iterator = fileTargets.values().iterator(); iterator.hasNext();) {
           FileTarget type = (FileTarget) iterator.next();
@@ -127,29 +126,37 @@
       }
     });
 
-    handler.registerCommand("speed", new BasicCommand("speed", "<factor>") {
+    handler.registerCommand("speed", new BasicCommand("set the speed factor for the CPU", "[factor]") {
       public int executeCommand(CommandContext context) {
-        double d = context.getArgumentAsDouble(0);
         MSP430 cpu = (MSP430) registry.getComponent(MSP430.class);
-        if (cpu != null) {
-          if (d < 0.0) {
-            System.out.println("Rate needs to be larger than zero");
+        if (cpu == null) {
+          context.err.println("could not access the CPU.");
+          return 1;
+        } else if (context.getArgumentCount() == 0) {
+          long rate = cpu.getSleepRate();
+          double d = rate / 25000.0;
+          context.out.println("Speed factor is set to " + (((int)(d * 100 + 0.5)) / 100.0));
+        } else {
+          double d = context.getArgumentAsDouble(0);
+          if (d > 0.0) {
+            long rate = (long) (25000 * d);
+            cpu.setSleepRate(rate);
           } else {
-            long rate = (long)(25000 * d);
-            cpu.setSleepRate(rate);
+            context.err.println("Speed factor must be larger than zero.");
+            return 1;
           }
         }
         return 0;
       }
     });
-    
-    handler.registerCommand("exit", new BasicCommand("exit", "") {
+
+    handler.registerCommand("quit", new BasicCommand("exit MSPSim", "") {
       public int executeCommand(CommandContext context) {
         System.exit(0);
         return 0;
       }
     });
-    
+
     handler.registerCommand("exec", new ExecCommand());
   }
 

Modified: mspsim/se/sics/mspsim/util/StatCommands.java
===================================================================
--- mspsim/se/sics/mspsim/util/StatCommands.java	2008-03-25 10:29:00 UTC (rev 210)
+++ mspsim/se/sics/mspsim/util/StatCommands.java	2008-03-25 10:30:14 UTC (rev 211)
@@ -62,23 +62,29 @@
 
   @Override
   public void setupCommands(ComponentRegistry registry, CommandHandler handler) {
-    handler.registerCommand("chipinfo", new BasicCommand("shows information about specified chip",
+    handler.registerCommand("chipinfo", new BasicCommand("show information about specified chip",
     "[chips...]") {
 
       @Override
       public int executeCommand(CommandContext context) {
         if (context.getArgumentCount() > 0) {
           for (int i = 0, n = context.getArgumentCount(); i < n; i++) {
-            // TODO list chips
+            String chipName = context.getArgument(i);
+            Chip chip = statistics.getChip(chipName);
+            if (chip == null) {
+              context.out.println("  " + chipName + ": NOT FOUND");
+            } else {
+              context.out.println("  " + chipName + ": " + chip);
+            }
           }
-          return 0;
-        }
-        Chip[] chips = statistics.getChips();
-        if (chips == null) {
-          context.out.println("No chips found");
         } else {
-          for (int i = 0, n = chips.length; i < n; i++) {
-            context.out.println("  " + chips[i].getName());
+          Chip[] chips = statistics.getChips();
+          if (chips == null) {
+            context.out.println("No chips found.");
+          } else {
+            for (int i = 0, n = chips.length; i < n; i++) {
+              context.out.println("  " + chips[i].getName());
+            }
           }
         }
         return 0;
@@ -86,7 +92,7 @@
         
     });
 
-    handler.registerCommand("duty", new BasicAsyncCommand("adds a duty cycle sampler for operating modes to the specified chips",
+    handler.registerCommand("duty", new BasicAsyncCommand("add a duty cycle sampler for operating modes to the specified chips",
         "<frequency> <chip> [chips...]") {
 
       private PrintStream out;


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.




2007	Jan	Feb	Mar	Apr	May	Jun	Jul	Aug	Sep	Oct (21)	Nov (12)	Dec (41)
2008	Jan (25)	Feb (54)	Mar (63)	Apr (52)	May (17)	Jun (3)	Jul (3)	Aug (5)	Sep (49)	Oct (50)	Nov (34)	Dec (14)
2009	Jan (9)	Feb (15)	Mar (38)	Apr (12)	May (35)	Jun (20)	Jul (2)	Aug (7)	Sep (36)	Oct (24)	Nov (2)	Dec (2)
2010	Jan (14)	Feb (1)	Mar (36)	Apr (2)	May (4)	Jun (6)	Jul (35)	Aug (11)	Sep (8)	Oct (3)	Nov	Dec (1)
2011	Jan (11)	Feb (12)	Mar (3)	Apr (7)	May (12)	Jun (8)	Jul	Aug (3)	Sep (4)	Oct	Nov (2)	Dec (4)
2012	Jan (2)	Feb (1)	Mar (14)	Apr (5)	May (28)	Jun	Jul	Aug	Sep	Oct (21)	Nov (4)	Dec (1)
2013	Jan (1)	Feb	Mar	Apr	May	Jun	Jul	Aug	Sep	Oct	Nov	Dec
2014	Jan	Feb	Mar	Apr	May (2)	Jun	Jul	Aug	Sep	Oct	Nov	Dec

mspsim-commit Mailing List for mspsim (Page 29)

Java-based instruction level emulator of MSP430. Code on github.

mspsim-commit — Commit messages