mirror of
https://git.savannah.gnu.org/git/guile.git
synced 2025-05-01 12:20:26 +02:00
6f16379e9a
* 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.
88 lines
3.1 KiB
Scheme
88 lines
3.1 KiB
Scheme
;;; Guile Lowlevel Intermediate Language
|
|
|
|
;; 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
|
|
;;;; License as published by the Free Software Foundation; either
|
|
;;;; version 3 of the License, or (at your option) any later version.
|
|
;;;;
|
|
;;;; This library 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
|
|
;;;; Lesser General Public License for more details.
|
|
;;;;
|
|
;;;; You should have received a copy of the GNU Lesser General Public
|
|
;;;; License along with this library; if not, write to the Free Software
|
|
;;;; Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
|
|
|
|
;;; Code:
|
|
|
|
(define-module (language objcode spec)
|
|
#:use-module (system base language)
|
|
#:use-module (system vm objcode)
|
|
#:use-module (system vm program)
|
|
#:export (objcode))
|
|
|
|
(define (objcode->value x e opts)
|
|
(let ((thunk (make-program x #f #f)))
|
|
(if (eq? e (current-module))
|
|
;; save a cons in this case
|
|
(values (thunk) e e)
|
|
(save-module-excursion
|
|
(lambda ()
|
|
(set-current-module e)
|
|
(values (thunk) e e))))))
|
|
|
|
;; since locals are allocated on the stack and can have limited scope,
|
|
;; in many cases we use one local for more than one lexical variable. so
|
|
;; the returned locals set is a list, where element N of the list is
|
|
;; itself a list of bindings for local variable N.
|
|
(define (collapse-locals locs)
|
|
(let lp ((ret '()) (locs locs))
|
|
(if (null? locs)
|
|
(map cdr (sort! ret
|
|
(lambda (x y) (< (car x) (car y)))))
|
|
(let ((b (car locs)))
|
|
(cond
|
|
((assv-ref ret (binding:index b))
|
|
=> (lambda (bindings)
|
|
(append! bindings (list b))
|
|
(lp ret (cdr locs))))
|
|
(else
|
|
(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)
|
|
(let ((objs (program-objects x))
|
|
(meta (program-meta x))
|
|
(free-vars (program-free-variables x))
|
|
(binds (program-bindings x))
|
|
(srcs (program-sources x)))
|
|
(let ((blocs (and binds (collapse-locals binds))))
|
|
(values (program-objcode x)
|
|
`((objects . ,objs)
|
|
(meta . ,(and meta (meta)))
|
|
(free-vars . ,free-vars)
|
|
(blocs . ,blocs)
|
|
(sources . ,srcs))))))
|
|
((objcode? x)
|
|
(values x #f))
|
|
(else
|
|
(error "can't decompile ~A: not a program or objcode" x))))
|
|
|
|
(define-language objcode
|
|
#:title "Guile Object Code"
|
|
#:version "0.3"
|
|
#:reader #f
|
|
#:printer write-objcode
|
|
#:compilers `((value . ,objcode->value))
|
|
#:decompilers `((value . ,decompile-value))
|
|
)
|