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

A64: Implement branch

Browse source
This commit is contained in:
MerryMage 2018-01-07 13:42:11 +00:00
parent 0641445e51
commit 86d1095df7
5 changed files with 49 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
src/CMakeLists.txt
View file

@ -58,6 +58,7 @@ add_library(dynarmic
frontend/A64/ir_emitter.h frontend/A64/ir_emitter.h
frontend/A64/location_descriptor.cpp frontend/A64/location_descriptor.cpp
frontend/A64/location_descriptor.h frontend/A64/location_descriptor.h
frontend/A64/translate/impl/branch.cpp
frontend/A64/translate/impl/data_processing_addsub.cpp frontend/A64/translate/impl/data_processing_addsub.cpp
frontend/A64/translate/impl/data_processing_logical.cpp frontend/A64/translate/impl/data_processing_logical.cpp
frontend/A64/translate/impl/data_processing_pcrel.cpp frontend/A64/translate/impl/data_processing_pcrel.cpp

4
src/backend_x64/a64_emit_x64.cpp
View file

@ -266,7 +266,7 @@ void A64EmitX64::EmitPatchJg(const IR::LocationDescriptor& target_desc, CodePtr
code->mov(qword[r15 + offsetof(A64JitState, pc)], A64::LocationDescriptor{target_desc}.PC()); code->mov(qword[r15 + offsetof(A64JitState, pc)], A64::LocationDescriptor{target_desc}.PC());
code->jg(code->GetReturnFromRunCodeAddress()); code->jg(code->GetReturnFromRunCodeAddress());
} }
code->EnsurePatchLocationSize(patch_location, 14); code->EnsurePatchLocationSize(patch_location, 17);
} }
void A64EmitX64::EmitPatchJmp(const IR::LocationDescriptor& target_desc, CodePtr target_code_ptr) { void A64EmitX64::EmitPatchJmp(const IR::LocationDescriptor& target_desc, CodePtr target_code_ptr) {
@ -277,7 +277,7 @@ void A64EmitX64::EmitPatchJmp(const IR::LocationDescriptor& target_desc, CodePtr
code->mov(qword[r15 + offsetof(A64JitState, pc)], A64::LocationDescriptor{target_desc}.PC()); code->mov(qword[r15 + offsetof(A64JitState, pc)], A64::LocationDescriptor{target_desc}.PC());
code->jmp(code->GetReturnFromRunCodeAddress()); code->jmp(code->GetReturnFromRunCodeAddress());
} }
code->EnsurePatchLocationSize(patch_location, 13); code->EnsurePatchLocationSize(patch_location, 16);
} }
void A64EmitX64::EmitPatchMovRcx(CodePtr target_code_ptr) { void A64EmitX64::EmitPatchMovRcx(CodePtr target_code_ptr) {

6
src/frontend/A64/decoder/a64.h
View file

@ -59,7 +59,7 @@ std::vector<Matcher<V>> GetDecodeTable() {
//INST(&V::EXTR, "EXTR", "z00100111N0mmmmmssssssnnnnnddddd"), //INST(&V::EXTR, "EXTR", "z00100111N0mmmmmssssssnnnnnddddd"),
// Conditional branch // Conditional branch
//INST(&V::B_cond, "B.cond", "01010100iiiiiiiiiiiiiiiiiii0cccc"), INST(&V::B_cond, "B.cond", "01010100iiiiiiiiiiiiiiiiiii0cccc"),
// Exception generation // Exception generation
//INST(&V::SVC, "SVC", "11010100000iiiiiiiiiiiiiiii00001"), //INST(&V::SVC, "SVC", "11010100000iiiiiiiiiiiiiiii00001"),
@ -113,8 +113,8 @@ std::vector<Matcher<V>> GetDecodeTable() {
//INST(&V::DRPS, "DRPS", "11010110101111110000001111100000"), //INST(&V::DRPS, "DRPS", "11010110101111110000001111100000"),
// Unconditonal branch (immediate) // Unconditonal branch (immediate)
//INST(&V::B_uncond, "B", "000101iiiiiiiiiiiiiiiiiiiiiiiiii"), INST(&V::B_uncond, "B", "000101iiiiiiiiiiiiiiiiiiiiiiiiii"),
//INST(&V::BL, "BL", "100101iiiiiiiiiiiiiiiiiiiiiiiiii"), INST(&V::BL, "BL", "100101iiiiiiiiiiiiiiiiiiiiiiiiii"),
// Compare and branch (immediate) // Compare and branch (immediate)
//INST(&V::CBZ, "CBZ", "z0110100iiiiiiiiiiiiiiiiiiittttt"), //INST(&V::CBZ, "CBZ", "z0110100iiiiiiiiiiiiiiiiiiittttt"),

2
src/frontend/A64/location_descriptor.h
View file

@ -44,7 +44,7 @@ public:
return !operator==(o); return !operator==(o);
} }
LocationDescriptor SetPC(u32 new_pc) const { LocationDescriptor SetPC(u64 new_pc) const {
return LocationDescriptor(new_pc, fpcr); return LocationDescriptor(new_pc, fpcr);
} }

42
src/frontend/A64/translate/impl/branch.cpp Normal file
View file

@ -0,0 +1,42 @@
/* This file is part of the dynarmic project.
* Copyright (c) 2018 MerryMage
* This software may be used and distributed according to the terms of the GNU
* General Public License version 2 or any later version.
*/
#include "frontend/A64/translate/impl/impl.h"
namespace Dynarmic {
namespace A64 {
bool TranslatorVisitor::B_cond(Imm<19> imm19, Cond cond) {
s64 offset = concatenate(imm19, Imm<2>{0}).SignExtend<s64>();
u64 target = ir.PC() + offset;
auto cond_pass = IR::Term::LinkBlock{ir.current_location.SetPC(target)};
auto cond_fail = IR::Term::LinkBlock{ir.current_location.AdvancePC(4)};
ir.SetTerm(IR::Term::If{cond, cond_pass, cond_fail});
return false;
}
bool TranslatorVisitor::B_uncond(Imm<26> imm26) {
s64 offset = concatenate(imm26, Imm<2>{0}).SignExtend<s64>();
u64 target = ir.PC() + offset;
ir.SetTerm(IR::Term::LinkBlock{ir.current_location.SetPC(target)});
return false;
}
bool TranslatorVisitor::BL(Imm<26> imm26) {
s64 offset = concatenate(imm26, Imm<2>{0}).SignExtend<s64>();
X(64, Reg::R30, ir.Imm64(ir.PC() + 4));
ir.PushRSB(ir.current_location.AdvancePC(4));
u64 target = ir.PC() + offset;
ir.SetTerm(IR::Term::LinkBlock{ir.current_location.SetPC(target)});
return false;
}
} // namespace A64
} // namespace Dynarmic