Mirrors_Framework/ghidra
1
0
Fork 0
mirror of https://github.com/NationalSecurityAgency/ghidra.git synced 2026-05-27 16:56:16 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/patch'

Browse Source 
Conflicts:
	Ghidra/Features/Base/src/main/java/ghidra/app/util/opinion/ElfProgramBuilder.java
This commit is contained in:
ghidra1
2021-02-19 16:26:01 -05:00
parent 591773ca55 efa065ac4d
commit 70172f2587
1 changed files with 10 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Ghidra/Features/Base/src/main/java/ghidra/app/util/opinion/ElfProgramBuilder.java
+10 -17
View File
@@ -159,6 +159,7 @@ class ElfProgramBuilder extends MemorySectionResolver implements ElfLoadHelper {
elf.getLoadAdapter().processElf(this, monitor); elf.getLoadAdapter().processElf(this, monitor);
processEntryPoints(monitor); processEntryPoints(monitor);
processRelocations(monitor); processRelocations(monitor);
processImports(monitor); processImports(monitor);
@@ -429,11 +430,10 @@ class ElfProgramBuilder extends MemorySectionResolver implements ElfLoadHelper {
/** /**
* Processes the GNU version section. * Processes the GNU version section.
* @throws CancelledException
*/ */
private void processGNU(TaskMonitor monitor) { private void processGNU(TaskMonitor monitor) throws CancelledException {
if (monitor.isCancelled()) { monitor.checkCanceled();
return;
}
Address versionTableAddr = null; Address versionTableAddr = null;
@@ -555,10 +555,8 @@ class ElfProgramBuilder extends MemorySectionResolver implements ElfLoadHelper {
} }
} }
private void processEntryPoints(TaskMonitor monitor) { private void processEntryPoints(TaskMonitor monitor) throws CancelledException {
if (monitor.isCancelled()) { monitor.checkCanceled();
return;
}
monitor.setMessage("Creating entry points..."); monitor.setMessage("Creating entry points...");
long entry = elf.e_entry(); // already adjusted for pre-link long entry = elf.e_entry(); // already adjusted for pre-link
@@ -678,11 +676,8 @@ class ElfProgramBuilder extends MemorySectionResolver implements ElfLoadHelper {
return msg; return msg;
} }
private void markupInterpreter(TaskMonitor monitor) { private void markupInterpreter(TaskMonitor monitor) throws CancelledException {
if (monitor.isCancelled()) { monitor.checkCanceled();
return;
}
monitor.setMessage("Processing interpreter..."); monitor.setMessage("Processing interpreter...");
Address interpStrAddr = null; Address interpStrAddr = null;
@@ -712,10 +707,8 @@ class ElfProgramBuilder extends MemorySectionResolver implements ElfLoadHelper {
listing.setComment(interpStrAddr, CodeUnit.EOL_COMMENT, "Initial Elf program interpreter"); listing.setComment(interpStrAddr, CodeUnit.EOL_COMMENT, "Initial Elf program interpreter");
} }
private void processImports(TaskMonitor monitor) { private void processImports(TaskMonitor monitor) throws CancelledException {
if (monitor.isCancelled()) { monitor.checkCanceled();
return;
}
monitor.setMessage("Processing imports..."); monitor.setMessage("Processing imports...");
ExternalManager extManager = program.getExternalManager(); ExternalManager extManager = program.getExternalManager();