Merge remote-tracking branch 'origin/patch'

Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/model/lang/Register.java

@@ -43,6 +43,9 @@ public class Register implements java.io.Serializable, Comparable<Register> {
 	/** Register can be used in SIMD operations **/
 	public final static int TYPE_VECTOR = 128;
 
+	public final static Register DEFAULT_CONTEXT =
+		new Register("DEFAULT_CONTEXT", "DEFAULT_CONTEXT", Address.NO_ADDRESS, 4, true, 0);
+
 	private String name;
 	private String description; // description of the register
 	private Address address; // smallest address containing bits for this register

Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/model/lang/RegisterManager.java

@@ -32,7 +32,7 @@ public class RegisterManager {
 	private Map<Address, List<Register>> registerAddressMap =
 		new HashMap<Address, List<Register>>();
 
-	/**List of vector registers, sorted first by size and then by offset**/
+	/** List of vector registers, sorted first by size and then by offset **/
 	private List<Register> sortedVectorRegisters;
 
 	class RegisterSizeKey {
@@ -80,10 +80,11 @@ public class RegisterManager {
 
 	/**
 	 * Construct RegisterManager
-	 * @param registers all defined registers with appropriate parent-child relationships
-	 * properly established.
-	 * @param registerNameMap a complete name-to-register map including all register aliases
-	 * and alternate spellings (e.g., case-variations)
+	 * 
+	 * @param registers all defined registers with appropriate parent-child relationships properly
+	 *            established.
+	 * @param registerNameMap a complete name-to-register map including all register aliases and
+	 *            alternate spellings (e.g., case-variations)
 	 */
 	RegisterManager(List<Register> registers, Map<String, Register> registerNameMap) {
 		this.registers = Collections.unmodifiableList(registers);
@@ -126,8 +127,7 @@ public class RegisterManager {
 		}
 		// if there is no context register, force a default one
 		if (contextBaseRegister == null) {
-			contextBaseRegister =
-				new Register("DEFAULT_CONTEXT", "DEFAULT_CONTEXT", Address.NO_ADDRESS, 4, true, 0);
+			contextBaseRegister = Register.DEFAULT_CONTEXT;
 		}
 		// handle the register size 0 case;
 		Collections.reverse(registerListSortedBySize);
@@ -156,6 +156,7 @@ public class RegisterManager {
 
 	/**
 	 * Get context base-register
+	 * 
 	 * @return context base register or null if one has not been defined by the language.
 	 */
 	public Register getContextBaseRegister() {
@@ -163,7 +164,9 @@ public class RegisterManager {
 	}
 
 	/**
-	 * Get unsorted unmodifiable list of all processor context registers (include base context register and children)
+	 * Get unsorted unmodifiable list of all processor context registers (include base context
+	 * register and children)
+	 * 
 	 * @return all processor context registers
 	 */
 	public List<Register> getContextRegisters() {
@@ -171,9 +174,8 @@ public class RegisterManager {
 	}
 
 	/**
-	 * Get an alphabetical sorted unmodifiable list of original register names 
-	 * (including context registers).  Names correspond to orignal register
-	 * name and not aliases which may be defined.
+	 * Get an alphabetical sorted unmodifiable list of original register names (including context
+	 * registers). Names correspond to orignal register name and not aliases which may be defined.
 	 * 
 	 * @return alphabetical sorted unmodifiable list of original register names.
 	 */
@@ -183,6 +185,7 @@ public class RegisterManager {
 
 	/**
 	 * Returns the largest register located at the specified address
+	 * 
 	 * @param addr register address
 	 * @return register or null if not found
 	 */
@@ -222,6 +225,7 @@ public class RegisterManager {
 
 	/**
 	 * Get register by address and size
+	 * 
 	 * @param addr register address
 	 * @param size register size
 	 * @return register or null if not found
@@ -235,9 +239,9 @@ public class RegisterManager {
 	}
 
 	/**
-	 * Get register by name.  A semi-case-insensitive lookup is performed.
-	 * The specified name must match either the case-sensitive name or
-	 * be entirely lowercase or uppercase.
+	 * Get register by name. A semi-case-insensitive lookup is performed. The specified name must
+	 * match either the case-sensitive name or be entirely lowercase or uppercase.
+	 * 
 	 * @param name register name
 	 * @return register or null if not found
 	 */
@@ -247,6 +251,7 @@ public class RegisterManager {
 
 	/**
 	 * Get all registers as an unsorted unmodifiable list.
+	 * 
 	 * @return unmodifiable list of all registers defined
 	 */
 	public List<Register> getRegisters() {
@@ -255,7 +260,8 @@ public class RegisterManager {
 
 	/**
 	 * Get an unmodifiable list of all vector registers indentified by the processor specification
-	 * in sorted order based upon address and size.  
+	 * in sorted order based upon address and size.
+	 * 
 	 * @return all vector registers as unmodifiable list
 	 */
 	public List<Register> getSortedVectorRegisters() {
@@ -274,6 +280,7 @@ public class RegisterManager {
 
 	/**
 	 * Compares two vector registers, first by size (descending) and then by offset (ascending).
+	 * 
 	 * @param reg1 vector register
 	 * @param reg2 vector register
 	 * @return result of comparison