octo
/
citra
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Address code style comments

This commit is contained in:
Weiyi Wang 2018-12-05 20:24:37 -05:00
parent e87dc17da2
commit ac1cda21c3
2 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/core/core.h
View File

@ -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::KernelSystem> kernel;
std::unique_ptr<Timing> timing;
/// Memory system
std::unique_ptr<Memory::MemorySystem> memory;

7
src/core/hle/service/ldr_ro/cro_helper.cpp
View File

@ -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) {