suyu/dynarmic
26
1
Fork 1
Code Issues Pull requests Projects Releases Packages Wiki Activity

EmitX64: Switch MXCSR when switching to interpreter

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

18
src/backend_x64/block_of_code.cpp
View file

@ -40,11 +40,11 @@ size_t BlockOfCode::RunCode(JitState* jit_state, CodePtr basic_block, size_t cyc
return cycles_to_run - jit_state->cycles_remaining; // Return number of cycles actually run. return cycles_to_run - jit_state->cycles_remaining; // Return number of cycles actually run.
} }
void BlockOfCode::ReturnFromRunCode() { void BlockOfCode::ReturnFromRunCode(bool MXCSR_switch) {
STMXCSR(MDisp(R15, offsetof(JitState, guest_MXCSR))); if (MXCSR_switch)
LDMXCSR(MDisp(R15, offsetof(JitState, save_host_MXCSR))); SwitchMxcsrOnExit();
MOV(64, R(RSP), MDisp(R15, offsetof(JitState, save_host_RSP)));
MOV(64, R(RSP), MDisp(R15, offsetof(JitState, save_host_RSP)));
ABI_PopRegistersAndAdjustStack(ABI_ALL_CALLEE_SAVED, 8); ABI_PopRegistersAndAdjustStack(ABI_ALL_CALLEE_SAVED, 8);
RET(); RET();
} }
@ -78,10 +78,18 @@ void BlockOfCode::GenRunCode() {
MOV(64, R(R15), R(ABI_PARAM1)); MOV(64, R(R15), R(ABI_PARAM1));
MOV(64, MDisp(R15, offsetof(JitState, save_host_RSP)), R(RSP)); MOV(64, MDisp(R15, offsetof(JitState, save_host_RSP)), R(RSP));
SwitchMxcsrOnEntry();
JMPptr(R(ABI_PARAM2));
}
void BlockOfCode::SwitchMxcsrOnEntry() {
STMXCSR(MDisp(R15, offsetof(JitState, save_host_MXCSR))); STMXCSR(MDisp(R15, offsetof(JitState, save_host_MXCSR)));
LDMXCSR(MDisp(R15, offsetof(JitState, guest_MXCSR))); LDMXCSR(MDisp(R15, offsetof(JitState, guest_MXCSR)));
}
JMPptr(R(ABI_PARAM2)); void BlockOfCode::SwitchMxcsrOnExit() {
STMXCSR(MDisp(R15, offsetof(JitState, guest_MXCSR)));
LDMXCSR(MDisp(R15, offsetof(JitState, save_host_MXCSR)));
} }
} // namespace BackendX64 } // namespace BackendX64

5
src/backend_x64/block_of_code.h
View file

@ -20,7 +20,10 @@ public:
void ClearCache(bool poison_memory); void ClearCache(bool poison_memory);
size_t RunCode(JitState* jit_state, CodePtr basic_block, size_t cycles_to_run) const; size_t RunCode(JitState* jit_state, CodePtr basic_block, size_t cycles_to_run) const;
void ReturnFromRunCode(); void ReturnFromRunCode(bool MXCSR_switch = true);
void SwitchMxcsrOnEntry();
void SwitchMxcsrOnExit();
Gen::OpArg MFloatNegativeZero32() const { Gen::OpArg MFloatNegativeZero32() const {
return Gen::M(const_FloatNegativeZero32); return Gen::M(const_FloatNegativeZero32);

9
src/backend_x64/emit_x64.cpp
View file

@ -308,11 +308,9 @@ void EmitX64::EmitCallSupervisor(IR::Block&, IR::Inst* inst) {
reg_alloc.HostCall(nullptr, imm32); reg_alloc.HostCall(nullptr, imm32);
code->STMXCSR(MDisp(R15, offsetof(JitState, guest_MXCSR))); code->SwitchMxcsrOnExit();
code->LDMXCSR(MDisp(R15, offsetof(JitState, save_host_MXCSR)));
code->ABI_CallFunction(reinterpret_cast<void*>(cb.CallSVC)); code->ABI_CallFunction(reinterpret_cast<void*>(cb.CallSVC));
code->STMXCSR(MDisp(R15, offsetof(JitState, save_host_MXCSR))); code->SwitchMxcsrOnEntry();
code->LDMXCSR(MDisp(R15, offsetof(JitState, guest_MXCSR)));
} }
void EmitX64::EmitGetCarryFromOp(IR::Block&, IR::Inst*) { void EmitX64::EmitGetCarryFromOp(IR::Block&, IR::Inst*) {
@ -1514,8 +1512,9 @@ void EmitX64::EmitTerminalInterpret(IR::Term::Interpret terminal, Arm::LocationD
code->MOV(64, R(ABI_PARAM2), Imm64(reinterpret_cast<u64>(jit_interface))); code->MOV(64, R(ABI_PARAM2), Imm64(reinterpret_cast<u64>(jit_interface)));
code->MOV(32, MJitStateReg(Arm::Reg::PC), R(ABI_PARAM1)); code->MOV(32, MJitStateReg(Arm::Reg::PC), R(ABI_PARAM1));
code->MOV(64, R(RSP), MDisp(R15, offsetof(JitState, save_host_RSP))); code->MOV(64, R(RSP), MDisp(R15, offsetof(JitState, save_host_RSP)));
code->SwitchMxcsrOnExit();
code->ABI_CallFunction(reinterpret_cast<void*>(cb.InterpreterFallback)); code->ABI_CallFunction(reinterpret_cast<void*>(cb.InterpreterFallback));
code->ReturnFromRunCode(); // TODO: Check cycles code->ReturnFromRunCode(false); // TODO: Check cycles
} }
void EmitX64::EmitTerminalReturnToDispatch(IR::Term::ReturnToDispatch, Arm::LocationDescriptor initial_location) { void EmitX64::EmitTerminalReturnToDispatch(IR::Term::ReturnToDispatch, Arm::LocationDescriptor initial_location) {