### Eclipse Workspace Patch 1.0 #P vmtt Index: src/org/apache/harmony/vmtt/disasm/Operand.java =================================================================== --- src/org/apache/harmony/vmtt/disasm/Operand.java (revision 731792) +++ src/org/apache/harmony/vmtt/disasm/Operand.java (working copy) @@ -71,8 +71,20 @@ return "#" + (operand_value.byteValue() & 0xFF); } //return "#" + str; - return "#" + str + " // " + Utils.refToValue(DefaultCodeFileGenerator.classFile, "#" + str); + return "#" + str; } return str; } + + public String operandCommentString() { + String str = operand_value.toString(); + if (operand_type == OT_REF) { + if (getSize() == 1) { + return ""; + } + //return comment + return " // " + Utils.refToValue(DefaultCodeFileGenerator.classFile, "#" + str); + } + return ""; + } } Index: src/org/apache/harmony/vmtt/disasm/Instruction.java =================================================================== --- src/org/apache/harmony/vmtt/disasm/Instruction.java (revision 731792) +++ src/org/apache/harmony/vmtt/disasm/Instruction.java (working copy) @@ -82,4 +82,8 @@ throws IOException, CodeFileFormatException; public abstract String toString(); + + public String operandCommentString() { + return ""; + } } Index: src/org/apache/harmony/vmtt/disasm/SimpleInstruction.java =================================================================== --- src/org/apache/harmony/vmtt/disasm/SimpleInstruction.java (revision 731792) +++ src/org/apache/harmony/vmtt/disasm/SimpleInstruction.java (working copy) @@ -132,6 +132,9 @@ for (int i = 0; i < operands.size(); i++) { str.append(" " + operandAt(i).toString()); } + for (int i= 0; i < operands.size(); i++) { + str.append(" " + operandAt(i).operandCommentString()); + } return str.toString(); } }