X-Git-Url: https://git.rrq.au/?a=blobdiff_plain;f=impl.asm;h=ea6c04ebd42155a2dd5f495ac57874308ad2fbe4;hb=a0c4c60159c79c8d9af3d08e01bacfa354232c3b;hp=070ad2a70561899ab567d4ec92796e68a588dc9a;hpb=bb3723bbe99455e7b95d5376758047563bd72eed;p=rrq%2Fjonasforth.git

diff --git a/impl.asm b/impl.asm
index 070ad2a..ea6c04e 100644
--- 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
+  sys_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 = $ - .
@@ -88,11 +80,8 @@ find:
 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
+  sys_read_char
 
   ;; We consider newlines and spaces to be whitespace.
   cmp [.char_buffer], ' '
@@ -112,11 +101,8 @@ read_word:
   mov [rsi], al
   inc [.length]
 
-  mov rax, 0
-  mov rdi, 0
   mov rsi, .char_buffer
-  mov rdx, 1
-  syscall
+  sys_read_char
 
   cmp [.char_buffer], ' '
   je .end
@@ -177,6 +163,9 @@ pop_word:
   jmp .read_alpha
 
 .end:
+  ;; Finally, we want to skip one whitespace character after the word.
+  inc rsi
+  dec rcx
 
   ret
 
@@ -240,9 +229,9 @@ parse_number:
   pop rdi
   printlen rdi, [.length]
   newline
-  exit 100
+  sys_terminate 100
 
-segment readable writable
+section '.data' readable writable
 
 find.search_length dq ?
 find.search_buffer dq ?