a64_emit_x64: Perform RSB predictions

This commit is contained in:
MerryMage 2018-01-27 22:44:17 +00:00
parent 98ec9c5f90
commit 52268298a8
2 changed files with 18 additions and 3 deletions

View file

@ -488,8 +488,23 @@ void A64EmitX64::EmitTerminalImpl(IR::Term::LinkBlockFast terminal, IR::Location
}
}
void A64EmitX64::EmitTerminalImpl(IR::Term::PopRSBHint, IR::LocationDescriptor initial_location) {
EmitTerminalImpl(IR::Term::ReturnToDispatch{}, initial_location);
void A64EmitX64::EmitTerminalImpl(IR::Term::PopRSBHint, IR::LocationDescriptor) {
// 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.
code->mov(rcx, qword[r15 + offsetof(A64JitState, pc)]);
code->mov(ebx, dword[r15 + offsetof(A64JitState, fpcr)]);
code->and_(ebx, A64::LocationDescriptor::FPCR_MASK);
code->shl(ebx, 37);
code->or_(rbx, rcx);
code->mov(eax, dword[r15 + offsetof(A64JitState, rsb_ptr)]);
code->sub(eax, 1);
code->and_(eax, u32(A64JitState::RSBPtrMask));
code->mov(dword[r15 + offsetof(A64JitState, rsb_ptr)], eax);
code->cmp(rbx, qword[r15 + offsetof(A64JitState, rsb_location_descriptors) + rax * sizeof(u64)]);
code->jne(code->GetReturnFromRunCodeAddress());
code->mov(rax, qword[r15 + offsetof(A64JitState, rsb_codeptrs) + rax * sizeof(u64)]);
code->jmp(rax);
}
void A64EmitX64::EmitTerminalImpl(IR::Term::If terminal, IR::LocationDescriptor initial_location) {

View file

@ -9,7 +9,7 @@
namespace Dynarmic::A64 {
bool TranslatorVisitor::SVC(Imm<16> imm16) {
// ir.PushRSB(ir.current_location.AdvancePC(4)); // TODO
ir.PushRSB(ir.current_location.AdvancePC(4));
ir.SetPC(ir.Imm64(ir.current_location.PC() + 4));
ir.CallSupervisor(imm16.ZeroExtend());
ir.SetTerm(IR::Term::CheckHalt{IR::Term::PopRSBHint{}});