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 /libguile/programs.c | |
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 'libguile/programs.c')
-rw-r--r-- | libguile/programs.c | 52 |
1 files changed, 16 insertions, 36 deletions
diff --git a/libguile/programs.c b/libguile/programs.c index 892b6770f..9e74f98e3 100644 --- a/libguile/programs.c +++ b/libguile/programs.c @@ -1,4 +1,4 @@ -/* 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 License @@ -36,7 +36,7 @@ scm_t_bits scm_tc16_program; static SCM write_program = SCM_BOOL_F; SCM_DEFINE (scm_make_program, "make-program", 1, 2, 0, - (SCM objcode, SCM objtable, SCM external), + (SCM objcode, SCM objtable, SCM free_vars), "") #define FUNC_NAME s_scm_make_program { @@ -45,18 +45,12 @@ SCM_DEFINE (scm_make_program, "make-program", 1, 2, 0, objtable = SCM_BOOL_F; else if (scm_is_true (objtable)) SCM_VALIDATE_VECTOR (2, objtable); - if (SCM_UNLIKELY (SCM_UNBNDP (external))) - external = SCM_EOL; - else - /* FIXME: currently this test is quite expensive (can be 2-3% of total - execution time in programs that make many closures). We could remove it, - yes, but we'd get much better gains if we used some other method, like - just capturing the variables that we need instead of all heap-allocated - variables. Dunno. Keeping the check for now, as it's a user-callable - function, and inlining the op in the vm's make-closure operation. */ - SCM_VALIDATE_LIST (3, external); - - SCM_RETURN_NEWSMOB3 (scm_tc16_program, objcode, objtable, external); + if (SCM_UNLIKELY (SCM_UNBNDP (free_vars))) + free_vars = SCM_BOOL_F; + else if (free_vars != SCM_BOOL_F) + SCM_VALIDATE_VECTOR (3, free_vars); + + SCM_RETURN_NEWSMOB3 (scm_tc16_program, objcode, objtable, free_vars); } #undef FUNC_NAME @@ -65,8 +59,8 @@ program_mark (SCM obj) { if (scm_is_true (SCM_PROGRAM_OBJTABLE (obj))) scm_gc_mark (SCM_PROGRAM_OBJTABLE (obj)); - if (!scm_is_null (SCM_PROGRAM_EXTERNALS (obj))) - scm_gc_mark (SCM_PROGRAM_EXTERNALS (obj)); + if (scm_is_true (SCM_PROGRAM_FREE_VARS (obj))) + scm_gc_mark (SCM_PROGRAM_FREE_VARS (obj)); return SCM_PROGRAM_OBJCODE (obj); } @@ -151,10 +145,9 @@ SCM_DEFINE (scm_program_arity, "program-arity", 1, 0, 0, SCM_VALIDATE_PROGRAM (1, program); p = SCM_PROGRAM_DATA (program); - return scm_list_4 (SCM_I_MAKINUM (p->nargs), + return scm_list_3 (SCM_I_MAKINUM (p->nargs), SCM_I_MAKINUM (p->nrest), - SCM_I_MAKINUM (p->nlocs), - SCM_I_MAKINUM (p->nexts)); + SCM_I_MAKINUM (p->nlocs)); } #undef FUNC_NAME @@ -191,7 +184,7 @@ SCM_DEFINE (scm_program_meta, "program-meta", 1, 0, 0, metaobj = scm_objcode_meta (SCM_PROGRAM_OBJCODE (program)); if (scm_is_true (metaobj)) - return scm_make_program (metaobj, SCM_BOOL_F, SCM_EOL); + return scm_make_program (metaobj, SCM_BOOL_F, SCM_BOOL_F); else return SCM_BOOL_F; } @@ -300,26 +293,13 @@ scm_c_program_source (SCM program, size_t ip) return source; /* (addr . (filename . (line . column))) */ } -SCM_DEFINE (scm_program_external, "program-external", 1, 0, 0, +SCM_DEFINE (scm_program_free_vars, "program-free-vars", 1, 0, 0, (SCM program), "") -#define FUNC_NAME s_scm_program_external -{ - SCM_VALIDATE_PROGRAM (1, program); - return SCM_PROGRAM_EXTERNALS (program); -} -#undef FUNC_NAME - -SCM_DEFINE (scm_program_external_set_x, "program-external-set!", 2, 0, 0, - (SCM program, SCM external), - "Modify the list of closure variables of @var{program} (for " - "debugging purposes).") -#define FUNC_NAME s_scm_program_external_set_x +#define FUNC_NAME s_scm_program_free_vars { SCM_VALIDATE_PROGRAM (1, program); - SCM_VALIDATE_LIST (2, external); - SCM_PROGRAM_EXTERNALS (program) = external; - return SCM_UNSPECIFIED; + return SCM_PROGRAM_FREE_VARS (program); } #undef FUNC_NAME |