mika/Atmosphere-libs
1
0
Fork 0
mirror of https://github.com/Atmosphere-NX/Atmosphere-libs.git synced 2025-08-09 17:09:27 +02:00
Code Issues Packages Projects Releases Wiki Activity

exo2: reorganize to save >0x300 bytes and 0x100 of stack in main

Browse Source
This commit is contained in:
Michael Scire 2020-05-13 18:10:54 -07:00
parent ffb3493ab5
commit 43a1908de7
2 changed files with 38 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libexosphere/include/exosphere/secmon/secmon_memory_layout.hpp
View File

@ -280,7 +280,7 @@ namespace ams::secmon {
static_assert(MemoryRegionVirtual.Contains(MemoryRegionVirtualTzramL2L3PageTable)); static_assert(MemoryRegionVirtual.Contains(MemoryRegionVirtualTzramL2L3PageTable));
static_assert(MemoryRegionPhysicalTzramNonVolatile.Contains(MemoryRegionPhysicalTzramL2L3PageTable)); static_assert(MemoryRegionPhysicalTzramNonVolatile.Contains(MemoryRegionPhysicalTzramL2L3PageTable));
constexpr inline const MemoryRegion MemoryRegionPhysicalTzramFullProgramImage = MemoryRegion(UINT64_C(0x7C010800), 0xD800); constexpr inline const MemoryRegion MemoryRegionPhysicalTzramFullProgramImage = MemoryRegion(UINT64_C(0x7C010000), 0xE000);
constexpr inline const MemoryRegion MemoryRegionPhysicalIramBootCodeImage = MemoryRegion(UINT64_C(0x40032000), 0xC000); constexpr inline const MemoryRegion MemoryRegionPhysicalIramBootCodeImage = MemoryRegion(UINT64_C(0x40032000), 0xC000);
constexpr inline const MemoryRegion MemoryRegionPhysicalIramWarmbootBin = MemoryRegion(UINT64_C(0x4003E000), 0x17F0); constexpr inline const MemoryRegion MemoryRegionPhysicalIramWarmbootBin = MemoryRegion(UINT64_C(0x4003E000), 0x17F0);

38
libexosphere/include/exosphere/secmon/secmon_volatile_context.hpp
View File

@ -15,6 +15,7 @@
*/ */
#pragma once #pragma once
#include <vapours.hpp> #include <vapours.hpp>
#include <exosphere/pkg2.hpp>
namespace ams::secmon { namespace ams::secmon {
@ -23,10 +24,22 @@ namespace ams::secmon {
constexpr inline const size_t CoreExceptionStackSize = 0x80; constexpr inline const size_t CoreExceptionStackSize = 0x80;
/* Volatile keydata that we lose access to after boot. */
struct VolatileKeys {
u8 boot_config_rsa_modulus[0x100];
u8 package2_dev_rsa_modulus[0x100];
u8 package2_prod_rsa_modulus[0x100];
u8 package2_aes_key[0x10];
};
/* Nintendo uses the bottom 0x740 of this as a stack for warmboot setup, and another 0x740 for the core 0/1/2 SMC stacks. */ /* Nintendo uses the bottom 0x740 of this as a stack for warmboot setup, and another 0x740 for the core 0/1/2 SMC stacks. */
/* This is...wasteful. The warmboot stack is not deep. We will thus save 1K+ of nonvolatile storage by keeping the random cache in here. */ /* This is...wasteful. The warmboot stack is not deep. We will thus save 1K+ of nonvolatile storage by keeping the random cache in here. */
struct VolatileData { struct VolatileData {
u8 random_cache[0x400]; union {
u8 random_cache[0x400];
VolatileKeys keys;
pkg2::Package2Meta pkg2_meta;
};
u8 se_work_block[crypto::AesEncryptor128::BlockSize]; u8 se_work_block[crypto::AesEncryptor128::BlockSize];
u8 reserved_danger_zone[0x30]; /* This memory is "available", but careful consideration must be taken before declaring it used. */ u8 reserved_danger_zone[0x30]; /* This memory is "available", but careful consideration must be taken before declaring it used. */
u8 warmboot_stack[0x380]; u8 warmboot_stack[0x380];
@ -35,6 +48,8 @@ namespace ams::secmon {
}; };
static_assert(util::is_pod<VolatileData>::value); static_assert(util::is_pod<VolatileData>::value);
static_assert(sizeof(VolatileData) == 0x1000); static_assert(sizeof(VolatileData) == 0x1000);
static_assert(sizeof(VolatileKeys{}.boot_config_rsa_modulus) == sizeof(pkg2::Package2Meta));
static_assert(offsetof(VolatileData, keys.boot_config_rsa_modulus) == offsetof(VolatileData, pkg2_meta));
ALWAYS_INLINE VolatileData &GetVolatileData() { ALWAYS_INLINE VolatileData &GetVolatileData() {
return *MemoryRegionVirtualTzramVolatileData.GetPointer<VolatileData>(); return *MemoryRegionVirtualTzramVolatileData.GetPointer<VolatileData>();
@ -52,6 +67,27 @@ namespace ams::secmon {
return GetVolatileData().se_work_block; return GetVolatileData().se_work_block;
} }
namespace boot {
ALWAYS_INLINE const u8 *GetBootConfigRsaModulus() {
return GetVolatileData().keys.boot_config_rsa_modulus;
}
ALWAYS_INLINE const u8 *GetPackage2RsaModulus(bool is_prod) {
auto &volatile_data = GetVolatileData();
return is_prod ? volatile_data.keys.package2_prod_rsa_modulus : volatile_data.keys.package2_dev_rsa_modulus;
}
ALWAYS_INLINE const u8 *GetPackage2AesKey() {
return GetVolatileData().keys.package2_aes_key;
}
ALWAYS_INLINE pkg2::Package2Meta &GetEphemeralPackage2Meta() {
return GetVolatileData().pkg2_meta;
}
}
constexpr inline const Address WarmbootStackAddress = MemoryRegionVirtualTzramVolatileData.GetAddress() + offsetof(VolatileData, warmboot_stack) + sizeof(VolatileData::warmboot_stack); constexpr inline const Address WarmbootStackAddress = MemoryRegionVirtualTzramVolatileData.GetAddress() + offsetof(VolatileData, warmboot_stack) + sizeof(VolatileData::warmboot_stack);
constexpr inline const Address Core012SmcStackAddress = MemoryRegionVirtualTzramVolatileData.GetAddress() + offsetof(VolatileData, core012_smc_stack) + sizeof(VolatileData::core012_smc_stack); constexpr inline const Address Core012SmcStackAddress = MemoryRegionVirtualTzramVolatileData.GetAddress() + offsetof(VolatileData, core012_smc_stack) + sizeof(VolatileData::core012_smc_stack);