[pypy-commit] pypy oparser-mock-model: move two more imports to the model

[antocuni]

Author: Antonio Cuni <anto.cuni at gmail.com>
Branch: oparser-mock-model
Changeset: r44864:d43ba265c462
Date: 2011-06-09 13:26 +0200
http://bitbucket.org/pypy/pypy/changeset/d43ba265c462/

Log:	move two more imports to the model

diff --git a/pypy/jit/tool/oparser.py b/pypy/jit/tool/oparser.py
--- a/pypy/jit/tool/oparser.py
+++ b/pypy/jit/tool/oparser.py
@@ -9,8 +9,6 @@
                                             ResOpWithDescr, N_aryOp, \
                                             UnaryOp, PlainResOp
 
-from pypy.jit.codewriter.heaptracker import adr2int
-from pypy.rpython.lltypesystem import llmemory
 from pypy.rpython.ootypesystem import ootype
 
 class ParseError(Exception):
@@ -86,7 +84,7 @@
                 return self.model.ConstPtr(obj)
             else:
                 assert typ == 'class'
-                return self.model.ConstInt(adr2int(llmemory.cast_ptr_to_adr(obj)))
+                return self.model.ConstInt(self.model.ptr_to_int(obj))
         else:
             if typ == 'ptr':
                 return self.model.ConstObj(obj)
diff --git a/pypy/jit/tool/oparser_model.py b/pypy/jit/tool/oparser_model.py
--- a/pypy/jit/tool/oparser_model.py
+++ b/pypy/jit/tool/oparser_model.py
@@ -18,6 +18,11 @@
             from pypy.jit.codewriter import longlong
             return longlong.getfloatstorage(float(arg))
 
+        @staticmethod
+        def ptr_to_int(obj):
+            from pypy.jit.codewriter.heaptracker import adr2int
+            from pypy.rpython.lltypesystem import llmemory
+            return adr2int(llmemory.cast_ptr_to_adr(obj))
 
     return LoopModel
 
@@ -86,6 +91,10 @@
         def convert_to_floatstorage(arg):
             return float(arg)
 
+        @staticmethod
+        def ptr_to_int(obj):
+            return id(obj)
+
         class llhelper(object):
             pass