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

kern: use size instead of phys addr as sentinel value in InitializeCore linear mapping logic

Browse source
This commit is contained in:
fincs 2020-08-13 02:06:12 +02:00 committed by SciresM
parent 2cedf2bcf0
commit 2effe130e3
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
mesosphere/kernel/source/arch/arm64/init/kern_init_core.cpp
View file

@ -274,7 +274,7 @@ namespace ams::kern::init {
continue; continue;
} }
if (cur_phys_addr == 0) { if (cur_size == 0) {
cur_phys_addr = region.GetAddress(); cur_phys_addr = region.GetAddress();
cur_size = region.GetSize(); cur_size = region.GetSize();
} else if (cur_phys_addr + cur_size == region.GetAddress()) { } else if (cur_phys_addr + cur_size == region.GetAddress()) {
@ -296,7 +296,7 @@ namespace ams::kern::init {
} }
/* Map the last block, which we may have skipped. */ /* Map the last block, which we may have skipped. */
if (cur_phys_addr != 0) { if (cur_size != 0) {
const uintptr_t cur_virt_addr = cur_phys_addr + linear_region_phys_to_virt_diff; const uintptr_t cur_virt_addr = cur_phys_addr + linear_region_phys_to_virt_diff;
ttbr1_table.Map(cur_virt_addr, cur_size, cur_phys_addr, KernelRwDataAttribute, g_initial_page_allocator); ttbr1_table.Map(cur_virt_addr, cur_size, cur_phys_addr, KernelRwDataAttribute, g_initial_page_allocator);
} }