diff options
| -rw-r--r-- | 059stop.subx | 3 | ||||
| -rw-r--r-- | 078table.subx | 245 | ||||
| -rwxr-xr-x | apps/assort | bin | 35948 -> 36540 bytes | |||
| -rwxr-xr-x | apps/crenshaw2-1 | bin | 29682 -> 30274 bytes | |||
| -rwxr-xr-x | apps/crenshaw2-1b | bin | 30241 -> 30833 bytes | |||
| -rwxr-xr-x | apps/dquotes | bin | 42504 -> 43096 bytes | |||
| -rwxr-xr-x | apps/factorial | bin | 28694 -> 29286 bytes | |||
| -rwxr-xr-x | apps/handle | bin | 29548 -> 30140 bytes | |||
| -rwxr-xr-x | apps/hex | bin | 38341 -> 38933 bytes | |||
| -rwxr-xr-x | apps/pack | bin | 48634 -> 49226 bytes | |||
| -rwxr-xr-x | apps/survey | bin | 45231 -> 45823 bytes | |||
| -rwxr-xr-x | apps/tests | bin | 34760 -> 35352 bytes |
12 files changed, 245 insertions, 3 deletions
diff --git a/059stop.subx b/059stop.subx index 7fc99a27..f4e90707 100644 --- a/059stop.subx +++ b/059stop.subx @@ -39,7 +39,8 @@ # Configure an exit-descriptor for a call pushing 'nbytes' bytes of args to # the stack. -# Ugly that we need to know the size of args, but so it goes. +# Ugly that we need to know the size of args. Don't allocate variables between +# tailor-exit-descriptor and the call it's for. tailor-exit-descriptor: # ed : (address exit-descriptor), nbytes : int -> <void> # . prolog 55/push-EBP diff --git a/078table.subx b/078table.subx index 0a6e7c57..6518789c 100644 --- a/078table.subx +++ b/078table.subx @@ -1085,7 +1085,7 @@ $test-get-or-stop:success: # . . push args 52/push-EDX/ed 68/push _test-error-buffered-file/imm32 - 68/push "foo"/imm32 + 68/push "foo"/imm32/abort-prefix 68/push 8/imm32/row-size 68/push "code"/imm32 51/push-ECX @@ -1110,7 +1110,7 @@ $test-get-or-stop:failure: # . . push args 52/push-EDX/ed 68/push _test-error-buffered-file/imm32 - 68/push "foo"/imm32 + 68/push "foo"/imm32/abort-prefix 68/push 8/imm32/row-size 68/push "data"/imm32 51/push-ECX @@ -1140,6 +1140,247 @@ $test-get-or-stop:end: 5d/pop-to-EBP c3/return +# if no row is found, stop(ed) +get-slice-or-stop: # table : (address stream {string, _}), key : (address slice), row-size : int, + # abort-message-prefix : (address string), err : (address buffered-file), ed : (address exit-descriptor) + # -> EAX : (address _) + # pseudocode: + # curr = table->data + # max = &table->data[table->write] + # while curr < max + # if slice-equal?(key, *curr) + # return curr+4 + # curr += row-size + # write-buffered(err, msg) + # stop(ed) + # + # . 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 +$get-slice-or-stop:search-loop: + # if (curr >= max) stop(ed) + 39/compare 3/mod/direct 1/rm32/ECX . . . 2/r32/EDX . . # compare ECX with EDX + 73/jump-if-greater-or-equal-unsigned $get-slice-or-stop:stop/disp8 + # if (slice-equal?(key, *curr)) return curr+4 + # . EAX = slice-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 slice-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 $get-slice-or-stop:mismatch/disp8 + 8d/copy-address 1/mod/*+disp8 1/rm32/ECX . . . 0/r32/EAX 4/disp8 . # copy ECX+4 to EAX + eb/jump $get-slice-or-stop:end/disp8 +$get-slice-or-stop: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 $get-slice-or-stop:search-loop/disp8 +$get-slice-or-stop: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 + +$get-slice-or-stop:stop: + # . write-buffered(err, abort-message-prefix) + # . . push args + ff 6/subop/push 1/mod/*+disp8 5/rm32/EBP . . . . 0x14/disp8 . # push *(EBP+20) + ff 6/subop/push 1/mod/*+disp8 5/rm32/EBP . . . . 0x18/disp8 . # push *(EBP+24) + # . . call + e8/call write-buffered/disp32 + # . . discard args + 81 0/subop/add 3/mod/direct 4/rm32/ESP . . . . . 8/imm32 # add to ESP + # . write-buffered(err, error) + # . . push args + 68/push ": get-slice-or-stop: key not found: "/imm32 + ff 6/subop/push 1/mod/*+disp8 5/rm32/EBP . . . . 0x18/disp8 . # push *(EBP+24) + # . . call + e8/call write-buffered/disp32 + # . . discard args + 81 0/subop/add 3/mod/direct 4/rm32/ESP . . . . . 8/imm32 # add to ESP + # . write-slice-buffered(err, key) + # . . push args + ff 6/subop/push 1/mod/*+disp8 5/rm32/EBP . . . . 0xc/disp8 . # push *(EBP+12) + ff 6/subop/push 1/mod/*+disp8 5/rm32/EBP . . . . 0x18/disp8 . # push *(EBP+24) + # . . call + e8/call write-slice-buffered/disp32 + # . . discard args + 81 0/subop/add 3/mod/direct 4/rm32/ESP . . . . . 8/imm32 # add to ESP + # . write-buffered(err, "\n") + # . . push args + 68/push "\n"/imm32 + ff 6/subop/push 1/mod/*+disp8 5/rm32/EBP . . . . 0x18/disp8 . # push *(EBP+24) + # . . call + e8/call write-buffered/disp32 + # . . discard args + 81 0/subop/add 3/mod/direct 4/rm32/ESP . . . . . 8/imm32 # add to ESP + # . stop(ed, 1) + # . . push args + 68/push 1/imm32 + ff 6/subop/push 1/mod/*+disp8 5/rm32/EBP . . . . 0x1c/disp8 . # push *(EBP+28) + # . . call + e8/call stop/disp32 + # never gets here +$get-slice-or-stop:terminus: + # . . discard args + 81 0/subop/add 3/mod/direct 4/rm32/ESP . . . . . 8/imm32 # add to ESP + # syscall(exit, 1) + b8/copy-to-EAX 1/imm32/exit + cd/syscall 0x80/imm8 + +test-get-slice-or-stop: + # This test uses exit-descriptors. Use EBP for setting up local variables. + # . prolog + 55/push-EBP + 89/copy 3/mod/direct 5/rm32/EBP . . . 4/r32/ESP . . # copy ESP to EBP + # setup + # . clear-stream(_test-error-stream) + # . . push args + 68/push _test-error-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 + # . clear-stream(_test-error-buffered-file+4) + # . . push args + b8/copy-to-EAX _test-error-buffered-file/imm32 + 05/add-to-EAX 4/imm32 + 50/push-EAX + # . . call + e8/call clear-stream/disp32 + # . . discard args + 81 0/subop/add 3/mod/direct 4/rm32/ESP . . . . . 4/imm32 # add to ESP + # 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 + # var ed/EDX : (address exit-descriptor) + 68/push 0/imm32 + 68/push 0/imm32 + 89/copy 3/mod/direct 2/rm32/EDX . . . 4/r32/ESP . . # copy ESP to EDX + # var slice/EBX = "code" + # . (EAX..EBX) = "code" + b8/copy-to-EAX "code"/imm32 + 8b/copy 0/mod/indirect 0/rm32/EAX . . . 3/r32/EBX . . # copy *EAX to EBX + 8d/copy-address 1/mod/*+disp8 4/rm32/sib 0/base/EAX 3/index/EBX . 3/r32/EBX 4/disp8 . # copy EAX+EBX+4 to EBX + 05/add-to-EAX 4/imm32 + # . EBX = {EAX, EBX} + 53/push-EBX + 50/push-EAX + 89/copy 3/mod/direct 3/rm32/EBX . . . 4/r32/ESP . . # copy ESP to EBX + # size 'ed' for the calls to 'get-or-stop' (define no locals past this point) + # . tailor-exit-descriptor(ed, 24) + # . . push args + 68/push 0x18/imm32/nbytes-of-args-for-get-or-stop + 52/push-EDX + # . . call + e8/call tailor-exit-descriptor/disp32 + # . . discard args + 81 0/subop/add 3/mod/direct 4/rm32/ESP . . . . . 8/imm32 # add to ESP + # 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-get-slice-or-stop:success: + # EAX = get-slice-or-stop(table, slice, row-size=8, msg, _test-error-buffered-file, ed) + # . . push args + 52/push-EDX/ed + 68/push _test-error-buffered-file/imm32 + 68/push "foo"/imm32/abort-prefix + 68/push 8/imm32/row-size + 53/push-EBX/slice + 51/push-ECX + # . . call + e8/call get-slice-or-stop/disp32 + # registers except ESP may be clobbered at this point + # restore register args, discard others + 59/pop-to-ECX + 5b/pop-to-EBX + 81 0/subop/add 3/mod/direct 4/rm32/ESP . . . . . 0xc/imm32 # add to ESP + 5a/pop-to-EDX +$test-get-slice-or-stop:success-assertion: + # check-ints-equal(EAX - table->data, 4, msg) # first row's value slot returned + # . check-ints-equal(EAX - table, 16, msg) + # . . push args + 68/push "F - test-get-slice-or-stop/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 +$test-get-slice-or-stop:failure: + # slice = "segment2" + # . *EBX = "segment2"->data + b8/copy-to-EAX "segment2"/imm32 + 05/add-to-EAX 4/imm32 + 89/copy 0/mod/indirect 3/rm32/EBX . . . 0/r32/EAX . . # copy EAX to *EBX + # . *(EBX+4) = "segment2"->data + len("segment2") + 05/add-to-EAX 8/imm32/strlen + 89/copy 1/mod/*+disp8 3/rm32/EBX . . . 0/r32/EAX 4/disp8 . # copy EAX to *(EBX+4) + # EAX = get-slice-or-stop(table, slice, row-size=8, msg, _test-error-buffered-file, ed) + # . . push args + 52/push-EDX/ed + 68/push _test-error-buffered-file/imm32 + 68/push "foo"/imm32/abort-prefix + 68/push 8/imm32/row-size + 53/push-EBX/slice + 51/push-ECX + # . . call + e8/call get-slice-or-stop/disp32 + # registers except ESP may be clobbered at this point + # restore register args, discard others + 59/pop-to-ECX + 5b/pop-to-EBX + 81 0/subop/add 3/mod/direct 4/rm32/ESP . . . . . 0xc/imm32 # add to ESP + 5a/pop-to-EDX +$test-get-slice-or-stop:failure-assertion: + # check that get-or-stop tried to call stop(1) + # . check-ints-equal(ed->value, 2, msg) + # . . push args + 68/push "F - test-get-or-stop/1"/imm32 + 68/push 2/imm32 + # . . push ed->value + ff 6/subop/push 1/mod/*+disp8 2/rm32/EDX . . . . 4/disp8 . # push *(EDX+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 +$test-get-slice-or-stop:end: + # . epilog + # don't restore ESP from EBP; manually reclaim locals + 81 0/subop/add 3/mod/direct 4/rm32/ESP . . . . . 0x2c/imm32 # add to ESP + 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: diff --git a/apps/assort b/apps/assort index 97660d3c..94b0ea4e 100755 --- a/apps/assort +++ b/apps/assort Binary files differdiff --git a/apps/crenshaw2-1 b/apps/crenshaw2-1 index 4b8559fd..fa879144 100755 --- a/apps/crenshaw2-1 +++ b/apps/crenshaw2-1 Binary files differdiff --git a/apps/crenshaw2-1b b/apps/crenshaw2-1b index f1f34232..347cb749 100755 --- a/apps/crenshaw2-1b +++ b/apps/crenshaw2-1b Binary files differdiff --git a/apps/dquotes b/apps/dquotes index 1ccfd2a7..efa60694 100755 --- a/apps/dquotes +++ b/apps/dquotes Binary files differdiff --git a/apps/factorial b/apps/factorial index b7b51d79..62c9e9c8 100755 --- a/apps/factorial +++ b/apps/factorial Binary files differdiff --git a/apps/handle b/apps/handle index 9ed11054..94326ff3 100755 --- a/apps/handle +++ b/apps/handle Binary files differdiff --git a/apps/hex b/apps/hex index 7bf66c63..15b7ec2f 100755 --- a/apps/hex +++ b/apps/hex Binary files differdiff --git a/apps/pack b/apps/pack index ead510f0..44797c67 100755 --- a/apps/pack +++ b/apps/pack Binary files differdiff --git a/apps/survey b/apps/survey index 6ca419a6..9adb79a1 100755 --- a/apps/survey +++ b/apps/survey Binary files differdiff --git a/apps/tests b/apps/tests index cfb1fbe7..537be047 100755 --- a/apps/tests +++ b/apps/tests Binary files differ |