7549

1 files changed, 46 insertions, 43 deletions

diff --git a/html/baremetal/102keyboard.subx.html b/html/baremetal/102keyboard.subx.html
index 660d74fb..e77a5b10 100644
--- a/html/baremetal/102keyboard.subx.html
+++ b/html/baremetal/102keyboard.subx.html
@@ -56,49 +56,52 @@ if ('onhashchange' in window) {
 <pre id='vimCodeElement'>
 <span id="L1" class="LineNr"> 1 </span><span class="subxComment"># check keyboard for a key</span>
 <span id="L2" class="LineNr"> 2 </span><span class="subxComment"># return 0 on no keypress or unrecognized key</span>
-<span id="L3" class="LineNr"> 3 </span>
-<span id="L4" class="LineNr"> 4 </span>== code
-<span id="L5" class="LineNr"> 5 </span>
-<span id="L6" class="LineNr"> 6 </span><span class="subxFunction">read-key</span>:  <span class="subxComment"># kbd: (addr keyboard) -&gt; result/eax: byte</span>
-<span id="L7" class="LineNr"> 7 </span>    <span class="subxS1Comment"># . prologue</span>
-<span id="L8" class="LineNr"> 8 </span>    55/push-ebp
-<span id="L9" class="LineNr"> 9 </span>    89/&lt;- %ebp 4/r32/esp
-<span id="L10" class="LineNr">10 </span>    <span class="subxS1Comment"># . save registers</span>
-<span id="L11" class="LineNr">11 </span>    51/push-ecx
-<span id="L12" class="LineNr">12 </span>    <span class="subxComment"># result = 0</span>
-<span id="L13" class="LineNr">13 </span>    b8/copy-to-eax 0/imm32
-<span id="L14" class="LineNr">14 </span>    <span class="subxComment"># ecx = keyboard</span>
-<span id="L15" class="LineNr">15 </span>    8b/-&gt; *(ebp+8) 1/r32/ecx
-<span id="L16" class="LineNr">16 </span>    81 7/subop/compare %ecx 0/imm32
-<span id="L17" class="LineNr">17 </span>    {
-<span id="L18" class="LineNr">18 </span>      75/jump-if-!= <span class="Constant">break</span>/disp8
-<span id="L19" class="LineNr">19 </span>      <span class="subxComment"># var read/ecx: byte = keyboard buffer's read index</span>
-<span id="L20" class="LineNr">20 </span>      8b/-&gt; *0x7dcc 1/r32/CL  <span class="subxComment"># keyboard-buffer-read</span>
-<span id="L21" class="LineNr">21 </span>      <span class="subxComment"># var next-key/eax: byte = *(keyboard buffer + ecx)</span>
-<span id="L22" class="LineNr">22 </span>      8a/byte-&gt; *(ecx+0x7dd0) 0/r32/AL  <span class="subxComment"># keyboard-buffer-data</span>
-<span id="L23" class="LineNr">23 </span>      <span class="subxComment"># if (next-key != 0) lock and remove from keyboard-buffer</span>
-<span id="L24" class="LineNr">24 </span>      81 7/subop/compare %eax 0/imm32
-<span id="L25" class="LineNr">25 </span>      {
-<span id="L26" class="LineNr">26 </span>        74/jump-if-= <span class="Constant">break</span>/disp8
-<span id="L27" class="LineNr">27 </span>        <span class="subxComment"># TODO: add some instructions in this block to SubX if we ever want to</span>
-<span id="L28" class="LineNr">28 </span>        <span class="subxComment"># use bootstrap on baremetal programs</span>
-<span id="L29" class="LineNr">29 </span>        fa/disable-interrupts
-<span id="L30" class="LineNr">30 </span>        c6 0/subop/copy-byte *(ecx+0x7dd0) 0/imm8
-<span id="L31" class="LineNr">31 </span>        ff 0/subop/increment *0x7dcc  <span class="subxComment"># keyboard-buffer-read</span>
-<span id="L32" class="LineNr">32 </span>        81 4/subop/and *0x7dcc 0xf/imm32  <span class="subxComment"># keyboard-buffer-read</span>
-<span id="L33" class="LineNr">33 </span>        fb/enable-interrupts
-<span id="L34" class="LineNr">34 </span>      }
-<span id="L35" class="LineNr">35 </span>      <span class="subxComment"># return</span>
-<span id="L36" class="LineNr">36 </span>      eb $read-key:end/disp8
-<span id="L37" class="LineNr">37 </span>    }
-<span id="L38" class="LineNr">38 </span>    <span class="subxComment"># TODO: fake keyboard</span>
-<span id="L39" class="LineNr">39 </span><span class="Constant">$read-key:end</span>:
-<span id="L40" class="LineNr">40 </span>    <span class="subxS1Comment"># . restore registers</span>
-<span id="L41" class="LineNr">41 </span>    59/pop-to-ecx
-<span id="L42" class="LineNr">42 </span>    <span class="subxS1Comment"># . epilogue</span>
-<span id="L43" class="LineNr">43 </span>    89/&lt;- %esp 5/r32/ebp
-<span id="L44" class="LineNr">44 </span>    5d/pop-to-ebp
-<span id="L45" class="LineNr">45 </span>    c3/return
+<span id="L3" class="LineNr"> 3 </span><span class="subxComment">#</span>
+<span id="L4" class="LineNr"> 4 </span><span class="subxComment"># We need to do this in machine code because Mu doesn't have global variables</span>
+<span id="L5" class="LineNr"> 5 </span><span class="subxComment"># yet (for the keyboard buffer).</span>
+<span id="L6" class="LineNr"> 6 </span>
+<span id="L7" class="LineNr"> 7 </span>== code
+<span id="L8" class="LineNr"> 8 </span>
+<span id="L9" class="LineNr"> 9 </span><span class="subxFunction">read-key</span>:  <span class="subxComment"># kbd: (addr keyboard) -&gt; result/eax: byte</span>
+<span id="L10" class="LineNr">10 </span>    <span class="subxS1Comment"># . prologue</span>
+<span id="L11" class="LineNr">11 </span>    55/push-ebp
+<span id="L12" class="LineNr">12 </span>    89/&lt;- %ebp 4/r32/esp
+<span id="L13" class="LineNr">13 </span>    <span class="subxS1Comment"># . save registers</span>
+<span id="L14" class="LineNr">14 </span>    51/push-ecx
+<span id="L15" class="LineNr">15 </span>    <span class="subxComment"># result = 0</span>
+<span id="L16" class="LineNr">16 </span>    b8/copy-to-eax 0/imm32
+<span id="L17" class="LineNr">17 </span>    <span class="subxComment"># ecx = keyboard</span>
+<span id="L18" class="LineNr">18 </span>    8b/-&gt; *(ebp+8) 1/r32/ecx
+<span id="L19" class="LineNr">19 </span>    81 7/subop/compare %ecx 0/imm32
+<span id="L20" class="LineNr">20 </span>    {
+<span id="L21" class="LineNr">21 </span>      75/jump-if-!= <span class="Constant">break</span>/disp8
+<span id="L22" class="LineNr">22 </span>      <span class="subxComment"># var read/ecx: byte = keyboard buffer's read index</span>
+<span id="L23" class="LineNr">23 </span>      8b/-&gt; *0x7dcc 1/r32/CL  <span class="subxComment"># keyboard-buffer-read</span>
+<span id="L24" class="LineNr">24 </span>      <span class="subxComment"># var next-key/eax: byte = *(keyboard buffer + ecx)</span>
+<span id="L25" class="LineNr">25 </span>      8a/byte-&gt; *(ecx+0x7dd0) 0/r32/AL  <span class="subxComment"># keyboard-buffer-data</span>
+<span id="L26" class="LineNr">26 </span>      <span class="subxComment"># if (next-key != 0) lock and remove from keyboard-buffer</span>
+<span id="L27" class="LineNr">27 </span>      81 7/subop/compare %eax 0/imm32
+<span id="L28" class="LineNr">28 </span>      {
+<span id="L29" class="LineNr">29 </span>        74/jump-if-= <span class="Constant">break</span>/disp8
+<span id="L30" class="LineNr">30 </span>        <span class="subxComment"># TODO: add some instructions in this block to SubX if we ever want to</span>
+<span id="L31" class="LineNr">31 </span>        <span class="subxComment"># use bootstrap on baremetal programs</span>
+<span id="L32" class="LineNr">32 </span>        fa/disable-interrupts
+<span id="L33" class="LineNr">33 </span>        c6 0/subop/copy-byte *(ecx+0x7dd0) 0/imm8
+<span id="L34" class="LineNr">34 </span>        ff 0/subop/increment *0x7dcc  <span class="subxComment"># keyboard-buffer-read</span>
+<span id="L35" class="LineNr">35 </span>        81 4/subop/and *0x7dcc 0xf/imm32  <span class="subxComment"># keyboard-buffer-read</span>
+<span id="L36" class="LineNr">36 </span>        fb/enable-interrupts
+<span id="L37" class="LineNr">37 </span>      }
+<span id="L38" class="LineNr">38 </span>      <span class="subxComment"># return</span>
+<span id="L39" class="LineNr">39 </span>      eb $read-key:end/disp8
+<span id="L40" class="LineNr">40 </span>    }
+<span id="L41" class="LineNr">41 </span>    <span class="subxComment"># TODO: fake keyboard</span>
+<span id="L42" class="LineNr">42 </span><span class="Constant">$read-key:end</span>:
+<span id="L43" class="LineNr">43 </span>    <span class="subxS1Comment"># . restore registers</span>
+<span id="L44" class="LineNr">44 </span>    59/pop-to-ecx
+<span id="L45" class="LineNr">45 </span>    <span class="subxS1Comment"># . epilogue</span>
+<span id="L46" class="LineNr">46 </span>    89/&lt;- %esp 5/r32/ebp
+<span id="L47" class="LineNr">47 </span>    5d/pop-to-ebp
+<span id="L48" class="LineNr">48 </span>    c3/return
 </pre>
 </body>
 </html>