#ifndef ROOTH
#define ROOTH
-/* Copyright (C) 1996 Free Software Foundation, Inc.
+/* Copyright (C) 1996,1998, 2000 Free Software Foundation, Inc.
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
*
* You should have received a copy of the GNU General Public License
* along with this software; see the file COPYING. If not, write to
- * the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
+ * the Free Software Foundation, Inc., 59 Temple Place, Suite 330,
+ * Boston, MA 02111-1307 USA
*
* As a special exception, the Free Software Foundation gives permission
* for additional uses of the text contained in its release of GUILE.
*
* If you write modifications of your own for GUILE, it is your choice
* whether to permit this exception to apply to your modifications.
- * If you do not wish that, delete this exception notice.
- */
+ * If you do not wish that, delete this exception notice. */
+
+/* Software engineering face-lift by Greg J. Badros, 11-Dec-1999,
+ gjb@cs.washington.edu, http://www.cs.washington.edu/homes/gjb */
\f
\f
-#include <libguile/__scm.h>
+#include "libguile/__scm.h"
+#include "libguile/debug.h"
+#include "libguile/throw.h"
\f
#define scm_symhash scm_sys_protects[5]
#define scm_weak_symhash scm_sys_protects[6]
#define scm_symhash_vars scm_sys_protects[7]
-#define scm_kw_obarray scm_sys_protects[8]
-#define scm_type_obj_list scm_sys_protects[9]
-#define scm_first_type scm_sys_protects[10]
-#define scm_stand_in_procs scm_sys_protects[11]
-#define scm_object_whash scm_sys_protects[12]
-#define scm_permobjs scm_sys_protects[13]
-#define scm_asyncs scm_sys_protects[14]
+#define scm_keyword_obarray scm_sys_protects[8]
+#define scm_stand_in_procs scm_sys_protects[9]
+#define scm_object_whash scm_sys_protects[10]
+#define scm_permobjs scm_sys_protects[11]
+#define scm_asyncs scm_sys_protects[12]
+#define scm_protects scm_sys_protects[13]
#ifdef DEBUG_EXTENSIONS
-#define scm_source_whash scm_sys_protects[15]
-#define SCM_NUM_PROTECTS 16
-#else
+#define scm_source_whash scm_sys_protects[14]
#define SCM_NUM_PROTECTS 15
+#else
+#define SCM_NUM_PROTECTS 14
#endif
extern SCM scm_sys_protects[];
\f
-struct scm_root_state
+extern long scm_tc16_root;
+
+#define SCM_ROOTP(obj) (SCM_NIMP(obj) && (scm_tc16_root == SCM_TYP16 (obj)))
+#define SCM_ROOT_STATE(root) ((scm_root_state *) SCM_CELL_WORD_1 (root))
+
+typedef struct scm_root_state
{
SCM_STACKITEM * stack_base;
jmp_buf save_regs_gc_mark;
SCM dynwinds;
SCM continuation_stack;
SCM continuation_stack_ptr;
+#ifdef DEBUG_EXTENSIONS
+ /* It is very inefficient to have this variable in the root state. */
+ scm_debug_frame *last_debug_frame;
+#endif
SCM progargs; /* vestigial */
SCM exitval; /* vestigial */
SCM def_inp;
SCM def_outp;
SCM def_errp;
+ SCM cur_loadp;
+
+ SCM fluids;
+
+ SCM system_transformer; /* No longer used (but kept for binary compatibility) */
+ SCM top_level_lookup_closure_var; /* No longer used (but kept for binary compatibility) */
- SCM system_transformer;
- SCM top_level_lookup_thunk_var;
-};
+ SCM handle; /* The root object for this root state */
+ SCM parent; /* The parent root object */
+} scm_root_state;
#define scm_stack_base (scm_root->stack_base)
#define scm_save_regs_gc_mark (scm_root->save_regs_gc_mark)
#define scm_continuation_stack (scm_root->continuation_stack)
#define scm_continuation_stack_ptr (scm_root->continuation_stack_ptr)
#define scm_progargs (scm_root->progargs)
+#ifdef USE_THREADS
+#define scm_last_debug_frame (scm_root->last_debug_frame)
+#endif
#define scm_exitval (scm_root->exitval)
#define scm_cur_inp (scm_root->cur_inp)
#define scm_cur_outp (scm_root->cur_outp)
#define scm_def_inp (scm_root->def_inp)
#define scm_def_outp (scm_root->def_outp)
#define scm_def_errp (scm_root->def_errp)
-#define scm_top_level_lookup_thunk_var (scm_root->top_level_lookup_thunk_var)
-#define scm_system_transformer (scm_root->system_transformer)
+#define scm_cur_loadp (scm_root->cur_loadp)
+
+#ifdef USE_THREADS
+#define scm_root ((scm_root_state *) SCM_THREAD_LOCAL_DATA)
+#define scm_set_root(new_root) SCM_SET_THREAD_LOCAL_DATA (new_root)
+#else /* USE_THREADS */
+extern struct scm_root_state *scm_root;
+#define scm_set_root(new_root) (scm_root = (new_root))
+#endif /* USE_THREADS */
+\f
-extern struct scm_root_state * scm_root;
+extern SCM scm_make_root (SCM parent);
+extern SCM scm_internal_cwdr (scm_catch_body_t body,
+ void *body_data,
+ scm_catch_handler_t handler,
+ void *handler_data,
+ SCM_STACKITEM *stack_start);
+extern SCM scm_call_with_dynamic_root (SCM thunk, SCM handler);
+extern SCM scm_dynamic_root (void);
+extern SCM scm_apply_with_dynamic_root (SCM proc, SCM a1, SCM args, SCM handler);
+extern void scm_init_root (void);
\f
+#if (SCM_DEBUG_DEPRECATED == 0)
-#ifdef __STDC__
+/* Use the catch functions from throw.[ch] instead of: */
extern SCM scm_call_catching_errors (SCM (*thunk)(), SCM (*err_filter)(), void * closure);
-#else /* STDC */
-extern SCM scm_call_catching_errors ();
-
-#endif /* STDC */
-
-
-
-
-
+#endif /* SCM_DEBUG_DEPRECATED == 0 */
#endif /* ROOTH */
+
+/*
+ Local Variables:
+ c-file-style: "gnu"
+ End:
+*/
HCoop / bpt / guile.git / blobdiff