mirror/guile
mirror/guile
1
Fork 0
mirror of https://git.savannah.gnu.org/git/guile.git synced 2025-06-18 01:30:27 +02:00
Code Activity

Avoid needless 64-bit args on 32-bit machines for some intrinsics

Browse source 
* libguile/intrinsics.h:
* libguile/intrinsics.c (string_set_x): Change to take size_t and u32 as
  args.
  (allocate_words): Change to take size_t as arg.
* libguile/vm.c (expand_apply_argument): Rename from rest_arg_length,
  and also handle the stack manipulation.
* libguile/vm-engine.c (expand-apply-argument): Update for intrinsic
  change.
  (call-scm-sz-u32): Rename from call-scm-u64-u64, as it matches its
  uses and will compile better on 32-bit systems.
* module/system/vm/assembler.scm (define-scm-sz-u32-intrinsic):
  (string-set!): Update for new instrinsic call inst.
* libguile/jit.c (compile_call_scm_sz_u32): Adapt.
This commit is contained in:
Andy Wingo 2018-08-13 14:24:44 +02:00
parent 11940f4c72
commit d4abe8bbed
6 changed files with 26 additions and 31 deletions
Download patch file Download diff file Expand all files Collapse all files

15
libguile/vm.c
View file

@ -1177,16 +1177,23 @@ compose_continuation (scm_thread *thread, SCM cont)
return mra;
}
static int
rest_arg_length (SCM x)
static void
expand_apply_argument (scm_thread *thread)
{
SCM x = thread->vm.sp[0].as_scm;
int len = scm_ilength (x);
if (SCM_UNLIKELY (len < 0))
scm_error (scm_arg_type_key, "apply", "Apply to non-list: ~S",
scm_list_1 (x), scm_list_1 (x));
return len;
alloc_frame (thread, frame_locals_count (thread) - 1 + len);
while (len--)
{
thread->vm.sp[len].as_scm = SCM_CAR (x);
x = SCM_CDR (x);
}
}
/* This is here to avoid putting the code for "alloc-frame" in subr
@ -1722,7 +1729,7 @@ scm_bootstrap_vm (void)
scm_vm_intrinsics.reinstate_continuation_x = reinstate_continuation_x;
scm_vm_intrinsics.capture_continuation = capture_continuation;
scm_vm_intrinsics.compose_continuation = compose_continuation;
scm_vm_intrinsics.rest_arg_length = rest_arg_length;
scm_vm_intrinsics.expand_apply_argument = expand_apply_argument;
scm_vm_intrinsics.abort_to_prompt = abort_to_prompt;
scm_vm_intrinsics.get_callee_vcode = get_callee_vcode;
scm_vm_intrinsics.unpack_values_object = unpack_values_object;