Author: Armin Rigo <[email protected]>
Branch: jit-simplify-backendintf
Changeset: r50401:9677e2ec7aef
Date: 2011-12-11 22:41 +0100
http://bitbucket.org/pypy/pypy/changeset/9677e2ec7aef/
Log: Kill.
diff --git a/pypy/jit/backend/x86/runner.py b/pypy/jit/backend/x86/runner.py
--- a/pypy/jit/backend/x86/runner.py
+++ b/pypy/jit/backend/x86/runner.py
@@ -91,15 +91,6 @@
return self.assembler.assemble_bridge(faildescr, inputargs, operations,
original_loop_token, log=log)
- def set_future_value_int(self, index, intvalue):
- self.assembler.fail_boxes_int.setitem(index, intvalue)
-
- def set_future_value_float(self, index, floatvalue):
- self.assembler.fail_boxes_float.setitem(index, floatvalue)
-
- def set_future_value_ref(self, index, ptrvalue):
- self.assembler.fail_boxes_ptr.setitem(index, ptrvalue)
-
def get_latest_value_int(self, index):
return self.assembler.fail_boxes_int.getitem(index)
@@ -122,17 +113,7 @@
# the FORCE_TOKEN operation and this helper both return 'ebp'.
return self.assembler.fail_ebp
- def make_execute_token(self, *argkinds):
- ARGS = []
- for kind in argkinds:
- if kind == history.INT:
- ARGS.append(lltype.Signed)
- elif kind == history.REF:
- ARGS.append(llmemory.GCREF)
- elif kind == history.FLOAT:
- ARGS.append(longlong.FLOATSTORAGE)
- else:
- assert 0
+ def make_execute_token(self, *ARGS):
FUNCPTR = lltype.Ptr(lltype.FuncType(ARGS, lltype.Signed))
#
def execute_token(executable_token, *args):
diff --git a/pypy/jit/backend/x86/test/test_runner.py
b/pypy/jit/backend/x86/test/test_runner.py
--- a/pypy/jit/backend/x86/test/test_runner.py
+++ b/pypy/jit/backend/x86/test/test_runner.py
@@ -282,11 +282,7 @@
ops[-2].setfailargs([i1])
looptoken = JitCellToken()
self.cpu.compile_loop([b], ops, looptoken)
- if op == rop.INT_IS_TRUE:
- self.cpu.set_future_value_int(0, b.value)
- else:
- self.cpu.set_future_value_ref(0, b.value)
- self.cpu.execute_token(looptoken)
+ self.cpu.execute_token(looptoken, b.value)
result = self.cpu.get_latest_value_int(0)
if guard == rop.GUARD_FALSE:
assert result == execute(self.cpu, None,
_______________________________________________
pypy-commit mailing list
[email protected]
http://mail.python.org/mailman/listinfo/pypy-commit
