[Guile-commits] 11/17: Add out-of-line slow path for compose-continuation

[Andy Wingo]

wingo pushed a commit to branch master
in repository guile.

commit 7a6fdd4fb58237b9213ffe9ce7a8e5b2ac659c54
Author: Andy Wingo <address@hidden>
Date:   Tue Dec 10 22:05:43 2019 +0100

    Add out-of-line slow path for compose-continuation
    
    * libguile/jit.c (compile_compose_continuation)
      (compile_compose_continuation_slow): Move interpreter fallback to slow
      path.
---
 libguile/jit.c | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/libguile/jit.c b/libguile/jit.c
index 2e96587..2b66e82 100644
--- a/libguile/jit.c
+++ b/libguile/jit.c
@@ -1789,8 +1789,6 @@ compile_continuation_call_slow (scm_jit_state *j, 
uint32_t contregs_idx)
 static void
 compile_compose_continuation (scm_jit_state *j, uint32_t cont_idx)
 {
-  jit_reloc_t interp;
-
   ASSERT_HAS_REGISTER_STATE (SP_IN_REGISTER | FP_IN_REGISTER);
 
   emit_store_current_ip (j, T0);
@@ -1798,20 +1796,18 @@ compile_compose_continuation (scm_jit_state *j, 
uint32_t cont_idx)
   emit_call_2 (j, scm_vm_intrinsics.compose_continuation,
                thread_operand (), free_variable_operand (j, T0, cont_idx));
   jit_retval (j->jit, T0);
-  interp = jit_beqi (j->jit, T0, 0);
+  add_slow_path_patch (j, jit_beqi (j->jit, T0, 0));
   emit_reload_sp (j);
   emit_reload_fp (j);
   jit_jmpr (j->jit, T0);
 
-  jit_patch_here (j->jit, interp);
-  emit_exit (j);
-
   j->frame_size_min = 0;
   j->frame_size_max = INT32_MAX;
 }
 static void
 compile_compose_continuation_slow (scm_jit_state *j, uint32_t cont_idx)
 {
+  emit_exit (j);
 }
 
 static void