[pypy-svn] r67297 - in pypy/branch/pyjitpl5-less-is_oo/pypy/jit/metainterp: . test

[antocuni at codespeak.net]

Author: antocuni
Date: Sat Aug 29 11:38:16 2009
New Revision: 67297

Modified:
   pypy/branch/pyjitpl5-less-is_oo/pypy/jit/metainterp/codewriter.py
   pypy/branch/pyjitpl5-less-is_oo/pypy/jit/metainterp/test/oparser.py
Log:
get rid of two more is_oos


Modified: pypy/branch/pyjitpl5-less-is_oo/pypy/jit/metainterp/codewriter.py
==============================================================================
--- pypy/branch/pyjitpl5-less-is_oo/pypy/jit/metainterp/codewriter.py	(original)
+++ pypy/branch/pyjitpl5-less-is_oo/pypy/jit/metainterp/codewriter.py	Sat Aug 29 11:38:16 2009
@@ -144,7 +144,7 @@
         if self.portal_graph is None or graph is self.portal_graph:
             return ()
         fnptr = self.rtyper.getcallable(graph)
-        if self.cpu.is_oo:
+        if self.rtyper.type_system.name == 'ootypesystem':
             if oosend_methdescr:
                 return (None, oosend_methdescr)
             else:

Modified: pypy/branch/pyjitpl5-less-is_oo/pypy/jit/metainterp/test/oparser.py
==============================================================================
--- pypy/branch/pyjitpl5-less-is_oo/pypy/jit/metainterp/test/oparser.py	(original)
+++ pypy/branch/pyjitpl5-less-is_oo/pypy/jit/metainterp/test/oparser.py	Sat Aug 29 11:38:16 2009
@@ -3,9 +3,10 @@
 in a nicer fashion
 """
 
-from pypy.jit.metainterp.history import TreeLoop, BoxInt, BoxPtr, ConstInt,\
-     ConstAddr, ConstObj, ConstPtr, Box, BoxObj
+from pypy.jit.metainterp.history import TreeLoop, BoxInt, ConstInt,\
+     ConstAddr, ConstObj, ConstPtr, Box
 from pypy.jit.metainterp.resoperation import rop, ResOperation
+from pypy.jit.metainterp.typesystem import llhelper
 from pypy.rpython.lltypesystem import lltype, llmemory
 from pypy.rpython.ootypesystem import ootype
 
@@ -70,10 +71,8 @@
             _box_counter_more_than(elem[1:])
         elif elem.startswith('p'):
             # pointer
-            if getattr(self.cpu, 'is_oo', False):
-                box = BoxObj()
-            else:
-                box = BoxPtr()
+            ts = getattr(self.cpu, 'ts', llhelper)
+            box = ts.BoxRef()
             _box_counter_more_than(elem[1:])
         else:
             for prefix, boxclass in self.boxkinds.iteritems():