7426

3 files changed, 154 insertions, 57 deletions

diff --git a/html/baremetal/ex1.hex.html b/html/baremetal/ex1.hex.html
index bdfb696f..5fc1129c 100644
--- a/html/baremetal/ex1.hex.html
+++ b/html/baremetal/ex1.hex.html
@@ -53,22 +53,23 @@ if ('onhashchange' in window) {
 <pre id='vimCodeElement'>
 <span id="L1" class="LineNr"> 1 </span><span class="subxComment"># The simplest possible program: just an infinite loop.</span>
 <span id="L2" class="LineNr"> 2 </span><span class="subxComment"># All is well if your computer clears screen and hangs without restarting.</span>
-<span id="L3" class="LineNr"> 3 </span><span class="subxComment"># On an emulator the window may get bigger to accomodate the 1280x1024 graphics mode.</span>
-<span id="L4" class="LineNr"> 4 </span><span class="subxComment">#</span>
-<span id="L5" class="LineNr"> 5 </span><span class="subxComment"># To convert to a disk image, first prepare a realistically sized disk image:</span>
-<span id="L6" class="LineNr"> 6 </span><span class="subxComment">#   dd if=/dev/zero of=disk.img count=20160  # 512-byte sectors, so 10MB</span>
-<span id="L7" class="LineNr"> 7 </span><span class="subxComment"># Load the disk image:</span>
-<span id="L8" class="LineNr"> 8 </span><span class="subxComment">#   cat baremetal/boot.hex baremetal/ex1.hex  |./bootstrap run apps/hex  &gt; a.bin</span>
-<span id="L9" class="LineNr"> 9 </span><span class="subxComment">#   dd if=a.bin of=disk.img conv=notrunc</span>
-<span id="L10" class="LineNr">10 </span><span class="subxComment"># To run:</span>
-<span id="L11" class="LineNr">11 </span><span class="subxComment">#   qemu-system-i386 disk.img</span>
-<span id="L12" class="LineNr">12 </span><span class="subxComment"># Or:</span>
-<span id="L13" class="LineNr">13 </span><span class="subxComment">#   bochs -f apps/boot.bochsrc  # boot.bochsrc loads disk.img</span>
-<span id="L14" class="LineNr">14 </span>
-<span id="L15" class="LineNr">15 </span><span class="subxComment"># address 0x8000</span>
-<span id="L16" class="LineNr">16 </span>e9 fb ff ff ff  <span class="subxComment"># jump to address 0x8000</span>
-<span id="L17" class="LineNr">17 </span>
-<span id="L18" class="LineNr">18 </span><span class="subxComment"># vim&#0058;ft=subx</span>
+<span id="L3" class="LineNr"> 3 </span><span class="subxComment"># On an emulator the window may get bigger to accomodate the higher-resolution</span>
+<span id="L4" class="LineNr"> 4 </span><span class="subxComment"># graphics mode.</span>
+<span id="L5" class="LineNr"> 5 </span><span class="subxComment">#</span>
+<span id="L6" class="LineNr"> 6 </span><span class="subxComment"># To convert to a disk image, first prepare a realistically sized disk image:</span>
+<span id="L7" class="LineNr"> 7 </span><span class="subxComment">#   dd if=/dev/zero of=disk.img count=20160  # 512-byte sectors, so 10MB</span>
+<span id="L8" class="LineNr"> 8 </span><span class="subxComment"># Load the disk image:</span>
+<span id="L9" class="LineNr"> 9 </span><span class="subxComment">#   cat baremetal/boot.hex baremetal/ex1.hex  |./bootstrap run apps/hex  &gt; a.bin</span>
+<span id="L10" class="LineNr">10 </span><span class="subxComment">#   dd if=a.bin of=disk.img conv=notrunc</span>
+<span id="L11" class="LineNr">11 </span><span class="subxComment"># To run:</span>
+<span id="L12" class="LineNr">12 </span><span class="subxComment">#   qemu-system-i386 disk.img</span>
+<span id="L13" class="LineNr">13 </span><span class="subxComment"># Or:</span>
+<span id="L14" class="LineNr">14 </span><span class="subxComment">#   bochs -f apps/boot.bochsrc  # boot.bochsrc loads disk.img</span>
+<span id="L15" class="LineNr">15 </span>
+<span id="L16" class="LineNr">16 </span><span class="subxComment"># main:  (address 0x8800)</span>
+<span id="L17" class="LineNr">17 </span>e9 fb ff ff ff  <span class="subxComment"># jump to address 0x8800</span>
+<span id="L18" class="LineNr">18 </span>
+<span id="L19" class="LineNr">19 </span><span class="subxComment"># vim&#0058;ft=subx</span>
 </pre>
 </body>
 </html>
diff --git a/html/baremetal/ex2.hex.html b/html/baremetal/ex2.hex.html
new file mode 100644
index 00000000..437dbb0d
--- /dev/null
+++ b/html/baremetal/ex2.hex.html
@@ -0,0 +1,96 @@
+<!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 - baremetal/ex2.hex</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; }
+.LineNr { }
+-->
+</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/baremetal/ex2.hex'>https://github.com/akkartik/mu/blob/master/baremetal/ex2.hex</a>
+<pre id='vimCodeElement'>
+<span id="L1" class="LineNr"> 1 </span><span class="subxComment"># Test out the video mode by filling in the screen with pixels.</span>
+<span id="L2" class="LineNr"> 2 </span><span class="subxComment">#</span>
+<span id="L3" class="LineNr"> 3 </span><span class="subxComment"># To run, first prepare a realistically sized disk image:</span>
+<span id="L4" class="LineNr"> 4 </span><span class="subxComment">#   dd if=/dev/zero of=disk.img count=20160  # 512-byte sectors, so 10MB</span>
+<span id="L5" class="LineNr"> 5 </span><span class="subxComment"># Load the disk image:</span>
+<span id="L6" class="LineNr"> 6 </span><span class="subxComment">#   cat baremetal/boot.hex baremetal/ex2.hex  |./bootstrap run apps/hex  &gt; a.bin</span>
+<span id="L7" class="LineNr"> 7 </span><span class="subxComment">#   dd if=a.bin of=disk.img conv=notrunc</span>
+<span id="L8" class="LineNr"> 8 </span><span class="subxComment"># To run:</span>
+<span id="L9" class="LineNr"> 9 </span><span class="subxComment">#   qemu-system-i386 disk.img</span>
+<span id="L10" class="LineNr">10 </span><span class="subxComment"># Or:</span>
+<span id="L11" class="LineNr">11 </span><span class="subxComment">#   bochs -f apps/boot.bochsrc  # boot.bochsrc loads disk.img</span>
+<span id="L12" class="LineNr">12 </span>
+<span id="L13" class="LineNr">13 </span><span class="subxComment"># main:  (address 0x8800)</span>
+<span id="L14" class="LineNr">14 </span>
+<span id="L15" class="LineNr">15 </span><span class="subxComment"># ecx &lt;- LFB</span>
+<span id="L16" class="LineNr">16 </span>8b  <span class="subxComment"># copy *rm32 to r32</span>
+<span id="L17" class="LineNr">17 </span>  0d  <span class="subxComment"># 00/mod/indirect 001/r32/ecx 101/rm32/use-disp32</span>
+<span id="L18" class="LineNr">18 </span>  68 7d 00 00 <span class="subxComment"># disp32</span>
+<span id="L19" class="LineNr">19 </span>
+<span id="L20" class="LineNr">20 </span><span class="subxComment"># eax &lt;- LFB + 0xbffff (1024*768 - 1)</span>
+<span id="L21" class="LineNr">21 </span>8d  <span class="subxComment"># copy-address rm32 to r32</span>
+<span id="L22" class="LineNr">22 </span>  81  <span class="subxComment"># 10/mod/*+disp32 000/r32/eax 001/rm32/ecx</span>
+<span id="L23" class="LineNr">23 </span>  ff ff 0b 00  <span class="subxComment"># disp32</span>
+<span id="L24" class="LineNr">24 </span>
+<span id="L25" class="LineNr">25 </span><span class="subxComment"># $loop:</span>
+<span id="L26" class="LineNr">26 </span><span class="subxComment"># if (eax &lt; ecx) break</span>
+<span id="L27" class="LineNr">27 </span>39  <span class="subxComment"># compare rm32 with r32</span>
+<span id="L28" class="LineNr">28 </span>  c8  <span class="subxComment"># 11/mod/direct 001/r32/ecx 000/rm32/eax</span>
+<span id="L29" class="LineNr">29 </span>7c 05  <span class="subxComment"># break if &lt;</span>
+<span id="L30" class="LineNr">30 </span><span class="subxComment"># *eax &lt;- al</span>
+<span id="L31" class="LineNr">31 </span>88  <span class="subxComment"># copy r8 to m8 at r32</span>
+<span id="L32" class="LineNr">32 </span>  00  <span class="subxComment"># 00/mod/indirect 000/r8/AL 000/rm32/eax</span>
+<span id="L33" class="LineNr">33 </span>48  <span class="subxComment"># decrement eax</span>
+<span id="L34" class="LineNr">34 </span>eb f7  <span class="subxComment"># loop to -9 bytes</span>
+<span id="L35" class="LineNr">35 </span>
+<span id="L36" class="LineNr">36 </span><span class="subxComment"># $break:</span>
+<span id="L37" class="LineNr">37 </span>e9 fb ff ff ff  <span class="subxComment"># hang indefinitely</span>
+<span id="L38" class="LineNr">38 </span>
+<span id="L39" class="LineNr">39 </span><span class="subxComment"># vim&#0058;ft=subx</span>
+</pre>
+</body>
+</html>
+<!-- vim: set foldmethod=manual : -->
diff --git a/tools/update_html b/tools/update_html
index 8aba9637..321f3c45 100755
--- a/tools/update_html
+++ b/tools/update_html
@@ -39,47 +39,47 @@ convert_html() {
   mv -i $1.html html/`dirname $1`
 }
 
