[Guile-commits] 07/13: Fix JIT bugs

[Andy Wingo]

wingo pushed a commit to branch lightening
in repository guile.

commit c0369df5e71c78926c8cf6bba159563ee78e51db
Author: Andy Wingo <address@hidden>
Date:   Thu Apr 4 11:33:16 2019 +0200

    Fix JIT bugs
    
    * libguile/jit.c (compile): Fix reloc fixup.
    (compute_mcode): Correctly compute entry mcode.
---
 libguile/jit.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/libguile/jit.c b/libguile/jit.c
index 1cdb75d..6bd92ba 100644
--- a/libguile/jit.c
+++ b/libguile/jit.c
@@ -4722,7 +4722,7 @@ compile (scm_jit_state *j)
       compile1 (j);
     }
 
-  for (size_t i = 0; i < j->reloc_count; i++)
+  for (size_t i = 0; i < j->reloc_idx; i++)
     {
       void *target = j->labels[j->relocs[i].target_vcode_offset];
       ASSERT(target);
@@ -4830,7 +4830,7 @@ compute_mcode (scm_thread *thread, uint32_t *entry_ip,
 
   data->mcode = emit_code (j, compile);
   if (data->mcode)
-    entry_mcode = jit_address (j->jit);
+    entry_mcode = j->labels[j->entry - j->start];
   else
     entry_mcode = NULL;