summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorYuri Kunde Schlesner <yuriks@yuriks.net>2015-08-28 05:09:43 +0200
committerYuri Kunde Schlesner <yuriks@yuriks.net>2015-08-28 05:09:43 +0200
commitbac1a6b1405fef5d4432d2d5b9cee33fabb0b0d8 (patch)
treef6d8105250ed5a829cbb9348df761ad57fae3ad0
parentMerge pull request #1075 from yuriks/ControlMem-fixes (diff)
parentKernel: Fix wrong linear heap base on titles using newer kernels (diff)
downloadyuzu-bac1a6b1405fef5d4432d2d5b9cee33fabb0b0d8.tar
yuzu-bac1a6b1405fef5d4432d2d5b9cee33fabb0b0d8.tar.gz
yuzu-bac1a6b1405fef5d4432d2d5b9cee33fabb0b0d8.tar.bz2
yuzu-bac1a6b1405fef5d4432d2d5b9cee33fabb0b0d8.tar.lz
yuzu-bac1a6b1405fef5d4432d2d5b9cee33fabb0b0d8.tar.xz
yuzu-bac1a6b1405fef5d4432d2d5b9cee33fabb0b0d8.tar.zst
yuzu-bac1a6b1405fef5d4432d2d5b9cee33fabb0b0d8.zip
-rw-r--r--src/core/hle/kernel/process.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/core/hle/kernel/process.cpp b/src/core/hle/kernel/process.cpp
index 6279a4bf8..c2b4963d4 100644
--- a/src/core/hle/kernel/process.cpp
+++ b/src/core/hle/kernel/process.cpp
@@ -129,7 +129,7 @@ void Process::Run(s32 main_thread_priority, u32 stack_size) {
}
VAddr Process::GetLinearHeapBase() const {
- return (kernel_version < 0x22C ? Memory::LINEAR_HEAP_VADDR : Memory::NEW_LINEAR_HEAP_SIZE)
+ return (kernel_version < 0x22C ? Memory::LINEAR_HEAP_VADDR : Memory::NEW_LINEAR_HEAP_VADDR)
+ memory_region->base;
}