Author: Maciej Fijalkowski <[email protected]>
Branch: inline-dict-ops
Changeset: r45112:9f1dfb29c299
Date: 2011-06-24 19:31 +0200
http://bitbucket.org/pypy/pypy/changeset/9f1dfb29c299/
Log: Some consistency in ops names
diff --git a/pypy/jit/codewriter/jtransform.py
b/pypy/jit/codewriter/jtransform.py
--- a/pypy/jit/codewriter/jtransform.py
+++ b/pypy/jit/codewriter/jtransform.py
@@ -715,7 +715,8 @@
fielddescr = self.cpu.fielddescrof(STRUCT, c_field.value)
args = [v_inst, v_index, arraydescr, fielddescr]
kind = getkind(op.result.concretetype)[0]
- return SpaceOperation('getinteriorfield_%s' % kind, args,
op.result)
+ return SpaceOperation('getinteriorfield_gc_%s' % kind, args,
+ op.result)
def rewrite_op_setinteriorfield(self, op):
# only supports strings and unicodes
@@ -739,8 +740,8 @@
fielddescr = self.cpu.fielddescrof(STRUCT, c_field.value)
kind = getkind(v_value.concretetype)[0]
args = [v_inst, v_index, v_value, arraydescr, fielddescr]
- return SpaceOperation('setinteriorfield_%s' % kind, args,
op.result)
-
+ return SpaceOperation('setinteriorfield_gc_%s' % kind, args,
+ op.result)
def _rewrite_equality(self, op, opname):
arg0, arg1 = op.args
diff --git a/pypy/jit/codewriter/test/test_jtransform.py
b/pypy/jit/codewriter/test/test_jtransform.py
--- a/pypy/jit/codewriter/test/test_jtransform.py
+++ b/pypy/jit/codewriter/test/test_jtransform.py
@@ -656,7 +656,7 @@
op = SpaceOperation('getinteriorfield', [v, i, Constant('v', lltype.Void)],
v_result)
op1 = Transformer(FakeCPU()).rewrite_operation(op)
- assert op1.opname == 'getinteriorfield_i'
+ assert op1.opname == 'getinteriorfield_gc_i'
assert op1.args == [v, i, ('arraydescr', DICT),
('fielddescr', DICT.OF, 'v')]
@@ -696,7 +696,7 @@
i],
v_void)
op1 = Transformer(FakeCPU()).rewrite_operation(op)
- assert op1.opname == 'setinteriorfield_i'
+ assert op1.opname == 'setinteriorfield_gc_i'
assert op1.args == [v, i, i, ('arraydescr', DICT),
('fielddescr', DICT.OF, 'v')]
diff --git a/pypy/jit/metainterp/blackhole.py b/pypy/jit/metainterp/blackhole.py
--- a/pypy/jit/metainterp/blackhole.py
+++ b/pypy/jit/metainterp/blackhole.py
@@ -1114,6 +1114,17 @@
array = cpu.bh_getfield_gc_r(vable, fdescr)
return cpu.bh_arraylen_gc(adescr, array)
+ @arguments("cpu", "r", "i", "d", "d", returns="i")
+ def bhimpl_getinteriorfield_gc_i(cpu, array, index, arraydescr,
fielddescr):
+ return cpu.bh_getinteriorfield_gc_i(array, index, arraydescr,
+ fielddescr)
+
+ @arguments("cpu", "r", "i", "d", "i", "d")
+ def bhimpl_setinteriorfield_gc_i(cpu, array, index, arraydescr, value,
+ fielddescr):
+ cpu.bh_setinteriorfield_gc_i(array, index, arraydescr, value,
+ fielddescr)
+
@arguments("cpu", "r", "d", returns="i")
def bhimpl_getfield_gc_i(cpu, struct, fielddescr):
return cpu.bh_getfield_gc_i(struct, fielddescr)
_______________________________________________
pypy-commit mailing list
[email protected]
http://mail.python.org/mailman/listinfo/pypy-commit
