final clean up

[sped.git] / sped.asm

diff --git a/sped.asm b/sped.asm
index 110bf98..e0920a1 100644 (file)
--- a/sped.asm
+++ b/sped.asm
@@ -1,23 +1,35 @@
 ; sped - the stupidly pointless editor
 ; written by pinosaur
+; sped.asm: main file
 
-%include "fileutils.S"
+%include "macros.S"
 
-global main
 extern printf
 
+extern readFile
+extern repl
+
+global main
+
 section .data
     banner_str db `SPED - the stupidly pointless editor\n`, 0x00
-    nofile_str db `no file provided\n`, 0x00
+    nofile_str db `no file provided.\n`, 0x00
+    readlines_str db `opened file with %i lines.\n`, 0x00
 
 section .text
 main:
     %define _ARGC 8
     %define _ARGV 12
 
+    %define BUFFER          4
+    %define BUFFER_LINES    8
+    %define BUFFER_FILENAME 12
+
     push ebp
     mov ebp, esp
 
+    sub esp, 12
+
     ; read command line args
     mov ecx, [ebp+_ARGC]
     cmp ecx, 1
@@ -32,15 +44,36 @@ main:
     _main_existing:
     mov ebx, DWORD [ebp+_ARGV]
     add ebx, 4 ; first user arg is filename
-    push DWORD [ebx]
+    mov ebx, [ebx]
+    mov [ebp-BUFFER_FILENAME], ebx
+
+    push DWORD [ebp-BUFFER_FILENAME]
     call readFile
 
+    mov [ebp-BUFFER], eax
+    mov [ebp-BUFFER_LINES], ecx
+
+    push DWORD [ebp-BUFFER_LINES]
+    push readlines_str
+    call printf
+
+    push DWORD [ebp-BUFFER]
+    push DWORD [ebp-BUFFER_LINES]
+    push DWORD [ebp-BUFFER_FILENAME]
+    call repl
+
     mov eax, 0
     jmp _main_exit
 
     _main_exit:
+
+    ; free string array
+
     %undef _ARGC
     %undef _ARGV
+    %undef BUFFER
+    %undef BUFFER_LINES
+    %undef BUFFER_FILENAME
 
     mov esp, ebp
     pop ebp