diff options
| -rw-r--r-- | apps/factorial.mu | 2 | ||||
| -rw-r--r-- | apps/factorial4.subx | 12 | ||||
| -rw-r--r-- | html/apps/factorial.mu.html | 90 | ||||
| -rw-r--r-- | html/apps/factorial4.subx.html | 12 |
4 files changed, 60 insertions, 56 deletions
diff --git a/apps/factorial.mu b/apps/factorial.mu index 128ac9ad..722c9e6c 100644 --- a/apps/factorial.mu +++ b/apps/factorial.mu @@ -2,6 +2,8 @@ # ./translate_mu apps/factorial.mu # ./a.elf test # to run tests # ./a.elf # to run factorial(5) +# +# Compare apps/factorial4.subx fn factorial n: int -> result/eax: int { compare n 1 diff --git a/apps/factorial4.subx b/apps/factorial4.subx index 9ab7038f..3aae0dd3 100644 --- a/apps/factorial4.subx +++ b/apps/factorial4.subx @@ -60,7 +60,7 @@ factorial: # n: int -> int/eax 55/push-ebp 89/<- %ebp 4/r32/esp # save registers - 53/push-ebx + 51/push-ecx # if (n <= 1) return 1 81 7/subop/compare *(ebp+8) 1/imm32 { @@ -70,14 +70,14 @@ factorial: # n: int -> int/eax # if (n > 1) return n * factorial(n-1) { 7e/jump-if-<= break/disp8 - # var ebx: int = n-1 - 8b/-> *(ebp+8) 3/r32/ebx - 4b/decrement-ebx - (factorial %ebx) # => eax + # var tmp/ecx: int = n-1 + 8b/-> *(ebp+8) 1/r32/ecx + 49/decrement-ecx + (factorial %ecx) # => eax f7 4/subop/multiply-into-eax *(ebp+8) } # restore registers - 5b/pop-to-ebx + 59/pop-to-ecx # . epilogue 89/<- %esp 5/r32/ebp 5d/pop-to-ebp diff --git a/html/apps/factorial.mu.html b/html/apps/factorial.mu.html index fa2ce7a3..2b8d1f0c 100644 --- a/html/apps/factorial.mu.html +++ b/html/apps/factorial.mu.html @@ -60,50 +60,52 @@ if ('onhashchange' in window) { <span id="L2" class="LineNr"> 2 </span><span class="Comment"># ./translate_mu apps/factorial.mu</span> <span id="L3" class="LineNr"> 3 </span><span class="Comment"># ./a.elf test # to run tests</span> <span id="L4" class="LineNr"> 4 </span><span class="Comment"># ./a.elf # to run factorial(5)</span> -<span id="L5" class="LineNr"> 5 </span> -<span id="L6" class="LineNr"> 6 </span><span class="PreProc">fn</span> factorial n: int<span class="PreProc"> -> </span>result/<span class="Constant">eax</span>: int <span class="Delimiter">{</span> -<span id="L7" class="LineNr"> 7 </span> compare n <span class="Constant">1</span> -<span id="L8" class="LineNr"> 8 </span> <span class="Delimiter">{</span> -<span id="L9" class="LineNr"> 9 </span> <span class="Identifier">break-if-></span> -<span id="L10" class="LineNr">10 </span> result <span class="Special"><-</span> copy <span class="Constant">1</span> -<span id="L11" class="LineNr">11 </span> <span class="Delimiter">}</span> -<span id="L12" class="LineNr">12 </span> <span class="Delimiter">{</span> -<span id="L13" class="LineNr">13 </span> <span class="Identifier">break-if-<=</span> -<span id="L14" class="LineNr">14 </span> <span class="PreProc">var</span> tmp/<span class="Constant">ecx</span>: int <span class="Special"><-</span> copy n -<span id="L15" class="LineNr">15 </span> tmp <span class="Special"><-</span> decrement -<span id="L16" class="LineNr">16 </span> result <span class="Special"><-</span> factorial tmp -<span id="L17" class="LineNr">17 </span> result <span class="Special"><-</span> multiply n -<span id="L18" class="LineNr">18 </span> <span class="Delimiter">}</span> -<span id="L19" class="LineNr">19 </span><span class="Delimiter">}</span> -<span id="L20" class="LineNr">20 </span> -<span id="L21" class="LineNr">21 </span><span class="PreProc">fn</span> test-factorial <span class="Delimiter">{</span> -<span id="L22" class="LineNr">22 </span> <span class="PreProc">var</span> result/<span class="Constant">eax</span>: int <span class="Special"><-</span> factorial <span class="Constant">5</span> -<span id="L23" class="LineNr">23 </span> <a href='../051test.subx.html#L24'>check-ints-equal</a> result <span class="Constant">0x78</span> <span class="Constant">"F - test-factorial"</span> -<span id="L24" class="LineNr">24 </span><span class="Delimiter">}</span> -<span id="L25" class="LineNr">25 </span> -<span id="L26" class="LineNr">26 </span><span class="PreProc">fn</span> main args: (addr array kernel-string)<span class="PreProc"> -> </span>exit-status/<span class="Constant">ebx</span>: int <span class="Delimiter">{</span> -<span id="L27" class="LineNr">27 </span> <span class="PreProc">var</span> a/<span class="Constant">eax</span>: (addr array kernel-string) <span class="Special"><-</span> copy args -<span id="L28" class="LineNr">28 </span> <span class="PreProc">var</span> tmp/<span class="Constant">ecx</span>: int <span class="Special"><-</span> length a -<span id="L29" class="LineNr">29 </span> $main-body: <span class="Delimiter">{</span> -<span id="L30" class="LineNr">30 </span> compare tmp, <span class="Constant">1</span> -<span id="L31" class="LineNr">31 </span> <span class="Comment"># if (len(args) == 1) factorial(5)</span> -<span id="L32" class="LineNr">32 </span> <span class="Delimiter">{</span> -<span id="L33" class="LineNr">33 </span> <span class="Identifier">break-if-!=</span> -<span id="L34" class="LineNr">34 </span> <span class="PreProc">var</span> tmp/<span class="Constant">eax</span>: int <span class="Special"><-</span> factorial <span class="Constant">5</span> -<span id="L35" class="LineNr">35 </span> exit-status <span class="Special"><-</span> copy tmp -<span id="L36" class="LineNr">36 </span> <span class="Identifier">break</span> $main-body -<span id="L37" class="LineNr">37 </span> <span class="Delimiter">}</span> -<span id="L38" class="LineNr">38 </span> <span class="Comment"># if (args[1] == "test") run-tests()</span> -<span id="L39" class="LineNr">39 </span> <span class="PreProc">var</span> tmp2/<span class="Constant">ecx</span>: (addr kernel-string) <span class="Special"><-</span> index a, <span class="Constant">1</span> -<span id="L40" class="LineNr">40 </span> <span class="PreProc">var</span> tmp3/<span class="Constant">eax</span>: boolean <span class="Special"><-</span> <a href='../052kernel-string-equal.subx.html#L33'>kernel-string-equal?</a> *tmp2, <span class="Constant">"test"</span> -<span id="L41" class="LineNr">41 </span> compare tmp3, <span class="Constant">0</span> -<span id="L42" class="LineNr">42 </span> <span class="Delimiter">{</span> -<span id="L43" class="LineNr">43 </span> <span class="Identifier">break-if-=</span> -<span id="L44" class="LineNr">44 </span> run-tests -<span id="L45" class="LineNr">45 </span> exit-status <span class="Special"><-</span> copy <span class="Constant">0</span> <span class="Comment"># TODO: get at Num-test-failures somehow</span> -<span id="L46" class="LineNr">46 </span> <span class="Delimiter">}</span> -<span id="L47" class="LineNr">47 </span> <span class="Delimiter">}</span> -<span id="L48" class="LineNr">48 </span><span class="Delimiter">}</span> +<span id="L5" class="LineNr"> 5 </span><span class="Comment">#</span> +<span id="L6" class="LineNr"> 6 </span><span class="Comment"># Compare apps/factorial4.subx</span> +<span id="L7" class="LineNr"> 7 </span> +<span id="L8" class="LineNr"> 8 </span><span class="PreProc">fn</span> <a href='factorial.mu.html#L8'>factorial</a> n: int<span class="PreProc"> -> </span>result/<span class="Constant">eax</span>: int <span class="Delimiter">{</span> +<span id="L9" class="LineNr"> 9 </span> compare n <span class="Constant">1</span> +<span id="L10" class="LineNr">10 </span> <span class="Delimiter">{</span> +<span id="L11" class="LineNr">11 </span> <span class="Identifier">break-if-></span> +<span id="L12" class="LineNr">12 </span> result <span class="Special"><-</span> copy <span class="Constant">1</span> +<span id="L13" class="LineNr">13 </span> <span class="Delimiter">}</span> +<span id="L14" class="LineNr">14 </span> <span class="Delimiter">{</span> +<span id="L15" class="LineNr">15 </span> <span class="Identifier">break-if-<=</span> +<span id="L16" class="LineNr">16 </span> <span class="PreProc">var</span> tmp/<span class="Constant">ecx</span>: int <span class="Special"><-</span> copy n +<span id="L17" class="LineNr">17 </span> tmp <span class="Special"><-</span> decrement +<span id="L18" class="LineNr">18 </span> result <span class="Special"><-</span> <a href='factorial.mu.html#L8'>factorial</a> tmp +<span id="L19" class="LineNr">19 </span> result <span class="Special"><-</span> multiply n +<span id="L20" class="LineNr">20 </span> <span class="Delimiter">}</span> +<span id="L21" class="LineNr">21 </span><span class="Delimiter">}</span> +<span id="L22" class="LineNr">22 </span> +<span id="L23" class="LineNr">23 </span><span class="PreProc">fn</span> <a href='factorial.mu.html#L23'>test-factorial</a> <span class="Delimiter">{</span> +<span id="L24" class="LineNr">24 </span> <span class="PreProc">var</span> result/<span class="Constant">eax</span>: int <span class="Special"><-</span> <a href='factorial.mu.html#L8'>factorial</a> <span class="Constant">5</span> +<span id="L25" class="LineNr">25 </span> <a href='../051test.subx.html#L24'>check-ints-equal</a> result <span class="Constant">0x78</span> <span class="Constant">"F - test-factorial"</span> +<span id="L26" class="LineNr">26 </span><span class="Delimiter">}</span> +<span id="L27" class="LineNr">27 </span> +<span id="L28" class="LineNr">28 </span><span class="PreProc">fn</span> main args: (addr array kernel-string)<span class="PreProc"> -> </span>exit-status/<span class="Constant">ebx</span>: int <span class="Delimiter">{</span> +<span id="L29" class="LineNr">29 </span> <span class="PreProc">var</span> a/<span class="Constant">eax</span>: (addr array kernel-string) <span class="Special"><-</span> copy args +<span id="L30" class="LineNr">30 </span> <span class="PreProc">var</span> tmp/<span class="Constant">ecx</span>: int <span class="Special"><-</span> length a +<span id="L31" class="LineNr">31 </span> $main-body: <span class="Delimiter">{</span> +<span id="L32" class="LineNr">32 </span> compare tmp, <span class="Constant">1</span> +<span id="L33" class="LineNr">33 </span> <span class="Comment"># if (len(args) == 1) factorial(5)</span> +<span id="L34" class="LineNr">34 </span> <span class="Delimiter">{</span> +<span id="L35" class="LineNr">35 </span> <span class="Identifier">break-if-!=</span> +<span id="L36" class="LineNr">36 </span> <span class="PreProc">var</span> tmp/<span class="Constant">eax</span>: int <span class="Special"><-</span> <a href='factorial.mu.html#L8'>factorial</a> <span class="Constant">5</span> +<span id="L37" class="LineNr">37 </span> exit-status <span class="Special"><-</span> copy tmp +<span id="L38" class="LineNr">38 </span> <span class="Identifier">break</span> $main-body +<span id="L39" class="LineNr">39 </span> <span class="Delimiter">}</span> +<span id="L40" class="LineNr">40 </span> <span class="Comment"># if (args[1] == "test") run-tests()</span> +<span id="L41" class="LineNr">41 </span> <span class="PreProc">var</span> tmp2/<span class="Constant">ecx</span>: (addr kernel-string) <span class="Special"><-</span> index a, <span class="Constant">1</span> +<span id="L42" class="LineNr">42 </span> <span class="PreProc">var</span> tmp3/<span class="Constant">eax</span>: boolean <span class="Special"><-</span> <a href='../052kernel-string-equal.subx.html#L33'>kernel-string-equal?</a> *tmp2, <span class="Constant">"test"</span> +<span id="L43" class="LineNr">43 </span> compare tmp3, <span class="Constant">0</span> +<span id="L44" class="LineNr">44 </span> <span class="Delimiter">{</span> +<span id="L45" class="LineNr">45 </span> <span class="Identifier">break-if-=</span> +<span id="L46" class="LineNr">46 </span> run-tests +<span id="L47" class="LineNr">47 </span> exit-status <span class="Special"><-</span> copy <span class="Constant">0</span> <span class="Comment"># TODO: get at Num-test-failures somehow</span> +<span id="L48" class="LineNr">48 </span> <span class="Delimiter">}</span> +<span id="L49" class="LineNr">49 </span> <span class="Delimiter">}</span> +<span id="L50" class="LineNr">50 </span><span class="Delimiter">}</span> </pre> </body> </html> diff --git a/html/apps/factorial4.subx.html b/html/apps/factorial4.subx.html index bd41739e..fcbde291 100644 --- a/html/apps/factorial4.subx.html +++ b/html/apps/factorial4.subx.html @@ -119,7 +119,7 @@ if ('onhashchange' in window) { <span id="L60" class="LineNr">60 </span> 55/push-ebp <span id="L61" class="LineNr">61 </span> 89/<- %ebp 4/r32/esp <span id="L62" class="LineNr">62 </span> <span class="subxComment"># save registers</span> -<span id="L63" class="LineNr">63 </span> 53/push-ebx +<span id="L63" class="LineNr">63 </span> 51/push-ecx <span id="L64" class="LineNr">64 </span> <span class="subxComment"># if (n <= 1) return 1</span> <span id="L65" class="LineNr">65 </span> 81 7/subop/compare *(ebp+8) 1/imm32 <span id="L66" class="LineNr">66 </span> { @@ -129,14 +129,14 @@ if ('onhashchange' in window) { <span id="L70" class="LineNr">70 </span> <span class="subxComment"># if (n > 1) return n * factorial(n-1)</span> <span id="L71" class="LineNr">71 </span> { <span id="L72" class="LineNr">72 </span> 7e/jump-if-<= <span class="Constant">break</span>/disp8 -<span id="L73" class="LineNr">73 </span> <span class="subxComment"># var ebx: int = n-1</span> -<span id="L74" class="LineNr">74 </span> 8b/-> *(ebp+8) 3/r32/ebx -<span id="L75" class="LineNr">75 </span> 4b/decrement-ebx -<span id="L76" class="LineNr">76 </span> (<a href='factorial4.subx.html#L58'>factorial</a> %ebx) <span class="subxComment"># => eax</span> +<span id="L73" class="LineNr">73 </span> <span class="subxComment"># var tmp/ecx: int = n-1</span> +<span id="L74" class="LineNr">74 </span> 8b/-> *(ebp+8) 1/r32/ecx +<span id="L75" class="LineNr">75 </span> 49/decrement-ecx +<span id="L76" class="LineNr">76 </span> (<a href='factorial4.subx.html#L58'>factorial</a> %ecx) <span class="subxComment"># => eax</span> <span id="L77" class="LineNr">77 </span> f7 4/subop/multiply-into-eax *(ebp+8) <span id="L78" class="LineNr">78 </span> } <span id="L79" class="LineNr">79 </span> <span class="subxComment"># restore registers</span> -<span id="L80" class="LineNr">80 </span> 5b/pop-to-ebx +<span id="L80" class="LineNr">80 </span> 59/pop-to-ecx <span id="L81" class="LineNr">81 </span> <span class="subxS1Comment"># . epilogue</span> <span id="L82" class="LineNr">82 </span> 89/<- %esp 5/r32/ebp <span id="L83" class="LineNr">83 </span> 5d/pop-to-ebp |