Fix a couple of typos and 80-col.

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@182954 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
Eric Christopher 2013-05-30 18:59:11 +00:00
parent 79b40f10c0
commit dab867ebba

View File

@ -53,8 +53,8 @@ inline std::pair<unsigned char, unsigned char>
getElfArchType(MemoryBuffer *Object) { getElfArchType(MemoryBuffer *Object) {
if (Object->getBufferSize() < ELF::EI_NIDENT) if (Object->getBufferSize() < ELF::EI_NIDENT)
return std::make_pair((uint8_t)ELF::ELFCLASSNONE,(uint8_t)ELF::ELFDATANONE); return std::make_pair((uint8_t)ELF::ELFCLASSNONE,(uint8_t)ELF::ELFDATANONE);
return std::make_pair( (uint8_t)Object->getBufferStart()[ELF::EI_CLASS] return std::make_pair((uint8_t) Object->getBufferStart()[ELF::EI_CLASS],
, (uint8_t)Object->getBufferStart()[ELF::EI_DATA]); (uint8_t) Object->getBufferStart()[ELF::EI_DATA]);
} }
// Templates to choose Elf_Addr and Elf_Off depending on is64Bits. // Templates to choose Elf_Addr and Elf_Off depending on is64Bits.
@ -338,8 +338,8 @@ struct Elf_Rel_Base<ELFType<TargetEndianness, MaxAlign, true>, false> {
uint64_t t = r_info; uint64_t t = r_info;
if (!isMips64EL) if (!isMips64EL)
return t; return t;
// Mip64 little endian has a "special" encoding of r_info. Instead of one // Mips64 little endian has a "special" encoding of r_info. Instead of one
// 64 bit little endian number, it is a little ending 32 bit number followed // 64 bit little endian number, it is a little endian 32 bit number followed
// by a 32 bit big endian number. // by a 32 bit big endian number.
return (t << 32) | ((t >> 8) & 0xff000000) | ((t >> 24) & 0x00ff0000) | return (t << 32) | ((t >> 8) & 0xff000000) | ((t >> 24) & 0x00ff0000) |
((t >> 40) & 0x0000ff00) | ((t >> 56) & 0x000000ff); ((t >> 40) & 0x0000ff00) | ((t >> 56) & 0x000000ff);
@ -374,8 +374,8 @@ struct Elf_Rel_Base<ELFType<TargetEndianness, MaxAlign, true>, true> {
Elf_Sxword r_addend; // Compute value for relocatable field by adding this. Elf_Sxword r_addend; // Compute value for relocatable field by adding this.
uint64_t getRInfo(bool isMips64EL) const { uint64_t getRInfo(bool isMips64EL) const {
// Mip64 little endian has a "special" encoding of r_info. Instead of one // Mips64 little endian has a "special" encoding of r_info. Instead of one
// 64 bit little endian number, it is a little ending 32 bit number followed // 64 bit little endian number, it is a little endian 32 bit number followed
// by a 32 bit big endian number. // by a 32 bit big endian number.
uint64_t t = r_info; uint64_t t = r_info;
if (!isMips64EL) if (!isMips64EL)
@ -681,7 +681,8 @@ protected:
virtual error_code getSymbolSize(DataRefImpl Symb, uint64_t &Res) const; virtual error_code getSymbolSize(DataRefImpl Symb, uint64_t &Res) const;
virtual error_code getSymbolNMTypeChar(DataRefImpl Symb, char &Res) const; virtual error_code getSymbolNMTypeChar(DataRefImpl Symb, char &Res) const;
virtual error_code getSymbolFlags(DataRefImpl Symb, uint32_t &Res) const; virtual error_code getSymbolFlags(DataRefImpl Symb, uint32_t &Res) const;
virtual error_code getSymbolType(DataRefImpl Symb, SymbolRef::Type &Res) const; virtual error_code getSymbolType(DataRefImpl Symb,
SymbolRef::Type &Res) const;
virtual error_code getSymbolSection(DataRefImpl Symb, virtual error_code getSymbolSection(DataRefImpl Symb,
section_iterator &Res) const; section_iterator &Res) const;
virtual error_code getSymbolValue(DataRefImpl Symb, uint64_t &Val) const; virtual error_code getSymbolValue(DataRefImpl Symb, uint64_t &Val) const;
@ -1520,7 +1521,8 @@ error_code ELFObjectFile<ELFT>::getRelocationSymbol(DataRefImpl Rel,
} }
} }
DataRefImpl SymbolData; DataRefImpl SymbolData;
IndexMap_t::const_iterator it = SymbolTableSectionsIndexMap.find(sec->sh_link); IndexMap_t::const_iterator it =
SymbolTableSectionsIndexMap.find(sec->sh_link);
if (it == SymbolTableSectionsIndexMap.end()) if (it == SymbolTableSectionsIndexMap.end())
report_fatal_error("Relocation symbol table not found!"); report_fatal_error("Relocation symbol table not found!");
SymbolData.d.a = symbolIdx; SymbolData.d.a = symbolIdx;