about summary refs log tree commit diff stats
diff options
context:
space:
mode:
-rw-r--r--apps/calls.subx4
-rw-r--r--apps/mulisp.subx18
-rw-r--r--html/apps/calls.subx.html4
-rw-r--r--html/apps/mulisp.subx.html195
4 files changed, 206 insertions, 15 deletions
diff --git a/apps/calls.subx b/apps/calls.subx
index 89b67cf6..a7e3bd57 100644
--- a/apps/calls.subx
+++ b/apps/calls.subx
@@ -248,8 +248,8 @@ parse-line:  # line : (address stream byte), words : (address stream slice)
     # . save registers
     51/push-ecx
     # var word-slice/ecx : (address slice) = {0, 0}
-    68/push 0/imm32
-    68/push 0/imm32
+    68/push 0/imm32/end
+    68/push 0/imm32/start
     89/<- %ecx 4/r32/esp
 $parse-line:loop:
     # word-slice = next-word-string-or-expression-without-metadata(line)
diff --git a/apps/mulisp.subx b/apps/mulisp.subx
index 015bd181..92803e97 100644
--- a/apps/mulisp.subx
+++ b/apps/mulisp.subx
@@ -7,10 +7,6 @@
 #   => 42
 #   ^D
 #   $
-#
-# Or, for emulated mode (veeery slow):
-#   $ cat 0*.subx apps/mulisp.subx  |  ./subx run apps/desugar > a.desugar
-#   $ ./subx translate a.desugar -o a.elf
 
 == code
 
@@ -39,8 +35,8 @@ $main:end:
     b8/copy-to-eax 1/imm32/exit
     cd/syscall 0x80/imm8
 
-# type val = nil | num | char | symbol | pair | array
-#     tag:    0     1     2       3       4       5
+# type cell = nil | num | char | symbol | pair | array | stream
+#     tag:    0     1     2       3       4       5       6
 # numbers start with a digit and are always in hex
 # characters start with a backslash
 # pairs start with '('
@@ -54,12 +50,12 @@ repl:  # in : (address buffered-file), out : (address buffered-file) -> <void>
     # . save registers
     50/push-eax
 $repl:loop:
-    (lisp-read Stdin)  # => eax
+    (lisp-read Stdin)  # => eax : (address cell)
     # if (eax == 0) break
     3d/compare-eax-and 0/imm32
     74/jump-if-equal $repl:end/disp8
     #
-    (lisp-eval %eax)  # => eax
+    (lisp-eval %eax)  # => eax : (address cell)
     (lisp-print Stdout %eax)
     # loop
     eb/jump $repl:loop/disp8
@@ -71,7 +67,7 @@ $repl:end:
     5d/pop-to-ebp
     c3/return
 
-lisp-read:  # in : (address buffered-file) -> eax : (address val)
+lisp-read:  # in : (address buffered-file) -> eax : (address cell)
     # . prolog
     55/push-ebp
     89/<- %ebp 4/r32/esp
@@ -102,7 +98,7 @@ $lisp-read:end:
     5d/pop-to-ebp
     c3/return
 
-lisp-eval:  # in : (address val) -> eax : (address val)
+lisp-eval:  # in : (address cell) -> eax : (address cell)
     # . prolog
     55/push-ebp
     89/<- %ebp 4/r32/esp
@@ -115,7 +111,7 @@ $lisp-eval:end:
     5d/pop-to-ebp
     c3/return
 
-lisp-print:  # out : (address buffered-file), x : (address val)
+lisp-print:  # out : (address buffered-file), x : (address cell)
     # . prolog
     55/push-ebp
     89/<- %ebp 4/r32/esp
