summaryrefslogtreecommitdiff
path: root/libguile/vm-engine.c
diff options
context:
space:
mode:
authorAndy Wingo <wingo@pobox.com>2018-08-29 17:54:19 +0200
committerAndy Wingo <wingo@pobox.com>2018-08-29 17:54:19 +0200
commit24d09b16b60c6c8f0dee8e3cd69de0e677601ee7 (patch)
tree2a0303169124b87d1115c4ce04574568f7114b27 /libguile/vm-engine.c
parentc03e2bbbb411267041f5fbba62c9a8f967a2c3fc (diff)
downloadguile-24d09b16b60c6c8f0dee8e3cd69de0e677601ee7.tar.gz
Maybe enter JIT when returning from interpreted functions
* libguile/jit.c (scm_jit_compute_mcode): Minor optimization. * libguile/vm-engine.c (return-values): Maybe return to JIT code.
Diffstat (limited to 'libguile/vm-engine.c')
-rw-r--r--libguile/vm-engine.c21
1 files changed, 14 insertions, 7 deletions
diff --git a/libguile/vm-engine.c b/libguile/vm-engine.c
index c8db813a6..58ff53cda 100644
--- a/libguile/vm-engine.c
+++ b/libguile/vm-engine.c
@@ -565,18 +565,25 @@ VM_NAME (scm_thread *thread)
{
union scm_vm_stack_element *old_fp;
size_t frame_size = 3;
+ uint8_t *mcode;
RETURN_HOOK ();
old_fp = VP->fp;
- ip = SCM_FRAME_VIRTUAL_RETURN_ADDRESS (VP->fp);
- VP->fp = SCM_FRAME_DYNAMIC_LINK (VP->fp);
-
- /* Clear stack frame. */
- while (frame_size--)
- old_fp[frame_size].as_scm = SCM_BOOL_F;
+ VP->fp = SCM_FRAME_DYNAMIC_LINK (old_fp);
- NEXT (0);
+ mcode = SCM_FRAME_MACHINE_RETURN_ADDRESS (old_fp);
+ if (mcode)
+ {
+ scm_jit_enter_mcode (thread, mcode);
+ CACHE_REGISTER ();
+ NEXT (0);
+ }
+ else
+ {
+ ip = SCM_FRAME_VIRTUAL_RETURN_ADDRESS (old_fp);
+ NEXT (0);
+ }
}