Author SHA1 Message Date
Sweetbread 24c38957f4 Add *(.bss.*) to link.x; fixes #8
Const var, which is used for allocator, is .bss.alloc..., and because
there was no that pattern in link scrypt, FILE_END didn't count the var,
that's why initial zero value was overwritten by application name (see
MENUET01 header description for more info)
2024-05-26 02:19:11 +03:00
8 changed files with 4 additions and 97 deletions

No files matched your search

-3
View File
@@ -21,6 +21,3 @@ path = "examples/dark.rs"
[profile.release]
opt-level = "z"
lto = "thin"
[[example]]
name = "fs_demo"
-10
View File
@@ -1,10 +0,0 @@
#![no_std]
#![no_main]
use kos::fs::read_file;
#[no_mangle]
pub fn kol_main() {
let mut buf = [0u8; 256];
let _ = read_file(c"/rd/1/readme.txt", &mut buf);
}
+4 -1
View File
@@ -30,7 +30,10 @@ SECTIONS {
*(data)
}
.bss ALIGN(16) : {*(.bss)}
.bss ALIGN(16) : {
*(.bss)
*(.bss.*)
}
FILE_END = .;
}
-58
View File
@@ -1,58 +0,0 @@
use core::ffi::CStr;
use crate::sys::{fs_execute, FsBlock};
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,
};
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)
}
-1
View File
@@ -20,4 +20,3 @@ SF_SYS_MISC = 68
SSF_MEM_ALLOC = 12
SSF_MEM_FREE = 13
SSF_LOAD_DLL = 19
SF_FILE = 70
-1
View File
@@ -6,7 +6,6 @@ mod nanolibc;
pub mod allocation;
pub mod dll;
pub mod sys;
pub mod fs;
pub use modules::*;
-15
View File
@@ -67,19 +67,4 @@ extern "C" {
// 68.19
#[link_name = "_load_dll"]
pub fn load_dll(name: *const u8) -> *const u32;
// 70
#[link_name = "_fs_execute"]
pub fn fs_execute(info: *const FsBlock) -> u32;
}
#[repr(C)]
pub(crate) struct FsBlock {
pub operation: u32,
pub offset: u32,
pub offset_hi: u32,
pub byte_count: u32,
pub buffer: *mut u8,
pub _pad: u8,
pub path: *const u8,
}
-8
View File
@@ -20,7 +20,6 @@ section '.text'
public _get_lang
public _load_dll
public _set_event_mask
public _fs_execute
_exit:
mov eax, SF_TERMINATE_PROCESS
@@ -144,10 +143,3 @@ _set_event_mask:
int 0x40
ret
_fs_execute:
push ebx
mov eax, SF_FILE
mov ebx, [esp + 4 * 2]
int 0x40
pop ebx
ret