[pypy-commit] pypy jitframe-on-heap: a set of oops and typos

[fijal]

Author: Maciej Fijalkowski <fijall at gmail.com>
Branch: jitframe-on-heap
Changeset: r61066:5f0381c30ee5
Date: 2013-02-11 11:14 +0200
http://bitbucket.org/pypy/pypy/changeset/5f0381c30ee5/

Log:	a set of oops and typos

diff --git a/rpython/jit/backend/llsupport/llmodel.py b/rpython/jit/backend/llsupport/llmodel.py
--- a/rpython/jit/backend/llsupport/llmodel.py
+++ b/rpython/jit/backend/llsupport/llmodel.py
@@ -52,8 +52,12 @@
         # the same as normal JITFRAME, however with an array of pointers
         self.refarraydescr = ArrayDescr(ad.basesize, ad.itemsize, ad.lendescr,
                                         FLAG_POINTER)
-        self.floatarraydescr = ArrayDescr(ad.basesize, ad.itemsize, ad.lendescr,
-                                          FLAG_FLOAT)
+        if WORD == 4:
+            self.floatarraydescr = ArrayDescr(ad.basesize, ad.itemsize * 2,
+                                              ad.lendescr, FLAG_FLOAT)
+        else:
+            self.floatarraydescr = ArrayDescr(ad.basesize, ad.itemsize,
+                                              ad.lendescr, FLAG_FLOAT)
         self.setup()
 
     def getarraydescr_for_frame(self, type):
diff --git a/rpython/jit/backend/llsupport/rewrite.py b/rpython/jit/backend/llsupport/rewrite.py
--- a/rpython/jit/backend/llsupport/rewrite.py
+++ b/rpython/jit/backend/llsupport/rewrite.py
@@ -175,15 +175,15 @@
                            None, descr=descrs.jf_frame_info)
         self.newops.append(op2)
         arglist = op.getarglist()
-        index = self.cpu.getarryoffset_for_frame()	
+        index = self.cpu.getarryoffset_for_frame()
         for i, arg in enumerate(arglist):
             descr = self.cpu.getarraydescr_for_frame(arg.type)
-            if WORD == 4 and type == history.FLOAT:
+            if WORD == 4 and arg.type == history.FLOAT:
                 self.newops.append(ResOperation(rop.SETARRAYITEM_GC,
                                                 [frame, ConstInt(index // 2),
                                                  arg],
                                                 None, descr))
-                index += 2
+                index += 2 
             else:
                 self.newops.append(ResOperation(rop.SETARRAYITEM_GC,
                                                 [frame, ConstInt(index),