RPCS3/llvm-mirror
1
0
Fork 0
mirror of https://github.com/RPCS3/llvm-mirror.git synced 2024-12-12 05:56:28 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Move logic of determining ELF entsize from the .s printer to initialization

Browse Source 
time. That way, the EntrySize field is initialized for other code paths, 
namely, the .ll -> .o code path.

llvm-svn: 115141
This commit is contained in:
Jan Wen Voung 2010-09-30 05:59:22 +00:00
parent b371d39f74
commit 7df9bf0092
4 changed files with 63 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
include/llvm/MC/MCSectionELF.h
View File

@ -189,6 +189,10 @@ public:
return S->getVariant() == SV_ELF;
}
static bool classof(const MCSectionELF *) { return true; }
// Return the entry size for sections with fixed-width data.
static unsigned DetermineEntrySize(SectionKind Kind);
};
} // end namespace llvm

4
lib/MC/MCContext.cpp
View File

@ -160,6 +160,10 @@ getELFSection(StringRef Section, unsigned Type, unsigned Flags,
StringMapEntry<const MCSectionELF*> &Entry = Map.GetOrCreateValue(Section);
if (Entry.getValue()) return Entry.getValue();
// Possibly refine the entry size first.
if (!EntrySize) {
EntrySize = MCSectionELF::DetermineEntrySize(Kind);
}
MCSectionELF *Result = new (*this) MCSectionELF(Entry.getKey(), Type, Flags,
Kind, IsExplicit, EntrySize);
Entry.setValue(Result);

23
lib/MC/MCSectionELF.cpp
View File

@ -104,17 +104,8 @@ void MCSectionELF::PrintSwitchToSection(const MCAsmInfo &MAI,
else if (Type == MCSectionELF::SHT_PROGBITS)
OS << "progbits";
if (getKind().isMergeable1ByteCString()) {
OS << ",1";
} else if (getKind().isMergeable2ByteCString()) {
OS << ",2";
} else if (getKind().isMergeable4ByteCString() ||
getKind().isMergeableConst4()) {
OS << ",4";
} else if (getKind().isMergeableConst8()) {
OS << ",8";
} else if (getKind().isMergeableConst16()) {
OS << ",16";
if (EntrySize) {
OS << "," << EntrySize;
}
}
@ -132,4 +123,12 @@ bool MCSectionELF::HasCommonSymbols() const {
return false;
}
unsigned MCSectionELF::DetermineEntrySize(SectionKind Kind) {
if (Kind.isMergeable1ByteCString()) return 1;
if (Kind.isMergeable2ByteCString()) return 2;
if (Kind.isMergeable4ByteCString()) return 4;
if (Kind.isMergeableConst4()) return 4;
if (Kind.isMergeableConst8()) return 8;
if (Kind.isMergeableConst16()) return 16;
return 0;
}

44
test/MC/ELF/entsize.ll Normal file
View File

@ -0,0 +1,44 @@
; RUN: llc -filetype=obj -mtriple x86_64-pc-linux-gnu %s -o - | elf-dump | FileCheck -check-prefix=64 %s
; Test that constant mergeable strings have sh_entsize set.
@.str1 = private constant [6 x i8] c"tring\00"
@.str2 = private constant [7 x i8] c"String\00"
@.c8a = private constant [1 x i64] [i64 42]
@.c8b = private constant [1 x i64] [i64 42]
define i32 @main() nounwind {
%1 = call i32 @puts(i8* getelementptr inbounds ([6 x i8]* @.str1, i32 0, i32 0))
%2 = call i32 @puts(i8* getelementptr inbounds ([7 x i8]* @.str2, i32 0, i32 0))
call void @foo(i64* getelementptr inbounds ([1 x i64]* @.c8a, i32 0, i32 0))
call void @foo(i64* getelementptr inbounds ([1 x i64]* @.c8b, i32 0, i32 0))
ret i32 0
}
declare i32 @puts(i8* nocapture) nounwind
declare void @foo(i64* nocapture) nounwind
;;;;;
; 64: (('sh_name', 7) # '.rodata.str1.1'
; 64-NEXT: ('sh_type', 1)
; 64-NEXT: ('sh_flags', 50)
; 64-NEXT: ('sh_addr',
; 64-NEXT: ('sh_offset',
; 64-NEXT: ('sh_size', 13)
; 64-NEXT: ('sh_link',
; 64-NEXT: ('sh_info',
; 64-NEXT: ('sh_addralign', 1)
; 64-NEXT: ('sh_entsize', 1)
; 64: (('sh_name', 22) # '.rodata.cst8'
; 64-NEXT: ('sh_type', 1)
; 64-NEXT: ('sh_flags', 18)
; 64-NEXT: ('sh_addr',
; 64-NEXT: ('sh_offset',
; 64-NEXT: ('sh_size', 16)
; 64-NEXT: ('sh_link',
; 64-NEXT: ('sh_info',
; 64-NEXT: ('sh_addralign', 8)
; 64-NEXT: ('sh_entsize', 8)