summaryrefslogtreecommitdiff
path: root/src/core
diff options
context:
space:
mode:
Diffstat (limited to 'src/core')
-rw-r--r--src/core/hle/kernel/memory.cpp2
-rw-r--r--src/core/hle/kernel/thread.cpp2
-rw-r--r--src/core/hle/service/ldr_ro/cro_helper.cpp2
-rw-r--r--src/core/loader/ncch.cpp2
-rw-r--r--src/core/loader/ncch.h2
5 files changed, 5 insertions, 5 deletions
diff --git a/src/core/hle/kernel/memory.cpp b/src/core/hle/kernel/memory.cpp
index e65fd5c41..33c165197 100644
--- a/src/core/hle/kernel/memory.cpp
+++ b/src/core/hle/kernel/memory.cpp
@@ -23,7 +23,7 @@ namespace Kernel {
23 23
24static MemoryRegionInfo memory_regions[3]; 24static MemoryRegionInfo memory_regions[3];
25 25
26/// Size of the APPLICATION, SYSTEM and BASE memory regions (respectively) for each sytem 26/// Size of the APPLICATION, SYSTEM and BASE memory regions (respectively) for each system
27/// memory configuration type. 27/// memory configuration type.
28static const u32 memory_region_sizes[8][3] = { 28static const u32 memory_region_sizes[8][3] = {
29 // Old 3DS layouts 29 // Old 3DS layouts
diff --git a/src/core/hle/kernel/thread.cpp b/src/core/hle/kernel/thread.cpp
index c4eeeee56..84d6d24c6 100644
--- a/src/core/hle/kernel/thread.cpp
+++ b/src/core/hle/kernel/thread.cpp
@@ -204,7 +204,7 @@ static std::tuple<u32*, u32*> GetWaitSynchTimeoutParameterRegister(Thread* threa
204} 204}
205 205
206/** 206/**
207 * Updates the WaitSynchronization timeout paramter according to the difference 207 * Updates the WaitSynchronization timeout parameter according to the difference
208 * between ticks of the last WaitSynchronization call and the incoming one. 208 * between ticks of the last WaitSynchronization call and the incoming one.
209 * @param timeout_low a pointer to the register for the low part of the timeout parameter 209 * @param timeout_low a pointer to the register for the low part of the timeout parameter
210 * @param timeout_high a pointer to the register for the high part of the timeout parameter 210 * @param timeout_high a pointer to the register for the high part of the timeout parameter
diff --git a/src/core/hle/service/ldr_ro/cro_helper.cpp b/src/core/hle/service/ldr_ro/cro_helper.cpp
index b7d250312..4f0aa77eb 100644
--- a/src/core/hle/service/ldr_ro/cro_helper.cpp
+++ b/src/core/hle/service/ldr_ro/cro_helper.cpp
@@ -1227,7 +1227,7 @@ ResultCode CROHelper::Link(VAddr crs_address, bool link_on_load_bug_fix) {
1227 // The bug itself is: 1227 // The bug itself is:
1228 // If a relocation target is in .data segment, it will relocate to the 1228 // If a relocation target is in .data segment, it will relocate to the
1229 // user-specified buffer. But if this is linking during loading, 1229 // user-specified buffer. But if this is linking during loading,
1230 // the .data segment hasn't been tranfer from CRO to the buffer, 1230 // the .data segment hasn't been transfer from CRO to the buffer,
1231 // thus the relocation will be overwritten by data transfer. 1231 // thus the relocation will be overwritten by data transfer.
1232 // To fix this bug, we need temporarily restore the old .data segment 1232 // To fix this bug, we need temporarily restore the old .data segment
1233 // offset and apply imported symbols. 1233 // offset and apply imported symbols.
diff --git a/src/core/loader/ncch.cpp b/src/core/loader/ncch.cpp
index 2e4510857..fadd7b16b 100644
--- a/src/core/loader/ncch.cpp
+++ b/src/core/loader/ncch.cpp
@@ -163,7 +163,7 @@ ResultStatus AppLoader_NCCH::LoadExec() {
163 Kernel::g_current_process->ideal_processor = 163 Kernel::g_current_process->ideal_processor =
164 exheader_header.arm11_system_local_caps.ideal_processor; 164 exheader_header.arm11_system_local_caps.ideal_processor;
165 165
166 // Copy data while converting endianess 166 // Copy data while converting endianness
167 std::array<u32, ARRAY_SIZE(exheader_header.arm11_kernel_caps.descriptors)> kernel_caps; 167 std::array<u32, ARRAY_SIZE(exheader_header.arm11_kernel_caps.descriptors)> kernel_caps;
168 std::copy_n(exheader_header.arm11_kernel_caps.descriptors, kernel_caps.size(), 168 std::copy_n(exheader_header.arm11_kernel_caps.descriptors, kernel_caps.size(),
169 begin(kernel_caps)); 169 begin(kernel_caps));
diff --git a/src/core/loader/ncch.h b/src/core/loader/ncch.h
index 04350d006..f8718d063 100644
--- a/src/core/loader/ncch.h
+++ b/src/core/loader/ncch.h
@@ -11,7 +11,7 @@
11#include "core/loader/loader.h" 11#include "core/loader/loader.h"
12 12
13//////////////////////////////////////////////////////////////////////////////////////////////////// 13////////////////////////////////////////////////////////////////////////////////////////////////////
14/// NCCH header (Note: "NCCH" appears to be a publically unknown acronym) 14/// NCCH header (Note: "NCCH" appears to be a publicly unknown acronym)
15 15
16struct NCCH_Header { 16struct NCCH_Header {
17 u8 signature[0x100]; 17 u8 signature[0x100];