6502/llvm-6502
1
0
Fork 0
mirror of https://github.com/c64scene-ar/llvm-6502.git synced 2025-01-28 06:32:09 +00:00
Code Issues Projects Releases Wiki Activity

Fix constant pool loads, and remove broken versions of addConstantPoolReference.

Browse Source 
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@55868 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
Owen Anderson 2008-09-06 01:11:01 +00:00
parent 99d6dca2f8
commit 3b217c6f5c
5 changed files with 10 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
lib/Target/CellSPU/SPUInstrBuilder.h
View File

@ -38,18 +38,6 @@ addFrameReference(const MachineInstrBuilder &MIB, int FI, int Offset = 0,
return MIB.addFrameIndex(FI).addImm(Offset); return MIB.addFrameIndex(FI).addImm(Offset);
} }
/// addConstantPoolReference - This function is used to add a reference to the
/// base of a constant value spilled to the per-function constant pool. The
/// reference has base register ConstantPoolIndex offset which is retained until
/// either machine code emission or assembly output. This allows an optional
/// offset to be added as well.
///
inline const MachineInstrBuilder&
addConstantPoolReference(const MachineInstrBuilder &MIB, unsigned CPI,
int Offset = 0) {
return MIB.addImm(Offset).addConstantPoolIndex(CPI);
}
} // End llvm namespace } // End llvm namespace
#endif #endif

12
lib/Target/IA64/IA64InstrBuilder.h
View File

@ -34,18 +34,6 @@ addFrameReference(const MachineInstrBuilder &MIB, int FI, int Offset = 0,
return MIB.addFrameIndex(FI).addImm(Offset); return MIB.addFrameIndex(FI).addImm(Offset);
} }
/// addConstantPoolReference - This function is used to add a reference to the
/// base of a constant value spilled to the per-function constant pool. The
/// reference has base register ConstantPoolIndex offset which is retained until
/// either machine code emission or assembly output. This allows an optional
/// offset to be added as well.
///
inline const MachineInstrBuilder&
addConstantPoolReference(const MachineInstrBuilder &MIB, unsigned CPI,
int Offset = 0) {
return MIB.addImm(Offset).addConstantPoolIndex(CPI);
}
} // End llvm namespace } // End llvm namespace
#endif #endif

12
lib/Target/PowerPC/PPCInstrBuilder.h
View File

@ -38,18 +38,6 @@ addFrameReference(const MachineInstrBuilder &MIB, int FI, int Offset = 0,
return MIB.addFrameIndex(FI).addImm(Offset); return MIB.addFrameIndex(FI).addImm(Offset);
} }
/// addConstantPoolReference - This function is used to add a reference to the
/// base of a constant value spilled to the per-function constant pool. The
/// reference has base register ConstantPoolIndex offset which is retained until
/// either machine code emission or assembly output. This allows an optional
/// offset to be added as well.
///
inline const MachineInstrBuilder&
addConstantPoolReference(const MachineInstrBuilder &MIB, unsigned CPI,
int Offset = 0) {
return MIB.addImm(Offset).addConstantPoolIndex(CPI);
}
} // End llvm namespace } // End llvm namespace
#endif #endif

15
lib/Target/X86/X86FastISel.cpp
View File

@ -585,10 +585,6 @@ X86FastISel::TargetSelectInstruction(Instruction *I) {
unsigned X86FastISel::TargetMaterializeConstant(Constant *C, unsigned X86FastISel::TargetMaterializeConstant(Constant *C,
MachineConstantPool* MCP) { MachineConstantPool* MCP) {
unsigned CPLoad = getRegForValue(C);
if (CPLoad != 0)
return CPLoad;
// Can't handle PIC-mode yet. // Can't handle PIC-mode yet.
if (TM.getRelocationModel() == Reloc::PIC_) if (TM.getRelocationModel() == Reloc::PIC_)
return 0; return 0;
@ -662,10 +658,17 @@ unsigned X86FastISel::TargetMaterializeConstant(Constant *C,
return 0; 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); addConstantPoolReference(BuildMI(MBB, TII.get(Opc), ResultReg), MCPOffset);
UpdateValueMap(C, ResultReg);
return ResultReg; return ResultReg;
} }

4
lib/Target/X86/X86InstrBuilder.h
View File

@ -119,9 +119,7 @@ addFrameReference(const MachineInstrBuilder &MIB, int FI, int Offset = 0) {
/// offset to be added as well. /// offset to be added as well.
/// ///
inline const MachineInstrBuilder & inline const MachineInstrBuilder &
addConstantPoolReference(const MachineInstrBuilder &MIB, unsigned CPI, addConstantPoolReference(const MachineInstrBuilder &MIB, unsigned CPI) {
int Offset = 0) {
assert(Offset == 0 && "Non-zero offsets not supported!");
return MIB.addReg(0).addImm(1).addReg(0).addConstantPoolIndex(CPI); return MIB.addReg(0).addImm(1).addReg(0).addConstantPoolIndex(CPI);
} }