X-Git-Url: https://git.danieliu.xyz/?a=blobdiff_plain;f=sped.asm;h=213f3ea0806f7ee5abd2e999a49607b6604db72f;hb=7a7ed6ae81978b84911dab0b902e77ebb7e9b735;hp=585697bf643d0a2d09f74a024aeda23b8271f264;hpb=2505d1841221648a72e768f23a5a475c8e1c01d1;p=sped.git

diff --git a/sped.asm b/sped.asm
index 585697b..213f3ea 100644
--- a/sped.asm
+++ b/sped.asm
@@ -3,10 +3,12 @@
 
 %include "fileutils.S"
 
-global main
 extern printf
 extern fflush
 extern stdout
+extern free
+
+global main
 
 ; macros
 %macro write_str 2
@@ -31,6 +33,7 @@ section .data
 section .bss
     buffer resb 4
     buffer_lines resb 4
+    buffer_filename resb 4
     cur_line resb 4
 
 section .text
@@ -55,7 +58,10 @@ main:
     _main_existing:
     mov ebx, DWORD [ebp+_ARGV]
     add ebx, 4 ; first user arg is filename
-    push DWORD [ebx]
+    mov ebx, [ebx]
+    mov [buffer_filename], ebx
+
+    push DWORD [buffer_filename]
     call readFile
 
     mov [buffer], eax
@@ -72,6 +78,10 @@ main:
     jmp _main_exit
 
     _main_exit:
+
+    ; free string array
+
+
     %undef _ARGC
     %undef _ARGV
 
@@ -112,14 +122,14 @@ repl:
     mov eax, DWORD [ebp-CMDSTR]
     mov eax, [eax]
 
-    ; q exists program
+    ; q exists program =-=-=-=-=-=-=-=-=-=-=-=-=
     mov eax, DWORD [ebp-CMDSTR]
     cmp BYTE [eax], 'q'
     jne _repl_cmd_quit_end
     jmp _repl_exit
     _repl_cmd_quit_end:
 
-    ; p prints current line
+    ; p prints current line =-=-=-=-=-=-=-=-=-=-=
     mov eax, DWORD [ebp-CMDSTR]
     cmp BYTE [eax], 'p'
     jne _repl_cmd_print_end
@@ -134,7 +144,7 @@ repl:
     jmp _repl_continue
     _repl_cmd_print_end:
 
-    ; n prints the current line number
+    ; n prints the current line number =-=-=-=-=-=-=-=
     mov eax, DWORD [ebp-CMDSTR]
     cmp BYTE [eax], 'n'
     jne _repl_cmd_number_end
@@ -146,7 +156,7 @@ repl:
     jmp _repl_continue
     _repl_cmd_number_end:
 
-    ; - goes to prev line
+    ; - goes to prev line =-=-=-=-=-=-=-=-=-=-=-=-=
     mov eax, DWORD [ebp-CMDSTR]
     cmp BYTE [eax], '-'
     jne _repl_cmd_decline_end
@@ -162,7 +172,7 @@ repl:
     jmp _repl_continue
     _repl_cmd_decline_end:
 
-    ; + goes to next line
+    ; + goes to next line =-=-=-=-=-=-=-=-=-=-=-=-=
     mov eax, DWORD [ebp-CMDSTR]
     cmp BYTE [eax], '+'
     jne _repl_cmd_incline_end
@@ -178,6 +188,70 @@ repl:
     jmp _repl_continue
     _repl_cmd_incline_end:
 
+    ; g goes to first line =-=-=-=-=-=-=-=-=-=-=-=-=
+    mov eax, DWORD [ebp-CMDSTR]
+    cmp BYTE [eax], 'g'
+    jne _repl_cmd_jumptop_end
+
+    mov DWORD [cur_line], 0x00
+
+    jmp _repl_continue
+    _repl_cmd_jumptop_end:
+
+    ; G goes to last line =-=-=-=-=-=-=-=-=-=-=-=-=
+    mov eax, DWORD [ebp-CMDSTR]
+    cmp BYTE [eax], 'G'
+    jne _repl_cmd_jumpbot_end
+
+    mov eax, DWORD [buffer_lines]
+    sub eax, 1
+    mov DWORD [cur_line], eax
+
+    jmp _repl_continue
+    _repl_cmd_jumpbot_end:
+
+    ; c changes the current line =-=-=-=-=-=-=-=-=-=
+    mov eax, DWORD [ebp-CMDSTR]
+    cmp BYTE [eax], 'c'
+    jne _repl_cmd_change_end
+
+    ; read a new line to use
+    push 0
+    call readLine
+
+    mov esi, eax
+
+    ; free old string
+    mov eax, [cur_line]
+    mov ecx, 4
+    mul ecx
+    add eax, [buffer]
+    push DWORD [eax]
+    call free
+
+    ; insert new string
+    mov eax, [cur_line]
+    mov ecx, 4
+    mul ecx
+    add eax, DWORD [buffer]
+    mov [eax], esi
+
+    jmp _repl_continue
+    _repl_cmd_change_end:
+
+    ; w writes file =-=-=-=-=-=-=-=-=-=-=-=-=
+    mov eax, DWORD [ebp-CMDSTR]
+    cmp BYTE [eax], 'w'
+    jne _repl_cmd_write_end
+
+    push DWORD [buffer_filename]
+    push DWORD [buffer]
+    push DWORD [buffer_lines]
+    call writeFile
+
+    jmp _repl_continue
+    _repl_cmd_write_end:
+
 
     jmp _repl_invalid_cmd