Merge remote-tracking branch 'origin/stable-2.0'

[bpt/guile.git] / libguile / stackchk.c

diff --git a/libguile/stackchk.c b/libguile/stackchk.c
index b14a712..208ba97 100644 (file)
--- a/libguile/stackchk.c
+++ b/libguile/stackchk.c
@@ -1,4 +1,4 @@
-/*     Copyright (C) 1995,1996,1997, 2000, 2001, 2006, 2008 Free Software Foundation, Inc.
+/*     Copyright (C) 1995,1996,1997, 2000, 2001, 2006, 2008, 2010, 2011 Free Software Foundation, Inc.
  * 
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public License
@@ -26,6 +26,7 @@
 #include "libguile/ports.h"
 #include "libguile/root.h"
 #include "libguile/threads.h"
+#include "libguile/dynwind.h"
 
 #include "libguile/stackchk.h"
 \f
@@ -33,23 +34,35 @@
 /* {Stack Checking}
  */
 
-#ifdef STACK_CHECKING
 int scm_stack_checking_enabled_p;
 
 SCM_SYMBOL (scm_stack_overflow_key, "stack-overflow");
 
+static void
+reset_scm_stack_checking_enabled_p (void *arg)
+{
+  scm_stack_checking_enabled_p = (int)(scm_t_bits)arg;
+}
+
 void
 scm_report_stack_overflow ()
 {
+  scm_dynwind_begin (0); /* non-rewindable frame */
+  scm_dynwind_unwind_handler (reset_scm_stack_checking_enabled_p,
+                              (void*)(scm_t_bits)scm_stack_checking_enabled_p,
+                              SCM_F_WIND_EXPLICITLY);
+  
   scm_stack_checking_enabled_p = 0;
+
   scm_error (scm_stack_overflow_key,
             NULL,
             "Stack overflow",
             SCM_BOOL_F,
             SCM_BOOL_F);
-}
 
-#endif
+  /* not reached */
+  scm_dynwind_end ();
+}
 
 long
 scm_stack_size (SCM_STACKITEM *start)
@@ -73,11 +86,11 @@ scm_stack_report ()
   scm_uintprint ((scm_stack_size (thread->continuation_base) 
                  * sizeof (SCM_STACKITEM)),
                 16, port);
-  scm_puts (" of stack: 0x", port);
+  scm_puts_unlocked (" of stack: 0x", port);
   scm_uintprint ((scm_t_bits) thread->continuation_base, 16, port);
-  scm_puts (" - 0x", port);
+  scm_puts_unlocked (" - 0x", port);
   scm_uintprint ((scm_t_bits) &stack, 16, port);
-  scm_puts ("\n", port);
+  scm_puts_unlocked ("\n", port);
 }