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 #2486 from Tilka/x86_32 

Jit64: drop more x86_32 left-overs
This commit is contained in:
Ryan Houdek 2015-05-31 13:06:19 -04:00
parent 4eef805270 a6004f8274
commit 210d7c4d54
2 changed files with 0 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -245,15 +245,10 @@ inline OpArg Imm8 (u8 imm) {return OpArg(imm, SCALE_IMM8);}
inline OpArg Imm16(u16 imm) {return OpArg(imm, SCALE_IMM16);} //rarely used inline OpArg Imm16(u16 imm) {return OpArg(imm, SCALE_IMM16);} //rarely used
inline OpArg Imm32(u32 imm) {return OpArg(imm, SCALE_IMM32);} inline OpArg Imm32(u32 imm) {return OpArg(imm, SCALE_IMM32);}
inline OpArg Imm64(u64 imm) {return OpArg(imm, SCALE_IMM64);} inline OpArg Imm64(u64 imm) {return OpArg(imm, SCALE_IMM64);}
#ifdef _ARCH_64
inline OpArg ImmPtr(const void* imm) {return Imm64((u64)imm);} inline OpArg ImmPtr(const void* imm) {return Imm64((u64)imm);}
#else
inline OpArg ImmPtr(const void* imm) {return Imm32((u32)imm);}
#endif
inline u32 PtrOffset(const void* ptr, const void* base) inline u32 PtrOffset(const void* ptr, const void* base)
{ {
#ifdef _ARCH_64
s64 distance = (s64)ptr-(s64)base; s64 distance = (s64)ptr-(s64)base;
if (distance >= 0x80000000LL || if (distance >= 0x80000000LL ||
distance < -0x80000000LL) distance < -0x80000000LL)
@ -263,9 +258,6 @@ inline u32 PtrOffset(const void* ptr, const void* base)
} }
return (u32)distance; return (u32)distance;
#else
return (u32)ptr-(u32)base;
#endif
} }
//usage: int a[]; ARRAY_OFFSET(a,10) //usage: int a[]; ARRAY_OFFSET(a,10)

4
Source/Core/Core/PowerPC/JitCommon/Jit_Util.cpp
View File

@ -166,11 +166,7 @@ private:
void LoadAddrMaskToReg(int sbits, const void* ptr, u32 mask) void LoadAddrMaskToReg(int sbits, const void* ptr, u32 mask)
{ {
#ifdef _ARCH_64
m_code->MOV(64, R(RSCRATCH), ImmPtr(ptr)); m_code->MOV(64, R(RSCRATCH), ImmPtr(ptr));
#else
m_code->MOV(32, R(RSCRATCH), ImmPtr(ptr));
#endif
// If we do not need to mask, we can do the sign extend while loading // If we do not need to mask, we can do the sign extend while loading
// from memory. If masking is required, we have to first zero extend, // from memory. If masking is required, we have to first zero extend,
// then mask, then sign extend if needed (1 instr vs. 2/3). // then mask, then sign extend if needed (1 instr vs. 2/3).