summaryrefslogtreecommitdiff
path: root/module/language/objcode
diff options
context:
space:
mode:
authorAndy Wingo <wingo@pobox.com>2010-01-09 16:42:27 +0100
committerAndy Wingo <wingo@pobox.com>2010-01-09 16:43:26 +0100
commit6f16379e9a8d1f2d10c648793582a10772f29e32 (patch)
tree895e04e9865e359245c7c372ab5b9e7d4afad9f7 /module/language/objcode
parent75c3ed282029f4d2a80adf75f52ec1b9b34edcb7 (diff)
downloadguile-6f16379e9a8d1f2d10c648793582a10772f29e32.tar.gz
allocate free variables inline to closures
* libguile/_scm.h (SCM_OBJCODE_MINOR_VERSION): Bump. * libguile/programs.h (SCM_PROGRAM_FREE_VARIABLES) (SCM_PROGRAM_FREE_VARIABLE_REF, SCM_PROGRAM_FREE_VARIABLE_SET) (SCM_PROGRAM_NUM_FREE_VARIABLES): * libguile/programs.c (scm_make_program, scm_program_num_free_variables) (scm_program_free_variable_ref, scm_program_free_variable_set_x): Allocate free variables inline with programs, instead of being in a vect. Should improve locality, and require fewer local variables in the VM. * libguile/vm-engine.c (vm_engine): Remove free_vars and free_vars_count variables. * libguile/vm-engine.h (CACHE_PROGRAM): No need to muck with free_vars and free_vars_count. (CHECK_FREE_VARIABLE): Update for inline free vars. * libguile/vm-i-system.c (FREE_VARIABLE_REF): Update for inline free vars. (make-closure, fix-closure): Take the closure vals as separate stack args, and copy or fix them inline into the appropriate closure. * module/language/objcode/spec.scm (program-free-variables): Define a local version of this removed function. * module/language/tree-il/compile-glil.scm (flatten): Adjust to not make a vector when making closures. * module/system/vm/program.scm: Export program-num-free-variables, program-free-variable-ref, program-free-variable-set!, and remove program-free-variables. * test-suite/tests/tree-il.test ("lambda"): Update to not make vectors when making closures.
Diffstat (limited to 'module/language/objcode')
-rw-r--r--module/language/objcode/spec.scm7
1 files changed, 6 insertions, 1 deletions
diff --git a/module/language/objcode/spec.scm b/module/language/objcode/spec.scm
index 9837c5c1c..707dd1f9d 100644
--- a/module/language/objcode/spec.scm
+++ b/module/language/objcode/spec.scm
@@ -1,6 +1,6 @@
;;; Guile Lowlevel Intermediate Language
-;; Copyright (C) 2001, 2009 Free Software Foundation, Inc.
+;; Copyright (C) 2001, 2009, 2010 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
@@ -53,6 +53,11 @@
(lp (acons (binding:index b) (list b) ret)
(cdr locs))))))))
+(define (program-free-variables program)
+ (list->vector
+ (map (lambda (i) (program-free-variable-ref program i))
+ (iota (program-num-free-variables program)))))
+
(define (decompile-value x env opts)
(cond
((program? x)