diff --git a/src/core/core.h b/src/core/core.h index be9a303f9..81d0dfffd 100644 --- a/src/core/core.h +++ b/src/core/core.h @@ -278,6 +278,7 @@ public: // HACK: this is temporary exposed for tests, // due to WIP kernel refactor causing desync state in memory std::unique_ptr kernel; std::unique_ptr timing; + /// Memory system std::unique_ptr memory; diff --git a/src/core/hle/service/ldr_ro/cro_helper.cpp b/src/core/hle/service/ldr_ro/cro_helper.cpp index 5981a3b66..755614662 100644 --- a/src/core/hle/service/ldr_ro/cro_helper.cpp +++ b/src/core/hle/service/ldr_ro/cro_helper.cpp @@ -1420,9 +1420,10 @@ void CROHelper::Register(VAddr crs_address, bool auto_link) { void CROHelper::Unregister(VAddr crs_address) { CROHelper crs(crs_address, process, memory); - CROHelper next_head(crs.NextModule(), process, memory), - previous_head(crs.PreviousModule(), process, memory); - CROHelper next(NextModule(), process, memory), previous(PreviousModule(), process, memory); + CROHelper next_head(crs.NextModule(), process, memory); + CROHelper previous_head(crs.PreviousModule(), process, memory); + CROHelper next(NextModule(), process, memory); + CROHelper previous(PreviousModule(), process, memory); if (module_address == next_head.module_address || module_address == previous_head.module_address) {