Author: Richard Plangger <[email protected]>
Branch:
Changeset: r88237:5860f448a03f
Date: 2016-11-08 20:36 +0100
http://bitbucket.org/pypy/pypy/changeset/5860f448a03f/
Log: two ppc fixes (test_form, test_ppc)
diff --git a/rpython/jit/backend/ppc/test/test_form.py
b/rpython/jit/backend/ppc/test/test_form.py
--- a/rpython/jit/backend/ppc/test/test_form.py
+++ b/rpython/jit/backend/ppc/test/test_form.py
@@ -28,18 +28,18 @@
w = a.insts[-1].assemble()
return struct.pack('>i', w)
-class TestForm(Form):
+class TForm(Form):
fieldmap = test_fieldmap
class TestForms(object):
def test_bitclash(self):
- raises(FormException, TestForm, 'h', 'hh')
- raises(FormException, TestForm,
+ raises(FormException, TForm, 'h', 'hh')
+ raises(FormException, TForm,
Field('t1', 0, 0), Field('t2', 0, 0))
def test_basic(self):
class T(Assembler):
- i = TestForm('h', 'l')()
+ i = TForm('h', 'l')()
j = i(h=1)
k = i(l=3)
raises(FormException, k, l=0)
@@ -56,7 +56,7 @@
def test_defdesc(self):
class T(Assembler):
- i = TestForm('hh', 'hl', 'lh', 'll')()
+ i = TForm('hh', 'hl', 'lh', 'll')()
i.default(hl=0).default(hh=1)
insts = []
a = T()
diff --git a/rpython/jit/backend/ppc/test/test_ppc.py
b/rpython/jit/backend/ppc/test/test_ppc.py
--- a/rpython/jit/backend/ppc/test/test_ppc.py
+++ b/rpython/jit/backend/ppc/test/test_ppc.py
@@ -199,9 +199,9 @@
a.load_imm(r10, call_addr)
elif IS_BIG_ENDIAN:
# load the 3-words descriptor
- a.load_from_addr(r10, call_addr)
- a.load_from_addr(r2, call_addr+WORD)
- a.load_from_addr(r11, call_addr+2*WORD)
+ a.load_from_addr(r10, SCRATCH2, call_addr)
+ a.load_from_addr(r2, SCRATCH2, call_addr+WORD)
+ a.load_from_addr(r11, SCRATCH2, call_addr+2*WORD)
else:
# no descriptor on little-endian, but the ABI says r12 must
# contain the function pointer
@@ -304,7 +304,7 @@
addr = rffi.cast(lltype.Signed, p)
p[0] = rffi.cast(rffi.LONG, 200)
- a.load_from_addr(r3, addr)
+ a.load_from_addr(r3, SCRATCH2, addr)
a.blr()
f = a.get_assembler_function()
assert f() == 200
_______________________________________________
pypy-commit mailing list
[email protected]
https://mail.python.org/mailman/listinfo/pypy-commit
