Mercurial > hg > truffle

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

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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
comparison
equal deleted inserted replaced
4141:04d21be7a24f 4142:bc8527f3071c
39 } 39 }
40 40
41 private List<SpecificityGroup> specificityGroups; 41 private List<SpecificityGroup> specificityGroups;
42 42
43 private void initialize() { 43 private void initialize() {
44 final IntHashMap<IntHashMap<OpcodeMaskGroup>> specificityTable = new IntHashMap<IntHashMap<OpcodeMaskGroup>>(); 44 final IntHashMap<IntHashMap<OpcodeMaskGroup>> specificityTable = new IntHashMap<>();
45 for (RiscTemplate template : templates()) { 45 for (RiscTemplate template : templates()) {
46 if (!template.isRedundant()) { 46 if (!template.isRedundant()) {
47 IntHashMap<OpcodeMaskGroup> opcodeMaskGroups = specificityTable.get(template.specificity()); 47 IntHashMap<OpcodeMaskGroup> opcodeMaskGroups = specificityTable.get(template.specificity());
48 if (opcodeMaskGroups == null) { 48 if (opcodeMaskGroups == null) {
49 opcodeMaskGroups = new IntHashMap<OpcodeMaskGroup>(); 49 opcodeMaskGroups = new IntHashMap<>();
50 specificityTable.put(template.specificity(), opcodeMaskGroups); 50 specificityTable.put(template.specificity(), opcodeMaskGroups);
51 } 51 }
52 final int opcodeMask = template.opcodeMask(); 52 final int opcodeMask = template.opcodeMask();
53 OpcodeMaskGroup opcodeMaskGroup = opcodeMaskGroups.get(opcodeMask); 53 OpcodeMaskGroup opcodeMaskGroup = opcodeMaskGroups.get(opcodeMask);
54 if (opcodeMaskGroup == null) { 54 if (opcodeMaskGroup == null) {
56 opcodeMaskGroups.put(opcodeMask, opcodeMaskGroup); 56 opcodeMaskGroups.put(opcodeMask, opcodeMaskGroup);
57 } 57 }
58 opcodeMaskGroup.add(template); 58 opcodeMaskGroup.add(template);
59 } 59 }
60 } 60 }
61 specificityGroups = new LinkedList<SpecificityGroup>(); 61 specificityGroups = new LinkedList<>();
62 for (int specificity = 33; specificity >= 0; specificity--) { 62 for (int specificity = 33; specificity >= 0; specificity--) {
63 final IntHashMap<OpcodeMaskGroup> opcodeGroupTable = specificityTable.get(specificity); 63 final IntHashMap<OpcodeMaskGroup> opcodeGroupTable = specificityTable.get(specificity);
64 if (opcodeGroupTable != null) { 64 if (opcodeGroupTable != null) {
65 final List<OpcodeMaskGroup> opcodeMaskGroups = opcodeGroupTable.toList(); 65 final List<OpcodeMaskGroup> opcodeMaskGroups = opcodeGroupTable.toList();
66 final SpecificityGroup specificityGroup = new SpecificityGroup(specificity, opcodeMaskGroups); 66 final SpecificityGroup specificityGroup = new SpecificityGroup(specificity, opcodeMaskGroups);