Author: Maciej Fijalkowski <fij...@gmail.com>
Branch: optresult-unroll
Changeset: r79318:ff5f9e91ac2a
Date: 2015-08-31 13:56 +0200
http://bitbucket.org/pypy/pypy/changeset/ff5f9e91ac2a/
Log: changes to make parsing work
diff --git a/rpython/jit/tool/oparser.py b/rpython/jit/tool/oparser.py
--- a/rpython/jit/tool/oparser.py
+++ b/rpython/jit/tool/oparser.py
@@ -293,7 +293,7 @@
return opnum, args, descr, fail_args
- def create_op(self, opnum, args, descr, fail_args):
+ def create_op(self, opnum, args, res, descr, fail_args):
if opnum in ALL_ESCAPE_OPS:
op = ALL_ESCAPE_OPS[opnum]()
op.initarglist(args)
@@ -319,13 +319,13 @@
opnum, args, descr, fail_args = self.parse_op(op)
if res in self.vars:
raise ParseError("Double assign to var %s in line: %s" % (res,
line))
- resop = self.create_op(opnum, args, descr, fail_args)
+ resop = self.create_op(opnum, args, res, descr, fail_args)
self.vars[res] = resop
return resop
def parse_op_no_result(self, line):
opnum, args, descr, fail_args = self.parse_op(line)
- res = self.create_op(opnum, args, descr, fail_args)
+ res = self.create_op_no_result(opnum, args, descr, fail_args)
return res
def parse_next_op(self, line):
diff --git a/rpython/tool/jitlogparser/parser.py
b/rpython/tool/jitlogparser/parser.py
--- a/rpython/tool/jitlogparser/parser.py
+++ b/rpython/tool/jitlogparser/parser.py
@@ -156,8 +156,13 @@
def box_for_var(self, res):
return res
- def create_op(self, opnum, args, descr, fail_args):
- return self.Op(intern(opname[opnum].lower()), args, None, descr,
fail_args)
+ def create_op(self, opnum, args, res, descr, fail_args):
+ return self.Op(intern(opname[opnum].lower()), args, res,
+ descr, fail_args)
+
+ def create_op_no_result(self, opnum, args, descr, fail_args):
+ return self.Op(intern(opname[opnum].lower()), args, None,
+ descr, fail_args)
_______________________________________________
pypy-commit mailing list
pypy-commit@python.org
https://mail.python.org/mailman/listinfo/pypy-commit
