From 08c58fe8e3f9ef5ee6bd022025ebbe8a85bc56cb Mon Sep 17 00:00:00 2001 From: Bartosz Taudul Date: Wed, 8 Apr 2020 23:59:10 +0200 Subject: [PATCH] Separate asm lines selection. --- server/TracySourceView.cpp | 9 +++++++-- server/TracySourceView.hpp | 1 + 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/server/TracySourceView.cpp b/server/TracySourceView.cpp index 39998cb6..77f07fe2 100644 --- a/server/TracySourceView.cpp +++ b/server/TracySourceView.cpp @@ -1035,10 +1035,15 @@ void SourceView::RenderAsmLine( const AsmLine& line, uint32_t ipcnt, uint32_t ip void SourceView::SelectLine( uint32_t line, const Worker* worker, bool changeAsmLine, uint64_t targetAddr ) { m_selectedLine = line; - m_selectedAddresses.clear(); if( m_symAddr == 0 ) return; assert( worker ); - auto addresses = worker->GetAddressesForLocation( m_fileStringIdx, line ); + SelectAsmLines( m_fileStringIdx, line, *worker, changeAsmLine, targetAddr ); +} + +void SourceView::SelectAsmLines( uint32_t file, uint32_t line, const Worker& worker, bool changeAsmLine, uint64_t targetAddr ) +{ + m_selectedAddresses.clear(); + auto addresses = worker.GetAddressesForLocation( file, line ); if( addresses ) { const auto& addr = *addresses; diff --git a/server/TracySourceView.hpp b/server/TracySourceView.hpp index d7e31d6d..63aba7df 100644 --- a/server/TracySourceView.hpp +++ b/server/TracySourceView.hpp @@ -67,6 +67,7 @@ private: void RenderAsmLine( const AsmLine& line, uint32_t ipcnt, uint32_t iptotal, const Worker& worker, uint64_t& jumpOut ); void SelectLine( uint32_t line, const Worker* worker, bool changeAsmLine = true, uint64_t targetAddr = 0 ); + void SelectAsmLines( uint32_t file, uint32_t line, const Worker& worker, bool changeAsmLine = true, uint64_t targetAddr = 0 ); ImFont* m_font; const char* m_file;