abstracting

[sped.git] / sped.asm

diff --git a/sped.asm b/sped.asm
index 6230c85..a14dbd4 100644 (file)
--- a/sped.asm
+++ b/sped.asm
@@ -1,4 +1,14 @@
+; sped - the stupidly pointless editor
+; written by pinosaur
 
+%include "fileutils.S"
+%include "repl.S"
+
+extern printf
+
+global main
+
+; macros
 %macro write_str 2
     mov eax, 4
     mov ebx, 1
@@ -8,14 +18,70 @@
 %endmacro
 
 section .data
-    msg db "SPED - the stupidly pointless editor", 0x0a
-    len equ $ - msg
+    banner_str db `SPED - the stupidly pointless editor\n`, 0x00
+    nofile_str db `no file provided\n`, 0x00
+    readlines_str db `opened file with %i lines\n`, 0x00
 
 section .text
-global _start
-_start:
-    write_str msg, len
+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
+    jg _main_existing
+    
+    ; display error msg if no file
+    push nofile_str
+    call printf
     mov eax, 1
-    mov ebx, 42
-    int 0x80
+    jmp _main_exit
+
+    _main_existing:
+    mov ebx, DWORD [ebp+_ARGV]
+    add ebx, 4 ; first user arg is filename
+    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
+    ret
+