mirror/guile
mirror/guile
1
Fork 0
mirror of https://git.savannah.gnu.org/git/guile.git synced 2025-06-17 09:10:22 +02:00
Code Activity

return-values opcode resets the frame

Browse source 
* libguile/vm-engine.c (return-values): Change to also reset the frame,
  if nlocals is nonzero.

* doc/ref/vm.texi (Procedure Call and Return Instructions): Updated
  docs.

* module/language/cps/compile-bytecode.scm (compile-function): Adapt to
  call emit-return-values with the right number of arguments.
This commit is contained in:
Andy Wingo 2015-10-28 10:47:18 +00:00
parent 34f3fb78e0
commit 7aee3c74f5
3 changed files with 15 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

12
libguile/vm-engine.c
View file

@ -747,20 +747,26 @@ VM_NAME (scm_i_thread *thread, struct scm_vm *vp,
RETURN_ONE_VALUE (SP_REF (src));
}
/* return-values _:24
/* return-values nlocals:24
*
* Return a number of values from a call frame. This opcode
* corresponds to an application of `values' in tail position. As
* with tail calls, we expect that the values have already been
* shuffled down to a contiguous array starting at slot 1.
* We also expect the frame has already been reset.
* If NLOCALS is not zero, we also reset the frame to hold NLOCALS
* values.
*/
VM_DEFINE_OP (9, return_values, "return-values", OP1 (X32))
VM_DEFINE_OP (9, return_values, "return-values", OP1 (X8_C24))
{
union scm_vm_stack_element *old_fp;
scm_t_uint32 nlocals;
VM_HANDLE_INTERRUPTS;
UNPACK_24 (op, nlocals);
if (nlocals)
RESET_FRAME (nlocals);
old_fp = vp->fp;
ip = SCM_FRAME_RETURN_ADDRESS (vp->fp);
vp->fp = SCM_FRAME_DYNAMIC_LINK (vp->fp);