nold/Atmosphere
1
0
Fork 0
mirror of https://github.com/Atmosphere-NX/Atmosphere synced 2024-12-23 04:41:12 +00:00
Code Issues Projects Releases Packages Wiki Activity

loader: support MapRegion capability as an atmosphere extension (normally kips-only)

Browse source
This commit is contained in:
Michael Scire 2020-08-21 02:37:06 -07:00 committed by SciresM
parent cd62d83586
commit 657470830f
2 changed files with 32 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
libraries/libvapours/include/vapours/results/loader_results.hpp
View file

@ -54,6 +54,7 @@ namespace ams::ldr {
R_DEFINE_ERROR_RESULT(InvalidCapabilitySyscallMask, 104); R_DEFINE_ERROR_RESULT(InvalidCapabilitySyscallMask, 104);
R_DEFINE_ERROR_RESULT(InvalidCapabilityMapRange, 106); R_DEFINE_ERROR_RESULT(InvalidCapabilityMapRange, 106);
R_DEFINE_ERROR_RESULT(InvalidCapabilityMapPage, 107); R_DEFINE_ERROR_RESULT(InvalidCapabilityMapPage, 107);
R_DEFINE_ERROR_RESULT(InvalidCapabilityMapRegion, 110);
R_DEFINE_ERROR_RESULT(InvalidCapabilityInterruptPair, 111); R_DEFINE_ERROR_RESULT(InvalidCapabilityInterruptPair, 111);
R_DEFINE_ERROR_RESULT(InvalidCapabilityApplicationType, 113); R_DEFINE_ERROR_RESULT(InvalidCapabilityApplicationType, 113);
R_DEFINE_ERROR_RESULT(InvalidCapabilityKernelVersion, 114); R_DEFINE_ERROR_RESULT(InvalidCapabilityKernelVersion, 114);

31
stratosphere/loader/source/ldr_capabilities.cpp
View file

@ -26,6 +26,7 @@ namespace ams::ldr::caps {
SyscallMask = 4, SyscallMask = 4,
MapRange = 6, MapRange = 6,
MapPage = 7, MapPage = 7,
MapRegion = 10,
InterruptPair = 11, InterruptPair = 11,
ApplicationType = 13, ApplicationType = 13,
KernelVersion = 14, KernelVersion = 14,
@ -181,6 +182,35 @@ namespace ams::ldr::caps {
} }
); );
enum class MemoryRegionType : u32 {
None = 0,
KernelTraceBuffer = 1,
OnMemoryBootImage = 2,
DTB = 3,
};
DEFINE_CAPABILITY_CLASS(MapRegion,
DEFINE_CAPABILITY_FIELD(Region0, IdBits, 6, MemoryRegionType);
DEFINE_CAPABILITY_FIELD(ReadOnly0, Region0, 1, bool);
DEFINE_CAPABILITY_FIELD(Region1, ReadOnly0, 6, MemoryRegionType);
DEFINE_CAPABILITY_FIELD(ReadOnly1, Region1, 1, bool);
DEFINE_CAPABILITY_FIELD(Region2, ReadOnly1, 6, MemoryRegionType);
DEFINE_CAPABILITY_FIELD(ReadOnly2, Region2, 1, bool);
bool IsValid(const util::BitPack32 *kac, size_t kac_count) const {
for (size_t i = 0; i < kac_count; i++) {
if (GetCapabilityId(kac[i]) == Id) {
const auto restriction = Decode(kac[i]);
if (this->GetValue() == restriction.GetValue()) {
return true;
}
}
}
return false;
}
);
DEFINE_CAPABILITY_CLASS(InterruptPair, DEFINE_CAPABILITY_CLASS(InterruptPair,
DEFINE_CAPABILITY_FIELD(InterruptId0, IdBits, 10); DEFINE_CAPABILITY_FIELD(InterruptId0, IdBits, 10);
DEFINE_CAPABILITY_FIELD(InterruptId1, InterruptId0, 10); DEFINE_CAPABILITY_FIELD(InterruptId1, InterruptId0, 10);
@ -304,6 +334,7 @@ namespace ams::ldr::caps {
VALIDATE_CASE(KernelFlags); VALIDATE_CASE(KernelFlags);
VALIDATE_CASE(SyscallMask); VALIDATE_CASE(SyscallMask);
VALIDATE_CASE(MapPage); VALIDATE_CASE(MapPage);
VALIDATE_CASE(MapRegion);
VALIDATE_CASE(InterruptPair); VALIDATE_CASE(InterruptPair);
VALIDATE_CASE(ApplicationType); VALIDATE_CASE(ApplicationType);
VALIDATE_CASE(KernelVersion); VALIDATE_CASE(KernelVersion);