diff options
| author | Kartik Agaram <vc@akkartik.com> | 2018-12-04 12:26:27 -0800 |
|---|---|---|
| committer | Kartik Agaram <vc@akkartik.com> | 2018-12-04 12:26:27 -0800 |
| commit | 79328f9ad6f3118fd86c1f99f672d2807917d848 (patch) | |
| tree | 0a9ad5f6de74f53ee727b30640b05d2e1055ab80 | |
| parent | a94b60b5cc217f08e4fd6c949e6af590c55a176b (diff) | |
| download | mu-79328f9ad6f3118fd86c1f99f672d2807917d848.tar.gz | |
4841
New helper: print an error message, then a numeric byte, then abort.
| -rw-r--r-- | html/subx/065error-byte.subx.html | 161 | ||||
| -rw-r--r-- | subx/065error-byte.subx | 94 | ||||
| -rwxr-xr-x | subx/apps/crenshaw2-1 | bin | 7509 -> 7678 bytes | |||
| -rwxr-xr-x | subx/apps/crenshaw2-1b | bin | 8070 -> 8239 bytes | |||
| -rwxr-xr-x | subx/apps/factorial | bin | 6400 -> 6569 bytes |
5 files changed, 255 insertions, 0 deletions
diff --git a/html/subx/065error-byte.subx.html b/html/subx/065error-byte.subx.html new file mode 100644 index 00000000..22660d7d --- /dev/null +++ b/html/subx/065error-byte.subx.html @@ -0,0 +1,161 @@ +<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd"> +<html> +<head> +<meta http-equiv="content-type" content="text/html; charset=UTF-8"> +<title>Mu - subx/065error-byte.subx</title> +<meta name="Generator" content="Vim/8.0"> +<meta name="plugin-version" content="vim7.4_v2"> +<meta name="syntax" content="none"> +<meta name="settings" content="number_lines,use_css,no_foldcolumn,expand_tabs,line_ids,prevent_copy="> +<meta name="colorscheme" content="minimal"> +<style type="text/css"> +<!-- +pre { font-family: monospace; color: #aaaaaa; background-color: #080808; } +body { font-size:12pt; font-family: monospace; color: #aaaaaa; background-color: #080808; } +.subxS2Comment a { color:inherit; } +.subxS1Comment a { color:inherit; } +.subxComment a { color:inherit; } +.subxH2Comment a { color:inherit; } +.subxH1Comment a { color:inherit; } +* { font-size:12pt; font-size: 1em; } +.subxComment { color:#16bfff; } +.subxS2Comment { color:#4466ff; } +.LineNr { color:#444444; } +.subxS1Comment { color:#2d8cff; } +.CommentedCode { color: #6c6c6c; } +.subxFunction { color: #ff8700; } +.Constant { color:#00a0a0; } +.SpecialChar { color: #ff0000; } +--> +</style> + +<script type='text/javascript'> +<!-- + +/* function to open any folds containing a jumped-to line before jumping to it */ +function JumpToLine() +{ + var lineNum; + lineNum = window.location.hash; + lineNum = lineNum.substr(1); /* strip off '#' */ + + if (lineNum.indexOf('L') == -1) { + lineNum = 'L'+lineNum; + } + lineElem = document.getElementById(lineNum); + /* Always jump to new location even if the line was hidden inside a fold, or + * we corrected the raw number to a line ID. + */ + if (lineElem) { + lineElem.scrollIntoView(true); + } + return true; +} +if ('onhashchange' in window) { + window.onhashchange = JumpToLine; +} + +--> +</script> +</head> +<body onload='JumpToLine();'> +<a href='https://github.com/akkartik/mu/blob/master/subx/065error-byte.subx'>https://github.com/akkartik/mu/blob/master/subx/065error-byte.subx</a> +<pre id='vimCodeElement'> +<span id="L1" class="LineNr"> 1 </span><span class="subxComment"># Print an error message followed by the text representation of a byte. Then exit.</span> +<span id="L2" class="LineNr"> 2 </span> +<span id="L3" class="LineNr"> 3 </span>== code +<span id="L4" class="LineNr"> 4 </span><span class="subxComment"># instruction effective address register displacement immediate</span> +<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"># main:</span> +<span id="L9" class="LineNr"> 9 </span> <span class="subxComment"># manual test</span> +<span id="L10" class="LineNr">10 </span><span class="CommentedCode">#? # . var ed/EAX : exit-descriptor</span> +<span id="L11" class="LineNr">11 </span><span class="CommentedCode">#? 81 5/subop/subtract 3/mod/direct 4/rm32/ESP . . . . . 8/imm32 # subtract from ESP</span> +<span id="L12" class="LineNr">12 </span><span class="CommentedCode">#? 8d/copy-address 0/mod/indirect 4/rm32/sib 4/base/ESP 4/index/none . 0/r32/EAX . . # copy ESP to EAX</span> +<span id="L13" class="LineNr">13 </span><span class="CommentedCode">#? # . configure ed to really exit()</span> +<span id="L14" class="LineNr">14 </span><span class="CommentedCode">#? # . . ed->target = 0</span> +<span id="L15" class="LineNr">15 </span><span class="CommentedCode">#? c7/copy 0/mod/direct 0/rm32/EAX . . . . . 0/imm32 # copy to *EAX</span> +<span id="L16" class="LineNr">16 </span><span class="CommentedCode">#? # . error-byte(ed, Stdout, msg, 34)</span> +<span id="L17" class="LineNr">17 </span><span class="CommentedCode">#? 68/push 0x34/imm32</span> +<span id="L18" class="LineNr">18 </span><span class="CommentedCode">#? 68/push "abc"/imm32</span> +<span id="L19" class="LineNr">19 </span><span class="CommentedCode">#? 68/push Stdout/imm32</span> +<span id="L20" class="LineNr">20 </span><span class="CommentedCode">#? 50/push-EAX</span> +<span id="L21" class="LineNr">21 </span><span class="CommentedCode">#? e8/call error-byte/disp32</span> +<span id="L22" class="LineNr">22 </span> <span class="subxComment"># automatic test</span> +<span id="L23" class="LineNr">23 </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="L24" class="LineNr">24 </span> <span class="subxS1Comment"># . syscall(exit, Num-test-failures)</span> +<span id="L25" class="LineNr">25 </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="L26" class="LineNr">26 </span> b8/copy-to-EAX 1/imm32 +<span id="L27" class="LineNr">27 </span> cd/syscall 0x80/imm8 +<span id="L28" class="LineNr">28 </span> +<span id="L29" class="LineNr">29 </span><span class="subxComment"># write(out, "Error: "+msg+": "+byte) then stop(ed, 1)</span> +<span id="L30" class="LineNr">30 </span><span class="subxFunction">error-byte</span>: <span class="subxComment"># ed : (address exit-descriptor), out : (address buffered-file), msg : (address array byte), n : byte -> <void></span> +<span id="L31" class="LineNr">31 </span> <span class="subxS1Comment"># . prolog</span> +<span id="L32" class="LineNr">32 </span> 55/push-EBP +<span id="L33" class="LineNr">33 </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="L34" class="LineNr">34 </span> <span class="subxComment"># write-buffered(out, "Error: ")</span> +<span id="L35" class="LineNr">35 </span> <span class="subxS2Comment"># . . push args</span> +<span id="L36" class="LineNr">36 </span> 68/push <span class="Constant">"Error: "</span>/imm32 +<span id="L37" class="LineNr">37 </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="L38" class="LineNr">38 </span> <span class="subxS2Comment"># . . call</span> +<span id="L39" class="LineNr">39 </span> e8/call write-buffered/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 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="L42" class="LineNr">42 </span> <span class="subxComment"># write-buffered(out, msg)</span> +<span id="L43" class="LineNr">43 </span> <span class="subxS2Comment"># . . push args</span> +<span id="L44" class="LineNr">44 </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="L45" class="LineNr">45 </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="L46" class="LineNr">46 </span> <span class="subxS2Comment"># . . call</span> +<span id="L47" class="LineNr">47 </span> e8/call write-buffered/disp32 +<span id="L48" class="LineNr">48 </span> <span class="subxS2Comment"># . . discard args</span> +<span id="L49" class="LineNr">49 </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="L50" class="LineNr">50 </span> <span class="subxComment"># write-buffered(out, ": ")</span> +<span id="L51" class="LineNr">51 </span> <span class="subxS2Comment"># . . push args</span> +<span id="L52" class="LineNr">52 </span> 68/push <span class="Constant">": "</span>/imm32 +<span id="L53" class="LineNr">53 </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="L54" class="LineNr">54 </span> <span class="subxS2Comment"># . . call</span> +<span id="L55" class="LineNr">55 </span> e8/call write-buffered/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="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="L58" class="LineNr">58 </span> <span class="subxComment"># print-byte(out, byte)</span> +<span id="L59" class="LineNr">59 </span> <span class="subxS2Comment"># . . push args</span> +<span id="L60" class="LineNr">60 </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> 0x14/disp8 <span class="CommentedCode"> . </span> <span class="subxComment"># push *(EBP+20)</span> +<span id="L61" class="LineNr">61 </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="L62" class="LineNr">62 </span> <span class="subxS2Comment"># . . call</span> +<span id="L63" class="LineNr">63 </span> e8/call print-byte/disp32 +<span id="L64" class="LineNr">64 </span> <span class="subxS2Comment"># . . discard args</span> +<span id="L65" class="LineNr">65 </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="L66" class="LineNr">66 </span> <span class="subxComment"># write-buffered(out, Newline)</span> +<span id="L67" class="LineNr">67 </span> <span class="subxS2Comment"># . . push args</span> +<span id="L68" class="LineNr">68 </span> 68/push <span class="SpecialChar">Newline</span>/imm32 +<span id="L69" class="LineNr">69 </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="L70" class="LineNr">70 </span> <span class="subxS2Comment"># . . call</span> +<span id="L71" class="LineNr">71 </span> e8/call write-buffered/disp32 +<span id="L72" class="LineNr">72 </span> <span class="subxS2Comment"># . . discard args</span> +<span id="L73" class="LineNr">73 </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="L74" class="LineNr">74 </span> <span class="subxS1Comment"># . flush(out)</span> +<span id="L75" class="LineNr">75 </span> <span class="subxS2Comment"># . . push args</span> +<span id="L76" class="LineNr">76 </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="L77" class="LineNr">77 </span> <span class="subxS2Comment"># . . call</span> +<span id="L78" class="LineNr">78 </span> e8/call flush/disp32 +<span id="L79" class="LineNr">79 </span> <span class="subxS2Comment"># . . discard args</span> +<span id="L80" class="LineNr">80 </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> 4/imm32 <span class="subxComment"># add to ESP</span> +<span id="L81" class="LineNr">81 </span> <span class="subxComment"># stop(ed, 1)</span> +<span id="L82" class="LineNr">82 </span> <span class="subxS2Comment"># . . push args</span> +<span id="L83" class="LineNr">83 </span> 68/push 1/imm32 +<span id="L84" class="LineNr">84 </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="L85" class="LineNr">85 </span> <span class="subxS2Comment"># . . call</span> +<span id="L86" class="LineNr">86 </span> e8/call stop/disp32 +<span id="L87" class="LineNr">87 </span> <span class="subxComment"># should never get past this point</span> +<span id="L88" class="LineNr">88 </span><span class="Constant">$error-byte:dead-end</span>: +<span id="L89" class="LineNr">89 </span> <span class="subxS1Comment"># . epilog</span> +<span id="L90" class="LineNr">90 </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="L91" class="LineNr">91 </span> 5d/pop-to-EBP +<span id="L92" class="LineNr">92 </span> c3/return +<span id="L93" class="LineNr">93 </span> +<span id="L94" class="LineNr">94 </span><span class="subxS2Comment"># . . vim:nowrap:textwidth=0</span> +</pre> +</body> +</html> +<!-- vim: set foldmethod=manual : --> diff --git a/subx/065error-byte.subx b/subx/065error-byte.subx new file mode 100644 index 00000000..82cfd21e --- /dev/null +++ b/subx/065error-byte.subx @@ -0,0 +1,94 @@ +# Print an error message followed by the text representation of a byte. Then exit. + +== code +# instruction effective address register displacement immediate +# . 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: + # manual test +#? # . var ed/EAX : exit-descriptor +#? 81 5/subop/subtract 3/mod/direct 4/rm32/ESP . . . . . 8/imm32 # subtract from ESP +#? 8d/copy-address 0/mod/indirect 4/rm32/sib 4/base/ESP 4/index/none . 0/r32/EAX . . # copy ESP to EAX +#? # . configure ed to really exit() +#? # . . ed->target = 0 +#? c7/copy 0/mod/direct 0/rm32/EAX . . . . . 0/imm32 # copy to *EAX +#? # . error-byte(ed, Stdout, msg, 34) +#? 68/push 0x34/imm32 +#? 68/push "abc"/imm32 +#? 68/push Stdout/imm32 +#? 50/push-EAX +#? e8/call error-byte/disp32 + # automatic test + 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+": "+byte) then stop(ed, 1) +error-byte: # ed : (address exit-descriptor), out : (address buffered-file), msg : (address array byte), n : byte -> <void> + # . prolog + 55/push-EBP + 89/copy 3/mod/direct 5/rm32/EBP . . . 4/r32/ESP . . # copy ESP to EBP + # write-buffered(out, "Error: ") + # . . push args + 68/push "Error: "/imm32 + ff 6/subop/push 1/mod/*+disp8 4/rm32/sib 5/base/EBP 4/index/none . . 0xc/disp8 . # push *(EBP+12) + # . . call + e8/call write-buffered/disp32 + # . . discard args + 81 0/subop/add 3/mod/direct 4/rm32/ESP . . . . . 8/imm32 # add to ESP + # write-buffered(out, msg) + # . . push args + ff 6/subop/push 1/mod/*+disp8 4/rm32/sib 5/base/EBP 4/index/none . . 0x10/disp8 . # push *(EBP+16) + ff 6/subop/push 1/mod/*+disp8 4/rm32/sib 5/base/EBP 4/index/none . . 0xc/disp8 . # push *(EBP+12) + # . . call + e8/call write-buffered/disp32 + # . . discard args + 81 0/subop/add 3/mod/direct 4/rm32/ESP . . . . . 8/imm32 # add to ESP + # write-buffered(out, ": ") + # . . push args + 68/push ": "/imm32 + ff 6/subop/push 1/mod/*+disp8 4/rm32/sib 5/base/EBP 4/index/none . . 0xc/disp8 . # push *(EBP+12) + # . . call + e8/call write-buffered/disp32 + # . . discard args + 81 0/subop/add 3/mod/direct 4/rm32/ESP . . . . . 8/imm32 # add to ESP + # print-byte(out, byte) + # . . push args + ff 6/subop/push 1/mod/*+disp8 4/rm32/sib 5/base/EBP 4/index/none . . 0x14/disp8 . # push *(EBP+20) + ff 6/subop/push 1/mod/*+disp8 4/rm32/sib 5/base/EBP 4/index/none . . 0xc/disp8 . # push *(EBP+12) + # . . call + e8/call print-byte/disp32 + # . . discard args + 81 0/subop/add 3/mod/direct 4/rm32/ESP . . . . . 8/imm32 # add to ESP + # write-buffered(out, Newline) + # . . push args + 68/push Newline/imm32 + ff 6/subop/push 1/mod/*+disp8 4/rm32/sib 5/base/EBP 4/index/none . . 0xc/disp8 . # push *(EBP+12) + # . . call + e8/call write-buffered/disp32 + # . . discard args + 81 0/subop/add 3/mod/direct 4/rm32/ESP . . . . . 8/imm32 # add to ESP + # . flush(out) + # . . push args + ff 6/subop/push 1/mod/*+disp8 4/rm32/sib 5/base/EBP 4/index/none . . 0xc/disp8 . # push *(EBP+12) + # . . call + e8/call flush/disp32 + # . . discard args + 81 0/subop/add 3/mod/direct 4/rm32/ESP . . . . . 4/imm32 # add to ESP + # stop(ed, 1) + # . . push args + 68/push 1/imm32 + ff 6/subop/push 1/mod/*+disp8 4/rm32/sib 5/base/EBP 4/index/none . . 8/disp8 . # push *(EBP+8) + # . . call + e8/call stop/disp32 + # should never get past this point +$error-byte:dead-end: + # . epilog + 89/copy 3/mod/direct 4/rm32/ESP . . . 5/r32/EBP . . # copy EBP to ESP + 5d/pop-to-EBP + c3/return + +# . . vim:nowrap:textwidth=0 diff --git a/subx/apps/crenshaw2-1 b/subx/apps/crenshaw2-1 index fbe0c10a..45f0e34c 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 fecd6c39..f3afe6f2 100755 --- a/subx/apps/crenshaw2-1b +++ b/subx/apps/crenshaw2-1b Binary files differdiff --git a/subx/apps/factorial b/subx/apps/factorial index 83dab085..befd01b6 100755 --- a/subx/apps/factorial +++ b/subx/apps/factorial Binary files differ |