[pypy-commit] pypy better-jit-hooks: simplify and remove dead code

[fijal]

Author: Maciej Fijalkowski <fijall at gmail.com>
Branch: better-jit-hooks
Changeset: r51104:6c698de2d866
Date: 2012-01-07 13:22 +0200
http://bitbucket.org/pypy/pypy/changeset/6c698de2d866/

Log:	simplify and remove dead code

diff --git a/pypy/module/pypyjit/interp_resop.py b/pypy/module/pypyjit/interp_resop.py
--- a/pypy/module/pypyjit/interp_resop.py
+++ b/pypy/module/pypyjit/interp_resop.py
@@ -104,20 +104,3 @@
     num = GetSetProperty(WrappedOp.descr_num),
 )
 WrappedOp.acceptable_as_base_class = False
-
-from pypy.rpython.extregistry import ExtRegistryEntry
-
-class WrappedOpRegistry(ExtRegistryEntry):
-    _type_ = WrappedOp
-
-    def compute_annotation(self):
-        from pypy.annotation import model as annmodel
-        clsdef = self.bookkeeper.getuniqueclassdef(WrappedOp)
-        if not clsdef.attrs:
-            resopclsdef = self.bookkeeper.getuniqueclassdef(AbstractResOp)
-            attrs = {'offset': annmodel.SomeInteger(),
-                     'repr_of_resop': annmodel.SomeString(can_be_None=False),
-                     'op': annmodel.SomeInstance(resopclsdef)}
-            for attrname, s_v in attrs.iteritems():
-                clsdef.generalize_attr(attrname, s_v)
-        return annmodel.SomeInstance(clsdef, can_be_None=True)
diff --git a/pypy/rlib/jit_hooks.py b/pypy/rlib/jit_hooks.py
--- a/pypy/rlib/jit_hooks.py
+++ b/pypy/rlib/jit_hooks.py
@@ -30,29 +30,32 @@
     ptr = lltype.cast_opaque_ptr(rclass.OBJECTPTR, llref)
     return cast_base_ptr_to_instance(AbstractValue, ptr)
 
+def _cast_to_resop(llref):
+    from pypy.jit.metainterp.resoperation import AbstractResOp
+
+    ptr = lltype.cast_opaque_ptr(rclass.OBJECTPTR, llref)
+    return cast_base_ptr_to_instance(AbstractResOp, ptr)
+
+def _cast_to_gcref(obj):
+    return lltype.cast_opaque_ptr(llmemory.GCREF,
+                                  cast_instance_to_base_ptr(obj))
+
 def resop_new(no, llargs, llres):
     from pypy.jit.metainterp.history import ResOperation
 
     args = [_cast_to_box(llarg) for llarg in llargs]
     res = _cast_to_box(llres)
-    rop = ResOperation(no, args, res)
-    return lltype.cast_opaque_ptr(llmemory.GCREF,
-                                  cast_instance_to_base_ptr(rop))
+    return _cast_to_gcref(ResOperation(no, args, res))
 
 register_helper(resop_new, annmodel.SomePtr(llmemory.GCREF))
 
 def boxint_new(no):
     from pypy.jit.metainterp.history import BoxInt
-    return lltype.cast_opaque_ptr(llmemory.GCREF,
-                                  cast_instance_to_base_ptr(BoxInt(no)))
+    return _cast_to_gcref(BoxInt(no))
 
 register_helper(boxint_new, annmodel.SomePtr(llmemory.GCREF))
 
 def resop_opnum(llop):
-    from pypy.jit.metainterp.resoperation import AbstractResOp
-    
-    opptr = lltype.cast_opaque_ptr(rclass.OBJECTPTR, llop)
-    op = cast_base_ptr_to_instance(AbstractResOp, opptr)
-    return op.getopnum()
+    return _cast_to_resop(llop).getopnum()
 
 register_helper(resop_opnum, annmodel.SomeInteger())