[pypy-svn] r13596 - pypy/dist/pypy/translator/llvm2
hpk at codespeak.net
hpk at codespeak.net
Sun Jun 19 12:34:34 CEST 2005
Author: hpk
Date: Sun Jun 19 12:34:34 2005
New Revision: 13596
Modified:
pypy/dist/pypy/translator/llvm2/database.py
pypy/dist/pypy/translator/llvm2/funcnode.py
pypy/dist/pypy/translator/llvm2/genllvm.py
pypy/dist/pypy/translator/llvm2/pyxwrapper.py
Log:
(cfbolz, hpk)
some renamings to make usages more obvious
Modified: pypy/dist/pypy/translator/llvm2/database.py
==============================================================================
--- pypy/dist/pypy/translator/llvm2/database.py (original)
+++ pypy/dist/pypy/translator/llvm2/database.py Sun Jun 19 12:34:34 2005
@@ -14,7 +14,7 @@
self.obj2node = {}
self._pendingsetup = []
- def prepare_ref(self, const_or_var):
+ def prepare_repr_arg(self, const_or_var):
if const_or_var in self.obj2node:
return
if isinstance(const_or_var, Constant):
@@ -26,14 +26,14 @@
log("added to pending nodes:", node)
self._pendingsetup.append(node)
- def prepare_typeref(self, type_):
+ def prepare_repr_arg_type(self, type_):
if not isinstance(type_, lltype.Primitive):
log.XXX("need to prepare typeref")
def prepare_arg(self, const_or_var):
log.prepare(const_or_var)
- self.prepare_ref(const_or_var)
- self.prepare_typeref(const_or_var.concretetype)
+ self.prepare_repr_arg(const_or_var)
+ self.prepare_repr_arg_type(const_or_var.concretetype)
def process(self):
if self._pendingsetup:
@@ -43,7 +43,7 @@
def getobjects(self):
return self.obj2node.values()
- def getref(self, arg):
+ def repr_arg(self, arg):
if (isinstance(arg, Constant) and
isinstance(arg.concretetype, lltype.Primitive)):
return str(arg.value).lower() #False --> false
@@ -51,11 +51,11 @@
return "%" + str(arg)
return self.obj2node[arg].ref
- def gettyperef(self, arg):
+ def repr_arg_type(self, arg):
return PRIMITIVES_TO_LLVM[arg.concretetype]
- def multi_getref(self, args):
- return [self.getref(arg) for arg in args]
+ def repr_arg_multi(self, args):
+ return [self.repr_arg(arg) for arg in args]
- def multi_gettyperef(self, args):
- return [self.gettyperef(arg) for arg in args]
+ def repr_arg_type_multi(self, args):
+ return [self.repr_arg_type(arg) for arg in args]
Modified: pypy/dist/pypy/translator/llvm2/funcnode.py
==============================================================================
--- pypy/dist/pypy/translator/llvm2/funcnode.py (original)
+++ pypy/dist/pypy/translator/llvm2/funcnode.py Sun Jun 19 12:34:34 2005
@@ -34,9 +34,9 @@
assert self._issetup
startblock = self.graph.startblock
returnblock = self.graph.returnblock
- inputargs = self.db.multi_getref(startblock.inputargs)
- inputargtypes = self.db.multi_gettyperef(startblock.inputargs)
- returntype = self.db.gettyperef(self.graph.returnblock.inputargs[0])
+ inputargs = self.db.repr_arg_multi(startblock.inputargs)
+ inputargtypes = self.db.repr_arg_type_multi(startblock.inputargs)
+ returntype = self.db.repr_arg_type(self.graph.returnblock.inputargs[0])
result = "%s %s" % (returntype, self.ref)
args = ["%s %s" % item for item in zip(inputargtypes, inputargs)]
result += "(%s)" % ", ".join(args)
@@ -75,10 +75,10 @@
def write_block_phi_nodes(self, codewriter, block):
entrylinks = mkentrymap(self.graph)[block]
entrylinks = [x for x in entrylinks if x.prevblock is not None]
- inputargs = self.db.multi_getref(block.inputargs)
- inputargtypes = self.db.multi_gettyperef(block.inputargs)
+ inputargs = self.db.repr_arg_multi(block.inputargs)
+ inputargtypes = self.db.repr_arg_type_multi(block.inputargs)
for i, (arg, type_) in enumerate(zip(inputargs, inputargtypes)):
- names = self.db.multi_getref([link.args[i] for link in entrylinks])
+ names = self.db.repr_arg_multi([link.args[i] for link in entrylinks])
blocknames = [self.block_to_name[link.prevblock]
for link in entrylinks]
codewriter.phi(arg, type_, names, blocknames)
@@ -87,7 +87,7 @@
if len(block.exits) == 1:
codewriter.br_uncond(self.block_to_name[block.exits[0].target])
elif len(block.exits) == 2:
- switch = self.db.getref(block.exitswitch)
+ switch = self.db.repr_arg(block.exitswitch)
codewriter.br(switch, self.block_to_name[block.exits[0].target],
self.block_to_name[block.exits[1].target])
@@ -106,8 +106,8 @@
def write_returnblock(self, codewriter, block):
assert len(block.inputargs) == 1
self.write_block_phi_nodes(codewriter, block)
- inputargtype = self.db.gettyperef(block.inputargs[0])
- inputarg = self.db.getref(block.inputargs[0])
+ inputargtype = self.db.repr_arg_type(block.inputargs[0])
+ inputarg = self.db.repr_arg(block.inputargs[0])
codewriter.ret(inputargtype, inputarg)
class OpWriter(object):
@@ -118,10 +118,10 @@
def binaryop(self, name, op):
assert len(op.args) == 2
self.codewriter.binaryop(name,
- self.db.getref(op.result),
- self.db.gettyperef(op.args[0]),
- self.db.getref(op.args[0]),
- self.db.getref(op.args[1]))
+ self.db.repr_arg(op.result),
+ self.db.repr_arg_type(op.args[0]),
+ self.db.repr_arg(op.args[0]),
+ self.db.repr_arg(op.args[1]))
def int_mul(self, op):
self.binaryop('mul', op)
@@ -154,19 +154,19 @@
def cast_bool_to_int(self, op):
assert len(op.args) == 1
- targetvar = self.db.getref(op.result)
- targettype = self.db.gettyperef(op.result)
- fromvar = self.db.getref(op.args[0])
- fromtype = self.db.gettyperef(op.args[0])
+ targetvar = self.db.repr_arg(op.result)
+ targettype = self.db.repr_arg_type(op.result)
+ fromvar = self.db.repr_arg(op.args[0])
+ fromtype = self.db.repr_arg_type(op.args[0])
self.codewriter.cast(targetvar, fromtype, fromvar, targettype)
def direct_call(self, op):
assert len(op.args) >= 1
- targetvar = self.db.getref(op.result)
- returntype = self.db.gettyperef(op.result)
- functionref = self.db.getref(op.args[0])
- argrefs = self.db.multi_getref(op.args[1:])
- argtypes = self.db.multi_gettyperef(op.args[1:])
+ targetvar = self.db.repr_arg(op.result)
+ returntype = self.db.repr_arg_type(op.result)
+ functionref = self.db.repr_arg(op.args[0])
+ argrefs = self.db.repr_arg_multi(op.args[1:])
+ argtypes = self.db.repr_arg_type_multi(op.args[1:])
self.codewriter.call(targetvar, returntype, functionref, argrefs,
argtypes)
Modified: pypy/dist/pypy/translator/llvm2/genllvm.py
==============================================================================
--- pypy/dist/pypy/translator/llvm2/genllvm.py (original)
+++ pypy/dist/pypy/translator/llvm2/genllvm.py Sun Jun 19 12:34:34 2005
@@ -15,7 +15,7 @@
db = Database(translator)
ptr = getfunctionptr(translator, func)
c = inputconst(lltype.typeOf(ptr), ptr)
- db.prepare_ref(c)
+ db.prepare_repr_arg(c)
assert c in db.obj2node
while db.process():
pass
Modified: pypy/dist/pypy/translator/llvm2/pyxwrapper.py
==============================================================================
--- pypy/dist/pypy/translator/llvm2/pyxwrapper.py (original)
+++ pypy/dist/pypy/translator/llvm2/pyxwrapper.py Sun Jun 19 12:34:34 2005
@@ -16,7 +16,7 @@
return result
lines = []
append = lines.append
- inputargs = funcgen.db.multi_getref(funcgen.graph.startblock.inputargs)
+ inputargs = funcgen.db.repr_arg_multi(funcgen.graph.startblock.inputargs)
inputargs = [x.strip("%") for x in inputargs]
append("cdef extern " + c_declaration())
append("")
More information about the Pypy-commit
mailing list