(get-addr (lambda () i)))
(write-bytecode assembly write-byte get-addr '())
(if (= i (u8vector-length v))
- (values v env)
+ (values v env env)
(error "incorrect length in assembly" i (u8vector-length v)))))
(else (error "bad assembly" assembly))))
#:export (bytecode))
(define (compile-objcode x e opts)
- (values (bytecode->objcode x) e))
+ (values (bytecode->objcode x) e e))
(define (decompile-objcode x e opts)
(values (objcode->bytecode x) e))
(-> (lambda vars #f '()
(-> (begin (list (@impl js-init '())
(comp exp e)))))))))
+ env
env))
(define (location x)
(define (compile-glil x e opts)
(if (memq #:O opts) (set! x (optimize x)))
(values (codegen x)
- (and e (cons (car e) (cddr e)))))
+ (and e (cons (car e) (cddr e)))
+ e))
\f
;;;
(apply write (unparse-glil exp) port))
(define (compile-asm x e opts)
- (values (compile-assembly x) e))
+ (values (compile-assembly x) e e))
(define-language glil
#:title "Guile Lowlevel Intermediate Language (GLIL)"
(save-module-excursion
(lambda ()
(set-current-module (objcode-env-module e))
- (values (thunk) #f)))
- (values (thunk) #f))))
+ (values (thunk) #f e)))
+ (values (thunk) #f 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
((pair? env) (cddr env))
(else (error "bad environment" env))))
+(define (make-cenv module lexicals externals)
+ (cons module (cons lexicals externals)))
\f
(and=> (cenv-module e) set-current-module)
(call-with-ghil-environment (cenv-ghil-env e) '()
(lambda (env vars)
- (values (make-ghil-lambda env #f vars #f '() (translate-1 env #f x))
- (and e
- (cons* (cenv-module e)
- (ghil-env-parent env)
- (cenv-externals e)))))))))
+ (let ((x (make-ghil-lambda env #f vars #f '()
+ (translate-1 env #f x))))
+ (values x
+ (and e
+ (cons* (cenv-module e)
+ (ghil-env-parent env)
+ (cenv-externals e)))
+ (make-cenv (current-module) '() '()))))))))
\f
;;;
(define (compile-fold passes exp env opts)
(if (null? passes)
exp
- (receive (exp env) ((car passes) exp env opts)
+ (receive (exp env cenv) ((car passes) exp env opts)
(compile-fold (cdr passes) exp env opts))))
(define (compile-time-environment)