RPCS3/llvm-mirror
1
0
Fork 0
mirror of https://github.com/RPCS3/llvm-mirror.git synced 2024-10-20 19:42:54 +02:00
Code Issues Projects Releases Wiki Activity

PDB - Instead of hardcoding stream numbers, use an enum.

Browse Source 
llvm-svn: 268270
This commit is contained in:
Zachary Turner 2016-05-02 18:09:21 +00:00
parent 90c3bf1135
commit d29e53f76f
3 changed files with 24 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
include/llvm/DebugInfo/PDB/Raw/RawConstants.h
View File

@ -34,6 +34,13 @@ enum PdbRaw_DbiVer : uint32_t {
PdbDbiV70 = 19990903, PdbDbiV70 = 19990903,
PdbDbiV110 = 20091201 PdbDbiV110 = 20091201
}; };
enum SpecialStream : uint32_t {
StreamPDB = 1,
StreamTPI = 2,
StreamDBI = 3,
StreamIPI = 4,
};
} }
} }

2
lib/DebugInfo/PDB/Raw/DbiStream.cpp
View File

@ -71,7 +71,7 @@ struct DbiStream::HeaderInfo {
ulittle32_t Reserved; // Pad to 64 bytes ulittle32_t Reserved; // Pad to 64 bytes
}; };
DbiStream::DbiStream(PDBFile &File) : Pdb(File), Stream(3, File) { DbiStream::DbiStream(PDBFile &File) : Pdb(File), Stream(StreamDBI, File) {
static_assert(sizeof(HeaderInfo) == 64, "Invalid HeaderInfo size!"); static_assert(sizeof(HeaderInfo) == 64, "Invalid HeaderInfo size!");
} }

27
lib/DebugInfo/PDB/Raw/InfoStream.cpp
View File

@ -10,30 +10,35 @@
#include "llvm/DebugInfo/PDB/Raw/InfoStream.h" #include "llvm/DebugInfo/PDB/Raw/InfoStream.h"
#include "llvm/ADT/BitVector.h" #include "llvm/ADT/BitVector.h"
#include "llvm/ADT/SmallVector.h" #include "llvm/ADT/SmallVector.h"
#include "llvm/DebugInfo/PDB/Raw/RawConstants.h"
#include "llvm/DebugInfo/PDB/Raw/StreamReader.h" #include "llvm/DebugInfo/PDB/Raw/StreamReader.h"
using namespace llvm; using namespace llvm;
using namespace llvm::pdb; using namespace llvm::pdb;
InfoStream::InfoStream(PDBFile &File) : Pdb(File), Stream(1, File) {} InfoStream::InfoStream(PDBFile &File) : Pdb(File), Stream(StreamPDB, File) {}
std::error_code InfoStream::reload() { std::error_code InfoStream::reload() {
StreamReader Reader(Stream); StreamReader Reader(Stream);
support::ulittle32_t Value; struct Header {
support::ulittle32_t Version;
support::ulittle32_t Signature;
support::ulittle32_t Age;
PDB_UniqueId Guid;
};
Reader.readObject(&Value); Header H;
Version = Value; Reader.readObject(&H);
if (Version < PdbRaw_ImplVer::PdbImplVC70)
if (H.Version < PdbRaw_ImplVer::PdbImplVC70)
return std::make_error_code(std::errc::not_supported); return std::make_error_code(std::errc::not_supported);
Reader.readObject(&Value); Version = H.Version;
Signature = Value; Signature = H.Signature;
Age = H.Age;
Guid = H.Guid;
Reader.readObject(&Value);
Age = Value;
Reader.readObject(&Guid);
NamedStreams.load(Reader); NamedStreams.load(Reader);
return std::error_code(); return std::error_code();