Mercurial > hg > truffle
changeset 5062:5e9f38419819
Adjust C++ part according to the renaming.
| author | Thomas Wuerthinger <thomas.wuerthinger@oracle.com> |
|---|---|
| date | Thu, 08 Mar 2012 19:24:41 +0100 |
| parents | e808627bd16f |
| children | 055c137f73ed |
| files | graal/com.oracle.graal.graph/.checkstyle_checks.xml graal/com.oracle.max.graal.graph/.checkstyle_checks.xml mx/projects src/share/vm/classfile/systemDictionary.hpp src/share/vm/graal/graalCompiler.cpp src/share/vm/graal/graalCompilerToVM.cpp src/share/vm/graal/graalJavaAccess.hpp src/share/vm/graal/graalVMToCompiler.cpp src/share/vm/oops/klass.hpp src/share/vm/oops/methodDataOop.hpp src/share/vm/oops/methodOop.hpp |
| diffstat | 11 files changed, 340 insertions(+), 340 deletions(-) [+] |
line wrap: on
line diff
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/graal/com.oracle.graal.graph/.checkstyle_checks.xml Thu Mar 08 19:24:41 2012 +0100 @@ -0,0 +1,202 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE module PUBLIC "-//Puppy Crawl//DTD Check Configuration 1.3//EN" "http://www.puppycrawl.com/dtds/configuration_1_3.dtd"> + +<!-- + This configuration file was written by the eclipse-cs plugin configuration editor +--> +<!-- + Checkstyle-Configuration: Maxine Checks + Description: none +--> +<module name="Checker"> + <property name="severity" value="warning"/> + <module name="TreeWalker"> + <property name="tabWidth" value="4"/> + <module name="FileContentsHolder"/> + <module name="JavadocStyle"> + <property name="checkHtml" value="false"/> + </module> + <module name="LocalFinalVariableName"/> + <module name="LocalVariableName"/> + <module name="MemberName"> + <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]*$"/> + </module> + <module name="PackageName"/> + <module name="ParameterName"/> + <module name="TypeName"> + <property name="format" value="^[A-Z][_a-zA-Z0-9]*$"/> + </module> + <module name="RedundantImport"/> + <module name="LineLength"> + <property name="max" value="250"/> + </module> + <module name="MethodParamPad"/> + <module name="NoWhitespaceAfter"> + <property name="tokens" value="ARRAY_INIT,BNOT,DEC,DOT,INC,LNOT,UNARY_MINUS,UNARY_PLUS"/> + </module> + <module name="NoWhitespaceBefore"> + <property name="tokens" value="SEMI,DOT,POST_DEC,POST_INC"/> + </module> + <module name="ParenPad"/> + <module name="TypecastParenPad"> + <property name="tokens" value="RPAREN,TYPECAST"/> + </module> + <module name="WhitespaceAfter"/> + <module name="WhitespaceAround"> + <property name="tokens" value="ASSIGN,BAND,BAND_ASSIGN,BOR,BOR_ASSIGN,BSR,BSR_ASSIGN,BXOR,BXOR_ASSIGN,COLON,DIV,DIV_ASSIGN,EQUAL,GE,GT,LAND,LE,LITERAL_ASSERT,LITERAL_CATCH,LITERAL_DO,LITERAL_ELSE,LITERAL_FINALLY,LITERAL_FOR,LITERAL_IF,LITERAL_RETURN,LITERAL_SYNCHRONIZED,LITERAL_TRY,LITERAL_WHILE,LOR,LT,MINUS,MINUS_ASSIGN,MOD,MOD_ASSIGN,NOT_EQUAL,PLUS,PLUS_ASSIGN,QUESTION,SL,SLIST,SL_ASSIGN,SR,SR_ASSIGN,STAR,STAR_ASSIGN,LITERAL_ASSERT,TYPE_EXTENSION_AND"/> + </module> + <module name="RedundantModifier"/> + <module name="AvoidNestedBlocks"> + <property name="allowInSwitchCase" value="true"/> + </module> + <module name="EmptyBlock"> + <property name="option" value="text"/> + <property name="tokens" value="LITERAL_DO,LITERAL_ELSE,LITERAL_FINALLY,LITERAL_IF,LITERAL_TRY,LITERAL_WHILE,STATIC_INIT"/> + </module> + <module name="LeftCurly"/> + <module name="NeedBraces"/> + <module name="RightCurly"/> + <module name="DoubleCheckedLocking"> + <property name="severity" value="error"/> + </module> + <module name="EmptyStatement"/> + <module name="HiddenField"> + <property name="severity" value="ignore"/> + <property name="ignoreConstructorParameter" value="true"/> + <metadata name="net.sf.eclipsecs.core.lastEnabledSeverity" value="inherit"/> + </module> + <module name="FinalClass"/> + <module name="HideUtilityClassConstructor"> + <property name="severity" value="ignore"/> + <metadata name="net.sf.eclipsecs.core.lastEnabledSeverity" value="inherit"/> + </module> + <module name="ArrayTypeStyle"/> + <module name="UpperEll"/> + <module name="FallThrough"/> + <module name="FinalLocalVariable"> + <property name="severity" value="ignore"/> + <metadata name="net.sf.eclipsecs.core.lastEnabledSeverity" value="inherit"/> + </module> + <module name="MultipleVariableDeclarations"/> + <module name="StringLiteralEquality"> + <property name="severity" value="error"/> + </module> + <module name="SuperFinalize"/> + <module name="UnnecessaryParentheses"> + <property name="severity" value="ignore"/> + <metadata name="net.sf.eclipsecs.core.lastEnabledSeverity" value="inherit"/> + </module> + <module name="Indentation"> + <property name="severity" value="ignore"/> + <metadata name="net.sf.eclipsecs.core.lastEnabledSeverity" value="inherit"/> + </module> + <module name="StaticVariableName"> + <property name="format" value="^[A-Za-z][a-zA-Z0-9]*$"/> + </module> + <module name="EmptyForInitializerPad"/> + <module name="EmptyForIteratorPad"/> + <module name="ModifierOrder"/> + <module name="DefaultComesLast"/> + <module name="InnerAssignment"> + <property name="severity" value="ignore"/> + <metadata name="net.sf.eclipsecs.core.lastEnabledSeverity" value="inherit"/> + </module> + <module name="JUnitTestCase"/> + <module name="ModifiedControlVariable"/> + <module name="MutableException"> + <property name="severity" value="ignore"/> + <metadata name="net.sf.eclipsecs.core.lastEnabledSeverity" value="inherit"/> + </module> + <module name="ParameterAssignment"> + <property name="severity" value="ignore"/> + <metadata name="net.sf.eclipsecs.core.lastEnabledSeverity" value="inherit"/> + </module> + <module name="RegexpSinglelineJava"> + <metadata name="net.sf.eclipsecs.core.comment" value="Illegal trailing whitespace(s) at the end of the line."/> + <property name="format" value="\s$"/> + <property name="message" value="Illegal trailing whitespace(s) at the end of the line."/> + <property name="ignoreComments" value="true"/> + <metadata name="com.atlassw.tools.eclipse.checkstyle.comment" value="Checks for trailing spaces at the end of a line"/> + </module> + <module name="RegexpSinglelineJava"> + <metadata name="net.sf.eclipsecs.core.comment" value="illegal space before a comma"/> + <property name="format" value=" ,"/> + <property name="message" value="illegal space before a comma"/> + <property name="ignoreComments" value="true"/> + <metadata name="com.atlassw.tools.eclipse.checkstyle.customMessage" value="Illegal whitespace before a comma."/> + <metadata name="com.atlassw.tools.eclipse.checkstyle.comment" value="Checks for whitespace before a comma."/> + </module> + </module> + <module name="RegexpHeader"> + <property name="header" value="/\*\n \* Copyright \(c\) (20[0-9][0-9], )?20[0-9][0-9], Oracle and/or its affiliates. All rights reserved.\n \* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.\n \*\n \* This code is free software; you can redistribute it and/or modify it\n \* under the terms of the GNU General Public License version 2 only, as\n \* published by the Free Software Foundation.\n \*\n \* This code is distributed in the hope that it will be useful, but WITHOUT\n \* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or\n \* FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License\n \* version 2 for more details \(a copy is included in the LICENSE file that\n \* accompanied this code\).\n \*\n \* You should have received a copy of the GNU General Public License version\n \* 2 along with this work; if not, write to the Free Software Foundation,\n \* Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.\n \*\n \* Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA\n \* or visit www.oracle.com if you need additional information or have any\n \* questions.\n \*/\n"/> + </module> + <module name="FileTabCharacter"> + <property name="severity" value="error"/> + </module> + <module name="NewlineAtEndOfFile"> + <property name="lineSeparator" value="lf"/> + </module> + <module name="Translation"/> + <module name="SuppressionCommentFilter"> + <property name="offCommentFormat" value="Checkstyle: stop constant name check"/> + <property name="onCommentFormat" value="Checkstyle: resume constant name check"/> + <property name="checkFormat" value="ConstantNameCheck"/> + <metadata name="com.atlassw.tools.eclipse.checkstyle.comment" value="Allow non-conforming constant names"/> + </module> + <module name="SuppressionCommentFilter"> + <property name="offCommentFormat" value="Checkstyle: stop method name check"/> + <property name="onCommentFormat" value="Checkstyle: resume method name check"/> + <property name="checkFormat" value="MethodName"/> + <property name="checkC" value="false"/> + <metadata name="com.atlassw.tools.eclipse.checkstyle.comment" value="Disable method name checks"/> + </module> + <module name="SuppressionCommentFilter"> + <property name="offCommentFormat" value="CheckStyle: stop parameter assignment check"/> + <property name="onCommentFormat" value="CheckStyle: resume parameter assignment check"/> + <property name="checkFormat" value="ParameterAssignment"/> + <property name="checkC" value="false"/> + <metadata name="com.atlassw.tools.eclipse.checkstyle.comment" value="Disable Parameter Assignment"/> + </module> + <module name="SuppressionCommentFilter"> + <property name="offCommentFormat" value="Checkstyle: stop final variable check"/> + <property name="onCommentFormat" value="Checkstyle: resume final variable check"/> + <property name="checkFormat" value="FinalLocalVariable"/> + <metadata name="com.atlassw.tools.eclipse.checkstyle.comment" value="Disable final variable checks"/> + </module> + <module name="SuppressionCommentFilter"> + <property name="offCommentFormat" value="Checkstyle: stop"/> + <property name="onCommentFormat" value="Checkstyle: resume"/> + <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"/> + <metadata name="com.atlassw.tools.eclipse.checkstyle.comment" value="Disable inner assignment checks"/> + </module> + <module name="SuppressionCommentFilter"> + <property name="offCommentFormat" value="Checkstyle: stop field name check"/> + <property name="onCommentFormat" value="Checkstyle: resume field name check"/> + <property name="checkFormat" value="MemberName"/> + <property name="checkC" value="false"/> + <metadata name="com.atlassw.tools.eclipse.checkstyle.comment" value="Disable field name checks"/> + </module> + <module name="RegexpMultiline"> + <metadata name="net.sf.eclipsecs.core.comment" value="illegal Windows line ending"/> + <property name="format" value="\r\n"/> + <property name="message" value="illegal Windows line ending"/> + </module> +</module>
--- a/graal/com.oracle.max.graal.graph/.checkstyle_checks.xml Thu Mar 08 19:24:17 2012 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,202 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE module PUBLIC "-//Puppy Crawl//DTD Check Configuration 1.3//EN" "http://www.puppycrawl.com/dtds/configuration_1_3.dtd"> - -<!-- - This configuration file was written by the eclipse-cs plugin configuration editor ---> -<!-- - Checkstyle-Configuration: Maxine Checks - Description: none ---> -<module name="Checker"> - <property name="severity" value="warning"/> - <module name="TreeWalker"> - <property name="tabWidth" value="4"/> - <module name="FileContentsHolder"/> - <module name="JavadocStyle"> - <property name="checkHtml" value="false"/> - </module> - <module name="LocalFinalVariableName"/> - <module name="LocalVariableName"/> - <module name="MemberName"> - <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]*$"/> - </module> - <module name="PackageName"/> - <module name="ParameterName"/> - <module name="TypeName"> - <property name="format" value="^[A-Z][_a-zA-Z0-9]*$"/> - </module> - <module name="RedundantImport"/> - <module name="LineLength"> - <property name="max" value="250"/> - </module> - <module name="MethodParamPad"/> - <module name="NoWhitespaceAfter"> - <property name="tokens" value="ARRAY_INIT,BNOT,DEC,DOT,INC,LNOT,UNARY_MINUS,UNARY_PLUS"/> - </module> - <module name="NoWhitespaceBefore"> - <property name="tokens" value="SEMI,DOT,POST_DEC,POST_INC"/> - </module> - <module name="ParenPad"/> - <module name="TypecastParenPad"> - <property name="tokens" value="RPAREN,TYPECAST"/> - </module> - <module name="WhitespaceAfter"/> - <module name="WhitespaceAround"> - <property name="tokens" value="ASSIGN,BAND,BAND_ASSIGN,BOR,BOR_ASSIGN,BSR,BSR_ASSIGN,BXOR,BXOR_ASSIGN,COLON,DIV,DIV_ASSIGN,EQUAL,GE,GT,LAND,LE,LITERAL_ASSERT,LITERAL_CATCH,LITERAL_DO,LITERAL_ELSE,LITERAL_FINALLY,LITERAL_FOR,LITERAL_IF,LITERAL_RETURN,LITERAL_SYNCHRONIZED,LITERAL_TRY,LITERAL_WHILE,LOR,LT,MINUS,MINUS_ASSIGN,MOD,MOD_ASSIGN,NOT_EQUAL,PLUS,PLUS_ASSIGN,QUESTION,SL,SLIST,SL_ASSIGN,SR,SR_ASSIGN,STAR,STAR_ASSIGN,LITERAL_ASSERT,TYPE_EXTENSION_AND"/> - </module> - <module name="RedundantModifier"/> - <module name="AvoidNestedBlocks"> - <property name="allowInSwitchCase" value="true"/> - </module> - <module name="EmptyBlock"> - <property name="option" value="text"/> - <property name="tokens" value="LITERAL_DO,LITERAL_ELSE,LITERAL_FINALLY,LITERAL_IF,LITERAL_TRY,LITERAL_WHILE,STATIC_INIT"/> - </module> - <module name="LeftCurly"/> - <module name="NeedBraces"/> - <module name="RightCurly"/> - <module name="DoubleCheckedLocking"> - <property name="severity" value="error"/> - </module> - <module name="EmptyStatement"/> - <module name="HiddenField"> - <property name="severity" value="ignore"/> - <property name="ignoreConstructorParameter" value="true"/> - <metadata name="net.sf.eclipsecs.core.lastEnabledSeverity" value="inherit"/> - </module> - <module name="FinalClass"/> - <module name="HideUtilityClassConstructor"> - <property name="severity" value="ignore"/> - <metadata name="net.sf.eclipsecs.core.lastEnabledSeverity" value="inherit"/> - </module> - <module name="ArrayTypeStyle"/> - <module name="UpperEll"/> - <module name="FallThrough"/> - <module name="FinalLocalVariable"> - <property name="severity" value="ignore"/> - <metadata name="net.sf.eclipsecs.core.lastEnabledSeverity" value="inherit"/> - </module> - <module name="MultipleVariableDeclarations"/> - <module name="StringLiteralEquality"> - <property name="severity" value="error"/> - </module> - <module name="SuperFinalize"/> - <module name="UnnecessaryParentheses"> - <property name="severity" value="ignore"/> - <metadata name="net.sf.eclipsecs.core.lastEnabledSeverity" value="inherit"/> - </module> - <module name="Indentation"> - <property name="severity" value="ignore"/> - <metadata name="net.sf.eclipsecs.core.lastEnabledSeverity" value="inherit"/> - </module> - <module name="StaticVariableName"> - <property name="format" value="^[A-Za-z][a-zA-Z0-9]*$"/> - </module> - <module name="EmptyForInitializerPad"/> - <module name="EmptyForIteratorPad"/> - <module name="ModifierOrder"/> - <module name="DefaultComesLast"/> - <module name="InnerAssignment"> - <property name="severity" value="ignore"/> - <metadata name="net.sf.eclipsecs.core.lastEnabledSeverity" value="inherit"/> - </module> - <module name="JUnitTestCase"/> - <module name="ModifiedControlVariable"/> - <module name="MutableException"> - <property name="severity" value="ignore"/> - <metadata name="net.sf.eclipsecs.core.lastEnabledSeverity" value="inherit"/> - </module> - <module name="ParameterAssignment"> - <property name="severity" value="ignore"/> - <metadata name="net.sf.eclipsecs.core.lastEnabledSeverity" value="inherit"/> - </module> - <module name="RegexpSinglelineJava"> - <metadata name="net.sf.eclipsecs.core.comment" value="Illegal trailing whitespace(s) at the end of the line."/> - <property name="format" value="\s$"/> - <property name="message" value="Illegal trailing whitespace(s) at the end of the line."/> - <property name="ignoreComments" value="true"/> - <metadata name="com.atlassw.tools.eclipse.checkstyle.comment" value="Checks for trailing spaces at the end of a line"/> - </module> - <module name="RegexpSinglelineJava"> - <metadata name="net.sf.eclipsecs.core.comment" value="illegal space before a comma"/> - <property name="format" value=" ,"/> - <property name="message" value="illegal space before a comma"/> - <property name="ignoreComments" value="true"/> - <metadata name="com.atlassw.tools.eclipse.checkstyle.customMessage" value="Illegal whitespace before a comma."/> - <metadata name="com.atlassw.tools.eclipse.checkstyle.comment" value="Checks for whitespace before a comma."/> - </module> - </module> - <module name="RegexpHeader"> - <property name="header" value="/\*\n \* Copyright \(c\) (20[0-9][0-9], )?20[0-9][0-9], Oracle and/or its affiliates. All rights reserved.\n \* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.\n \*\n \* This code is free software; you can redistribute it and/or modify it\n \* under the terms of the GNU General Public License version 2 only, as\n \* published by the Free Software Foundation.\n \*\n \* This code is distributed in the hope that it will be useful, but WITHOUT\n \* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or\n \* FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License\n \* version 2 for more details \(a copy is included in the LICENSE file that\n \* accompanied this code\).\n \*\n \* You should have received a copy of the GNU General Public License version\n \* 2 along with this work; if not, write to the Free Software Foundation,\n \* Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.\n \*\n \* Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA\n \* or visit www.oracle.com if you need additional information or have any\n \* questions.\n \*/\n"/> - </module> - <module name="FileTabCharacter"> - <property name="severity" value="error"/> - </module> - <module name="NewlineAtEndOfFile"> - <property name="lineSeparator" value="lf"/> - </module> - <module name="Translation"/> - <module name="SuppressionCommentFilter"> - <property name="offCommentFormat" value="Checkstyle: stop constant name check"/> - <property name="onCommentFormat" value="Checkstyle: resume constant name check"/> - <property name="checkFormat" value="ConstantNameCheck"/> - <metadata name="com.atlassw.tools.eclipse.checkstyle.comment" value="Allow non-conforming constant names"/> - </module> - <module name="SuppressionCommentFilter"> - <property name="offCommentFormat" value="Checkstyle: stop method name check"/> - <property name="onCommentFormat" value="Checkstyle: resume method name check"/> - <property name="checkFormat" value="MethodName"/> - <property name="checkC" value="false"/> - <metadata name="com.atlassw.tools.eclipse.checkstyle.comment" value="Disable method name checks"/> - </module> - <module name="SuppressionCommentFilter"> - <property name="offCommentFormat" value="CheckStyle: stop parameter assignment check"/> - <property name="onCommentFormat" value="CheckStyle: resume parameter assignment check"/> - <property name="checkFormat" value="ParameterAssignment"/> - <property name="checkC" value="false"/> - <metadata name="com.atlassw.tools.eclipse.checkstyle.comment" value="Disable Parameter Assignment"/> - </module> - <module name="SuppressionCommentFilter"> - <property name="offCommentFormat" value="Checkstyle: stop final variable check"/> - <property name="onCommentFormat" value="Checkstyle: resume final variable check"/> - <property name="checkFormat" value="FinalLocalVariable"/> - <metadata name="com.atlassw.tools.eclipse.checkstyle.comment" value="Disable final variable checks"/> - </module> - <module name="SuppressionCommentFilter"> - <property name="offCommentFormat" value="Checkstyle: stop"/> - <property name="onCommentFormat" value="Checkstyle: resume"/> - <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"/> - <metadata name="com.atlassw.tools.eclipse.checkstyle.comment" value="Disable inner assignment checks"/> - </module> - <module name="SuppressionCommentFilter"> - <property name="offCommentFormat" value="Checkstyle: stop field name check"/> - <property name="onCommentFormat" value="Checkstyle: resume field name check"/> - <property name="checkFormat" value="MemberName"/> - <property name="checkC" value="false"/> - <metadata name="com.atlassw.tools.eclipse.checkstyle.comment" value="Disable field name checks"/> - </module> - <module name="RegexpMultiline"> - <metadata name="net.sf.eclipsecs.core.comment" value="illegal Windows line ending"/> - <property name="format" value="\r\n"/> - <property name="message" value="illegal Windows line ending"/> - </module> -</module>
--- a/mx/projects Thu Mar 08 19:24:17 2012 +0100 +++ b/mx/projects Thu Mar 08 19:24:41 2012 +0100 @@ -23,117 +23,117 @@ library@DACAPO_SCALA@urls=http://repo.scalabench.org/snapshots/org/scalabench/benchmarks/scala-benchmark-suite/0.1.0-SNAPSHOT/scala-benchmark-suite-0.1.0-20110908.085753-2.jar # graal.hotspot -project@com.oracle.max.graal.hotspot@subDir=graal -project@com.oracle.max.graal.hotspot@sourceDirs=src -project@com.oracle.max.graal.hotspot@dependencies=com.oracle.max.graal.snippets -project@com.oracle.max.graal.hotspot@checkstyle=com.oracle.max.graal.graph -project@com.oracle.max.graal.hotspot@javaCompliance=1.7 +project@com.oracle.graal.hotspot@subDir=graal +project@com.oracle.graal.hotspot@sourceDirs=src +project@com.oracle.graal.hotspot@dependencies=com.oracle.graal.snippets +project@com.oracle.graal.hotspot@checkstyle=com.oracle.graal.graph +project@com.oracle.graal.hotspot@javaCompliance=1.7 # graal.graph -project@com.oracle.max.graal.graph@subDir=graal -project@com.oracle.max.graal.graph@sourceDirs=src -project@com.oracle.max.graal.graph@dependencies=com.oracle.max.graal.debug,JUNIT -project@com.oracle.max.graal.graph@javaCompliance=1.7 +project@com.oracle.graal.graph@subDir=graal +project@com.oracle.graal.graph@sourceDirs=src +project@com.oracle.graal.graph@dependencies=com.oracle.graal.debug,JUNIT +project@com.oracle.graal.graph@javaCompliance=1.7 # graal.debug -project@com.oracle.max.graal.debug@subDir=graal -project@com.oracle.max.graal.debug@sourceDirs=src -project@com.oracle.max.graal.debug@checkstyle=com.oracle.max.graal.graph -project@com.oracle.max.graal.debug@javaCompliance=1.7 +project@com.oracle.graal.debug@subDir=graal +project@com.oracle.graal.debug@sourceDirs=src +project@com.oracle.graal.debug@checkstyle=com.oracle.graal.graph +project@com.oracle.graal.debug@javaCompliance=1.7 # graal.lir -project@com.oracle.max.graal.lir@subDir=graal -project@com.oracle.max.graal.lir@sourceDirs=src -project@com.oracle.max.graal.lir@dependencies=com.oracle.max.asm,com.oracle.max.graal.nodes -project@com.oracle.max.graal.lir@checkstyle=com.oracle.max.graal.graph -project@com.oracle.max.graal.lir@javaCompliance=1.7 +project@com.oracle.graal.lir@subDir=graal +project@com.oracle.graal.lir@sourceDirs=src +project@com.oracle.graal.lir@dependencies=com.oracle.max.asm,com.oracle.graal.nodes +project@com.oracle.graal.lir@checkstyle=com.oracle.graal.graph +project@com.oracle.graal.lir@javaCompliance=1.7 # graal.lir.amd64 -project@com.oracle.max.graal.lir.amd64@subDir=graal -project@com.oracle.max.graal.lir.amd64@sourceDirs=src -project@com.oracle.max.graal.lir.amd64@dependencies=com.oracle.max.graal.lir -project@com.oracle.max.graal.lir.amd64@checkstyle=com.oracle.max.graal.graph -project@com.oracle.max.graal.lir.amd64@javaCompliance=1.7 +project@com.oracle.graal.lir.amd64@subDir=graal +project@com.oracle.graal.lir.amd64@sourceDirs=src +project@com.oracle.graal.lir.amd64@dependencies=com.oracle.graal.lir +project@com.oracle.graal.lir.amd64@checkstyle=com.oracle.graal.graph +project@com.oracle.graal.lir.amd64@javaCompliance=1.7 # graal.alloc -project@com.oracle.max.graal.alloc@subDir=graal -project@com.oracle.max.graal.alloc@sourceDirs=src -project@com.oracle.max.graal.alloc@dependencies=com.oracle.max.graal.lir -project@com.oracle.max.graal.alloc@checkstyle=com.oracle.max.graal.graph -project@com.oracle.max.graal.alloc@javaCompliance=1.7 +project@com.oracle.graal.alloc@subDir=graal +project@com.oracle.graal.alloc@sourceDirs=src +project@com.oracle.graal.alloc@dependencies=com.oracle.graal.lir +project@com.oracle.graal.alloc@checkstyle=com.oracle.graal.graph +project@com.oracle.graal.alloc@javaCompliance=1.7 # graal.snippets -project@com.oracle.max.graal.snippets@subDir=graal -project@com.oracle.max.graal.snippets@sourceDirs=src,test -project@com.oracle.max.graal.snippets@dependencies=com.oracle.max.graal.printer -project@com.oracle.max.graal.snippets@checkstyle=com.oracle.max.graal.graph -project@com.oracle.max.graal.snippets@javaCompliance=1.7 +project@com.oracle.graal.snippets@subDir=graal +project@com.oracle.graal.snippets@sourceDirs=src,test +project@com.oracle.graal.snippets@dependencies=com.oracle.graal.printer +project@com.oracle.graal.snippets@checkstyle=com.oracle.graal.graph +project@com.oracle.graal.snippets@javaCompliance=1.7 # graal.nodes -project@com.oracle.max.graal.nodes@subDir=graal -project@com.oracle.max.graal.nodes@sourceDirs=src,test -project@com.oracle.max.graal.nodes@dependencies=com.oracle.max.cri,com.oracle.max.graal.graph -project@com.oracle.max.graal.nodes@checkstyle=com.oracle.max.graal.graph -project@com.oracle.max.graal.nodes@javaCompliance=1.7 +project@com.oracle.graal.nodes@subDir=graal +project@com.oracle.graal.nodes@sourceDirs=src,test +project@com.oracle.graal.nodes@dependencies=com.oracle.max.cri,com.oracle.graal.graph +project@com.oracle.graal.nodes@checkstyle=com.oracle.graal.graph +project@com.oracle.graal.nodes@javaCompliance=1.7 # graal.compiler -project@com.oracle.max.graal.compiler@subDir=graal -project@com.oracle.max.graal.compiler@sourceDirs=src -project@com.oracle.max.graal.compiler@dependencies=com.oracle.max.graal.lir.amd64,com.oracle.max.graal.alloc -project@com.oracle.max.graal.compiler@checkstyle=com.oracle.max.graal.graph -project@com.oracle.max.graal.compiler@javaCompliance=1.7 +project@com.oracle.graal.compiler@subDir=graal +project@com.oracle.graal.compiler@sourceDirs=src +project@com.oracle.graal.compiler@dependencies=com.oracle.graal.lir.amd64,com.oracle.graal.alloc +project@com.oracle.graal.compiler@checkstyle=com.oracle.graal.graph +project@com.oracle.graal.compiler@javaCompliance=1.7 # graal.java -project@com.oracle.max.graal.java@subDir=graal -project@com.oracle.max.graal.java@sourceDirs=src -project@com.oracle.max.graal.java@dependencies=com.oracle.max.graal.compiler -project@com.oracle.max.graal.java@checkstyle=com.oracle.max.graal.graph -project@com.oracle.max.graal.java@javaCompliance=1.7 +project@com.oracle.graal.java@subDir=graal +project@com.oracle.graal.java@sourceDirs=src +project@com.oracle.graal.java@dependencies=com.oracle.graal.compiler +project@com.oracle.graal.java@checkstyle=com.oracle.graal.graph +project@com.oracle.graal.java@javaCompliance=1.7 # graal.printer -project@com.oracle.max.graal.printer@subDir=graal -project@com.oracle.max.graal.printer@sourceDirs=src -project@com.oracle.max.graal.printer@dependencies=com.oracle.max.graal.java -project@com.oracle.max.graal.printer@checkstyle=com.oracle.max.graal.graph -project@com.oracle.max.graal.printer@javaCompliance=1.7 +project@com.oracle.graal.printer@subDir=graal +project@com.oracle.graal.printer@sourceDirs=src +project@com.oracle.graal.printer@dependencies=com.oracle.graal.java +project@com.oracle.graal.printer@checkstyle=com.oracle.graal.graph +project@com.oracle.graal.printer@javaCompliance=1.7 # graal.test -project@com.oracle.max.graal.tests@subDir=graal -project@com.oracle.max.graal.tests@sourceDirs=src -project@com.oracle.max.graal.tests@dependencies=com.oracle.max.graal.printer -project@com.oracle.max.graal.tests@checkstyle=com.oracle.max.graal.graph -project@com.oracle.max.graal.tests@javaCompliance=1.7 +project@com.oracle.graal.tests@subDir=graal +project@com.oracle.graal.tests@sourceDirs=src +project@com.oracle.graal.tests@dependencies=com.oracle.graal.printer +project@com.oracle.graal.tests@checkstyle=com.oracle.graal.graph +project@com.oracle.graal.tests@javaCompliance=1.7 # graal.jtt -project@com.oracle.max.graal.jtt@subDir=graal -project@com.oracle.max.graal.jtt@sourceDirs=src -project@com.oracle.max.graal.jtt@dependencies=JUNIT -project@com.oracle.max.graal.jtt@checkstyle=com.oracle.max.graal.graph -project@com.oracle.max.graal.jtt@javaCompliance=1.7 +project@com.oracle.graal.jtt@subDir=graal +project@com.oracle.graal.jtt@sourceDirs=src +project@com.oracle.graal.jtt@dependencies=JUNIT +project@com.oracle.graal.jtt@checkstyle=com.oracle.graal.graph +project@com.oracle.graal.jtt@javaCompliance=1.7 # graal.examples -project@com.oracle.max.graal.examples@subDir=graal -project@com.oracle.max.graal.examples@sourceDirs=src -project@com.oracle.max.graal.examples@checkstyle=com.oracle.max.graal.graph -project@com.oracle.max.graal.examples@javaCompliance=1.7 +project@com.oracle.graal.examples@subDir=graal +project@com.oracle.graal.examples@sourceDirs=src +project@com.oracle.graal.examples@checkstyle=com.oracle.graal.graph +project@com.oracle.graal.examples@javaCompliance=1.7 # max.asm project@com.oracle.max.asm@subDir=graal project@com.oracle.max.asm@sourceDirs=src project@com.oracle.max.asm@dependencies=com.oracle.max.criutils -project@com.oracle.max.asm@checkstyle=com.oracle.max.graal.graph +project@com.oracle.max.asm@checkstyle=com.oracle.graal.graph project@com.oracle.max.asm@javaCompliance=1.7 # max.cri project@com.oracle.max.cri@subDir=graal project@com.oracle.max.cri@sourceDirs=src project@com.oracle.max.cri@dependencies= -project@com.oracle.max.cri@checkstyle=com.oracle.max.graal.graph +project@com.oracle.max.cri@checkstyle=com.oracle.graal.graph project@com.oracle.max.cri@javaCompliance=1.7 # max.criutils project@com.oracle.max.criutils@subDir=graal project@com.oracle.max.criutils@sourceDirs=src project@com.oracle.max.criutils@dependencies=com.oracle.max.cri -project@com.oracle.max.criutils@checkstyle=com.oracle.max.graal.graph +project@com.oracle.max.criutils@checkstyle=com.oracle.graal.graph project@com.oracle.max.criutils@javaCompliance=1.7
--- a/src/share/vm/classfile/systemDictionary.hpp Thu Mar 08 19:24:17 2012 +0100 +++ b/src/share/vm/classfile/systemDictionary.hpp Thu Mar 08 19:24:41 2012 +0100 @@ -188,15 +188,15 @@ template(Long_klass, java_lang_Long, Pre) \ \ /* Support for Graal */ \ - template(HotSpotTypeResolved_klass, com_oracle_max_graal_hotspot_HotSpotTypeResolved, Opt) \ - template(HotSpotType_klass, com_oracle_max_graal_hotspot_HotSpotType, Opt) \ - template(HotSpotField_klass, com_oracle_max_graal_hotspot_HotSpotField, Opt) \ - template(HotSpotCompiledMethod_klass, com_oracle_max_graal_hotspot_HotSpotCompiledMethod, Opt) \ - template(HotSpotMethodResolved_klass, com_oracle_max_graal_hotspot_ri_HotSpotMethodResolved, Opt) \ - template(HotSpotMethodData_klass, com_oracle_max_graal_hotspot_ri_HotSpotMethodData, Opt) \ - template(HotSpotTargetMethod_klass, com_oracle_max_graal_hotspot_HotSpotTargetMethod, Opt) \ - template(HotSpotExceptionHandler_klass, com_oracle_max_graal_hotspot_HotSpotExceptionHandler, Opt) \ - template(HotSpotProxy_klass, com_oracle_max_graal_hotspot_HotSpotProxy, Opt) \ + template(HotSpotTypeResolved_klass, com_oracle_graal_hotspot_HotSpotTypeResolved, Opt) \ + template(HotSpotType_klass, com_oracle_graal_hotspot_HotSpotType, Opt) \ + template(HotSpotField_klass, com_oracle_graal_hotspot_HotSpotField, Opt) \ + template(HotSpotCompiledMethod_klass, com_oracle_graal_hotspot_HotSpotCompiledMethod, Opt) \ + template(HotSpotMethodResolved_klass, com_oracle_graal_hotspot_ri_HotSpotMethodResolved, Opt) \ + template(HotSpotMethodData_klass, com_oracle_graal_hotspot_ri_HotSpotMethodData, Opt) \ + template(HotSpotTargetMethod_klass, com_oracle_graal_hotspot_HotSpotTargetMethod, Opt) \ + template(HotSpotExceptionHandler_klass, com_oracle_graal_hotspot_HotSpotExceptionHandler, Opt) \ + template(HotSpotProxy_klass, com_oracle_graal_hotspot_HotSpotProxy, Opt) \ template(CiAssumptions_klass, com_oracle_max_cri_ci_CiAssumptions, Opt) \ template(CiAssumptions_MethodContents_klass, com_oracle_max_cri_ci_CiAssumptions_MethodContents, Opt) \ template(CiAssumptions_ConcreteSubtype_klass, com_oracle_max_cri_ci_CiAssumptions_ConcreteSubtype, Opt) \
--- a/src/share/vm/graal/graalCompiler.cpp Thu Mar 08 19:24:17 2012 +0100 +++ b/src/share/vm/graal/graalCompiler.cpp Thu Mar 08 19:24:41 2012 +0100 @@ -51,7 +51,7 @@ Runtime1::initialize(THREAD->get_buffer_blob()); JNIEnv *env = ((JavaThread *) Thread::current())->jni_environment(); - jclass klass = env->FindClass("com/oracle/max/graal/hotspot/bridge/CompilerToVMImpl"); + jclass klass = env->FindClass("com/oracle/graal/hotspot/bridge/CompilerToVMImpl"); if (klass == NULL) { tty->print_cr("graal CompilerToVMImpl class not found"); vm_abort(false);
--- a/src/share/vm/graal/graalCompilerToVM.cpp Thu Mar 08 19:24:17 2012 +0100 +++ b/src/share/vm/graal/graalCompilerToVM.cpp Thu Mar 08 19:24:41 2012 +0100 @@ -49,7 +49,7 @@ } // public byte[] RiMethod_code(HotSpotResolvedMethod method); -JNIEXPORT jbyteArray JNICALL Java_com_oracle_max_graal_hotspot_bridge_CompilerToVMImpl_RiMethod_1code(JNIEnv *env, jobject, jobject hotspot_method) { +JNIEXPORT jbyteArray JNICALL Java_com_oracle_graal_hotspot_bridge_CompilerToVMImpl_RiMethod_1code(JNIEnv *env, jobject, jobject hotspot_method) { TRACE_graal_3("CompilerToVM::RiMethod_code"); methodHandle method = getMethodFromHotSpotMethod(hotspot_method); int code_size = method->code_size(); @@ -59,7 +59,7 @@ } // public String RiMethod_signature(HotSpotResolvedMethod method); -JNIEXPORT jstring JNICALL Java_com_oracle_max_graal_hotspot_bridge_CompilerToVMImpl_RiMethod_1signature(JNIEnv *env, jobject, jobject hotspot_method) { +JNIEXPORT jstring JNICALL Java_com_oracle_graal_hotspot_bridge_CompilerToVMImpl_RiMethod_1signature(JNIEnv *env, jobject, jobject hotspot_method) { TRACE_graal_3("CompilerToVM::RiMethod_signature"); VM_ENTRY_MARK methodOop method = getMethodFromHotSpotMethod(hotspot_method); @@ -68,7 +68,7 @@ } // public RiExceptionHandler[] RiMethod_exceptionHandlers(long vmId); -JNIEXPORT jobjectArray JNICALL Java_com_oracle_max_graal_hotspot_bridge_CompilerToVMImpl_RiMethod_1exceptionHandlers(JNIEnv *, jobject, jobject hotspot_method) { +JNIEXPORT jobjectArray JNICALL Java_com_oracle_graal_hotspot_bridge_CompilerToVMImpl_RiMethod_1exceptionHandlers(JNIEnv *, jobject, jobject hotspot_method) { TRACE_graal_3("CompilerToVM::RiMethod_exceptionHandlers"); VM_ENTRY_MARK ResourceMark rm; @@ -109,7 +109,7 @@ } // public boolean RiMethod_hasBalancedMonitors(long vmId); -JNIEXPORT jint JNICALL Java_com_oracle_max_graal_hotspot_bridge_CompilerToVMImpl_RiMethod_1hasBalancedMonitors(JNIEnv *, jobject, jobject hotspot_method) { +JNIEXPORT jint JNICALL Java_com_oracle_graal_hotspot_bridge_CompilerToVMImpl_RiMethod_1hasBalancedMonitors(JNIEnv *, jobject, jobject hotspot_method) { TRACE_graal_3("CompilerToVM::RiMethod_hasBalancedMonitors"); VM_ENTRY_MARK; @@ -137,7 +137,7 @@ } // public RiMethod getRiMethod(java.lang.reflect.Method reflectionMethod); -JNIEXPORT jobject JNICALL Java_com_oracle_max_graal_hotspot_bridge_CompilerToVMImpl_getRiMethod(JNIEnv *, jobject, jobject reflection_method_handle) { +JNIEXPORT jobject JNICALL Java_com_oracle_graal_hotspot_bridge_CompilerToVMImpl_getRiMethod(JNIEnv *, jobject, jobject reflection_method_handle) { TRACE_graal_3("CompilerToVM::getRiMethod"); VM_ENTRY_MARK; oop reflection_method = JNIHandles::resolve(reflection_method_handle); @@ -150,7 +150,7 @@ } // public boolean RiMethod_uniqueConcreteMethod(long vmId); -JNIEXPORT jobject JNICALL Java_com_oracle_max_graal_hotspot_bridge_CompilerToVMImpl_RiMethod_1uniqueConcreteMethod(JNIEnv *, jobject, jobject hotspot_method) { +JNIEXPORT jobject JNICALL Java_com_oracle_graal_hotspot_bridge_CompilerToVMImpl_RiMethod_1uniqueConcreteMethod(JNIEnv *, jobject, jobject hotspot_method) { TRACE_graal_3("CompilerToVM::RiMethod_uniqueConcreteMethod"); VM_ENTRY_MARK; @@ -181,13 +181,13 @@ } // public native int RiMethod_invocationCount(long vmId); -JNIEXPORT jint JNICALL Java_com_oracle_max_graal_hotspot_bridge_CompilerToVMImpl_RiMethod_1invocationCount(JNIEnv *, jobject, jobject hotspot_method) { +JNIEXPORT jint JNICALL Java_com_oracle_graal_hotspot_bridge_CompilerToVMImpl_RiMethod_1invocationCount(JNIEnv *, jobject, jobject hotspot_method) { TRACE_graal_3("CompilerToVM::RiMethod_invocationCount"); return getMethodFromHotSpotMethod(hotspot_method)->invocation_count(); } // public native HotSpotMethodData RiMethod_methodData(HotSpotMethodResolved method); -JNIEXPORT jobject JNICALL Java_com_oracle_max_graal_hotspot_bridge_CompilerToVMImpl_RiMethod_1methodData(JNIEnv *, jobject, jobject hotspot_method) { +JNIEXPORT jobject JNICALL Java_com_oracle_graal_hotspot_bridge_CompilerToVMImpl_RiMethod_1methodData(JNIEnv *, jobject, jobject hotspot_method) { TRACE_graal_3("CompilerToVM::RiMethod_methodData"); VM_ENTRY_MARK; @@ -227,20 +227,20 @@ } // public native boolean RiMethod_hasCompiledCode(HotSpotMethodResolved method); -JNIEXPORT jboolean JNICALL Java_com_oracle_max_graal_hotspot_bridge_CompilerToVMImpl_RiMethod_1hasCompiledCode(JNIEnv *, jobject, jobject hotspot_method) { +JNIEXPORT jboolean JNICALL Java_com_oracle_graal_hotspot_bridge_CompilerToVMImpl_RiMethod_1hasCompiledCode(JNIEnv *, jobject, jobject hotspot_method) { TRACE_graal_3("CompilerToVM::RiMethod_hasCompiledCode"); return getMethodFromHotSpotMethod(hotspot_method)->has_compiled_code(); } // public native int RiMethod_getCompiledCodeSize(HotSpotMethodResolved method); -JNIEXPORT jint JNICALL Java_com_oracle_max_graal_hotspot_bridge_CompilerToVMImpl_RiMethod_1getCompiledCodeSize(JNIEnv *env, jobject, jobject hotspot_method) { +JNIEXPORT jint JNICALL Java_com_oracle_graal_hotspot_bridge_CompilerToVMImpl_RiMethod_1getCompiledCodeSize(JNIEnv *env, jobject, jobject hotspot_method) { TRACE_graal_3("CompilerToVM::RiMethod_getCompiledCodeSize"); nmethod* code = getMethodFromHotSpotMethod(hotspot_method)->code(); return code == NULL ? 0 : code->insts_size(); } // public RiType RiSignature_lookupType(String returnType, HotSpotTypeResolved accessingClass); -JNIEXPORT jobject JNICALL Java_com_oracle_max_graal_hotspot_bridge_CompilerToVMImpl_RiSignature_1lookupType(JNIEnv *env, jobject, jstring jname, jobject accessingClass, jboolean eagerResolve) { +JNIEXPORT jobject JNICALL Java_com_oracle_graal_hotspot_bridge_CompilerToVMImpl_RiSignature_1lookupType(JNIEnv *env, jobject, jstring jname, jobject accessingClass, jboolean eagerResolve) { TRACE_graal_3("CompilerToVM::RiSignature_lookupType"); VM_ENTRY_MARK; ResourceMark rm; @@ -306,7 +306,7 @@ } // public Object RiConstantPool_lookupConstant(HotSpotTypeResolved type, int cpi); -JNIEXPORT jobject JNICALL Java_com_oracle_max_graal_hotspot_bridge_CompilerToVMImpl_RiConstantPool_1lookupConstant(JNIEnv *env, jobject, jobject type, jint index) { +JNIEXPORT jobject JNICALL Java_com_oracle_graal_hotspot_bridge_CompilerToVMImpl_RiConstantPool_1lookupConstant(JNIEnv *env, jobject, jobject type, jint index) { TRACE_graal_3("CompilerToVM::RiConstantPool_lookupConstant"); VM_ENTRY_MARK; @@ -351,7 +351,7 @@ } // public RiMethod RiConstantPool_lookupMethod(long vmId, int cpi, byte byteCode); -JNIEXPORT jobject JNICALL Java_com_oracle_max_graal_hotspot_bridge_CompilerToVMImpl_RiConstantPool_1lookupMethod(JNIEnv *env, jobject, jobject type, jint index, jbyte byteCode) { +JNIEXPORT jobject JNICALL Java_com_oracle_graal_hotspot_bridge_CompilerToVMImpl_RiConstantPool_1lookupMethod(JNIEnv *env, jobject, jobject type, jint index, jbyte byteCode) { TRACE_graal_3("CompilerToVM::RiConstantPool_lookupMethod"); VM_ENTRY_MARK; index = GraalCompiler::to_cp_index_u2(index); @@ -374,7 +374,7 @@ } // public RiType RiConstantPool_lookupType(long vmId, int cpi); -JNIEXPORT jobject JNICALL Java_com_oracle_max_graal_hotspot_bridge_CompilerToVMImpl_RiConstantPool_1lookupType(JNIEnv *env, jobject, jobject type, jint index) { +JNIEXPORT jobject JNICALL Java_com_oracle_graal_hotspot_bridge_CompilerToVMImpl_RiConstantPool_1lookupType(JNIEnv *env, jobject, jobject type, jint index) { TRACE_graal_3("CompilerToVM::RiConstantPool_lookupType"); VM_ENTRY_MARK; @@ -384,7 +384,7 @@ } // public void RiConstantPool_loadReferencedType(long vmId, int cpi); -JNIEXPORT void JNICALL Java_com_oracle_max_graal_hotspot_bridge_CompilerToVMImpl_RiConstantPool_1loadReferencedType(JNIEnv *env, jobject, jobject type, jint index, jbyte op) { +JNIEXPORT void JNICALL Java_com_oracle_graal_hotspot_bridge_CompilerToVMImpl_RiConstantPool_1loadReferencedType(JNIEnv *env, jobject, jobject type, jint index, jbyte op) { TRACE_graal_3("CompilerToVM::RiConstantPool_loadReferencedType"); VM_ENTRY_MARK; @@ -410,7 +410,7 @@ } // public RiField RiConstantPool_lookupField(long vmId, int cpi); -JNIEXPORT jobject JNICALL Java_com_oracle_max_graal_hotspot_bridge_CompilerToVMImpl_RiConstantPool_1lookupField(JNIEnv *env, jobject, jobject constantPoolHolder, jint index, jbyte byteCode) { +JNIEXPORT jobject JNICALL Java_com_oracle_graal_hotspot_bridge_CompilerToVMImpl_RiConstantPool_1lookupField(JNIEnv *env, jobject, jobject constantPoolHolder, jint index, jbyte byteCode) { TRACE_graal_3("CompilerToVM::RiConstantPool_lookupField"); VM_ENTRY_MARK; ResourceMark rm; @@ -519,7 +519,7 @@ } // public RiMethod RiType_resolveMethodImpl(HotSpotTypeResolved klass, String name, String signature); -JNIEXPORT jobject JNICALL Java_com_oracle_max_graal_hotspot_bridge_CompilerToVMImpl_RiType_3resolveMethodImpl(JNIEnv *, jobject, jobject resolved_type, jstring name, jstring signature) { +JNIEXPORT jobject JNICALL Java_com_oracle_graal_hotspot_bridge_CompilerToVMImpl_RiType_3resolveMethodImpl(JNIEnv *, jobject, jobject resolved_type, jstring name, jstring signature) { TRACE_graal_3("CompilerToVM::RiType_resolveMethodImpl"); VM_ENTRY_MARK; @@ -540,7 +540,7 @@ } // public boolean RiType_isSubtypeOf(HotSpotTypeResolved klass, RiType other); -JNIEXPORT jboolean JNICALL Java_com_oracle_max_graal_hotspot_bridge_CompilerToVMImpl_RiType_2isSubtypeOf(JNIEnv *, jobject, jobject klass, jobject jother) { +JNIEXPORT jboolean JNICALL Java_com_oracle_graal_hotspot_bridge_CompilerToVMImpl_RiType_2isSubtypeOf(JNIEnv *, jobject, jobject klass, jobject jother) { TRACE_graal_3("CompilerToVM::RiType_isSubtypeOf"); VM_ENTRY_MARK; @@ -560,7 +560,7 @@ } // public RiType RiType_leastCommonAncestor(HotSpotTypeResolved thisType, HotSpotTypeResolved otherType); -JNIEXPORT jobject JNICALL Java_com_oracle_max_graal_hotspot_bridge_CompilerToVMImpl_RiType_2leastCommonAncestor(JNIEnv *, jobject, jobject this_type, jobject other_type) { +JNIEXPORT jobject JNICALL Java_com_oracle_graal_hotspot_bridge_CompilerToVMImpl_RiType_2leastCommonAncestor(JNIEnv *, jobject, jobject this_type, jobject other_type) { TRACE_graal_3("CompilerToVM::RiType_leastCommonAncestor"); VM_ENTRY_MARK; @@ -572,7 +572,7 @@ } // public RiType RiType_componentType(HotSpotResolvedType klass); -JNIEXPORT jobject JNICALL Java_com_oracle_max_graal_hotspot_bridge_CompilerToVMImpl_RiType_1componentType(JNIEnv *, jobject, jobject klass) { +JNIEXPORT jobject JNICALL Java_com_oracle_graal_hotspot_bridge_CompilerToVMImpl_RiType_1componentType(JNIEnv *, jobject, jobject klass) { TRACE_graal_3("CompilerToVM::RiType_componentType"); VM_ENTRY_MARK; KlassHandle array_klass = java_lang_Class::as_klassOop(HotSpotTypeResolved::javaMirror(klass)); @@ -588,7 +588,7 @@ } // public RiType RiType_superType(HotSpotResolvedType klass); -JNIEXPORT jobject JNICALL Java_com_oracle_max_graal_hotspot_bridge_CompilerToVMImpl_RiType_1superType(JNIEnv *, jobject, jobject klass) { +JNIEXPORT jobject JNICALL Java_com_oracle_graal_hotspot_bridge_CompilerToVMImpl_RiType_1superType(JNIEnv *, jobject, jobject klass) { TRACE_graal_3("CompilerToVM::RiType_superType"); VM_ENTRY_MARK; KlassHandle klass_handle(java_lang_Class::as_klassOop(HotSpotTypeResolved::javaMirror(klass))); @@ -609,7 +609,7 @@ } // public RiType RiType_uniqueConcreteSubtype(HotSpotResolvedType klass); -JNIEXPORT jobject JNICALL Java_com_oracle_max_graal_hotspot_bridge_CompilerToVMImpl_RiType_1uniqueConcreteSubtype(JNIEnv *, jobject, jobject klass) { +JNIEXPORT jobject JNICALL Java_com_oracle_graal_hotspot_bridge_CompilerToVMImpl_RiType_1uniqueConcreteSubtype(JNIEnv *, jobject, jobject klass) { TRACE_graal_3("CompilerToVM::RiType_uniqueConcreteSubtype"); VM_ENTRY_MARK; KlassHandle klass_handle(java_lang_Class::as_klassOop(HotSpotTypeResolved::javaMirror(klass))); @@ -621,7 +621,7 @@ } // public bool RiType_isInitialized(HotSpotResolvedType klass); -JNIEXPORT jboolean JNICALL Java_com_oracle_max_graal_hotspot_bridge_CompilerToVMImpl_RiType_1isInitialized(JNIEnv *, jobject, jobject hotspot_klass) { +JNIEXPORT jboolean JNICALL Java_com_oracle_graal_hotspot_bridge_CompilerToVMImpl_RiType_1isInitialized(JNIEnv *, jobject, jobject hotspot_klass) { TRACE_graal_3("CompilerToVM::RiType_isInitialized"); klassOop klass = java_lang_Class::as_klassOop(HotSpotTypeResolved::javaMirror(hotspot_klass)); assert(klass != NULL, "method must not be called for primitive types"); @@ -629,7 +629,7 @@ } // public RiType RiType_arrayOf(HotSpotTypeResolved klass); -JNIEXPORT jobject JNICALL Java_com_oracle_max_graal_hotspot_bridge_CompilerToVMImpl_RiType_1arrayOf(JNIEnv *, jobject, jobject klass) { +JNIEXPORT jobject JNICALL Java_com_oracle_graal_hotspot_bridge_CompilerToVMImpl_RiType_1arrayOf(JNIEnv *, jobject, jobject klass) { TRACE_graal_3("CompilerToVM::RiType_arrayOf"); VM_ENTRY_MARK; @@ -641,7 +641,7 @@ } // public RiResolvedField[] RiType_fields(HotSpotTypeResolved klass); -JNIEXPORT jobject JNICALL Java_com_oracle_max_graal_hotspot_bridge_CompilerToVMImpl_RiType_1fields(JNIEnv *, jobject, jobject klass) { +JNIEXPORT jobject JNICALL Java_com_oracle_graal_hotspot_bridge_CompilerToVMImpl_RiType_1fields(JNIEnv *, jobject, jobject klass) { TRACE_graal_3("CompilerToVM::RiType_fields"); VM_ENTRY_MARK; ResourceMark rm; @@ -675,7 +675,7 @@ } // public RiType getPrimitiveArrayType(CiKind kind); -JNIEXPORT jobject JNICALL Java_com_oracle_max_graal_hotspot_bridge_CompilerToVMImpl_getPrimitiveArrayType(JNIEnv *env, jobject, jobject kind) { +JNIEXPORT jobject JNICALL Java_com_oracle_graal_hotspot_bridge_CompilerToVMImpl_getPrimitiveArrayType(JNIEnv *env, jobject, jobject kind) { TRACE_graal_3("CompilerToVM::getPrimitiveArrayType"); VM_ENTRY_MARK; BasicType type = GraalCompiler::kindToBasicType(CiKind::typeChar(kind)); @@ -685,7 +685,7 @@ } // public long getMaxCallTargetOffset(CiRuntimeCall rtcall); -JNIEXPORT jlong JNICALL Java_com_oracle_max_graal_hotspot_bridge_CompilerToVMImpl_getMaxCallTargetOffset(JNIEnv *env, jobject, jobject rtcall) { +JNIEXPORT jlong JNICALL Java_com_oracle_graal_hotspot_bridge_CompilerToVMImpl_getMaxCallTargetOffset(JNIEnv *env, jobject, jobject rtcall) { TRACE_graal_3("CompilerToVM::getMaxCallTargetOffset"); VM_ENTRY_MARK; oop call = JNIHandles::resolve(rtcall); @@ -699,7 +699,7 @@ } // public RiType getType(Class<?> javaClass); -JNIEXPORT jobject JNICALL Java_com_oracle_max_graal_hotspot_bridge_CompilerToVMImpl_getType(JNIEnv *env, jobject, jobject javaClass) { +JNIEXPORT jobject JNICALL Java_com_oracle_graal_hotspot_bridge_CompilerToVMImpl_getType(JNIEnv *env, jobject, jobject javaClass) { TRACE_graal_3("CompilerToVM::getType"); VM_ENTRY_MARK; oop javaClassOop = JNIHandles::resolve(javaClass); @@ -745,8 +745,8 @@ int basicTypeCount = sizeof(basicTypes) / sizeof(BasicType); // public HotSpotVMConfig getConfiguration(); -JNIEXPORT jobject JNICALL Java_com_oracle_max_graal_hotspot_bridge_CompilerToVMImpl_getConfiguration(JNIEnv *env, jobject) { - jclass klass = env->FindClass("com/oracle/max/graal/hotspot/HotSpotVMConfig"); +JNIEXPORT jobject JNICALL Java_com_oracle_graal_hotspot_bridge_CompilerToVMImpl_getConfiguration(JNIEnv *env, jobject) { + jclass klass = env->FindClass("com/oracle/graal/hotspot/HotSpotVMConfig"); assert(klass != NULL, "HotSpot vm config class not found"); jobject config = env->AllocObject(klass); #ifdef _WIN64 @@ -850,7 +850,7 @@ } // public HotSpotCompiledMethod installMethod(HotSpotTargetMethod targetMethod, boolean installCode); -JNIEXPORT jobject JNICALL Java_com_oracle_max_graal_hotspot_bridge_CompilerToVMImpl_installMethod(JNIEnv *jniEnv, jobject, jobject targetMethod, jboolean install_code) { +JNIEXPORT jobject JNICALL Java_com_oracle_graal_hotspot_bridge_CompilerToVMImpl_installMethod(JNIEnv *jniEnv, jobject, jobject targetMethod, jboolean install_code) { VM_ENTRY_MARK; ResourceMark rm; HandleMark hm; @@ -876,7 +876,7 @@ } // public long installStub(HotSpotTargetMethod targetMethod, String name); -JNIEXPORT jlong JNICALL Java_com_oracle_max_graal_hotspot_bridge_CompilerToVMImpl_installStub(JNIEnv *jniEnv, jobject, jobject targetMethod) { +JNIEXPORT jlong JNICALL Java_com_oracle_graal_hotspot_bridge_CompilerToVMImpl_installStub(JNIEnv *jniEnv, jobject, jobject targetMethod) { VM_ENTRY_MARK; ResourceMark rm; HandleMark hm; @@ -889,7 +889,7 @@ } // public String disassembleNative(byte[] code, long address); -JNIEXPORT jobject JNICALL Java_com_oracle_max_graal_hotspot_bridge_CompilerToVMImpl_disassembleNative(JNIEnv *jniEnv, jobject, jbyteArray code, jlong start_address) { +JNIEXPORT jobject JNICALL Java_com_oracle_graal_hotspot_bridge_CompilerToVMImpl_disassembleNative(JNIEnv *jniEnv, jobject, jbyteArray code, jlong start_address) { TRACE_graal_3("CompilerToVM::disassembleNative"); VM_ENTRY_MARK; ResourceMark rm; @@ -907,7 +907,7 @@ } // public String disassembleJava(HotSpotMethodResolved method); -JNIEXPORT jobject JNICALL Java_com_oracle_max_graal_hotspot_bridge_CompilerToVMImpl_disassembleJava(JNIEnv *env, jobject, jobject hotspot_method) { +JNIEXPORT jobject JNICALL Java_com_oracle_graal_hotspot_bridge_CompilerToVMImpl_disassembleJava(JNIEnv *env, jobject, jobject hotspot_method) { TRACE_graal_3("CompilerToVM::disassembleJava"); // Important: The bytecode printing functions are all NOT PRODUCT code, so this method returns an empty string for a product VM build. @@ -926,7 +926,7 @@ } // public Object executeCompiledMethod(HotSpotCompiledMethod method, Object arg1, Object arg2, Object arg3); -JNIEXPORT jobject JNICALL Java_com_oracle_max_graal_hotspot_bridge_CompilerToVMImpl_executeCompiledMethod(JNIEnv *env, jobject, jobject method, jobject arg1, jobject arg2, jobject arg3) { +JNIEXPORT jobject JNICALL Java_com_oracle_graal_hotspot_bridge_CompilerToVMImpl_executeCompiledMethod(JNIEnv *env, jobject, jobject method, jobject arg1, jobject arg2, jobject arg3) { TRACE_graal_3("CompilerToVM::executeCompiledMethod"); VM_ENTRY_MARK; @@ -952,7 +952,7 @@ } // public native int RiMethod_vtableEntryOffset(HotSpotMethodResolved method); -JNIEXPORT jint JNICALL Java_com_oracle_max_graal_hotspot_bridge_CompilerToVMImpl_RiMethod_vtableEntryOffset(JNIEnv *, jobject, jobject hotspot_method) { +JNIEXPORT jint JNICALL Java_com_oracle_graal_hotspot_bridge_CompilerToVMImpl_RiMethod_vtableEntryOffset(JNIEnv *, jobject, jobject hotspot_method) { TRACE_graal_3("CompilerToVM::RiMethod_vtableEntryOffset"); methodOop method = getMethodFromHotSpotMethod(hotspot_method); @@ -968,24 +968,24 @@ #define CC (char*) /*cast a literal from (const char*)*/ -#define FN_PTR(f) CAST_FROM_FN_PTR(void*, &(Java_com_oracle_max_graal_hotspot_bridge_CompilerToVMImpl_##f)) +#define FN_PTR(f) CAST_FROM_FN_PTR(void*, &(Java_com_oracle_graal_hotspot_bridge_CompilerToVMImpl_##f)) #define PROXY "J" #define TYPE "Lcom/oracle/max/cri/ri/RiType;" -#define RESOLVED_TYPE "Lcom/oracle/max/graal/hotspot/ri/HotSpotTypeResolved;" +#define RESOLVED_TYPE "Lcom/oracle/graal/hotspot/ri/HotSpotTypeResolved;" #define METHOD "Lcom/oracle/max/cri/ri/RiMethod;" -#define RESOLVED_METHOD "Lcom/oracle/max/graal/hotspot/ri/HotSpotMethodResolved;" +#define RESOLVED_METHOD "Lcom/oracle/graal/hotspot/ri/HotSpotMethodResolved;" #define REFLECT_METHOD "Ljava/lang/reflect/Method;" #define SIGNATURE "Lcom/oracle/max/cri/ri/RiSignature;" #define FIELD "Lcom/oracle/max/cri/ri/RiField;" #define RESOLVED_FIELD "Lcom/oracle/max/cri/ri/RiResolvedField;" #define CONSTANT_POOL "Lcom/oracle/max/cri/ri/RiConstantPool;" #define EXCEPTION_HANDLERS "[Lcom/oracle/max/cri/ri/RiExceptionHandler;" -#define TARGET_METHOD "Lcom/oracle/max/graal/hotspot/HotSpotTargetMethod;" -#define CONFIG "Lcom/oracle/max/graal/hotspot/HotSpotVMConfig;" -#define HS_METHOD "Lcom/oracle/max/graal/hotspot/ri/HotSpotMethod;" -#define HS_COMP_METHOD "Lcom/oracle/max/graal/hotspot/ri/HotSpotCompiledMethod;" -#define METHOD_DATA "Lcom/oracle/max/graal/hotspot/ri/HotSpotMethodData;" +#define TARGET_METHOD "Lcom/oracle/graal/hotspot/HotSpotTargetMethod;" +#define CONFIG "Lcom/oracle/graal/hotspot/HotSpotVMConfig;" +#define HS_METHOD "Lcom/oracle/graal/hotspot/ri/HotSpotMethod;" +#define HS_COMP_METHOD "Lcom/oracle/graal/hotspot/ri/HotSpotCompiledMethod;" +#define METHOD_DATA "Lcom/oracle/graal/hotspot/ri/HotSpotMethodData;" #define CI_CONSTANT "Lcom/oracle/max/cri/ci/CiConstant;" #define CI_KIND "Lcom/oracle/max/cri/ci/CiKind;" #define CI_RUNTIME_CALL "Lcom/oracle/max/cri/ci/CiRuntimeCall;"
--- a/src/share/vm/graal/graalJavaAccess.hpp Thu Mar 08 19:24:17 2012 +0100 +++ b/src/share/vm/graal/graalJavaAccess.hpp Thu Mar 08 19:24:41 2012 +0100 @@ -46,7 +46,7 @@ #define COMPILER_CLASSES_DO(start_class, end_class, char_field, int_field, boolean_field, long_field, float_field, oop_field, static_oop_field) \ start_class(HotSpotTypeResolved) \ - oop_field(HotSpotTypeResolved, compiler, "Lcom/oracle/max/graal/hotspot/Compiler;") \ + oop_field(HotSpotTypeResolved, compiler, "Lcom/oracle/graal/hotspot/Compiler;") \ oop_field(HotSpotTypeResolved, javaMirror, "Ljava/lang/Class;") \ oop_field(HotSpotTypeResolved, simpleName, "Ljava/lang/String;") \ int_field(HotSpotTypeResolved, accessFlags) \ @@ -59,7 +59,7 @@ int_field(HotSpotTypeResolved, instanceSize) \ end_class \ start_class(HotSpotMethodResolved) \ - oop_field(HotSpotMethodResolved, compiler, "Lcom/oracle/max/graal/hotspot/Compiler;") \ + oop_field(HotSpotMethodResolved, compiler, "Lcom/oracle/graal/hotspot/Compiler;") \ oop_field(HotSpotMethodResolved, name, "Ljava/lang/String;") \ oop_field(HotSpotMethodResolved, holder, "Lcom/oracle/max/cri/ri/RiResolvedType;") \ oop_field(HotSpotMethodResolved, javaMirror, "Ljava/lang/Object;") \ @@ -71,7 +71,7 @@ oop_field(HotSpotMethodResolved, callback, "Lcom/oracle/max/cri/ci/CiGenericCallback;") \ end_class \ start_class(HotSpotMethodData) \ - oop_field(HotSpotMethodData, compiler, "Lcom/oracle/max/graal/hotspot/Compiler;") \ + oop_field(HotSpotMethodData, compiler, "Lcom/oracle/graal/hotspot/Compiler;") \ oop_field(HotSpotMethodData, hotspotMirror, "Ljava/lang/Object;") \ int_field(HotSpotMethodData, normalDataSize) \ int_field(HotSpotMethodData, extraDataSize) \ @@ -85,7 +85,7 @@ int_field(HotSpotField, accessFlags) \ end_class \ start_class(HotSpotCompiledMethod) \ - oop_field(HotSpotCompiledMethod, compiler, "Lcom/oracle/max/graal/hotspot/Compiler;") \ + oop_field(HotSpotCompiledMethod, compiler, "Lcom/oracle/graal/hotspot/Compiler;") \ long_field(HotSpotCompiledMethod, nmethod) \ oop_field(HotSpotCompiledMethod, method, "Lcom/oracle/max/cri/ri/RiResolvedMethod;") \ end_class \ @@ -94,7 +94,7 @@ end_class \ start_class(HotSpotTargetMethod) \ oop_field(HotSpotTargetMethod, targetMethod, "Lcom/oracle/max/cri/ci/CiTargetMethod;") \ - oop_field(HotSpotTargetMethod, method, "Lcom/oracle/max/graal/hotspot/ri/HotSpotMethodResolved;") \ + oop_field(HotSpotTargetMethod, method, "Lcom/oracle/graal/hotspot/ri/HotSpotMethodResolved;") \ oop_field(HotSpotTargetMethod, name, "Ljava/lang/String;") \ oop_field(HotSpotTargetMethod, sites, "[Lcom/oracle/max/cri/ci/CiTargetMethod$Site;") \ oop_field(HotSpotTargetMethod, exceptionHandlers, "[Lcom/oracle/max/cri/ci/CiTargetMethod$ExceptionHandler;") \
--- a/src/share/vm/graal/graalVMToCompiler.cpp Thu Mar 08 19:24:17 2012 +0100 +++ b/src/share/vm/graal/graalVMToCompiler.cpp Thu Mar 08 19:24:41 2012 +0100 @@ -31,7 +31,7 @@ KlassHandle VMToCompiler::vmExitsKlass() { if (JNIHandles::resolve(_vmExitsPermKlass) == NULL) { - klassOop result = SystemDictionary::resolve_or_null(vmSymbols::com_oracle_max_graal_hotspot_bridge_VMToCompiler(), SystemDictionary::java_system_loader(), NULL, Thread::current()); + klassOop result = SystemDictionary::resolve_or_null(vmSymbols::com_oracle_graal_hotspot_bridge_VMToCompiler(), SystemDictionary::java_system_loader(), NULL, Thread::current()); check_not_null(result, "Couldn't find class com.oracle.max.graal.hotspot.bridge.VMToCompiler"); _vmExitsPermKlass = JNIHandles::make_global(result); } @@ -40,7 +40,7 @@ Handle VMToCompiler::compilerInstance() { if (JNIHandles::resolve(_compilerPermObject) == NULL) { - KlassHandle compilerImplKlass = SystemDictionary::resolve_or_null(vmSymbols::com_oracle_max_graal_hotspot_CompilerImpl(), SystemDictionary::java_system_loader(), NULL, Thread::current()); + KlassHandle compilerImplKlass = SystemDictionary::resolve_or_null(vmSymbols::com_oracle_graal_hotspot_CompilerImpl(), SystemDictionary::java_system_loader(), NULL, Thread::current()); check_not_null(compilerImplKlass(), "Couldn't find class com.sun.hotspot.graal.CompilerImpl"); JavaValue result(T_OBJECT); @@ -53,7 +53,7 @@ Handle VMToCompiler::instance() { if (JNIHandles::resolve(_vmExitsPermObject) == NULL) { - KlassHandle compilerKlass = SystemDictionary::resolve_or_null(vmSymbols::com_oracle_max_graal_hotspot_Compiler(), SystemDictionary::java_system_loader(), NULL, Thread::current()); + KlassHandle compilerKlass = SystemDictionary::resolve_or_null(vmSymbols::com_oracle_graal_hotspot_Compiler(), SystemDictionary::java_system_loader(), NULL, Thread::current()); check_not_null(compilerKlass(), "Couldn't find class com.sun.hotspot.graal.Compiler"); JavaValue result(T_OBJECT); @@ -67,7 +67,7 @@ } void VMToCompiler::initializeCompiler() { - KlassHandle compilerImplKlass = SystemDictionary::resolve_or_null(vmSymbols::com_oracle_max_graal_hotspot_CompilerImpl(), SystemDictionary::java_system_loader(), NULL, Thread::current()); + KlassHandle compilerImplKlass = SystemDictionary::resolve_or_null(vmSymbols::com_oracle_graal_hotspot_CompilerImpl(), SystemDictionary::java_system_loader(), NULL, Thread::current()); check_not_null(compilerImplKlass(), "Couldn't find class com.sun.hotspot.graal.CompilerImpl"); JavaValue result(T_VOID); @@ -77,7 +77,7 @@ jboolean VMToCompiler::setOption(Handle option) { assert(!option.is_null(), ""); - KlassHandle compilerKlass = SystemDictionary::resolve_or_null(vmSymbols::com_oracle_max_graal_hotspot_HotSpotOptions(), SystemDictionary::java_system_loader(), NULL, Thread::current()); + KlassHandle compilerKlass = SystemDictionary::resolve_or_null(vmSymbols::com_oracle_graal_hotspot_HotSpotOptions(), SystemDictionary::java_system_loader(), NULL, Thread::current()); check_not_null(compilerKlass(), "Couldn't find class com.sun.hotspot.graal.HotSpotOptions"); Thread* THREAD = Thread::current(); @@ -88,7 +88,7 @@ } void VMToCompiler::setDefaultOptions() { - KlassHandle compilerKlass = SystemDictionary::resolve_or_null(vmSymbols::com_oracle_max_graal_hotspot_HotSpotOptions(), SystemDictionary::java_system_loader(), NULL, Thread::current()); + KlassHandle compilerKlass = SystemDictionary::resolve_or_null(vmSymbols::com_oracle_graal_hotspot_HotSpotOptions(), SystemDictionary::java_system_loader(), NULL, Thread::current()); check_not_null(compilerKlass(), "Couldn't find class com.sun.hotspot.graal.HotSpotOptions"); Thread* THREAD = Thread::current();
--- a/src/share/vm/oops/klass.hpp Thu Mar 08 19:24:17 2012 +0100 +++ b/src/share/vm/oops/klass.hpp Thu Mar 08 19:24:41 2012 +0100 @@ -239,7 +239,7 @@ klassOop _primary_supers[_primary_super_limit]; // java/lang/Class instance mirroring this class oop _java_mirror; - // com/oracle/max/graal/hotspot/HotSpotTypeResolved mirroring this class + // com/oracle/graal/hotspot/HotSpotTypeResolved mirroring this class oop _graal_mirror; // Superclass klassOop _super;
--- a/src/share/vm/oops/methodDataOop.hpp Thu Mar 08 19:24:17 2012 +0100 +++ b/src/share/vm/oops/methodDataOop.hpp Thu Mar 08 19:24:41 2012 +0100 @@ -1194,7 +1194,7 @@ // Back pointer to the methodOop methodOop _method; - // com/oracle/max/graal/hotspot/HotSpotProfilingInfo mirroring this method + // com/oracle/graal/hotspot/HotSpotProfilingInfo mirroring this method oop _graal_mirror; // Size of this oop in bytes
--- a/src/share/vm/oops/methodOop.hpp Thu Mar 08 19:24:17 2012 +0100 +++ b/src/share/vm/oops/methodOop.hpp Thu Mar 08 19:24:41 2012 +0100 @@ -131,7 +131,7 @@ InvocationCounter _invocation_counter; // Incremented before each activation of the method - used to trigger frequency-based optimizations InvocationCounter _backedge_counter; // Incremented before each backedge taken - used to trigger frequencey-based optimizations - // com/oracle/max/graal/hotspot/HotSpotMethodResolved mirroring this method + // com/oracle/graal/hotspot/HotSpotMethodResolved mirroring this method oop _graal_mirror; #ifdef TIERED jlong _prev_time; // Previous time the rate was acquired