Nixyri/ghidra
1
0
Fork 0
mirror of https://github.com/NationalSecurityAgency/ghidra.git synced 2025-02-18 00:20:10 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/GP-3829_Ives_TraceAddressFactory-Registeroverlay--SQUASHED'

Browse Source
This commit is contained in:
Ryan Kurtz 2023-09-15 13:43:02 -04:00
commit 8cfd98f933
2 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Ghidra/Debug/Framework-TraceModeling/src/main/java/ghidra/trace/database/address/TraceAddressFactory.java
View File

@ -34,6 +34,12 @@ public class TraceAddressFactory extends ProgramAddressFactory {
!originalSpace.isOverlaySpace();
}
@Override
protected boolean assignUniqueID(AddressSpace originalSpace) {
return super.assignUniqueID(originalSpace) ||
originalSpace.getType() == AddressSpace.TYPE_REGISTER;
}
@Override // for peer access
protected OverlayAddressSpace addOverlayAddressSpace(String name, boolean preserveName,
AddressSpace originalSpace, long minOffset, long maxOffset) {

8
Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/database/ProgramAddressFactory.java
View File

@ -112,6 +112,11 @@ public class ProgramAddressFactory extends DefaultAddressFactory {
return originalSpace.isMemorySpace() && !originalSpace.isOverlaySpace();
}
protected boolean assignUniqueID(AddressSpace originalSpace) {
return originalSpace.getType() == AddressSpace.TYPE_RAM ||
originalSpace.getType() == AddressSpace.TYPE_OTHER;
}
/**
* Create a new OverlayAddressSpace based upon the given overlay blockName and base AddressSpace
*
@ -149,8 +154,7 @@ public class ProgramAddressFactory extends DefaultAddressFactory {
}
int unique = 0;
if (originalSpace.getType() == AddressSpace.TYPE_RAM ||
originalSpace.getType() == AddressSpace.TYPE_OTHER) {
if (assignUniqueID(originalSpace)) {
unique = getNextUniqueID();
}