diff options
| author | Andy Wingo <wingo@pobox.com> | 2013-11-15 15:39:38 +0100 |
|---|---|---|
| committer | Andy Wingo <wingo@pobox.com> | 2013-11-15 15:39:38 +0100 |
| commit | 840ec33422e7ccae5ac158584e5587d88ff42d85 (patch) | |
| tree | e6e4b743559e02f309628b20107751206827d872 /libguile/frames.h | |
| parent | 0c247a2fb6a9872b262eb7558e62481ac1967063 (diff) | |
| download | guile-840ec33422e7ccae5ac158584e5587d88ff42d85.tar.gz | |
Remove MVRA accessors in libguile
* libguile/vm.c (scm_i_vm_capture_stack): Remove MVRA argument, in
preparation for removing MVRA from frames.
(scm_i_capture_current_stack): Adapt to scm_i_vm_capture_stack
change.
(vm_reinstate_partial_continuation): Remove references to MVRA.
* libguile/vm.h (struct scm_vm_cont): Remove mvra member.
* libguile/vm-engine.c (call): Set MVRA to 0. Will remove later.
(return-values): Return to RA.
(call/cc): Remove MVRA from capture call.
* libguile/frames.c:
* libguile/frames.h (SCM_FRAME_MV_RETURN_ADDRESS)
(SCM_FRAME_RTL_MV_RETURN_ADDRESS, scm_frame_mv_return_address): Remove
accessors.
* libguile/control.c (reify_partial_continuation): Adapt to
scm_i_vm_capture_stack change.
Diffstat (limited to 'libguile/frames.h')
| -rw-r--r-- | libguile/frames.h | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/libguile/frames.h b/libguile/frames.h index 9105311f1..084f051d4 100644 --- a/libguile/frames.h +++ b/libguile/frames.h @@ -1,4 +1,4 @@ -/* Copyright (C) 2001, 2009, 2010, 2011, 2012 Free Software Foundation, Inc. +/* Copyright (C) 2001, 2009, 2010, 2011, 2012, 2013 Free Software Foundation, Inc. * * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public License @@ -85,8 +85,6 @@ struct scm_vm_frame (SCM_FRAME_STRUCT (fp)->return_address) #define SCM_FRAME_SET_RETURN_ADDRESS(fp, ra) \ SCM_FRAME_STRUCT (fp)->return_address = (ra) -#define SCM_FRAME_MV_RETURN_ADDRESS(fp) \ - (SCM_FRAME_STRUCT (fp)->mv_return_address) #define SCM_FRAME_SET_MV_RETURN_ADDRESS(fp, mvra) \ SCM_FRAME_STRUCT (fp)->mv_return_address = (mvra) #define SCM_FRAME_DYNAMIC_LINK(fp) \ @@ -124,8 +122,6 @@ struct scm_vm_frame #define SCM_FRAME_SET_RTL_RETURN_ADDRESS(fp, ip) \ SCM_FRAME_SET_RETURN_ADDRESS (fp, (scm_t_uint8 *) (ip)) -#define SCM_FRAME_RTL_MV_RETURN_ADDRESS(fp) \ - ((scm_t_uint32 *) SCM_FRAME_MV_RETURN_ADDRESS (fp)) #define SCM_FRAME_SET_RTL_MV_RETURN_ADDRESS(fp, ip) \ SCM_FRAME_SET_MV_RETURN_ADDRESS (fp, (scm_t_uint8 *) (ip)) @@ -165,7 +161,6 @@ SCM_API SCM scm_frame_address (SCM frame); SCM_API SCM scm_frame_stack_pointer (SCM frame); SCM_API SCM scm_frame_instruction_pointer (SCM frame); SCM_API SCM scm_frame_return_address (SCM frame); -SCM_API SCM scm_frame_mv_return_address (SCM frame); SCM_API SCM scm_frame_dynamic_link (SCM frame); SCM_API SCM scm_frame_previous (SCM frame); |