The-Homebrew-Cloud/dolphin
2
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-02-13 15:59:23 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #11125 from Lobsterzelda/master

Browse Source 
Added MemoryInterface variables to savestates
This commit is contained in:
Admiral H. Curtiss 2022-10-07 21:41:40 +02:00 committed by GitHub
commit 6e3d140283
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 22 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
Source/Core/Core/HW/HW.cpp
View File

@ -19,6 +19,7 @@
#include "Core/HW/GPFifo.h"
#include "Core/HW/HSP/HSP.h"
#include "Core/HW/Memmap.h"
#include "Core/HW/MemoryInterface.h"
#include "Core/HW/ProcessorInterface.h"
#include "Core/HW/SI/SI.h"
#include "Core/HW/SystemTimers.h"
@ -45,6 +46,7 @@ void Init(const Sram* override_sram)
HSP::Init();
Memory::Init(); // Needs to be initialized before AddressSpace
AddressSpace::Init();
MemoryInterface::Init();
DSP::Init(Config::Get(Config::MAIN_DSP_HLE));
DVDInterface::Init();
GPFifo::Init();
@ -68,6 +70,7 @@ void Shutdown()
CPU::Shutdown();
DVDInterface::Shutdown();
DSP::Shutdown();
MemoryInterface::Shutdown();
AddressSpace::Shutdown();
Memory::Shutdown();
HSP::Shutdown();
@ -83,6 +86,8 @@ void DoState(PointerWrap& p)
{
Memory::DoState(p);
p.DoMarker("Memory");
MemoryInterface::DoState(p);
p.DoMarker("MemoryInterface");
VideoInterface::DoState(p);
p.DoMarker("VideoInterface");
SerialInterface::DoState(p);

13
Source/Core/Core/HW/MemoryInterface.cpp
View File

@ -4,6 +4,8 @@
#include "Core/HW/MemoryInterface.h"
#include <array>
#include <cstring>
#include <type_traits>
#include "Common/BitField.h"
#include "Common/ChunkFile.h"
@ -135,6 +137,17 @@ struct MIMemStruct
// STATE_TO_SAVE
static MIMemStruct g_mi_mem;
void Init()
{
static_assert(std::is_trivially_copyable_v<MIMemStruct>);
std::memset(&g_mi_mem, 0, sizeof(MIMemStruct));
}
void Shutdown()
{
Init();
}
void DoState(PointerWrap& p)
{
p.Do(g_mi_mem);

4
Source/Core/Core/HW/MemoryInterface.h
View File

@ -13,7 +13,9 @@ class PointerWrap;
namespace MemoryInterface
{
void DoState(PointerWrap& p);
void Init();
void Shutdown();
void DoState(PointerWrap& p);
void RegisterMMIO(MMIO::Mapping* mmio, u32 base);
} // namespace MemoryInterface

2
Source/Core/Core/State.cpp
View File

@ -94,7 +94,7 @@ static size_t s_state_writes_in_queue;
static std::condition_variable s_state_write_queue_is_empty;
// Don't forget to increase this after doing changes on the savestate system
constexpr u32 STATE_VERSION = 150; // Last changed in PR 11124
constexpr u32 STATE_VERSION = 151; // Last changed in PR 11125
// Maps savestate versions to Dolphin versions.
// Versions after 42 don't need to be added to this list,