[pypy-svn] r62248 - in pypy/trunk/pypy/lang/gameboy: . debug test

[tverwaes at codespeak.net]

Author: tverwaes
Date: Fri Feb 27 19:05:05 2009
New Revision: 62248

Modified:
   pypy/trunk/pypy/lang/gameboy/debug/debug_comparator.py
   pypy/trunk/pypy/lang/gameboy/debug/debug_util.py
   pypy/trunk/pypy/lang/gameboy/test/test_video_registers.py
   pypy/trunk/pypy/lang/gameboy/video_register.py
Log:
change in tileData. old code didn't seem to make sense. cami should check


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	Fri Feb 27 19:05:05 2009
@@ -43,21 +43,22 @@
             self.print_compare(name+" value at "+hex(address), \
                     expected[address], new[address])
     
-    def print_compare(self, msg, python, java, output=False):
+    def print_compare(self, msg, python, java, printall=False):
         if java != python:
             self.compare_failed = True
             print "python: !!", msg, "java:", java, "python:", python, "!!"
-            
+        if printall:
+            print "python: XX", msg, "java:", java, "python:", python, "!!"
     
     def print_mismatch(self, part, python, java):
         print "python:", str(part), "java:", str(java), "python:", str(python)
         
         
-    def compare_set(self, set, data, label=""):
+    def compare_set(self, set, data, label="", printall=False):
         for compare_value in set:
             self.print_compare(label+": "+compare_value[0], 
                              compare_value[1], 
-                             data[compare_value[2]]);
+                             data[compare_value[2]], printall);
             
     def compare_memory_set(self, set, data, label=""):
         for compare_value in set:
@@ -197,7 +198,7 @@
         ];
         for reg in mapping:
             display_results.append((reg[1], registers[reg[0]]))
-            self.print_compare("register %s" % reg[0], reg[1], registers[reg[0]], output=True)
+            self.print_compare("register %s" % reg[0], reg[1], registers[reg[0]])
         self.print_registers(mapping, display_results)
             
     def print_registers(self, mapping, display_results):
@@ -324,5 +325,4 @@
             ("Check whether emulated VBLank", 
                     self.video.emulated_vblank, "emulated_vblank"),
         ]
-        self.compare_set(cmp, data, label="video")
-         
+        self.compare_set(cmp, data, label="video", printall=True)

Modified: pypy/trunk/pypy/lang/gameboy/debug/debug_util.py
==============================================================================
--- pypy/trunk/pypy/lang/gameboy/debug/debug_util.py	(original)
+++ pypy/trunk/pypy/lang/gameboy/debug/debug_util.py	Fri Feb 27 19:05:05 2009
@@ -7,7 +7,7 @@
 #
 # ----------------------------------------------------------------------------
 
-DEBUG = False
+DEBUG = True
 DEBUG_PRINT_LOGS = True
 op_codes               = [0] * (0xFF+1)
 fetch_execute_op_codes = [0] * (0xFF+1)

Modified: pypy/trunk/pypy/lang/gameboy/test/test_video_registers.py
==============================================================================
--- pypy/trunk/pypy/lang/gameboy/test/test_video_registers.py	(original)
+++ pypy/trunk/pypy/lang/gameboy/test/test_video_registers.py	Fri Feb 27 19:05:05 2009
@@ -32,12 +32,13 @@
         assert control.read() == i
         
 def test_video_control_get_selected_tile_data_space():
+    # TODO: Cami's magic has to pass over here :)
     control = get_control_register()
     
-    control.window.upper_tile_map_selected = True
+    control.background_and_window_lower_tile_data_selected = False
     assert control.get_selected_tile_data_space() == constants.VRAM_DATA_B
     
-    control.window.upper_tile_map_selected = False
+    control.background_and_window_lower_tile_data_selected = True
     assert control.get_selected_tile_data_space() == constants.VRAM_DATA_A
     
 # StatusRegister ---------------------------------------------------------------

Modified: pypy/trunk/pypy/lang/gameboy/video_register.py
==============================================================================
--- pypy/trunk/pypy/lang/gameboy/video_register.py	(original)
+++ pypy/trunk/pypy/lang/gameboy/video_register.py	Fri Feb 27 19:05:05 2009
@@ -124,7 +124,7 @@
     
     
     def get_selected_tile_data_space(self):
-        if self.window.upper_tile_map_selected:
-            return constants.VRAM_DATA_B
-        else:
+        if self.background_and_window_lower_tile_data_selected:
             return constants.VRAM_DATA_A
+        else:
+            return constants.VRAM_DATA_B