summaryrefslogtreecommitdiff
path: root/module/scripts
diff options
context:
space:
mode:
authorAndy Wingo <wingo@pobox.com>2012-06-22 13:35:55 +0200
committerAndy Wingo <wingo@pobox.com>2012-06-22 13:40:50 +0200
commitb8bc86bce147cf280ca2a60d36c8b6493cbf11e8 (patch)
tree510c9f80953d586f40af3b5ad0ffa5fc7c0b2ec9 /module/scripts
parentafc74c2920d2f8f8424db9d6f554a91866cbac01 (diff)
downloadguile-b8bc86bce147cf280ca2a60d36c8b6493cbf11e8.tar.gz
instead of our custom .go format, use elf
* libguile/objcodes.c: Change to expect objcode on disk to be embedded in ELF instead of having the funky cookie. (to_native_order): Use already existing SCM_BYTE_ORDER style byte order instead of chars. (bytecode_to_objcode): No need for word_size arg. (scm_bytecode_to_objcode, scm_objcode_to_bytecode): Take optional endianness arg instead of sometimes using target-endianness. (scm_load_objcode, scm_write_objcode, scm_bytecode_to_native_objcode): Remove. * libguile/objcodes.h: Adapt. * libguile/vm.c (scm_load_compiled_with_vm): Use scm_load_thunk_from_file. (make_boot_program): Adapt to use scm_bytecode_to_objcode with endianness arg. * module/Makefile.am (OBJCODE_LANG_SOURCES): Add (language objcode elf). * module/language/objcode/elf.scm: New module, embeds objcode in ELF. * module/language/bytecode/spec.scm (compile-objcode): (decompile-objcode): Use (target-endianness). * module/language/objcode/spec.scm: use (language objcode elf) for write-objcode. * module/scripts/disassemble.scm (disassemble): * module/system/repl/command.scm (disassemble-file): Use load-thunk-from-file. * module/system/vm/objcode.scm: Remove load-objcode and write-objcode. * test-suite/tests/asm-to-bytecode.test (test-target): Adapt to the new ELF world.
Diffstat (limited to 'module/scripts')
-rw-r--r--module/scripts/disassemble.scm4
1 files changed, 2 insertions, 2 deletions
diff --git a/module/scripts/disassemble.scm b/module/scripts/disassemble.scm
index 7dab2dde9..094d65654 100644
--- a/module/scripts/disassemble.scm
+++ b/module/scripts/disassemble.scm
@@ -1,6 +1,6 @@
;;; Disassemble --- Disassemble .go files into something human-readable
-;; Copyright 2005, 2008, 2009, 2011 Free Software Foundation, Inc.
+;; Copyright 2005, 2008, 2009, 2011, 2012 Free Software Foundation, Inc.
;;
;; This program is free software; you can redistribute it and/or
;; modify it under the terms of the GNU Lesser General Public License
@@ -36,7 +36,7 @@
(define (disassemble . files)
(for-each (lambda (file)
- (asm:disassemble (load-objcode file)))
+ (asm:disassemble (load-thunk-from-file file)))
files))
(define main disassemble)