diff options
| author | dos-reis <gdr@axiomatics.org> | 2011-12-14 20:07:49 +0000 |
|---|---|---|
| committer | dos-reis <gdr@axiomatics.org> | 2011-12-14 20:07:49 +0000 |
| commit | 838ceddb3d0ea500a4eee199b14638810e3a36f3 (patch) | |
| tree | b844925adb956f4661c27b9d05ced0ce1fc90846 | |
| parent | 879ee7751c95f2077b4c62ebd08c313be41b7e27 (diff) | |
| download | open-axiom-838ceddb3d0ea500a4eee199b14638810e3a36f3.tar.gz | |
* interp/g-opt.boot (removeNeedleesLeave): Remove.
(optScope): Adjust.
(removeLeave!): New.
(optimize!): Run it at the very beginning.
| -rw-r--r-- | src/ChangeLog | 7 | ||||
| -rw-r--r-- | src/interp/g-opt.boot | 24 |
2 files changed, 13 insertions, 18 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index ea523bed..76e17f35 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,10 @@ +2011-12-14 Gabriel Dos Reis <gdr@cs.tamu.edu> + + * interp/g-opt.boot (removeNeedleesLeave): Remove. + (optScope): Adjust. + (removeLeave!): New. + (optimize!): Run it at the very beginning. + 2011-12-13 Gabriel Dos Reis <gdr@cs.tamu.edu> * interp/g-opt.boot (optSeq): Remove. Adjust callers. diff --git a/src/interp/g-opt.boot b/src/interp/g-opt.boot index 62276e2c..64dfbd9b 100644 --- a/src/interp/g-opt.boot +++ b/src/interp/g-opt.boot @@ -325,11 +325,16 @@ cancelScopeLeave! x == walkWith!(x,function f) where resetTo(x,f y) x +removeLeave! x == walkWith!(x,function f) where + f x == + x is ['%leave,.,y] and y is ['%return,:.] => resetTo(x,y) + x + ++ Transform an intermediate form (output of the elaborator) to ++ a lower intermediate form, applying several transformations ++ generaly intended to improve quality and efficiency. optimize! x == - x := spliceSeq! packWhen! transformIF! x + x := spliceSeq! packWhen! transformIF! removeLeave! x changeVariableDefinitionToStore(x,nil) simplifyVMForm cancelScopeLeave! spliceSeq! packWhen! inlineLocals! groupTranscients! cancelScopeLeave! removeJunk! reduceXLAM! x @@ -412,25 +417,8 @@ changeLeaveToGo(s,g) == changeLeaveToGo(first s,g) changeLeaveToGo(rest s,g) -++ Change any `(%leave tag (%return expr))' in x to just -++ `(%return expr) since a %return-expression transfers control -++ out of the function body anyway. Similarly, transform -++ reudant `('%leave tag (%leave tag expr))' to `(%leave tag expr)'. -removeNeedlessLeave x == - atomic? x => x - x is ['%leave,.,y] and y is ['%return,:.] => - removeNeedlessLeave third y - x.op := y.op - x.args := y.args - x is ['%leave,g,y] and y is ['%leave,=g,z] => - removeNeedlessLeave z - second(x.args) := z - for x' in x repeat - removeNeedlessLeave x' - optScope (x is ['%scope,g,a]) == a isnt [.,:.] => a - removeNeedlessLeave a if a is ['%seq,:s,['%leave,=g,u]] then changeLeaveToExit(s,g) a.rest := [:s,['%exit,u]] |