suzanne.soy/whalesong
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Still trying to trace where the trampoline went.

Browse Source
This commit is contained in:
Danny Yoo 2013-02-25 19:00:30 -07:00
parent 3030cf9f00
commit 25de948d1d
3 changed files with 9 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
whalesong/js-assembler/assemble-perform-statement.rkt
View File

@ -156,13 +156,14 @@
function(restart){ function(restart){
RT.currentModuleLoader(M,~s, RT.currentModuleLoader(M,~s,
function(){ function(){
restart(function(M){ ~a(M); }); restart(function(M){ console.log('resume after loading ~a'); ~a(M); });
}, },
function(){ function(){
RT.raiseModuleLoadingError(M,~s); RT.raiseModuleLoadingError(M,~s);
}); });
});" });"
(symbol->string (ModuleLocator-name (LinkModule!-path op))) (symbol->string (ModuleLocator-name (LinkModule!-path op)))
(symbol->string (ModuleLocator-name (LinkModule!-path op)))
(assemble-label (make-Label (LinkModule!-label op))) (assemble-label (make-Label (LinkModule!-label op)))
(symbol->string (ModuleLocator-name (LinkModule!-path op))))] (symbol->string (ModuleLocator-name (LinkModule!-path op))))]

8
whalesong/js-assembler/assemble.rkt
View File

@ -31,11 +31,11 @@
(: assemble/write-invoke ((Listof Statement) #;Boolean Output-Port -> Void)) (: assemble/write-invoke ((Listof Statement) Boolean Output-Port -> Void))
;; Writes out the JavaScript code that represents the anonymous invocation expression. ;; Writes out the JavaScript code that represents the anonymous invocation expression.
;; What's emitted is a function expression that, when invoked, runs the ;; What's emitted is a function expression that, when invoked, runs the
;; statements. ;; statements.
(define (assemble/write-invoke stmts #;without-trampoline? op) (define (assemble/write-invoke stmts without-trampoline? op)
(parameterize ([current-interned-symbol-table ((inst make-hash Symbol Symbol))] (parameterize ([current-interned-symbol-table ((inst make-hash Symbol Symbol))]
[current-interned-constant-closure-table ((inst make-hash Symbol MakeCompiledProcedure))]) [current-interned-constant-closure-table ((inst make-hash Symbol MakeCompiledProcedure))])
(display "(function(M, success, fail, params) {\n" op) (display "(function(M, success, fail, params) {\n" op)
@ -73,9 +73,7 @@ for (param in params) {
} }
EOF EOF
op) op)
(fprintf op "~a(M); })" (cond [without-trampoline?
(assemble-label (make-Label (BasicBlock-name (first basic-blocks)))))
#;(cond [without-trampoline?
;; If it's a module statement, we just want to call it directly, to get things loaded. ;; If it's a module statement, we just want to call it directly, to get things loaded.
(fprintf op "~a(M); })" (fprintf op "~a(M); })"
(assemble-label (make-Label (BasicBlock-name (first basic-blocks)))))] (assemble-label (make-Label (BasicBlock-name (first basic-blocks)))))]

8
whalesong/js-assembler/package.rkt
View File

@ -454,20 +454,20 @@ M.modules[~s] =
(display bytes op))] (display bytes op))]
[(cacheable? path) [(cacheable? path)
(define string-op (open-output-bytes)) (define string-op (open-output-bytes))
(assemble/write-invoke (my-force stmts) string-op) (assemble/write-invoke (my-force stmts) #t string-op)
(save-in-cache! path (get-output-bytes string-op)) (save-in-cache! path (get-output-bytes string-op))
(display (get-output-string string-op) op)] (display (get-output-string string-op) op)]
[else [else
(assemble/write-invoke (my-force stmts) op)])] (assemble/write-invoke (my-force stmts) #t op)])]
[else [else
(assemble/write-invoke (my-force stmts) op)])) (assemble/write-invoke (my-force stmts) #t op)]))
(cond (cond
[(ModuleSource? src) [(ModuleSource? src)
(on-path (ModuleSource-path src))] (on-path (ModuleSource-path src))]
[(MainModuleSource? src) [(MainModuleSource? src)
(on-path (MainModuleSource-path src))] (on-path (MainModuleSource-path src))]
[else [else
(assemble/write-invoke (my-force stmts) op)])) (assemble/write-invoke (my-force stmts) #f op)]))
;; cached?: path -> (U false bytes) ;; cached?: path -> (U false bytes)