summaryrefslogtreecommitdiff
path: root/src/core/loader
diff options
context:
space:
mode:
authorGravatar bunnei2020-03-31 15:10:44 -0400
committerGravatar bunnei2020-04-17 00:59:28 -0400
commit4caff51710a793c6c2c1069ddd6e92185aa731fe (patch)
tree9770a5cdbfc40f6bddab093d5010f80ddad5bd26 /src/core/loader
parentcommon: alignment: Add a helper function for generic alignment checking. (diff)
downloadyuzu-4caff51710a793c6c2c1069ddd6e92185aa731fe.tar.gz
yuzu-4caff51710a793c6c2c1069ddd6e92185aa731fe.tar.xz
yuzu-4caff51710a793c6c2c1069ddd6e92185aa731fe.zip
core: memory: Move to Core::Memory namespace.
- helpful to disambiguate Kernel::Memory namespace.
Diffstat (limited to 'src/core/loader')
-rw-r--r--src/core/loader/elf.cpp2
-rw-r--r--src/core/loader/kip.cpp2
-rw-r--r--src/core/loader/nro.cpp4
-rw-r--r--src/core/loader/nso.cpp4
4 files changed, 6 insertions, 6 deletions
diff --git a/src/core/loader/elf.cpp b/src/core/loader/elf.cpp
index 8908e5328..b01400325 100644
--- a/src/core/loader/elf.cpp
+++ b/src/core/loader/elf.cpp
@@ -401,7 +401,7 @@ AppLoader_ELF::LoadResult AppLoader_ELF::Load(Kernel::Process& process) {
401 process.LoadModule(std::move(codeset), entry_point); 401 process.LoadModule(std::move(codeset), entry_point);
402 402
403 is_loaded = true; 403 is_loaded = true;
404 return {ResultStatus::Success, LoadParameters{48, Memory::DEFAULT_STACK_SIZE}}; 404 return {ResultStatus::Success, LoadParameters{48, Core::Memory::DEFAULT_STACK_SIZE}};
405} 405}
406 406
407} // namespace Loader 407} // namespace Loader
diff --git a/src/core/loader/kip.cpp b/src/core/loader/kip.cpp
index 092103abe..dce342ce2 100644
--- a/src/core/loader/kip.cpp
+++ b/src/core/loader/kip.cpp
@@ -14,7 +14,7 @@ namespace Loader {
14 14
15namespace { 15namespace {
16constexpr u32 PageAlignSize(u32 size) { 16constexpr u32 PageAlignSize(u32 size) {
17 return (size + Memory::PAGE_MASK) & ~Memory::PAGE_MASK; 17 return (size + Core::Memory::PAGE_MASK) & ~Core::Memory::PAGE_MASK;
18} 18}
19} // Anonymous namespace 19} // Anonymous namespace
20 20
diff --git a/src/core/loader/nro.cpp b/src/core/loader/nro.cpp
index 175898b91..bc41fe161 100644
--- a/src/core/loader/nro.cpp
+++ b/src/core/loader/nro.cpp
@@ -127,7 +127,7 @@ FileType AppLoader_NRO::IdentifyType(const FileSys::VirtualFile& file) {
127} 127}
128 128
129static constexpr u32 PageAlignSize(u32 size) { 129static constexpr u32 PageAlignSize(u32 size) {
130 return (size + Memory::PAGE_MASK) & ~Memory::PAGE_MASK; 130 return (size + Core::Memory::PAGE_MASK) & ~Core::Memory::PAGE_MASK;
131} 131}
132 132
133static bool LoadNroImpl(Kernel::Process& process, const std::vector<u8>& data, 133static bool LoadNroImpl(Kernel::Process& process, const std::vector<u8>& data,
@@ -221,7 +221,7 @@ AppLoader_NRO::LoadResult AppLoader_NRO::Load(Kernel::Process& process) {
221 221
222 is_loaded = true; 222 is_loaded = true;
223 return {ResultStatus::Success, 223 return {ResultStatus::Success,
224 LoadParameters{Kernel::THREADPRIO_DEFAULT, Memory::DEFAULT_STACK_SIZE}}; 224 LoadParameters{Kernel::THREADPRIO_DEFAULT, Core::Memory::DEFAULT_STACK_SIZE}};
225} 225}
226 226
227ResultStatus AppLoader_NRO::ReadIcon(std::vector<u8>& buffer) { 227ResultStatus AppLoader_NRO::ReadIcon(std::vector<u8>& buffer) {
diff --git a/src/core/loader/nso.cpp b/src/core/loader/nso.cpp
index 5fe798bf0..ce9d52309 100644
--- a/src/core/loader/nso.cpp
+++ b/src/core/loader/nso.cpp
@@ -47,7 +47,7 @@ std::vector<u8> DecompressSegment(const std::vector<u8>& compressed_data,
47} 47}
48 48
49constexpr u32 PageAlignSize(u32 size) { 49constexpr u32 PageAlignSize(u32 size) {
50 return (size + Memory::PAGE_MASK) & ~Memory::PAGE_MASK; 50 return (size + Core::Memory::PAGE_MASK) & ~Core::Memory::PAGE_MASK;
51} 51}
52} // Anonymous namespace 52} // Anonymous namespace
53 53
@@ -182,7 +182,7 @@ AppLoader_NSO::LoadResult AppLoader_NSO::Load(Kernel::Process& process) {
182 182
183 is_loaded = true; 183 is_loaded = true;
184 return {ResultStatus::Success, 184 return {ResultStatus::Success,
185 LoadParameters{Kernel::THREADPRIO_DEFAULT, Memory::DEFAULT_STACK_SIZE}}; 185 LoadParameters{Kernel::THREADPRIO_DEFAULT, Core::Memory::DEFAULT_STACK_SIZE}};
186} 186}
187 187
188ResultStatus AppLoader_NSO::ReadNSOModules(Modules& modules) { 188ResultStatus AppLoader_NSO::ReadNSOModules(Modules& modules) {