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

EmitX64: Renamed patch_jmp_locations to patch_jg_locations

Browse source
This commit is contained in:
MerryMage 2016-08-08 15:56:07 +01:00
parent 52fa998e6b
commit abd113f160
2 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/backend_x64/emit_x64.cpp
View file

@ -1540,7 +1540,7 @@ void EmitX64::EmitTerminalLinkBlock(IR::Term::LinkBlock terminal, Arm::LocationD
code->CMP(64, MDisp(R15, offsetof(JitState, cycles_remaining)), Imm32(0)); code->CMP(64, MDisp(R15, offsetof(JitState, cycles_remaining)), Imm32(0));
BlockDescriptor* next_bb = GetBasicBlock(terminal.next); BlockDescriptor* next_bb = GetBasicBlock(terminal.next);
patch_jmp_locations[terminal.next].emplace_back(code->GetWritableCodePtr()); patch_jg_locations[terminal.next].emplace_back(code->GetWritableCodePtr());
if (next_bb) { if (next_bb) {
code->J_CC(CC_G, next_bb->code_ptr, true); code->J_CC(CC_G, next_bb->code_ptr, true);
} else { } else {
@ -1569,7 +1569,7 @@ void EmitX64::EmitTerminalIf(IR::Term::If terminal, Arm::LocationDescriptor init
void EmitX64::Patch(Arm::LocationDescriptor desc, CodePtr bb) { void EmitX64::Patch(Arm::LocationDescriptor desc, CodePtr bb) {
u8* const save_code_ptr = code->GetWritableCodePtr(); u8* const save_code_ptr = code->GetWritableCodePtr();
for (CodePtr location : patch_jmp_locations[desc]) { for (CodePtr location : patch_jg_locations[desc]) {
code->SetCodePtr(const_cast<u8*>(location)); code->SetCodePtr(const_cast<u8*>(location));
code->J_CC(CC_G, bb, true); code->J_CC(CC_G, bb, true);
ASSERT(code->GetCodePtr() - location == 6); ASSERT(code->GetCodePtr() - location == 6);
@ -1580,7 +1580,7 @@ void EmitX64::Patch(Arm::LocationDescriptor desc, CodePtr bb) {
void EmitX64::ClearCache() { void EmitX64::ClearCache() {
basic_blocks.clear(); basic_blocks.clear();
patch_jmp_locations.clear(); patch_jg_locations.clear();
} }
} // namespace BackendX64 } // namespace BackendX64

2
src/backend_x64/emit_x64.h
View file

@ -67,7 +67,7 @@ private:
UserCallbacks cb; UserCallbacks cb;
Jit* jit_interface; Jit* jit_interface;
std::unordered_map<Arm::LocationDescriptor, BlockDescriptor, Arm::LocationDescriptorHash> basic_blocks; std::unordered_map<Arm::LocationDescriptor, BlockDescriptor, Arm::LocationDescriptorHash> basic_blocks;
std::unordered_map<Arm::LocationDescriptor, std::vector<CodePtr>, Arm::LocationDescriptorHash> patch_jmp_locations; std::unordered_map<Arm::LocationDescriptor, std::vector<CodePtr>, Arm::LocationDescriptorHash> patch_jg_locations;
}; };
} // namespace BackendX64 } // namespace BackendX64