mirror/guile
mirror/guile
1
Fork 0
mirror of https://git.savannah.gnu.org/git/guile.git synced 2025-04-30 20:00:19 +02:00
Code Activity

turn abort() calls in vm.c into exceptions

Browse source 
* libguile/vm.c (vm_return_to_continuation, vm_abort):
  (vm_reinstate_partial_continuation, really_make_boot_program): Turn
  some abort()s into scm_misc_errors.
This commit is contained in:
Andy Wingo 2010-02-24 18:51:25 +01:00
parent 9a1c6f1f0c
commit 29366989cf
1 changed files with 12 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

22
libguile/vm.c
View file

@ -138,10 +138,9 @@ vm_return_to_continuation (SCM vm, SCM cont, size_t n, SCM *argv)
SCM_EOL);
if (vp->stack_size < cp->stack_size + n + 1)
{
/* puts ("FIXME: Need to expand"); */
abort ();
}
scm_misc_error ("vm-engine", "not enough space to reinstate continuation",
scm_list_2 (vm, cont));
#ifdef VM_ENABLE_STACK_NULLING
{
scm_t_ptrdiff nzero = (vp->sp - cp->sp);
@ -215,7 +214,9 @@ vm_abort (SCM vm, size_t n, scm_t_int64 vm_cookie)
/* NULLSTACK (1) */
tail_len = scm_ilength (tail);
if (tail_len < 0)
abort ();
scm_misc_error ("vm-engine", "tail values to abort should be a list",
scm_list_1 (tail));
tag = SCM_VM_DATA (vm)->sp[-n];
argv = alloca ((n + tail_len) * sizeof (SCM));
for (i = 0; i < n; i++)
@ -247,10 +248,9 @@ vm_reinstate_partial_continuation (SCM vm, SCM cont, SCM intwinds,
#define RELOC(scm_p) (scm_p + cp->reloc + (base - cp->stack_base))
if ((base - vp->stack_base) + cp->stack_size + n + 1 > vp->stack_size)
{
/* puts ("FIXME: Need to expand"); */
abort ();
}
scm_misc_error ("vm-engine",
"not enough space to instate partial continuation",
scm_list_2 (vm, cont));
memcpy (base, cp->stack_base, cp->stack_size * sizeof (SCM));
@ -316,7 +316,9 @@ really_make_boot_program (long nargs)
SCM ret;
if (SCM_UNLIKELY (nargs > 255 || nargs < 0))
abort ();
scm_misc_error ("vm-engine", "too many args when making boot procedure",
scm_list_1 (scm_from_long (nargs)));
text[1] = (scm_t_uint8)nargs;
bp = scm_malloc (sizeof (struct scm_objcode) + sizeof (text));