diff options
| author |  bunnei | 2020-03-31 15:10:44 -0400 |
|---|---|---|
| committer | bunnei | 2020-04-17 00:59:28 -0400 |
| commit | 4caff51710a793c6c2c1069ddd6e92185aa731fe (patch) | |
| tree | 9770a5cdbfc40f6bddab093d5010f80ddad5bd26 /src/core/loader/nro.cpp | |
| parent | common: alignment: Add a helper function for generic alignment checking. (diff) | |
| download | yuzu-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/nro.cpp')
| -rw-r--r-- | src/core/loader/nro.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
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 | ||
| 129 | static constexpr u32 PageAlignSize(u32 size) { | 129 | static 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 | ||
| 133 | static bool LoadNroImpl(Kernel::Process& process, const std::vector<u8>& data, | 133 | static 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 | ||
| 227 | ResultStatus AppLoader_NRO::ReadIcon(std::vector<u8>& buffer) { | 227 | ResultStatus AppLoader_NRO::ReadIcon(std::vector<u8>& buffer) { |