diff graal/com.oracle.max.asmdis/src/com/sun/max/asm/gen/risc/RiscTemplate.java @ 4142:bc8527f3071c

Adjust code base to new level of warnings.
author Thomas Wuerthinger <thomas.wuerthinger@oracle.com>
date Sun, 18 Dec 2011 05:24:06 +0100
parents e233f5660da4
children
line wrap: on
line diff
--- a/graal/com.oracle.max.asmdis/src/com/sun/max/asm/gen/risc/RiscTemplate.java	Sun Dec 18 05:23:52 2011 +0100
+++ b/graal/com.oracle.max.asmdis/src/com/sun/max/asm/gen/risc/RiscTemplate.java	Sun Dec 18 05:24:06 2011 +0100
@@ -32,11 +32,11 @@
  */
 public class RiscTemplate extends Template implements RiscInstructionDescriptionVisitor {
 
-    private final List<RiscField> allFields = new LinkedList<RiscField>();
-    private final List<OperandField> operandFields = new LinkedList<OperandField>();
-    private final List<OptionField> optionFields = new LinkedList<OptionField>();
-    private final List<OperandField> parameters = new ArrayList<OperandField>();
-    private final List<Option> options = new LinkedList<Option>();
+    private final List<RiscField> allFields = new LinkedList<>();
+    private final List<OperandField> operandFields = new LinkedList<>();
+    private final List<OptionField> optionFields = new LinkedList<>();
+    private final List<OperandField> parameters = new ArrayList<>();
+    private final List<Option> options = new LinkedList<>();
 
     private int opcode;
     private int opcodeMask;
@@ -141,7 +141,7 @@
         return Integer.bitCount(opcodeMask);
     }
 
-    public void organizeOption(Option option, RiscTemplate canonicalRepresentative) {
+    public void organizeOption(Option option, RiscTemplate newCanonicalRepresentative) {
         instructionDescription().setExternalName(externalName() + option.externalName());
         setInternalName(internalName() + option.name());
         try {
@@ -153,7 +153,7 @@
 
         options.add(option);
         if (option.isRedundant()) {
-            this.canonicalRepresentative = canonicalRepresentative;
+            this.canonicalRepresentative = newCanonicalRepresentative;
         }
     }