diff options
| author | 2020-05-02 02:51:50 -0400 | |
|---|---|---|
| committer | 2020-05-02 02:51:50 -0400 | |
| commit | 5ddcc1b2f582b10ac52ba9d329bfb4e49360c738 (patch) | |
| tree | fcfa54f0c46919bbe940fa6ce8f9a0bfc304cef8 /src/core/hle/kernel/svc.cpp | |
| parent | Merge pull request #3732 from lioncash/header (diff) | |
| parent | kernel: Don't fail silently (diff) | |
| download | yuzu-5ddcc1b2f582b10ac52ba9d329bfb4e49360c738.tar.gz yuzu-5ddcc1b2f582b10ac52ba9d329bfb4e49360c738.tar.xz yuzu-5ddcc1b2f582b10ac52ba9d329bfb4e49360c738.zip | |
Merge pull request #3819 from ogniK5377/err-log2
kernel: Don't fail silently
Diffstat (limited to 'src/core/hle/kernel/svc.cpp')
| -rw-r--r-- | src/core/hle/kernel/svc.cpp | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/src/core/hle/kernel/svc.cpp b/src/core/hle/kernel/svc.cpp index 41ef2caf6..4ae4529f5 100644 --- a/src/core/hle/kernel/svc.cpp +++ b/src/core/hle/kernel/svc.cpp | |||
| @@ -685,6 +685,8 @@ static ResultCode GetInfo(Core::System& system, u64* result, u64 info_id, u64 ha | |||
| 685 | case GetInfoType::TotalPhysicalMemoryAvailableWithoutSystemResource: | 685 | case GetInfoType::TotalPhysicalMemoryAvailableWithoutSystemResource: |
| 686 | case GetInfoType::TotalPhysicalMemoryUsedWithoutSystemResource: { | 686 | case GetInfoType::TotalPhysicalMemoryUsedWithoutSystemResource: { |
| 687 | if (info_sub_id != 0) { | 687 | if (info_sub_id != 0) { |
| 688 | LOG_ERROR(Kernel_SVC, "Info sub id is non zero! info_id={}, info_sub_id={}", info_id, | ||
| 689 | info_sub_id); | ||
| 688 | return ERR_INVALID_ENUM_VALUE; | 690 | return ERR_INVALID_ENUM_VALUE; |
| 689 | } | 691 | } |
| 690 | 692 | ||
| @@ -692,6 +694,8 @@ static ResultCode GetInfo(Core::System& system, u64* result, u64 info_id, u64 ha | |||
| 692 | system.Kernel().CurrentProcess()->GetHandleTable(); | 694 | system.Kernel().CurrentProcess()->GetHandleTable(); |
| 693 | const auto process = current_process_handle_table.Get<Process>(static_cast<Handle>(handle)); | 695 | const auto process = current_process_handle_table.Get<Process>(static_cast<Handle>(handle)); |
| 694 | if (!process) { | 696 | if (!process) { |
| 697 | LOG_ERROR(Kernel_SVC, "Process is not valid! info_id={}, info_sub_id={}, handle={:08X}", | ||
| 698 | info_id, info_sub_id, handle); | ||
| 695 | return ERR_INVALID_HANDLE; | 699 | return ERR_INVALID_HANDLE; |
| 696 | } | 700 | } |
| 697 | 701 | ||
| @@ -783,10 +787,13 @@ static ResultCode GetInfo(Core::System& system, u64* result, u64 info_id, u64 ha | |||
| 783 | 787 | ||
| 784 | case GetInfoType::RegisterResourceLimit: { | 788 | case GetInfoType::RegisterResourceLimit: { |
| 785 | if (handle != 0) { | 789 | if (handle != 0) { |
| 790 | LOG_ERROR(Kernel, "Handle is non zero! handle={:08X}", handle); | ||
| 786 | return ERR_INVALID_HANDLE; | 791 | return ERR_INVALID_HANDLE; |
| 787 | } | 792 | } |
| 788 | 793 | ||
| 789 | if (info_sub_id != 0) { | 794 | if (info_sub_id != 0) { |
| 795 | LOG_ERROR(Kernel, "Info sub id is non zero! info_id={}, info_sub_id={}", info_id, | ||
| 796 | info_sub_id); | ||
| 790 | return ERR_INVALID_COMBINATION; | 797 | return ERR_INVALID_COMBINATION; |
| 791 | } | 798 | } |
| 792 | 799 | ||