summaryrefslogtreecommitdiff
path: root/module
diff options
context:
space:
mode:
Diffstat (limited to 'module')
-rw-r--r--module/Makefile.am10
-rw-r--r--module/ice-9/eval-string.scm2
-rw-r--r--module/language/bytecode.scm (renamed from module/language/rtl.scm)20
-rw-r--r--module/language/bytecode/spec.scm (renamed from module/language/rtl/spec.scm)16
-rw-r--r--module/language/cps/arities.scm4
-rw-r--r--module/language/cps/compile-bytecode.scm (renamed from module/language/cps/compile-rtl.scm)12
-rw-r--r--module/language/cps/contification.scm2
-rw-r--r--module/language/cps/elide-values.scm2
-rw-r--r--module/language/cps/primitives.scm20
-rw-r--r--module/language/cps/reify-primitives.scm4
-rw-r--r--module/language/cps/spec.scm4
-rw-r--r--module/language/cps/specialize-primcalls.scm8
-rw-r--r--module/scripts/compile.scm4
-rw-r--r--module/system/base/compile.scm4
-rw-r--r--module/system/repl/common.scm2
-rw-r--r--module/system/vm/assembler.scm50
-rw-r--r--module/system/vm/debug.scm8
-rw-r--r--module/system/vm/disassembler.scm4
-rw-r--r--module/system/vm/dwarf.scm2
19 files changed, 89 insertions, 89 deletions
diff --git a/module/Makefile.am b/module/Makefile.am
index beb1a99c4..95dd23632 100644
--- a/module/Makefile.am
+++ b/module/Makefile.am
@@ -57,7 +57,7 @@ SOURCES = \
language/tree-il.scm \
$(TREE_IL_LANG_SOURCES) \
$(CPS_LANG_SOURCES) \
- $(RTL_LANG_SOURCES) \
+ $(BYTECODE_LANG_SOURCES) \
$(VALUE_LANG_SOURCES) \
$(SCHEME_LANG_SOURCES) \
$(SYSTEM_BASE_SOURCES) \
@@ -120,7 +120,7 @@ CPS_LANG_SOURCES = \
language/cps.scm \
language/cps/arities.scm \
language/cps/closure-conversion.scm \
- language/cps/compile-rtl.scm \
+ language/cps/compile-bytecode.scm \
language/cps/constructors.scm \
language/cps/contification.scm \
language/cps/dfg.scm \
@@ -132,9 +132,9 @@ CPS_LANG_SOURCES = \
language/cps/specialize-primcalls.scm \
language/cps/verify.scm
-RTL_LANG_SOURCES = \
- language/rtl.scm \
- language/rtl/spec.scm
+BYTECODE_LANG_SOURCES = \
+ language/bytecode.scm \
+ language/bytecode/spec.scm
VALUE_LANG_SOURCES = \
language/value/spec.scm
diff --git a/module/ice-9/eval-string.scm b/module/ice-9/eval-string.scm
index 3cf73b9b5..789980938 100644
--- a/module/ice-9/eval-string.scm
+++ b/module/ice-9/eval-string.scm
@@ -86,5 +86,5 @@
(if (or compile? (not (language-evaluator lang)))
((load-thunk-from-memory
- (read-and-compile port #:from lang #:to 'rtl)))
+ (read-and-compile port #:from lang #:to 'bytecode)))
(read-and-eval port #:lang lang))))))))
diff --git a/module/language/rtl.scm b/module/language/bytecode.scm
index 89b9ac84b..2ef98675a 100644
--- a/module/language/rtl.scm
+++ b/module/language/bytecode.scm
@@ -1,4 +1,4 @@
-;;; Register Transfer Language (RTL)
+;;; Bytecode
;; Copyright (C) 2013 Free Software Foundation, Inc.
@@ -18,11 +18,11 @@
;;; Code:
-(define-module (language rtl)
+(define-module (language bytecode)
#:use-module (ice-9 match)
#:use-module ((srfi srfi-1) #:select (fold))
#:export (instruction-list
- rtl-instruction-arity
+ instruction-arity
builtin-name->index
builtin-index->name))
@@ -31,7 +31,7 @@
(load-extension (string-append "libguile-" (effective-version))
"scm_init_vm_builtins")
-(define (compute-rtl-instruction-arity name args)
+(define (compute-instruction-arity name args)
(define (first-word-arity word)
(case word
((U8_X24) 0)
@@ -74,17 +74,17 @@
(cached-toplevel-box . (1 . 3))
(cached-module-box . (1 . 4))))
-(define (compute-rtl-instruction-arities)
+(define (compute-instruction-arities)
(let ((table (make-hash-table)))
(for-each
(match-lambda
;; Put special cases here.
((name op '! . args)
(hashq-set! table name
- (cons 0 (compute-rtl-instruction-arity name args))))
+ (cons 0 (compute-instruction-arity name args))))
((name op '<- . args)
(hashq-set! table name
- (cons 1 (1- (compute-rtl-instruction-arity name args))))))
+ (cons 1 (1- (compute-instruction-arity name args))))))
(instruction-list))
(for-each (match-lambda
((name . arity)
@@ -92,7 +92,7 @@
*macro-instruction-arities*)
table))
-(define *rtl-instruction-arities* (delay (compute-rtl-instruction-arities)))
+(define *instruction-arities* (delay (compute-instruction-arities)))
-(define (rtl-instruction-arity name)
- (hashq-ref (force *rtl-instruction-arities*) name))
+(define (instruction-arity name)
+ (hashq-ref (force *instruction-arities*) name))
diff --git a/module/language/rtl/spec.scm b/module/language/bytecode/spec.scm
index 0d9fa6a65..89256c5c2 100644
--- a/module/language/rtl/spec.scm
+++ b/module/language/bytecode/spec.scm
@@ -1,4 +1,4 @@
-;;; Register Transfer Language (RTL)
+;;; Bytecode
;; Copyright (C) 2013 Free Software Foundation, Inc.
@@ -18,13 +18,13 @@
;;; Code:
-(define-module (language rtl spec)
+(define-module (language bytecode spec)
#:use-module (system base language)
#:use-module (system vm loader)
#:use-module (ice-9 binary-ports)
- #:export (rtl))
+ #:export (bytecode))
-(define (rtl->value x e opts)
+(define (bytecode->value x e opts)
(let ((thunk (load-thunk-from-memory x)))
(if (eq? e (current-module))
;; save a cons in this case
@@ -34,9 +34,9 @@
(set-current-module e)
(values (thunk) e e))))))
-(define-language rtl
- #:title "Register Transfer Language"
- #:compilers `((value . ,rtl->value))
- #:printer (lambda (rtl port) (put-bytevector port rtl))
+(define-language bytecode
+ #:title "Bytecode"
+ #:compilers `((value . ,bytecode->value))
+ #:printer (lambda (bytecode port) (put-bytevector port bytecode))
#:reader get-bytevector-all
#:for-humans? #f)
diff --git a/module/language/cps/arities.scm b/module/language/cps/arities.scm
index 10056831c..8b9815224 100644
--- a/module/language/cps/arities.scm
+++ b/module/language/cps/arities.scm
@@ -131,7 +131,7 @@
;; Primcalls to return are in tail position.
($continue ktail src ,exp))
(($ $primcall (? (lambda (name)
- (and (not (prim-rtl-instruction name))
+ (and (not (prim-instruction name))
(not (branching-primitive? name))))))
($continue k src ,exp))
(($ $primcall name args)
@@ -139,7 +139,7 @@
((out . in)
(if (= in (length args))
(adapt-exp out k src
- (let ((inst (prim-rtl-instruction name)))
+ (let ((inst (prim-instruction name)))
(if (and inst (not (eq? inst name)))
(build-cps-exp ($primcall inst args))
exp)))
diff --git a/module/language/cps/compile-rtl.scm b/module/language/cps/compile-bytecode.scm
index 6ad5d8b5c..aef2265be 100644
--- a/module/language/cps/compile-rtl.scm
+++ b/module/language/cps/compile-bytecode.scm
@@ -18,12 +18,12 @@
;;; Commentary:
;;;
-;;; Compiling CPS to RTL. The result is in the RTL language, which
-;;; happens to be an ELF image as a bytecode.
+;;; Compiling CPS to bytecode. The result is in the bytecode language,
+;;; which happens to be an ELF image as a bytecode.
;;;
;;; Code:
-(define-module (language cps compile-rtl)
+(define-module (language cps compile-bytecode)
#:use-module (ice-9 match)
#:use-module (srfi srfi-1)
#:use-module (language cps)
@@ -38,7 +38,7 @@
#:use-module (language cps slot-allocation)
#:use-module (language cps specialize-primcalls)
#:use-module (system vm assembler)
- #:export (compile-rtl))
+ #:export (compile-bytecode))
;; TODO: Local var names.
@@ -305,7 +305,7 @@
(emit-bv-f64-ref asm dst (slot bv) (slot idx)))
(($ $primcall name args)
;; FIXME: Inline all the cases.
- (let ((inst (prim-rtl-instruction name)))
+ (let ((inst (prim-instruction name)))
(emit-text asm `((,inst ,dst ,@(map slot args))))))))
(define (compile-effect label exp k nlocals)
@@ -478,7 +478,7 @@
(_ (values))))
-(define (compile-rtl exp env opts)
+(define (compile-bytecode exp env opts)
(let* ((exp (fix-arities exp))
(exp (optimize exp opts))
(exp (convert-closures exp))
diff --git a/module/language/cps/contification.scm b/module/language/cps/contification.scm
index 7d1f651f5..fe0a3ad3d 100644
--- a/module/language/cps/contification.scm
+++ b/module/language/cps/contification.scm
@@ -35,7 +35,7 @@
#:use-module (language cps)
#:use-module (language cps dfg)
#:use-module (language cps primitives)
- #:use-module (language rtl)
+ #:use-module (language bytecode)
#:export (contify))
(define (compute-contification fun)
diff --git a/module/language/cps/elide-values.scm b/module/language/cps/elide-values.scm
index 0168ab87f..5835b2aec 100644
--- a/module/language/cps/elide-values.scm
+++ b/module/language/cps/elide-values.scm
@@ -22,7 +22,7 @@
;;; they are calls, and indeed the later reify-primitives pass turns
;;; them into calls. Because no return arity checking is done for these
;;; primitives, if a later optimization pass simplifies the primcall to
-;;; an RTL operation, the tail of the simplification has to be a
+;;; a VM operation, the tail of the simplification has to be a
;;; primcall to 'values. Most of these primcalls can be elided, and
;;; that is the job of this pass.
;;;
diff --git a/module/language/cps/primitives.scm b/module/language/cps/primitives.scm
index 5a5fadc63..58506a5f0 100644
--- a/module/language/cps/primitives.scm
+++ b/module/language/cps/primitives.scm
@@ -26,13 +26,13 @@
#:use-module (ice-9 match)
#:use-module ((srfi srfi-1) #:select (fold))
#:use-module (srfi srfi-26)
- #:use-module (language rtl)
- #:export (prim-rtl-instruction
+ #:use-module (language bytecode)
+ #:export (prim-instruction
branching-primitive?
prim-arity
))
-(define *rtl-instruction-aliases*
+(define *instruction-aliases*
'((+ . add) (1+ . add1)
(- . sub) (1- . sub1)
(* . mul) (/ . div)
@@ -87,24 +87,24 @@
(<= . (1 . 2))
(>= . (1 . 2))))
-(define (compute-prim-rtl-instructions)
+(define (compute-prim-instructions)
(let ((table (make-hash-table)))
(for-each
(match-lambda ((inst . _) (hashq-set! table inst inst)))
(instruction-list))
(for-each
(match-lambda ((prim . inst) (hashq-set! table prim inst)))
- *rtl-instruction-aliases*)
+ *instruction-aliases*)
(for-each
(match-lambda ((inst . arity) (hashq-set! table inst inst)))
*macro-instruction-arities*)
table))
-(define *prim-rtl-instructions* (delay (compute-prim-rtl-instructions)))
+(define *prim-instructions* (delay (compute-prim-instructions)))
-;; prim -> rtl-instruction | #f
-(define (prim-rtl-instruction name)
- (hashq-ref (force *prim-rtl-instructions*) name))
+;; prim -> instruction | #f
+(define (prim-instruction name)
+ (hashq-ref (force *prim-instructions*) name))
(define (branching-primitive? name)
(and (assq name *branching-primcall-arities*) #t))
@@ -114,7 +114,7 @@
(define (prim-arity name)
(or (hashq-ref *prim-arities* name)
(let ((arity (cond
- ((prim-rtl-instruction name) => rtl-instruction-arity)
+ ((prim-instruction name) => instruction-arity)
((assq name *branching-primcall-arities*) => cdr)
(else
(error "Primitive of unknown arity" name)))))
diff --git a/module/language/cps/reify-primitives.scm b/module/language/cps/reify-primitives.scm
index 501c23c94..9a57bf181 100644
--- a/module/language/cps/reify-primitives.scm
+++ b/module/language/cps/reify-primitives.scm
@@ -29,7 +29,7 @@
#:use-module (language cps)
#:use-module (language cps dfg)
#:use-module (language cps primitives)
- #:use-module (language rtl)
+ #:use-module (language bytecode)
#:export (reify-primitives))
(define (module-box src module name public? bound? val-proc)
@@ -144,7 +144,7 @@
($continue k src ($call proc ()))))
(($ $primcall name args)
(cond
- ((or (prim-rtl-instruction name) (branching-primitive? name))
+ ((or (prim-instruction name) (branching-primitive? name))
;; Assume arities are correct.
term)
(else
diff --git a/module/language/cps/spec.scm b/module/language/cps/spec.scm
index 493b54740..f1255afeb 100644
--- a/module/language/cps/spec.scm
+++ b/module/language/cps/spec.scm
@@ -21,7 +21,7 @@
(define-module (language cps spec)
#:use-module (system base language)
#:use-module (language cps)
- #:use-module (language cps compile-rtl)
+ #:use-module (language cps compile-bytecode)
#:export (cps))
(define* (write-cps exp #:optional (port (current-output-port)))
@@ -32,6 +32,6 @@
#:reader (lambda (port env) (read port))
#:printer write-cps
#:parser parse-cps
- #:compilers `((rtl . ,compile-rtl))
+ #:compilers `((bytecode . ,compile-bytecode))
#:for-humans? #f
)
diff --git a/module/language/cps/specialize-primcalls.scm b/module/language/cps/specialize-primcalls.scm
index 8e2f38fd0..f5d61bd00 100644
--- a/module/language/cps/specialize-primcalls.scm
+++ b/module/language/cps/specialize-primcalls.scm
@@ -18,9 +18,9 @@
;;; Commentary:
;;;
-;;; Some RTL operations can encode an immediate as an operand. This
-;;; pass tranforms generic primcalls to these specialized primcalls, if
-;;; possible.
+;;; Some bytecode operations can encode an immediate as an operand.
+;;; This pass tranforms generic primcalls to these specialized
+;;; primcalls, if possible.
;;;
;;; Code:
@@ -61,7 +61,7 @@
(($ $continue)
,term)))
(define (visit-primcall k src name args)
- ;; If we introduce an RTL op from a primcall without an RTL op, we
+ ;; If we introduce a VM op from a primcall without a VM op, we
;; will need to ensure that the return arity matches. Rely on the
;; elide-values pass to clean up.
(define-syntax-rule (adapt-void exp)
diff --git a/module/scripts/compile.scm b/module/scripts/compile.scm
index 76a253129..ab2c456d4 100644
--- a/module/scripts/compile.scm
+++ b/module/scripts/compile.scm
@@ -139,7 +139,7 @@ There is NO WARRANTY, to the extent permitted by law.~%"))
(cons #:O o)
o)))
(from (or (assoc-ref options 'from) 'scheme))
- (to (or (assoc-ref options 'to) 'rtl))
+ (to (or (assoc-ref options 'to) 'bytecode))
(target (or (assoc-ref options 'target) %host-type))
(input-files (assoc-ref options 'input-files))
(output-file (assoc-ref options 'output-file))
@@ -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 `rtl'
+ -t, --to=LANG specify a target language other than `bytecode'
-T, --target=TRIPLET produce bytecode for host TRIPLET
Note that auto-compilation will be turned off.
diff --git a/module/system/base/compile.scm b/module/system/base/compile.scm
index 18941d710..d6a53d6b3 100644
--- a/module/system/base/compile.scm
+++ b/module/system/base/compile.scm
@@ -133,7 +133,7 @@
(define* (compile-file file #:key
(output-file #f)
(from (current-language))
- (to 'rtl)
+ (to 'bytecode)
(env (default-environment from))
(opts '())
(canonicalization 'relative))
@@ -207,7 +207,7 @@
(define* (read-and-compile port #:key
(from (current-language))
- (to 'rtl)
+ (to 'bytecode)
(env (default-environment from))
(opts '()))
(let ((from (ensure-language from))
diff --git a/module/system/repl/common.scm b/module/system/repl/common.scm
index 4e216791b..0a38710af 100644
--- a/module/system/repl/common.scm
+++ b/module/system/repl/common.scm
@@ -177,7 +177,7 @@ See <http://www.gnu.org/licenses/lgpl.html>, for more details.")
(define (repl-compile repl form)
(let ((from (repl-language repl))
(opts (repl-compile-options repl)))
- (compile form #:from from #:to 'rtl #:opts opts
+ (compile form #:from from #:to 'bytecode #:opts opts
#:env (current-module))))
(define (repl-expand repl form)
diff --git a/module/system/vm/assembler.scm b/module/system/vm/assembler.scm
index 7a0cdcc1a..e8eba306f 100644
--- a/module/system/vm/assembler.scm
+++ b/module/system/vm/assembler.scm
@@ -1,4 +1,4 @@
-;;; Guile RTL assembler
+;;; Guile bytecode assembler
;;; Copyright (C) 2001, 2009, 2010, 2012, 2013 Free Software Foundation, Inc.
;;;
@@ -19,16 +19,16 @@
;;; Commentary:
;;;
;;; This module implements an assembler that creates an ELF image from
-;;; RTL assembly and macro-assembly. The input can be given in
+;;; bytecode assembly and macro-assembly. The input can be given in
;;; s-expression form, like ((OP ARG ...) ...). Internally there is a
;;; procedural interface, the emit-OP procedures, but that is not
;;; currently exported.
;;;
-;;; "Primitive instructions" correspond to RTL VM operations.
-;;; Assemblers for primitive instructions are generated programmatically
-;;; from (instruction-list), which itself is derived from the VM
-;;; sources. There are also "macro-instructions" like "label" or
-;;; "load-constant" that expand to 0 or more primitive instructions.
+;;; "Primitive instructions" correspond to VM operations. Assemblers
+;;; for primitive instructions are generated programmatically from
+;;; (instruction-list), which itself is derived from the VM sources.
+;;; There are also "macro-instructions" like "label" or "load-constant"
+;;; that expand to 0 or more primitive instructions.
;;;
;;; The assembler also handles some higher-level tasks, like creating
;;; the symbol table, other metadata sections, creating a constant table
@@ -47,7 +47,7 @@
#:use-module (system vm dwarf)
#:use-module (system vm elf)
#:use-module (system vm linker)
- #:use-module (language rtl)
+ #:use-module (language bytecode)
#:use-module (rnrs bytevectors)
#:use-module (ice-9 binary-ports)
#:use-module (ice-9 vlist)
@@ -63,7 +63,7 @@
-;;; RTL code consists of 32-bit units, often subdivided in some way.
+;;; Bytecode consists of 32-bit units, often subdivided in some way.
;;; These helpers create one 32-bit unit from multiple components.
(define-inlinable (pack-u8-u24 x y)
@@ -136,7 +136,7 @@
;;; A <meta> entry collects metadata for one procedure. Procedures are
-;;; written as contiguous ranges of RTL code.
+;;; written as contiguous ranges of bytecode.
;;;
(define-syntax-rule (assert-match arg pattern kind)
(let ((x arg))
@@ -179,7 +179,7 @@
;;; also maintains ancillary information such as the constant table, a
;;; relocation list, and so on.
;;;
-;;; RTL code consists of 32-bit units. We emit RTL code using native
+;;; Bytecode consists of 32-bit units. We emit bytecode using native
;;; endianness. If we're targeting a foreign endianness, we byte-swap
;;; the bytevector as a whole instead of conditionalizing each access.
;;;
@@ -192,7 +192,7 @@
meta sources)
asm?
- ;; We write RTL code into what is logically a growable vector,
+ ;; We write bytecode into what is logically a growable vector,
;; implemented as a list of blocks. asm-cur is the current block, and
;; asm-idx is the current index into that block, in 32-bit units.
;;
@@ -203,9 +203,9 @@
;; beginning of an instruction (in u32 units). It is updated after
;; writing all the words for one primitive instruction. It models the
;; position of the instruction pointer during execution, given that
- ;; the RTL VM updates the IP only at the end of executing the
- ;; instruction, and is thus useful for computing offsets between two
- ;; points in a program.
+ ;; the VM updates the IP only at the end of executing the instruction,
+ ;; and is thus useful for computing offsets between two points in a
+ ;; program.
;;
(start asm-start set-asm-start!)
@@ -244,8 +244,8 @@
;;
(constants asm-constants set-asm-constants!)
- ;; A list of RTL instructions needed to initialize the constants.
- ;; Will run in a thunk with 2 local variables.
+ ;; A list of instructions needed to initialize the constants. Will
+ ;; run in a thunk with 2 local variables.
;;
(inits asm-inits set-asm-inits!)
@@ -485,8 +485,8 @@ later by the linker."
(define (emit-text asm instructions)
"Assemble @var{instructions} using the assembler @var{asm}.
-@var{instructions} is a sequence of RTL instructions, expressed as a
-list of lists. This procedure can be called many times before calling
+@var{instructions} is a sequence of instructions, expressed as a list of
+lists. This procedure can be called many times before calling
@code{link-assembly}."
(for-each (lambda (inst)
(apply (or (hashq-ref assemblers (car inst))
@@ -1203,10 +1203,10 @@ needed."
(define *bytecode-minor-version* 3)
(define (link-dynamic-section asm text rw rw-init)
- "Link the dynamic section for an ELF image with RTL text, given the
-writable data section @var{rw} needing fixup from the procedure with
-label @var{rw-init}. @var{rw-init} may be false. If @var{rw} is true,
-it will be added to the GC roots at runtime."
+ "Link the dynamic section for an ELF image with bytecode @var{text},
+given the writable data section @var{rw} needing fixup from the
+procedure with label @var{rw-init}. @var{rw-init} may be false. If
+@var{rw} is true, it will be added to the GC roots at runtime."
(define-syntax-rule (emit-dynamic-section word-size %set-uword! reloc-type)
(let* ((endianness (asm-endianness asm))
(bv (make-bytevector (* word-size (if rw (if rw-init 12 10) 6)) 0))
@@ -1316,8 +1316,8 @@ it will be added to the GC roots at runtime."
;;;
;;; All of the offsets and addresses are 32 bits. We can expand in the
;;; future to use 64-bit offsets if appropriate, but there are other
-;;; aspects of RTL that constrain us to a total image that fits in 32
-;;; bits, so for the moment we'll simplify the problem space.
+;;; aspects of bytecode that constrain us to a total image that fits in
+;;; 32 bits, so for the moment we'll simplify the problem space.
;;;
;;; The following flags values are defined:
;;;
diff --git a/module/system/vm/debug.scm b/module/system/vm/debug.scm
index 0ad387ac4..b4dfc3e16 100644
--- a/module/system/vm/debug.scm
+++ b/module/system/vm/debug.scm
@@ -18,8 +18,8 @@
;;; Commentary:
;;;
-;;; Guile's RTL compiler and linker serialize debugging information into
-;;; separate sections of the ELF image. This module reads those
+;;; Guile's bytecode compiler and linker serialize debugging information
+;;; into separate sections of the ELF image. This module reads those
;;; sections.
;;;
;;; Code:
@@ -175,8 +175,8 @@ during the fold are omitted."
(define (find-debug-context addr)
"Find and return the debugging context corresponding to the ELF image
containing the address @var{addr}. @var{addr} is an integer. If no ELF
-image is found, return @code{#f}. It's possible for an RTL program not
-to have an ELF image if the program was defined in as a stub in C."
+image is found, return @code{#f}. It's possible for an bytecode program
+not to have an ELF image if the program was defined in as a stub in C."
(and=> (find-mapped-elf-image addr)
debug-context-from-image))
diff --git a/module/system/vm/disassembler.scm b/module/system/vm/disassembler.scm
index 577124a7e..6eb14c5eb 100644
--- a/module/system/vm/disassembler.scm
+++ b/module/system/vm/disassembler.scm
@@ -1,4 +1,4 @@
-;;; Guile RTL disassembler
+;;; Guile bytecode disassembler
;;; Copyright (C) 2001, 2009, 2010, 2012, 2013 Free Software Foundation, Inc.
;;;
@@ -19,7 +19,7 @@
;;; Code:
(define-module (system vm disassembler)
- #:use-module (language rtl)
+ #:use-module (language bytecode)
#:use-module (system vm elf)
#:use-module (system vm debug)
#:use-module (system vm program)
diff --git a/module/system/vm/dwarf.scm b/module/system/vm/dwarf.scm
index c545665d5..f3e45c758 100644
--- a/module/system/vm/dwarf.scm
+++ b/module/system/vm/dwarf.scm
@@ -38,7 +38,7 @@
;;
;; The DIE nodes are contained in the .debug_info section of an ELF
;; file. Attributes within the DIE nodes link them to mapped ranges of
-;; the ELF file (.rtl_text, .data, etc.).
+;; the ELF file (.rtl-text, .data, etc.).
;;
;; A .debug_info section logically contains a series of debugging
;; "contributions", one for each compilation unit. Each contribution is