diff options
| author | Kartik Agaram <vc@akkartik.com> | 2019-08-12 23:28:48 -0700 |
|---|---|---|
| committer | Kartik Agaram <vc@akkartik.com> | 2019-08-12 23:39:53 -0700 |
| commit | 2b48729fd2a677ca081cec05c057d86a44664abd (patch) | |
| tree | 337d97f86e59648a4297b3c7f1189f11afd13e35 | |
| parent | 15a84e24497c107cc1572e8e85115d37179d83f4 (diff) | |
| download | mu-2b48729fd2a677ca081cec05c057d86a44664abd.tar.gz | |
new variant: maybe-get returns null on failure
| -rw-r--r-- | 078table.subx | 148 | ||||
| -rwxr-xr-x | apps/assort | bin | 34424 -> 34812 bytes | |||
| -rwxr-xr-x | apps/crenshaw2-1 | bin | 27418 -> 27806 bytes | |||
| -rwxr-xr-x | apps/crenshaw2-1b | bin | 27977 -> 28365 bytes | |||
| -rwxr-xr-x | apps/desugar | bin | 33687 -> 34075 bytes | |||
| -rwxr-xr-x | apps/dquotes | bin | 40980 -> 41368 bytes | |||
| -rwxr-xr-x | apps/factorial | bin | 26334 -> 26722 bytes | |||
| -rwxr-xr-x | apps/handle | bin | 27188 -> 27576 bytes | |||
| -rwxr-xr-x | apps/hex | bin | 36979 -> 37367 bytes | |||
| -rwxr-xr-x | apps/pack | bin | 47110 -> 47498 bytes | |||
| -rwxr-xr-x | apps/survey | bin | 43707 -> 44095 bytes | |||
| -rwxr-xr-x | apps/tests | bin | 33236 -> 33624 bytes |
12 files changed, 148 insertions, 0 deletions
diff --git a/078table.subx b/078table.subx index 90976b11..d172209a 100644 --- a/078table.subx +++ b/078table.subx @@ -13,6 +13,7 @@ # ------------------------+--------------------------------------------------- # abort | get get-slice # insert key | get-or-insert leaky-get-or-insert-slice +# return null | maybe-get maybe-get-slice # Some variants may take extra args. == code @@ -920,4 +921,151 @@ $test-leaky-get-or-insert-slice:end: 5d/pop-to-EBP c3/return +# if no row is found, return null (0) +maybe-get: # table : (address stream {string, _}), key : (address string), row-size : int -> EAX : (address _) + # pseudocode: + # curr = table->data + # max = &table->data[table->write] + # while curr < max + # if string-equal?(key, *curr) + # return curr+4 + # curr += row-size + # return 0 + # + # . prolog + 55/push-EBP + 89/copy 3/mod/direct 5/rm32/EBP . . . 4/r32/ESP . . # copy ESP to EBP + # . save registers + 51/push-ECX + 52/push-EDX + 56/push-ESI + # ESI = table + 8b/copy 1/mod/*+disp8 5/rm32/EBP . . . 6/r32/ESI 8/disp8 . # copy *(EBP+8) to ESI + # curr/ECX = table->data + 8d/copy-address 1/mod/*+disp8 6/rm32/ESI . . . 1/r32/ECX 0xc/disp8 . # copy ESI+12 to ECX + # max/EDX = table->data + table->write + 8b/copy 0/mod/indirect 6/rm32/ESI . . . 2/r32/EDX . . # copy *ESI to EDX + 8d/copy-address 0/mod/indirect 4/rm32/sib 1/base/ECX 2/index/EDX . 2/r32/EDX . . # copy ECX+EDX to EDX +$maybe-get:search-loop: + # if (curr >= max) return null + 39/compare 3/mod/direct 1/rm32/ECX . . . 2/r32/EDX . . # compare ECX with EDX + 73/jump-if-greater-or-equal-unsigned $maybe-get:null/disp8 + # if (string-equal?(key, *curr)) return curr+4 + # . EAX = string-equal?(key, *curr) + # . . push args + ff 6/subop/push 0/mod/indirect 1/rm32/ECX . . . . . . # push *ECX + ff 6/subop/push 1/mod/*+disp8 5/rm32/EBP . . . . 0xc/disp8 . # push *(EBP+12) + # . . call + e8/call string-equal?/disp32 + # . . discard args + 81 0/subop/add 3/mod/direct 4/rm32/ESP . . . . . 8/imm32 # add to ESP + # . if (EAX != 0) return EAX = curr+4 + 3d/compare-EAX-and 0/imm32 + 74/jump-if-equal $maybe-get:mismatch/disp8 + 8d/copy-address 1/mod/*+disp8 1/rm32/ECX . . . 0/r32/EAX 4/disp8 . # copy ECX+4 to EAX + eb/jump $maybe-get:end/disp8 +$maybe-get:mismatch: + # curr += row-size + 03/add 1/mod/*+disp8 5/rm32/EBP . . . 1/r32/ECX 0x10/disp8 . # add *(EBP+16) to ECX + # loop + eb/jump $maybe-get:search-loop/disp8 +$maybe-get:null: + b8/copy-to-EAX 0/imm32 +$maybe-get:end: + # . restore registers + 5e/pop-to-ESI + 5a/pop-to-EDX + 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-maybe-get: + # . prolog + 55/push-EBP + 89/copy 3/mod/direct 5/rm32/EBP . . . 4/r32/ESP . . # copy ESP to EBP + # - setup: create a table with one row + # var table/ECX : (address stream {string, number}) = stream(2 rows * 8 bytes) + 81 5/subop/subtract 3/mod/direct 4/rm32/ESP . . . . . 0x10/imm32 # subtract from ESP + 68/push 0x10/imm32/length + 68/push 0/imm32/read + 68/push 0/imm32/write + 89/copy 3/mod/direct 1/rm32/ECX . . . 4/r32/ESP . . # copy ESP to ECX + # EAX = get-or-insert(table, "code", 8 bytes per row) + # . . push args + 68/push 8/imm32/row-size + 68/push "code"/imm32 + 51/push-ECX + # . . call + e8/call get-or-insert/disp32 + # . . discard args + 81 0/subop/add 3/mod/direct 4/rm32/ESP . . . . . 0xc/imm32 # add to ESP +$test-maybe-get:success: + # - check for the same key, verify that it was reused + # EAX = maybe-get(table, "code", 8 bytes per row) + # . . push args + 68/push 8/imm32/row-size + 68/push "code"/imm32 + 51/push-ECX + # . . call + e8/call maybe-get/disp32 + # . . discard args + 81 0/subop/add 3/mod/direct 4/rm32/ESP . . . . . 0xc/imm32 # add to ESP + # check-ints-equal(EAX - table->data, 4, msg) + # . check-ints-equal(EAX - table, 16, msg) + # . . push args + 68/push "F - test-maybe-get/0"/imm32 + 68/push 0x10/imm32 + 29/subtract 3/mod/direct 0/rm32/EAX . . . 1/r32/ECX . . # subtract ECX from EAX + 50/push-EAX + # . . call + e8/call check-ints-equal/disp32 + # . . discard args + 81 0/subop/add 3/mod/direct 4/rm32/ESP . . . . . 0xc/imm32 # add to ESP + # no new row inserted + # . check-ints-equal(table->write, row-size = 8, msg) + # . . push args + 68/push "F - test-maybe-get/1"/imm32 + 68/push 8/imm32/row-size + ff 6/subop/push 0/mod/indirect 1/rm32/ECX . . . . . . # 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 + # check-string-equal(*table->data, "code", msg) + # . . push args + 68/push "F - test-maybe-get/2"/imm32 + 68/push "code"/imm32 + ff 6/subop/push 1/mod/*+disp8 1/rm32/ECX . . . . 0xc/disp8 . # push *(ECX+12) + # . . call + e8/call check-string-equal/disp32 + # . . discard args + 81 0/subop/add 3/mod/direct 4/rm32/ESP . . . . . 0xc/imm32 # add to ESP +$test-maybe-get:failure: + # - search for a new key + # EAX = maybe-get(table, "data", 8 bytes per row) + # . . push args + 68/push 8/imm32/row-size + 68/push "data"/imm32 + 51/push-ECX + # . . call + e8/call maybe-get/disp32 + # . . discard args + 81 0/subop/add 3/mod/direct 4/rm32/ESP . . . . . 0xc/imm32 # add to ESP + # check-ints-equal(EAX, 0, msg) + # . . push args + 68/push "F - test-maybe-get/3"/imm32 + 68/push 0/imm32 + 50/push-EAX + # . . call + e8/call check-ints-equal/disp32 + # . . discard args + 81 0/subop/add 3/mod/direct 4/rm32/ESP . . . . . 0xc/imm32 # add to ESP +$test-maybe-get:end: + # . epilog + 89/copy 3/mod/direct 4/rm32/ESP . . . 5/r32/EBP . . # copy EBP to ESP + 5d/pop-to-EBP + c3/return + # . . vim:nowrap:textwidth=0 diff --git a/apps/assort b/apps/assort index 65c376cb..08795d45 100755 --- a/apps/assort +++ b/apps/assort Binary files differdiff --git a/apps/crenshaw2-1 b/apps/crenshaw2-1 index 46a69570..a30a6230 100755 --- a/apps/crenshaw2-1 +++ b/apps/crenshaw2-1 Binary files differdiff --git a/apps/crenshaw2-1b b/apps/crenshaw2-1b index 1ecdf77d..4913856a 100755 --- a/apps/crenshaw2-1b +++ b/apps/crenshaw2-1b Binary files differdiff --git a/apps/desugar b/apps/desugar index 7e37ec11..a7f798ef 100755 --- a/apps/desugar +++ b/apps/desugar Binary files differdiff --git a/apps/dquotes b/apps/dquotes index bada9287..6bcdd993 100755 --- a/apps/dquotes +++ b/apps/dquotes Binary files differdiff --git a/apps/factorial b/apps/factorial index ba94e958..96d40859 100755 --- a/apps/factorial +++ b/apps/factorial Binary files differdiff --git a/apps/handle b/apps/handle index 6c590f36..87c25a9d 100755 --- a/apps/handle +++ b/apps/handle Binary files differdiff --git a/apps/hex b/apps/hex index 7d13505d..d0660086 100755 --- a/apps/hex +++ b/apps/hex Binary files differdiff --git a/apps/pack b/apps/pack index 820f7962..a8b58e43 100755 --- a/apps/pack +++ b/apps/pack Binary files differdiff --git a/apps/survey b/apps/survey index 3431001b..08026c71 100755 --- a/apps/survey +++ b/apps/survey Binary files differdiff --git a/apps/tests b/apps/tests index fb27af91..ee832d05 100755 --- a/apps/tests +++ b/apps/tests Binary files differ |