Add PDB section reading to bfd (using LLVM now)
This commit is contained in:
parent
12d1289ad6
commit
f6d5862ceb
162
bfd/pdb.cpp
162
bfd/pdb.cpp
|
@ -2,6 +2,11 @@
|
||||||
|
|
||||||
#include "pdb.h"
|
#include "pdb.h"
|
||||||
|
|
||||||
|
#pragma clang diagnostic push
|
||||||
|
#pragma ide diagnostic ignored "UnusedLocalVariable"
|
||||||
|
#pragma ide diagnostic ignored "UnusedMacroInspection"
|
||||||
|
#pragma ide diagnostic ignored "UnusedGlobalDeclarationInspection"
|
||||||
|
|
||||||
/* Called when the BFD is being closed to do any necessary cleanup. */
|
/* Called when the BFD is being closed to do any necessary cleanup. */
|
||||||
bfd_boolean
|
bfd_boolean
|
||||||
bfd_pdb_close_and_cleanup (bfd *abfd)
|
bfd_pdb_close_and_cleanup (bfd *abfd)
|
||||||
|
@ -81,35 +86,172 @@ bfd_pdb_find_nearest_line (bfd *abfd,
|
||||||
#define bfd_pdb_read_minisymbols _bfd_nosymbols_read_minisymbols
|
#define bfd_pdb_read_minisymbols _bfd_nosymbols_read_minisymbols
|
||||||
#define bfd_pdb_minisymbol_to_symbol _bfd_nosymbols_minisymbol_to_symbol
|
#define bfd_pdb_minisymbol_to_symbol _bfd_nosymbols_minisymbol_to_symbol
|
||||||
|
|
||||||
|
#pragma clang diagnostic pop
|
||||||
|
|
||||||
|
class BfdByteStream;
|
||||||
|
|
||||||
static bfd_pdb_data_struct *
|
static bfd_pdb_data_struct *
|
||||||
get_bfd_pdb_data (bfd *abfd)
|
get_bfd_pdb_data (bfd *abfd)
|
||||||
{
|
{
|
||||||
return NULL;
|
//TODO: check file magic
|
||||||
|
|
||||||
|
auto allocator = std::make_unique<llvm::BumpPtrAllocator> ();
|
||||||
|
|
||||||
|
auto stream = std::make_unique<BfdByteStream> (abfd);
|
||||||
|
auto pdbFile = std::make_unique<llvm::pdb::PDBFile> (abfd->filename, std::move (stream), *allocator);
|
||||||
|
|
||||||
|
//TODO: proper error handling, only if magic says we're actually reading a PDB file
|
||||||
|
auto ec = pdbFile->parseFileHeaders ();
|
||||||
|
if (ec)
|
||||||
|
{
|
||||||
|
//printf ("%s: error: %s\n", abfd->filename, toString (std::move (ec)).c_str ());
|
||||||
|
return nullptr;
|
||||||
|
}
|
||||||
|
|
||||||
|
ec = pdbFile->parseStreamData ();
|
||||||
|
if (ec)
|
||||||
|
{
|
||||||
|
//printf ("%s: error: %s\n", abfd->filename, toString (std::move (ec)).c_str ());
|
||||||
|
return nullptr;
|
||||||
|
}
|
||||||
|
|
||||||
|
auto session = std::make_unique<llvm::pdb::NativeSession> (std::move (pdbFile),
|
||||||
|
std::move (allocator));
|
||||||
|
|
||||||
|
auto resultBuffer = bfd_alloc (abfd, sizeof (bfd_pdb_data_struct));
|
||||||
|
auto result = new (resultBuffer) bfd_pdb_data_struct;
|
||||||
|
result->session = std::move (session);
|
||||||
|
return result;
|
||||||
}
|
}
|
||||||
|
|
||||||
void
|
bool
|
||||||
bfd_pdb_get_sections (bfd *abfd)
|
bfd_pdb_get_sections (bfd *abfd)
|
||||||
{
|
{
|
||||||
|
auto & session = abfd->tdata.pdb_data->session;
|
||||||
|
auto & pdbFile = session->getPDBFile ();
|
||||||
|
|
||||||
|
auto dbi = pdbFile.getPDBDbiStream ();
|
||||||
|
auto streamIndex = dbi->getDebugStreamIndex (llvm::pdb::DbgHeaderType::SectionHdr);
|
||||||
|
auto stream = pdbFile.createIndexedStream (streamIndex);
|
||||||
|
|
||||||
|
llvm::ArrayRef<llvm::object::coff_section> headers;
|
||||||
|
auto headerCount = stream->getLength () / sizeof (llvm::object::coff_section);
|
||||||
|
llvm::BinaryStreamReader reader (*stream);
|
||||||
|
if(reader.readArray (headers, headerCount))
|
||||||
|
{
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
|
for (auto & header: headers)
|
||||||
|
{
|
||||||
|
asection *section = bfd_make_section_with_flags (abfd,
|
||||||
|
header.Name,
|
||||||
|
SEC_LOAD);
|
||||||
|
section->vma = header.VirtualAddress;
|
||||||
|
section->size = header.VirtualSize;
|
||||||
|
//section->userdata = header;
|
||||||
|
}
|
||||||
|
|
||||||
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
class BfdByteStream : public llvm::BinaryStream {
|
||||||
|
public:
|
||||||
|
explicit BfdByteStream (bfd *abfd) : abfd (abfd)
|
||||||
|
{
|
||||||
|
}
|
||||||
|
|
||||||
|
llvm::support::endianness getEndian () const override
|
||||||
|
{
|
||||||
|
return llvm::support::little;
|
||||||
|
}
|
||||||
|
|
||||||
|
llvm::Error readBytes (uint32_t Offset, uint32_t Size, llvm::ArrayRef<uint8_t> & Buffer) override
|
||||||
|
{
|
||||||
|
//We need to cache the whole PDB file in memory:
|
||||||
|
//During parsing, the LLVM functions first read one block of PDB data into an ArrayRef. They
|
||||||
|
//then just assume all blocks are stored contiguously in memory and simply change the `size`
|
||||||
|
//field of the ArrayRef instead of actually reading the remaining blocks...
|
||||||
|
|
||||||
|
if (!cached)
|
||||||
|
{
|
||||||
|
auto ec = this->createCache ();
|
||||||
|
if (ec) return ec;
|
||||||
|
}
|
||||||
|
|
||||||
|
//printf ("%s: readBytes(offset=%d,size=%d)\n", abfd->filename, Offset, Size);
|
||||||
|
|
||||||
|
Buffer = llvm::ArrayRef<uint8_t> (cache + Offset, (size_t) Size);
|
||||||
|
return llvm::Error::success ();
|
||||||
|
}
|
||||||
|
|
||||||
|
llvm::Error
|
||||||
|
readLongestContiguousChunk (uint32_t Offset, llvm::ArrayRef<uint8_t> & Buffer) override
|
||||||
|
{
|
||||||
|
return readBytes (Offset, getLength () - Offset, Buffer);
|
||||||
|
}
|
||||||
|
|
||||||
|
uint32_t getLength () override
|
||||||
|
{
|
||||||
|
if (fileSize != -1)
|
||||||
|
return fileSize;
|
||||||
|
|
||||||
|
struct stat stat{};
|
||||||
|
if (bfd_stat (abfd, &stat) < 0)
|
||||||
|
return -1;
|
||||||
|
|
||||||
|
fileSize = stat.st_size;
|
||||||
|
|
||||||
|
//printf("stat.st_size=%ld\n", stat.st_size);
|
||||||
|
return fileSize;
|
||||||
|
}
|
||||||
|
|
||||||
|
private:
|
||||||
|
llvm::Error
|
||||||
|
createCache ()
|
||||||
|
{
|
||||||
|
if (cached) return llvm::Error::success ();
|
||||||
|
|
||||||
|
auto length = getLength ();
|
||||||
|
|
||||||
|
cache = static_cast<uint8_t *>(bfd_alloc (abfd, length));
|
||||||
|
if (bfd_seek (abfd, 0, SEEK_SET) != 0)
|
||||||
|
return llvm::createStringError (std::error_code (), "EOF");
|
||||||
|
if (bfd_bread (cache, length, abfd) != length)
|
||||||
|
return llvm::createStringError (std::error_code (), "EOF");
|
||||||
|
|
||||||
|
cached = true;
|
||||||
|
|
||||||
|
return llvm::Error::success ();
|
||||||
|
}
|
||||||
|
|
||||||
|
bfd *abfd;
|
||||||
|
bool cached = false;
|
||||||
|
uint8_t *cache = nullptr;
|
||||||
|
size_t fileSize = -1;
|
||||||
|
};
|
||||||
|
|
||||||
const bfd_target *
|
const bfd_target *
|
||||||
bfd_pdb_check_format (bfd *abfd)
|
bfd_pdb_check_format (bfd *abfd)
|
||||||
{
|
{
|
||||||
if ((abfd->tdata.pdb_data = get_bfd_pdb_data (abfd)))
|
if ((abfd->tdata.pdb_data = get_bfd_pdb_data (abfd)))
|
||||||
{
|
{
|
||||||
if (true)
|
auto & pdbData = abfd->tdata.pdb_data;
|
||||||
{
|
|
||||||
goto fail;
|
if (!bfd_pdb_get_sections (abfd))
|
||||||
}
|
goto fail;
|
||||||
|
|
||||||
return abfd->xvec;
|
return abfd->xvec;
|
||||||
}
|
}
|
||||||
|
|
||||||
fail:
|
fail:
|
||||||
bfd_set_error (bfd_error_wrong_format);
|
bfd_set_error (bfd_error_wrong_format);
|
||||||
return NULL;
|
return nullptr;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#pragma clang diagnostic push
|
||||||
|
#pragma ide diagnostic ignored "hicpp-signed-bitwise"
|
||||||
|
|
||||||
extern "C"
|
extern "C"
|
||||||
const bfd_target pdb_vec =
|
const bfd_target pdb_vec =
|
||||||
{
|
{
|
||||||
|
@ -166,7 +308,9 @@ const bfd_target pdb_vec =
|
||||||
BFD_JUMP_TABLE_LINK (_bfd_nolink),
|
BFD_JUMP_TABLE_LINK (_bfd_nolink),
|
||||||
BFD_JUMP_TABLE_DYNAMIC (_bfd_nodynamic),
|
BFD_JUMP_TABLE_DYNAMIC (_bfd_nodynamic),
|
||||||
|
|
||||||
NULL,
|
nullptr,
|
||||||
|
|
||||||
NULL
|
nullptr
|
||||||
};
|
};
|
||||||
|
|
||||||
|
#pragma clang diagnostic pop
|
19
bfd/pdb.h
19
bfd/pdb.h
|
@ -1,11 +1,24 @@
|
||||||
/* PDB support for BFD. */
|
/* PDB support for BFD. */
|
||||||
|
|
||||||
extern "C"
|
|
||||||
{
|
|
||||||
#include "sysdep.h"
|
#include "sysdep.h"
|
||||||
#include "bfd.h"
|
#include "bfd.h"
|
||||||
#include "libbfd.h"
|
#include "libbfd.h"
|
||||||
|
|
||||||
|
#include <memory>
|
||||||
|
#include <iostream>
|
||||||
|
#include <llvm/Support/ErrorOr.h>
|
||||||
|
#include <llvm/Support/Error.h>
|
||||||
|
#include <llvm/Support/MemoryBuffer.h>
|
||||||
|
#include <llvm/Support/BinaryStream.h>
|
||||||
|
#include <llvm/Support/Allocator.h>
|
||||||
|
#include <llvm/DebugInfo/PDB/Native/PDBFile.h>
|
||||||
|
#include <llvm/DebugInfo/PDB/Native/DbiStream.h>
|
||||||
|
#include <llvm/DebugInfo/PDB/Native/NativeSession.h>
|
||||||
|
#include <llvm/DebugInfo/PDB/IPDBSectionContrib.h>
|
||||||
|
#include <llvm/DebugInfo/PDB/PDBSymbolCompiland.h>
|
||||||
|
#include <llvm/DebugInfo/PDB/IPDBTable.h>
|
||||||
|
#include <llvm/Object/COFF.h>
|
||||||
|
|
||||||
typedef struct pdb_data_struct {
|
typedef struct pdb_data_struct {
|
||||||
|
std::unique_ptr<llvm::pdb::NativeSession> session;
|
||||||
} bfd_pdb_data_struct;
|
} bfd_pdb_data_struct;
|
||||||
}
|
|
|
@ -28,7 +28,7 @@ char* msvc_demangle(const char* sym, int options)
|
||||||
flags = llvm::MSDemangleFlags(flags | llvm::MSDF_NoReturnType);
|
flags = llvm::MSDemangleFlags(flags | llvm::MSDF_NoReturnType);
|
||||||
}
|
}
|
||||||
|
|
||||||
#if LLVM_VERSION_MAJOR > 10 || LLVM_VERSION_MAJOR == 10 && (LLVM_VERSION_MINOR > 0 || LLVM_VERSION_PATCH > 0)
|
#if LLVM_VERSION_MAJOR > 10
|
||||||
auto demangled = llvm::microsoftDemangle(mangled, nullptr, nullptr, nullptr, nullptr, flags);
|
auto demangled = llvm::microsoftDemangle(mangled, nullptr, nullptr, nullptr, nullptr, flags);
|
||||||
#else
|
#else
|
||||||
auto demangled = llvm::microsoftDemangle(mangled, nullptr, nullptr, nullptr, flags);
|
auto demangled = llvm::microsoftDemangle(mangled, nullptr, nullptr, nullptr, flags);
|
||||||
|
|
Loading…
Reference in New Issue