Nixyri/ghidra
1
0
Fork 0
mirror of https://github.com/NationalSecurityAgency/ghidra.git synced 2024-11-28 23:21:46 +00:00
Code Issues Packages Projects Releases Wiki Activity

More efficient overlay check in PcodeEmit

Browse Source
This commit is contained in:
caheckman 2019-10-02 12:09:45 -04:00
parent bf4a17b67d
commit 40c54939c6
1 changed files with 13 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/app/plugin/processors/sleigh/PcodeEmit.java
View File

@ -63,7 +63,6 @@ public abstract class PcodeEmit {
private long uniquemask;
private long uniqueoffset;
private AddressSpace overlayspace = null;
private AddressSpace overlayedspace = null;
/**
* Pcode emitter constructor for empty or unimiplemented instructions
@ -89,8 +88,8 @@ public abstract class PcodeEmit {
AddressSpace myspace = startAddress.getAddressSpace();
if (myspace.isOverlaySpace()) {
overlayspace = myspace;
overlayedspace = ((OverlayAddressSpace) myspace).getOverlayedSpace();
startAddress = overlayedspace.getAddress(startAddress.getOffset());
startAddress = ((OverlayAddressSpace) myspace).getOverlayedSpace().getAddress(
startAddress.getOffset());
}
this.fallOffset = fallOffset;
this.uniqueFactory = uniqueFactory;
@ -730,18 +729,18 @@ public abstract class PcodeEmit {
}
void checkOverlays(int opcode, VarnodeData[] in, int isize, VarnodeData out) {
if (uniqueFactory == null) {
return;
}
if ((opcode == PcodeOp.LOAD) || (opcode == PcodeOp.STORE)) {
int spaceId = (int) in[0].offset;
AddressSpace space = uniqueFactory.getAddressFactory().getAddressSpace(spaceId);
if (space.isOverlaySpace()) {
space = ((OverlayAddressSpace) space).getOverlayedSpace();
in[0].offset = space.getBaseSpaceID();
}
}
if (overlayspace != null) {
if (uniqueFactory == null) {
return;
}
if ((opcode == PcodeOp.LOAD) || (opcode == PcodeOp.STORE)) {
int spaceId = (int) in[0].offset;
AddressSpace space = uniqueFactory.getAddressFactory().getAddressSpace(spaceId);
if (space.isOverlaySpace()) {
space = ((OverlayAddressSpace) space).getOverlayedSpace();
in[0].offset = space.getBaseSpaceID();
}
}
for (int i = 0; i < isize; ++i) {
VarnodeData v = in[0];
if (v.space.equals(overlayspace)) {