GT-3511 revised fix for branch to self with invalid delay slot

ghidra1 · ghidra1 · commit d73c362790cd · 2020-02-03T15:18:36.000-05:00
diff --git a/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/disassemble/Disassembler.java b/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/disassemble/Disassembler.java
@@ -1150,12 +1150,12 @@ protected Address processInstruction(PseudoInstruction inst, MemBuffer blockMemB
 			throws InsufficientBytesException, UnknownInstructionException,
 			AddressOverflowException, NestedDelaySlotException {
 
+		List<PseudoInstruction> delaySlotList = parseDelaySlots(inst, blockMemBuffer, block);
+
 		if (followFlow) {
 			processInstructionFlows(inst, block);
 		}
 
-		List<PseudoInstruction> delaySlotList = parseDelaySlots(inst, blockMemBuffer, block);
-
 		block.addInstruction(inst);
 
 		if (delaySlotList != null) {
diff --git a/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/disassemble/DisassemblerQueue.java b/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/disassemble/DisassemblerQueue.java
@@ -174,9 +174,6 @@ else if (!currentBranchQueue.isEmpty()) {
 				branchFlow = currentBranchQueue.first();
 				currentBranchQueue.remove(branchFlow);
 			}
-			if (processedBranchFlows.contains(branchFlow)) {
-				continue;
-			}
 			processedBranchFlows.add(branchFlow);
 
 			Address blockAddr = branchFlow.getDestinationAddress();

Original file line number	Diff line number	Diff line change
`@@ -174,9 +174,6 @@ else if (!currentBranchQueue.isEmpty()) {`
`174`	`174`	`branchFlow = currentBranchQueue.first();`
`175`	`175`	`currentBranchQueue.remove(branchFlow);`
`176`	`176`	`}`
`177`		`- if (processedBranchFlows.contains(branchFlow)) {`
`178`		`- continue;`
`179`		`- }`
`180`	`177`	`processedBranchFlows.add(branchFlow);`
`181`	`178`
`182`	`179`	`Address blockAddr = branchFlow.getDestinationAddress();`