Mirrors_Framework/ghidra
1
0
Fork 0
mirror of https://github.com/NationalSecurityAgency/ghidra.git synced 2026-05-20 23:08:31 +08:00
Code Issues Actions 2 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
+16 -16
View File
@@ -256,8 +256,8 @@ public class OmfFileHeader extends OmfRecord {
* @throws IOException for problems reading program data
* @throws OmfException for malformed records
*/
public static OmfFileHeader scan(BinaryReader reader, TaskMonitor monitor,
boolean fastscan) throws IOException, OmfException {
public static OmfFileHeader scan(BinaryReader reader, TaskMonitor monitor, boolean fastscan)
throws IOException, OmfException {
OmfRecord record = OmfRecord.readRecord(reader);
if (!(record instanceof OmfFileHeader)) {
throw new OmfException("Object file does not start with proper header");
@@ -275,24 +275,24 @@ public class OmfFileHeader extends OmfRecord {
}
if (record instanceof OmfCommentRecord comment) {
switch(comment.getCommentClass()) {
case OmfCommentRecord.COMMENT_CLASS_TRANSLATOR:
header.translator = comment.getValue();
break;
case OmfCommentRecord.COMMENT_CLASS_LIBMOD:
header.libModuleName = comment.getValue();
break;
case OmfCommentRecord.COMMENT_CLASS_WATCOM_SETTINGS:
header.translator = "Watcom";
break;
case OmfCommentRecord.COMMENT_CLASS_MICROSOFT_SETTINGS:
header.translator = "Microsoft";
break;
switch (comment.getCommentClass()) {
case OmfCommentRecord.COMMENT_CLASS_TRANSLATOR:
header.translator = comment.getValue();
break;
case OmfCommentRecord.COMMENT_CLASS_LIBMOD:
header.libModuleName = comment.getValue();
break;
case OmfCommentRecord.COMMENT_CLASS_WATCOM_SETTINGS:
header.translator = "Watcom";
break;
case OmfCommentRecord.COMMENT_CLASS_MICROSOFT_SETTINGS:
header.translator = "Microsoft";
break;
}
}
else if (record instanceof OmfSegmentHeader head) {
header.format16bit = head.is16Bit();
if(fastscan) {
if (fastscan) {
break;
}
}
Ghidra/Features/Base/src/main/java/ghidra/app/util/opinion/OmfLoader.java
+75 -75
View File
@@ -73,7 +73,7 @@ public class OmfLoader extends AbstractProgramWrapperLoader {
if (record.equals("MS C")) {
return "windows";
}
if(record.startsWith("Watcom")) {
if (record.startsWith("Watcom")) {
return "watcom";
}
return null;
@@ -162,7 +162,7 @@ public class OmfLoader extends AbstractProgramWrapperLoader {
message = "Unable to process relocation at " + addr + " with type 0x" +
Integer.toHexString(type);
program.getBookmarkManager()
.setBookmark(addr, BookmarkType.ERROR, "Relocations", message);
.setBookmark(addr, BookmarkType.ERROR, "Relocations", message);
}
else {
message = "Badly broken relocation";
@@ -241,10 +241,9 @@ public class OmfLoader extends AbstractProgramWrapperLoader {
targetAddr += subrec.getTargetDisplacement();
locationType = subrec.getLocationType();
OmfSegmentHeader seg =
header.resolveSegment(fixup.getDataBlock().getSegmentIndex());
header.resolveSegment(fixup.getDataBlock().getSegmentIndex());
locAddress = seg.getAddress(language)
.add(
fixup.getDataBlock().getDataOffset() +
.add(fixup.getDataBlock().getDataOffset() +
subrec.getDataRecordOffset());
if (locAddress == null) {
log.appendMsg("Couldn't find address for fixup");
@@ -252,74 +251,74 @@ public class OmfLoader extends AbstractProgramWrapperLoader {
}
finalvalue = targetAddr;
switch (locationType) {
case 0: // Low-order byte
origbytes = new byte[1];
memory.getBytes(locAddress, origbytes);
if (subrec.isSegmentRelative()) {
finalvalue += origbytes[0];
}
else {
finalvalue -= (locAddress.getOffset() + 1);
}
memory.setByte(locAddress, (byte) finalvalue);
break;
case 1: // 16-bit offset
case 5: // 16-bit loader-resolved offset (treated same as 1)
origbytes = new byte[2];
memory.getBytes(locAddress, origbytes);
if (subrec.isSegmentRelative()) {
finalvalue += converter.getShort(origbytes);
}
else {
finalvalue -= (locAddress.getOffset() + 2);
}
memory.setShort(locAddress, (short) finalvalue);
break;
case 2: // 16-bit base -- logical segment base (selector)
if (!subrec.isSegmentRelative()) {
// Segment can't be self relative
relocationError(program, log, locAddress, locationType);
continue;
}
origbytes = new byte[2];
memory.getBytes(locAddress, origbytes);
finalvalue += converter.getShort(origbytes) << 4;
finalvalue >>= 4; // Convert address to segment
memory.setShort(locAddress, (short) finalvalue);
break;
case 3: // 32-bit far pointer (16-bit segment:16-bit offset)
if (!subrec.isSegmentRelative()) {
// Far can't be self relative
relocationError(program, log, locAddress, locationType);
continue;
}
origbytes = new byte[4];
memory.getBytes(locAddress, origbytes);
finalvalue += converter.getInt(origbytes);
// Convert to segment:offset in 64K blocks
finalvalue =
((finalvalue & 0xffff0000L) << 12) | (finalvalue & 0xffff);
memory.setInt(locAddress, (int) finalvalue);
break;
// case 11: // 48-bit far pointer (16-bit segment:32-bit offset)
case 4: // High-order byte (high byte of 16-bit offset)
case 9: // 32-bit offset
case 13: // 32-bit loader-resolved offset (treated same as 9)
origbytes = new byte[4];
memory.getBytes(locAddress, origbytes);
if (subrec.isSegmentRelative()) {
case 0: // Low-order byte
origbytes = new byte[1];
memory.getBytes(locAddress, origbytes);
if (subrec.isSegmentRelative()) {
finalvalue += origbytes[0];
}
else {
finalvalue -= (locAddress.getOffset() + 1);
}
memory.setByte(locAddress, (byte) finalvalue);
break;
case 1: // 16-bit offset
case 5: // 16-bit loader-resolved offset (treated same as 1)
origbytes = new byte[2];
memory.getBytes(locAddress, origbytes);
if (subrec.isSegmentRelative()) {
finalvalue += converter.getShort(origbytes);
}
else {
finalvalue -= (locAddress.getOffset() + 2);
}
memory.setShort(locAddress, (short) finalvalue);
break;
case 2: // 16-bit base -- logical segment base (selector)
if (!subrec.isSegmentRelative()) {
// Segment can't be self relative
relocationError(program, log, locAddress, locationType);
continue;
}
origbytes = new byte[2];
memory.getBytes(locAddress, origbytes);
finalvalue += converter.getShort(origbytes) << 4;
finalvalue >>= 4; // Convert address to segment
memory.setShort(locAddress, (short) finalvalue);
break;
case 3: // 32-bit far pointer (16-bit segment:16-bit offset)
if (!subrec.isSegmentRelative()) {
// Far can't be self relative
relocationError(program, log, locAddress, locationType);
continue;
}
origbytes = new byte[4];
memory.getBytes(locAddress, origbytes);
finalvalue += converter.getInt(origbytes);
}
else {
finalvalue -= (locAddress.getOffset() + 4);
}
memory.setInt(locAddress, (int) finalvalue);
break;
default:
log.appendMsg("Unsupported relocation type " +
Integer.toString(locationType) + " at 0x" +
Long.toHexString(locAddress.getOffset()));
break;
// Convert to segment:offset in 64K blocks
finalvalue =
((finalvalue & 0xffff0000L) << 12) | (finalvalue & 0xffff);
memory.setInt(locAddress, (int) finalvalue);
break;
// case 11: // 48-bit far pointer (16-bit segment:32-bit offset)
case 4: // High-order byte (high byte of 16-bit offset)
case 9: // 32-bit offset
case 13: // 32-bit loader-resolved offset (treated same as 9)
origbytes = new byte[4];
memory.getBytes(locAddress, origbytes);
if (subrec.isSegmentRelative()) {
finalvalue += converter.getInt(origbytes);
}
else {
finalvalue -= (locAddress.getOffset() + 4);
}
memory.setInt(locAddress, (int) finalvalue);
break;
default:
log.appendMsg("Unsupported relocation type " +
Integer.toString(locationType) + " at 0x" +
Long.toHexString(locAddress.getOffset()));
break;
}
}
catch (MemoryAccessException e) {
@@ -337,7 +336,7 @@ public class OmfLoader extends AbstractProgramWrapperLoader {
long[] values = new long[1];
values[0] = finalvalue;
program.getRelocationTable()
.add(locAddress, Status.APPLIED, locationType, values, origbytes, null);
.add(locAddress, Status.APPLIED, locationType, values, origbytes, null);
}
}
}
@@ -374,7 +373,7 @@ public class OmfLoader extends AbstractProgramWrapperLoader {
if (segmentSize == 0) {
continue;
}
if (segment.hasNonZeroData()) {
MemoryBlockUtils.createInitializedBlock(program, false, segment.getName(),
segmentAddr, segment.getRawDataStream(reader, log), segmentSize, "", "",
@@ -551,7 +550,8 @@ public class OmfLoader extends AbstractProgramWrapperLoader {
Map<String, OmfSymbol> publicSymbols = header.getPublicSymbols()
.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");
Ghidra/Processors/x86/data/languages/x86.opinion
+3 -3
View File
@@ -71,11 +71,11 @@
<constraint primary="16bit" processor="x86" endian="little" size="16" />
</constraint>
<constraint compilerSpecID="borlandcpp">
<constraint primary="32bit" secondary="borlandcpp" processor="x86" endian="little" size="32" />
<constraint primary="32bit" secondary="codegearcpp" processor="x86" endian="little" size="32" />
<constraint primary="32bit" secondary="borlandcpp" processor="x86" endian="little" size="32" />
<constraint primary="32bit" secondary="codegearcpp" processor="x86" endian="little" size="32" />
</constraint>
<constraint compilerSpecID="borlanddelphi">
<constraint primary="32bit" secondary="borlanddelphi" processor="x86" endian="little" size="32" />
<constraint primary="32bit" secondary="borlanddelphi" processor="x86" endian="little" size="32" />
</constraint>
</constraint>
</opinions>