mirror of
https://github.com/RPCS3/llvm-mirror.git
synced 2024-11-25 12:12:47 +01:00
a6534d0295
Produce the first specific error message for a malformed Mach-O file describing the problem instead of the generic message for object_error::parse_failed of "Invalid data was encountered while parsing the file”. Many more good error messages will follow after this first one. This is built on Lang Hames’ great work of adding the ’Error' class for structured error handling and threading Error through MachOObjectFile construction. And making createMachOObjectFile return Expected<...> . So to to get the error to the llvm-obdump tool, I changed the stack of these methods to also return Expected<...> : object::ObjectFile::createObjectFile() object::SymbolicFile::createSymbolicFile() object::createBinary() Then finally in ParseInputMachO() in MachODump.cpp the error can be reported and the specific error message can be printed in llvm-objdump and can be seen in the existing test case for the existing malformed binary but with the updated error message. Converting these interfaces to Expected<> from ErrorOr<> does involve touching a number of places. To contain the changes for now use of errorToErrorCode() and errorOrToExpected() are used where the callers are yet to be converted. Also there some were bugs in the existing code that did not deal with the old ErrorOr<> return values. So now with Expected<> since they must be checked and the error handled, I added a TODO and a comment: “// TODO: Actually report errors helpfully” and a call something like consumeError(ObjOrErr.takeError()) so the buggy code will not crash since needed to deal with the Error. Note there is one fix also needed to lld/COFF/InputFiles.cpp that goes along with this that I will commit right after this. So expect lld not to built after this commit and before the next one. llvm-svn: 265606
193 lines
4.7 KiB
C++
193 lines
4.7 KiB
C++
//===- Binary.h - A generic binary file -------------------------*- C++ -*-===//
|
|
//
|
|
// The LLVM Compiler Infrastructure
|
|
//
|
|
// This file is distributed under the University of Illinois Open Source
|
|
// License. See LICENSE.TXT for details.
|
|
//
|
|
//===----------------------------------------------------------------------===//
|
|
//
|
|
// This file declares the Binary class.
|
|
//
|
|
//===----------------------------------------------------------------------===//
|
|
|
|
#ifndef LLVM_OBJECT_BINARY_H
|
|
#define LLVM_OBJECT_BINARY_H
|
|
|
|
#include "llvm/Object/Error.h"
|
|
#include "llvm/Support/ErrorOr.h"
|
|
#include "llvm/Support/FileSystem.h"
|
|
#include "llvm/Support/MemoryBuffer.h"
|
|
|
|
namespace llvm {
|
|
|
|
class LLVMContext;
|
|
class StringRef;
|
|
|
|
namespace object {
|
|
|
|
class Binary {
|
|
private:
|
|
Binary() = delete;
|
|
Binary(const Binary &other) = delete;
|
|
|
|
unsigned int TypeID;
|
|
|
|
protected:
|
|
MemoryBufferRef Data;
|
|
|
|
Binary(unsigned int Type, MemoryBufferRef Source);
|
|
|
|
enum {
|
|
ID_Archive,
|
|
ID_MachOUniversalBinary,
|
|
ID_COFFImportFile,
|
|
ID_IR, // LLVM IR
|
|
ID_ModuleSummaryIndex, // Module summary index
|
|
|
|
// Object and children.
|
|
ID_StartObjects,
|
|
ID_COFF,
|
|
|
|
ID_ELF32L, // ELF 32-bit, little endian
|
|
ID_ELF32B, // ELF 32-bit, big endian
|
|
ID_ELF64L, // ELF 64-bit, little endian
|
|
ID_ELF64B, // ELF 64-bit, big endian
|
|
|
|
ID_MachO32L, // MachO 32-bit, little endian
|
|
ID_MachO32B, // MachO 32-bit, big endian
|
|
ID_MachO64L, // MachO 64-bit, little endian
|
|
ID_MachO64B, // MachO 64-bit, big endian
|
|
|
|
ID_EndObjects
|
|
};
|
|
|
|
static inline unsigned int getELFType(bool isLE, bool is64Bits) {
|
|
if (isLE)
|
|
return is64Bits ? ID_ELF64L : ID_ELF32L;
|
|
else
|
|
return is64Bits ? ID_ELF64B : ID_ELF32B;
|
|
}
|
|
|
|
static unsigned int getMachOType(bool isLE, bool is64Bits) {
|
|
if (isLE)
|
|
return is64Bits ? ID_MachO64L : ID_MachO32L;
|
|
else
|
|
return is64Bits ? ID_MachO64B : ID_MachO32B;
|
|
}
|
|
|
|
public:
|
|
virtual ~Binary();
|
|
|
|
StringRef getData() const;
|
|
StringRef getFileName() const;
|
|
MemoryBufferRef getMemoryBufferRef() const;
|
|
|
|
// Cast methods.
|
|
unsigned int getType() const { return TypeID; }
|
|
|
|
// Convenience methods
|
|
bool isObject() const {
|
|
return TypeID > ID_StartObjects && TypeID < ID_EndObjects;
|
|
}
|
|
|
|
bool isSymbolic() const {
|
|
return isIR() || isObject();
|
|
}
|
|
|
|
bool isArchive() const {
|
|
return TypeID == ID_Archive;
|
|
}
|
|
|
|
bool isMachOUniversalBinary() const {
|
|
return TypeID == ID_MachOUniversalBinary;
|
|
}
|
|
|
|
bool isELF() const {
|
|
return TypeID >= ID_ELF32L && TypeID <= ID_ELF64B;
|
|
}
|
|
|
|
bool isMachO() const {
|
|
return TypeID >= ID_MachO32L && TypeID <= ID_MachO64B;
|
|
}
|
|
|
|
bool isCOFF() const {
|
|
return TypeID == ID_COFF;
|
|
}
|
|
|
|
bool isCOFFImportFile() const {
|
|
return TypeID == ID_COFFImportFile;
|
|
}
|
|
|
|
bool isIR() const {
|
|
return TypeID == ID_IR;
|
|
}
|
|
|
|
bool isModuleSummaryIndex() const { return TypeID == ID_ModuleSummaryIndex; }
|
|
|
|
bool isLittleEndian() const {
|
|
return !(TypeID == ID_ELF32B || TypeID == ID_ELF64B ||
|
|
TypeID == ID_MachO32B || TypeID == ID_MachO64B);
|
|
}
|
|
};
|
|
|
|
/// @brief Create a Binary from Source, autodetecting the file type.
|
|
///
|
|
/// @param Source The data to create the Binary from.
|
|
Expected<std::unique_ptr<Binary>> createBinary(MemoryBufferRef Source,
|
|
LLVMContext *Context = nullptr);
|
|
|
|
template <typename T> class OwningBinary {
|
|
std::unique_ptr<T> Bin;
|
|
std::unique_ptr<MemoryBuffer> Buf;
|
|
|
|
public:
|
|
OwningBinary();
|
|
OwningBinary(std::unique_ptr<T> Bin, std::unique_ptr<MemoryBuffer> Buf);
|
|
OwningBinary(OwningBinary<T>&& Other);
|
|
OwningBinary<T> &operator=(OwningBinary<T> &&Other);
|
|
|
|
std::pair<std::unique_ptr<T>, std::unique_ptr<MemoryBuffer>> takeBinary();
|
|
|
|
T* getBinary();
|
|
const T* getBinary() const;
|
|
};
|
|
|
|
template <typename T>
|
|
OwningBinary<T>::OwningBinary(std::unique_ptr<T> Bin,
|
|
std::unique_ptr<MemoryBuffer> Buf)
|
|
: Bin(std::move(Bin)), Buf(std::move(Buf)) {}
|
|
|
|
template <typename T> OwningBinary<T>::OwningBinary() {}
|
|
|
|
template <typename T>
|
|
OwningBinary<T>::OwningBinary(OwningBinary &&Other)
|
|
: Bin(std::move(Other.Bin)), Buf(std::move(Other.Buf)) {}
|
|
|
|
template <typename T>
|
|
OwningBinary<T> &OwningBinary<T>::operator=(OwningBinary &&Other) {
|
|
Bin = std::move(Other.Bin);
|
|
Buf = std::move(Other.Buf);
|
|
return *this;
|
|
}
|
|
|
|
template <typename T>
|
|
std::pair<std::unique_ptr<T>, std::unique_ptr<MemoryBuffer>>
|
|
OwningBinary<T>::takeBinary() {
|
|
return std::make_pair(std::move(Bin), std::move(Buf));
|
|
}
|
|
|
|
template <typename T> T* OwningBinary<T>::getBinary() {
|
|
return Bin.get();
|
|
}
|
|
|
|
template <typename T> const T* OwningBinary<T>::getBinary() const {
|
|
return Bin.get();
|
|
}
|
|
|
|
Expected<OwningBinary<Binary>> createBinary(StringRef Path);
|
|
}
|
|
}
|
|
|
|
#endif
|