mu.subx: switch SubX instruction names to globals

Entirely using interactive search-and-replace in my text editor.

This is all ugly as hell. But get it working first.

1 files changed, 81 insertions, 81 deletions

diff --git a/apps/mu.subx b/apps/mu.subx
index ff4c933e..94d1dd0b 100644
--- a/apps/mu.subx
+++ b/apps/mu.subx
@@ -9372,7 +9372,7 @@ _Primitive-and-with-eax:
     0x11/imm32/alloc-id:fake
     Single-int-var-in-eax/imm32/outputs
     0x11/imm32/alloc-id:fake
-    "25/and-with-eax"/imm32/subx-name
+    _string_25_and_with_eax/imm32/subx-name
     0/imm32/no-rm32
     0/imm32/no-r32
     1/imm32/imm32-is-first-inout
@@ -9390,7 +9390,7 @@ _Primitive-and-reg-with-reg:
     0x11/imm32/alloc-id:fake
     Single-int-var-in-some-register/imm32/outputs
     0x11/imm32/alloc-id:fake
-    "21/and-with"/imm32/subx-name
+    _string_21_and_with/imm32/subx-name
     3/imm32/rm32-is-first-output
     1/imm32/r32-is-first-inout
     0/imm32/no-imm32
@@ -9408,7 +9408,7 @@ _Primitive-and-reg-with-mem:
     0/imm32/no-outputs
     0/imm32/no-outputs
     0x11/imm32/alloc-id:fake
-    "21/and-with"/imm32/subx-name
+    _string_21_and_with/imm32/subx-name
     1/imm32/rm32-is-first-inout
     2/imm32/r32-is-second-inout
     0/imm32/no-imm32
@@ -9426,7 +9426,7 @@ _Primitive-and-mem-with-reg:
     0x11/imm32/alloc-id:fake
     Single-int-var-in-some-register/imm32/outputs
     0x11/imm32/alloc-id:fake
-    "23/and"/imm32/subx-name
+    _string_23_and/imm32/subx-name
     1/imm32/rm32-is-first-inout
     3/imm32/r32-is-first-output
     0/imm32/no-imm32
@@ -9444,7 +9444,7 @@ _Primitive-and-lit-with-reg:
     0x11/imm32/alloc-id:fake
     Single-int-var-in-some-register/imm32/outputs
     0x11/imm32/alloc-id:fake
-    "81 4/subop/and"/imm32/subx-name
+    _string_81_subop_and/imm32/subx-name
     3/imm32/rm32-is-first-output
     0/imm32/no-r32
     1/imm32/imm32-is-first-inout
@@ -9462,7 +9462,7 @@ _Primitive-and-lit-with-mem:
     0/imm32/no-outputs
     0/imm32/no-outputs
     0x11/imm32/alloc-id:fake
-    "81 4/subop/and"/imm32/subx-name
+    _string_81_subop_and/imm32/subx-name
     1/imm32/rm32-is-first-inout
     0/imm32/no-r32
     2/imm32/imm32-is-first-inout
@@ -9481,7 +9481,7 @@ _Primitive-or-with-eax:
     0x11/imm32/alloc-id:fake
     Single-int-var-in-eax/imm32/outputs
     0x11/imm32/alloc-id:fake
-    "0d/or-with-eax"/imm32/subx-name
+    _string_0d_or_with_eax/imm32/subx-name
     0/imm32/no-rm32
     0/imm32/no-r32
     1/imm32/imm32-is-first-inout
@@ -9499,7 +9499,7 @@ _Primitive-or-reg-with-reg:
     0x11/imm32/alloc-id:fake
     Single-int-var-in-some-register/imm32/outputs
     0x11/imm32/alloc-id:fake
-    "09/or-with"/imm32/subx-name
+    _string_09_or_with/imm32/subx-name
     3/imm32/rm32-is-first-output
     1/imm32/r32-is-first-inout
     0/imm32/no-imm32
@@ -9517,7 +9517,7 @@ _Primitive-or-reg-with-mem:
     0/imm32/no-outputs
     0/imm32/no-outputs
     0x11/imm32/alloc-id:fake
-    "09/or-with"/imm32/subx-name
+    _string_09_or_with/imm32/subx-name
     1/imm32/rm32-is-first-inout
     2/imm32/r32-is-second-inout
     0/imm32/no-imm32
