Author: Alex Langford Date: 2023-05-19T13:06:40-07:00 New Revision: 3c4f16b6cab2964702d70a4834ea631bed7daaca
URL: https://github.com/llvm/llvm-project/commit/3c4f16b6cab2964702d70a4834ea631bed7daaca DIFF: https://github.com/llvm/llvm-project/commit/3c4f16b6cab2964702d70a4834ea631bed7daaca.diff LOG: [lldb][NFCI] Consolidate segment names in ObjectFileMachO We have static functions for each one, we should use them where it makes sense. Added: Modified: lldb/source/Plugins/ObjectFile/Mach-O/ObjectFileMachO.cpp Removed: ################################################################################ diff --git a/lldb/source/Plugins/ObjectFile/Mach-O/ObjectFileMachO.cpp b/lldb/source/Plugins/ObjectFile/Mach-O/ObjectFileMachO.cpp index 150dde8304cb8..dfd5ae728cefb 100644 --- a/lldb/source/Plugins/ObjectFile/Mach-O/ObjectFileMachO.cpp +++ b/lldb/source/Plugins/ObjectFile/Mach-O/ObjectFileMachO.cpp @@ -1362,9 +1362,11 @@ void ObjectFileMachO::SanitizeSegmentCommand( // shared cache file, and not the specific image we are // examining. Let's fix this up so that it looks like a normal // image. - if (strncmp(seg_cmd.segname, "__TEXT", sizeof(seg_cmd.segname)) == 0) + if (strncmp(seg_cmd.segname, GetSegmentNameTEXT().GetCString(), + sizeof(seg_cmd.segname)) == 0) m_text_address = seg_cmd.vmaddr; - if (strncmp(seg_cmd.segname, "__LINKEDIT", sizeof(seg_cmd.segname)) == 0) + if (strncmp(seg_cmd.segname, GetSegmentNameLINKEDIT().GetCString(), + sizeof(seg_cmd.segname)) == 0) m_linkedit_original_offset = seg_cmd.fileoff; seg_cmd.fileoff = seg_cmd.vmaddr - m_text_address; @@ -2606,9 +2608,8 @@ void ObjectFileMachO::ParseSymtab(Symtab &symtab) { std::set<lldb::addr_t> resolver_addresses; if (dyld_trie_data.GetByteSize() > 0) { - ConstString text_segment_name("__TEXT"); SectionSP text_segment_sp = - GetSectionList()->FindSectionByName(text_segment_name); + GetSectionList()->FindSectionByName(GetSegmentNameTEXT()); lldb::addr_t text_segment_file_addr = LLDB_INVALID_ADDRESS; if (text_segment_sp) text_segment_file_addr = text_segment_sp->GetFileAddress(); @@ -5270,10 +5271,9 @@ lldb_private::Address ObjectFileMachO::GetEntryPointAddress() { } } break; case LC_MAIN: { - ConstString text_segment_name("__TEXT"); uint64_t entryoffset = m_data.GetU64(&offset); SectionSP text_segment_sp = - GetSectionList()->FindSectionByName(text_segment_name); + GetSectionList()->FindSectionByName(GetSegmentNameTEXT()); if (text_segment_sp) { done = true; start_address = text_segment_sp->GetFileAddress() + entryoffset; _______________________________________________ lldb-commits mailing list lldb-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/lldb-commits
