[Guile-commits] 02/03: Fix JIT compilation of composable continuations

[Andy Wingo]

wingo pushed a commit to branch lightning
in repository guile.

commit 6da132cb95f93874c60802eac33182263d40068e
Author: Andy Wingo <address@hidden>
Date:   Wed Aug 29 22:15:20 2018 +0200

    Fix JIT compilation of composable continuations
    
    * libguile/control.c (compose_continuation_code): Fix offset of code
      end.
    * libguile/jit.c (compile_compose_continuation): Fix test for mcode not
      null.
---
 libguile/control.c | 2 +-
 libguile/jit.c     | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/libguile/control.c b/libguile/control.c
index 20b3e74..c659f8c 100644
--- a/libguile/control.c
+++ b/libguile/control.c
@@ -80,7 +80,7 @@ struct compose_continuation_code compose_continuation_code = {
     /* mcode = */ 0,
     /* counter = */ 0,
     /* start = */ sizeof (struct scm_jit_function_data),
-    /* end = */ sizeof (struct compose_continuation_code)
+    /* end = */ sizeof (struct scm_jit_function_data) + 12
   },
   {
     SCM_PACK_OP_24 (instrument_entry, 0),
diff --git a/libguile/jit.c b/libguile/jit.c
index 8657fc9..129d143 100644
--- a/libguile/jit.c
+++ b/libguile/jit.c
@@ -1496,7 +1496,7 @@ compile_compose_continuation (scm_jit_state *j, uint32_t 
cont_idx)
   emit_free_variable_ref (j, T0, T0, cont_idx);
   emit_call_r_r (j, scm_vm_intrinsics.compose_continuation, THREAD, T0);
   jit_retval (T0);
-  interp = jit_bnei (T0, 0);
+  interp = jit_beqi (T0, 0);
   emit_reload_sp (j);
   emit_reload_fp (j);
   jit_jmpr (T0);