Changeset 11551

Timestamp:

Dec 26, 2008, 2:49:51 AM (12 years ago)

Author:

gb

Message:

Not the bug I was looking for either, but un-botch some of the GC-state-saving
changes from a few weeks ago: save_application() is always run with the
EGC off, so make the caller pass an extra arg indicating its state as of
the time we trapped to it. Set G2_THRESHOLD global before writing image,
don't set G1_THRESHOLD twice.

Images built a few weeks ago have EGC off and misconfigured.

Location:

trunk/source/lisp-kernel

Files:

• image.c (modified) (2 diffs)
• ppc-exceptions.c (modified) (1 diff)
• x86-exceptions.c (modified) (5 diffs)

trunk/source/lisp-kernel/image.c

@@ -394 +394 @@
 
 OSErr
-save_application(unsigned fd)
+save_application(unsigned fd, Boolean egc_was_enabled)
 {
   openmcl_image_file_header fh;
@@ -462 +462 @@
     lisp_global(G0_THRESHOLD) = g0_area->threshold;
     lisp_global(G1_THRESHOLD) = g1_area->threshold;
-    lisp_global(G1_THRESHOLD) = g2_area->threshold;
-    lisp_global(EGC_ENABLED) = (LispObj)(active_dynamic_area->older != NULL);
+    lisp_global(G2_THRESHOLD) = g2_area->threshold;
+    lisp_global(EGC_ENABLED) = (LispObj)egc_was_enabled;
   }
   /*

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

@@ -515 +515 @@
       if (selector & GC_TRAP_FUNCTION_SAVE_APPLICATION) {
         OSErr err;
-        extern OSErr save_application(unsigned);
+        extern OSErr save_application(unsigned, Boolean);
         TCR *tcr = TCR_FROM_TSD(xpGPR(xp, rcontext));
         area *vsarea = tcr->vs_area;
         
         nrs_TOPLFUNC.vcell = *((LispObj *)(vsarea->high)-1);
-        err = save_application(arg);
+        err = save_application(arg, egc_was_enabled);
         if (err == noErr) {
           _exit(0);

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

@@ -267 +267 @@
       if (selector & GC_TRAP_FUNCTION_SAVE_APPLICATION) {
         OSErr err;
-        extern OSErr save_application(unsigned);
+        extern OSErr save_application(unsigned, Boolean);
         area *vsarea = tcr->vs_area;
 
@@ -274 +274 @@
 #endif
         nrs_TOPLFUNC.vcell = *((LispObj *)(vsarea->high)-1);
-        err = save_application(arg);
+        err = save_application(arg, egc_was_enabled);
         if (err == noErr) {
           _exit(0);
@@ -1350 +1350 @@
 #endif
 
-#ifdef DARWIN
-void
-pseudo_signal_handler(int signum, siginfo_t *info, ExceptionInformation  *context, TCR *tcr, int old_valence)
-{
-  sigset_t mask;
-
-  sigfillset(&mask);
-
-  pthread_sigmask(SIG_SETMASK,&mask,&(context->uc_sigmask));
-  signal_handler(signum, info, context, tcr, old_valence);
-}
-#endif
 
 
@@ -2394 +2382 @@
          instruction, then fall into the next case. */
       new_vector = xpGPR(xp,Iallocptr);
-      deref(new_vector,0) = xpGPR(xp,Iimm0);
+      deref(new_vector,0) = 
+#ifdef X8664
+        xpGPR(xp,Iimm0)
+#else
+        xpMMXreg(xp,Imm0)
+#endif
+        ;
 
       xpPC(xp) += sizeof(set_allocptr_header_instruction);
@@ -3131 +3125 @@
 #endif
 
-#ifdef DARWIN_USE_PSEUDO_SIGRETURN
+
 #define DARWIN_EXCEPTION_HANDLER signal_handler
-#else
-#define DARWIN_EXCEPTION_HANDLER pseudo_signal_handler
-#endif