diff options
| -rw-r--r-- | html/subx/061error.subx.html | 87 | ||||
| -rw-r--r-- | subx/061error.subx | 7 | ||||
| -rwxr-xr-x | subx/apps/crenshaw2-1 | bin | 6462 -> 6480 bytes | |||
| -rwxr-xr-x | subx/apps/crenshaw2-1b | bin | 7023 -> 7041 bytes | |||
| -rwxr-xr-x | subx/apps/factorial | bin | 5353 -> 5371 bytes |
5 files changed, 54 insertions, 40 deletions
diff --git a/html/subx/061error.subx.html b/html/subx/061error.subx.html index a606c428..984ab7e7 100644 --- a/html/subx/061error.subx.html +++ b/html/subx/061error.subx.html @@ -68,46 +68,53 @@ if ('onhashchange' in window) { <span id="L5" class="LineNr"> 5 </span><span class="subxS1Comment"># . op subop mod rm32 base index scale r32</span> <span id="L6" class="LineNr"> 6 </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="L7" class="LineNr"> 7 </span> -<span id="L8" class="LineNr"> 8 </span><span class="subxComment"># write(out, "Error: "+msg+"\n") then stop(ed, 1)</span> -<span id="L9" class="LineNr"> 9 </span><span class="subxFunction">error</span>: <span class="subxComment"># ed : (address exit-descriptor), out : fd or (address stream), msg : (address array byte) -> <void></span> -<span id="L10" class="LineNr">10 </span> <span class="subxS1Comment"># . prolog</span> -<span id="L11" class="LineNr">11 </span> 55/push-EBP -<span id="L12" class="LineNr">12 </span> 89/copy 3/mod/direct 5/rm32/EBP <span class="CommentedCode"> . </span> <span class="CommentedCode"> . </span> <span class="CommentedCode"> . </span> 4/r32/ESP <span class="CommentedCode"> . </span> <span class="CommentedCode"> . </span> <span class="subxComment"># copy ESP to EBP</span> -<span id="L13" class="LineNr">13 </span> <span class="subxComment"># write(out, "Error: ")</span> -<span id="L14" class="LineNr">14 </span> <span class="subxS2Comment"># . . push args</span> -<span id="L15" class="LineNr">15 </span> 68/push <span class="Constant">"Error: "</span>/imm32 -<span id="L16" class="LineNr">16 </span> ff 6/subop/push 1/mod/*+disp8 4/rm32/sib 5/base/EBP 4/index/none <span class="CommentedCode"> . </span> <span class="CommentedCode"> . </span> 0xc/disp8 <span class="CommentedCode"> . </span> <span class="subxComment"># push *(EBP+12)</span> -<span id="L17" class="LineNr">17 </span> <span class="subxS2Comment"># . . call</span> -<span id="L18" class="LineNr">18 </span> e8/call write/disp32 -<span id="L19" class="LineNr">19 </span> <span class="subxS2Comment"># . . discard args</span> -<span id="L20" class="LineNr">20 </span> 81 0/subop/add 3/mod/direct 4/rm32/ESP <span class="CommentedCode"> . </span> <span class="CommentedCode"> . </span> <span class="CommentedCode"> . </span> <span class="CommentedCode"> . </span> <span class="CommentedCode"> . </span> 8/imm32 <span class="subxComment"># add to ESP</span> -<span id="L21" class="LineNr">21 </span> <span class="subxComment"># write(out, msg)</span> -<span id="L22" class="LineNr">22 </span> <span class="subxS2Comment"># . . push args</span> -<span id="L23" class="LineNr">23 </span> ff 6/subop/push 1/mod/*+disp8 4/rm32/sib 5/base/EBP 4/index/none <span class="CommentedCode"> . </span> <span class="CommentedCode"> . </span> 0x10/disp8 <span class="CommentedCode"> . </span> <span class="subxComment"># push *(EBP+16)</span> -<span id="L24" class="LineNr">24 </span> ff 6/subop/push 1/mod/*+disp8 4/rm32/sib 5/base/EBP 4/index/none <span class="CommentedCode"> . </span> <span class="CommentedCode"> . </span> 0xc/disp8 <span class="CommentedCode"> . </span> <span class="subxComment"># push *(EBP+12)</span> -<span id="L25" class="LineNr">25 </span> <span class="subxS2Comment"># . . call</span> -<span id="L26" class="LineNr">26 </span> e8/call write/disp32 -<span id="L27" class="LineNr">27 </span> <span class="subxS2Comment"># . . discard args</span> -<span id="L28" class="LineNr">28 </span> 81 0/subop/add 3/mod/direct 4/rm32/ESP <span class="CommentedCode"> . </span> <span class="CommentedCode"> . </span> <span class="CommentedCode"> . </span> <span class="CommentedCode"> . </span> <span class="CommentedCode"> . </span> 8/imm32 <span class="subxComment"># add to ESP</span> -<span id="L29" class="LineNr">29 </span> <span class="subxComment"># write(out, Newline)</span> -<span id="L30" class="LineNr">30 </span> <span class="subxS2Comment"># . . push args</span> -<span id="L31" class="LineNr">31 </span> 68/push <span class="SpecialChar">Newline</span>/imm32 -<span id="L32" class="LineNr">32 </span> ff 6/subop/push 1/mod/*+disp8 4/rm32/sib 5/base/EBP 4/index/none <span class="CommentedCode"> . </span> <span class="CommentedCode"> . </span> 0xc/disp8 <span class="CommentedCode"> . </span> <span class="subxComment"># push *(EBP+12)</span> -<span id="L33" class="LineNr">33 </span> <span class="subxS2Comment"># . . call</span> -<span id="L34" class="LineNr">34 </span> e8/call write/disp32 -<span id="L35" class="LineNr">35 </span> <span class="subxS2Comment"># . . discard args</span> -<span id="L36" class="LineNr">36 </span> 81 0/subop/add 3/mod/direct 4/rm32/ESP <span class="CommentedCode"> . </span> <span class="CommentedCode"> . </span> <span class="CommentedCode"> . </span> <span class="CommentedCode"> . </span> <span class="CommentedCode"> . </span> 8/imm32 <span class="subxComment"># add to ESP</span> -<span id="L37" class="LineNr">37 </span> <span class="subxComment"># stop(ed, 1)</span> -<span id="L38" class="LineNr">38 </span> <span class="subxS2Comment"># . . push args</span> -<span id="L39" class="LineNr">39 </span> 68/push 1/imm32 -<span id="L40" class="LineNr">40 </span> ff 6/subop/push 1/mod/*+disp8 4/rm32/sib 5/base/EBP 4/index/none <span class="CommentedCode"> . </span> <span class="CommentedCode"> . </span> 8/disp8 <span class="CommentedCode"> . </span> <span class="subxComment"># push *(EBP+8)</span> -<span id="L41" class="LineNr">41 </span> <span class="subxS2Comment"># . . call</span> -<span id="L42" class="LineNr">42 </span> e8/call stop/disp32 -<span id="L43" class="LineNr">43 </span> <span class="subxComment"># should never get past this point</span> -<span id="L44" class="LineNr">44 </span> <span class="subxS1Comment"># . epilog</span> -<span id="L45" class="LineNr">45 </span> 89/copy 3/mod/direct 4/rm32/ESP <span class="CommentedCode"> . </span> <span class="CommentedCode"> . </span> <span class="CommentedCode"> . </span> 5/r32/EBP <span class="CommentedCode"> . </span> <span class="CommentedCode"> . </span> <span class="subxComment"># copy EBP to ESP</span> -<span id="L46" class="LineNr">46 </span> 5d/pop-to-EBP -<span id="L47" class="LineNr">47 </span> c3/return +<span id="L8" class="LineNr"> 8 </span><span class="subxComment"># main:</span> +<span id="L9" class="LineNr"> 9 </span> e8/call run-tests/disp32 <span class="subxComment"># 'run-tests' is a function created automatically by SubX. It calls all functions that start with 'test-'.</span> +<span id="L10" class="LineNr">10 </span> <span class="subxComment"># syscall(exit, Num-test-failures)</span> +<span id="L11" class="LineNr">11 </span> 8b/copy 0/mod/indirect 5/rm32/.disp32 <span class="CommentedCode"> . </span> <span class="CommentedCode"> . </span> 3/r32/EBX <span class="SpecialChar">Num-test-failures</span>/disp32 <span class="subxComment"># copy *Num-test-failures to EBX</span> +<span id="L12" class="LineNr">12 </span> b8/copy-to-EAX 1/imm32 +<span id="L13" class="LineNr">13 </span> cd/syscall 0x80/imm8 +<span id="L14" class="LineNr">14 </span> +<span id="L15" class="LineNr">15 </span><span class="subxComment"># write(out, "Error: "+msg+"\n") then stop(ed, 1)</span> +<span id="L16" class="LineNr">16 </span><span class="subxFunction">error</span>: <span class="subxComment"># ed : (address exit-descriptor), out : fd or (address stream), msg : (address array byte) -> <void></span> +<span id="L17" class="LineNr">17 </span> <span class="subxS1Comment"># . prolog</span> +<span id="L18" class="LineNr">18 </span> 55/push-EBP +<span id="L19" class="LineNr">19 </span> 89/copy 3/mod/direct 5/rm32/EBP <span class="CommentedCode"> . </span> <span class="CommentedCode"> . </span> <span class="CommentedCode"> . </span> 4/r32/ESP <span class="CommentedCode"> . </span> <span class="CommentedCode"> . </span> <span class="subxComment"># copy ESP to EBP</span> +<span id="L20" class="LineNr">20 </span> <span class="subxComment"># write(out, "Error: ")</span> +<span id="L21" class="LineNr">21 </span> <span class="subxS2Comment"># . . push args</span> +<span id="L22" class="LineNr">22 </span> 68/push <span class="Constant">"Error: "</span>/imm32 +<span id="L23" class="LineNr">23 </span> ff 6/subop/push 1/mod/*+disp8 4/rm32/sib 5/base/EBP 4/index/none <span class="CommentedCode"> . </span> <span class="CommentedCode"> . </span> 0xc/disp8 <span class="CommentedCode"> . </span> <span class="subxComment"># push *(EBP+12)</span> +<span id="L24" class="LineNr">24 </span> <span class="subxS2Comment"># . . call</span> +<span id="L25" class="LineNr">25 </span> e8/call write/disp32 +<span id="L26" class="LineNr">26 </span> <span class="subxS2Comment"># . . discard args</span> +<span id="L27" class="LineNr">27 </span> 81 0/subop/add 3/mod/direct 4/rm32/ESP <span class="CommentedCode"> . </span> <span class="CommentedCode"> . </span> <span class="CommentedCode"> . </span> <span class="CommentedCode"> . </span> <span class="CommentedCode"> . </span> 8/imm32 <span class="subxComment"># add to ESP</span> +<span id="L28" class="LineNr">28 </span> <span class="subxComment"># write(out, msg)</span> +<span id="L29" class="LineNr">29 </span> <span class="subxS2Comment"># . . push args</span> +<span id="L30" class="LineNr">30 </span> ff 6/subop/push 1/mod/*+disp8 4/rm32/sib 5/base/EBP 4/index/none <span class="CommentedCode"> . </span> <span class="CommentedCode"> . </span> 0x10/disp8 <span class="CommentedCode"> . </span> <span class="subxComment"># push *(EBP+16)</span> +<span id="L31" class="LineNr">31 </span> ff 6/subop/push 1/mod/*+disp8 4/rm32/sib 5/base/EBP 4/index/none <span class="CommentedCode"> . </span> <span class="CommentedCode"> . </span> 0xc/disp8 <span class="CommentedCode"> . </span> <span class="subxComment"># push *(EBP+12)</span> +<span id="L32" class="LineNr">32 </span> <span class="subxS2Comment"># . . call</span> +<span id="L33" class="LineNr">33 </span> e8/call write/disp32 +<span id="L34" class="LineNr">34 </span> <span class="subxS2Comment"># . . discard args</span> +<span id="L35" class="LineNr">35 </span> 81 0/subop/add 3/mod/direct 4/rm32/ESP <span class="CommentedCode"> . </span> <span class="CommentedCode"> . </span> <span class="CommentedCode"> . </span> <span class="CommentedCode"> . </span> <span class="CommentedCode"> . </span> 8/imm32 <span class="subxComment"># add to ESP</span> +<span id="L36" class="LineNr">36 </span> <span class="subxComment"># write(out, Newline)</span> +<span id="L37" class="LineNr">37 </span> <span class="subxS2Comment"># . . push args</span> +<span id="L38" class="LineNr">38 </span> 68/push <span class="SpecialChar">Newline</span>/imm32 +<span id="L39" class="LineNr">39 </span> ff 6/subop/push 1/mod/*+disp8 4/rm32/sib 5/base/EBP 4/index/none <span class="CommentedCode"> . </span> <span class="CommentedCode"> . </span> 0xc/disp8 <span class="CommentedCode"> . </span> <span class="subxComment"># push *(EBP+12)</span> +<span id="L40" class="LineNr">40 </span> <span class="subxS2Comment"># . . call</span> +<span id="L41" class="LineNr">41 </span> e8/call write/disp32 +<span id="L42" class="LineNr">42 </span> <span class="subxS2Comment"># . . discard args</span> +<span id="L43" class="LineNr">43 </span> 81 0/subop/add 3/mod/direct 4/rm32/ESP <span class="CommentedCode"> . </span> <span class="CommentedCode"> . </span> <span class="CommentedCode"> . </span> <span class="CommentedCode"> . </span> <span class="CommentedCode"> . </span> 8/imm32 <span class="subxComment"># add to ESP</span> +<span id="L44" class="LineNr">44 </span> <span class="subxComment"># stop(ed, 1)</span> +<span id="L45" class="LineNr">45 </span> <span class="subxS2Comment"># . . push args</span> +<span id="L46" class="LineNr">46 </span> 68/push 1/imm32 +<span id="L47" class="LineNr">47 </span> ff 6/subop/push 1/mod/*+disp8 4/rm32/sib 5/base/EBP 4/index/none <span class="CommentedCode"> . </span> <span class="CommentedCode"> . </span> 8/disp8 <span class="CommentedCode"> . </span> <span class="subxComment"># push *(EBP+8)</span> +<span id="L48" class="LineNr">48 </span> <span class="subxS2Comment"># . . call</span> +<span id="L49" class="LineNr">49 </span> e8/call stop/disp32 +<span id="L50" class="LineNr">50 </span> <span class="subxComment"># should never get past this point</span> +<span id="L51" class="LineNr">51 </span> <span class="subxS1Comment"># . epilog</span> +<span id="L52" class="LineNr">52 </span> 89/copy 3/mod/direct 4/rm32/ESP <span class="CommentedCode"> . </span> <span class="CommentedCode"> . </span> <span class="CommentedCode"> . </span> 5/r32/EBP <span class="CommentedCode"> . </span> <span class="CommentedCode"> . </span> <span class="subxComment"># copy EBP to ESP</span> +<span id="L53" class="LineNr">53 </span> 5d/pop-to-EBP +<span id="L54" class="LineNr">54 </span> c3/return </pre> </body> </html> diff --git a/subx/061error.subx b/subx/061error.subx index b03cfde2..0868f854 100644 --- a/subx/061error.subx +++ b/subx/061error.subx @@ -5,6 +5,13 @@ # . 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 +# main: + e8/call run-tests/disp32 # 'run-tests' is a function created automatically by SubX. It calls all functions that start with 'test-'. + # syscall(exit, Num-test-failures) + 8b/copy 0/mod/indirect 5/rm32/.disp32 . . 3/r32/EBX Num-test-failures/disp32 # copy *Num-test-failures to EBX + b8/copy-to-EAX 1/imm32 + cd/syscall 0x80/imm8 + # write(out, "Error: "+msg+"\n") then stop(ed, 1) error: # ed : (address exit-descriptor), out : fd or (address stream), msg : (address array byte) -> <void> # . prolog diff --git a/subx/apps/crenshaw2-1 b/subx/apps/crenshaw2-1 index a02751f0..47762af7 100755 --- a/subx/apps/crenshaw2-1 +++ b/subx/apps/crenshaw2-1 Binary files differdiff --git a/subx/apps/crenshaw2-1b b/subx/apps/crenshaw2-1b index 2c7d0d0d..620c1bad 100755 --- a/subx/apps/crenshaw2-1b +++ b/subx/apps/crenshaw2-1b Binary files differdiff --git a/subx/apps/factorial b/subx/apps/factorial index 5fb3daf7..d3a50805 100755 --- a/subx/apps/factorial +++ b/subx/apps/factorial Binary files differ |