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

rename fields of constant pool entries

Browse Source 
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@26076 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
Chris Lattner
2006-02-09 04:22:52 +00:00
parent 69a9563969
commit fa77d43ba1
4 changed files with 12 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
lib/CodeGen/AsmPrinter.cpp
View File

@ -106,16 +106,16 @@ void AsmPrinter::SetupMachineFunction(MachineFunction &MF) {
/// the code generator. /// the code generator.
/// ///
void AsmPrinter::EmitConstantPool(MachineConstantPool *MCP) { void AsmPrinter::EmitConstantPool(MachineConstantPool *MCP) {
const std::vector<std::pair<Constant*, unsigned> > &CP = MCP->getConstants(); const std::vector<MachineConstantPoolEntry> &CP = MCP->getConstants();
if (CP.empty()) return; if (CP.empty()) return;
const TargetData &TD = TM.getTargetData(); const TargetData &TD = TM.getTargetData();
SwitchSection(ConstantPoolSection, 0); SwitchSection(ConstantPoolSection, 0);
for (unsigned i = 0, e = CP.size(); i != e; ++i) { for (unsigned i = 0, e = CP.size(); i != e; ++i) {
EmitAlignment(CP[i].second); EmitAlignment(CP[i].Alignment);
O << PrivateGlobalPrefix << "CPI" << getFunctionNumber() << '_' << i O << PrivateGlobalPrefix << "CPI" << getFunctionNumber() << '_' << i
<< ":\t\t\t\t\t" << CommentString << *CP[i].first << '\n'; << ":\t\t\t\t\t" << CommentString << *CP[i].Val << '\n';
EmitGlobalConstant(CP[i].first); EmitGlobalConstant(CP[i].Val);
} }
} }

4
lib/CodeGen/MachineFunction.cpp
View File

@ -347,8 +347,8 @@ void MachineFrameInfo::dump(const MachineFunction &MF) const {
void MachineConstantPool::print(std::ostream &OS) const { void MachineConstantPool::print(std::ostream &OS) const {
for (unsigned i = 0, e = Constants.size(); i != e; ++i) { for (unsigned i = 0, e = Constants.size(); i != e; ++i) {
OS << " <cp #" << i << "> is" << *(Value*)Constants[i].first; OS << " <cp #" << i << "> is" << *(Value*)Constants[i].Val;
if (Constants[i].second != 0) OS << " , align=" << Constants[i].second; OS << " , align=" << Constants[i].Alignment;
OS << "\n"; OS << "\n";
} }
} }

10
lib/ExecutionEngine/JIT/JITEmitter.cpp
View File

@ -566,18 +566,16 @@ void JITEmitter::finishFunction(MachineFunction &F) {
} }
void JITEmitter::emitConstantPool(MachineConstantPool *MCP) { void JITEmitter::emitConstantPool(MachineConstantPool *MCP) {
const std::vector<std::pair<Constant*,unsigned> > &Constants = MCP->getConstants(); const std::vector<MachineConstantPoolEntry> &Constants = MCP->getConstants();
if (Constants.empty()) return; if (Constants.empty()) return;
for (unsigned i = 0, e = Constants.size(); i != e; ++i) { for (unsigned i = 0, e = Constants.size(); i != e; ++i) {
const Type *Ty = Constants[i].first->getType(); const Type *Ty = Constants[i].Val->getType();
unsigned Size = (unsigned)TheJIT->getTargetData().getTypeSize(Ty); unsigned Size = (unsigned)TheJIT->getTargetData().getTypeSize(Ty);
unsigned Alignment = (Constants[i].second == 0) unsigned Alignment = Constants[i].Alignment;
? TheJIT->getTargetData().getTypeAlignment(Ty)
: Constants[i].second;
void *Addr = MemMgr.allocateConstant(Size, Alignment); void *Addr = MemMgr.allocateConstant(Size, Alignment);
TheJIT->InitializeMemory(Constants[i].first, Addr); TheJIT->InitializeMemory(Constants[i].Val, Addr);
ConstantPoolAddresses.push_back(Addr); ConstantPoolAddresses.push_back(Addr);
} }
} }

4
lib/Target/SparcV9/SparcV9AsmPrinter.cpp
View File

@ -724,12 +724,12 @@ void SparcV9AsmPrinter::emitFunction(const Function &F) {
// Emit constant pool for this function // Emit constant pool for this function
const MachineConstantPool *MCP = MF.getConstantPool(); const MachineConstantPool *MCP = MF.getConstantPool();
const std::vector<std::pair<Constant*, unsigned> > &CP = MCP->getConstants(); const std::vector<MachineConstantPoolEntry> &CP = MCP->getConstants();
enterSection(ReadOnlyData); enterSection(ReadOnlyData);
for (unsigned i = 0, e = CP.size(); i != e; ++i) { for (unsigned i = 0, e = CP.size(); i != e; ++i) {
std::string cpiName = ".CPI_" + CurrentFnName + "_" + utostr(i); std::string cpiName = ".CPI_" + CurrentFnName + "_" + utostr(i);
printConstant(CP[i].first, CP[i].second, cpiName); printConstant(CP[i].Val, CP[i].Alignment, cpiName);
} }
enterSection(Text); enterSection(Text);