The FSF has a new address.

[bpt/guile.git] / libguile / continuations.h

diff --git a/libguile/continuations.h b/libguile/continuations.h
index 002a285..ce19917 100644 (file)
--- a/libguile/continuations.h
+++ b/libguile/continuations.h
@@ -17,7 +17,7 @@
  *
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
 \f
@@ -26,7 +26,7 @@
 
 #ifdef __ia64__
 #include <signal.h>
-#include <sys/ucontext.h>
+#include <ucontext.h>
 extern unsigned long * __libc_ia64_register_backing_store_base;
 #endif /* __ia64__ */
 \f
@@ -51,12 +51,22 @@ typedef struct
   void *backing_store;
   unsigned long backing_store_size;
 #endif /* __ia64__ */
-  SCM_STACKITEM *base;      /* base of the live stack, before it was saved.  */
   size_t num_stack_items;   /* size of the saved stack.  */
-  unsigned long seq;        /* dynamic root identifier.  */
+  SCM root;                 /* continuation root identifier.  */
 
-  /* the most recently created debug frame on the live stack, before
-     it was saved.  */
+  /* The offset from the live stack location to this copy.  This is
+     used to adjust pointers from within the copied stack to the stack
+     itself.
+
+     Thus, when you read a pointer from the copied stack that points
+     into the live stack, you need to add OFFSET so that it points
+     into the copy.
+  */
+  scm_t_ptrdiff offset;
+
+  /* The most recently created debug frame on the live stack, before
+     it was saved.  This needs to be adjusted with OFFSET, above.
+  */
   struct scm_t_debug_frame *dframe;
 
   SCM_STACKITEM stack[1];    /* copied stack of size num_stack_items.  */ 
@@ -69,16 +79,24 @@ typedef struct
 #define SCM_CONTINUATION_LENGTH(x) (SCM_CONTREGS (x)->num_stack_items)
 #define SCM_SET_CONTINUATION_LENGTH(x, n)\
    (SCM_CONTREGS (x)->num_stack_items = (n))
-#define SCM_JMPBUF(x)          ((SCM_CONTREGS (x))->jmpbuf)
-#define SCM_DYNENV(x)          ((SCM_CONTREGS (x))->dynenv)
-#define SCM_THROW_VALUE(x)     ((SCM_CONTREGS (x))->throw_value)
-#define SCM_BASE(x)            ((SCM_CONTREGS (x))->base) 
-#define SCM_SEQ(x)             ((SCM_CONTREGS (x))->seq)   
-#define SCM_DFRAME(x)          ((SCM_CONTREGS (x))->dframe)
+#define SCM_JMPBUF(x)           ((SCM_CONTREGS (x))->jmpbuf)
+#define SCM_DYNENV(x)           ((SCM_CONTREGS (x))->dynenv)
+#define SCM_THROW_VALUE(x)      ((SCM_CONTREGS (x))->throw_value)
+#define SCM_CONTINUATION_ROOT(x) ((SCM_CONTREGS (x))->root)   
+#define SCM_DFRAME(x)           ((SCM_CONTREGS (x))->dframe)
 
 \f
 
 SCM_API SCM scm_make_continuation (int *first);
+
+SCM_API void *scm_c_with_continuation_barrier (void *(*func)(void*), void *);
+SCM_API SCM scm_with_continuation_barrier (SCM proc);
+
+SCM_API SCM scm_i_with_continuation_barrier (scm_t_catch_body body,
+                                            void *body_data,
+                                            scm_t_catch_handler handler,
+                                            void *handler_data);
+
 SCM_API void scm_init_continuations (void);
 
 #endif  /* SCM_CONTINUATIONS_H */