nold/Atmosphere
1
0
Fork 0
mirror of https://github.com/Atmosphere-NX/Atmosphere synced 2024-11-09 22:56:35 +00:00
Code Issues Projects Releases Packages Wiki Activity

Loader: Implement argument passing.

Browse source
This commit is contained in:
Michael Scire 2018-04-24 06:14:04 -06:00
parent a96f862f11
commit ee9bfd514c
2 changed files with 32 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
stratosphere/loader/source/ldr_nso.cpp
View file

@ -234,6 +234,30 @@ Result NsoUtils::LoadNsosIntoProcessMemory(Handle process_h, u64 title_id, NsoLo
} }
} }
/* TODO: Map in arguments, here. */ if (args != NULL && args_size) {
u64 arg_map_addr = 0;
if (R_FAILED((rc = MapUtils::LocateSpaceForMap(&arg_map_addr, extents->args_size)))) {
return rc;
}
NsoArgument *arg_map_base = (NsoArgument *)arg_map_addr;
if (R_FAILED((rc = svcMapProcessMemory(arg_map_base, process_h, extents->args_address, extents->args_size)))) {
return rc;
}
arg_map_base->allocated_space = extents->args_size;
arg_map_base->args_size = args_size;
std::fill(arg_map_base->_0x8, arg_map_base->_0x8 + sizeof(arg_map_base->_0x8), 0);
std::copy(args, args + args_size, arg_map_base->arguments);
if (R_FAILED((rc = svcUnmapProcessMemory(arg_map_base, process_h, extents->args_address, extents->args_size)))) {
return rc;
}
if (R_FAILED((rc = svcSetProcessMemoryPermission(process_h, extents->args_address, extents->args_size, 3)))) {
return rc;
}
}
return rc; return rc;
} }

7
stratosphere/loader/source/ldr_nso.hpp
View file

@ -37,6 +37,13 @@ class NsoUtils {
u64 nso_sizes[NSO_NUM_MAX]; u64 nso_sizes[NSO_NUM_MAX];
}; };
struct NsoArgument {
u32 allocated_space;
u32 args_size;
u8 _0x8[0x18];
u8 arguments[];
};
static_assert(sizeof(NsoHeader) == 0x100, "Incorrectly defined NsoHeader!"); static_assert(sizeof(NsoHeader) == 0x100, "Incorrectly defined NsoHeader!");