Citra-emu/dynarmic-android
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

emit_a64: Do not clear fast_dispatch_table unnecessarily

Browse Source 
port 4305c74 - emit_x64: Do not clear fast_dispatch_table unnecessarily
This commit is contained in:
SachinVin 2020-04-18 14:28:21 +05:30
parent 231feee518
commit 470be4f7dc
3 changed files with 21 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/backend/A64/a32_emit_a64.cpp
View File

@ -164,12 +164,11 @@ void A32EmitA64::ClearCache() {
void A32EmitA64::InvalidateCacheRanges(const boost::icl::interval_set<u32>& ranges) {
InvalidateBasicBlocks(block_ranges.InvalidateRanges(ranges));
ClearFastDispatchTable();
}
void A32EmitA64::ClearFastDispatchTable() {
if (config.enable_fast_dispatch) {
fast_dispatch_table.fill({0xFFFFFFFFFFFFFFFFull, nullptr});
fast_dispatch_table.fill({});
}
}
@ -327,6 +326,14 @@ void A32EmitA64::GenTerminalHandlers() {
code.STR(INDEX_UNSIGNED, code.ABI_RETURN, fast_dispatch_entry_reg, offsetof(FastDispatchEntry, code_ptr));
code.BR(code.ABI_RETURN);
PerfMapRegister(terminal_handler_fast_dispatch_hint, code.GetCodePtr(), "a32_terminal_handler_fast_dispatch_hint");
code.AlignCode16();
fast_dispatch_table_lookup = reinterpret_cast<FastDispatchEntry& (*)(u64)>(code.GetWritableCodePtr());
code.MOVI2R(code.ABI_PARAM2, reinterpret_cast<u64>(fast_dispatch_table.data()));
code.CRC32CW(DecodeReg(code.ABI_PARAM1), DecodeReg(code.ABI_PARAM1), DecodeReg(code.ABI_PARAM2));
code.ANDI2R(DecodeReg(code.ABI_PARAM1), DecodeReg(code.ABI_PARAM1), fast_dispatch_table_mask);
code.ADD(code.ABI_RETURN, code.ABI_PARAM1, code.ABI_PARAM2);
code.RET();
}
}
@ -1551,4 +1558,11 @@ void A32EmitA64::EmitPatchMovX0(CodePtr target_code_ptr) {
code.EnsurePatchLocationSize(patch_location, 16);
}
void A32EmitA64::Unpatch(const IR::LocationDescriptor& location) {
EmitA64::Unpatch(location);
if (config.enable_fast_dispatch) {
(*fast_dispatch_table_lookup)(location.Value()) = {};
}
}
} // namespace Dynarmic::BackendA64

6
src/backend/A64/a32_emit_a64.h
View File

@ -61,8 +61,8 @@ protected:
ExceptionHandler exception_handler;
struct FastDispatchEntry {
u64 location_descriptor;
const void* code_ptr;
u64 location_descriptor = 0xFFFF'FFFF'FFFF'FFFFull;
const void* code_ptr = nullptr;
};
static_assert(sizeof(FastDispatchEntry) == 0x10);
static constexpr u64 fast_dispatch_table_mask = 0xFFFF0;
@ -92,6 +92,7 @@ protected:
const void* terminal_handler_pop_rsb_hint;
const void* terminal_handler_fast_dispatch_hint = nullptr;
FastDispatchEntry& (*fast_dispatch_table_lookup)(u64) = nullptr;
void GenTerminalHandlers();
// Microinstruction emitters
@ -125,6 +126,7 @@ protected:
void EmitTerminalImpl(IR::Term::CheckHalt terminal, IR::LocationDescriptor initial_location) override;
// Patching
void Unpatch(const IR::LocationDescriptor& target_desc) override;
void EmitPatchJg(const IR::LocationDescriptor& target_desc, CodePtr target_code_ptr = nullptr) override;
void EmitPatchJmp(const IR::LocationDescriptor& target_desc, CodePtr target_code_ptr = nullptr) override;
void EmitPatchMovX0(CodePtr target_code_ptr = nullptr) override;

2
src/backend/A64/emit_a64.h
View File

@ -111,7 +111,7 @@ protected:
std::vector<CodePtr> mov_x0;
};
void Patch(const IR::LocationDescriptor& target_desc, CodePtr target_code_ptr);
void Unpatch(const IR::LocationDescriptor& target_desc);
virtual void Unpatch(const IR::LocationDescriptor& target_desc);
virtual void EmitPatchJg(const IR::LocationDescriptor& target_desc, CodePtr target_code_ptr = nullptr) = 0;
virtual void EmitPatchJmp(const IR::LocationDescriptor& target_desc, CodePtr target_code_ptr = nullptr) = 0;
virtual void EmitPatchMovX0(CodePtr target_code_ptr = nullptr) = 0;