mika/Atmosphere-libs
1
0
Fork 0
mirror of https://github.com/Atmosphere-NX/Atmosphere-libs.git synced 2025-06-25 12:32:41 +02:00
Code Issues Packages Projects Releases Wiki Activity

docs/fatal error: update for 0.15.0

Browse Source
This commit is contained in:
Michael Scire 2020-10-26 15:59:09 -07:00
parent 1235ee67a1
commit 10e9e0e8f9
2 changed files with 17 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
libmesosphere/source/board/nintendo/nx/kern_k_system_control.cpp
View File

@ -308,6 +308,15 @@ namespace ams::kern::board::nintendo::nx {
g_secure_applet_memory_used = false; g_secure_applet_memory_used = false;
} }
u64 GetVersionIdentifier() {
u64 value = kern::GetTargetFirmware();
value |= static_cast<u64>(ATMOSPHERE_RELEASE_VERSION_MICRO) << 32;
value |= static_cast<u64>(ATMOSPHERE_RELEASE_VERSION_MINOR) << 40;
value |= static_cast<u64>(ATMOSPHERE_RELEASE_VERSION_MAJOR) << 48;
value |= static_cast<u64>('M') << 56;
return value;
}
} }
/* Initialization. */ /* Initialization. */
@ -557,6 +566,10 @@ namespace ams::kern::board::nintendo::nx {
/* Set module base. */ /* Set module base. */
f_ctx->module_base = KMemoryLayout::GetKernelCodeRegionExtents().GetAddress(); f_ctx->module_base = KMemoryLayout::GetKernelCodeRegionExtents().GetAddress();
/* Set afsr1. */
f_ctx->afsr0 = 0;
f_ctx->afsr1 = GetVersionIdentifier();
/* Copy registers. */ /* Copy registers. */
for (size_t i = 0; i < util::size(e_ctx->x); ++i) { for (size_t i = 0; i < util::size(e_ctx->x); ++i) {
f_ctx->gprs[i] = e_ctx->x[i]; f_ctx->gprs[i] = e_ctx->x[i];

5
libstratosphere/source/ams/ams_environment.cpp
View File

@ -74,7 +74,10 @@ namespace ams {
ams_ctx.pc = ctx->pc.x; ams_ctx.pc = ctx->pc.x;
ams_ctx.pstate = ctx->pstate; ams_ctx.pstate = ctx->pstate;
ams_ctx.afsr0 = ctx->afsr0; ams_ctx.afsr0 = ctx->afsr0;
ams_ctx.afsr1 = ctx->afsr1; ams_ctx.afsr1 = (static_cast<u64>(::ams::exosphere::GetVersion(ATMOSPHERE_RELEASE_VERSION)) << 32) | static_cast<u64>(hos::GetVersion());
if (svc::IsKernelMesosphere()) {
ams_ctx.afsr1 |= (static_cast<u64>('M') << (BITSIZEOF(u64) - BITSIZEOF(u8)));
}
ams_ctx.far = ctx->far.x; ams_ctx.far = ctx->far.x;
ams_ctx.report_identifier = armGetSystemTick(); ams_ctx.report_identifier = armGetSystemTick();