From 540974343290cb9ac0cf55b999447bf563928612 Mon Sep 17 00:00:00 2001 From: Kartik Agaram Date: Thu, 17 Oct 2019 21:59:51 -0700 Subject: 5700 --- apps/assort.subx | 2 +- apps/braces.subx | 2 +- apps/calls.subx | 2 +- apps/crenshaw2-1.subx | 8 ++++---- apps/crenshaw2-1b.subx | 8 ++++---- apps/dquotes.subx | 2 +- apps/hex.subx | 4 ++-- apps/mulisp.subx | 2 +- apps/pack.subx | 18 +++++++++--------- apps/sigils.subx | 2 +- apps/survey.subx | 2 +- apps/tests.subx | 2 +- 12 files changed, 27 insertions(+), 27 deletions(-) (limited to 'apps') diff --git a/apps/assort.subx b/apps/assort.subx index 1898d832..1e546f49 100644 --- a/apps/assort.subx +++ b/apps/assort.subx @@ -86,7 +86,7 @@ $subx-assort-main:end: # table: (address stream {string, (address stream byte)}) (8 bytes per row) # inefficient; uses sequential search for looking up segments by name -subx-assort: # in : (address buffered-file), out : (address buffered-file) -> +subx-assort: # in : (address buffered-file), out : (address buffered-file) # pseudocode: # var table : (address stream) = new-stream(10 rows, 8 bytes each) # read-segments(in, table) diff --git a/apps/braces.subx b/apps/braces.subx index 87907b95..69e62c2c 100644 --- a/apps/braces.subx +++ b/apps/braces.subx @@ -75,7 +75,7 @@ $subx-braces-main:end: b8/copy-to-eax 1/imm32/exit cd/syscall 0x80/imm8 -subx-braces: # in : (address buffered-file), out : (address buffered-file) -> +subx-braces: # in : (address buffered-file), out : (address buffered-file) # pseudocode: # var line = new-stream(512, 1) # var label-stack : (address stack) = new-stack(32*4) # at most 32 levels of nesting diff --git a/apps/calls.subx b/apps/calls.subx index 88e963a5..a29c52f3 100644 --- a/apps/calls.subx +++ b/apps/calls.subx @@ -75,7 +75,7 @@ $subx-calls-main:end: b8/copy-to-eax 1/imm32/exit cd/syscall 0x80/imm8 -subx-calls: # in : (address buffered-file), out : (address buffered-file) -> +subx-calls: # in : (address buffered-file), out : (address buffered-file) # pseudocode: # var line = new-stream(512, 1) # var words : (address stream slice) = new-stream(16, 8) # at most function name and 15 args diff --git a/apps/crenshaw2-1.subx b/apps/crenshaw2-1.subx index 9fc2cb08..3f075140 100644 --- a/apps/crenshaw2-1.subx +++ b/apps/crenshaw2-1.subx @@ -90,7 +90,7 @@ $main:end: cd/syscall 0x80/imm8 # the main entry point -compile: # in : (address buffered-file), out : fd or (address stream), err : fd or (address stream), ed : (address exit-descriptor) -> +compile: # in : (address buffered-file), out : fd or (address stream), err : fd or (address stream), ed : (address exit-descriptor) # . prologue 55/push-ebp 89/copy 3/mod/direct 5/rm32/ebp . . . 4/r32/esp . . # copy esp to ebp @@ -190,7 +190,7 @@ $compile:end: # Read a single digit into 'out'. Abort if there are none, or if there is no space in 'out'. # Input comes from the global variable 'Look', and we leave the next byte from # 'in' into it on exit. -get-num: # in : (address buffered-file), out : (address stream), err : fd or (address stream), ed : (address exit-descriptor) -> +get-num: # in : (address buffered-file), out : (address stream), err : fd or (address stream), ed : (address exit-descriptor) # pseudocode: # if (!is-digit?(Look)) expected(ed, err, "integer") # if out->write >= out->length @@ -472,7 +472,7 @@ test-get-num-aborts-on-non-digit-in-Look: ## helpers # write(f, "Error: "+s+" expected\n") then stop(ed, 1) -expected: # ed : (address exit-descriptor), f : fd or (address stream), s : (address array byte) -> +expected: # ed : (address exit-descriptor), f : fd or (address stream), s : (address array byte) # . prologue 55/push-ebp 89/copy 3/mod/direct 5/rm32/ebp . . . 4/r32/esp . . # copy esp to ebp @@ -514,7 +514,7 @@ $expected:dead-end: c3/return # read a byte from 'f', and save it in 'Look' -get-char: # f : (address buffered-file) -> +get-char: # f : (address buffered-file) # . prologue 55/push-ebp 89/copy 3/mod/direct 5/rm32/ebp . . . 4/r32/esp . . # copy esp to ebp diff --git a/apps/crenshaw2-1b.subx b/apps/crenshaw2-1b.subx index 2a321281..11115b24 100644 --- a/apps/crenshaw2-1b.subx +++ b/apps/crenshaw2-1b.subx @@ -90,7 +90,7 @@ $main:end: cd/syscall 0x80/imm8 # the main entry point -compile: # in : (address buffered-file), out : fd or (address stream), err : fd or (address stream), ed : (address exit-descriptor) -> +compile: # in : (address buffered-file), out : fd or (address stream), err : fd or (address stream), ed : (address exit-descriptor) # . prologue 55/push-ebp 89/copy 3/mod/direct 5/rm32/ebp . . . 4/r32/esp . . # copy esp to ebp @@ -191,7 +191,7 @@ $compile:end: # no space in 'out'. # Input comes from the global variable 'Look' (first byte) and the argument # 'in' (rest). We leave the next byte from 'in' into 'Look' on exit. -get-num: # in : (address buffered-file), out : (address stream), err : fd or (address stream), ed : (address exit-descriptor) -> +get-num: # in : (address buffered-file), out : (address stream), err : fd or (address stream), ed : (address exit-descriptor) # pseudocode: # if (!is-digit?(Look)) expected(ed, err, "integer") # do @@ -672,7 +672,7 @@ test-get-num-reads-multiple-digits-followed-by-nondigit: ## helpers # write(f, "Error: "+s+" expected\n") then stop(ed, 1) -expected: # ed : (address exit-descriptor), f : fd or (address stream), s : (address array byte) -> +expected: # ed : (address exit-descriptor), f : fd or (address stream), s : (address array byte) # . prologue 55/push-ebp 89/copy 3/mod/direct 5/rm32/ebp . . . 4/r32/esp . . # copy esp to ebp @@ -714,7 +714,7 @@ $expected:dead-end: c3/return # read a byte from 'f', and save it in 'Look' -get-char: # f : (address buffered-file) -> +get-char: # f : (address buffered-file) # . prologue 55/push-ebp 89/copy 3/mod/direct 5/rm32/ebp . . . 4/r32/esp . . # copy esp to ebp diff --git a/apps/dquotes.subx b/apps/dquotes.subx index 8d85b45b..7d7cf632 100644 --- a/apps/dquotes.subx +++ b/apps/dquotes.subx @@ -82,7 +82,7 @@ $subx-dquotes-main:end: # line = words separated by ' ', maybe followed by comment starting with '#' # word = datum until '/', then 0 or more metadata separated by '/' -subx-dquotes: # in : (address buffered-file), out : (address buffered-file) -> +subx-dquotes: # in : (address buffered-file), out : (address buffered-file) # pseudocode: # var line = new-stream(512, 1) # var new-data-segment = new-stream(Heap, Segment-size, 1) diff --git a/apps/hex.subx b/apps/hex.subx index 98e14a25..b3a98838 100644 --- a/apps/hex.subx +++ b/apps/hex.subx @@ -77,7 +77,7 @@ $subx-hex-main:end: cd/syscall 0x80/imm8 # the main entry point -subx-hex: # in : (address buffered-file), out : (address buffered-file), err : (address buffered-file), ed : (address exit-descriptor) -> +subx-hex: # in : (address buffered-file), out : (address buffered-file), err : (address buffered-file), ed : (address exit-descriptor) # pseudocode: # while true # eax = convert-next-octet(in, err, ed) @@ -1392,7 +1392,7 @@ $test-scan-next-byte-aborts-on-invalid-byte:end: 5d/pop-to-ebp c3/return -skip-until-newline: # in : (address buffered-file) -> +skip-until-newline: # in : (address buffered-file) # pseudocode: # push eax # while true diff --git a/apps/mulisp.subx b/apps/mulisp.subx index 226042c2..74f8098c 100644 --- a/apps/mulisp.subx +++ b/apps/mulisp.subx @@ -74,7 +74,7 @@ $main:end: # data contains a pointer to an array of 8-byte data fields and the common # tag for them all -repl: # in : (address buffered-file), out : (address buffered-file) -> +repl: # in : (address buffered-file), out : (address buffered-file) # . prologue 55/push-ebp 89/<- %ebp 4/r32/esp diff --git a/apps/pack.subx b/apps/pack.subx index 3f300f3a..51ad879e 100644 --- a/apps/pack.subx +++ b/apps/pack.subx @@ -97,7 +97,7 @@ $subx-pack-main:end: # next-token-from-slice(start, end, delim char) -> slice # slice-equal?(slice, string) -subx-pack: # in : (address buffered-file), out : (address buffered-file) -> +subx-pack: # in : (address buffered-file), out : (address buffered-file) # pseudocode: # var line = new-stream(512, 1) # var in-code? = false @@ -933,7 +933,7 @@ test-subx-pack-code-and-data-segments: 5d/pop-to-ebp c3/return -convert-data: # line : (address stream byte), out : (address buffered-file) -> +convert-data: # line : (address stream byte), out : (address buffered-file) # pseudocode: # var word-slice = {0, 0} # while true @@ -1853,7 +1853,7 @@ test-convert-data-trailing-comment: # unceremoniously abort on non-numeric operands except disp or imm # opcodes must be lowercase and zero padded # opcodes with misleading operand metadata may get duplicated as operands as well. don't rely on this. -convert-instruction: # line : (address stream byte), out : (address buffered-file) -> +convert-instruction: # line : (address stream byte), out : (address buffered-file) # pseudocode: # # some early exits # var word-slice = next-word(line) @@ -1997,7 +1997,7 @@ $convert-instruction:end: 5d/pop-to-ebp c3/return -emit-opcodes: # line : (address stream byte), out : (address buffered-file) -> +emit-opcodes: # line : (address stream byte), out : (address buffered-file) # opcodes occupy 1-3 bytes: # xx # 0f xx @@ -2293,7 +2293,7 @@ $emit-opcodes:end: 5d/pop-to-ebp c3/return -emit-modrm: # line : (address stream byte), out : (address buffered-file) -> +emit-modrm: # line : (address stream byte), out : (address buffered-file) # pseudocode: # rewind-stream(line) # var has-modrm? = false, mod = 0, rm32 = 0, r32 = 0 @@ -2612,7 +2612,7 @@ $emit-modrm:end: 5d/pop-to-ebp c3/return -emit-sib: # line : (address stream byte), out : (address buffered-file) -> +emit-sib: # line : (address stream byte), out : (address buffered-file) # pseudocode: # var has-sib? = false, base = 0, index = 0, scale = 0 # var word-slice = {0, 0} @@ -2895,7 +2895,7 @@ $emit-sib:end: 5d/pop-to-ebp c3/return -emit-disp: # line : (address stream byte), out : (address buffered-file) -> +emit-disp: # line : (address stream byte), out : (address buffered-file) # pseudocode: # rewind-stream(line) # var word-slice = {0, 0} @@ -3116,7 +3116,7 @@ $emit-disp:break: 5d/pop-to-ebp c3/return -emit-imm: # line : (address stream byte), out : (address buffered-file) -> +emit-imm: # line : (address stream byte), out : (address buffered-file) # pseudocode: # rewind-stream(line) # var word-slice = {0, 0} @@ -3337,7 +3337,7 @@ $emit-imm:break: 5d/pop-to-ebp c3/return -emit-line-in-comment: # line : (address stream byte), out : (address buffered-file) -> +emit-line-in-comment: # line : (address stream byte), out : (address buffered-file) # . prologue 55/push-ebp 89/copy 3/mod/direct 5/rm32/ebp . . . 4/r32/esp . . # copy esp to ebp diff --git a/apps/sigils.subx b/apps/sigils.subx index 76a956b7..296ad68d 100644 --- a/apps/sigils.subx +++ b/apps/sigils.subx @@ -104,7 +104,7 @@ $subx-sigils-main:end: # error messages considered: # *x + 34 -> error: base+disp addressing must be within '()' -subx-sigils: # in : (address buffered-file), out : (address buffered-file) -> +subx-sigils: # in : (address buffered-file), out : (address buffered-file) # pseudocode: # var line = new-stream(512, 1) # while true diff --git a/apps/survey.subx b/apps/survey.subx index 08e7775a..9c48e928 100644 --- a/apps/survey.subx +++ b/apps/survey.subx @@ -113,7 +113,7 @@ $subx-survey-main:end: # labels: (address stream {string, label-info}) (16 bytes per row) # these are all inefficient; use sequential scans for lookups -subx-survey: # infile : (address buffered-file), out : (address buffered-file) -> +subx-survey: # infile : (address buffered-file), out : (address buffered-file) # pseudocode # var in : (address stream byte) = stream(4096) # slurp(infile, in) diff --git a/apps/tests.subx b/apps/tests.subx index cb2b5e2a..4e407d50 100644 --- a/apps/tests.subx +++ b/apps/tests.subx @@ -67,7 +67,7 @@ $subx-tests-main:end: b8/copy-to-eax 1/imm32/exit cd/syscall 0x80/imm8 -subx-gen-run-tests: # in : (address buffered-file), out : (address buffered-file) -> +subx-gen-run-tests: # in : (address buffered-file), out : (address buffered-file) # pseudocode # bool tests-found = false # var line = new-stream(512, 1) -- cgit 1.4.1-2-gfad0