diff options
author | Andy Wingo <wingo@pobox.com> | 2009-12-03 13:09:58 +0100 |
---|---|---|
committer | Andy Wingo <wingo@pobox.com> | 2009-12-03 14:42:51 +0100 |
commit | aa3f69519f1af3fcf31cf36be33776db3fedf65a (patch) | |
tree | 5f2a4ab2d8332b5754693d4dc7997ed96cd7985d /libguile/frames.c | |
parent | 14aa25e410d49586c8ff9b4a80d2b6046b769905 (diff) | |
download | guile-aa3f69519f1af3fcf31cf36be33776db3fedf65a.tar.gz |
replace frame implementation with VM frames
* libguile/stacks.h: Rework so that a stack doesn't copy information out
of VM frames, it just holds onto a VM frame, along with the stack id
and length. VM frames are now the only representation of frames in
Guile.
(scm_t_info_frame, SCM_FRAME_N_SLOTS, SCM_FRAME_REF, SCM_FRAME_NUMBER)
(SCM_FRAME_FLAGS, SCM_FRAME_SOURCE, SCM_FRAME_PROC, SCM_FRAME_ARGS)
(SCM_FRAME_PREV, SCM_FRAME_NEXT)
(SCM_FRAMEF_VOID, SCM_FRAMEF_REAL, SCM_FRAMEF_PROC)
(SCM_FRAMEF_EVAL_ARGS, SCM_FRAMEF_OVERFLOW)
(SCM_FRAME_VOID_P, SCM_FRAME_REAL_P, SCM_FRAME_PROC_P)
(SCM_FRAME_EVAL_ARGS_P, SCM_FRAME_OVERFLOW_P): Remove these macros
corresponding to the old frame implementation.
(scm_frame_p scm_frame_source, scm_frame_procedure)
(scm_frame_arguments): These definitions are now in frames.h.
(scm_last_stack_frame): Remove declaration of previously-removed
constructor. Probably should re-instate it though.
(scm_frame_number, scm_frame_previous, scm_frame_next)
(scm_frame_real_p, scm_frame_procedure_p, scm_frame_evaluating_args_p)
(scm_frame_overflow_p) : Remove these procedures corresponding to the
old stack implementation.
* libguile/stacks.c: Update for new frames implementation.
* libguile/frames.h:
* libguile/frames.c: Rename functions operating on VM frames to have a
scm_frame prefix, not scm_vm_frame -- because they really are the only
frames we have. Rename corresponding Scheme functions too, from
vm-frame-foo to frame-foo.
* libguile/deprecated.h: Remove scm_stack and scm_info_frame data types.
* libguile/vm.c (vm_dispatch_hook): Adapt to scm_c_make_frame name
change.
* module/system/vm/frame.scm: No need to export functions provided
frames.c now, as we load those procedures into the default environment
now. Rename functions, and remove a couple of outdated, unused
functions. The bottom half of this file is still bitrotten, though.
* libguile/backtrace.c: Rework to operate on the new frame
representation. Also fix a bug displaying file names for compiled
procedures.
* libguile/init.c: Load the VM much earlier, just because we can. Also
it allows us to have frames.[ch] loaded in time for stacks to be
initialized, so that scm_frame_arguments can do the right thing.
Diffstat (limited to 'libguile/frames.c')
-rw-r--r-- | libguile/frames.c | 89 |
1 files changed, 45 insertions, 44 deletions
diff --git a/libguile/frames.c b/libguile/frames.c index c0d7d61e4..e38fc00ac 100644 --- a/libguile/frames.c +++ b/libguile/frames.c @@ -27,31 +27,31 @@ #include "frames.h" -scm_t_bits scm_tc16_vm_frame; +scm_t_bits scm_tc16_frame; #define RELOC(frame, val) (val + SCM_VM_FRAME_OFFSET (frame)) SCM -scm_c_make_vm_frame (SCM stack_holder, SCM *fp, SCM *sp, - scm_t_uint8 *ip, scm_t_ptrdiff offset) +scm_c_make_frame (SCM stack_holder, SCM *fp, SCM *sp, + scm_t_uint8 *ip, scm_t_ptrdiff offset) { - struct scm_vm_frame *p = scm_gc_malloc (sizeof (struct scm_vm_frame), - "vmframe"); + struct scm_frame *p = scm_gc_malloc (sizeof (struct scm_frame), + "vmframe"); p->stack_holder = stack_holder; p->fp = fp; p->sp = sp; p->ip = ip; p->offset = offset; - SCM_RETURN_NEWSMOB (scm_tc16_vm_frame, p); + SCM_RETURN_NEWSMOB (scm_tc16_frame, p); } static int -vm_frame_print (SCM frame, SCM port, scm_print_state *pstate) +frame_print (SCM frame, SCM port, scm_print_state *pstate) { - scm_puts ("#<vm-frame ", port); + scm_puts ("#<frame ", port); scm_uintprint (SCM_UNPACK (frame), 16, port); scm_putc (' ', port); - scm_write (scm_vm_frame_program (frame), port); + scm_write (scm_frame_procedure (frame), port); /* don't write args, they can get us into trouble. */ scm_puts (">", port); @@ -61,28 +61,29 @@ vm_frame_print (SCM frame, SCM port, scm_print_state *pstate) /* Scheme interface */ -SCM_DEFINE (scm_vm_frame_p, "vm-frame?", 1, 0, 0, +SCM_DEFINE (scm_frame_p, "frame?", 1, 0, 0, (SCM obj), "") -#define FUNC_NAME s_scm_vm_frame_p +#define FUNC_NAME s_scm_frame_p { return scm_from_bool (SCM_VM_FRAME_P (obj)); } #undef FUNC_NAME -SCM_DEFINE (scm_vm_frame_program, "vm-frame-program", 1, 0, 0, +SCM_DEFINE (scm_frame_procedure, "frame-procedure", 1, 0, 0, (SCM frame), "") -#define FUNC_NAME s_scm_vm_frame_program +#define FUNC_NAME s_scm_frame_procedure { SCM_VALIDATE_VM_FRAME (1, frame); return SCM_FRAME_PROGRAM (SCM_VM_FRAME_FP (frame)); } #undef FUNC_NAME -SCM -scm_vm_frame_arguments (SCM frame) -#define FUNC_NAME "vm-frame-arguments" +SCM_DEFINE (scm_frame_arguments, "frame-arguments", 1, 0, 0, + (SCM frame), + "") +#define FUNC_NAME s_scm_frame_arguments { static SCM var = SCM_BOOL_F; @@ -90,16 +91,16 @@ scm_vm_frame_arguments (SCM frame) if (scm_is_false (var)) var = scm_c_module_lookup (scm_c_resolve_module ("system vm frame"), - "vm-frame-arguments"); + "frame-arguments"); return scm_call_1 (SCM_VARIABLE_REF (var), frame); } #undef FUNC_NAME -SCM_DEFINE (scm_vm_frame_source, "vm-frame-source", 1, 0, 0, +SCM_DEFINE (scm_frame_source, "frame-source", 1, 0, 0, (SCM frame), "") -#define FUNC_NAME s_scm_vm_frame_source +#define FUNC_NAME s_scm_frame_source { SCM *fp; struct scm_objcode *bp; @@ -118,11 +119,11 @@ SCM_DEFINE (scm_vm_frame_source, "vm-frame-source", 1, 0, 0, the presence of not-yet-active frames on the stack. So we have a cheap heuristic to detect not-yet-active frames, and skip over them. Perhaps we should represent them more usefully. - */ -SCM_DEFINE (scm_vm_frame_num_locals, "vm-frame-num-locals", 1, 0, 0, +*/ +SCM_DEFINE (scm_frame_num_locals, "frame-num-locals", 1, 0, 0, (SCM frame), "") -#define FUNC_NAME s_scm_vm_frame_num_locals +#define FUNC_NAME s_scm_frame_num_locals { SCM *sp, *p; unsigned int n = 0; @@ -146,11 +147,11 @@ SCM_DEFINE (scm_vm_frame_num_locals, "vm-frame-num-locals", 1, 0, 0, } #undef FUNC_NAME -/* Need same not-yet-active frame logic here as in vm-frame-num-locals */ -SCM_DEFINE (scm_vm_frame_local_ref, "vm-frame-local-ref", 2, 0, 0, +/* Need same not-yet-active frame logic here as in frame-num-locals */ +SCM_DEFINE (scm_frame_local_ref, "frame-local-ref", 2, 0, 0, (SCM frame, SCM index), "") -#define FUNC_NAME s_scm_vm_frame_local_ref +#define FUNC_NAME s_scm_frame_local_ref { SCM *sp, *p; unsigned int n = 0; @@ -178,11 +179,11 @@ SCM_DEFINE (scm_vm_frame_local_ref, "vm-frame-local-ref", 2, 0, 0, } #undef FUNC_NAME -/* Need same not-yet-active frame logic here as in vm-frame-num-locals */ -SCM_DEFINE (scm_vm_frame_local_set_x, "vm-frame-local-set!", 3, 0, 0, +/* Need same not-yet-active frame logic here as in frame-num-locals */ +SCM_DEFINE (scm_frame_local_set_x, "frame-local-set!", 3, 0, 0, (SCM frame, SCM index, SCM val), "") -#define FUNC_NAME s_scm_vm_frame_local_set_x +#define FUNC_NAME s_scm_frame_local_set_x { SCM *sp, *p; unsigned int n = 0; @@ -213,22 +214,22 @@ SCM_DEFINE (scm_vm_frame_local_set_x, "vm-frame-local-set!", 3, 0, 0, } #undef FUNC_NAME -SCM_DEFINE (scm_vm_frame_instruction_pointer, "vm-frame-instruction-pointer", 1, 0, 0, +SCM_DEFINE (scm_frame_instruction_pointer, "frame-instruction-pointer", 1, 0, 0, (SCM frame), "") -#define FUNC_NAME s_scm_vm_frame_instruction_pointer +#define FUNC_NAME s_scm_frame_instruction_pointer { SCM_VALIDATE_VM_FRAME (1, frame); return scm_from_ulong ((unsigned long) (SCM_VM_FRAME_IP (frame) - - SCM_PROGRAM_DATA (scm_vm_frame_program (frame))->base)); + - SCM_PROGRAM_DATA (scm_frame_procedure (frame))->base)); } #undef FUNC_NAME -SCM_DEFINE (scm_vm_frame_return_address, "vm-frame-return-address", 1, 0, 0, +SCM_DEFINE (scm_frame_return_address, "frame-return-address", 1, 0, 0, (SCM frame), "") -#define FUNC_NAME s_scm_vm_frame_return_address +#define FUNC_NAME s_scm_frame_return_address { SCM_VALIDATE_VM_FRAME (1, frame); return scm_from_ulong ((unsigned long) @@ -237,10 +238,10 @@ SCM_DEFINE (scm_vm_frame_return_address, "vm-frame-return-address", 1, 0, 0, } #undef FUNC_NAME -SCM_DEFINE (scm_vm_frame_mv_return_address, "vm-frame-mv-return-address", 1, 0, 0, +SCM_DEFINE (scm_frame_mv_return_address, "frame-mv-return-address", 1, 0, 0, (SCM frame), "") -#define FUNC_NAME s_scm_vm_frame_mv_return_address +#define FUNC_NAME s_scm_frame_mv_return_address { SCM_VALIDATE_VM_FRAME (1, frame); return scm_from_ulong ((unsigned long) @@ -249,10 +250,10 @@ SCM_DEFINE (scm_vm_frame_mv_return_address, "vm-frame-mv-return-address", 1, 0, } #undef FUNC_NAME -SCM_DEFINE (scm_vm_frame_dynamic_link, "vm-frame-dynamic-link", 1, 0, 0, +SCM_DEFINE (scm_frame_dynamic_link, "frame-dynamic-link", 1, 0, 0, (SCM frame), "") -#define FUNC_NAME s_scm_vm_frame_dynamic_link +#define FUNC_NAME s_scm_frame_dynamic_link { SCM_VALIDATE_VM_FRAME (1, frame); /* fixme: munge fp if holder is a continuation */ @@ -264,7 +265,7 @@ SCM_DEFINE (scm_vm_frame_dynamic_link, "vm-frame-dynamic-link", 1, 0, 0, #undef FUNC_NAME extern SCM -scm_c_vm_frame_prev (SCM frame) +scm_c_frame_prev (SCM frame) { SCM *this_fp, *new_fp, *new_sp; this_fp = SCM_VM_FRAME_FP (frame); @@ -272,10 +273,10 @@ scm_c_vm_frame_prev (SCM frame) if (new_fp) { new_fp = RELOC (frame, new_fp); new_sp = SCM_FRAME_LOWER_ADDRESS (this_fp) - 1; - return scm_c_make_vm_frame (SCM_VM_FRAME_STACK_HOLDER (frame), - new_fp, new_sp, - SCM_FRAME_RETURN_ADDRESS (this_fp), - SCM_VM_FRAME_OFFSET (frame)); + return scm_c_make_frame (SCM_VM_FRAME_STACK_HOLDER (frame), + new_fp, new_sp, + SCM_FRAME_RETURN_ADDRESS (this_fp), + SCM_VM_FRAME_OFFSET (frame)); } else return SCM_BOOL_F; @@ -285,8 +286,8 @@ scm_c_vm_frame_prev (SCM frame) void scm_bootstrap_frames (void) { - scm_tc16_vm_frame = scm_make_smob_type ("vm-frame", 0); - scm_set_smob_print (scm_tc16_vm_frame, vm_frame_print); + scm_tc16_frame = scm_make_smob_type ("frame", 0); + scm_set_smob_print (scm_tc16_frame, frame_print); scm_c_register_extension ("libguile", "scm_init_frames", (scm_t_extension_init_func)scm_init_frames, NULL); } |