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

[cami at codespeak.net]

Author: cami
Date: Fri Feb 27 23:23:09 2009
New Revision: 62258

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/gameboy_implementation.py
   pypy/trunk/pypy/lang/gameboy/video.py
Log:
remove some catches in order to have a usefull traceback


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 23:23:09 2009
@@ -278,8 +278,8 @@
             ("vram",    self.video.vram,    "vram"),
             ("oam",     self.video.oam,     "oam"),
             ("line",    self.video.line,    "line"),
-            ("objects", self.video.objects, "objects"),
-            ("palette", self.video.palette, "palette")
+            ("objects", self.video.objects, "objects")
+         #   ("palette", self.video.palette, "palette")
         ]
         self.compare_memory_set(cmp, data, label="video");
     

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	Fri Feb 27 23:23:09 2009
@@ -19,10 +19,15 @@
 skip_count   = 2700
 skip_count   = 0
 
+skip_count = 0
+first_skip = 0
+in_between_skip = 0
+
+
 if len(sys.argv) > 1:
     skip_count       = sys.argv[1]
     first_skip       = sys.argv[2] 
-    in_between_skips = sys.argv[3]
+    in_between_skip = sys.argv[3]
 
 # ------------------------------------------------------------------------------
 
@@ -67,12 +72,13 @@
     except Exception, error:
         gameBoy.load_cartridge_file(str(filename), verify=False)
         print "Cartridge is Corrupted!"
-    try:
-        gameBoy.mainLoop()
-    except Exception, error:
-        print "stopped"
-        print error
-        pdb.set_trace()
+    gameBoy.mainLoop()
+    #try:
+    #    gameBoy.mainLoop()
+    #except Exception, error:
+    #    print "stopped"
+    #    print error
+    #    pdb.set_trace()
 
 # ------------------------------------------------------------------------------ 
     

Modified: pypy/trunk/pypy/lang/gameboy/gameboy_implementation.py
==============================================================================
--- pypy/trunk/pypy/lang/gameboy/gameboy_implementation.py	(original)
+++ pypy/trunk/pypy/lang/gameboy/gameboy_implementation.py	Fri Feb 27 23:23:09 2009
@@ -37,12 +37,14 @@
     def mainLoop(self):
         self.reset()
         self.is_running = True
-        try:
-            while self.is_running:
-                self.emulate_cycle()
-        except Exception, error:
-            self.is_running = False
-            self.handle_execution_error(error)
+        while self.is_running:
+            self.emulate_cycle()
+        #try:
+        #    while self.is_running:
+        #        self.emulate_cycle()
+        #except Exception, error:
+        #    self.is_running = False
+        #    self.handle_execution_error(error)
         return 0
     
     def emulate_cycle(self):

Modified: pypy/trunk/pypy/lang/gameboy/video.py
==============================================================================
--- pypy/trunk/pypy/lang/gameboy/video.py	(original)
+++ pypy/trunk/pypy/lang/gameboy/video.py	Fri Feb 27 23:23:09 2009
@@ -544,8 +544,7 @@
                 
     def swap_object_indices(self, index_a, index_b):
         data                  = self.objects[index_a]
-        self.objects[index_a] = self.objects[index_b]
-        self.objects[index_b] = data
+        self.objects[index_a] = sself.objects[index_b] = data
 
     # ---------------------------------------------------------------------