diff options
author | Andy Wingo <wingo@pobox.com> | 2009-07-23 17:12:10 +0200 |
---|---|---|
committer | Andy Wingo <wingo@pobox.com> | 2009-07-23 17:15:13 +0200 |
commit | 20d47c3915c1b910e683d4b010b91c48047d6251 (patch) | |
tree | b4d9a6d3dd5b9b696d358d8436970a856ddd1ee5 /module/system/vm/program.scm | |
parent | 66d3e9a32c2da4eedb3f316e0dcffe92e6631f87 (diff) | |
download | guile-20d47c3915c1b910e683d4b010b91c48047d6251.tar.gz |
remove "externals" from the vm
* libguile/frames.c (scm_frame_external_link): Removed.
* libguile/frames.h: No need to have the "external link" in the stack
frame -- update macros to take the new situation into account.
* libguile/objcodes.h (struct scm_objcode): Rename the nexts field to
"unused". In the future we can use it for nlocs, I think.
(SCM_OBJCODE_NEXTS): removed.
* libguile/programs.h:
* libguile/programs.c (scm_make_program): Expect the third argument to
be a vector of free variables, not a list of free variables.
SCM_BOOL_F indicates no free variables, not SCM_EOL.
(program_mark): Adapt.
(scm_program_arity): No more nexts.
(scm_program_free_vars): Replaces scm_program_externals.
* libguile/vm-engine.c (VM_CHECK_EXTERNAL)
(vm_engine): No need for the "external" var.
* libguile/vm-engine.h (CACHE_PROGRAM): Update for SCM_PROGRAM_FREE_VARS
instead of SCM_PROGRAM_EXTERNALS.
(NEW_FRAME): Update for new frame size, and no need to cons up
externals. Yay :)
* libguile/vm-i-loader.c (load-program): Update for scm_make_program.
* libguile/vm-i-system.c (external-ref, external-set): No more.
(make-closure): No more.
(goto/args): No need to re-cons externals here. Update for new stack
frame size.
(mv-call, return, return/values): Update for new frame size. No need
to reinstate externals on return.
* libguile/vm.c (really_make_boot_program, scm_load_compiled_with_vm):
Update for scm_make_program.
* module/language/objcode/spec.scm (objcode-env-externals): Treat '() as
#f, for the externals. Need to clean this up later...
* module/system/vm/program.scm (arity:nexts): Remove. Rename
program-external to program-free-vars.
Diffstat (limited to 'module/system/vm/program.scm')
-rw-r--r-- | module/system/vm/program.scm | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/module/system/vm/program.scm b/module/system/vm/program.scm index 9db4a754b..99021ed05 100644 --- a/module/system/vm/program.scm +++ b/module/system/vm/program.scm @@ -1,6 +1,6 @@ ;;; Guile VM program functions -;;; Copyright (C) 2001 Free Software Foundation, Inc. +;;; Copyright (C) 2001, 2009 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 @@ -31,16 +31,15 @@ program-properties program-property program-documentation program-name program-arguments - program-arity program-external-set! program-meta + program-arity program-meta program-objcode program? program-objects - program-module program-base program-external)) + program-module program-base program-free-vars)) (load-extension "libguile" "scm_init_programs") (define arity:nargs car) (define arity:nrest cadr) (define arity:nlocs caddr) -(define arity:nexts cadddr) (define (make-binding name extp index start end) (list name extp index start end)) |