mirror of
https://git.savannah.gnu.org/git/guile.git
synced 2025-04-30 20:00:19 +02:00
d808027782
(Best-ability ChangeLog annotation added by Christopher Allan Webber.) * libguile/loader.c (load_thunk_from_memory): Refactor, adding "constants" argument and passing to "init" if appropriate. (load_thunk_from_file): Call "load-thunk-from-memory" with "constants" set to #f. (scm_load_thunk_from_memory): Instead of a bytevector, accept a cons of "(bytevector . constants)", where constants is either a vector or #f. Pass this into "load_thunk_from_memory". * module/language/bytecode/spec.scm: Adapt printer. * module/language/cps/compile-bytecode.scm (compile-bytecode): New variable. * module/system/repl/command.scm (disassemble): Adapt to expect pair which includes bytevector as its car. * module/system/vm/assembler.scm <asm>: Add "to-file?" slot. (fresh-block): New variable. (make-assembler): Adapt to expect "to-file?" keyword argument. (intern-constant): Support "asm-to-file?" in checks. (emit-init-constants, link-data): Likewise. (link-assembly): Update logic for handling "(bytevector . constants)" pair, as well as the expectations of its invocation by compile-bytecode.
43 lines
1.5 KiB
Scheme
43 lines
1.5 KiB
Scheme
;;; Bytecode
|
|
|
|
;; Copyright (C) 2013 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 bytecode spec)
|
|
#:use-module (system base language)
|
|
#:use-module (system vm loader)
|
|
#:use-module (ice-9 binary-ports)
|
|
#:export (bytecode))
|
|
|
|
(define (bytecode->value x e opts)
|
|
(let ((thunk (load-thunk-from-memory x)))
|
|
(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))))))
|
|
|
|
(define-language bytecode
|
|
#:title "Bytecode"
|
|
#:compilers `((value . ,bytecode->value))
|
|
#:printer (lambda (x port)
|
|
(put-bytevector port (car x)))
|
|
#:reader get-bytevector-all
|
|
#:for-humans? #f)
|