Author: Maciej Fijalkowski <fij...@gmail.com>
Branch: jitframe-on-heap
Changeset: r61176:4085f406efb4
Date: 2013-02-13 19:39 +0200
http://bitbucket.org/pypy/pypy/changeset/4085f406efb4/
Log: small fixes
diff --git a/rpython/jit/backend/arm/regalloc.py
b/rpython/jit/backend/arm/regalloc.py
--- a/rpython/jit/backend/arm/regalloc.py
+++ b/rpython/jit/backend/arm/regalloc.py
@@ -301,7 +301,7 @@
def prepare_loop(self, inputargs, operations, looptoken, allgcrefs):
operations = self._prepare(inputargs, operations, allgcrefs)
- self._set_initial_bindings(inputargs)
+ self._set_initial_bindings(inputargs, looptoken)
self.possibly_free_vars(list(inputargs))
return operations
@@ -311,7 +311,6 @@
self._update_bindings(arglocs, inputargs)
return operations
-
def get_final_frame_depth(self):
return self.frame_manager.get_frame_depth()
@@ -749,15 +748,16 @@
# we would like the boxes to be after the jump.
def _compute_hint_frame_locations_from_descr(self, descr):
- arglocs = self.assembler.target_arglocs(descr)
- jump_op = self.final_jump_op
- assert len(arglocs) == jump_op.numargs()
- for i in range(jump_op.numargs()):
- box = jump_op.getarg(i)
- if isinstance(box, Box):
- loc = arglocs[i]
- if loc is not None and loc.is_stack():
- self.frame_manager.hint_frame_locations[box] = loc
+ return
+ #arglocs = self.assembler.target_arglocs(descr)
+ #jump_op = self.final_jump_op
+ #assert len(arglocs) == jump_op.numargs()
+ #for i in range(jump_op.numargs()):
+ # box = jump_op.getarg(i)
+ # if isinstance(box, Box):
+ # loc = arglocs[i]
+ # if loc is not None and loc.is_stack():
+ # self.frame_manager.hint_frame_locations[box] = loc
def prepare_op_jump(self, op, fcond):
descr = op.getdescr()
diff --git a/rpython/jit/backend/x86/regalloc.py
b/rpython/jit/backend/x86/regalloc.py
--- a/rpython/jit/backend/x86/regalloc.py
+++ b/rpython/jit/backend/x86/regalloc.py
@@ -4,7 +4,7 @@
import os
from rpython.jit.metainterp.history import (Box, Const, ConstInt, ConstPtr,
- BoxPtr, ConstFloat, BoxInt,
+ ConstFloat, BoxInt,
BoxFloat, INT, REF, FLOAT,
TargetToken, JitCellToken)
from rpython.jit.backend.x86.regloc import *
_______________________________________________
pypy-commit mailing list
pypy-commit@python.org
http://mail.python.org/mailman/listinfo/pypy-commit