@@ -9535,7 +9535,7 @@ _Primitive-or-mem-with-reg:
     0x11/imm32/alloc-id:fake
     Single-int-var-in-some-register/imm32/outputs
     0x11/imm32/alloc-id:fake
-    "0b/or"/imm32/subx-name
+    _string_0b_or/imm32/subx-name
     1/imm32/rm32-is-first-inout
     3/imm32/r32-is-first-output
     0/imm32/no-imm32
@@ -9553,7 +9553,7 @@ _Primitive-or-lit-with-reg:
     0x11/imm32/alloc-id:fake
     Single-int-var-in-some-register/imm32/outputs
     0x11/imm32/alloc-id:fake
-    "81 1/subop/or"/imm32/subx-name
+    _string_81_subop_or/imm32/subx-name
     3/imm32/rm32-is-first-output
     0/imm32/no-r32
     1/imm32/imm32-is-first-inout
@@ -9571,7 +9571,7 @@ _Primitive-or-lit-with-mem:
     0/imm32/no-outputs
     0/imm32/no-outputs
     0x11/imm32/alloc-id:fake
-    "81 1/subop/or"/imm32/subx-name
+    _string_81_subop_or/imm32/subx-name
     1/imm32/rm32-is-first-inout
     0/imm32/no-r32
     2/imm32/imm32-is-second-inout
@@ -9590,7 +9590,7 @@ _Primitive-xor-with-eax:
     0x11/imm32/alloc-id:fake
     Single-int-var-in-eax/imm32/outputs
     0x11/imm32/alloc-id:fake
-    "35/xor-with-eax"/imm32/subx-name
+    _string_35_xor_with_eax/imm32/subx-name
     0/imm32/no-rm32
     0/imm32/no-r32
     1/imm32/imm32-is-first-inout
@@ -9608,7 +9608,7 @@ _Primitive-xor-reg-with-reg:
     0x11/imm32/alloc-id:fake
     Single-int-var-in-some-register/imm32/outputs
     0x11/imm32/alloc-id:fake
-    "31/xor-with"/imm32/subx-name
+    _string_31_xor_with/imm32/subx-name
     3/imm32/rm32-is-first-output
     1/imm32/r32-is-first-inout
     0/imm32/no-imm32
@@ -9626,7 +9626,7 @@ _Primitive-xor-reg-with-mem:
     0/imm32/no-outputs
     0/imm32/no-outputs
     0x11/imm32/alloc-id:fake
-    "31/xor-with"/imm32/subx-name
+    _string_31_xor_with/imm32/subx-name
     1/imm32/rm32-is-first-inout
     2/imm32/r32-is-second-inout
     0/imm32/no-imm32
@@ -9644,7 +9644,7 @@ _Primitive-xor-mem-with-reg:
     0x11/imm32/alloc-id:fake
     Single-int-var-in-some-register/imm32/outputs
     0x11/imm32/alloc-id:fake
-    "33/xor"/imm32/subx-name
+    _string_33_xor/imm32/subx-name
     1/imm32/rm32-is-first-inout
     3/imm32/r32-is-first-output
     0/imm32/no-imm32
@@ -9662,7 +9662,7 @@ _Primitive-xor-lit-with-reg:
     0x11/imm32/alloc-id:fake
     Single-int-var-in-some-register/imm32/outputs
     0x11/imm32/alloc-id:fake
-    "81 6/subop/xor"/imm32/subx-name
+    _string_81_subop_xor/imm32/subx-name
     3/imm32/rm32-is-first-output
     0/imm32/no-r32
     1/imm32/imm32-is-first-inout
@@ -9680,7 +9680,7 @@ _Primitive-xor-lit-with-mem:
     0/imm32/no-outputs
     0/imm32/no-outputs
     0x11/imm32/alloc-id:fake
-    "81 6/subop/xor"/imm32/subx-name
+    _string_81_subop_xor/imm32/subx-name
     1/imm32/rm32-is-first-inout
     0/imm32/no-r32
     2/imm32/imm32-is-first-inout
@@ -9699,7 +9699,7 @@ _Primitive-copy-to-eax:
     0x11/imm32/alloc-id:fake
     Single-int-var-in-eax/imm32/outputs
     0x11/imm32/alloc-id:fake
-    "b8/copy-to-eax"/imm32/subx-name
+    _string_b8_copy_to_eax/imm32/subx-name
     0/imm32/no-rm32
     0/imm32/no-r32
     1/imm32/imm32-is-first-inout
