about summary refs log tree commit diff stats
diff options
context:
space:
mode:
-rw-r--r--html/subx/011direct_addressing.cc.html26
-rw-r--r--html/subx/012indirect_addressing.cc.html47
-rw-r--r--html/subx/013immediate_addressing.cc.html54
-rw-r--r--subx/011direct_addressing.cc26
-rw-r--r--subx/012indirect_addressing.cc41
-rw-r--r--subx/013immediate_addressing.cc22
6 files changed, 183 insertions, 33 deletions
diff --git a/html/subx/011direct_addressing.cc.html b/html/subx/011direct_addressing.cc.html
index 1738b2a2..dba0b3cf 100644
--- a/html/subx/011direct_addressing.cc.html
+++ b/html/subx/011direct_addressing.cc.html
@@ -279,6 +279,32 @@ if ('onhashchange' in window) {
 <span id="L214" class="LineNr">214 </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; *arg1 &lt;&lt; <a href='003trace.cc.html#L184'>end</a><span class="Delimiter">();</span>
 <span id="L215" class="LineNr">215 </span>  <span class="Identifier">break</span><span class="Delimiter">;</span>
 <span id="L216" class="LineNr">216 </span><span class="Delimiter">}</span>
+<span id="L217" class="LineNr">217 </span>
+<span id="L218" class="LineNr">218 </span><span class="SalientComment">//:: push</span>
+<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="L223" class="LineNr">223 </span><span class="Comment"># op  ModRM   SIB   displacement  immediate</span>
+<span id="L224" class="LineNr">224 </span>  <span class="Constant">50</span>  <span class="PreProc">0</span><span class="Constant">3</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>
+<span id="L226" class="LineNr">226 </span><span class="traceContains">+run: pushing value 0x0000000a</span>
+<span id="L227" class="LineNr">227 </span><span class="traceContains">+run: <a href='010core.cc.html#L11'>ESP</a> is now 0x00000060</span>
+<span id="L228" class="LineNr">228 </span><span class="traceContains">+run: <a href='003trace.cc.html#L74'>contents</a> at <a href='010core.cc.html#L11'>ESP</a>: 0x0000000a</span>
+<span id="L229" class="LineNr">229 </span>
+<span id="L230" class="LineNr">230 </span><span class="Delimiter">:(before &quot;End Single-Byte Opcodes&quot;)</span>
+<span id="L231" class="LineNr">231 </span><span class="Normal">case</span> <span class="Constant">0x50</span>: <span class="Delimiter">{</span>
+<span id="L232" class="LineNr">232 </span>  <span class="Normal">uint8_t</span> modrm = <a href='010core.cc.html#L214'>next</a><span class="Delimiter">();</span>
+<span id="L233" class="LineNr">233 </span>  <span class="Normal">uint8_t</span> <a href='010core.cc.html#L17'>reg</a> = modrm &amp; <span class="Constant">0x7</span><span class="Delimiter">;</span>
+<span id="L234" class="LineNr">234 </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;push <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="L235" class="LineNr">235 </span>  <span class="Normal">const</span> <span class="Normal">int32_t</span> val = Reg[reg]<span class="Delimiter">.</span>u<span class="Delimiter">;</span>
+<span id="L236" class="LineNr">236 </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;pushing value 0x&quot;</span> &lt;&lt; <a href='010core.cc.html#L230'>HEXWORD</a> &lt;&lt; val &lt;&lt; <a href='003trace.cc.html#L184'>end</a><span class="Delimiter">();</span>
+<span id="L237" class="LineNr">237 </span>  Reg[ESP]<span class="Delimiter">.</span>u -= <span class="Constant">4</span><span class="Delimiter">;</span>
+<span id="L238" class="LineNr">238 </span>  *<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> = val<span class="Delimiter">;</span>
+<span id="L239" class="LineNr">239 </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="L240" class="LineNr">240 </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="L241" class="LineNr">241 </span>  <span class="Identifier">break</span><span class="Delimiter">;</span>
+<span id="L242" class="LineNr">242 </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 d04c442e..2643bcaf 100644
--- a/html/subx/012indirect_addressing.cc.html
+++ b/html/subx/012indirect_addressing.cc.html
@@ -392,16 +392,43 @@ if ('onhashchange' in window) {
 <span id="L327" class="LineNr">327 </span>  <span class="Normal">uint8_t</span> modrm = <a href='010core.cc.html#L214'>next</a><span class="Delimiter">();</span>
 <span id="L328" class="LineNr">328 </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 class="Comment">// middle 3 'reg opcode' bits</span>
 <span id="L329" class="LineNr">329 </span>  <span class="Normal">switch</span> <span class="Delimiter">(</span>subop<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L330" class="LineNr">330 </span>  <span class="Normal">case</span> <span class="Constant">4</span>:
-<span id="L331" class="LineNr">331 </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;jump to effective address&quot;</span> &lt;&lt; <a href='003trace.cc.html#L184'>end</a><span class="Delimiter">();</span>
-<span id="L332" class="LineNr">332 </span>  <span class="Conceal">¦</span> <span class="Normal">int32_t</span>* arg2 = <a href='011direct_addressing.cc.html#L26'>effective_address</a><span class="Delimiter">(</span>modrm<span class="Delimiter">);</span>
-<span id="L333" class="LineNr">333 </span>  <span class="Conceal">¦</span> <a href='010core.cc.html#L23'>EIP</a> = *arg2<span class="Delimiter">;</span>
-<span id="L334" class="LineNr">334 </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;jumping to 0x&quot;</span> &lt;&lt; <a href='010core.cc.html#L230'>HEXWORD</a> &lt;&lt; <a href='010core.cc.html#L23'>EIP</a> &lt;&lt; <a href='003trace.cc.html#L184'>end</a><span class="Delimiter">();</span>
-<span id="L335" class="LineNr">335 </span>  <span class="Conceal">¦</span> <span class="Identifier">break</span><span class="Delimiter">;</span>
-<span id="L336" class="LineNr">336 </span>  <span class="Comment">// End Op ff Subops</span>
-<span id="L337" class="LineNr">337 </span>  <span class="Delimiter">}</span>
-<span id="L338" class="LineNr">338 </span>  <span class="Identifier">break</span><span class="Delimiter">;</span>
-<span id="L339" class="LineNr">339 </span><span class="Delimiter">}</span>
+<span id="L330" class="LineNr">330 </span>  <span class="Conceal">¦</span> <span class="Normal">case</span> <span class="Constant">4</span>: <span class="Delimiter">{</span>
+<span id="L331" class="LineNr">331 </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;jump to effective address&quot;</span> &lt;&lt; <a href='003trace.cc.html#L184'>end</a><span class="Delimiter">();</span>
+<span id="L332" class="LineNr">332 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Normal">int32_t</span>* arg2 = <a href='011direct_addressing.cc.html#L26'>effective_address</a><span class="Delimiter">(</span>modrm<span class="Delimiter">);</span>
+<span id="L333" class="LineNr">333 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> <a href='010core.cc.html#L23'>EIP</a> = *arg2<span class="Delimiter">;</span>
+<span id="L334" class="LineNr">334 </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;jumping to 0x&quot;</span> &lt;&lt; <a href='010core.cc.html#L230'>HEXWORD</a> &lt;&lt; <a href='010core.cc.html#L23'>EIP</a> &lt;&lt; <a href='003trace.cc.html#L184'>end</a><span class="Delimiter">();</span>
+<span id="L335" class="LineNr">335 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Identifier">break</span><span class="Delimiter">;</span>
+<span id="L336" class="LineNr">336 </span>  <span class="Conceal">¦</span> <span class="Delimiter">}</span>
+<span id="L337" class="LineNr">337 </span>  <span class="Conceal">¦</span> <span class="Comment">// End Op ff Subops</span>
+<span id="L338" class="LineNr">338 </span>  <span class="Delimiter">}</span>
+<span id="L339" class="LineNr">339 </span>  <span class="Identifier">break</span><span class="Delimiter">;</span>
+<span id="L340" class="LineNr">340 </span><span class="Delimiter">}</span>
+<span id="L341" class="LineNr">341 </span>
+<span id="L342" class="LineNr">342 </span><span class="SalientComment">//:: push</span>
+<span id="L343" class="LineNr">343 </span>
+<span id="L344" class="LineNr">344 </span><span class="Delimiter">:(scenario push_mem_at_r32)</span>
+<span id="L345" class="LineNr">345 </span><span class="Special">% Reg[0].i = 0x60;</span>
+<span id="L346" class="LineNr">346 </span><span class="Special">% SET_WORD_IN_MEM(0x60, 0x000000af);</span>
+<span id="L347" class="LineNr">347 </span><span class="Special">% Reg[ESP].u = 0x14;</span>
+<span id="L348" class="LineNr">348 </span><span class="Comment"># op  ModRM   SIB   displacement  immediate</span>
+<span id="L349" class="LineNr">349 </span>  ff  <span class="Constant">30</span>                                      <span class="Comment"># push *EAX (reg 0) to stack</span>
+<span id="L350" class="LineNr">350 </span><span class="traceContains">+run: push effective address</span>
+<span id="L351" class="LineNr">351 </span><span class="traceContains">+run: effective address is mem at address 0x60 (reg 0)</span>
+<span id="L352" class="LineNr">352 </span><span class="traceContains">+run: <a href='010core.cc.html#L11'>ESP</a> is now 0x00000010</span>
+<span id="L353" class="LineNr">353 </span><span class="traceContains">+run: <a href='003trace.cc.html#L74'>contents</a> at <a href='010core.cc.html#L11'>ESP</a>: 0x000000af</span>
+<span id="L354" class="LineNr">354 </span>
+<span id="L355" class="LineNr">355 </span><span class="Delimiter">:(before &quot;End Op ff Subops&quot;)</span>
+<span id="L356" class="LineNr">356 </span><span class="Normal">case</span> <span class="Constant">6</span>: <span class="Delimiter">{</span>
+<span id="L357" class="LineNr">357 </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;push effective address&quot;</span> &lt;&lt; <a href='003trace.cc.html#L184'>end</a><span class="Delimiter">();</span>
+<span id="L358" class="LineNr">358 </span>  <span class="Normal">const</span> <span class="Normal">int32_t</span>* val = <a href='011direct_addressing.cc.html#L26'>effective_address</a><span class="Delimiter">(</span>modrm<span class="Delimiter">);</span>
+<span id="L359" class="LineNr">359 </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;pushing value 0x&quot;</span> &lt;&lt; <a href='010core.cc.html#L230'>HEXWORD</a> &lt;&lt; *val &lt;&lt; <a href='003trace.cc.html#L184'>end</a><span class="Delimiter">();</span>
+<span id="L360" class="LineNr">360 </span>  Reg[ESP]<span class="Delimiter">.</span>u -= <span class="Constant">4</span><span class="Delimiter">;</span>
+<span id="L361" class="LineNr">361 </span>  *<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> = *val<span class="Delimiter">;</span>
+<span id="L362" class="LineNr">362 </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="L363" class="LineNr">363 </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="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>
 </pre>
 </body>
 </html>
diff --git a/html/subx/013immediate_addressing.cc.html b/html/subx/013immediate_addressing.cc.html
index bde49732..adaff3e0 100644
--- a/html/subx/013immediate_addressing.cc.html
+++ b/html/subx/013immediate_addressing.cc.html
@@ -414,22 +414,44 @@ if ('onhashchange' in window) {
 <span id="L350" class="LineNr">350 </span><span class="Delimiter">}</span>
 <span id="L351" class="LineNr">351 </span>
 <span id="L352" class="LineNr">352 </span><span class="Comment">//:</span>
-<span id="L353" class="LineNr">353 </span><span class="Delimiter">:(scenario copy_imm32_to_mem_at_r32)</span>
-<span id="L354" class="LineNr">354 </span><span class="Special">% Reg[3].i = 0x60;</span>
-<span id="L355" class="LineNr">355 </span><span class="Comment"># op  ModRM   SIB   displacement  immediate</span>
-<span id="L356" class="LineNr">356 </span>  c7  <span class="PreProc">0</span><span class="Constant">3</span>                          0a 0b 0c 0d  <span class="Comment"># copy 0x0d0c0b0a to *EBX (reg 3)</span>
-<span id="L357" class="LineNr">357 </span><span class="traceContains">+run: copy <a href='010core.cc.html#L219'>imm32</a> 0x0d0c0b0a to effective address</span>
-<span id="L358" class="LineNr">358 </span><span class="traceContains">+run: effective address is mem at address 0x60 (reg 3)</span>
-<span id="L359" class="LineNr">359 </span>
-<span id="L360" class="LineNr">360 </span><span class="Delimiter">:(before &quot;End Single-Byte Opcodes&quot;)</span>
-<span id="L361" class="LineNr">361 </span><span class="Normal">case</span> <span class="Constant">0xc7</span>: <span class="Delimiter">{</span>  <span class="Comment">// copy imm32 to r32</span>
-<span id="L362" class="LineNr">362 </span>  <span class="Normal">uint8_t</span> modrm = <a href='010core.cc.html#L214'>next</a><span class="Delimiter">();</span>
-<span id="L363" class="LineNr">363 </span>  <span class="Normal">int32_t</span> arg2 = <a href='010core.cc.html#L219'>imm32</a><span class="Delimiter">();</span>
-<span id="L364" class="LineNr">364 </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;copy <a href='010core.cc.html#L219'>imm32</a> 0x&quot;</span> &lt;&lt; <a href='010core.cc.html#L230'>HEXWORD</a> &lt;&lt; arg2 &lt;&lt; <span class="Constant">&quot; to effective address&quot;</span> &lt;&lt; <a href='003trace.cc.html#L184'>end</a><span class="Delimiter">();</span>
-<span id="L365" class="LineNr">365 </span>  <span class="Normal">int32_t</span>* arg1 = <a href='011direct_addressing.cc.html#L26'>effective_address</a><span class="Delimiter">(</span>modrm<span class="Delimiter">);</span>
-<span id="L366" class="LineNr">366 </span>  *arg1 = arg2<span class="Delimiter">;</span>
-<span id="L367" class="LineNr">367 </span>  <span class="Identifier">break</span><span class="Delimiter">;</span>
-<span id="L368" class="LineNr">368 </span><span class="Delimiter">}</span>
+<span id="L353" class="LineNr">353 </span>
+<span id="L354" class="LineNr">354 </span><span class="Delimiter">:(scenario copy_imm32_to_mem_at_r32)</span>
+<span id="L355" class="LineNr">355 </span><span class="Special">% Reg[3].i = 0x60;</span>
+<span id="L356" class="LineNr">356 </span><span class="Comment"># op  ModRM   SIB   displacement  immediate</span>
+<span id="L357" class="LineNr">357 </span>  c7  <span class="PreProc">0</span><span class="Constant">3</span>                          0a 0b 0c 0d  <span class="Comment"># copy 0x0d0c0b0a to *EBX (reg 3)</span>
+<span id="L358" class="LineNr">358 </span><span class="traceContains">+run: copy <a href='010core.cc.html#L219'>imm32</a> 0x0d0c0b0a to effective address</span>
+<span id="L359" class="LineNr">359 </span><span class="traceContains">+run: effective address is mem at address 0x60 (reg 3)</span>
+<span id="L360" class="LineNr">360 </span>
+<span id="L361" class="LineNr">361 </span><span class="Delimiter">:(before &quot;End Single-Byte Opcodes&quot;)</span>
+<span id="L362" class="LineNr">362 </span><span class="Normal">case</span> <span class="Constant">0xc7</span>: <span class="Delimiter">{</span>  <span class="Comment">// copy imm32 to r32</span>
+<span id="L363" class="LineNr">363 </span>  <span class="Normal">uint8_t</span> modrm = <a href='010core.cc.html#L214'>next</a><span class="Delimiter">();</span>
+<span id="L364" class="LineNr">364 </span>  <span class="Normal">int32_t</span> arg2 = <a href='010core.cc.html#L219'>imm32</a><span class="Delimiter">();</span>
+<span id="L365" class="LineNr">365 </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;copy <a href='010core.cc.html#L219'>imm32</a> 0x&quot;</span> &lt;&lt; <a href='010core.cc.html#L230'>HEXWORD</a> &lt;&lt; arg2 &lt;&lt; <span class="Constant">&quot; to effective address&quot;</span> &lt;&lt; <a href='003trace.cc.html#L184'>end</a><span class="Delimiter">();</span>
+<span id="L366" class="LineNr">366 </span>  <span class="Normal">int32_t</span>* arg1 = <a href='011direct_addressing.cc.html#L26'>effective_address</a><span class="Delimiter">(</span>modrm<span class="Delimiter">);</span>
+<span id="L367" class="LineNr">367 </span>  *arg1 = arg2<span class="Delimiter">;</span>
+<span id="L368" class="LineNr">368 </span>  <span class="Identifier">break</span><span class="Delimiter">;</span>
+<span id="L369" class="LineNr">369 </span><span class="Delimiter">}</span>
+<span id="L370" class="LineNr">370 </span>
+<span id="L371" class="LineNr">371 </span><span class="SalientComment">//:: push</span>
+<span id="L372" class="LineNr">372 </span>
+<span id="L373" class="LineNr">373 </span><span class="Delimiter">:(scenario push_imm32)</span>
+<span id="L374" class="LineNr">374 </span><span class="Special">% Reg[ESP].u = 0x14;</span>
+<span id="L375" class="LineNr">375 </span><span class="Comment"># op  ModRM   SIB   displacement  immediate</span>
+<span id="L376" class="LineNr">376 </span>  <span class="Constant">68</span>                              af <span class="PreProc">0</span><span class="Constant">0</span> <span class="PreProc">0</span><span class="Constant">0</span> <span class="PreProc">0</span><span class="Constant">0</span>  <span class="Comment"># push *EAX (reg 0) to stack</span>
+<span id="L377" class="LineNr">377 </span><span class="traceContains">+run: push <a href='010core.cc.html#L219'>imm32</a> 0x000000af</span>
+<span id="L378" class="LineNr">378 </span><span class="traceContains">+run: <a href='010core.cc.html#L11'>ESP</a> is now 0x00000010</span>
+<span id="L379" class="LineNr">379 </span><span class="traceContains">+run: <a href='003trace.cc.html#L74'>contents</a> at <a href='010core.cc.html#L11'>ESP</a>: 0x000000af</span>
+<span id="L380" class="LineNr">380 </span>
+<span id="L381" class="LineNr">381 </span><span class="Delimiter">:(before &quot;End Single-Byte Opcodes&quot;)</span>
+<span id="L382" class="LineNr">382 </span><span class="Normal">case</span> <span class="Constant">0x68</span>: <span class="Delimiter">{</span>
+<span id="L383" class="LineNr">383 </span>  <span class="Normal">int32_t</span> val = <a href='010core.cc.html#L219'>imm32</a><span class="Delimiter">();</span>
+<span id="L384" class="LineNr">384 </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;push <a href='010core.cc.html#L219'>imm32</a> 0x&quot;</span> &lt;&lt; <a href='010core.cc.html#L230'>HEXWORD</a> &lt;&lt; val &lt;&lt; <a href='003trace.cc.html#L184'>end</a><span class="Delimiter">();</span>
+<span id="L385" class="LineNr">385 </span>  Reg[ESP]<span class="Delimiter">.</span>u -= <span class="Constant">4</span><span class="Delimiter">;</span>
+<span id="L386" class="LineNr">386 </span>  *<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> = val<span class="Delimiter">;</span>
+<span id="L387" class="LineNr">387 </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="L388" class="LineNr">388 </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="L389" class="LineNr">389 </span>  <span class="Identifier">break</span><span class="Delimiter">;</span>
+<span id="L390" class="LineNr">390 </span><span class="Delimiter">}</span>
 </pre>
 </body>
 </html>
diff --git a/subx/011direct_addressing.cc b/subx/011direct_addressing.cc
index f474ac99..2defcfec 100644
--- a/subx/011direct_addressing.cc
+++ b/subx/011direct_addressing.cc
@@ -214,3 +214,29 @@ case 0x89: {  // copy r32 to r/m32
   trace(2, "run") << "storing 0x" << HEXWORD << *arg1 << end();
   break;
 }
+
+//:: push
+
+:(scenario push_r32)
+% Reg[ESP].u = 0x64;
+% Reg[EBX].i = 10;
+# op  ModRM   SIB   displacement  immediate
+  50  03                                      # push EBX (reg 3) to stack
++run: push reg 3
++run: pushing value 0x0000000a
++run: ESP is now 0x00000060
++run: contents at ESP: 0x0000000a
+
+:(before "End Single-Byte Opcodes")
+case 0x50: {
+  uint8_t modrm = next();
+  uint8_t reg = modrm & 0x7;
+  trace(2, "run") << "push reg " << NUM(reg) << end();
+  const int32_t val = Reg[reg].u;
+  trace(2, "run") << "pushing value 0x" << HEXWORD << val << end();
+  Reg[ESP].u -= 4;
+  *reinterpret_cast<uint32_t*>(&Mem.at(Reg[ESP].u)) = val;
+  trace(2, "run") << "ESP is now 0x" << HEXWORD << Reg[ESP].u << end();
+  trace(2, "run") << "contents at ESP: 0x" << HEXWORD << *reinterpret_cast<uint32_t*>(&Mem.at(Reg[ESP].u)) << end();
+  break;
+}
diff --git a/subx/012indirect_addressing.cc b/subx/012indirect_addressing.cc
index 1bf5e378..b4821856 100644
--- a/subx/012indirect_addressing.cc
+++ b/subx/012indirect_addressing.cc
@@ -327,13 +327,40 @@ case 0xff: {  // jump to r/m32
   uint8_t modrm = next();
   uint8_t subop = (modrm>>3)&0x7;  // middle 3 'reg opcode' bits
   switch (subop) {
-  case 4:
-    trace(2, "run") << "jump to effective address" << end();
-    int32_t* arg2 = effective_address(modrm);
-    EIP = *arg2;
-    trace(2, "run") << "jumping to 0x" << HEXWORD << EIP << end();
-    break;
-  // End Op ff Subops
+    case 4: {
+      trace(2, "run") << "jump to effective address" << end();
+      int32_t* arg2 = effective_address(modrm);
+      EIP = *arg2;
+      trace(2, "run") << "jumping to 0x" << HEXWORD << EIP << end();
+      break;
+    }
+    // End Op ff Subops
   }
   break;
 }
+
+//:: push
+
+:(scenario push_mem_at_r32)
+% Reg[0].i = 0x60;
+% SET_WORD_IN_MEM(0x60, 0x000000af);
+% Reg[ESP].u = 0x14;
+# op  ModRM   SIB   displacement  immediate
+  ff  30                                      # push *EAX (reg 0) to stack
++run: push effective address
++run: effective address is mem at address 0x60 (reg 0)
++run: ESP is now 0x00000010
++run: contents at ESP: 0x000000af
+
+:(before "End Op ff Subops")
+case 6: {
+  trace(2, "run") << "push effective address" << end();
+  const int32_t* val = effective_address(modrm);
+  trace(2, "run") << "pushing value 0x" << HEXWORD << *val << end();
+  Reg[ESP].u -= 4;
+  *reinterpret_cast<uint32_t*>(&Mem.at(Reg[ESP].u)) = *val;
+  trace(2, "run") << "ESP is now 0x" << HEXWORD << Reg[ESP].u << end();
+  trace(2, "run") << "contents at ESP: 0x" << HEXWORD << *reinterpret_cast<uint32_t*>(&Mem.at(Reg[ESP].u)) << end();
+  break;
+}
+
diff --git a/subx/013immediate_addressing.cc b/subx/013immediate_addressing.cc
index dd1ce4c0..2e4b459a 100644
--- a/subx/013immediate_addressing.cc
+++ b/subx/013immediate_addressing.cc
@@ -350,6 +350,7 @@ case 0xb8: {  // copy imm32 to r32
 }
 
 //:
+
 :(scenario copy_imm32_to_mem_at_r32)
 % Reg[3].i = 0x60;
 # op  ModRM   SIB   displacement  immediate
@@ -366,3 +367,24 @@ case 0xc7: {  // copy imm32 to r32
   *arg1 = arg2;
   break;
 }
+
+//:: push
+
+:(scenario push_imm32)
+% Reg[ESP].u = 0x14;
+# op  ModRM   SIB   displacement  immediate
+  68                              af 00 00 00  # push *EAX (reg 0) to stack
++run: push imm32 0x000000af
++run: ESP is now 0x00000010
++run: contents at ESP: 0x000000af
+
+:(before "End Single-Byte Opcodes")
+case 0x68: {
+  int32_t val = imm32();
+  trace(2, "run") << "push imm32 0x" << HEXWORD << val << end();
+  Reg[ESP].u -= 4;
+  *reinterpret_cast<uint32_t*>(&Mem.at(Reg[ESP].u)) = val;
+  trace(2, "run") << "ESP is now 0x" << HEXWORD << Reg[ESP].u << end();
+  trace(2, "run") << "contents at ESP: 0x" << HEXWORD << *reinterpret_cast<uint32_t*>(&Mem.at(Reg[ESP].u)) << end();
+  break;
+}