diff options
| author | Kartik Agaram <vc@akkartik.com> | 2019-08-24 08:18:09 -0700 |
|---|---|---|
| committer | Kartik Agaram <vc@akkartik.com> | 2019-08-24 08:18:09 -0700 |
| commit | 33de6b80310da89950b0d1c63c5b39d5893a68c3 (patch) | |
| tree | 01278a8cef34642556fec5933bdc38c983e3a805 | |
| parent | 60d59aec858d5456f6b2301e4fbae09937628b11 (diff) | |
| download | mu-33de6b80310da89950b0d1c63c5b39d5893a68c3.tar.gz | |
build out all variants for skipping whitespace
skip {whitespace, non-whitespace} x {from stream, from slice}
| -rw-r--r-- | 073next-token.subx | 270 | ||||
| -rwxr-xr-x | apps/assort | bin | 36540 -> 37257 bytes | |||
| -rwxr-xr-x | apps/crenshaw2-1 | bin | 30274 -> 30991 bytes | |||
| -rwxr-xr-x | apps/crenshaw2-1b | bin | 30833 -> 31550 bytes | |||
| -rwxr-xr-x | apps/desugar | bin | 39803 -> 40520 bytes | |||
| -rwxr-xr-x | apps/dquotes | bin | 43096 -> 43813 bytes | |||
| -rwxr-xr-x | apps/factorial | bin | 29286 -> 30003 bytes | |||
| -rwxr-xr-x | apps/handle | bin | 30140 -> 30857 bytes | |||
| -rwxr-xr-x | apps/hex | bin | 38933 -> 39650 bytes | |||
| -rwxr-xr-x | apps/pack | bin | 49226 -> 49943 bytes | |||
| -rwxr-xr-x | apps/survey | bin | 45823 -> 46540 bytes | |||
| -rwxr-xr-x | apps/tests | bin | 35352 -> 36069 bytes |
12 files changed, 270 insertions, 0 deletions
diff --git a/073next-token.subx b/073next-token.subx index 942d9878..a1dd0c4c 100644 --- a/073next-token.subx +++ b/073next-token.subx @@ -461,6 +461,95 @@ test-skip-chars-matching-none: # end c3/return +skip-chars-matching-whitespace: # in : (address stream) + # . prolog + 55/push-EBP + 89/copy 3/mod/direct 5/rm32/EBP . . . 4/r32/ESP . . # copy ESP to EBP + # . save registers + 50/push-EAX + 51/push-ECX + 53/push-EBX + 56/push-ESI + # ESI = in + 8b/copy 1/mod/*+disp8 5/rm32/EBP . . . 6/r32/ESI 8/disp8 . # copy *(EBP+8) to ESI + # ECX = in->read + 8b/copy 1/mod/*+disp8 6/rm32/ESI . . . 1/r32/ECX 4/disp8 . # copy *(ESI+4) to ECX + # EBX = in->write + 8b/copy 0/mod/indirect 6/rm32/ESI . . . 3/r32/EBX . . # copy *ESI to EBX +$skip-chars-matching-whitespace:loop: + # if (in->read >= in->write) break + 39/compare 3/mod/direct 1/rm32/ECX . . . 3/r32/EBX . . # compare ECX with EBX + 7d/jump-if-greater-or-equal $skip-chars-matching-whitespace:end/disp8 + # EAX = in->data[in->read] + 31/xor 3/mod/direct 0/rm32/EAX . . . 0/r32/EAX . . # clear EAX + 8a/copy-byte 1/mod/*+disp8 4/rm32/sib 6/base/ESI 1/index/ECX . 0/r32/AL 0xc/disp8 . # copy byte at *(ESI+ECX+12) to AL + # if (EAX == ' ') goto body + 3d/compare-EAX-and 0x20/imm32/space + 74/jump-if-equal $skip-chars-matching-whitespace:body/disp8 + # if (EAX == '\n') goto body + 3d/compare-EAX-and 0x0a/imm32/newline + 74/jump-if-equal $skip-chars-matching-whitespace:body/disp8 + # if (EAX == '\t') goto body + 3d/compare-EAX-and 0x09/imm32/tab + 74/jump-if-equal $skip-chars-matching-whitespace:body/disp8 + # if (EAX != '\r') break + 3d/compare-EAX-and 0x0d/imm32/cr + 75/jump-if-not-equal $skip-chars-matching-whitespace:end/disp8 +$skip-chars-matching-whitespace:body: + # ++in->read + 41/increment-ECX + eb/jump $skip-chars-matching-whitespace:loop/disp8 +$skip-chars-matching-whitespace:end: + # persist in->read + 89/copy 1/mod/*+disp8 6/rm32/ESI . . . 1/r32/ECX 4/disp8 . # copy ECX to *(ESI+4) + # . restore registers + 5e/pop-to-ESI + 5b/pop-to-EBX + 59/pop-to-ECX + 58/pop-to-EAX + # . epilog + 89/copy 3/mod/direct 4/rm32/ESP . . . 5/r32/EBP . . # copy EBP to ESP + 5d/pop-to-EBP + c3/return + +test-skip-chars-matching-whitespace: + # setup + # . clear-stream(_test-stream) + # . . push args + 68/push _test-stream/imm32 + # . . call + e8/call clear-stream/disp32 + # . . discard args + 81 0/subop/add 3/mod/direct 4/rm32/ESP . . . . . 4/imm32 # add to ESP + # write(_test-stream, " \nab") + # . . push args + 68/push " \nab"/imm32 + 68/push _test-stream/imm32 + # . . call + e8/call write/disp32 + # . . discard args + 81 0/subop/add 3/mod/direct 4/rm32/ESP . . . . . 8/imm32 # add to ESP + # skip-chars-matching-whitespace(_test-stream) + # . . push args + 68/push _test-stream/imm32 + # . . call + e8/call skip-chars-matching-whitespace/disp32 + # . . discard args + 81 0/subop/add 3/mod/direct 4/rm32/ESP . . . . . 4/imm32 # add to ESP + # check-ints-equal(_test-stream->read, 2, msg) + # . . push args + 68/push "F - test-skip-chars-matching-whitespace"/imm32 + 68/push 2/imm32 + # . . push *_test-stream->read + b8/copy-to-EAX _test-stream/imm32 + ff 6/subop/push 1/mod/*+disp8 0/rm32/EAX . . . . 4/disp8 . # push *(EAX+4) + # . . call + e8/call check-ints-equal/disp32 + # . . discard args + 81 0/subop/add 3/mod/direct 4/rm32/ESP . . . . . 0xc/imm32 # add to ESP + # end + c3/return + # minor fork of 'skip-chars-matching' skip-chars-not-matching: # in : (address stream), delimiter : byte # . prolog @@ -674,6 +763,44 @@ $skip-chars-not-matching-whitespace:end: 5d/pop-to-EBP c3/return +test-skip-chars-not-matching-whitespace: + # setup + # . clear-stream(_test-stream) + # . . push args + 68/push _test-stream/imm32 + # . . call + e8/call clear-stream/disp32 + # . . discard args + 81 0/subop/add 3/mod/direct 4/rm32/ESP . . . . . 4/imm32 # add to ESP + # write(_test-stream, "ab\n") + # . . push args + 68/push "ab\n"/imm32 + 68/push _test-stream/imm32 + # . . call + e8/call write/disp32 + # . . discard args + 81 0/subop/add 3/mod/direct 4/rm32/ESP . . . . . 8/imm32 # add to ESP + # skip-chars-not-matching-whitespace(_test-stream) + # . . push args + 68/push _test-stream/imm32 + # . . call + e8/call skip-chars-not-matching-whitespace/disp32 + # . . discard args + 81 0/subop/add 3/mod/direct 4/rm32/ESP . . . . . 4/imm32 # add to ESP + # check-ints-equal(_test-stream->read, 2, msg) + # . . push args + 68/push "F - test-skip-chars-not-matching-whitespace"/imm32 + 68/push 2/imm32 + # . . push *_test-stream->read + b8/copy-to-EAX _test-stream/imm32 + ff 6/subop/push 1/mod/*+disp8 0/rm32/EAX . . . . 4/disp8 . # push *(EAX+4) + # . . call + e8/call check-ints-equal/disp32 + # . . discard args + 81 0/subop/add 3/mod/direct 4/rm32/ESP . . . . . 0xc/imm32 # add to ESP + # end + c3/return + skip-chars-matching-in-slice: # curr : (address byte), end : (address byte), delimiter : byte -> curr/EAX # . prolog 55/push-EBP @@ -769,6 +896,78 @@ test-skip-chars-matching-in-slice-none: # end c3/return +skip-chars-matching-whitespace-in-slice: # in : (address stream) + # . prolog + 55/push-EBP + 89/copy 3/mod/direct 5/rm32/EBP . . . 4/r32/ESP . . # copy ESP to EBP + # . save registers + 51/push-ECX + 53/push-EBX + # EAX = curr + 8b/copy 1/mod/*+disp8 5/rm32/EBP . . . 0/r32/EAX 8/disp8 . # copy *(EBP+8) to EAX + # ECX = end + 8b/copy 1/mod/*+disp8 5/rm32/EBP . . . 1/r32/ECX 0xc/disp8 . # copy *(EBP+12) to ECX + # EBX = 0 + 31/xor 3/mod/direct 3/rm32/EBX . . . 3/r32/EBX . . # clear EBX +$skip-chars-matching-whitespace-in-slice:loop: + # if (curr >= end) break + 39/compare 3/mod/direct 0/rm32/EAX . . . 1/r32/ECX . . # compare EAX with ECX + 0f 83/jump-if-greater-or-equal-unsigned $skip-chars-matching-in-slice:end/disp32 + # EBX = *curr + 8a/copy-byte 0/mod/indirect 0/rm32/EAX . . . 3/r32/BL . . # copy byte at *EAX to BL + # if (*curr == ' ') goto body + 81 7/subop/compare 3/mod/direct 3/rm32/EBX . . . . . 0x20/imm32/space # compare EBX + 74/jump-if-equal $skip-chars-matching-whitespace-in-slice:body/disp8 + # if (*curr == '\n') goto body + 81 7/subop/compare 3/mod/direct 3/rm32/EBX . . . . . 0x0a/imm32/newline # compare EBX + 74/jump-if-equal $skip-chars-matching-whitespace-in-slice:body/disp8 + # if (*curr == '\t') goto body + 81 7/subop/compare 3/mod/direct 3/rm32/EBX . . . . . 0x09/imm32/tab # compare EBX + 74/jump-if-equal $skip-chars-matching-whitespace-in-slice:body/disp8 + # if (*curr != '\r') break + 81 7/subop/compare 3/mod/direct 3/rm32/EBX . . . . . 0x0d/imm32/cr # compare EBX + 75/jump-if-not-equal $skip-chars-matching-whitespace-in-slice:end/disp8 +$skip-chars-matching-whitespace-in-slice:body: + # ++curr + 40/increment-EAX + eb/jump $skip-chars-matching-whitespace-in-slice:loop/disp8 +$skip-chars-matching-whitespace-in-slice:end: + # . restore registers + 5b/pop-to-EBX + 59/pop-to-ECX + # . epilog + 89/copy 3/mod/direct 4/rm32/ESP . . . 5/r32/EBP . . # copy EBP to ESP + 5d/pop-to-EBP + c3/return + +test-skip-chars-matching-whitespace-in-slice: + # (EAX..ECX) = " \nab" + b8/copy-to-EAX " \nab"/imm32 + 8b/copy 0/mod/indirect 0/rm32/EAX . . . 1/r32/ECX . . # copy *EAX to ECX + 8d/copy-address 1/mod/*+disp8 4/rm32/sib 0/base/EAX 1/index/ECX . 1/r32/ECX 4/disp8 . # copy EAX+ECX+4 to ECX + 05/add-to-EAX 4/imm32 + # EAX = skip-chars-matching-whitespace-in-slice(EAX, ECX) + # . . push args + 51/push-ECX + 50/push-EAX + # . . call + e8/call skip-chars-matching-whitespace-in-slice/disp32 + # . . discard args + 81 0/subop/add 3/mod/direct 4/rm32/ESP . . . . . 8/imm32 # add to ESP + # check-ints-equal(ECX-EAX, 2, msg) + # . . push args + 68/push "F - test-skip-chars-matching-whitespace-in-slice"/imm32 + 68/push 2/imm32 + # . . push ECX-EAX + 29/subtract 3/mod/direct 1/rm32/ECX . . . 0/r32/EAX . . # subtract EAX from ECX + 51/push-ECX + # . . call + e8/call check-ints-equal/disp32 + # . . discard args + 81 0/subop/add 3/mod/direct 4/rm32/ESP . . . . . 0xc/imm32 # add to ESP + # end + c3/return + # minor fork of 'skip-chars-matching-in-slice' skip-chars-not-matching-in-slice: # curr : (address byte), end : (address byte), delimiter : byte -> curr/EAX # . prolog @@ -894,4 +1093,75 @@ test-skip-chars-not-matching-in-slice-all: # end c3/return +skip-chars-not-matching-whitespace-in-slice: # in : (address stream) + # . prolog + 55/push-EBP + 89/copy 3/mod/direct 5/rm32/EBP . . . 4/r32/ESP . . # copy ESP to EBP + # . save registers + 51/push-ECX + 53/push-EBX + # EAX = curr + 8b/copy 1/mod/*+disp8 5/rm32/EBP . . . 0/r32/EAX 8/disp8 . # copy *(EBP+8) to EAX + # ECX = end + 8b/copy 1/mod/*+disp8 5/rm32/EBP . . . 1/r32/ECX 0xc/disp8 . # copy *(EBP+12) to ECX + # EBX = 0 + 31/xor 3/mod/direct 3/rm32/EBX . . . 3/r32/EBX . . # clear EBX +$skip-chars-not-matching-whitespace-in-slice:loop: + # if (curr >= end) break + 39/compare 3/mod/direct 0/rm32/EAX . . . 1/r32/ECX . . # compare EAX with ECX + 0f 83/jump-if-greater-or-equal-unsigned $skip-chars-not-matching-in-slice:end/disp32 + # EBX = *curr + 8a/copy-byte 0/mod/indirect 0/rm32/EAX . . . 3/r32/BL . . # copy byte at *EAX to BL + # if (*curr == ' ') break + 81 7/subop/compare 3/mod/direct 3/rm32/EBX . . . . . 0x20/imm32/space # compare EBX + 74/jump-if-equal $skip-chars-not-matching-whitespace-in-slice:end/disp8 + # if (*curr == '\n') break + 81 7/subop/compare 3/mod/direct 3/rm32/EBX . . . . . 0x0a/imm32/newline # compare EBX + 74/jump-if-equal $skip-chars-not-matching-whitespace-in-slice:end/disp8 + # if (*curr == '\t') break + 81 7/subop/compare 3/mod/direct 3/rm32/EBX . . . . . 0x09/imm32/tab # compare EBX + 74/jump-if-equal $skip-chars-not-matching-whitespace-in-slice:end/disp8 + # if (*curr == '\r') break + 81 7/subop/compare 3/mod/direct 3/rm32/EBX . . . . . 0x0d/imm32/cr # compare EBX + 74/jump-if-equal $skip-chars-not-matching-whitespace-in-slice:end/disp8 + # ++curr + 40/increment-EAX + eb/jump $skip-chars-not-matching-whitespace-in-slice:loop/disp8 +$skip-chars-not-matching-whitespace-in-slice:end: + # . restore registers + 5b/pop-to-EBX + 59/pop-to-ECX + # . epilog + 89/copy 3/mod/direct 4/rm32/ESP . . . 5/r32/EBP . . # copy EBP to ESP + 5d/pop-to-EBP + c3/return + +test-skip-chars-not-matching-whitespace-in-slice: + # (EAX..ECX) = "ab\n" + b8/copy-to-EAX "ab\n"/imm32 + 8b/copy 0/mod/indirect 0/rm32/EAX . . . 1/r32/ECX . . # copy *EAX to ECX + 8d/copy-address 1/mod/*+disp8 4/rm32/sib 0/base/EAX 1/index/ECX . 1/r32/ECX 4/disp8 . # copy EAX+ECX+4 to ECX + 05/add-to-EAX 4/imm32 + # EAX = skip-chars-not-matching-whitespace-in-slice(EAX, ECX) + # . . push args + 51/push-ECX + 50/push-EAX + # . . call + e8/call skip-chars-not-matching-whitespace-in-slice/disp32 + # . . discard args + 81 0/subop/add 3/mod/direct 4/rm32/ESP . . . . . 8/imm32 # add to ESP + # check-ints-equal(ECX-EAX, 1, msg) + # . . push args + 68/push "F - test-skip-chars-not-matching-whitespace-in-slice"/imm32 + 68/push 1/imm32 + # . . push ECX-EAX + 29/subtract 3/mod/direct 1/rm32/ECX . . . 0/r32/EAX . . # subtract EAX from ECX + 51/push-ECX + # . . call + e8/call check-ints-equal/disp32 + # . . discard args + 81 0/subop/add 3/mod/direct 4/rm32/ESP . . . . . 0xc/imm32 # add to ESP + # end + c3/return + # . . vim:nowrap:textwidth=0 diff --git a/apps/assort b/apps/assort index 94b0ea4e..4787bd57 100755 --- a/apps/assort +++ b/apps/assort Binary files differdiff --git a/apps/crenshaw2-1 b/apps/crenshaw2-1 index fa879144..c8affb01 100755 --- a/apps/crenshaw2-1 +++ b/apps/crenshaw2-1 Binary files differdiff --git a/apps/crenshaw2-1b b/apps/crenshaw2-1b index 347cb749..9b059183 100755 --- a/apps/crenshaw2-1b +++ b/apps/crenshaw2-1b Binary files differdiff --git a/apps/desugar b/apps/desugar index 84eaeb2c..27049b34 100755 --- a/apps/desugar +++ b/apps/desugar Binary files differdiff --git a/apps/dquotes b/apps/dquotes index efa60694..c3c7cb5e 100755 --- a/apps/dquotes +++ b/apps/dquotes Binary files differdiff --git a/apps/factorial b/apps/factorial index 62c9e9c8..de1fe8c0 100755 --- a/apps/factorial +++ b/apps/factorial Binary files differdiff --git a/apps/handle b/apps/handle index 94326ff3..6b2f289c 100755 --- a/apps/handle +++ b/apps/handle Binary files differdiff --git a/apps/hex b/apps/hex index 15b7ec2f..ffbb7850 100755 --- a/apps/hex +++ b/apps/hex Binary files differdiff --git a/apps/pack b/apps/pack index 44797c67..7bf20991 100755 --- a/apps/pack +++ b/apps/pack Binary files differdiff --git a/apps/survey b/apps/survey index 9adb79a1..f0742f44 100755 --- a/apps/survey +++ b/apps/survey Binary files differdiff --git a/apps/tests b/apps/tests index 537be047..a4888fee 100755 --- a/apps/tests +++ b/apps/tests Binary files differ |