Azahar-Mirror/dynarmic
1
0
Fork 0
mirror of https://github.com/azahar-emu/dynarmic synced 2025-11-12 18:09:58 +01:00
Code Issues Packages Projects Releases Wiki Activity

A64/PopRSBHint: Prevent RETing to a guest PC of ~0ull from crashing the jit

Browse Source
This commit is contained in:
MerryMage 2018-07-16 18:24:29 +01:00
parent 4525209bab
commit 58f3399032
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/backend_x64/a64_emit_x64.cpp
View File

@ -1005,7 +1005,8 @@ void A64EmitX64::EmitTerminalImpl(IR::Term::LinkBlockFast terminal, IR::Location
void A64EmitX64::EmitTerminalImpl(IR::Term::PopRSBHint, IR::LocationDescriptor) { void A64EmitX64::EmitTerminalImpl(IR::Term::PopRSBHint, IR::LocationDescriptor) {
// This calculation has to match up with A64::LocationDescriptor::UniqueHash // This calculation has to match up with A64::LocationDescriptor::UniqueHash
// TODO: Optimization is available here based on known state of FPSCR_mode and CPSR_et. // TODO: Optimization is available here based on known state of FPSCR_mode and CPSR_et.
code.mov(rcx, qword[r15 + offsetof(A64JitState, pc)]); code.mov(rcx, A64::LocationDescriptor::PC_MASK);
code.and_(rcx, qword[r15 + offsetof(A64JitState, pc)]);
code.mov(ebx, dword[r15 + offsetof(A64JitState, fpcr)]); code.mov(ebx, dword[r15 + offsetof(A64JitState, fpcr)]);
code.and_(ebx, A64::LocationDescriptor::FPCR_MASK); code.and_(ebx, A64::LocationDescriptor::FPCR_MASK);
code.shl(ebx, 37); code.shl(ebx, 37);