diff --git a/html/apps/calls.subx.html b/html/apps/calls.subx.html
index e370fff2..707593ec 100644
--- a/html/apps/calls.subx.html
+++ b/html/apps/calls.subx.html
@@ -309,8 +309,8 @@ if ('onhashchange' in window) {
 <span id="L248" class="LineNr"> 248 </span>    <span class="subxS1Comment"># . save registers</span>
 <span id="L249" class="LineNr"> 249 </span>    51/push-ecx
 <span id="L250" class="LineNr"> 250 </span>    <span class="subxComment"># var word-slice/ecx : (address slice) = {0, 0}</span>
-<span id="L251" class="LineNr"> 251 </span>    68/push 0/imm32
-<span id="L252" class="LineNr"> 252 </span>    68/push 0/imm32
+<span id="L251" class="LineNr"> 251 </span>    68/push 0/imm32/end
+<span id="L252" class="LineNr"> 252 </span>    68/push 0/imm32/start
 <span id="L253" class="LineNr"> 253 </span>    89/&lt;- %ecx 4/r32/esp
 <span id="L254" class="LineNr"> 254 </span><span class="Constant">$parse-line:loop</span>:
 <span id="L255" class="LineNr"> 255 </span>    <span class="subxComment"># word-slice = next-word-string-or-expression-without-metadata(line)</span>
diff --git a/html/apps/mulisp.subx.html b/html/apps/mulisp.subx.html
new file mode 100644
index 00000000..e3c08251
--- /dev/null
+++ b/html/apps/mulisp.subx.html
@@ -0,0 +1,195 @@
+<!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 - apps/mulisp.subx</title>
+<meta name="Generator" content="Vim/8.1">
+<meta name="plugin-version" content="vim8.1_v1">
+<meta name="syntax" content="none">
+<meta name="settings" content="number_lines,use_css,pre_wrap,no_foldcolumn,expand_tabs,line_ids,prevent_copy=">
+<meta name="colorscheme" content="minimal-light">
+<style type="text/css">
+<!--
+pre { white-space: pre-wrap; font-family: monospace; color: #000000; background-color: #c6c6c6; }
+body { font-size:12pt; font-family: monospace; color: #000000; background-color: #c6c6c6; }
+a { color:inherit; }
+* { font-size:12pt; font-size: 1em; }
+.subxComment { color: #005faf; }
+.subxFunction { color: #af5f00; text-decoration: underline; }
+.LineNr { }
+.subxS1Comment { color: #0000af; }
+.SpecialChar { color: #d70000; }
+.Constant { color: #008787; }
+-->
+</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;
+  }
+  var 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/apps/mulisp.subx'>https://github.com/akkartik/mu/blob/master/apps/mulisp.subx</a>
+<pre id='vimCodeElement'>
+<span id="L1" class="LineNr">  1 </span><span class="subxComment"># Toy lisp interpreter</span>
+<span id="L2" class="LineNr">  2 </span><span class="subxComment">#</span>
+<span id="L3" class="LineNr">  3 </span><span class="subxComment"># To run:</span>
+<span id="L4" class="LineNr">  4 </span><span class="subxComment">#   $ ./ntranslate 0*.subx apps/subx-common.subx apps/mulisp.subx</span>
+<span id="L5" class="LineNr">  5 </span><span class="subxComment">#   $ ./a.elf</span>
+<span id="L6" class="LineNr">  6 </span><span class="subxComment">#   42</span>
+<span id="L7" class="LineNr">  7 </span><span class="subxComment">#   =&gt; 42</span>
+<span id="L8" class="LineNr">  8 </span><span class="subxComment">#   ^D</span>
+<span id="L9" class="LineNr">  9 </span><span class="subxComment">#   $</span>
+<span id="L10" class="LineNr"> 10 </span>
+<span id="L11" class="LineNr"> 11 </span>== code
+<span id="L12" class="LineNr"> 12 </span>
+<span id="L13" class="LineNr"> 13 </span><span class="SpecialChar">Entry</span>:  <span class="subxComment"># run tests if necessary, a REPL if not</span>
+<span id="L14" class="LineNr"> 14 </span>    <span class="subxS1Comment"># . prolog</span>
+<span id="L15" class="LineNr"> 15 </span>    89/&lt;- %ebp 4/r32/esp
+<span id="L16" class="LineNr"> 16 </span>    <span class="subxComment"># initialize heap</span>
+<span id="L17" class="LineNr"> 17 </span>    (new-segment <span class="SpecialChar">Heap-size</span> <span class="SpecialChar"><a href='../075array-equal.subx.html#L623'>Heap</a></span>)
+<span id="L18" class="LineNr"> 18 </span>    <span class="subxComment"># if (argc &lt;= 1) goto run-main</span>
+<span id="L19" class="LineNr"> 19 </span>    81 7/subop/compare *ebp 1/imm32
+<span id="L20" class="LineNr"> 20 </span>    7e/jump-if-lesser-or-equal $run-main/disp8
+<span id="L21" class="LineNr"> 21 </span>    <span class="subxComment"># if (argv[1] != &quot;test&quot;)) goto run-main</span>
+<span id="L22" class="LineNr"> 22 </span>    (kernel-string-equal? *(ebp+8) <span class="Constant">&quot;test&quot;</span>)  <span class="subxComment"># =&gt; eax</span>
+<span id="L23" class="LineNr"> 23 </span>    3d/compare-eax-and 0/imm32
+<span id="L24" class="LineNr"> 24 </span>    74/jump-if-equal $run-main/disp8
+<span id="L25" class="LineNr"> 25 </span>    <span class="subxComment">#</span>
+<span id="L26" class="LineNr"> 26 </span>    (run-tests)
+<span id="L27" class="LineNr"> 27 </span>    <span class="subxComment"># syscall(exit, *Num-test-failures)</span>
+<span id="L28" class="LineNr"> 28 </span>    8b/-&gt; *<span class="SpecialChar"><a href='../051test.subx.html#L90'>Num-test-failures</a></span> 3/r32/ebx
+<span id="L29" class="LineNr"> 29 </span>    eb/jump $main:end/disp8
+<span id="L30" class="LineNr"> 30 </span><span class="Constant">$run-main</span>:
+<span id="L31" class="LineNr"> 31 </span>    (repl <span class="SpecialChar"><a href='../061read-byte.subx.html#L14'>Stdin</a></span> <span class="SpecialChar"><a href='../064write-byte.subx.html#L10'>Stdout</a></span>)
+<span id="L32" class="LineNr"> 32 </span>    <span class="subxComment"># syscall(exit, 0)</span>
+<span id="L33" class="LineNr"> 33 </span>    bb/copy-to-ebx 0/imm32
+<span id="L34" class="LineNr"> 34 </span><span class="Constant">$main:end</span>:
+<span id="L35" class="LineNr"> 35 </span>    b8/copy-to-eax 1/imm32/exit
+<span id="L36" class="LineNr"> 36 </span>    cd/syscall 0x80/imm8
+<span id="L37" class="LineNr"> 37 </span>
+<span id="L38" class="LineNr"> 38 </span><span class="subxComment"># type cell = nil | num | char | symbol | pair | array | stream</span>
+<span id="L39" class="LineNr"> 39 </span><span class="subxComment">#     tag:    0     1     2       3       4       5       6</span>
+<span id="L40" class="LineNr"> 40 </span><span class="subxComment"># numbers start with a digit and are always in hex</span>
+<span id="L41" class="LineNr"> 41 </span><span class="subxComment"># characters start with a backslash</span>
+<span id="L42" class="LineNr"> 42 </span><span class="subxComment"># pairs start with '('</span>
+<span id="L43" class="LineNr"> 43 </span><span class="subxComment"># arrays start with '['</span>
+<span id="L44" class="LineNr"> 44 </span><span class="subxComment"># symbols start with anything else but quote, backquote, unquote or splice</span>
+<span id="L45" class="LineNr"> 45 </span>
+<span id="L46" class="LineNr"> 46 </span><span class="subxFunction">repl</span>:  <span class="subxComment"># in : (address buffered-file), out : (address buffered-file) -&gt; &lt;void&gt;</span>
+<span id="L47" class="LineNr"> 47 </span>    <span class="subxS1Comment"># . prolog</span>
+<span id="L48" class="LineNr"> 48 </span>    55/push-ebp
+<span id="L49" class="LineNr"> 49 </span>    89/&lt;- %ebp 4/r32/esp
+<span id="L50" class="LineNr"> 50 </span>    <span class="subxS1Comment"># . save registers</span>
+<span id="L51" class="LineNr"> 51 </span>    50/push-eax
+<span id="L52" class="LineNr"> 52 </span><span class="Constant">$repl:loop</span>:
+<span id="L53" class="LineNr"> 53 </span>    (lisp-read <span class="SpecialChar"><a href='../061read-byte.subx.html#L14'>Stdin</a></span>)  <span class="subxComment"># =&gt; eax : (address cell)</span>
+<span id="L54" class="LineNr"> 54 </span>    <span class="subxComment"># if (eax == 0) break</span>
+<span id="L55" class="LineNr"> 55 </span>    3d/compare-eax-and 0/imm32
+<span id="L56" class="LineNr"> 56 </span>    74/jump-if-equal $repl:end/disp8
+<span id="L57" class="LineNr"> 57 </span>    <span class="subxComment">#</span>
+<span id="L58" class="LineNr"> 58 </span>    (lisp-eval %eax)  <span class="subxComment"># =&gt; eax : (address cell)</span>
+<span id="L59" class="LineNr"> 59 </span>    (lisp-print <span class="SpecialChar"><a href='../064write-byte.subx.html#L10'>Stdout</a></span> %eax)
+<span id="L60" class="LineNr"> 60 </span>    <span class="subxComment"># loop</span>
+<span id="L61" class="LineNr"> 61 </span>    eb/jump $repl:loop/disp8
+<span id="L62" class="LineNr"> 62 </span><span class="Constant">$repl:end</span>:
+<span id="L63" class="LineNr"> 63 </span>    <span class="subxS1Comment"># . restore registers</span>
+<span id="L64" class="LineNr"> 64 </span>    58/pop-to-eax
+<span id="L65" class="LineNr"> 65 </span>    <span class="subxS1Comment"># . epilog</span>
+<span id="L66" class="LineNr"> 66 </span>    89/&lt;- %esp 5/r32/ebp
+<span id="L67" class="LineNr"> 67 </span>    5d/pop-to-ebp
+<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="subxFunction">lisp-read</span>:  <span class="subxComment"># in : (address buffered-file) -&gt; eax : (address cell)</span>
+<span id="L71" class="LineNr"> 71 </span>    <span class="subxS1Comment"># . prolog</span>
+<span id="L72" class="LineNr"> 72 </span>    55/push-ebp
+<span id="L73" class="LineNr"> 73 </span>    89/&lt;- %ebp 4/r32/esp
+<span id="L74" class="LineNr"> 74 </span>    <span class="subxS1Comment"># . save registers</span>
+<span id="L75" class="LineNr"> 75 </span>    <span class="subxComment"># var s/ecx : (address stream) = new-stream(512)</span>
+<span id="L76" class="LineNr"> 76 </span>    81 5/subop/subtract %esp 0x200/imm32
+<span id="L77" class="LineNr"> 77 </span>    68/push 0x200/imm32/size
+<span id="L78" class="LineNr"> 78 </span>    68/push 0/imm32/read
+<span id="L79" class="LineNr"> 79 </span>    68/push 0/imm32/write
+<span id="L80" class="LineNr"> 80 </span>    89/&lt;- %ecx 4/r32/esp
+<span id="L81" class="LineNr"> 81 </span>    <span class="subxComment">#</span>
+<span id="L82" class="LineNr"> 82 </span>    (clear-stream %ecx)
+<span id="L83" class="LineNr"> 83 </span>    (read-line-buffered *(ebp+8) %ecx)
+<span id="L84" class="LineNr"> 84 </span>    <span class="subxComment"># if (s-&gt;write == 0) return null</span>
+<span id="L85" class="LineNr"> 85 </span>    81 7/subop/compare *ecx 0/imm32
+<span id="L86" class="LineNr"> 86 </span>    75/jump-if-not-equal $lisp-read:loop/disp8
+<span id="L87" class="LineNr"> 87 </span>    b8/copy-to-eax 0/imm32/eof
+<span id="L88" class="LineNr"> 88 </span>    eb/jump $lisp-read:end/disp8
+<span id="L89" class="LineNr"> 89 </span><span class="Constant">$lisp-read:loop</span>:
+<span id="L90" class="LineNr"> 90 </span>    <span class="subxComment"># return s</span>
+<span id="L91" class="LineNr"> 91 </span>    89/&lt;- %eax 1/r32/ecx
+<span id="L92" class="LineNr"> 92 </span><span class="Constant">$lisp-read:end</span>:
+<span id="L93" class="LineNr"> 93 </span>    <span class="subxS1Comment"># . reclaim locals</span>
+<span id="L94" class="LineNr"> 94 </span>    81 0/subop/add %esp 0x20c/imm32
+<span id="L95" class="LineNr"> 95 </span>    <span class="subxS1Comment"># . restore registers</span>
+<span id="L96" class="LineNr"> 96 </span>    <span class="subxS1Comment"># . epilog</span>
+<span id="L97" class="LineNr"> 97 </span>    89/&lt;- %esp 5/r32/ebp
+<span id="L98" class="LineNr"> 98 </span>    5d/pop-to-ebp
+<span id="L99" class="LineNr"> 99 </span>    c3/return
+<span id="L100" class="LineNr">100 </span>
+<span id="L101" class="LineNr">101 </span><span class="subxFunction">lisp-eval</span>:  <span class="subxComment"># in : (address cell) -&gt; eax : (address cell)</span>
+<span id="L102" class="LineNr">102 </span>    <span class="subxS1Comment"># . prolog</span>
+<span id="L103" class="LineNr">103 </span>    55/push-ebp
+<span id="L104" class="LineNr">104 </span>    89/&lt;- %ebp 4/r32/esp
+<span id="L105" class="LineNr">105 </span>    <span class="subxS1Comment"># . save registers</span>
+<span id="L106" class="LineNr">106 </span>    8b/-&gt; *(ebp+8) 0/r32/eax
+<span id="L107" class="LineNr">107 </span><span class="Constant">$lisp-eval:end</span>:
+<span id="L108" class="LineNr">108 </span>    <span class="subxS1Comment"># . restore registers</span>
+<span id="L109" class="LineNr">109 </span>    <span class="subxS1Comment"># . epilog</span>
+<span id="L110" class="LineNr">110 </span>    89/&lt;- %esp 5/r32/ebp
+<span id="L111" class="LineNr">111 </span>    5d/pop-to-ebp
+<span id="L112" class="LineNr">112 </span>    c3/return
+<span id="L113" class="LineNr">113 </span>
+<span id="L114" class="LineNr">114 </span><span class="subxFunction">lisp-print</span>:  <span class="subxComment"># out : (address buffered-file), x : (address cell)</span>
+<span id="L115" class="LineNr">115 </span>    <span class="subxS1Comment"># . prolog</span>
+<span id="L116" class="LineNr">116 </span>    55/push-ebp
+<span id="L117" class="LineNr">117 </span>    89/&lt;- %ebp 4/r32/esp
+<span id="L118" class="LineNr">118 </span>    <span class="subxS1Comment"># . save registers</span>
+<span id="L119" class="LineNr">119 </span>    <span class="subxComment"># write(x)</span>
+<span id="L120" class="LineNr">120 </span>    (write-buffered <span class="SpecialChar"><a href='../064write-byte.subx.html#L10'>Stdout</a></span> <span class="Constant">&quot;=&gt; &quot;</span>)
+<span id="L121" class="LineNr">121 </span>    (write-stream-data <span class="SpecialChar"><a href='../064write-byte.subx.html#L10'>Stdout</a></span> *(ebp+0xc))
+<span id="L122" class="LineNr">122 </span>    (flush <span class="SpecialChar"><a href='../064write-byte.subx.html#L10'>Stdout</a></span>)
+<span id="L123" class="LineNr">123 </span><span class="Constant">$lisp-print:end</span>:
+<span id="L124" class="LineNr">124 </span>    <span class="subxS1Comment"># . restore registers</span>
+<span id="L125" class="LineNr">125 </span>    <span class="subxS1Comment"># . epilog</span>
+<span id="L126" class="LineNr">126 </span>    89/&lt;- %esp 5/r32/ebp
+<span id="L127" class="LineNr">127 </span>    5d/pop-to-ebp
+<span id="L128" class="LineNr">128 </span>    c3/return
+<span id="L129" class="LineNr">129 </span>
+<span id="L130" class="LineNr">130 </span>== data
+<span id="L131" class="LineNr">131 </span>
+<span id="L132" class="LineNr">132 </span><span class="SpecialChar">Nil</span>:
+<span id="L133" class="LineNr">133 </span>  0/imm32/tag
+<span id="L134" class="LineNr">134 </span>  0/imm32/data
+</pre>
+</body>
+</html>
+<!-- vim: set foldmethod=manual : -->