Author: Armin Rigo <[email protected]>
Branch:
Changeset: r70121:43b3b5bb76fa
Date: 2014-03-20 16:57 +0100
http://bitbucket.org/pypy/pypy/changeset/43b3b5bb76fa/
Log: Try to settle on this order of arguments, which is the same one as
the one on compile_loop / compile_bridge.
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
@@ -434,8 +434,8 @@
self.wb_slowpath[withcards + 2 * withfloats] = rawstart
@rgc.no_release_gil
- def assemble_loop(self, logger, loopname, inputargs, operations, looptoken,
- log):
+ def assemble_loop(self, inputargs, operations, looptoken, log,
+ loopname, logger):
'''adds the following attributes to looptoken:
_ll_function_addr (address of the generated func, as an int)
_ll_loop_code (debug: addr of the start of the ResOps)
@@ -514,8 +514,8 @@
size_excluding_failure_stuff - looppos)
@rgc.no_release_gil
- def assemble_bridge(self, logger, faildescr, inputargs, operations,
- original_loop_token, log):
+ def assemble_bridge(self, faildescr, inputargs, operations,
+ original_loop_token, log, logger):
if not we_are_translated():
# Arguments should be unique
assert len(set(inputargs)) == len(inputargs)
diff --git a/rpython/jit/backend/x86/runner.py
b/rpython/jit/backend/x86/runner.py
--- a/rpython/jit/backend/x86/runner.py
+++ b/rpython/jit/backend/x86/runner.py
@@ -93,16 +93,15 @@
def compile_loop(self, inputargs, operations, looptoken, log=True,
name='', logger=None):
- return self.assembler.assemble_loop(logger, name, inputargs,
operations,
- looptoken, log=log)
+ return self.assembler.assemble_loop(inputargs, operations, looptoken,
log,
+ name, logger)
def compile_bridge(self, faildescr, inputargs, operations,
original_loop_token, log=True, logger=None):
clt = original_loop_token.compiled_loop_token
clt.compiling_a_bridge()
- return self.assembler.assemble_bridge(logger, faildescr, inputargs,
- operations,
- original_loop_token, log=log)
+ return self.assembler.assemble_bridge(faildescr, inputargs, operations,
+ original_loop_token, log, logger)
def clear_latest_values(self, count):
setitem = self.assembler.fail_boxes_ptr.setitem
_______________________________________________
pypy-commit mailing list
[email protected]
https://mail.python.org/mailman/listinfo/pypy-commit
