X-Git-Url: https://git.danieliu.xyz/?a=blobdiff_plain;f=sped.asm;h=110bf98378f1bd5e012172bb48a69c768c38c04b;hb=fb894149783dd18e6ecf1271153193a342e80433;hp=eda67b319c0ed0c03fbe20f546e5b2bf76db4752;hpb=17adbf435e9341831aa580404d18d8caa7448ce2;p=sped.git

diff --git a/sped.asm b/sped.asm
index eda67b3..110bf98 100644
--- a/sped.asm
+++ b/sped.asm
@@ -1,51 +1,47 @@
+; sped - the stupidly pointless editor
+; written by pinosaur
+
+%include "fileutils.S"
 
 global main
 extern printf
 
-; macros
-%macro write_str 2
-    mov eax, 4
-    mov ebx, 1
-    mov ecx, %1
-    mov edx, %2
-    int 0x80
-%endmacro
-
 section .data
     banner_str db `SPED - the stupidly pointless editor\n`, 0x00
-    readfile_str db `reading file %s\n`, 0x00
     nofile_str db `no file provided\n`, 0x00
-    argcount_str db `there are %d args\n`, 0x00
 
 section .text
 main:
+    %define _ARGC 8
+    %define _ARGV 12
+
     push ebp
     mov ebp, esp
 
     ; read command line args
-    mov ecx, [ebp+8]
-
+    mov ecx, [ebp+_ARGC]
     cmp ecx, 1
-    jg .readFile
+    jg _main_existing
     
     ; display error msg if no file
     push nofile_str
     call printf
     mov eax, 1
-    jmp .exit
+    jmp _main_exit
 
-.readFile:
-
-    mov ebx, DWORD [ebp+12]
-    add ebx, 4
+    _main_existing:
+    mov ebx, DWORD [ebp+_ARGV]
+    add ebx, 4 ; first user arg is filename
     push DWORD [ebx]
-    push readfile_str
-    call printf
+    call readFile
 
     mov eax, 0
-    jmp .exit
+    jmp _main_exit
+
+    _main_exit:
+    %undef _ARGC
+    %undef _ARGV
 
-.exit:
     mov esp, ebp
     pop ebp
     ret