Changeset 16375

Timestamp:

Apr 24, 2015, 2:56:08 AM (6 years ago)

Author:

gb

Message:

not there yet

Location:

branches/acl2-egc/source/lisp-kernel

Files:

• gc-common.c (modified) (1 diff)
• image.c (modified) (3 diffs)
• lisp-debug.c (modified) (1 diff)
• lisp.h (modified) (1 diff)
• memory.c (modified) (1 diff)
• pmcl-kernel.c (modified) (5 diffs)
• x86-gc.c (modified) (1 diff)

branches/acl2-egc/source/lisp-kernel/gc-common.c

@@ -1834 +1834 @@
     GCfirstunmarked = calculate_relocation();
 
-    if (!GCephemeral_low) {
-      reclaim_static_dnodes();
-    }
-
-    forward_range((LispObj *) ptr_from_lispobj(GCarealow), (LispObj *) ptr_from_lispobj(GCfirstunmarked));
+    reclaim_static_dnodes();
+
+
+    forward_range((LispObj *) ptr_from_lispobj(GCareadynamiclow), (LispObj *) ptr_from_lispobj(GCfirstunmarked));
 
     other_tcr = tcr;

branches/acl2-egc/source/lisp-kernel/image.c

@@ -312 +312 @@
   case AREA_STATIC_CONS:
     addr = (char *) lisp_global(HEAP_START);
+    tenured_area = new_area(addr, addr, AREA_STATIC);
+
     a = new_area(addr-align_to_power_of_2(mem_size,log2_page_size), addr, AREA_STATIC_CONS);
     if (mem_size) {      
@@ -325 +327 @@
     sect->area = a;
     static_cons_area = a;
+    /* not yet 
+    lower_heap_start(a->low,tenured_area);
+    */
     break;
 
@@ -421 +426 @@
         break;
       case AREA_STATIC_CONS:
+        /* not yet
+ lower_heap_start(static_cons_area->low,tenured_area);
+        */
         break;
       case AREA_DYNAMIC:
-        lower_heap_start(static_cons_area->low,a);
         if (bias) {
           relocate_area_contents(a, bias);

branches/acl2-egc/source/lisp-kernel/lisp-debug.c

@@ -224 +224 @@
 {
 #ifndef WINDOWS
-  if (!isatty(fileno(dbgin))) {
+  if (1 || !isatty(fileno(dbgin))) {
     int fd = open("/dev/tty", O_RDWR);
     if (fd >=0) {

branches/acl2-egc/source/lisp-kernel/lisp.h

@@ -92 +92 @@
 void ensure_static_conses(ExceptionInformation *, TCR *,natural);
 
+void ensure_gc_structures_writable(void);
+
 extern FILE *dbgout,*dbgin;
 

branches/acl2-egc/source/lisp-kernel/memory.c

@@ -708 +708 @@
 untenure_from_area(area *from)
 {
-  if (lisp_global(OLDEST_EPHEMERAL) != 0) {
+  if ((lisp_global(OLDEST_EPHEMERAL) != 0) &&
+      (from->static_dnodes ==0)) {
     area *a = active_dynamic_area, *child;
     BytePtr curlow = from->low;

branches/acl2-egc/source/lisp-kernel/pmcl-kernel.c

@@ -703 +703 @@
     CommitMemory(new_markbits,n);
     dynamic_mark_ref_bits = (bitvector)new_markbits;
-    if (a->refbits) {
+    if (a) {
+      if (a->refbits) {
       a->refbits= dynamic_mark_ref_bits;
-    }
-    a->static_dnodes += new_dnodes;
-    a->ndnodes += new_dnodes;
-    a->low = new_low;
-    a->refidx -= nidx;
+      }
+      a->static_dnodes += new_dnodes;
+      a->ndnodes += new_dnodes;
+      a->low = new_low;
+      a->refidx -= nidx;
+    }
     low_markable_address = new_low;
     lisp_global(HEAP_START) = (LispObj)new_low;
     static_cons_area->ndnodes = area_dnode(static_cons_area->high,new_low);
+    ensure_gc_structures_writable();
   }
 }
@@ -720 +723 @@
 {
   natural 
-    ndnodes = area_dnode(lisp_global(HEAP_END),low_relocatable_address),
+    ndnodes = area_dnode(lisp_global(HEAP_END),tenured_area->low),
     markbits_size = (3*sizeof(LispObj))+((ndnodes+7)>>3),
     reloctab_size = (sizeof(LispObj)*(((ndnodes+((1<<bitmap_shift)-1))>>bitmap_shift)+1)),
@@ -1402 +1405 @@
     }
   }
+  redirect_debugger_io();
+#if 0
+  fprintf(dbgout,"ccl pid = %d", getpid());
+  sleep(20);
+#endif
+
+
 }
 
@@ -1780 +1790 @@
     g1_area = new_area(lowptr, lowptr, AREA_STATIC);
     g2_area = new_area(lowptr, lowptr, AREA_STATIC);
-    tenured_area = new_area(lowptr, lowptr, AREA_STATIC);
-    add_area_holding_area_lock(tenured_area);
     add_area_holding_area_lock(g2_area);
     add_area_holding_area_lock(g1_area);
-
+    add_area_holding_area_lock(tenured_area);
     g1_area->code = AREA_DYNAMIC;
     g2_area->code = AREA_DYNAMIC;
@@ -1811 +1819 @@
     g1_area->threshold = default_g1_threshold;
     a->threshold = default_g0_threshold;
+    if (static_cons_area && static_cons_area->ndnodes) {
+      lower_heap_start(static_cons_area->low, tenured_area);
+    }
   }
 }

branches/acl2-egc/source/lisp-kernel/x86-gc.c

@@ -311 +311 @@
 
   if (current != end) {
-    Bug(NULL, "Overran end of memory range: start = 0x%08x, end = 0x%08x, prev = 0x%08x, current = 0x%08x",
+    Bug(NULL, "Overran end of memory range: start = 0x" LISP ", end = 0x" LISP ", prev = 0x" LISP ", current = 0x" LISP "",
         start, end, prev, current);
   }