@@ -9717,7 +9717,7 @@ _Primitive-copy-to-ecx:
     0x11/imm32/alloc-id:fake
     Single-int-var-in-ecx/imm32/outputs
     0x11/imm32/alloc-id:fake
-    "b9/copy-to-ecx"/imm32/subx-name
+    _string_b9_copy_to_ecx/imm32/subx-name
     0/imm32/no-rm32
     0/imm32/no-r32
     1/imm32/imm32-is-first-inout
@@ -9735,7 +9735,7 @@ _Primitive-copy-to-edx:
     0x11/imm32/alloc-id:fake
     Single-int-var-in-edx/imm32/outputs
     0x11/imm32/alloc-id:fake
-    "ba/copy-to-edx"/imm32/subx-name
+    _string_ba_copy_to_edx/imm32/subx-name
     0/imm32/no-rm32
     0/imm32/no-r32
     1/imm32/imm32-is-first-inout
@@ -9753,7 +9753,7 @@ _Primitive-copy-to-ebx:
     0x11/imm32/alloc-id:fake
     Single-int-var-in-ebx/imm32/outputs
     0x11/imm32/alloc-id:fake
-    "bb/copy-to-ebx"/imm32/subx-name
+    _string_bb_copy_to_ebx/imm32/subx-name
     0/imm32/no-rm32
     0/imm32/no-r32
     1/imm32/imm32-is-first-inout
@@ -9771,7 +9771,7 @@ _Primitive-copy-to-esi:
     0x11/imm32/alloc-id:fake
     Single-int-var-in-esi/imm32/outputs
     0x11/imm32/alloc-id:fake
-    "be/copy-to-esi"/imm32/subx-name
+    _string_be_copy_to_esi/imm32/subx-name
     0/imm32/no-rm32
     0/imm32/no-r32
     1/imm32/imm32-is-first-inout
@@ -9789,7 +9789,7 @@ _Primitive-copy-to-edi:
     0x11/imm32/alloc-id:fake
     Single-int-var-in-edi/imm32/outputs
     0x11/imm32/alloc-id:fake
-    "bf/copy-to-edi"/imm32/subx-name
+    _string_bf_copy_to_edi/imm32/subx-name
     0/imm32/no-rm32
     0/imm32/no-r32
     1/imm32/imm32-is-first-inout
@@ -9807,7 +9807,7 @@ _Primitive-copy-reg-to-reg:
     0x11/imm32/alloc-id:fake
     Single-int-var-in-some-register/imm32/outputs
     0x11/imm32/alloc-id:fake
-    "89/<-"/imm32/subx-name
+    _string_89_<-/imm32/subx-name
     3/imm32/rm32-is-first-output
     1/imm32/r32-is-first-inout
     0/imm32/no-imm32
@@ -9825,7 +9825,7 @@ _Primitive-copy-reg-to-mem:
     0/imm32/no-outputs
     0/imm32/no-outputs
     0x11/imm32/alloc-id:fake
-    "89/<-"/imm32/subx-name
+    _string_89_<-/imm32/subx-name
     1/imm32/rm32-is-first-inout
     2/imm32/r32-is-second-inout
     0/imm32/no-imm32
@@ -9843,7 +9843,7 @@ _Primitive-copy-mem-to-reg:
     0x11/imm32/alloc-id:fake
     Single-int-var-in-some-register/imm32/outputs
     0x11/imm32/alloc-id:fake
-    "8b/->"/imm32/subx-name
+    _string_8b_->/imm32/subx-name
     1/imm32/rm32-is-first-inout
     3/imm32/r32-is-first-output
     0/imm32/no-imm32
@@ -9861,7 +9861,7 @@ _Primitive-copy-lit-to-reg:
     0x11/imm32/alloc-id:fake
     Single-int-var-in-some-register/imm32/outputs
     0x11/imm32/alloc-id:fake
-    "c7 0/subop/copy"/imm32/subx-name
+    _string_c7_subop_copy/imm32/subx-name
     3/imm32/rm32-is-first-output
     0/imm32/no-r32
     1/imm32/imm32-is-first-inout
@@ -9879,7 +9879,7 @@ _Primitive-copy-lit-to-mem:
     0/imm32/no-outputs
     0/imm32/no-outputs
     0x11/imm32/alloc-id:fake
-    "c7 0/subop/copy"/imm32/subx-name
+    _string_c7_subop_copy/imm32/subx-name
     1/imm32/rm32-is-first-inout
     0/imm32/no-r32
     2/imm32/imm32-is-first-inout
