Implement looping words and add fibonacci example

[rrq/jonasforth.git] / impl.asm

diff --git a/impl.asm b/impl.asm
index 923406f2465e50728f83e5e710bfe42341b1205f..9ad22789eb587a03da91ae3773427543006a6253 100644 (file)
--- a/impl.asm
+++ b/impl.asm
@@ -1,5 +1,39 @@
 segment readable executable
 
+macro printlen msg, len {
+  push rsi
+  add rsp, 8
+
+  mov rsi, msg
+  mov rdx, len
+  mov rax, 1
+  mov rdi, 1
+  syscall
+
+  sub rsp, 8
+  pop rsi
+}
+
+macro newline {
+  push $A
+  printlen rsp, 1
+}
+
+macro print msg {
+  printlen msg, msg#.len
+}
+
+macro exit code {
+  mov rax, $3C
+  mov rdi, code
+  syscall
+}
+
+struc string bytes {
+  . db bytes
+  .len = $ - .
+}
+
 ;; Find the given word in the dictionary of words. If no such word exists,
 ;; return 0.
 ;;
@@ -96,8 +130,8 @@ read_word:
 ;; Parses a string.
 ;;
 ;; Parameters:
-;;   * [.length] = Length of string
-;;   * [.buffer] = Pointer to string buffer
+;;   * rcx = Length of string
+;;   * rdi = Pointer to string buffer
 ;;
 ;; Results:
 ;;   * rax = Value
@@ -108,7 +142,7 @@ parse_number:
 
   ;; Add (10^(rcx-1) * parse_char(rdi[length - rcx])) to the accumulated value
   ;; for each rcx.
-  mov rcx, [.length]
+  mov [.length], rcx
 .loop:
   ;; First, calcuate 10^(rcx - 1)
   mov rax, 1
@@ -125,12 +159,15 @@ parse_number:
   ;; Now, rax = 10^(rcx - 1).
 
   ;; We need to calulate the value of the character at rdi[length - rcx].
-  mov rbx, rdi
+   mov rbx, rdi
   add rbx, [.length]
   sub rbx, rcx
   movzx rbx, byte [rbx]
   sub rbx, '0'
 
+  cmp rbx, 10
+  jae .error
+
   ;; Multiply this value by rax to get (10^(rcx-1) * parse_char(rdi[length - rcx])),
   ;; then add this to the result.
   mul rbx
@@ -144,6 +181,13 @@ parse_number:
   mov rax, r8
   ret
 
+.error:
+  push rdi
+  print parse_number.error_msg
+  pop rdi
+  printlen rdi, [.length]
+  newline
+  exit 100
 
 segment readable writable
 
@@ -155,6 +199,6 @@ read_word.buffer rb read_word.max_size
 read_word.length db ?
 read_word.char_buffer db ?
 
-parse_number.buffer dq ?
 parse_number.length dq ?
+parse_number.error_msg string "Invalid number: "