From 1ea751f93120f1206a4780da0e35d6f9aaaa8225 Mon Sep 17 00:00:00 2001 From: rajc6h6 Date: Tue, 10 Mar 2026 22:59:34 +0530 Subject: [PATCH 1/4] Add filesystem syscall 70 wrapper and fs_demo example --- examples/fs_demo.rs | 25 +++++++++++++++++++++++++ src/fs.rs | 31 +++++++++++++++++++++++++++++++ 2 files changed, 56 insertions(+) create mode 100644 examples/fs_demo.rs create mode 100644 src/fs.rs diff --git a/examples/fs_demo.rs b/examples/fs_demo.rs new file mode 100644 index 0000000..076f496 --- /dev/null +++ b/examples/fs_demo.rs @@ -0,0 +1,25 @@ +#![no_std] +#![no_main] + +use kos::fs::{FileInfo, fs_read}; + +static FILENAME: &[u8] = b"/rd/1/readme.txt\0"; +static mut BUFFER: [u8; 256] = [0u8; 256]; + +#[no_mangle] +pub extern "C" fn _start() -> ! { + unsafe { + let info = FileInfo { + func: 0, + param1: 0, + param2: 0, + param3: 256, + buf: BUFFER.as_mut_ptr(), + name: FILENAME.as_ptr(), + }; + + let (_result, _bytes_read) = fs_read(&info as *const FileInfo); + } + + loop {} +} diff --git a/src/fs.rs b/src/fs.rs new file mode 100644 index 0000000..4b47d6f --- /dev/null +++ b/src/fs.rs @@ -0,0 +1,31 @@ +use core::arch::asm; + +/// KolibriOS Function 70 — filesystem operations +/// Passes a pointer to a FileInfo structure via ebx +/// int 0x40 with eax=70 is the KolibriOS FS syscall + +#[repr(C, packed)] +pub struct FileInfo { + pub func: u32, // 0 = read, 1 = read folder, 2 = create/write + pub param1: u32, // offset (low) + pub param2: u32, // offset (high) or flags + pub param3: u32, // bytes to read/write + pub buf: *mut u8, // pointer to buffer + pub name: *const u8, // pointer to filename (ASCIIZ) +} + +/// Opens/reads a file on KolibriOS using syscall eax=70 +/// Returns (eax_result, ebx_bytes_read) +pub unsafe fn fs_read(info: *const FileInfo) -> (u32, u32) { + let eax_out: u32; + let ebx_out: u32; + unsafe { + asm!( + "int 0x40", + inlateout("eax") 70u32 => eax_out, + inlateout("ebx") info as u32 => ebx_out, + options(nostack) + ); + } + (eax_out, ebx_out) +} -- 2.54.0 From 922c05ceb64481e49ae82410534e47de83bbc620 Mon Sep 17 00:00:00 2001 From: rajc6h6 Date: Sat, 21 Mar 2026 12:43:38 +0530 Subject: [PATCH 2/4] refactor: move raw syscall to sys.rs, safe fs_read API, c-string fix, named struct fields --- Cargo.toml | 3 +++ examples/fs_demo.rs | 23 +++++------------------ src/fs.rs | 41 ++++++++++++----------------------------- src/lib.rs | 1 + src/sys.rs | 23 +++++++++++++++++++++++ 5 files changed, 44 insertions(+), 47 deletions(-) diff --git a/Cargo.toml b/Cargo.toml index bc59867..b7d3a6a 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -21,3 +21,6 @@ path = "examples/dark.rs" [profile.release] opt-level = "z" lto = "thin" + +[[example]] +name = "fs_demo" diff --git a/examples/fs_demo.rs b/examples/fs_demo.rs index 076f496..41a03b5 100644 --- a/examples/fs_demo.rs +++ b/examples/fs_demo.rs @@ -1,25 +1,12 @@ -#![no_std] +#![no_std] #![no_main] -use kos::fs::{FileInfo, fs_read}; - -static FILENAME: &[u8] = b"/rd/1/readme.txt\0"; -static mut BUFFER: [u8; 256] = [0u8; 256]; +use kos::fs::fs_read; #[no_mangle] pub extern "C" fn _start() -> ! { - unsafe { - let info = FileInfo { - func: 0, - param1: 0, - param2: 0, - param3: 256, - buf: BUFFER.as_mut_ptr(), - name: FILENAME.as_ptr(), - }; - - let (_result, _bytes_read) = fs_read(&info as *const FileInfo); - } - + let path = c"/rd/1/readme.txt"; + let mut buf = [0u8; 512]; + let (_status, _bytes) = fs_read(path, &mut buf); loop {} } diff --git a/src/fs.rs b/src/fs.rs index 4b47d6f..ed6b23c 100644 --- a/src/fs.rs +++ b/src/fs.rs @@ -1,31 +1,14 @@ -use core::arch::asm; +use core::ffi::CStr; +use crate::sys::{syscall_fs, FileSystemRequest}; -/// KolibriOS Function 70 — filesystem operations -/// Passes a pointer to a FileInfo structure via ebx -/// int 0x40 with eax=70 is the KolibriOS FS syscall - -#[repr(C, packed)] -pub struct FileInfo { - pub func: u32, // 0 = read, 1 = read folder, 2 = create/write - pub param1: u32, // offset (low) - pub param2: u32, // offset (high) or flags - pub param3: u32, // bytes to read/write - pub buf: *mut u8, // pointer to buffer - pub name: *const u8, // pointer to filename (ASCIIZ) -} - -/// Opens/reads a file on KolibriOS using syscall eax=70 -/// Returns (eax_result, ebx_bytes_read) -pub unsafe fn fs_read(info: *const FileInfo) -> (u32, u32) { - let eax_out: u32; - let ebx_out: u32; - unsafe { - asm!( - "int 0x40", - inlateout("eax") 70u32 => eax_out, - inlateout("ebx") info as u32 => ebx_out, - options(nostack) - ); - } - (eax_out, ebx_out) +pub fn fs_read(path: &CStr, buf: &mut [u8]) -> (u32, u32) { + let req = FileSystemRequest { + operation: 0, + offset_low: 0, + offset_high: 0, + byte_count: buf.len() as u32, + buffer: buf.as_mut_ptr() as u32, + path: path.as_ptr() as u32, + }; + unsafe { syscall_fs(&req) } } diff --git a/src/lib.rs b/src/lib.rs index 296cdf8..063bc76 100644 --- a/src/lib.rs +++ b/src/lib.rs @@ -6,6 +6,7 @@ mod nanolibc; pub mod allocation; pub mod dll; pub mod sys; +pub mod fs; pub use modules::*; diff --git a/src/sys.rs b/src/sys.rs index 41188e8..eb10ed2 100644 --- a/src/sys.rs +++ b/src/sys.rs @@ -68,3 +68,26 @@ extern "C" { #[link_name = "_load_dll"] pub fn load_dll(name: *const u8) -> *const u32; } + +#[repr(C)] +pub struct FileSystemRequest { + pub operation: u32, + pub offset_low: u32, + pub offset_high: u32, + pub byte_count: u32, + pub buffer: u32, + pub path: u32, +} + +pub unsafe fn syscall_fs(req: *const FileSystemRequest) -> (u32, u32) { + let eax_result: u32; + let ebx_result: u32; + core::arch::asm!( + "int 0x40", + inout("eax") 70u32 => eax_result, + in("ebx") req, + out("ebx") ebx_result, + options(nostack) + ); + (eax_result, ebx_result) +} -- 2.54.0 From 819ffb3e5a3fde35a75ec2e77594da6c32527c37 Mon Sep 17 00:00:00 2001 From: rajc6h6 Date: Wed, 25 Mar 2026 21:43:18 +0530 Subject: [PATCH 3/4] fix: use syscalls.S FFI pattern for fs syscall, pub fn kol_main --- examples/fs_demo.rs | 10 ++++------ src/fs.rs | 22 ++++++++++++---------- src/sys.rs | 32 ++++++++++++-------------------- src/syscalls.S | 8 ++++++++ 4 files changed, 36 insertions(+), 36 deletions(-) diff --git a/examples/fs_demo.rs b/examples/fs_demo.rs index 41a03b5..f7fc4cb 100644 --- a/examples/fs_demo.rs +++ b/examples/fs_demo.rs @@ -1,12 +1,10 @@ #![no_std] #![no_main] -use kos::fs::fs_read; +use kos::fs::read_file; #[no_mangle] -pub extern "C" fn _start() -> ! { - let path = c"/rd/1/readme.txt"; - let mut buf = [0u8; 512]; - let (_status, _bytes) = fs_read(path, &mut buf); - loop {} +pub fn kol_main() { + let mut buf = [0u8; 256]; + let _ = read_file(c"/rd/1/readme.txt", &mut buf); } diff --git a/src/fs.rs b/src/fs.rs index ed6b23c..ed10a22 100644 --- a/src/fs.rs +++ b/src/fs.rs @@ -1,14 +1,16 @@ use core::ffi::CStr; -use crate::sys::{syscall_fs, FileSystemRequest}; +use crate::sys::{fs_read, FsInfo}; -pub fn fs_read(path: &CStr, buf: &mut [u8]) -> (u32, u32) { - let req = FileSystemRequest { - operation: 0, - offset_low: 0, - offset_high: 0, - byte_count: buf.len() as u32, - buffer: buf.as_mut_ptr() as u32, - path: path.as_ptr() as u32, +pub fn read_file(path: &CStr, buf: &mut [u8]) -> Result<(), u32> { + let info = FsInfo { + operation: 0, + offset: 0, + offset_hi: 0, + byte_count: buf.len() as u32, + buffer: buf.as_mut_ptr(), + reserved: 0, + path: path.as_ptr() as *const u8, }; - unsafe { syscall_fs(&req) } + let result = unsafe { fs_read(&info) }; + if result == 0 { Ok(()) } else { Err(result) } } diff --git a/src/sys.rs b/src/sys.rs index eb10ed2..5ba5b38 100644 --- a/src/sys.rs +++ b/src/sys.rs @@ -67,27 +67,19 @@ extern "C" { // 68.19 #[link_name = "_load_dll"] pub fn load_dll(name: *const u8) -> *const u32; + + // 70 + #[link_name = "_fs_read"] + pub fn fs_read(info: *const FsInfo) -> u32; } #[repr(C)] -pub struct FileSystemRequest { - pub operation: u32, - pub offset_low: u32, - pub offset_high: u32, - pub byte_count: u32, - pub buffer: u32, - pub path: u32, -} - -pub unsafe fn syscall_fs(req: *const FileSystemRequest) -> (u32, u32) { - let eax_result: u32; - let ebx_result: u32; - core::arch::asm!( - "int 0x40", - inout("eax") 70u32 => eax_result, - in("ebx") req, - out("ebx") ebx_result, - options(nostack) - ); - (eax_result, ebx_result) +pub struct FsInfo { + pub operation: u32, + pub offset: u32, + pub offset_hi: u32, + pub byte_count: u32, + pub buffer: *mut u8, + pub reserved: u8, + pub path: *const u8, } diff --git a/src/syscalls.S b/src/syscalls.S index 85570eb..41959d5 100644 --- a/src/syscalls.S +++ b/src/syscalls.S @@ -20,6 +20,7 @@ section '.text' public _get_lang public _load_dll public _set_event_mask + public _fs_read _exit: mov eax, SF_TERMINATE_PROCESS @@ -143,3 +144,10 @@ _set_event_mask: int 0x40 ret +_fs_read: + push ebx + mov eax, 70 + mov ebx, [esp + 4 * 2] + int 0x40 + pop ebx + ret -- 2.54.0 From de15d645b4131f268f5a5dbd2eb55bc6d8b292f7 Mon Sep 17 00:00:00 2001 From: rajc6h6 Date: Fri, 27 Mar 2026 00:57:15 +0530 Subject: [PATCH 4/4] fix: 10 separate fs functions, SF_FILE constant, pub(crate) FsBlock --- src/fs.rs | 64 ++++++++++++++++++++++++++++++++++-------- src/func_constants.inc | 1 + src/sys.rs | 8 +++--- src/syscalls.S | 6 ++-- 4 files changed, 61 insertions(+), 18 deletions(-) diff --git a/src/fs.rs b/src/fs.rs index ed10a22..2e18776 100644 --- a/src/fs.rs +++ b/src/fs.rs @@ -1,16 +1,58 @@ use core::ffi::CStr; -use crate::sys::{fs_read, FsInfo}; +use crate::sys::{fs_execute, FsBlock}; -pub fn read_file(path: &CStr, buf: &mut [u8]) -> Result<(), u32> { - let info = FsInfo { - operation: 0, - offset: 0, - offset_hi: 0, - byte_count: buf.len() as u32, - buffer: buf.as_mut_ptr(), - reserved: 0, +fn execute(op: u32, offset: u32, offset_hi: u32, count: u32, buf: *mut u8, path: &CStr) -> Result<(), u32> { + let info = FsBlock { + operation: op, + offset, + offset_hi, + byte_count: count, + buffer: buf, + _pad: 0, path: path.as_ptr() as *const u8, }; - let result = unsafe { fs_read(&info) }; - if result == 0 { Ok(()) } else { Err(result) } + match unsafe { fs_execute(&info) } { + 0 => Ok(()), + e => Err(e), + } +} + +pub fn read_file(path: &CStr, buf: &mut [u8]) -> Result<(), u32> { + execute(0, 0, 0, buf.len() as u32, buf.as_mut_ptr(), path) +} + +pub fn read_folder(path: &CStr, buf: &mut [u8]) -> Result<(), u32> { + execute(1, 0, 0, buf.len() as u32, buf.as_mut_ptr(), path) +} + +pub fn create_file(path: &CStr, buf: &[u8]) -> Result<(), u32> { + execute(2, 0, 0, buf.len() as u32, buf.as_ptr() as *mut u8, path) +} + +pub fn write_file(path: &CStr, buf: &[u8]) -> Result<(), u32> { + execute(3, 0, 0, buf.len() as u32, buf.as_ptr() as *mut u8, path) +} + +pub fn set_size(path: &CStr, size: u64) -> Result<(), u32> { + execute(4, size as u32, (size >> 32) as u32, 0, core::ptr::null_mut(), path) +} + +pub fn get_attributes(path: &CStr, buf: &mut [u8]) -> Result<(), u32> { + execute(5, 0, 0, buf.len() as u32, buf.as_mut_ptr(), path) +} + +pub fn set_attributes(path: &CStr, buf: &[u8]) -> Result<(), u32> { + execute(6, 0, 0, buf.len() as u32, buf.as_ptr() as *mut u8, path) +} + +pub fn run(path: &CStr) -> Result<(), u32> { + execute(7, 0, 0, 0, core::ptr::null_mut(), path) +} + +pub fn delete(path: &CStr) -> Result<(), u32> { + execute(8, 0, 0, 0, core::ptr::null_mut(), path) +} + +pub fn create_folder(path: &CStr) -> Result<(), u32> { + execute(9, 0, 0, 0, core::ptr::null_mut(), path) } diff --git a/src/func_constants.inc b/src/func_constants.inc index cda41b6..677c023 100644 --- a/src/func_constants.inc +++ b/src/func_constants.inc @@ -20,3 +20,4 @@ SF_SYS_MISC = 68 SSF_MEM_ALLOC = 12 SSF_MEM_FREE = 13 SSF_LOAD_DLL = 19 +SF_FILE = 70 diff --git a/src/sys.rs b/src/sys.rs index 5ba5b38..599b1f4 100644 --- a/src/sys.rs +++ b/src/sys.rs @@ -69,17 +69,17 @@ extern "C" { pub fn load_dll(name: *const u8) -> *const u32; // 70 - #[link_name = "_fs_read"] - pub fn fs_read(info: *const FsInfo) -> u32; + #[link_name = "_fs_execute"] + pub fn fs_execute(info: *const FsBlock) -> u32; } #[repr(C)] -pub struct FsInfo { +pub(crate) struct FsBlock { pub operation: u32, pub offset: u32, pub offset_hi: u32, pub byte_count: u32, pub buffer: *mut u8, - pub reserved: u8, + pub _pad: u8, pub path: *const u8, } diff --git a/src/syscalls.S b/src/syscalls.S index 41959d5..60fe4fa 100644 --- a/src/syscalls.S +++ b/src/syscalls.S @@ -20,7 +20,7 @@ section '.text' public _get_lang public _load_dll public _set_event_mask - public _fs_read + public _fs_execute _exit: mov eax, SF_TERMINATE_PROCESS @@ -144,9 +144,9 @@ _set_event_mask: int 0x40 ret -_fs_read: +_fs_execute: push ebx - mov eax, 70 + mov eax, SF_FILE mov ebx, [esp + 4 * 2] int 0x40 pop ebx -- 2.54.0