octo/yuzu-android
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #5864 from MerryMage/is-thumb

Browse Source 
arm_dynarmic_32: Print out CPSR.T on exception
This commit is contained in:
LC
2021-02-01 13:36:55 -05:00
committed by GitHub
parent f317b0d354 821fc4a7b6
commit 5e49b81d4d
2 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/core/arm/dynarmic/arm_dynarmic_32.cpp
View File

@@ -71,8 +71,9 @@ public:
} }
void ExceptionRaised(u32 pc, Dynarmic::A32::Exception exception) override { void ExceptionRaised(u32 pc, Dynarmic::A32::Exception exception) override {
LOG_CRITICAL(Core_ARM, "ExceptionRaised(exception = {}, pc = {:08X}, code = {:08X})", LOG_CRITICAL(Core_ARM,
exception, pc, MemoryReadCode(pc)); "ExceptionRaised(exception = {}, pc = {:08X}, code = {:08X}, thumb = {})",
exception, pc, MemoryReadCode(pc), parent.IsInThumbMode());
UNIMPLEMENTED(); UNIMPLEMENTED();
} }

4
src/core/arm/dynarmic/arm_dynarmic_32.h
View File

@@ -50,6 +50,10 @@ public:
u64 GetTPIDR_EL0() const override; u64 GetTPIDR_EL0() const override;
void ChangeProcessorID(std::size_t new_core_id) override; void ChangeProcessorID(std::size_t new_core_id) override;
bool IsInThumbMode() const {
return (GetPSTATE() & 0x20) != 0;
}
void SaveContext(ThreadContext32& ctx) override; void SaveContext(ThreadContext32& ctx) override;
void SaveContext(ThreadContext64& ctx) override {} void SaveContext(ThreadContext64& ctx) override {}
void LoadContext(const ThreadContext32& ctx) override; void LoadContext(const ThreadContext32& ctx) override;