diff options
| author | Evan Cheng <evan.cheng@apple.com> | 2009-03-12 18:15:39 +0000 |
|---|---|---|
| committer | Evan Cheng <evan.cheng@apple.com> | 2009-03-12 18:15:39 +0000 |
| commit | 2a332aa8665e924993ba0f8fb8b2d0b62f08d606 (patch) | |
| tree | 05e2db11ac2e9e8b8d7624469e6414289b772442 /llvm/lib/Target/X86/X86CodeEmitter.cpp | |
| parent | 85ba59eade4ef710f5da9f5a42e601d699e82f78 (diff) | |
| download | bcm5719-llvm-2a332aa8665e924993ba0f8fb8b2d0b62f08d606.tar.gz bcm5719-llvm-2a332aa8665e924993ba0f8fb8b2d0b62f08d606.zip | |
Re-apply 66024 with fixes: 1. Fixed indirect call to immediate address assembly. 2. Fixed JIT encoding by making the address pc-relative.
llvm-svn: 66803
Diffstat (limited to 'llvm/lib/Target/X86/X86CodeEmitter.cpp')
| -rw-r--r-- | llvm/lib/Target/X86/X86CodeEmitter.cpp | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/llvm/lib/Target/X86/X86CodeEmitter.cpp b/llvm/lib/Target/X86/X86CodeEmitter.cpp index dbcb52a4816..bbe063b4f82 100644 --- a/llvm/lib/Target/X86/X86CodeEmitter.cpp +++ b/llvm/lib/Target/X86/X86CodeEmitter.cpp @@ -589,7 +589,13 @@ void Emitter::emitInstruction(const MachineInstr &MI, } else if (MO.isSymbol()) { emitExternalSymbolAddress(MO.getSymbolName(), X86::reloc_pcrel_word); } else if (MO.isImm()) { - emitConstant(MO.getImm(), X86InstrInfo::sizeOfImm(Desc)); + if (Opcode == X86::CALLpcrel32 || Opcode == X86::CALL64pcrel32) { + // Fix up immediate operand for pc relative calls. + intptr_t Imm = (intptr_t)MO.getImm(); + Imm = Imm - MCE.getCurrentPCValue() - 4; + emitConstant(Imm, X86InstrInfo::sizeOfImm(Desc)); + } else + emitConstant(MO.getImm(), X86InstrInfo::sizeOfImm(Desc)); } else { assert(0 && "Unknown RawFrm operand!"); } |
