Mercurial > hg > truffle

comparison graal/com.oracle.max.asmdis/src/com/sun/max/asm/gen/cisc/x86/X86AssemblyTester.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
45 public X86Assembly<Template_Type> assembly() { 45 public X86Assembly<Template_Type> assembly() {
46 final Class<X86Assembly<Template_Type>> type = null; 46 final Class<X86Assembly<Template_Type>> type = null;
47 return Utils.cast(type, super.assembly()); 47 return Utils.cast(type, super.assembly());
48 } 48 }
49 49
50 private String getSibIndexAndScale(Queue<X86Operand> operands, Queue<Argument> arguments) { 50 private static String getSibIndexAndScale(Queue<X86Operand> operands, Queue<Argument> arguments) {
51 X86Parameter parameter = (X86Parameter) operands.remove(); 51 X86Parameter parameter = (X86Parameter) operands.remove();
52 assert parameter.place() == ParameterPlace.SIB_INDEX || parameter.place() == ParameterPlace.SIB_INDEX_REXX; 52 assert parameter.place() == ParameterPlace.SIB_INDEX || parameter.place() == ParameterPlace.SIB_INDEX_REXX;
53 final String result = arguments.remove().externalValue() + ","; 53 final String result = arguments.remove().externalValue() + ",";
54 parameter = (X86Parameter) operands.remove(); 54 parameter = (X86Parameter) operands.remove();
55 assert parameter.place() == ParameterPlace.SIB_SCALE; 55 assert parameter.place() == ParameterPlace.SIB_SCALE;
56 return result + arguments.remove().externalValue() + ")"; 56 return result + arguments.remove().externalValue() + ")";
57 } 57 }
58 58
59 private String getOperand(X86Template template, Queue<X86Operand> operands, Queue<Argument> arguments, String label) { 59 private static String getOperand(X86Template template, Queue<X86Operand> operands, Queue<Argument> arguments, String label) {
60 final X86Operand operand = operands.remove(); 60 final X86Operand operand = operands.remove();
61 if (operand instanceof ImplicitOperand) { 61 if (operand instanceof ImplicitOperand) {
62 final ImplicitOperand implicitOperand = (ImplicitOperand) operand; 62 final ImplicitOperand implicitOperand = (ImplicitOperand) operand;
63 if (implicitOperand.externalPresence() == ImplicitOperand.ExternalPresence.OMITTED) { 63 if (implicitOperand.externalPresence() == ImplicitOperand.ExternalPresence.OMITTED) {
64 return ""; 64 return "";
127 if (externalCodeSizeAttribute != null) { 127 if (externalCodeSizeAttribute != null) {
128 stream.println(".code" + externalCodeSizeAttribute.numberOfBits); 128 stream.println(".code" + externalCodeSizeAttribute.numberOfBits);
129 } else { 129 } else {
130 stream.println(".code" + addressWidth().numberOfBits); 130 stream.println(".code" + addressWidth().numberOfBits);
131 } 131 }
132 final LinkedList<X86Operand> operandQueue = new LinkedList<X86Operand>(template.operands()); 132 final LinkedList<X86Operand> operandQueue = new LinkedList<>(template.operands());
133 final LinkedList<Argument> argumentQueue = new LinkedList<Argument>(argumentList); 133 final LinkedList<Argument> argumentQueue = new LinkedList<>(argumentList);
134 String first = ""; 134 String first = "";
135 if (!operandQueue.isEmpty()) { 135 if (!operandQueue.isEmpty()) {
136 first = getOperand(template, operandQueue, argumentQueue, label); 136 first = getOperand(template, operandQueue, argumentQueue, label);
137 } 137 }
138 String second = ""; 138 String second = "";