Skip to content

Commit c94c572

Browse files
clayborgclayborg
committed
Add subsection and permissions support to ObjectFileJSON.
This patch adds the ability to create subsections in a section and allows permissions to be specified.
1 parent 7b596ce commit c94c572

File tree

4 files changed

+112
-25
lines changed

4 files changed

+112
-25
lines changed

‎lldb/include/lldb/Core/Section.h‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -105,6 +105,11 @@ struct JSONSection {
105105
std::optional<lldb::SectionType> type;
106106
std::optional<uint64_t> address;
107107
std::optional<uint64_t> size;
108+
// Section permissions;
109+
std::optional<bool> read;
110+
std::optional<bool> write;
111+
std::optional<bool> execute;
112+
std::vector<JSONSection> subsections;
108113
};
109114

110115
class Section : public std::enable_shared_from_this<Section>,

‎lldb/source/Core/Section.cpp‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -690,7 +690,11 @@ bool fromJSON(const llvm::json::Value &value,
690690
lldb_private::JSONSection &section, llvm::json::Path path) {
691691
llvm::json::ObjectMapper o(value, path);
692692
return o && o.map("name", section.name) && o.map("type", section.type) &&
693-
o.map("address", section.address) && o.map("size", section.size);
693+
o.map("address", section.address) && o.map("size", section.size) &&
694+
o.map("read", section.read) &&
695+
o.map("write", section.write) &&
696+
o.map("execute", section.execute) &&
697+
o.mapOptional("subsections", section.subsections);
694698
}
695699

