Author: Greg Clayton Date: 2025-03-04T14:35:42-08:00 New Revision: 7b596ce362829281ea73b576774ce90bb212138d
URL: https://github.com/llvm/llvm-project/commit/7b596ce362829281ea73b576774ce90bb212138d DIFF: https://github.com/llvm/llvm-project/commit/7b596ce362829281ea73b576774ce90bb212138d.diff LOG: [lldb] Fix ObjectFileJSON to section addresses. (#129648) ObjectFileJSON sections didn't work, they were set to zero all of the time. Fixed the bug and fixed the test to ensure it was testing real values. Added: Modified: lldb/source/Core/Section.cpp lldb/source/Plugins/ObjectFile/JSON/ObjectFileJSON.cpp lldb/test/API/functionalities/json/object-file/TestObjectFileJSON.py Removed: ################################################################################ diff --git a/lldb/source/Core/Section.cpp b/lldb/source/Core/Section.cpp index a17f43fe89033..96410a1ad497c 100644 --- a/lldb/source/Core/Section.cpp +++ b/lldb/source/Core/Section.cpp @@ -690,7 +690,7 @@ bool fromJSON(const llvm::json::Value &value, lldb_private::JSONSection §ion, llvm::json::Path path) { llvm::json::ObjectMapper o(value, path); return o && o.map("name", section.name) && o.map("type", section.type) && - o.map("size", section.address) && o.map("size", section.size); + o.map("address", section.address) && o.map("size", section.size); } bool fromJSON(const llvm::json::Value &value, lldb::SectionType &type, diff --git a/lldb/source/Plugins/ObjectFile/JSON/ObjectFileJSON.cpp b/lldb/source/Plugins/ObjectFile/JSON/ObjectFileJSON.cpp index ffbd87714242c..8e90fac46f348 100644 --- a/lldb/source/Plugins/ObjectFile/JSON/ObjectFileJSON.cpp +++ b/lldb/source/Plugins/ObjectFile/JSON/ObjectFileJSON.cpp @@ -182,9 +182,16 @@ void ObjectFileJSON::CreateSections(SectionList &unified_section_list) { lldb::user_id_t id = 1; for (const auto §ion : m_sections) { auto section_sp = std::make_shared<Section>( - GetModule(), this, id++, ConstString(section.name), - section.type.value_or(eSectionTypeCode), 0, section.size.value_or(0), 0, - section.size.value_or(0), /*log2align*/ 0, /*flags*/ 0); + GetModule(), this, + /*sect_id=*/id++, + /*name=*/ConstString(section.name), + /*sect_type=*/section.type.value_or(eSectionTypeCode), + /*file_vm_addr=*/section.address.value_or(0), + /*vm_size=*/section.size.value_or(0), + /*file_offset=*/0, + /*file_size=*/0, + /*log2align=*/0, + /*flags=*/0); m_sections_up->AddSection(section_sp); unified_section_list.AddSection(section_sp); } diff --git a/lldb/test/API/functionalities/json/object-file/TestObjectFileJSON.py b/lldb/test/API/functionalities/json/object-file/TestObjectFileJSON.py index efb1aa2c3ad8a..eee0144ad5706 100644 --- a/lldb/test/API/functionalities/json/object-file/TestObjectFileJSON.py +++ b/lldb/test/API/functionalities/json/object-file/TestObjectFileJSON.py @@ -59,7 +59,15 @@ def test_module(self): module = target.AddModule(self.toModuleSpec(json_object_file_b)) self.assertFalse(module.IsValid()) - + TEXT_file_addr = 0x100000000 + DATA_file_addr = 0x100001000 + foo_file_addr = TEXT_file_addr + 0x100 + bar_file_addr = DATA_file_addr + 0x10 + TEXT_size = 0x222 + DATA_size = 0x333 + foo_size = 0x11 + bar_size = 0x22 + slide = 0x100000000 data = { "triple": target.GetTriple(), "uuid": str(uuid.uuid4()), @@ -68,16 +76,29 @@ def test_module(self): { "name": "__TEXT", "type": "code", - "address": 0, - "size": 0x222, + "address": TEXT_file_addr, + "size": TEXT_size, + }, + { + "name": "__DATA", + "type": "code", + "address": DATA_file_addr, + "size": DATA_size, } ], "symbols": [ { "name": "foo", - "address": 0x100, - "size": 0x11, - } + "type": "code", + "address": foo_file_addr, + "size": foo_size, + }, + { + "name": "bar", + "type": "data", + "address": bar_file_addr, + "size": bar_size, + }, ], } @@ -87,17 +108,31 @@ def test_module(self): module = target.AddModule(self.toModuleSpec(json_object_file_c)) self.assertTrue(module.IsValid()) - section = module.GetSectionAtIndex(0) - self.assertTrue(section.IsValid()) - self.assertEqual(section.GetName(), "__TEXT") - self.assertEqual(section.file_addr, 0x0) - self.assertEqual(section.size, 0x222) - - symbol = module.FindSymbol("foo") - self.assertTrue(symbol.IsValid()) - self.assertEqual(symbol.addr.GetFileAddress(), 0x100) - self.assertEqual(symbol.GetSize(), 0x11) - - error = target.SetSectionLoadAddress(section, 0x1000) + text_section = module.GetSectionAtIndex(0) + self.assertTrue(text_section.IsValid()) + self.assertEqual(text_section.GetName(), "__TEXT") + self.assertEqual(text_section.file_addr, TEXT_file_addr) + self.assertEqual(text_section.size, TEXT_size) + + data_section = module.GetSectionAtIndex(1) + self.assertTrue(data_section.IsValid()) + self.assertEqual(data_section.GetName(), "__DATA") + self.assertEqual(data_section.file_addr, DATA_file_addr) + self.assertEqual(data_section.size, DATA_size) + + foo_symbol = module.FindSymbol("foo") + self.assertTrue(foo_symbol.IsValid()) + self.assertEqual(foo_symbol.addr.GetFileAddress(), foo_file_addr) + self.assertEqual(foo_symbol.GetSize(), foo_size) + + bar_symbol = module.FindSymbol("bar") + self.assertTrue(bar_symbol.IsValid()) + self.assertEqual(bar_symbol.addr.GetFileAddress(), bar_file_addr) + self.assertEqual(bar_symbol.GetSize(), bar_size) + + error = target.SetSectionLoadAddress(text_section, TEXT_file_addr + slide) + self.assertSuccess(error) + error = target.SetSectionLoadAddress(data_section, DATA_file_addr + slide) self.assertSuccess(error) - self.assertEqual(symbol.addr.GetLoadAddress(target), 0x1100) + self.assertEqual(foo_symbol.addr.GetLoadAddress(target), foo_file_addr + slide) + self.assertEqual(bar_symbol.addr.GetLoadAddress(target), bar_file_addr + slide) _______________________________________________ lldb-commits mailing list lldb-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/lldb-commits
