Skip to content

Ghidra is a software reverse engineering (SRE) framework

GP-7388 Real Mode address space adjustment

caheckmand3df9929fcde
diff --git a/Ghidra/Features/Decompiler/src/decompile/cpp/architecture.cc b/Ghidra/Features/Decompiler/src/decompile/cpp/architecture.cc
index 10f5da088a..629404a1d1 100644
--- a/Ghidra/Features/Decompiler/src/decompile/cpp/architecture.cc
+++ b/Ghidra/Features/Decompiler/src/decompile/cpp/architecture.cc
@@ -1456,23 +1456,15 @@ Address SegmentedResolver::resolve(uintb val,int4 sz,const Address &point,uintb
// (as with near pointers)
if (segop->getResolve().space != (AddrSpace *)0 && !point.isInvalid()) {
uintb base = glb->context->getTrackedValue(segop->getResolve(),point);
- fullEncoding = (base << 8 * innersz) + (val & calc_mask(innersz));
vector<uintb> seginput;
seginput.push_back(base);
seginput.push_back(val);
- val = segop->execute(seginput);
- return Address(spc,AddrSpace::addressToByte(val,spc->getWordSize()));
+ fullEncoding = segop->execute(seginput);
+ return Address(spc,AddrSpace::addressToByte(fullEncoding,spc->getWordSize()));
}
}
- else { // For anything else, consider it a "far" pointer
+ else { // For anything else, consider it a flat pointer
fullEncoding = val;
- int4 outersz = segop->getBaseSize();
- uintb base = (val >> 8*innersz) & calc_mask(outersz);
- val = val & calc_mask(innersz);
- vector<uintb> seginput;
- seginput.push_back(base);
- seginput.push_back(val);
- val = segop->execute(seginput);
return Address(spc,AddrSpace::addressToByte(val,spc->getWordSize()));
}
return Address(); // Return invalid address
diff --git a/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/model/address/SegmentedAddressSpace.java b/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/model/address/SegmentedAddressSpace.java
index 3f9d5c6616..003bd1e60e 100644
--- a/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/model/address/SegmentedAddressSpace.java
+++ b/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/model/address/SegmentedAddressSpace.java
@@ -4,9 +4,9 @@
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -333,6 +333,6 @@ public class SegmentedAddressSpace extends GenericAddressSpace {
*/
@Override
public int getPointerSize() {
- return 2;
+ return 4;
}
}
diff --git a/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/model/pcode/DynamicHash.java b/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/model/pcode/DynamicHash.java
index b698845253..be021d5dc1 100644
--- a/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/model/pcode/DynamicHash.java
+++ b/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/model/pcode/DynamicHash.java
@@ -105,8 +105,8 @@ public class DynamicHash {
reg = SimpleCRC32.hashOneByte(reg, slot);
reg = SimpleCRC32.hashOneByte(reg, transtable[op.getOpcode()]);
long val = op.getSeqnum().getTarget().getOffset();
- int sz = op.getSeqnum().getTarget().getSize();
- for (int i = 0; i < sz; i += 8) {
+ int sz = op.getSeqnum().getTarget().getPointerSize();
+ for (int i = 0; i < sz; i += 1) {
reg = SimpleCRC32.hashOneByte(reg, (int) val);
val >>= 8;
}
diff --git a/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/model/pcode/HighFunctionDBUtil.java b/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/model/pcode/HighFunctionDBUtil.java
index 6657ceddce..8233eff8e7 100644
--- a/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/model/pcode/HighFunctionDBUtil.java
+++ b/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/model/pcode/HighFunctionDBUtil.java
@@ -847,16 +847,7 @@ public class HighFunctionDBUtil {
}
else {
AddressSpace space = addrFactory.getDefaultAddressSpace();
- if (space instanceof SegmentedAddressSpace) {
- // Assume this is a "full" encoding of the offset
- int innersize = space.getPointerSize();
- int base = (int) (cnode.getOffset() >>> 8 * innersize);
- int off = (int) cnode.getOffset() & ((1 << 8 * innersize) - 1);
- storageAddress = ((SegmentedAddressSpace) space).getAddress(base, off);
- }
- else {
- storageAddress = space.getAddress(cnode.getOffset());
- }
+ storageAddress = space.getAddress(cnode.getOffset());
}
}
return storageAddress;