;;; Code:
(define-module (system vm frame)
- :use-module (system vm program)
- :export (frame-number frame-address
+ #:use-module (system vm program)
+ #:use-module (system vm instruction)
+ #:use-module ((srfi srfi-1) #:select (fold))
+ #:export (vm-frame?
+ vm-frame-program
+ vm-frame-local-ref vm-frame-local-set!
+ vm-frame-return-address vm-frame-mv-return-address
+ vm-frame-dynamic-link vm-frame-external-link
+ vm-frame-stack
+
+
+ vm-frame-number vm-frame-address
make-frame-chain
- print-frame print-frame-call
+ print-frame print-frame-chain-as-backtrace
frame-arguments frame-local-variables frame-external-variables
frame-environment
frame-variable-exists? frame-variable-ref frame-variable-set!
frame-object-name
frame-local-ref frame-external-link frame-local-set!
frame-return-address frame-program
- frame-dynamic-link frame?))
+ frame-dynamic-link heap-frame?))
-(dynamic-call "scm_init_frames" (dynamic-link "libguile-vm"))
+;; fixme: avoid the dynamic-call?
+(dynamic-call "scm_init_frames" (dynamic-link "libguile"))
;;;
;;; Frame chain
;;;
-(define frame-number (make-object-property))
-(define frame-address (make-object-property))
+(define vm-frame-number (make-object-property))
+(define vm-frame-address (make-object-property))
+
+(define (bootstrap-frame? frame)
+ (let ((code (program-bytecode (frame-program frame))))
+ (and (= (uniform-vector-length code) 6)
+ (= (uniform-vector-ref code 5)
+ (instruction->opcode 'halt)))))
(define (make-frame-chain frame addr)
- (let* ((link (frame-dynamic-link frame))
- (chain (if (eq? link #t)
- '()
- (cons frame (make-frame-chain
- link (frame-return-address frame))))))
- (set! (frame-number frame) (length chain))
- (set! (frame-address frame)
- (- addr (program-base (frame-program frame))))
- chain))
+ (define (make-rest)
+ (make-frame-chain (frame-dynamic-link frame)
+ (frame-return-address frame)))
+ (cond
+ ((or (eq? frame #t) (eq? frame #f))
+ ;; handle #f or #t dynamic links
+ '())
+ ((bootstrap-frame? frame)
+ (make-rest))
+ (else
+ (let ((chain (make-rest)))
+ (set! (frame-number frame) (length chain))
+ (set! (frame-address frame)
+ (- addr (program-base (frame-program frame))))
+ (cons frame chain)))))
\f
;;;
;;; Pretty printing
;;;
+(define (frame-line-number frame)
+ (let ((addr (frame-address frame)))
+ (cond ((assv addr (program-sources (frame-program frame)))
+ => source:line)
+ (else (format #f "@~a" addr)))))
+
+(define (frame-file frame prev)
+ (let ((sources (program-sources (frame-program frame))))
+ (if (null? sources)
+ prev
+ (or (source:file (car sources))
+ "current input"))))
+
(define (print-frame frame)
- (format #t "#~A " (frame-number frame))
- (print-frame-call frame)
- (newline))
+ (format #t "~4@a: ~a ~s\n" (frame-line-number frame) (frame-number frame)
+ (frame-call-representation frame)))
+
-(define (print-frame-call frame)
+(define (frame-call-representation frame)
(define (abbrev x)
- (cond ((list? x) (if (> (length x) 3)
- (list (abbrev (car x)) (abbrev (cadr x)) '...)
- (map abbrev x)))
- ((pair? x) (cons (abbrev (car x)) (abbrev (cdr x))))
- ((vector? x) (case (vector-length x)
- ((0) x)
- ((1) (vector (abbrev (vector-ref x 0))))
- (else (vector (abbrev (vector-ref x 0)) '...))))
+ (cond ((list? x)
+ (if (> (length x) 4)
+ (list (abbrev (car x)) (abbrev (cadr x)) '...)
+ (map abbrev x)))
+ ((pair? x)
+ (cons (abbrev (car x)) (abbrev (cdr x))))
+ ((vector? x)
+ (case (vector-length x)
+ ((0) x)
+ ((1) (vector (abbrev (vector-ref x 0))))
+ (else (vector (abbrev (vector-ref x 0)) '...))))
(else x)))
- (write (abbrev (cons (program-name frame)
- (frame-arguments frame)))))
-
-(define (program-name frame)
+ (abbrev (cons (frame-program-name frame) (frame-arguments frame))))
+
+(define (print-frame-chain-as-backtrace frames)
+ (if (null? frames)
+ (format #t "No backtrace available.\n")
+ (begin
+ (format #t "VM backtrace:\n")
+ (fold (lambda (frame file)
+ (let ((new-file (frame-file frame file)))
+ (if (not (equal? new-file file))
+ (format #t "In ~a:\n" new-file))
+ (print-frame frame)
+ new-file))
+ 'no-file
+ frames))))
+
+(define (frame-program-name frame)
(let ((prog (frame-program frame))
(link (frame-dynamic-link frame)))
- (or (object-property prog 'name)
- (frame-object-name link (1- (frame-address link)) prog)
- (hash-fold (lambda (s v d) (if (eq? prog (variable-ref v)) s d))
+ (or (program-name prog)
+ (object-property prog 'name)
+ (and (heap-frame? link) (frame-address link)
+ (frame-object-name link (1- (frame-address link)) prog))
+ (hash-fold (lambda (s v d) (if (and (variable-bound? v)
+ (eq? prog (variable-ref v)))
+ s d))
prog (module-obarray (current-module))))))
\f
(frame-external-set! frame (binding:index binding) val)
(frame-local-set! frame (binding:index binding) val)))
+;; FIXME handle #f program-bindings return
(define (frame-bindings frame addr)
- (do ((bs (program-bindings (frame-program frame)) (cdr bs))
- (ls '() (if (cdar bs) (cons (cdar bs) ls) (cdr ls))))
- ((or (null? bs) (> (caar bs) addr))
- (apply append ls))))
+ (filter (lambda (b) (and (>= addr (binding:start b))
+ (<= addr (binding:end b))))
+ (program-bindings (frame-program frame))))
(define (frame-lookup-binding frame addr sym)
- (do ((bs (frame-bindings frame addr) (cdr bs)))
- ((or (null? bs) (eq? sym (binding:name (car bs))))
- (and (pair? bs) (car bs)))))
+ (assq sym (reverse (frame-bindings frame addr))))
(define (frame-object-binding frame addr obj)
(do ((bs (frame-bindings frame addr) (cdr bs)))
HCoop / bpt / guile.git / blobdiff