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

lsh, rsh etc are intrinsics

Browse source 
* libguile/intrinsics.c (lsh, rsh, lsh_immediate, rsh_immediate): New
  intrinsics.
  (scm_bootstrap_intrinsics): Wire up the intrinsics.
* libguile/intrinsics.h (SCM_FOR_ALL_VM_INTRINSICS): Add new
  intrinsics.
* libguile/vm-engine.c (call-scm<-scm-u64): New intrinsic caller.
  (lsh, rsh, lsh/immediate, rsh/immediate): Disable.
* module/language/cps/reify-primitives.scm (compute-known-primitives):
  Add new intrinsics.
* module/system/vm/assembler.scm: Adapt assemblers for new intrinsics.
This commit is contained in:
Andy Wingo 2018-05-01 07:00:37 +02:00
parent e014bf3fc5
commit 1532b570e5
5 changed files with 88 additions and 33 deletions
Download patch file Download diff file Expand all files Collapse all files

53
libguile/vm-engine.c
View file

@ -2209,7 +2209,24 @@ VM_NAME (scm_i_thread *thread, struct scm_vm *vp,
NEXT (2);
}
VM_DEFINE_OP (91, unused_91, NULL, NOP)
VM_DEFINE_OP (91, call_scm_from_scm_u64, "call-scm<-scm-u64", OP2 (X8_S8_S8_S8, C32))
{
scm_t_uint8 dst, a, b;
SCM res;
scm_t_scm_from_scm_u64_intrinsic intrinsic;
UNPACK_8_8_8 (op, dst, a, b);
intrinsic = intrinsics[ip[1]];
SYNC_IP ();
res = intrinsic (SP_REF (a), SP_REF_U64 (b));
CACHE_SP ();
SP_SET (dst, res);
NEXT (2);
}
VM_DEFINE_OP (92, unused_92, NULL, NOP)
VM_DEFINE_OP (93, unused_93, NULL, NOP)
VM_DEFINE_OP (94, unused_94, NULL, NOP)
@ -3345,15 +3362,7 @@ VM_NAME (scm_i_thread *thread, struct scm_vm *vp,
abort (); /* never reached */
}
/* Temporary instructions down here, while we incrementally proceed
with instruction explosion. */
/* lsh dst:8 a:8 b:8
*
* Shift A left by B bits, and place the result in DST. B is a U64
* value.
*/
VM_DEFINE_OP (252, lsh, "lsh", OP1 (X8_S8_S8_S8) | OP_DST)
VM_DEFINE_OP (252, unused_252, NULL, NOP)
{
scm_t_uint8 dst, x, y;
SCM a, result;
@ -3383,12 +3392,8 @@ VM_NAME (scm_i_thread *thread, struct scm_vm *vp,
SP_SET (dst, result);
NEXT (1);
}
/* rsh dst:8 a:8 b:8
*
* Shift A right by B bits, and place the result in DST. B is a U64
* value.
*/
VM_DEFINE_OP (253, rsh, "rsh", OP1 (X8_S8_S8_S8) | OP_DST)
VM_DEFINE_OP (253, unused_253, NULL, NOP)
{
scm_t_uint8 dst, x, y;
SCM a, result;
@ -3415,12 +3420,8 @@ VM_NAME (scm_i_thread *thread, struct scm_vm *vp,
SP_SET (dst, result);
NEXT (1);
}
/* lsh/immediate dst:8 a:8 b:8
*
* Shift A left by B bits, and place the result in DST. B is an
* immediate unsigned integer.
*/
VM_DEFINE_OP (254, lsh_immediate, "lsh/immediate", OP1 (X8_S8_S8_C8) | OP_DST)
VM_DEFINE_OP (254, unused_254, NULL, NOP)
{
scm_t_uint8 dst, x, y;
SCM a, result;
@ -3450,12 +3451,8 @@ VM_NAME (scm_i_thread *thread, struct scm_vm *vp,
SP_SET (dst, result);
NEXT (1);
}
/* rsh dst:8 a:8 b:8
*
* Shift A right by B bits, and place the result in DST. B is an
* immediate unsigned integer.
*/
VM_DEFINE_OP (255, rsh_immediate, "rsh/immediate", OP1 (X8_S8_S8_C8) | OP_DST)
VM_DEFINE_OP (255, unused_255, NULL, NOP)
{
scm_t_uint8 dst, x, y;
SCM a, result;