OpenPunk/citra
1
0
Fork 0
mirror of https://github.com/citra-emu/citra.git synced 2024-11-25 09:50:15 +00:00
Code Issues Projects Releases Wiki Activity

fixup! RunJittedCode: Remove C-style casts

Browse Source
This commit is contained in:
MerryMage 2016-04-06 20:32:28 +01:00
parent 420d3afdf8
commit 71d1031b4c
1 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/core/arm/jit_x64/interface.cpp
View File

@ -20,14 +20,15 @@ namespace Gen {
struct RunJittedCode final : private Gen::XCodeBlock { struct RunJittedCode final : private Gen::XCodeBlock {
private: private:
const u8* run_jit; using RunJitFuncType = void(*)(JitX64::JitState*, void*);
const u8* return_from_run_jit; RunJitFuncType run_jit;
u64 return_from_run_jit;
public: public:
RunJittedCode() { RunJittedCode() {
AllocCodeSpace(1024); AllocCodeSpace(1024);
run_jit = this->GetCodePtr(); run_jit = RunJitFuncType(this->GetCodePtr());
// This serves two purposes: // This serves two purposes:
// 1. It saves all the registers we as a callee need to save. // 1. It saves all the registers we as a callee need to save.
@ -39,7 +40,7 @@ public:
MOV(64, R(R15), R(ABI_PARAM1)); MOV(64, R(R15), R(ABI_PARAM1));
JMPptr(R(ABI_PARAM2)); JMPptr(R(ABI_PARAM2));
return_from_run_jit = this->GetCodePtr(); return_from_run_jit = reinterpret_cast<u64>(this->GetCodePtr());
MOV(64, R(RSP), MDisp(R15, offsetof(JitX64::JitState, save_host_RSP))); MOV(64, R(RSP), MDisp(R15, offsetof(JitX64::JitState, save_host_RSP)));
ABI_PopRegistersAndAdjustStack(ABI_ALL_CALLEE_SAVED, 8); ABI_PopRegistersAndAdjustStack(ABI_ALL_CALLEE_SAVED, 8);
@ -56,10 +57,9 @@ public:
cpu->TFlag = (cpu->Cpsr >> 5) & 1; cpu->TFlag = (cpu->Cpsr >> 5) & 1;
jit_state->cycles_remaining = cycles_to_run; jit_state->cycles_remaining = cycles_to_run;
jit_state->return_RIP = (u64)CallCodeReturnAddress(); jit_state->return_RIP = CallCodeReturnAddress();
auto fn = (void(*)(u64, void*))run_jit; run_jit(jit_state, bb);
fn((u64)jit_state, bb);
new_pc = cpu->Reg[15]; new_pc = cpu->Reg[15];
@ -73,7 +73,7 @@ public:
return cycles_to_run - jit_state->cycles_remaining; return cycles_to_run - jit_state->cycles_remaining;
} }
const u8* CallCodeReturnAddress() { u64 CallCodeReturnAddress() const {
return return_from_run_jit; return return_from_run_jit;
} }
}; };
@ -174,7 +174,7 @@ void ARM_Jit::ExecuteInstructions(int num_instructions) {
else else
state->cpu_state.Reg[15] &= 0xfffffffc; state->cpu_state.Reg[15] &= 0xfffffffc;
u8 *ptr = impl->compiler.GetBB(state->cpu_state.Reg[15], state->cpu_state.TFlag, EFlag); u8* ptr = impl->compiler.GetBB(state->cpu_state.Reg[15], state->cpu_state.TFlag, EFlag);
unsigned ticks_executed = impl->run_jit.CallCode(state.get(), ptr, num_instructions, state->cpu_state.Reg[15]); unsigned ticks_executed = impl->run_jit.CallCode(state.get(), ptr, num_instructions, state->cpu_state.Reg[15]);
num_instructions -= ticks_executed; num_instructions -= ticks_executed;