piwalker/dolphin
1
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-07-24 14:49:42 -06:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #457 from Tilka/jcc

Browse Source 
x64Emitter: J_CC: use 32 bit offset automatically
This commit is contained in:
Ryan Houdek
2014-06-06 20:53:50 -05:00
parent c118632cde f8280401f6
commit b6db0d0ab8
4 changed files with 13 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -447,27 +447,25 @@ FixupBranch XEmitter::J_CC(CCFlags conditionCode, bool force5bytes)
return branch;
}
void XEmitter::J_CC(CCFlags conditionCode, const u8 * addr, bool force5Bytes)
void XEmitter::J_CC(CCFlags conditionCode, const u8* addr)
{
u64 fn = (u64)addr;
if (!force5Bytes)
s64 distance = (s64)(fn - ((u64)code + 2));
if (distance < -0x80 || distance >= 0x80)
{
s64 distance = (s64)(fn - ((u64)code + 2));
_assert_msg_(DYNA_REC, distance >= -0x80 && distance < 0x80, "Jump target too far away, needs force5Bytes = true");
//8 bits will do
Write8(0x70 + conditionCode);
Write8((u8)(s8)distance);
}
else
{
s64 distance = (s64)(fn - ((u64)code + 6));
distance = (s64)(fn - ((u64)code + 6));
_assert_msg_(DYNA_REC,
distance >= -0x80000000LL && distance < 0x80000000LL,
"Jump target too far away, needs indirect register");
"Jump target too far away, needs indirect register");
Write8(0x0F);
Write8(0x80 + conditionCode);
Write32((u32)(s32)distance);
}
else
{
Write8(0x70 + conditionCode);
Write8((u8)(s8)distance);
}
}
void XEmitter::SetJumpTarget(const FixupBranch &branch)

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

@ -331,7 +331,7 @@ public:
FixupBranch J_CC(CCFlags conditionCode, bool force5bytes = false);
//void J_CC(CCFlags conditionCode, JumpTarget target);
void J_CC(CCFlags conditionCode, const u8 * addr, bool force5Bytes = false);
void J_CC(CCFlags conditionCode, const u8* addr);
void SetJumpTarget(const FixupBranch &branch);