diff options
Diffstat (limited to 'lib/Target/X86')
| -rw-r--r-- | lib/Target/X86/X86FastISel.cpp | 15 | ||||
| -rw-r--r-- | lib/Target/X86/X86InstrBuilder.h | 4 |
2 files changed, 10 insertions, 9 deletions
diff --git a/lib/Target/X86/X86FastISel.cpp b/lib/Target/X86/X86FastISel.cpp index bf939ab..211afd5 100644 --- a/lib/Target/X86/X86FastISel.cpp +++ b/lib/Target/X86/X86FastISel.cpp @@ -585,10 +585,6 @@ X86FastISel::TargetSelectInstruction(Instruction *I) { unsigned X86FastISel::TargetMaterializeConstant(Constant *C, MachineConstantPool* MCP) { - unsigned CPLoad = getRegForValue(C); - if (CPLoad != 0) - return CPLoad; - // Can't handle PIC-mode yet. if (TM.getRelocationModel() == Reloc::PIC_) return 0; @@ -662,10 +658,17 @@ unsigned X86FastISel::TargetMaterializeConstant(Constant *C, return 0; } + // MachineConstantPool wants an explicit alignment. + unsigned Align = + TM.getTargetData()->getPreferredTypeAlignmentShift(C->getType()); + if (Align == 0) { + // Alignment of vector types. FIXME! + Align = TM.getTargetData()->getABITypeSize(C->getType()); + Align = Log2_64(Align); + } - unsigned MCPOffset = MCP->getConstantPoolIndex(C, 0); + unsigned MCPOffset = MCP->getConstantPoolIndex(C, Align); addConstantPoolReference(BuildMI(MBB, TII.get(Opc), ResultReg), MCPOffset); - UpdateValueMap(C, ResultReg); return ResultReg; } diff --git a/lib/Target/X86/X86InstrBuilder.h b/lib/Target/X86/X86InstrBuilder.h index d4e10bb..b5924cb 100644 --- a/lib/Target/X86/X86InstrBuilder.h +++ b/lib/Target/X86/X86InstrBuilder.h @@ -119,9 +119,7 @@ addFrameReference(const MachineInstrBuilder &MIB, int FI, int Offset = 0) { /// offset to be added as well. /// inline const MachineInstrBuilder & -addConstantPoolReference(const MachineInstrBuilder &MIB, unsigned CPI, - int Offset = 0) { - assert(Offset == 0 && "Non-zero offsets not supported!"); +addConstantPoolReference(const MachineInstrBuilder &MIB, unsigned CPI) { return MIB.addReg(0).addImm(1).addReg(0).addConstantPoolIndex(CPI); } |