diff options
| author | 2020-03-31 15:10:44 -0400 | |
|---|---|---|
| committer | 2020-04-17 00:59:28 -0400 | |
| commit | 4caff51710a793c6c2c1069ddd6e92185aa731fe (patch) | |
| tree | 9770a5cdbfc40f6bddab093d5010f80ddad5bd26 /src/core/memory | |
| 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/memory')
| -rw-r--r-- | src/core/memory/cheat_engine.cpp | 4 | ||||
| -rw-r--r-- | src/core/memory/cheat_engine.h | 4 | ||||
| -rw-r--r-- | src/core/memory/dmnt_cheat_types.h | 4 | ||||
| -rw-r--r-- | src/core/memory/dmnt_cheat_vm.cpp | 4 | ||||
| -rw-r--r-- | src/core/memory/dmnt_cheat_vm.h | 4 |
5 files changed, 10 insertions, 10 deletions
diff --git a/src/core/memory/cheat_engine.cpp b/src/core/memory/cheat_engine.cpp index 4472500d2..ab459221d 100644 --- a/src/core/memory/cheat_engine.cpp +++ b/src/core/memory/cheat_engine.cpp | |||
| @@ -16,7 +16,7 @@ | |||
| 16 | #include "core/hle/service/sm/sm.h" | 16 | #include "core/hle/service/sm/sm.h" |
| 17 | #include "core/memory/cheat_engine.h" | 17 | #include "core/memory/cheat_engine.h" |
| 18 | 18 | ||
| 19 | namespace Memory { | 19 | namespace Core::Memory { |
| 20 | 20 | ||
| 21 | constexpr s64 CHEAT_ENGINE_TICKS = static_cast<s64>(Core::Hardware::BASE_CLOCK_RATE / 12); | 21 | constexpr s64 CHEAT_ENGINE_TICKS = static_cast<s64>(Core::Hardware::BASE_CLOCK_RATE / 12); |
| 22 | constexpr u32 KEYPAD_BITMASK = 0x3FFFFFF; | 22 | constexpr u32 KEYPAD_BITMASK = 0x3FFFFFF; |
| @@ -230,4 +230,4 @@ void CheatEngine::FrameCallback(u64 userdata, s64 cycles_late) { | |||
| 230 | core_timing.ScheduleEvent(CHEAT_ENGINE_TICKS - cycles_late, event); | 230 | core_timing.ScheduleEvent(CHEAT_ENGINE_TICKS - cycles_late, event); |
| 231 | } | 231 | } |
| 232 | 232 | ||
| 233 | } // namespace Memory | 233 | } // namespace Core::Memory |
diff --git a/src/core/memory/cheat_engine.h b/src/core/memory/cheat_engine.h index 3d6b2298a..2649423f8 100644 --- a/src/core/memory/cheat_engine.h +++ b/src/core/memory/cheat_engine.h | |||
| @@ -20,7 +20,7 @@ class CoreTiming; | |||
| 20 | struct EventType; | 20 | struct EventType; |
| 21 | } // namespace Core::Timing | 21 | } // namespace Core::Timing |
| 22 | 22 | ||
| 23 | namespace Memory { | 23 | namespace Core::Memory { |
| 24 | 24 | ||
| 25 | class StandardVmCallbacks : public DmntCheatVm::Callbacks { | 25 | class StandardVmCallbacks : public DmntCheatVm::Callbacks { |
| 26 | public: | 26 | public: |
| @@ -84,4 +84,4 @@ private: | |||
| 84 | Core::System& system; | 84 | Core::System& system; |
| 85 | }; | 85 | }; |
| 86 | 86 | ||
| 87 | } // namespace Memory | 87 | } // namespace Core::Memory |
diff --git a/src/core/memory/dmnt_cheat_types.h b/src/core/memory/dmnt_cheat_types.h index bf68fa0fe..5e60733dc 100644 --- a/src/core/memory/dmnt_cheat_types.h +++ b/src/core/memory/dmnt_cheat_types.h | |||
| @@ -26,7 +26,7 @@ | |||
| 26 | 26 | ||
| 27 | #include "common/common_types.h" | 27 | #include "common/common_types.h" |
| 28 | 28 | ||
| 29 | namespace Memory { | 29 | namespace Core::Memory { |
| 30 | 30 | ||
| 31 | struct MemoryRegionExtents { | 31 | struct MemoryRegionExtents { |
| 32 | u64 base{}; | 32 | u64 base{}; |
| @@ -55,4 +55,4 @@ struct CheatEntry { | |||
| 55 | CheatDefinition definition{}; | 55 | CheatDefinition definition{}; |
| 56 | }; | 56 | }; |
| 57 | 57 | ||
| 58 | } // namespace Memory | 58 | } // namespace Core::Memory |
diff --git a/src/core/memory/dmnt_cheat_vm.cpp b/src/core/memory/dmnt_cheat_vm.cpp index 5bb26a36f..fb9f36bfd 100644 --- a/src/core/memory/dmnt_cheat_vm.cpp +++ b/src/core/memory/dmnt_cheat_vm.cpp | |||
| @@ -27,7 +27,7 @@ | |||
| 27 | #include "core/memory/dmnt_cheat_types.h" | 27 | #include "core/memory/dmnt_cheat_types.h" |
| 28 | #include "core/memory/dmnt_cheat_vm.h" | 28 | #include "core/memory/dmnt_cheat_vm.h" |
| 29 | 29 | ||
| 30 | namespace Memory { | 30 | namespace Core::Memory { |
| 31 | 31 | ||
| 32 | DmntCheatVm::DmntCheatVm(std::unique_ptr<Callbacks> callbacks) : callbacks(std::move(callbacks)) {} | 32 | DmntCheatVm::DmntCheatVm(std::unique_ptr<Callbacks> callbacks) : callbacks(std::move(callbacks)) {} |
| 33 | 33 | ||
| @@ -1210,4 +1210,4 @@ void DmntCheatVm::Execute(const CheatProcessMetadata& metadata) { | |||
| 1210 | } | 1210 | } |
| 1211 | } | 1211 | } |
| 1212 | 1212 | ||
| 1213 | } // namespace Memory | 1213 | } // namespace Core::Memory |
diff --git a/src/core/memory/dmnt_cheat_vm.h b/src/core/memory/dmnt_cheat_vm.h index c36212cf1..8351fd798 100644 --- a/src/core/memory/dmnt_cheat_vm.h +++ b/src/core/memory/dmnt_cheat_vm.h | |||
| @@ -30,7 +30,7 @@ | |||
| 30 | #include "common/common_types.h" | 30 | #include "common/common_types.h" |
| 31 | #include "core/memory/dmnt_cheat_types.h" | 31 | #include "core/memory/dmnt_cheat_types.h" |
| 32 | 32 | ||
| 33 | namespace Memory { | 33 | namespace Core::Memory { |
| 34 | 34 | ||
| 35 | enum class CheatVmOpcodeType : u32 { | 35 | enum class CheatVmOpcodeType : u32 { |
| 36 | StoreStatic = 0, | 36 | StoreStatic = 0, |
| @@ -318,4 +318,4 @@ private: | |||
| 318 | MemoryAccessType mem_type, u64 rel_address); | 318 | MemoryAccessType mem_type, u64 rel_address); |
| 319 | }; | 319 | }; |
| 320 | 320 | ||
| 321 | }; // namespace Memory | 321 | }; // namespace Core::Memory |