X-Git-Url: http://git.rot13.org/?p=goodfet;a=blobdiff_plain;f=client%2FGoodFET.py;h=53026dfe60c17c146f2b41fd2de17d82a75f93fd;hp=45bd33aee85aca4065bb5d404f8bd61fc3c59b71;hb=2dcd81fd2345fd3839a35f75f8fffcf79e359a5e;hpb=627d0fc63ba0bfa962c0270157718b6cd4c888f7

diff --git a/client/GoodFET.py b/client/GoodFET.py
index 45bd33a..53026df 100755
--- a/client/GoodFET.py
+++ b/client/GoodFET.py
@@ -287,9 +287,9 @@ class GoodFET:
                     return self.data;
             except TypeError:
                 if self.connected:
-                    print "Error: waiting for serial read timed out (most likely).";
-                    print "This shouldn't happen after syncing.  Exiting for safety.";                    
-                    sys.exit(-1)
+                    print "Warning: waiting for serial read timed out (most likely).";
+                    #print "This shouldn't happen after syncing.  Exiting for safety.";                    
+                    #sys.exit(-1)
                 return self.data;
     #Glitching stuff.
     def glitchApp(self,app):
@@ -481,7 +481,7 @@ class GoodFET:
         return self.peek16(0x56);
     # The following functions ought to be implemented in
     # every client.
-
+    
     def infostring(self):
         a=self.peekbyte(0xff0);
         b=self.peekbyte(0xff1);
@@ -516,15 +516,25 @@ class GoodFET:
         """Dump an intel hex file from code memory."""
         print "Dump not implemented.";
     def peek32(self,address, memory="vn"):
+        """Peek 32 bits."""
         return (self.peek16(address,memory)+
                 (self.peek16(address+2,memory)<<16));
     def peek16(self,address, memory="vn"):
+        """Peek 16 bits of memory."""
         return (self.peek8(address,memory)+
                 (self.peek8(address+1,memory)<<8));
     def peek8(self,address, memory="vn"):
+        """Peek a byte of memory."""
         return self.peekbyte(address); #monitor
     def peekword(self,address, memory="vn"):
-        return self.peek(address); #monitor
-    
+        """Peek a natively sized word of memory."""
+        return self.peek16(address); #monitor
+    def peekblock(self,address,length,memory="vn"):
+        """Return a block of data."""
+        data=range(0,length);
+        for foo in range(0,length):
+            data[foo]=self.peek8(address+foo,memory);
+        return data;
     def loadsymbols(self):
+        """Load symbols from a file."""
         return;