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

Fixing test failures from merging GP-134: ProgramLocationComparator.

Browse source
This commit is contained in:
Dan 2020-09-17 07:54:32 -04:00
parent d807f56354
commit 0962913876
1 changed files with 4 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

6
Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/util/ProgramLocationComparator.java
View file

@ -30,8 +30,6 @@ import ghidra.program.model.listing.Program;
* two locations are definitely of the same class. * two locations are definitely of the same class.
*/ */
public class ProgramLocationComparator implements Comparator<ProgramLocation> { public class ProgramLocationComparator implements Comparator<ProgramLocation> {
/** The singleton instance */
public static final ProgramLocationComparator INSTANCE = new ProgramLocationComparator();
private static final Class<?>[] PROGRAM_LOCATION_CLASSES = { private static final Class<?>[] PROGRAM_LOCATION_CLASSES = {
DividerLocation.class, ProgramLocation.class, PlateFieldLocation.class, DividerLocation.class, ProgramLocation.class, PlateFieldLocation.class,
@ -58,6 +56,10 @@ public class ProgramLocationComparator implements Comparator<ProgramLocation> {
RegisterFieldLocation.class, RegisterFieldLocation.class,
}; };
// Note, because this calls the constructor, which in turn refers to PROGRAM_LOCATION_CLASSES
// This must be declared/initialized after PROGRAM_LOCATION_CLASSES
/** The singleton instance */
public static final ProgramLocationComparator INSTANCE = new ProgramLocationComparator();
private Map<Class<?>, Integer> priorityMap; private Map<Class<?>, Integer> priorityMap;