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.

diff --git a/module/scripts/compile.scm b/module/scripts/compile.scm
index db58a33..76a2531 100644 (file)
--- 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 8f72430..631957a 100644 (file)
--- 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 8aba837..e3b3352 100644 (file)
--- 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 4a0e992..ba4ba53 100644 (file)
--- 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))