@@ -9898,7 +9898,7 @@ _Primitive-address:
     0x11/imm32/alloc-id:fake
     Single-addr-var-in-some-register/imm32/outputs
     0x11/imm32/alloc-id:fake
-    "8d/copy-address"/imm32/subx-name
+    _string_8d_copy_address/imm32/subx-name
     1/imm32/rm32-is-first-inout
     3/imm32/r32-is-first-output
     0/imm32/no-imm32
@@ -9917,7 +9917,7 @@ _Primitive-compare-mem-with-reg:
     0/imm32/no-outputs
     0/imm32/no-outputs
     0x11/imm32/alloc-id:fake
-    "39/compare->"/imm32/subx-name
+    _string_39_compare->/imm32/subx-name
     1/imm32/rm32-is-first-inout
     2/imm32/r32-is-second-inout
     0/imm32/no-imm32
@@ -9935,7 +9935,7 @@ _Primitive-compare-reg-with-mem:
     0/imm32/no-outputs
     0/imm32/no-outputs
     0x11/imm32/alloc-id:fake
-    "3b/compare<-"/imm32/subx-name
+    _string_3b_compare<-/imm32/subx-name
     2/imm32/rm32-is-second-inout
     1/imm32/r32-is-first-inout
     0/imm32/no-imm32
@@ -9953,7 +9953,7 @@ _Primitive-compare-eax-with-literal:
     0/imm32/no-outputs
     0/imm32/no-outputs
     0x11/imm32/alloc-id:fake
-    "3d/compare-eax-with"/imm32/subx-name
+    _string_3d_compare_eax_with/imm32/subx-name
     0/imm32/no-rm32
     0/imm32/no-r32
     2/imm32/imm32-is-second-inout
@@ -9971,7 +9971,7 @@ _Primitive-compare-reg-with-literal:
     0/imm32/no-outputs
     0/imm32/no-outputs
     0x11/imm32/alloc-id:fake
-    "81 7/subop/compare"/imm32/subx-name
+    _string_81_subop_compare/imm32/subx-name
     1/imm32/rm32-is-first-inout
     0/imm32/no-r32
     2/imm32/imm32-is-second-inout
@@ -9989,7 +9989,7 @@ _Primitive-compare-mem-with-literal:
     0/imm32/no-outputs
     0/imm32/no-outputs
     0x11/imm32/alloc-id:fake
-    "81 7/subop/compare"/imm32/subx-name
+    _string_81_subop_compare/imm32/subx-name
     1/imm32/rm32-is-first-inout
     0/imm32/no-r32
     2/imm32/imm32-is-second-inout
@@ -10008,7 +10008,7 @@ _Primitive-multiply-reg-by-mem:
     0x11/imm32/alloc-id:fake
     Single-int-var-in-some-register/imm32/outputs
     0x11/imm32/alloc-id:fake
-    "0f af/multiply"/imm32/subx-name
+    _string_0f_af_multiply/imm32/subx-name
     1/imm32/rm32-is-first-inout
     3/imm32/r32-is-first-output
     0/imm32/no-imm32
@@ -10026,7 +10026,7 @@ _Primitive-break-if-addr<:
     0/imm32/no-outputs
     0/imm32/no-outputs
     0x11/imm32/alloc-id:fake
-    "0f 82/jump-if-addr< break/disp32"/imm32/subx-name
+    _string_0f_82_jump_break/imm32/subx-name
     0/imm32/no-rm32
     0/imm32/no-r32
     0/imm32/no-imm32
@@ -10043,7 +10043,7 @@ _Primitive-break-if-addr>=:
     0/imm32/no-outputs
     0/imm32/no-outputs
     0x11/imm32/alloc-id:fake
-    "0f 83/jump-if-addr>= break/disp32"/imm32/subx-name
+    _string_0f_83_jump_break/imm32/subx-name
     0/imm32/no-rm32
     0/imm32/no-r32
     0/imm32/no-imm32
@@ -10060,7 +10060,7 @@ _Primitive-break-if-=:
     0/imm32/no-outputs
     0/imm32/no-outputs
     0x11/imm32/alloc-id:fake
-    "0f 84/jump-if-= break/disp32"/imm32/subx-name
+    _string_0f_84_jump_break/imm32/subx-name
     0/imm32/no-rm32
     0/imm32/no-r32
     0/imm32/no-imm32
