@@ -732,7 +732,8 @@ void Instruction::Dump(lldb_private::Stream *s, uint32_t max_opcode_byte_size,
732
732
return ;
733
733
734
734
addr_t current_pc = m_address.GetLoadAddress (target_sp.get ());
735
- addr_t original_pc = frame->GetFrameCodeAddress ().GetLoadAddress (target_sp.get ());
735
+ addr_t original_pc =
736
+ frame->GetFrameCodeAddress ().GetLoadAddress (target_sp.get ());
736
737
737
738
if (!frame->ChangePC (current_pc))
738
739
return ;
@@ -744,7 +745,8 @@ void Instruction::Dump(lldb_private::Stream *s, uint32_t max_opcode_byte_size,
744
745
SymbolContext sc = frame->GetSymbolContext (eSymbolContextFunction);
745
746
addr_t func_load_addr = LLDB_INVALID_ADDRESS;
746
747
if (sc.function )
747
- func_load_addr = sc.function ->GetAddress ().GetLoadAddress (target_sp.get ());
748
+ func_load_addr =
749
+ sc.function ->GetAddress ().GetLoadAddress (target_sp.get ());
748
750
749
751
// Only annotate if the current disassembly line is short enough
750
752
// to keep annotations aligned past the desired annotation_column.
@@ -763,22 +765,26 @@ void Instruction::Dump(lldb_private::Stream *s, uint32_t max_opcode_byte_size,
763
765
continue ;
764
766
765
767
// Handle std::optional<DWARFExpressionEntry>.
766
- if (auto entryOrErr = expr_list.GetExpressionEntryAtAddress (func_load_addr, current_pc)) {
768
+ if (auto entryOrErr = expr_list.GetExpressionEntryAtAddress (
769
+ func_load_addr, current_pc)) {
767
770
auto entry = *entryOrErr;
768
771
// Check if entry has a file_range, and filter on address if so.
769
772
if (!entry.file_range || entry.file_range ->ContainsFileAddress (
770
- (current_pc - func_load_addr) + expr_list.GetFuncFileAddress ())) {
773
+ (current_pc - func_load_addr) +
774
+ expr_list.GetFuncFileAddress ())) {
771
775
772
776
StreamString loc_str;
773
777
ABI *abi = exe_ctx->GetProcessPtr ()->GetABI ().get ();
774
778
llvm::DIDumpOptions opts;
775
779
opts.ShowAddresses = false ;
776
- opts.PrintRegisterOnly = true ; // <-- important: suppress DW_OP_... annotations, etc.
780
+ opts.PrintRegisterOnly =
781
+ true ; // <-- important: suppress DW_OP_... annotations, etc.
777
782
778
783
entry.expr ->DumpLocation (&loc_str, eDescriptionLevelBrief, abi, opts);
779
-
784
+
780
785
// Only include if not empty.
781
- llvm::StringRef loc_clean = llvm::StringRef (loc_str.GetString ()).trim ();
786
+ llvm::StringRef loc_clean =
787
+ llvm::StringRef (loc_str.GetString ()).trim ();
782
788
if (!loc_clean.empty ()) {
783
789
annotations.push_back (llvm::formatv (" {0} = {1}" , name, loc_clean));
784
790
}
@@ -808,7 +814,6 @@ void Instruction::Dump(lldb_private::Stream *s, uint32_t max_opcode_byte_size,
808
814
s->PutCString (ss.GetString ());
809
815
}
810
816
811
-
812
817
bool Instruction::DumpEmulation (const ArchSpec &arch) {
813
818
std::unique_ptr<EmulateInstruction> insn_emulator_up (
814
819
EmulateInstruction::FindPlugin (arch, eInstructionTypeAny, nullptr ));
@@ -820,9 +825,7 @@ bool Instruction::DumpEmulation(const ArchSpec &arch) {
820
825
return false ;
821
826
}
822
827
823
- bool Instruction::CanSetBreakpoint () {
824
- return !HasDelaySlot ();
825
- }
828
+ bool Instruction::CanSetBreakpoint () { return !HasDelaySlot (); }
826
829
827
830
bool Instruction::HasDelaySlot () {
828
831
// Default is false.
@@ -1159,10 +1162,8 @@ void InstructionList::Append(lldb::InstructionSP &inst_sp) {
1159
1162
m_instructions.push_back (inst_sp);
1160
1163
}
1161
1164
1162
- uint32_t
1163
- InstructionList::GetIndexOfNextBranchInstruction (uint32_t start,
1164
- bool ignore_calls,
1165
- bool *found_calls) const {
1165
+ uint32_t InstructionList::GetIndexOfNextBranchInstruction (
1166
+ uint32_t start, bool ignore_calls, bool *found_calls) const {
1166
1167
size_t num_instructions = m_instructions.size ();
1167
1168
1168
1169
uint32_t next_branch = UINT32_MAX;
0 commit comments