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

GP-0: Formatting

Browse Source
This commit is contained in:
Ryan Kurtz
2023-04-03 06:29:36 -04:00
parent f462733ae3
commit e60aae9cc0
3 changed files with 94 additions and 94 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Ghidra/Features/Base/src/main/java/ghidra/app/util/bin/format/omf/OmfFileHeader.java
+2 -2
View File
@@ -256,8 +256,8 @@ public class OmfFileHeader extends OmfRecord {
* @throws IOException for problems reading program data * @throws IOException for problems reading program data
* @throws OmfException for malformed records * @throws OmfException for malformed records
*/ */
public static OmfFileHeader scan(BinaryReader reader, TaskMonitor monitor, public static OmfFileHeader scan(BinaryReader reader, TaskMonitor monitor, boolean fastscan)
boolean fastscan) throws IOException, OmfException { throws IOException, OmfException {
OmfRecord record = OmfRecord.readRecord(reader); OmfRecord record = OmfRecord.readRecord(reader);
if (!(record instanceof OmfFileHeader)) { if (!(record instanceof OmfFileHeader)) {
throw new OmfException("Object file does not start with proper header"); throw new OmfException("Object file does not start with proper header");
Ghidra/Features/Base/src/main/java/ghidra/app/util/opinion/OmfLoader.java
+3 -3
View File
@@ -243,8 +243,7 @@ public class OmfLoader extends AbstractProgramWrapperLoader {
OmfSegmentHeader seg = OmfSegmentHeader seg =
header.resolveSegment(fixup.getDataBlock().getSegmentIndex()); header.resolveSegment(fixup.getDataBlock().getSegmentIndex());
locAddress = seg.getAddress(language) locAddress = seg.getAddress(language)
.add( .add(fixup.getDataBlock().getDataOffset() +
fixup.getDataBlock().getDataOffset() +
subrec.getDataRecordOffset()); subrec.getDataRecordOffset());
if (locAddress == null) { if (locAddress == null) {
log.appendMsg("Couldn't find address for fixup"); log.appendMsg("Couldn't find address for fixup");
@@ -551,7 +550,8 @@ public class OmfLoader extends AbstractProgramWrapperLoader {
Map<String, OmfSymbol> publicSymbols = header.getPublicSymbols() Map<String, OmfSymbol> publicSymbols = header.getPublicSymbols()
.stream() .stream()
.flatMap(symbolRec -> symbolRec.getSymbols().stream()) .flatMap(symbolRec -> symbolRec.getSymbols().stream())
.collect(Collectors.toMap(sym -> sym.getName(), java.util.function.Function.identity())); .collect(
Collectors.toMap(sym -> sym.getName(), java.util.function.Function.identity()));
monitor.setMessage("Creating External Symbols"); monitor.setMessage("Creating External Symbols");