Commits

Maciej Fijalkowski committed 5b4f2cb

oops

Comments (0)

Files changed (3)

pypy/jit/backend/llsupport/llmodel.py

         pos = self._decode_pos(deadframe, index)
         descr = self.gc_ll_descr.getframedescrs(self).arraydescr
         ofs = self.unpack_arraydescr(descr)
-        return self.read_int_at_mem(deadframe, pos + ofs, 1, WORD)
+        return self.read_int_at_mem(deadframe, pos + ofs, WORD, 1)
 
     def get_ref_value(self, deadframe, index):
         pos = self._decode_pos(deadframe, index)

pypy/jit/backend/test/runner_test.py

         operations[0].setfailargs([i0])
         self.cpu.compile_loop(inputargs, operations, looptoken)
 
-        i1list = [BoxInt() for i in range(1000)]
+        i1list = [BoxInt() for i in range(150)]
         bridge = []
         iprev = i0
         for i1 in i1list:
         deadframe = self.cpu.execute_token(looptoken, 1)
         fail = self.cpu.get_latest_descr(deadframe)
         assert fail.identifier == 3
-        for i in range(1000):
+        for i in range(len(i1list)):
             res = self.cpu.get_int_value(deadframe, i)
             assert res == 2 + i
 

pypy/jit/backend/x86/assembler.py

             if loc is None:
                 positions[i] = -1
             elif isinstance(loc, StackLoc):
-                positions[i] = (loc.value + JITFRAME_FIXED_SIZE) * WORD
+                positions[i] = loc.value
             else:
                 assert isinstance(loc, RegLoc)
                 v = (gpr_reg_mgr_cls.all_reg_indexes[loc.value] +