[pypy-commit] pypy jitframe-on-heap: kill this hack

[fijal]

Author: Maciej Fijalkowski <fijall at gmail.com>
Branch: jitframe-on-heap
Changeset: r61877:912c74f224e9
Date: 2013-02-28 19:05 +0200
http://bitbucket.org/pypy/pypy/changeset/912c74f224e9/

Log:	kill this hack

diff --git a/rpython/jit/backend/llsupport/gc.py b/rpython/jit/backend/llsupport/gc.py
--- a/rpython/jit/backend/llsupport/gc.py
+++ b/rpython/jit/backend/llsupport/gc.py
@@ -132,10 +132,10 @@
         """ This functions retuns an arraydescr of type for the JITFRAME"""
         raise NotImplementedError
 
-    def malloc_jitframe(self, frame_info, staticsize):
+    def malloc_jitframe(self, frame_info):
         """ Allocate a new frame, overwritten by tests
         """
-        frame = jitframe.JITFRAME.allocate(frame_info, staticsize)
+        frame = jitframe.JITFRAME.allocate(frame_info)
         llop.gc_assume_young_pointers(lltype.Void, frame)
         return frame
 
diff --git a/rpython/jit/backend/llsupport/jitframe.py b/rpython/jit/backend/llsupport/jitframe.py
--- a/rpython/jit/backend/llsupport/jitframe.py
+++ b/rpython/jit/backend/llsupport/jitframe.py
@@ -38,13 +38,9 @@
 # the JITFRAME that's stored on the heap. See backend/<backend>/arch.py for
 # detailed explanation how it is on your architecture
 
-def jitframe_allocate(frame_info, staticsize):
+def jitframe_allocate(frame_info):
     frame = lltype.malloc(JITFRAME, frame_info.jfi_frame_depth, zero=True)
     frame.jf_frame_info = frame_info
-    i = 0
-    while i < staticsize:
-        frame.jf_frame[i] = 13
-        i += 1
     return frame
 
 def jitframe_resolve(frame):
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
@@ -87,8 +87,7 @@
                     # update the frame_info size, which is for whatever reason
                     # not up to date
                     frame.jf_frame_info.set_frame_depth(base_ofs, size)
-                new_frame = jitframe.JITFRAME.allocate(frame.jf_frame_info,
-                                                       self.JITFRAME_FIXED_SIZE)
+                new_frame = jitframe.JITFRAME.allocate(frame.jf_frame_info)
                 frame.jf_forward = new_frame
                 i = 0
                 while i < len(frame.jf_frame):
@@ -213,8 +212,7 @@
             func = rffi.cast(FUNCPTR, addr)
             #llop.debug_print(lltype.Void, ">>>> Entering", addr)
             frame_info = clt.frame_info
-            frame = self.gc_ll_descr.malloc_jitframe(frame_info,
-                                                     self.JITFRAME_FIXED_SIZE)
+            frame = self.gc_ll_descr.malloc_jitframe(frame_info)
             ll_frame = lltype.cast_opaque_ptr(llmemory.GCREF, frame)
             locs = executable_token.compiled_loop_token._ll_initial_locs
             prev_interpreter = None   # help flow space
diff --git a/rpython/jit/backend/llsupport/test/test_gc_integration.py b/rpython/jit/backend/llsupport/test/test_gc_integration.py
--- a/rpython/jit/backend/llsupport/test/test_gc_integration.py
+++ b/rpython/jit/backend/llsupport/test/test_gc_integration.py
@@ -450,7 +450,7 @@
         self.frames[-1].hdr |= 1
         self.init_nursery()
 
-    def malloc_jitframe(self, frame_info, ignored):
+    def malloc_jitframe(self, frame_info):
         """ Allocate a new frame, overwritten by tests
         """
         frame = JITFRAME.allocate(frame_info)