Changeset 8475

Timestamp:

Feb 12, 2008, 7:02:15 AM (17 years ago)

Author:

Gary Byers

Message:

get impurify() working on x86-64.

Location:

trunk/source/lisp-kernel

Files:

• memory.c (modified) (1 diff)
• x86-exceptions.c (modified) (2 diffs)
• x86-gc.c (modified) (12 diffs)

trunk/source/lisp-kernel/memory.c

@@ -616 +616 @@
 }
 
+void
+release_readonly_area()
+{
+  area *a = readonly_area;
+  munmap(a->low,align_to_power_of_2(a->active-a->low, log2_page_size));
+  a->active = a->low;
+  a->ndnodes = 0;
+  pure_space_active = pure_space_start;
+}

trunk/source/lisp-kernel/x86-exceptions.c

@@ -157 +157 @@
   area *a = active_dynamic_area;
   Boolean egc_was_enabled = (a->older != NULL);
+  
   natural gc_previously_deferred = gc_deferred;
 
@@ -219 +220 @@
       full_gc_deferred = 0;
     }
-    if (selector & GC_TRAP_FUNCTION_PURIFY) {
-      purify_from_xp(xp, 0L);
-      gc_from_xp(xp, 0L);
-    }
-    if (selector & GC_TRAP_FUNCTION_SAVE_APPLICATION) {
-      OSErr err;
-      extern OSErr save_application(unsigned);
-      area *vsarea = tcr->vs_area;
+    if (selector > GC_TRAP_FUNCTION_GC) {
+      if (selector & GC_TRAP_FUNCTION_IMPURIFY) {
+        impurify_from_xp(xp, 0L);
+        /*        nrs_GC_EVENT_STATUS_BITS.vcell |= gc_integrity_check_bit; */
+        gc_from_xp(xp, 0L);
+        release_readonly_area();
+      }
+      if (selector & GC_TRAP_FUNCTION_PURIFY) {
+        purify_from_xp(xp, 0L);
+        gc_from_xp(xp, 0L);
+      }
+      if (selector & GC_TRAP_FUNCTION_SAVE_APPLICATION) {
+        OSErr err;
+        extern OSErr save_application(unsigned);
+        area *vsarea = tcr->vs_area;
         
-      nrs_TOPLFUNC.vcell = *((LispObj *)(vsarea->high)-1);
-      err = save_application(arg);
-      if (err == noErr) {
-        _exit(0);
+        nrs_TOPLFUNC.vcell = *((LispObj *)(vsarea->high)-1);
+        err = save_application(arg);
+        if (err == noErr) {
+          _exit(0);
+        }
+        fatal_oserr(": save_application", err);
       }
-      fatal_oserr(": save_application", err);
-    }
-    switch (selector) {
-    case GC_TRAP_FUNCTION_SET_HONS_AREA_SIZE:
-      xpGPR(xp, Iimm0) = 0;
-      break;
-    case GC_TRAP_FUNCTION_FREEZE:
-      a->active = (BytePtr) align_to_power_of_2(a->active, log2_page_size);
-      tenured_area->static_dnodes = area_dnode(a->active, a->low);
-      xpGPR(xp, Iimm0) = tenured_area->static_dnodes << dnode_shift;
-      break;
-    default:
-      break;
+      switch (selector) {
+      case GC_TRAP_FUNCTION_SET_HONS_AREA_SIZE:
+        xpGPR(xp, Iimm0) = 0;
+        break;
+      case GC_TRAP_FUNCTION_FREEZE:
+        a->active = (BytePtr) align_to_power_of_2(a->active, log2_page_size);
+        tenured_area->static_dnodes = area_dnode(a->active, a->low);
+        xpGPR(xp, Iimm0) = tenured_area->static_dnodes << dnode_shift;
+        break;
+      default:
+        break;
+      }
     }
     if (egc_was_enabled) {

trunk/source/lisp-kernel/x86-gc.c

@@ -1782 +1782 @@
   }
 }
+
 void 
 purify_headerless_range(LispObj *start, LispObj *end, BytePtr low, BytePtr high, area *to)
@@ -2058 +2059 @@
   
 
-
-void
-impurify_xp(ExceptionInformation *xp, LispObj low, LispObj high, int delta)
+void
+impurify_gcable_ptrs(LispObj low, LispObj high, signed_natural delta)
+{
+  LispObj *prev = &(lisp_global(GCABLE_POINTERS)), next;
+
+  while ((*prev) != (LispObj)NULL) {
+    impurify_noderef(prev, low, high, delta);
+    next = *prev;
+    prev = &(((xmacptr *)ptr_from_lispobj(untag(next)))->link);
+  }
+}
+
+
+void
+impurify_xp(ExceptionInformation *xp, LispObj low, LispObj high, signed_natural delta)
 {
   natural *regs = (natural *) xpGPRvector(xp);
@@ -2085 +2098 @@
 
 void
-impurify_headerless_range(LispObj *start, LispObj *end, LispObj low, LispObj high, int delta)
+impurify_headerless_range(LispObj *start, LispObj *end, LispObj low, LispObj high, signed_natural delta)
 {
   while (start < end) {
@@ -2095 +2108 @@
 
 void
-impurify_range(LispObj *start, LispObj *end, LispObj low, LispObj high, int delta)
+impurify_range(LispObj *start, LispObj *end, LispObj low, LispObj high, signed_natural delta)
 {
   LispObj header;
@@ -2167 +2180 @@
 
 void
-impurify_tcr_tlb(TCR *tcr,  LispObj low, LispObj high, int delta)
+impurify_tcr_tlb(TCR *tcr,  LispObj low, LispObj high, signed_natural delta)
 {
   unsigned n = tcr->tlb_limit;
@@ -2176 +2189 @@
 
 void
-impurify_tcr_xframes(TCR *tcr, LispObj low, LispObj high, int delta)
+impurify_tcr_xframes(TCR *tcr, LispObj low, LispObj high, signed_natural delta)
 {
   xframe_list *xframes;
@@ -2192 +2205 @@
 
 void
-impurify_tstack_area(area *a, LispObj low, LispObj high, int delta)
+impurify_tstack_area(area *a, LispObj low, LispObj high, signed_natural delta)
 {
   LispObj
@@ -2212 +2225 @@
 }
 void
-impurify_vstack_area(area *a, LispObj low, LispObj high, int delta)
+impurify_vstack_area(area *a, LispObj low, LispObj high, signed_natural delta)
 {
   LispObj
@@ -2223 +2236 @@
 
 void
-impurify_areas(LispObj low, LispObj high, int delta)
+impurify_areas(LispObj low, LispObj high, signed_natural delta)
 {
   area *next_area;
@@ -2239 +2252 @@
       
     case AREA_CSTACK:
-#ifdef PPC
-      impurify_cstack_area(next_area, low, high, delta);
-#endif
       break;
       
@@ -2265 +2275 @@
       oldhigh = a->high, newhigh; 
     unsigned n = ro_limit - ro_base;
-    int delta = oldfree-ro_base;
+    signed_natural delta = oldfree-ro_base;
     TCR *other_tcr;
 
@@ -2290 +2300 @@
         other_tcr = other_tcr->next;
       } while (other_tcr != tcr);
+
+      impurify_gcable_ptrs(ptr_to_lispobj(ro_base), ptr_to_lispobj(ro_limit), delta);
       lisp_global(IN_GC) = 0;
     }