@@ -10077,7 +10077,7 @@ _Primitive-break-if-!=:
     0/imm32/no-outputs
     0/imm32/no-outputs
     0x11/imm32/alloc-id:fake
-    "0f 85/jump-if-!= break/disp32"/imm32/subx-name
+    _string_0f_85_jump_break/imm32/subx-name
     0/imm32/no-rm32
     0/imm32/no-r32
     0/imm32/no-imm32
@@ -10094,7 +10094,7 @@ _Primitive-break-if-addr<=:
     0/imm32/no-outputs
     0/imm32/no-outputs
     0x11/imm32/alloc-id:fake
-    "0f 86/jump-if-addr<= break/disp32"/imm32/subx-name
+    _string_0f_86_jump_break/imm32/subx-name
     0/imm32/no-rm32
     0/imm32/no-r32
     0/imm32/no-imm32
@@ -10111,7 +10111,7 @@ _Primitive-break-if-addr>:
     0/imm32/no-outputs
     0/imm32/no-outputs
     0x11/imm32/alloc-id:fake
-    "0f 87/jump-if-addr> break/disp32"/imm32/subx-name
+    _string_0f_87_jump_break/imm32/subx-name
     0/imm32/no-rm32
     0/imm32/no-r32
     0/imm32/no-imm32
@@ -10128,7 +10128,7 @@ _Primitive-break-if-<:
     0/imm32/no-outputs
     0/imm32/no-outputs
     0x11/imm32/alloc-id:fake
-    "0f 8c/jump-if-< break/disp32"/imm32/subx-name
+    _string_0f_8c_jump_break/imm32/subx-name
     0/imm32/no-rm32
     0/imm32/no-r32
     0/imm32/no-imm32
@@ -10145,7 +10145,7 @@ _Primitive-break-if->=:
     0/imm32/no-outputs
     0/imm32/no-outputs
     0x11/imm32/alloc-id:fake
-    "0f 8d/jump-if->= break/disp32"/imm32/subx-name
+    _string_0f_8d_jump_break/imm32/subx-name
     0/imm32/no-rm32
     0/imm32/no-r32
     0/imm32/no-imm32
@@ -10162,7 +10162,7 @@ _Primitive-break-if-<=:
     0/imm32/no-outputs
     0/imm32/no-outputs
     0x11/imm32/alloc-id:fake
-    "0f 8e/jump-if-<= break/disp32"/imm32/subx-name
+    _string_0f_8e_jump_break/imm32/subx-name
     0/imm32/no-rm32
     0/imm32/no-r32
     0/imm32/no-imm32
@@ -10179,7 +10179,7 @@ _Primitive-break-if->:
     0/imm32/no-outputs
     0/imm32/no-outputs
     0x11/imm32/alloc-id:fake
-    "0f 8f/jump-if-> break/disp32"/imm32/subx-name
+    _string_0f_8f_jump_break/imm32/subx-name
     0/imm32/no-rm32
     0/imm32/no-r32
     0/imm32/no-imm32
@@ -10196,7 +10196,7 @@ _Primitive-break:
     0/imm32/no-outputs
     0/imm32/no-outputs
     0x11/imm32/alloc-id:fake
-    "e9/jump break/disp32"/imm32/subx-name
+    _string_e9_jump_break/imm32/subx-name
     0/imm32/no-rm32
     0/imm32/no-r32
     0/imm32/no-imm32
@@ -10213,7 +10213,7 @@ _Primitive-loop-if-addr<:
     0/imm32/no-outputs
     0/imm32/no-outputs
     0x11/imm32/alloc-id:fake
-    "0f 82/jump-if-addr< loop/disp32"/imm32/subx-name
+    _string_0f_82_jump_loop/imm32/subx-name
     0/imm32/no-rm32
     0/imm32/no-r32
     0/imm32/no-imm32
@@ -10230,7 +10230,7 @@ _Primitive-loop-if-addr>=:
     0/imm32/no-outputs
     0/imm32/no-outputs
     0x11/imm32/alloc-id:fake
-    "0f 83/jump-if-addr>= loop/disp32"/imm32/subx-name
+    _string_0f_83_jump_loop/imm32/subx-name
     0/imm32/no-rm32
     0/imm32/no-r32
     0/imm32/no-imm32
@@ -10247,7 +10247,7 @@ _Primitive-loop-if-=:
     0/imm32/no-outputs
     0/imm32/no-outputs
     0x11/imm32/alloc-id:fake
