[pypy-svn] r65978 - pypy/branch/pyjitpl5/pypy/jit/backend/llgraph
arigo at codespeak.net
arigo at codespeak.net
Fri Jun 26 00:09:33 CEST 2009
Author: arigo
Date: Fri Jun 26 00:09:32 2009
New Revision: 65978
Modified:
pypy/branch/pyjitpl5/pypy/jit/backend/llgraph/llimpl.py
pypy/branch/pyjitpl5/pypy/jit/backend/llgraph/runner.py
Log:
Rename the 'type' field, which sometimes conflicts with
the 'type' class attribute on Boxes and Consts.
Modified: pypy/branch/pyjitpl5/pypy/jit/backend/llgraph/llimpl.py
==============================================================================
--- pypy/branch/pyjitpl5/pypy/jit/backend/llgraph/llimpl.py (original)
+++ pypy/branch/pyjitpl5/pypy/jit/backend/llgraph/llimpl.py Fri Jun 26 00:09:32 2009
@@ -599,7 +599,7 @@
# delegating to the builtins do_xxx() (done automatically for simple cases)
def op_getarrayitem_gc(self, arraydescr, array, index):
- if arraydescr.type == 'p':
+ if arraydescr.typeinfo == 'p':
return do_getarrayitem_gc_ptr(array, index)
else:
return do_getarrayitem_gc_int(array, index, self.memocast)
@@ -607,7 +607,7 @@
op_getarrayitem_gc_pure = op_getarrayitem_gc
def op_getfield_gc(self, fielddescr, struct):
- if fielddescr.type == 'p':
+ if fielddescr.typeinfo == 'p':
return do_getfield_gc_ptr(struct, fielddescr.ofs)
else:
return do_getfield_gc_int(struct, fielddescr.ofs, self.memocast)
@@ -615,7 +615,7 @@
op_getfield_gc_pure = op_getfield_gc
def op_getfield_raw(self, fielddescr, struct):
- if fielddescr.type == 'p':
+ if fielddescr.typeinfo == 'p':
return do_getfield_raw_ptr(struct, fielddescr.ofs)
else:
return do_getfield_raw_int(struct, fielddescr.ofs, self.memocast)
@@ -630,20 +630,20 @@
return result
def op_setarrayitem_gc(self, arraydescr, array, index, newvalue):
- if arraydescr.type == 'p':
+ if arraydescr.typeinfo == 'p':
do_setarrayitem_gc_ptr(array, index, newvalue)
else:
do_setarrayitem_gc_int(array, index, newvalue, self.memocast)
def op_setfield_gc(self, fielddescr, struct, newvalue):
- if fielddescr.type == 'p':
+ if fielddescr.typeinfo == 'p':
do_setfield_gc_ptr(struct, fielddescr.ofs, newvalue)
else:
do_setfield_gc_int(struct, fielddescr.ofs, newvalue,
self.memocast)
def op_setfield_raw(self, fielddescr, struct, newvalue):
- if fielddescr.type == 'p':
+ if fielddescr.typeinfo == 'p':
do_setfield_raw_ptr(struct, fielddescr.ofs, newvalue)
else:
do_setfield_raw_int(struct, fielddescr.ofs, newvalue,
@@ -651,12 +651,12 @@
def op_call(self, calldescr, func, *args):
_call_args[:] = args
- if calldescr.type == 'v':
+ if calldescr.typeinfo == 'v':
err_result = None
- elif calldescr.type == 'p':
+ elif calldescr.typeinfo == 'p':
err_result = lltype.nullptr(llmemory.GCREF.TO)
else:
- assert calldescr.type == 'i'
+ assert calldescr.typeinfo == 'i'
err_result = 0
return _do_call_common(func, self.memocast, err_result)
Modified: pypy/branch/pyjitpl5/pypy/jit/backend/llgraph/runner.py
==============================================================================
--- pypy/branch/pyjitpl5/pypy/jit/backend/llgraph/runner.py (original)
+++ pypy/branch/pyjitpl5/pypy/jit/backend/llgraph/runner.py Fri Jun 26 00:09:32 2009
@@ -21,24 +21,24 @@
class Descr(history.AbstractDescr):
name = None
ofs = -1
- type = '?'
+ typeinfo = '?'
- def __init__(self, ofs, type='?'):
+ def __init__(self, ofs, typeinfo='?'):
self.ofs = ofs
- self.type = type
+ self.typeinfo = typeinfo
def __hash__(self):
- return hash((self.ofs, self.type))
+ return hash((self.ofs, self.typeinfo))
def __eq__(self, other):
if not isinstance(other, Descr):
return NotImplemented
- return self.ofs == other.ofs and self.type == other.type
+ return self.ofs == other.ofs and self.typeinfo == other.typeinfo
def __ne__(self, other):
if not isinstance(other, Descr):
return NotImplemented
- return self.ofs != other.ofs or self.type != other.type
+ return self.ofs != other.ofs or self.typeinfo != other.typeinfo
def sort_key(self):
return self.ofs
@@ -59,8 +59,8 @@
def __repr__(self):
if self.name is not None:
- return '<Descr %r, %r, %r>' % (self.ofs, self.type, self.name)
- return '<Descr %r, %r>' % (self.ofs, self.type)
+ return '<Descr %r, %r, %r>' % (self.ofs, self.typeinfo, self.name)
+ return '<Descr %r, %r>' % (self.ofs, self.typeinfo)
history.TreeLoop._compiled_version = lltype.nullptr(llimpl.COMPILEDLOOP.TO)
@@ -118,7 +118,7 @@
llimpl.compile_add(c, op.opnum)
descr = op.descr
if isinstance(descr, Descr):
- llimpl.compile_add_descr(c, descr.ofs, descr.type)
+ llimpl.compile_add_descr(c, descr.ofs, descr.typeinfo)
if self.is_oo and isinstance(descr, (OODescr, MethDescr)):
# hack hack, not rpython
c._obj.externalobj.operations[-1].descr = descr
@@ -286,7 +286,7 @@
assert isinstance(arraydescr, Descr)
array = args[0].getptr_base()
index = args[1].getint()
- if arraydescr.type == 'p':
+ if arraydescr.typeinfo == 'p':
return history.BoxPtr(llimpl.do_getarrayitem_gc_ptr(array, index))
else:
return history.BoxInt(llimpl.do_getarrayitem_gc_int(array, index,
@@ -295,7 +295,7 @@
def do_getfield_gc(self, args, fielddescr):
assert isinstance(fielddescr, Descr)
struct = args[0].getptr_base()
- if fielddescr.type == 'p':
+ if fielddescr.typeinfo == 'p':
return history.BoxPtr(llimpl.do_getfield_gc_ptr(struct,
fielddescr.ofs))
else:
@@ -305,7 +305,7 @@
def do_getfield_raw(self, args, fielddescr):
assert isinstance(fielddescr, Descr)
struct = self.cast_int_to_adr(args[0].getint())
- if fielddescr.type == 'p':
+ if fielddescr.typeinfo == 'p':
return history.BoxPtr(llimpl.do_getfield_raw_ptr(struct,
fielddescr.ofs))
else:
@@ -331,7 +331,7 @@
assert isinstance(arraydescr, Descr)
array = args[0].getptr_base()
index = args[1].getint()
- if arraydescr.type == 'p':
+ if arraydescr.typeinfo == 'p':
newvalue = args[2].getptr_base()
llimpl.do_setarrayitem_gc_ptr(array, index, newvalue)
else:
@@ -342,7 +342,7 @@
def do_setfield_gc(self, args, fielddescr):
assert isinstance(fielddescr, Descr)
struct = args[0].getptr_base()
- if fielddescr.type == 'p':
+ if fielddescr.typeinfo == 'p':
newvalue = args[1].getptr_base()
llimpl.do_setfield_gc_ptr(struct, fielddescr.ofs, newvalue)
else:
@@ -353,7 +353,7 @@
def do_setfield_raw(self, args, fielddescr):
assert isinstance(fielddescr, Descr)
struct = self.cast_int_to_adr(args[0].getint())
- if fielddescr.type == 'p':
+ if fielddescr.typeinfo == 'p':
newvalue = args[1].getptr_base()
llimpl.do_setfield_raw_ptr(struct, fielddescr.ofs, newvalue)
else:
@@ -390,11 +390,11 @@
llimpl.do_call_pushptr(arg.getptr_base())
else:
llimpl.do_call_pushint(arg.getint())
- if calldescr.type == 'p':
+ if calldescr.typeinfo == 'p':
return history.BoxPtr(llimpl.do_call_ptr(func, self.memo_cast))
- elif calldescr.type == 'i':
+ elif calldescr.typeinfo == 'i':
return history.BoxInt(llimpl.do_call_int(func, self.memo_cast))
- else: # calldescr.type == 'v' # void
+ else: # calldescr.typeinfo == 'v' # void
llimpl.do_call_void(func, self.memo_cast)
def do_cast_int_to_ptr(self, args, descr=None):
More information about the Pypy-commit
mailing list