[pypy-svn] r55228 - pypy/dist/pypy/translator/goal

[cami at codespeak.net]

Author: cami
Date: Mon May 26 01:37:01 2008
New Revision: 55228

Modified:
   pypy/dist/pypy/translator/goal/targetgbimplementation.py
   pypy/dist/pypy/translator/goal/targetgbrom4.py
Log:
change targetrom4 to use again the non graphical test rom 4


Modified: pypy/dist/pypy/translator/goal/targetgbimplementation.py
==============================================================================
--- pypy/dist/pypy/translator/goal/targetgbimplementation.py	(original)
+++ pypy/dist/pypy/translator/goal/targetgbimplementation.py	Mon May 26 01:37:01 2008
@@ -1,21 +1,27 @@
 import os
 import py
+import pdb
 from pypy.lang.gameboy.gameboyImplementation import GameBoyImplementation
 
 
 ROM_PATH = str(py.magic.autopath().dirpath().dirpath().dirpath())+"/lang/gameboy/rom"
-EMULATION_CYCLES = 64
 
 
 def entry_point(argv=None):
-    if len(argv) > 1:
-        filename = argv[1]
+    if argv is not None and len(argv) > 0:
+        filename = argv[0]
     else:
-        filename = ROM_PATH+"/rom9/rom9.gb"
+        pos = str(9)
+        filename = ROM_PATH+"/rom"+pos+"/rom"+pos+".gb"
     print "loading rom: ", str(filename)
     gameBoy = GameBoyImplementation()
-    gameBoy.load_cartridge_file(str(filename))
+    try:
+        gameBoy.load_cartridge_file(str(filename))
+    except:
+        print "Corrupt Cartridge"
+        gameBoy.load_cartridge_file(str(filename), verify=False)
     gameBoy.mainLoop()
+    #pdb.runcall(gameBoy.mainLoop)
     return 0
     
 
@@ -25,4 +31,10 @@
     return entry_point, None
 
 def test_target():
-    entry_point(["boe", ROM_PATH+"/rom4/rom4.gb"])
+    entry_point(["b", ROM_PATH+"/rom9/rom9.gb"])
+    
+
+
+#from AppKit import NSApplication
+#NSApplication.sharedApplication()
+#entry_point()

Modified: pypy/dist/pypy/translator/goal/targetgbrom4.py
==============================================================================
--- pypy/dist/pypy/translator/goal/targetgbrom4.py	(original)
+++ pypy/dist/pypy/translator/goal/targetgbrom4.py	Mon May 26 01:37:01 2008
@@ -5,14 +5,14 @@
 
 
 ROM_PATH = str(py.magic.autopath().dirpath().dirpath().dirpath())+"/lang/gameboy/rom"
-EMULATION_CYCLES = 64
+EMULATION_CYCLES = 1<<24
 
 
 def entry_point(argv=None):
     if len(argv) > 1:
         filename = argv[1]
     else:
-        filename = ROM_PATH+"/rom9/rom9.gb"
+        filename = ROM_PATH+"/rom4/rom4.gb"
     gameBoy = GameBoy()
     gameBoy.load_cartridge_file(str(filename))
     gameBoy.emulate(EMULATION_CYCLES)