Mercurial > hg > truffle
changeset 10513:00b70a864d3b
updated Checkstyle rules to prohibit underscores in method names and fixed current violations
line wrap: on
line diff
--- a/graal/com.oracle.graal.asm.amd64/src/com/oracle/graal/asm/amd64/AMD64Assembler.java Mon Jun 24 16:40:56 2013 +0200 +++ b/graal/com.oracle.graal.asm.amd64/src/com/oracle/graal/asm/amd64/AMD64Assembler.java Mon Jun 24 22:56:07 2013 +0200 @@ -2420,12 +2420,12 @@ emitByte(b2 + i); } - public final void fld_d(AMD64Address src) { + public final void fldd(AMD64Address src) { emitByte(0xDD); emitOperandHelper(0, src); } - public final void fld_s(AMD64Address src) { + public final void flds(AMD64Address src) { emitByte(0xD9); emitOperandHelper(0, src); } @@ -2445,12 +2445,12 @@ emitByte(0xF1); } - public final void fstp_s(AMD64Address src) { + public final void fstps(AMD64Address src) { emitByte(0xD9); emitOperandHelper(3, src); } - public final void fstp_d(AMD64Address src) { + public final void fstpd(AMD64Address src) { emitByte(0xDD); emitOperandHelper(3, src); } @@ -2474,7 +2474,7 @@ emitFPUArith(0xD9, 0xC8, i); } - public void fnstsw_ax() { + public void fnstswAX() { emitByte(0xDF); emitByte(0xE0); }
--- a/graal/com.oracle.graal.asm.amd64/src/com/oracle/graal/asm/amd64/AMD64MacroAssembler.java Mon Jun 24 16:40:56 2013 +0200 +++ b/graal/com.oracle.graal.asm.amd64/src/com/oracle/graal/asm/amd64/AMD64MacroAssembler.java Mon Jun 24 22:56:07 2013 +0200 @@ -258,13 +258,13 @@ AMD64Address tmp = new AMD64Address(AMD64.rsp); subq(AMD64.rsp, target.arch.getSizeInBytes(Kind.Double)); movsd(tmp, value); - fld_d(tmp); + fldd(tmp); return tmp; } private void trigEpilogue(Register dest, AMD64Address tmp) { assert dest.getRegisterCategory() == AMD64.XMM; - fstp_d(tmp); + fstpd(tmp); movsd(dest, tmp); addq(AMD64.rsp, target.arch.getSizeInBytes(Kind.Double)); }
--- a/graal/com.oracle.graal.asm.ptx/src/com/oracle/graal/asm/ptx/PTXAssembler.java Mon Jun 24 16:40:56 2013 +0200 +++ b/graal/com.oracle.graal.asm.ptx/src/com/oracle/graal/asm/ptx/PTXAssembler.java Mon Jun 24 22:56:07 2013 +0200 @@ -38,6 +38,7 @@ emitString("@%q" + " " + ""); } + // Checkstyle: stop method name check public final void add_f32(Register d, Register a, Register b) { emitString("add.f32" + " " + "%r" + d.encoding() + ", %r" + a.encoding() + ", %r" + b.encoding() + ";" + ""); } @@ -198,7 +199,7 @@ emitString("div.f32" + " " + "%r" + d.encoding() + ", %r" + a.encoding() + ", %r" + b.encoding() + ";" + ""); } - public final void div_s16(Register d, Register a, Register b) { + public final void div_s16(Register d, Register a, Register b) { emitString("div.s16" + " " + "%r" + d.encoding() + ", %r" + a.encoding() + ", %r" + b.encoding() + ";" + ""); } @@ -350,8 +351,7 @@ emitString("mov.u64" + " " + "%r" + d.encoding() + ", %r" + a.encoding() + ";" + ""); } - public final void mov_u64(@SuppressWarnings("unused") Register d, - @SuppressWarnings("unused") AbstractAddress a) { + public final void mov_u64(@SuppressWarnings("unused") Register d, @SuppressWarnings("unused") AbstractAddress a) { // emitString("mov.u64" + " " + "%r" + d.encoding() + ", %r" + a.encoding() + ";" + ""); }
--- a/graal/com.oracle.graal.graph/.checkstyle_checks.xml Mon Jun 24 16:40:56 2013 +0200 +++ b/graal/com.oracle.graal.graph/.checkstyle_checks.xml Mon Jun 24 22:56:07 2013 +0200 @@ -22,7 +22,7 @@ <property name="format" value="^(([a-z][a-zA-Z0-9]*$)|(_[A-Z][a-zA-Z0-9]*_[a-z][a-zA-Z0-9]*$))"/> </module> <module name="MethodName"> - <property name="format" value="^[a-z][a-z_A-Z0-9]*$"/> + <property name="format" value="^[a-z][a-zA-Z0-9]*$"/> </module> <module name="PackageName"/> <module name="ParameterName"/> @@ -170,16 +170,6 @@ <metadata name="com.atlassw.tools.eclipse.checkstyle.comment" value="Disable all checks"/> </module> <module name="SuppressionCommentFilter"> - <property name="offCommentFormat" value="// START GENERATED RAW ASSEMBLER METHODS"/> - <property name="onCommentFormat" value="// END GENERATED RAW ASSEMBLER METHODS"/> - <metadata name="com.atlassw.tools.eclipse.checkstyle.comment" value="Disable all checks for generated raw assembler methods"/> - </module> - <module name="SuppressionCommentFilter"> - <property name="offCommentFormat" value="// START GENERATED LABEL ASSEMBLER METHODS"/> - <property name="onCommentFormat" value="// END GENERATED LABEL ASSEMBLER METHODS"/> - <metadata name="com.atlassw.tools.eclipse.checkstyle.comment" value="Disable all checks for generated label assembler methods"/> - </module> - <module name="SuppressionCommentFilter"> <property name="offCommentFormat" value="CheckStyle: stop inner assignment check"/> <property name="onCommentFormat" value="CheckStyle: resume inner assignment check"/> <property name="checkFormat" value="InnerAssignment"/>
--- a/graal/com.oracle.graal.hotspot.test/src/com/oracle/graal/hotspot/test/HotSpotMethodSubstitutionTest.java Mon Jun 24 16:40:56 2013 +0200 +++ b/graal/com.oracle.graal.hotspot.test/src/com/oracle/graal/hotspot/test/HotSpotMethodSubstitutionTest.java Mon Jun 24 22:56:07 2013 +0200 @@ -35,7 +35,7 @@ @Test public void testObjectSubstitutions() { - test("getClass_"); + test("getClass0"); test("objectHashCode"); Object obj = new Object(); @@ -45,7 +45,7 @@ } @SuppressWarnings("all") - public static boolean getClass_(Object obj, Class<?> clazz) { + public static boolean getClass0(Object obj, Class<?> clazz) { return obj.getClass() == clazz; }
--- a/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/bytecode/BC_multianewarray04.java Mon Jun 24 16:40:56 2013 +0200 +++ b/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/bytecode/BC_multianewarray04.java Mon Jun 24 22:56:07 2013 +0200 @@ -32,19 +32,19 @@ public static int test(int a) { int i = 1; - i += test_byte(a); - i += test_boolean(a); - i += test_char(a); - i += test_short(a); - i += test_int(a); - i += test_float(a); - i += test_long(a); - i += test_double(a); + i += testByte(a); + i += testBoolean(a); + i += testChar(a); + i += testShort(a); + i += testInt(a); + i += testFloat(a); + i += testLong(a); + i += testDouble(a); return i; } - private static int test_double(int a) { + private static int testDouble(int a) { double[][] b2 = new double[a][a]; double[][][] b3 = new double[a][a][a]; double[][][][] b4 = new double[a][a][a][a]; @@ -53,7 +53,7 @@ return b2.length + b3.length + b4.length + b5.length + b6.length; } - private static int test_long(int a) { + private static int testLong(int a) { long[][] b2 = new long[a][a]; long[][][] b3 = new long[a][a][a]; long[][][][] b4 = new long[a][a][a][a]; @@ -62,7 +62,7 @@ return b2.length + b3.length + b4.length + b5.length + b6.length; } - private static int test_float(int a) { + private static int testFloat(int a) { float[][] b2 = new float[a][a]; float[][][] b3 = new float[a][a][a]; float[][][][] b4 = new float[a][a][a][a]; @@ -71,7 +71,7 @@ return b2.length + b3.length + b4.length + b5.length + b6.length; } - private static int test_int(int a) { + private static int testInt(int a) { int[][] b2 = new int[a][a]; int[][][] b3 = new int[a][a][a]; int[][][][] b4 = new int[a][a][a][a]; @@ -80,7 +80,7 @@ return b2.length + b3.length + b4.length + b5.length + b6.length; } - private static int test_short(int a) { + private static int testShort(int a) { short[][] b2 = new short[a][a]; short[][][] b3 = new short[a][a][a]; short[][][][] b4 = new short[a][a][a][a]; @@ -89,7 +89,7 @@ return b2.length + b3.length + b4.length + b5.length + b6.length; } - private static int test_char(int a) { + private static int testChar(int a) { char[][] b2 = new char[a][a]; char[][][] b3 = new char[a][a][a]; char[][][][] b4 = new char[a][a][a][a]; @@ -98,7 +98,7 @@ return b2.length + b3.length + b4.length + b5.length + b6.length; } - private static int test_boolean(int a) { + private static int testBoolean(int a) { boolean[][] b2 = new boolean[a][a]; boolean[][][] b3 = new boolean[a][a][a]; boolean[][][][] b4 = new boolean[a][a][a][a]; @@ -107,7 +107,7 @@ return b2.length + b3.length + b4.length + b5.length + b6.length; } - private static int test_byte(int a) { + private static int testByte(int a) { byte[][] b2 = new byte[a][a]; byte[][][] b3 = new byte[a][a][a]; byte[][][][] b4 = new byte[a][a][a][a];
--- a/graal/com.oracle.graal.lir.amd64/src/com/oracle/graal/lir/amd64/AMD64Arithmetic.java Mon Jun 24 16:40:56 2013 +0200 +++ b/graal/com.oracle.graal.lir.amd64/src/com/oracle/graal/lir/amd64/AMD64Arithmetic.java Mon Jun 24 22:56:07 2013 +0200 @@ -301,32 +301,32 @@ masm.subq(AMD64.rsp, 8); if (opcode == FREM) { masm.movflt(tmp, asRegister(y)); - masm.fld_s(tmp); + masm.flds(tmp); masm.movflt(tmp, asRegister(x)); - masm.fld_s(tmp); + masm.flds(tmp); } else { assert opcode == DREM; masm.movsd(tmp, asRegister(y)); - masm.fld_d(tmp); + masm.fldd(tmp); masm.movsd(tmp, asRegister(x)); - masm.fld_d(tmp); + masm.fldd(tmp); } Label label = new Label(); masm.bind(label); masm.fprem(); masm.fwait(); - masm.fnstsw_ax(); + masm.fnstswAX(); masm.testl(AMD64.rax, 0x400); masm.jcc(ConditionFlag.NotZero, label); masm.fxch(1); masm.fpop(); if (opcode == FREM) { - masm.fstp_s(tmp); + masm.fstps(tmp); masm.movflt(asRegister(result), tmp); } else { - masm.fstp_d(tmp); + masm.fstpd(tmp); masm.movsd(asRegister(result), tmp); } masm.addq(AMD64.rsp, 8);
--- a/graal/com.oracle.graal.replacements.test/src/com/oracle/graal/replacements/test/CheckCastTest.java Mon Jun 24 16:40:56 2013 +0200 +++ b/graal/com.oracle.graal.replacements.test/src/com/oracle/graal/replacements/test/CheckCastTest.java Mon Jun 24 22:56:07 2013 +0200 @@ -101,7 +101,7 @@ } @LongTest - public void test8_1() { + public void test801() { test("arrayFill", new Object[100], "111"); }
--- a/graal/com.oracle.graal.replacements.test/src/com/oracle/graal/replacements/test/InstanceOfTest.java Mon Jun 24 16:40:56 2013 +0200 +++ b/graal/com.oracle.graal.replacements.test/src/com/oracle/graal/replacements/test/InstanceOfTest.java Mon Jun 24 22:56:07 2013 +0200 @@ -75,7 +75,7 @@ } @LongTest - public void test2_1() { + public void test201() { test("isStringIntComplex", profile(), "object"); test("isStringIntComplex", profile(String.class), "object"); @@ -96,7 +96,7 @@ } @LongTest - public void test3_1() { + public void test301() { onlyFirstIsException(new Exception(), new Error()); test("onlyFirstIsException", profile(), new Exception(), new Error()); test("onlyFirstIsException", profile(), new Error(), new Exception()); @@ -304,7 +304,7 @@ * need to remove use of special JumpNodes in the {@code InstanceOfSnippets}. */ @LongTest - public void test_removeIntermediateMaterialization() { + public void testRemoveIntermediateMaterialization() { List<String> list = Arrays.asList("1", "2", "3", "4"); test("removeIntermediateMaterialization", profile(), list, "2", "yes", "no"); test("removeIntermediateMaterialization", profile(), list, null, "yes", "no");
--- a/graal/com.oracle.graal.replacements.test/src/com/oracle/graal/replacements/test/MonitorTest.java Mon Jun 24 16:40:56 2013 +0200 +++ b/graal/com.oracle.graal.replacements.test/src/com/oracle/graal/replacements/test/MonitorTest.java Mon Jun 24 22:56:07 2013 +0200 @@ -37,23 +37,23 @@ } @Test - public void test0_1() { + public void test01() { test("lockThisSimple", "test1", new Object()); test("lockThisSimple", "test1", null); } @Test - public void test0_2() { + public void test02() { test("lockObjectSimple", null, "test1"); } @Test - public void test1_1() { + public void test101() { test("lockObject", new Object(), "test1", new String[1]); } @Test - public void test1_2() { + public void test102() { test("lockObject", null, "test1_1", new String[1]); }
--- a/graal/com.oracle.graal.replacements.test/src/com/oracle/graal/replacements/test/PointerTest.java Mon Jun 24 16:40:56 2013 +0200 +++ b/graal/com.oracle.graal.replacements.test/src/com/oracle/graal/replacements/test/PointerTest.java Mon Jun 24 22:56:07 2013 +0200 @@ -61,42 +61,42 @@ } @Test - public void test_read1() { + public void testRead1() { for (Kind kind : KINDS) { assertRead(parse("read" + kind.name() + "1"), kind, false, ID); } } @Test - public void test_read2() { + public void testRead2() { for (Kind kind : KINDS) { assertRead(parse("read" + kind.name() + "2"), kind, true, ID); } } @Test - public void test_read3() { + public void testRead3() { for (Kind kind : KINDS) { assertRead(parse("read" + kind.name() + "3"), kind, false, LocationIdentity.ANY_LOCATION); } } @Test - public void test_write1() { + public void testWrite1() { for (Kind kind : KINDS) { assertWrite(parse("write" + kind.name() + "1"), kind, false, ID); } } @Test - public void test_write2() { + public void testWrite2() { for (Kind kind : KINDS) { assertWrite(parse("write" + kind.name() + "2"), kind, true, ID); } } @Test - public void test_write3() { + public void testWrite3() { for (Kind kind : KINDS) { assertWrite(parse("write" + kind.name() + "3"), kind, false, LocationIdentity.ANY_LOCATION); }
--- a/graal/com.oracle.graal.replacements.test/src/com/oracle/graal/replacements/test/WordTest.java Mon Jun 24 16:40:56 2013 +0200 +++ b/graal/com.oracle.graal.replacements.test/src/com/oracle/graal/replacements/test/WordTest.java Mon Jun 24 22:56:07 2013 +0200 @@ -59,52 +59,52 @@ long[] words = new long[]{Long.MIN_VALUE, Long.MIN_VALUE + 1, -1L, 0L, 1L, Long.MAX_VALUE - 1, Long.MAX_VALUE, Integer.MAX_VALUE - 1L, Integer.MAX_VALUE, Integer.MAX_VALUE + 1L, Integer.MIN_VALUE - 1L, Integer.MIN_VALUE, Integer.MIN_VALUE + 1L}; for (long word : words) { - test("unsigned_long", word); - test("unsigned_int", (int) word); - test("signed_long", word); - test("signed_int", (int) word); + test("unsignedLong", word); + test("unsignedInt", (int) word); + test("signedLong", word); + test("signedInt", (int) word); } } @LongTest - public void test_arithmetic() { + public void testArithmetic() { long[] words = new long[]{Long.MIN_VALUE, Long.MIN_VALUE + 1, -1L, 0L, 1L, Long.MAX_VALUE - 1, Long.MAX_VALUE, Integer.MAX_VALUE - 1L, Integer.MAX_VALUE, Integer.MAX_VALUE + 1L, Integer.MIN_VALUE - 1L, Integer.MIN_VALUE, Integer.MIN_VALUE + 1L}; for (long word : words) { - test("unsigned_not", word); - test("signed_not", word); + test("unsignedNot", word); + test("signedNot", word); for (long addend : words) { - test("unsigned_plus_int", word, (int) addend); - test("unsigned_minus_int", word, (int) addend); - test("unsigned_plus_int", word, -((int) addend)); - test("unsigned_minus_int", word, -((int) addend)); - test("unsigned_plus_long", word, addend); - test("unsigned_minus_long", word, addend); - test("unsigned_plus_long", word, -addend); - test("unsigned_minus_long", word, -addend); - test("signed_plus_int", word, (int) addend); - test("signed_minus_int", word, (int) addend); - test("signed_plus_int", word, -((int) addend)); - test("signed_minus_int", word, -((int) addend)); - test("signed_plus_long", word, addend); - test("signed_minus_long", word, addend); - test("signed_plus_long", word, -addend); - test("signed_minus_long", word, -addend); + test("unsignedPlusInt", word, (int) addend); + test("unsignedMinusInt", word, (int) addend); + test("unsignedPlusInt", word, -((int) addend)); + test("unsignedMinusInt", word, -((int) addend)); + test("unsignedPlusLong", word, addend); + test("unsignedMinusLong", word, addend); + test("unsignedPlusLong", word, -addend); + test("unsignedMinusLong", word, -addend); + test("signedPlusInt", word, (int) addend); + test("signedMinusInt", word, (int) addend); + test("signedPlusInt", word, -((int) addend)); + test("signedMinusInt", word, -((int) addend)); + test("signedPlusLong", word, addend); + test("signedMinusLong", word, addend); + test("signedPlusLong", word, -addend); + test("signedMinusLong", word, -addend); - test("and_int", word, (int) addend); - test("or_int", word, (int) addend); - test("and_int", word, -((int) addend)); - test("or_int", word, -((int) addend)); - test("and_long", word, addend); - test("or_long", word, addend); - test("and_long", word, -addend); - test("or_long", word, -addend); + test("andInt", word, (int) addend); + test("orInt", word, (int) addend); + test("andInt", word, -((int) addend)); + test("orInt", word, -((int) addend)); + test("andLong", word, addend); + test("orLong", word, addend); + test("andLong", word, -addend); + test("orLong", word, -addend); } } } @LongTest - public void test_compare() { + public void testCompare() { long[] words = new long[]{Long.MIN_VALUE, Long.MIN_VALUE + 1, -1L, 0L, 1L, Long.MAX_VALUE - 1, Long.MAX_VALUE}; for (long word1 : words) { for (long word2 : words) { @@ -117,72 +117,72 @@ } @Snippet - public static long unsigned_long(long word) { + public static long unsignedLong(long word) { return Word.unsigned(word).rawValue(); } @Snippet - public static long unsigned_int(int word) { + public static long unsignedInt(int word) { return Word.unsigned(word).rawValue(); } @Snippet - public static long signed_long(long word) { + public static long signedLong(long word) { return Word.signed(word).rawValue(); } @Snippet - public static long signed_int(int word) { + public static long signedInt(int word) { return Word.signed(word).rawValue(); } @Snippet - public static long unsigned_plus_int(long word, int addend) { + public static long unsignedPlusInt(long word, int addend) { return Word.unsigned(word).add(addend).rawValue(); } @Snippet - public static long unsigned_minus_int(long word, int addend) { + public static long unsignedMinusInt(long word, int addend) { return Word.unsigned(word).subtract(addend).rawValue(); } @Snippet - public static long unsigned_plus_long(long word, long addend) { + public static long unsignedPlusLong(long word, long addend) { return Word.unsigned(word).add(Word.unsigned(addend)).rawValue(); } @Snippet - public static long unsigned_minus_long(long word, long addend) { + public static long unsignedMinusLong(long word, long addend) { return Word.unsigned(word).subtract(Word.unsigned(addend)).rawValue(); } @Snippet - public static long signed_plus_int(long word, int addend) { + public static long signedPlusInt(long word, int addend) { return Word.signed(word).add(addend).rawValue(); } @Snippet - public static long signed_minus_int(long word, int addend) { + public static long signedMinusInt(long word, int addend) { return Word.signed(word).subtract(addend).rawValue(); } @Snippet - public static long signed_plus_long(long word, long addend) { + public static long signedPlusLong(long word, long addend) { return Word.signed(word).add(Word.signed(addend)).rawValue(); } @Snippet - public static long signed_minus_long(long word, long addend) { + public static long signedMinusLong(long word, long addend) { return Word.signed(word).subtract(Word.signed(addend)).rawValue(); } @Snippet - public static long signed_not(long word) { + public static long signedNot(long word) { return Word.signed(word).not().rawValue(); } @Snippet - public static long unsigned_not(long word) { + public static long unsignedNot(long word) { return Word.unsigned(word).not().rawValue(); } @@ -207,22 +207,22 @@ } @Snippet - public static long and_int(long word, int addend) { + public static long andInt(long word, int addend) { return Word.unsigned(word).and(addend).rawValue(); } @Snippet - public static long or_int(long word, int addend) { + public static long orInt(long word, int addend) { return Word.unsigned(word).or(addend).rawValue(); } @Snippet - public static long and_long(long word, long addend) { + public static long andLong(long word, long addend) { return Word.unsigned(word).and(Word.unsigned(addend)).rawValue(); } @Snippet - public static long or_long(long word, long addend) { + public static long orLong(long word, long addend) { return Word.unsigned(word).or(Word.unsigned(addend)).rawValue(); } }
--- a/graal/com.oracle.truffle.codegen.processor/src/com/oracle/truffle/codegen/processor/ast/CodeTreeBuilder.java Mon Jun 24 16:40:56 2013 +0200 +++ b/graal/com.oracle.truffle.codegen.processor/src/com/oracle/truffle/codegen/processor/ast/CodeTreeBuilder.java Mon Jun 24 22:56:07 2013 +0200 @@ -654,7 +654,7 @@ return startBlock(); } - public CodeTreeBuilder null_() { + public CodeTreeBuilder nullLiteral() { return string("null"); }
--- a/graal/com.oracle.truffle.codegen.processor/src/com/oracle/truffle/codegen/processor/node/NodeCodeGenerator.java Mon Jun 24 16:40:56 2013 +0200 +++ b/graal/com.oracle.truffle.codegen.processor/src/com/oracle/truffle/codegen/processor/node/NodeCodeGenerator.java Mon Jun 24 22:56:07 2013 +0200 @@ -43,8 +43,8 @@ private static final String THIS_NODE_LOCAL_VAR_NAME = "thisNode"; - private static final String EXECUTE_GENERIC_NAME = "executeGeneric_"; - private static final String EXECUTE_SPECIALIZE_NAME = "executeAndSpecialize_"; + private static final String EXECUTE_GENERIC_NAME = "executeGeneric0"; + private static final String EXECUTE_SPECIALIZE_NAME = "executeAndSpecialize0"; public NodeCodeGenerator(ProcessorContext context) { super(context); @@ -1350,7 +1350,7 @@ CodeTreeBuilder body = method.createBuilder(); body.startReturn(); if (node.getSpecializations().isEmpty()) { - body.null_(); + body.nullLiteral(); } else { body.startNew(nodeSpecializationClassName(node.getSpecializations().get(0))); for (VariableElement var : method.getParameters()) {