[pypy-svn] r60005 - pypy/trunk/pypy/lang/gameboy/debug

[cami at codespeak.net]

Author: cami
Date: Thu Nov 20 00:33:52 2008
New Revision: 60005

Modified:
   pypy/trunk/pypy/lang/gameboy/debug/debug_comparator.py
   pypy/trunk/pypy/lang/gameboy/debug/gameboy_debug_entry_point.py
   pypy/trunk/pypy/lang/gameboy/debug/gameboy_debug_implementation.py
Log:
runnable debugger again
fixed some typos
added missing init paramters of several comparators


Modified: pypy/trunk/pypy/lang/gameboy/debug/debug_comparator.py
==============================================================================
--- pypy/trunk/pypy/lang/gameboy/debug/debug_comparator.py	(original)
+++ pypy/trunk/pypy/lang/gameboy/debug/debug_comparator.py	Thu Nov 20 00:33:52 2008
@@ -68,11 +68,11 @@
         self.ram_comparator = RAMComparator(debug_connection, self.gameboy)
     
     def compare(self, data):
-        self.compare_cycles(data["cycles"])
         self.cpu_comparator.compare(data["cpu"])
+        self.video_comparator.compare(data["video"])
+        self.compare_cycles(data["cycles"])
         self.timer_comparator.compare(data["timer"])
         self.interrupt_comparator.compare(data["interrupt"])
-        self.video_comparator.compare(data["video"])
         self.ram_comparator.compare(data["ram"])
     
     @printframe("comparing cycles")        
@@ -94,7 +94,7 @@
         Comparator.__init__(self, debug_connection)
         self.gameboy = gameboy
         self.cartridgeComparator = CartridgeComparator(debug_connection, 
-                                        self.gameboy_debug.cartridge_manager)
+                                        self.gameboy.cartridge_manager)
    
     @printframe("checking ROM")     
     def compare(self, data):
@@ -106,7 +106,7 @@
 
 class CartridgeComparator(Comparator):
     
-    def __init__(self, debug_connection, catridge_manager):
+    def __init__(self, debug_connection, cartridge_manager):
         Comparator.__init__(self, debug_connection)
         self.cartridge_manager = cartridge_manager
         

Modified: pypy/trunk/pypy/lang/gameboy/debug/gameboy_debug_entry_point.py
==============================================================================
--- pypy/trunk/pypy/lang/gameboy/debug/gameboy_debug_entry_point.py	(original)
+++ pypy/trunk/pypy/lang/gameboy/debug/gameboy_debug_entry_point.py	Thu Nov 20 00:33:52 2008
@@ -19,7 +19,7 @@
 
 ROM_PATH    = str(py.magic.autopath().dirpath().dirpath())+"/rom"
 filename    = ROM_PATH + "/rom9/rom9.gb"
-SOCKET_PORT = 55691
+SOCKET_PORT = 55680
 skipExecs   = 22545
 skipExecs   = 1000000
 

Modified: pypy/trunk/pypy/lang/gameboy/debug/gameboy_debug_implementation.py
==============================================================================
--- pypy/trunk/pypy/lang/gameboy/debug/gameboy_debug_implementation.py	(original)
+++ pypy/trunk/pypy/lang/gameboy/debug/gameboy_debug_implementation.py	Thu Nov 20 00:33:52 2008
@@ -22,7 +22,7 @@
      # ------------------------------------------------------------------------   
     def create_comparators(self):
         self.gameboy_comparator = GameboyComparator(self.debug_connection, self)
-        self.rom_comparator = ROMComparator(self, self.debug_connection, self)
+        self.rom_comparator = ROMComparator(self.debug_connection, self)
     
     def compare_rom(data):
          self.rom_comparator.compare(data)