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

RTL engine can apply smobs and applicable structs w/o stack VM

Browse source 
* libguile/vm-engine.c (rtl_vm_engine): Allow the RTL VM to handle the
  dispatch for SMOBs and applicable structs.
This commit is contained in:
Andy Wingo 2013-10-17 23:24:16 +02:00
parent 8d23c43641
commit 9d87158fdb
1 changed files with 13 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

25
libguile/vm-engine.c
View file

@ -898,7 +898,6 @@ RTL_VM_NAME (SCM vm, SCM program, SCM *argv, size_t nargs_)
apply: apply:
while (!SCM_RTL_PROGRAM_P (SCM_FRAME_PROGRAM (fp))) while (!SCM_RTL_PROGRAM_P (SCM_FRAME_PROGRAM (fp)))
{ {
#if 0
SCM proc = SCM_FRAME_PROGRAM (fp); SCM proc = SCM_FRAME_PROGRAM (fp);
if (SCM_STRUCTP (proc) && SCM_STRUCT_APPLICABLE_P (proc)) if (SCM_STRUCTP (proc) && SCM_STRUCT_APPLICABLE_P (proc))
@ -910,28 +909,30 @@ RTL_VM_NAME (SCM vm, SCM program, SCM *argv, size_t nargs_)
{ {
scm_t_uint32 n = FRAME_LOCALS_COUNT(); scm_t_uint32 n = FRAME_LOCALS_COUNT();
/* Shuffle args up, place smob in local 0. */ /* Shuffle args up. */
CHECK_OVERFLOW (vp->sp + 1); RESET_FRAME (n + 1);
vp->sp++;
while (n--) while (n--)
LOCAL_SET (n + 1, LOCAL_REF (n)); LOCAL_SET (n + 1, LOCAL_REF (n));
fp[-1] = SCM_SMOB_DESCRIPTOR (proc).apply_trampoline; LOCAL_SET (0, SCM_SMOB_DESCRIPTOR (proc).apply_trampoline);
continue; continue;
} }
#if 0
SYNC_IP(); SYNC_IP();
vm_error_wrong_type_apply (proc); vm_error_wrong_type_apply (proc);
#else #else
SCM ret; {
SYNC_ALL (); SCM ret;
SYNC_ALL ();
ret = VM_NAME (vm, fp[-1], fp, FRAME_LOCALS_COUNT () - 1); ret = VM_NAME (vm, fp[-1], fp, FRAME_LOCALS_COUNT () - 1);
if (SCM_UNLIKELY (SCM_VALUESP (ret))) if (SCM_UNLIKELY (SCM_VALUESP (ret)))
RETURN_VALUE_LIST (scm_struct_ref (ret, SCM_INUM0)); RETURN_VALUE_LIST (scm_struct_ref (ret, SCM_INUM0));
else else
RETURN_ONE_VALUE (ret); RETURN_ONE_VALUE (ret);
}
#endif #endif
} }