changeset 23140:28613ae6b05d

Use arg instead of _arg as prefix for variable names in generated node plugins.
author Roland Schatz <roland.schatz@oracle.com>
date Mon, 07 Dec 2015 11:57:37 +0100
parents 661e2d8a7316
children 7d5a2e297409
files graal/com.oracle.graal.replacements.verifier/src/com/oracle/graal/replacements/verifier/FoldPluginGenerator.java graal/com.oracle.graal.replacements.verifier/src/com/oracle/graal/replacements/verifier/NodeIntrinsicPluginGenerator.java graal/com.oracle.graal.replacements.verifier/src/com/oracle/graal/replacements/verifier/PluginGenerator.java
diffstat 3 files changed, 19 insertions(+), 19 deletions(-) [+]
line wrap: on
line diff
--- a/graal/com.oracle.graal.replacements.verifier/src/com/oracle/graal/replacements/verifier/FoldPluginGenerator.java	Sun Dec 06 00:13:06 2015 -0800
+++ b/graal/com.oracle.graal.replacements.verifier/src/com/oracle/graal/replacements/verifier/FoldPluginGenerator.java	Mon Dec 07 11:57:37 2015 +0100
@@ -112,9 +112,9 @@
         }
         out.printf("            %s result = %s.%s(", intrinsicMethod.getReturnType(), intrinsicMethod.getEnclosingElement(), intrinsicMethod.getSimpleName());
         if (idx > 0) {
-            out.printf("_arg0");
+            out.printf("arg0");
             for (int i = 1; i < idx; i++) {
-                out.printf(", _arg%d", i);
+                out.printf(", arg%d", i);
             }
         }
         out.printf(");\n");
--- a/graal/com.oracle.graal.replacements.verifier/src/com/oracle/graal/replacements/verifier/NodeIntrinsicPluginGenerator.java	Sun Dec 06 00:13:06 2015 -0800
+++ b/graal/com.oracle.graal.replacements.verifier/src/com/oracle/graal/replacements/verifier/NodeIntrinsicPluginGenerator.java	Mon Dec 07 11:57:37 2015 +0100
@@ -80,7 +80,7 @@
                 break;
             }
 
-            out.printf("            %s _arg%d = %s;\n", param.asType(), idx, deps.use(env, (DeclaredType) param.asType()));
+            out.printf("            %s arg%d = %s;\n", param.asType(), idx, deps.use(env, (DeclaredType) param.asType()));
         }
 
         for (int i = 0; i < signature.length; i++, idx++) {
@@ -88,9 +88,9 @@
                 constantArgument(out, deps, idx, signature[i], i);
             } else {
                 if (signature[i].equals(valueNodeType())) {
-                    out.printf("            ValueNode _arg%d = args[%d];\n", idx, i);
+                    out.printf("            ValueNode arg%d = args[%d];\n", idx, i);
                 } else {
-                    out.printf("            %s _arg%d = (%s) args[%d];\n", signature[i], idx, signature[i], i);
+                    out.printf("            %s arg%d = (%s) args[%d];\n", signature[i], idx, signature[i], i);
                 }
             }
         }
