Clean up OS interface

[rrq/jonasforth.git] / impl.asm

diff --git a/impl.asm b/impl.asm
index f6a25cf5b54d420cc016582e6f3d41e0661636a2..dd7fc9dcbc4b70a896d523bde9c89b8cc95baec2 100644 (file)
--- a/impl.asm
+++ b/impl.asm
@@ -1,16 +1,14 @@
 ;; vim: syntax=fasm
 
-segment readable executable
+section '.text' code readable executable
 
 macro printlen msg, len {
   push rsi
   add rsp, 8
 
-  mov rsi, msg
+  mov rcx, msg
   mov rdx, len
-  mov rax, 1
-  mov rdi, 1
-  syscall
+  call os_print_string
 
   sub rsp, 8
   pop rsi
@@ -25,12 +23,6 @@ macro print msg {
   printlen msg, msg#.len
 }
 
-macro exit code {
-  mov rax, $3C
-  mov rdi, code
-  syscall
-}
-
 struc string bytes {
   . db bytes
   .len = $ - .
@@ -77,58 +69,6 @@ find:
 .found:
   ret
 
-;; Read a word from standard input. Returns pointer to string containing word as
-;; well as length.
-;;
-;; Results:
-;;   * rdx = Length of string
-;;   * rdi = Pointer to string buffer
-;;
-;; Clobbers pretty much everything.
-read_word:
-.skip_whitespace:
-  ;; Read characters into .char_buffer until one of them is not whitespace.
-  mov rax, 0
-  mov rdi, 0
-  mov rsi, .char_buffer
-  mov rdx, 1
-  syscall
-
-  ;; We consider newlines and spaces to be whitespace.
-  cmp [.char_buffer], ' '
-  je .skip_whitespace
-  cmp [.char_buffer], $A
-  je .skip_whitespace
-
-.alpha:
-  ;; We got a character that wasn't whitespace. Now read the actual word.
-  mov [.length], 0
-
-.read_alpha:
-  mov al, [.char_buffer]
-  movzx rbx, [.length]
-  mov rsi, .buffer
-  add rsi, rbx
-  mov [rsi], al
-  inc [.length]
-
-  mov rax, 0
-  mov rdi, 0
-  mov rsi, .char_buffer
-  mov rdx, 1
-  syscall
-
-  cmp [.char_buffer], ' '
-  je .end
-  cmp [.char_buffer], $A
-  jne .read_alpha
-
-.end:
-  mov rdi, .buffer
-  movzx rdx, [.length]
-
-  ret
-
 ;; Read a word from a buffer. Returns the buffer without the word, as well as
 ;; the word that was read (including lengths).
 ;;
@@ -243,18 +183,14 @@ parse_number:
   pop rdi
   printlen rdi, [.length]
   newline
-  exit 100
+  mov rax, 100
+  call os_terminate
 
-segment readable writable
+section '.data' readable writable
 
 find.search_length dq ?
 find.search_buffer dq ?
 
-read_word.max_size = $FF
-read_word.buffer rb read_word.max_size
-read_word.length db ?
-read_word.char_buffer db ?
-
 parse_number.length dq ?
 parse_number.error_msg string "Invalid number: "