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 '62f476b674a05fd251af2943d24256dc8c90f1ce' into patch

Browse Source
This commit is contained in:
ghidra1
2021-12-13 13:02:53 -05:00
parent fb467671e0 62f476b674
commit 609e56381a
2 changed files with 18 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
Ghidra/Features/Base/src/main/java/ghidra/app/util/opinion/NeLoader.java
View File

@@ -146,7 +146,7 @@ public class NeLoader extends AbstractLibrarySupportLoader {
return;
}
monitor.setMessage("Processing entry table...");
processEntryTable(st, ib, et, symbolTable, space);
processEntryTable(st, ib, et, symbolTable, space, log);
if (monitor.isCancelled()) {
return;
@@ -340,7 +340,7 @@ public class NeLoader extends AbstractLibrarySupportLoader {
}
//create a comment to describe this resource...
StringBuffer buf = new StringBuffer();
StringBuilder buf = new StringBuilder();
buf.append("Resource Type: " + Conv.toHexString(type.getTypeID()) + " (" + type +
")" + "\n");
buf.append(
@@ -380,14 +380,10 @@ public class NeLoader extends AbstractLibrarySupportLoader {
listing.createData(straddr, new StringDataType(),
Conv.byteToInt(string.getLength()));
}
catch (AddressOverflowException e) {
//TODO:
}
catch (CodeUnitInsertionException e) {
//TODO:
}
catch (DataTypeConflictException e) {
//TODO:
catch (AddressOverflowException | CodeUnitInsertionException
| DataTypeConflictException e) {
log.appendMsg("Error creating data");
log.appendException(e);
}
}
}
@@ -507,7 +503,7 @@ public class NeLoader extends AbstractLibrarySupportLoader {
}
private void processEntryTable(SegmentTable st, InformationBlock ib, EntryTable et,
SymbolTable symbolTable, SegmentedAddressSpace space) {
SymbolTable symbolTable, SegmentedAddressSpace space, MessageLog log) {
//process the main entry point defined in the information block...
short segmentIdx = ib.getEntryPointSegment();
@@ -520,8 +516,8 @@ public class NeLoader extends AbstractLibrarySupportLoader {
symbolTable.createLabel(entryAddr, "entry", SourceType.IMPORTED);
}
catch (InvalidInputException e) {
// TODO Auto-generated catch block
e.printStackTrace();
log.appendMsg("Error creating label at " + entryAddr);
log.appendException(e);
}
}
@@ -539,11 +535,16 @@ public class NeLoader extends AbstractLibrarySupportLoader {
for (EntryPoint pt : pts) {
int seg = 0;
if (bundle.isMoveable()) {
seg = st.getSegments()[pt.getSegment() - 1].getSegmentID();
int segmentIndex = Byte.toUnsignedInt(pt.getSegment()) - 1;
if (segmentIndex < 0 || segmentIndex >= st.getSegments().length) {
log.appendMsg("Invalid segmentIndex " + segmentIndex);
continue;
}
seg = st.getSegments()[segmentIndex].getSegmentID();
}
else if (bundle.isConstant()) {
//todo: how to handle constants...?
System.out.println("NE - constant entry point...");
log.appendMsg("NE - constant entry point...");
}
else {
seg = st.getSegments()[bundle.getType() - 1].getSegmentID();
@@ -785,8 +786,7 @@ public class NeLoader extends AbstractLibrarySupportLoader {
SourceType.IMPORTED);
}
catch (InvalidInputException e) {
// TODO Auto-generated catch block
e.printStackTrace();
Msg.error(this, "Error creating label " + name + "@" + addr, e);
}
}
}

2
Ghidra/application.properties
View File

@@ -1,5 +1,5 @@
application.name=Ghidra
application.version=10.1
application.version=10.1.1
application.release.name=DEV
application.layout.version=1
application.gradle.min=6.4