X-Git-Url: http://git.rot13.org/?p=goodfet;a=blobdiff_plain;f=client%2FGoodFETConsole.py;h=cd0045f01cc59aa67386a58a752e28b06671d4ac;hp=14fc3e3c6706636b6ffbce48ff8287cb4b29ebc9;hb=d941137f767ad40f7bf253f6828735b641b52dca;hpb=dbd55dca7cded37fc93f74beb7c3043f11389d6e

diff --git a/client/GoodFETConsole.py b/client/GoodFETConsole.py
index 14fc3e3..cd0045f 100644
--- a/client/GoodFETConsole.py
+++ b/client/GoodFETConsole.py
@@ -5,7 +5,7 @@
 #
 # This code is being rewritten and refactored.  You've been warned!
 
-import sys;
+import sys, os;
 import binascii;
 
 from GoodFET import GoodFET;
@@ -19,15 +19,37 @@ class GoodFETConsole():
         client.serInit();
         client.setup();
         client.start();
+    def run(self):
+        while 1:
+            sys.stdout.write("gf% ");
+            sys.stdout.flush();
+            cmd=sys.stdin.readline();
+            self.handle(cmd);
+
     def handle(self, str):
         """Handle a command string.  First word is command."""
+        #Lines beginning with # are comments.
+        if(str[0]=="#"):  return;
+        #Lines beginning with ! are Python.
+        if(str[0]=="!"):
+            try:
+                exec(str.lstrip('!'));
+            except:
+                print sys.exc_info()[0];
+            return;
+        #Backtick (`) indicates shell commands.
+        if(str[0]=='`'):
+            os.system(str.lstrip('`'));
+            return;
+        #By this point, we're looking at a GoodFET command.
         args=str.split();
         if len(args)==0:
             return;
         try:
             eval("self.CMD%s(args)" % args[0])
-        except AttributeError:
-            print "Unknown command '%s'." % args[0];
+        except:
+            print sys.exc_info()[0];
+            #print "Unknown command '%s'." % args[0];
     def CMDinfo(self,args):
         print self.client.infostring()
     def CMDlock(self,args):
@@ -44,6 +66,16 @@ class GoodFETConsole():
         return;
     def CMDpeek(self,args):
         adr=eval(args[1]);
-        print "0x%08x:= 0x%04x" % (adr, self.client.peek16(adr));
-        return;
+        memory="vn";
+        if(len(args)>2):
+            memory=args[2];
+        print "0x%08x:= 0x%04x" % (adr, self.client.peek16(adr,memory));
+    def CMDflash(self,args):
+        file=args[1];
+        self.client.flash(self.expandfilename(file));
+    def expandfilename(self,filename):
+        if(filename[0]=='~'):
+            return "%s%s" % (os.environ.get("HOME"),filename.lstrip('~'));
+        return filename;
+