Merge remote-tracking branch 'origin/GP-0_ghidragon_fixing_junit_failures_related_to_AddressEvaluator'

Ghidra/Features/Base/src/main/java/ghidra/app/util/AddressInput.java

@@ -197,6 +197,14 @@ public class AddressInput extends JPanel implements FocusableEditor {
 		}
 	}
 
+	/**
+	 * Sets the selected AddressSpace to the given space.
+	 * @param addressSpace the address space to set selected
+	 */
+	public void setAddressSpace(AddressSpace addressSpace) {
+		addressSpaceField.setAddressSpace(addressSpace);
+	}
+
 	/**
 	 * Returns the address in the field or null if the address can't
 	 * be parsed.
@@ -577,4 +585,5 @@ public class AddressInput extends JPanel implements FocusableEditor {
 			return model;
 		}
 	}
+
 }

Ghidra/Features/Base/src/test.slow/java/ghidra/app/plugin/core/symboltree/AbstractSymbolTreePluginExternalsTest.java

@@ -435,6 +435,9 @@ public abstract class AbstractSymbolTreePluginExternalsTest
 				createDialog.getComponent().getRootPane(), EditExternalLocationPanel.class);
 			AddressInput extAddressInputWidget =
 				(AddressInput) getInstanceField("extAddressInputWidget", extLocPanel);
+			extAddressInputWidget.setAddressSpace(addressSpace);
+			extAddressInputWidget.setText(address);
+
 			if (extAddressInputWidget.containsAddressSpaces()) {
 				JComboBox<?> addressSpaceWidget =
 					(JComboBox<?>) getInstanceField("combo", extAddressInputWidget);

Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/util/AddressEvaluator.java

@@ -71,7 +71,7 @@ public class AddressEvaluator extends ExpressionEvaluator {
 	public static Address evaluate(Program p, Address baseAddr, String inputExpression) {
 		AddressEvaluator evaluator = new AddressEvaluator(p, true);
 		try {
-			return evaluator.parseAsAddress(inputExpression);
+			return evaluator.parseAsRelativeAddress(inputExpression, baseAddr);
 		}
 		catch (ExpressionException e) {
 			return null;