drew/acadia
1
0
Fork 0
Code Issues 6 Pull requests Projects Releases Packages Wiki Activity Actions

[yellowstone] Recieve all caps via init port.

Browse source
This commit is contained in:
Drew Galbraith 2023-06-17 00:17:43 -07:00
parent 2ea1f90690
commit 09ac87e6f5
6 changed files with 18 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

4
lib/mammoth/src/init.cpp
View file

@ -17,11 +17,11 @@ z_err_t ParseInitPort(uint64_t init_port_cap) {
while ((ret = port.PollForIntCap(&init_sig, &init_cap)) != Z_ERR_EMPTY) {
RET_ERR(ret);
switch (init_sig) {
case Z_INIT_PROC_SELF:
case Z_INIT_SELF_PROC:
dbgln("received proc");
gSelfProcCap = init_cap;
break;
case Z_INIT_VMAS_SELF:
case Z_INIT_SELF_VMAS:
dbgln("received vmas");
gSelfVmasCap = init_cap;
break;

7
lib/mammoth/src/process.cpp
View file

@ -6,6 +6,7 @@
#include "mammoth/channel.h"
#include "mammoth/debug.h"
#include "mammoth/init.h"
#define MAM_PROC_DEBUG 0
@ -77,7 +78,7 @@ uint64_t LoadElfProgram(uint64_t base, uint64_t as_cap) {
dbgln("Map Local");
#endif
uint64_t vaddr;
check(ZAddressSpaceMap(Z_INIT_VMAS_SELF, 0, mem_cap, &vaddr));
check(ZAddressSpaceMap(gSelfVmasCap, 0, mem_cap, &vaddr));
#if MAM_PROC_DEBUG
dbgln("Copy");
@ -104,8 +105,8 @@ uint64_t SpawnProcessFromElfRegion(uint64_t program, Channel& local) {
uint64_t proc_cap;
uint64_t as_cap;
uint64_t foreign_chan_id;
check(ZProcessSpawn(Z_INIT_PROC_SELF, foreign.release_cap(), &proc_cap,
&as_cap, &foreign_chan_id));
check(ZProcessSpawn(gSelfProcCap, foreign.release_cap(), &proc_cap, &as_cap,
&foreign_chan_id));
uint64_t entry_point = LoadElfProgram(program, as_cap);
#if MAM_PROC_DEBUG