about summary refs log tree commit diff stats
diff options
context:
space:
mode:
-rw-r--r--html/linux/advent2017/1a.mu.html173
-rw-r--r--linux/advent2017/1a.mu1
-rwxr-xr-xtools/update_html2
3 files changed, 103 insertions, 73 deletions
diff --git a/html/linux/advent2017/1a.mu.html b/html/linux/advent2017/1a.mu.html
index f3579b5d..3b9e8592 100644
--- a/html/linux/advent2017/1a.mu.html
+++ b/html/linux/advent2017/1a.mu.html
@@ -2,20 +2,22 @@
 <html>
 <head>
 <meta http-equiv="content-type" content="text/html; charset=UTF-8">
-<title>~/play/mu/linux/advent2017/1a.mu.html</title>
+<title>Mu - linux/advent2017/1a.mu</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="use_css,pre_wrap,no_foldcolumn,expand_tabs,prevent_copy=">
+<meta name="settings" content="number_lines,use_css,pre_wrap,no_foldcolumn,expand_tabs,line_ids,prevent_copy=">
 <meta name="colorscheme" content="minimal-dark">
 <style type="text/css">
 <!--
 pre { white-space: pre-wrap; font-family: monospace; color: #000000; background-color: #a8a8a8; }
-body { font-family: monospace; color: #000000; background-color: #a8a8a8; }
-* { font-size: 1em; }
+body { font-size:12pt; font-family: monospace; color: #000000; background-color: #a8a8a8; }
+a { color:inherit; }
+* { font-size:12pt; font-size: 1em; }
 .PreProc { color: #c000c0; }
 .muRegEax { color: #875f00; }
-.muComment { color: #005faf; }
+.Special { color: #ff6060; }
+.LineNr { }
 .Constant { color: #008787; }
 .muRegEdx { color: #878700; }
 .muRegEbx { color: #8787af; }
@@ -23,78 +25,107 @@ body { font-family: monospace; color: #000000; background-color: #a8a8a8; }
 .muRegEdi { color: #87ffd7; }
 .Delimiter { color: #c000c0; }
 .muFunction { color: #af5f00; text-decoration: underline; }
-.Special { color: #ff6060; }
+.muComment { color: #005faf; }
 -->
 </style>
-</head>
-<body>
-<pre id='vimCodeElement'>
-<span class="muComment"># Advent of code 2017, problem 1a</span>
-<span class="muComment">#   <a href="https://adventofcode.com/2017/day/1">https://adventofcode.com/2017/day/1</a></span>
-<span class="muComment">#</span>
-<span class="muComment"># Mu solution by Sumeet Agarwal and Kartik Agaram</span>
-<span class="muComment">#   <a href="https://github.com/akkartik/mu/blob/main/linux/advent2017/1a.mu">https://github.com/akkartik/mu/blob/main/linux/advent2017/1a.mu</a></span>
-<span class="muComment">#   <a href="https://archive.org/details/2021-06-02-akkartik-sumeet">https://archive.org/details/2021-06-02-akkartik-sumeet</a></span>
-<span class="muComment">#</span>
-<span class="muComment"># To build on Linux:</span>
-<span class="muComment">#   $ git clone <a href="https://github.com/akkartik/mu">https://github.com/akkartik/mu</a></span>
-<span class="muComment">#   $ cd mu/linux</span>
-<span class="muComment">#   $ ./translate advent2017/1a.mu            # emits a.elf</span>
-<span class="muComment"># To run on Linux:</span>
-<span class="muComment">#   Download <a href="https://adventofcode.com/2017/day/1/input">https://adventofcode.com/2017/day/1/input</a></span>
-<span class="muComment">#   $ ./a.elf &lt; input</span>
-<span class="muComment"># Type in the number returned at <a href="https://adventofcode.com/2017/day/1">https://adventofcode.com/2017/day/1</a></span>
-
-<span class="PreProc">fn</span> <span class="muFunction">main</span><span class="PreProc"> -&gt; </span>_/<span class="muRegEbx">ebx</span>: int <span class="Delimiter">{</span>
-  <span class="PreProc">var</span> input_stream: (stream byte <span class="Constant">0x8000</span>)
-  <span class="PreProc">var</span> input_stream_addr/<span class="muRegEsi">esi</span>: (addr stream byte) <span class="Special">&lt;-</span> address input_stream
-
-  <span class="PreProc">var</span> sum/<span class="muRegEdi">edi</span>: int <span class="Special">&lt;-</span> copy <span class="Constant">0</span>
-  read-line-from-real-keyboard input_stream_addr
-
-  <span class="PreProc">var</span> temp/<span class="muRegEax">eax</span>: int <span class="Special">&lt;-</span> read_digit input_stream_addr
-  <span class="PreProc">var</span> first_digit/<span class="muRegEbx">ebx</span>: int <span class="Special">&lt;-</span> copy temp
-  <span class="PreProc">var</span> this_digit/<span class="muRegEdx">edx</span>: int <span class="Special">&lt;-</span> copy temp
 
-  <span class="Delimiter">{</span>
-    <span class="PreProc">var</span> done?/<span class="muRegEax">eax</span>: boolean <span class="Special">&lt;-</span> stream-empty? input_stream_addr
-    compare done?, <span class="Constant">1</span>
-    <span class="PreProc">break-if-=</span>
-
-    <span class="PreProc">var</span> next_digit/<span class="muRegEax">eax</span>: int <span class="Special">&lt;-</span> read_digit input_stream_addr
-    <span class="muComment"># hacky newline check</span>
-    compare next_digit, <span class="Constant">0</span>
-    <span class="PreProc">break-if-&lt;</span>
-
-    <span class="Delimiter">{</span>
-      compare this_digit, next_digit
-      <span class="PreProc">break-if-!=</span>
-      sum <span class="Special">&lt;-</span> add this_digit
-    <span class="Delimiter">}</span>
-
-    this_digit <span class="Special">&lt;-</span> copy next_digit
-
-    <span class="PreProc">loop</span>
-  <span class="Delimiter">}</span>
-
-  <span class="muComment"># the last iteration will need to compare the last number to the first</span>
-  <span class="Delimiter">{</span>
-    compare this_digit, first_digit
-    <span class="PreProc">break-if-!=</span>
-    sum <span class="Special">&lt;-</span> add this_digit
-  <span class="Delimiter">}</span>
+<script type='text/javascript'>
+<!--
 
-  print-int32-decimal <span class="Constant">0</span>, sum
+/* 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 '#' */
 
-  <span class="PreProc">return</span> <span class="Constant">0</span>/ok
-<span class="Delimiter">}</span>
+  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;
+}
 
-<span class="PreProc">fn</span> <span class="muFunction">read_digit</span> input_stream_addr: (addr stream byte)<span class="PreProc"> -&gt; </span>_/<span class="muRegEax">eax</span>: int <span class="Delimiter">{</span>
-  <span class="PreProc">var</span> next_digit/<span class="muRegEax">eax</span>: byte <span class="Special">&lt;-</span> read-byte input_stream_addr
-  next_digit <span class="Special">&lt;-</span> subtract <span class="Constant">0x30</span>
-  <span class="PreProc">var</span> next_digit/<span class="muRegEax">eax</span>: int <span class="Special">&lt;-</span> copy next_digit
-  <span class="PreProc">return</span> next_digit
-<span class="Delimiter">}</span>
+-->
+</script>
+</head>
+<body onload='JumpToLine();'>
+<a href='https://github.com/akkartik/mu/blob/main/linux/advent2017/1a.mu'>https://github.com/akkartik/mu/blob/main/linux/advent2017/1a.mu</a>
+<pre id='vimCodeElement'>
+<span id="L1" class="LineNr"> 1 </span><span class="muComment"># Advent of code 2017, problem 1a</span>
+<span id="L2" class="LineNr"> 2 </span><span class="muComment">#   <a href="https://adventofcode.com/2017/day/1">https://adventofcode.com/2017/day/1</a></span>
+<span id="L3" class="LineNr"> 3 </span><span class="muComment">#</span>
+<span id="L4" class="LineNr"> 4 </span><span class="muComment"># Mu solution by Sumeet Agarwal and Kartik Agaram</span>
+<span id="L5" class="LineNr"> 5 </span><span class="muComment">#   <a href="https://archive.org/details/2021-06-02-akkartik-sumeet">https://archive.org/details/2021-06-02-akkartik-sumeet</a></span>
+<span id="L6" class="LineNr"> 6 </span><span class="muComment">#</span>
+<span id="L7" class="LineNr"> 7 </span><span class="muComment"># To build on Linux:</span>
+<span id="L8" class="LineNr"> 8 </span><span class="muComment">#   $ git clone <a href="https://github.com/akkartik/mu">https://github.com/akkartik/mu</a></span>
+<span id="L9" class="LineNr"> 9 </span><span class="muComment">#   $ cd mu/linux</span>
+<span id="L10" class="LineNr">10 </span><span class="muComment">#   $ ./translate advent2017/1a.mu            # emits a.elf</span>
+<span id="L11" class="LineNr">11 </span><span class="muComment"># To run on Linux:</span>
+<span id="L12" class="LineNr">12 </span><span class="muComment">#   Download <a href="https://adventofcode.com/2017/day/1/input">https://adventofcode.com/2017/day/1/input</a></span>
+<span id="L13" class="LineNr">13 </span><span class="muComment">#   $ ./a.elf &lt; input</span>
+<span id="L14" class="LineNr">14 </span><span class="muComment"># Type in the number returned at <a href="https://adventofcode.com/2017/day/1">https://adventofcode.com/2017/day/1</a></span>
+<span id="L15" class="LineNr">15 </span>
+<span id="L16" class="LineNr">16 </span><span class="PreProc">fn</span> <span class="muFunction"><a href='1a.mu.html#L16'>main</a></span><span class="PreProc"> -&gt; </span>_/<span class="muRegEbx">ebx</span>: int <span class="Delimiter">{</span>
+<span id="L17" class="LineNr">17 </span>  <span class="PreProc">var</span> input_stream: (stream byte <span class="Constant">0x8000</span>)
+<span id="L18" class="LineNr">18 </span>  <span class="PreProc">var</span> input_stream_addr/<span class="muRegEsi">esi</span>: (addr stream byte) <span class="Special">&lt;-</span> address input_stream
+<span id="L19" class="LineNr">19 </span>
+<span id="L20" class="LineNr">20 </span>  <span class="PreProc">var</span> sum/<span class="muRegEdi">edi</span>: int <span class="Special">&lt;-</span> copy <span class="Constant">0</span>
+<span id="L21" class="LineNr">21 </span>  <a href='../305keyboard.subx.html#L158'>read-line-from-real-keyboard</a> input_stream_addr
+<span id="L22" class="LineNr">22 </span>
+<span id="L23" class="LineNr">23 </span>  <span class="PreProc">var</span> temp/<span class="muRegEax">eax</span>: int <span class="Special">&lt;-</span> <a href='1a.mu.html#L60'>read_digit</a> input_stream_addr
+<span id="L24" class="LineNr">24 </span>  <span class="PreProc">var</span> first_digit/<span class="muRegEbx">ebx</span>: int <span class="Special">&lt;-</span> copy temp
+<span id="L25" class="LineNr">25 </span>  <span class="PreProc">var</span> this_digit/<span class="muRegEdx">edx</span>: int <span class="Special">&lt;-</span> copy temp
+<span id="L26" class="LineNr">26 </span>
+<span id="L27" class="LineNr">27 </span>  <span class="Delimiter">{</span>
+<span id="L28" class="LineNr">28 </span>    <span class="PreProc">var</span> done?/<span class="muRegEax">eax</span>: boolean <span class="Special">&lt;-</span> <a href='../309stream.subx.html#L6'>stream-empty?</a> input_stream_addr
+<span id="L29" class="LineNr">29 </span>    compare done?, <span class="Constant">1</span>
+<span id="L30" class="LineNr">30 </span>    <span class="PreProc">break-if-=</span>
+<span id="L31" class="LineNr">31 </span>
+<span id="L32" class="LineNr">32 </span>    <span class="PreProc">var</span> next_digit/<span class="muRegEax">eax</span>: int <span class="Special">&lt;-</span> <a href='1a.mu.html#L60'>read_digit</a> input_stream_addr
+<span id="L33" class="LineNr">33 </span>    <span class="muComment"># hacky newline check</span>
+<span id="L34" class="LineNr">34 </span>    compare next_digit, <span class="Constant">0</span>
+<span id="L35" class="LineNr">35 </span>    <span class="PreProc">break-if-&lt;</span>
+<span id="L36" class="LineNr">36 </span>
+<span id="L37" class="LineNr">37 </span>    <span class="Delimiter">{</span>
+<span id="L38" class="LineNr">38 </span>      compare this_digit, next_digit
+<span id="L39" class="LineNr">39 </span>      <span class="PreProc">break-if-!=</span>
+<span id="L40" class="LineNr">40 </span>      sum <span class="Special">&lt;-</span> add this_digit
+<span id="L41" class="LineNr">41 </span>    <span class="Delimiter">}</span>
+<span id="L42" class="LineNr">42 </span>
+<span id="L43" class="LineNr">43 </span>    this_digit <span class="Special">&lt;-</span> copy next_digit
+<span id="L44" class="LineNr">44 </span>
+<span id="L45" class="LineNr">45 </span>    <span class="PreProc">loop</span>
+<span id="L46" class="LineNr">46 </span>  <span class="Delimiter">}</span>
+<span id="L47" class="LineNr">47 </span>
+<span id="L48" class="LineNr">48 </span>  <span class="muComment"># the last iteration will need to compare the last number to the first</span>
+<span id="L49" class="LineNr">49 </span>  <span class="Delimiter">{</span>
+<span id="L50" class="LineNr">50 </span>    compare this_digit, first_digit
+<span id="L51" class="LineNr">51 </span>    <span class="PreProc">break-if-!=</span>
+<span id="L52" class="LineNr">52 </span>    sum <span class="Special">&lt;-</span> add this_digit
+<span id="L53" class="LineNr">53 </span>  <span class="Delimiter">}</span>
+<span id="L54" class="LineNr">54 </span>
+<span id="L55" class="LineNr">55 </span>  <a href='../405screen.mu.html#L484'>print-int32-decimal</a> <span class="Constant">0</span>, sum
+<span id="L56" class="LineNr">56 </span>
+<span id="L57" class="LineNr">57 </span>  <span class="PreProc">return</span> <span class="Constant">0</span>/ok
+<span id="L58" class="LineNr">58 </span><span class="Delimiter">}</span>
+<span id="L59" class="LineNr">59 </span>
+<span id="L60" class="LineNr">60 </span><span class="PreProc">fn</span> <span class="muFunction"><a href='1a.mu.html#L60'>read_digit</a></span> input_stream_addr: (addr stream byte)<span class="PreProc"> -&gt; </span>_/<span class="muRegEax">eax</span>: int <span class="Delimiter">{</span>
+<span id="L61" class="LineNr">61 </span>  <span class="PreProc">var</span> next_digit/<span class="muRegEax">eax</span>: byte <span class="Special">&lt;-</span> <a href='../112read-byte.subx.html#L273'>read-byte</a> input_stream_addr
+<span id="L62" class="LineNr">62 </span>  next_digit <span class="Special">&lt;-</span> subtract <span class="Constant">0x30</span>
+<span id="L63" class="LineNr">63 </span>  <span class="PreProc">var</span> next_digit/<span class="muRegEax">eax</span>: int <span class="Special">&lt;-</span> copy next_digit
+<span id="L64" class="LineNr">64 </span>  <span class="PreProc">return</span> next_digit
+<span id="L65" class="LineNr">65 </span><span class="Delimiter">}</span>
 </pre>
 </body>
 </html>
diff --git a/linux/advent2017/1a.mu b/linux/advent2017/1a.mu
index 4ce92c9d..2f639080 100644
--- a/linux/advent2017/1a.mu
+++ b/linux/advent2017/1a.mu
@@ -2,7 +2,6 @@
 #   https://adventofcode.com/2017/day/1
 #
 # Mu solution by Sumeet Agarwal and Kartik Agaram
-#   https://github.com/akkartik/mu/blob/main/linux/advent2017/1a.mu
 #   https://archive.org/details/2021-06-02-akkartik-sumeet
 #
 # To build on Linux:
diff --git a/tools/update_html b/tools/update_html
index c395f675..6fadd0e9 100755
--- a/tools/update_html
+++ b/tools/update_html
@@ -78,7 +78,7 @@ do
   process $f
 done
 
-for f in linux/advent2020/*.mu
+for f in linux/advent2020/*.mu linux/advent2017/*.mu
 do
   ( cd $(dirname $f)
     ctags -x ../[0-9]*.subx ../[0-9]*.mu $(basename $f) > /tmp/tags