-    "0f 84/jump-if-= loop/disp32"/imm32/subx-name
+    _string_0f_84_jump_loop/imm32/subx-name
     0/imm32/no-rm32
     0/imm32/no-r32
     0/imm32/no-imm32
@@ -10264,7 +10264,7 @@ _Primitive-loop-if-!=:
     0/imm32/no-outputs
     0/imm32/no-outputs
     0x11/imm32/alloc-id:fake
-    "0f 85/jump-if-!= loop/disp32"/imm32/subx-name
+    _string_0f_85_jump_loop/imm32/subx-name
     0/imm32/no-rm32
     0/imm32/no-r32
     0/imm32/no-imm32
@@ -10281,7 +10281,7 @@ _Primitive-loop-if-addr<=:
     0/imm32/no-outputs
     0/imm32/no-outputs
     0x11/imm32/alloc-id:fake
-    "0f 86/jump-if-addr<= loop/disp32"/imm32/subx-name
+    _string_0f_86_jump_loop/imm32/subx-name
     0/imm32/no-rm32
     0/imm32/no-r32
     0/imm32/no-imm32
@@ -10298,7 +10298,7 @@ _Primitive-loop-if-addr>:
     0/imm32/no-outputs
     0/imm32/no-outputs
     0x11/imm32/alloc-id:fake
-    "0f 87/jump-if-addr> loop/disp32"/imm32/subx-name
+    _string_0f_87_jump_loop/imm32/subx-name
     0/imm32/no-rm32
     0/imm32/no-r32
     0/imm32/no-imm32
@@ -10315,7 +10315,7 @@ _Primitive-loop-if-<:
     0/imm32/no-outputs
     0/imm32/no-outputs
     0x11/imm32/alloc-id:fake
-    "0f 8c/jump-if-< loop/disp32"/imm32/subx-name
+    _string_0f_8c_jump_loop/imm32/subx-name
     0/imm32/no-rm32
     0/imm32/no-r32
     0/imm32/no-imm32
@@ -10332,7 +10332,7 @@ _Primitive-loop-if->=:
     0/imm32/no-outputs
     0/imm32/no-outputs
     0x11/imm32/alloc-id:fake
-    "0f 8d/jump-if->= loop/disp32"/imm32/subx-name
+    _string_0f_8d_jump_loop/imm32/subx-name
     0/imm32/no-rm32
     0/imm32/no-r32
     0/imm32/no-imm32
@@ -10349,7 +10349,7 @@ _Primitive-loop-if-<=:
     0/imm32/no-outputs
     0/imm32/no-outputs
     0x11/imm32/alloc-id:fake
-    "0f 8e/jump-if-<= loop/disp32"/imm32/subx-name
+    _string_0f_8e_jump_loop/imm32/subx-name
     0/imm32/no-rm32
     0/imm32/no-r32
     0/imm32/no-imm32
@@ -10366,7 +10366,7 @@ _Primitive-loop-if->:
     0/imm32/no-outputs
     0/imm32/no-outputs
     0x11/imm32/alloc-id:fake
-    "0f 8f/jump-if-> loop/disp32"/imm32/subx-name
+    _string_0f_8f_jump_loop/imm32/subx-name
     0/imm32/no-rm32
     0/imm32/no-r32
     0/imm32/no-imm32
@@ -10383,7 +10383,7 @@ _Primitive-loop:
     0/imm32/no-outputs
     0/imm32/no-outputs
     0x11/imm32/alloc-id:fake
-    "e9/jump loop/disp32"/imm32/subx-name
+    _string_e9_jump_loop/imm32/subx-name
     0/imm32/no-rm32
     0/imm32/no-r32
     0/imm32/no-imm32
@@ -10401,7 +10401,7 @@ _Primitive-break-if-addr<-named:
     0/imm32/no-outputs
     0/imm32/no-outputs
     0x11/imm32/alloc-id:fake
-    "0f 82/jump-if-addr<"/imm32/subx-name
+    _string_0f_82_jump_label/imm32/subx-name
     0/imm32/no-rm32
     0/imm32/no-r32
     0/imm32/no-imm32
@@ -10418,7 +10418,7 @@ _Primitive-break-if-addr>=-named:
     0/imm32/no-outputs
     0/imm32/no-outputs
     0x11/imm32/alloc-id:fake
