diff options
author | Andy Wingo <wingo@pobox.com> | 2013-11-08 17:36:45 +0100 |
---|---|---|
committer | Andy Wingo <wingo@pobox.com> | 2013-11-08 17:36:45 +0100 |
commit | 4dfae1bf50912af2e47afe343e44aea1916ccd3e (patch) | |
tree | 360b8f63029728cb2120d9e6683da0957140cc5f | |
parent | b77a5215c7dbee6c88ab9614942c9b0866c3ab0b (diff) | |
download | guile-4dfae1bf50912af2e47afe343e44aea1916ccd3e.tar.gz |
Move assemble-program to test cases.
* module/system/vm/assembler.scm (assemble-program): Remove.
* test-suite/tests/rtl.test (assemble-program): Move here.
-rw-r--r-- | module/system/vm/assembler.scm | 12 | ||||
-rw-r--r-- | test-suite/tests/rtl.test | 10 |
2 files changed, 11 insertions, 11 deletions
diff --git a/module/system/vm/assembler.scm b/module/system/vm/assembler.scm index 58c00ef99..9f40221c0 100644 --- a/module/system/vm/assembler.scm +++ b/module/system/vm/assembler.scm @@ -48,7 +48,6 @@ #:use-module (system vm dwarf) #:use-module (system vm elf) #:use-module (system vm linker) - #:use-module (system vm objcode) #:use-module (rnrs bytevectors) #:use-module (ice-9 binary-ports) #:use-module (ice-9 vlist) @@ -59,8 +58,7 @@ #:use-module (srfi srfi-11) #:export (make-assembler emit-text - link-assembly - assemble-program)) + link-assembly)) @@ -1991,11 +1989,3 @@ The result is a bytevector, by default linked so that read-only and writable data are on separate pages. Pass @code{#:page-aligned? #f} to disable this behavior." (link-elf (link-objects asm) #:page-aligned? page-aligned?)) - -(define (assemble-program instructions) - "Take the sequence of instructions @var{instructions}, assemble them -into RTL code, link an image, and load that image from memory. Returns -a procedure." - (let ((asm (make-assembler))) - (emit-text asm instructions) - (load-thunk-from-memory (link-assembly asm #:page-aligned? #f)))) diff --git a/test-suite/tests/rtl.test b/test-suite/tests/rtl.test index 84bb65647..a435d52f6 100644 --- a/test-suite/tests/rtl.test +++ b/test-suite/tests/rtl.test @@ -20,8 +20,18 @@ #:use-module (test-suite lib) #:use-module (system vm assembler) #:use-module (system vm program) + #:use-module (system vm objcode) + #:use-module (system vm linker) #:use-module (system vm debug)) +(define (assemble-program instructions) + "Take the sequence of instructions @var{instructions}, assemble them +into RTL code, link an image, and load that image from memory. Returns +a procedure." + (let ((asm (make-assembler))) + (emit-text asm instructions) + (load-thunk-from-memory (link-assembly asm #:page-aligned? #f)))) + (define-syntax-rule (assert-equal val expr) (let ((x val)) (pass-if (object->string x) (equal? expr x)))) |