[pypy-commit] stmgc c7: fixes until minimal.duh works

arigo noreply at buildbot.pypy.org
Sat Jan 18 17:13:40 CET 2014


Author: Armin Rigo <arigo at tunes.org>
Branch: c7
Changeset: r643:d3f5c236e429
Date: 2014-01-18 17:13 +0100
http://bitbucket.org/pypy/stmgc/changeset/d3f5c236e429/

Log:	fixes until minimal.duh works

diff --git a/c7/core.c b/c7/core.c
--- a/c7/core.c
+++ b/c7/core.c
@@ -543,6 +543,7 @@
         item->stm_flags |= GCFLAG_WRITE_BARRIER;
         
         stmcb_trace(real_address(item), trace_if_young);
+        old_objs = _STM_TL2->old_objects_to_trace;
     }
 
     
diff --git a/duhton/duhton.c b/duhton/duhton.c
--- a/duhton/duhton.c
+++ b/duhton/duhton.c
@@ -44,7 +44,9 @@
         }
         stm_start_transaction(NULL);
         DuObject *code = Du_Compile(filename, interactive);
+        _du_save1(code);
         stm_stop_transaction();
+        _du_restore1(code);
         if (code == NULL) {
             printf("\n");
             break;
diff --git a/duhton/object.c b/duhton/object.c
--- a/duhton/object.c
+++ b/duhton/object.c
@@ -39,7 +39,7 @@
 DuObject *DuObject_New(DuType *tp)
 {
     assert(tp->dt_size >= sizeof(DuObject));
-    DuObject *ob = (DuObject *)stm_allocate(tp->dt_size);
+    DuObject *ob = (DuObject *)stm_allocate(ROUND_UP(tp->dt_size));
     assert(ob);
     ob->type_id = tp->dt_typeindex;
     return ob;


More information about the pypy-commit mailing list