-    "0f 83/jump-if-addr>="/imm32/subx-name
+    _string_0f_83_jump_label/imm32/subx-name
     0/imm32/no-rm32
     0/imm32/no-r32
     0/imm32/no-imm32
@@ -10435,7 +10435,7 @@ _Primitive-break-if-=-named:
     0/imm32/no-outputs
     0/imm32/no-outputs
     0x11/imm32/alloc-id:fake
-    "0f 84/jump-if-="/imm32/subx-name
+    _string_0f_84_jump_label/imm32/subx-name
     0/imm32/no-rm32
     0/imm32/no-r32
     0/imm32/no-imm32
@@ -10452,7 +10452,7 @@ _Primitive-break-if-!=-named:
     0/imm32/no-outputs
     0/imm32/no-outputs
     0x11/imm32/alloc-id:fake
-    "0f 85/jump-if-!="/imm32/subx-name
+    _string_0f_85_jump_label/imm32/subx-name
     0/imm32/no-rm32
     0/imm32/no-r32
     0/imm32/no-imm32
@@ -10469,7 +10469,7 @@ _Primitive-break-if-addr<=-named:
     0/imm32/no-outputs
     0/imm32/no-outputs
     0x11/imm32/alloc-id:fake
-    "0f 86/jump-if-addr<="/imm32/subx-name
+    _string_0f_86_jump_label/imm32/subx-name
     0/imm32/no-rm32
     0/imm32/no-r32
     0/imm32/no-imm32
@@ -10486,7 +10486,7 @@ _Primitive-break-if-addr>-named:
     0/imm32/no-outputs
     0/imm32/no-outputs
     0x11/imm32/alloc-id:fake
-    "0f 87/jump-if-addr>"/imm32/subx-name
+    _string_0f_87_jump_label/imm32/subx-name
     0/imm32/no-rm32
     0/imm32/no-r32
     0/imm32/no-imm32
@@ -10503,7 +10503,7 @@ _Primitive-break-if-<-named:
     0/imm32/no-outputs
     0/imm32/no-outputs
     0x11/imm32/alloc-id:fake
-    "0f 8c/jump-if-<"/imm32/subx-name
+    _string_0f_8c_jump_label/imm32/subx-name
     0/imm32/no-rm32
     0/imm32/no-r32
     0/imm32/no-imm32
@@ -10520,7 +10520,7 @@ _Primitive-break-if->=-named:
     0/imm32/no-outputs
     0/imm32/no-outputs
     0x11/imm32/alloc-id:fake
-    "0f 8d/jump-if->="/imm32/subx-name
+    _string_0f_8d_jump_label/imm32/subx-name
     0/imm32/no-rm32
     0/imm32/no-r32
     0/imm32/no-imm32
@@ -10537,7 +10537,7 @@ _Primitive-break-if-<=-named:
     0/imm32/no-outputs
     0/imm32/no-outputs
     0x11/imm32/alloc-id:fake
-    "0f 8e/jump-if-<="/imm32/subx-name
+    _string_0f_8e_jump_label/imm32/subx-name
     0/imm32/no-rm32
     0/imm32/no-r32
     0/imm32/no-imm32
@@ -10554,7 +10554,7 @@ _Primitive-break-if->-named:
     0/imm32/no-outputs
     0/imm32/no-outputs
     0x11/imm32/alloc-id:fake
-    "0f 8f/jump-if->"/imm32/subx-name
+    _string_0f_8f_jump_label/imm32/subx-name
     0/imm32/no-rm32
     0/imm32/no-r32
     0/imm32/no-imm32
@@ -10571,7 +10571,7 @@ _Primitive-break-named:
     0/imm32/no-outputs
     0/imm32/no-outputs
     0x11/imm32/alloc-id:fake
-    "e9/jump"/imm32/subx-name
+    _string_e9_jump_label/imm32/subx-name
     0/imm32/no-rm32
     0/imm32/no-r32
     0/imm32/no-imm32
@@ -10588,7 +10588,7 @@ _Primitive-loop-if-addr<-named:
     0/imm32/no-outputs
     0/imm32/no-outputs
     0x11/imm32/alloc-id:fake
-    "0f 82/jump-if-addr<"/imm32/subx-name
+    _string_0f_82_jump_label/imm32/subx-name
     0/imm32/no-rm32
     0/imm32/no-r32
     0/imm32/no-imm32
@@ -10605,7 +10605,7 @@ _Primitive-loop-if-addr>=-named:
     0/imm32/no-outputs
     0/imm32/no-outputs
     0x11/imm32/alloc-id:fake
