[pypy-svn] r58611 - pypy/dist/pypy/lang/gameboy/debug

[cami at codespeak.net]

Author: cami
Date: Mon Oct  6 10:32:15 2008
New Revision: 58611

Modified:
   pypy/dist/pypy/lang/gameboy/debug/debug_rpc_xml_memory.py
   pypy/dist/pypy/lang/gameboy/debug/gameboy_debug_entry_point.py
   pypy/dist/pypy/lang/gameboy/debug/gameboy_debug_implementation.py
Log:
updated remote debugger to the newer object model of video


Modified: pypy/dist/pypy/lang/gameboy/debug/debug_rpc_xml_memory.py
==============================================================================
--- pypy/dist/pypy/lang/gameboy/debug/debug_rpc_xml_memory.py	(original)
+++ pypy/dist/pypy/lang/gameboy/debug/debug_rpc_xml_memory.py	Mon Oct  6 10:32:15 2008
@@ -74,6 +74,7 @@
     # RPC ===================================================================
         
     def close(self):
+    	pdb.set_trace()
         if not self.is_closed:
             print "python: called close"
             self.server_close()
@@ -146,7 +147,7 @@
         
     @printframe("comparing registers")
     def compare_registers(self, registers):
-        for reg in [("a",  self.cpu.a.get()),  ("f",  self.cpu.f.get()),
+        for reg in [("a",  self.cpu.a.get()),  ("f",  self.cpu.flag.get()),
                     ("b",  self.cpu.b.get()),  ("c",  self.cpu.c.get()),
                     ("d",  self.cpu.d.get()),  ("e",  self.cpu.e.get()),
                     ("h",  self.cpu.h.get()),  ("l",  self.cpu.l.get()),
@@ -227,21 +228,21 @@
                          self.gameboy_debug.video.object_palette_1, \
                          video["obp1"])
         self.print_check("video scx", \
-                         self.gameboy_debug.video.scroll_x, video["scx"])
+                         self.gameboy_debug.video.background.scroll_x, video["scx"])
         self.print_check("video scy", \
-                         self.gameboy_debug.video.scroll_y, video["scy"])
+                         self.gameboy_debug.video.background.scroll_y, video["scy"])
         self.print_check("video stat", \
                          self.gameboy_debug.video.status.read(), video["stat"])
         self.print_check("video transfer", \
                            self.gameboy_debug.video.transfer, video["transfer"])
         self.print_check("video vblank", \
-                         self.gameboy_debug.video.vblank, video["vblank"])
+                         self.gameboy_debug.video.v_blank, video["vblank"])
         self.print_check("video wly", \
-                         self.gameboy_debug.video.window_line_y, video["wly"])
+                         self.gameboy_debug.video.window.line_y, video["wly"])
         self.print_check("video wx", \
-                         self.gameboy_debug.video.window_x, video["wx"])
+                         self.gameboy_debug.video.window.x, video["wx"])
         self.print_check("video wy", \
-                         self.gameboy_debug.video.window_y, video["wy"])
+                         self.gameboy_debug.video.window.y, video["wy"])
      
     @printframe("comparing timer")   
     def compare_timer(self, data):
@@ -327,8 +328,6 @@
             return
         #self.prompt_for_user_input()
         
-    
-        
     def prompt_for_user_input(self):
         if self.showed_skip_message_count < 2:
             print ">>  enter skip, default is 0:"

Modified: pypy/dist/pypy/lang/gameboy/debug/gameboy_debug_entry_point.py
==============================================================================
--- pypy/dist/pypy/lang/gameboy/debug/gameboy_debug_entry_point.py	(original)
+++ pypy/dist/pypy/lang/gameboy/debug/gameboy_debug_entry_point.py	Mon Oct  6 10:32:15 2008
@@ -44,7 +44,7 @@
     except:
         print "stopped"
 
-   
+# ------------------------------------------------------------------------------ 
     
 JMARIO_DIR =  str(py.magic.autopath().dirpath().dirpath()\
                         .dirpath().dirpath()\

Modified: pypy/dist/pypy/lang/gameboy/debug/gameboy_debug_implementation.py
==============================================================================
--- pypy/dist/pypy/lang/gameboy/debug/gameboy_debug_implementation.py	(original)
+++ pypy/dist/pypy/lang/gameboy/debug/gameboy_debug_implementation.py	Mon Oct  6 10:32:15 2008
@@ -6,6 +6,7 @@
 from pypy.lang.gameboy.debug import debug
 from pypy.lang.gameboy.debug.debug_socket_memory import *
 import time
+import pdb
 
 # GAMEBOY ----------------------------------------------------------------------
 
@@ -26,8 +27,10 @@
         self.sound_driver  = SoundDriverImplementation()
    
    
-    def handle_execution_error(self):
+    def handle_execution_error(self, error):
+    	print error
         print "closing socket connections"
+        pdb.set_trace()
         self.is_running = False
         debug.print_results()
         self.memory.close()
@@ -54,6 +57,7 @@
     def update_display(self):
         # dont update the display, we're here only for testing
         pass
+    
              
         
 # JOYPAD DRIVER ----------------------------------------------------------------
@@ -62,6 +66,9 @@
     
     def __init__(self):
         JoypadDriver.__init__(self)
+      
+    def update(self, event):
+      	pass;  
         
         
 # SOUND DRIVER -----------------------------------------------------------------