Symbol loading is now in GoodFETCC instead of goodfet.cc.

[goodfet] / client / goodfet.cc

diff --git a/client/goodfet.cc b/client/goodfet.cc
index 7654378..7a07aac 100755 (executable)
--- a/client/goodfet.cc
+++ b/client/goodfet.cc
@@ -9,13 +9,15 @@ import sys;
 import binascii;
 
 from GoodFETCC import GoodFETCC;
+from GoodFETConsole import GoodFETConsole;
 from intelhex import IntelHex;
 
-
 if(len(sys.argv)==1):
     print "Usage: %s verb [objects]\n" % sys.argv[0];
     print "%s test" % sys.argv[0];
+    print "%s term" % sys.argv[0];
     print "%s info" % sys.argv[0];
+    print "%s radioinfo" % sys.argv[0];
     print "%s dumpcode $foo.hex [0x$start 0x$stop]" % sys.argv[0];
     print "%s dumpdata $foo.hex [0x$start 0x$stop]" % sys.argv[0];
     print "%s erase" % sys.argv[0];
@@ -23,19 +25,35 @@ if(len(sys.argv)==1):
     print "%s verify $foo.hex [0x$start 0x$stop]" % sys.argv[0];
     print "%s peekdata 0x$start [0x$stop]" % sys.argv[0];
     print "%s pokedata 0x$adr 0x$val" % sys.argv[0];
-    #print "%s peekcode 0x$start [0x$stop]" % sys.argv[0];
+    print "%s peek 0x$iram" % sys.argv[0];
+    print "%s poke 0x$iram 0x$val" % sys.argv[0];
+    print "%s peekcode 0x$start [0x$stop]" % sys.argv[0];
     sys.exit();
 
 #Initailize FET and set baud rate
+#client=GoodFET.GoodFETCC.GoodFETCC();
 client=GoodFETCC();
 client.serInit()
 
 #Connect to target
-client.CCsetup();
-client.CCstart();
+client.setup();
+client.start();
+
 
+if(sys.argv[1]=="explore"):
+    print "Exploring undefined commands."
+    print "Status: %s" %client.status();
+    
+    cmd=0x04; #read status
+    for foo in range(0,0x5):
+        client.CCcmd([(0x0F<<3)|(0x00)|0x03,0x09<<3]);
+        print "Status %02x: %s" % (foo,client.status());
+    for foo in range(0,3):
+        print "PC: %04x" % client.CCgetPC();
+if(sys.argv[1]=="term"):
+    GoodFETConsole(client).run();
 if(sys.argv[1]=="test"):
-    client.CCtest();
+    client.test();
 if(sys.argv[1]=="deadtest"):
     for i in range(1,10):
         print "IDENT as %s" % client.CCidentstr();
@@ -76,11 +94,15 @@ if(sys.argv[1]=="dumpdata"):
         i+=1;
     h.write_hex_file(f);
 if(sys.argv[1]=="status"):
-    print "Status: %s" %client.CCstatusstr();
+    print "Status: %s" %client.status();
+if(sys.argv[1]=="info"):
+    print "%s" % client.CCidentstr();
+if(sys.argv[1]=="radioinfo"):
+    client.CMDrs();
 if(sys.argv[1]=="erase"):
-    print "Status: %s" % client.CCstatusstr();
+    print "Status: %s" % client.status();
     client.CCchiperase();
-    print "Status: %s" %client.CCstatusstr();
+    print "Status: %s" %client.status();
 
 if(sys.argv[1]=="peekinfo"):
     print "Select info flash."
@@ -97,8 +119,6 @@ if(sys.argv[1]=="peekinfo"):
     while start<=stop:
         print "%04x: %02x" % (start,client.CCpeekcodebyte(start));
         start=start+1;
-if(sys.argv[1]=="peek"):
-    print "%02x" % client.CCpeekirambyte(int(sys.argv[2],16));
 if(sys.argv[1]=="poke"):
     client.CCpokeirambyte(int(sys.argv[2],16),
                           int(sys.argv[3],16));
@@ -133,39 +153,11 @@ if(sys.argv[1]=="flash"):
      if(len(sys.argv)>4):
          stop=int(sys.argv[4],16);
    
-     h = IntelHex(f);
-     page = 0x0000;
-     pagelen = 2048; #2kB pages in 32-bit words
-     bcount = 0;
-     
-     print "Wiping Flash."
-     #Wipe all of flash.
-     #client.CCchiperase();
-     #Wipe the RAM buffer for the next flash page.
-     #client.CCeraseflashbuffer();
-     for i in h._buf.keys():
-         while(i>page+pagelen):
-             if bcount>0:
-                 client.CCflashpage(page);
-                 #client.CCeraseflashbuffer();
-                 bcount=0;
-                 print "Flashed page at %06x" % page
-             page+=pagelen;
-             
-         #Place byte into buffer.
-         client.CCpokedatabyte(0xF000+i-page,
-                               h[i]);
-         bcount+=1;
-         if(i%0x100==0):
-                print "Buffering %04x toward %06x" % (i,page);
-     #last page
-     client.CCflashpage(page);
-     print "Flashed final page at %06x" % page;
-     
+     client.flash(f);
 if(sys.argv[1]=="lock"):
-    print "Status: %s" %client.CCstatusstr();
+    print "Status: %s" %client.status();
     client.CClockchip();
-    print "Status: %s" %client.CCstatusstr();
+    print "Status: %s" %client.status();
 if(sys.argv[1]=="flashpage"):
     target=0;
     if(len(sys.argv)>2):
@@ -205,6 +197,34 @@ if(sys.argv[1]=="peekdata"):
     while start<=stop:
         print "%04x: %02x" % (start,client.CCpeekdatabyte(start));
         start=start+1;
+if(sys.argv[1]=="peek"):
+    start=0x0000;
+    if(len(sys.argv)>2):
+        start=int(sys.argv[2],16);
+    stop=start;
+    if(len(sys.argv)>3):
+        stop=int(sys.argv[3],16);
+    print "Peeking from %04x to %04x." % (start,stop);
+    while start<=stop:
+        print "%04x: %02x" % (start,client.CCpeekirambyte(start));
+        start=start+1;
+if(sys.argv[1]=="verify"):
+    f=sys.argv[2];
+    start=0;
+    stop=0xFFFF;
+    if(len(sys.argv)>3):
+        start=int(sys.argv[3],16);
+    if(len(sys.argv)>4):
+        stop=int(sys.argv[4],16);
+    
+    h = IntelHex(f);
+    for i in h._buf.keys():
+        if(i>=start and i<stop):
+            peek=client.CCpeekcodebyte(i)
+            if(h[i]!=peek):
+                print "ERROR at %04x, found %02x not %02x"%(i,peek,h[i]);
+            if(i%0x100==0):
+                print "%04x" % i;
 if(sys.argv[1]=="peekcode"):
     start=0x0000;
     if(len(sys.argv)>2):
@@ -226,4 +246,4 @@ if(sys.argv[1]=="pokedata"):
     print "Poking %04x to become %02x." % (start,val);
     client.CCpokedatabyte(start,val);
 
-client.CCstop();
+client.stop();