[pypy-commit] pypy virtual-raw-mallocs: replace all the references to virtual_ref_cache&co. with virtual_ptr_cache&co., to avoid confusions with virtualrefs, which are (obviously :)) another thing

[antocuni]

Author: Antonio Cuni <anto.cuni at gmail.com>
Branch: virtual-raw-mallocs
Changeset: r59917:6fb648947ab5
Date: 2013-01-10 11:15 +0100
http://bitbucket.org/pypy/pypy/changeset/6fb648947ab5/

Log:	replace all the references to virtual_ref_cache&co. with
	virtual_ptr_cache&co., to avoid confusions with virtualrefs, which
	are (obviously :)) another thing

diff --git a/pypy/jit/metainterp/compile.py b/pypy/jit/metainterp/compile.py
--- a/pypy/jit/metainterp/compile.py
+++ b/pypy/jit/metainterp/compile.py
@@ -650,7 +650,7 @@
 
 class AllVirtuals:
     llopaque = True
-    list = [resume.ResumeDataDirectReader.virtual_ref_default]   # annotation hack
+    list = [resume.ResumeDataDirectReader.virtual_ptr_default]   # annotation hack
     def __init__(self, list):
         self.list = list
     def hide(self, cpu):
diff --git a/pypy/jit/metainterp/resume.py b/pypy/jit/metainterp/resume.py
--- a/pypy/jit/metainterp/resume.py
+++ b/pypy/jit/metainterp/resume.py
@@ -745,7 +745,7 @@
     _mixin_ = True
     rd_virtuals = None
     virtuals_cache = None
-    virtual_ref_default = None
+    virtual_ptr_default = None
     virtual_int_default = None
 
 
@@ -758,7 +758,7 @@
         self._prepare_virtuals(storage.rd_virtuals)
         self._prepare_pendingfields(storage.rd_pendingfields)
 
-    def getvirtual_ref(self, index):
+    def getvirtual_ptr(self, index):
         # Returns the index'th virtual, building it lazily if needed.
         # Note that this may be called recursively; that's why the
         # allocate() methods must fill in the cache as soon as they
@@ -786,7 +786,7 @@
                 rd_virtual = rd_virtuals[i]
                 if rd_virtual is not None:
                     if rd_virtual.kind == REF:
-                        self.getvirtual_ref(i)
+                        self.getvirtual_ptr(i)
                     elif rd_virtual.kind == INT:
                         self.getvirtual_int(i)
                     else:
@@ -800,7 +800,7 @@
             # for REFs and one for INTs: but for each index, we are using
             # either one or the other, so we should think of a way to
             # "compact" them
-            self.virtuals_cache = self.VirtualCache([self.virtual_ref_default] * len(virtuals),
+            self.virtuals_cache = self.VirtualCache([self.virtual_ptr_default] * len(virtuals),
                                                     [self.virtual_int_default] * len(virtuals))
 
     def _prepare_pendingfields(self, pendingfields):
@@ -1057,7 +1057,7 @@
             if kind == INT:
                 box = self.getvirtual_int(num)
             else:
-                box = self.getvirtual_ref(num)
+                box = self.getvirtual_ptr(num)
         elif tag == TAGINT:
             box = ConstInt(num)
         else:
@@ -1152,7 +1152,7 @@
 
 class ResumeDataDirectReader(AbstractResumeDataReader):
     unique_id = lambda: None
-    virtual_ref_default = lltype.nullptr(llmemory.GCREF.TO)
+    virtual_ptr_default = lltype.nullptr(llmemory.GCREF.TO)
     virtual_int_default = 0
     resume_after_guard_not_forced = 0
     VirtualCache = get_VirtualCache_class('DirectReader')
@@ -1370,7 +1370,7 @@
                 return self.cpu.ts.NULLREF
             return self.consts[num].getref_base()
         elif tag == TAGVIRTUAL:
-            return self.getvirtual_ref(num)
+            return self.getvirtual_ptr(num)
         else:
             assert tag == TAGBOX
             if num < 0: