[pypy-svn] r67813 - pypy/trunk/pypy/jit/metainterp

[cfbolz at codespeak.net]

Author: cfbolz
Date: Mon Sep 21 10:35:57 2009
New Revision: 67813

Added:
   pypy/trunk/pypy/jit/metainterp/resume.py.merge.tmp
      - copied, changed from r67810, pypy/trunk/pypy/jit/metainterp/resume.py
Log:
merging of svn+ssh://codespeak.net/svn/pypy/branch/execute-star-args-jit/pypy/jit/metainterp/resume.py
revisions 67773 to 67810:

    ------------------------------------------------------------------------
    r67777 | cfbolz | 2009-09-18 17:21:44 +0200 (Fri, 18 Sep 2009) | 3 lines
    
    (pedronis, cfbolz, arigo)
    Progress in making *arg versions of the functions.  Not finished yet.
    
    ------------------------------------------------------------------------
    r67774 | cfbolz | 2009-09-18 15:37:46 +0200 (Fri, 18 Sep 2009) | 2 lines
    
    (pedronis, cfbolz): make a branch that tries to make the jit use less memory
    
    ------------------------------------------------------------------------


Copied: pypy/trunk/pypy/jit/metainterp/resume.py.merge.tmp (from r67810, pypy/trunk/pypy/jit/metainterp/resume.py)
==============================================================================
--- pypy/trunk/pypy/jit/metainterp/resume.py	(original)
+++ pypy/trunk/pypy/jit/metainterp/resume.py.merge.tmp	Mon Sep 21 10:35:57 2009
@@ -189,8 +189,8 @@
         for i in range(len(self.fielddescrs)):
             fieldbox = fn_decode_box(self.fieldnums[i])
             metainterp.execute_and_record(rop.SETFIELD_GC,
-                                          [box, fieldbox],
-                                          descr=self.fielddescrs[i])
+                                          self.fielddescrs[i],
+                                          box, fieldbox)
 
 class VirtualInfo(AbstractVirtualStructInfo):
     def __init__(self, known_class, fielddescrs):
@@ -199,7 +199,7 @@
 
     def allocate(self, metainterp):
         return metainterp.execute_and_record(rop.NEW_WITH_VTABLE,
-                                             [self.known_class])
+                                             None, self.known_class)
 
     def repr_rpython(self):
         return 'VirtualInfo("%s", %s, %s)' % (
@@ -213,8 +213,7 @@
         self.typedescr = typedescr
 
     def allocate(self, metainterp):
-        return metainterp.execute_and_record(rop.NEW, [],
-                                             descr=self.typedescr)
+        return metainterp.execute_and_record(rop.NEW, self.typedescr)
 
     def repr_rpython(self):
         return 'VStructInfo("%s", %s, %s)' % (
@@ -230,15 +229,15 @@
     def allocate(self, metainterp):
         length = len(self.fieldnums)
         return metainterp.execute_and_record(rop.NEW_ARRAY,
-                                             [ConstInt(length)],
-                                             descr=self.arraydescr)
+                                             self.arraydescr,
+                                             ConstInt(length))
 
     def setfields(self, metainterp, box, fn_decode_box):
         for i in range(len(self.fieldnums)):
             itembox = fn_decode_box(self.fieldnums[i])
             metainterp.execute_and_record(rop.SETARRAYITEM_GC,
-                                          [box, ConstInt(i), itembox],
-                                          descr=self.arraydescr)
+                                          self.arraydescr,
+                                          box, ConstInt(i), itembox)
 
     def repr_rpython(self):
         return 'VArrayInfo("%s", %s)' % (self.arraydescr,