development/ghidra
development/ghidra
1
0
Fork 0
mirror of https://github.com/NationalSecurityAgency/ghidra synced 2024-10-01 07:54:25 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/GP-1989_ghidra1_AddressMapComparator'

Browse source
This commit is contained in:
Ryan Kurtz 2022-05-06 14:25:21 -04:00
parent 1a94a17723 2bf0887be1
commit 16b190d39e
1 changed files with 1 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/database/map/AddressMapDB.java
View file

@ -128,30 +128,9 @@ public class AddressMapDB implements AddressMap {
int comp = normalizedAddr.getAddressSpace().compareTo(space);
if (comp == 0) {
// Same address space - assumes unsigned space
long maxOffset = space.getMaxAddress().getOffset();
long otherOffset = addr.getOffset() - baseImageOffset;
long offset = normalizedAddr.getOffset();
if (space.getSize() == 64) {
// Address space offsets are 64-bit unsigned
// wrapping of otherOffset handled automatically
if (offset < 0 && otherOffset >= 0) {
return 1;
}
else if (offset >= 0 && otherOffset < 0) {
return -1;
}
}
else if (otherOffset < 0) {
// wrap normalized otherOffset within space for spaces smaller than 64-bits
otherOffset += maxOffset + 1;
}
long diff = offset - otherOffset;
if (diff > 0) {
return 1;
}
if (diff < 0) {
return -1;
}
return Long.compareUnsigned(offset, otherOffset);
}
return comp;
}