Author: hager <sven.ha...@uni-duesseldorf.de> Branch: ppc-jit-backend Changeset: r51010:45e11554d5ad Date: 2012-01-04 14:21 +0100 http://bitbucket.org/pypy/pypy/changeset/45e11554d5ad/
Log: replace LoopToken with JitCellToken and kill unused functions from runner diff --git a/pypy/jit/backend/ppc/runner.py b/pypy/jit/backend/ppc/runner.py --- a/pypy/jit/backend/ppc/runner.py +++ b/pypy/jit/backend/ppc/runner.py @@ -52,13 +52,6 @@ self.asm.assemble_bridge(faildescr, inputargs, operations, original_loop_token, log=log) - # set value in fail_boxes_int - def set_future_value_int(self, index, value_int): - self.asm.fail_boxes_int.setitem(index, value_int) - - def set_future_value_ref(self, index, pointer): - self.asm.fail_boxes_ptr.setitem(index, pointer) - def clear_latest_values(self, count): null = lltype.nullptr(llmemory.GCREF.TO) for index in range(count): diff --git a/pypy/jit/backend/test/runner_test.py b/pypy/jit/backend/test/runner_test.py --- a/pypy/jit/backend/test/runner_test.py +++ b/pypy/jit/backend/test/runner_test.py @@ -121,10 +121,9 @@ prev_box = next_box operations.append(ResOperation(rop.FINISH, [prev_box], None, descr=BasicFailDescr(1))) inputargs = [i0] - looptoken = LoopToken() + looptoken = JitCellToken() self.cpu.compile_loop(inputargs, operations, looptoken) - self.cpu.set_future_value_int(0, 20) - fail = self.cpu.execute_token(looptoken) + fail = self.cpu.execute_token(looptoken, 20) res = self.cpu.get_latest_value_int(0) assert res == 520 assert fail.identifier == 1 @@ -197,7 +196,7 @@ i0_1 = BoxInt() i1_1 = BoxInt() i2_1 = BoxInt() - looptoken1 = LoopToken() + looptoken1 = JitCellToken() operations1 = [ ResOperation(rop.INT_ADD, [i0_1, ConstInt(1)], i1_1), ResOperation(rop.INT_LE, [i1_1, ConstInt(9)], i2_1), @@ -218,7 +217,7 @@ i0_2 = BoxInt() i1_2 = BoxInt() i2_2 = BoxInt() - looptoken2 = LoopToken() + looptoken2 = JitCellToken() operations2 = [ ResOperation(rop.INT_ADD, [i0_2, ConstInt(1)], i1_2), ResOperation(rop.INT_LE, [i1_2, ConstInt(19)], i2_2), @@ -533,7 +532,7 @@ ResOperation(rop.FINISH, [ptr], None, descr=BasicFailDescr(1)) ] inputargs = [i0, ptr, i1] - looptoken = LoopToken() + looptoken = JitCellToken() self.cpu.compile_loop(inputargs, operations, looptoken) self.cpu.set_future_value_int(0, 10) self.cpu.set_future_value_ref(1, u_box.value) @@ -549,7 +548,7 @@ finish(i0) ''' loop = parse(ops, namespace=locals()) - looptoken = LoopToken() + looptoken = JitCellToken() self.cpu.compile_loop(loop.inputargs, loop.operations, looptoken) self.cpu.set_future_value_int(0, 42) _______________________________________________ pypy-commit mailing list pypy-commit@python.org http://mail.python.org/mailman/listinfo/pypy-commit