diff options
| -rwxr-xr-x | apps/factorial | bin | 44976 -> 44976 bytes | |||
| -rw-r--r-- | apps/factorial.mu | 5 | ||||
| -rw-r--r-- | apps/factorial.subx | 100 | ||||
| -rw-r--r-- | apps/factorial2.subx | 100 | ||||
| -rw-r--r-- | apps/factorial3.subx | 59 | ||||
| -rw-r--r-- | apps/factorial4.subx | 69 | ||||
| -rw-r--r-- | html/apps/factorial.mu.html | 97 | ||||
| -rw-r--r-- | html/apps/factorial.subx.html | 254 | ||||
| -rw-r--r-- | html/apps/factorial2.subx.html | 200 | ||||
| -rw-r--r-- | html/apps/factorial3.subx.html | 127 | ||||
| -rw-r--r-- | html/apps/factorial4.subx.html | 140 |
11 files changed, 584 insertions, 567 deletions
diff --git a/apps/factorial b/apps/factorial index c001d2d8..c5676040 100755 --- a/apps/factorial +++ b/apps/factorial Binary files differdiff --git a/apps/factorial.mu b/apps/factorial.mu index dab0ca90..362b68c6 100644 --- a/apps/factorial.mu +++ b/apps/factorial.mu @@ -8,6 +8,11 @@ # # You can also run the automated test suite: # $ ./a.elf test +# Expected output: +# ........ +# Every '.' indicates a passing test. Failing tests get a 'F'. +# There's only one test in this file, but you'll also see tests running from +# Mu's standard library. # # Compare apps/factorial4.subx diff --git a/apps/factorial.subx b/apps/factorial.subx index 74e4dd6d..b027696e 100644 --- a/apps/factorial.subx +++ b/apps/factorial.subx @@ -18,6 +18,55 @@ # . op subop mod rm32 base index scale r32 # . 1-3 bytes 3 bits 2 bits 3 bits 3 bits 3 bits 2 bits 2 bits 0/1/2/4 bytes 0/1/2/4 bytes +factorial: # n: int -> int/eax + # . prologue + 55/push-ebp + 89/copy 3/mod/direct 5/rm32/ebp . . . 4/r32/esp . . # copy esp to ebp + 53/push-ebx + # if (n <= 1) return 1 + b8/copy-to-eax 1/imm32 + 81 7/subop/compare 1/mod/*+disp8 5/rm32/ebp . . . . 8/disp8 1/imm32 # compare *(ebp+8) + 7e/jump-if-<= $factorial:end/disp8 + # var ebx: int = n-1 + 8b/copy 1/mod/*+disp8 5/rm32/ebp . . 3/r32/ebx 8/disp8 . # copy *(ebp+8) to ebx + 4b/decrement-ebx + # var eax: int = factorial(n-1) + # . . push args + 53/push-ebx + # . . call + e8/call factorial/disp32 + # . . discard args + 81 0/subop/add 3/mod/direct 4/rm32/esp . . . . . 4/imm32 # add to esp + # return n * factorial(n-1) + f7 4/subop/multiply 1/mod/*+disp8 5/rm32/ebp . . 8/disp8 . # multiply *(ebp+8) into eax + # TODO: check for overflow +$factorial:end: + # . epilogue + 5b/pop-to-ebx + 89/copy 3/mod/direct 4/rm32/esp . . . 5/r32/ebp . . # copy ebp to esp + 5d/pop-to-ebp + c3/return + +test-factorial: + # factorial(5) + # . . push args + 68/push 5/imm32 + # . . call + e8/call factorial/disp32 + # . . discard args + 81 0/subop/add 3/mod/direct 4/rm32/esp . . . . . 4/imm32 # add to esp + # check-ints-equal(eax, 120, msg) + # . . push args + 68/push "F - test-factorial"/imm32 + 68/push 0x78/imm32/expected-120 + 50/push-eax + # . . call + e8/call check-ints-equal/disp32 + # . . discard args + 81 0/subop/add 3/mod/direct 4/rm32/esp . . . . . 0xc/imm32 # add to esp + # end + c3/return + Entry: # run tests if necessary, compute `factorial(5)` if not # . prologue 89/copy 3/mod/direct 5/rm32/ebp . . . 4/r32/esp . . # copy esp to ebp @@ -92,58 +141,9 @@ $run-main: e8/call write/disp32 # . . discard args 81 0/subop/add 3/mod/direct 4/rm32/esp . . . . . 8/imm32 # add to esp - # syscall(exit, eax) + # 89/copy 3/mod/direct 3/rm32/ebx . . . 0/r32/eax . . # copy eax to ebx $main:end: e8/call syscall_exit/disp32 -factorial: # n: int -> int/eax - # . prologue - 55/push-ebp - 89/copy 3/mod/direct 5/rm32/ebp . . . 4/r32/esp . . # copy esp to ebp - 53/push-ebx - # if (n <= 1) return 1 - b8/copy-to-eax 1/imm32 - 81 7/subop/compare 1/mod/*+disp8 5/rm32/ebp . . . . 8/disp8 1/imm32 # compare *(ebp+8) - 7e/jump-if-<= $factorial:end/disp8 - # var ebx: int = n-1 - 8b/copy 1/mod/*+disp8 5/rm32/ebp . . 3/r32/ebx 8/disp8 . # copy *(ebp+8) to ebx - 4b/decrement-ebx - # var eax: int = factorial(n-1) - # . . push args - 53/push-ebx - # . . call - e8/call factorial/disp32 - # . . discard args - 81 0/subop/add 3/mod/direct 4/rm32/esp . . . . . 4/imm32 # add to esp - # return n * factorial(n-1) - f7 4/subop/multiply 1/mod/*+disp8 5/rm32/ebp . . 8/disp8 . # multiply *(ebp+8) into eax - # TODO: check for overflow -$factorial:end: - # . epilogue - 5b/pop-to-ebx - 89/copy 3/mod/direct 4/rm32/esp . . . 5/r32/ebp . . # copy ebp to esp - 5d/pop-to-ebp - c3/return - -test-factorial: - # factorial(5) - # . . push args - 68/push 5/imm32 - # . . call - e8/call factorial/disp32 - # . . discard args - 81 0/subop/add 3/mod/direct 4/rm32/esp . . . . . 4/imm32 # add to esp - # check-ints-equal(eax, 120, msg) - # . . push args - 68/push "F - test-factorial"/imm32 - 68/push 0x78/imm32/expected-120 - 50/push-eax - # . . call - e8/call check-ints-equal/disp32 - # . . discard args - 81 0/subop/add 3/mod/direct 4/rm32/esp . . . . . 0xc/imm32 # add to esp - # end - c3/return - # . . vim:nowrap:textwidth=0 diff --git a/apps/factorial2.subx b/apps/factorial2.subx index 0eaaf049..7d303227 100644 --- a/apps/factorial2.subx +++ b/apps/factorial2.subx @@ -15,58 +15,11 @@ # Expected output: # ........ # Every '.' indicates a passing test. Failing tests get a 'F'. +# +# Compare apps/factorial.subx == code -Entry: # run tests if necessary, compute `factorial(5)` if not - # . prologue - 89/<- %ebp 4/r32/esp - - # initialize heap - # . Heap = new-segment(Heap-size) - # . . push args - 68/push Heap/imm32 - ff 6/subop/push *Heap-size - # . . call - e8/call new-segment/disp32 - # . . discard args - 81 0/subop/add %esp 8/imm32 - - # - if argc > 1 and argv[1] == "test", then return run_tests() - # if (argc <= 1) goto run-main - 81 7/subop/compare *ebp 1/imm32 - 7e/jump-if-<= $run-main/disp8 - # if (!kernel-string-equal?(argv[1], "test")) goto run-main - # . eax = kernel-string-equal?(argv[1], "test") - # . . push args - 68/push "test"/imm32 - ff 6/subop/push *(ebp+8) - # . . call - e8/call kernel-string-equal?/disp32 - # . . discard args - 81 0/subop/add %esp 8/imm32 - # . if (eax == false) goto run-main - 3d/compare-eax-and 0/imm32/false - 74/jump-if-= $run-main/disp8 - # run-tests() - e8/call run-tests/disp32 - # syscall(exit, *Num-test-failures) - 8b/-> *Num-test-failures 3/r32/ebx - eb/jump $main:end/disp8 -$run-main: - # - otherwise return factorial(5) - # eax = factorial(5) - # . . push args - 68/push 5/imm32 - # . . call - e8/call factorial/disp32 - # . . discard args - 81 0/subop/add %esp 4/imm32 - # syscall(exit, eax) - 89/<- %ebx 0/r32/eax -$main:end: - e8/call syscall_exit/disp32 - factorial: # n: int -> int/eax # . prologue 55/push-ebp @@ -115,3 +68,52 @@ test-factorial: 81 0/subop/add %esp 0xc/imm32 # end c3/return + +Entry: # run tests if necessary, compute `factorial(5)` if not + # . prologue + 89/<- %ebp 4/r32/esp + + # initialize heap + # . Heap = new-segment(Heap-size) + # . . push args + 68/push Heap/imm32 + ff 6/subop/push *Heap-size + # . . call + e8/call new-segment/disp32 + # . . discard args + 81 0/subop/add %esp 8/imm32 + + # - if argc > 1 and argv[1] == "test", then return run_tests() + # if (argc <= 1) goto run-main + 81 7/subop/compare *ebp 1/imm32 + 7e/jump-if-<= $run-main/disp8 + # if (!kernel-string-equal?(argv[1], "test")) goto run-main + # . eax = kernel-string-equal?(argv[1], "test") + # . . push args + 68/push "test"/imm32 + ff 6/subop/push *(ebp+8) + # . . call + e8/call kernel-string-equal?/disp32 + # . . discard args + 81 0/subop/add %esp 8/imm32 + # . if (eax == false) goto run-main + 3d/compare-eax-and 0/imm32/false + 74/jump-if-= $run-main/disp8 + # run-tests() + e8/call run-tests/disp32 + # syscall(exit, *Num-test-failures) + 8b/-> *Num-test-failures 3/r32/ebx + eb/jump $main:end/disp8 +$run-main: + # - otherwise return factorial(5) + # ebx = factorial(5) + # . . push args + 68/push 5/imm32 + # . . call + e8/call factorial/disp32 + # . . discard args + 81 0/subop/add %esp 4/imm32 + # + 89/<- %ebx 0/r32/eax +$main:end: + e8/call syscall_exit/disp32 diff --git a/apps/factorial3.subx b/apps/factorial3.subx index e8f39066..eb07b5ca 100644 --- a/apps/factorial3.subx +++ b/apps/factorial3.subx @@ -16,38 +16,11 @@ # Expected output: # ........ # Every '.' indicates a passing test. Failing tests get a 'F'. +# +# Compare apps/factorial2.subx == code -Entry: # run tests if necessary, compute `factorial(5)` if not - # . prologue - 89/<- %ebp 4/r32/esp - - # initialize heap - (new-segment *Heap-size Heap) - - # - if argc > 1 and argv[1] == "test", then return run_tests() - # if (argc <= 1) goto run-main - 81 7/subop/compare *ebp 1/imm32 - 7e/jump-if-<= $run-main/disp8 - # if (!kernel-string-equal?(argv[1], "test")) goto run-main - (kernel-string-equal? *(ebp+8) "test") # => eax - # . if (eax == false) goto run-main - 3d/compare-eax-and 0/imm32/false - 74/jump-if-= $run-main/disp8 - # - (run-tests) - # syscall(exit, *Num-test-failures) - 8b/-> *Num-test-failures 3/r32/ebx - eb/jump $main:end/disp8 -$run-main: - # - otherwise - (factorial 5) # => eax - # syscall(exit, eax) - 89/<- %ebx 0/r32/eax -$main:end: - e8/call syscall_exit/disp32 - factorial: # n: int -> int/eax # . prologue 55/push-ebp @@ -78,3 +51,31 @@ test-factorial: (factorial 5) (check-ints-equal %eax 0x78 "F - test-factorial") c3/return + +Entry: # run tests if necessary, compute `factorial(5)` if not + # . prologue + 89/<- %ebp 4/r32/esp + + # initialize heap (needed by tests elsewhere) + (new-segment *Heap-size Heap) + + # - if argc > 1 and argv[1] == "test", then return run_tests() + # if (argc <= 1) goto run-main + 81 7/subop/compare *ebp 1/imm32 + 7e/jump-if-<= $run-main/disp8 + # if (!kernel-string-equal?(argv[1], "test")) goto run-main + (kernel-string-equal? *(ebp+8) "test") # => eax + # . if (eax == false) goto run-main + 3d/compare-eax-and 0/imm32/false + 74/jump-if-= $run-main/disp8 + # + (run-tests) + # syscall(exit, *Num-test-failures) + 8b/-> *Num-test-failures 3/r32/ebx + eb/jump $main:end/disp8 +$run-main: + # - otherwise + (factorial 5) # => eax + 89/<- %ebx 0/r32/eax +$main:end: + e8/call syscall_exit/disp32 diff --git a/apps/factorial4.subx b/apps/factorial4.subx index 3028999e..6228f9ab 100644 --- a/apps/factorial4.subx +++ b/apps/factorial4.subx @@ -17,43 +17,11 @@ # Expected output: # ........ # Every '.' indicates a passing test. Failing tests get a 'F'. +# +# Compare apps/factorial3.subx == code -Entry: # run tests if necessary, compute `factorial(5)` if not - # . prologue - 89/<- %ebp 4/r32/esp - - # initialize heap - (new-segment *Heap-size Heap) - - # - if argc > 1, then return run_tests() - { - # if (argc <= 1) break - 81 7/subop/compare *ebp 1/imm32 - 7e/jump-if-<= break/disp8 - # if (!kernel-string-equal?(argv[1], "test")) break - (kernel-string-equal? *(ebp+8) "test") # => eax - 3d/compare-eax-and 0/imm32/false - 74/jump-if-= break/disp8 - # - (run-tests) - # eax = *Num-test-failures - 8b/-> *Num-test-failures 3/r32/ebx - } - # if (argc <= 1) factorial(5) - { - # if (argc > 1) break - 81 7/subop/compare *ebp 1/imm32 - 7f/jump-if-> break/disp8 - # eax = factorial(5) - (factorial 5) - # syscall(exit, eax) - 89/<- %ebx 0/r32/eax - } - - e8/call syscall_exit/disp32 - factorial: # n: int -> int/eax # . prologue 55/push-ebp @@ -86,3 +54,36 @@ test-factorial: (factorial 5) (check-ints-equal %eax 0x78 "F - test-factorial") c3/return + +Entry: # run tests if necessary, compute `factorial(5)` if not + # . prologue + 89/<- %ebp 4/r32/esp + + # initialize heap (needed by tests elsewhere) + (new-segment *Heap-size Heap) + + # if (argc <= 1) return factorial(5) + { + # if (argc > 1) break + 81 7/subop/compare *ebp 1/imm32 + 7f/jump-if-> break/disp8 + # ebx = factorial(5) + (factorial 5) # => eax + 89/<- %ebx 0/r32/eax + } + # otherwise if an arg exists and is "test", then return run_tests() + { + # if (argc <= 1) break + 81 7/subop/compare *ebp 1/imm32 + 7e/jump-if-<= break/disp8 + # if (!kernel-string-equal?(argv[1], "test")) break + (kernel-string-equal? *(ebp+8) "test") # => eax + 3d/compare-eax-and 0/imm32/false + 74/jump-if-= break/disp8 + # + (run-tests) + # ebx = *Num-test-failures + 8b/-> *Num-test-failures 3/r32/ebx + } + + e8/call syscall_exit/disp32 diff --git a/html/apps/factorial.mu.html b/html/apps/factorial.mu.html index b26c4123..823fcf3b 100644 --- a/html/apps/factorial.mu.html +++ b/html/apps/factorial.mu.html @@ -67,55 +67,60 @@ if ('onhashchange' in window) { <span id="L8" class="LineNr"> 8 </span><span class="muComment">#</span> <span id="L9" class="LineNr"> 9 </span><span class="muComment"># You can also run the automated test suite:</span> <span id="L10" class="LineNr">10 </span><span class="muComment"># $ ./a.elf test</span> -<span id="L11" class="LineNr">11 </span><span class="muComment">#</span> -<span id="L12" class="LineNr">12 </span><span class="muComment"># Compare apps/factorial4.subx</span> -<span id="L13" class="LineNr">13 </span> -<span id="L14" class="LineNr">14 </span><span class="PreProc">fn</span> <span class="muFunction"><a href='factorial.mu.html#L14'>factorial</a></span> n: int<span class="PreProc"> -> </span>result/<span class="Constant">eax</span>: int <span class="Delimiter">{</span> -<span id="L15" class="LineNr">15 </span> compare n, <span class="Constant">1</span> -<span id="L16" class="LineNr">16 </span> <span class="Delimiter">{</span> -<span id="L17" class="LineNr">17 </span> <span class="PreProc">break-if-></span> -<span id="L18" class="LineNr">18 </span> <span class="muComment"># n <= 1; return 1</span> -<span id="L19" class="LineNr">19 </span> result <span class="SpecialChar"><-</span> copy <span class="Constant">1</span> -<span id="L20" class="LineNr">20 </span> <span class="Delimiter">}</span> +<span id="L11" class="LineNr">11 </span><span class="muComment"># Expected output:</span> +<span id="L12" class="LineNr">12 </span><span class="muComment"># ........</span> +<span id="L13" class="LineNr">13 </span><span class="muComment"># Every '.' indicates a passing test. Failing tests get a 'F'.</span> +<span id="L14" class="LineNr">14 </span><span class="muComment"># There's only one test in this file, but you'll also see tests running from</span> +<span id="L15" class="LineNr">15 </span><span class="muComment"># Mu's standard library.</span> +<span id="L16" class="LineNr">16 </span><span class="muComment">#</span> +<span id="L17" class="LineNr">17 </span><span class="muComment"># Compare apps/factorial4.subx</span> +<span id="L18" class="LineNr">18 </span> +<span id="L19" class="LineNr">19 </span><span class="PreProc">fn</span> <span class="muFunction"><a href='factorial.mu.html#L19'>factorial</a></span> n: int<span class="PreProc"> -> </span>result/<span class="Constant">eax</span>: int <span class="Delimiter">{</span> +<span id="L20" class="LineNr">20 </span> compare n, <span class="Constant">1</span> <span id="L21" class="LineNr">21 </span> <span class="Delimiter">{</span> -<span id="L22" class="LineNr">22 </span> <span class="PreProc">break-if-<=</span> -<span id="L23" class="LineNr">23 </span> <span class="muComment"># n > 1; return n * factorial(n-1)</span> -<span id="L24" class="LineNr">24 </span> <span class="PreProc">var</span> tmp/<span class="Constant">ecx</span>: int <span class="SpecialChar"><-</span> copy n -<span id="L25" class="LineNr">25 </span> tmp <span class="SpecialChar"><-</span> decrement -<span id="L26" class="LineNr">26 </span> result <span class="SpecialChar"><-</span> <a href='factorial.mu.html#L14'>factorial</a> tmp -<span id="L27" class="LineNr">27 </span> result <span class="SpecialChar"><-</span> multiply n -<span id="L28" class="LineNr">28 </span> <span class="Delimiter">}</span> -<span id="L29" class="LineNr">29 </span><span class="Delimiter">}</span> -<span id="L30" class="LineNr">30 </span> -<span id="L31" class="LineNr">31 </span><span class="PreProc">fn</span> <span class="muTest"><a href='factorial.mu.html#L31'>test-factorial</a></span> <span class="Delimiter">{</span> -<span id="L32" class="LineNr">32 </span> <span class="PreProc">var</span> result/<span class="Constant">eax</span>: int <span class="SpecialChar"><-</span> <a href='factorial.mu.html#L14'>factorial</a> <span class="Constant">5</span> -<span id="L33" class="LineNr">33 </span> <a href='../102test.subx.html#L23'>check-ints-equal</a> result, <span class="Constant">0x78</span>, <span class="Constant">"F - test-factorial"</span> +<span id="L22" class="LineNr">22 </span> <span class="PreProc">break-if-></span> +<span id="L23" class="LineNr">23 </span> <span class="muComment"># n <= 1; return 1</span> +<span id="L24" class="LineNr">24 </span> result <span class="SpecialChar"><-</span> copy <span class="Constant">1</span> +<span id="L25" class="LineNr">25 </span> <span class="Delimiter">}</span> +<span id="L26" class="LineNr">26 </span> <span class="Delimiter">{</span> +<span id="L27" class="LineNr">27 </span> <span class="PreProc">break-if-<=</span> +<span id="L28" class="LineNr">28 </span> <span class="muComment"># n > 1; return n * factorial(n-1)</span> +<span id="L29" class="LineNr">29 </span> <span class="PreProc">var</span> tmp/<span class="Constant">ecx</span>: int <span class="SpecialChar"><-</span> copy n +<span id="L30" class="LineNr">30 </span> tmp <span class="SpecialChar"><-</span> decrement +<span id="L31" class="LineNr">31 </span> result <span class="SpecialChar"><-</span> <a href='factorial.mu.html#L19'>factorial</a> tmp +<span id="L32" class="LineNr">32 </span> result <span class="SpecialChar"><-</span> multiply n +<span id="L33" class="LineNr">33 </span> <span class="Delimiter">}</span> <span id="L34" class="LineNr">34 </span><span class="Delimiter">}</span> <span id="L35" class="LineNr">35 </span> -<span id="L36" class="LineNr">36 </span><span class="PreProc">fn</span> <span class="muFunction"><a href='factorial.mu.html#L36'>main</a></span> args-on-stack: (addr array (addr array byte))<span class="PreProc"> -> </span>exit-status/<span class="Constant">ebx</span>: int <span class="Delimiter">{</span> -<span id="L37" class="LineNr">37 </span> <span class="PreProc">var</span> args/<span class="Constant">eax</span>: (addr array addr array byte) <span class="SpecialChar"><-</span> copy args-on-stack -<span id="L38" class="LineNr">38 </span> <span class="muComment"># len = length(args)</span> -<span id="L39" class="LineNr">39 </span> <span class="PreProc">var</span> len/<span class="Constant">ecx</span>: int <span class="SpecialChar"><-</span> length args -<span id="L40" class="LineNr">40 </span> $main-body: <span class="Delimiter">{</span> -<span id="L41" class="LineNr">41 </span> <span class="muComment"># if (len <= 1) return factorial(5)</span> -<span id="L42" class="LineNr">42 </span> compare len, <span class="Constant">1</span> -<span id="L43" class="LineNr">43 </span> <span class="Delimiter">{</span> -<span id="L44" class="LineNr">44 </span> <span class="PreProc">break-if-></span> -<span id="L45" class="LineNr">45 </span> <span class="PreProc">var</span> tmp/<span class="Constant">eax</span>: int <span class="SpecialChar"><-</span> <a href='factorial.mu.html#L14'>factorial</a> <span class="Constant">5</span> -<span id="L46" class="LineNr">46 </span> exit-status <span class="SpecialChar"><-</span> copy tmp -<span id="L47" class="LineNr">47 </span> <span class="PreProc">break</span> $main-body -<span id="L48" class="LineNr">48 </span> <span class="Delimiter">}</span> -<span id="L49" class="LineNr">49 </span> <span class="muComment"># if (args[1] == "test") run-tests()</span> -<span id="L50" class="LineNr">50 </span> <span class="PreProc">var</span> tmp2/<span class="Constant">ecx</span>: (addr addr array byte) <span class="SpecialChar"><-</span> index args, <span class="Constant">1</span> -<span id="L51" class="LineNr">51 </span> <span class="PreProc">var</span> tmp3/<span class="Constant">eax</span>: boolean <span class="SpecialChar"><-</span> <a href='../105string-equal.subx.html#L15'>string-equal?</a> *tmp2, <span class="Constant">"test"</span> -<span id="L52" class="LineNr">52 </span> compare tmp3, <span class="Constant">0</span> -<span id="L53" class="LineNr">53 </span> <span class="Delimiter">{</span> -<span id="L54" class="LineNr">54 </span> <span class="PreProc">break-if-=</span> -<span id="L55" class="LineNr">55 </span> run-tests -<span id="L56" class="LineNr">56 </span> exit-status <span class="SpecialChar"><-</span> copy <span class="Constant">0</span> <span class="muComment"># TODO: get at Num-test-failures somehow</span> -<span id="L57" class="LineNr">57 </span> <span class="Delimiter">}</span> -<span id="L58" class="LineNr">58 </span> <span class="Delimiter">}</span> -<span id="L59" class="LineNr">59 </span><span class="Delimiter">}</span> +<span id="L36" class="LineNr">36 </span><span class="PreProc">fn</span> <span class="muTest"><a href='factorial.mu.html#L36'>test-factorial</a></span> <span class="Delimiter">{</span> +<span id="L37" class="LineNr">37 </span> <span class="PreProc">var</span> result/<span class="Constant">eax</span>: int <span class="SpecialChar"><-</span> <a href='factorial.mu.html#L19'>factorial</a> <span class="Constant">5</span> +<span id="L38" class="LineNr">38 </span> <a href='../102test.subx.html#L23'>check-ints-equal</a> result, <span class="Constant">0x78</span>, <span class="Constant">"F - test-factorial"</span> +<span id="L39" class="LineNr">39 </span><span class="Delimiter">}</span> +<span id="L40" class="LineNr">40 </span> +<span id="L41" class="LineNr">41 </span><span class="PreProc">fn</span> <span class="muFunction"><a href='factorial.mu.html#L41'>main</a></span> args-on-stack: (addr array (addr array byte))<span class="PreProc"> -> </span>exit-status/<span class="Constant">ebx</span>: int <span class="Delimiter">{</span> +<span id="L42" class="LineNr">42 </span> <span class="PreProc">var</span> args/<span class="Constant">eax</span>: (addr array addr array byte) <span class="SpecialChar"><-</span> copy args-on-stack +<span id="L43" class="LineNr">43 </span> <span class="muComment"># len = length(args)</span> +<span id="L44" class="LineNr">44 </span> <span class="PreProc">var</span> len/<span class="Constant">ecx</span>: int <span class="SpecialChar"><-</span> length args +<span id="L45" class="LineNr">45 </span> $main-body: <span class="Delimiter">{</span> +<span id="L46" class="LineNr">46 </span> <span class="muComment"># if (len <= 1) return factorial(5)</span> +<span id="L47" class="LineNr">47 </span> compare len, <span class="Constant">1</span> +<span id="L48" class="LineNr">48 </span> <span class="Delimiter">{</span> +<span id="L49" class="LineNr">49 </span> <span class="PreProc">break-if-></span> +<span id="L50" class="LineNr">50 </span> <span class="PreProc">var</span> tmp/<span class="Constant">eax</span>: int <span class="SpecialChar"><-</span> <a href='factorial.mu.html#L19'>factorial</a> <span class="Constant">5</span> +<span id="L51" class="LineNr">51 </span> exit-status <span class="SpecialChar"><-</span> copy tmp +<span id="L52" class="LineNr">52 </span> <span class="PreProc">break</span> $main-body +<span id="L53" class="LineNr">53 </span> <span class="Delimiter">}</span> +<span id="L54" class="LineNr">54 </span> <span class="muComment"># if (args[1] == "test") run-tests()</span> +<span id="L55" class="LineNr">55 </span> <span class="PreProc">var</span> tmp2/<span class="Constant">ecx</span>: (addr addr array byte) <span class="SpecialChar"><-</span> index args, <span class="Constant">1</span> +<span id="L56" class="LineNr">56 </span> <span class="PreProc">var</span> tmp3/<span class="Constant">eax</span>: boolean <span class="SpecialChar"><-</span> <a href='../105string-equal.subx.html#L15'>string-equal?</a> *tmp2, <span class="Constant">"test"</span> +<span id="L57" class="LineNr">57 </span> compare tmp3, <span class="Constant">0</span> +<span id="L58" class="LineNr">58 </span> <span class="Delimiter">{</span> +<span id="L59" class="LineNr">59 </span> <span class="PreProc">break-if-=</span> +<span id="L60" class="LineNr">60 </span> run-tests +<span id="L61" class="LineNr">61 </span> exit-status <span class="SpecialChar"><-</span> copy <span class="Constant">0</span> <span class="muComment"># TODO: get at Num-test-failures somehow</span> +<span id="L62" class="LineNr">62 </span> <span class="Delimiter">}</span> +<span id="L63" class="LineNr">63 </span> <span class="Delimiter">}</span> +<span id="L64" class="LineNr">64 </span><span class="Delimiter">}</span> </pre> </body> </html> diff --git a/html/apps/factorial.subx.html b/html/apps/factorial.subx.html index 9890611e..3d00b2d3 100644 --- a/html/apps/factorial.subx.html +++ b/html/apps/factorial.subx.html @@ -16,11 +16,11 @@ a { color:inherit; } * { font-size:12pt; font-size: 1em; } .subxComment { color: #005faf; } .subxS2Comment { color: #8a8a8a; } -.subxFunction { color: #af5f00; text-decoration: underline; } +.SpecialChar { color: #d70000; } .LineNr { } .subxTest { color: #5f8700; } .subxS1Comment { color: #0000af; } -.SpecialChar { color: #d70000; } +.subxFunction { color: #af5f00; text-decoration: underline; } .Normal { color: #000000; background-color: #c6c6c6; padding-bottom: 1px; } .Constant { color: #008787; } .subxH1Comment { color: #005faf; text-decoration: underline; } @@ -79,133 +79,133 @@ if ('onhashchange' in window) { <span id="L18" class="LineNr"> 18 </span><span class="subxS1Comment"># . op subop mod rm32 base index scale r32</span> <span id="L19" class="LineNr"> 19 </span><span class="subxS1Comment"># . 1-3 bytes 3 bits 2 bits 3 bits 3 bits 3 bits 2 bits 2 bits 0/1/2/4 bytes 0/1/2/4 bytes</span> <span id="L20" class="LineNr"> 20 </span> -<span id="L21" class="LineNr"> 21 </span><span class="SpecialChar">Entry</span>: <span class="subxComment"># run tests if necessary, compute `factorial(5)` if not</span> +<span id="L21" class="LineNr"> 21 </span><span class="subxFunction">factorial</span>: <span class="subxComment"># n: int -> int/eax</span> <span id="L22" class="LineNr"> 22 </span> <span class="subxS1Comment"># . prologue</span> -<span id="L23" class="LineNr"> 23 </span> 89/copy 3/mod/direct 5/rm32/ebp <span class="Normal"> . </span> <span class="Normal"> . </span> <span class="Normal"> . </span> 4/r32/esp <span class="Normal"> . </span> <span class="Normal"> . </span> <span class="subxComment"># copy esp to ebp</span> -<span id="L24" class="LineNr"> 24 </span> -<span id="L25" class="LineNr"> 25 </span> <span class="subxComment"># initialize heap</span> -<span id="L26" class="LineNr"> 26 </span> <span class="subxS1Comment"># . Heap = new-segment(Heap-size)</span> -<span id="L27" class="LineNr"> 27 </span> <span class="subxS2Comment"># . . push args</span> -<span id="L28" class="LineNr"> 28 </span> 68/push <span class="SpecialChar"><a href='../120allocate.subx.html#L27'>Heap</a></span>/imm32 -<span id="L29" class="LineNr"> 29 </span> ff 6/subop/push 0/mod/indirect 5/rm32/.disp32 <span class="Normal"> . </span> <span class="Normal"> . </span> <span class="Normal"> . </span> <span class="SpecialChar"><a href='../120allocate.subx.html#L34'>Heap-size</a></span>/disp32 <span class="subxComment"># push *Heap-size</span> -<span id="L30" class="LineNr"> 30 </span> <span class="subxS2Comment"># . . call</span> -<span id="L31" class="LineNr"> 31 </span> e8/call <a href='../104new-segment.subx.html#L40'>new-segment</a>/disp32 -<span id="L32" class="LineNr"> 32 </span> <span class="subxS2Comment"># . . discard args</span> -<span id="L33" class="LineNr"> 33 </span> 81 0/subop/add 3/mod/direct 4/rm32/esp <span class="Normal"> . </span> <span class="Normal"> . </span> <span class="Normal"> . </span> <span class="Normal"> . </span> <span class="Normal"> . </span> 8/imm32 <span class="subxComment"># add to esp</span> -<span id="L34" class="LineNr"> 34 </span> -<span id="L35" class="LineNr"> 35 </span> <span class="subxH1Comment"># - if argc > 1 and argv[1] == "test", then return run_tests()</span> -<span id="L36" class="LineNr"> 36 </span> <span class="subxComment"># if (argc <= 1) goto run-main</span> -<span id="L37" class="LineNr"> 37 </span> 81 7/subop/compare 1/mod/*+disp8 5/rm32/ebp <span class="Normal"> . </span> <span class="Normal"> . </span> <span class="Normal"> . </span> <span class="Normal"> . </span> 0/disp8 1/imm32 <span class="subxComment"># compare *ebp</span> -<span id="L38" class="LineNr"> 38 </span> 7e/jump-if-<= $run-main/disp8 -<span id="L39" class="LineNr"> 39 </span> <span class="subxComment"># if (!kernel-string-equal?(argv[1], "test")) goto run-main</span> -<span id="L40" class="LineNr"> 40 </span> <span class="subxS1Comment"># . eax = kernel-string-equal?(argv[1], "test")</span> -<span id="L41" class="LineNr"> 41 </span> <span class="subxS2Comment"># . . push args</span> -<span id="L42" class="LineNr"> 42 </span> 68/push <span class="Constant">"test"</span>/imm32 -<span id="L43" class="LineNr"> 43 </span> ff 6/subop/push 1/mod/*+disp8 5/rm32/ebp <span class="Normal"> . </span> <span class="Normal"> . </span> <span class="Normal"> . </span> <span class="Normal"> . </span> 8/disp8 <span class="Normal"> . </span> <span class="subxComment"># push *(ebp+8)</span> -<span id="L44" class="LineNr"> 44 </span> <span class="subxS2Comment"># . . call</span> -<span id="L45" class="LineNr"> 45 </span> e8/call <a href='../103kernel-string-equal.subx.html#L31'>kernel-string-equal?</a>/disp32 -<span id="L46" class="LineNr"> 46 </span> <span class="subxS2Comment"># . . discard args</span> -<span id="L47" class="LineNr"> 47 </span> 81 0/subop/add 3/mod/direct 4/rm32/esp <span class="Normal"> . </span> <span class="Normal"> . </span> <span class="Normal"> . </span> <span class="Normal"> . </span> <span class="Normal"> . </span> 8/imm32 <span class="subxComment"># add to esp</span> -<span id="L48" class="LineNr"> 48 </span> <span class="subxS1Comment"># . if (eax == false) goto run-main</span> -<span id="L49" class="LineNr"> 49 </span> 3d/compare-eax-and 0/imm32/false -<span id="L50" class="LineNr"> 50 </span> 74/jump-if-= $run-main/disp8 -<span id="L51" class="LineNr"> 51 </span> <span class="subxComment"># run-tests()</span> -<span id="L52" class="LineNr"> 52 </span> e8/call run-tests/disp32 -<span id="L53" class="LineNr"> 53 </span> <span class="subxComment"># syscall(exit, *Num-test-failures)</span> -<span id="L54" class="LineNr"> 54 </span> 8b/copy 0/mod/indirect 5/rm32/.disp32 <span class="Normal"> . </span> <span class="Normal"> . </span> 3/r32/ebx <span class="SpecialChar"><a href='../102test.subx.html#L89'>Num-test-failures</a></span>/disp32 <span class="subxComment"># copy *Num-test-failures to ebx</span> -<span id="L55" class="LineNr"> 55 </span> eb/jump $main:end/disp8 -<span id="L56" class="LineNr"> 56 </span><span class="Constant">$run-main</span>: -<span id="L57" class="LineNr"> 57 </span> <span class="subxH1Comment"># - otherwise print factorial(5)</span> -<span id="L58" class="LineNr"> 58 </span> <span class="subxComment"># eax = factorial(5)</span> +<span id="L23" class="LineNr"> 23 </span> 55/push-ebp +<span id="L24" class="LineNr"> 24 </span> 89/copy 3/mod/direct 5/rm32/ebp <span class="Normal"> . </span> <span class="Normal"> . </span> <span class="Normal"> . </span> 4/r32/esp <span class="Normal"> . </span> <span class="Normal"> . </span> <span class="subxComment"># copy esp to ebp</span> +<span id="L25" class="LineNr"> 25 </span> 53/push-ebx +<span id="L26" class="LineNr"> 26 </span> <span class="subxComment"># if (n <= 1) return 1</span> +<span id="L27" class="LineNr"> 27 </span> b8/copy-to-eax 1/imm32 +<span id="L28" class="LineNr"> 28 </span> 81 7/subop/compare 1/mod/*+disp8 5/rm32/ebp <span class="Normal"> . </span> <span class="Normal"> . </span> <span class="Normal"> . </span> <span class="Normal"> . </span> 8/disp8 1/imm32 <span class="subxComment"># compare *(ebp+8)</span> +<span id="L29" class="LineNr"> 29 </span> 7e/jump-if-<= $factorial:end/disp8 +<span id="L30" class="LineNr"> 30 </span> <span class="subxComment"># var ebx: int = n-1</span> +<span id="L31" class="LineNr"> 31 </span> 8b/copy 1/mod/*+disp8 5/rm32/ebp <span class="Normal"> . </span> <span class="Normal"> . </span> 3/r32/ebx 8/disp8 <span class="Normal"> . </span> <span class="subxComment"># copy *(ebp+8) to ebx</span> +<span id="L32" class="LineNr"> 32 </span> 4b/decrement-ebx +<span id="L33" class="LineNr"> 33 </span> <span class="subxComment"># var eax: int = factorial(n-1)</span> +<span id="L34" class="LineNr"> 34 </span> <span class="subxS2Comment"># . . push args</span> +<span id="L35" class="LineNr"> 35 </span> 53/push-ebx +<span id="L36" class="LineNr"> 36 </span> <span class="subxS2Comment"># . . call</span> +<span id="L37" class="LineNr"> 37 </span> e8/call <a href='factorial.subx.html#L21'>factorial</a>/disp32 +<span id="L38" class="LineNr"> 38 </span> <span class="subxS2Comment"># . . discard args</span> +<span id="L39" class="LineNr"> 39 </span> 81 0/subop/add 3/mod/direct 4/rm32/esp <span class="Normal"> . </span> <span class="Normal"> . </span> <span class="Normal"> . </span> <span class="Normal"> . </span> <span class="Normal"> . </span> 4/imm32 <span class="subxComment"># add to esp</span> +<span id="L40" class="LineNr"> 40 </span> <span class="subxComment"># return n * factorial(n-1)</span> +<span id="L41" class="LineNr"> 41 </span> f7 4/subop/multiply 1/mod/*+disp8 5/rm32/ebp <span class="Normal"> . </span> <span class="Normal"> . </span> 8/disp8 <span class="Normal"> . </span> <span class="subxComment"># multiply *(ebp+8) into eax</span> +<span id="L42" class="LineNr"> 42 </span> <span class="subxComment"># TODO: check for overflow</span> +<span id="L43" class="LineNr"> 43 </span><span class="Constant">$factorial:end</span>: +<span id="L44" class="LineNr"> 44 </span> <span class="subxS1Comment"># . epilogue</span> +<span id="L45" class="LineNr"> 45 </span> 5b/pop-to-ebx +<span id="L46" class="LineNr"> 46 </span> 89/copy 3/mod/direct 4/rm32/esp <span class="Normal"> . </span> <span class="Normal"> . </span> <span class="Normal"> . </span> 5/r32/ebp <span class="Normal"> . </span> <span class="Normal"> . </span> <span class="subxComment"># copy ebp to esp</span> +<span id="L47" class="LineNr"> 47 </span> 5d/pop-to-ebp +<span id="L48" class="LineNr"> 48 </span> c3/return +<span id="L49" class="LineNr"> 49 </span> +<span id="L50" class="LineNr"> 50 </span><span class="subxTest">test-factorial</span>: +<span id="L51" class="LineNr"> 51 </span> <span class="subxComment"># factorial(5)</span> +<span id="L52" class="LineNr"> 52 </span> <span class="subxS2Comment"># . . push args</span> +<span id="L53" class="LineNr"> 53 </span> 68/push 5/imm32 +<span id="L54" class="LineNr"> 54 </span> <span class="subxS2Comment"># . . call</span> +<span id="L55" class="LineNr"> 55 </span> e8/call <a href='factorial.subx.html#L21'>factorial</a>/disp32 +<span id="L56" class="LineNr"> 56 </span> <span class="subxS2Comment"># . . discard args</span> +<span id="L57" class="LineNr"> 57 </span> 81 0/subop/add 3/mod/direct 4/rm32/esp <span class="Normal"> . </span> <span class="Normal"> . </span> <span class="Normal"> . </span> <span class="Normal"> . </span> <span class="Normal"> . </span> 4/imm32 <span class="subxComment"># add to esp</span> +<span id="L58" class="LineNr"> 58 </span> <span class="subxComment"># check-ints-equal(eax, 120, msg)</span> <span id="L59" class="LineNr"> 59 </span> <span class="subxS2Comment"># . . push args</span> -<span id="L60" class="LineNr"> 60 </span> 68/push 5/imm32 -<span id="L61" class="LineNr"> 61 </span> <span class="subxS2Comment"># . . call</span> -<span id="L62" class="LineNr"> 62 </span> e8/call <a href='factorial.subx.html#L100'>factorial</a>/disp32 -<span id="L63" class="LineNr"> 63 </span> <span class="subxS2Comment"># . . discard args</span> -<span id="L64" class="LineNr"> 64 </span> 81 0/subop/add 3/mod/direct 4/rm32/esp <span class="Normal"> . </span> <span class="Normal"> . </span> <span class="Normal"> . </span> <span class="Normal"> . </span> <span class="Normal"> . </span> 4/imm32 <span class="subxComment"># add to esp</span> -<span id="L65" class="LineNr"> 65 </span> <span class="subxComment"># var buffer/ecx: (stream byte 10) # number of decimal digits a 32-bit number can have</span> -<span id="L66" class="LineNr"> 66 </span> 81 5/subop/subtract 3/mod/direct 4/rm32/esp <span class="Normal"> . </span> <span class="Normal"> . </span> <span class="Normal"> . </span> <span class="Normal"> . </span> <span class="Normal"> . </span> 0xa/imm32 <span class="subxComment"># subtract from esp</span> -<span id="L67" class="LineNr"> 67 </span> 68/push 0xa/imm32/decimal-digits-in-32bit-number -<span id="L68" class="LineNr"> 68 </span> 68/push 0/imm32/read -<span id="L69" class="LineNr"> 69 </span> 68/push 0/imm32/write -<span id="L70" class="LineNr"> 70 </span> 89/copy 3/mod/direct 1/rm32/ecx <span class="Normal"> . </span> <span class="Normal"> . </span> <span class="Normal"> . </span> 4/r32/esp <span class="Normal"> . </span> <span class="Normal"> . </span> <span class="subxComment"># copy esp to ecx</span> -<span id="L71" class="LineNr"> 71 </span> <span class="subxComment"># write-int32-decimal(buffer, eax)</span> -<span id="L72" class="LineNr"> 72 </span> <span class="subxS2Comment"># . . push args</span> -<span id="L73" class="LineNr"> 73 </span> 50/push-eax -<span id="L74" class="LineNr"> 74 </span> 51/push-ecx -<span id="L75" class="LineNr"> 75 </span> <span class="subxS2Comment"># . . call</span> -<span id="L76" class="LineNr"> 76 </span> e8/call <a href='../126write-int-decimal.subx.html#L8'>write-int32-decimal</a>/disp32 -<span id="L77" class="LineNr"> 77 </span> <span class="subxS2Comment"># . . discard args</span> -<span id="L78" class="LineNr"> 78 </span> 81 0/subop/add 3/mod/direct 4/rm32/esp <span class="Normal"> . </span> <span class="Normal"> . </span> <span class="Normal"> . </span> <span class="Normal"> . </span> <span class="Normal"> . </span> 8/imm32 <span class="subxComment"># add to esp</span> -<span id="L79" class="LineNr"> 79 </span> <span class="subxComment"># write-stream(stderr, buffer)</span> -<span id="L80" class="LineNr"> 80 </span> <span class="subxS2Comment"># . . push args</span> -<span id="L81" class="LineNr"> 81 </span> 51/push-ecx -<span id="L82" class="LineNr"> 82 </span> 68/push 2/imm32/stderr -<span id="L83" class="LineNr"> 83 </span> <span class="subxS2Comment"># . . call</span> -<span id="L84" class="LineNr"> 84 </span> e8/call <a href='../113write-stream.subx.html#L17'>write-stream</a>/disp32 -<span id="L85" class="LineNr"> 85 </span> <span class="subxS2Comment"># . . discard args</span> -<span id="L86" class="LineNr"> 86 </span> 81 0/subop/add 3/mod/direct 4/rm32/esp <span class="Normal"> . </span> <span class="Normal"> . </span> <span class="Normal"> . </span> <span class="Normal"> . </span> <span class="Normal"> . </span> 8/imm32 <span class="subxComment"># add to esp</span> -<span id="L87" class="LineNr"> 87 </span> <span class="subxComment"># write(stderr, Newline)</span> -<span id="L88" class="LineNr"> 88 </span> <span class="subxS2Comment"># . . push args</span> -<span id="L89" class="LineNr"> 89 </span> 68/push <span class="SpecialChar"><a href='../102test.subx.html#L82'>Newline</a></span>/imm32 -<span id="L90" class="LineNr"> 90 </span> 68/push 2/imm32/stderr -<span id="L91" class="LineNr"> 91 </span> <span class="subxS2Comment"># . . call</span> -<span id="L92" class="LineNr"> 92 </span> e8/call <a href='../108write.subx.html#L24'>write</a>/disp32 -<span id="L93" class="LineNr"> 93 </span> <span class="subxS2Comment"># . . discard args</span> -<span id="L94" class="LineNr"> 94 </span> 81 0/subop/add 3/mod/direct 4/rm32/esp <span class="Normal"> . </span> <span class="Normal"> . </span> <span class="Normal"> . </span> <span class="Normal"> . </span> <span class="Normal"> . </span> 8/imm32 <span class="subxComment"># add to esp</span> -<span id="L95" class="LineNr"> 95 </span> <span class="subxComment"># syscall(exit, eax)</span> -<span id="L96" class="LineNr"> 96 </span> 89/copy 3/mod/direct 3/rm32/ebx <span class="Normal"> . </span> <span class="Normal"> . </span> <span class="Normal"> . </span> 0/r32/eax <span class="Normal"> . </span> <span class="Normal"> . </span> <span class="subxComment"># copy eax to ebx</span> -<span id="L97" class="LineNr"> 97 </span><span class="Constant">$main:end</span>: -<span id="L98" class="LineNr"> 98 </span> e8/call syscall_exit/disp32 -<span id="L99" class="LineNr"> 99 </span> -<span id="L100" class="LineNr">100 </span><span class="subxFunction">factorial</span>: <span class="subxComment"># n: int -> int/eax</span> -<span id="L101" class="LineNr">101 </span> <span class="subxS1Comment"># . prologue</span> -<span id="L102" class="LineNr">102 </span> 55/push-ebp -<span id="L103" class="LineNr">103 </span> 89/copy 3/mod/direct 5/rm32/ebp <span class="Normal"> . </span> <span class="Normal"> . </span> <span class="Normal"> . </span> 4/r32/esp <span class="Normal"> . </span> <span class="Normal"> . </span> <span class="subxComment"># copy esp to ebp</span> -<span id="L104" class="LineNr">104 </span> 53/push-ebx -<span id="L105" class="LineNr">105 </span> <span class="subxComment"># if (n <= 1) return 1</span> -<span id="L106" class="LineNr">106 </span> b8/copy-to-eax 1/imm32 -<span id="L107" class="LineNr">107 </span> 81 7/subop/compare 1/mod/*+disp8 5/rm32/ebp <span class="Normal"> . </span> <span class="Normal"> . </span> <span class="Normal"> . </span> <span class="Normal"> . </span> 8/disp8 1/imm32 <span class="subxComment"># compare *(ebp+8)</span> -<span id="L108" class="LineNr">108 </span> 7e/jump-if-<= $factorial:end/disp8 -<span id="L109" class="LineNr">109 </span> <span class="subxComment"># var ebx: int = n-1</span> -<span id="L110" class="LineNr">110 </span> 8b/copy 1/mod/*+disp8 5/rm32/ebp <span class="Normal"> . </span> <span class="Normal"> . </span> 3/r32/ebx 8/disp8 <span class="Normal"> . </span> <span class="subxComment"># copy *(ebp+8) to ebx</span> -<span id="L111" class="LineNr">111 </span> 4b/decrement-ebx -<span id="L112" class="LineNr">112 </span> <span class="subxComment"># var eax: int = factorial(n-1)</span> -<span id="L113" class="LineNr">113 </span> <span class="subxS2Comment"># . . push args</span> -<span id="L114" class="LineNr">114 </span> 53/push-ebx -<span id="L115" class="LineNr">115 </span> <span class="subxS2Comment"># . . call</span> -<span id="L116" class="LineNr">116 </span> e8/call <a href='factorial.subx.html#L100'>factorial</a>/disp32 -<span id="L117" class="LineNr">117 </span> <span class="subxS2Comment"># . . discard args</span> -<span id="L118" class="LineNr">118 </span> 81 0/subop/add 3/mod/direct 4/rm32/esp <span class="Normal"> . </span> <span class="Normal"> . </span> <span class="Normal"> . </span> <span class="Normal"> . </span> <span class="Normal"> . </span> 4/imm32 <span class="subxComment"># add to esp</span> -<span id="L119" class="LineNr">119 </span> <span class="subxComment"># return n * factorial(n-1)</span> -<span id="L120" class="LineNr">120 </span> f7 4/subop/multiply 1/mod/*+disp8 5/rm32/ebp <span class="Normal"> . </span> <span class="Normal"> . </span> 8/disp8 <span class="Normal"> . </span> <span class="subxComment"># multiply *(ebp+8) into eax</span> -<span id="L121" class="LineNr">121 </span> <span class="subxComment"># TODO: check for overflow</span> -<span id="L122" class="LineNr">122 </span><span class="Constant">$factorial:end</span>: -<span id="L123" class="LineNr">123 </span> <span class="subxS1Comment"># . epilogue</span> -<span id="L124" class="LineNr">124 </span> 5b/pop-to-ebx -<span id="L125" class="LineNr">125 </span> 89/copy 3/mod/direct 4/rm32/esp <span class="Normal"> . </span> <span class="Normal"> . </span> <span class="Normal"> . </span> 5/r32/ebp <span class="Normal"> . </span> <span class="Normal"> . </span> <span class="subxComment"># copy ebp to esp</span> -<span id="L126" class="LineNr">126 </span> 5d/pop-to-ebp -<span id="L127" class="LineNr">127 </span> c3/return -<span id="L128" class="LineNr">128 </span> -<span id="L129" class="LineNr">129 </span><span class="subxTest">test-factorial</span>: -<span id="L130" class="LineNr">130 </span> <span class="subxComment"># factorial(5)</span> -<span id="L131" class="LineNr">131 </span> <span class="subxS2Comment"># . . push args</span> -<span id="L132" class="LineNr">132 </span> 68/push 5/imm32 -<span id="L133" class="LineNr">133 </span> <span class="subxS2Comment"># . . call</span> -<span id="L134" class="LineNr">134 </span> e8/call <a href='factorial.subx.html#L100'>factorial</a>/disp32 -<span id="L135" class="LineNr">135 </span> <span class="subxS2Comment"># . . discard args</span> -<span id="L136" class="LineNr">136 </span> 81 0/subop/add 3/mod/direct 4/rm32/esp <span class="Normal"> . </span> <span class="Normal"> . </span> <span class="Normal"> . </span> <span class="Normal"> . </span> <span class="Normal"> . </span> 4/imm32 <span class="subxComment"># add to esp</span> -<span id="L137" class="LineNr">137 </span> <span class="subxComment"># check-ints-equal(eax, 120, msg)</span> -<span id="L138" class="LineNr">138 </span> <span class="subxS2Comment"># . . push args</span> -<span id="L139" class="LineNr">139 </span> 68/push <span class="Constant">"F - test-factorial"</span>/imm32 -<span id="L140" class="LineNr">140 </span> 68/push 0x78/imm32/expected-120 -<span id="L141" class="LineNr">141 </span> 50/push-eax -<span id="L142" class="LineNr">142 </span> <span class="subxS2Comment"># . . call</span> -<span id="L143" class="LineNr">143 </span> e8/call <a href='../102test.subx.html#L23'>check-ints-equal</a>/disp32 -<span id="L144" class="LineNr">144 </span> <span class="subxS2Comment"># . . discard args</span> -<span id="L145" class="LineNr">145 </span> 81 0/subop/add 3/mod/direct 4/rm32/esp <span class="Normal"> . </span> <span class="Normal"> . </span> <span class="Normal"> . </span> <span class="Normal"> . </span> <span class="Normal"> . </span> 0xc/imm32 <span class="subxComment"># add to esp</span> -<span id="L146" class="LineNr">146 </span> <span class="subxComment"># end</span> -<span id="L147" class="LineNr">147 </span> c3/return +<span id="L60" class="LineNr"> 60 </span> 68/push <span class="Constant">"F - test-factorial"</span>/imm32 +<span id="L61" class="LineNr"> 61 </span> 68/push 0x78/imm32/expected-120 +<span id="L62" class="LineNr"> 62 </span> 50/push-eax +<span id="L63" class="LineNr"> 63 </span> <span class="subxS2Comment"># . . call</span> +<span id="L64" class="LineNr"> 64 </span> e8/call <a href='../102test.subx.html#L23'>check-ints-equal</a>/disp32 +<span id="L65" class="LineNr"> 65 </span> <span class="subxS2Comment"># . . discard args</span> +<span id="L66" class="LineNr"> 66 </span> 81 0/subop/add 3/mod/direct 4/rm32/esp <span class="Normal"> . </span> <span class="Normal"> . </span> <span class="Normal"> . </span> <span class="Normal"> . </span> <span class="Normal"> . </span> 0xc/imm32 <span class="subxComment"># add to esp</span> +<span id="L67" class="LineNr"> 67 </span> <span class="subxComment"># end</span> +<span id="L68" class="LineNr"> 68 </span> c3/return +<span id="L69" class="LineNr"> 69 </span> +<span id="L70" class="LineNr"> 70 </span><span class="SpecialChar">Entry</span>: <span class="subxComment"># run tests if necessary, compute `factorial(5)` if not</span> +<span id="L71" class="LineNr"> 71 </span> <span class="subxS1Comment"># . prologue</span> +<span id="L72" class="LineNr"> 72 </span> 89/copy 3/mod/direct 5/rm32/ebp <span class="Normal"> . </span> <span class="Normal"> . </span> <span class="Normal"> . </span> 4/r32/esp <span class="Normal"> . </span> <span class="Normal"> . </span> <span class="subxComment"># copy esp to ebp</span> +<span id="L73" class="LineNr"> 73 </span> +<span id="L74" class="LineNr"> 74 </span> <span class="subxComment"># initialize heap</span> +<span id="L75" class="LineNr"> 75 </span> <span class="subxS1Comment"># . Heap = new-segment(Heap-size)</span> +<span id="L76" class="LineNr"> 76 </span> <span class="subxS2Comment"># . . push args</span> +<span id="L77" class="LineNr"> 77 </span> 68/push <span class="SpecialChar"><a href='../120allocate.subx.html#L27'>Heap</a></span>/imm32 +<span id="L78" class="LineNr"> 78 </span> ff 6/subop/push 0/mod/indirect 5/rm32/.disp32 <span class="Normal"> . </span> <span class="Normal"> . </span> <span class="Normal"> . </span> <span class="SpecialChar"><a href='../120allocate.subx.html#L34'>Heap-size</a></span>/disp32 <span class="subxComment"># push *Heap-size</span> +<span id="L79" class="LineNr"> 79 </span> <span class="subxS2Comment"># . . call</span> +<span id="L80" class="LineNr"> 80 </span> e8/call <a href='../104new-segment.subx.html#L40'>new-segment</a>/disp32 +<span id="L81" class="LineNr"> 81 </span> <span class="subxS2Comment"># . . discard args</span> +<span id="L82" class="LineNr"> 82 </span> 81 0/subop/add 3/mod/direct 4/rm32/esp <span class="Normal"> . </span> <span class="Normal"> . </span> <span class="Normal"> . </span> <span class="Normal"> . </span> <span class="Normal"> . </span> 8/imm32 <span class="subxComment"># add to esp</span> +<span id="L83" class="LineNr"> 83 </span> +<span id="L84" class="LineNr"> 84 </span> <span class="subxH1Comment"># - if argc > 1 and argv[1] == "test", then return run_tests()</span> +<span id="L85" class="LineNr"> 85 </span> <span class="subxComment"># if (argc <= 1) goto run-main</span> +<span id="L86" class="LineNr"> 86 </span> 81 7/subop/compare 1/mod/*+disp8 5/rm32/ebp <span class="Normal"> . </span> <span class="Normal"> . </span> <span class="Normal"> . </span> <span class="Normal"> . </span> 0/disp8 1/imm32 <span class="subxComment"># compare *ebp</span> +<span id="L87" class="LineNr"> 87 </span> 7e/jump-if-<= $run-main/disp8 +<span id="L88" class="LineNr"> 88 </span> <span class="subxComment"># if (!kernel-string-equal?(argv[1], "test")) goto run-main</span> +<span id="L89" class="LineNr"> 89 </span> <span class="subxS1Comment"># . eax = kernel-string-equal?(argv[1], "test")</span> +<span id="L90" class="LineNr"> 90 </span> <span class="subxS2Comment"># . . push args</span> +<span id="L91" class="LineNr"> 91 </span> 68/push <span class="Constant">"test"</span>/imm32 +<span id="L92" class="LineNr"> 92 </span> ff 6/subop/push 1/mod/*+disp8 5/rm32/ebp <span class="Normal"> . </span> <span class="Normal"> . </span> <span class="Normal"> . </span> <span class="Normal"> . </span> 8/disp8 <span class="Normal"> . </span> <span class="subxComment"># push *(ebp+8)</span> +<span id="L93" class="LineNr"> 93 </span> <span class="subxS2Comment"># . . call</span> +<span id="L94" class="LineNr"> 94 </span> e8/call <a href='../103kernel-string-equal.subx.html#L31'>kernel-string-equal?</a>/disp32 +<span id="L95" class="LineNr"> 95 </span> <span class="subxS2Comment"># . . discard args</span> +<span id="L96" class="LineNr"> 96 </span> 81 0/subop/add 3/mod/direct 4/rm32/esp <span class="Normal"> . </span> <span class="Normal"> . </span> <span class="Normal"> . </span> <span class="Normal"> . </span> <span class="Normal"> . </span> 8/imm32 <span class="subxComment"># add to esp</span> +<span id="L97" class="LineNr"> 97 </span> <span class="subxS1Comment"># . if (eax == false) goto run-main</span> +<span id="L98" class="LineNr"> 98 </span> 3d/compare-eax-and 0/imm32/false +<span id="L99" class="LineNr"> 99 </span> 74/jump-if-= $run-main/disp8 +<span id="L100" class="LineNr">100 </span> <span class="subxComment"># run-tests()</span> +<span id="L101" class="LineNr">101 </span> e8/call run-tests/disp32 +<span id="L102" class="LineNr">102 </span> <span class="subxComment"># syscall(exit, *Num-test-failures)</span> +<span id="L103" class="LineNr">103 </span> 8b/copy 0/mod/indirect 5/rm32/.disp32 <span class="Normal"> . </span> <span class="Normal"> . </span> 3/r32/ebx <span class="SpecialChar"><a href='../102test.subx.html#L89'>Num-test-failures</a></span>/disp32 <span class="subxComment"># copy *Num-test-failures to ebx</span> +<span id="L104" class="LineNr">104 </span> eb/jump $main:end/disp8 +<span id="L105" class="LineNr">105 </span><span class="Constant">$run-main</span>: +<span id="L106" class="LineNr">106 </span> <span class="subxH1Comment"># - otherwise print factorial(5)</span> +<span id="L107" class="LineNr">107 </span> <span class="subxComment"># eax = factorial(5)</span> +<span id="L108" class="LineNr">108 </span> <span class="subxS2Comment"># . . push args</span> +<span id="L109" class="LineNr">109 </span> 68/push 5/imm32 +<span id="L110" class="LineNr">110 </span> <span class="subxS2Comment"># . . call</span> +<span id="L111" class="LineNr">111 </span> e8/call <a href='factorial.subx.html#L21'>factorial</a>/disp32 +<span id="L112" class="LineNr">112 </span> <span class="subxS2Comment"># . . discard args</span> +<span id="L113" class="LineNr">113 </span> 81 0/subop/add 3/mod/direct 4/rm32/esp <span class="Normal"> . </span> <span class="Normal"> . </span> <span class="Normal"> . </span> <span class="Normal"> . </span> <span class="Normal"> . </span> 4/imm32 <span class="subxComment"># add to esp</span> +<span id="L114" class="LineNr">114 </span> <span class="subxComment"># var buffer/ecx: (stream byte 10) # number of decimal digits a 32-bit number can have</span> +<span id="L115" class="LineNr">115 </span> 81 5/subop/subtract 3/mod/direct 4/rm32/esp <span class="Normal"> . </span> <span class="Normal"> . </span> <span class="Normal"> . </span> <span class="Normal"> . </span> <span class="Normal"> . </span> 0xa/imm32 <span class="subxComment"># subtract from esp</span> +<span id="L116" class="LineNr">116 </span> 68/push 0xa/imm32/decimal-digits-in-32bit-number +<span id="L117" class="LineNr">117 </span> 68/push 0/imm32/read +<span id="L118" class="LineNr">118 </span> 68/push 0/imm32/write +<span id="L119" class="LineNr">119 </span> 89/copy 3/mod/direct 1/rm32/ecx <span class="Normal"> . </span> <span class="Normal"> . </span> <span class="Normal"> . </span> 4/r32/esp <span class="Normal"> . </span> <span class="Normal"> . </span> <span class="subxComment"># copy esp to ecx</span> +<span id="L120" class="LineNr">120 </span> <span class="subxComment"># write-int32-decimal(buffer, eax)</span> +<span id="L121" class="LineNr">121 </span> <span class="subxS2Comment"># . . push args</span> +<span id="L122" class="LineNr">122 </span> 50/push-eax +<span id="L123" class="LineNr">123 </span> 51/push-ecx +<span id="L124" class="LineNr">124 </span> <span class="subxS2Comment"># . . call</span> +<span id="L125" class="LineNr">125 </span> e8/call <a href='../126write-int-decimal.subx.html#L8'>write-int32-decimal</a>/disp32 +<span id="L126" class="LineNr">126 </span> <span class="subxS2Comment"># . . discard args</span> +<span id="L127" class="LineNr">127 </span> 81 0/subop/add 3/mod/direct 4/rm32/esp <span class="Normal"> . </span> <span class="Normal"> . </span> <span class="Normal"> . </span> <span class="Normal"> . </span> <span class="Normal"> . </span> 8/imm32 <span class="subxComment"># add to esp</span> +<span id="L128" class="LineNr">128 </span> <span class="subxComment"># write-stream(stderr, buffer)</span> +<span id="L129" class="LineNr">129 </span> <span class="subxS2Comment"># . . push args</span> +<span id="L130" class="LineNr">130 </span> 51/push-ecx +<span id="L131" class="LineNr">131 </span> 68/push 2/imm32/stderr +<span id="L132" class="LineNr">132 </span> <span class="subxS2Comment"># . . call</span> +<span id="L133" class="LineNr">133 </span> e8/call <a href='../113write-stream.subx.html#L17'>write-stream</a>/disp32 +<span id="L134" class="LineNr">134 </span> <span class="subxS2Comment"># . . discard args</span> +<span id="L135" class="LineNr">135 </span> 81 0/subop/add 3/mod/direct 4/rm32/esp <span class="Normal"> . </span> <span class="Normal"> . </span> <span class="Normal"> . </span> <span class="Normal"> . </span> <span class="Normal"> . </span> 8/imm32 <span class="subxComment"># add to esp</span> +<span id="L136" class="LineNr">136 </span> <span class="subxComment"># write(stderr, Newline)</span> +<span id="L137" class="LineNr">137 </span> <span class="subxS2Comment"># . . push args</span> +<span id="L138" class="LineNr">138 </span> 68/push <span class="SpecialChar"><a href='../102test.subx.html#L82'>Newline</a></span>/imm32 +<span id="L139" class="LineNr">139 </span> 68/push 2/imm32/stderr +<span id="L140" class="LineNr">140 </span> <span class="subxS2Comment"># . . call</span> +<span id="L141" class="LineNr">141 </span> e8/call <a href='../108write.subx.html#L24'>write</a>/disp32 +<span id="L142" class="LineNr">142 </span> <span class="subxS2Comment"># . . discard args</span> +<span id="L143" class="LineNr">143 </span> 81 0/subop/add 3/mod/direct 4/rm32/esp <span class="Normal"> . </span> <span class="Normal"> . </span> <span class="Normal"> . </span> <span class="Normal"> . </span> <span class="Normal"> . </span> 8/imm32 <span class="subxComment"># add to esp</span> +<span id="L144" class="LineNr">144 </span> <span class="subxComment">#</span> +<span id="L145" class="LineNr">145 </span> 89/copy 3/mod/direct 3/rm32/ebx <span class="Normal"> . </span> <span class="Normal"> . </span> <span class="Normal"> . </span> 0/r32/eax <span class="Normal"> . </span> <span class="Normal"> . </span> <span class="subxComment"># copy eax to ebx</span> +<span id="L146" class="LineNr">146 </span><span class="Constant">$main:end</span>: +<span id="L147" class="LineNr">147 </span> e8/call syscall_exit/disp32 <span id="L148" class="LineNr">148 </span> <span id="L149" class="LineNr">149 </span><span class="subxS2Comment"># . . vim:nowrap:textwidth=0</span> </pre> diff --git a/html/apps/factorial2.subx.html b/html/apps/factorial2.subx.html index cf2478f8..295d7e0b 100644 --- a/html/apps/factorial2.subx.html +++ b/html/apps/factorial2.subx.html @@ -16,11 +16,11 @@ a { color:inherit; } * { font-size:12pt; font-size: 1em; } .subxComment { color: #005faf; } .subxS2Comment { color: #8a8a8a; } -.subxFunction { color: #af5f00; text-decoration: underline; } +.SpecialChar { color: #d70000; } .LineNr { } .subxTest { color: #5f8700; } .subxS1Comment { color: #0000af; } -.SpecialChar { color: #d70000; } +.subxFunction { color: #af5f00; text-decoration: underline; } .Constant { color: #008787; } .subxH1Comment { color: #005faf; text-decoration: underline; } --> @@ -75,106 +75,108 @@ if ('onhashchange' in window) { <span id="L15" class="LineNr"> 15 </span><span class="subxComment"># Expected output:</span> <span id="L16" class="LineNr"> 16 </span><span class="subxComment"># ........</span> <span id="L17" class="LineNr"> 17 </span><span class="subxComment"># Every '.' indicates a passing test. Failing tests get a 'F'.</span> -<span id="L18" class="LineNr"> 18 </span> -<span id="L19" class="LineNr"> 19 </span>== code +<span id="L18" class="LineNr"> 18 </span><span class="subxComment">#</span> +<span id="L19" class="LineNr"> 19 </span><span class="subxComment"># Compare apps/factorial.subx</span> <span id="L20" class="LineNr"> 20 </span> -<span id="L21" class="LineNr"> 21 </span><span class="SpecialChar">Entry</span>: <span class="subxComment"># run tests if necessary, compute `factorial(5)` if not</span> -<span id="L22" class="LineNr"> 22 </span> <span class="subxS1Comment"># . prologue</span> -<span id="L23" class="LineNr"> 23 </span> 89/<- %ebp 4/r32/esp -<span id="L24" class="LineNr"> 24 </span> -<span id="L25" class="LineNr"> 25 </span> <span class="subxComment"># initialize heap</span> -<span id="L26" class="LineNr"> 26 </span> <span class="subxS1Comment"># . Heap = new-segment(Heap-size)</span> -<span id="L27" class="LineNr"> 27 </span> <span class="subxS2Comment"># . . push args</span> -<span id="L28" class="LineNr"> 28 </span> 68/push <span class="SpecialChar"><a href='../120allocate.subx.html#L27'>Heap</a></span>/imm32 -<span id="L29" class="LineNr"> 29 </span> ff 6/subop/push *<span class="SpecialChar"><a href='../120allocate.subx.html#L34'>Heap-size</a></span> -<span id="L30" class="LineNr"> 30 </span> <span class="subxS2Comment"># . . call</span> -<span id="L31" class="LineNr"> 31 </span> e8/call <a href='../104new-segment.subx.html#L40'>new-segment</a>/disp32 -<span id="L32" class="LineNr"> 32 </span> <span class="subxS2Comment"># . . discard args</span> -<span id="L33" class="LineNr"> 33 </span> 81 0/subop/add %esp 8/imm32 -<span id="L34" class="LineNr"> 34 </span> -<span id="L35" class="LineNr"> 35 </span> <span class="subxH1Comment"># - if argc > 1 and argv[1] == "test", then return run_tests()</span> -<span id="L36" class="LineNr"> 36 </span> <span class="subxComment"># if (argc <= 1) goto run-main</span> -<span id="L37" class="LineNr"> 37 </span> 81 7/subop/compare *ebp 1/imm32 -<span id="L38" class="LineNr"> 38 </span> 7e/jump-if-<= $run-main/disp8 -<span id="L39" class="LineNr"> 39 </span> <span class="subxComment"># if (!kernel-string-equal?(argv[1], "test")) goto run-main</span> -<span id="L40" class="LineNr"> 40 </span> <span class="subxS1Comment"># . eax = kernel-string-equal?(argv[1], "test")</span> -<span id="L41" class="LineNr"> 41 </span> <span class="subxS2Comment"># . . push args</span> -<span id="L42" class="LineNr"> 42 </span> 68/push <span class="Constant">"test"</span>/imm32 -<span id="L43" class="LineNr"> 43 </span> ff 6/subop/push *(ebp+8) -<span id="L44" class="LineNr"> 44 </span> <span class="subxS2Comment"># . . call</span> -<span id="L45" class="LineNr"> 45 </span> e8/call <a href='../103kernel-string-equal.subx.html#L31'>kernel-string-equal?</a>/disp32 -<span id="L46" class="LineNr"> 46 </span> <span class="subxS2Comment"># . . discard args</span> -<span id="L47" class="LineNr"> 47 </span> 81 0/subop/add %esp 8/imm32 -<span id="L48" class="LineNr"> 48 </span> <span class="subxS1Comment"># . if (eax == false) goto run-main</span> -<span id="L49" class="LineNr"> 49 </span> 3d/compare-eax-and 0/imm32/false -<span id="L50" class="LineNr"> 50 </span> 74/jump-if-= $run-main/disp8 -<span id="L51" class="LineNr"> 51 </span> <span class="subxComment"># run-tests()</span> -<span id="L52" class="LineNr"> 52 </span> e8/call run-tests/disp32 -<span id="L53" class="LineNr"> 53 </span> <span class="subxComment"># syscall(exit, *Num-test-failures)</span> -<span id="L54" class="LineNr"> 54 </span> 8b/-> *<span class="SpecialChar"><a href='../102test.subx.html#L89'>Num-test-failures</a></span> 3/r32/ebx -<span id="L55" class="LineNr"> 55 </span> eb/jump $main:end/disp8 -<span id="L56" class="LineNr"> 56 </span><span class="Constant">$run-main</span>: -<span id="L57" class="LineNr"> 57 </span> <span class="subxH1Comment"># - otherwise return factorial(5)</span> -<span id="L58" class="LineNr"> 58 </span> <span class="subxComment"># eax = factorial(5)</span> -<span id="L59" class="LineNr"> 59 </span> <span class="subxS2Comment"># . . push args</span> -<span id="L60" class="LineNr"> 60 </span> 68/push 5/imm32 -<span id="L61" class="LineNr"> 61 </span> <span class="subxS2Comment"># . . call</span> -<span id="L62" class="LineNr"> 62 </span> e8/call <a href='factorial2.subx.html#L70'>factorial</a>/disp32 -<span id="L63" class="LineNr"> 63 </span> <span class="subxS2Comment"># . . discard args</span> -<span id="L64" class="LineNr"> 64 </span> 81 0/subop/add %esp 4/imm32 -<span id="L65" class="LineNr"> 65 </span> <span class="subxComment"># syscall(exit, eax)</span> -<span id="L66" class="LineNr"> 66 </span> 89/<- %ebx 0/r32/eax -<span id="L67" class="LineNr"> 67 </span><span class="Constant">$main:end</span>: -<span id="L68" class="LineNr"> 68 </span> e8/call syscall_exit/disp32 -<span id="L69" class="LineNr"> 69 </span> -<span id="L70" class="LineNr"> 70 </span><span class="subxFunction">factorial</span>: <span class="subxComment"># n: int -> int/eax</span> -<span id="L71" class="LineNr"> 71 </span> <span class="subxS1Comment"># . prologue</span> -<span id="L72" class="LineNr"> 72 </span> 55/push-ebp -<span id="L73" class="LineNr"> 73 </span> 89/<- %ebp 4/r32/esp -<span id="L74" class="LineNr"> 74 </span> 53/push-ebx -<span id="L75" class="LineNr"> 75 </span> <span class="subxComment"># if (n <= 1) return 1</span> -<span id="L76" class="LineNr"> 76 </span> b8/copy-to-eax 1/imm32 -<span id="L77" class="LineNr"> 77 </span> 81 7/subop/compare *(ebp+8) 1/imm32 -<span id="L78" class="LineNr"> 78 </span> 7e/jump-if-<= $factorial:end/disp8 -<span id="L79" class="LineNr"> 79 </span> <span class="subxComment"># var ebx: int = n-1</span> -<span id="L80" class="LineNr"> 80 </span> 8b/-> *(ebp+8) 3/r32/ebx -<span id="L81" class="LineNr"> 81 </span> 4b/decrement-ebx -<span id="L82" class="LineNr"> 82 </span> <span class="subxComment"># var eax: int = factorial(n-1)</span> -<span id="L83" class="LineNr"> 83 </span> <span class="subxS2Comment"># . . push args</span> -<span id="L84" class="LineNr"> 84 </span> 53/push-ebx -<span id="L85" class="LineNr"> 85 </span> <span class="subxS2Comment"># . . call</span> -<span id="L86" class="LineNr"> 86 </span> e8/call <a href='factorial2.subx.html#L70'>factorial</a>/disp32 -<span id="L87" class="LineNr"> 87 </span> <span class="subxS2Comment"># . . discard args</span> -<span id="L88" class="LineNr"> 88 </span> 81 0/subop/add %esp 4/imm32 -<span id="L89" class="LineNr"> 89 </span> <span class="subxComment"># return n * factorial(n-1)</span> -<span id="L90" class="LineNr"> 90 </span> f7 4/subop/multiply-into-eax *(ebp+8) -<span id="L91" class="LineNr"> 91 </span> <span class="subxComment"># TODO: check for overflow</span> -<span id="L92" class="LineNr"> 92 </span><span class="Constant">$factorial:end</span>: -<span id="L93" class="LineNr"> 93 </span> <span class="subxS1Comment"># . epilogue</span> -<span id="L94" class="LineNr"> 94 </span> 5b/pop-to-ebx -<span id="L95" class="LineNr"> 95 </span> 89/<- %esp 5/r32/ebp -<span id="L96" class="LineNr"> 96 </span> 5d/pop-to-ebp -<span id="L97" class="LineNr"> 97 </span> c3/return -<span id="L98" class="LineNr"> 98 </span> -<span id="L99" class="LineNr"> 99 </span><span class="subxTest">test-factorial</span>: -<span id="L100" class="LineNr">100 </span> <span class="subxComment"># factorial(5)</span> -<span id="L101" class="LineNr">101 </span> <span class="subxS2Comment"># . . push args</span> -<span id="L102" class="LineNr">102 </span> 68/push 5/imm32 -<span id="L103" class="LineNr">103 </span> <span class="subxS2Comment"># . . call</span> -<span id="L104" class="LineNr">104 </span> e8/call <a href='factorial2.subx.html#L70'>factorial</a>/disp32 -<span id="L105" class="LineNr">105 </span> <span class="subxS2Comment"># . . discard args</span> -<span id="L106" class="LineNr">106 </span> 81 0/subop/add %esp 4/imm32 -<span id="L107" class="LineNr">107 </span> <span class="subxComment"># check-ints-equal(eax, 120, msg)</span> -<span id="L108" class="LineNr">108 </span> <span class="subxS2Comment"># . . push args</span> -<span id="L109" class="LineNr">109 </span> 68/push <span class="Constant">"F - test-factorial"</span>/imm32 -<span id="L110" class="LineNr">110 </span> 68/push 0x78/imm32/expected-120 -<span id="L111" class="LineNr">111 </span> 50/push-eax +<span id="L21" class="LineNr"> 21 </span>== code +<span id="L22" class="LineNr"> 22 </span> +<span id="L23" class="LineNr"> 23 </span><span class="subxFunction">factorial</span>: <span class="subxComment"># n: int -> int/eax</span> +<span id="L24" class="LineNr"> 24 </span> <span class="subxS1Comment"># . prologue</span> +<span id="L25" class="LineNr"> 25 </span> 55/push-ebp +<span id="L26" class="LineNr"> 26 </span> 89/<- %ebp 4/r32/esp +<span id="L27" class="LineNr"> 27 </span> 53/push-ebx +<span id="L28" class="LineNr"> 28 </span> <span class="subxComment"># if (n <= 1) return 1</span> +<span id="L29" class="LineNr"> 29 </span> b8/copy-to-eax 1/imm32 +<span id="L30" class="LineNr"> 30 </span> 81 7/subop/compare *(ebp+8) 1/imm32 +<span id="L31" class="LineNr"> 31 </span> 7e/jump-if-<= $factorial:end/disp8 +<span id="L32" class="LineNr"> 32 </span> <span class="subxComment"># var ebx: int = n-1</span> +<span id="L33" class="LineNr"> 33 </span> 8b/-> *(ebp+8) 3/r32/ebx +<span id="L34" class="LineNr"> 34 </span> 4b/decrement-ebx +<span id="L35" class="LineNr"> 35 </span> <span class="subxComment"># var eax: int = factorial(n-1)</span> +<span id="L36" class="LineNr"> 36 </span> <span class="subxS2Comment"># . . push args</span> +<span id="L37" class="LineNr"> 37 </span> 53/push-ebx +<span id="L38" class="LineNr"> 38 </span> <span class="subxS2Comment"># . . call</span> +<span id="L39" class="LineNr"> 39 </span> e8/call <a href='factorial2.subx.html#L23'>factorial</a>/disp32 +<span id="L40" class="LineNr"> 40 </span> <span class="subxS2Comment"># . . discard args</span> +<span id="L41" class="LineNr"> 41 </span> 81 0/subop/add %esp 4/imm32 +<span id="L42" class="LineNr"> 42 </span> <span class="subxComment"># return n * factorial(n-1)</span> +<span id="L43" class="LineNr"> 43 </span> f7 4/subop/multiply-into-eax *(ebp+8) +<span id="L44" class="LineNr"> 44 </span> <span class="subxComment"># TODO: check for overflow</span> +<span id="L45" class="LineNr"> 45 </span><span class="Constant">$factorial:end</span>: +<span id="L46" class="LineNr"> 46 </span> <span class="subxS1Comment"># . epilogue</span> +<span id="L47" class="LineNr"> 47 </span> 5b/pop-to-ebx +<span id="L48" class="LineNr"> 48 </span> 89/<- %esp 5/r32/ebp +<span id="L49" class="LineNr"> 49 </span> 5d/pop-to-ebp +<span id="L50" class="LineNr"> 50 </span> c3/return +<span id="L51" class="LineNr"> 51 </span> +<span id="L52" class="LineNr"> 52 </span><span class="subxTest">test-factorial</span>: +<span id="L53" class="LineNr"> 53 </span> <span class="subxComment"># factorial(5)</span> +<span id="L54" class="LineNr"> 54 </span> <span class="subxS2Comment"># . . push args</span> +<span id="L55" class="LineNr"> 55 </span> 68/push 5/imm32 +<span id="L56" class="LineNr"> 56 </span> <span class="subxS2Comment"># . . call</span> +<span id="L57" class="LineNr"> 57 </span> e8/call <a href='factorial2.subx.html#L23'>factorial</a>/disp32 +<span id="L58" class="LineNr"> 58 </span> <span class="subxS2Comment"># . . discard args</span> +<span id="L59" class="LineNr"> 59 </span> 81 0/subop/add %esp 4/imm32 +<span id="L60" class="LineNr"> 60 </span> <span class="subxComment"># check-ints-equal(eax, 120, msg)</span> +<span id="L61" class="LineNr"> 61 </span> <span class="subxS2Comment"># . . push args</span> +<span id="L62" class="LineNr"> 62 </span> 68/push <span class="Constant">"F - test-factorial"</span>/imm32 +<span id="L63" class="LineNr"> 63 </span> 68/push 0x78/imm32/expected-120 +<span id="L64" class="LineNr"> 64 </span> 50/push-eax +<span id="L65" class="LineNr"> 65 </span> <span class="subxS2Comment"># . . call</span> +<span id="L66" class="LineNr"> 66 </span> e8/call <a href='../102test.subx.html#L23'>check-ints-equal</a>/disp32 +<span id="L67" class="LineNr"> 67 </span> <span class="subxS2Comment"># . . discard args</span> +<span id="L68" class="LineNr"> 68 </span> 81 0/subop/add %esp 0xc/imm32 +<span id="L69" class="LineNr"> 69 </span> <span class="subxComment"># end</span> +<span id="L70" class="LineNr"> 70 </span> c3/return +<span id="L71" class="LineNr"> 71 </span> +<span id="L72" class="LineNr"> 72 </span><span class="SpecialChar">Entry</span>: <span class="subxComment"># run tests if necessary, compute `factorial(5)` if not</span> +<span id="L73" class="LineNr"> 73 </span> <span class="subxS1Comment"># . prologue</span> +<span id="L74" class="LineNr"> 74 </span> 89/<- %ebp 4/r32/esp +<span id="L75" class="LineNr"> 75 </span> +<span id="L76" class="LineNr"> 76 </span> <span class="subxComment"># initialize heap</span> +<span id="L77" class="LineNr"> 77 </span> <span class="subxS1Comment"># . Heap = new-segment(Heap-size)</span> +<span id="L78" class="LineNr"> 78 </span> <span class="subxS2Comment"># . . push args</span> +<span id="L79" class="LineNr"> 79 </span> 68/push <span class="SpecialChar"><a href='../120allocate.subx.html#L27'>Heap</a></span>/imm32 +<span id="L80" class="LineNr"> 80 </span> ff 6/subop/push *<span class="SpecialChar"><a href='../120allocate.subx.html#L34'>Heap-size</a></span> +<span id="L81" class="LineNr"> 81 </span> <span class="subxS2Comment"># . . call</span> +<span id="L82" class="LineNr"> 82 </span> e8/call <a href='../104new-segment.subx.html#L40'>new-segment</a>/disp32 +<span id="L83" class="LineNr"> 83 </span> <span class="subxS2Comment"># . . discard args</span> +<span id="L84" class="LineNr"> 84 </span> 81 0/subop/add %esp 8/imm32 +<span id="L85" class="LineNr"> 85 </span> +<span id="L86" class="LineNr"> 86 </span> <span class="subxH1Comment"># - if argc > 1 and argv[1] == "test", then return run_tests()</span> +<span id="L87" class="LineNr"> 87 </span> <span class="subxComment"># if (argc <= 1) goto run-main</span> +<span id="L88" class="LineNr"> 88 </span> 81 7/subop/compare *ebp 1/imm32 +<span id="L89" class="LineNr"> 89 </span> 7e/jump-if-<= $run-main/disp8 +<span id="L90" class="LineNr"> 90 </span> <span class="subxComment"># if (!kernel-string-equal?(argv[1], "test")) goto run-main</span> +<span id="L91" class="LineNr"> 91 </span> <span class="subxS1Comment"># . eax = kernel-string-equal?(argv[1], "test")</span> +<span id="L92" class="LineNr"> 92 </span> <span class="subxS2Comment"># . . push args</span> +<span id="L93" class="LineNr"> 93 </span> 68/push <span class="Constant">"test"</span>/imm32 +<span id="L94" class="LineNr"> 94 </span> ff 6/subop/push *(ebp+8) +<span id="L95" class="LineNr"> 95 </span> <span class="subxS2Comment"># . . call</span> +<span id="L96" class="LineNr"> 96 </span> e8/call <a href='../103kernel-string-equal.subx.html#L31'>kernel-string-equal?</a>/disp32 +<span id="L97" class="LineNr"> 97 </span> <span class="subxS2Comment"># . . discard args</span> +<span id="L98" class="LineNr"> 98 </span> 81 0/subop/add %esp 8/imm32 +<span id="L99" class="LineNr"> 99 </span> <span class="subxS1Comment"># . if (eax == false) goto run-main</span> +<span id="L100" class="LineNr">100 </span> 3d/compare-eax-and 0/imm32/false +<span id="L101" class="LineNr">101 </span> 74/jump-if-= $run-main/disp8 +<span id="L102" class="LineNr">102 </span> <span class="subxComment"># run-tests()</span> +<span id="L103" class="LineNr">103 </span> e8/call run-tests/disp32 +<span id="L104" class="LineNr">104 </span> <span class="subxComment"># syscall(exit, *Num-test-failures)</span> +<span id="L105" class="LineNr">105 </span> 8b/-> *<span class="SpecialChar"><a href='../102test.subx.html#L89'>Num-test-failures</a></span> 3/r32/ebx +<span id="L106" class="LineNr">106 </span> eb/jump $main:end/disp8 +<span id="L107" class="LineNr">107 </span><span class="Constant">$run-main</span>: +<span id="L108" class="LineNr">108 </span> <span class="subxH1Comment"># - otherwise return factorial(5)</span> +<span id="L109" class="LineNr">109 </span> <span class="subxComment"># ebx = factorial(5)</span> +<span id="L110" class="LineNr">110 </span> <span class="subxS2Comment"># . . push args</span> +<span id="L111" class="LineNr">111 </span> 68/push 5/imm32 <span id="L112" class="LineNr">112 </span> <span class="subxS2Comment"># . . call</span> -<span id="L113" class="LineNr">113 </span> e8/call <a href='../102test.subx.html#L23'>check-ints-equal</a>/disp32 +<span id="L113" class="LineNr">113 </span> e8/call <a href='factorial2.subx.html#L23'>factorial</a>/disp32 <span id="L114" class="LineNr">114 </span> <span class="subxS2Comment"># . . discard args</span> -<span id="L115" class="LineNr">115 </span> 81 0/subop/add %esp 0xc/imm32 -<span id="L116" class="LineNr">116 </span> <span class="subxComment"># end</span> -<span id="L117" class="LineNr">117 </span> c3/return +<span id="L115" class="LineNr">115 </span> 81 0/subop/add %esp 4/imm32 +<span id="L116" class="LineNr">116 </span> <span class="subxComment">#</span> +<span id="L117" class="LineNr">117 </span> 89/<- %ebx 0/r32/eax +<span id="L118" class="LineNr">118 </span><span class="Constant">$main:end</span>: +<span id="L119" class="LineNr">119 </span> e8/call syscall_exit/disp32 </pre> </body> </html> diff --git a/html/apps/factorial3.subx.html b/html/apps/factorial3.subx.html index 2c522450..a61385fc 100644 --- a/html/apps/factorial3.subx.html +++ b/html/apps/factorial3.subx.html @@ -15,11 +15,11 @@ body { font-size:12pt; font-family: monospace; color: #000000; background-color: a { color:inherit; } * { font-size:12pt; font-size: 1em; } .subxComment { color: #005faf; } -.subxFunction { color: #af5f00; text-decoration: underline; } +.SpecialChar { color: #d70000; } .LineNr { } .subxTest { color: #5f8700; } .subxS1Comment { color: #0000af; } -.SpecialChar { color: #d70000; } +.subxFunction { color: #af5f00; text-decoration: underline; } .Constant { color: #008787; } .subxH1Comment { color: #005faf; text-decoration: underline; } --> @@ -75,68 +75,69 @@ if ('onhashchange' in window) { <span id="L16" class="LineNr">16 </span><span class="subxComment"># Expected output:</span> <span id="L17" class="LineNr">17 </span><span class="subxComment"># ........</span> <span id="L18" class="LineNr">18 </span><span class="subxComment"># Every '.' indicates a passing test. Failing tests get a 'F'.</span> -<span id="L19" class="LineNr">19 </span> -<span id="L20" class="LineNr">20 </span>== code +<span id="L19" class="LineNr">19 </span><span class="subxComment">#</span> +<span id="L20" class="LineNr">20 </span><span class="subxComment"># Compare apps/factorial2.subx</span> <span id="L21" class="LineNr">21 </span> -<span id="L22" class="LineNr">22 </span><span class="SpecialChar">Entry</span>: <span class="subxComment"># run tests if necessary, compute `factorial(5)` if not</span> -<span id="L23" class="LineNr">23 </span> <span class="subxS1Comment"># . prologue</span> -<span id="L24" class="LineNr">24 </span> 89/<- %ebp 4/r32/esp -<span id="L25" class="LineNr">25 </span> -<span id="L26" class="LineNr">26 </span> <span class="subxComment"># initialize heap</span> -<span id="L27" class="LineNr">27 </span> (<a href='../104new-segment.subx.html#L40'>new-segment</a> *<span class="SpecialChar"><a href='../120allocate.subx.html#L34'>Heap-size</a></span> <span class="SpecialChar"><a href='../120allocate.subx.html#L27'>Heap</a></span>) -<span id="L28" class="LineNr">28 </span> -<span id="L29" class="LineNr">29 </span> <span class="subxH1Comment"># - if argc > 1 and argv[1] == "test", then return run_tests()</span> -<span id="L30" class="LineNr">30 </span> <span class="subxComment"># if (argc <= 1) goto run-main</span> -<span id="L31" class="LineNr">31 </span> 81 7/subop/compare *ebp 1/imm32 -<span id="L32" class="LineNr">32 </span> 7e/jump-if-<= $run-main/disp8 -<span id="L33" class="LineNr">33 </span> <span class="subxComment"># if (!kernel-string-equal?(argv[1], "test")) goto run-main</span> -<span id="L34" class="LineNr">34 </span> (<a href='../103kernel-string-equal.subx.html#L31'>kernel-string-equal?</a> *(ebp+8) <span class="Constant">"test"</span>) <span class="subxComment"># => eax</span> -<span id="L35" class="LineNr">35 </span> <span class="subxS1Comment"># . if (eax == false) goto run-main</span> -<span id="L36" class="LineNr">36 </span> 3d/compare-eax-and 0/imm32/false -<span id="L37" class="LineNr">37 </span> 74/jump-if-= $run-main/disp8 -<span id="L38" class="LineNr">38 </span> <span class="subxComment">#</span> -<span id="L39" class="LineNr">39 </span> (run-tests) -<span id="L40" class="LineNr">40 </span> <span class="subxComment"># syscall(exit, *Num-test-failures)</span> -<span id="L41" class="LineNr">41 </span> 8b/-> *<span class="SpecialChar"><a href='../102test.subx.html#L89'>Num-test-failures</a></span> 3/r32/ebx -<span id="L42" class="LineNr">42 </span> eb/jump $main:end/disp8 -<span id="L43" class="LineNr">43 </span><span class="Constant">$run-main</span>: -<span id="L44" class="LineNr">44 </span> <span class="subxH1Comment"># - otherwise</span> -<span id="L45" class="LineNr">45 </span> (<a href='factorial3.subx.html#L51'>factorial</a> 5) <span class="subxComment"># => eax</span> -<span id="L46" class="LineNr">46 </span> <span class="subxComment"># syscall(exit, eax)</span> -<span id="L47" class="LineNr">47 </span> 89/<- %ebx 0/r32/eax -<span id="L48" class="LineNr">48 </span><span class="Constant">$main:end</span>: -<span id="L49" class="LineNr">49 </span> e8/call syscall_exit/disp32 -<span id="L50" class="LineNr">50 </span> -<span id="L51" class="LineNr">51 </span><span class="subxFunction">factorial</span>: <span class="subxComment"># n: int -> int/eax</span> -<span id="L52" class="LineNr">52 </span> <span class="subxS1Comment"># . prologue</span> -<span id="L53" class="LineNr">53 </span> 55/push-ebp -<span id="L54" class="LineNr">54 </span> 89/<- %ebp 4/r32/esp -<span id="L55" class="LineNr">55 </span> <span class="subxComment"># save registers</span> -<span id="L56" class="LineNr">56 </span> 53/push-ebx -<span id="L57" class="LineNr">57 </span> <span class="subxComment"># if (n <= 1) return 1</span> -<span id="L58" class="LineNr">58 </span> b8/copy-to-eax 1/imm32 -<span id="L59" class="LineNr">59 </span> 81 7/subop/compare *(ebp+8) 1/imm32 -<span id="L60" class="LineNr">60 </span> 7e/jump-if-<= $factorial:end/disp8 -<span id="L61" class="LineNr">61 </span> <span class="subxComment"># var ebx: int = n-1</span> -<span id="L62" class="LineNr">62 </span> 8b/-> *(ebp+8) 3/r32/ebx -<span id="L63" class="LineNr">63 </span> 4b/decrement-ebx -<span id="L64" class="LineNr">64 </span> <span class="subxComment">#</span> -<span id="L65" class="LineNr">65 </span> (<a href='factorial3.subx.html#L51'>factorial</a> %ebx) <span class="subxComment"># => eax</span> -<span id="L66" class="LineNr">66 </span> <span class="subxComment"># return n * factorial(n-1)</span> -<span id="L67" class="LineNr">67 </span> f7 4/subop/multiply-into-eax *(ebp+8) -<span id="L68" class="LineNr">68 </span> <span class="subxComment"># TODO: check for overflow</span> -<span id="L69" class="LineNr">69 </span><span class="Constant">$factorial:end</span>: -<span id="L70" class="LineNr">70 </span> <span class="subxComment"># restore registers</span> -<span id="L71" class="LineNr">71 </span> 5b/pop-to-ebx -<span id="L72" class="LineNr">72 </span> <span class="subxS1Comment"># . epilogue</span> -<span id="L73" class="LineNr">73 </span> 89/<- %esp 5/r32/ebp -<span id="L74" class="LineNr">74 </span> 5d/pop-to-ebp -<span id="L75" class="LineNr">75 </span> c3/return -<span id="L76" class="LineNr">76 </span> -<span id="L77" class="LineNr">77 </span><span class="subxTest">test-factorial</span>: -<span id="L78" class="LineNr">78 </span> (<a href='factorial3.subx.html#L51'>factorial</a> 5) -<span id="L79" class="LineNr">79 </span> (<a href='../102test.subx.html#L23'>check-ints-equal</a> %eax 0x78 <span class="Constant">"F - test-factorial"</span>) -<span id="L80" class="LineNr">80 </span> c3/return +<span id="L22" class="LineNr">22 </span>== code +<span id="L23" class="LineNr">23 </span> +<span id="L24" class="LineNr">24 </span><span class="subxFunction">factorial</span>: <span class="subxComment"># n: int -> int/eax</span> +<span id="L25" class="LineNr">25 </span> <span class="subxS1Comment"># . prologue</span> +<span id="L26" class="LineNr">26 </span> 55/push-ebp +<span id="L27" class="LineNr">27 </span> 89/<- %ebp 4/r32/esp +<span id="L28" class="LineNr">28 </span> <span class="subxComment"># save registers</span> +<span id="L29" class="LineNr">29 </span> 53/push-ebx +<span id="L30" class="LineNr">30 </span> <span class="subxComment"># if (n <= 1) return 1</span> +<span id="L31" class="LineNr">31 </span> b8/copy-to-eax 1/imm32 +<span id="L32" class="LineNr">32 </span> 81 7/subop/compare *(ebp+8) 1/imm32 +<span id="L33" class="LineNr">33 </span> 7e/jump-if-<= $factorial:end/disp8 +<span id="L34" class="LineNr">34 </span> <span class="subxComment"># var ebx: int = n-1</span> +<span id="L35" class="LineNr">35 </span> 8b/-> *(ebp+8) 3/r32/ebx +<span id="L36" class="LineNr">36 </span> 4b/decrement-ebx +<span id="L37" class="LineNr">37 </span> <span class="subxComment">#</span> +<span id="L38" class="LineNr">38 </span> (<a href='factorial3.subx.html#L24'>factorial</a> %ebx) <span class="subxComment"># => eax</span> +<span id="L39" class="LineNr">39 </span> <span class="subxComment"># return n * factorial(n-1)</span> +<span id="L40" class="LineNr">40 </span> f7 4/subop/multiply-into-eax *(ebp+8) +<span id="L41" class="LineNr">41 </span> <span class="subxComment"># TODO: check for overflow</span> +<span id="L42" class="LineNr">42 </span><span class="Constant">$factorial:end</span>: +<span id="L43" class="LineNr">43 </span> <span class="subxComment"># restore registers</span> +<span id="L44" class="LineNr">44 </span> 5b/pop-to-ebx +<span id="L45" class="LineNr">45 </span> <span class="subxS1Comment"># . epilogue</span> +<span id="L46" class="LineNr">46 </span> 89/<- %esp 5/r32/ebp +<span id="L47" class="LineNr">47 </span> 5d/pop-to-ebp +<span id="L48" class="LineNr">48 </span> c3/return +<span id="L49" class="LineNr">49 </span> +<span id="L50" class="LineNr">50 </span><span class="subxTest">test-factorial</span>: +<span id="L51" class="LineNr">51 </span> (<a href='factorial3.subx.html#L24'>factorial</a> 5) +<span id="L52" class="LineNr">52 </span> (<a href='../102test.subx.html#L23'>check-ints-equal</a> %eax 0x78 <span class="Constant">"F - test-factorial"</span>) +<span id="L53" class="LineNr">53 </span> c3/return +<span id="L54" class="LineNr">54 </span> +<span id="L55" class="LineNr">55 </span><span class="SpecialChar">Entry</span>: <span class="subxComment"># run tests if necessary, compute `factorial(5)` if not</span> +<span id="L56" class="LineNr">56 </span> <span class="subxS1Comment"># . prologue</span> +<span id="L57" class="LineNr">57 </span> 89/<- %ebp 4/r32/esp +<span id="L58" class="LineNr">58 </span> +<span id="L59" class="LineNr">59 </span> <span class="subxComment"># initialize heap (needed by tests elsewhere)</span> +<span id="L60" class="LineNr">60 </span> (<a href='../104new-segment.subx.html#L40'>new-segment</a> *<span class="SpecialChar"><a href='../120allocate.subx.html#L34'>Heap-size</a></span> <span class="SpecialChar"><a href='../120allocate.subx.html#L27'>Heap</a></span>) +<span id="L61" class="LineNr">61 </span> +<span id="L62" class="LineNr">62 </span> <span class="subxH1Comment"># - if argc > 1 and argv[1] == "test", then return run_tests()</span> +<span id="L63" class="LineNr">63 </span> <span class="subxComment"># if (argc <= 1) goto run-main</span> +<span id="L64" class="LineNr">64 </span> 81 7/subop/compare *ebp 1/imm32 +<span id="L65" class="LineNr">65 </span> 7e/jump-if-<= $run-main/disp8 +<span id="L66" class="LineNr">66 </span> <span class="subxComment"># if (!kernel-string-equal?(argv[1], "test")) goto run-main</span> +<span id="L67" class="LineNr">67 </span> (<a href='../103kernel-string-equal.subx.html#L31'>kernel-string-equal?</a> *(ebp+8) <span class="Constant">"test"</span>) <span class="subxComment"># => eax</span> +<span id="L68" class="LineNr">68 </span> <span class="subxS1Comment"># . if (eax == false) goto run-main</span> +<span id="L69" class="LineNr">69 </span> 3d/compare-eax-and 0/imm32/false +<span id="L70" class="LineNr">70 </span> 74/jump-if-= $run-main/disp8 +<span id="L71" class="LineNr">71 </span> <span class="subxComment">#</span> +<span id="L72" class="LineNr">72 </span> (run-tests) +<span id="L73" class="LineNr">73 </span> <span class="subxComment"># syscall(exit, *Num-test-failures)</span> +<span id="L74" class="LineNr">74 </span> 8b/-> *<span class="SpecialChar"><a href='../102test.subx.html#L89'>Num-test-failures</a></span> 3/r32/ebx +<span id="L75" class="LineNr">75 </span> eb/jump $main:end/disp8 +<span id="L76" class="LineNr">76 </span><span class="Constant">$run-main</span>: +<span id="L77" class="LineNr">77 </span> <span class="subxH1Comment"># - otherwise</span> +<span id="L78" class="LineNr">78 </span> (<a href='factorial3.subx.html#L24'>factorial</a> 5) <span class="subxComment"># => eax</span> +<span id="L79" class="LineNr">79 </span> 89/<- %ebx 0/r32/eax +<span id="L80" class="LineNr">80 </span><span class="Constant">$main:end</span>: +<span id="L81" class="LineNr">81 </span> e8/call syscall_exit/disp32 </pre> </body> </html> diff --git a/html/apps/factorial4.subx.html b/html/apps/factorial4.subx.html index b40586bf..7c770ea7 100644 --- a/html/apps/factorial4.subx.html +++ b/html/apps/factorial4.subx.html @@ -15,13 +15,12 @@ body { font-size:12pt; font-family: monospace; color: #000000; background-color: a { color:inherit; } * { font-size:12pt; font-size: 1em; } .subxComment { color: #005faf; } -.subxFunction { color: #af5f00; text-decoration: underline; } +.SpecialChar { color: #d70000; } .LineNr { } .subxTest { color: #5f8700; } .subxS1Comment { color: #0000af; } -.SpecialChar { color: #d70000; } +.subxFunction { color: #af5f00; text-decoration: underline; } .Constant { color: #008787; } -.subxH1Comment { color: #005faf; text-decoration: underline; } --> </style> @@ -76,75 +75,76 @@ if ('onhashchange' in window) { <span id="L17" class="LineNr">17 </span><span class="subxComment"># Expected output:</span> <span id="L18" class="LineNr">18 </span><span class="subxComment"># ........</span> <span id="L19" class="LineNr">19 </span><span class="subxComment"># Every '.' indicates a passing test. Failing tests get a 'F'.</span> -<span id="L20" class="LineNr">20 </span> -<span id="L21" class="LineNr">21 </span>== code +<span id="L20" class="LineNr">20 </span><span class="subxComment">#</span> +<span id="L21" class="LineNr">21 </span><span class="subxComment"># Compare apps/factorial3.subx</span> <span id="L22" class="LineNr">22 </span> -<span id="L23" class="LineNr">23 </span><span class="SpecialChar">Entry</span>: <span class="subxComment"># run tests if necessary, compute `factorial(5)` if not</span> -<span id="L24" class="LineNr">24 </span> <span class="subxS1Comment"># . prologue</span> -<span id="L25" class="LineNr">25 </span> 89/<- %ebp 4/r32/esp -<span id="L26" class="LineNr">26 </span> -<span id="L27" class="LineNr">27 </span> <span class="subxComment"># initialize heap</span> -<span id="L28" class="LineNr">28 </span> (<a href='../104new-segment.subx.html#L40'>new-segment</a> *<span class="SpecialChar"><a href='../120allocate.subx.html#L34'>Heap-size</a></span> <span class="SpecialChar"><a href='../120allocate.subx.html#L27'>Heap</a></span>) -<span id="L29" class="LineNr">29 </span> -<span id="L30" class="LineNr">30 </span> <span class="subxH1Comment"># - if argc > 1, then return run_tests()</span> -<span id="L31" class="LineNr">31 </span> { -<span id="L32" class="LineNr">32 </span> <span class="subxComment"># if (argc <= 1) break</span> -<span id="L33" class="LineNr">33 </span> 81 7/subop/compare *ebp 1/imm32 -<span id="L34" class="LineNr">34 </span> 7e/jump-if-<= <span class="Constant">break</span>/disp8 -<span id="L35" class="LineNr">35 </span> <span class="subxComment"># if (!kernel-string-equal?(argv[1], "test")) break</span> -<span id="L36" class="LineNr">36 </span> (<a href='../103kernel-string-equal.subx.html#L31'>kernel-string-equal?</a> *(ebp+8) <span class="Constant">"test"</span>) <span class="subxComment"># => eax</span> -<span id="L37" class="LineNr">37 </span> 3d/compare-eax-and 0/imm32/false -<span id="L38" class="LineNr">38 </span> 74/jump-if-= <span class="Constant">break</span>/disp8 -<span id="L39" class="LineNr">39 </span> <span class="subxComment">#</span> -<span id="L40" class="LineNr">40 </span> (run-tests) -<span id="L41" class="LineNr">41 </span> <span class="subxComment"># eax = *Num-test-failures</span> -<span id="L42" class="LineNr">42 </span> 8b/-> *<span class="SpecialChar"><a href='../102test.subx.html#L89'>Num-test-failures</a></span> 3/r32/ebx -<span id="L43" class="LineNr">43 </span> } -<span id="L44" class="LineNr">44 </span> <span class="subxComment"># if (argc <= 1) factorial(5)</span> -<span id="L45" class="LineNr">45 </span> { -<span id="L46" class="LineNr">46 </span> <span class="subxComment"># if (argc > 1) break</span> -<span id="L47" class="LineNr">47 </span> 81 7/subop/compare *ebp 1/imm32 -<span id="L48" class="LineNr">48 </span> 7f/jump-if-> <span class="Constant">break</span>/disp8 -<span id="L49" class="LineNr">49 </span> <span class="subxComment"># eax = factorial(5)</span> -<span id="L50" class="LineNr">50 </span> (<a href='factorial4.subx.html#L57'>factorial</a> 5) -<span id="L51" class="LineNr">51 </span> <span class="subxComment"># syscall(exit, eax)</span> -<span id="L52" class="LineNr">52 </span> 89/<- %ebx 0/r32/eax -<span id="L53" class="LineNr">53 </span> } -<span id="L54" class="LineNr">54 </span> -<span id="L55" class="LineNr">55 </span> e8/call syscall_exit/disp32 -<span id="L56" class="LineNr">56 </span> -<span id="L57" class="LineNr">57 </span><span class="subxFunction">factorial</span>: <span class="subxComment"># n: int -> int/eax</span> -<span id="L58" class="LineNr">58 </span> <span class="subxS1Comment"># . prologue</span> -<span id="L59" class="LineNr">59 </span> 55/push-ebp +<span id="L23" class="LineNr">23 </span>== code +<span id="L24" class="LineNr">24 </span> +<span id="L25" class="LineNr">25 </span><span class="subxFunction">factorial</span>: <span class="subxComment"># n: int -> int/eax</span> +<span id="L26" class="LineNr">26 </span> <span class="subxS1Comment"># . prologue</span> +<span id="L27" class="LineNr">27 </span> 55/push-ebp +<span id="L28" class="LineNr">28 </span> 89/<- %ebp 4/r32/esp +<span id="L29" class="LineNr">29 </span> <span class="subxComment"># save registers</span> +<span id="L30" class="LineNr">30 </span> 51/push-ecx +<span id="L31" class="LineNr">31 </span> <span class="subxComment"># if (n <= 1) return 1</span> +<span id="L32" class="LineNr">32 </span> 81 7/subop/compare *(ebp+8) 1/imm32 +<span id="L33" class="LineNr">33 </span> { +<span id="L34" class="LineNr">34 </span> 7f/jump-if-> <span class="Constant">break</span>/disp8 +<span id="L35" class="LineNr">35 </span> b8/copy-to-eax 1/imm32 +<span id="L36" class="LineNr">36 </span> } +<span id="L37" class="LineNr">37 </span> <span class="subxComment"># if (n > 1) return n * factorial(n-1)</span> +<span id="L38" class="LineNr">38 </span> { +<span id="L39" class="LineNr">39 </span> 7e/jump-if-<= <span class="Constant">break</span>/disp8 +<span id="L40" class="LineNr">40 </span> <span class="subxComment"># var tmp/ecx: int = n-1</span> +<span id="L41" class="LineNr">41 </span> 8b/-> *(ebp+8) 1/r32/ecx +<span id="L42" class="LineNr">42 </span> 49/decrement-ecx +<span id="L43" class="LineNr">43 </span> (<a href='factorial4.subx.html#L25'>factorial</a> %ecx) <span class="subxComment"># => eax</span> +<span id="L44" class="LineNr">44 </span> f7 4/subop/multiply-into-eax *(ebp+8) +<span id="L45" class="LineNr">45 </span> } +<span id="L46" class="LineNr">46 </span> <span class="subxComment"># restore registers</span> +<span id="L47" class="LineNr">47 </span> 59/pop-to-ecx +<span id="L48" class="LineNr">48 </span> <span class="subxS1Comment"># . epilogue</span> +<span id="L49" class="LineNr">49 </span> 89/<- %esp 5/r32/ebp +<span id="L50" class="LineNr">50 </span> 5d/pop-to-ebp +<span id="L51" class="LineNr">51 </span> c3/return +<span id="L52" class="LineNr">52 </span> +<span id="L53" class="LineNr">53 </span><span class="subxTest">test-factorial</span>: +<span id="L54" class="LineNr">54 </span> (<a href='factorial4.subx.html#L25'>factorial</a> 5) +<span id="L55" class="LineNr">55 </span> (<a href='../102test.subx.html#L23'>check-ints-equal</a> %eax 0x78 <span class="Constant">"F - test-factorial"</span>) +<span id="L56" class="LineNr">56 </span> c3/return +<span id="L57" class="LineNr">57 </span> +<span id="L58" class="LineNr">58 </span><span class="SpecialChar">Entry</span>: <span class="subxComment"># run tests if necessary, compute `factorial(5)` if not</span> +<span id="L59" class="LineNr">59 </span> <span class="subxS1Comment"># . prologue</span> <span id="L60" class="LineNr">60 </span> 89/<- %ebp 4/r32/esp -<span id="L61" class="LineNr">61 </span> <span class="subxComment"># save registers</span> -<span id="L62" class="LineNr">62 </span> 51/push-ecx -<span id="L63" class="LineNr">63 </span> <span class="subxComment"># if (n <= 1) return 1</span> -<span id="L64" class="LineNr">64 </span> 81 7/subop/compare *(ebp+8) 1/imm32 -<span id="L65" class="LineNr">65 </span> { -<span id="L66" class="LineNr">66 </span> 7f/jump-if-> <span class="Constant">break</span>/disp8 -<span id="L67" class="LineNr">67 </span> b8/copy-to-eax 1/imm32 -<span id="L68" class="LineNr">68 </span> } -<span id="L69" class="LineNr">69 </span> <span class="subxComment"># if (n > 1) return n * factorial(n-1)</span> -<span id="L70" class="LineNr">70 </span> { -<span id="L71" class="LineNr">71 </span> 7e/jump-if-<= <span class="Constant">break</span>/disp8 -<span id="L72" class="LineNr">72 </span> <span class="subxComment"># var tmp/ecx: int = n-1</span> -<span id="L73" class="LineNr">73 </span> 8b/-> *(ebp+8) 1/r32/ecx -<span id="L74" class="LineNr">74 </span> 49/decrement-ecx -<span id="L75" class="LineNr">75 </span> (<a href='factorial4.subx.html#L57'>factorial</a> %ecx) <span class="subxComment"># => eax</span> -<span id="L76" class="LineNr">76 </span> f7 4/subop/multiply-into-eax *(ebp+8) -<span id="L77" class="LineNr">77 </span> } -<span id="L78" class="LineNr">78 </span> <span class="subxComment"># restore registers</span> -<span id="L79" class="LineNr">79 </span> 59/pop-to-ecx -<span id="L80" class="LineNr">80 </span> <span class="subxS1Comment"># . epilogue</span> -<span id="L81" class="LineNr">81 </span> 89/<- %esp 5/r32/ebp -<span id="L82" class="LineNr">82 </span> 5d/pop-to-ebp -<span id="L83" class="LineNr">83 </span> c3/return -<span id="L84" class="LineNr">84 </span> -<span id="L85" class="LineNr">85 </span><span class="subxTest">test-factorial</span>: -<span id="L86" class="LineNr">86 </span> (<a href='factorial4.subx.html#L57'>factorial</a> 5) -<span id="L87" class="LineNr">87 </span> (<a href='../102test.subx.html#L23'>check-ints-equal</a> %eax 0x78 <span class="Constant">"F - test-factorial"</span>) -<span id="L88" class="LineNr">88 </span> c3/return +<span id="L61" class="LineNr">61 </span> +<span id="L62" class="LineNr">62 </span> <span class="subxComment"># initialize heap (needed by tests elsewhere)</span> +<span id="L63" class="LineNr">63 </span> (<a href='../104new-segment.subx.html#L40'>new-segment</a> *<span class="SpecialChar"><a href='../120allocate.subx.html#L34'>Heap-size</a></span> <span class="SpecialChar"><a href='../120allocate.subx.html#L27'>Heap</a></span>) +<span id="L64" class="LineNr">64 </span> +<span id="L65" class="LineNr">65 </span> <span class="subxComment"># if (argc <= 1) return factorial(5)</span> +<span id="L66" class="LineNr">66 </span> { +<span id="L67" class="LineNr">67 </span> <span class="subxComment"># if (argc > 1) break</span> +<span id="L68" class="LineNr">68 </span> 81 7/subop/compare *ebp 1/imm32 +<span id="L69" class="LineNr">69 </span> 7f/jump-if-> <span class="Constant">break</span>/disp8 +<span id="L70" class="LineNr">70 </span> <span class="subxComment"># ebx = factorial(5)</span> +<span id="L71" class="LineNr">71 </span> (<a href='factorial4.subx.html#L25'>factorial</a> 5) <span class="subxComment"># => eax</span> +<span id="L72" class="LineNr">72 </span> 89/<- %ebx 0/r32/eax +<span id="L73" class="LineNr">73 </span> } +<span id="L74" class="LineNr">74 </span> <span class="subxComment"># otherwise if an arg exists and is "test", then return run_tests()</span> +<span id="L75" class="LineNr">75 </span> { +<span id="L76" class="LineNr">76 </span> <span class="subxComment"># if (argc <= 1) break</span> +<span id="L77" class="LineNr">77 </span> 81 7/subop/compare *ebp 1/imm32 +<span id="L78" class="LineNr">78 </span> 7e/jump-if-<= <span class="Constant">break</span>/disp8 +<span id="L79" class="LineNr">79 </span> <span class="subxComment"># if (!kernel-string-equal?(argv[1], "test")) break</span> +<span id="L80" class="LineNr">80 </span> (<a href='../103kernel-string-equal.subx.html#L31'>kernel-string-equal?</a> *(ebp+8) <span class="Constant">"test"</span>) <span class="subxComment"># => eax</span> +<span id="L81" class="LineNr">81 </span> 3d/compare-eax-and 0/imm32/false +<span id="L82" class="LineNr">82 </span> 74/jump-if-= <span class="Constant">break</span>/disp8 +<span id="L83" class="LineNr">83 </span> <span class="subxComment">#</span> +<span id="L84" class="LineNr">84 </span> (run-tests) +<span id="L85" class="LineNr">85 </span> <span class="subxComment"># ebx = *Num-test-failures</span> +<span id="L86" class="LineNr">86 </span> 8b/-> *<span class="SpecialChar"><a href='../102test.subx.html#L89'>Num-test-failures</a></span> 3/r32/ebx +<span id="L87" class="LineNr">87 </span> } +<span id="L88" class="LineNr">88 </span> +<span id="L89" class="LineNr">89 </span> e8/call syscall_exit/disp32 </pre> </body> </html> |