summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndy Wingo <wingo@pobox.com>2013-11-08 16:51:44 +0100
committerAndy Wingo <wingo@pobox.com>2013-11-08 16:51:44 +0100
commit0d4bcc71d2e2d19098fb940fd58e2e4727e9eb0c (patch)
tree998acdc210ee7e732b6325e76cf2a6683732c86f
parentad9b491fa72ea5bac2d463ba383aa812c644c5dd (diff)
downloadguile-0d4bcc71d2e2d19098fb940fd58e2e4727e9eb0c.tar.gz
Remove objcode language.
* module/language/objcode/elf.scm: * module/language/objcode/spec.scm: Remove objcode language. * module/Makefile.am: Adapt.
-rw-r--r--module/Makefile.am5
-rw-r--r--module/language/objcode/elf.scm92
-rw-r--r--module/language/objcode/spec.scm84
3 files changed, 0 insertions, 181 deletions
diff --git a/module/Makefile.am b/module/Makefile.am
index d5ade221f..32baacb5d 100644
--- a/module/Makefile.am
+++ b/module/Makefile.am
@@ -53,7 +53,6 @@ SOURCES = \
$(TREE_IL_LANG_SOURCES) \
$(CPS_LANG_SOURCES) \
$(RTL_LANG_SOURCES) \
- $(OBJCODE_LANG_SOURCES) \
$(VALUE_LANG_SOURCES) \
$(SCHEME_LANG_SOURCES) \
$(SYSTEM_BASE_SOURCES) \
@@ -131,10 +130,6 @@ RTL_LANG_SOURCES = \
language/rtl.scm \
language/rtl/spec.scm
-OBJCODE_LANG_SOURCES = \
- language/objcode/spec.scm \
- language/objcode/elf.scm
-
VALUE_LANG_SOURCES = \
language/value/spec.scm
diff --git a/module/language/objcode/elf.scm b/module/language/objcode/elf.scm
deleted file mode 100644
index ddbd7b2a3..000000000
--- a/module/language/objcode/elf.scm
+++ /dev/null
@@ -1,92 +0,0 @@
-;;; Embedding bytecode in ELF
-
-;; Copyright (C) 2012, 2013 Free Software Foundation, Inc.
-
-;;;; This library is free software; you can redistribute it and/or
-;;;; modify it under the terms of the GNU Lesser General Public
-;;;; License as published by the Free Software Foundation; either
-;;;; version 3 of the License, or (at your option) any later version.
-;;;;
-;;;; This library is distributed in the hope that it will be useful,
-;;;; but WITHOUT ANY WARRANTY; without even the implied warranty of
-;;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-;;;; Lesser General Public License for more details.
-;;;;
-;;;; You should have received a copy of the GNU Lesser General Public
-;;;; License along with this library; if not, write to the Free Software
-;;;; Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
-
-;;; Code:
-
-;; The eval-when is because (language objcode elf) will not be loaded
-;; yet when we go to compile it, but later passes of the
-;; compiler need it. So we have to be sure that the module is present
-;; at compile time, with all of its definitions. The easiest way to do
-;; that is just to go ahead and resolve it now.
-;;
-(define-module (language objcode elf)
- #:use-module (system vm objcode)
- #:use-module (system base target)
- #:use-module (rnrs bytevectors)
- #:use-module (ice-9 binary-ports)
- #:use-module (system vm elf)
- #:use-module (system vm linker)
- #:export (write-objcode))
-
-(define (bytecode->elf bv)
- (let ((string-table (make-string-table)))
- (define (intern-string! string)
- (string-table-intern! string-table string))
- (define (make-object index name bv relocs . kwargs)
- (let ((name-idx (intern-string! (symbol->string name))))
- (make-linker-object (apply make-elf-section
- #:index index
- #:name name-idx
- #:size (bytevector-length bv)
- kwargs)
- bv relocs
- (list (make-linker-symbol name 0)))))
- (define (make-dynamic-section index word-size endianness)
- (define (make-dynamic-section/32)
- (let ((bv (make-bytevector 24 0)))
- (bytevector-u32-set! bv 0 DT_GUILE_RTL_VERSION endianness)
- (bytevector-u32-set! bv 4 #x02000000 endianness)
- (bytevector-u32-set! bv 8 DT_GUILE_ENTRY endianness)
- (bytevector-u32-set! bv 12 0 endianness)
- (bytevector-u32-set! bv 16 DT_NULL endianness)
- (bytevector-u32-set! bv 20 0 endianness)
- (values bv (make-linker-reloc 'abs32/1 12 0 '.rtl-text))))
- (define (make-dynamic-section/64)
- (let ((bv (make-bytevector 48 0)))
- (bytevector-u64-set! bv 0 DT_GUILE_RTL_VERSION endianness)
- (bytevector-u64-set! bv 8 #x02000000 endianness)
- (bytevector-u64-set! bv 16 DT_GUILE_ENTRY endianness)
- (bytevector-u64-set! bv 24 0 endianness)
- (bytevector-u64-set! bv 32 DT_NULL endianness)
- (bytevector-u64-set! bv 40 0 endianness)
- (values bv (make-linker-reloc 'abs64/1 24 0 '.rtl-text))))
- (call-with-values (lambda ()
- (case word-size
- ((4) (make-dynamic-section/32))
- ((8) (make-dynamic-section/64))
- (else (error "unexpected word size" word-size))))
- (lambda (bv reloc)
- (make-object index '.dynamic bv (list reloc)
- #:type SHT_DYNAMIC #:flags SHF_ALLOC))))
- (define (make-string-table index)
- (intern-string! ".shstrtab")
- (make-object index '.shstrtab (link-string-table! string-table) '()
- #:type SHT_STRTAB #:flags 0))
- (let* ((word-size (target-word-size))
- (endianness (target-endianness))
- (text (make-object 1 '.rtl-text bv '()))
- (dt (make-dynamic-section 2 word-size endianness))
- ;; This needs to be linked last, because linking other
- ;; sections adds entries to the string table.
- (shstrtab (make-string-table 3)))
- (link-elf (list text dt shstrtab)
- #:endianness endianness #:word-size word-size))))
-
-(define (write-objcode objcode port)
- (let ((bv (objcode->bytecode objcode (target-endianness))))
- (put-bytevector port (bytecode->elf bv))))
diff --git a/module/language/objcode/spec.scm b/module/language/objcode/spec.scm
deleted file mode 100644
index 16f52410a..000000000
--- a/module/language/objcode/spec.scm
+++ /dev/null
@@ -1,84 +0,0 @@
-;;; Guile Lowlevel Intermediate Language
-
-;; Copyright (C) 2001, 2009, 2010, 2011, 2013 Free Software Foundation, Inc.
-
-;;;; This library is free software; you can redistribute it and/or
-;;;; modify it under the terms of the GNU Lesser General Public
-;;;; License as published by the Free Software Foundation; either
-;;;; version 3 of the License, or (at your option) any later version.
-;;;;
-;;;; This library is distributed in the hope that it will be useful,
-;;;; but WITHOUT ANY WARRANTY; without even the implied warranty of
-;;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-;;;; Lesser General Public License for more details.
-;;;;
-;;;; You should have received a copy of the GNU Lesser General Public
-;;;; License along with this library; if not, write to the Free Software
-;;;; Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
-
-;;; Code:
-
-(define-module (language objcode spec)
- #:use-module (system base language)
- #:use-module (system vm objcode)
- #:use-module (system vm program)
- #:use-module (language objcode elf)
- #:export (objcode))
-
-(define (objcode->value x e opts)
- (let ((thunk (make-program x #f #f)))
- (if (eq? e (current-module))
- ;; save a cons in this case
- (values (thunk) e e)
- (save-module-excursion
- (lambda ()
- (set-current-module e)
- (values (thunk) e e))))))
-
-;; since locals are allocated on the stack and can have limited scope,
-;; in many cases we use one local for more than one lexical variable. so
-;; the returned locals set is a list, where element N of the list is
-;; itself a list of bindings for local variable N.
-(define (collapse-locals locs)
- (let lp ((ret '()) (locs locs))
- (if (null? locs)
- (map cdr (sort! ret
- (lambda (x y) (< (car x) (car y)))))
- (let ((b (car locs)))
- (cond
- ((assv-ref ret (binding:index b))
- => (lambda (bindings)
- (append! bindings (list b))
- (lp ret (cdr locs))))
- (else
- (lp (acons (binding:index b) (list b) ret)
- (cdr locs))))))))
-
-(define (decompile-value x env opts)
- (cond
- ((program? x)
- (let ((objs (program-objects x))
- (meta (program-meta x))
- (free-vars (program-free-variables x))
- (binds (program-bindings x))
- (srcs (program-sources x)))
- (let ((blocs (and binds (collapse-locals binds))))
- (values (program-objcode x)
- `((objects . ,objs)
- (meta . ,(and meta (meta)))
- (free-vars . ,free-vars)
- (blocs . ,blocs)
- (sources . ,srcs))))))
- ((objcode? x)
- (values x #f))
- (else
- (error "Object for disassembly not a program or objcode" x))))
-
-(define-language objcode
- #:title "Guile Object Code"
- #:reader #f
- #:printer write-objcode
- #:compilers `((value . ,objcode->value))
- #:decompilers `((value . ,decompile-value))
- #:for-humans? #f
- )