X-Git-Url: https://git.danieliu.xyz/?p=sped.git;a=blobdiff_plain;f=sped.asm;h=e0920a1712b6c5af80784a4995d2eb9073796ef2;hp=859d386ed7635ab529e75a097091bd730c906abd;hb=HEAD;hpb=f0c5604be9e918713786e0fdecd7efe1e3cea0ee

diff --git a/sped.asm b/sped.asm
index 859d386..e0920a1 100644
--- a/sped.asm
+++ b/sped.asm
@@ -1,38 +1,35 @@
 ; sped - the stupidly pointless editor
 ; written by pinosaur
+; sped.asm: main file
+
+%include "macros.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
+extern readFile
+extern repl
+
+global main
 
 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
-    wrongfile_str db `unable to open file, error code: %i\n`, 0x00
-    char_str db `read this char: %i\n`, 0x00
-    printfint_str db `int: %i\n`, 0x00
-
-section .bss
-    read_buf resb 64
+    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
@@ -46,134 +43,37 @@ main:
 
     _main_existing:
     mov ebx, DWORD [ebp+_ARGV]
-    add ebx, 4
-    push DWORD [ebx]
-    ; push readfile_str
-    ; call printf
+    add ebx, 4 ; first user arg is filename
+    mov ebx, [ebx]
+    mov [ebp-BUFFER_FILENAME], ebx
 
+    push DWORD [ebp-BUFFER_FILENAME]
     call readFile
 
-    mov eax, 0
-    jmp _main_exit
+    mov [ebp-BUFFER], eax
+    mov [ebp-BUFFER_LINES], ecx
 
-    _main_exit:
-    %undef _ARGC
-    %undef _ARGV
-
-    mov esp, ebp
-    pop ebp
-    ret
-
-
-; reads file line by line
-; args: filename
-; return:
-;    eax - pointer to mem
-;    ecx - lines read
-readFile:
-    %define _FILE_NAME 8
-    %define FILE_HANDLE 4
-
-    push ebp
-    mov ebp, esp
-    
-    ; allocate vars
-    sub esp, 4
-    mov DWORD [ebp-FILE_HANDLE], 0x00
-
-    ; open existing file
-    mov eax, 5
-    mov ebx, [ebp+_FILE_NAME]
-    mov ecx, 0
-    mov edx, 0777
-    int 0x80
-    mov [ebp-FILE_HANDLE], eax
-
-    ; check if file was open successfully
-    cmp eax, 0
-    jge _readFile_noerror
-    push eax
-    push wrongfile_str
+    push DWORD [ebp-BUFFER_LINES]
+    push readlines_str
     call printf
-    jmp _readFile_exit
-
-    _readFile_noerror:
-    push DWORD [ebp-FILE_HANDLE]
-    call readLine 
-
-    jmp _readFile_exit
-
-    _readFile_exit:
-    ; close file
-    mov eax, 6
-    mov ebx, [ebp-FILE_HANDLE]
-    int 0x80
-
-    %undef _FILE_NAME
-    %undef FILE_HANDLE
-
-    mov esp, ebp
-    pop ebp
-    ret
-
 
-; reads a line until newline character is reached
-; args: file_handle
-; return:
-;   location to buffer
-;   contains eof
-readLine:
-    %define _FILE_HANDLE 8
-    %define CHAR_PTR 4
+    push DWORD [ebp-BUFFER]
+    push DWORD [ebp-BUFFER_LINES]
+    push DWORD [ebp-BUFFER_FILENAME]
+    call repl
 
-    push ebp
-    mov ebp, esp
-
-    sub esp, 4
-    mov DWORD [ebp-CHAR_PTR], 0x00
-
-    _readLine_loop:
-    ; if buffer is full
-    cmp BYTE [ebp-CHAR_PTR], 64
-    jne _readLine_notfull
-    jmp _readLine_exit
-
-    _readLine_notfull:
-    ; read a single character
-    mov eax, 3
-    mov ebx, [ebp+_FILE_HANDLE]
-    mov ecx, read_buf
-    add ecx, [ebp-CHAR_PTR]
-    mov edx, 1
-    int 0x80
-
-    mov eax, 4
-    mov ebx, 1
-    mov ecx, read_buf
-    add ecx, [ebp-CHAR_PTR]
-    mov edx, 1
-    int 0x80
-
-    ; check for newline
-    mov eax, read_buf
-    add eax, [ebp-CHAR_PTR]
-    cmp DWORD [eax], 0x0a
-    je _readLine_exit
-    
-    ; check for eof
-    mov eax, read_buf
-    add eax, [ebp-CHAR_PTR]
-    cmp DWORD [eax], 0x05
-    je _readLine_exit
-
-    add DWORD [ebp-CHAR_PTR], 1
+    mov eax, 0
+    jmp _main_exit
 
-    jmp _readLine_loop
+    _main_exit:
 
-    _readLine_exit:
+    ; free string array
 
-    %undef _FILE_HANDLE
-    %undef CHAR_PTR
+    %undef _ARGC
+    %undef _ARGV
+    %undef BUFFER
+    %undef BUFFER_LINES
+    %undef BUFFER_FILENAME
 
     mov esp, ebp
     pop ebp