yetangitu/ghidra
1
0
Fork 0
mirror of https://github.com/NationalSecurityAgency/ghidra.git synced 2025-10-06 03:50:02 +02:00
Code Issues Releases Wiki Activity

Merge remote-tracking branch 'origin/patch'

Browse source
This commit is contained in:
Ryan Kurtz 2022-11-15 00:45:13 -05:00
commit 81fd59389d
5 changed files with 46 additions and 25 deletions
Download patch file Download diff file Expand all files Collapse all files

4
Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/app/plugin/processors/sleigh/PcodeEmit.java
View file

@ -664,6 +664,10 @@ public abstract class PcodeEmit {
AddressSpace spc = vn.getSpace().fixSpace(walker);
Address addr = spc.getTruncatedAddress(vn.getOffset().fix(walker), false);
// translate the address into the overlayspace if we have an overlayspace.
if (startAddress.getAddressSpace().isOverlaySpace()) {
OverlayAddressSpace overSpace = (OverlayAddressSpace) startAddress.getAddressSpace();
addr = overSpace.getOverlayAddress(addr);
}
ParserWalker oldwalker = walker;
long olduniqueoffset = uniqueoffset;
setUniqueOffset(addr);

4
Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/model/data/TypedefDataType.java
View file

@ -40,7 +40,7 @@ public class TypedefDataType extends GenericDataType implements TypeDef {
* @param dt data type that is being typedef'ed (may not be null)
*/
public TypedefDataType(String name, DataType dt) {
this(CategoryPath.ROOT, name, dt, null);
this(CategoryPath.ROOT, name, dt, dt.getDataTypeManager());
}
/**
@ -50,7 +50,7 @@ public class TypedefDataType extends GenericDataType implements TypeDef {
* @param dt data type that is being typedef'ed (may not be null)
*/
public TypedefDataType(CategoryPath path, String name, DataType dt) {
this(path, name, dt, null);
this(path, name, dt, dt.getDataTypeManager());
}
/**