696700
bool fromJSON(const llvm::json::Value &value, lldb::SectionType &type,

‎lldb/source/Plugins/ObjectFile/JSON/ObjectFileJSON.cpp‎

Lines changed: 47 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -180,18 +180,53 @@ void ObjectFileJSON::CreateSections(SectionList &unified_section_list) {
180180
m_sections_up = std::make_unique<SectionList>();
181181

182182
lldb::user_id_t id = 1;
183-
for (const auto &section : m_sections) {
184-
auto section_sp = std::make_shared<Section>(
185-
GetModule(), this,
186-
/*sect_id=*/id++,
187-
/*name=*/ConstString(section.name),
188-
/*sect_type=*/section.type.value_or(eSectionTypeCode),
189-
/*file_vm_addr=*/section.address.value_or(0),
190-
/*vm_size=*/section.size.value_or(0),
191-
/*file_offset=*/0,
192-
/*file_size=*/0,
193-
/*log2align=*/0,
194-
/*flags=*/0);
183+
for (const auto &json_section : m_sections) {
184+
auto make_section = [this, &id](const JSONSection &section,
185+
SectionSP parent_section_sp = nullptr) -> SectionSP {
186+
SectionSP section_sp;
187+
if (parent_section_sp) {
188+
section_sp = std::make_shared<Section>(
189+
parent_section_sp, GetModule(), this,
190+
/*sect_id=*/id++,
191+
/*name=*/ConstString(section.name),
192+
/*sect_type=*/section.type.value_or(eSectionTypeCode),
193+
/*file_vm_addr=*/section.address.value_or(0) - parent_section_sp->GetFileAddress(),
194+
/*vm_size=*/section.size.value_or(0),
195+
/*file_offset=*/0,
196+
/*file_size=*/0,
197+
/*log2align=*/0,
198+
/*flags=*/0);
199+
200+
} else {
201+
section_sp = std::make_shared<Section>(
202+
GetModule(), this,
203+
/*sect_id=*/id++,
204+
/*name=*/ConstString(section.name),
205+
/*sect_type=*/section.type.value_or(eSectionTypeCode),
206+
/*file_vm_addr=*/section.address.value_or(0),
207+
/*vm_size=*/section.size.value_or(0),
208+
/*file_offset=*/0,
209+
/*file_size=*/0,
210+
/*log2align=*/0,
211+
/*flags=*/0);
212+
}
213+
uint32_t permissions = 0;
214+
if (section.read.value_or(0))
215+
permissions |= lldb::ePermissionsReadable;
216+
if (section.write.value_or(0))
217+
permissions |= lldb::ePermissionsWritable;
218+
if (section.execute.value_or(0))
219+
permissions |= lldb::ePermissionsExecutable;
220+
if (permissions)
221+
section_sp->SetPermissions(permissions);
222+
return section_sp;
223+
};
224+
auto section_sp = make_section(json_section);
225+
for (const auto &subsection : json_section.subsections) {
226+
SectionSP subsection_sp = make_section(subsection, section_sp);
227+
section_sp->GetChildren().AddSection(subsection_sp);
228+
}
229+
195230
m_sections_up->AddSection(section_sp);
196231
unified_section_list.AddSection(section_sp);
197232
}

‎lldb/test/API/functionalities/json/object-file/TestObjectFileJSON.py‎

Lines changed: 55 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -75,15 +75,32 @@ def test_module(self):
7575
"sections": [
7676
{
7777
"name": "__TEXT",
78-
"type": "code",
78+
"type": "container",
7979
"address": TEXT_file_addr,
8080
"size": TEXT_size,
81+
"read": True,
82+
"write": False,
83+
"execute": True,
84+
"subsections": [
85+
{
86+
"name": "__text",
87+
"type": "code",
88+
"address": TEXT_file_addr,
89+
"size": TEXT_size,
90+
"read": True,
91+
"write": False,
92+
"execute": True
93+
}
94+
]
8195
},
8296
{
8397
"name": "__DATA",
84-
"type": "code",
98+
"type": "data",
8599
"address": DATA_file_addr,
86100
"size": DATA_size,
101+
"read": True,
102+
"write": True,
103+
"execute": False
87104
}
88105
],
89106
"symbols": [
@@ -108,17 +125,43 @@ def test_module(self):
108125
module = target.AddModule(self.toModuleSpec(json_object_file_c))
109126
self.assertTrue(module.IsValid())
110127

111-
text_section = module.GetSectionAtIndex(0)
128+
TEXT_section = module.GetSectionAtIndex(0)
129+
self.assertTrue(TEXT_section.IsValid())
130+
self.assertEqual(TEXT_section.GetName(), "__TEXT")
131+
self.assertEqual(TEXT_section.file_addr, TEXT_file_addr)
132+
self.assertEqual(TEXT_section.size, TEXT_size)
133+
self.assertEqual(TEXT_section.GetSectionType(),
134+
lldb.eSectionTypeContainer)
135+
self.assertEqual(TEXT_section.GetNumSubSections(), 1)
136+
text_permissions = TEXT_section.GetPermissions()
137+
self.assertTrue((text_permissions & lldb.ePermissionsReadable) != 0)
138+
self.assertFalse((text_permissions & lldb.ePermissionsWritable) != 0)
139+
self.assertTrue((text_permissions & lldb.ePermissionsExecutable) != 0)
140+
141+
text_section = TEXT_section.GetSubSectionAtIndex(0)
112142
self.assertTrue(text_section.IsValid())
113-
self.assertEqual(text_section.GetName(), "__TEXT")
143+
self.assertEqual(text_section.GetName(), "__text")
114144
self.assertEqual(text_section.file_addr, TEXT_file_addr)
115145
self.assertEqual(text_section.size, TEXT_size)
116-
117-
data_section = module.GetSectionAtIndex(1)
118-
self.assertTrue(data_section.IsValid())
119-
self.assertEqual(data_section.GetName(), "__DATA")
120-
self.assertEqual(data_section.file_addr, DATA_file_addr)
121-
self.assertEqual(data_section.size, DATA_size)
146+
self.assertEqual(text_section.GetSectionType(),
147+
lldb.eSectionTypeCode)
148+
self.assertEqual(text_section.GetNumSubSections(), 0)
149+
text_permissions = text_section.GetPermissions()
150+
self.assertTrue((text_permissions & lldb.ePermissionsReadable) != 0)
151+
self.assertFalse((text_permissions & lldb.ePermissionsWritable) != 0)
152+
self.assertTrue((text_permissions & lldb.ePermissionsExecutable) != 0)
153+
154+
DATA_section = module.GetSectionAtIndex(1)
155+
self.assertTrue(DATA_section.IsValid())
156+
self.assertEqual(DATA_section.GetName(), "__DATA")
157+
self.assertEqual(DATA_section.file_addr, DATA_file_addr)
158+
self.assertEqual(DATA_section.size, DATA_size)
159+
self.assertEqual(DATA_section.GetSectionType(),
160+
lldb.eSectionTypeData)
161+
data_permissions = DATA_section.GetPermissions()
162+
self.assertTrue((data_permissions & lldb.ePermissionsReadable) != 0)
163+
self.assertTrue((data_permissions & lldb.ePermissionsWritable) != 0)
164+
self.assertFalse((data_permissions & lldb.ePermissionsExecutable) != 0)
122165

123166
foo_symbol = module.FindSymbol("foo")
124167
self.assertTrue(foo_symbol.IsValid())
@@ -130,9 +173,9 @@ def test_module(self):
130173
self.assertEqual(bar_symbol.addr.GetFileAddress(), bar_file_addr)
131174
self.assertEqual(bar_symbol.GetSize(), bar_size)
132175

133-
error = target.SetSectionLoadAddress(text_section, TEXT_file_addr + slide)
176+
error = target.SetSectionLoadAddress(TEXT_section, TEXT_file_addr + slide)
134177
self.assertSuccess(error)
135-
error = target.SetSectionLoadAddress(data_section, DATA_file_addr + slide)
178+
error = target.SetSectionLoadAddress(DATA_section, DATA_file_addr + slide)
136179
self.assertSuccess(error)
137180
self.assertEqual(foo_symbol.addr.GetLoadAddress(target), foo_file_addr + slide)
138181
self.assertEqual(bar_symbol.addr.GetLoadAddress(target), bar_file_addr + slide)

0 commit comments

Comments
 (0)