summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndy Wingo <wingo@pobox.com>2008-08-20 14:11:35 -0700
committerAndy Wingo <wingo@pobox.com>2008-08-20 14:11:35 -0700
commit22e95889ffb32ac09b799ef23df8b4eaeb3face3 (patch)
treecf6d23ce315b377388205a4da41a1cee03cf18ed
parentb9d8ed05024ecfefa46f71888c0e502c2e3ff844 (diff)
downloadguile-22e95889ffb32ac09b799ef23df8b4eaeb3face3.tar.gz
remove unused "envs" code from guile-vm
* src/Makefile.am: * src/envs.c: * src/envs.h: Remove the envs code, which was historically used to implement modules. But since we use Guile's modules, these aren't necessary. * src/vm.c: * src/vm_loader.c: * module/system/vm/assemble.scm: Remove code bits that trafficked in yon deprecation.
-rw-r--r--module/system/vm/assemble.scm3
-rw-r--r--src/Makefile.am6
-rw-r--r--src/envs.c259
-rw-r--r--src/envs.h74
-rw-r--r--src/vm.c1
-rw-r--r--src/vm_loader.c10
6 files changed, 3 insertions, 350 deletions
diff --git a/module/system/vm/assemble.scm b/module/system/vm/assemble.scm
index d121dc52f..aa5f97657 100644
--- a/module/system/vm/assemble.scm
+++ b/module/system/vm/assemble.scm
@@ -42,7 +42,6 @@
(define-record (<vm-asm> venv glil body))
(define-record (<venv> parent nexts closure?))
-(define-record (<vmod> id))
(define-record (<vlink-now> name))
(define-record (<vlink-later> module name))
(define-record (<vdefine> module name))
@@ -282,8 +281,6 @@
((<vdefine> module name)
;; FIXME: dump module
(push-code! `(define ,(symbol->string name))))
- ((<vmod> id)
- (push-code! `(load-module ,id)))
(else
(error "assemble: unknown record type" (record-type-descriptor x)))))
((and (integer? x) (exact? x))
diff --git a/src/Makefile.am b/src/Makefile.am
index 32de942fa..fab6063fc 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -10,14 +10,14 @@ CFLAGS:=$(filter-out -Wmissing-prototypes,$(CFLAGS))
lib_LTLIBRARIES = libguile-vm.la
libguile_vm_la_SOURCES = \
bootstrap.h \
- envs.c frames.c instructions.c objcodes.c programs.c vm.c \
- envs.h frames.h instructions.h objcodes.h programs.h vm.h \
+ frames.c instructions.c objcodes.c programs.c vm.c \
+ frames.h instructions.h objcodes.h programs.h vm.h \
vm_engine.h vm_expand.h
libguile_vm_la_LDFLAGS = -version-info 0:0:0 -export-dynamic
EXTRA_DIST = vm_engine.c vm_system.c vm_scheme.c vm_loader.c \
guilec.in guile-disasm.in
BUILT_SOURCES = vm_system.i vm_scheme.i vm_loader.i \
- envs.x frames.x instructions.x objcodes.x programs.x vm.x
+ frames.x instructions.x objcodes.x programs.x vm.x
INCLUDES =
CLEANFILES = guilec guile-disasm
diff --git a/src/envs.c b/src/envs.c
deleted file mode 100644
index 434b98fab..000000000
--- a/src/envs.c
+++ /dev/null
@@ -1,259 +0,0 @@
-/* Copyright (C) 2001 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
- * the Free Software Foundation; either version 2, or (at your option)
- * any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * 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, 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.
- *
- * The exception is that, if you link the GUILE library with other files
- * to produce an executable, this does not by itself cause the
- * resulting executable to be covered by the GNU General Public License.
- * Your use of that executable is in no way restricted on account of
- * linking the GUILE library code into it.
- *
- * This exception does not however invalidate any other reasons why
- * the executable file might be covered by the GNU General Public License.
- *
- * This exception applies only to the code released by the
- * Free Software Foundation under the name GUILE. If you copy
- * code from other Free Software Foundation releases into a copy of
- * GUILE, as the General Public License permits, the exception does
- * not apply to the code that you add in this way. To avoid misleading
- * anyone as to the status of such modified files, you must delete
- * this exception notice from them.
- *
- * 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 HAVE_CONFIG_H
-# include <config.h>
-#endif
-
-#include <string.h>
-#include "envs.h"
-
-#define ENV_OBARRAY_SIZE 31
-
-
-scm_t_bits scm_tc16_env;
-
-SCM
-scm_c_make_env (void)
-{
- struct scm_env *p = scm_gc_malloc (sizeof (struct scm_env),
- "env");
- p->identifier = SCM_BOOL_F;
- p->obarray = scm_c_make_hash_table (ENV_OBARRAY_SIZE);
- SCM_RETURN_NEWSMOB (scm_tc16_env, p);
-}
-
-static SCM
-env_mark (SCM obj)
-{
- struct scm_env *p = SCM_ENV_DATA (obj);
- scm_gc_mark (p->identifier);
- return p->obarray;
-}
-
-static scm_sizet
-env_free (SCM obj)
-{
- scm_gc_free (SCM_ENV_DATA (obj), sizeof (struct scm_env),
- "env");
- return 0;
-}
-
-
-/*
- * C interface
- */
-
-static SCM env_table;
-static SCM load_env;
-
-SCM
-scm_c_lookup_env (SCM identifier)
-{
- /* Check if the env is already loaded */
- SCM vcell = scm_hash_get_handle (env_table, identifier);
-
- /* If not, load the env */
- if (SCM_FALSEP (vcell))
- {
- SCM env = scm_apply (SCM_CDR (load_env),
- SCM_LIST1 (identifier), SCM_EOL);
- if (!SCM_ENV_P (env))
- scm_misc_error ("scm_c_lookup_env",
- "Invalid env: ~S", SCM_LIST1 (env));
- vcell = scm_hash_create_handle_x (env_table, identifier, env);
- }
-
- return (SCM_CDR (vcell));
-}
-
-SCM
-scm_c_env_vcell (SCM env, SCM name, int intern)
-{
- SCM vcell;
- SCM ob = SCM_ENV_OBARRAY (env);
-
- if (intern)
- vcell = scm_hash_create_handle_x (ob, name, SCM_UNSPECIFIED);
- else
- vcell = scm_hash_get_handle (ob, name);
-
- return vcell;
-}
-
-
-/*
- * Scheme interface
- */
-
-SCM_DEFINE (scm_make_env, "make-env", 0, 0, 0,
- (),
- "")
-#define FUNC_NAME s_scm_make_env
-{
- return scm_c_make_env ();
-}
-#undef FUNC_NAME
-
-SCM_DEFINE (scm_env_p, "env?", 1, 0, 0,
- (SCM x),
- "")
-#define FUNC_NAME s_scm_env_p
-{
- return SCM_BOOL (SCM_ENV_P (x));
-}
-#undef FUNC_NAME
-
-SCM_DEFINE (scm_env_identifier, "env-identifier", 1, 0, 0,
- (SCM env),
- "")
-#define FUNC_NAME s_scm_env_identifier
-{
- SCM_VALIDATE_ENV (1, env);
- return SCM_ENV_IDENTIFIER (env);
-}
-#undef FUNC_NAME
-
-SCM_DEFINE (scm_set_env_identifier_x, "set-env-identifier!", 2, 0, 0,
- (SCM env, SCM identifier),
- "")
-#define FUNC_NAME s_scm_set_env_identifier_x
-{
- SCM_VALIDATE_ENV (1, env);
- SCM_VALIDATE_SYMBOL (2, identifier);
- SCM_ENV_IDENTIFIER (env) = identifier;
- return SCM_UNSPECIFIED;
-}
-#undef FUNC_NAME
-
-SCM_DEFINE (scm_env_bound_p, "env-bound?", 2, 0, 0,
- (SCM env, SCM name),
- "")
-#define FUNC_NAME s_scm_env_bound_p
-{
- SCM obarray, vcell;
- SCM_VALIDATE_ENV (1, env);
- SCM_VALIDATE_SYMBOL (2, name);
-
- obarray = SCM_ENV_OBARRAY (env);
- vcell = scm_hash_get_handle (obarray, name);
-
- return SCM_BOOL (!SCM_FALSEP (vcell) && !SCM_UNBNDP (SCM_CDR (vcell)));
-}
-#undef FUNC_NAME
-
-SCM_DEFINE (scm_env_ref, "env-ref", 2, 0, 0,
- (SCM env, SCM name),
- "")
-#define FUNC_NAME s_scm_env_ref
-{
- SCM vcell;
- SCM_VALIDATE_ENV (1, env);
- SCM_VALIDATE_SYMBOL (2, name);
- vcell = scm_hash_get_handle (name, SCM_ENV_OBARRAY (env));
- if (SCM_FALSEP (vcell) || SCM_UNBNDP (SCM_CDR (vcell)))
- SCM_MISC_ERROR ("Unbound variable in env: ~A, ~A",
- SCM_LIST2 (env, name));
- return SCM_CDR (vcell);
-}
-#undef FUNC_NAME
-
-SCM_DEFINE (scm_env_set_x, "env-set!", 3, 0, 0,
- (SCM env, SCM name, SCM val),
- "")
-#define FUNC_NAME s_scm_env_set_x
-{
- SCM vcell;
- SCM_VALIDATE_ENV (1, env);
- SCM_VALIDATE_SYMBOL (2, name);
- vcell = scm_hash_get_handle (name, SCM_ENV_OBARRAY (env));
- if (SCM_FALSEP (vcell))
- SCM_MISC_ERROR ("Unbound variable in env: ~A, ~A",
- SCM_LIST2 (env, name));
- SCM_SETCDR (vcell, val);
-
- return SCM_UNSPECIFIED;
-}
-#undef FUNC_NAME
-
-SCM_DEFINE (scm_env_define, "env-define", 3, 0, 0,
- (SCM env, SCM name, SCM val),
- "")
-#define FUNC_NAME s_scm_env_define
-{
- SCM vcell;
- SCM_VALIDATE_ENV (1, env);
- SCM_VALIDATE_SYMBOL (2, name);
- vcell = scm_c_env_vcell (env, name, 1);
- SCM_SETCDR (vcell, val);
- return SCM_UNSPECIFIED;
-}
-#undef FUNC_NAME
-
-
-void
-scm_init_envs (void)
-{
- SCM mod;
-
- scm_tc16_env = scm_make_smob_type ("env", 0);
- scm_set_smob_mark (scm_tc16_env, env_mark);
- scm_set_smob_free (scm_tc16_env, env_free);
-
- env_table = scm_permanent_object (scm_c_make_hash_table (51));
-
-#ifndef SCM_MAGIC_SNARFER
-#include "envs.x"
-#endif
-
- mod = scm_current_module ();
- load_env = scm_eval_closure_lookup (scm_standard_eval_closure (mod),
- scm_str2symbol ("load-env"),
- SCM_BOOL_T);
- load_env = scm_variable_ref (load_env);
- /* Was: SCM_VARVCELL (load_env); */
-}
-
-/*
- Local Variables:
- c-file-style: "gnu"
- End:
-*/
diff --git a/src/envs.h b/src/envs.h
deleted file mode 100644
index 04e204fac..000000000
--- a/src/envs.h
+++ /dev/null
@@ -1,74 +0,0 @@
-/* Copyright (C) 2001 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
- * the Free Software Foundation; either version 2, or (at your option)
- * any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * 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, 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.
- *
- * The exception is that, if you link the GUILE library with other files
- * to produce an executable, this does not by itself cause the
- * resulting executable to be covered by the GNU General Public License.
- * Your use of that executable is in no way restricted on account of
- * linking the GUILE library code into it.
- *
- * This exception does not however invalidate any other reasons why
- * the executable file might be covered by the GNU General Public License.
- *
- * This exception applies only to the code released by the
- * Free Software Foundation under the name GUILE. If you copy
- * code from other Free Software Foundation releases into a copy of
- * GUILE, as the General Public License permits, the exception does
- * not apply to the code that you add in this way. To avoid misleading
- * anyone as to the status of such modified files, you must delete
- * this exception notice from them.
- *
- * 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. */
-
-#ifndef _SCM_ENVS_H_
-#define _SCM_ENVS_H_
-
-#include <libguile.h>
-
-extern scm_t_bits scm_tc16_env;
-
-struct scm_env
-{
- SCM identifier;
- SCM obarray;
-};
-typedef struct scm_env scm_env_t;
-
-#define SCM_ENV_P(x) SCM_SMOB_PREDICATE (scm_tc16_env, x)
-#define SCM_ENV_DATA(x) ((struct scm_env *) SCM_SMOB_DATA (x))
-#define SCM_VALIDATE_ENV(p,x) SCM_MAKE_VALIDATE (p, x, ENV_P)
-
-#define SCM_ENV_IDENTIFIER(x) (SCM_ENV_DATA(x)->identifier)
-#define SCM_ENV_OBARRAY(x) (SCM_ENV_DATA(x)->obarray)
-
-extern SCM scm_c_lookup_env (SCM identifier);
-extern SCM scm_c_env_vcell (SCM env, SCM name, int intern);
-
-extern void scm_init_envs (void);
-
-#endif /* _SCM_ENVS_H_ */
-
-/*
- Local Variables:
- c-file-style: "gnu"
- End:
-*/
diff --git a/src/vm.c b/src/vm.c
index 127fe70b1..e0a368c2b 100644
--- a/src/vm.c
+++ b/src/vm.c
@@ -44,7 +44,6 @@
#endif
#include <string.h>
-#include "envs.h"
#include "frames.h"
#include "instructions.h"
#include "objcodes.h"
diff --git a/src/vm_loader.c b/src/vm_loader.c
index d0046f345..db0ee9b57 100644
--- a/src/vm_loader.c
+++ b/src/vm_loader.c
@@ -103,16 +103,6 @@ VM_DEFINE_LOADER (load_keyword, "load-keyword")
NEXT;
}
-VM_DEFINE_LOADER (load_module, "load-module")
-{
- size_t len;
- FETCH_LENGTH (len);
- SYNC_REGISTER ();
- PUSH (scm_c_lookup_env (scm_from_locale_symboln ((char *)ip, len)));
- ip += len;
- NEXT;
-}
-
VM_DEFINE_LOADER (load_program, "load-program")
{
size_t len;