[pypy-svn] pypy 32ptr-on-64bit: Skip some not-written-yet tests, and a hard-to-test fix...

[arigo]

Author: Armin Rigo <arigo at tunes.org>
Branch: 32ptr-on-64bit
Changeset: r43412:6e3d7a746010
Date: 2011-04-16 22:55 +0200
http://bitbucket.org/pypy/pypy/changeset/6e3d7a746010/

Log:	Skip some not-written-yet tests, and a hard-to-test fix...

diff --git a/pypy/jit/metainterp/test/test_rcompressed.py b/pypy/jit/metainterp/test/test_rcompressed.py
--- a/pypy/jit/metainterp/test/test_rcompressed.py
+++ b/pypy/jit/metainterp/test/test_rcompressed.py
@@ -46,7 +46,10 @@
         assert res == 42063
 
     def test_call_argument(self):
-        ...
+        # the issue here is that even if we wrote this test, for now, it's
+        # not going to really test the interesting parts, which are in
+        # GcLLDescr_framework.rewrite_assembler
+        py.test.skip("write me")
 
     def test_call_result(self):
-        ...
+        py.test.skip("write me")

diff --git a/pypy/jit/backend/llsupport/gc.py b/pypy/jit/backend/llsupport/gc.py
--- a/pypy/jit/backend/llsupport/gc.py
+++ b/pypy/jit/backend/llsupport/gc.py
@@ -877,14 +877,15 @@
                   isinstance(descr, BaseCallDescr)):
                 args = op.getarglist()
                 arg_classes = descr.get_arg_types()
-                assert len(args) == len(arg_classes)
+                fixed = 1
+                assert len(args) == fixed + len(arg_classes)
                 for i in range(len(arg_classes)):
                     if arg_classes[i] == 'H':
-                        v1 = args[i]
+                        v1 = args[fixed + i]
                         v2 = BoxInt()
                         newops.append(ResOperation(rop.HIDE_INTO_PTR32,
                                                    [v1], v2))
-                        args[i] = v2
+                        args[fixed + i] = v2
                         op = op.copy_and_change(op.getopnum(), args=args)
                 if descr.get_return_type() == 'H':
                     v1 = BoxInt()