mirrors/tracy
1
0
Fork 0
mirror of https://github.com/wolfpld/tracy synced 2025-05-01 13:13:53 +00:00
Code Issues Releases Wiki Activity

Search for base address when if symbol address is inlined.

Browse Source
This commit is contained in:
Bartosz Taudul 2020-03-27 21:04:23 +01:00
parent 4b78559228
commit 45b8622bc9
2 changed files with 28 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
server/TracyView.cpp
View File

@ -199,6 +199,33 @@ void View::SetTextEditorFile( const char* fileName, int line, uint64_t baseAddr,
m_sourceView->Open( fileName, line, baseAddr, symAddr, m_worker ); m_sourceView->Open( fileName, line, baseAddr, symAddr, m_worker );
} }
void View::SetTextEditorFile( const char* fileName, int line, uint64_t symAddr )
{
if( symAddr == 0 )
{
SetTextEditorFile( fileName, line, 0, 0 );
}
else
{
const auto& symMap = m_worker.GetSymbolMap();
auto sit = symMap.find( symAddr );
auto baseAddr = symAddr;
uint32_t symlen = 0;
if( sit != symMap.end() ) symlen = sit->second.size.Val();
if( symlen == 0 )
{
uint32_t offset;
const auto parentAddr = m_worker.GetSymbolForAddress( symAddr, offset );
if( parentAddr != 0 )
{
auto pit = symMap.find( parentAddr );
if( pit != symMap.end() ) baseAddr = parentAddr;
}
}
SetTextEditorFile( fileName, line, baseAddr, symAddr );
}
}
const char* View::ShortenNamespace( const char* name ) const const char* View::ShortenNamespace( const char* name ) const
{ {
if( m_namespace == Namespace::Full ) return name; if( m_namespace == Namespace::Full ) return name;

2
server/TracyView.hpp
View File

@ -81,7 +81,7 @@ public:
void NotifyRootWindowSize( float w, float h ) { m_rootWidth = w; m_rootHeight = h; } void NotifyRootWindowSize( float w, float h ) { m_rootWidth = w; m_rootHeight = h; }
void SetTextEditorFile( const char* fileName, int line, uint64_t baseAddr, uint64_t symAddr ); void SetTextEditorFile( const char* fileName, int line, uint64_t baseAddr, uint64_t symAddr );
void SetTextEditorFile( const char* fileName, int line, uint64_t symAddr ) { SetTextEditorFile( fileName, line, symAddr, symAddr ); } void SetTextEditorFile( const char* fileName, int line, uint64_t symAddr );
bool ReconnectRequested() const { return m_reconnectRequested; } bool ReconnectRequested() const { return m_reconnectRequested; }
std::string GetAddress() const { return m_worker.GetAddr(); } std::string GetAddress() const { return m_worker.GetAddr(); }