This is an archive of the discontinued LLVM Phabricator instance.

Differential D14628

ELF: Ignore OS bits in sh_flag when assigning 'Constant' ContentType for Atoms
AbandonedPublic

Authored by • tstellarAMD on Nov 12 2015, 2:42 PM.

Details

Reviewers
ruiu

Diff Detail

Event Timeline

• tstellarAMD updated this revision to Diff 40091.Nov 12 2015, 2:42 PM
• tstellarAMD retitled this revision from to ELF: Ignore OS bits in sh_flag when assigning 'Constant' ContentType for Atoms.
• tstellarAMD updated this object.
• tstellarAMD added a reviewer: ruiu.
• tstellarAMD added a subscriber: llvm-commits.
• tstellarAMD added a parent revision: D14625: AMDGPU: Add support for .hsarodata_readonly_agent section.Nov 12 2015, 2:43 PM
• tstellarAMD abandoned this revision.Jan 5 2016, 10:38 AM

Revision Contents

PathSize
lib/
ReaderWriter/
ELF/
2 lines
test/
elf/
AMDGPU/
18 lines

Diff 40091

lib/ReaderWriter/ELF/Atoms.cpp

Show First 20 Lines • Show All 76 Lines • ▼ Show 20 Lines if (_section->sh_type == SHT_NOTE)
return (flags == SHF_WRITE) ? typeRWNote : typeRONote; return (flags == SHF_WRITE) ? typeRWNote : typeRONote;
return _contentType = typeNoAlloc; return _contentType = typeNoAlloc;
} }
if (_section->sh_flags == (SHF_ALLOC | SHF_WRITE | SHF_TLS)) if (_section->sh_flags == (SHF_ALLOC | SHF_WRITE | SHF_TLS))
return _section->sh_type == SHT_NOBITS ? typeThreadZeroFill return _section->sh_type == SHT_NOBITS ? typeThreadZeroFill
: typeThreadData; : typeThreadData;
if (_section->sh_flags == SHF_ALLOC && _section->sh_type == SHT_PROGBITS) if ((_section->sh_flags & ~SHF_MASKOS) == SHF_ALLOC && _section->sh_type == SHT_PROGBITS)
return _contentType = typeConstant; return _contentType = typeConstant;
if (_symbol->getType() == STT_GNU_IFUNC) if (_symbol->getType() == STT_GNU_IFUNC)
return _contentType = typeResolver; return _contentType = typeResolver;
if (_symbol->st_shndx == SHN_COMMON) if (_symbol->st_shndx == SHN_COMMON)
return _contentType = typeZeroFill; return _contentType = typeZeroFill;
if (_section->sh_type == SHT_PROGBITS) { if (_section->sh_type == SHT_PROGBITS) {
flags &= ~SHF_ALLOC; flags &= ~SHF_ALLOC;
▲ Show 20 Lines • Show All 205 Lines • Show Last 20 Lines

test/elf/AMDGPU/hsa-symbols.test

# RUN: yaml2obj -format=elf %s > %t.obj # RUN: yaml2obj -format=elf %s > %t.obj
# RUN: lld -flavor gnu -target amdgcn--hsa %t.obj -o %t.exe --noinhibit-exec # RUN: lld -flavor gnu -target amdgcn--hsa %t.obj -o %t.exe --noinhibit-exec
# RUN: llvm-readobj -h -program-headers -s -symbols %t.exe | FileCheck %s # RUN: llvm-readobj -h -program-headers -s -symbols %t.exe | FileCheck %s
# CHECK: Symbol { # CHECK: Symbol {
# CHECK: Name: readonly_agent
# CHECK: Binding: Local
# CHECK: Type: Object
# CHECK: Section: .hsarodata_readonly_agent
# CHECK: }
# CHECK: Symbol {
# CHECK: Name: global_agent # CHECK: Name: global_agent
# CHECK: Binding: Local # CHECK: Binding: Local
# CHECK: Type: Object # CHECK: Type: Object
# CHECK: Section: .hsadata_global_agent # CHECK: Section: .hsadata_global_agent
# CHECK: } # CHECK: }
--- ---
FileHeader: FileHeader:
Class: ELFCLASS64 Class: ELFCLASS64
Data: ELFDATA2LSB Data: ELFDATA2LSB
OSABI: ELFOSABI_GNU OSABI: ELFOSABI_GNU
Type: ET_REL Type: ET_REL
Machine: EM_AMDGPU Machine: EM_AMDGPU
Sections: Sections:
- Name: .hsadata_global_agent - Name: .hsadata_global_agent
Type: SHT_PROGBITS Type: SHT_PROGBITS
Flags: [ SHF_ALLOC, SHF_WRITE, SHF_AMDGPU_HSA_GLOBAL, Flags: [ SHF_ALLOC, SHF_WRITE, SHF_AMDGPU_HSA_GLOBAL,
SHF_AMDGPU_HSA_AGENT ] SHF_AMDGPU_HSA_AGENT ]
AddressAlign: 0x0000000000000004 AddressAlign: 0x0000000000000004
Content: '' Content: ''
- Name: .hsarodata_readonly_agent
Type: SHT_PROGBITS
Flags: [ SHF_ALLOC, SHF_AMDGPU_HSA_AGENT, SHF_AMDGPU_HSA_READONLY ]
Content: 'abcd'
Symbols: Symbols:
Local: Local:
- Name: global_agent - Name: global_agent
Type: STT_OBJECT Type: STT_OBJECT
Section: .hsadata_global_agent Section: .hsadata_global_agent
- Name: readonly_agent
Type: STT_OBJECT
Section: .hsarodata_readonly_agent
... ...