mirror of
https://git.savannah.gnu.org/git/guile.git
synced 2025-04-29 19:30:36 +02:00
22bcbe8cc9
* 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.
83 lines
2.7 KiB
Scheme
83 lines
2.7 KiB
Scheme
;;; Guile VM frame functions
|
||
|
||
;;; Copyright (C) 2001 Free Software Foundation, Inc.
|
||
;;; Copyright (C) 2005 Ludovic Courtès <ludovic.courtes@laas.fr>
|
||
;;;
|
||
;;; 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 of the License, 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; if not, write to the Free Software
|
||
;;; Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
|
||
|
||
;;; Code:
|
||
|
||
(define-module (system vm frame)
|
||
:use-module ((system vm core) :renamer (symbol-prefix-proc 'vm:))
|
||
:export (frame-number frame-address
|
||
vm-current-frame-chain vm-last-frame-chain
|
||
print-frame print-frame-call))
|
||
|
||
|
||
;;;
|
||
;;; Frame chain
|
||
;;;
|
||
|
||
(define frame-number (make-object-property))
|
||
(define frame-address (make-object-property))
|
||
|
||
(define (vm-current-frame-chain vm)
|
||
(make-frame-chain (vm:vm-this-frame vm) (vm:vm:ip vm)))
|
||
|
||
(define (vm-last-frame-chain vm)
|
||
(make-frame-chain (vm:vm-last-frame vm) (vm:vm:ip vm)))
|
||
|
||
(define (make-frame-chain frame addr)
|
||
(let* ((link (vm:frame-dynamic-link frame))
|
||
(chain (if (eq? link #t)
|
||
'()
|
||
(cons frame (make-frame-chain
|
||
link (vm:frame-return-address frame))))))
|
||
(set! (frame-number frame) (length chain))
|
||
(set! (frame-address frame)
|
||
(- addr (program-base (vm:frame-program frame))))
|
||
chain))
|
||
|
||
|
||
;;;
|
||
;;; Pretty printing
|
||
;;;
|
||
|
||
(define (print-frame frame)
|
||
(format #t "#~A " (vm:frame-number frame))
|
||
(print-frame-call frame)
|
||
(newline))
|
||
|
||
(define (print-frame-call frame)
|
||
(define (abbrev x)
|
||
(cond ((list? x) (if (> (length x) 3)
|
||
(list (abbrev (car x)) (abbrev (cadr x)) '...)
|
||
(map abbrev x)))
|
||
((pair? x) (cons (abbrev (car x)) (abbrev (cdr x))))
|
||
((vector? x) (case (vector-length x)
|
||
((0) x)
|
||
((1) (vector (abbrev (vector-ref x 0))))
|
||
(else (vector (abbrev (vector-ref x 0)) '...))))
|
||
(else x)))
|
||
(write (abbrev (cons (program-name frame)
|
||
(vm:frame-arguments frame)))))
|
||
|
||
(define (program-name frame)
|
||
(let ((prog (vm:frame-program frame))
|
||
(link (vm:frame-dynamic-link frame)))
|
||
(or (object-property prog 'name)
|
||
(vm:frame-object-name link (1- (vm:frame-address link)) prog)
|
||
(hash-fold (lambda (s v d) (if (eq? prog (variable-ref v)) s d))
|
||
prog (module-obarray (current-module))))))
|