From fc60ba101e122dd74ee0a2aeafd80a620c6bbb47 Mon Sep 17 00:00:00 2001 From: Chris Lattner Date: Sun, 26 Jul 2009 06:26:55 +0000 Subject: simplify getSectionForMergableConstant to take a SectionKind. git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@77134 91177308-0d34-0410-b5e6-96231b3b80d8 --- lib/CodeGen/AsmPrinter/AsmPrinter.cpp | 21 ++++++++++++++++----- 1 file changed, 16 insertions(+), 5 deletions(-) (limited to 'lib/CodeGen/AsmPrinter') diff --git a/lib/CodeGen/AsmPrinter/AsmPrinter.cpp b/lib/CodeGen/AsmPrinter/AsmPrinter.cpp index 582acce..e12a0f2 100644 --- a/lib/CodeGen/AsmPrinter/AsmPrinter.cpp +++ b/lib/CodeGen/AsmPrinter/AsmPrinter.cpp @@ -301,17 +301,28 @@ void AsmPrinter::EmitConstantPool(MachineConstantPool *MCP) { const std::vector &CP = MCP->getConstants(); if (CP.empty()) return; - const TargetData &TD = *TM.getTargetData(); - // Calculate sections for constant pool entries. We collect entries to go into // the same section together to reduce amount of section switch statements. SmallVector CPSections; for (unsigned i = 0, e = CP.size(); i != e; ++i) { const MachineConstantPoolEntry &CPE = CP[i]; unsigned Align = CPE.getAlignment(); - uint64_t Size = TD.getTypeAllocSize(CPE.getType()); - const Section *S = - TAI->getSectionForMergableConstant(Size, CPE.getRelocationInfo()); + + SectionKind Kind; + switch (CPE.getRelocationInfo()) { + default: llvm_unreachable("Unknown section kind"); + case 2: Kind = SectionKind::getReadOnlyWithRel(); break; + case 1: Kind = SectionKind::getReadOnlyWithRelLocal(); break; + case 0: + switch (TM.getTargetData()->getTypeAllocSize(CPE.getType())) { + case 4: Kind = SectionKind::getMergableConst4(); break; + case 8: Kind = SectionKind::getMergableConst8(); break; + case 16: Kind = SectionKind::getMergableConst16(); break; + default: Kind = SectionKind::getMergableConst(); break; + } + } + + const Section *S = TAI->getSectionForMergableConstant(Kind); // The number of sections are small, just do a linear search from the // last section to the first. -- cgit v1.1