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

[cami at codespeak.net]

Author: cami
Date: Sat Nov 29 12:44:40 2008
New Revision: 60226

Modified:
   pypy/trunk/pypy/lang/gameboy/debug/gameboy_debug_entry_point.py
   pypy/trunk/pypy/lang/gameboy/debug/gameboy_debug_implementation.py
   pypy/trunk/pypy/lang/gameboy/debug/gameboy_debug_parts.py
Log:
fixed some wrong references to debug_util,
opcodes are now printed with its function names


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	Sat Nov 29 12:44:40 2008
@@ -1,14 +1,7 @@
 #!/usr/bin/env python
-
-dont_import_rsdl = True
-
+import py, sys, os, threading
 from pypy.lang.gameboy.debug.gameboy_debug_implementation import *
 from pypy.lang.gameboy.debug.debug_rpc_xml_connection import *
-import py
-import sys
-import os
-import threading
-import pdb
 
 # ------------------------------------------------------------------------------
 

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	Sat Nov 29 12:44:40 2008
@@ -3,7 +3,7 @@
         
 from pypy.lang.gameboy.gameboy_implementation import *
 from pypy.lang.gameboy.debug.gameboy_debug_parts import *
-from pypy.lang.gameboy.debug import debug
+from pypy.lang.gameboy.debug import debug_util
 from pypy.lang.gameboy.debug.debug_rpc_xml_connection import *
 from pypy.lang.gameboy.debug.debug_comparator import *
 import time
@@ -50,7 +50,7 @@
         print "closing socket debug_connections"
         pdb.set_trace()
         self.is_running = False
-        debug.print_results()
+        debug_util.print_results()
         self.debug_connection.close()
     
     def handle_executed_op_code(self, is_fetch_execute=True):

Modified: pypy/trunk/pypy/lang/gameboy/debug/gameboy_debug_parts.py
==============================================================================
--- pypy/trunk/pypy/lang/gameboy/debug/gameboy_debug_parts.py	(original)
+++ pypy/trunk/pypy/lang/gameboy/debug/gameboy_debug_parts.py	Sat Nov 29 12:44:40 2008
@@ -1,20 +1,19 @@
-
 from pypy.lang.gameboy.cpu import CPU
 from pypy.lang.gameboy.video import Video
-from pypy.lang.gameboy.debug import debug
+from pypy.lang.gameboy.debug import debug_util
 from pypy.lang.gameboy.video_register import *
 from pypy.lang.gameboy.video_mode import *
 
 class DebugCPU(CPU):
     def fetch_execute(self):
         CPU.fetch_execute(self)
-        debug.log(self.last_fetch_execute_op_code, is_fetch_execute=True)
+        debug_util.log(self.last_fetch_execute_op_code, is_fetch_execute=True)
         self.memory.handle_executed_op_code(is_fetch_execute=True)
         
     
     def execute(self, opCode):
         CPU.execute(self, opCode)
-        debug.log(self.last_op_code)
+        debug_util.log(self.last_op_code)
         self.memory.handle_executed_op_code(is_fetch_execute=False)