summaryrefslogtreecommitdiff
path: root/src/core/hle/kernel/svc.cpp
diff options
context:
space:
mode:
authorGravatar liamwhite2022-10-19 16:27:43 -0400
committerGravatar GitHub2022-10-19 16:27:43 -0400
commit560bca57a203c45acb1c589699b472223e8b68fd (patch)
tree98ef4a0d62a368614075463d13c4220b11af9760 /src/core/hle/kernel/svc.cpp
parentMerge pull request #9084 from vonchenplus/dma_copy (diff)
parentcore: hle: kernel: Migrate ProcessState to enum class. (diff)
downloadyuzu-560bca57a203c45acb1c589699b472223e8b68fd.tar.gz
yuzu-560bca57a203c45acb1c589699b472223e8b68fd.tar.xz
yuzu-560bca57a203c45acb1c589699b472223e8b68fd.zip
Merge pull request #9071 from bunnei/mp-mm
Kernel Multiprocess (Part 1) - Persist memory & core timing
Diffstat (limited to 'src/core/hle/kernel/svc.cpp')
-rw-r--r--src/core/hle/kernel/svc.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/core/hle/kernel/svc.cpp b/src/core/hle/kernel/svc.cpp
index 1d145ea91..b07ae3f02 100644
--- a/src/core/hle/kernel/svc.cpp
+++ b/src/core/hle/kernel/svc.cpp
@@ -933,7 +933,7 @@ static Result GetInfo(Core::System& system, u64* result, u64 info_id, Handle han
933 return ResultSuccess; 933 return ResultSuccess;
934 934
935 case GetInfoType::UserExceptionContextAddr: 935 case GetInfoType::UserExceptionContextAddr:
936 *result = process->GetTLSRegionAddress(); 936 *result = process->GetProcessLocalRegionAddress();
937 return ResultSuccess; 937 return ResultSuccess;
938 938
939 case GetInfoType::TotalPhysicalMemoryAvailableWithoutSystemResource: 939 case GetInfoType::TotalPhysicalMemoryAvailableWithoutSystemResource:
@@ -1888,7 +1888,7 @@ static void ExitProcess(Core::System& system) {
1888 auto* current_process = system.Kernel().CurrentProcess(); 1888 auto* current_process = system.Kernel().CurrentProcess();
1889 1889
1890 LOG_INFO(Kernel_SVC, "Process {} exiting", current_process->GetProcessID()); 1890 LOG_INFO(Kernel_SVC, "Process {} exiting", current_process->GetProcessID());
1891 ASSERT_MSG(current_process->GetStatus() == ProcessStatus::Running, 1891 ASSERT_MSG(current_process->GetState() == KProcess::State::Running,
1892 "Process has already exited"); 1892 "Process has already exited");
1893 1893
1894 system.Exit(); 1894 system.Exit();
@@ -2557,7 +2557,7 @@ static Result GetProcessInfo(Core::System& system, u64* out, Handle process_hand
2557 return ResultInvalidEnumValue; 2557 return ResultInvalidEnumValue;
2558 } 2558 }
2559 2559
2560 *out = static_cast<u64>(process->GetStatus()); 2560 *out = static_cast<u64>(process->GetState());
2561 return ResultSuccess; 2561 return ResultSuccess;
2562} 2562}
2563 2563