x64dbg/x64dbg
x64dbg
/
x64dbg
1
0
Fork 0
Code Releases 5 Activity

DBG: rename SymbolSourcePDB to SymbolSourceDIA

This commit is contained in:
Duncan Ogilvie 2018-01-09 16:44:13 +01:00
parent aec262b88a
commit ffc168f44d
No known key found for this signature in database
GPG Key ID: FC89E0AAA0C1AAD8
5 changed files with 34 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/dbg/module.cpp
View File

@ -3,7 +3,7 @@
#include "threading.h"
#include "symbolinfo.h"
#include "murmurhash.h"
#include "symbolsourcepdb.h"
#include "symbolsourcedia.h"
#include "memory.h"
#include "label.h"
#include <algorithm>
@ -401,9 +401,9 @@ bool ModLoad(duint Base, duint Size, const char* FullPath)
// Try DIA
if(info.symbols == &EmptySymbolSource &&
SymbolSourcePDB::isLibraryAvailable())
SymbolSourceDIA::isLibraryAvailable())
{
SymbolSourcePDB* symSource = new SymbolSourcePDB();
SymbolSourceDIA* symSource = new SymbolSourceDIA();
if(symSource->loadPDB(info.path, Base, info.size))
{
symSource->resizeSymbolBitmap(info.size);

36
src/dbg/symbolsourcepdb.cpp → src/dbg/symbolsourcedia.cpp
View File

@ -1,16 +1,16 @@
#include "symbolsourcepdb.h"
#include "symbolsourcedia.h"
#include "console.h"
#include "debugger.h"
#include <algorithm>
SymbolSourcePDB::SymbolSourcePDB()
SymbolSourceDIA::SymbolSourceDIA()
: _requiresShutdown(false),
_imageBase(0),
_loadCounter(0)
{
}
SymbolSourcePDB::~SymbolSourcePDB()
SymbolSourceDIA::~SymbolSourceDIA()
{
if(isLoading() || _symbolsThread.joinable() || _sourceLinesThread.joinable())
{
@ -35,7 +35,7 @@ static void SetThreadDescription(std::thread & thread, WString name)
fp(handle, name.c_str());
}
bool SymbolSourcePDB::loadPDB(const std::string & path, duint imageBase, duint imageSize)
bool SymbolSourceDIA::loadPDB(const std::string & path, duint imageBase, duint imageSize)
{
if(!PDBDiaFile::initLibrary())
{
@ -50,26 +50,26 @@ bool SymbolSourcePDB::loadPDB(const std::string & path, duint imageBase, duint i
_imageBase = imageBase;
_requiresShutdown = false;
_loadCounter.store(2);
_symbolsThread = std::thread(&SymbolSourcePDB::loadSymbolsAsync, this, path);
_symbolsThread = std::thread(&SymbolSourceDIA::loadSymbolsAsync, this, path);
SetThreadDescription(_symbolsThread, L"SymbolsThread");
_sourceLinesThread = std::thread(&SymbolSourcePDB::loadSourceLinesAsync, this, path);
_sourceLinesThread = std::thread(&SymbolSourceDIA::loadSourceLinesAsync, this, path);
SetThreadDescription(_symbolsThread, L"SourceLinesThread");
}
#endif
return res;
}
bool SymbolSourcePDB::isOpen() const
bool SymbolSourceDIA::isOpen() const
{
return _pdb.isOpen();
}
bool SymbolSourcePDB::isLoading() const
bool SymbolSourceDIA::isLoading() const
{
return _loadCounter > 0;
}
bool SymbolSourcePDB::cancelLoading()
bool SymbolSourceDIA::cancelLoading()
{
_requiresShutdown.store(true);
while(_loadCounter > 0)
@ -86,11 +86,11 @@ bool SymbolSourcePDB::cancelLoading()
return true;
}
void SymbolSourcePDB::loadPDBAsync()
void SymbolSourceDIA::loadPDBAsync()
{
}
bool SymbolSourcePDB::loadSymbolsAsync(String path)
bool SymbolSourceDIA::loadSymbolsAsync(String path)
{
ScopedDecrement ref(_loadCounter);
@ -214,7 +214,7 @@ bool SymbolSourcePDB::loadSymbolsAsync(String path)
return true;
}
bool SymbolSourcePDB::loadSourceLinesAsync(String path)
bool SymbolSourceDIA::loadSourceLinesAsync(String path)
{
ScopedDecrement ref(_loadCounter);
@ -298,7 +298,7 @@ bool SymbolSourcePDB::loadSourceLinesAsync(String path)
return true;
}
bool SymbolSourcePDB::findSymbolExact(duint rva, SymbolInfo & symInfo)
bool SymbolSourceDIA::findSymbolExact(duint rva, SymbolInfo & symInfo)
{
ScopedSpinLock lock(_lockSymbols);
@ -336,7 +336,7 @@ typename A::iterator findExactOrLower(A & ctr, const B key)
return itr;
}
bool SymbolSourcePDB::findSymbolExactOrLower(duint rva, SymbolInfo & symInfo)
bool SymbolSourceDIA::findSymbolExactOrLower(duint rva, SymbolInfo & symInfo)
{
ScopedSpinLock lock(_lockSymbols);
@ -351,7 +351,7 @@ bool SymbolSourcePDB::findSymbolExactOrLower(duint rva, SymbolInfo & symInfo)
return nullptr;
}
void SymbolSourcePDB::enumSymbols(const CbEnumSymbol & cbEnum)
void SymbolSourceDIA::enumSymbols(const CbEnumSymbol & cbEnum)
{
ScopedSpinLock lock(_lockSymbols);
@ -365,7 +365,7 @@ void SymbolSourcePDB::enumSymbols(const CbEnumSymbol & cbEnum)
}
}
bool SymbolSourcePDB::findSourceLineInfo(duint rva, LineInfo & lineInfo)
bool SymbolSourceDIA::findSourceLineInfo(duint rva, LineInfo & lineInfo)
{
if(isOpen() == false)
return false;
@ -398,7 +398,7 @@ ForwardIt binary_find(ForwardIt first, ForwardIt last, const T & value, Compare
return first != last && !comp(value, *first) ? first : last;
}
bool SymbolSourcePDB::findSymbolByName(const std::string & name, SymbolInfo & symInfo, bool caseSensitive)
bool SymbolSourceDIA::findSymbolByName(const std::string & name, SymbolInfo & symInfo, bool caseSensitive)
{
ScopedSpinLock lock(_lockSymbols);
@ -421,7 +421,7 @@ bool SymbolSourcePDB::findSymbolByName(const std::string & name, SymbolInfo & sy
return false;
}
bool SymbolSourcePDB::findSymbolsByPrefix(const std::string & prefix, const std::function<bool(const SymbolInfo &)> & cbSymbol, bool caseSensitive)
bool SymbolSourceDIA::findSymbolsByPrefix(const std::string & prefix, const std::function<bool(const SymbolInfo &)> & cbSymbol, bool caseSensitive)
{
struct PrefixCmp
{

10
src/dbg/symbolsourcepdb.h → src/dbg/symbolsourcedia.h
View File

@ -1,5 +1,5 @@
#ifndef _SYMBOLSOURCEPDB_H_
#define _SYMBOLSOURCEPDB_H_
#ifndef _SYMBOLSOURCEDIA_H_
#define _SYMBOLSOURCEDIA_H_
#include "pdbdiafile.h"
#include "symbolsourcebase.h"
@ -35,7 +35,7 @@ public:
~ScopedSpinLock() { _lock.unlock(); }
};
class SymbolSourcePDB : public SymbolSourceBase
class SymbolSourceDIA : public SymbolSourceBase
{
struct CachedLineInfo
{
@ -123,9 +123,9 @@ public:
}
public:
SymbolSourcePDB();
SymbolSourceDIA();
virtual ~SymbolSourcePDB() override;
virtual ~SymbolSourceDIA() override;
virtual bool isOpen() const override;

4
src/dbg/x64dbg_dbg.vcxproj
View File

@ -100,7 +100,7 @@
<ClCompile Include="stringformat.cpp" />
<ClCompile Include="stringutils.cpp" />
<ClCompile Include="symbolinfo.cpp" />
<ClCompile Include="symbolsourcepdb.cpp" />
<ClCompile Include="symbolsourcedia.cpp" />
<ClCompile Include="symcache.cpp" />
<ClCompile Include="tcpconnections.cpp" />
<ClCompile Include="thread.cpp" />
@ -236,7 +236,7 @@
<ClInclude Include="serializablemap.h" />
<ClInclude Include="sortedlru.h" />
<ClInclude Include="symbolsourcebase.h" />
<ClInclude Include="symbolsourcepdb.h" />
<ClInclude Include="symbolsourcedia.h" />
<ClInclude Include="symcache.h" />
<ClInclude Include="taskthread.h" />
<ClInclude Include="tcpconnections.h" />

12
src/dbg/x64dbg_dbg.vcxproj.filters
View File

@ -434,9 +434,6 @@
<ClCompile Include="symcache.cpp">
<Filter>Source Files\Symbols</Filter>
</ClCompile>
<ClCompile Include="symbolsourcepdb.cpp">
<Filter>Source Files\Symbols</Filter>
</ClCompile>
<ClCompile Include="symbolinfo.cpp">
<Filter>Source Files\Symbols</Filter>
</ClCompile>
@ -446,6 +443,9 @@
<ClCompile Include="msdia\diacreate.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="symbolsourcedia.cpp">
<Filter>Source Files\Symbols</Filter>
</ClCompile>
</ItemGroup>
<ItemGroup>
<ClInclude Include="dbghelp\dbghelp.h">
@ -958,9 +958,6 @@
<ClInclude Include="msdia\diaCreate.h">
<Filter>Header Files\Third Party\msdia</Filter>
</ClInclude>
<ClInclude Include="symbolsourcepdb.h">
<Filter>Header Files\Symbols</Filter>
</ClInclude>
<ClInclude Include="symbolsourcebase.h">
<Filter>Header Files\Symbols</Filter>
</ClInclude>
@ -979,5 +976,8 @@
<ClInclude Include="sortedlru.h">
<Filter>Header Files\Symbols</Filter>
</ClInclude>
<ClInclude Include="symbolsourcedia.h">
<Filter>Header Files\Symbols</Filter>
</ClInclude>
</ItemGroup>
</Project>