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

Merge pull request #6776 from lioncash/type 

x64Emitter: Use an enum class to represent FixupBranch branch types
This commit is contained in:
Anthony 2018-05-06 19:09:54 -07:00 committed by GitHub
parent d131e4d2bc 82b1518342
commit fcc5095d8c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
Source/Core/Common/x64Emitter.cpp
View File

@ -473,7 +473,7 @@ void XEmitter::CALL(const void* fnptr)
FixupBranch XEmitter::CALL() FixupBranch XEmitter::CALL()
{ {
FixupBranch branch; FixupBranch branch;
branch.type = 1; branch.type = FixupBranch::Type::Branch32Bit;
branch.ptr = code + 5; branch.ptr = code + 5;
Write8(0xE8); Write8(0xE8);
Write32(0); Write32(0);
@ -483,7 +483,7 @@ FixupBranch XEmitter::CALL()
FixupBranch XEmitter::J(bool force5bytes) FixupBranch XEmitter::J(bool force5bytes)
{ {
FixupBranch branch; FixupBranch branch;
branch.type = force5bytes ? 1 : 0; branch.type = force5bytes ? FixupBranch::Type::Branch32Bit : FixupBranch::Type::Branch8Bit;
branch.ptr = code + (force5bytes ? 5 : 2); branch.ptr = code + (force5bytes ? 5 : 2);
if (!force5bytes) if (!force5bytes)
{ {
@ -502,7 +502,7 @@ FixupBranch XEmitter::J(bool force5bytes)
FixupBranch XEmitter::J_CC(CCFlags conditionCode, bool force5bytes) FixupBranch XEmitter::J_CC(CCFlags conditionCode, bool force5bytes)
{ {
FixupBranch branch; FixupBranch branch;
branch.type = force5bytes ? 1 : 0; branch.type = force5bytes ? FixupBranch::Type::Branch32Bit : FixupBranch::Type::Branch8Bit;
branch.ptr = code + (force5bytes ? 6 : 2); branch.ptr = code + (force5bytes ? 6 : 2);
if (!force5bytes) if (!force5bytes)
{ {
@ -541,14 +541,14 @@ void XEmitter::J_CC(CCFlags conditionCode, const u8* addr)
void XEmitter::SetJumpTarget(const FixupBranch& branch) void XEmitter::SetJumpTarget(const FixupBranch& branch)
{ {
if (branch.type == 0) if (branch.type == FixupBranch::Type::Branch8Bit)
{ {
s64 distance = (s64)(code - branch.ptr); s64 distance = (s64)(code - branch.ptr);
ASSERT_MSG(DYNA_REC, distance >= -0x80 && distance < 0x80, ASSERT_MSG(DYNA_REC, distance >= -0x80 && distance < 0x80,
"Jump target too far away, needs force5Bytes = true"); "Jump target too far away, needs force5Bytes = true");
branch.ptr[-1] = (u8)(s8)distance; branch.ptr[-1] = (u8)(s8)distance;
} }
else if (branch.type == 1) else if (branch.type == FixupBranch::Type::Branch32Bit)
{ {
s64 distance = (s64)(code - branch.ptr); s64 distance = (s64)(code - branch.ptr);
ASSERT_MSG(DYNA_REC, distance >= -0x80000000LL && distance < 0x80000000LL, ASSERT_MSG(DYNA_REC, distance >= -0x80000000LL && distance < 0x80000000LL,

8
Source/Core/Common/x64Emitter.h
View File

@ -322,8 +322,14 @@ inline u32 PtrOffset(const void* ptr, const void* base = nullptr)
struct FixupBranch struct FixupBranch
{ {
enum class Type
{
Branch8Bit,
Branch32Bit
};
u8* ptr; u8* ptr;
int type; // 0 = 8bit 1 = 32bit Type type;
}; };
class XEmitter class XEmitter