mirror/guile
mirror/guile
1
Fork 0
mirror of https://git.savannah.gnu.org/git/guile.git synced 2025-06-29 22:40:34 +02:00
Code Activity

Beginnings of local variable information

Browse source 
* module/system/vm/assembler.scm (<arity>, begin-kw-arity, end-arity):
  (definition): Add definition macro-instruction.  Arrange to record
  variable definitions.

* module/language/cps/compile-bytecode.scm (compile-fun): Emit
  definition macro-instructions as appropriate.
This commit is contained in:
Andy Wingo 2014-04-15 14:02:25 +02:00
parent 863034a8ac
commit 78351d1065
2 changed files with 16 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

7
module/language/cps/compile-bytecode.scm
View file

@ -153,8 +153,13 @@
label
(match (lookup-cont label dfg)
(($ $kclause) label)
(($ $kargs _ _ term)
(($ $kargs names vars term)
(emit-label asm label)
(for-each (lambda (name var)
(let ((slot (maybe-slot var)))
(when slot
(emit-definition asm name slot))))
names vars)
(let find-exp ((term term))
(match term
(($ $letk conts term)

13
module/system/vm/assembler.scm
View file

@ -163,7 +163,7 @@
;; Metadata for one <lambda-case>.
(define-record-type <arity>
(make-arity req opt rest kw-indices allow-other-keys?
low-pc high-pc)
low-pc high-pc definitions)
arity?
(req arity-req)
(opt arity-opt)
@ -171,7 +171,8 @@
(kw-indices arity-kw-indices)
(allow-other-keys? arity-allow-other-keys?)
(low-pc arity-low-pc)
(high-pc arity-high-pc set-arity-high-pc!))
(high-pc arity-high-pc set-arity-high-pc!)
(definitions arity-definitions set-arity-definitions!))
(define-syntax *block-size* (identifier-syntax 32))
@ -753,7 +754,7 @@ returned instead."
(assert-match alternate (or #f (? exact-integer?) (? symbol?)) "#f or symbol")
(let* ((meta (car (asm-meta asm)))
(arity (make-arity req opt rest kw-indices allow-other-keys?
(asm-start asm) #f))
(asm-start asm) #f '()))
;; The procedure itself is in slot 0, in the standard calling
;; convention. For procedure prologues, nreq includes the
;; procedure, so here we add 1.
@ -772,6 +773,7 @@ returned instead."
(define-macro-assembler (end-arity asm)
(let ((arity (car (meta-arities (car (asm-meta asm))))))
(set-arity-definitions! arity (reverse (arity-definitions arity)))
(set-arity-high-pc! arity (asm-start asm))))
(define-macro-assembler (standard-prelude asm nreq nlocals alternate)
@ -825,6 +827,11 @@ returned instead."
(define-macro-assembler (source asm source)
(set-asm-sources! asm (acons (asm-start asm) source (asm-sources asm))))
(define-macro-assembler (definition asm name slot)
(let* ((arity (car (meta-arities (car (asm-meta asm)))))
(def (vector name slot (- (asm-start asm) (arity-low-pc arity)))))
(set-arity-definitions! arity (cons def (arity-definitions arity)))))
(define-macro-assembler (cache-current-module! asm module scope)
(let ((mod-label (intern-module-cache-cell asm scope)))
(emit-static-set! asm module mod-label 0)))