[pypy-svn] r23534 - in pypy/dist/pypy: jit rpython

[pedronis at codespeak.net]

Author: pedronis
Date: Tue Feb 21 00:45:02 2006
New Revision: 23534

Modified:
   pypy/dist/pypy/jit/rtimeshift.py
   pypy/dist/pypy/rpython/rgenop.py
Log:
more consistent naming gv_*.



Modified: pypy/dist/pypy/jit/rtimeshift.py
==============================================================================
--- pypy/dist/pypy/jit/rtimeshift.py	(original)
+++ pypy/dist/pypy/jit/rtimeshift.py	Tue Feb 21 00:45:02 2006
@@ -347,8 +347,8 @@
     value = lltype.cast_primitive(lltype.Signed, value)
     return ConstRedBox.ll_fromvalue(value)
 
-def ll_var_box(jitstate, cvTYPE):
-    genvar = rgenop.geninputarg(jitstate.curblock, cvTYPE)
+def ll_var_box(jitstate, gv_TYPE):
+    genvar = rgenop.geninputarg(jitstate.curblock, gv_TYPE)
     return VarRedBox(genvar)
     
 def ll_end_setup_jitstate(jitstate):

Modified: pypy/dist/pypy/rpython/rgenop.py
==============================================================================
--- pypy/dist/pypy/rpython/rgenop.py	(original)
+++ pypy/dist/pypy/rpython/rgenop.py	Tue Feb 21 00:45:02 2006
@@ -23,9 +23,9 @@
     initblock(blockcontainer.obj)
     return blockcontainer
 
-def geninputarg(blockcontainer, cvCONCRETE_TYPE):
+def geninputarg(blockcontainer, gv_CONCRETE_TYPE):
     block = from_opaque_object(blockcontainer.obj)
-    CONCRETE_TYPE = from_opaque_object(cvCONCRETE_TYPE).value
+    CONCRETE_TYPE = from_opaque_object(gv_CONCRETE_TYPE).value
     v = flowmodel.Variable()
     v.concretetype = CONCRETE_TYPE
     block.inputargs.append(v)
@@ -45,11 +45,11 @@
     return res
 
 # is opname a runtime value?
-def genop(blockcontainer, opname, vars, cvRESULT_TYPE):
+def genop(blockcontainer, opname, vars, gv_RESULT_TYPE):
     if not isinstance(opname, str):
         opname = from_rstr(opname)
     block = from_opaque_object(blockcontainer.obj)
-    RESULT_TYPE = from_opaque_object(cvRESULT_TYPE).value
+    RESULT_TYPE = from_opaque_object(gv_RESULT_TYPE).value
     opvars = _inputvars(vars)    
     v = flowmodel.Variable()
     v.concretetype = RESULT_TYPE
@@ -57,10 +57,10 @@
     block.operations.append(op)
     return to_opaque_object(v)
 
-def gencallableconst(blockcontainer, name, targetcontainer, cvFUNCTYPE):
+def gencallableconst(blockcontainer, name, targetcontainer, gv_FUNCTYPE):
     # is name useful, is it runtime variable?
     target = from_opaque_object(targetcontainer.obj)
-    FUNCTYPE = from_opaque_object(cvFUNCTYPE).value
+    FUNCTYPE = from_opaque_object(gv_FUNCTYPE).value
     fptr = lltype.functionptr(FUNCTYPE, name,
                               graph=_buildgraph(target))
     return genconst(fptr)