6502/llvm-6502
1
0
Fork 0
mirror of https://github.com/c64scene-ar/llvm-6502.git synced 2024-07-08 18:30:04 +00:00
Code Issues Projects Releases Wiki Activity

Revert "Revert r240762 "[X86] Cleanup X86WindowsTargetObjectFile::getSectionForConstant""

Browse Source 
This reverts commit r240793 while fixing how we handle array constant
pool entries.

This fixes PR23966.

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@240811 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
David Majnemer 2015-06-26 18:55:48 +00:00
parent aaaa38cb95
commit b0e21d44cb
2 changed files with 41 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

64
lib/Target/X86/X86TargetObjectFile.cpp
View File

@ -131,52 +131,44 @@ static std::string APIntToHexString(const APInt &AI) {
return HexString;
}
static std::string scalarConstantToHexString(const Constant *C) {
Type *Ty = C->getType();
APInt AI;
if (isa<UndefValue>(C)) {
AI = APInt(Ty->getPrimitiveSizeInBits(), /*val=*/0);
} else if (Ty->isFloatTy() || Ty->isDoubleTy()) {
const auto *CFP = cast<ConstantFP>(C);
AI = CFP->getValueAPF().bitcastToAPInt();
} else if (Ty->isIntegerTy()) {
const auto *CI = cast<ConstantInt>(C);
AI = CI->getValue();
return APIntToHexString(APInt::getNullValue(Ty->getPrimitiveSizeInBits()));
} else if (const auto *CFP = dyn_cast<ConstantFP>(C)) {
return APIntToHexString(CFP->getValueAPF().bitcastToAPInt());
} else if (const auto *CI = dyn_cast<ConstantInt>(C)) {
return APIntToHexString(CI->getValue());
} else {
llvm_unreachable("unexpected constant pool element type!");
unsigned NumElements;
if (isa<VectorType>(Ty))
NumElements = Ty->getVectorNumElements();
else
NumElements = Ty->getArrayNumElements();
std::string HexString;
for (int I = NumElements - 1, E = -1; I != E; --I)
HexString += scalarConstantToHexString(C->getAggregateElement(I));
return HexString;
}
return APIntToHexString(AI);
}
MCSection *
X86WindowsTargetObjectFile::getSectionForConstant(SectionKind Kind,
const Constant *C) const {
if (Kind.isReadOnly()) {
if (C) {
Type *Ty = C->getType();
SmallString<32> COMDATSymName;
if (Ty->isFloatTy() || Ty->isDoubleTy()) {
COMDATSymName = "__real@";
COMDATSymName += scalarConstantToHexString(C);
} else if (const auto *VTy = dyn_cast<VectorType>(Ty)) {
uint64_t NumBits = VTy->getBitWidth();
if (NumBits == 128 || NumBits == 256) {
COMDATSymName = NumBits == 128 ? "__xmm@" : "__ymm@";
for (int I = VTy->getNumElements() - 1, E = -1; I != E; --I)
COMDATSymName +=
scalarConstantToHexString(C->getAggregateElement(I));
}
}
if (!COMDATSymName.empty()) {
unsigned Characteristics = COFF::IMAGE_SCN_CNT_INITIALIZED_DATA |
COFF::IMAGE_SCN_MEM_READ |
COFF::IMAGE_SCN_LNK_COMDAT;
return getContext().getCOFFSection(".rdata", Characteristics, Kind,
COMDATSymName,
COFF::IMAGE_COMDAT_SELECT_ANY);
}
}
if (Kind.isMergeableConst() && C) {
const unsigned Characteristics = COFF::IMAGE_SCN_CNT_INITIALIZED_DATA |
COFF::IMAGE_SCN_MEM_READ |
COFF::IMAGE_SCN_LNK_COMDAT;
std::string COMDATSymName;
if (Kind.isMergeableConst4() || Kind.isMergeableConst8())
COMDATSymName = "__real@" + scalarConstantToHexString(C);
else if (Kind.isMergeableConst16())
COMDATSymName = "__xmm@" + scalarConstantToHexString(C);
if (!COMDATSymName.empty())
return getContext().getCOFFSection(".rdata", Characteristics, Kind,
COMDATSymName,
COFF::IMAGE_COMDAT_SELECT_ANY);
}
return TargetLoweringObjectFile::getSectionForConstant(Kind, C);

13
test/CodeGen/X86/win_cst_pool.ll
View File

@ -64,3 +64,16 @@ define <4 x float> @undef1() {
; CHECK: movaps __xmm@00000000000000003f8000003f800000(%rip), %xmm0
; CHECK-NEXT: ret
}
define float @pr23966(i32 %a) {
%tobool = icmp ne i32 %a, 0
%sel = select i1 %tobool, float -1.000000e+00, float 1.000000e+00
ret float %sel
}
; CHECK: .globl __real@bf8000003f800000
; CHECK-NEXT: .section .rdata,"dr",discard,__real@bf8000003f800000
; CHECK-NEXT: .align 4
; CHECK-NEXT: __real@bf8000003f800000:
; CHECK-NEXT: .long 1065353216
; CHECK-NEXT: .long 3212836864