diff options
| author | Kartik Agaram <vc@akkartik.com> | 2019-07-13 19:41:16 -0700 |
|---|---|---|
| committer | Kartik Agaram <vc@akkartik.com> | 2019-07-13 19:41:16 -0700 |
| commit | 2773d5a48a0c3f385c0dbc9240c0baa07b67a2cc (patch) | |
| tree | e9449bfd730c85f70dea6309ef2265edb2c9d621 /subx | |
| parent | 17fb42cfd9d8b00c03973d68e7bfee61f8882918 (diff) | |
| download | mu-2773d5a48a0c3f385c0dbc9240c0baa07b67a2cc.tar.gz | |
survey.subx now passing all tests
Diffstat (limited to 'subx')
| -rwxr-xr-x | subx/apps/survey | bin | 40657 -> 40938 bytes | |||
| -rw-r--r-- | subx/apps/survey.subx | 42 |
2 files changed, 34 insertions, 8 deletions
diff --git a/subx/apps/survey b/subx/apps/survey index 1cf107fe..abab8078 100755 --- a/subx/apps/survey +++ b/subx/apps/survey Binary files differdiff --git a/subx/apps/survey.subx b/subx/apps/survey.subx index c533dbfa..a3c77d36 100644 --- a/subx/apps/survey.subx +++ b/subx/apps/survey.subx @@ -388,34 +388,60 @@ test-convert-computes-addresses: # . . discard args 81 0/subop/add 3/mod/direct 4/rm32/ESP . . . . . 8/imm32 # add to ESP # check trace - # . check-trace-contains("label 'x' is at address 0x1079", msg) +#? # dump *Trace-stream {{{ +#? # . write(2/stderr, "^") +#? # . . push args +#? 68/push "^"/imm32 +#? 68/push 2/imm32/stderr +#? # . . call +#? e8/call write/disp32 +#? # . . discard args +#? 81 0/subop/add 3/mod/direct 4/rm32/ESP . . . . . 8/imm32 # add to ESP +#? # . write-stream(2/stderr, *Trace-stream) +#? # . . push args +#? ff 6/subop/push 0/mod/indirect 5/rm32/.disp32 . . . Trace-stream/disp32 # push *Trace-stream +#? 68/push 2/imm32/stderr +#? # . . call +#? e8/call write-stream/disp32 +#? # . . discard args +#? 81 0/subop/add 3/mod/direct 4/rm32/ESP . . . . . 8/imm32 # add to ESP +#? # . write(2/stderr, "$\n") +#? # . . push args +#? 68/push "$\n"/imm32 +#? 68/push 2/imm32/stderr +#? # . . call +#? e8/call write/disp32 +#? # . . discard args +#? 81 0/subop/add 3/mod/direct 4/rm32/ESP . . . . . 8/imm32 # add to ESP +#? # }}} + # . check-trace-contains("label 'x' is at address 0x00001079.", msg) # . . push args 68/push "F - test-convert-computes-addresses/0"/imm32 - 68/push "label 'x' is at address 0x1079"/imm32 + 68/push "label 'x' is at address 0x00001079."/imm32 # . . call e8/call check-trace-contains/disp32 # . . discard args 81 0/subop/add 3/mod/direct 4/rm32/ESP . . . . . 8/imm32 # add to ESP - # . check-trace-contains("segment 'code' starts at address 0x74", msg) + # . check-trace-contains("segment 'code' starts at address 0x00000074.", msg) # . . push args 68/push "F - test-convert-computes-addresses/1"/imm32 - 68/push "segment 'code' starts at address 0x74"/imm32 + 68/push "segment 'code' starts at address 0x00000074."/imm32 # . . call e8/call check-trace-contains/disp32 # . . discard args 81 0/subop/add 3/mod/direct 4/rm32/ESP . . . . . 8/imm32 # add to ESP - # . check-trace-contains("segment 'code' has size 0x5", msg) + # . check-trace-contains("segment 'code' has size 0x00000005.", msg) # . . push args 68/push "F - test-convert-computes-addresses/2"/imm32 - 68/push "segment 'code' has size 0x5"/imm32 + 68/push "segment 'code' has size 0x00000005."/imm32 # . . call e8/call check-trace-contains/disp32 # . . discard args 81 0/subop/add 3/mod/direct 4/rm32/ESP . . . . . 8/imm32 # add to ESP - # . check-trace-contains("segment 'data' starts at address 0x1079", msg) + # . check-trace-contains("segment 'data' starts at address 0x00001079.", msg) # . . push args 68/push "F - test-convert-computes-addresses/3"/imm32 - 68/push "segment 'data' starts at address 0x1079"/imm32 + 68/push "segment 'data' starts at address 0x00001079."/imm32 # . . call e8/call check-trace-contains/disp32 # . . discard args |