[pypy-svn] r53506 - pypy/branch/jit-hotpath/pypy/jit/codegen/ia32

[fijal at codespeak.net]

Author: fijal
Date: Mon Apr  7 08:17:49 2008
New Revision: 53506

Modified:
   pypy/branch/jit-hotpath/pypy/jit/codegen/ia32/objmodel.py
   pypy/branch/jit-hotpath/pypy/jit/codegen/ia32/rgenop.py
Log:
Small fix, but that's not what I'm looking for :-/


Modified: pypy/branch/jit-hotpath/pypy/jit/codegen/ia32/objmodel.py
==============================================================================
--- pypy/branch/jit-hotpath/pypy/jit/codegen/ia32/objmodel.py	(original)
+++ pypy/branch/jit-hotpath/pypy/jit/codegen/ia32/objmodel.py	Mon Apr  7 08:17:49 2008
@@ -76,7 +76,7 @@
         return builder.returnboolvar(self.operand(builder))
 
     def movetonewaddr(self, builder, addr):
-        destop = builder.mem_access(addr)
+        destop = builder.mem_access8(addr)
         builder.mc.MOV(eax, self.operand(builder))
         builder.mc.MOV(destop, al)
 

Modified: pypy/branch/jit-hotpath/pypy/jit/codegen/ia32/rgenop.py
==============================================================================
--- pypy/branch/jit-hotpath/pypy/jit/codegen/ia32/rgenop.py	(original)
+++ pypy/branch/jit-hotpath/pypy/jit/codegen/ia32/rgenop.py	Mon Apr  7 08:17:49 2008
@@ -294,6 +294,7 @@
         return genmethod(gv_arg)
 
     def genop_getfield(self, (offset, fieldsize, kindtoken), gv_ptr):
+        assert fieldsize != 2
         self.mc.MOV(edx, gv_ptr.operand(self))
         return self.newvarfromaddr(kindtoken, (edx, None, 0, offset))
         
@@ -319,6 +320,7 @@
         return vars_gv
 
     def genop_setfield(self, (offset, fieldsize, kt), gv_ptr, gv_value):
+        assert fieldsize != 2
         self.mc.MOV(edx, gv_ptr.operand(self))
         gv_value.movetonewaddr(self, (edx, None, 0, offset))
 
@@ -377,6 +379,7 @@
         itemsize = arraytoken[2]
         self.mc.MOV(edx, gv_ptr.operand(self))
         destaddr = self._compute_itemaddr(edx, arraytoken, gv_index)
+        assert itemsize != 2
         gv_value.movetonewaddr(self, destaddr)
         #if itemsize <= WORD:
         #    self.mc.MOV(eax, gv_value.operand(self))
@@ -1036,7 +1039,7 @@
         builder.mc.SUB(esp, imm(WORD * (N - builder.stackdepth)))
         builder.stackdepth = N
         
-    for pos in arg_positions:
+    for pos in target.arg_positions:
         assert pos >= 0
     outputargs_gv, arg_positions = _remap_bigger_values(outputargs_gv,
                                                         target.arg_positions)