From ee9a9237d6324f1de1bb7150083eacf7b9af5f70 Mon Sep 17 00:00:00 2001 From: Kartik Agaram Date: Fri, 30 Nov 2018 11:10:44 -0800 Subject: 4802 Some automated commenting cleanup. Still needs more careful manual scanning. sed -i 's/^# 1-3/# . 1-3/' *.subx */*.subx sed -i 's/^# op/# . op/' *.subx */*.subx sed -i 's/# vim/# . . vim/' *.subx */*.subx sed -i 's/^ # push args/ # . . push args/' *.subx */*.subx sed -i 's/^ # discard args/ # . . discard args/' *.subx */*.subx sed -i 's/^ # call/ # . . call/' *.subx */*.subx sed -i 's/^ # prolog/ # . prolog/' *.subx */*.subx sed -i 's/^ # epilog/ # . epilog/' *.subx */*.subx sed -i 's/^ # save registers/ # . save registers/' *.subx */*.subx sed -i 's/^ # restore registers/ # . restore registers/' *.subx */*.subx sed -i 's/ operand / register /' *.subx */*.subx --- subx/060write-stream.subx | 106 +++++++++++++++++++++++----------------------- 1 file changed, 53 insertions(+), 53 deletions(-) (limited to 'subx/060write-stream.subx') diff --git a/subx/060write-stream.subx b/subx/060write-stream.subx index 75957462..cf178bc1 100644 --- a/subx/060write-stream.subx +++ b/subx/060write-stream.subx @@ -1,9 +1,9 @@ # write-stream: like write, but write streams rather than strings == code -# instruction effective address operand displacement immediate -# op subop mod rm32 base index scale r32 -# 1-3 bytes 3 bits 2 bits 3 bits 3 bits 3 bits 2 bits 2 bits 0/1/2/4 bytes 0/1/2/4 bytes +# instruction effective address register displacement immediate +# . op subop mod rm32 base index scale r32 +# . 1-3 bytes 3 bits 2 bits 3 bits 3 bits 3 bits 2 bits 2 bits 0/1/2/4 bytes 0/1/2/4 bytes # main: # manual test @@ -20,23 +20,23 @@ cd/syscall 0x80/imm8 write-stream: # f : fd or (address stream), s : (address stream) -> - # prolog + # . prolog 55/push-EBP 89/copy 3/mod/direct 5/rm32/EBP . . . 4/r32/ESP . . # copy ESP to EBP # if (f < 0x08000000) _write-stream(f, s), return # f can't be a user-mode address, so treat it as a kernel file descriptor 81 7/subop/compare 1/mod/*+disp8 4/rm32/sib 5/base/EBP 4/index/none . . 8/disp8 0x08000000/imm32 # compare *(EBP+8) 7d/jump-if-greater-or-equal $write-stream:fake/disp8 - # push args + # . . push args ff 6/subop/push 1/mod/*+disp8 4/rm32/sib 5/base/EBP 4/index/none . . 0xc/disp8 . # push *(EBP+12) ff 6/subop/push 1/mod/*+disp8 4/rm32/sib 5/base/EBP 4/index/none . . 8/disp8 . # push *(EBP+8) - # call + # . . call e8/call _write-stream/disp32 - # discard args + # . . discard args 81 0/subop/add 3/mod/direct 4/rm32/ESP . . . . . 8/imm32 # add to ESP eb/jump $write-stream:end/disp8 $write-stream:fake: # otherwise, treat 'f' as a stream to append to - # save registers + # . save registers 50/push-EAX 56/push-ESI 57/push-EDI @@ -61,29 +61,29 @@ $write-stream:fake: 8b/copy 0/mod/indirect 6/rm32/ESI . . . 0/r32/EAX . . # copy *ESI to EAX 8d/copy-address 1/mod/*+disp8 4/rm32/sib 6/base/ESI 0/index/EAX . 0/r32/EAX 0xc/disp8 . # copy ESI+EAX+12 to EAX 50/push-EAX - # call + # . . call e8/call _append-4/disp32 - # discard args + # . . discard args 81 0/subop/add 3/mod/direct 4/rm32/ESP . . . . . 0x10/imm32 # add to ESP # f->write += EAX 01/add 0/mod/indirect 6/rm32/ESI . . . 0/r32/EAX . . # add EAX to *ESI # s->read += EAX 01/add 1/mod/*+disp8 7/rm32/EDI . . . 0/r32/EAX 4/disp8 . # add EAX to *(EDI+4) - # restore registers + # . restore registers 5f/pop-to-EDI 5e/pop-to-ESI 58/pop-to-EAX $write-stream:end: - # epilog + # . epilog 89/copy 3/mod/direct 4/rm32/ESP . . . 5/r32/EBP . . # copy EBP to ESP 5d/pop-to-EBP c3/return _write-stream: # fd : int, s : (address stream) -> - # prolog + # . prolog 55/push-EBP 89/copy 3/mod/direct 5/rm32/EBP . . . 4/r32/ESP . . # copy ESP to EBP - # save registers + # . save registers 50/push-EAX 51/push-ECX 52/push-EDX @@ -106,120 +106,120 @@ _write-stream: # fd : int, s : (address stream) -> # syscall b8/copy-to-EAX 4/imm32/write cd/syscall 0x80/imm8 - # restore registers + # . restore registers 5f/pop-to-EDI 5e/pop-to-ESI 5b/pop-to-EBX 5a/pop-to-EDX 59/pop-to-ECX 58/pop-to-EAX - # epilog + # . epilog 89/copy 3/mod/direct 4/rm32/ESP . . . 5/r32/EBP . . # copy EBP to ESP 5d/pop-to-EBP c3/return test-write-stream-single: # clear-stream(_test-stream) - # push args + # . . push args 68/push _test-stream/imm32 - # call + # . . call e8/call clear-stream/disp32 - # discard args + # . . discard args 81 0/subop/add 3/mod/direct 4/rm32/ESP . . . . . 4/imm32 # add to ESP # clear-stream(_test-stream2) - # push args + # . . push args 68/push _test-stream2/imm32 - # call + # . . call e8/call clear-stream/disp32 - # discard args + # . . discard args 81 0/subop/add 3/mod/direct 4/rm32/ESP . . . . . 4/imm32 # add to ESP # write(_test-stream2, "Ab") - # push args + # . . push args 68/push "Ab"/imm32 68/push _test-stream2/imm32 - # call + # . . call e8/call write/disp32 - # discard args + # . . discard args 81 0/subop/add 3/mod/direct 4/rm32/ESP . . . . . 8/imm32 # add to ESP # write-stream(_test-stream, _test-stream2) - # push args + # . . push args 68/push _test-stream2/imm32 68/push _test-stream/imm32 - # call + # . . call e8/call write-stream/disp32 - # discard args + # . . discard args 81 0/subop/add 3/mod/direct 4/rm32/ESP . . . . . 8/imm32 # add to ESP # check-ints-equal(*_test-stream.data, 41/A 62/b 00 00, msg) - # push args + # . . push args 68/push "F - test-write-stream-single"/imm32 68/push 0x006241/imm32/Ab # push *_test-stream.data b8/copy-to-EAX _test-stream/imm32 ff 6/subop/push 1/mod/*+disp8 0/rm32/EAX . . . . 0xc/disp8 . # push *(EAX+12) - # call + # . . call e8/call check-ints-equal/disp32 - # discard args + # . . discard args 81 0/subop/add 3/mod/direct 4/rm32/ESP . . . . . 0xc/imm32 # add to ESP # end c3/return test-write-stream-appends: # clear-stream(_test-stream) - # push args + # . . push args 68/push _test-stream/imm32 - # call + # . . call e8/call clear-stream/disp32 - # discard args + # . . discard args 81 0/subop/add 3/mod/direct 4/rm32/ESP . . . . . 4/imm32 # add to ESP # clear-stream(_test-stream2) - # push args + # . . push args 68/push _test-stream2/imm32 - # call + # . . call e8/call clear-stream/disp32 - # discard args + # . . discard args 81 0/subop/add 3/mod/direct 4/rm32/ESP . . . . . 4/imm32 # add to ESP # write(_test-stream2, "C") - # push args + # . . push args 68/push "C"/imm32 68/push _test-stream2/imm32 - # call + # . . call e8/call write/disp32 - # discard args + # . . discard args 81 0/subop/add 3/mod/direct 4/rm32/ESP . . . . . 8/imm32 # add to ESP # write-stream(_test-stream, _test-stream2) - # push args + # . . push args 68/push _test-stream2/imm32 68/push _test-stream/imm32 - # call + # . . call e8/call write-stream/disp32 - # discard args + # . . discard args 81 0/subop/add 3/mod/direct 4/rm32/ESP . . . . . 8/imm32 # add to ESP # write(_test-stream2, "D") - # push args + # . . push args 68/push "D"/imm32 68/push _test-stream2/imm32 - # call + # . . call e8/call write/disp32 - # discard args + # . . discard args 81 0/subop/add 3/mod/direct 4/rm32/ESP . . . . . 8/imm32 # add to ESP # write-stream(_test-stream, _test-stream2) - # push args + # . . push args 68/push _test-stream2/imm32 68/push _test-stream/imm32 - # call + # . . call e8/call write-stream/disp32 - # discard args + # . . discard args 81 0/subop/add 3/mod/direct 4/rm32/ESP . . . . . 8/imm32 # add to ESP # check-ints-equal(*_test-stream.data, 43/C 44/D 00 00, msg) - # push args + # . . push args 68/push "F - test-write-stream-appends"/imm32 68/push 0x00004443/imm32/C-D # push *_test-stream.data b8/copy-to-EAX _test-stream/imm32 ff 6/subop/push 1/mod/*+disp8 0/rm32/EAX . . . . 0xc/disp8 . # push *(EAX+12) - # call + # . . call e8/call check-ints-equal/disp32 - # discard args + # . . discard args 81 0/subop/add 3/mod/direct 4/rm32/ESP . . . . . 0xc/imm32 # add to ESP # end c3/return @@ -236,4 +236,4 @@ _test-stream2: # data 41 42 43 44 00 00 00 00 # 8 bytes -# vim:nowrap:textwidth=0 +# . . vim:nowrap:textwidth=0 -- cgit 1.4.1-2-gfad0