RVM-134 : Make the fields register and type of RegisterOperand private.

Author: erik-brangs

rvm/src/org/jikesrvm/compilers/opt/Simple.java

@@ -197,20 +197,20 @@ private static void sortCommutativeRegisterUses(IR ir) {
         RegisterOperand rop1 = Binary.getVal1(s).asRegister();
         RegisterOperand rop2 = Binary.getVal2(s).asRegister();
         // Simple SSA based test
-        if (rop1.register.isSSA()) {
-          if(rop2.register.isSSA()) {
+        if (rop1.getRegister().isSSA()) {
+          if(rop2.getRegister().isSSA()) {
             // ordering is arbitrary, ignore
           } else {
             // swap
             Binary.setVal1(s, rop2);
             Binary.setVal2(s, rop1);
           }
-        } else if (rop2.register.isSSA()) {
+        } else if (rop2.getRegister().isSSA()) {
           // already have prefered ordering
         } else {
           // neither registers are SSA so place registers used more on the RHS
           // (we don't have easy access to a count of the number of definitions)
-          if (rop1.register.useCount > rop2.register.useCount) {
+          if (rop1.getRegister().useCount > rop2.getRegister().useCount) {
             // swap
             Binary.setVal1(s, rop2);
             Binary.setVal2(s, rop1);

rvm/src/org/jikesrvm/compilers/opt/ir/operand/RegisterOperand.java

@@ -34,15 +34,13 @@ public final class RegisterOperand extends Operand {
 
   /**
    * Register object that this operand uses.
-   * TODO: make this field private, it is accessed via generated code
    */
-  public Register register;
+  private Register register;
 
   /**
    * Inferred data type of the contents of the register.
-   * TODO: make this field private, it is accessed via generated code
    */
-  public TypeReference type;
+  private TypeReference type;
 
   /**
    * Optimizations can use it for different purposes, as long as they
@@ -160,7 +158,7 @@ public Operand copy() {
    * and/or scratchObject being copied
    */
   public RegisterOperand copyRO() {
-    RegisterOperand temp = new RegisterOperand(getRegister(), type);
+    RegisterOperand temp = new RegisterOperand(register, type);
     temp.info = info;
     temp.flags = flags;
     temp.flags2 = flags2;
@@ -205,7 +203,7 @@ public RegisterOperand copyD2D() {
    */
   @Override
   public boolean similar(Operand op) {
-    return (op instanceof RegisterOperand) && (getRegister() == ((RegisterOperand) op).getRegister());
+    return (op instanceof RegisterOperand) && (register == ((RegisterOperand) op).getRegister());
   }
 
   /**
@@ -216,7 +214,7 @@ public boolean similar(Operand op) {
    */
   public void copyType(RegisterOperand rhs) {
     this.flags = rhs.flags;
-    this.setType(rhs.type); // setting type this way will force checking of precision
+    this.setType(rhs.getType()); // setting type this way will force checking of precision
   }
 
   @Override
@@ -450,7 +448,7 @@ public RegisterOperand getNext() {
    */
   @Override
   public String toString() {
-    String s = getRegister().toString();
+    String s = register.toString();
     if (type != null) {
       if (type != TypeReference.VALIDATION_TYPE) {
         s = s + "(" + type.getName();
@@ -497,7 +495,7 @@ public void setType(TypeReference t) {
    * @param t the inferred data type of the contents of the register
    */
   public void setPreciseType(TypeReference t) {
-    type = t;
+    setType(t);
     flags |= PRECISE_TYPE;
     if (VM.VerifyAssertions) verifyPreciseType();
   }