yetangitu/ghidra
1
0
Fork 0
mirror of https://github.com/NationalSecurityAgency/ghidra.git synced 2025-10-05 19:42:36 +02:00
Code Issues Releases Wiki Activity

Merge remote-tracking branch 'origin/patch'

Browse source
This commit is contained in:
Ryan Kurtz 2021-10-19 07:19:14 -04:00
commit 389a0ae441
3 changed files with 49 additions and 29 deletions
Download patch file Download diff file Expand all files Collapse all files

7
Ghidra/Debug/Framework-TraceModeling/src/main/java/ghidra/trace/model/TraceAddressSnapSpace.java
View file

@ -22,9 +22,11 @@ import ghidra.program.model.address.Address;
import ghidra.program.model.address.AddressSpace;
import ghidra.trace.model.map.UnsignedUtils;
import ghidra.util.database.spatial.rect.EuclideanSpace2D;
import utilities.util.IDHashed;
public class TraceAddressSnapSpace implements EuclideanSpace2D<Address, Long> {
private static final Map<AddressSpace, TraceAddressSnapSpace> SPACES = new HashMap<>();
private static final Map<IDHashed<AddressSpace>, TraceAddressSnapSpace> SPACES =
new HashMap<>();
/**
* Get the trace-address-snap space for a given address space
@ -38,7 +40,8 @@ public class TraceAddressSnapSpace implements EuclideanSpace2D<Address, Long> {
*/
public static TraceAddressSnapSpace forAddressSpace(AddressSpace space) {
synchronized (SPACES) {
return SPACES.computeIfAbsent(space, TraceAddressSnapSpace::new);
return SPACES.computeIfAbsent(new IDHashed<>(space),
s -> new TraceAddressSnapSpace(space));
}
}