mirror/guile
mirror/guile
1
Fork 0
mirror of https://git.savannah.gnu.org/git/guile.git synced 2025-05-01 20:30:28 +02:00
Code Activity

* src/vm.c (lookup_variable): New function.

Browse source 
(scm_make_bytecode): Call lookup_variable for top-level variables.
* src/vm_engine.h (VM_VARIABLE_REF, VM_VARIABLE_SET): New macros.
* src/vm_system.c (TOPLEVEL_VAR, TOPLEVEL_VAR_SET): Removed.
Use VM_VARIABLE_REF and VM_VARIABLE_SET instead.
This commit is contained in:
Keisuke Nishida 2000-08-25 02:31:26 +00:00
parent db7880185f
commit 9df03fd0c1
3 changed files with 33 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

14
src/vm.c
View file

@ -334,6 +334,18 @@ init_bytecode_type ()
scm_set_smob_free (scm_bytecode_tag, free_bytecode);
}
/* Internal functions */
static SCM
lookup_variable (SCM sym)
{
SCM closure = scm_standard_eval_closure (scm_selected_module ());
SCM var = scm_apply (closure, SCM_LIST2 (sym, SCM_BOOL_F), SCM_EOL);
if (SCM_FALSEP (var))
var = scm_apply (closure, SCM_LIST2 (sym, SCM_BOOL_T), SCM_EOL);
return var;
}
/* Scheme interface */
SCM_DEFINE (scm_bytecode_p, "bytecode?", 1, 0, 0,
@ -428,7 +440,7 @@ SCM_DEFINE (scm_make_bytecode, "make-bytecode", 1, 0, 0,
case INST_TOP:
/* top-level variable */
SCM_VALIDATE_SYMBOL (1, old[i]);
new[i] = scm_intern0 (SCM_CHARS (old[i]));
new[i] = lookup_variable (old[i]);
break;
case INST_EXT:
/* just copy for now */

28
src/vm_engine.h
View file

@ -95,17 +95,6 @@
* Type checking
*/
#define VM_ASSERT_PROGRAM(OBJ) SCM_VALIDATE_PROGRAM (1, OBJ)
#undef VM_ASSERT_BOUND
#if VM_CHECK_BINDING
#define VM_ASSERT_BOUND(CELL) \
if (SCM_UNBNDP (SCM_CDR (CELL))) \
SCM_MISC_ERROR ("Unbound variable: ~S", SCM_LIST1 (SCM_CAR (CELL)))
#else
#define VM_ASSERT_BOUND(CELL)
#endif
#undef VM_ASSERT_LINK
#if VM_CHECK_LINK
#define VM_ASSERT_LINK(OBJ) \
@ -115,6 +104,23 @@
#define VM_ASSERT_LINK(OBJ)
#endif
/*
* Top-level variable
*/
#define VM_VARIABLE_REF(VAR) SCM_CDDR (VAR)
#define VM_VARIABLE_SET(VAR,VAL) SCM_SETCDR (SCM_CDR (VAR), VAL)
#undef VM_ASSERT_BOUND
#if VM_CHECK_BINDING
#define VM_ASSERT_BOUND(VAR) \
if (SCM_UNBNDP (VM_VARIABLE_REF (VAR))) \
SCM_MISC_ERROR ("Unbound variable: ~S", SCM_LIST1 (SCM_CADR (VAR)))
#else
#define VM_ASSERT_BOUND(CELL)
#endif
/*
* Hooks

9
src/vm_system.c
View file

@ -65,9 +65,6 @@
#define EXTERNAL_VAR1(OFFSET) SCM_VM_EXTERNAL_VARIABLE (SCM_VM_EXTERNAL_LINK (ext), OFFSET)
#define EXTERNAL_VAR2(OFFSET) SCM_VM_EXTERNAL_VARIABLE (SCM_VM_EXTERNAL_LINK (SCM_VM_EXTERNAL_LINK (ext)), OFFSET)
#define TOPLEVEL_VAR(CELL) SCM_CDR (CELL)
#define TOPLEVEL_VAR_SET(CELL,OBJ) SCM_SETCDR (CELL, OBJ)
/*
* Basic operations
@ -176,7 +173,7 @@ SCM_DEFINE_INSTRUCTION (pusht, "%pusht", INST_TOP)
{
ac = FETCH ();
VM_ASSERT_BOUND (ac);
PUSH (TOPLEVEL_VAR (ac));
PUSH (VM_VARIABLE_REF (ac));
NEXT;
}
@ -257,7 +254,7 @@ SCM_DEFINE_INSTRUCTION (loadt, "%loadt", INST_TOP)
{
ac = FETCH ();
VM_ASSERT_BOUND (ac);
RETURN (TOPLEVEL_VAR (ac));
RETURN (VM_VARIABLE_REF (ac));
}
@ -338,7 +335,7 @@ SCM_DEFINE_INSTRUCTION (savet, "%savet", INST_TOP)
{
SCM cell = FETCH ();
scm_set_object_property_x (ac, scm_sym_name, SCM_CAR (cell));
TOPLEVEL_VAR_SET (cell, ac);
VM_VARIABLE_SET (cell, ac);
NEXT;
}