diff options
| author | Andy Wingo <wingo@pobox.com> | 2013-11-08 17:42:54 +0100 |
|---|---|---|
| committer | Andy Wingo <wingo@pobox.com> | 2013-11-08 17:42:54 +0100 |
| commit | 84680d238299c3b2c8be42b16a8be0ff6e02ba5c (patch) | |
| tree | 69cf6033285f36721f7ce273f7544c091d224880 | |
| parent | 741073719e657c8d7103287e942a72a6aedcce88 (diff) | |
| download | guile-84680d238299c3b2c8be42b16a8be0ff6e02ba5c.tar.gz | |
Miscellaneous fixups related to objcode removal.
* module/scripts/compile.scm: Fix --help message.
* module/system/repl/command.scm (disassemble): Fix error message.
* module/system/vm/frame.scm: Remove objcode import.
* module/system/vm/objcode.scm: Remove some exports related to the
objcode type.
| -rw-r--r-- | module/scripts/compile.scm | 2 | ||||
| -rw-r--r-- | module/system/repl/command.scm | 3 | ||||
| -rw-r--r-- | module/system/vm/frame.scm | 1 | ||||
| -rw-r--r-- | module/system/vm/objcode.scm | 6 |
4 files changed, 5 insertions, 7 deletions
diff --git a/module/scripts/compile.scm b/module/scripts/compile.scm index db58a339a..76a253129 100644 --- a/module/scripts/compile.scm +++ b/module/scripts/compile.scm @@ -158,7 +158,7 @@ Compile each Guile source file FILE into a Guile object. for a list of available warnings -f, --from=LANG specify a source language other than `scheme' - -t, --to=LANG specify a target language other than `objcode' + -t, --to=LANG specify a target language other than `rtl' -T, --target=TRIPLET produce bytecode for host TRIPLET Note that auto-compilation will be turned off. diff --git a/module/system/repl/command.scm b/module/system/repl/command.scm index 8f72430c8..631957a83 100644 --- a/module/system/repl/command.scm +++ b/module/system/repl/command.scm @@ -497,7 +497,8 @@ Disassemble a compiled procedure." ((bytevector? obj) (disassemble-image (load-image obj))) (else - (format #t "Argument to ,disassemble not a procedure or objcode: ~a~%" + (format #t + "Argument to ,disassemble not a procedure or a bytevector: ~a~%" obj))))) (define-meta-command (disassemble-file repl file) diff --git a/module/system/vm/frame.scm b/module/system/vm/frame.scm index 8aba837d1..e3b3352d5 100644 --- a/module/system/vm/frame.scm +++ b/module/system/vm/frame.scm @@ -22,7 +22,6 @@ #:use-module (system base pmatch) #:use-module (system vm program) #:use-module (system vm instruction) - #:use-module (system vm objcode) #:export (frame-bindings frame-lookup-binding frame-binding-ref frame-binding-set! diff --git a/module/system/vm/objcode.scm b/module/system/vm/objcode.scm index 4a0e9924a..ba4ba53e7 100644 --- a/module/system/vm/objcode.scm +++ b/module/system/vm/objcode.scm @@ -19,10 +19,8 @@ ;;; Code: (define-module (system vm objcode) - #:export (objcode? objcode-meta - bytecode->objcode objcode->bytecode - load-thunk-from-file load-thunk-from-memory - word-size byte-order + #:export (load-thunk-from-file + load-thunk-from-memory find-mapped-elf-image all-mapped-elf-images)) (load-extension (string-append "libguile-" (effective-version)) |