-    "0f 83/jump-if-addr>="/imm32/subx-name
+    _string_0f_83_jump_label/imm32/subx-name
     0/imm32/no-rm32
     0/imm32/no-r32
     0/imm32/no-imm32
@@ -10622,7 +10622,7 @@ _Primitive-loop-if-=-named:
     0/imm32/no-outputs
     0/imm32/no-outputs
     0x11/imm32/alloc-id:fake
-    "0f 84/jump-if-="/imm32/subx-name
+    _string_0f_84_jump_label/imm32/subx-name
     0/imm32/no-rm32
     0/imm32/no-r32
     0/imm32/no-imm32
@@ -10639,7 +10639,7 @@ _Primitive-loop-if-!=-named:
     0/imm32/no-outputs
     0/imm32/no-outputs
     0x11/imm32/alloc-id:fake
-    "0f 85/jump-if-!="/imm32/subx-name
+    _string_0f_85_jump_label/imm32/subx-name
     0/imm32/no-rm32
     0/imm32/no-r32
     0/imm32/no-imm32
@@ -10656,7 +10656,7 @@ _Primitive-loop-if-addr<=-named:
     0/imm32/no-outputs
     0/imm32/no-outputs
     0x11/imm32/alloc-id:fake
-    "0f 86/jump-if-addr<="/imm32/subx-name
+    _string_0f_86_jump_label/imm32/subx-name
     0/imm32/no-rm32
     0/imm32/no-r32
     0/imm32/no-imm32
@@ -10673,7 +10673,7 @@ _Primitive-loop-if-addr>-named:
     0/imm32/no-outputs
     0/imm32/no-outputs
     0x11/imm32/alloc-id:fake
-    "0f 87/jump-if-addr>"/imm32/subx-name
+    _string_0f_87_jump_label/imm32/subx-name
     0/imm32/no-rm32
     0/imm32/no-r32
     0/imm32/no-imm32
@@ -10690,7 +10690,7 @@ _Primitive-loop-if-<-named:
     0/imm32/no-outputs
     0/imm32/no-outputs
     0x11/imm32/alloc-id:fake
-    "0f 8c/jump-if-<"/imm32/subx-name
+    _string_0f_8c_jump_label/imm32/subx-name
     0/imm32/no-rm32
     0/imm32/no-r32
     0/imm32/no-imm32
@@ -10707,7 +10707,7 @@ _Primitive-loop-if->=-named:
     0/imm32/no-outputs
     0/imm32/no-outputs
     0x11/imm32/alloc-id:fake
-    "0f 8d/jump-if->="/imm32/subx-name
+    _string_0f_8d_jump_label/imm32/subx-name
     0/imm32/no-rm32
     0/imm32/no-r32
     0/imm32/no-imm32
@@ -10724,7 +10724,7 @@ _Primitive-loop-if-<=-named:
     0/imm32/no-outputs
     0/imm32/no-outputs
     0x11/imm32/alloc-id:fake
-    "0f 8e/jump-if-<="/imm32/subx-name
+    _string_0f_8e_jump_label/imm32/subx-name
     0/imm32/no-rm32
     0/imm32/no-r32
     0/imm32/no-imm32
@@ -10741,7 +10741,7 @@ _Primitive-loop-if->-named:
     0/imm32/no-outputs
     0/imm32/no-outputs
     0x11/imm32/alloc-id:fake
-    "0f 8f/jump-if->"/imm32/subx-name
+    _string_0f_8f_jump_label/imm32/subx-name
     0/imm32/no-rm32
     0/imm32/no-r32
     0/imm32/no-imm32
@@ -10758,7 +10758,7 @@ _Primitive-loop-named:
     0/imm32/no-outputs
     0/imm32/no-outputs
     0x11/imm32/alloc-id:fake
-    "e9/jump"/imm32/subx-name
+    _string_e9_jump_label/imm32/subx-name
     0/imm32/no-rm32
     0/imm32/no-r32
     0/imm32/no-imm32
@@ -10990,7 +10990,7 @@ _string_0b_or:
     # "0b/or"
     0x5/imm32/size
     0x30/0 0x62/b 0x2f/slash 0x6f/o 0x72/r
-_string_0d_or_with:
+_string_0d_or_with_eax:
     0x11/imm32/alloc-id:fake:payload
     # "0d/or-with-eax"
     0xe/imm32/size