mirrors/dynarmic
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

EmitX64: EmitTerminalLinkBlock: Fix behaviour when setting T and E flags

Browse source
This commit is contained in:
MerryMage 2016-08-07 22:47:43 +01:00
parent 04c1a0d2de
commit 52fa998e6b
1 changed files with 11 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
src/backend_x64/emit_x64.cpp
View file

@ -1522,15 +1522,6 @@ void EmitX64::EmitTerminalReturnToDispatch(IR::Term::ReturnToDispatch, Arm::Loca
} }
void EmitX64::EmitTerminalLinkBlock(IR::Term::LinkBlock terminal, Arm::LocationDescriptor initial_location) { void EmitX64::EmitTerminalLinkBlock(IR::Term::LinkBlock terminal, Arm::LocationDescriptor initial_location) {
BlockDescriptor* next_bb = GetBasicBlock(terminal.next);
patch_jmp_locations[terminal.next].emplace_back(code->GetWritableCodePtr());
if (next_bb) {
code->J_CC(CC_G, next_bb->code_ptr, true);
} else {
code->NOP(6); // Leave enough space for a jg instruction.
}
code->MOV(32, MJitStateReg(Arm::Reg::PC), Imm32(terminal.next.PC()));
if (terminal.next.TFlag() != initial_location.TFlag()) { if (terminal.next.TFlag() != initial_location.TFlag()) {
if (terminal.next.TFlag()) { if (terminal.next.TFlag()) {
code->OR(32, MJitStateCpsr(), Imm32(1 << 5)); code->OR(32, MJitStateCpsr(), Imm32(1 << 5));
@ -1545,6 +1536,17 @@ void EmitX64::EmitTerminalLinkBlock(IR::Term::LinkBlock terminal, Arm::LocationD
code->AND(32, MJitStateCpsr(), Imm32(~(1 << 9))); code->AND(32, MJitStateCpsr(), Imm32(~(1 << 9)));
} }
} }
code->CMP(64, MDisp(R15, offsetof(JitState, cycles_remaining)), Imm32(0));
BlockDescriptor* next_bb = GetBasicBlock(terminal.next);
patch_jmp_locations[terminal.next].emplace_back(code->GetWritableCodePtr());
if (next_bb) {
code->J_CC(CC_G, next_bb->code_ptr, true);
} else {
code->NOP(6); // Leave enough space for a jg instruction.
}
code->MOV(32, MJitStateReg(Arm::Reg::PC), Imm32(terminal.next.PC()));
code->ReturnFromRunCode(); // TODO: Check cycles, Properly do a link code->ReturnFromRunCode(); // TODO: Check cycles, Properly do a link
} }