diff options
| author |  LC | 2020-06-22 14:21:53 -0400 |
|---|---|---|
| committer |  GitHub | 2020-06-22 14:21:53 -0400 |
| commit | 25174afa7922fab55e36acd1a2eb1a55daff7f27 (patch) | |
| tree | 186a3b8bdf440e936577a9d31d8715573772ac7e /src/core | |
| parent | Merge pull request #4110 from ReinUsesLisp/direct-upload-sets (diff) | |
| parent | arm_dynarmic_64: Log the instruction when an exception is raised (diff) | |
| download | yuzu-25174afa7922fab55e36acd1a2eb1a55daff7f27.tar.gz yuzu-25174afa7922fab55e36acd1a2eb1a55daff7f27.tar.xz yuzu-25174afa7922fab55e36acd1a2eb1a55daff7f27.zip | |
Merge pull request #4142 from Morph1984/core-arm-logging
arm_dynarmic: Minor logging changes
Diffstat (limited to 'src/core')
| -rw-r--r-- | src/core/arm/dynarmic/arm_dynarmic_32.cpp | 2 | ||||
| -rw-r--r-- | src/core/arm/dynarmic/arm_dynarmic_64.cpp | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/src/core/arm/dynarmic/arm_dynarmic_32.cpp b/src/core/arm/dynarmic/arm_dynarmic_32.cpp index 19d798dc7..4c8663d03 100644 --- a/src/core/arm/dynarmic/arm_dynarmic_32.cpp +++ b/src/core/arm/dynarmic/arm_dynarmic_32.cpp | |||
| @@ -62,7 +62,7 @@ public: | |||
| 62 | case Dynarmic::A32::Exception::Breakpoint: | 62 | case Dynarmic::A32::Exception::Breakpoint: |
| 63 | break; | 63 | break; |
| 64 | } | 64 | } |
| 65 | LOG_CRITICAL(HW_GPU, "ExceptionRaised(exception = {}, pc = {:08X}, code = {:08X})", | 65 | LOG_CRITICAL(Core_ARM, "ExceptionRaised(exception = {}, pc = {:08X}, code = {:08X})", |
| 66 | static_cast<std::size_t>(exception), pc, MemoryReadCode(pc)); | 66 | static_cast<std::size_t>(exception), pc, MemoryReadCode(pc)); |
| 67 | UNIMPLEMENTED(); | 67 | UNIMPLEMENTED(); |
| 68 | } | 68 | } |
diff --git a/src/core/arm/dynarmic/arm_dynarmic_64.cpp b/src/core/arm/dynarmic/arm_dynarmic_64.cpp index 337b97be9..5f5e36d94 100644 --- a/src/core/arm/dynarmic/arm_dynarmic_64.cpp +++ b/src/core/arm/dynarmic/arm_dynarmic_64.cpp | |||
| @@ -98,8 +98,8 @@ public: | |||
| 98 | } | 98 | } |
| 99 | [[fallthrough]]; | 99 | [[fallthrough]]; |
| 100 | default: | 100 | default: |
| 101 | ASSERT_MSG(false, "ExceptionRaised(exception = {}, pc = {:X})", | 101 | ASSERT_MSG(false, "ExceptionRaised(exception = {}, pc = {:08X}, code = {:08X})", |
| 102 | static_cast<std::size_t>(exception), pc); | 102 | static_cast<std::size_t>(exception), pc, MemoryReadCode(pc)); |
| 103 | } | 103 | } |
| 104 | } | 104 | } |
| 105 | 105 | ||