@@ -98,7 +98,7 @@
         if (customFactory) {
             out.printf("            return %s.%s(b", constructor.getEnclosingElement(), constructor.getSimpleName());
             for (int i = 1; i < idx; i++) {
-                out.printf(", _arg%d", i);
+                out.printf(", arg%d", i);
             }
             out.printf(");\n");
 
@@ -108,9 +108,9 @@
         } else {
             out.printf("            %s node = new %s(", constructor.getEnclosingElement(), constructor.getEnclosingElement());
             if (idx > 0) {
-                out.printf("_arg0");
+                out.printf("arg0");
                 for (int i = 1; i < idx; i++) {
-                    out.printf(", _arg%d", i);
+                    out.printf(", arg%d", i);
                 }
             }
             out.printf(");\n");
--- a/graal/com.oracle.graal.replacements.verifier/src/com/oracle/graal/replacements/verifier/PluginGenerator.java	Sun Dec 06 00:13:06 2015 -0800
+++ b/graal/com.oracle.graal.replacements.verifier/src/com/oracle/graal/replacements/verifier/PluginGenerator.java	Mon Dec 07 11:57:37 2015 +0100
@@ -219,38 +219,38 @@
     }
 
     protected void constantArgument(PrintWriter out, InjectedDependencies deps, int argIdx, TypeMirror type, int nodeIdx) {
-        out.printf("            %s _arg%d;\n", type, argIdx);
+        out.printf("            %s arg%d;\n", type, argIdx);
         out.printf("            if (args[%d].isConstant()) {\n", nodeIdx);
         if (type.equals(resolvedJavaTypeType())) {
-            out.printf("                _arg%d = %s.asJavaType(args[%d].asConstant());\n", argIdx, deps.use(WellKnownDependency.CONSTANT_REFLECTION), nodeIdx);
+            out.printf("                arg%d = %s.asJavaType(args[%d].asConstant());\n", argIdx, deps.use(WellKnownDependency.CONSTANT_REFLECTION), nodeIdx);
         } else {
             switch (type.getKind()) {
                 case BOOLEAN:
-                    out.printf("                _arg%d = args[%d].asJavaConstant().asInt() != 0;\n", argIdx, nodeIdx);
+                    out.printf("                arg%d = args[%d].asJavaConstant().asInt() != 0;\n", argIdx, nodeIdx);
                     break;
                 case BYTE:
-                    out.printf("                _arg%d = (byte) args[%d].asJavaConstant().asInt();\n", argIdx, nodeIdx);
+                    out.printf("                arg%d = (byte) args[%d].asJavaConstant().asInt();\n", argIdx, nodeIdx);
                     break;
                 case CHAR:
-                    out.printf("                _arg%d = (char) args[%d].asJavaConstant().asInt();\n", argIdx, nodeIdx);
+                    out.printf("                arg%d = (char) args[%d].asJavaConstant().asInt();\n", argIdx, nodeIdx);
                     break;
                 case SHORT:
-                    out.printf("                _arg%d = (short) args[%d].asJavaConstant().asInt();\n", argIdx, nodeIdx);
+                    out.printf("                arg%d = (short) args[%d].asJavaConstant().asInt();\n", argIdx, nodeIdx);
                     break;
                 case INT:
-                    out.printf("                _arg%d = args[%d].asJavaConstant().asInt();\n", argIdx, nodeIdx);
+                    out.printf("                arg%d = args[%d].asJavaConstant().asInt();\n", argIdx, nodeIdx);
                     break;
                 case LONG:
-                    out.printf("                _arg%d = args[%d].asJavaConstant().asLong();\n", argIdx, nodeIdx);
+                    out.printf("                arg%d = args[%d].asJavaConstant().asLong();\n", argIdx, nodeIdx);
                     break;
                 case FLOAT:
-                    out.printf("                _arg%d = args[%d].asJavaConstant().asFloat();\n", argIdx, nodeIdx);
+                    out.printf("                arg%d = args[%d].asJavaConstant().asFloat();\n", argIdx, nodeIdx);
                     break;
                 case DOUBLE:
-                    out.printf("                _arg%d = args[%d].asJavaConstant().asDouble();\n", argIdx, nodeIdx);
+                    out.printf("                arg%d = args[%d].asJavaConstant().asDouble();\n", argIdx, nodeIdx);
                     break;
                 case DECLARED:
-                    out.printf("                _arg%d = %s.asObject(%s.class, args[%d].asJavaConstant());\n", argIdx, deps.use(WellKnownDependency.SNIPPET_REFLECTION), type, nodeIdx);
+                    out.printf("                arg%d = %s.asObject(%s.class, args[%d].asJavaConstant());\n", argIdx, deps.use(WellKnownDependency.SNIPPET_REFLECTION), type, nodeIdx);
                     break;
                 default:
                     throw new IllegalArgumentException();