Merge branch 'GP-0_ryanmkurtz_PR-3787_GameCubeGBA_outerloop'

NationalSecurityAgency · Jun 24, 2022 · a59c42d · a59c42d
2 parents f57cf98 + d8bf2f9
commit a59c42d
Showing 1 changed file with 14 additions and 8 deletions.
diff --git a/Ghidra/Features/BytePatterns/src/main/java/ghidra/app/analyzers/FunctionStartAnalyzer.java b/Ghidra/Features/BytePatterns/src/main/java/ghidra/app/analyzers/FunctionStartAnalyzer.java
@@ -718,14 +718,8 @@ public boolean added(Program addedProgram, AddressSetView addedSet,
 					while (addresses.hasNext() && !addedMonitor.isCancelled()) {
 						Address address = addresses.next();
 						// if there are any conditional references, then this can't be a function start
-						ReferenceIterator referencesTo =
-							addedProgram.getReferenceManager().getReferencesTo(address);
-						while (referencesTo.hasNext()) {
-							Reference reference = referencesTo.next();
-							if (reference.getReferenceType().isConditional()) {
-								continue;
-							}
-
+						if (hasConditionalReferences(addedProgram, address)) {
+							continue;
 						}
 						Function funcAt =
 							addedProgram.getFunctionManager().getFunctionContaining(address);
@@ -743,6 +737,18 @@ public boolean added(Program addedProgram, AddressSetView addedSet,
 					}
 					return true;
 				}
+
+				private boolean hasConditionalReferences(Program addedProgram, Address address) {
+					ReferenceIterator refsTo =
+						addedProgram.getReferenceManager().getReferencesTo(address);
+					while (refsTo.hasNext()) {
+						Reference reference = refsTo.next();
+						if (reference.getReferenceType().isConditional()) {
+							return true;
+						}
+					}
+					return false;
+				}
 			}, potentialFuncResult);
 		}