From bb096f826af1a025a5d28cff93957b961cff37c5 Mon Sep 17 00:00:00 2001
From: Ruslan Isaev <ubijca16@gmail.com>
Date: Sat, 21 Jun 2025 17:09:34 +0300
Subject: [PATCH] syscalls: implement read syscall

---
 grubshit/aaa                 | Bin 8724 -> 8820 bytes
 grubshit/aaa.asm             |  60 +++++++++++++++++++++--------------
 grubshit/aaa.o               | Bin 720 -> 880 bytes
 src/kernel/kernel.c          |   2 +-
 src/tasking/exec_from_file.c |   2 +-
 src/tasking/syscalls.c       |  27 ++++++++++++++++
 6 files changed, 65 insertions(+), 26 deletions(-)

diff --git a/grubshit/aaa b/grubshit/aaa
index fe52346f45ace5146780eb6e138ec6cf5906606a..db56b221084b69d215b9a0c7c4016053d8db654b 100755
GIT binary patch
delta 317
zcmbQ@^2KF>f^du?0~nYvC@?THXfUuduuU{JWQ_z0Mo!F>XEI>i*wx5y1yZvMM4WBt
zJidb&$msmNQ)dAS$1Vm&kl<pSg)AI9Sb*ZYfqVwARJSNdaI>bsZvIIMHSy{|agYum
z1q93tdO#AS0L%sQ?LdqP5WWD=R7;RNRJ{OD-WAB#hVz*ie1LodsD7aQ<lPDyf=Q)m
zX{kjFMX8A?@yYq6c_ot{DLAm`B^4J>T&OeIM^S_^a&n@gwHU}PAd5jB0okFgz`(%5
pIJrwvjdKG~h!u$0C+}30X1xQH2%K!FAUyevq5!KdFtBt$JOIl8JP!Z>

delta 214
zcmez3GR0+rg0PAr0~nYvC@?THXfUubuue2KWVHnf+D^=rXVPZa*wx4{=LqEQTEfV{
zaJHfI_zo5zuk-g#{sk-?yQG2a&8`Bw`6q6WnWRu-uLI;WOkm*vQ34E%4C+8y8>kS%
zXJRl$<68mwItcm6w-q!diz?brT%<L*MNx#&cJfR`>&br<MK~t_6@n~goh+#&&ALZ{
Wfx&*Vp@Q&aA0+|S-$0%^hz9_z9VxQ_

diff --git a/grubshit/aaa.asm b/grubshit/aaa.asm
index 9749e68..d3590ba 100644
--- a/grubshit/aaa.asm
+++ b/grubshit/aaa.asm
@@ -1,33 +1,45 @@
 section .data
-    file_path db '/ebalo/huy.txt', 0        ; Specific file path, null-terminated
-    message   db 'Hello, World from KatauOS!', 10, 0    ; Message to write, with newline
-    message_len equ $ - message - 1        ; Length of message (14 bytes, excluding null)
+    file_path db '/ebalo/huy.txt', 0        ; File path
+    message   db 'Hello, World from KatauOS!', 10, 0  ; Message with newline
+    message_len equ $ - message - 1         ; Length excluding null terminator
+
+section .bss
+    buffer resb 256           ; Buffer for reading file content
+    read_count resd 1         ; Store bytes read count
 
 section .text
     global _start
 
 _start:
-    ; Open the file
-    mov eax, 5              ; System call number for sys_open
-    mov ebx, file_path      ; Pointer to file path
-    mov ecx, 65             ; Flags: O_WRONLY (1) | O_CREAT (64)
-    mov edx, 0x1A4          ; Mode: 0644 (rw-r--r--)
-    int 0x80                ; Invoke system call
-    mov edi, eax            ; Save file descriptor in edi
+    ; Reopen file for reading
+    mov eax, 5                ; sys_open
+    mov ebx, file_path
+    mov ecx, 0                ; O_RDONLY
+    mov edx, 0                ; Mode (unused)
+    int 0x80
+    mov edi, eax              ; Save new descriptor
 
-    ; Write to the file
-    mov eax, 4              ; System call number for sys_write
-    mov ebx, edi            ; File descriptor
-    mov ecx, message        ; Pointer to message
-    mov edx, message_len    ; Number of bytes to write
-    int 0x80                ; Invoke system call
+    ; Read file content
+    mov eax, 3                ; sys_read
+    mov ebx, edi
+    mov ecx, buffer
+    mov edx, 256
+    int 0x80
+    mov [read_count], eax     ; Save bytes read count
 
-    ; Close the file
-    mov eax, 6              ; System call number for sys_close
-    mov ebx, edi            ; File descriptor
-    int 0x80                ; Invoke system call
+    ; Write to stdout
+    mov eax, 4                ; sys_write
+    mov ebx, 1                ; stdout
+    mov ecx, buffer
+    mov edx, [read_count]     ; Use actual bytes read
+    int 0x80
 
-    ; Exit the program
-    mov eax, 1              ; System call number for sys_exit
-    xor ebx, ebx            ; Return status 0
-    int 0x80                ; Invoke system call
+    ; Close file
+    mov eax, 6                ; sys_close
+    mov ebx, edi
+    int 0x80
+
+    ; Exit
+    mov eax, 1                ; sys_exit
+    xor ebx, ebx              ; Return 0
+    int 0x80
diff --git a/grubshit/aaa.o b/grubshit/aaa.o
index a4dd3c8655215ac633b5561173f8794aa36a881f..b7c32e7d6f42f313fe95cfb3030a8388cab7f93f 100644
GIT binary patch
literal 880
zcmb7C%}T>S5T3MEs|XgwlO8Gv7Az@(2;!w46hT43gLn!XyR|~vNU{ZcGS}i`_yRpf
z`v9Ku1U^O2J=FQq-J0Ubfyp<&-^^zB_3Y~0vMe%UQJ#K1qPk8TrdXjO6-?>B5S-Aw
z?uyvi&oCI)C5{y{bpx&|pizsdTV)^NMIA@oy|w`*ZLc$$nQ1&nbfj|tL%q#5r)F})
z&VW7eudre+ICojId~oU<Gh+Cv99T9%#yZzk7#CR44?di;CSBqAwN|%hs~1HV()0Xk
z`OXi#M!6aI?ee8iqI-S2gC$sE5DZ~`;PZ)367|1gkoLzq$Xg`QI}R6P&=6atskco8
zlPJcy`eQbbI`~c^hE(hZ4<y?SL$a0RmF%z;sz3>stzLVI+7F~Rtuf7i5%fk1G@2M2
zIRDb%XKw(0e(oRQwl=tLZAN0z7TeINj3#@=Ofg3`aJEE_jx+fZ^OF$57Gay3Po8w1
zg=$e-hM{<r1|3g!$n7?pGN3?;hV$TeJBpl8i9n_A!{W8e7{he9ci@S}Q;iI%`~clQ
BS^oe4

delta 344
zcmeysc7b(*0W&)T^F&AWi2;0*6PQ>g=I}5kOstfyXJlYtU;|<hm;mJ1LYQDu0LtbC
z(#%NW7l7&vk@z4pKtLRbnZPUvApqnw0GX^n%nrmXKnyZd9*Cjlc>$R~i-8LDz$^#>
zGf*AK<wO!c08|Gu0AvuzA`s01#9%PFmeJ1I5y;%N1gQUPL+9}wAo<SUJNZF^(m>*D
z!w!&NJAVTiAUh0ipKSnA40<VvC5e-znOr9ZumVHJVDbVc8)g9prpf=AG$iATOA?Dp
OfT}=R8G+U+KxqJ<+9~<~

diff --git a/src/kernel/kernel.c b/src/kernel/kernel.c
index 1c6661f..225ff1c 100644
--- a/src/kernel/kernel.c
+++ b/src/kernel/kernel.c
@@ -218,7 +218,7 @@ void kmain(unsigned int magic, unsigned int info)
 	printf("huy1 points to: 0x%X huy2 points to:0x%X\n", huy, huy2);
 	printf("huy1: %s\nhuy2: %s", huy, huy2);
 
-	exec_from_file("/boot/katauos.bin");
+	exec_from_file("/ebalo/aaa");
 
 	while(1)
 	{
diff --git a/src/tasking/exec_from_file.c b/src/tasking/exec_from_file.c
index 052f718..5052963 100644
--- a/src/tasking/exec_from_file.c
+++ b/src/tasking/exec_from_file.c
@@ -68,7 +68,7 @@ void exec_from_file(const char* filename)
 
     uint8_t* file;
 
-    int result = read_file("/ebalo/aaa", &file);
+    int result = read_file(filename, &file);
     debug_log("result: %X\n", result);
     debug_log("buffer: %s\n", file);
 
diff --git a/src/tasking/syscalls.c b/src/tasking/syscalls.c
index b38da5a..37e20b6 100644
--- a/src/tasking/syscalls.c
+++ b/src/tasking/syscalls.c
@@ -46,6 +46,22 @@ const char* flags_to_mode_str(int flags) {
     return mode;
 }
 
+int sys_read(TrapFrame *tf)
+{
+    if(tf->ebx < 3)
+    {
+        //TODO: implement stdin handling here
+    }
+    else
+    {
+        if(current->file_descriptors[tf->ebx] == NULL)
+        {
+            return -EBADF;
+        }
+        return fat_fread(current->file_descriptors[tf->ebx], (void*)tf->ecx, tf->edx);
+    }
+}
+
 int sys_write(TrapFrame *tf)
 {
     if(tf->ebx < 3)
@@ -53,7 +69,9 @@ int sys_write(TrapFrame *tf)
         //stdin, stdout or stderr
         if(tf->ebx == STDOUT_FILENO)
         {
+            debug_log("\n=================SYS_WRITE output to stdout=====================\n");
             print((char*)tf->ecx, tf->edx);
+            debug_log("\n=================END OF THAT SHIT=====================\n");
             tf->ecx++;
         }
     }
@@ -102,9 +120,12 @@ int sys_open(TrapFrame *tf)
 int sys_close(TrapFrame *tf)
 {
     int fd = tf->ebx;
+    debug_log("SYS_CLOSE: fd = 0x%X", fd);
     if(current->file_descriptors[fd] != NULL)
     {
+        debug_log("SYS_CLOSE: current->file_descriptors[fd] != NULL");
         int result = fat_fclose(current->file_descriptors[fd]);
+        debug_log("SYS_CLOSE: fat_fclose result: 0x%X", result);
         free(current->file_descriptors[fd]);
         current->file_descriptors[fd] = NULL;
         return result;
@@ -120,6 +141,12 @@ void handle_syscall(TrapFrame *tf)
     debug_log("ECX: %s ", tf->ecx);
     debug_log("EDX: %X\n", tf->edx);
     
+    if(tf->eax == 3)//read
+    {
+        int r = sys_read(tf);
+        tf->eax = r;
+    }
+
     if(tf->eax == 4)//write
     {
         int r = sys_write(tf);