From ee128996963879359edf7c56aea0e6a08f0e4c36 Mon Sep 17 00:00:00 2001 From: Gravelbones Date: Sat, 18 Mar 2023 12:29:13 +0100 Subject: [PATCH 1/2] OMF format: Remove some logging messages --- .../java/ghidra/app/util/opinion/OmfLoader.java | 13 ++----------- 1 file changed, 2 insertions(+), 11 deletions(-) diff --git a/Ghidra/Features/Base/src/main/java/ghidra/app/util/opinion/OmfLoader.java b/Ghidra/Features/Base/src/main/java/ghidra/app/util/opinion/OmfLoader.java index cf3a038746..5ffdbd39a4 100644 --- a/Ghidra/Features/Base/src/main/java/ghidra/app/util/opinion/OmfLoader.java +++ b/Ghidra/Features/Base/src/main/java/ghidra/app/util/opinion/OmfLoader.java @@ -373,9 +373,7 @@ public class OmfLoader extends AbstractProgramWrapperLoader { 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()); + // don't create a block } else if (segment.hasNonZeroData()) { block = MemoryBlockUtils.createInitializedBlock(program, false, segment.getName(), @@ -384,10 +382,7 @@ public class OmfLoader extends AbstractProgramWrapperLoader { Long.toHexString(segmentSize), null/*source*/, segment.isReadable(), segment.isWritable(), segment.isExecutable(), log, monitor); - if (block != null) { - log.appendMsg( - "Created Initialized Block: " + segment.getName() + " @ " + segmentAddr); - } + } else { block = MemoryBlockUtils.createUninitializedBlock(program, false, segment.getName(), @@ -396,10 +391,6 @@ public class OmfLoader extends AbstractProgramWrapperLoader { Long.toHexString(segmentSize), null/*source*/, segment.isReadable(), segment.isWritable(), segment.isExecutable(), log); - if (block != null) { - log.appendMsg( - "Created Uninitialized Block: " + segment.getName() + " @ " + segmentAddr); - } } } } From e85269eea9d78e664698f06856bd173b54a8cf0d Mon Sep 17 00:00:00 2001 From: Ryan Kurtz Date: Mon, 20 Mar 2023 06:46:05 -0400 Subject: [PATCH 2/2] GP-0: PR cleanup --- .../ghidra/app/util/opinion/OmfLoader.java | 31 ++++++------------- 1 file changed, 10 insertions(+), 21 deletions(-) diff --git a/Ghidra/Features/Base/src/main/java/ghidra/app/util/opinion/OmfLoader.java b/Ghidra/Features/Base/src/main/java/ghidra/app/util/opinion/OmfLoader.java index 5ffdbd39a4..3caaaab634 100644 --- a/Ghidra/Features/Base/src/main/java/ghidra/app/util/opinion/OmfLoader.java +++ b/Ghidra/Features/Base/src/main/java/ghidra/app/util/opinion/OmfLoader.java @@ -357,39 +357,28 @@ public class OmfLoader extends AbstractProgramWrapperLoader { final Language language = program.getLanguage(); ArrayList 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 + 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 (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); } }