mirror of
https://github.com/RPCSX/llvm.git
synced 2025-01-21 03:37:47 +00:00
813e0cf966
Produce another specific error message for a malformed Mach-O file when a symbol’s string index is past the end of the string table. The existing test case in test/Object/macho-invalid.test for macho-invalid-symbol-name-past-eof now reports the error with the message indicating that a symbol at a specific index has a bad sting index and that bad string index value. Again converting interfaces to Expected<> from ErrorOr<> does involve touching a number of places. Where the existing code reported the error with a string message or an error code it was converted to do the same. There is some code for this that could be factored into a routine but I would like to leave that for the code owners post-commit to do as they want for handling an llvm::Error. An example of how this could be done is shown in the diff in lib/ExecutionEngine/RuntimeDyld/RuntimeDyldImpl.h which had a Check() routine already for std::error_code so I added one like it for llvm::Error . 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(NameOrErr.takeError()) so the buggy code will not crash since needed to deal with the Error. Note there fixes needed to lld 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. git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@266919 91177308-0d34-0410-b5e6-96231b3b80d8
124 lines
4.2 KiB
C++
124 lines
4.2 KiB
C++
//===- ObjectFile.cpp - File format independent object 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 defines a file format independent ObjectFile class.
|
|
//
|
|
//===----------------------------------------------------------------------===//
|
|
|
|
#include "llvm/Object/COFF.h"
|
|
#include "llvm/Object/MachO.h"
|
|
#include "llvm/Object/ObjectFile.h"
|
|
#include "llvm/Support/ErrorHandling.h"
|
|
#include "llvm/Support/FileSystem.h"
|
|
#include "llvm/Support/MemoryBuffer.h"
|
|
#include "llvm/Support/raw_ostream.h"
|
|
#include <system_error>
|
|
|
|
using namespace llvm;
|
|
using namespace object;
|
|
|
|
void ObjectFile::anchor() { }
|
|
|
|
ObjectFile::ObjectFile(unsigned int Type, MemoryBufferRef Source)
|
|
: SymbolicFile(Type, Source) {}
|
|
|
|
bool SectionRef::containsSymbol(SymbolRef S) const {
|
|
ErrorOr<section_iterator> SymSec = S.getSection();
|
|
if (!SymSec)
|
|
return false;
|
|
return *this == **SymSec;
|
|
}
|
|
|
|
uint64_t ObjectFile::getSymbolValue(DataRefImpl Ref) const {
|
|
uint32_t Flags = getSymbolFlags(Ref);
|
|
if (Flags & SymbolRef::SF_Undefined)
|
|
return 0;
|
|
if (Flags & SymbolRef::SF_Common)
|
|
return getCommonSymbolSize(Ref);
|
|
return getSymbolValueImpl(Ref);
|
|
}
|
|
|
|
std::error_code ObjectFile::printSymbolName(raw_ostream &OS,
|
|
DataRefImpl Symb) const {
|
|
Expected<StringRef> Name = getSymbolName(Symb);
|
|
if (!Name)
|
|
return errorToErrorCode(Name.takeError());
|
|
OS << *Name;
|
|
return std::error_code();
|
|
}
|
|
|
|
uint32_t ObjectFile::getSymbolAlignment(DataRefImpl DRI) const { return 0; }
|
|
|
|
bool ObjectFile::isSectionBitcode(DataRefImpl Sec) const {
|
|
StringRef SectName;
|
|
if (!getSectionName(Sec, SectName))
|
|
return SectName == ".llvmbc";
|
|
return false;
|
|
}
|
|
|
|
section_iterator ObjectFile::getRelocatedSection(DataRefImpl Sec) const {
|
|
return section_iterator(SectionRef(Sec, this));
|
|
}
|
|
|
|
Expected<std::unique_ptr<ObjectFile>>
|
|
ObjectFile::createObjectFile(MemoryBufferRef Object, sys::fs::file_magic Type) {
|
|
StringRef Data = Object.getBuffer();
|
|
if (Type == sys::fs::file_magic::unknown)
|
|
Type = sys::fs::identify_magic(Data);
|
|
|
|
switch (Type) {
|
|
case sys::fs::file_magic::unknown:
|
|
case sys::fs::file_magic::bitcode:
|
|
case sys::fs::file_magic::archive:
|
|
case sys::fs::file_magic::macho_universal_binary:
|
|
case sys::fs::file_magic::windows_resource:
|
|
return errorCodeToError(object_error::invalid_file_type);
|
|
case sys::fs::file_magic::elf:
|
|
case sys::fs::file_magic::elf_relocatable:
|
|
case sys::fs::file_magic::elf_executable:
|
|
case sys::fs::file_magic::elf_shared_object:
|
|
case sys::fs::file_magic::elf_core:
|
|
return errorOrToExpected(createELFObjectFile(Object));
|
|
case sys::fs::file_magic::macho_object:
|
|
case sys::fs::file_magic::macho_executable:
|
|
case sys::fs::file_magic::macho_fixed_virtual_memory_shared_lib:
|
|
case sys::fs::file_magic::macho_core:
|
|
case sys::fs::file_magic::macho_preload_executable:
|
|
case sys::fs::file_magic::macho_dynamically_linked_shared_lib:
|
|
case sys::fs::file_magic::macho_dynamic_linker:
|
|
case sys::fs::file_magic::macho_bundle:
|
|
case sys::fs::file_magic::macho_dynamically_linked_shared_lib_stub:
|
|
case sys::fs::file_magic::macho_dsym_companion:
|
|
case sys::fs::file_magic::macho_kext_bundle:
|
|
return createMachOObjectFile(Object);
|
|
case sys::fs::file_magic::coff_object:
|
|
case sys::fs::file_magic::coff_import_library:
|
|
case sys::fs::file_magic::pecoff_executable:
|
|
return errorOrToExpected(createCOFFObjectFile(Object));
|
|
}
|
|
llvm_unreachable("Unexpected Object File Type");
|
|
}
|
|
|
|
Expected<OwningBinary<ObjectFile>>
|
|
ObjectFile::createObjectFile(StringRef ObjectPath) {
|
|
ErrorOr<std::unique_ptr<MemoryBuffer>> FileOrErr =
|
|
MemoryBuffer::getFile(ObjectPath);
|
|
if (std::error_code EC = FileOrErr.getError())
|
|
return errorCodeToError(EC);
|
|
std::unique_ptr<MemoryBuffer> Buffer = std::move(FileOrErr.get());
|
|
|
|
Expected<std::unique_ptr<ObjectFile>> ObjOrErr =
|
|
createObjectFile(Buffer->getMemBufferRef());
|
|
if (!ObjOrErr)
|
|
ObjOrErr.takeError();
|
|
std::unique_ptr<ObjectFile> Obj = std::move(ObjOrErr.get());
|
|
|
|
return OwningBinary<ObjectFile>(std::move(Obj), std::move(Buffer));
|
|
}
|