Merge remote-tracking branch 'origin/Ghidra_10.2'

Author: ghidra1

Ghidra/Configurations/Public_Release/src/global/docs/ChangeHistory.html

@@ -580,8 +580,7 @@ public void setChanged(TraceChangeRecord<?, ?> event) {
 	}
 
 	@Override
-	// NOTE: addListener synchronizes on this and might generate callbacks immediately
-	public synchronized DBTraceProgramView getFixedProgramView(long snap) {
+	public DBTraceProgramView getFixedProgramView(long snap) {
 		// NOTE: The new viewport will need to read from the time manager during init
 		DBTraceProgramView view;
 		try (LockHold hold = lockRead()) {
@@ -595,8 +594,7 @@ public synchronized DBTraceProgramView getFixedProgramView(long snap) {
 	}
 
 	@Override
-	// NOTE: Ditto getFixedProgramView
-	public synchronized DBTraceVariableSnapProgramView createProgramView(long snap) {
+	public DBTraceVariableSnapProgramView createProgramView(long snap) {
 		// NOTE: The new viewport will need to read from the time manager during init
 		DBTraceVariableSnapProgramView view;
 		try (LockHold hold = lockRead()) {
@@ -613,7 +611,7 @@ public DBTraceVariableSnapProgramView getProgramView() {
 	}
 
 	@Override
-	public synchronized DBTraceTimeViewport createTimeViewport() {
+	public DBTraceTimeViewport createTimeViewport() {
 		try (LockHold hold = lockRead()) {
 			DBTraceTimeViewport view = new DBTraceTimeViewport(this);
 			viewports.add(view);

Ghidra/Configurations/Public_Release/src/global/docs/WhatsNew.html

@@ -165,7 +165,7 @@ public static StoredAnalyzerTimes getStoredAnalyzerTimes(Program program) {
 		Options options = program.getOptions(OPTIONS_LIST);
 		StoredAnalyzerTimes times = (StoredAnalyzerTimes) options
 			.getCustomOption(StoredAnalyzerTimes.OPTION_NAME, new StoredAnalyzerTimes());
-		return times;
+		return times.clone();
 	}
 
 	/**

Ghidra/Debug/Framework-TraceModeling/src/main/java/ghidra/trace/database/DBTrace.java

@@ -1559,8 +1559,8 @@ private void setupAreaMarkerSets() {
 		if (programs[LEFT] != null) {
 			AddressIndexMap indexMap = listingPanels[LEFT].getAddressIndexMap();
 			listingPanels[LEFT].getFieldPanel()
-					.setBackgroundColorModel(
-						new MarkerServiceBackgroundColorModel(markerManagers[LEFT], indexMap));
+					.setBackgroundColorModel(new MarkerServiceBackgroundColorModel(
+						markerManagers[LEFT], programs[LEFT], indexMap));
 			unmatchedCodeMarkers[LEFT] =
 				markerManagers[LEFT].createAreaMarker("Listing1 Unmatched Code",
 					"Instructions that are not matched to an instruction in the other function.",
@@ -1573,9 +1573,8 @@ private void setupAreaMarkerSets() {
 		if (programs[RIGHT] != null) {
 			AddressIndexMap rightIndexMap = listingPanels[RIGHT].getAddressIndexMap();
 			listingPanels[RIGHT].getFieldPanel()
-					.setBackgroundColorModel(
-						new MarkerServiceBackgroundColorModel(markerManagers[RIGHT],
-							rightIndexMap));
+					.setBackgroundColorModel(new MarkerServiceBackgroundColorModel(
+						markerManagers[RIGHT], programs[RIGHT], rightIndexMap));
 			unmatchedCodeMarkers[RIGHT] =
 				markerManagers[RIGHT].createAreaMarker("Listing2 Unmatched Code",
 					"Instructions that are not matched to an instruction in the other function.",
@@ -1675,8 +1674,8 @@ private void updateLeftAddressSet(Function leftFunction) {
 		indexMaps[LEFT] = new AddressIndexMap(addressSets[LEFT]);
 		markerManagers[LEFT].getOverviewProvider().setProgram(getLeftProgram(), indexMaps[LEFT]);
 		listingPanels[LEFT].getFieldPanel()
-				.setBackgroundColorModel(
-					new MarkerServiceBackgroundColorModel(markerManagers[LEFT], indexMaps[LEFT]));
+				.setBackgroundColorModel(new MarkerServiceBackgroundColorModel(markerManagers[LEFT],
+					programs[LEFT], indexMaps[LEFT]));
 	}
 
 	private void updateRightAddressSet(Function rightFunction) {
@@ -1692,8 +1691,8 @@ private void updateRightAddressSet(Function rightFunction) {
 		indexMaps[RIGHT] = new AddressIndexMap(addressSets[RIGHT]);
 		markerManagers[RIGHT].getOverviewProvider().setProgram(getRightProgram(), indexMaps[RIGHT]);
 		listingPanels[RIGHT].getFieldPanel()
-				.setBackgroundColorModel(
-					new MarkerServiceBackgroundColorModel(markerManagers[RIGHT], indexMaps[RIGHT]));
+				.setBackgroundColorModel(new MarkerServiceBackgroundColorModel(
+					markerManagers[RIGHT], programs[RIGHT], indexMaps[RIGHT]));
 	}
 
 	@Override

Ghidra/Features/Base/src/main/java/ghidra/app/plugin/core/analysis/StoredAnalyzerTimes.java

@@ -597,6 +597,15 @@ public Function createEmptyFunction(String name, String namespace, String callin
 			returnType, params);
 	}
 
+	public void deleteFunction(String address) throws Exception {
+
+		tx(() -> {
+			Address entryPoint = addr(address);
+			FunctionManager functionManager = program.getFunctionManager();
+			functionManager.removeFunction(entryPoint);
+		});
+	}
+
 	public Library createLibrary(String libraryName)
 			throws DuplicateNameException, InvalidInputException {
 		return createLibrary(libraryName, SourceType.USER_DEFINED);

Ghidra/Features/Base/src/main/java/ghidra/app/util/viewer/listingpanel/ListingCodeComparisonPanel.java

@@ -341,6 +341,12 @@ void createFunction(String address) throws Exception {
 		waitForBusyTool(tool);
 	}
 
+	void deleteFunction(String address) throws Exception {
+		setLocation(address);
+		builder.deleteFunction(address);
+		waitForBusyTool(tool);
+	}
+
 	void analyzeStack(String address) {
 		setLocation(address);
 		DockingActionIf analyzeStack =

Ghidra/Features/Base/src/main/java/ghidra/program/database/ProgramBuilder.java

@@ -25,6 +25,7 @@
 import org.junit.Test;
 
 import docking.action.DockingActionIf;
+import ghidra.app.util.datatype.EmptyCompositeException;
 import ghidra.framework.options.Options;
 import ghidra.program.model.data.*;
 import ghidra.program.model.listing.*;
@@ -139,10 +140,12 @@ public void testEditUnchangedStackAndDeleteFunction() throws Exception {
 	}
 
 	@Test
-	public void testUndoAssociatedFunctionCreate() throws Exception {
+	public void testDeleteAssociatedFunction() throws Exception {
 		Window dialog;
 		// Create the stack frame @ 00000200.
 		createFunction("0x200");
+		waitForBusyTool(tool); // wait for analysis to complete
+
 		editStack("0x200");
 
 		Function f = program.getFunctionManager().getFunctionAt(addr("0x200"));
@@ -159,16 +162,23 @@ public void testUndoAssociatedFunctionCreate() throws Exception {
 		// Put byte at -0x18
 		setType(new ByteDataType(), 0);
 
-		// Undo the apply of a new data type to an editor component.
-		undo(program, false); // don't wait, in case there is a modal dialog
-		waitForSwing();
+		runSwing(() -> {
+			try {
+				model.apply();
+			}
+			catch (EmptyCompositeException | InvalidDataTypeException e) {
+				failWithException("Editor apply failure", e);
+			}
+		});
+		
+		deleteFunction("0x200");
 
 		// Verify the Reload Stack Editor? dialog is not displayed.
 		dialog = getWindow("Reload Stack Editor?");
 		assertNull(dialog);
 
 		// Verify the stack editor is not displayed.
-		assertStackEditorHidden(f);
+		assertStackEditorHidden(f); // This occurs if function is removed
 	}
 
 	@Test

Ghidra/Features/Base/src/test.slow/java/ghidra/app/plugin/core/stackeditor/AbstractStackEditorTest.java

@@ -44,7 +44,7 @@
 import ghidra.xml.XmlPullParser;
 
 public class FunctionStartAnalyzer extends AbstractAnalyzer implements PatternFactory {
-	private static final String FUNCTION_START_SEARCH = "Function Start Search";
+	protected static final String FUNCTION_START_SEARCH = "Function Start Search";
 	protected static final String NAME = FUNCTION_START_SEARCH;
 	private static final String DESCRIPTION =
 		"Search for architecture specific byte patterns: typically starts of functions";
@@ -742,7 +742,7 @@ public BigInteger getValue() {
 		}
 
 	}
-
+	
 	@Override
 	public boolean canAnalyze(Program program) {
 		ProgramDecisionTree patternDecisionTree = getPatternDecisionTree();
@@ -816,57 +816,17 @@ public void postMatchApply(MatchAction[] actions, Address addr) {
 
 		AutoAnalysisManager analysisManager = AutoAnalysisManager.getAnalysisManager(program);
 		if (!disassemResult.isEmpty()) {
-			analysisManager.disassemble(disassemResult);
+			analysisManager.disassemble(disassemResult, AnalysisPriority.DISASSEMBLY);
 		}
 		analysisManager.setProtectedLocations(codeLocations);
 
 		if (!potentialFuncResult.isEmpty()) {
 			// could be a pattern that said this is a function start, so it isn't potentially anymore
 			potentialFuncResult = potentialFuncResult.subtract(funcResult);
 
-			// kick off a later analyzer to create the functions after all the fallout
-			//       it should check that the function is not already part of another function
-			analysisManager.scheduleOneTimeAnalysis(new AnalyzerAdapter(
-				FUNCTION_START_SEARCH + " delayed", AnalysisPriority.DATA_ANALYSIS.after()) {
-				@Override
-				public boolean added(Program addedProgram, AddressSetView addedSet,
-						TaskMonitor addedMonitor, MessageLog addedLog) throws CancelledException {
-					AddressIterator addresses = addedSet.getAddresses(true);
-					while (addresses.hasNext() && !addedMonitor.isCancelled()) {
-						Address address = addresses.next();
-						// if there are any conditional references, then this can't be a function start
-						if (hasConditionalReferences(addedProgram, address)) {
-							continue;
-						}
-						Function funcAt =
-							addedProgram.getFunctionManager().getFunctionContaining(address);
-						if (funcAt != null) {
-							if (funcAt.getEntryPoint().equals(address)) {
-								continue;
-							}
-							BookmarkManager bookmarkManager = addedProgram.getBookmarkManager();
-							bookmarkManager.setBookmark(address, BookmarkType.ANALYSIS,
-								getName() + " Overlap",
-								"Function exists at probable good function start");
-							continue;
-						}
-						new CreateFunctionCmd(address, false).applyTo(addedProgram, addedMonitor);
-					}
-					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);
+			// kick off a later analyzer to create the functions after all the fallout from disassemlby
+			PossibleDelayedFunctionCreator analyzer = new PossibleDelayedFunctionCreator();
+			analysisManager.scheduleOneTimeAnalysis(analyzer, potentialFuncResult);
 		}
 
 		if (!funcResult.isEmpty()) {
@@ -994,3 +954,59 @@ public PostRule getPostRuleByName(String nm) {
 	}
 
 }
+
+/**
+ * 
+ * One time analyzer used to delay function creation until disassembly has settled.
+ */
+final class PossibleDelayedFunctionCreator extends AnalyzerAdapter {
+
+	PossibleDelayedFunctionCreator() {
+		super(FunctionStartAnalyzer.FUNCTION_START_SEARCH + " delayed", AnalysisPriority.DATA_ANALYSIS.after());
+	}
+
+	@Override
+	public boolean added(Program addedProgram, AddressSetView addedSet,
+			TaskMonitor addedMonitor, MessageLog addedLog) throws CancelledException {
+		AddressIterator addresses = addedSet.getAddresses(true);
+		AddressSet functionStarts = new AddressSet();
+		while (addresses.hasNext() && !addedMonitor.isCancelled()) {
+			Address address = addresses.next();
+			// if there are any conditional references, then this can't be a function start
+			if (hasConditionalReferences(addedProgram, address)) {
+				continue;
+			}
+			
+			// Check for any function containing the potential start detected earlier in analysis
+			Function funcAt =
+				addedProgram.getFunctionManager().getFunctionContaining(address);
+			if (funcAt != null) {
+				if (funcAt.getEntryPoint().equals(address)) {
+					continue;
+				}
+				BookmarkManager bookmarkManager = addedProgram.getBookmarkManager();
+				bookmarkManager.setBookmark(address, BookmarkType.ANALYSIS,
+					getName() + " Overlap",
+					"Function exists at probable good function start");
+				continue;
+			}
+			functionStarts.add(address);
+		}
+		
+		// create functions that still don't exist/overlap
+		new CreateFunctionCmd(functionStarts, false).applyTo(addedProgram, addedMonitor);
+		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;
+	}
+}

Ghidra/Features/Base/src/test.slow/java/ghidra/app/plugin/core/stackeditor/StackEditorProvider1Test.java

@@ -111,8 +111,14 @@ public void testAssemble_T_push_r7_lr() {
 	}
 
 	@Test
-	public void testAssemble_T_vmov_i32_d0_simdExpand_0x0_0x0_0xb1() {
+	public void testAssemble_T_vmov_simd_immed() {
 		assertOneCompatRestExact("vmov.i32 d0,simdExpand(0x0,0x0,0xb1)", "83:ff:11:00", THUMB,
 			0x00010100, "vmov.i32 d0,simdExpand(0x0,0x0,0xb1)");
+		assertOneCompatRestExact("vmov.i16 d0,simdExpand(0x0,0xa,0xb1)", "83:ff:11:0a", THUMB,
+			0x00010100, "vmov.i16 d0,simdExpand(0x0,0xa,0xb1)");
+		assertOneCompatRestExact("vmov.i32 d0,simdExpand(0x0,0xd,0xb1)", "83:ff:11:0d", THUMB,
+			0x00010100, "vmov.i32 d0,simdExpand(0x0,0xd,0xb1)");
+		assertOneCompatRestExact("vmov.i64 d0,simdExpand(0x1,0xe,0xb1)", "83:ff:31:0e", THUMB,
+			0x00010100, "vmov.i64 d0,simdExpand(0x1,0xe,0xb1)");
 	}
 }