Author: Richard Plangger <planri...@gmail.com>
Branch: new-jit-log
Changeset: r83263:f4455cafdb2d
Date: 2016-03-22 18:45 +0100
http://bitbucket.org/pypy/pypy/changeset/f4455cafdb2d/
Log: translation issue
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
@@ -583,7 +583,7 @@
self.patch_pending_failure_recoveries(rawstart)
# patch the jump from original guard
if logger:
- logger.log_patch_guard(faildescr.adr_new_target, rawstart)
+ logger.log_patch_guard(faildescr.adr_jump_offset, rawstart)
self.patch_jump_for_descr(faildescr, rawstart)
ops_offset = self.mc.ops_offset
frame_depth = max(self.current_clt.frame_info.jfi_frame_depth,
diff --git a/rpython/jit/metainterp/compile.py
b/rpython/jit/metainterp/compile.py
--- a/rpython/jit/metainterp/compile.py
+++ b/rpython/jit/metainterp/compile.py
@@ -481,8 +481,8 @@
def do_compile_loop(jd_id, unique_id, metainterp_sd, inputargs, operations,
looptoken, log=True, name='', memo=None):
- log = metainterp_sd.jitlog.log_trace(MARK_TRACE_OPT, metainterp_sd, None)
- log.write(inputargs, operations)
+ _log = metainterp_sd.jitlog.log_trace(MARK_TRACE_OPT, metainterp_sd, None)
+ _log.write(inputargs, operations)
# TODO remove old
metainterp_sd.logger_ops.log_loop(inputargs, operations, -2,
'compiling', None, name, memo)
@@ -494,8 +494,8 @@
def do_compile_bridge(metainterp_sd, faildescr, inputargs, operations,
original_loop_token, log=True, memo=None):
- log = metainterp_sd.jitlog.log_trace(MARK_TRACE_OPT, metainterp_sd, None)
- log.write(inputargs, operations, faildescr=faildescr)
+ _log = metainterp_sd.jitlog.log_trace(MARK_TRACE_OPT, metainterp_sd, None)
+ _log.write(inputargs, operations, faildescr=faildescr)
# TODO remove old
metainterp_sd.logger_ops.log_bridge(inputargs, operations, "compiling",
memo=memo)
diff --git a/rpython/jit/metainterp/jitlog.py b/rpython/jit/metainterp/jitlog.py
--- a/rpython/jit/metainterp/jitlog.py
+++ b/rpython/jit/metainterp/jitlog.py
@@ -57,7 +57,7 @@
return LogTrace(tag, memo, metainterp_sd, mc, self)
def log_patch_guard(self, addr, target_addr):
- if self.cintf.jitlog_filter(tag):
+ if self.cintf.jitlog_filter(MARK_ASM_PATCH):
return
le_addr_write = self.encode_le_addr(addr)
le_len = self.encode_le_32bit(8)
@@ -116,8 +116,8 @@
absaddr = self.mc.absolute_addr()
rel = self.mc.get_relative_pos()
# packs <start addr> <end addr> as two unsigend longs
- le_addr1 = self.encode_le_addr(absaddr)
- le_addr2 = self.encode_le_addr(absaddr + rel)
+ le_addr1 = self.logger.encode_le_addr(absaddr)
+ le_addr2 = self.logger.encode_le_addr(absaddr + rel)
log.write_marked(MARK_ASM_ADDR, le_addr1 + le_addr2)
for i,op in enumerate(ops):
mark, line = self.encode_op(op)
_______________________________________________
pypy-commit mailing list
pypy-commit@python.org
https://mail.python.org/mailman/listinfo/pypy-commit
