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

GP-0: PR cleanup

Browse Source
This commit is contained in:
Ryan Kurtz
2023-03-20 06:46:05 -04:00
parent ee12899696
commit e85269eea9
1 changed files with 10 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Ghidra/Features/Base/src/main/java/ghidra/app/util/opinion/OmfLoader.java
+10 -21
View File
@@ -357,39 +357,28 @@ public class OmfLoader extends AbstractProgramWrapperLoader {
final Language language = program.getLanguage(); final Language language = program.getLanguage();
ArrayList<OmfSegmentHeader> segments = header.getSegments(); ArrayList<OmfSegmentHeader> segments = header.getSegments();
// int sectionNumber = 0;
for (OmfSegmentHeader segment : segments) { for (OmfSegmentHeader segment : segments) {
// ++sectionNumber;
if (monitor.isCancelled()) { if (monitor.isCancelled()) {
break; break;
} }
// if (segment.hasIteratedData() && segment.hasEnumeratedData()) Address segmentAddr = segment.getAddress(language);
// throw new IOException("OMF segment has both iterated and enumerated data blocks");
MemoryBlock block = null;
final long segmentSize = segment.getSegmentLength(); final long segmentSize = segment.getSegmentLength();
Address segmentAddr = segment.getAddress(language);
if (segmentSize == 0) { if (segmentSize == 0) {
// don't create a block continue;
} }
else if (segment.hasNonZeroData()) {
block = MemoryBlockUtils.createInitializedBlock(program, false, segment.getName(), if (segment.hasNonZeroData()) {
segmentAddr, segment.getRawDataStream(reader, log), segmentSize, MemoryBlockUtils.createInitializedBlock(program, false, segment.getName(),
"Address:0x" + Long.toHexString(segmentAddr.getOffset()) + " " + "Size:0x" + segmentAddr, segment.getRawDataStream(reader, log), segmentSize, "", "",
Long.toHexString(segmentSize), segment.isReadable(), segment.isWritable(), segment.isExecutable(), log,
null/*source*/, segment.isReadable(), segment.isWritable(), monitor);
segment.isExecutable(), log, monitor);
} }
else { else {
block = MemoryBlockUtils.createUninitializedBlock(program, false, segment.getName(), MemoryBlockUtils.createUninitializedBlock(program, false, segment.getName(),
segmentAddr, segmentSize, segmentAddr, segmentSize, "", "", segment.isReadable(), segment.isWritable(),
"Address:0x" + Long.toHexString(segmentAddr.getOffset()) + " " + "Size:0x" +
Long.toHexString(segmentSize),
null/*source*/, segment.isReadable(), segment.isWritable(),
segment.isExecutable(), log); segment.isExecutable(), log);
} }
} }