For some reason x86 was compiling ArmEmitter

This commit is contained in:
Sacha 2014-08-20 22:44:16 +10:00
parent 0fe929e491
commit d08f65bf03
2 changed files with 2 additions and 4 deletions

View file

@ -279,8 +279,6 @@ elseif(X86)
set(CommonExtra ${CommonExtra}
Common/ABI.cpp
Common/ABI.h
Common/ArmEmitter.h
Common/ArmEmitter.cpp
Common/CPUDetect.cpp
Common/CPUDetect.h
Common/Thunk.cpp

View file

@ -471,10 +471,10 @@ void ARMXEmitter::FlushLitPool()
// Write the constant to Literal Pool
if (!pool.loc)
{
pool.loc = (s32)code;
pool.loc = (intptr_t)code;
Write32(pool.val);
}
s32 offset = pool.loc - (s32)pool.ldr_address - 8;
s32 offset = (s32)(pool.loc - (intptr_t)pool.ldr_address - 8);
// Backpatch the LDR
*(u32*)pool.ldr_address |= (offset >= 0) << 23 | abs(offset);