diff options
| author | Andy Wingo <wingo@pobox.com> | 2010-01-05 19:45:56 +0100 |
|---|---|---|
| committer | Andy Wingo <wingo@pobox.com> | 2010-01-07 23:42:41 +0100 |
| commit | 6f3b0cc29eb1c1dcb2e02058e3db9ab04ca36b42 (patch) | |
| tree | cd54bfb0b6196206aa67d26638e92bc9a857f134 /libguile/frames.h | |
| parent | a6029b97ea84d9e9a13d71b21213b6fd0be41e87 (diff) | |
| download | guile-6f3b0cc29eb1c1dcb2e02058e3db9ab04ca36b42.tar.gz | |
tc7 tags for vm-related data
* libguile/tags.h (scm_tc7_frame, scm_tc7_objcode, scm_tc7_vm)
(scm_tc7_vm_cont): Take more tc7s for VM-related data structures.
* libguile/evalext.c (scm_self_evaluating_p):
* libguile/gc.c (scm_i_tag_name):
* libguile/goops.c (scm_class_of, create_standard_classes):
* libguile/print.c (iprin1): Add cases for the new tc7s.
* libguile/frames.c:
* libguile/frames.h:
* libguile/objcodes.c:
* libguile/objcodes.h:
* libguile/vm.c:
* libguile/vm.h: Desmobify.
* libguile/vm.c (scm_vm_apply): Export to Scheme, because VM objects are
no longer applicable.
* module/system/repl/command.scm (profile):
* module/system/vm/trace.scm (vm-trace):
* module/system/vm/vm.scm (vm-load): Call vm-apply to run a program in a
VM instead of treating the VM as applicable.
Diffstat (limited to 'libguile/frames.h')
| -rw-r--r-- | libguile/frames.h | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/libguile/frames.h b/libguile/frames.h index 0636fe8a1..33432eb48 100644 --- a/libguile/frames.h +++ b/libguile/frames.h @@ -1,4 +1,4 @@ -/* Copyright (C) 2001, 2009 Free Software Foundation, Inc. +/* Copyright (C) 2001, 2009, 2010 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 @@ -87,8 +87,6 @@ * Heap frames */ -SCM_API scm_t_bits scm_tc16_frame; - struct scm_frame { SCM stack_holder; @@ -98,8 +96,8 @@ struct scm_frame scm_t_ptrdiff offset; }; -#define SCM_VM_FRAME_P(x) SCM_SMOB_PREDICATE (scm_tc16_frame, x) -#define SCM_VM_FRAME_DATA(x) ((struct scm_frame*)SCM_SMOB_DATA (x)) +#define SCM_VM_FRAME_P(x) (SCM_NIMP (x) && SCM_TYP7 (x) == scm_tc7_frame) +#define SCM_VM_FRAME_DATA(x) ((struct scm_frame*)SCM_CELL_WORD_1 (x)) #define SCM_VM_FRAME_STACK_HOLDER(f) SCM_VM_FRAME_DATA(f)->stack_holder #define SCM_VM_FRAME_FP(f) SCM_VM_FRAME_DATA(f)->fp #define SCM_VM_FRAME_SP(f) SCM_VM_FRAME_DATA(f)->sp @@ -122,7 +120,8 @@ 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); -SCM_INTERNAL void scm_bootstrap_frames (void); +SCM_INTERNAL void scm_i_frame_print (SCM frame, SCM port, + scm_print_state *pstate); SCM_INTERNAL void scm_init_frames (void); #endif /* _SCM_FRAMES_H_ */ |