1
0
Fork 0
forked from AbleOS/ableos

memory service

This commit is contained in:
able 2024-03-11 09:48:56 -05:00
parent eb30ee3c12
commit fac1f77270
9 changed files with 157 additions and 32 deletions

View file

@ -72,13 +72,14 @@ pub fn handler(vm: &mut Vm) {
Ok(()) => {} Ok(()) => {}
Err(err) => log::error!("Improper log format"), Err(err) => log::error!("Improper log format"),
}, },
2 => match memory_msg_handler(vm, mem_addr, length) { 2 => {
Ok(()) => { use crate::holeybytes::kernel_services::mem_serve::memory_msg_handler;
let free_chunks = allocator::get_free_chunks_count(); match memory_msg_handler(vm, mem_addr, length) {
debug!("Free chunk count: {}", free_chunks); Ok(_) => {}
Err(_) => {}
}
//
} }
Err(err) => log::error!("Improper log format"),
},
buffer_id => { buffer_id => {
let mut buffs = IPC_BUFFERS.lock(); let mut buffs = IPC_BUFFERS.lock();
@ -173,13 +174,13 @@ pub enum LogError {
} }
use {alloc::vec, log::Record}; use {alloc::vec, log::Record};
fn memory_msg_handler(vm: &mut Vm, mem_addr: u64, length: usize) -> Result<(), LogError> { // fn memory_msg_handler(vm: &mut Vm, mem_addr: u64, length: usize) -> Result<(), LogError> {
let mut val = alloc::vec::Vec::new(); // let mut val = alloc::vec::Vec::new();
for _ in 0..4096 { // for _ in 0..4096 {
val.push(0); // val.push(0);
} // }
info!("Block address: {:?}", val.as_ptr()); // info!("Block address: {:?}", val.as_ptr());
vm.registers[1] = hbvm::value::Value(val.as_ptr() as u64); // vm.registers[1] = hbvm::value::Value(val.as_ptr() as u64);
vm.registers[2] = hbvm::value::Value(4096); // vm.registers[2] = hbvm::value::Value(4096);
Ok(()) // Ok(())
} // }

View file

@ -0,0 +1,22 @@
enum MemoryServiceResult {
}
@alignment(4096)
type PageAlignedPointer = pointer;
type RID = u64;
@nonexhaustive
@version 1.0
protocol MemoryService {
@validator(page_count, Range(1..16))
fn map_pages(page_count: u8, ptr: Optional<PageAlignedPointer>) -> MemoryServiceResult;
fn unmap_pages(ptr: PageAlignedPointer) -> MemoryServiceResult;
// ptr must be page aligned and already mapped from map_pages
fn map_hardware(hw: RID, ptr: PageAlignedPointer) -> MemoryServiceResult;
fn unmap_hardware(hw: RID) -> MemoryServiceResult;
}

View file

@ -0,0 +1,48 @@
use {
crate::holeybytes::{ecah::LogError, kernel_services::mem_serve, Vm},
log::info,
};
pub enum MemoryServiceError {
InvalidMemoryFormat,
}
fn alloc_page(vm: &mut Vm, mem_addr: u64, length: usize) -> Result<(), MemoryServiceError> {
let mut val = alloc::vec::Vec::new();
for _ in 0..4096 {
val.push(0);
}
info!("Block address: {:?}", val.as_ptr());
vm.registers[1] = hbvm::value::Value(val.as_ptr() as u64);
vm.registers[2] = hbvm::value::Value(4096);
Ok(())
}
pub fn memory_msg_handler(
vm: &mut Vm,
mem_addr: u64,
length: usize,
) -> Result<(), MemoryServiceError> {
let msg_type = (mem_addr) as *const u8;
// info!("memory message type {:?}", unsafe { msg_type.read() });
let ptr = (mem_addr + 1) as *const u64;
// info!("ptr: {:x?}", unsafe { ptr.read() });
let page_count_addr = (mem_addr + 9) as *const u8;
// let page_count = unsafe { page_count_addr.read() };
// info!("page count {}", page_count);
// if page_count > 16 {
// use log::error;
// error!("Map less pages at a time");
// }
Ok(())
}
// match memory_msg_handler(vm, mem_addr, length) {
// Ok(()) => {
// let free_chunks = allocator::get_free_chunks_count();
// debug!("Free chunk count: {}", free_chunks);
// }
// Err(err) => log::error!("Improper log format"),
// };

View file

@ -0,0 +1 @@
pub mod mem_serve;

View file

@ -6,7 +6,29 @@
use hbvm::mem::Address; use hbvm::mem::Address;
pub struct Memory; fn calc_start_of_page(ptr: u64) -> u64 {
let mut page_aligned = false;
if ptr % 4096 == 0 {
// page_aligned = true;
return ptr / 4096;
}
panic!("unaligned");
}
pub struct Memory {
// TODO: map page aligned segments of memory into a table or some sort here
}
impl Memory {
#[cfg(target_arch = "x86_64")]
fn read_device(addr: Address) {
unsafe {
//
// x86_64::instructions::port::Port::new(addr.get()).read()
}
}
}
impl hbvm::mem::Memory for Memory { impl hbvm::mem::Memory for Memory {
#[inline] #[inline]
unsafe fn load( unsafe fn load(
@ -15,6 +37,8 @@ impl hbvm::mem::Memory for Memory {
target: *mut u8, target: *mut u8,
count: usize, count: usize,
) -> Result<(), hbvm::mem::LoadError> { ) -> Result<(), hbvm::mem::LoadError> {
use log::{error, info};
if addr.get() % 4096 == 0 {}
core::ptr::copy(addr.get() as *const u8, target, count); core::ptr::copy(addr.get() as *const u8, target, count);
Ok(()) Ok(())
} }

View file

@ -1,4 +1,5 @@
mod ecah; mod ecah;
mod kernel_services;
mod mem; mod mem;
use { use {
@ -35,7 +36,7 @@ impl<'p> ExecThread<'p> {
pub unsafe fn new(program: &'p [u8], entrypoint: Address) -> Self { pub unsafe fn new(program: &'p [u8], entrypoint: Address) -> Self {
let mut vm = unsafe { let mut vm = unsafe {
Vm::new( Vm::new(
mem::Memory, mem::Memory {},
Address::new(program.as_ptr() as u64 + entrypoint.get()), Address::new(program.as_ptr() as u64 + entrypoint.get()),
) )
}; };

View file

@ -260,7 +260,7 @@ TERM_BACKDROP={}
.attach_printable("Copying Limine (ARM): have you pulled the submodule?")?, .attach_printable("Copying Limine (ARM): have you pulled the submodule?")?,
&mut bootdir.create_file("bootaa64.efi")?, &mut bootdir.create_file("bootaa64.efi")?,
)?; )?;
// TODO: Remove this and replace it with pulling executables from the system_config
for fpath in [ for fpath in [
"sysdata/background.bmp", "sysdata/background.bmp",
"target/test-programs/failure.hbf", "target/test-programs/failure.hbf",

View file

@ -1,13 +1,31 @@
import "sysdata/test-programs/hblib/std" as std; import "sysdata/test-programs/hblib/std" as std;
fn main(){ fn main(){
std::Error(":+)"); std::Error(":o) h0nk");
std::Warn("Your mom fell in a well!"); std::Warn("Your mom is a worm!");
std::Info("Hello, world!"); std::Info("Hello, world!");
std::Debug("XYZ"); // std::Debug("XYZ");
std::Trace("Trace Deez"); // std::Trace("Trace Deez");
std::ipc_send(2, 0, 0); let ADDR = 0xFFFF_FFFF_8100_0000;
let ADDR_PLUS_ONE = ADDR + 1;
let ADDR_PLUS_NINE = ADDR + 9;
li64(r25, 1);
st(r25, r0, ADDR, 1);
li64(r25, 0);
st(r25, r0, ADDR_PLUS_ONE, 8);
li64(r25, 17);
st(r25, r0, ADDR_PLUS_NINE, 1);
li64(r1, 3);
li64(r2, 2);
li64(r3, ADDR);
li64(r4, 0);
eca();
tx(); tx();
} }

View file

@ -3,7 +3,6 @@ type String {
data [u8; length], data [u8; length],
} }
// needs three bits to store this // needs three bits to store this
@exhaustive @exhaustive
enum LogLevel { enum LogLevel {
@ -30,6 +29,14 @@ type LogMessage {
00100001 // ! 00100001 // !
] ]
// This is displayed as bytes in memory
[
0x3 // INFO
0xD // Length of the string
0x48
0x69
0x21
]
@ -40,14 +47,17 @@ enum LogResult {
Error, Error,
} }
@exhaustive
protocol Logger { protocol Logger {
fn log(LogMessage) -> LogResult; fn log(LogMessage) -> LogResult;
fn error(String) -> LogResult;
fn warn(String) -> LogResult;
fn info(String) -> LogResult;
fn debug(String) -> LogResult;
fn trace(String) -> LogResult;
fn flush() -> LogResult; fn flush() -> LogResult;
} }
TODO argue about time being added after the fact in the logger or inplace by the loggee