ShuriZma
/
dolphin
mirror of https://github.com/dolphin-emu/dolphin.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Arm64Emitter: Add shorthand member functions for hint instructions 

Allows for more concise code.
This commit is contained in:
Lioncash 2020-12-30 20:40:46 -05:00
parent 6046a15267
commit cca0dffebd
3 changed files with 15 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
Source/Core/Common/Arm64Emitter.cpp
View File

@ -965,7 +965,7 @@ FixupBranch ARM64XEmitter::CBZ(ARM64Reg Rt)
branch.ptr = m_code; branch.ptr = m_code;
branch.type = FixupBranch::Type::CBZ; branch.type = FixupBranch::Type::CBZ;
branch.reg = Rt; branch.reg = Rt;
HINT(SystemHint::NOP); NOP();
return branch; return branch;
} }
FixupBranch ARM64XEmitter::CBNZ(ARM64Reg Rt) FixupBranch ARM64XEmitter::CBNZ(ARM64Reg Rt)
@ -974,7 +974,7 @@ FixupBranch ARM64XEmitter::CBNZ(ARM64Reg Rt)
branch.ptr = m_code; branch.ptr = m_code;
branch.type = FixupBranch::Type::CBNZ; branch.type = FixupBranch::Type::CBNZ;
branch.reg = Rt; branch.reg = Rt;
HINT(SystemHint::NOP); NOP();
return branch; return branch;
} }
FixupBranch ARM64XEmitter::B(CCFlags cond) FixupBranch ARM64XEmitter::B(CCFlags cond)
@ -983,7 +983,7 @@ FixupBranch ARM64XEmitter::B(CCFlags cond)
branch.ptr = m_code; branch.ptr = m_code;
branch.type = FixupBranch::Type::BConditional; branch.type = FixupBranch::Type::BConditional;
branch.cond = cond; branch.cond = cond;
HINT(SystemHint::NOP); NOP();
return branch; return branch;
} }
FixupBranch ARM64XEmitter::TBZ(ARM64Reg Rt, u8 bit) FixupBranch ARM64XEmitter::TBZ(ARM64Reg Rt, u8 bit)
@ -993,7 +993,7 @@ FixupBranch ARM64XEmitter::TBZ(ARM64Reg Rt, u8 bit)
branch.type = FixupBranch::Type::TBZ; branch.type = FixupBranch::Type::TBZ;
branch.reg = Rt; branch.reg = Rt;
branch.bit = bit; branch.bit = bit;
HINT(SystemHint::NOP); NOP();
return branch; return branch;
} }
FixupBranch ARM64XEmitter::TBNZ(ARM64Reg Rt, u8 bit) FixupBranch ARM64XEmitter::TBNZ(ARM64Reg Rt, u8 bit)
@ -1003,7 +1003,7 @@ FixupBranch ARM64XEmitter::TBNZ(ARM64Reg Rt, u8 bit)
branch.type = FixupBranch::Type::TBNZ; branch.type = FixupBranch::Type::TBNZ;
branch.reg = Rt; branch.reg = Rt;
branch.bit = bit; branch.bit = bit;
HINT(SystemHint::NOP); NOP();
return branch; return branch;
} }
FixupBranch ARM64XEmitter::B() FixupBranch ARM64XEmitter::B()
@ -1011,7 +1011,7 @@ FixupBranch ARM64XEmitter::B()
FixupBranch branch{}; FixupBranch branch{};
branch.ptr = m_code; branch.ptr = m_code;
branch.type = FixupBranch::Type::B; branch.type = FixupBranch::Type::B;
HINT(SystemHint::NOP); NOP();
return branch; return branch;
} }
FixupBranch ARM64XEmitter::BL() FixupBranch ARM64XEmitter::BL()
@ -1019,7 +1019,7 @@ FixupBranch ARM64XEmitter::BL()
FixupBranch branch{}; FixupBranch branch{};
branch.ptr = m_code; branch.ptr = m_code;
branch.type = FixupBranch::Type::BL; branch.type = FixupBranch::Type::BL;
HINT(SystemHint::NOP); NOP();
return branch; return branch;
} }

7
Source/Core/Common/Arm64Emitter.h
View File

@ -603,6 +603,13 @@ public:
void CNTVCT(ARM64Reg Rt); void CNTVCT(ARM64Reg Rt);
void HINT(SystemHint op); void HINT(SystemHint op);
void NOP() { HINT(SystemHint::NOP); }
void SEV() { HINT(SystemHint::SEV); }
void SEVL() { HINT(SystemHint::SEVL); }
void WFE() { HINT(SystemHint::WFE); }
void WFI() { HINT(SystemHint::WFI); }
void YIELD() { HINT(SystemHint::YIELD); }
void CLREX(); void CLREX();
void DSB(BarrierType type); void DSB(BarrierType type);
void DMB(BarrierType type); void DMB(BarrierType type);

2
Source/Core/Core/PowerPC/JitArm64/JitArm64_BackPatch.cpp
View File

@ -322,7 +322,7 @@ bool JitArm64::HandleFastmemFault(uintptr_t access_address, SContext* ctx)
const u32 num_insts_max = fastmem_area_length / 4 - 1; const u32 num_insts_max = fastmem_area_length / 4 - 1;
for (u32 i = 0; i < num_insts_max; ++i) for (u32 i = 0; i < num_insts_max; ++i)
emitter.HINT(SystemHint::NOP); emitter.NOP();
m_fault_to_handler.erase(slow_handler_iter); m_fault_to_handler.erase(slow_handler_iter);