mirror/guile
mirror/guile
1
Fork 0
mirror of https://git.savannah.gnu.org/git/guile.git synced 2025-05-29 08:20:20 +02:00
Code Activity

$dfa no longer includes name vector (can get that from dfg)

Browse source 
* module/language/cps/dfg.scm ($dfa, dfa-var-name):
  (compute-live-variables, print-dfa): Remove "names" from DFAs.
This commit is contained in:
Andy Wingo 2014-03-30 11:23:51 +02:00
parent 5e89790896
commit 29619661e4
1 changed files with 5 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

17
module/language/cps/dfg.scm
View file

@ -68,7 +68,7 @@
;; Data flow analysis. ;; Data flow analysis.
compute-live-variables compute-live-variables
dfa-k-idx dfa-k-sym dfa-k-count dfa-k-in dfa-k-out dfa-k-idx dfa-k-sym dfa-k-count dfa-k-in dfa-k-out
dfa-var-idx dfa-var-name dfa-var-sym dfa-var-count dfa-var-idx dfa-var-sym dfa-var-count
print-dfa)) print-dfa))
;; These definitions are here because currently we don't do cross-module ;; These definitions are here because currently we don't do cross-module
@ -672,14 +672,12 @@ BODY for each body continuation in the prompt."
;; Data-flow analysis. ;; Data-flow analysis.
(define-record-type $dfa (define-record-type $dfa
(make-dfa cfa var-map names syms in out) (make-dfa cfa var-map syms in out)
dfa? dfa?
;; CFA, for its reverse-post-order numbering ;; CFA, for its reverse-post-order numbering
(cfa dfa-cfa) (cfa dfa-cfa)
;; Hash table mapping var-sym -> var-idx ;; Hash table mapping var-sym -> var-idx
(var-map dfa-var-map) (var-map dfa-var-map)
;; Vector of var-idx -> name
(names dfa-names)
;; Vector of var-idx -> var-sym ;; Vector of var-idx -> var-sym
(syms dfa-syms) (syms dfa-syms)
;; Vector of k-idx -> bitvector ;; Vector of k-idx -> bitvector
@ -700,9 +698,6 @@ BODY for each body continuation in the prompt."
(or (hashq-ref (dfa-var-map dfa) var) (or (hashq-ref (dfa-var-map dfa) var)
(error "unknown var" var))) (error "unknown var" var)))
(define (dfa-var-name dfa idx)
(vector-ref (dfa-names dfa) idx))
(define (dfa-var-sym dfa idx) (define (dfa-var-sym dfa idx)
(vector-ref (dfa-syms dfa) idx)) (vector-ref (dfa-syms dfa) idx))
@ -721,12 +716,11 @@ BODY for each body continuation in the prompt."
(cfa (analyze-control-flow fun dfg #:reverse? #t (cfa (analyze-control-flow fun dfg #:reverse? #t
#:add-handler-preds? #t)) #:add-handler-preds? #t))
(syms (make-vector nvars #f)) (syms (make-vector nvars #f))
(names (make-vector nvars #f))
(usev (make-vector (cfa-k-count cfa) '())) (usev (make-vector (cfa-k-count cfa) '()))
(defv (make-vector (cfa-k-count cfa) '())) (defv (make-vector (cfa-k-count cfa) '()))
(live-in (make-vector (cfa-k-count cfa) #f)) (live-in (make-vector (cfa-k-count cfa) #f))
(live-out (make-vector (cfa-k-count cfa) #f))) (live-out (make-vector (cfa-k-count cfa) #f)))
;; Initialize syms, names, defv, and usev. ;; Initialize syms, defv, and usev.
(let ((use-maps (dfg-use-maps dfg)) (let ((use-maps (dfg-use-maps dfg))
(counter 0)) (counter 0))
(define (counter++) (define (counter++)
@ -741,7 +735,6 @@ BODY for each body continuation in the prompt."
(let ((v (counter++))) (let ((v (counter++)))
(hashq-set! var-map var v) (hashq-set! var-map var v)
(vector-set! syms v var) (vector-set! syms v var)
(vector-set! names v name)
(for-each (lambda (def) (for-each (lambda (def)
(vector-push! defv (cfa-k-idx cfa def) v)) (vector-push! defv (cfa-k-idx cfa def) v))
(block-preds (lookup-block def dfg))) (block-preds (lookup-block def dfg)))
@ -765,11 +758,11 @@ BODY for each body continuation in the prompt."
(compute-maximum-fixed-point (cfa-preds cfa) (compute-maximum-fixed-point (cfa-preds cfa)
live-out live-in defv usev #t) live-out live-in defv usev #t)
(make-dfa cfa var-map names syms live-in live-out))) (make-dfa cfa var-map syms live-in live-out)))
(define (print-dfa dfa) (define (print-dfa dfa)
(match dfa (match dfa
(($ $dfa cfa var-map names syms in out) (($ $dfa cfa var-map syms in out)
(define (print-var-set bv) (define (print-var-set bv)
(let lp ((n 0)) (let lp ((n 0))
(let ((n (bit-position #t bv n))) (let ((n (bit-position #t bv n)))