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

Remove support for AT&T assembly syntax.

Browse Source
This commit is contained in:
Bartosz Taudul 2023-02-10 20:41:03 +01:00
parent 0d6fb703b4
commit 55823df56a
No known key found for this signature in database
GPG Key ID: B7FE2008B7575DF3
2 changed files with 49 additions and 60 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

108
server/TracySourceView.cpp
View File

@ -257,7 +257,6 @@ SourceView::SourceView()
, m_asmBytes( false ) , m_asmBytes( false )
, m_asmShowSourceLocation( true ) , m_asmShowSourceLocation( true )
, m_calcInlineStats( true ) , m_calcInlineStats( true )
, m_atnt( false )
, m_hwSamples( true ) , m_hwSamples( true )
, m_hwSamplesRelative( true ) , m_hwSamplesRelative( true )
, m_childCalls( false ) , m_childCalls( false )
@ -706,7 +705,7 @@ bool SourceView::Disassemble( uint64_t symAddr, const Worker& worker )
} }
if( rval != CS_ERR_OK ) return false; if( rval != CS_ERR_OK ) return false;
cs_option( handle, CS_OPT_DETAIL, CS_OPT_ON ); cs_option( handle, CS_OPT_DETAIL, CS_OPT_ON );
cs_option( handle, CS_OPT_SYNTAX, m_atnt ? CS_OPT_SYNTAX_ATT : CS_OPT_SYNTAX_INTEL ); cs_option( handle, CS_OPT_SYNTAX, CS_OPT_SYNTAX_INTEL );
cs_insn* insn; cs_insn* insn;
size_t cnt = cs_disasm( handle, (const uint8_t*)code, len, symAddr, 0, &insn ); size_t cnt = cs_disasm( handle, (const uint8_t*)code, len, symAddr, 0, &insn );
if( cnt > 0 ) if( cnt > 0 )
@ -879,9 +878,8 @@ bool SourceView::Disassemble( uint64_t symAddr, const Worker& worker )
if( ( m_cpuArch == CpuArchX64 || m_cpuArch == CpuArchX86 ) && op.id == X86_INS_LEA ) if( ( m_cpuArch == CpuArchX64 || m_cpuArch == CpuArchX86 ) && op.id == X86_INS_LEA )
{ {
assert( op.detail->x86.op_count == 2 ); assert( op.detail->x86.op_count == 2 );
const auto opidx = m_atnt ? 0 : 1; assert( op.detail->x86.operands[1].type == X86_OP_MEM );
assert( op.detail->x86.operands[opidx].type == X86_OP_MEM ); auto& mem = op.detail->x86.operands[1].mem;
auto& mem = op.detail->x86.operands[opidx].mem;
if( mem.base == X86_REG_INVALID ) if( mem.base == X86_REG_INVALID )
{ {
if( mem.index == X86_REG_INVALID ) if( mem.index == X86_REG_INVALID )
@ -2363,63 +2361,55 @@ uint64_t SourceView::RenderSymbolAsmView( const AddrStatData& as, Worker& worker
ImGui::SameLine(); ImGui::SameLine();
ImGui::Spacing(); ImGui::Spacing();
ImGui::SameLine(); ImGui::SameLine();
if( SmallCheckbox( "AT&T", &m_atnt ) ) Disassemble( m_baseAddr, worker ); float mw = 0;
for( auto& v : s_uArchUx )
if( !m_atnt )
{ {
ImGui::SameLine(); const auto w = ImGui::CalcTextSize( v.uArch ).x;
ImGui::Spacing(); if( w > mw ) mw = w;
ImGui::SameLine(); }
float mw = 0; if( m_selMicroArch == m_profileMicroArch )
{
TextColoredUnformatted( ImVec4( 0.4f, 0.8f, 0.4f, 1.f ), ICON_FA_MICROCHIP );
TooltipIfHovered( "Selected microarchitecture is the same as the profiled application was running on" );
}
else
{
TextColoredUnformatted( ImVec4( 1.f, 0.3f, 0.3f, 1.f ), ICON_FA_MICROCHIP );
if( ImGui::IsItemHovered() )
{
const bool clicked = ImGui::IsItemClicked();
ImGui::BeginTooltip();
ImGui::TextUnformatted( "Selected microarchitecture does not match the one profiled application was running on" );
if( m_profileMicroArch >= 0 )
{
ImGui::Text( "Measurements were performed on the %s microarchitecture", s_uArchUx[m_profileMicroArch].uArch );
if( clicked ) SelectMicroArchitecture( s_uArchUx[m_profileMicroArch].moniker );
}
else
{
ImGui::TextUnformatted( "Measurements were performed on an unknown microarchitecture" );
}
ImGui::EndTooltip();
}
}
ImGui::SameLine( 0, 0 );
ImGui::TextUnformatted( " \xce\xbc""arch:" );
ImGui::SameLine();
ImGui::SetNextItemWidth( mw + ImGui::GetTextLineHeight() );
ImGui::PushStyleVar( ImGuiStyleVar_FramePadding, ImVec2( 0, 0 ) );
if( ImGui::BeginCombo( "##uarch", s_uArchUx[m_selMicroArch].uArch, ImGuiComboFlags_HeightLarge ) )
{
int idx = 0;
for( auto& v : s_uArchUx ) for( auto& v : s_uArchUx )
{ {
const auto w = ImGui::CalcTextSize( v.uArch ).x; if( ImGui::Selectable( v.uArch, idx == m_selMicroArch ) ) SelectMicroArchitecture( v.moniker );
if( w > mw ) mw = w; ImGui::SameLine();
TextDisabledUnformatted( v.cpuName );
idx++;
} }
if( m_selMicroArch == m_profileMicroArch ) ImGui::EndCombo();
{
TextColoredUnformatted( ImVec4( 0.4f, 0.8f, 0.4f, 1.f ), ICON_FA_MICROCHIP );
TooltipIfHovered( "Selected microarchitecture is the same as the profiled application was running on" );
}
else
{
TextColoredUnformatted( ImVec4( 1.f, 0.3f, 0.3f, 1.f ), ICON_FA_MICROCHIP );
if( ImGui::IsItemHovered() )
{
const bool clicked = ImGui::IsItemClicked();
ImGui::BeginTooltip();
ImGui::TextUnformatted( "Selected microarchitecture does not match the one profiled application was running on" );
if( m_profileMicroArch >= 0 )
{
ImGui::Text( "Measurements were performed on the %s microarchitecture", s_uArchUx[m_profileMicroArch].uArch );
if( clicked ) SelectMicroArchitecture( s_uArchUx[m_profileMicroArch].moniker );
}
else
{
ImGui::TextUnformatted( "Measurements were performed on an unknown microarchitecture" );
}
ImGui::EndTooltip();
}
}
ImGui::SameLine( 0, 0 );
ImGui::TextUnformatted( " \xce\xbc""arch:" );
ImGui::SameLine();
ImGui::SetNextItemWidth( mw + ImGui::GetTextLineHeight() );
ImGui::PushStyleVar( ImGuiStyleVar_FramePadding, ImVec2( 0, 0 ) );
if( ImGui::BeginCombo( "##uarch", s_uArchUx[m_selMicroArch].uArch, ImGuiComboFlags_HeightLarge ) )
{
int idx = 0;
for( auto& v : s_uArchUx )
{
if( ImGui::Selectable( v.uArch, idx == m_selMicroArch ) ) SelectMicroArchitecture( v.moniker );
ImGui::SameLine();
TextDisabledUnformatted( v.cpuName );
idx++;
}
ImGui::EndCombo();
}
ImGui::PopStyleVar();
} }
ImGui::PopStyleVar();
} }
ImGui::SameLine(); ImGui::SameLine();
@ -3936,7 +3926,7 @@ void SourceView::RenderAsmLine( AsmLine& line, const AddrStat& ipcnt, const Addr
int opdesc = 0; int opdesc = 0;
const AsmVar* asmVar = nullptr; const AsmVar* asmVar = nullptr;
if( !m_atnt && ( m_cpuArch == CpuArchX64 || m_cpuArch == CpuArchX86 ) ) if( m_cpuArch == CpuArchX64 || m_cpuArch == CpuArchX86 )
{ {
auto uarch = MicroArchitectureData[m_idxMicroArch]; auto uarch = MicroArchitectureData[m_idxMicroArch];
char tmp[32]; char tmp[32];
@ -5569,7 +5559,7 @@ void SourceView::Save( const Worker& worker, size_t start, size_t stop )
symName = worker.GetString( sym->name ); symName = worker.GetString( sym->name );
} }
fprintf( f, "# Tracy Profiler disassembly of symbol %s [%s]\n\n", symName, worker.GetCaptureProgram().c_str() ); fprintf( f, "# Tracy Profiler disassembly of symbol %s [%s]\n\n", symName, worker.GetCaptureProgram().c_str() );
if( !m_atnt ) fprintf( f, ".intel_syntax\n\n" ); fprintf( f, ".intel_syntax\n\n" );
const auto end = m_asm.size() < stop ? m_asm.size() : stop; const auto end = m_asm.size() < stop ? m_asm.size() : stop;
for( size_t i=start; i<end; i++ ) for( size_t i=start; i<end; i++ )

1
server/TracySourceView.hpp
View File

@ -235,7 +235,6 @@ private:
bool m_asmShowSourceLocation; bool m_asmShowSourceLocation;
bool m_calcInlineStats; bool m_calcInlineStats;
uint8_t m_maxAsmBytes; uint8_t m_maxAsmBytes;
bool m_atnt;
uint64_t m_jumpPopupAddr; uint64_t m_jumpPopupAddr;
const CallstackFrameData* m_localCallstackPopup; const CallstackFrameData* m_localCallstackPopup;
bool m_hwSamples, m_hwSamplesRelative; bool m_hwSamples, m_hwSamplesRelative;