mirrors/tracy
1
0
Fork 0
mirror of https://github.com/wolfpld/tracy synced 2025-04-30 20:53:52 +00:00
Code Issues Releases Wiki Activity

Display jump/call target address.

Browse Source
This commit is contained in:
Bartosz Taudul 2020-03-28 01:22:27 +01:00
parent 28db0f6227
commit 86aad15e0c
2 changed files with 49 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

49
server/TracySourceView.cpp
View File

@ -18,6 +18,7 @@ SourceView::SourceView( ImFont* font )
: m_font( font ) : m_font( font )
, m_file( nullptr ) , m_file( nullptr )
, m_symAddr( 0 ) , m_symAddr( 0 )
, m_currentAddr( 0 )
, m_targetAddr( 0 ) , m_targetAddr( 0 )
, m_data( nullptr ) , m_data( nullptr )
, m_dataSize( 0 ) , m_dataSize( 0 )
@ -25,6 +26,7 @@ SourceView::SourceView( ImFont* font )
, m_selectedLine( 0 ) , m_selectedLine( 0 )
, m_showAsm( false ) , m_showAsm( false )
, m_codeLen( 0 ) , m_codeLen( 0 )
, m_highlightAddr( 0 )
{ {
} }
@ -40,6 +42,7 @@ void SourceView::Open( const char* fileName, int line, uint64_t baseAddr, uint64
m_targetAddr = symAddr; m_targetAddr = symAddr;
m_baseAddr = baseAddr; m_baseAddr = baseAddr;
m_symAddr = symAddr; m_symAddr = symAddr;
m_currentAddr = symAddr;
if( m_file != fileName ) if( m_file != fileName )
{ {
@ -206,6 +209,8 @@ bool SourceView::Disassemble( uint64_t symAddr, const Worker& worker )
void SourceView::Render( const Worker& worker ) void SourceView::Render( const Worker& worker )
{ {
m_highlightAddr.Decay( 0 );
if( m_file ) TextFocused( "File:", m_file ); if( m_file ) TextFocused( "File:", m_file );
if( !m_asm.empty() && !m_lines.empty() ) if( !m_asm.empty() && !m_lines.empty() )
@ -314,7 +319,7 @@ void SourceView::Render( const Worker& worker )
m_targetAddr = 0; m_targetAddr = 0;
ImGui::SetScrollHereY(); ImGui::SetScrollHereY();
} }
RenderAsmLine( line, 0, iptotal ); RenderAsmLine( line, 0, iptotal, worker );
} }
} }
else else
@ -326,7 +331,7 @@ void SourceView::Render( const Worker& worker )
{ {
for( auto i=clipper.DisplayStart; i<clipper.DisplayEnd; i++ ) for( auto i=clipper.DisplayStart; i<clipper.DisplayEnd; i++ )
{ {
RenderAsmLine( m_asm[i], 0, 0 ); RenderAsmLine( m_asm[i], 0, 0, worker );
} }
} }
else else
@ -336,7 +341,7 @@ void SourceView::Render( const Worker& worker )
auto& line = m_asm[i]; auto& line = m_asm[i];
auto it = ipcount.find( line.addr ); auto it = ipcount.find( line.addr );
const auto ipcnt = it == ipcount.end() ? 0 : it->second; const auto ipcnt = it == ipcount.end() ? 0 : it->second;
RenderAsmLine( line, ipcnt, iptotal ); RenderAsmLine( line, ipcnt, iptotal, worker );
} }
} }
} }
@ -429,16 +434,20 @@ void SourceView::RenderLine( const Line& line, int lineNum, uint32_t ipcnt, uint
draw->AddLine( wpos + ImVec2( 0, ty+2 ), wpos + ImVec2( w, ty+2 ), 0x08FFFFFF ); draw->AddLine( wpos + ImVec2( 0, ty+2 ), wpos + ImVec2( w, ty+2 ), 0x08FFFFFF );
} }
void SourceView::RenderAsmLine( const AsmLine& line, uint32_t ipcnt, uint32_t iptotal ) void SourceView::RenderAsmLine( const AsmLine& line, uint32_t ipcnt, uint32_t iptotal, const Worker& worker )
{ {
const auto ty = ImGui::GetFontSize(); const auto ty = ImGui::GetFontSize();
auto draw = ImGui::GetWindowDrawList(); auto draw = ImGui::GetWindowDrawList();
const auto w = ImGui::GetWindowWidth(); const auto w = ImGui::GetWindowWidth();
const auto wpos = ImGui::GetCursorScreenPos(); const auto wpos = ImGui::GetCursorScreenPos();
if( line.addr == m_symAddr ) if( line.addr == m_currentAddr )
{ {
draw->AddRectFilled( wpos, wpos + ImVec2( w, ty+1 ), 0xFF333322 ); draw->AddRectFilled( wpos, wpos + ImVec2( w, ty+1 ), 0xFF333322 );
} }
if( line.addr == m_highlightAddr )
{
draw->AddRectFilled( wpos, wpos + ImVec2( w, ty+1 ), 0xFF222233 );
}
if( iptotal != 0 ) if( iptotal != 0 )
{ {
@ -475,6 +484,36 @@ void SourceView::RenderAsmLine( const AsmLine& line, uint32_t ipcnt, uint32_t ip
memcpy( buf+16, line.operands.c_str(), line.operands.size() + 1 ); memcpy( buf+16, line.operands.c_str(), line.operands.size() + 1 );
ImGui::TextUnformatted( buf ); ImGui::TextUnformatted( buf );
if( line.jumpAddr != 0 )
{
uint32_t offset = 0;
const auto base = worker.GetSymbolForAddress( line.jumpAddr, offset );
auto sym = base == 0 ? worker.GetSymbolData( line.jumpAddr ) : worker.GetSymbolData( base );
if( sym )
{
ImGui::SameLine();
ImGui::Spacing();
ImGui::SameLine();
if( base == m_baseAddr )
{
ImGui::TextDisabled( "-> [%s+%" PRIu32"]", worker.GetString( sym->name ), offset );
if( ImGui::IsItemHovered() )
{
m_highlightAddr = line.jumpAddr;
if( ImGui::IsItemClicked() )
{
m_targetAddr = line.jumpAddr;
m_currentAddr = line.jumpAddr;
}
}
}
else
{
ImGui::TextDisabled( "[%s+%" PRIu32"]", worker.GetString( sym->name ), offset );
}
}
}
draw->AddLine( wpos + ImVec2( 0, ty+2 ), wpos + ImVec2( w, ty+2 ), 0x08FFFFFF ); draw->AddLine( wpos + ImVec2( 0, ty+2 ), wpos + ImVec2( w, ty+2 ), 0x08FFFFFF );
} }

6
server/TracySourceView.hpp
View File

@ -1,6 +1,8 @@
#include <string> #include <string>
#include <vector> #include <vector>
#include "TracyDecayValue.hpp"
struct ImFont; struct ImFont;
namespace tracy namespace tracy
@ -33,13 +35,14 @@ public:
private: private:
void RenderLine( const Line& line, int lineNum, uint32_t ipcnt, uint32_t iptotal ); void RenderLine( const Line& line, int lineNum, uint32_t ipcnt, uint32_t iptotal );
void RenderAsmLine( const AsmLine& line, uint32_t ipcnt, uint32_t iptotal ); void RenderAsmLine( const AsmLine& line, uint32_t ipcnt, uint32_t iptotal, const Worker& worker );
bool Disassemble( uint64_t symAddr, const Worker& worker ); bool Disassemble( uint64_t symAddr, const Worker& worker );
ImFont* m_font; ImFont* m_font;
const char* m_file; const char* m_file;
uint64_t m_symAddr; uint64_t m_symAddr;
uint64_t m_currentAddr;
uint64_t m_baseAddr; uint64_t m_baseAddr;
uint64_t m_targetAddr; uint64_t m_targetAddr;
char* m_data; char* m_data;
@ -48,6 +51,7 @@ private:
int m_selectedLine; int m_selectedLine;
bool m_showAsm; bool m_showAsm;
uint32_t m_codeLen; uint32_t m_codeLen;
DecayValue<uint64_t> m_highlightAddr;
std::vector<Line> m_lines; std::vector<Line> m_lines;
std::vector<AsmLine> m_asm; std::vector<AsmLine> m_asm;