From f07878dadbdfabaa0e4fa72e3c5efa7dd3d3afe2 Mon Sep 17 00:00:00 2001 From: Matthew Flatt Date: Tue, 8 May 2012 06:40:27 -0600 Subject: [PATCH] fix non-futures, non-places build Problem introduced with the addition of `flexpt'. --- src/racket/src/jit.h | 3 ++- src/racket/src/jitalloc.c | 1 + 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/src/racket/src/jit.h b/src/racket/src/jit.h index b5d6aa0e0b..aab6fdc0ec 100644 --- a/src/racket/src/jit.h +++ b/src/racket/src/jit.h @@ -467,6 +467,7 @@ void *scheme_jit_get_threadlocal_table(); # define tl_fixup_runstack_base (&fixup_runstack_base) # define tl_fixup_already_in_place (&fixup_already_in_place) # define tl_scheme_jit_save_fp (&scheme_jit_save_fp) +# define tl_scheme_jit_save_fp2 (&scheme_jit_save_fp2) # define tl_scheme_fuel_counter (&scheme_fuel_counter) # define tl_scheme_jit_stack_boundary (&scheme_jit_stack_boundary) #endif @@ -902,7 +903,7 @@ void scheme_jit_prolog_again(mz_jit_state *jitter, int n, int ret_addr_reg) (Other JIT constraints imply that it isn't a pointer to GCable memory.) * Relevant thread-local state is confined to the C stack, runstack, - mark stack, and tl_save_fp. + mark stack, and tl_save_fp[2]. * A pointer to the runstack can be used as a Scheme_Object** argument, but only when it points to MZ_RUNSTACK. diff --git a/src/racket/src/jitalloc.c b/src/racket/src/jitalloc.c index 5c21715885..6168492c78 100644 --- a/src/racket/src/jitalloc.c +++ b/src/racket/src/jitalloc.c @@ -42,6 +42,7 @@ THREAD_LOCAL_DECL(static void *retry_alloc_r1); /* set by prepare_retry_alloc() #ifdef JIT_USE_FP_OPS THREAD_LOCAL_DECL(double scheme_jit_save_fp); +THREAD_LOCAL_DECL(double scheme_jit_save_fp2); #endif static void *prepare_retry_alloc(void *p, void *p2)