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

Merge remote-tracking branch 'origin/GP-3780_ryanmkurtz_mz-cs--SQUASHED'

Browse Source 
(Closes #5700)
This commit is contained in:
Ryan Kurtz
2023-09-07 16:29:24 -04:00
parent 0a48ae6ea1 b0a4144e2d
commit 1efa660703
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Ghidra/Features/Base/src/main/java/ghidra/app/util/opinion/MzLoader.java
+5 -5
View File
@@ -183,7 +183,9 @@ public class MzLoader extends AbstractLibrarySupportLoader {
Set<SegmentedAddress> knownSegments = new TreeSet<>();
relocationFixups.forEach(rf -> knownSegments.add(space.getAddress(rf.segment, 0)));
knownSegments.add(space.getAddress(INITIAL_SEGMENT_VAL, 0));
if (header.e_cs() > 0) {
knownSegments.add(space.getAddress((INITIAL_SEGMENT_VAL + header.e_cs()) & 0xffff, 0));
}
// Allocate an initialized memory block for each segment we know about
int endOffset = pagesToBytes(header.e_cp() - 1) + header.e_cblp();
MemoryBlock lastBlock = null;
@@ -392,8 +394,6 @@ public class MzLoader extends AbstractLibrarySupportLoader {
BigInteger.valueOf(
Integer.toUnsignedLong((header.e_ss() + INITIAL_SEGMENT_VAL) & 0xffff)));
for (MemoryBlock block : program.getMemory().getBlocks()) {
Address start = block.getStart();
Address end = block.getEnd();
@@ -402,8 +402,8 @@ public class MzLoader extends AbstractLibrarySupportLoader {
continue;
}
BigInteger csValue = BigInteger.valueOf(
Integer.toUnsignedLong(((SegmentedAddress) start).getSegment()));
BigInteger csValue = BigInteger
.valueOf(Integer.toUnsignedLong(((SegmentedAddress) start).getSegment()));
context.setValue(cs, start, end, csValue);
if (shouldSetDS) {