diff options
author | Andy Wingo <wingo@pobox.com> | 2019-05-27 12:01:38 +0200 |
---|---|---|
committer | Andy Wingo <wingo@pobox.com> | 2019-05-27 12:01:38 +0200 |
commit | 230a5559764679d75e3e8941e97a268a2b2e6a53 (patch) | |
tree | 280d1098fccb2007ea6fa6d16328e5fbe6a203cb /libguile/vm-engine.c | |
parent | 33e07fc56c18d4f3ffbfd53c4a8300bb2b5e49ba (diff) | |
download | guile-230a5559764679d75e3e8941e97a268a2b2e6a53.tar.gz |
Inline the atomic intrinsics
* libguile/intrinsics.h (SCM_FOR_ALL_VM_INTRINSICS):
* libguile/intrinsics.c (scm_bootstrap_intrinsics): Remove the atomic
intrinsics, as the JIT no longer needs them.
* libguile/vm-engine.c (VM_NAME): Inline the intrinsics.
Diffstat (limited to 'libguile/vm-engine.c')
-rw-r--r-- | libguile/vm-engine.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/libguile/vm-engine.c b/libguile/vm-engine.c index 3b57fa115..6505662d3 100644 --- a/libguile/vm-engine.c +++ b/libguile/vm-engine.c @@ -1,4 +1,4 @@ -/* Copyright 2001,2009-2015,2017-2018 +/* Copyright 2001,2009-2015,2017-2019 Free Software Foundation, Inc. This file is part of Guile. @@ -2079,7 +2079,7 @@ VM_NAME (scm_thread *thread) SCM *loc; UNPACK_8_8_8 (op, dst, obj, offset); loc = SCM_CELL_OBJECT_LOC (SP_REF (obj), offset); - SP_SET (dst, CALL_INTRINSIC (atomic_ref_scm, (loc))); + SP_SET (dst, scm_atomic_ref_scm (loc)); NEXT (1); } @@ -2095,7 +2095,7 @@ VM_NAME (scm_thread *thread) SCM *loc; UNPACK_8_8_8 (op, obj, offset, val); loc = SCM_CELL_OBJECT_LOC (SP_REF (obj), offset); - CALL_INTRINSIC (atomic_set_scm, (loc, SP_REF (val))); + scm_atomic_set_scm (loc, SP_REF (val)); NEXT (1); } @@ -2114,7 +2114,7 @@ VM_NAME (scm_thread *thread) UNPACK_24 (ip[1], obj); UNPACK_8_24 (ip[2], offset, val); loc = SCM_CELL_OBJECT_LOC (SP_REF (obj), offset); - SP_SET (dst, CALL_INTRINSIC (atomic_swap_scm, (loc, SP_REF (val)))); + SP_SET (dst, scm_atomic_swap_scm (loc, SP_REF (val))); NEXT (3); } @@ -2137,8 +2137,8 @@ VM_NAME (scm_thread *thread) UNPACK_8_24 (ip[2], offset, expected); UNPACK_24 (ip[3], desired); loc = SCM_CELL_OBJECT_LOC (SP_REF (obj), offset); - got = CALL_INTRINSIC (atomic_compare_and_swap_scm, - (loc, SP_REF (expected), SP_REF (desired))); + got = scm_atomic_compare_and_swap_scm, (loc, SP_REF (expected), + SP_REF (desired)); SP_SET (dst, got); NEXT (4); } |