[pypy-commit] pypy redirect-assembler-jitlog: translation issues

[plan_rich]

Author: Richard Plangger <planrichi at gmail.com>
Branch: redirect-assembler-jitlog
Changeset: r86875:adb14149ca02
Date: 2016-09-05 08:34 +0200
http://bitbucket.org/pypy/pypy/changeset/adb14149ca02/

Log:	translation issues

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
@@ -1123,8 +1123,8 @@
     """
     jitcell_token = make_jitcell_token(jitdriver_sd)
     #
-    logger = jitdriver_sd.metainterp_sd.jitlog
-    jitcell_token.number = logger.next_id()
+    #logger = jitdriver_sd.metainterp_sd.jitlog
+    #jitcell_token.number = logger.next_id()
     jl.tmp_callback(jitcell_token)
     #
     nb_red_args = jitdriver_sd.num_red_args
diff --git a/rpython/rlib/rjitlog/rjitlog.py b/rpython/rlib/rjitlog/rjitlog.py
--- a/rpython/rlib/rjitlog/rjitlog.py
+++ b/rpython/rlib/rjitlog/rjitlog.py
@@ -255,12 +255,13 @@
 
 if __name__ == "__main__":
     print("# generated constants from rpython/rlib/jitlog.py")
-    print 'MARK_JITLOG_START = struct.pack("b", "%s")' % hex(0x10)
+    print('import struct')
+    print('MARK_JITLOG_START = struct.pack("b", %s)' % hex(0x10))
     for mark, in marks:
         nmr = globals()['MARK_' + mark]
         h = hex(ord(nmr))
-        print '%s = struct.pack("b", "%s")' % ('MARK_' + mark, h)
-    print 'MARK_JITLOG_END = struct.pack("b", "%s")' % hex(start)
+        print '%s = struct.pack("b", %s)' % ('MARK_' + mark, h)
+    print 'MARK_JITLOG_END = struct.pack("b", %s)' % hex(start)
     for key,value in locals().items():
         if key.startswith("MP_"):
             print '%s = (%s,"%s")' % (key, hex(value[0]), value[1])
@@ -323,10 +324,10 @@
 
 def tmp_callback(looptoken):
     mark_tmp_callback = ''.join([
-        jl.MARK_TMP_CALLBACK,
+        MARK_TMP_CALLBACK,
         encode_le_addr(compute_unique_id(looptoken)),
         encode_le_64bit(looptoken.number)])
-    jl.jitlog_write_marked(mark_tmp_callback, len(mark_tmp_callback))
+    jitlog_write_marked(mark_tmp_callback, len(mark_tmp_callback))
 
 class JitLogger(object):
     def __init__(self, cpu=None):