[pypy-commit] pypy jitframe-on-heap: be consistently nicer

[fijal]

Author: Maciej Fijalkowski <fijall at gmail.com>
Branch: jitframe-on-heap
Changeset: r61839:52f577300225
Date: 2013-02-27 13:33 +0200
http://bitbucket.org/pypy/pypy/changeset/52f577300225/

Log:	be consistently nicer

diff --git a/rpython/jit/backend/arm/assembler.py b/rpython/jit/backend/arm/assembler.py
--- a/rpython/jit/backend/arm/assembler.py
+++ b/rpython/jit/backend/arm/assembler.py
@@ -636,11 +636,11 @@
         self.teardown()
 
         debug_start("jit-backend-addr")
-        debug_print("Loop %d (%s) has address %x to %x (bootstrap %x)" % (
+        debug_print("Loop %d (%s) has address 0x%x to 0x%x (bootstrap 0x%x)" % (
             looptoken.number, loopname,
-            rawstart + loop_head,
-            rawstart + size_excluding_failure_stuff,
-            rawstart))
+            r_uint(rawstart + loop_head),
+            r_uint(rawstart + size_excluding_failure_stuff),
+            r_uint(rawstart)))
         debug_stop("jit-backend-addr")
 
         return AsmInfo(ops_offset, rawstart + loop_head,
@@ -710,7 +710,7 @@
         self.teardown()
 
         debug_start("jit-backend-addr")
-        debug_print("bridge out of Guard %d has address %x to %x" %
+        debug_print("bridge out of Guard %d has address 0x%x to 0x%x" %
                     (descr_number, r_uint(rawstart),
                      r_uint(rawstart + codeendpos)))
         debug_stop("jit-backend-addr")
diff --git a/rpython/jit/backend/x86/assembler.py b/rpython/jit/backend/x86/assembler.py
--- a/rpython/jit/backend/x86/assembler.py
+++ b/rpython/jit/backend/x86/assembler.py
@@ -494,7 +494,7 @@
         rawstart = self.materialize_loop(looptoken)
         looptoken._ll_loop_code = looppos + rawstart
         debug_start("jit-backend-addr")
-        debug_print("Loop %d (%s) has address %x to %x (bootstrap %x)" % (
+        debug_print("Loop %d (%s) has address 0x%x to 0x%x (bootstrap 0x%x)" % (
             looptoken.number, loopname,
             r_uint(rawstart + looppos),
             r_uint(rawstart + size_excluding_failure_stuff),
@@ -548,8 +548,8 @@
         #
         rawstart = self.materialize_loop(original_loop_token)
         debug_start("jit-backend-addr")
-        debug_print("bridge out of Guard %x has address %x to %x" %
-                    (descr_number, r_uint(rawstart),
+        debug_print("bridge out of Guard 0x%x has address 0x%x to 0x%x" %
+                    (r_uint(descr_number), r_uint(rawstart),
                      r_uint(rawstart + codeendpos)))
         debug_stop("jit-backend-addr")
         self.patch_pending_failure_recoveries(rawstart)
diff --git a/rpython/jit/metainterp/logger.py b/rpython/jit/metainterp/logger.py
--- a/rpython/jit/metainterp/logger.py
+++ b/rpython/jit/metainterp/logger.py
@@ -42,7 +42,8 @@
             debug_stop("jit-log-compiling-bridge")
         else:
             debug_start("jit-log-opt-bridge")
-            debug_print("# bridge out of Guard", compute_unique_id(descr),
+            debug_print("# bridge out of Guard",
+                        "%x" % compute_unique_id(descr),
                         "with", len(operations), "ops")
             logops = self._log_operations(inputargs, operations, ops_offset)
             debug_stop("jit-log-opt-bridge")
@@ -133,7 +134,7 @@
             descr = op.getdescr()
             if is_guard and self.guard_number:
                 hash = compute_unique_id(descr)
-                r = "<Guard%d>" % hash
+                r = "<Guard%x>" % hash
             else:
                 r = self.repr_of_descr(descr)
             if args: