Author: Armin Rigo <[email protected]>
Branch: op_malloc_gc
Changeset: r50681:cddd54cacea7
Date: 2011-12-18 20:31 +0100
http://bitbucket.org/pypy/pypy/changeset/cddd54cacea7/
Log: fixes
diff --git a/pypy/jit/backend/llsupport/gc.py b/pypy/jit/backend/llsupport/gc.py
--- a/pypy/jit/backend/llsupport/gc.py
+++ b/pypy/jit/backend/llsupport/gc.py
@@ -67,6 +67,10 @@
return None
def freeing_block(self, start, stop):
pass
+ def get_nursery_free_addr(self):
+ raise NotImplementedError
+ def get_nursery_top_addr(self):
+ raise NotImplementedError
def gc_malloc(self, sizedescr):
"""Blackhole: do a 'bh_new'. Also used for 'bh_new_with_vtable',
diff --git a/pypy/jit/backend/x86/assembler.py
b/pypy/jit/backend/x86/assembler.py
--- a/pypy/jit/backend/x86/assembler.py
+++ b/pypy/jit/backend/x86/assembler.py
@@ -2243,9 +2243,9 @@
#
# Reset the vable token --- XXX really too much special logic here:-(
if jd.index_of_virtualizable >= 0:
- from pypy.jit.backend.llsupport.descr import BaseFieldDescr
+ from pypy.jit.backend.llsupport.descr import FieldDescr
fielddescr = jd.vable_token_descr
- assert isinstance(fielddescr, BaseFieldDescr)
+ assert isinstance(fielddescr, FieldDescr)
ofs = fielddescr.offset
self.mc.MOV(eax, arglocs[1])
self.mc.MOV_mi((eax.value, ofs), 0)
_______________________________________________
pypy-commit mailing list
[email protected]
http://mail.python.org/mailman/listinfo/pypy-commit
