Author: Konstantin Lopuhin <[email protected]>
Branch: fix-jit-logs
Changeset: r62439:7a0706d3f218
Date: 2013-03-17 12:29 +0400
http://bitbucket.org/pypy/pypy/changeset/7a0706d3f218/
Log: fix different bridge logging in arm and x86
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
@@ -14,6 +14,7 @@
VFPRegisterManager,
operations as regalloc_operations,
operations_with_guard as regalloc_operations_with_guard)
+from rpython.jit.backend.llsupport.assembler import debug_bridge
from rpython.jit.backend.llsupport.asmmemmgr import MachineDataBlockWrapper
from rpython.jit.backend.model import CompiledLoopToken
from rpython.jit.codewriter import longlong
@@ -734,11 +735,7 @@
self.update_frame_depth(frame_depth)
self.teardown()
- debug_start("jit-backend-addr")
- 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")
+ debug_bridge(descr_number, rawstart, codeendpos)
return AsmInfo(ops_offset, startpos + rawstart, codeendpos - startpos)
diff --git a/rpython/jit/backend/llsupport/assembler.py
b/rpython/jit/backend/llsupport/assembler.py
--- a/rpython/jit/backend/llsupport/assembler.py
+++ b/rpython/jit/backend/llsupport/assembler.py
@@ -203,3 +203,12 @@
# XXX here should be emitted guard_not_forced, but due
# to incompatibilities in how it's done, we leave it for the
# caller to deal with
+
+
+def debug_bridge(descr_number, rawstart, codeendpos):
+ debug_start("jit-backend-addr")
+ 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")
+
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
@@ -1,7 +1,8 @@
import sys, os
from rpython.jit.backend.llsupport import symbolic, jitframe
-from rpython.jit.backend.llsupport.assembler import GuardToken, BaseAssembler
+from rpython.jit.backend.llsupport.assembler import (GuardToken, BaseAssembler,
+ debug_bridge)
from rpython.jit.backend.llsupport.asmmemmgr import MachineDataBlockWrapper
from rpython.jit.backend.llsupport.gcmap import allocate_gcmap
from rpython.jit.metainterp.history import Const, Box, BoxInt, ConstInt
@@ -554,11 +555,7 @@
rawstart = self.materialize_loop(original_loop_token)
self.patch_stack_checks(frame_depth_no_fixed_size +
JITFRAME_FIXED_SIZE,
rawstart)
- debug_start("jit-backend-addr")
- 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")
+ debug_bridge(descr_number, rawstart, codeendpos)
self.patch_pending_failure_recoveries(rawstart)
# patch the jump from original guard
self.patch_jump_for_descr(faildescr, rawstart)
_______________________________________________
pypy-commit mailing list
[email protected]
http://mail.python.org/mailman/listinfo/pypy-commit
