diff options
| -rw-r--r-- | apps/mu.subx | 141 | ||||
| -rwxr-xr-x | tools/expand_string | 17 | ||||
| -rwxr-xr-x | tools/expand_string_handle | 20 |
3 files changed, 144 insertions, 34 deletions
diff --git a/apps/mu.subx b/apps/mu.subx index 21801228..be834252 100644 --- a/apps/mu.subx +++ b/apps/mu.subx @@ -8876,16 +8876,17 @@ _Primitive-increment-eax: 0x11/imm32/alloc-id:fake _Primitive-increment-ecx/imm32/next _string-increment: - 0x11/imm32/alloc-id:fake + 0x11/imm32/alloc-id:fake:payload # "increment" 0x9/imm32/size 0x69/i 0x6e/n 0x63/c 0x72/r 0x65/e 0x6d/m 0x65/e 0x6e/n 0x74/t _string_increment_eax: - 0x11/imm32/alloc-id:fake + 0x11/imm32/alloc-id:fake:payload # "40/increment-eax" 0x10/imm32/size 0x34/4 0x30/0 0x2f/slash 0x69/i 0x6e/n 0x63/c 0x72/r 0x65/e 0x6d/m 0x65/e 0x6e/n 0x74/t 0x2d/dash 0x65/e 0x61/a 0x78/x _Primitive-increment-ecx: + 0x11/imm32/alloc-id:fake:payload # var/ecx <- increment => 41/increment-ecx 0x11/imm32/alloc-id:fake _string-increment/imm32/name @@ -8903,11 +8904,12 @@ _Primitive-increment-ecx: 0x11/imm32/alloc-id:fake _Primitive-increment-edx/imm32/next _string_increment_ecx: - 0x11/imm32/alloc-id:fake + 0x11/imm32/alloc-id:fake:payload # "41/increment-ecx" 0x10/imm32/size 0x34/4 0x31/1 0x2f/slash 0x69/i 0x6e/n 0x63/c 0x72/r 0x65/e 0x6d/m 0x65/e 0x6e/n 0x74/t 0x2d/dash 0x65/e 0x63/c 0x78/x _Primitive-increment-edx: + 0x11/imm32/alloc-id:fake:payload # var/edx <- increment => 42/increment-edx 0x11/imm32/alloc-id:fake _string-increment/imm32/name @@ -8925,11 +8927,12 @@ _Primitive-increment-edx: 0x11/imm32/alloc-id:fake _Primitive-increment-ebx/imm32/next _string_increment_edx: - 0x11/imm32/alloc-id:fake + 0x11/imm32/alloc-id:fake:payload # "42/increment-edx" 0x10/imm32/size 0x34/4 0x32/2 0x2f/slash 0x69/i 0x6e/n 0x63/c 0x72/r 0x65/e 0x6d/m 0x65/e 0x6e/n 0x74/t 0x2d/dash 0x65/e 0x64/d 0x78/x _Primitive-increment-ebx: + 0x11/imm32/alloc-id:fake:payload # var/ebx <- increment => 43/increment-ebx 0x11/imm32/alloc-id:fake _string-increment/imm32/name @@ -8947,11 +8950,12 @@ _Primitive-increment-ebx: 0x11/imm32/alloc-id:fake _Primitive-increment-esi/imm32/next _string_increment_ebx: - 0x11/imm32/alloc-id:fake + 0x11/imm32/alloc-id:fake:payload # "43/increment-ebx" 0x10/imm32/size 0x34/4 0x33/3 0x2f/slash 0x69/i 0x6e/n 0x63/c 0x72/r 0x65/e 0x6d/m 0x65/e 0x6e/n 0x74/t 0x2d/dash 0x65/e 0x62/b 0x78/x _Primitive-increment-esi: + 0x11/imm32/alloc-id:fake:payload # var/esi <- increment => 46/increment-esi 0x11/imm32/alloc-id:fake _string-increment/imm32/name @@ -8969,11 +8973,12 @@ _Primitive-increment-esi: 0x11/imm32/alloc-id:fake _Primitive-increment-edi/imm32/next _string_increment_esi: - 0x11/imm32/alloc-id:fake + 0x11/imm32/alloc-id:fake:payload # "46/increment-esi" 0x10/imm32/size 0x34/4 0x36/6 0x2f/slash 0x69/i 0x6e/n 0x63/c 0x72/r 0x65/e 0x6d/m 0x65/e 0x6e/n 0x74/t 0x2d/dash 0x65/e 0x73/s 0x69/i _Primitive-increment-edi: + 0x11/imm32/alloc-id:fake:payload # var/edi <- increment => 47/increment-edi 0x11/imm32/alloc-id:fake _string-increment/imm32/name @@ -8991,11 +8996,12 @@ _Primitive-increment-edi: 0x11/imm32/alloc-id:fake _Primitive-decrement-eax/imm32/next _string_increment_edi: - 0x11/imm32/alloc-id:fake + 0x11/imm32/alloc-id:fake:payload # "47/increment-edi" 0x10/imm32/size 0x34/4 0x37/7 0x2f/slash 0x69/i 0x6e/n 0x63/c 0x72/r 0x65/e 0x6d/m 0x65/e 0x6e/n 0x74/t 0x2d/dash 0x65/e 0x64/d 0x69/i _Primitive-decrement-eax: + 0x11/imm32/alloc-id:fake:payload # var/eax <- decrement => 48/decrement-eax 0x11/imm32/alloc-id:fake _string-decrement/imm32/name @@ -9013,15 +9019,17 @@ _Primitive-decrement-eax: 0x11/imm32/alloc-id:fake _Primitive-decrement-ecx/imm32/next _string-decrement: + 0x11/imm32/alloc-id:fake:payload # "decrement" 0x9/imm32/size 0x64/d 0x65/e 0x63/c 0x72/r 0x65/e 0x6d/m 0x65/e 0x6e/n 0x74/t _string_decrement_eax: - 0x11/imm32/alloc-id:fake + 0x11/imm32/alloc-id:fake:payload # "48/decrement-eax" 0x10/imm32/size 0x34/4 0x38/8 0x2f/slash 0x64/d 0x65/e 0x63/c 0x72/r 0x65/e 0x6d/m 0x65/e 0x6e/n 0x74/t 0x2d/dash 0x65/e 0x61/a 0x78/x _Primitive-decrement-ecx: + 0x11/imm32/alloc-id:fake:payload # var/ecx <- decrement => 49/decrement-ecx 0x11/imm32/alloc-id:fake _string-decrement/imm32/name @@ -9035,15 +9043,16 @@ _Primitive-decrement-ecx: 0/imm32/no-r32 0/imm32/no-imm32 0/imm32/no-disp32 - 0x11/imm32/alloc-id:fake 0/imm32/output-is-write-only + 0x11/imm32/alloc-id:fake _Primitive-decrement-edx/imm32/next _string_decrement_ecx: - 0x11/imm32/alloc-id:fake + 0x11/imm32/alloc-id:fake:payload # "49/decrement-ecx" 0x10/imm32/size 0x34/4 0x39/9 0x2f/slash 0x64/d 0x65/e 0x63/c 0x72/r 0x65/e 0x6d/m 0x65/e 0x6e/n 0x74/t 0x2d/dash 0x65/e 0x63/c 0x78/x _Primitive-decrement-edx: + 0x11/imm32/alloc-id:fake:payload # var/edx <- decrement => 4a/decrement-edx 0x11/imm32/alloc-id:fake _string-decrement/imm32/name @@ -9061,11 +9070,12 @@ _Primitive-decrement-edx: 0x11/imm32/alloc-id:fake _Primitive-decrement-ebx/imm32/next _string_decrement_edx: - 0x11/imm32/alloc-id:fake + 0x11/imm32/alloc-id:fake:payload # "4a/decrement-edx" 0x10/imm32/size 0x34/4 0x3a/a 0x2f/slash 0x64/d 0x65/e 0x63/c 0x72/r 0x65/e 0x6d/m 0x65/e 0x6e/n 0x74/t 0x2d/dash 0x65/e 0x64/d 0x78/x _Primitive-decrement-ebx: + 0x11/imm32/alloc-id:fake:payload # var/ebx <- decrement => 4b/decrement-ebx 0x11/imm32/alloc-id:fake _string-decrement/imm32/name @@ -9083,11 +9093,12 @@ _Primitive-decrement-ebx: 0x11/imm32/alloc-id:fake _Primitive-decrement-esi/imm32/next _string_decrement_ebx: - 0x11/imm32/alloc-id:fake + 0x11/imm32/alloc-id:fake:payload # "4b/decrement-ebx" 0x10/imm32/size 0x34/4 0x3b/b 0x2f/slash 0x64/d 0x65/e 0x63/c 0x72/r 0x65/e 0x6d/m 0x65/e 0x6e/n 0x74/t 0x2d/dash 0x65/e 0x62/b 0x78/x _Primitive-decrement-esi: + 0x11/imm32/alloc-id:fake:payload # var/esi <- decrement => 4e/decrement-esi 0x11/imm32/alloc-id:fake _string-decrement/imm32/name @@ -9105,11 +9116,12 @@ _Primitive-decrement-esi: 0x11/imm32/alloc-id:fake _Primitive-decrement-edi/imm32/next _string_decrement_esi: - 0x11/imm32/alloc-id:fake + 0x11/imm32/alloc-id:fake:payload # "4e/decrement-esi" 0x10/imm32/size 0x34/4 0x3e/e 0x2f/slash 0x64/d 0x65/e 0x63/c 0x72/r 0x65/e 0x6d/m 0x65/e 0x6e/n 0x74/t 0x2d/dash 0x65/e 0x73/s 0x69/i _Primitive-decrement-edi: + 0x11/imm32/alloc-id:fake:payload # var/edi <- decrement => 4f/decrement-edi 0x11/imm32/alloc-id:fake _string-decrement/imm32/name @@ -9123,15 +9135,16 @@ _Primitive-decrement-edi: 0/imm32/no-r32 0/imm32/no-imm32 0/imm32/no-disp32 - 0x11/imm32/alloc-id:fake 0/imm32/output-is-write-only + 0x11/imm32/alloc-id:fake _Primitive-increment-mem/imm32/next _string_decrement_edi: - 0x11/imm32/alloc-id:fake + 0x11/imm32/alloc-id:fake:payload # "4f/decrement-edi" 0x10/imm32/size 0x34/4 0x3f/f 0x2f/slash 0x64/d 0x65/e 0x63/c 0x72/r 0x65/e 0x6d/m 0x65/e 0x6e/n 0x74/t 0x2d/dash 0x65/e 0x64/d 0x69/i _Primitive-increment-mem: + 0x11/imm32/alloc-id:fake:payload # increment var => ff 0/subop/increment *(ebp+__) 0x11/imm32/alloc-id:fake _string-increment/imm32/name @@ -9149,11 +9162,12 @@ _Primitive-increment-mem: 0x11/imm32/alloc-id:fake _Primitive-increment-reg/imm32/next _string_ff_subop_increment: - 0x11/imm32/alloc-id:fake + 0x11/imm32/alloc-id:fake:payload # "ff 0/subop/increment" 0x14/imm32/size 0x66/f 0x66/f 0x30/0 0x2f/slash 0x73/s 0x75/u 0x62/b 0x6f/o 0x70/p 0x2f/slash 0x69/i 0x6e/n 0x63/c 0x72/r 0x65/e 0x6d/m 0x65/e 0x6e/n 0x74/t _Primitive-increment-reg: + 0x11/imm32/alloc-id:fake:payload # var/reg <- increment => ff 0/subop/increment %__ 0x11/imm32/alloc-id:fake _string-increment/imm32/name @@ -9171,6 +9185,7 @@ _Primitive-increment-reg: 0x11/imm32/alloc-id:fake _Primitive-decrement-mem/imm32/next _Primitive-decrement-mem: + 0x11/imm32/alloc-id:fake:payload # decrement var => ff 1/subop/decrement *(ebp+__) 0x11/imm32/alloc-id:fake _string-decrement/imm32/name @@ -9188,11 +9203,12 @@ _Primitive-decrement-mem: 0x11/imm32/alloc-id:fake _Primitive-decrement-reg/imm32/next _string_ff_subop_decrement: - 0x11/imm32/alloc-id:fake + 0x11/imm32/alloc-id:fake:payload # "ff 1/subop/decrement" 0x14/imm32/size 0x66/f 0x66/f 0x31/1 0x2f/slash 0x73/s 0x75/u 0x62/b 0x6f/o 0x70/p 0x2f/slash 0x64/d 0x65/e 0x63/c 0x72/r 0x65/e 0x6d/m 0x65/e 0x6e/n 0x74/t _Primitive-decrement-reg: + 0x11/imm32/alloc-id:fake:payload # var/reg <- decrement => ff 1/subop/decrement %__ 0x11/imm32/alloc-id:fake _string-decrement/imm32/name @@ -9211,6 +9227,7 @@ _Primitive-decrement-reg: _Primitive-add-to-eax/imm32/next # - add _Primitive-add-to-eax: + 0x11/imm32/alloc-id:fake:payload # var/eax <- add lit => 05/add-to-eax lit/imm32 0x11/imm32/alloc-id:fake "add"/imm32/name @@ -9228,6 +9245,7 @@ _Primitive-add-to-eax: 0x11/imm32/alloc-id:fake _Primitive-add-reg-to-reg/imm32/next _Primitive-add-reg-to-reg: + 0x11/imm32/alloc-id:fake:payload # var1/reg <- add var2/reg => 01/add-to var1/rm32 var2/r32 0x11/imm32/alloc-id:fake "add"/imm32/name @@ -9262,6 +9280,7 @@ _Primitive-add-reg-to-mem: 0x11/imm32/alloc-id:fake _Primitive-add-mem-to-reg/imm32/next _Primitive-add-mem-to-reg: + 0x11/imm32/alloc-id:fake:payload # var1/reg <- add var2 => 03/add var2/rm32 var1/r32 0x11/imm32/alloc-id:fake "add"/imm32/name @@ -9279,6 +9298,7 @@ _Primitive-add-mem-to-reg: 0x11/imm32/alloc-id:fake _Primitive-add-lit-to-reg/imm32/next _Primitive-add-lit-to-reg: + 0x11/imm32/alloc-id:fake:payload # var1/reg <- add lit => 81 0/subop/add var1/rm32 lit/imm32 0x11/imm32/alloc-id:fake "add"/imm32/name @@ -9296,6 +9316,7 @@ _Primitive-add-lit-to-reg: 0x11/imm32/alloc-id:fake _Primitive-add-lit-to-mem/imm32/next _Primitive-add-lit-to-mem: + 0x11/imm32/alloc-id:fake:payload # add-to var1, lit => 81 0/subop/add var1/rm32 lit/imm32 0x11/imm32/alloc-id:fake "add-to"/imm32/name @@ -9314,6 +9335,7 @@ _Primitive-add-lit-to-mem: _Primitive-subtract-from-eax/imm32/next # - subtract _Primitive-subtract-from-eax: + 0x11/imm32/alloc-id:fake:payload # var/eax <- subtract lit => 2d/subtract-from-eax lit/imm32 0x11/imm32/alloc-id:fake "subtract"/imm32/name @@ -9331,6 +9353,7 @@ _Primitive-subtract-from-eax: 0x11/imm32/alloc-id:fake _Primitive-subtract-reg-from-reg/imm32/next _Primitive-subtract-reg-from-reg: + 0x11/imm32/alloc-id:fake:payload # var1/reg <- subtract var2/reg => 29/subtract-from var1/rm32 var2/r32 0x11/imm32/alloc-id:fake "subtract"/imm32/name @@ -9348,6 +9371,7 @@ _Primitive-subtract-reg-from-reg: 0x11/imm32/alloc-id:fake _Primitive-subtract-reg-from-mem/imm32/next _Primitive-subtract-reg-from-mem: + 0x11/imm32/alloc-id:fake:payload # subtract-from var1 var2/reg => 29/subtract-from var1 var2/r32 0x11/imm32/alloc-id:fake "subtract-from"/imm32/name @@ -9365,6 +9389,7 @@ _Primitive-subtract-reg-from-mem: 0x11/imm32/alloc-id:fake _Primitive-subtract-mem-from-reg/imm32/next _Primitive-subtract-mem-from-reg: + 0x11/imm32/alloc-id:fake:payload # var1/reg <- subtract var2 => 2b/subtract var2/rm32 var1/r32 0x11/imm32/alloc-id:fake "subtract"/imm32/name @@ -9382,6 +9407,7 @@ _Primitive-subtract-mem-from-reg: 0x11/imm32/alloc-id:fake _Primitive-subtract-lit-from-reg/imm32/next _Primitive-subtract-lit-from-reg: + 0x11/imm32/alloc-id:fake:payload # var1/reg <- subtract lit => 81 5/subop/subtract var1/rm32 lit/imm32 0x11/imm32/alloc-id:fake "subtract"/imm32/name @@ -9398,6 +9424,7 @@ _Primitive-subtract-lit-from-reg: 0/imm32/output-is-write-only _Primitive-subtract-lit-from-mem/imm32/next _Primitive-subtract-lit-from-mem: + 0x11/imm32/alloc-id:fake:payload # subtract-from var1, lit => 81 5/subop/subtract var1/rm32 lit/imm32 0x11/imm32/alloc-id:fake "subtract-from"/imm32/name @@ -9416,6 +9443,7 @@ _Primitive-subtract-lit-from-mem: _Primitive-and-with-eax/imm32/next # - and _Primitive-and-with-eax: + 0x11/imm32/alloc-id:fake:payload # var/eax <- and lit => 25/and-with-eax lit/imm32 0x11/imm32/alloc-id:fake "and"/imm32/name @@ -9433,6 +9461,7 @@ _Primitive-and-with-eax: 0x11/imm32/alloc-id:fake _Primitive-and-reg-with-reg/imm32/next _Primitive-and-reg-with-reg: + 0x11/imm32/alloc-id:fake:payload # var1/reg <- and var2/reg => 21/and-with var1/rm32 var2/r32 0x11/imm32/alloc-id:fake "and"/imm32/name @@ -9450,6 +9479,7 @@ _Primitive-and-reg-with-reg: 0x11/imm32/alloc-id:fake _Primitive-and-reg-with-mem/imm32/next _Primitive-and-reg-with-mem: + 0x11/imm32/alloc-id:fake:payload # and-with var1 var2/reg => 21/and-with var1 var2/r32 0x11/imm32/alloc-id:fake "and-with"/imm32/name @@ -9467,6 +9497,7 @@ _Primitive-and-reg-with-mem: 0x11/imm32/alloc-id:fake _Primitive-and-mem-with-reg/imm32/next _Primitive-and-mem-with-reg: + 0x11/imm32/alloc-id:fake:payload # var1/reg <- and var2 => 23/and var2/rm32 var1/r32 0x11/imm32/alloc-id:fake "and"/imm32/name @@ -9484,6 +9515,7 @@ _Primitive-and-mem-with-reg: 0x11/imm32/alloc-id:fake _Primitive-and-lit-with-reg/imm32/next _Primitive-and-lit-with-reg: + 0x11/imm32/alloc-id:fake:payload # var1/reg <- and lit => 81 4/subop/and var1/rm32 lit/imm32 0x11/imm32/alloc-id:fake "and"/imm32/name @@ -9501,6 +9533,7 @@ _Primitive-and-lit-with-reg: 0x11/imm32/alloc-id:fake _Primitive-and-lit-with-mem/imm32/next _Primitive-and-lit-with-mem: + 0x11/imm32/alloc-id:fake:payload # and-with var1, lit => 81 4/subop/and var1/rm32 lit/imm32 0x11/imm32/alloc-id:fake "and-with"/imm32/name @@ -9519,6 +9552,7 @@ _Primitive-and-lit-with-mem: _Primitive-or-with-eax/imm32/next # - or _Primitive-or-with-eax: + 0x11/imm32/alloc-id:fake:payload # var/eax <- or lit => 0d/or-with-eax lit/imm32 0x11/imm32/alloc-id:fake "or"/imm32/name @@ -9536,6 +9570,7 @@ _Primitive-or-with-eax: 0x11/imm32/alloc-id:fake _Primitive-or-reg-with-reg/imm32/next _Primitive-or-reg-with-reg: + 0x11/imm32/alloc-id:fake:payload # var1/reg <- or var2/reg => 09/or-with var1/rm32 var2/r32 0x11/imm32/alloc-id:fake "or"/imm32/name @@ -9553,6 +9588,7 @@ _Primitive-or-reg-with-reg: 0x11/imm32/alloc-id:fake _Primitive-or-reg-with-mem/imm32/next _Primitive-or-reg-with-mem: + 0x11/imm32/alloc-id:fake:payload # or-with var1 var2/reg => 09/or-with var1 var2/r32 0x11/imm32/alloc-id:fake "or-with"/imm32/name @@ -9570,6 +9606,7 @@ _Primitive-or-reg-with-mem: 0x11/imm32/alloc-id:fake _Primitive-or-mem-with-reg/imm32/next _Primitive-or-mem-with-reg: + 0x11/imm32/alloc-id:fake:payload # var1/reg <- or var2 => 0b/or var2/rm32 var1/r32 0x11/imm32/alloc-id:fake "or"/imm32/name @@ -9587,6 +9624,7 @@ _Primitive-or-mem-with-reg: 0x11/imm32/alloc-id:fake _Primitive-or-lit-with-reg/imm32/next _Primitive-or-lit-with-reg: + 0x11/imm32/alloc-id:fake:payload # var1/reg <- or lit => 81 1/subop/or var1/rm32 lit/imm32 0x11/imm32/alloc-id:fake "or"/imm32/name @@ -9604,6 +9642,7 @@ _Primitive-or-lit-with-reg: 0x11/imm32/alloc-id:fake _Primitive-or-lit-with-mem/imm32/next _Primitive-or-lit-with-mem: + 0x11/imm32/alloc-id:fake:payload # or-with var1, lit => 81 1/subop/or var1/rm32 lit/imm32 0x11/imm32/alloc-id:fake "or-with"/imm32/name @@ -9622,6 +9661,7 @@ _Primitive-or-lit-with-mem: _Primitive-xor-with-eax/imm32/next # - xor _Primitive-xor-with-eax: + 0x11/imm32/alloc-id:fake:payload # var/eax <- xor lit => 35/xor-with-eax lit/imm32 0x11/imm32/alloc-id:fake "xor"/imm32/name @@ -9639,6 +9679,7 @@ _Primitive-xor-with-eax: 0x11/imm32/alloc-id:fake _Primitive-xor-reg-with-reg/imm32/next _Primitive-xor-reg-with-reg: + 0x11/imm32/alloc-id:fake:payload # var1/reg <- xor var2/reg => 31/xor-with var1/rm32 var2/r32 0x11/imm32/alloc-id:fake "xor"/imm32/name @@ -9656,6 +9697,7 @@ _Primitive-xor-reg-with-reg: 0x11/imm32/alloc-id:fake _Primitive-xor-reg-with-mem/imm32/next _Primitive-xor-reg-with-mem: + 0x11/imm32/alloc-id:fake:payload # xor-with var1 var2/reg => 31/xor-with var1 var2/r32 0x11/imm32/alloc-id:fake "xor-with"/imm32/name @@ -9673,6 +9715,7 @@ _Primitive-xor-reg-with-mem: 0x11/imm32/alloc-id:fake _Primitive-xor-mem-with-reg/imm32/next _Primitive-xor-mem-with-reg: + 0x11/imm32/alloc-id:fake:payload # var1/reg <- xor var2 => 33/xor var2/rm32 var1/r32 0x11/imm32/alloc-id:fake "xor"/imm32/name @@ -9690,6 +9733,7 @@ _Primitive-xor-mem-with-reg: 0x11/imm32/alloc-id:fake _Primitive-xor-lit-with-reg/imm32/next _Primitive-xor-lit-with-reg: + 0x11/imm32/alloc-id:fake:payload # var1/reg <- xor lit => 81 6/subop/xor var1/rm32 lit/imm32 0x11/imm32/alloc-id:fake "xor"/imm32/name @@ -9707,6 +9751,7 @@ _Primitive-xor-lit-with-reg: 0x11/imm32/alloc-id:fake _Primitive-xor-lit-with-mem/imm32/next _Primitive-xor-lit-with-mem: + 0x11/imm32/alloc-id:fake:payload # xor-with var1, lit => 81 6/subop/xor var1/rm32 lit/imm32 0x11/imm32/alloc-id:fake "xor-with"/imm32/name @@ -9725,6 +9770,7 @@ _Primitive-xor-lit-with-mem: _Primitive-copy-to-eax/imm32/next # - copy _Primitive-copy-to-eax: + 0x11/imm32/alloc-id:fake:payload # var/eax <- copy lit => b8/copy-to-eax lit/imm32 0x11/imm32/alloc-id:fake "copy"/imm32/name @@ -9742,6 +9788,7 @@ _Primitive-copy-to-eax: 0x11/imm32/alloc-id:fake _Primitive-copy-to-ecx/imm32/next _Primitive-copy-to-ecx: + 0x11/imm32/alloc-id:fake:payload # var/ecx <- copy lit => b9/copy-to-ecx lit/imm32 0x11/imm32/alloc-id:fake "copy"/imm32/name @@ -9759,6 +9806,7 @@ _Primitive-copy-to-ecx: 0x11/imm32/alloc-id:fake _Primitive-copy-to-edx/imm32/next _Primitive-copy-to-edx: + 0x11/imm32/alloc-id:fake:payload # var/edx <- copy lit => ba/copy-to-edx lit/imm32 0x11/imm32/alloc-id:fake "copy"/imm32/name @@ -9776,6 +9824,7 @@ _Primitive-copy-to-edx: 0x11/imm32/alloc-id:fake _Primitive-copy-to-ebx/imm32/next _Primitive-copy-to-ebx: + 0x11/imm32/alloc-id:fake:payload # var/ebx <- copy lit => bb/copy-to-ebx lit/imm32 0x11/imm32/alloc-id:fake "copy"/imm32/name @@ -9793,6 +9842,7 @@ _Primitive-copy-to-ebx: 0x11/imm32/alloc-id:fake _Primitive-copy-to-esi/imm32/next _Primitive-copy-to-esi: + 0x11/imm32/alloc-id:fake:payload # var/esi <- copy lit => be/copy-to-esi lit/imm32 0x11/imm32/alloc-id:fake "copy"/imm32/name @@ -9810,6 +9860,7 @@ _Primitive-copy-to-esi: 0x11/imm32/alloc-id:fake _Primitive-copy-to-edi/imm32/next _Primitive-copy-to-edi: + 0x11/imm32/alloc-id:fake:payload # var/edi <- copy lit => bf/copy-to-edi lit/imm32 0x11/imm32/alloc-id:fake "copy"/imm32/name @@ -9827,6 +9878,7 @@ _Primitive-copy-to-edi: 0x11/imm32/alloc-id:fake _Primitive-copy-reg-to-reg/imm32/next _Primitive-copy-reg-to-reg: + 0x11/imm32/alloc-id:fake:payload # var1/reg <- copy var2/reg => 89/<- var1/rm32 var2/r32 0x11/imm32/alloc-id:fake "copy"/imm32/name @@ -9844,6 +9896,7 @@ _Primitive-copy-reg-to-reg: 0x11/imm32/alloc-id:fake _Primitive-copy-reg-to-mem/imm32/next _Primitive-copy-reg-to-mem: + 0x11/imm32/alloc-id:fake:payload # copy-to var1 var2/reg => 89/<- var1 var2/r32 0x11/imm32/alloc-id:fake "copy-to"/imm32/name @@ -9861,6 +9914,7 @@ _Primitive-copy-reg-to-mem: 0x11/imm32/alloc-id:fake _Primitive-copy-mem-to-reg/imm32/next _Primitive-copy-mem-to-reg: + 0x11/imm32/alloc-id:fake:payload # var1/reg <- copy var2 => 8b/-> var2/rm32 var1/r32 0x11/imm32/alloc-id:fake "copy"/imm32/name @@ -9878,6 +9932,7 @@ _Primitive-copy-mem-to-reg: 0x11/imm32/alloc-id:fake _Primitive-copy-lit-to-reg/imm32/next _Primitive-copy-lit-to-reg: + 0x11/imm32/alloc-id:fake:payload # var1/reg <- copy lit => c7 0/subop/copy var1/rm32 lit/imm32 0x11/imm32/alloc-id:fake "copy"/imm32/name @@ -9895,6 +9950,7 @@ _Primitive-copy-lit-to-reg: 0x11/imm32/alloc-id:fake _Primitive-copy-lit-to-mem/imm32/next _Primitive-copy-lit-to-mem: + 0x11/imm32/alloc-id:fake:payload # copy-to var1, lit => c7 0/subop/copy var1/rm32 lit/imm32 0x11/imm32/alloc-id:fake "copy-to"/imm32/name @@ -9913,6 +9969,7 @@ _Primitive-copy-lit-to-mem: _Primitive-address/imm32/next # - address _Primitive-address: + 0x11/imm32/alloc-id:fake:payload # var1/reg <- address var2 => 8d/copy-address var2/rm32 var1/r32 0x11/imm32/alloc-id:fake "address"/imm32/name @@ -9931,6 +9988,7 @@ _Primitive-address: _Primitive-compare-mem-with-reg/imm32/next # - compare _Primitive-compare-mem-with-reg: + 0x11/imm32/alloc-id:fake:payload # compare var1 var2/reg => 39/compare var1/rm32 var2/r32 0x11/imm32/alloc-id:fake "compare"/imm32/name @@ -9948,6 +10006,7 @@ _Primitive-compare-mem-with-reg: 0x11/imm32/alloc-id:fake _Primitive-compare-reg-with-mem/imm32/next _Primitive-compare-reg-with-mem: + 0x11/imm32/alloc-id:fake:payload # compare var1/reg var2 => 3b/compare<- var2/rm32 var1/r32 0x11/imm32/alloc-id:fake "compare"/imm32/name @@ -9965,6 +10024,7 @@ _Primitive-compare-reg-with-mem: 0x11/imm32/alloc-id:fake _Primitive-compare-eax-with-literal/imm32/next _Primitive-compare-eax-with-literal: + 0x11/imm32/alloc-id:fake:payload # compare var1/eax n => 3d/compare-eax-with n/imm32 0x11/imm32/alloc-id:fake "compare"/imm32/name @@ -9982,6 +10042,7 @@ _Primitive-compare-eax-with-literal: 0x11/imm32/alloc-id:fake _Primitive-compare-reg-with-literal/imm32/next _Primitive-compare-reg-with-literal: + 0x11/imm32/alloc-id:fake:payload # compare var1/reg n => 81 7/subop/compare %reg n/imm32 0x11/imm32/alloc-id:fake "compare"/imm32/name @@ -9999,6 +10060,7 @@ _Primitive-compare-reg-with-literal: 0x11/imm32/alloc-id:fake _Primitive-compare-mem-with-literal/imm32/next _Primitive-compare-mem-with-literal: + 0x11/imm32/alloc-id:fake:payload # compare var1 n => 81 7/subop/compare *(ebp+___) n/imm32 0x11/imm32/alloc-id:fake "compare"/imm32/name @@ -10017,6 +10079,7 @@ _Primitive-compare-mem-with-literal: _Primitive-multiply-reg-by-mem/imm32/next # - multiply _Primitive-multiply-reg-by-mem: + 0x11/imm32/alloc-id:fake:payload # var1/reg <- multiply var2 => 0f af/multiply var2/rm32 var1/r32 0x11/imm32/alloc-id:fake "multiply"/imm32/name @@ -10035,6 +10098,7 @@ _Primitive-multiply-reg-by-mem: _Primitive-break-if-addr</imm32/next # - branches _Primitive-break-if-addr<: + 0x11/imm32/alloc-id:fake:payload 0x11/imm32/alloc-id:fake "break-if-addr<"/imm32/name 0/imm32/no-inouts @@ -10051,6 +10115,7 @@ _Primitive-break-if-addr<: 0x11/imm32/alloc-id:fake _Primitive-break-if-addr>=/imm32/next _Primitive-break-if-addr>=: + 0x11/imm32/alloc-id:fake:payload 0x11/imm32/alloc-id:fake "break-if-addr>="/imm32/name 0/imm32/no-inouts @@ -10067,6 +10132,7 @@ _Primitive-break-if-addr>=: 0x11/imm32/alloc-id:fake _Primitive-break-if-=/imm32/next _Primitive-break-if-=: + 0x11/imm32/alloc-id:fake:payload 0x11/imm32/alloc-id:fake "break-if-="/imm32/name 0/imm32/no-inouts @@ -10083,6 +10149,7 @@ _Primitive-break-if-=: 0x11/imm32/alloc-id:fake _Primitive-break-if-!=/imm32/next _Primitive-break-if-!=: + 0x11/imm32/alloc-id:fake:payload 0x11/imm32/alloc-id:fake "break-if-!="/imm32/name 0/imm32/no-inouts @@ -10099,6 +10166,7 @@ _Primitive-break-if-!=: 0x11/imm32/alloc-id:fake _Primitive-break-if-addr<=/imm32/next _Primitive-break-if-addr<=: + 0x11/imm32/alloc-id:fake:payload 0x11/imm32/alloc-id:fake "break-if-addr<="/imm32/name 0/imm32/no-inouts @@ -10115,6 +10183,7 @@ _Primitive-break-if-addr<=: 0x11/imm32/alloc-id:fake _Primitive-break-if-addr>/imm32/next _Primitive-break-if-addr>: + 0x11/imm32/alloc-id:fake:payload 0x11/imm32/alloc-id:fake "break-if-addr>"/imm32/name 0/imm32/no-inouts @@ -10131,6 +10200,7 @@ _Primitive-break-if-addr>: 0x11/imm32/alloc-id:fake _Primitive-break-if-</imm32/next _Primitive-break-if-<: + 0x11/imm32/alloc-id:fake:payload 0x11/imm32/alloc-id:fake "break-if-<"/imm32/name 0/imm32/no-inouts @@ -10147,6 +10217,7 @@ _Primitive-break-if-<: 0x11/imm32/alloc-id:fake _Primitive-break-if->=/imm32/next _Primitive-break-if->=: + 0x11/imm32/alloc-id:fake:payload 0x11/imm32/alloc-id:fake "break-if->="/imm32/name 0/imm32/no-inouts @@ -10163,6 +10234,7 @@ _Primitive-break-if->=: 0x11/imm32/alloc-id:fake _Primitive-break-if-<=/imm32/next _Primitive-break-if-<=: + 0x11/imm32/alloc-id:fake:payload 0x11/imm32/alloc-id:fake "break-if-<="/imm32/name 0/imm32/no-inouts @@ -10179,6 +10251,7 @@ _Primitive-break-if-<=: 0x11/imm32/alloc-id:fake _Primitive-break-if->/imm32/next _Primitive-break-if->: + 0x11/imm32/alloc-id:fake:payload 0x11/imm32/alloc-id:fake "break-if->"/imm32/name 0/imm32/no-inouts @@ -10195,6 +10268,7 @@ _Primitive-break-if->: 0x11/imm32/alloc-id:fake _Primitive-break/imm32/next _Primitive-break: + 0x11/imm32/alloc-id:fake:payload 0x11/imm32/alloc-id:fake "break"/imm32/name 0/imm32/no-inouts @@ -10211,6 +10285,7 @@ _Primitive-break: 0x11/imm32/alloc-id:fake _Primitive-loop-if-addr</imm32/next _Primitive-loop-if-addr<: + 0x11/imm32/alloc-id:fake:payload 0x11/imm32/alloc-id:fake "loop-if-addr<"/imm32/name 0/imm32/no-inouts @@ -10227,6 +10302,7 @@ _Primitive-loop-if-addr<: 0x11/imm32/alloc-id:fake _Primitive-loop-if-addr>=/imm32/next _Primitive-loop-if-addr>=: + 0x11/imm32/alloc-id:fake:payload 0x11/imm32/alloc-id:fake "loop-if-addr>="/imm32/name 0/imm32/no-inouts @@ -10243,6 +10319,7 @@ _Primitive-loop-if-addr>=: 0x11/imm32/alloc-id:fake _Primitive-loop-if-=/imm32/next _Primitive-loop-if-=: + 0x11/imm32/alloc-id:fake:payload 0x11/imm32/alloc-id:fake "loop-if-="/imm32/name 0/imm32/no-inouts @@ -10259,6 +10336,7 @@ _Primitive-loop-if-=: 0x11/imm32/alloc-id:fake _Primitive-loop-if-!=/imm32/next _Primitive-loop-if-!=: + 0x11/imm32/alloc-id:fake:payload 0x11/imm32/alloc-id:fake "loop-if-!="/imm32/name 0/imm32/no-inouts @@ -10275,6 +10353,7 @@ _Primitive-loop-if-!=: 0x11/imm32/alloc-id:fake _Primitive-loop-if-addr<=/imm32/next _Primitive-loop-if-addr<=: + 0x11/imm32/alloc-id:fake:payload 0x11/imm32/alloc-id:fake "loop-if-addr<="/imm32/name 0/imm32/no-inouts @@ -10291,6 +10370,7 @@ _Primitive-loop-if-addr<=: 0x11/imm32/alloc-id:fake _Primitive-loop-if-addr>/imm32/next _Primitive-loop-if-addr>: + 0x11/imm32/alloc-id:fake:payload 0x11/imm32/alloc-id:fake "loop-if-addr>"/imm32/name 0/imm32/no-inouts @@ -10307,6 +10387,7 @@ _Primitive-loop-if-addr>: 0x11/imm32/alloc-id:fake _Primitive-loop-if-</imm32/next _Primitive-loop-if-<: + 0x11/imm32/alloc-id:fake:payload 0x11/imm32/alloc-id:fake "loop-if-<"/imm32/name 0/imm32/no-inouts @@ -10323,6 +10404,7 @@ _Primitive-loop-if-<: 0x11/imm32/alloc-id:fake _Primitive-loop-if->=/imm32/next _Primitive-loop-if->=: + 0x11/imm32/alloc-id:fake:payload 0x11/imm32/alloc-id:fake "loop-if->="/imm32/name 0/imm32/no-inouts @@ -10339,6 +10421,7 @@ _Primitive-loop-if->=: 0x11/imm32/alloc-id:fake _Primitive-loop-if-<=/imm32/next _Primitive-loop-if-<=: + 0x11/imm32/alloc-id:fake:payload 0x11/imm32/alloc-id:fake "loop-if-<="/imm32/name 0/imm32/no-inouts @@ -10355,6 +10438,7 @@ _Primitive-loop-if-<=: 0x11/imm32/alloc-id:fake _Primitive-loop-if->/imm32/next _Primitive-loop-if->: + 0x11/imm32/alloc-id:fake:payload 0x11/imm32/alloc-id:fake "loop-if->"/imm32/name 0/imm32/no-inouts @@ -10371,6 +10455,7 @@ _Primitive-loop-if->: 0x11/imm32/alloc-id:fake _Primitive-loop/imm32/next # we probably don't need an unconditional break _Primitive-loop: + 0x11/imm32/alloc-id:fake:payload 0x11/imm32/alloc-id:fake "loop"/imm32/name 0/imm32/no-inouts @@ -10388,6 +10473,7 @@ _Primitive-loop: _Primitive-break-if-addr<-named/imm32/next # - branches to named blocks _Primitive-break-if-addr<-named: + 0x11/imm32/alloc-id:fake:payload 0x11/imm32/alloc-id:fake "break-if-addr<"/imm32/name 0x11/imm32/alloc-id:fake @@ -10404,6 +10490,7 @@ _Primitive-break-if-addr<-named: 0x11/imm32/alloc-id:fake _Primitive-break-if-addr>=-named/imm32/next _Primitive-break-if-addr>=-named: + 0x11/imm32/alloc-id:fake:payload 0x11/imm32/alloc-id:fake "break-if-addr>="/imm32/name 0x11/imm32/alloc-id:fake @@ -10420,6 +10507,7 @@ _Primitive-break-if-addr>=-named: 0x11/imm32/alloc-id:fake _Primitive-break-if-=-named/imm32/next _Primitive-break-if-=-named: + 0x11/imm32/alloc-id:fake:payload 0x11/imm32/alloc-id:fake "break-if-="/imm32/name 0x11/imm32/alloc-id:fake @@ -10436,6 +10524,7 @@ _Primitive-break-if-=-named: 0x11/imm32/alloc-id:fake _Primitive-break-if-!=-named/imm32/next _Primitive-break-if-!=-named: + 0x11/imm32/alloc-id:fake:payload 0x11/imm32/alloc-id:fake "break-if-!="/imm32/name 0x11/imm32/alloc-id:fake @@ -10452,6 +10541,7 @@ _Primitive-break-if-!=-named: 0x11/imm32/alloc-id:fake _Primitive-break-if-addr<=-named/imm32/next _Primitive-break-if-addr<=-named: + 0x11/imm32/alloc-id:fake:payload 0x11/imm32/alloc-id:fake "break-if-addr<="/imm32/name 0x11/imm32/alloc-id:fake @@ -10468,6 +10558,7 @@ _Primitive-break-if-addr<=-named: 0x11/imm32/alloc-id:fake _Primitive-break-if-addr>-named/imm32/next _Primitive-break-if-addr>-named: + 0x11/imm32/alloc-id:fake:payload 0x11/imm32/alloc-id:fake "break-if-addr>"/imm32/name 0x11/imm32/alloc-id:fake @@ -10484,6 +10575,7 @@ _Primitive-break-if-addr>-named: 0x11/imm32/alloc-id:fake _Primitive-break-if-<-named/imm32/next _Primitive-break-if-<-named: + 0x11/imm32/alloc-id:fake:payload 0x11/imm32/alloc-id:fake "break-if-<"/imm32/name 0x11/imm32/alloc-id:fake @@ -10500,6 +10592,7 @@ _Primitive-break-if-<-named: 0x11/imm32/alloc-id:fake _Primitive-break-if->=-named/imm32/next _Primitive-break-if->=-named: + 0x11/imm32/alloc-id:fake:payload 0x11/imm32/alloc-id:fake "break-if->="/imm32/name 0x11/imm32/alloc-id:fake @@ -10516,6 +10609,7 @@ _Primitive-break-if->=-named: 0x11/imm32/alloc-id:fake _Primitive-break-if-<=-named/imm32/next _Primitive-break-if-<=-named: + 0x11/imm32/alloc-id:fake:payload 0x11/imm32/alloc-id:fake "break-if-<="/imm32/name 0x11/imm32/alloc-id:fake @@ -10532,6 +10626,7 @@ _Primitive-break-if-<=-named: 0x11/imm32/alloc-id:fake _Primitive-break-if->-named/imm32/next _Primitive-break-if->-named: + 0x11/imm32/alloc-id:fake:payload 0x11/imm32/alloc-id:fake "break-if->"/imm32/name 0x11/imm32/alloc-id:fake @@ -10548,6 +10643,7 @@ _Primitive-break-if->-named: 0x11/imm32/alloc-id:fake _Primitive-break-named/imm32/next _Primitive-break-named: + 0x11/imm32/alloc-id:fake:payload 0x11/imm32/alloc-id:fake "break"/imm32/name 0x11/imm32/alloc-id:fake @@ -10564,6 +10660,7 @@ _Primitive-break-named: 0x11/imm32/alloc-id:fake _Primitive-loop-if-addr<-named/imm32/next _Primitive-loop-if-addr<-named: + 0x11/imm32/alloc-id:fake:payload 0x11/imm32/alloc-id:fake "loop-if-addr<"/imm32/name 0x11/imm32/alloc-id:fake @@ -10580,6 +10677,7 @@ _Primitive-loop-if-addr<-named: 0x11/imm32/alloc-id:fake _Primitive-loop-if-addr>=-named/imm32/next _Primitive-loop-if-addr>=-named: + 0x11/imm32/alloc-id:fake:payload 0x11/imm32/alloc-id:fake "loop-if-addr>="/imm32/name 0x11/imm32/alloc-id:fake @@ -10596,6 +10694,7 @@ _Primitive-loop-if-addr>=-named: 0x11/imm32/alloc-id:fake _Primitive-loop-if-=-named/imm32/next _Primitive-loop-if-=-named: + 0x11/imm32/alloc-id:fake:payload 0x11/imm32/alloc-id:fake "loop-if-="/imm32/name 0x11/imm32/alloc-id:fake @@ -10612,6 +10711,7 @@ _Primitive-loop-if-=-named: 0x11/imm32/alloc-id:fake _Primitive-loop-if-!=-named/imm32/next _Primitive-loop-if-!=-named: + 0x11/imm32/alloc-id:fake:payload 0x11/imm32/alloc-id:fake "loop-if-!="/imm32/name 0x11/imm32/alloc-id:fake @@ -10628,6 +10728,7 @@ _Primitive-loop-if-!=-named: 0x11/imm32/alloc-id:fake _Primitive-loop-if-addr<=-named/imm32/next _Primitive-loop-if-addr<=-named: + 0x11/imm32/alloc-id:fake:payload 0x11/imm32/alloc-id:fake "loop-if-addr<="/imm32/name 0x11/imm32/alloc-id:fake @@ -10644,6 +10745,7 @@ _Primitive-loop-if-addr<=-named: 0x11/imm32/alloc-id:fake _Primitive-loop-if-addr>-named/imm32/next _Primitive-loop-if-addr>-named: + 0x11/imm32/alloc-id:fake:payload 0x11/imm32/alloc-id:fake "loop-if-addr>"/imm32/name 0x11/imm32/alloc-id:fake @@ -10660,6 +10762,7 @@ _Primitive-loop-if-addr>-named: 0x11/imm32/alloc-id:fake _Primitive-loop-if-<-named/imm32/next _Primitive-loop-if-<-named: + 0x11/imm32/alloc-id:fake:payload 0x11/imm32/alloc-id:fake "loop-if-<"/imm32/name 0x11/imm32/alloc-id:fake @@ -10676,6 +10779,7 @@ _Primitive-loop-if-<-named: 0x11/imm32/alloc-id:fake _Primitive-loop-if->=-named/imm32/next _Primitive-loop-if->=-named: + 0x11/imm32/alloc-id:fake:payload 0x11/imm32/alloc-id:fake "loop-if->="/imm32/name 0x11/imm32/alloc-id:fake @@ -10692,6 +10796,7 @@ _Primitive-loop-if->=-named: 0x11/imm32/alloc-id:fake _Primitive-loop-if-<=-named/imm32/next _Primitive-loop-if-<=-named: + 0x11/imm32/alloc-id:fake:payload 0x11/imm32/alloc-id:fake "loop-if-<="/imm32/name 0x11/imm32/alloc-id:fake @@ -10708,6 +10813,7 @@ _Primitive-loop-if-<=-named: 0x11/imm32/alloc-id:fake _Primitive-loop-if->-named/imm32/next _Primitive-loop-if->-named: + 0x11/imm32/alloc-id:fake:payload 0x11/imm32/alloc-id:fake "loop-if->"/imm32/name 0x11/imm32/alloc-id:fake @@ -10724,6 +10830,7 @@ _Primitive-loop-if->-named: 0x11/imm32/alloc-id:fake _Primitive-loop-named/imm32/next # we probably don't need an unconditional break _Primitive-loop-named: + 0x11/imm32/alloc-id:fake:payload 0x11/imm32/alloc-id:fake "loop"/imm32/name 0x11/imm32/alloc-id:fake diff --git a/tools/expand_string b/tools/expand_string deleted file mode 100755 index a5a9ad30..00000000 --- a/tools/expand_string +++ /dev/null @@ -1,17 +0,0 @@ -#!/bin/sh -# Expand syntax sugar for SubX string literals. -# Helpful for converting them into handles to strings. - -INPUT=$(cat) -echo " # \"$INPUT\"" - -# print length in bytes -printf " 0x%x/imm32/size\n" $(echo -n $INPUT |wc -c) - -# print ascii codes for each character in hex -echo -n " " -for c in $(echo "$INPUT" | sed -e 's/./& /g') -do - echo -n " 0x$(printf '%x' "'$c")/$c" -done -echo diff --git a/tools/expand_string_handle b/tools/expand_string_handle new file mode 100755 index 00000000..0c739f65 --- /dev/null +++ b/tools/expand_string_handle @@ -0,0 +1,20 @@ +#!/bin/sh +# Expand syntax sugar for SubX string literals and show the corresponding handle definition. +# +# The handle has a fake alloc-id; we're never going to try to reclaim global +# variables, we just sometimes need handles in them to satisfy type constraints. + +INPUT=$(cat) +echo " 0x11/imm32/alloc-id:fake:payload" +echo " # \"$INPUT\"" + +# print length in bytes +printf " 0x%x/imm32/size\n" $(echo -n $INPUT |wc -c) + +# print ascii codes for each character in hex +echo -n " " +for c in $(echo "$INPUT" |sed -e 's/./& /g') +do + echo -n " 0x$(printf '%x' "'$c")/$c" +done +echo |