mirror/guile
mirror/guile
1
Fork 0
mirror of https://git.savannah.gnu.org/git/guile.git synced 2025-06-12 06:41:13 +02:00
Code Activity

Revert "Inline the atomic intrinsics"

Browse source 
This reverts commit 230a555976.
This commit is contained in:
Andy Wingo 2019-05-27 18:40:42 +02:00
parent d0a95bfbe8
commit 2ba50e2fe6
3 changed files with 39 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

28
libguile/intrinsics.c
View file

@ -438,6 +438,30 @@ push_prompt (scm_thread *thread, uint8_t escape_only_p,
vra, mra, thread->vm.registers); vra, mra, thread->vm.registers);
} }
static SCM
atomic_ref_scm (SCM *loc)
{
return scm_atomic_ref_scm (loc);
}
static void
atomic_set_scm (SCM *loc, SCM val)
{
scm_atomic_set_scm (loc, val);
}
static SCM
atomic_swap_scm (SCM *loc, SCM val)
{
return scm_atomic_swap_scm (loc, val);
}
static SCM
atomic_compare_and_swap_scm (SCM *loc, SCM expected, SCM desired)
{
return scm_atomic_compare_and_swap_scm (loc, expected, desired);
}
void void
scm_bootstrap_intrinsics (void) scm_bootstrap_intrinsics (void)
{ {
@ -506,6 +530,10 @@ scm_bootstrap_intrinsics (void)
scm_vm_intrinsics.allocate_words = allocate_words; scm_vm_intrinsics.allocate_words = allocate_words;
scm_vm_intrinsics.current_module = current_module; scm_vm_intrinsics.current_module = current_module;
scm_vm_intrinsics.push_prompt = push_prompt; scm_vm_intrinsics.push_prompt = push_prompt;
scm_vm_intrinsics.atomic_ref_scm = atomic_ref_scm;
scm_vm_intrinsics.atomic_set_scm = atomic_set_scm;
scm_vm_intrinsics.atomic_swap_scm = atomic_swap_scm;
scm_vm_intrinsics.atomic_compare_and_swap_scm = atomic_compare_and_swap_scm;
scm_c_register_extension ("libguile-" SCM_EFFECTIVE_VERSION, scm_c_register_extension ("libguile-" SCM_EFFECTIVE_VERSION,
"scm_init_intrinsics", "scm_init_intrinsics",

6
libguile/intrinsics.h
View file

@ -1,4 +1,4 @@
/* Copyright 2018-2019 /* Copyright 2018
Free Software Foundation, Inc. Free Software Foundation, Inc.
This file is part of Guile. This file is part of Guile.
@ -160,6 +160,10 @@ typedef uint32_t* scm_t_vcode_intrinsic;
M(scm_from_thread, current_module, "current-module", CURRENT_MODULE) \ M(scm_from_thread, current_module, "current-module", CURRENT_MODULE) \
M(thread_u8_scm_sp_vra_mra, push_prompt, "push-prompt", PUSH_PROMPT) \ M(thread_u8_scm_sp_vra_mra, push_prompt, "push-prompt", PUSH_PROMPT) \
M(thread_scm, unpack_values_object, "unpack-values-object", UNPACK_VALUES_OBJECT) \ M(thread_scm, unpack_values_object, "unpack-values-object", UNPACK_VALUES_OBJECT) \
M(scm_from_ptr, atomic_ref_scm, "atomic-ref-scm", ATOMIC_REF_SCM) \
M(ptr_scm, atomic_set_scm, "atomic-set-scm", ATOMIC_SET_SCM) \
M(scm_from_ptr_scm, atomic_swap_scm, "atomic-swap-scm", ATOMIC_SWAP_SCM) \
M(scm_from_ptr_scm_scm, atomic_compare_and_swap_scm, "atomic-compare-and-swap-scm", ATOMIC_COMPARE_AND_SWAP_SCM) \
M(vcode, handle_interrupt_code, "%handle-interrupt-code", HANDLE_INTERRUPT_CODE) \ M(vcode, handle_interrupt_code, "%handle-interrupt-code", HANDLE_INTERRUPT_CODE) \
/* Add new intrinsics here; also update scm_bootstrap_intrinsics. */ /* Add new intrinsics here; also update scm_bootstrap_intrinsics. */

12
libguile/vm-engine.c
View file

@ -1,4 +1,4 @@
/* Copyright 2001,2009-2015,2017-2019 /* Copyright 2001,2009-2015,2017-2018
Free Software Foundation, Inc. Free Software Foundation, Inc.
This file is part of Guile. This file is part of Guile.
@ -2079,7 +2079,7 @@ VM_NAME (scm_thread *thread)
SCM *loc; SCM *loc;
UNPACK_8_8_8 (op, dst, obj, offset); UNPACK_8_8_8 (op, dst, obj, offset);
loc = SCM_CELL_OBJECT_LOC (SP_REF (obj), offset); loc = SCM_CELL_OBJECT_LOC (SP_REF (obj), offset);
SP_SET (dst, scm_atomic_ref_scm (loc)); SP_SET (dst, CALL_INTRINSIC (atomic_ref_scm, (loc)));
NEXT (1); NEXT (1);
} }
@ -2095,7 +2095,7 @@ VM_NAME (scm_thread *thread)
SCM *loc; SCM *loc;
UNPACK_8_8_8 (op, obj, offset, val); UNPACK_8_8_8 (op, obj, offset, val);
loc = SCM_CELL_OBJECT_LOC (SP_REF (obj), offset); loc = SCM_CELL_OBJECT_LOC (SP_REF (obj), offset);
scm_atomic_set_scm (loc, SP_REF (val)); CALL_INTRINSIC (atomic_set_scm, (loc, SP_REF (val)));
NEXT (1); NEXT (1);
} }
@ -2114,7 +2114,7 @@ VM_NAME (scm_thread *thread)
UNPACK_24 (ip[1], obj); UNPACK_24 (ip[1], obj);
UNPACK_8_24 (ip[2], offset, val); UNPACK_8_24 (ip[2], offset, val);
loc = SCM_CELL_OBJECT_LOC (SP_REF (obj), offset); loc = SCM_CELL_OBJECT_LOC (SP_REF (obj), offset);
SP_SET (dst, scm_atomic_swap_scm (loc, SP_REF (val))); SP_SET (dst, CALL_INTRINSIC (atomic_swap_scm, (loc, SP_REF (val))));
NEXT (3); NEXT (3);
} }
@ -2137,8 +2137,8 @@ VM_NAME (scm_thread *thread)
UNPACK_8_24 (ip[2], offset, expected); UNPACK_8_24 (ip[2], offset, expected);
UNPACK_24 (ip[3], desired); UNPACK_24 (ip[3], desired);
loc = SCM_CELL_OBJECT_LOC (SP_REF (obj), offset); loc = SCM_CELL_OBJECT_LOC (SP_REF (obj), offset);
got = scm_atomic_compare_and_swap_scm, (loc, SP_REF (expected), got = CALL_INTRINSIC (atomic_compare_and_swap_scm,
SP_REF (desired)); (loc, SP_REF (expected), SP_REF (desired)));
SP_SET (dst, got); SP_SET (dst, got);
NEXT (4); NEXT (4);
} }