[pypy-commit] pypy jit-counter: Fixes

[arigo]

Author: Armin Rigo <arigo at tunes.org>
Branch: jit-counter
Changeset: r67748:3f10fdb46ecf
Date: 2013-10-30 19:26 +0100
http://bitbucket.org/pypy/pypy/changeset/3f10fdb46ecf/

Log:	Fixes

diff --git a/rpython/jit/metainterp/compile.py b/rpython/jit/metainterp/compile.py
--- a/rpython/jit/metainterp/compile.py
+++ b/rpython/jit/metainterp/compile.py
@@ -581,10 +581,10 @@
             # it to an integer
             if typetag == self.TY_INT:
                 intval = metainterp_sd.cpu.get_int_value(deadframe, index)
-            elif typetag == self.CNT_REF:
+            elif typetag == self.TY_REF:
                 refval = metainterp_sd.cpu.get_ref_value(deadframe, index)
                 intval = current_object_addr_as_int(refval)
-            elif typetag == self.CNT_FLOAT:
+            elif typetag == self.TY_FLOAT:
                 floatval = metainterp_sd.cpu.get_float_value(deadframe, index)
                 intval = longlong.gethash_fast(floatval)
             else:
diff --git a/rpython/jit/metainterp/warmstate.py b/rpython/jit/metainterp/warmstate.py
--- a/rpython/jit/metainterp/warmstate.py
+++ b/rpython/jit/metainterp/warmstate.py
@@ -512,7 +512,7 @@
         redargtypes = ''.join([kind[0] for kind in jd.red_args_types])
 
         def get_assembler_token(greenkey):
-            cell = self.ensure_jit_cell_at_key(greenkey)
+            cell = JitCell.ensure_jit_cell_at_key(greenkey)
             procedure_token = cell.get_procedure_token()
             if procedure_token is None:
                 from rpython.jit.metainterp.compile import compile_tmp_callback