drew
/
acadia
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 1 Wiki Activity

[mammoth] Return ErrorOr when creating a process

This commit is contained in:
Drew Galbraith 2023-06-21 20:58:08 -07:00
parent 0ec2fa3e76
commit 1f7a15eed4
4 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/glacier/status/error_or.h
View File

@ -10,6 +10,8 @@ class ErrorOr {
ErrorOr() = delete; ErrorOr() = delete;
ErrorOr(const ErrorOr&) = delete; ErrorOr(const ErrorOr&) = delete;
ErrorOr(ErrorOr&&) = delete; ErrorOr(ErrorOr&&) = delete;
// FIXME: Do we have to call ~T manually here.
~ErrorOr() {}
ErrorOr(ErrorCode code) : error_(code), ok_(false) {} ErrorOr(ErrorCode code) : error_(code), ok_(false) {}
ErrorOr(const T& obj) : obj_(obj), ok_(true) {} ErrorOr(const T& obj) : obj_(obj), ok_(true) {}

3
lib/mammoth/include/mammoth/process.h
View File

@ -1,7 +1,8 @@
#pragma once #pragma once
#include <glacier/status/error_or.h>
#include <stdint.h> #include <stdint.h>
#include "mammoth/channel.h" #include "mammoth/channel.h"
uint64_t SpawnProcessFromElfRegion(uint64_t program, Channel& local); glcr::ErrorOr<Channel> SpawnProcessFromElfRegion(uint64_t program);

6
lib/mammoth/src/process.cpp
View File

@ -95,8 +95,8 @@ uint64_t LoadElfProgram(uint64_t base, uint64_t as_cap) {
} // namespace } // namespace
uint64_t SpawnProcessFromElfRegion(uint64_t program, Channel& local) { glcr::ErrorOr<Channel> SpawnProcessFromElfRegion(uint64_t program) {
Channel foreign; Channel local, foreign;
check(CreateChannels(local, foreign)); check(CreateChannels(local, foreign));
uint64_t proc_cap; uint64_t proc_cap;
@ -134,5 +134,5 @@ uint64_t SpawnProcessFromElfRegion(uint64_t program, Channel& local) {
#endif #endif
check(ZThreadStart(thread_cap, entry_point, foreign_port_id, 0)); check(ZThreadStart(thread_cap, entry_point, foreign_port_id, 0));
return glcr::OK; return local;
} }

7
sys/yellowstone/yellowstone.cpp
View File

@ -17,8 +17,11 @@ uint64_t main(uint64_t port_cap) {
uint64_t vaddr; uint64_t vaddr;
check(ZAddressSpaceMap(gSelfVmasCap, 0, gBootDenaliVmmoCap, &vaddr)); check(ZAddressSpaceMap(gSelfVmasCap, 0, gBootDenaliVmmoCap, &vaddr));
Channel local; auto local_or = SpawnProcessFromElfRegion(vaddr);
check(SpawnProcessFromElfRegion(vaddr, local)); if (!local_or) {
check(local_or.error());
}
Channel local = local_or.value();
DenaliClient client(local); DenaliClient client(local);
GptReader reader(client); GptReader reader(client);