From 4a2d78b4d463cd29226f3eee776dcad9f64e6152 Mon Sep 17 00:00:00 2001 From: Andy Wingo Date: Mon, 25 Jun 2018 15:49:34 +0200 Subject: Give multiple-values objects a tc7 * libguile/scm.h (scm_tc7_values): New tc7. Never seen by Scheme, so we don't need to update it anywhere else. * libguile/values.h (scm_is_values): New public static inline function. (scm_i_nvalues, scm_i_value_ref): New private static inline functions. (SCM_VALUESP): Use scm_is_value. (scm_values_2, scm_values_3): New functions. (scm_values_vtable): Remove; values objects are not structs any more. * libguile/values.c (scm_i_extract_values_2): Adapt to new values representation. (print_values): Remove now-unused function. (scm_c_nvalues): Use scm_i_nvalues. (scm_c_value_ref): Use scm_i_value_ref. (scm_values, scm_c_values): Make the new-style objects, which store their values inline. (scm_values_2, scm_values_3): New helpers, to avoid consing little useless lists. * libguile/vm-engine.c (halt, subr-call) * libguile/eval.c (eval): Adapt to new values representation. * libguile/i18n.c (scm_locale_string_to_integer) (scm_locale_string_to_integer) * libguile/numbers.c (scm_i_floor_divide, scm_i_ceiling_divide) (scm_i_truncate_divide, scm_i_centered_divide, scm_i_round_divide) (scm_i_exact_integer_sqrt) * libguile/r6rs-ports.c (make_bytevector_output_port) * libguile/srfi-1.c (scm_srfi1_partition, scm_srfi1_partition_x) * libguile/srfi-14.c (scm_char_set_diff_plus_intersection) (scm_char_set_diff_plus_intersection_x) * libguile/posix.c (scm_getrlimit, scm_open_process): Adapt to use scm_values_2 or scm_values_3. * libguile/print.c (iprin1): Add printer for values objects. --- libguile/vm-engine.c | 22 +++++++++------------- 1 file changed, 9 insertions(+), 13 deletions(-) (limited to 'libguile/vm-engine.c') diff --git a/libguile/vm-engine.c b/libguile/vm-engine.c index 56c5ec177..ac47da67b 100644 --- a/libguile/vm-engine.c +++ b/libguile/vm-engine.c @@ -342,11 +342,11 @@ VM_NAME (scm_i_thread *thread, jmp_buf *registers, int resume) else { uint32_t n; - ret = SCM_EOL; SYNC_IP (); - for (n = nvals; n > 0; n--) - ret = scm_inline_cons (thread, FP_REF (4 + n - 1), ret); - ret = scm_values (ret); + VM_ASSERT (nvals <= (UINTPTR_MAX >> 8), abort ()); + ret = scm_words ((nvals << 8) | scm_tc7_values, nvals + 1); + for (n = 0; n < nvals; n++) + SCM_SET_CELL_OBJECT (ret, n+1, FP_REF (4 + n - 1)); } VP->ip = SCM_FRAME_RETURN_ADDRESS (VP->fp); @@ -608,16 +608,12 @@ VM_NAME (scm_i_thread *thread, jmp_buf *registers, int resume) ret = scm_apply_subr (sp, FRAME_LOCALS_COUNT ()); CACHE_SP (); - if (SCM_UNLIKELY (SCM_VALUESP (ret))) + if (SCM_UNLIKELY (scm_is_values (ret))) { - SCM vals = scm_struct_ref (ret, SCM_INUM0); - long len = scm_ilength (vals); - ALLOC_FRAME (1 + len); - while (len--) - { - SP_SET (len, SCM_CAR (vals)); - vals = SCM_CDR (vals); - } + size_t n, nvals = scm_i_nvalues (ret); + ALLOC_FRAME (1 + nvals); + for (n = 0; n < nvals; n++) + FP_SET (n + 1, scm_i_value_ref (ret, n)); NEXT (1); } else -- cgit v1.2.3