diff options
| author | Kartik Agaram <vc@akkartik.com> | 2018-09-20 16:23:51 -0700 |
|---|---|---|
| committer | Kartik Agaram <vc@akkartik.com> | 2018-09-20 16:23:51 -0700 |
| commit | b09d6b5db00390d2eef683217146d5ad61af79a4 (patch) | |
| tree | 1eb31ba96cfc6916fdd29162d16a205e68c0b4d6 /subx | |
| parent | d783d42cf81a58783f904100a114ff312c7d04de (diff) | |
| download | mu-b09d6b5db00390d2eef683217146d5ad61af79a4.tar.gz | |
4557
Diffstat (limited to 'subx')
| -rwxr-xr-x | subx/apps/crenshaw2-1 | bin | 275 -> 304 bytes | |||
| -rw-r--r-- | subx/apps/crenshaw2-1.subx | 21 |
2 files changed, 17 insertions, 4 deletions
diff --git a/subx/apps/crenshaw2-1 b/subx/apps/crenshaw2-1 index c5fda5e0..826d5776 100755 --- a/subx/apps/crenshaw2-1 +++ b/subx/apps/crenshaw2-1 Binary files differdiff --git a/subx/apps/crenshaw2-1.subx b/subx/apps/crenshaw2-1.subx index dc178bf5..804f9f69 100644 --- a/subx/apps/crenshaw2-1.subx +++ b/subx/apps/crenshaw2-1.subx @@ -28,7 +28,8 @@ b8/copy . . . . . . . 1/imm32/exit # copy 1 to EAX cd/syscall . . . . . . . 0x80/imm8 # int 80h -# print error message and exit(1) +# print error message and exit +# really maps to the 'Expected' function in Crenshaw abort: # s : (address array byte) -> <void> # error(s) # push args @@ -42,9 +43,9 @@ abort: # s : (address array byte) -> <void> b8/copy . . . . . . . 1/imm32/exit # copy 1 to EAX cd/syscall . . . . . . . 0x80/imm8 # int 80h -# print out "Error: #{s}\n" to stderr +# print out "Error: #{s} expected\n" to stderr error: # s : (address array byte) -> <void> - # write_stderr(Error) + # write_stderr("Error: ") # push args 68/push . . . . . . . Error/imm32 # call @@ -58,7 +59,14 @@ error: # s : (address array byte) -> <void> e8/call . . . . . . write_stderr/disp32 # discard arg 81 0/subop/add 3/mod/direct 4/rm32/ESP . . . . . 4/imm32 # add 4 to ESP - # write_stderr(Newline) + # write_stderr(" expected") + # push args + 68/push . . . . . . . Expected_suffix/imm32 + # call + e8/call . . . . . . write_stderr/disp32 + # discard arg + 81 0/subop/add 3/mod/direct 4/rm32/ESP . . . . . 4/imm32 # add 4 to ESP + # write_stderr("\n") # push args 68/push . . . . . . . Newline/imm32 # call @@ -95,6 +103,11 @@ Error: # "Error: " : (array byte) 07 00 00 00 # data 45/E 72/r 72/r 6f/o 72/r 3a/: 20/space +Expected_suffix: # " expected" : (array byte) + # size + 09 00 00 00 + # data + 20/space 65/e 78/x 70/p 65/e 63/c 74/t 65/e 64/d Error_integer: # "Integer" : (array byte) # size 07 00 00 00 |