diff options
| author | 2020-01-11 13:52:34 +0100 | |
|---|---|---|
| committer | 2020-01-11 14:04:44 +0100 | |
| commit | c76ffa501996ba2597b34ebb3b502a9c8d5dc30a (patch) | |
| tree | 2c34aa7092c81ba93fe9a76e7a64967985142f68 /src/core/hle/kernel/process.cpp | |
| parent | Merge pull request #3279 from ReinUsesLisp/vk-pipeline-cache (diff) | |
| download | yuzu-c76ffa501996ba2597b34ebb3b502a9c8d5dc30a.tar.gz yuzu-c76ffa501996ba2597b34ebb3b502a9c8d5dc30a.tar.xz yuzu-c76ffa501996ba2597b34ebb3b502a9c8d5dc30a.zip | |
core/kernel: Fix GetTotalPhysicalMemoryUsed.
module._memory was already moved over to a new shared_ptr.
So code_memory_size was not increased at all.
This lowers the heap space and so saves a bit of memory, usually between 50 to 100 MB.
This fixes a regression of c0a01f3adc466d07fc27020048e82cca60988970
Diffstat (limited to 'src/core/hle/kernel/process.cpp')
| -rw-r--r-- | src/core/hle/kernel/process.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/core/hle/kernel/process.cpp b/src/core/hle/kernel/process.cpp index 12ea4ebe3..b9035a0be 100644 --- a/src/core/hle/kernel/process.cpp +++ b/src/core/hle/kernel/process.cpp | |||
| @@ -317,6 +317,8 @@ void Process::FreeTLSRegion(VAddr tls_address) { | |||
| 317 | } | 317 | } |
| 318 | 318 | ||
| 319 | void Process::LoadModule(CodeSet module_, VAddr base_addr) { | 319 | void Process::LoadModule(CodeSet module_, VAddr base_addr) { |
| 320 | code_memory_size += module_.memory.size(); | ||
| 321 | |||
| 320 | const auto memory = std::make_shared<PhysicalMemory>(std::move(module_.memory)); | 322 | const auto memory = std::make_shared<PhysicalMemory>(std::move(module_.memory)); |
| 321 | 323 | ||
| 322 | const auto MapSegment = [&](const CodeSet::Segment& segment, VMAPermission permissions, | 324 | const auto MapSegment = [&](const CodeSet::Segment& segment, VMAPermission permissions, |
| @@ -332,8 +334,6 @@ void Process::LoadModule(CodeSet module_, VAddr base_addr) { | |||
| 332 | MapSegment(module_.CodeSegment(), VMAPermission::ReadExecute, MemoryState::Code); | 334 | MapSegment(module_.CodeSegment(), VMAPermission::ReadExecute, MemoryState::Code); |
| 333 | MapSegment(module_.RODataSegment(), VMAPermission::Read, MemoryState::CodeData); | 335 | MapSegment(module_.RODataSegment(), VMAPermission::Read, MemoryState::CodeData); |
| 334 | MapSegment(module_.DataSegment(), VMAPermission::ReadWrite, MemoryState::CodeData); | 336 | MapSegment(module_.DataSegment(), VMAPermission::ReadWrite, MemoryState::CodeData); |
| 335 | |||
| 336 | code_memory_size += module_.memory.size(); | ||
| 337 | } | 337 | } |
| 338 | 338 | ||
| 339 | Process::Process(Core::System& system) | 339 | Process::Process(Core::System& system) |