Skip to content

Commit

Permalink
Initializes ProcManager (obhq#812)
Browse files Browse the repository at this point in the history
  • Loading branch information
ultimaweapon committed Apr 7, 2024
1 parent e74514c commit 2c61961
Show file tree
Hide file tree
Showing 5 changed files with 910 additions and 890 deletions.
13 changes: 5 additions & 8 deletions src/kernel/src/main.rs
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ use crate::log::{print, LOGGER};
use crate::namedobj::NamedObjManager;
use crate::net::NetManager;
use crate::osem::OsemManager;
use crate::process::{VProc, VProcInitError, VThread};
use crate::process::{ProcManager, VProc, VProcInitError, VThread};
use crate::regmgr::RegMgr;
use crate::rtld::{ExecError, LoadFlags, ModuleFlags, RuntimeLinker};
use crate::shm::SharedMemoryManager;
Expand Down Expand Up @@ -115,11 +115,9 @@ fn run() -> Result<(), KernelError> {

path.push("param.sfo");

// Open param.sfo.
let param = File::open(&path).map_err(KernelError::FailedToOpenGameParam)?;

// Load param.sfo.
let param = Arc::new(Param::read(param)?);
let param = File::open(&path).map_err(KernelError::FailedToOpenGameParam)?;
let param = Arc::new(Param::read(param).map_err(KernelError::FailedToReadGameParam)?);

// Get auth info for the process.
let auth =
Expand Down Expand Up @@ -366,6 +364,7 @@ fn run() -> Result<(), KernelError> {
NamedObjManager::new(&mut syscalls);
OsemManager::new(&mut syscalls);
UmtxManager::new(&mut syscalls);
ProcManager::new(&mut syscalls);

// Initialize runtime linker.
let ee = NativeEngine::new();
Expand Down Expand Up @@ -449,8 +448,6 @@ fn run() -> Result<(), KernelError> {
todo!("statically linked eboot.bin");
}

// TODO: Setup hypervisor.

// Get entry point.
let boot = ld.kernel().unwrap();
let mut arg = Box::pin(EntryArg::new(&proc, app.clone()));
Expand Down Expand Up @@ -588,7 +585,7 @@ enum KernelError {
FailedToOpenGameParam(#[source] std::io::Error),

#[error("couldn't read param.sfo ")]
FailedToReadGameParam(#[from] param::ReadError),
FailedToReadGameParam(#[source] param::ReadError),

#[error("{0} has an invalid title identifier")]
InvalidTitleId(PathBuf),
Expand Down
File renamed without changes.
Loading

0 comments on commit 2c61961

Please sign in to comment.