4083

subx: 'pop'

4 files changed, 120 insertions, 2 deletions

diff --git a/html/subx/011direct_addressing.cc.html b/html/subx/011direct_addressing.cc.html
index f9508be6..ba7a1e3b 100644
--- a/html/subx/011direct_addressing.cc.html
+++ b/html/subx/011direct_addressing.cc.html
@@ -284,7 +284,7 @@ if ('onhashchange' in window) {
 <span id="L219" class="LineNr">219 </span>
 <span id="L220" class="LineNr">220 </span><span class="Delimiter">:(scenario push_r32)</span>
 <span id="L221" class="LineNr">221 </span><span class="Special">% Reg[ESP].u = 0x64;</span>
-<span id="L222" class="LineNr">222 </span><span class="Special">% Reg[EBX].i = 10;</span>
+<span id="L222" class="LineNr">222 </span><span class="Special">% Reg[EBX].i = 0x0000000a;</span>
 <span id="L223" class="LineNr">223 </span><span class="Comment"># op  ModRM   SIB   displacement  immediate</span>
 <span id="L224" class="LineNr">224 </span>  <span class="Constant">53</span>                                          <span class="Comment"># push EBX (reg 3) to stack</span>
 <span id="L225" class="LineNr">225 </span><span class="traceContains">+run: push <a href='010core.cc.html#L17'>reg</a> 3</span>
@@ -311,6 +311,35 @@ if ('onhashchange' in window) {
 <span id="L246" class="LineNr">246 </span>  <a href='003trace.cc.html#L160'>trace</a><span class="Delimiter">(</span><span class="Constant">2</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;contents at <a href='010core.cc.html#L11'>ESP</a>: 0x&quot;</span> &lt;&lt; <a href='010core.cc.html#L230'>HEXWORD</a> &lt;&lt; *<span class="Normal">reinterpret_cast</span>&lt;<span class="Normal">uint32_t</span>*&gt;<span class="Delimiter">(</span>&amp;Mem<span class="Delimiter">.</span>at<span class="Delimiter">(</span>Reg[ESP]<span class="Delimiter">.</span>u<span class="Delimiter">))</span> &lt;&lt; <a href='003trace.cc.html#L184'>end</a><span class="Delimiter">();</span>
 <span id="L247" class="LineNr">247 </span>  <span class="Identifier">break</span><span class="Delimiter">;</span>
 <span id="L248" class="LineNr">248 </span><span class="Delimiter">}</span>
+<span id="L249" class="LineNr">249 </span>
+<span id="L250" class="LineNr">250 </span><span class="SalientComment">//:: pop</span>
+<span id="L251" class="LineNr">251 </span>
+<span id="L252" class="LineNr">252 </span><span class="Delimiter">:(scenario pop_r32)</span>
+<span id="L253" class="LineNr">253 </span><span class="Special">% Reg[ESP].u = 0x60;</span>
+<span id="L254" class="LineNr">254 </span><span class="Special">% SET_WORD_IN_MEM(0x60, 0x0000000a);</span>
+<span id="L255" class="LineNr">255 </span><span class="Comment"># op  ModRM   SIB   displacement  immediate</span>
+<span id="L256" class="LineNr">256 </span>  5b                                          <span class="Comment"># pop stack to EBX (reg 3)</span>
+<span id="L257" class="LineNr">257 </span><span class="traceContains">+run: pop into <a href='010core.cc.html#L17'>reg</a> 3</span>
+<span id="L258" class="LineNr">258 </span><span class="traceContains">+run: popping value 0x0000000a</span>
+<span id="L259" class="LineNr">259 </span><span class="traceContains">+run: <a href='010core.cc.html#L11'>ESP</a> is now 0x00000064</span>
+<span id="L260" class="LineNr">260 </span>
+<span id="L261" class="LineNr">261 </span><span class="Delimiter">:(before &quot;End Single-Byte Opcodes&quot;)</span>
+<span id="L262" class="LineNr">262 </span><span class="Normal">case</span> <span class="Constant">0x58</span>:
+<span id="L263" class="LineNr">263 </span><span class="Normal">case</span> <span class="Constant">0x59</span>:
+<span id="L264" class="LineNr">264 </span><span class="Normal">case</span> <span class="Constant">0x5a</span>:
+<span id="L265" class="LineNr">265 </span><span class="Normal">case</span> <span class="Constant">0x5b</span>:
+<span id="L266" class="LineNr">266 </span><span class="Normal">case</span> <span class="Constant">0x5c</span>:
+<span id="L267" class="LineNr">267 </span><span class="Normal">case</span> <span class="Constant">0x5d</span>:
+<span id="L268" class="LineNr">268 </span><span class="Normal">case</span> <span class="Constant">0x5e</span>:
+<span id="L269" class="LineNr">269 </span><span class="Normal">case</span> <span class="Constant">0x5f</span>: <span class="Delimiter">{</span>  <span class="Comment">// pop stack into r32</span>
+<span id="L270" class="LineNr">270 </span>  <span class="Normal">uint8_t</span> <a href='010core.cc.html#L17'>reg</a> = op &amp; <span class="Constant">0x7</span><span class="Delimiter">;</span>
+<span id="L271" class="LineNr">271 </span>  <a href='003trace.cc.html#L160'>trace</a><span class="Delimiter">(</span><span class="Constant">2</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;pop into <a href='010core.cc.html#L17'>reg</a> &quot;</span> &lt;&lt; <a href='010core.cc.html#L232'>NUM</a><span class="Delimiter">(</span><a href='010core.cc.html#L17'>reg</a><span class="Delimiter">)</span> &lt;&lt; <a href='003trace.cc.html#L184'>end</a><span class="Delimiter">();</span>
+<span id="L272" class="LineNr">272 </span>  Reg[reg]<span class="Delimiter">.</span>u = *<span class="Normal">reinterpret_cast</span>&lt;<span class="Normal">uint32_t</span>*&gt;<span class="Delimiter">(</span>&amp;Mem<span class="Delimiter">.</span>at<span class="Delimiter">(</span>Reg[ESP]<span class="Delimiter">.</span>u<span class="Delimiter">));</span>
+<span id="L273" class="LineNr">273 </span>  <a href='003trace.cc.html#L160'>trace</a><span class="Delimiter">(</span><span class="Constant">2</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;popping value 0x&quot;</span> &lt;&lt; <a href='010core.cc.html#L230'>HEXWORD</a> &lt;&lt; Reg[reg]<span class="Delimiter">.</span>u &lt;&lt; <a href='003trace.cc.html#L184'>end</a><span class="Delimiter">();</span>
+<span id="L274" class="LineNr">274 </span>  Reg[ESP]<span class="Delimiter">.</span>u += <span class="Constant">4</span><span class="Delimiter">;</span>
+<span id="L275" class="LineNr">275 </span>  <a href='003trace.cc.html#L160'>trace</a><span class="Delimiter">(</span><span class="Constant">2</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;ESP is now 0x&quot;</span> &lt;&lt; <a href='010core.cc.html#L230'>HEXWORD</a> &lt;&lt; Reg[ESP]<span class="Delimiter">.</span>u &lt;&lt; <a href='003trace.cc.html#L184'>end</a><span class="Delimiter">();</span>
+<span id="L276" class="LineNr">276 </span>  <span class="Identifier">break</span><span class="Delimiter">;</span>
+<span id="L277" class="LineNr">277 </span><span class="Delimiter">}</span>
 </pre>
 </body>
 </html>
diff --git a/html/subx/012indirect_addressing.cc.html b/html/subx/012indirect_addressing.cc.html
index 2643bcaf..35dd62ab 100644
--- a/html/subx/012indirect_addressing.cc.html
+++ b/html/subx/012indirect_addressing.cc.html
@@ -429,6 +429,36 @@ if ('onhashchange' in window) {
 <span id="L364" class="LineNr">364 </span>  <span class="Identifier">break</span><span class="Delimiter">;</span>
 <span id="L365" class="LineNr">365 </span><span class="Delimiter">}</span>
 <span id="L366" class="LineNr">366 </span>
+<span id="L367" class="LineNr">367 </span><span class="SalientComment">//:: pop</span>
+<span id="L368" class="LineNr">368 </span>
+<span id="L369" class="LineNr">369 </span><span class="Delimiter">:(scenario pop_mem_at_r32)</span>
+<span id="L370" class="LineNr">370 </span><span class="Special">% Reg[0].i = 0x60;</span>
+<span id="L371" class="LineNr">371 </span><span class="Special">% Reg[ESP].u = 0x10;</span>
+<span id="L372" class="LineNr">372 </span><span class="Special">% SET_WORD_IN_MEM(0x10, 0x00000030);</span>
+<span id="L373" class="LineNr">373 </span><span class="Comment"># op  ModRM   SIB   displacement  immediate</span>
+<span id="L374" class="LineNr">374 </span>  <span class="Constant">8f</span>  <span class="PreProc">0</span><span class="Constant">0</span>                                      <span class="Comment"># pop stack into *EAX (reg 0)</span>
+<span id="L375" class="LineNr">375 </span><span class="traceContains">+run: pop into effective address</span>
+<span id="L376" class="LineNr">376 </span><span class="traceContains">+run: effective address is mem at address 0x60 (reg 0)</span>
+<span id="L377" class="LineNr">377 </span><span class="traceContains">+run: storing 0x00000030</span>
+<span id="L378" class="LineNr">378 </span><span class="traceContains">+run: <a href='010core.cc.html#L11'>ESP</a> is now 0x00000014</span>
+<span id="L379" class="LineNr">379 </span>
+<span id="L380" class="LineNr">380 </span><span class="Delimiter">:(before &quot;End Single-Byte Opcodes&quot;)</span>
+<span id="L381" class="LineNr">381 </span><span class="Normal">case</span> <span class="Constant">0x8f</span>: <span class="Delimiter">{</span>  <span class="Comment">// pop stack into r/m32</span>
+<span id="L382" class="LineNr">382 </span>  <span class="Normal">uint8_t</span> modrm = <a href='010core.cc.html#L214'>next</a><span class="Delimiter">();</span>
+<span id="L383" class="LineNr">383 </span>  <span class="Normal">uint8_t</span> subop = <span class="Delimiter">(</span>modrm&gt;&gt;<span class="Constant">3</span><span class="Delimiter">)</span>&amp;<span class="Constant">0x7</span><span class="Delimiter">;</span>
+<span id="L384" class="LineNr">384 </span>  <span class="Normal">switch</span> <span class="Delimiter">(</span>subop<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L385" class="LineNr">385 </span>  <span class="Conceal">¦</span> <span class="Normal">case</span> <span class="Constant">0</span>: <span class="Delimiter">{</span>
+<span id="L386" class="LineNr">386 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> <a href='003trace.cc.html#L160'>trace</a><span class="Delimiter">(</span><span class="Constant">2</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;pop into effective address&quot;</span> &lt;&lt; <a href='003trace.cc.html#L184'>end</a><span class="Delimiter">();</span>
+<span id="L387" class="LineNr">387 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Normal">int32_t</span>* dest = <a href='011direct_addressing.cc.html#L26'>effective_address</a><span class="Delimiter">(</span>modrm<span class="Delimiter">);</span>
+<span id="L388" class="LineNr">388 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> *dest = *<span class="Normal">reinterpret_cast</span>&lt;<span class="Normal">uint32_t</span>*&gt;<span class="Delimiter">(</span>&amp;Mem<span class="Delimiter">.</span>at<span class="Delimiter">(</span>Reg[ESP]<span class="Delimiter">.</span>u<span class="Delimiter">));</span>
+<span id="L389" class="LineNr">389 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> <a href='003trace.cc.html#L160'>trace</a><span class="Delimiter">(</span><span class="Constant">2</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;storing 0x&quot;</span> &lt;&lt; <a href='010core.cc.html#L230'>HEXWORD</a> &lt;&lt; *dest &lt;&lt; <a href='003trace.cc.html#L184'>end</a><span class="Delimiter">();</span>
+<span id="L390" class="LineNr">390 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> Reg[ESP]<span class="Delimiter">.</span>u += <span class="Constant">4</span><span class="Delimiter">;</span>
+<span id="L391" class="LineNr">391 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> <a href='003trace.cc.html#L160'>trace</a><span class="Delimiter">(</span><span class="Constant">2</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;ESP is now 0x&quot;</span> &lt;&lt; <a href='010core.cc.html#L230'>HEXWORD</a> &lt;&lt; Reg[ESP]<span class="Delimiter">.</span>u &lt;&lt; <a href='003trace.cc.html#L184'>end</a><span class="Delimiter">();</span>
+<span id="L392" class="LineNr">392 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Identifier">break</span><span class="Delimiter">;</span>
+<span id="L393" class="LineNr">393 </span>  <span class="Conceal">¦</span> <span class="Delimiter">}</span>
+<span id="L394" class="LineNr">394 </span>  <span class="Delimiter">}</span>
+<span id="L395" class="LineNr">395 </span>  <span class="Identifier">break</span><span class="Delimiter">;</span>
+<span id="L396" class="LineNr">396 </span><span class="Delimiter">}</span>
 </pre>
 </body>
 </html>
diff --git a/subx/011direct_addressing.cc b/subx/011direct_addressing.cc
index a8f3fe7e..b3f234b3 100644
--- a/subx/011direct_addressing.cc
+++ b/subx/011direct_addressing.cc
@@ -219,7 +219,7 @@ case 0x89: {  // copy r32 to r/m32
 
 :(scenario push_r32)
 % Reg[ESP].u = 0x64;
-% Reg[EBX].i = 10;
+% Reg[EBX].i = 0x0000000a;
 # op  ModRM   SIB   displacement  immediate
   53                                          # push EBX (reg 3) to stack
 +run: push reg 3
@@ -246,3 +246,32 @@ case 0x57: {  // push r32 to stack
   trace(2, "run") << "contents at ESP: 0x" << HEXWORD << *reinterpret_cast<uint32_t*>(&Mem.at(Reg[ESP].u)) << end();
   break;
 }
+
+//:: pop
+
+:(scenario pop_r32)
+% Reg[ESP].u = 0x60;
+% SET_WORD_IN_MEM(0x60, 0x0000000a);
+# op  ModRM   SIB   displacement  immediate
+  5b                                          # pop stack to EBX (reg 3)
++run: pop into reg 3
++run: popping value 0x0000000a
++run: ESP is now 0x00000064
+
+:(before "End Single-Byte Opcodes")
+case 0x58:
+case 0x59:
+case 0x5a:
+case 0x5b:
+case 0x5c:
+case 0x5d:
+case 0x5e:
+case 0x5f: {  // pop stack into r32
+  uint8_t reg = op & 0x7;
+  trace(2, "run") << "pop into reg " << NUM(reg) << end();
+  Reg[reg].u = *reinterpret_cast<uint32_t*>(&Mem.at(Reg[ESP].u));
+  trace(2, "run") << "popping value 0x" << HEXWORD << Reg[reg].u << end();
+  Reg[ESP].u += 4;
+  trace(2, "run") << "ESP is now 0x" << HEXWORD << Reg[ESP].u << end();
+  break;
+}
diff --git a/subx/012indirect_addressing.cc b/subx/012indirect_addressing.cc
index b4821856..37d82a3f 100644
--- a/subx/012indirect_addressing.cc
+++ b/subx/012indirect_addressing.cc
@@ -364,3 +364,33 @@ case 6: {
   break;
 }
 
+//:: pop
+
+:(scenario pop_mem_at_r32)
+% Reg[0].i = 0x60;
+% Reg[ESP].u = 0x10;
+% SET_WORD_IN_MEM(0x10, 0x00000030);
+# op  ModRM   SIB   displacement  immediate
+  8f  00                                      # pop stack into *EAX (reg 0)
++run: pop into effective address
++run: effective address is mem at address 0x60 (reg 0)
++run: storing 0x00000030
++run: ESP is now 0x00000014
+
+:(before "End Single-Byte Opcodes")
+case 0x8f: {  // pop stack into r/m32
+  uint8_t modrm = next();
+  uint8_t subop = (modrm>>3)&0x7;
+  switch (subop) {
+    case 0: {
+      trace(2, "run") << "pop into effective address" << end();
+      int32_t* dest = effective_address(modrm);
+      *dest = *reinterpret_cast<uint32_t*>(&Mem.at(Reg[ESP].u));
+      trace(2, "run") << "storing 0x" << HEXWORD << *dest << end();
+      Reg[ESP].u += 4;
+      trace(2, "run") << "ESP is now 0x" << HEXWORD << Reg[ESP].u << end();
+      break;
+    }
+  }
+  break;
+}