git.iko.soy/Idris-dev
on master help sign in
javascript: moved EVALTC and APPLYTC into codegen
f182cf2raichoo
jsrts/Runtime-common.js−17
compare with master
unifiedsplit
@@ -37,20 +37,3 @@ var __IDRRT__tailcall = function(k) {
37
37
38 return ret;
38 return ret;
39};
39};
40−
41−var __IDRRT__EVALTC = function(arg0) {
42− var ret = (arg0 instanceof __IDRRT__Con && __IDRLT__mEVAL0[arg0.tag])?(__IDRLT__mEVAL0[arg0.tag](arg0)):(arg0);
43− while (ret instanceof __IDRRT__Cont)
44− ret = ret.k();
45−
46− return ret;
47−};
48−
49−var __IDRRT__APPLYTC = function(fn0, arg0) {
50− var ev = __IDRRT__EVALTC(fn0);
51− var ret = (ev instanceof __IDRRT__Con && __IDRLT__mAPPLY0[ev.tag])?(__IDRLT__mAPPLY0[ev.tag](fn0,arg0,ev)):(null)
52− while (ret instanceof __IDRRT__Cont)
53− ret = ret.k();
54−
55− return ret;
56−}
src/IRTS/CodegenJavaScript.hs+61−5
@@ -766,9 +766,9 @@ elimDuplicateEvals (JSAlloc fun (Just (JSFunction args (JSSeq seq)))) =
766elimDuplicateEvals js = js
766elimDuplicateEvals js = js
767
767
768
768
769−optimizeEvalTailcalls :: (String, String) -> JS -> JS
769+optimizeRuntimeCalls :: String -> String -> [JS] -> [JS]
770−optimizeEvalTailcalls (fun, tc) js =
770+optimizeRuntimeCalls fun tc js =
771− optHelper js
771+ optTC tc : map optHelper js
772 where
772 where
773 optHelper :: JS -> JS
773 optHelper :: JS -> JS
774 optHelper (JSApp (JSIdent "__IDRRT__tailcall") [
774 optHelper (JSApp (JSIdent "__IDRRT__tailcall") [
@@ -779,6 +779,62 @@ optimizeEvalTailcalls (fun, tc) js =
779 optHelper js = transformJS optHelper js
779 optHelper js = transformJS optHelper js
780
780
781
781
782+ optTC :: String -> JS
783+ optTC tc@"__IDRRT__EVALTC" =
784+ JSAlloc tc (Just $ JSFunction ["arg0"] (
785+ JSSeq [ JSAlloc "ret" $ Just (
786+ JSTernary (
787+ (JSIdent "arg0" `jsInstanceOf` jsCon) `jsAnd`
788+ (hasProp "__IDRLT__mEVAL0" "arg0")
789+ ) (JSApp
790+ (JSIndex
791+ (JSIdent "__IDRLT__mEVAL0")
792+ (JSProj (JSIdent "arg0") "tag")
793+ )
794+ [JSIdent "arg0"]
795+ ) (JSIdent "arg0")
796+ )
797+ , JSWhile (JSIdent "ret" `jsInstanceOf` (JSIdent "__IDRRT__Cont")) (
798+ JSAssign (JSIdent "ret") (
799+ JSApp (JSProj (JSIdent "ret") "k") []
800+ )
801+ )
802+ , JSReturn $ JSIdent "ret"
803+ ]
804+ ))
805+
806+ optTC tc@"__IDRRT__APPLYTC" =
807+ JSAlloc tc (Just $ JSFunction ["fn0", "arg0"] (
808+ JSSeq [ JSAlloc "ev" $ Just (JSApp
809+ (JSIdent "__IDRRT__EVALTC") [JSIdent "fn0"]
810+ )
811+ , JSAlloc "ret" $ Just (
812+ JSTernary (
813+ (JSIdent "ev" `jsInstanceOf` jsCon) `jsAnd`
814+ (hasProp "__IDRLT__mAPPLY0" "ev")
815+ ) (JSApp
816+ (JSIndex
817+ (JSIdent "__IDRLT__mAPPLY0")
818+ (JSProj (JSIdent "ev") "tag")
819+ )
820+ [JSIdent "fn0", JSIdent "arg0", JSIdent "ev"]
821+ ) JSNull
822+ )
823+ , JSWhile (JSIdent "ret" `jsInstanceOf` (JSIdent "__IDRRT__Cont")) (
824+ JSAssign (JSIdent "ret") (
825+ JSApp (JSProj (JSIdent "ret") "k") []
826+ )
827+ )
828+ , JSReturn $ JSIdent "ret"
829+ ]
830+ ))
831+
832+
833+ hasProp :: String -> String -> JS
834+ hasProp table var =
835+ JSIndex (JSIdent table) (JSProj (JSIdent var) "tag")
836+
837+
782unfoldLookupTable :: [JS] -> [JS]
838unfoldLookupTable :: [JS] -> [JS]
783unfoldLookupTable input =
839unfoldLookupTable input =
784 let (evals, evalunfold) = unfoldLT "__IDRLT__mEVAL0" input
840 let (evals, evalunfold) = unfoldLT "__IDRLT__mEVAL0" input
@@ -967,8 +1023,8 @@ codegenJavaScript target definitions filename outputType = do
967 , map removeAllocations
1023 , map removeAllocations
968 , elimDeadLoop
1024 , elimDeadLoop
969 , map elimDuplicateEvals
1025 , map elimDuplicateEvals
970− , map (optimizeEvalTailcalls ("__IDR__mEVAL0", "__IDRRT__EVALTC"))
1026+ , optimizeRuntimeCalls "__IDR__mEVAL0" "__IDRRT__EVALTC"
971− , map (optimizeEvalTailcalls ("__IDR__mAPPLY0", "__IDRRT__APPLYTC"))
1027+ , optimizeRuntimeCalls "__IDR__mAPPLY0" "__IDRRT__APPLYTC"
972 , map removeInstanceChecks
1028 , map removeInstanceChecks
973 , inlineFunctions
1029 , inlineFunctions
974 , map reduceContinuations
1030 , map reduceContinuations