mirror/ghidra
1
0
Fork 0
mirror of https://github.com/NationalSecurityAgency/ghidra.git synced 2026-09-28 17:11:11 -09:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'GP-2019_ryanmkurtz_program-tree'

Browse Source
This commit is contained in:
Ryan Kurtz
2022-09-21 12:14:33 -04:00
parent 5199df57a2 085e61c149
commit f31e6bd52e
2 changed files with 64 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
Ghidra/Features/Base/src/main/java/ghidra/app/util/opinion/MachoPrelinkProgramBuilder.java
View File

@@ -292,7 +292,13 @@ public class MachoPrelinkProgramBuilder extends MachoProgramBuilder {
section.getSectionName(), name));
sectionFragment.move(sectionStart, sectionEnd);
}
// If the sections fully filled the segment, we can remove the now-empty segment
if (segmentFragment.isEmpty()) {
module.removeChild(segmentFragment.getName());
}
}
}
}
}

58
Ghidra/Features/Base/src/main/java/ghidra/app/util/opinion/MachoProgramBuilder.java
View File

@@ -125,6 +125,7 @@ public class MachoProgramBuilder {
processEncryption();
processEntryPoint();
processMemoryBlocks(machoHeader, provider.getName(), true, true);
fixupProgramTree();
processUnsupportedLoadCommands();
boolean exportsFound = processExports(machoHeader);
processSymbolTables(machoHeader, !exportsFound);
@@ -386,6 +387,63 @@ public class MachoProgramBuilder {
return memory.getBlock(start);
}
/**
* Fixes up the Program Tree to better visualize the memory blocks that were split into sections
*
* @throws Exception if there was a problem fixing up the Program Tree
*/
protected void fixupProgramTree() throws Exception {
ProgramModule rootModule = listing.getDefaultRootModule();
for (SegmentCommand segment : machoHeader.getAllSegments()) {
if (segment.getVMsize() == 0) {
continue;
}
Address segmentStart = space.getAddress(segment.getVMaddress());
Address segmentEnd = segmentStart.add(segment.getVMsize() - 1);
if (!memory.contains(segmentStart)) {
continue;
}
if (!memory.contains(segmentEnd)) {
segmentEnd = memory.getBlock(segmentStart).getEnd();
}
// Move original segment fragment into module and rename it. After we add new
// section fragments, it will represent the parts of the segment that weren't in any
// section.
String noSectionsName = segment.getSegmentName() + " <no section>";
ProgramFragment segmentFragment = null;
for (Group group : rootModule.getChildren()) {
if (group instanceof ProgramFragment fragment &&
fragment.getName().equals(segment.getSegmentName())) {
fragment.setName(noSectionsName);
segmentFragment = fragment;
break;
}
}
ProgramModule segmentModule = rootModule.createModule(segment.getSegmentName());
segmentModule.reparent(noSectionsName, rootModule);
// Add the sections, which will remove overlapped ranges from the segment fragment
for (Section section : segment.getSections()) {
if (section.getSize() == 0) {
continue;
}
Address sectionStart = space.getAddress(section.getAddress());
Address sectionEnd = sectionStart.add(section.getSize() - 1);
if (!memory.contains(sectionEnd)) {
sectionEnd = memory.getBlock(sectionStart).getEnd();
}
ProgramFragment sectionFragment = segmentModule.createFragment(
String.format("%s %s", section.getSegmentName(), section.getSectionName()));
sectionFragment.move(sectionStart, sectionEnd);
}
// If the sections fully filled the segment, we can remove the now-empty segment
if (segmentFragment.isEmpty()) {
segmentModule.removeChild(segmentFragment.getName());
}
}
}
/**
* Processes {@link LoadCommand}s that we haven't implemented yet.
*