7468

4 files changed, 59 insertions, 55 deletions

diff --git a/html/baremetal/ex1.hex.html b/html/baremetal/ex1.hex.html
index 92c4ab4e..ff7fef1e 100644
--- a/html/baremetal/ex1.hex.html
+++ b/html/baremetal/ex1.hex.html
@@ -64,7 +64,7 @@ if ('onhashchange' in window) {
 <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="L14" class="LineNr">14 </span><span class="subxComment">#   bochs -f baremetal/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>
diff --git a/html/baremetal/ex2.hex.html b/html/baremetal/ex2.hex.html
index 42eae7b3..1d9e1418 100644
--- a/html/baremetal/ex2.hex.html
+++ b/html/baremetal/ex2.hex.html
@@ -61,35 +61,38 @@ if ('onhashchange' in window) {
 <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>  28 7f 00 00 <span class="subxComment"># disp32 [label]</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; [label]</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 [label]</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="L11" class="LineNr">11 </span><span class="subxComment">#   bochs -f baremetal/boot.bochsrc  # boot.bochsrc loads disk.img</span>
+<span id="L12" class="LineNr">12 </span><span class="subxComment">#</span>
+<span id="L13" class="LineNr">13 </span><span class="subxComment"># Expected output:</span>
+<span id="L14" class="LineNr">14 </span><span class="subxComment">#   html/baremetal.png</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>
+<span id="L18" class="LineNr">18 </span><span class="subxComment"># ecx &lt;- LFB</span>
+<span id="L19" class="LineNr">19 </span>8b  <span class="subxComment"># copy *rm32 to r32</span>
+<span id="L20" class="LineNr">20 </span>  0d  <span class="subxComment"># 00/mod/indirect 001/r32/ecx 101/rm32/use-disp32</span>
+<span id="L21" class="LineNr">21 </span>  28 7f 00 00 <span class="subxComment"># disp32 [label]</span>
+<span id="L22" class="LineNr">22 </span>
+<span id="L23" class="LineNr">23 </span><span class="subxComment"># eax &lt;- LFB + 0xbffff (1024*768 - 1)</span>
+<span id="L24" class="LineNr">24 </span>8d  <span class="subxComment"># copy-address rm32 to r32</span>
+<span id="L25" class="LineNr">25 </span>  81  <span class="subxComment"># 10/mod/*+disp32 000/r32/eax 001/rm32/ecx</span>
+<span id="L26" class="LineNr">26 </span>  ff ff 0b 00  <span class="subxComment"># disp32</span>
+<span id="L27" class="LineNr">27 </span>
+<span id="L28" class="LineNr">28 </span><span class="subxComment"># $loop:</span>
+<span id="L29" class="LineNr">29 </span><span class="subxComment"># if (eax &lt; ecx) break</span>
+<span id="L30" class="LineNr">30 </span>39  <span class="subxComment"># compare rm32 with r32</span>
+<span id="L31" class="LineNr">31 </span>  c8  <span class="subxComment"># 11/mod/direct 001/r32/ecx 000/rm32/eax</span>
+<span id="L32" class="LineNr">32 </span>7c 05  <span class="subxComment"># break if &lt; [label]</span>
+<span id="L33" class="LineNr">33 </span><span class="subxComment"># *eax &lt;- al</span>
+<span id="L34" class="LineNr">34 </span>88  <span class="subxComment"># copy r8 to m8 at r32</span>
+<span id="L35" class="LineNr">35 </span>  00  <span class="subxComment"># 00/mod/indirect 000/r8/AL 000/rm32/eax</span>
+<span id="L36" class="LineNr">36 </span>48  <span class="subxComment"># decrement eax</span>
+<span id="L37" class="LineNr">37 </span>eb f7  <span class="subxComment"># loop to -9 bytes [label]</span>
 <span id="L38" class="LineNr">38 </span>
-<span id="L39" class="LineNr">39 </span><span class="subxComment"># vim&#0058;ft=subx</span>
+<span id="L39" class="LineNr">39 </span><span class="subxComment"># $break:</span>
+<span id="L40" class="LineNr">40 </span>e9 fb ff ff ff  <span class="subxComment"># hang indefinitely</span>
+<span id="L41" class="LineNr">41 </span>
+<span id="L42" class="LineNr">42 </span><span class="subxComment"># vim&#0058;ft=subx</span>
 </pre>
 </body>
 </html>
diff --git a/html/baremetal/ex2.subx.html b/html/baremetal/ex2.subx.html
index ae4eb8a8..12c06aeb 100644
--- a/html/baremetal/ex2.subx.html
+++ b/html/baremetal/ex2.subx.html
@@ -60,33 +60,34 @@ if ('onhashchange' in window) {
 <span id="L6" class="LineNr"> 6 </span><span class="subxComment">#   qemu-system-i386 disk.img</span>
 <span id="L7" class="LineNr"> 7 </span><span class="subxComment"># Or:</span>
 <span id="L8" class="LineNr"> 8 </span><span class="subxComment">#   bochs -f baremetal/boot.bochsrc  # boot.bochsrc loads disk.img</span>
-<span id="L9" class="LineNr"> 9 </span>
-<span id="L10" class="LineNr">10 </span><span class="subxComment"># main:  (address 0x8800)</span>
-<span id="L11" class="LineNr">11 </span>
-<span id="L12" class="LineNr">12 </span>== code
-<span id="L13" class="LineNr">13 </span>
-<span id="L14" class="LineNr">14 </span><span class="subxComment"># ecx &lt;- start of video memory</span>
-<span id="L15" class="LineNr">15 </span>8b/-&gt; 0/mod/indirect 5/rm32/use-disp32 0x7f28/disp32/video-memory  1/r32/ecx
+<span id="L9" class="LineNr"> 9 </span><span class="subxComment">#</span>
+<span id="L10" class="LineNr">10 </span><span class="subxComment"># Expected output:</span>
+<span id="L11" class="LineNr">11 </span><span class="subxComment">#   html/baremetal.png</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>== code
 <span id="L16" class="LineNr">16 </span>
-<span id="L17" class="LineNr">17 </span><span class="subxComment"># eax &lt;- final pixel of video memory</span>
-<span id="L18" class="LineNr">18 </span>8d/copy-address *(ecx + 0x0bffff) 0/r32/eax  <span class="subxComment"># 0xbffff = 1024*768 - 1</span>
+<span id="L17" class="LineNr">17 </span><span class="subxComment"># ecx &lt;- start of video memory</span>
+<span id="L18" class="LineNr">18 </span>8b/-&gt; *0x7f28 1/r32/ecx
 <span id="L19" class="LineNr">19 </span>
-<span id="L20" class="LineNr">20 </span><span class="subxComment"># for each pixel in video memory</span>
-<span id="L21" class="LineNr">21 </span>{
-<span id="L22" class="LineNr">22 </span>  39/compare %eax 1/r32/ecx
-<span id="L23" class="LineNr">23 </span>  7c/jump-if-&lt; <span class="Constant">break</span>/disp8
-<span id="L24" class="LineNr">24 </span>  <span class="subxComment"># write its column number to it</span>
-<span id="L25" class="LineNr">25 </span>  88/byte&lt;- *eax 0/r32/AL
-<span id="L26" class="LineNr">26 </span>  48/decrement-eax
-<span id="L27" class="LineNr">27 </span>  eb/jump <span class="Constant">loop</span>/disp8
-<span id="L28" class="LineNr">28 </span>}
-<span id="L29" class="LineNr">29 </span>
-<span id="L30" class="LineNr">30 </span><span class="subxComment"># hang indefinitely</span>
-<span id="L31" class="LineNr">31 </span>{
-<span id="L32" class="LineNr">32 </span>  eb/jump <span class="Constant">loop</span>/disp8
-<span id="L33" class="LineNr">33 </span>}
-<span id="L34" class="LineNr">34 </span>
-<span id="L35" class="LineNr">35 </span><span class="subxComment"># vim&#0058;ft=subx</span>
+<span id="L20" class="LineNr">20 </span><span class="subxComment"># eax &lt;- final pixel of video memory</span>
+<span id="L21" class="LineNr">21 </span>8d/copy-address *(ecx + 0x0bffff) 0/r32/eax  <span class="subxComment"># 0xbffff = 1024*768 - 1</span>
+<span id="L22" class="LineNr">22 </span>
+<span id="L23" class="LineNr">23 </span><span class="subxComment"># for each pixel in video memory</span>
+<span id="L24" class="LineNr">24 </span>{
+<span id="L25" class="LineNr">25 </span>  39/compare %eax 1/r32/ecx
+<span id="L26" class="LineNr">26 </span>  7c/jump-if-&lt; <span class="Constant">break</span>/disp8
+<span id="L27" class="LineNr">27 </span>  <span class="subxComment"># write its column number to it</span>
+<span id="L28" class="LineNr">28 </span>  88/byte&lt;- *eax 0/r32/AL
+<span id="L29" class="LineNr">29 </span>  48/decrement-eax
+<span id="L30" class="LineNr">30 </span>  eb/jump <span class="Constant">loop</span>/disp8
+<span id="L31" class="LineNr">31 </span>}
+<span id="L32" class="LineNr">32 </span>
+<span id="L33" class="LineNr">33 </span><span class="subxComment"># hang indefinitely</span>
+<span id="L34" class="LineNr">34 </span>{
+<span id="L35" class="LineNr">35 </span>  eb/jump <span class="Constant">loop</span>/disp8
+<span id="L36" class="LineNr">36 </span>}
 </pre>
 </body>
 </html>
diff --git a/html/baremetal/ex3.hex.html b/html/baremetal/ex3.hex.html
index ccb3422c..24d978d3 100644
--- a/html/baremetal/ex3.hex.html
+++ b/html/baremetal/ex3.hex.html
@@ -61,7 +61,7 @@ if ('onhashchange' in window) {
 <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="L11" class="LineNr">11 </span><span class="subxComment">#   bochs -f baremetal/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>