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

Rename union scm_vm_stack_element members

Browse source 
* libguile/frames.h (union scm_vm_stack_element): Rename members from
  scm, ip, etc to as_scm, as_ip, etc.  Adapt users.
This commit is contained in:
Andy Wingo 2015-10-18 20:25:43 +02:00
parent 30c06bfbb3
commit 8f027385db
5 changed files with 39 additions and 38 deletions
Download patch file Download diff file Expand all files Collapse all files

22
libguile/vm-engine.c
View file

@ -268,13 +268,13 @@
union scm_vm_stack_element *old_fp; \
VM_HANDLE_INTERRUPTS; \
ALLOC_FRAME (2); \
old_fp = vp->fp; \
ip = SCM_FRAME_RETURN_ADDRESS (vp->fp); \
vp->fp = SCM_FRAME_DYNAMIC_LINK (vp->fp); \
CACHE_LOCALS (); \
old_fp = vp->fp; \
ip = SCM_FRAME_RETURN_ADDRESS (vp->fp); \
vp->fp = SCM_FRAME_DYNAMIC_LINK (vp->fp); \
CACHE_LOCALS (); \
/* Clear frame. */ \
old_fp[0].scm = SCM_BOOL_F; \
old_fp[1].scm = SCM_BOOL_F; \
old_fp[0].as_scm = SCM_BOOL_F; \
old_fp[1].as_scm = SCM_BOOL_F; \
/* Leave proc. */ \
SCM_FRAME_LOCAL (old_fp, 1) = val; \
vp->sp = SCM_FRAME_SLOT (old_fp, 1); \
@ -289,9 +289,9 @@
SCM vals = vals_; \
VM_HANDLE_INTERRUPTS; \
ALLOC_FRAME (3); \
SCM_FRAME_LOCAL (vp->fp, 0) = vm_builtin_apply; \
SCM_FRAME_LOCAL (vp->fp, 1) = vm_builtin_values; \
SCM_FRAME_LOCAL (vp->fp, 2) = vals; \
SCM_FRAME_LOCAL (vp->fp, 0) = vm_builtin_apply; \
SCM_FRAME_LOCAL (vp->fp, 1) = vm_builtin_values; \
SCM_FRAME_LOCAL (vp->fp, 2) = vals; \
ip = (scm_t_uint32 *) vm_builtin_apply_code; \
goto op_tail_apply; \
} while (0)
@ -776,8 +776,8 @@ VM_NAME (scm_i_thread *thread, struct scm_vm *vp,
CACHE_LOCALS ();
/* Clear stack frame. */
old_fp[0].scm = SCM_BOOL_F;
old_fp[1].scm = SCM_BOOL_F;
old_fp[0].as_scm = SCM_BOOL_F;
old_fp[1].as_scm = SCM_BOOL_F;
POP_CONTINUATION_HOOK (old_fp);