deploy: 758f014afb8ec5c20ef2fc862fc12e80f65d3d25

7 files changed, 103 insertions, 67 deletions

diff --git a/src/juicebox_asm/insn/add.rs.html b/src/juicebox_asm/insn/add.rs.html
index f91aa25..be3d025 100644
--- a/src/juicebox_asm/insn/add.rs.html
+++ b/src/juicebox_asm/insn/add.rs.html
@@ -42,48 +42,84 @@
 <a href="#41" id="41">41</a>
 <a href="#42" id="42">42</a>
 <a href="#43" id="43">43</a>
-<a href="#44" id="44">44</a></pre></div><pre class="rust"><code><span class="kw">use </span><span class="kw">super</span>::Add;
-<span class="kw">use crate</span>::{Asm, Imm16, Imm8, MemOp, Reg16, Reg32, Reg64};
+<a href="#44" id="44">44</a>
+<a href="#45" id="45">45</a>
+<a href="#46" id="46">46</a>
+<a href="#47" id="47">47</a>
+<a href="#48" id="48">48</a>
+<a href="#49" id="49">49</a>
+<a href="#50" id="50">50</a>
+<a href="#51" id="51">51</a>
+<a href="#52" id="52">52</a>
+<a href="#53" id="53">53</a>
+<a href="#54" id="54">54</a>
+<a href="#55" id="55">55</a>
+<a href="#56" id="56">56</a>
+<a href="#57" id="57">57</a>
+<a href="#58" id="58">58</a>
+<a href="#59" id="59">59</a>
+<a href="#60" id="60">60</a>
+<a href="#61" id="61">61</a>
+<a href="#62" id="62">62</a></pre></div><pre class="rust"><code><span class="kw">use </span><span class="kw">super</span>::Add;
+<span class="kw">use crate</span>::{Asm, Imm16, Imm8, Mem16, Mem32, Mem64, Mem8, Reg16, Reg32, Reg64};
 
