mirror of
https://git.savannah.gnu.org/git/guile.git
synced 2025-04-30 03:40:34 +02:00
* gdbinit: Untested attempts to get the stack fondling macros to deal with the new program representation. * libguile/frames.c (scm_vm_frame_arguments, scm_vm_frame_source) (scm_vm_frame_local_ref, scm_vm_frame_local_set_x): SCM_PROGRAM_DATA is a struct scm_objcode*. * libguile/instructions.h: * libguile/instructions.c: Hide the instruction table and the struct scm_instruction structure; all access to instructions now goes through procedures. This is because instructions are no longer in a packed array indexed by opcode. Also, declare a mask that all instructions should fit in. * libguile/objcodes.h: * libguile/objcodes.c: Rewrite so that object code directly maps its arity and length from its bytecode. This makes it unnecessary to keep this information in programs, allowing programs to be simple conses between the code (objcodes) and data (the object table and the closure variables). * libguile/programs.c (scm_make_program): Rework so that make-program takes objcode, an object table, and externals as arguments. It's much clearer this way, and we avoid malloc(). * libguile/stacks.c (is_vm_bootstrap_frame): Update for program/objcode changes. * libguile/vm-engine.c (vm_run): Initialize the jump table on the first run, with the opcodes declared in the instruction sources, and with bad instructions raising an error instead of wandering off into the Unknown. * libguile/vm-engine.h (FETCH_LENGTH): Always represent lengths as 3 bytes. The old code was too error-prone. (NEXT_JUMP): Mask the instruction with SCM_VM_INSTRUCTION_MASK. (NEW_FRAME): Update for program/objcode changes. * libguile/vm-expand.h (VM_DEFINE_FUNCTION, VM_DEFINE_INSTRUCTION) (VM_DEFINE_LOADER): Update so that we explicitly specify opcodes, so that we have a stable bytecode API. * libguile/vm-i-loader.c: Update license to LGPLv2+. Explicitly declare opcodes. (load-integer): Use an int instead of a long as the accumulator; still need to revisit this code at some point, I think. (load-program): Simplify, thankfully!! Just creates the objcode slice and rolls with it. * libguile/vm-i-scheme.c: Number the opcodes explicitly. * libguile/vm-i-system.c: Update license to LGPLv2+. Explicitly declare opcodes. (make-closure): Update for new program API. * libguile/vm.c (vm_make_boot_program): Update for new program/objcode API. Still a bit ugly. (scm_load_compiled_with_vm): Update for new program/objcode API. * module/language/assembly.scm (byte-length): Fix byte-length calculation for loaders, and load-program. (code-pack, code-unpack): Start to move things from (system vm conv) here. (object->code, code->object): More things from conv.scm. * module/language/glil.scm (<glil-program>): Add a new field, closure-level. (make-glil-program, compute-closure-level): Calculate the "closure level" when making a glil program. This is the maximum depth of external binding refs in this closure. (unparse-glil): Fix label serialization. * module/language/glil/compile-assembly.scm (make-meta): Prepend #f for the meta's object table, though maybe in the future we can avoid creating assembly in the first place. (assoc-ref-or-acons, object-index-and-alist): GRRR! Caught again by the different sets of arguments to assoc and assoc-ref! (glil->assembly): Attempt to make the <glil-program> case more readable, and fix the bugs. Sorry I don't know how to comment this change any more than this. (glil->assembly): For <glil-module> serialize the whole key, not just the name. (dump-object): subprogram-code is already a list. Serialize integers as strings, not u8vectors. Fix the order of lists and vectors. * module/language/glil/spec.scm (glil): Switch orders, so we prefer glil -> assembly -> objcode. Actually glil->objcode doesn't work any more, needs to be removed I think. * module/language/objcode/spec.scm (objcode->value): s/objcode->program/make-program/. * module/language/scheme/inline.scm: Add acons inline. * module/system/vm/conv.scm (make-byte-decoder): Skip the first 8 bytes, they are header. Handle subprograms properly. Still needs help though. (decode-length): Lengths are always 3 bytes now. * module/system/vm/disasm.scm: Superficial changes to keep things working. I'd like to fix this better in the future. * module/system/vm/frame.scm (bootstrap-frame?): Fixes for program-bytecode. * module/system/vm/program.scm: Export make-program. It's program-objcode now, no more program-bytecode. * module/system/vm/vm.scm (vm-load): Use make-program. * test-suite/tests/asm-to-bytecode.test: New test, very minimal. * module/system/vm/objcode.scm: Export word-size, byte-order, and write-objcode.
183 lines
6.5 KiB
Scheme
183 lines
6.5 KiB
Scheme
;;; Guile VM Disassembler
|
|
|
|
;; Copyright (C) 2001 Free Software Foundation, Inc.
|
|
|
|
;; This program is free software; you can redistribute it and/or modify
|
|
;; it under the terms of the GNU General Public License as published by
|
|
;; the Free Software Foundation; either version 2, or (at your option)
|
|
;; any later version.
|
|
;;
|
|
;; This program 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 General Public License for more details.
|
|
;;
|
|
;; You should have received a copy of the GNU General Public License
|
|
;; along with this program; see the file COPYING. If not, write to
|
|
;; the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
|
|
;; Boston, MA 02111-1307, USA.
|
|
|
|
;;; Code:
|
|
|
|
(define-module (system vm disasm)
|
|
#:use-module (system base pmatch)
|
|
#:use-module (system vm objcode)
|
|
#:use-module (system vm program)
|
|
#:use-module (system vm conv)
|
|
#:use-module (ice-9 regex)
|
|
#:use-module (ice-9 format)
|
|
#:use-module (ice-9 receive)
|
|
#:export (disassemble-objcode disassemble-program disassemble-bytecode))
|
|
|
|
;; FIXME: the header, and arity
|
|
(define (disassemble-objcode objcode . opts)
|
|
(let* ((prog (make-program objcode)) ;; fixme: no need to make a program...
|
|
(arity (program-arity prog))
|
|
(nlocs (arity:nlocs arity))
|
|
(nexts (arity:nexts arity))
|
|
(bytes (objcode->u8vector (program-objcode prog))))
|
|
(format #t "Disassembly of ~A:\n\n" objcode)
|
|
(format #t "nlocs = ~A nexts = ~A\n\n" nlocs nexts)
|
|
(disassemble-bytecode bytes #f 0 #f #f '())))
|
|
|
|
(define (disassemble-program prog . opts)
|
|
(let* ((arity (program-arity prog))
|
|
(nargs (arity:nargs arity))
|
|
(nrest (arity:nrest arity))
|
|
(nlocs (arity:nlocs arity))
|
|
(nexts (arity:nexts arity))
|
|
;; FIXME: header and arity, etc
|
|
(bytes (objcode->u8vector (program-objcode prog)))
|
|
(objs (program-objects prog))
|
|
(meta (program-meta prog))
|
|
(exts (program-external prog))
|
|
(binds (program-bindings prog))
|
|
(blocs (and binds
|
|
(append (list-head binds nargs)
|
|
(filter (lambda (x) (not (binding:extp x)))
|
|
(list-tail binds nargs)))))
|
|
(bexts (and binds
|
|
(filter binding:extp binds)))
|
|
(srcs (program-sources prog)))
|
|
;; Disassemble this bytecode
|
|
(format #t "Disassembly of ~A:\n\n" prog)
|
|
(format #t "Bytecode:\n\n")
|
|
(disassemble-bytecode bytes objs nargs blocs bexts srcs)
|
|
(if (pair? exts)
|
|
(disassemble-externals exts))
|
|
(if meta
|
|
(disassemble-meta prog (meta)))
|
|
;; Disassemble other bytecode in it
|
|
;; FIXME: something about the module.
|
|
(if objs
|
|
(for-each
|
|
(lambda (x)
|
|
(if (program? x)
|
|
(begin (display "----------------------------------------\n")
|
|
(apply disassemble-program x opts))))
|
|
(cddr (vector->list objs))))))
|
|
|
|
(define (disassemble-bytecode bytes objs nargs blocs bexts sources)
|
|
(let ((decode (make-byte-decoder bytes))
|
|
(programs '()))
|
|
(define (lp start end code)
|
|
(pmatch code
|
|
(#f (newline))
|
|
((load-program ,x)
|
|
(let ((sym (gensym "")))
|
|
(set! programs (acons sym x programs))
|
|
(print-info start `(load-program ,sym) #f #f)))
|
|
(else
|
|
(print-info start code
|
|
(code-annotation end code objs nargs blocs bexts)
|
|
(and=> (assq end sources) source->string))))
|
|
(if code (call-with-values decode lp)))
|
|
(call-with-values decode lp)
|
|
(for-each (lambda (sym+bytes)
|
|
(format #t "Bytecode #~A:\n\n" (car sym+bytes))
|
|
(disassemble-bytecode (cdr sym+bytes) #f 0 #f #f '()))
|
|
(reverse! programs))))
|
|
|
|
(define (disassemble-objects objs)
|
|
(display "Objects:\n\n")
|
|
(let ((len (vector-length objs)))
|
|
(do ((n 0 (1+ n)))
|
|
((= n len) (newline))
|
|
(print-info n (vector-ref objs n) #f #f))))
|
|
|
|
(define (disassemble-externals exts)
|
|
(display "Externals:\n\n")
|
|
(let ((len (length exts)))
|
|
(do ((n 0 (1+ n))
|
|
(l exts (cdr l)))
|
|
((null? l) (newline))
|
|
(print-info n (car l) #f #f))))
|
|
|
|
(define-macro (unless test . body)
|
|
`(if (not ,test) (begin ,@body)))
|
|
|
|
(define *uninteresting-props* '(name))
|
|
|
|
(define (disassemble-meta program meta)
|
|
(let ((sources (cadr meta))
|
|
(props (filter (lambda (x)
|
|
(not (memq (car x) *uninteresting-props*)))
|
|
(cddr meta))))
|
|
(unless (null? props)
|
|
(display "Properties:\n\n")
|
|
(for-each (lambda (x) (print-info #f x #f #f)) props)
|
|
(newline))))
|
|
|
|
(define (source->string src)
|
|
(format #f "~a:~a:~a" (or (source:file src) "(unknown file)")
|
|
(source:line src) (source:column src)))
|
|
|
|
(define (make-int16 byte1 byte2)
|
|
(+ (* byte1 256) byte2))
|
|
|
|
(define (code-annotation end-addr code objs nargs blocs bexts)
|
|
(let* ((code (code-unpack code))
|
|
(inst (car code))
|
|
(args (cdr code)))
|
|
(case inst
|
|
((list vector)
|
|
(list "~a element~:p" (apply make-int16 args)))
|
|
((br br-if br-if-eq br-if-not br-if-not-eq br-if-not-null br-if-null)
|
|
(list "-> ~A" (+ end-addr (apply make-int16 args))))
|
|
((object-ref)
|
|
(and objs (list "~s" (vector-ref objs (car args)))))
|
|
((local-ref local-set)
|
|
(and blocs
|
|
(let ((b (list-ref blocs (car args))))
|
|
(list "`~a'~@[ (arg)~]"
|
|
(binding:name b) (< (binding:index b) nargs)))))
|
|
((external-ref external-set)
|
|
(and bexts
|
|
(if (< (car args) (length bexts))
|
|
(let ((b (list-ref bexts (car args))))
|
|
(list "`~a'~@[ (arg)~]"
|
|
(binding:name b) (< (binding:index b) nargs)))
|
|
(list "(closure variable)"))))
|
|
((toplevel-ref toplevel-set)
|
|
(and objs
|
|
(let ((v (vector-ref objs (car args))))
|
|
(if (and (variable? v) (variable-bound? v))
|
|
(list "~s" (variable-ref v))
|
|
(list "`~s'" v)))))
|
|
((mv-call)
|
|
(list "MV -> ~A" (+ end-addr (apply make-int16 (cdr args)))))
|
|
(else
|
|
(and=> (code->object code)
|
|
(lambda (obj) (list "~s" obj)))))))
|
|
|
|
;; i am format's daddy.
|
|
(define (print-info addr info extra src)
|
|
(format #t "~4@S ~32S~@[;; ~1{~@?~}~]~@[~61t at ~a~]\n" addr info extra src))
|
|
|
|
(define (simplify x)
|
|
(cond ((string? x)
|
|
(cond ((string-index x #\newline) =>
|
|
(lambda (i) (set! x (substring x 0 i)))))
|
|
(cond ((> (string-length x) 16)
|
|
(set! x (string-append (substring x 0 13) "..."))))))
|
|
x)
|