Skip to content

Commit

Permalink
Fix typo.
Browse files Browse the repository at this point in the history
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@180137 91177308-0d34-0410-b5e6-96231b3b80d8
  • Loading branch information
espindola committed Apr 23, 2013
1 parent 3a1b4f8 commit a0840c4
Show file tree
Hide file tree
Showing 3 changed files with 11 additions and 11 deletions.
4 changes: 2 additions & 2 deletions test/Object/Inputs/COFF/i386.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ symbols:
ComplexType: IMAGE_SYM_DTYPE_NULL # (0)
StorageClass: IMAGE_SYM_CLASS_STATIC # (3)
NumberOfAuxSymbols: 1
AuxillaryData: !hex "240000000300000000000000010000000000" # |$.................|
AuxiliaryData: !hex "240000000300000000000000010000000000" # |$.................|

- !Symbol
Name: .data
Expand All @@ -48,7 +48,7 @@ symbols:
ComplexType: IMAGE_SYM_DTYPE_NULL # (0)
StorageClass: IMAGE_SYM_CLASS_STATIC # (3)
NumberOfAuxSymbols: 1
AuxillaryData: !hex "0D0000000000000000000000020000000000" # |..................|
AuxiliaryData: !hex "0D0000000000000000000000020000000000" # |..................|

- !Symbol
Name: _main
Expand Down
4 changes: 2 additions & 2 deletions test/Object/Inputs/COFF/x86-64.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ symbols:
ComplexType: IMAGE_SYM_DTYPE_NULL # (0)
StorageClass: IMAGE_SYM_CLASS_STATIC # (3)
NumberOfAuxSymbols: 1
AuxillaryData: !hex "260000000300000000000000010000000000" # |&.................|
AuxiliaryData: !hex "260000000300000000000000010000000000" # |&.................|

- !Symbol
Name: .data
Expand All @@ -47,7 +47,7 @@ symbols:
ComplexType: IMAGE_SYM_DTYPE_NULL # (0)
StorageClass: IMAGE_SYM_CLASS_STATIC # (3)
NumberOfAuxSymbols: 1
AuxillaryData: !hex "0D0000000000000000000000020000000000" # |..................|
AuxiliaryData: !hex "0D0000000000000000000000020000000000" # |..................|

- !Symbol
Name: main
Expand Down
14 changes: 7 additions & 7 deletions tools/yaml2obj/yaml2obj.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -128,7 +128,7 @@ namespace COFFYAML {
COFF::symbol Header;
COFF::SymbolBaseType SimpleType;
COFF::SymbolComplexType ComplexType;
StringRef AuxillaryData;
StringRef AuxiliaryData;
StringRef Name;
Symbol() {
memset(&Header, 0, sizeof(COFF::symbol));
Expand Down Expand Up @@ -270,9 +270,9 @@ static bool layoutCOFF(COFFParser &CP) {
for (std::vector<COFFYAML::Symbol>::iterator i = CP.Obj.Symbols.begin(),
e = CP.Obj.Symbols.end();
i != e; ++i) {
unsigned AuxBytes = i->AuxillaryData.size() / 2;
unsigned AuxBytes = i->AuxiliaryData.size() / 2;
if (AuxBytes % COFF::SymbolSize != 0) {
errs() << "AuxillaryData size not a multiple of symbol size!\n";
errs() << "AuxiliaryData size not a multiple of symbol size!\n";
return false;
}
i->Header.NumberOfAuxSymbols = AuxBytes / COFF::SymbolSize;
Expand Down Expand Up @@ -368,10 +368,10 @@ bool writeCOFF(COFFParser &CP, raw_ostream &OS) {
<< binary_le(i->Header.Type)
<< binary_le(i->Header.StorageClass)
<< binary_le(i->Header.NumberOfAuxSymbols);
if (!i->AuxillaryData.empty()) {
if (!i->AuxiliaryData.empty()) {
std::vector<uint8_t> AuxSymbols;
if (!hexStringToByteArray(i->AuxillaryData, AuxSymbols)) {
errs() << "AuxillaryData must be a collection of pairs of hex bytes";
if (!hexStringToByteArray(i->AuxiliaryData, AuxSymbols)) {
errs() << "AuxiliaryData must be a collection of pairs of hex bytes";
return false;
}

Expand Down Expand Up @@ -622,7 +622,7 @@ struct MappingTraits<COFFYAML::Symbol> {
IO.mapOptional("NumberOfAuxSymbols", S.Header.NumberOfAuxSymbols);
IO.mapRequired("Name", S.Name);
IO.mapRequired("StorageClass", NS->StorageClass);
IO.mapOptional("AuxillaryData", S.AuxillaryData); // FIXME: typo
IO.mapOptional("AuxiliaryData", S.AuxiliaryData);
IO.mapRequired("ComplexType", S.ComplexType);
IO.mapRequired("Value", S.Header.Value);
IO.mapRequired("SectionNumber", S.Header.SectionNumber);
Expand Down

0 comments on commit a0840c4

Please sign in to comment.