mirror of
https://git.savannah.gnu.org/git/guile.git
synced 2025-06-17 01:00:20 +02:00
Merge branch 'master' into boehm-demers-weiser-gc
Conflicts: libguile/Makefile.am libguile/bytevectors.c libguile/gc-card.c libguile/gc-mark.c libguile/programs.c libguile/srcprop.c libguile/srfi-14.c libguile/symbols.c libguile/threads.c libguile/unif.c libguile/vm.c
This commit is contained in:
commit
7af531508c
205 changed files with 18774 additions and 8289 deletions
|
@ -33,7 +33,7 @@ scm_t_bits scm_tc16_vm_frame;
|
|||
|
||||
SCM
|
||||
scm_c_make_vm_frame (SCM stack_holder, SCM *fp, SCM *sp,
|
||||
scm_byte_t *ip, scm_t_ptrdiff offset)
|
||||
scm_t_uint8 *ip, scm_t_ptrdiff offset)
|
||||
{
|
||||
struct scm_vm_frame *p = scm_gc_malloc (sizeof (struct scm_vm_frame),
|
||||
"vmframe");
|
||||
|
@ -98,12 +98,12 @@ SCM_DEFINE (scm_vm_frame_arguments, "vm-frame-arguments", 1, 0, 0,
|
|||
if (!bp->nargs)
|
||||
return SCM_EOL;
|
||||
else if (bp->nrest)
|
||||
ret = fp[bp->nargs - 1];
|
||||
ret = SCM_FRAME_VARIABLE (fp, bp->nargs - 1);
|
||||
else
|
||||
ret = scm_cons (fp[bp->nargs - 1], SCM_EOL);
|
||||
ret = scm_cons (SCM_FRAME_VARIABLE (fp, bp->nargs - 1), SCM_EOL);
|
||||
|
||||
for (i = bp->nargs - 2; i >= 0; i--)
|
||||
ret = scm_cons (fp[i], ret);
|
||||
ret = scm_cons (SCM_FRAME_VARIABLE (fp, i), ret);
|
||||
|
||||
return ret;
|
||||
}
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue