peekword() for console.

Needs a lot of work.

git-svn-id: https://svn.code.sf.net/p/goodfet/code/trunk@566 12e2690d-a6be-4b82-a7b7-67c4a43b65c8

diff --git a/client/GoodFET.py b/client/GoodFET.py
index 8244aaa..7e32773 100755 (executable)
--- a/client/GoodFET.py
+++ b/client/GoodFET.py
@@ -401,7 +401,6 @@ class GoodFET:
     def dump(self,file,start=0,stop=0xffff):
         """Dump an intel hex file from code memory."""
         print "Dump not implemented.";
     def dump(self,file,start=0,stop=0xffff):
         """Dump an intel hex file from code memory."""
         print "Dump not implemented.";

-

     def peek32(self,address, memory="vn"):
         return (self.peek16(address,memory)+
                 (self.peek16(address+2,memory)<<16));
     def peek32(self,address, memory="vn"):
         return (self.peek16(address,memory)+
                 (self.peek16(address+2,memory)<<16));


@@ -410,5 +409,8 @@ class GoodFET:
                 (self.peek8(address+1,memory)<<8));
     def peek8(self,address, memory="vn"):
         return self.peekbyte(address); #monitor
                 (self.peek8(address+1,memory)<<8));
     def peek8(self,address, memory="vn"):
         return self.peekbyte(address); #monitor

+    def peekword(self,address, memory="vn"):
+        return self.peek(address); #monitor
+    

     def loadsymbols(self):
         return;
     def loadsymbols(self):
         return;

diff --git a/client/GoodFETConsole.py b/client/GoodFETConsole.py
index 5f1a436..3612007 100644 (file)
--- a/client/GoodFETConsole.py
+++ b/client/GoodFETConsole.py
@@ -99,8 +99,8 @@ class GoodFETConsole():
         adr= self.client.name2adr(adr);
         #print "%i" % adr;
         print "0x%08x:= 0x%04x" % (
         adr= self.client.name2adr(adr);
         #print "%i" % adr;
         print "0x%08x:= 0x%04x" % (

-            adr, self.client.peek16(adr,
-                                    memory));
+            adr, self.client.peekword(adr,
+                                  memory));

     def CMDflash(self,args):
         file=args[1];
         self.client.flash(self.expandfilename(file));
     def CMDflash(self,args):
         file=args[1];
         self.client.flash(self.expandfilename(file));