-/* Copyright (C) 1995,1996,1998,2000,2001,2004 Free Software Foundation, Inc.
+/* Copyright (C) 1995,1996,1998,2000,2001,2004, 2006, 2008 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
\f
+#ifdef HAVE_CONFIG_H
+# include <config.h>
+#endif
#include "libguile/_scm.h"
#include "libguile/dynwind.h"
#include "libguile/values.h"
#include "libguile/eval.h"
+#include "libguile/vm.h"
#include "libguile/validate.h"
#include "libguile/continuations.h"
scm_gc_mark (continuation->root);
scm_gc_mark (continuation->throw_value);
+ scm_gc_mark (continuation->vm_conts);
scm_mark_locations (continuation->stack, continuation->num_stack_items);
#ifdef __ia64__
if (continuation->backing_store)
return 1;
}
-#ifdef __ia64__
-/* Extern declaration of getcontext()/setcontext() in order to redefine
- getcontext() since on ia64-linux the second return value indicates whether
- it returned from getcontext() itself or by running setcontext(). */
-struct rv
-{
- long retval;
- long first_return;
-};
-extern struct rv ia64_getcontext (ucontext_t *) __asm__ ("getcontext");
-#endif /* __ia64__ */
-
/* this may return more than once: the first time with the escape
procedure, then subsequently with the value to be passed to the
continuation. */
scm_t_contregs *continuation;
long stack_size;
SCM_STACKITEM * src;
-#ifdef __ia64__
- struct rv rv;
-#endif /* __ia64__ */
SCM_FLUSH_REGISTER_WINDOWS;
stack_size = scm_stack_size (thread->continuation_base);
#endif
continuation->offset = continuation->stack - src;
memcpy (continuation->stack, src, sizeof (SCM_STACKITEM) * stack_size);
+ continuation->vm_conts = scm_vm_capture_continuations ();
-#ifdef __ia64__
- rv = ia64_getcontext (&continuation->ctx);
- if (rv.first_return)
+ *first = !setjmp (continuation->jmpbuf);
+ if (*first)
{
- continuation->backing_store_size =
- continuation->ctx.uc_mcontext.sc_ar_bsp -
- (unsigned long) __libc_ia64_register_backing_store_base;
+#ifdef __ia64__
+ continuation->backing_store_size =
+ (char *) scm_ia64_ar_bsp(&continuation->jmpbuf.ctx)
+ -
+ (char *) thread->register_backing_store_base;
continuation->backing_store = NULL;
continuation->backing_store =
scm_gc_malloc (continuation->backing_store_size,
"continuation backing store");
memcpy (continuation->backing_store,
- (void *) __libc_ia64_register_backing_store_base,
+ (void *) thread->register_backing_store_base,
continuation->backing_store_size);
- *first = 1;
+#endif /* __ia64__ */
return cont;
}
else
{
SCM ret = continuation->throw_value;
- *first = 0;
- continuation->throw_value = SCM_BOOL_F;
- return ret;
- }
-#else /* !__ia64__ */
- if (setjmp (continuation->jmpbuf))
- {
- SCM ret = continuation->throw_value;
- *first = 0;
continuation->throw_value = SCM_BOOL_F;
return ret;
}
- else
- {
- *first = 1;
- return cont;
- }
-#endif /* !__ia64__ */
}
#undef FUNC_NAME
copy_stack_data *d = (copy_stack_data *)data;
memcpy (d->dst, d->continuation->stack,
sizeof (SCM_STACKITEM) * d->continuation->num_stack_items);
+ scm_vm_reinstate_continuations (d->continuation->vm_conts);
+#ifdef __ia64__
+ SCM_I_CURRENT_THREAD->pending_rbs_continuation = d->continuation;
+#endif
}
static void
scm_i_set_last_debug_frame (continuation->dframe);
continuation->throw_value = val;
-#ifdef __ia64__
- memcpy ((void *) __libc_ia64_register_backing_store_base,
- continuation->backing_store,
- continuation->backing_store_size);
- setcontext (&continuation->ctx);
-#else
longjmp (continuation->jmpbuf, 1);
-#endif
}
+#ifdef __ia64__
+void
+scm_ia64_longjmp (jmp_buf *JB, int VAL)
+{
+ scm_i_thread *t = SCM_I_CURRENT_THREAD;
+
+ if (t->pending_rbs_continuation)
+ {
+ memcpy (t->register_backing_store_base,
+ t->pending_rbs_continuation->backing_store,
+ t->pending_rbs_continuation->backing_store_size);
+ t->pending_rbs_continuation = NULL;
+ }
+ setcontext (&JB->ctx);
+}
+#endif
+
/* Call grow_stack until the stack space is large enough, then, as the current
* stack frame might get overwritten, let copy_stack_and_call perform the
* actual copying and continuation calling.
scm_i_with_continuation_barrier (scm_t_catch_body body,
void *body_data,
scm_t_catch_handler handler,
- void *handler_data)
+ void *handler_data,
+ scm_t_catch_handler pre_unwind_handler,
+ void *pre_unwind_handler_data)
{
SCM_STACKITEM stack_item;
scm_i_thread *thread = SCM_I_CURRENT_THREAD;
/* Call FUNC inside a catch all. This is now guaranteed to return
directly and exactly once.
*/
- result = scm_internal_catch (SCM_BOOL_T,
- body, body_data,
- handler, handler_data);
+ result = scm_c_catch (SCM_BOOL_T,
+ body, body_data,
+ handler, handler_data,
+ pre_unwind_handler, pre_unwind_handler_data);
/* Return to old continuation root.
*/
c_handler (void *d, SCM tag, SCM args)
{
struct c_data *data = (struct c_data *)d;
- scm_handle_by_message_noexit (NULL, tag, args);
data->result = NULL;
return SCM_UNSPECIFIED;
}
c_data.func = func;
c_data.data = data;
scm_i_with_continuation_barrier (c_body, &c_data,
- c_handler, &c_data);
+ c_handler, &c_data,
+ scm_handle_by_message_noexit, NULL);
return c_data.result;
}
static SCM
scm_handler (void *d, SCM tag, SCM args)
{
- scm_handle_by_message_noexit (NULL, tag, args);
return SCM_BOOL_F;
}
struct scm_data scm_data;
scm_data.proc = proc;
return scm_i_with_continuation_barrier (scm_body, &scm_data,
- scm_handler, &scm_data);
+ scm_handler, &scm_data,
+ scm_handle_by_message_noexit, NULL);
}
#undef FUNC_NAME