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

a32_emit_x64: Specify callback as template argument

Browse source 
Removes unnecessary switch statement.
This commit is contained in:
MerryMage 2020-06-16 10:20:37 +01:00
parent 58b2c83944
commit 34ef5142e3
2 changed files with 14 additions and 44 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

54
src/backend/x64/a32_emit_x64.cpp
View file

@ -944,28 +944,13 @@ static void EmitWriteMemoryMov(BlockOfCode& code, const Xbyak::RegExp& addr, con
} }
} }
template<std::size_t bitsize> template<std::size_t bitsize, auto callback>
void A32EmitX64::ReadMemory(A32EmitContext& ctx, IR::Inst* inst) { void A32EmitX64::ReadMemory(A32EmitContext& ctx, IR::Inst* inst) {
auto args = ctx.reg_alloc.GetArgumentInfo(inst); auto args = ctx.reg_alloc.GetArgumentInfo(inst);
if (!config.page_table) { if (!config.page_table) {
ctx.reg_alloc.HostCall(inst, {}, args[0]); ctx.reg_alloc.HostCall(inst, {}, args[0]);
switch (bitsize) { Devirtualize<callback>(config.callbacks).EmitCall(code);
case 8:
Devirtualize<&A32::UserCallbacks::MemoryRead8>(config.callbacks).EmitCall(code);
break;
case 16:
Devirtualize<&A32::UserCallbacks::MemoryRead16>(config.callbacks).EmitCall(code);
break;
case 32:
Devirtualize<&A32::UserCallbacks::MemoryRead32>(config.callbacks).EmitCall(code);
break;
case 64:
Devirtualize<&A32::UserCallbacks::MemoryRead64>(config.callbacks).EmitCall(code);
break;
default:
UNREACHABLE();
}
return; return;
} }
@ -1003,28 +988,13 @@ void A32EmitX64::ReadMemory(A32EmitContext& ctx, IR::Inst* inst) {
ctx.reg_alloc.DefineValue(inst, value); ctx.reg_alloc.DefineValue(inst, value);
} }
template<std::size_t bitsize> template<std::size_t bitsize, auto callback>
void A32EmitX64::WriteMemory(A32EmitContext& ctx, IR::Inst* inst) { void A32EmitX64::WriteMemory(A32EmitContext& ctx, IR::Inst* inst) {
auto args = ctx.reg_alloc.GetArgumentInfo(inst); auto args = ctx.reg_alloc.GetArgumentInfo(inst);
if (!config.page_table) { if (!config.page_table) {
ctx.reg_alloc.HostCall(nullptr, {}, args[0], args[1]); ctx.reg_alloc.HostCall(nullptr, {}, args[0], args[1]);
switch (bitsize) { Devirtualize<callback>(config.callbacks).EmitCall(code);
case 8:
Devirtualize<&A32::UserCallbacks::MemoryWrite8>(config.callbacks).EmitCall(code);
break;
case 16:
Devirtualize<&A32::UserCallbacks::MemoryWrite16>(config.callbacks).EmitCall(code);
break;
case 32:
Devirtualize<&A32::UserCallbacks::MemoryWrite32>(config.callbacks).EmitCall(code);
break;
case 64:
Devirtualize<&A32::UserCallbacks::MemoryWrite64>(config.callbacks).EmitCall(code);
break;
default:
UNREACHABLE();
}
return; return;
} }
@ -1060,35 +1030,35 @@ void A32EmitX64::WriteMemory(A32EmitContext& ctx, IR::Inst* inst) {
} }
void A32EmitX64::EmitA32ReadMemory8(A32EmitContext& ctx, IR::Inst* inst) { void A32EmitX64::EmitA32ReadMemory8(A32EmitContext& ctx, IR::Inst* inst) {
ReadMemory<8>(ctx, inst); ReadMemory<8, &A32::UserCallbacks::MemoryRead8>(ctx, inst);
} }
void A32EmitX64::EmitA32ReadMemory16(A32EmitContext& ctx, IR::Inst* inst) { void A32EmitX64::EmitA32ReadMemory16(A32EmitContext& ctx, IR::Inst* inst) {
ReadMemory<16>(ctx, inst); ReadMemory<16, &A32::UserCallbacks::MemoryRead16>(ctx, inst);
} }
void A32EmitX64::EmitA32ReadMemory32(A32EmitContext& ctx, IR::Inst* inst) { void A32EmitX64::EmitA32ReadMemory32(A32EmitContext& ctx, IR::Inst* inst) {
ReadMemory<32>(ctx, inst); ReadMemory<32, &A32::UserCallbacks::MemoryRead32>(ctx, inst);
} }
void A32EmitX64::EmitA32ReadMemory64(A32EmitContext& ctx, IR::Inst* inst) { void A32EmitX64::EmitA32ReadMemory64(A32EmitContext& ctx, IR::Inst* inst) {
ReadMemory<64>(ctx, inst); ReadMemory<64, &A32::UserCallbacks::MemoryRead64>(ctx, inst);
} }
void A32EmitX64::EmitA32WriteMemory8(A32EmitContext& ctx, IR::Inst* inst) { void A32EmitX64::EmitA32WriteMemory8(A32EmitContext& ctx, IR::Inst* inst) {
WriteMemory<8>(ctx, inst); WriteMemory<8, &A32::UserCallbacks::MemoryWrite8>(ctx, inst);
} }
void A32EmitX64::EmitA32WriteMemory16(A32EmitContext& ctx, IR::Inst* inst) { void A32EmitX64::EmitA32WriteMemory16(A32EmitContext& ctx, IR::Inst* inst) {
WriteMemory<16>(ctx, inst); WriteMemory<16, &A32::UserCallbacks::MemoryWrite16>(ctx, inst);
} }
void A32EmitX64::EmitA32WriteMemory32(A32EmitContext& ctx, IR::Inst* inst) { void A32EmitX64::EmitA32WriteMemory32(A32EmitContext& ctx, IR::Inst* inst) {
WriteMemory<32>(ctx, inst); WriteMemory<32, &A32::UserCallbacks::MemoryWrite32>(ctx, inst);
} }
void A32EmitX64::EmitA32WriteMemory64(A32EmitContext& ctx, IR::Inst* inst) { void A32EmitX64::EmitA32WriteMemory64(A32EmitContext& ctx, IR::Inst* inst) {
WriteMemory<64>(ctx, inst); WriteMemory<64, &A32::UserCallbacks::MemoryWrite64>(ctx, inst);
} }
template <typename T, void (A32::UserCallbacks::*fn)(A32::VAddr, T)> template <typename T, void (A32::UserCallbacks::*fn)(A32::VAddr, T)>

4
src/backend/x64/a32_emit_x64.h
View file

@ -98,9 +98,9 @@ protected:
FakeCall FastmemCallback(u64 rip); FakeCall FastmemCallback(u64 rip);
// Memory access helpers // Memory access helpers
template<std::size_t bitsize> template<std::size_t bitsize, auto callback>
void ReadMemory(A32EmitContext& ctx, IR::Inst* inst); void ReadMemory(A32EmitContext& ctx, IR::Inst* inst);
template<std::size_t bitsize> template<std::size_t bitsize, auto callback>
void WriteMemory(A32EmitContext& ctx, IR::Inst* inst); void WriteMemory(A32EmitContext& ctx, IR::Inst* inst);
// Terminal instruction emitters // Terminal instruction emitters