-#? ctags -x *.cc  |grep -v '^. '  > /tmp/tags  # don't hyperlink every 'i' to the integer register variant
-#? for f in *.cc
-#? do
-#?   test $# -gt 0  &&  test $1 != $f  &&  continue
-#?   process $f
-#? done
-#? 
-#? ctags -x [0-9]*.subx [0-9]*.mu  > /tmp/tags
-#? for f in *.subx *.mu
-#? do
-#?   test $# -gt 0  &&  test $1 != $f  &&  continue
-#?   process $f
-#? done
-#? 
-#? for f in apps/*.subx
-#? do
-#?   test $# -gt 0  &&  test $1 != $f  &&  continue
-#?   ( cd apps
-#?     ctags -x ../[0-9]*.subx ../[0-9]*.mu `basename $f` > /tmp/tags
-#?   )
-#?   process $f
-#? done
-#? 
-#? for f in apps/*.mu
-#? do
-#?   test $# -gt 0  &&  test $1 != $f  &&  continue
-#?   ( cd apps
-#?     ctags -x ../[0-9]*.subx ../[0-9]*.mu `basename $f` > /tmp/tags
-#?   )
-#?   process $f
-#? done
-#? 
-#? for f in apps/*/*.mu
-#? do
-#?   test $# -gt 0  &&  test $1 != $f  &&  continue
-#?   echo $f
-#?   ( cd `dirname $f`
-#?     ctags -x ../../[0-9]*.subx ../../[0-9]*.mu *.mu > /tmp/tags
-#?   )
-#?   process $f
-#? done
+ctags -x *.cc  |grep -v '^. '  > /tmp/tags  # don't hyperlink every 'i' to the integer register variant
+for f in *.cc
+do
+  test $# -gt 0  &&  test $1 != $f  &&  continue
+  process $f
+done
+
+ctags -x [0-9]*.subx [0-9]*.mu  > /tmp/tags
+for f in *.subx *.mu
+do
+  test $# -gt 0  &&  test $1 != $f  &&  continue
+  process $f
+done
+
+for f in apps/*.subx
+do
+  test $# -gt 0  &&  test $1 != $f  &&  continue
+  ( cd apps
+    ctags -x ../[0-9]*.subx ../[0-9]*.mu `basename $f` > /tmp/tags
+  )
+  process $f
+done
+
+for f in apps/*.mu
+do
+  test $# -gt 0  &&  test $1 != $f  &&  continue
+  ( cd apps
+    ctags -x ../[0-9]*.subx ../[0-9]*.mu `basename $f` > /tmp/tags
+  )
+  process $f
+done
+
+for f in apps/*/*.mu
+do
+  test $# -gt 0  &&  test $1 != $f  &&  continue
+  echo $f
+  ( cd `dirname $f`
+    ctags -x ../../[0-9]*.subx ../../[0-9]*.mu *.mu > /tmp/tags
+  )
+  process $f
+done
 
 for f in baremetal/*.hex
 do