Merge remote-tracking branch 'origin/GP-4874_ryanmkurtz_getValueAsInt'

(Closes #5037, Closes #5028)

Ghidra/Features/Base/src/main/java/ghidra/app/script/AskDialog.java

@@ -246,12 +246,12 @@ public class AskDialog<T> extends DialogComponentProvider {
 
 	protected Integer getValueAsInt() {
 		String text = getValueAsString();
-		return text != null ? Integer.decode(text) : null;
+		return text != null ? NumericUtilities.parseInt(text) : null;
 	}
 
 	protected Long getValueAsLong() {
 		String text = getValueAsString();
-		return text != null ? Long.decode(text) : null;
+		return text != null ? NumericUtilities.parseLong(text) : null;
 	}
 
 	protected Double getValueAsDouble() {

Ghidra/Framework/Generic/src/main/java/ghidra/util/NumericUtilities.java

@@ -4,9 +4,9 @@
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
- * 
+ *
  *      http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -98,20 +98,69 @@ public final class NumericUtilities {
 	}
 
 	/**
-	 * Parses the given string as a numeric value, detecting whether or not it begins with a hex
+	 * Parses the given decimal/hex string as an {@code int} value. This method allows values with
-	 * prefix, and if not, parses as a long int value.
+	 * the top bit set to be implicitly parsed as negative values.
+	 * 
 	 * @param s the string to parse
-	 * @return the long value
+	 * @return the {@code int} value, or 0 if the string to parse is null or blank
-	 * @throws NumberFormatException if the string is blank or has too many digits 
+	 * @throws NumberFormatException if the string does not represent a valid {@code int} value 
+	 */
+	public static int parseInt(String s) {
+		String origStr = s;
+		int sign = 1;
+
+		s = (s == null ? "" : s.trim());
+		if (s.length() == 0) {
+			return 0;
+		}
+		if (s.startsWith("-")) {
+			sign = -1;
+			s = s.substring(1);
+		}
+		int radix = 10;
+
+		if (s.startsWith(HEX_PREFIX_x) || s.startsWith(HEX_PREFIX_X)) {
+			if (s.length() > 10) {
+				throw new NumberFormatException(s + " has too many digits.");
+			}
+			s = s.substring(2);
+			radix = 16;
+		}
+		if (s.length() == 0) {
+			return 0;
+		}
+		try {
+			BigInteger bi = new BigInteger(s, radix);
+			return bi.intValue() * sign;
+		}
+		catch (NumberFormatException e) {
+			// This is a little hacky, but the message should be complete and report about the
+			// original string
+			NumberFormatException e2 =
+				new NumberFormatException("Cannot parse int from " + origStr);
+			e2.setStackTrace(e.getStackTrace());
+			throw e2;
+		}
+		catch (ArithmeticException e) {
+			throw new NumberFormatException(origStr + " is too big.");
+		}
+	}
+	
+	/**
+	 * Parses the given decimal/hex string as a {@code long} value. This method allows values with
+	 * the top bit set to be implicitly parsed as negative values.
+	 * 
+	 * @param s the string to parse
+	 * @return the {@code long} value, or 0 if the string to parse is null or blank
+	 * @throws NumberFormatException if the string does not represent a valid {@code long} value 
 	 */
 	public static long parseLong(String s) {
 		String origStr = s;
-		long value = 0;
 		long sign = 1;
 
 		s = (s == null ? "" : s.trim());
 		if (s.length() == 0) {
-			return value;
+			return 0;
 		}
 		if (s.startsWith("-")) {
 			sign = -1;