diff options
author | Yuri Kunde Schlesner <yuriks@yuriks.net> | 2016-03-06 07:09:59 +0100 |
---|---|---|
committer | Yuri Kunde Schlesner <yuriks@yuriks.net> | 2016-03-06 07:09:59 +0100 |
commit | 6aa90e13f99ea032754733057f7c13f94fd10aa2 (patch) | |
tree | 33a2235a50da38de52ace3b28ef4ae0a6dd28d97 /src/core/hle | |
parent | Merge pull request #1455 from yuriks/ResultVal-union (diff) | |
download | yuzu-6aa90e13f99ea032754733057f7c13f94fd10aa2.tar yuzu-6aa90e13f99ea032754733057f7c13f94fd10aa2.tar.gz yuzu-6aa90e13f99ea032754733057f7c13f94fd10aa2.tar.bz2 yuzu-6aa90e13f99ea032754733057f7c13f94fd10aa2.tar.lz yuzu-6aa90e13f99ea032754733057f7c13f94fd10aa2.tar.xz yuzu-6aa90e13f99ea032754733057f7c13f94fd10aa2.tar.zst yuzu-6aa90e13f99ea032754733057f7c13f94fd10aa2.zip |
Diffstat (limited to 'src/core/hle')
-rw-r--r-- | src/core/hle/kernel/process.cpp | 6 | ||||
-rw-r--r-- | src/core/hle/kernel/process.h | 1 |
2 files changed, 5 insertions, 2 deletions
diff --git a/src/core/hle/kernel/process.cpp b/src/core/hle/kernel/process.cpp index 16eb972fb..24b266eae 100644 --- a/src/core/hle/kernel/process.cpp +++ b/src/core/hle/kernel/process.cpp @@ -130,9 +130,11 @@ void Process::Run(s32 main_thread_priority, u32 stack_size) { Kernel::SetupMainThread(codeset->entrypoint, main_thread_priority); } +VAddr Process::GetLinearHeapAreaAddress() const { + return kernel_version < 0x22C ? Memory::LINEAR_HEAP_VADDR : Memory::NEW_LINEAR_HEAP_VADDR; +} VAddr Process::GetLinearHeapBase() const { - return (kernel_version < 0x22C ? Memory::LINEAR_HEAP_VADDR : Memory::NEW_LINEAR_HEAP_VADDR) - + memory_region->base; + return GetLinearHeapAreaAddress() + memory_region->base; } VAddr Process::GetLinearHeapLimit() const { diff --git a/src/core/hle/kernel/process.h b/src/core/hle/kernel/process.h index 60e17f251..6d2ca96a2 100644 --- a/src/core/hle/kernel/process.h +++ b/src/core/hle/kernel/process.h @@ -143,6 +143,7 @@ public: /// Bitmask of the used TLS slots std::bitset<300> used_tls_slots; + VAddr GetLinearHeapAreaAddress() const; VAddr GetLinearHeapBase() const; VAddr GetLinearHeapLimit() const; |