mirror of
https://git.savannah.gnu.org/git/guile.git
synced 2025-04-29 19:30:36 +02:00
* module/system/il/inline.scm: New module, implements generic inlining of scheme functions. It even does the right thing regarding (define arity:nopt caddr) and such. So now there are many more inlines: the arithmetics, `apply', the caddr family, etc. This makes the benchmarks *much* faster. * module/language/scheme/translate.scm (trans): Remove the %scheme-primitives code in favor of the generic (scheme il inline) code. Adds inlining for +, -, =, etc. * src/vm.c (vm_puts): Fix to work. * module/system/base/compile.scm (system): Export load/compile also. * module/system/il/compile.scm (optimize): Further debitrotting, but I haven't tried this function yet. It seems that <ghil-inst> was what <ghil-inline> is. * module/system/il/ghil.scm (*core-primitives*, *macro-module*) (ghil-primitive-macro?, ghil-macro-expander, ghil-primitive?): Remove these unused things. * module/system/il/macros.scm: Removed, replaced with inline.scm. * module/system/vm/assemble.scm (stack->bytes): Before, the final serialization code did an (apply u8vector (apply append (map u8vector->list ...))). Aside from the misspelling of append-map, this ends up pushing all elements of the u8vector on the stack -- assuredly not what you want. But besides even that, I think that pushing more than 32k arguments on the stack brings out some other bug that I think was hidden before, because now we actually use the `apply' VM instruction. Further testing is needed here, I think. Fixed the code to be more efficient, which fixes the manifestation of this particular bug: a failure to self-compile after inlining was enabled. * module/system/vm/bootstrap.scm: New module, serves to bootstrap boot-9's `load-compiled'. That way when we load (system vm core), we're loading compiled code already. * module/system/vm/core.scm: Use (system vm bootstrap). * src/guilec.in: Use the bootstrap code, so that we really are compiling with an entirely compiled compiler. * module/system/repl/repl.scm (default-catch-handler): An attempt at making the repl print a backtrace; more work needed here. * module/system/vm/frame.scm (make-frame-chain): Fix some misspellings -- I think, anyway.
173 lines
4.9 KiB
Scheme
173 lines
4.9 KiB
Scheme
;;; Guile VM core
|
||
|
||
;; 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 program; see the file COPYING. If not, write to
|
||
;; the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
|
||
;; Boston, MA 02111-1307, USA.
|
||
|
||
;;; Code:
|
||
|
||
(define-module (system vm core)
|
||
:use-module (system vm bootstrap)
|
||
:export (arity:nargs arity:nrest arity:nlocs arity:nexts
|
||
make-binding binding:name binding:extp binding:index
|
||
program-bindings program-sources
|
||
frame-arguments frame-local-variables frame-external-variables
|
||
frame-environment
|
||
frame-variable-exists? frame-variable-ref frame-variable-set!
|
||
frame-object-name
|
||
vm-fetch-locals vm-fetch-externals vm-return-value
|
||
vms:time vms:clock vm-load))
|
||
|
||
;;;
|
||
;;; Core procedures
|
||
;;;
|
||
|
||
;; FIXME
|
||
(module-re-export! (current-module)
|
||
(hash-fold (lambda (k v d) (cons k d)) '()
|
||
(module-obarray
|
||
(resolve-interface '(system vm bootstrap)))))
|
||
|
||
|
||
;;;
|
||
;;; Programs
|
||
;;;
|
||
|
||
(define arity:nargs car)
|
||
(define arity:nrest cadr)
|
||
(define arity:nlocs caddr)
|
||
(define arity:nexts cadddr)
|
||
|
||
(define (make-binding name extp index)
|
||
(list name extp index))
|
||
|
||
(define binding:name car)
|
||
(define binding:extp cadr)
|
||
(define binding:index caddr)
|
||
|
||
(define (program-bindings prog)
|
||
(cond ((program-meta prog) => car)
|
||
(else '())))
|
||
|
||
(define (program-sources prog)
|
||
(cond ((program-meta prog) => cdr)
|
||
(else '())))
|
||
|
||
|
||
;;;
|
||
;;; Frames
|
||
;;;
|
||
|
||
(define (frame-arguments frame)
|
||
(let* ((prog (frame-program frame))
|
||
(arity (program-arity prog)))
|
||
(do ((n (+ (arity:nargs arity) -1) (1- n))
|
||
(l '() (cons (frame-local-ref frame n) l)))
|
||
((< n 0) l))))
|
||
|
||
(define (frame-local-variables frame)
|
||
(let* ((prog (frame-program frame))
|
||
(arity (program-arity prog)))
|
||
(do ((n (+ (arity:nargs arity) (arity:nlocs arity) -1) (1- n))
|
||
(l '() (cons (frame-local-ref frame n) l)))
|
||
((< n 0) l))))
|
||
|
||
(define (frame-external-variables frame)
|
||
(frame-external-link frame))
|
||
|
||
(define (frame-external-ref frame index)
|
||
(list-ref (frame-external-link frame) index))
|
||
|
||
(define (frame-external-set! frame index val)
|
||
(list-set! (frame-external-link frame) index val))
|
||
|
||
(define (frame-binding-ref frame binding)
|
||
(if (binding:extp binding)
|
||
(frame-external-ref frame (binding:index binding))
|
||
(frame-local-ref frame (binding:index binding))))
|
||
|
||
(define (frame-binding-set! frame binding val)
|
||
(if (binding:extp binding)
|
||
(frame-external-set! frame (binding:index binding) val)
|
||
(frame-local-set! frame (binding:index binding) val)))
|
||
|
||
(define (frame-bindings frame addr)
|
||
(do ((bs (program-bindings (frame-program frame)) (cdr bs))
|
||
(ls '() (if (cdar bs) (cons (cdar bs) ls) (cdr ls))))
|
||
((or (null? bs) (> (caar bs) addr))
|
||
(apply append ls))))
|
||
|
||
(define (frame-lookup-binding frame addr sym)
|
||
(do ((bs (frame-bindings frame addr) (cdr bs)))
|
||
((or (null? bs) (eq? sym (binding:name (car bs))))
|
||
(and (pair? bs) (car bs)))))
|
||
|
||
(define (frame-object-binding frame addr obj)
|
||
(do ((bs (frame-bindings frame addr) (cdr bs)))
|
||
((or (null? bs) (eq? obj (frame-binding-ref frame (car bs))))
|
||
(and (pair? bs) (car bs)))))
|
||
|
||
(define (frame-environment frame addr)
|
||
(map (lambda (binding)
|
||
(cons (binding:name binding) (frame-binding-ref frame binding)))
|
||
(frame-bindings frame addr)))
|
||
|
||
(define (frame-variable-exists? frame addr sym)
|
||
(if (frame-lookup-binding frame addr sym) #t #f))
|
||
|
||
(define (frame-variable-ref frame addr sym)
|
||
(cond ((frame-lookup-binding frame addr sym) =>
|
||
(lambda (binding) (frame-binding-ref frame binding)))
|
||
(else (error "Unknown variable:" sym))))
|
||
|
||
(define (frame-variable-set! frame addr sym val)
|
||
(cond ((frame-lookup-binding frame addr sym) =>
|
||
(lambda (binding) (frame-binding-set! frame binding val)))
|
||
(else (error "Unknown variable:" sym))))
|
||
|
||
(define (frame-object-name frame addr obj)
|
||
(cond ((frame-object-binding frame addr obj) => binding:name)
|
||
(else #f)))
|
||
|
||
|
||
;;;
|
||
;;; Current status
|
||
;;;
|
||
|
||
(define (vm-fetch-locals vm)
|
||
(frame-local-variables (vm-this-frame vm)))
|
||
|
||
(define (vm-fetch-externals vm)
|
||
(frame-external-variables (vm-this-frame vm)))
|
||
|
||
(define (vm-return-value vm)
|
||
(car (vm-fetch-stack vm)))
|
||
|
||
|
||
;;;
|
||
;;; Statistics
|
||
;;;
|
||
|
||
(define (vms:time stat) (vector-ref stat 0))
|
||
(define (vms:clock stat) (vector-ref stat 1))
|
||
|
||
|
||
;;;
|
||
;;; Loader
|
||
;;;
|
||
|
||
(define (vm-load vm objcode)
|
||
(vm (objcode->program objcode)))
|