Merge pull request #371 from quarnster/patch-1

PPCAnalyst now detects internal branches better
dolphin-emu · Jun 6, 2014 · db08f7b · db08f7b
2 parents 7ffea5d + 31ec57a
commit db08f7b
Showing 1 changed file with 15 additions and 4 deletions.
diff --git a/Source/Core/Core/PowerPC/PPCAnalyst.cpp b/Source/Core/Core/PowerPC/PPCAnalyst.cpp
@@ -172,11 +172,22 @@ bool AnalyzeFunction(u32 startAddr, Symbol &func, int max_size)
 				else
 				{
 					u32 target = EvaluateBranchTarget(instr, addr);
-					if (target != INVALID_TARGET && instr.LK)
+					if (target != INVALID_TARGET)
 					{
-						//we found a branch-n-link!
-						func.calls.push_back(SCall(target,addr));
-						func.flags &= ~FFLAG_LEAF;
+						if (instr.LK)
+						{
+							//we found a branch-n-link!
+							func.calls.push_back(SCall(target, addr));
+							func.flags &= ~FFLAG_LEAF;
+						}
+						else
+						{
+							if (target > farthestInternalBranchTarget)
+							{
+								farthestInternalBranchTarget = target;
+							}
+							numInternalBranches++;
+						}
 					}
 				}
 			}