diff options
| author | Andy Wingo <wingo@pobox.com> | 2015-10-18 20:25:43 +0200 |
|---|---|---|
| committer | Andy Wingo <wingo@pobox.com> | 2015-10-21 11:49:20 +0200 |
| commit | 8f027385db228d68193ad7316cf0b79489ac038b (patch) | |
| tree | 9611f78024bf6d0e23f7ea91f04f8883b5be8f9a /libguile/frames.h | |
| parent | 30c06bfbb3db6e8c05f2ee6e7866d4ecf5838482 (diff) | |
| download | guile-8f027385db228d68193ad7316cf0b79489ac038b.tar.gz | |
Rename union scm_vm_stack_element members
* libguile/frames.h (union scm_vm_stack_element): Rename members from
scm, ip, etc to as_scm, as_ip, etc. Adapt users.
Diffstat (limited to 'libguile/frames.h')
| -rw-r--r-- | libguile/frames.h | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/libguile/frames.h b/libguile/frames.h index c2f1e57db..870477d53 100644 --- a/libguile/frames.h +++ b/libguile/frames.h @@ -88,23 +88,23 @@ /* Each element on the stack occupies the same amount of space. */ union scm_vm_stack_element { - union scm_vm_stack_element *fp; - scm_t_uint32 *ip; - SCM scm; + union scm_vm_stack_element *as_fp; + scm_t_uint32 *as_ip; + SCM as_scm; /* For GC purposes. */ - void *ptr; - scm_t_bits bits; + void *as_ptr; + scm_t_bits as_bits; }; -#define SCM_FRAME_PREVIOUS_SP(fp_) ((fp_) + 2) -#define SCM_FRAME_RETURN_ADDRESS(fp_) ((fp_)[0].ip) -#define SCM_FRAME_SET_RETURN_ADDRESS(fp_, ra) ((fp_)[0].ip = (ra)) -#define SCM_FRAME_DYNAMIC_LINK(fp_) ((fp_)[1].fp) -#define SCM_FRAME_SET_DYNAMIC_LINK(fp_, dl) ((fp_)[1].fp = (dl)) -#define SCM_FRAME_SLOT(fp_,i) ((fp_) - (i) - 1) -#define SCM_FRAME_LOCAL(fp_,i) (SCM_FRAME_SLOT (fp_, i)->scm) -#define SCM_FRAME_NUM_LOCALS(fp_, sp) ((fp_) - (sp)) +#define SCM_FRAME_PREVIOUS_SP(fp) ((fp) + 2) +#define SCM_FRAME_RETURN_ADDRESS(fp) ((fp)[0].as_ip) +#define SCM_FRAME_SET_RETURN_ADDRESS(fp, ra) ((fp)[0].as_ip = (ra)) +#define SCM_FRAME_DYNAMIC_LINK(fp) ((fp)[1].as_fp) +#define SCM_FRAME_SET_DYNAMIC_LINK(fp, dl) ((fp)[1].as_fp = (dl)) +#define SCM_FRAME_SLOT(fp,i) ((fp) - (i) - 1) +#define SCM_FRAME_LOCAL(fp,i) (SCM_FRAME_SLOT (fp, i)->as_scm) +#define SCM_FRAME_NUM_LOCALS(fp, sp) ((fp) - (sp)) /* |