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

Merge branch 'GP-0_ryanmkurtz_PR-5110_Gravelbones_omf_logging'

Browse Source
This commit is contained in:
Ryan Kurtz
2023-03-20 06:55:02 -04:00
parent a6be09898f e85269eea9
commit c60ac3d4b6
1 changed files with 11 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

42
Ghidra/Features/Base/src/main/java/ghidra/app/util/opinion/OmfLoader.java
View File

@@ -357,49 +357,29 @@ public class OmfLoader extends AbstractProgramWrapperLoader {
final Language language = program.getLanguage();
ArrayList<OmfSegmentHeader> segments = header.getSegments();
// int sectionNumber = 0;
for (OmfSegmentHeader segment : segments) {
// ++sectionNumber;
if (monitor.isCancelled()) {
break;
}
// if (segment.hasIteratedData() && segment.hasEnumeratedData())
// throw new IOException("OMF segment has both iterated and enumerated data blocks");
MemoryBlock block = null;
Address segmentAddr = segment.getAddress(language);
final long segmentSize = segment.getSegmentLength();
Address segmentAddr = segment.getAddress(language);
if (segmentSize == 0) {
// don't create a block...just log that we've seen the segment
block = program.getMemory().getBlock(segmentAddr);
log.appendMsg("Empty Segment: " + segment.getName());
continue;
}
else if (segment.hasNonZeroData()) {
block = MemoryBlockUtils.createInitializedBlock(program, false, segment.getName(),
segmentAddr, segment.getRawDataStream(reader, log), segmentSize,
"Address:0x" + Long.toHexString(segmentAddr.getOffset()) + " " + "Size:0x" +
Long.toHexString(segmentSize),
null/*source*/, segment.isReadable(), segment.isWritable(),
segment.isExecutable(), log, monitor);
if (block != null) {
log.appendMsg(
"Created Initialized Block: " + segment.getName() + " @ " + segmentAddr);
}
if (segment.hasNonZeroData()) {
MemoryBlockUtils.createInitializedBlock(program, false, segment.getName(),
segmentAddr, segment.getRawDataStream(reader, log), segmentSize, "", "",
segment.isReadable(), segment.isWritable(), segment.isExecutable(), log,
monitor);
}
else {
block = MemoryBlockUtils.createUninitializedBlock(program, false, segment.getName(),
segmentAddr, segmentSize,
"Address:0x" + Long.toHexString(segmentAddr.getOffset()) + " " + "Size:0x" +
Long.toHexString(segmentSize),
null/*source*/, segment.isReadable(), segment.isWritable(),
MemoryBlockUtils.createUninitializedBlock(program, false, segment.getName(),
segmentAddr, segmentSize, "", "", segment.isReadable(), segment.isWritable(),
segment.isExecutable(), log);
if (block != null) {
log.appendMsg(
"Created Uninitialized Block: " + segment.getName() + " @ " + segmentAddr);
}
}
}
}