franklinblanco
/
yuzu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Core: Invert guest memory depandancy

This commit is contained in:
Fernando Sahmkow 2024-01-07 07:56:51 +01:00 committed by Liam
parent 648ed55fe6
commit 4b963ca8a5
2 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/core/guest_memory.h
View File

@ -9,8 +9,8 @@
#include <span> #include <span>
#include <vector> #include <vector>
#include "common/assert.h"
#include "common/scratch_buffer.h" #include "common/scratch_buffer.h"
#include "core/memory.h"
namespace Core::Memory { namespace Core::Memory {
@ -211,9 +211,4 @@ public:
}; };
} // namespace } // namespace
template <typename T, GuestMemoryFlags FLAGS>
using CpuGuestMemory = GuestMemory<Core::Memory::Memory, T, FLAGS>;
template <typename T, GuestMemoryFlags FLAGS>
using CpuGuestMemoryScoped = GuestMemoryScoped<Core::Memory::Memory, T, FLAGS>;
} // namespace Core::Memory } // namespace Core::Memory

6
src/core/memory.h
View File

@ -12,6 +12,7 @@
#include "common/scratch_buffer.h" #include "common/scratch_buffer.h"
#include "common/typed_address.h" #include "common/typed_address.h"
#include "core/guest_memory.h"
#include "core/hle/result.h" #include "core/hle/result.h"
namespace Common { namespace Common {
@ -498,4 +499,9 @@ private:
std::unique_ptr<Impl> impl; std::unique_ptr<Impl> impl;
}; };
template <typename T, GuestMemoryFlags FLAGS>
using CpuGuestMemory = GuestMemory<Core::Memory::Memory, T, FLAGS>;
template <typename T, GuestMemoryFlags FLAGS>
using CpuGuestMemoryScoped = GuestMemoryScoped<Core::Memory::Memory, T, FLAGS>;
} // namespace Core::Memory } // namespace Core::Memory