Changeset 13259

Timestamp:

Dec 7, 2009, 4:37:31 PM (15 years ago)

Author:

Gary Byers

Message:

Use ensure_static_conses() to handle static_cons allocation.
Always purify functions, for now.
Don't zero the PC in exception frames before purify(); expect
purify() to handle locatives.

File:

• branches/purify/source/lisp-kernel/x86-exceptions.c (modified) (2 diffs)

branches/purify/source/lisp-kernel/x86-exceptions.c

@@ -222 +222 @@
 
   case GC_TRAP_FUNCTION_ENSURE_STATIC_CONSES:
-    allocate_static_conses(32768);
+    ensure_static_conses(xp, tcr, 32768);
     break;
 
@@ -266 +266 @@
       }
       if (selector & GC_TRAP_FUNCTION_PURIFY) {
-        /* There should be exactly one xp in the world (this one) if we're saving
-           an image, and we'll never return to it.  If we copy functions,
-           we'll have difficulty updating the PC in that xp and a subsequent
-           GC will be confused by that, so zero it here */       
-        if (selector & GC_TRAP_FUNCTION_SAVE_APPLICATION) {
-          xpPC(xp)=(LispObj)0;
-        }
-        purify_from_xp(xp, selector & GC_TRAP_FUNCTION_SAVE_APPLICATION);
+        purify_from_xp(xp, 1);
         gc_from_xp(xp, 0L);
       }