diff options
author | Andy Wingo <wingo@pobox.com> | 2013-11-19 20:45:57 +0100 |
---|---|---|
committer | Andy Wingo <wingo@pobox.com> | 2013-11-19 20:45:57 +0100 |
commit | 1b780c134b1714966ae39c6b3de10875eb5c1bd2 (patch) | |
tree | 418c3d723d5eac1a69a4ca5cc47195eeab3639c0 /module/system/vm/assembler.scm | |
parent | ef6b7f718acaceba9408ad16d007cc4cb76e0a84 (diff) | |
download | guile-1b780c134b1714966ae39c6b3de10875eb5c1bd2.tar.gz |
(system vm instruction) rtl-instruction-list -> (language rtl) instruction-list
* libguile/instructions.c (struct scm_instruction, fetch_instruction_table)
(scm_instruction_list): Remove rtl_ infix.
* libguile/instructions.h: Adapt.
* module/system/vm/instruction.scm: Remove.
* module/language/rtl.scm: Export instruction-list from here.
* module/Makefile.am:
* module/language/cps/primitives.scm:
* module/system/vm/assembler.scm:
* module/system/vm/disassembler.scm:
* module/system/vm/frame.scm:
* module/system/vm/program.scm:
* module/system/vm/trace.scm:
* module/system/vm/traps.scm: Adapt.
Diffstat (limited to 'module/system/vm/assembler.scm')
-rw-r--r-- | module/system/vm/assembler.scm | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/module/system/vm/assembler.scm b/module/system/vm/assembler.scm index 7c1d58982..7a0cdcc1a 100644 --- a/module/system/vm/assembler.scm +++ b/module/system/vm/assembler.scm @@ -26,7 +26,7 @@ ;;; ;;; "Primitive instructions" correspond to RTL VM operations. ;;; Assemblers for primitive instructions are generated programmatically -;;; from (rtl-instruction-list), which itself is derived from the VM +;;; 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. ;;; @@ -44,10 +44,10 @@ (define-module (system vm assembler) #:use-module (system base target) - #:use-module (system vm instruction) #:use-module (system vm dwarf) #:use-module (system vm elf) #:use-module (system vm linker) + #:use-module (language rtl) #:use-module (rnrs bytevectors) #:use-module (ice-9 binary-ports) #:use-module (ice-9 vlist) @@ -342,7 +342,7 @@ later by the linker." ;;; ;;; Primitive assemblers are defined by expanding `assembler' for each -;;; opcode in `(rtl-instruction-list)'. +;;; opcode in `(instruction-list)'. ;;; (eval-when (expand compile load eval) @@ -476,7 +476,7 @@ later by the linker." ((visit-opcodes macro arg ...) (with-syntax (((inst ...) (map (lambda (x) (datum->syntax #'macro x)) - (rtl-instruction-list)))) + (instruction-list)))) #'(begin (macro arg ... . inst) ...)))))) |