about summary refs log tree commit diff stats
path: root/subx/apps/crenshaw2-1.subx
diff options
context:
space:
mode:
Diffstat (limited to 'subx/apps/crenshaw2-1.subx')
-rw-r--r--subx/apps/crenshaw2-1.subx59
1 files changed, 16 insertions, 43 deletions
diff --git a/subx/apps/crenshaw2-1.subx b/subx/apps/crenshaw2-1.subx
index 7b4a8deb..2d7921ce 100644
--- a/subx/apps/crenshaw2-1.subx
+++ b/subx/apps/crenshaw2-1.subx
@@ -50,66 +50,39 @@ abort:  # s : (address array byte) -> <void>
 
 # print out "Error: #{s} expected\n" to stderr
 error:  # s : (address array byte) -> <void>
-  # write-stderr("Error: ")
+  # _write(2/stderr, "Error: ")
     # push args
   68/push  "Error: "/imm32
+  68/push  2/imm32/stderr
     # call
-  e8/call  write-stderr/disp32
+  e8/call  _write/disp32
     # discard arg
-  81          0/subop/add         3/mod/direct    4/rm32/ESP    .           .             .           .           .               4/imm32           # add to ESP
-  # write-stderr(s)
+  81          0/subop/add         3/mod/direct    4/rm32/ESP    .           .             .           .           .               8/imm32           # add to ESP
+  # _write(2/stderr, s)
     # push args
   ff          6/subop/push        1/mod/*+disp8   4/rm32/sib    4/base/ESP  4/index/none  .           .           4/disp8         .                 # push *(ESP+4)
+  68/push  2/imm32/stderr
     # call
-  e8/call  write-stderr/disp32
+  e8/call  _write/disp32
     # discard arg
-  81          0/subop/add         3/mod/direct    4/rm32/ESP    .           .             .           .           .               4/imm32           # add to ESP
-  # write-stderr(" expected")
+  81          0/subop/add         3/mod/direct    4/rm32/ESP    .           .             .           .           .               8/imm32           # add to ESP
+  # _write(2/stderr, " expected")
     # push args
   68/push  " expected"/imm32
+  68/push  2/imm32/stderr
     # call
-  e8/call  write-stderr/disp32
+  e8/call  _write/disp32
     # discard arg
-  81          0/subop/add         3/mod/direct    4/rm32/ESP    .           .             .           .           .               4/imm32           # add to ESP
-  # write-stderr("\n")
+  81          0/subop/add         3/mod/direct    4/rm32/ESP    .           .             .           .           .               8/imm32           # add to ESP
+  # _write(2/stderr, "\n")
     # push args
   68/push  Newline/imm32
+  68/push  2/imm32/stderr
     # call
-  e8/call  write-stderr/disp32
+  e8/call  _write/disp32
     # discard arg
-  81          0/subop/add         3/mod/direct    4/rm32/ESP    .           .             .           .           .               4/imm32           # add to ESP
-  # end
-  c3/return
-
-write-stdout:  # s : (address array byte) -> <void>
-  # prolog
-  55/push-EBP
-  89/copy                         3/mod/direct    5/rm32/EBP    .           .             .           4/r32/ESP   .               .                 # copy ESP to EBP
-  # save registers
-  50/push-EAX
-  51/push-ECX
-  52/push-EDX
-  53/push-EBX
-  # syscall(write, 1/stdout, (data) s+4, (size) *s)
-    # fd = 1 (stdout)
-  bb/copy-to-EBX  1/imm32
-    # x = s+4
-  8b/copy                         1/mod/*+disp8   4/rm32/sib    5/base/EBP  4/index/none  .           1/r32/ECX   8/disp8         .                 # copy *(EBP+8) to ECX
-  81          0/subop/add         3/mod/direct    1/rm32/ECX    .           .             .           .           .               4/imm32           # add to ECX
-    # size = *s
-  8b/copy                         1/mod/*+disp8   4/rm32/sib    5/base/EBP  4/index/none  .           2/r32/EDX   8/disp8         .                 # copy *(EBP+8) to EDX
-  8b/copy                         0/mod/indirect  2/rm32/EDX    .           .             .           2/r32/EDX   .               .                 # copy *EDX to EDX
-    # syscall
-  b8/copy-to-EAX  4/imm32/write
-  cd/syscall  0x80/imm8
-  # restore registers
-  5b/pop-to-EBX
-  5a/pop-to-EDX
-  59/pop-to-ECX
-  58/pop-to-EAX
+  81          0/subop/add         3/mod/direct    4/rm32/ESP    .           .             .           .           .               8/imm32           # add to ESP
   # end
-  89/copy                         3/mod/direct    4/rm32/ESP    .           .             .           5/r32/EBP   .               .                 # copy EBP to ESP
-  5d/pop-to-EBP
   c3/return
 
 # vim:nowrap:textwidth=0