diff options
author | Andy Wingo <wingo@pobox.com> | 2009-10-31 00:08:42 +0100 |
---|---|---|
committer | Andy Wingo <wingo@pobox.com> | 2009-11-15 20:28:11 +0100 |
commit | 352c87d7e4c8845b935f8439432d28d80bf06879 (patch) | |
tree | a25a5ab29569286d38cc62f8f7dfc1e43903d74d /libguile/vm-i-system.c | |
parent | 9e759da10b8ec9334239d6ce40e19bf45c2d00e7 (diff) | |
download | guile-352c87d7e4c8845b935f8439432d28d80bf06879.tar.gz |
generic dispatch in the vm (sorta)
* libguile/vm-i-system.c (call, goto/args, mv-call): Add a case for
generics, so we can avoid the evaluator in that case. Still have to
cons up a list -- the real solution comes later.
Diffstat (limited to 'libguile/vm-i-system.c')
-rw-r--r-- | libguile/vm-i-system.c | 34 |
1 files changed, 34 insertions, 0 deletions
diff --git a/libguile/vm-i-system.c b/libguile/vm-i-system.c index f58ffce58..d60c20c3b 100644 --- a/libguile/vm-i-system.c +++ b/libguile/vm-i-system.c @@ -749,6 +749,17 @@ VM_DEFINE_INSTRUCTION (53, call, "call", 1, -1, 1) APPLY_HOOK (); NEXT; } + if (SCM_STRUCTP (x) && SCM_OBJ_CLASS_FLAGS (x) & SCM_CLASSF_PURE_GENERIC) + { + SCM args = SCM_EOL; + int n = nargs; + SCM* walk = sp; + SYNC_REGISTER (); + while (n--) + args = scm_cons (*walk--, args); + *walk = scm_mcache_compute_cmethod (SCM_ENTITY_PROCEDURE (x), args); + goto vm_call; + } /* * Other interpreted or compiled call */ @@ -822,6 +833,17 @@ VM_DEFINE_INSTRUCTION (54, goto_args, "goto/args", 1, -1, 1) APPLY_HOOK (); NEXT; } + if (SCM_STRUCTP (x) && SCM_OBJ_CLASS_FLAGS (x) & SCM_CLASSF_PURE_GENERIC) + { + SCM args = SCM_EOL; + int n = nargs; + SCM* walk = sp; + SYNC_REGISTER (); + while (n--) + args = scm_cons (*walk--, args); + *walk = scm_mcache_compute_cmethod (SCM_ENTITY_PROCEDURE (x), args); + goto vm_goto_args; + } /* * Other interpreted or compiled call @@ -883,6 +905,7 @@ VM_DEFINE_INSTRUCTION (57, mv_call, "mv-call", 4, -1, 1) FETCH_OFFSET (offset); mvra = ip + offset; + vm_mv_call: x = sp[-nargs]; /* @@ -902,6 +925,17 @@ VM_DEFINE_INSTRUCTION (57, mv_call, "mv-call", 4, -1, 1) APPLY_HOOK (); NEXT; } + if (SCM_STRUCTP (x) && SCM_OBJ_CLASS_FLAGS (x) & SCM_CLASSF_PURE_GENERIC) + { + SCM args = SCM_EOL; + int n = nargs; + SCM* walk = sp; + SYNC_REGISTER (); + while (n--) + args = scm_cons (*walk--, args); + *walk = scm_mcache_compute_cmethod (SCM_ENTITY_PROCEDURE (x), args); + goto vm_mv_call; + } /* * Other interpreted or compiled call */ |