GAWA/BurritOS
1
0
Fork 0
forked from Rativel/BurritOS
Code Pull Requests Activity

Fix exceptions with semaphore

Browse Source
This commit is contained in:
Quentin Legot
2023-04-12 14:49:08 +02:00
parent 134e2bd2cc
commit 21f3a72a3d
5 changed files with 64 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/kernel/exception.rs
View File

@@ -2,7 +2,7 @@ use std::{cell::RefCell, rc::Rc};
use crate::{simulator::{machine::{ExceptionType, Machine}, error::{MachineOk, MachineError}}};
use super::{system::System, thread::Thread, synch::Semaphore};
use super::{system::System, thread::Thread};
type Error = String;
@@ -200,21 +200,12 @@ fn syscall(machine: &mut Machine, system: &mut System) -> Result<MachineOk, Mach
fn sc_p(machine: &mut Machine, system: &mut System) -> Result<MachineOk, MachineError> {
let id_sema = machine.int_reg.get_reg(10);
match system.get_obj_addrs().search_semaphore(id_sema as i32) {
Some(sema) => { sema.p(machine, system.get_thread_manager()); Ok(MachineOk::Ok) }
None => Err(format!("Coudn't find semaphore {}", id_sema))?
}
system.get_thread_manager().sem_p(id_sema as i32, machine)
}
fn sc_v(machine: &mut Machine, system: &mut System) -> Result<MachineOk, MachineError> {
let id_sema = machine.int_reg.get_reg(10);
match system.get_obj_addrs().search_semaphore(id_sema as i32) {
Some(sema) => {
sema.v(machine, system.get_thread_manager());
Ok(MachineOk::Ok)
},
None => Err(format!("Couldn't find semaphore {}", id_sema))?
}
system.get_thread_manager().sem_v(id_sema as i32, machine)
}
fn sc_sem_create(machine: &mut Machine) -> Result<MachineOk, MachineError> {