-<span class="kw">impl </span>Add&lt;Reg64, Reg64&gt; <span class="kw">for </span>Asm {
-    <span class="kw">fn </span>add(<span class="kw-2">&amp;mut </span><span class="self">self</span>, op1: Reg64, op2: Reg64) {
+<span class="kw">impl </span>Add&lt;Reg32, Reg32&gt; <span class="kw">for </span>Asm {
+    <span class="kw">fn </span>add(<span class="kw-2">&amp;mut </span><span class="self">self</span>, op1: Reg32, op2: Reg32) {
         <span class="self">self</span>.encode_rr(<span class="kw-2">&amp;</span>[<span class="number">0x01</span>], op1, op2);
     }
 }
 
-<span class="kw">impl </span>Add&lt;Reg32, Reg32&gt; <span class="kw">for </span>Asm {
-    <span class="kw">fn </span>add(<span class="kw-2">&amp;mut </span><span class="self">self</span>, op1: Reg32, op2: Reg32) {
+<span class="kw">impl </span>Add&lt;Reg64, Reg64&gt; <span class="kw">for </span>Asm {
+    <span class="kw">fn </span>add(<span class="kw-2">&amp;mut </span><span class="self">self</span>, op1: Reg64, op2: Reg64) {
         <span class="self">self</span>.encode_rr(<span class="kw-2">&amp;</span>[<span class="number">0x01</span>], op1, op2);
     }
 }
 
-<span class="kw">impl </span>Add&lt;MemOp, Reg64&gt; <span class="kw">for </span>Asm {
-    <span class="kw">fn </span>add(<span class="kw-2">&amp;mut </span><span class="self">self</span>, op1: MemOp, op2: Reg64) {
+<span class="kw">impl </span>Add&lt;Mem16, Reg16&gt; <span class="kw">for </span>Asm {
+    <span class="kw">fn </span>add(<span class="kw-2">&amp;mut </span><span class="self">self</span>, op1: Mem16, op2: Reg16) {
         <span class="self">self</span>.encode_mr(<span class="number">0x01</span>, op1, op2);
     }
 }
 
-<span class="kw">impl </span>Add&lt;MemOp, Reg16&gt; <span class="kw">for </span>Asm {
-    <span class="kw">fn </span>add(<span class="kw-2">&amp;mut </span><span class="self">self</span>, op1: MemOp, op2: Reg16) {
+<span class="kw">impl </span>Add&lt;Mem64, Reg64&gt; <span class="kw">for </span>Asm {
+    <span class="kw">fn </span>add(<span class="kw-2">&amp;mut </span><span class="self">self</span>, op1: Mem64, op2: Reg64) {
         <span class="self">self</span>.encode_mr(<span class="number">0x01</span>, op1, op2);
     }
 }
 
-<span class="kw">impl </span>Add&lt;MemOp, Imm8&gt; <span class="kw">for </span>Asm {
-    <span class="kw">fn </span>add(<span class="kw-2">&amp;mut </span><span class="self">self</span>, op1: MemOp, op2: Imm8) {
+<span class="kw">impl </span>Add&lt;Reg64, Mem64&gt; <span class="kw">for </span>Asm {
+    <span class="kw">fn </span>add(<span class="kw-2">&amp;mut </span><span class="self">self</span>, op1: Reg64, op2: Mem64) {
+        <span class="self">self</span>.encode_rm(<span class="number">0x03</span>, op1, op2);
+    }
+}
+
+<span class="kw">impl </span>Add&lt;Mem8, Imm8&gt; <span class="kw">for </span>Asm {
+    <span class="kw">fn </span>add(<span class="kw-2">&amp;mut </span><span class="self">self</span>, op1: Mem8, op2: Imm8) {
+        <span class="self">self</span>.encode_mi(<span class="number">0x80</span>, <span class="number">0</span>, op1, op2);
+    }
+}
+
+<span class="kw">impl </span>Add&lt;Mem16, Imm8&gt; <span class="kw">for </span>Asm {
+    <span class="kw">fn </span>add(<span class="kw-2">&amp;mut </span><span class="self">self</span>, op1: Mem16, op2: Imm8) {
         <span class="self">self</span>.encode_mi(<span class="number">0x83</span>, <span class="number">0</span>, op1, op2);
     }
 }
 
-<span class="kw">impl </span>Add&lt;MemOp, Imm16&gt; <span class="kw">for </span>Asm {
-    <span class="kw">fn </span>add(<span class="kw-2">&amp;mut </span><span class="self">self</span>, op1: MemOp, op2: Imm16) {
-        <span class="self">self</span>.encode_mi(<span class="number">0x81</span>, <span class="number">0</span>, op1, op2);
+<span class="kw">impl </span>Add&lt;Mem32, Imm8&gt; <span class="kw">for </span>Asm {
+    <span class="kw">fn </span>add(<span class="kw-2">&amp;mut </span><span class="self">self</span>, op1: Mem32, op2: Imm8) {
+        <span class="self">self</span>.encode_mi(<span class="number">0x83</span>, <span class="number">0</span>, op1, op2);
     }
 }
 
-<span class="kw">impl </span>Add&lt;Reg64, MemOp&gt; <span class="kw">for </span>Asm {
-    <span class="kw">fn </span>add(<span class="kw-2">&amp;mut </span><span class="self">self</span>, op1: Reg64, op2: MemOp) {
-        <span class="self">self</span>.encode_rm(<span class="number">0x03</span>, op1, op2);
+<span class="kw">impl </span>Add&lt;Mem64, Imm8&gt; <span class="kw">for </span>Asm {
+    <span class="kw">fn </span>add(<span class="kw-2">&amp;mut </span><span class="self">self</span>, op1: Mem64, op2: Imm8) {
+        <span class="self">self</span>.encode_mi(<span class="number">0x83</span>, <span class="number">0</span>, op1, op2);
+    }
+}
+
+<span class="kw">impl </span>Add&lt;Mem16, Imm16&gt; <span class="kw">for </span>Asm {
+    <span class="kw">fn </span>add(<span class="kw-2">&amp;mut </span><span class="self">self</span>, op1: Mem16, op2: Imm16) {
+        <span class="self">self</span>.encode_mi(<span class="number">0x81</span>, <span class="number">0</span>, op1, op2);
     }
 }
 </code></pre></div></section></main></body></html>
\ No newline at end of file
diff --git a/src/juicebox_asm/insn/cmp.rs.html b/src/juicebox_asm/insn/cmp.rs.html
index a4e5447..35bb5b7 100644
--- a/src/juicebox_asm/insn/cmp.rs.html
+++ b/src/juicebox_asm/insn/cmp.rs.html
@@ -13,16 +13,16 @@
 <a href="#12" id="12">12</a>
 <a href="#13" id="13">13</a>
 <a href="#14" id="14">14</a></pre></div><pre class="rust"><code><span class="kw">use </span><span class="kw">super</span>::Cmp;
-<span class="kw">use crate</span>::{Asm, Imm16, Imm8, MemOp};
+<span class="kw">use crate</span>::{Asm, Imm16, Imm8, Mem16, Mem8};
 
-<span class="kw">impl </span>Cmp&lt;MemOp, Imm8&gt; <span class="kw">for </span>Asm {
-    <span class="kw">fn </span>cmp(<span class="kw-2">&amp;mut </span><span class="self">self</span>, op1: MemOp, op2: Imm8) {
+<span class="kw">impl </span>Cmp&lt;Mem8, Imm8&gt; <span class="kw">for </span>Asm {
+    <span class="kw">fn </span>cmp(<span class="kw-2">&amp;mut </span><span class="self">self</span>, op1: Mem8, op2: Imm8) {
         <span class="self">self</span>.encode_mi(<span class="number">0x80</span>, <span class="number">0x7</span>, op1, op2);
     }
 }
 
-<span class="kw">impl </span>Cmp&lt;MemOp, Imm16&gt; <span class="kw">for </span>Asm {
-    <span class="kw">fn </span>cmp(<span class="kw-2">&amp;mut </span><span class="self">self</span>, op1: MemOp, op2: Imm16) {
+<span class="kw">impl </span>Cmp&lt;Mem16, Imm16&gt; <span class="kw">for </span>Asm {
+    <span class="kw">fn </span>cmp(<span class="kw-2">&amp;mut </span><span class="self">self</span>, op1: Mem16, op2: Imm16) {
         <span class="self">self</span>.encode_mi(<span class="number">0x81</span>, <span class="number">0x7</span>, op1, op2);
     }
 }
diff --git a/src/juicebox_asm/insn/dec.rs.html b/src/juicebox_asm/insn/dec.rs.html
index 7a05154..4bd9216 100644
--- a/src/juicebox_asm/insn/dec.rs.html
+++ b/src/juicebox_asm/insn/dec.rs.html
@@ -37,7 +37,7 @@
 <a href="#36" id="36">36</a>
 <a href="#37" id="37">37</a>
 <a href="#38" id="38">38</a></pre></div><pre class="rust"><code><span class="kw">use </span><span class="kw">super</span>::Dec;
-<span class="kw">use crate</span>::{Asm, MemOp16, MemOp32, MemOp64, MemOp8, Reg32, Reg64};
+<span class="kw">use crate</span>::{Asm, Mem16, Mem32, Mem64, Mem8, Reg32, Reg64};
 
 <span class="kw">impl </span>Dec&lt;Reg64&gt; <span class="kw">for </span>Asm {
     <span class="kw">fn </span>dec(<span class="kw-2">&amp;mut </span><span class="self">self</span>, op1: Reg64) {
@@ -51,26 +51,26 @@
     }
 }
 
-<span class="kw">impl </span>Dec&lt;MemOp8&gt; <span class="kw">for </span>Asm {
-    <span class="kw">fn </span>dec(<span class="kw-2">&amp;mut </span><span class="self">self</span>, op1: MemOp8) {
+<span class="kw">impl </span>Dec&lt;Mem8&gt; <span class="kw">for </span>Asm {
+    <span class="kw">fn </span>dec(<span class="kw-2">&amp;mut </span><span class="self">self</span>, op1: Mem8) {
         <span class="self">self</span>.encode_m(<span class="number">0xfe</span>, <span class="number">1</span>, op1);
     }
 }
 
-<span class="kw">impl </span>Dec&lt;MemOp16&gt; <span class="kw">for </span>Asm {
-    <span class="kw">fn </span>dec(<span class="kw-2">&amp;mut </span><span class="self">self</span>, op1: MemOp16) {
+<span class="kw">impl </span>Dec&lt;Mem16&gt; <span class="kw">for </span>Asm {
+    <span class="kw">fn </span>dec(<span class="kw-2">&amp;mut </span><span class="self">self</span>, op1: Mem16) {
         <span class="self">self</span>.encode_m(<span class="number">0xff</span>, <span class="number">1</span>, op1);
     }
 }
 
-<span class="kw">impl </span>Dec&lt;MemOp32&gt; <span class="kw">for </span>Asm {
-    <span class="kw">fn </span>dec(<span class="kw-2">&amp;mut </span><span class="self">self</span>, op1: MemOp32) {
+<span class="kw">impl </span>Dec&lt;Mem32&gt; <span class="kw">for </span>Asm {
+    <span class="kw">fn </span>dec(<span class="kw-2">&amp;mut </span><span class="self">self</span>, op1: Mem32) {
         <span class="self">self</span>.encode_m(<span class="number">0xff</span>, <span class="number">1</span>, op1);
     }
 }
 
-<span class="kw">impl </span>Dec&lt;MemOp64&gt; <span class="kw">for </span>Asm {
-    <span class="kw">fn </span>dec(<span class="kw-2">&amp;mut </span><span class="self">self</span>, op1: MemOp64) {
+<span class="kw">impl </span>Dec&lt;Mem64&gt; <span class="kw">for </span>Asm {
+    <span class="kw">fn </span>dec(<span class="kw-2">&amp;mut </span><span class="self">self</span>, op1: Mem64) {
         <span class="self">self</span>.encode_m(<span class="number">0xff</span>, <span class="number">1</span>, op1);
     }
 }
diff --git a/src/juicebox_asm/insn/inc.rs.html b/src/juicebox_asm/insn/inc.rs.html
index 05ce6bb..c559c66 100644
--- a/src/juicebox_asm/insn/inc.rs.html
+++ b/src/juicebox_asm/insn/inc.rs.html
@@ -37,7 +37,7 @@
 <a href="#36" id="36">36</a>
 <a href="#37" id="37">37</a>
 <a href="#38" id="38">38</a></pre></div><pre class="rust"><code><span class="kw">use </span><span class="kw">super</span>::Inc;
-<span class="kw">use crate</span>::{Asm, MemOp16, MemOp32, MemOp64, MemOp8, Reg32, Reg64};
+<span class="kw">use crate</span>::{Asm, Mem16, Mem32, Mem64, Mem8, Reg32, Reg64};
 
 <span class="kw">impl </span>Inc&lt;Reg64&gt; <span class="kw">for </span>Asm {
     <span class="kw">fn </span>inc(<span class="kw-2">&amp;mut </span><span class="self">self</span>, op1: Reg64) {
@@ -51,26 +51,26 @@
     }
 }
 
-<span class="kw">impl </span>Inc&lt;MemOp8&gt; <span class="kw">for </span>Asm {
-    <span class="kw">fn </span>inc(<span class="kw-2">&amp;mut </span><span class="self">self</span>, op1: MemOp8) {
+<span class="kw">impl </span>Inc&lt;Mem8&gt; <span class="kw">for </span>Asm {
+    <span class="kw">fn </span>inc(<span class="kw-2">&amp;mut </span><span class="self">self</span>, op1: Mem8) {
         <span class="self">self</span>.encode_m(<span class="number">0xfe</span>, <span class="number">0</span>, op1);
     }
 }
 
-<span class="kw">impl </span>Inc&lt;MemOp16&gt; <span class="kw">for </span>Asm {
-    <span class="kw">fn </span>inc(<span class="kw-2">&amp;mut </span><span class="self">self</span>, op1: MemOp16) {
+<span class="kw">impl </span>Inc&lt;Mem16&gt; <span class="kw">for </span>Asm {
+    <span class="kw">fn </span>inc(<span class="kw-2">&amp;mut </span><span class="self">self</span>, op1: Mem16) {
         <span class="self">self</span>.encode_m(<span class="number">0xff</span>, <span class="number">0</span>, op1);
     }
 }
 
-<span class="kw">impl </span>Inc&lt;MemOp32&gt; <span class="kw">for </span>Asm {
-    <span class="kw">fn </span>inc(<span class="kw-2">&amp;mut </span><span class="self">self</span>, op1: MemOp32) {
+<span class="kw">impl </span>Inc&lt;Mem32&gt; <span class="kw">for </span>Asm {
+    <span class="kw">fn </span>inc(<span class="kw-2">&amp;mut </span><span class="self">self</span>, op1: Mem32) {
         <span class="self">self</span>.encode_m(<span class="number">0xff</span>, <span class="number">0</span>, op1);
     }
 }
 
-<span class="kw">impl </span>Inc&lt;MemOp64&gt; <span class="kw">for </span>Asm {
-    <span class="kw">fn </span>inc(<span class="kw-2">&amp;mut </span><span class="self">self</span>, op1: MemOp64) {
+<span class="kw">impl </span>Inc&lt;Mem64&gt; <span class="kw">for </span>Asm {
+    <span class="kw">fn </span>inc(<span class="kw-2">&amp;mut </span><span class="self">self</span>, op1: Mem64) {
         <span class="self">self</span>.encode_m(<span class="number">0xff</span>, <span class="number">0</span>, op1);
     }
 }
diff --git a/src/juicebox_asm/insn/mov.rs.html b/src/juicebox_asm/insn/mov.rs.html
index 5bd4111..ab91c85 100644
--- a/src/juicebox_asm/insn/mov.rs.html
+++ b/src/juicebox_asm/insn/mov.rs.html
@@ -113,7 +113,7 @@
 <a href="#112" id="112">112</a>
 <a href="#113" id="113">113</a>
 <a href="#114" id="114">114</a></pre></div><pre class="rust"><code><span class="kw">use </span><span class="kw">super</span>::Mov;
-<span class="kw">use crate</span>::{Asm, Imm16, Imm32, Imm64, Imm8, MemOp, Reg16, Reg32, Reg64, Reg8};
+<span class="kw">use crate</span>::{Asm, Imm16, Imm32, Imm64, Imm8, Mem16, Mem32, Mem64, Mem8, Reg16, Reg32, Reg64, Reg8};
 
 <span class="comment">// -- MOV : reg reg
 
@@ -143,52 +143,52 @@
 
 <span class="comment">// -- MOV : mem reg
 
-</span><span class="kw">impl </span>Mov&lt;MemOp, Reg64&gt; <span class="kw">for </span>Asm {
-    <span class="kw">fn </span>mov(<span class="kw-2">&amp;mut </span><span class="self">self</span>, op1: MemOp, op2: Reg64) {
+</span><span class="kw">impl </span>Mov&lt;Mem64, Reg64&gt; <span class="kw">for </span>Asm {
+    <span class="kw">fn </span>mov(<span class="kw-2">&amp;mut </span><span class="self">self</span>, op1: Mem64, op2: Reg64) {
         <span class="self">self</span>.encode_mr(<span class="number">0x89</span>, op1, op2);
     }
 }
 
-<span class="kw">impl </span>Mov&lt;MemOp, Reg32&gt; <span class="kw">for </span>Asm {
-    <span class="kw">fn </span>mov(<span class="kw-2">&amp;mut </span><span class="self">self</span>, op1: MemOp, op2: Reg32) {
+<span class="kw">impl </span>Mov&lt;Mem32, Reg32&gt; <span class="kw">for </span>Asm {
+    <span class="kw">fn </span>mov(<span class="kw-2">&amp;mut </span><span class="self">self</span>, op1: Mem32, op2: Reg32) {
         <span class="self">self</span>.encode_mr(<span class="number">0x89</span>, op1, op2);
     }
 }
 
-<span class="kw">impl </span>Mov&lt;MemOp, Reg16&gt; <span class="kw">for </span>Asm {
-    <span class="kw">fn </span>mov(<span class="kw-2">&amp;mut </span><span class="self">self</span>, op1: MemOp, op2: Reg16) {
+<span class="kw">impl </span>Mov&lt;Mem16, Reg16&gt; <span class="kw">for </span>Asm {
+    <span class="kw">fn </span>mov(<span class="kw-2">&amp;mut </span><span class="self">self</span>, op1: Mem16, op2: Reg16) {
         <span class="self">self</span>.encode_mr(<span class="number">0x89</span>, op1, op2);
     }
 }
 
-<span class="kw">impl </span>Mov&lt;MemOp, Reg8&gt; <span class="kw">for </span>Asm {
-    <span class="kw">fn </span>mov(<span class="kw-2">&amp;mut </span><span class="self">self</span>, op1: MemOp, op2: Reg8) {
+<span class="kw">impl </span>Mov&lt;Mem8, Reg8&gt; <span class="kw">for </span>Asm {
+    <span class="kw">fn </span>mov(<span class="kw-2">&amp;mut </span><span class="self">self</span>, op1: Mem8, op2: Reg8) {
         <span class="self">self</span>.encode_mr(<span class="number">0x88</span>, op1, op2);
     }
 }
 
 <span class="comment">// -- MOV : reg mem
 
-</span><span class="kw">impl </span>Mov&lt;Reg64, MemOp&gt; <span class="kw">for </span>Asm {
-    <span class="kw">fn </span>mov(<span class="kw-2">&amp;mut </span><span class="self">self</span>, op1: Reg64, op2: MemOp) {
+</span><span class="kw">impl </span>Mov&lt;Reg64, Mem64&gt; <span class="kw">for </span>Asm {
+    <span class="kw">fn </span>mov(<span class="kw-2">&amp;mut </span><span class="self">self</span>, op1: Reg64, op2: Mem64) {
         <span class="self">self</span>.encode_rm(<span class="number">0x8b</span>, op1, op2);
     }
 }
 
-<span class="kw">impl </span>Mov&lt;Reg32, MemOp&gt; <span class="kw">for </span>Asm {
-    <span class="kw">fn </span>mov(<span class="kw-2">&amp;mut </span><span class="self">self</span>, op1: Reg32, op2: MemOp) {
+<span class="kw">impl </span>Mov&lt;Reg32, Mem32&gt; <span class="kw">for </span>Asm {
+    <span class="kw">fn </span>mov(<span class="kw-2">&amp;mut </span><span class="self">self</span>, op1: Reg32, op2: Mem32) {
         <span class="self">self</span>.encode_rm(<span class="number">0x8b</span>, op1, op2);
     }
 }
 
-<span class="kw">impl </span>Mov&lt;Reg16, MemOp&gt; <span class="kw">for </span>Asm {
-    <span class="kw">fn </span>mov(<span class="kw-2">&amp;mut </span><span class="self">self</span>, op1: Reg16, op2: MemOp) {
+<span class="kw">impl </span>Mov&lt;Reg16, Mem16&gt; <span class="kw">for </span>Asm {
+    <span class="kw">fn </span>mov(<span class="kw-2">&amp;mut </span><span class="self">self</span>, op1: Reg16, op2: Mem16) {
         <span class="self">self</span>.encode_rm(<span class="number">0x8b</span>, op1, op2);
     }
 }
 
-<span class="kw">impl </span>Mov&lt;Reg8, MemOp&gt; <span class="kw">for </span>Asm {
-    <span class="kw">fn </span>mov(<span class="kw-2">&amp;mut </span><span class="self">self</span>, op1: Reg8, op2: MemOp) {
+<span class="kw">impl </span>Mov&lt;Reg8, Mem8&gt; <span class="kw">for </span>Asm {
+    <span class="kw">fn </span>mov(<span class="kw-2">&amp;mut </span><span class="self">self</span>, op1: Reg8, op2: Mem8) {
         <span class="self">self</span>.encode_rm(<span class="number">0x8a</span>, op1, op2);
     }
 }
@@ -221,8 +221,8 @@
 
 <span class="comment">// -- MOV : mem imm
 
-</span><span class="kw">impl </span>Mov&lt;MemOp, Imm16&gt; <span class="kw">for </span>Asm {
-    <span class="kw">fn </span>mov(<span class="kw-2">&amp;mut </span><span class="self">self</span>, op1: MemOp, op2: Imm16) {
+</span><span class="kw">impl </span>Mov&lt;Mem16, Imm16&gt; <span class="kw">for </span>Asm {
+    <span class="kw">fn </span>mov(<span class="kw-2">&amp;mut </span><span class="self">self</span>, op1: Mem16, op2: Imm16) {
         <span class="self">self</span>.encode_mi(<span class="number">0xc7</span>, <span class="number">0</span>, op1, op2);
     }
 }
diff --git a/src/juicebox_asm/insn/sub.rs.html b/src/juicebox_asm/insn/sub.rs.html
index f350d05..b385a09 100644
--- a/src/juicebox_asm/insn/sub.rs.html
+++ b/src/juicebox_asm/insn/sub.rs.html
@@ -13,7 +13,7 @@
 <a href="#12" id="12">12</a>
 <a href="#13" id="13">13</a>
 <a href="#14" id="14">14</a></pre></div><pre class="rust"><code><span class="kw">use </span><span class="kw">super</span>::Sub;
-<span class="kw">use crate</span>::{Asm, Imm8, MemOp, Reg64};
+<span class="kw">use crate</span>::{Asm, Imm8, Mem8, Reg64};
 
 <span class="kw">impl </span>Sub&lt;Reg64, Reg64&gt; <span class="kw">for </span>Asm {
     <span class="kw">fn </span>sub(<span class="kw-2">&amp;mut </span><span class="self">self</span>, op1: Reg64, op2: Reg64) {
@@ -21,9 +21,9 @@
     }
 }
 
-<span class="kw">impl </span>Sub&lt;MemOp, Imm8&gt; <span class="kw">for </span>Asm {
-    <span class="kw">fn </span>sub(<span class="kw-2">&amp;mut </span><span class="self">self</span>, op1: MemOp, op2: Imm8) {
-        <span class="self">self</span>.encode_mi(<span class="number">0x83</span>, <span class="number">5</span>, op1, op2);
+<span class="kw">impl </span>Sub&lt;Mem8, Imm8&gt; <span class="kw">for </span>Asm {
+    <span class="kw">fn </span>sub(<span class="kw-2">&amp;mut </span><span class="self">self</span>, op1: Mem8, op2: Imm8) {
+        <span class="self">self</span>.encode_mi(<span class="number">0x80</span>, <span class="number">5</span>, op1, op2);
     }
 }
 </code></pre></div></section></main></body></html>
\ No newline at end of file
diff --git a/src/juicebox_asm/insn/test.rs.html b/src/juicebox_asm/insn/test.rs.html
index 4c9bd7d..32339bc 100644
--- a/src/juicebox_asm/insn/test.rs.html
+++ b/src/juicebox_asm/insn/test.rs.html
@@ -19,7 +19,7 @@
 <a href="#18" id="18">18</a>
 <a href="#19" id="19">19</a>
 <a href="#20" id="20">20</a></pre></div><pre class="rust"><code><span class="kw">use </span><span class="kw">super</span>::Test;
-<span class="kw">use crate</span>::{Asm, Imm16, MemOp, Reg32, Reg64};
+<span class="kw">use crate</span>::{Asm, Imm16, Mem16, Reg32, Reg64};
 
 <span class="kw">impl </span>Test&lt;Reg64, Reg64&gt; <span class="kw">for </span>Asm {
     <span class="kw">fn </span>test(<span class="kw-2">&amp;mut </span><span class="self">self</span>, op1: Reg64, op2: Reg64) {
@@ -33,8 +33,8 @@
     }
 }
 
-<span class="kw">impl </span>Test&lt;MemOp, Imm16&gt; <span class="kw">for </span>Asm {
-    <span class="kw">fn </span>test(<span class="kw-2">&amp;mut </span><span class="self">self</span>, op1: MemOp, op2: Imm16) {
+<span class="kw">impl </span>Test&lt;Mem16, Imm16&gt; <span class="kw">for </span>Asm {
+    <span class="kw">fn </span>test(<span class="kw-2">&amp;mut </span><span class="self">self</span>, op1: Mem16, op2: Imm16) {
         <span class="self">self</span>.encode_mi(<span class="number">0xf7</span>, <span class="number">0</span>, op1, op2);
     }
 }