[pypy-commit] pypy kill-ootype: clean up rpython/jit/metainterp/

[rlamy]

Author: Ronan Lamy <ronan.lamy at gmail.com>
Branch: kill-ootype
Changeset: r65548:0cfea4acf443
Date: 2013-07-23 13:29 +0200
http://bitbucket.org/pypy/pypy/changeset/0cfea4acf443/

Log:	clean up rpython/jit/metainterp/

diff --git a/rpython/jit/metainterp/quasiimmut.py b/rpython/jit/metainterp/quasiimmut.py
--- a/rpython/jit/metainterp/quasiimmut.py
+++ b/rpython/jit/metainterp/quasiimmut.py
@@ -7,8 +7,6 @@
 def get_mutate_field_name(fieldname):
     if fieldname.startswith('inst_'):    # lltype
         return 'mutate_' + fieldname[5:]
-    elif fieldname.startswith('o'):      # ootype
-        return 'mutate_' + fieldname[1:]
     else:
         raise AssertionError(fieldname)
 
diff --git a/rpython/jit/metainterp/resoperation.py b/rpython/jit/metainterp/resoperation.py
--- a/rpython/jit/metainterp/resoperation.py
+++ b/rpython/jit/metainterp/resoperation.py
@@ -469,10 +469,6 @@
     'UNICODELEN/1',
     'UNICODEGETITEM/2',
     #
-    # ootype operations
-    #'INSTANCEOF/1db',
-    #'SUBCLASSOF/2b',
-    #
     '_ALWAYS_PURE_LAST',  # ----- end of always_pure operations -----
 
     'GETARRAYITEM_GC/2d',
@@ -503,7 +499,6 @@
     'SETFIELD_RAW/2d',
     'STRSETITEM/3',
     'UNICODESETITEM/3',
-    #'RUNTIMENEW/1',     # ootype operation
     'COND_CALL_GC_WB/2d', # [objptr, newvalue] (for the write barrier)
     'COND_CALL_GC_WB_ARRAY/3d', # [objptr, arrayindex, newvalue] (write barr.)
     'DEBUG_MERGE_POINT/*',      # debugging only
@@ -522,8 +517,6 @@
     'CALL_MAY_FORCE/*d',
     'CALL_LOOPINVARIANT/*d',
     'CALL_RELEASE_GIL/*d',  # release the GIL and "close the stack" for asmgcc
-    #'OOSEND',                     # ootype operation
-    #'OOSEND_PURE',                # ootype operation
     'CALL_PURE/*d',             # removed before it's passed to the backend
     'CALL_MALLOC_GC/*d',      # like CALL, but NULL => propagate MemoryError
     'CALL_MALLOC_NURSERY/1',  # nursery malloc, const number of bytes, zeroed
diff --git a/rpython/jit/metainterp/warmspot.py b/rpython/jit/metainterp/warmspot.py
--- a/rpython/jit/metainterp/warmspot.py
+++ b/rpython/jit/metainterp/warmspot.py
@@ -1,7 +1,5 @@
 import sys
 
-import py
-
 from rpython.tool.sourcetools import func_with_new_name
 from rpython.rtyper.lltypesystem import lltype, llmemory
 from rpython.rtyper.annlowlevel import (llhelper, MixLevelHelperAnnotator,
@@ -977,8 +975,6 @@
             op.args[:3] = [closures[key]]
 
     def rewrite_force_virtual(self, vrefinfo):
-        if self.cpu.ts.name != 'lltype':
-            py.test.skip("rewrite_force_virtual: port it to ootype")
         all_graphs = self.translator.graphs
         vrefinfo.replace_force_virtual_with_call(all_graphs)