6502/llvm-6502
1
0
Fork 0
mirror of https://github.com/c64scene-ar/llvm-6502.git synced 2025-06-13 04:38:24 +00:00
Code Issues Projects Releases Wiki Activity

Be a bit more consistent about using ErrorOr when constructing Binary objects.

Browse Source 
The constructors of classes deriving from Binary normally take an error_code
as an argument to the constructor. My original intent was to change them
to have a trivial constructor and move the initial parsing logic to a static
method returning an ErrorOr. I changed my mind because:

* A constructor with an error_code out parameter is extremely convenient from
  the implementation side. We can incrementally construct the object and give
  up when we find an error.
* It is very efficient when constructing on the stack or when there is no
  error. The only inefficient case is where heap allocating and an error is
  found (we have to free the memory).

The result is that this is a much smaller patch. It just standardizes the
create* helpers to return an ErrorOr.

Almost no functionality change: The only difference is that this found that
we were trying to read past the end of COFF import library but ignoring the
error.

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@199770 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
Rafael Espindola
2014-01-21 23:06:54 +00:00
parent dcaab3b681
commit 3d218156f8
11 changed files with 84 additions and 81 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
lib/Object/ELFObjectFile.cpp
View File

@ -17,57 +17,60 @@
namespace llvm {
using namespace object;
// Creates an in-memory object-file by default: createELFObjectFile(Buffer)
ObjectFile *ObjectFile::createELFObjectFile(MemoryBuffer *Object) {
std::pair<unsigned char, unsigned char> Ident = getElfArchType(Object);
error_code ec;
ErrorOr<ObjectFile *> ObjectFile::createELFObjectFile(MemoryBuffer *Obj) {
std::pair<unsigned char, unsigned char> Ident = getElfArchType(Obj);
std::size_t MaxAlignment =
1ULL << countTrailingZeros(uintptr_t(Object->getBufferStart()));
1ULL << countTrailingZeros(uintptr_t(Obj->getBufferStart()));
error_code EC;
OwningPtr<ObjectFile> R;
if (Ident.first == ELF::ELFCLASS32 && Ident.second == ELF::ELFDATA2LSB)
#if !LLVM_IS_UNALIGNED_ACCESS_FAST
if (MaxAlignment >= 4)
return new ELFObjectFile<ELFType<support::little, 4, false> >(Object, ec);
R.reset(new ELFObjectFile<ELFType<support::little, 4, false> >(Obj, EC));
else
#endif
if (MaxAlignment >= 2)
return new ELFObjectFile<ELFType<support::little, 2, false> >(Object, ec);
R.reset(new ELFObjectFile<ELFType<support::little, 2, false> >(Obj, EC));
else
llvm_unreachable("Invalid alignment for ELF file!");
else if (Ident.first == ELF::ELFCLASS32 && Ident.second == ELF::ELFDATA2MSB)
#if !LLVM_IS_UNALIGNED_ACCESS_FAST
if (MaxAlignment >= 4)
return new ELFObjectFile<ELFType<support::big, 4, false> >(Object, ec);
R.reset(new ELFObjectFile<ELFType<support::big, 4, false> >(Obj, EC));
else
#endif
if (MaxAlignment >= 2)
return new ELFObjectFile<ELFType<support::big, 2, false> >(Object, ec);
R.reset(new ELFObjectFile<ELFType<support::big, 2, false> >(Obj, EC));
else
llvm_unreachable("Invalid alignment for ELF file!");
else if (Ident.first == ELF::ELFCLASS64 && Ident.second == ELF::ELFDATA2MSB)
#if !LLVM_IS_UNALIGNED_ACCESS_FAST
if (MaxAlignment >= 8)
return new ELFObjectFile<ELFType<support::big, 8, true> >(Object, ec);
R.reset(new ELFObjectFile<ELFType<support::big, 8, true> >(Obj, EC));
else
#endif
if (MaxAlignment >= 2)
return new ELFObjectFile<ELFType<support::big, 2, true> >(Object, ec);
R.reset(new ELFObjectFile<ELFType<support::big, 2, true> >(Obj, EC));
else
llvm_unreachable("Invalid alignment for ELF file!");
else if (Ident.first == ELF::ELFCLASS64 && Ident.second == ELF::ELFDATA2LSB) {
#if !LLVM_IS_UNALIGNED_ACCESS_FAST
if (MaxAlignment >= 8)
return new ELFObjectFile<ELFType<support::little, 8, true> >(Object, ec);
R.reset(new ELFObjectFile<ELFType<support::little, 8, true> >(Obj, EC));
else
#endif
if (MaxAlignment >= 2)
return new ELFObjectFile<ELFType<support::little, 2, true> >(Object, ec);
R.reset(new ELFObjectFile<ELFType<support::little, 2, true> >(Obj, EC));
else
llvm_unreachable("Invalid alignment for ELF file!");
}
else
report_fatal_error("Buffer is not an ELF object file!");
report_fatal_error("Buffer is not an ELF object file!");
if (EC)
return EC;
return R.take();
}
} // end namespace llvm