Mercurial > hg > graal-compiler
changeset 1420:44efca8a02d6
reformatting similar to other maxine projects (tabs, etc.)
line wrap: on
line diff
--- a/.hgignore Mon Jul 12 15:05:17 2010 -0700 +++ b/.hgignore Tue Jul 13 11:47:55 2010 -0700 @@ -3,7 +3,6 @@ ^java/ ^work/ .metadata/ -.settings/ ~$ .swp$ .class$
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/c1x4hotspotsrc/HotSpotVM/.settings/org.eclipse.jdt.core.prefs Tue Jul 13 11:47:55 2010 -0700 @@ -0,0 +1,372 @@ +#Wed Jul 07 17:26:56 PDT 2010 +eclipse.preferences.version=1 +org.eclipse.jdt.core.builder.cleanOutputFolder=clean +org.eclipse.jdt.core.builder.duplicateResourceTask=warning +org.eclipse.jdt.core.builder.invalidClasspath=abort +org.eclipse.jdt.core.builder.resourceCopyExclusionFilter=*.launch +org.eclipse.jdt.core.circularClasspath=error +org.eclipse.jdt.core.classpath.exclusionPatterns=enabled +org.eclipse.jdt.core.classpath.multipleOutputLocations=enabled +org.eclipse.jdt.core.codeComplete.argumentPrefixes= +org.eclipse.jdt.core.codeComplete.argumentSuffixes= +org.eclipse.jdt.core.codeComplete.fieldPrefixes= +org.eclipse.jdt.core.codeComplete.fieldSuffixes= +org.eclipse.jdt.core.codeComplete.localPrefixes= +org.eclipse.jdt.core.codeComplete.localSuffixes= +org.eclipse.jdt.core.codeComplete.staticFieldPrefixes= +org.eclipse.jdt.core.codeComplete.staticFieldSuffixes= +org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled +org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6 +org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve +org.eclipse.jdt.core.compiler.compliance=1.6 +org.eclipse.jdt.core.compiler.debug.lineNumber=generate +org.eclipse.jdt.core.compiler.debug.localVariable=generate +org.eclipse.jdt.core.compiler.debug.sourceFile=generate +org.eclipse.jdt.core.compiler.doc.comment.support=enabled +org.eclipse.jdt.core.compiler.maxProblemPerUnit=100 +org.eclipse.jdt.core.compiler.problem.annotationSuperInterface=warning +org.eclipse.jdt.core.compiler.problem.assertIdentifier=error +org.eclipse.jdt.core.compiler.problem.autoboxing=ignore +org.eclipse.jdt.core.compiler.problem.comparingIdentical=ignore +org.eclipse.jdt.core.compiler.problem.deadCode=ignore +org.eclipse.jdt.core.compiler.problem.deprecation=error +org.eclipse.jdt.core.compiler.problem.deprecationInDeprecatedCode=enabled +org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=enabled +org.eclipse.jdt.core.compiler.problem.discouragedReference=warning +org.eclipse.jdt.core.compiler.problem.emptyStatement=warning +org.eclipse.jdt.core.compiler.problem.enumIdentifier=error +org.eclipse.jdt.core.compiler.problem.fallthroughCase=ignore +org.eclipse.jdt.core.compiler.problem.fatalOptionalError=enabled +org.eclipse.jdt.core.compiler.problem.fieldHiding=warning +org.eclipse.jdt.core.compiler.problem.finalParameterBound=error +org.eclipse.jdt.core.compiler.problem.finallyBlockNotCompletingNormally=ignore +org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning +org.eclipse.jdt.core.compiler.problem.hiddenCatchBlock=warning +org.eclipse.jdt.core.compiler.problem.incompatibleNonInheritedInterfaceMethod=warning +org.eclipse.jdt.core.compiler.problem.incompleteEnumSwitch=error +org.eclipse.jdt.core.compiler.problem.indirectStaticAccess=ignore +org.eclipse.jdt.core.compiler.problem.invalidJavadoc=ignore +org.eclipse.jdt.core.compiler.problem.invalidJavadocTags=enabled +org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsDeprecatedRef=enabled +org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsNotVisibleRef=enabled +org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsVisibility=private +org.eclipse.jdt.core.compiler.problem.localVariableHiding=ignore +org.eclipse.jdt.core.compiler.problem.methodWithConstructorName=error +org.eclipse.jdt.core.compiler.problem.missingDeprecatedAnnotation=error +org.eclipse.jdt.core.compiler.problem.missingHashCodeMethod=ignore +org.eclipse.jdt.core.compiler.problem.missingJavadocComments=ignore +org.eclipse.jdt.core.compiler.problem.missingJavadocCommentsOverriding=enabled +org.eclipse.jdt.core.compiler.problem.missingJavadocCommentsVisibility=public +org.eclipse.jdt.core.compiler.problem.missingJavadocTags=ignore +org.eclipse.jdt.core.compiler.problem.missingJavadocTagsOverriding=enabled +org.eclipse.jdt.core.compiler.problem.missingJavadocTagsVisibility=private +org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotation=error +org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotationForInterfaceMethodImplementation=disabled +org.eclipse.jdt.core.compiler.problem.missingSerialVersion=ignore +org.eclipse.jdt.core.compiler.problem.missingSynchronizedOnInheritedMethod=ignore +org.eclipse.jdt.core.compiler.problem.noEffectAssignment=warning +org.eclipse.jdt.core.compiler.problem.noImplicitStringConversion=warning +org.eclipse.jdt.core.compiler.problem.nonExternalizedStringLiteral=ignore +org.eclipse.jdt.core.compiler.problem.nullReference=ignore +org.eclipse.jdt.core.compiler.problem.overridingPackageDefaultMethod=warning +org.eclipse.jdt.core.compiler.problem.parameterAssignment=ignore +org.eclipse.jdt.core.compiler.problem.possibleAccidentalBooleanAssignment=warning +org.eclipse.jdt.core.compiler.problem.potentialNullReference=ignore +org.eclipse.jdt.core.compiler.problem.rawTypeReference=ignore +org.eclipse.jdt.core.compiler.problem.redundantNullCheck=ignore +org.eclipse.jdt.core.compiler.problem.redundantSuperinterface=ignore +org.eclipse.jdt.core.compiler.problem.specialParameterHidingField=disabled +org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=warning +org.eclipse.jdt.core.compiler.problem.suppressOptionalErrors=disabled +org.eclipse.jdt.core.compiler.problem.suppressWarnings=enabled +org.eclipse.jdt.core.compiler.problem.syntheticAccessEmulation=ignore +org.eclipse.jdt.core.compiler.problem.typeParameterHiding=warning +org.eclipse.jdt.core.compiler.problem.uncheckedTypeOperation=error +org.eclipse.jdt.core.compiler.problem.undocumentedEmptyBlock=ignore +org.eclipse.jdt.core.compiler.problem.unhandledWarningToken=error +org.eclipse.jdt.core.compiler.problem.unnecessaryElse=warning +org.eclipse.jdt.core.compiler.problem.unnecessaryTypeCheck=ignore +org.eclipse.jdt.core.compiler.problem.unqualifiedFieldAccess=ignore +org.eclipse.jdt.core.compiler.problem.unsafeTypeOperation=warning +org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownException=ignore +org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionExemptExceptionAndThrowable=enabled +org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionIncludeDocCommentReference=enabled +org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionWhenOverriding=disabled +org.eclipse.jdt.core.compiler.problem.unusedImport=warning +org.eclipse.jdt.core.compiler.problem.unusedLabel=warning +org.eclipse.jdt.core.compiler.problem.unusedLocal=warning +org.eclipse.jdt.core.compiler.problem.unusedObjectAllocation=ignore +org.eclipse.jdt.core.compiler.problem.unusedParameter=ignore +org.eclipse.jdt.core.compiler.problem.unusedParameterIncludeDocCommentReference=enabled +org.eclipse.jdt.core.compiler.problem.unusedParameterWhenImplementingAbstract=disabled +org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=disabled +org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=ignore +org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning +org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning +org.eclipse.jdt.core.compiler.source=1.6 +org.eclipse.jdt.core.compiler.taskCaseSensitive=enabled +org.eclipse.jdt.core.compiler.taskPriorities=NORMAL,HIGH,NORMAL +org.eclipse.jdt.core.compiler.taskTags=TODO,FIXME,XXX +org.eclipse.jdt.core.formatter.align_type_members_on_columns=false +org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16 +org.eclipse.jdt.core.formatter.alignment_for_arguments_in_enum_constant=16 +org.eclipse.jdt.core.formatter.alignment_for_arguments_in_explicit_constructor_call=16 +org.eclipse.jdt.core.formatter.alignment_for_arguments_in_method_invocation=16 +org.eclipse.jdt.core.formatter.alignment_for_arguments_in_qualified_allocation_expression=16 +org.eclipse.jdt.core.formatter.alignment_for_assignment=0 +org.eclipse.jdt.core.formatter.alignment_for_binary_expression=16 +org.eclipse.jdt.core.formatter.alignment_for_compact_if=16 +org.eclipse.jdt.core.formatter.alignment_for_conditional_expression=80 +org.eclipse.jdt.core.formatter.alignment_for_enum_constants=0 +org.eclipse.jdt.core.formatter.alignment_for_expressions_in_array_initializer=16 +org.eclipse.jdt.core.formatter.alignment_for_multiple_fields=16 +org.eclipse.jdt.core.formatter.alignment_for_parameters_in_constructor_declaration=16 +org.eclipse.jdt.core.formatter.alignment_for_parameters_in_method_declaration=16 +org.eclipse.jdt.core.formatter.alignment_for_selector_in_method_invocation=16 +org.eclipse.jdt.core.formatter.alignment_for_superclass_in_type_declaration=16 +org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_enum_declaration=16 +org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_type_declaration=16 +org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_constructor_declaration=16 +org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_method_declaration=16 +org.eclipse.jdt.core.formatter.blank_lines_after_imports=1 +org.eclipse.jdt.core.formatter.blank_lines_after_package=1 +org.eclipse.jdt.core.formatter.blank_lines_before_field=0 +org.eclipse.jdt.core.formatter.blank_lines_before_first_class_body_declaration=1 +org.eclipse.jdt.core.formatter.blank_lines_before_imports=1 +org.eclipse.jdt.core.formatter.blank_lines_before_member_type=1 +org.eclipse.jdt.core.formatter.blank_lines_before_method=1 +org.eclipse.jdt.core.formatter.blank_lines_before_new_chunk=1 +org.eclipse.jdt.core.formatter.blank_lines_before_package=0 +org.eclipse.jdt.core.formatter.blank_lines_between_import_groups=1 +org.eclipse.jdt.core.formatter.blank_lines_between_type_declarations=1 +org.eclipse.jdt.core.formatter.brace_position_for_annotation_type_declaration=end_of_line +org.eclipse.jdt.core.formatter.brace_position_for_anonymous_type_declaration=end_of_line +org.eclipse.jdt.core.formatter.brace_position_for_array_initializer=end_of_line +org.eclipse.jdt.core.formatter.brace_position_for_block=end_of_line +org.eclipse.jdt.core.formatter.brace_position_for_block_in_case=end_of_line +org.eclipse.jdt.core.formatter.brace_position_for_constructor_declaration=end_of_line +org.eclipse.jdt.core.formatter.brace_position_for_enum_constant=end_of_line +org.eclipse.jdt.core.formatter.brace_position_for_enum_declaration=end_of_line +org.eclipse.jdt.core.formatter.brace_position_for_method_declaration=end_of_line +org.eclipse.jdt.core.formatter.brace_position_for_switch=end_of_line +org.eclipse.jdt.core.formatter.brace_position_for_type_declaration=end_of_line +org.eclipse.jdt.core.formatter.comment.clear_blank_lines=false +org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_block_comment=false +org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_javadoc_comment=false +org.eclipse.jdt.core.formatter.comment.format_block_comments=true +org.eclipse.jdt.core.formatter.comment.format_comments=true +org.eclipse.jdt.core.formatter.comment.format_header=true +org.eclipse.jdt.core.formatter.comment.format_html=true +org.eclipse.jdt.core.formatter.comment.format_javadoc_comments=true +org.eclipse.jdt.core.formatter.comment.format_line_comments=true +org.eclipse.jdt.core.formatter.comment.format_source_code=true +org.eclipse.jdt.core.formatter.comment.indent_parameter_description=true +org.eclipse.jdt.core.formatter.comment.indent_root_tags=true +org.eclipse.jdt.core.formatter.comment.insert_new_line_before_root_tags=insert +org.eclipse.jdt.core.formatter.comment.insert_new_line_for_parameter=do not insert +org.eclipse.jdt.core.formatter.comment.line_length=120 +org.eclipse.jdt.core.formatter.compact_else_if=true +org.eclipse.jdt.core.formatter.continuation_indentation=4 +org.eclipse.jdt.core.formatter.continuation_indentation_for_array_initializer=4 +org.eclipse.jdt.core.formatter.format_guardian_clause_on_one_line=false +org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_annotation_declaration_header=true +org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_constant_header=true +org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_declaration_header=true +org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_type_header=true +org.eclipse.jdt.core.formatter.indent_breaks_compare_to_cases=true +org.eclipse.jdt.core.formatter.indent_empty_lines=false +org.eclipse.jdt.core.formatter.indent_statements_compare_to_block=true +org.eclipse.jdt.core.formatter.indent_statements_compare_to_body=true +org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_cases=true +org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_switch=true +org.eclipse.jdt.core.formatter.indentation.size=8 +org.eclipse.jdt.core.formatter.insert_new_line_after_annotation=insert +org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_local_variable=insert +org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_member=insert +org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_parameter=do not insert +org.eclipse.jdt.core.formatter.insert_new_line_after_opening_brace_in_array_initializer=do not insert +org.eclipse.jdt.core.formatter.insert_new_line_at_end_of_file_if_missing=do not insert +org.eclipse.jdt.core.formatter.insert_new_line_before_catch_in_try_statement=do not insert +org.eclipse.jdt.core.formatter.insert_new_line_before_closing_brace_in_array_initializer=do not insert +org.eclipse.jdt.core.formatter.insert_new_line_before_else_in_if_statement=do not insert +org.eclipse.jdt.core.formatter.insert_new_line_before_finally_in_try_statement=do not insert +org.eclipse.jdt.core.formatter.insert_new_line_before_while_in_do_statement=do not insert +org.eclipse.jdt.core.formatter.insert_new_line_in_empty_annotation_declaration=insert +org.eclipse.jdt.core.formatter.insert_new_line_in_empty_anonymous_type_declaration=insert +org.eclipse.jdt.core.formatter.insert_new_line_in_empty_block=insert +org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_constant=insert +org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_declaration=insert +org.eclipse.jdt.core.formatter.insert_new_line_in_empty_method_body=insert +org.eclipse.jdt.core.formatter.insert_new_line_in_empty_type_declaration=insert +org.eclipse.jdt.core.formatter.insert_space_after_and_in_type_parameter=insert +org.eclipse.jdt.core.formatter.insert_space_after_assignment_operator=insert +org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation_type_declaration=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_binary_operator=insert +org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_arguments=insert +org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_parameters=insert +org.eclipse.jdt.core.formatter.insert_space_after_closing_brace_in_block=insert +org.eclipse.jdt.core.formatter.insert_space_after_closing_paren_in_cast=insert +org.eclipse.jdt.core.formatter.insert_space_after_colon_in_assert=insert +org.eclipse.jdt.core.formatter.insert_space_after_colon_in_case=insert +org.eclipse.jdt.core.formatter.insert_space_after_colon_in_conditional=insert +org.eclipse.jdt.core.formatter.insert_space_after_colon_in_for=insert +org.eclipse.jdt.core.formatter.insert_space_after_colon_in_labeled_statement=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_allocation_expression=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_annotation=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_array_initializer=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_parameters=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_throws=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_constant_arguments=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_declarations=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_explicitconstructorcall_arguments=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_increments=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_inits=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_parameters=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_throws=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_invocation_arguments=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_field_declarations=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_local_declarations=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_parameterized_type_reference=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_superinterfaces=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_arguments=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_parameters=insert +org.eclipse.jdt.core.formatter.insert_space_after_ellipsis=insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_parameterized_type_reference=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_arguments=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_parameters=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_brace_in_array_initializer=insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_allocation_expression=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_reference=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_annotation=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_cast=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_catch=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_constructor_declaration=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_enum_constant=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_for=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_if=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_declaration=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_invocation=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_parenthesized_expression=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_switch=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_synchronized=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_while=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_postfix_operator=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_prefix_operator=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_question_in_conditional=insert +org.eclipse.jdt.core.formatter.insert_space_after_question_in_wildcard=insert +org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_for=insert +org.eclipse.jdt.core.formatter.insert_space_after_unary_operator=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_and_in_type_parameter=insert +org.eclipse.jdt.core.formatter.insert_space_before_assignment_operator=insert +org.eclipse.jdt.core.formatter.insert_space_before_at_in_annotation_type_declaration=insert +org.eclipse.jdt.core.formatter.insert_space_before_binary_operator=insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_parameterized_type_reference=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_arguments=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_parameters=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_brace_in_array_initializer=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_allocation_expression=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_reference=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_annotation=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_cast=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_catch=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_constructor_declaration=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_enum_constant=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_for=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_if=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_declaration=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_invocation=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_parenthesized_expression=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_switch=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_synchronized=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_while=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_colon_in_assert=insert +org.eclipse.jdt.core.formatter.insert_space_before_colon_in_case=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_colon_in_conditional=insert +org.eclipse.jdt.core.formatter.insert_space_before_colon_in_default=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_colon_in_for=insert +org.eclipse.jdt.core.formatter.insert_space_before_colon_in_labeled_statement=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_allocation_expression=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_annotation=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_array_initializer=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_parameters=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_throws=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_constant_arguments=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_declarations=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_explicitconstructorcall_arguments=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_increments=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_inits=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_parameters=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_throws=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_invocation_arguments=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_field_declarations=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_local_declarations=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_parameterized_type_reference=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_superinterfaces=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_arguments=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_parameters=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_ellipsis=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_parameterized_type_reference=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_arguments=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_parameters=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_annotation_type_declaration=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_anonymous_type_declaration=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_array_initializer=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_block=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_constructor_declaration=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_constant=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_declaration=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_method_declaration=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_switch=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_type_declaration=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_allocation_expression=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_reference=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_type_reference=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation_type_member_declaration=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_catch=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_constructor_declaration=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_enum_constant=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_for=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_if=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_declaration=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_invocation=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_parenthesized_expression=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_switch=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_synchronized=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_while=insert +org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_return=insert +org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_throw=insert +org.eclipse.jdt.core.formatter.insert_space_before_postfix_operator=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_prefix_operator=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_question_in_conditional=insert +org.eclipse.jdt.core.formatter.insert_space_before_question_in_wildcard=insert +org.eclipse.jdt.core.formatter.insert_space_before_semicolon=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_for=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_unary_operator=do not insert +org.eclipse.jdt.core.formatter.insert_space_between_brackets_in_array_type_reference=do not insert +org.eclipse.jdt.core.formatter.insert_space_between_empty_braces_in_array_initializer=do not insert +org.eclipse.jdt.core.formatter.insert_space_between_empty_brackets_in_array_allocation_expression=do not insert +org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_annotation_type_member_declaration=do not insert +org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_constructor_declaration=do not insert +org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_enum_constant=do not insert +org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_declaration=do not insert +org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_invocation=do not insert +org.eclipse.jdt.core.formatter.join_lines_in_comments=true +org.eclipse.jdt.core.formatter.join_wrapped_lines=true +org.eclipse.jdt.core.formatter.keep_else_statement_on_same_line=false +org.eclipse.jdt.core.formatter.keep_empty_array_initializer_on_one_line=true +org.eclipse.jdt.core.formatter.keep_imple_if_on_one_line=false +org.eclipse.jdt.core.formatter.keep_then_statement_on_same_line=false +org.eclipse.jdt.core.formatter.lineSplit=200 +org.eclipse.jdt.core.formatter.never_indent_block_comments_on_first_column=true +org.eclipse.jdt.core.formatter.never_indent_line_comments_on_first_column=true +org.eclipse.jdt.core.formatter.number_of_blank_lines_at_beginning_of_method_body=0 +org.eclipse.jdt.core.formatter.number_of_empty_lines_to_preserve=1 +org.eclipse.jdt.core.formatter.put_empty_statement_on_new_line=true +org.eclipse.jdt.core.formatter.tabulation.char=space +org.eclipse.jdt.core.formatter.tabulation.size=4 +org.eclipse.jdt.core.formatter.use_tabs_only_for_leading_indentations=false +org.eclipse.jdt.core.formatter.wrap_before_binary_operator=false +org.eclipse.jdt.core.incompatibleJDKLevel=error +org.eclipse.jdt.core.incompleteClasspath=error
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/c1x4hotspotsrc/HotSpotVM/.settings/org.eclipse.jdt.ui.prefs Tue Jul 13 11:47:55 2010 -0700 @@ -0,0 +1,75 @@ +#Thu Nov 13 14:45:16 PST 2008 +comment_clear_blank_lines=false +comment_format_comments=true +comment_format_header=true +comment_format_html=true +comment_format_source_code=true +comment_indent_parameter_description=true +comment_indent_root_tags=true +comment_line_length=120 +comment_new_line_for_parameter=true +comment_separate_root_tags=true +eclipse.preferences.version=1 +editor_save_participant_org.eclipse.jdt.ui.postsavelistener.cleanup=true +formatter_profile=_MaxineJavaCodeStyle +formatter_settings_version=11 +org.eclipse.jdt.ui.exception.name=e +org.eclipse.jdt.ui.gettersetter.use.is=true +org.eclipse.jdt.ui.ignorelowercasenames=true +org.eclipse.jdt.ui.importorder=java;javax;org;com; +org.eclipse.jdt.ui.javadoc=false +org.eclipse.jdt.ui.keywordthis=false +org.eclipse.jdt.ui.ondemandthreshold=0 +org.eclipse.jdt.ui.overrideannotation=true +org.eclipse.jdt.ui.staticondemandthreshold=0 +org.eclipse.jdt.ui.text.custom_code_templates=<?xml version\="1.0" encoding\="UTF-8" standalone\="no"?><templates><template autoinsert\="true" context\="gettercomment_context" deleted\="false" description\="Comment for getter method" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.gettercomment" name\="gettercomment">/**\n * @return Returns the ${bare_field_name}.\n */</template><template autoinsert\="true" context\="setterbody_context" deleted\="false" description\="Code in created setters" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.setterbody" name\="setterbody">${field} \= ${param};</template><template autoinsert\="true" context\="newtype_context" deleted\="false" description\="Newly created files" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.newtype" name\="newtype">${filecomment}\n${package_declaration}\n\n${typecomment}\n${type_declaration}</template><template autoinsert\="true" context\="getterbody_context" deleted\="false" description\="Code in created getters" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.getterbody" name\="getterbody">return ${field};</template><template autoinsert\="true" context\="typecomment_context" deleted\="false" description\="Comment for created types" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.typecomment" name\="typecomment">/**\n *\n * @author ${user}\n */</template><template autoinsert\="true" context\="constructorbody_context" deleted\="false" description\="Code in created constructor stubs" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.constructorbody" name\="constructorbody">${body_statement}</template><template autoinsert\="true" context\="fieldcomment_context" deleted\="false" description\="Comment for fields" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.fieldcomment" name\="fieldcomment">/**\n * \n */</template><template autoinsert\="true" context\="constructorcomment_context" deleted\="false" description\="Comment for created constructors" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.constructorcomment" name\="constructorcomment">/**\n * ${tags}\n */</template><template autoinsert\="true" context\="catchblock_context" deleted\="false" description\="Code in new catch blocks" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.catchblock" name\="catchblock">// ${todo} Auto-generated catch block\n${exception_var}.printStackTrace();</template><template autoinsert\="false" context\="filecomment_context" deleted\="false" description\="Comment for created Java files" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.filecomment" name\="filecomment">/*\n * Copyright (c) 2007 Sun Microsystems, Inc. All rights reserved.\n *\n * Sun Microsystems, Inc. has intellectual property rights relating to technology embodied in the product\n * that is described in this document. In particular, and without limitation, these intellectual property\n * rights may include one or more of the U.S. patents listed at http\://www.sun.com/patents and one or\n * more additional patents or pending patent applications in the U.S. and in other countries.\n *\n * U.S. Government Rights - Commercial software. Government users are subject to the Sun\n * Microsystems, Inc. standard license agreement and applicable provisions of the FAR and its\n * supplements.\n *\n * Use is subject to license terms. Sun, Sun Microsystems, the Sun logo, Java and Solaris are trademarks or\n * registered trademarks of Sun Microsystems, Inc. in the U.S. and other countries. All SPARC trademarks\n * are used under license and are trademarks or registered trademarks of SPARC International, Inc. in the\n * U.S. and other countries.\n *\n * UNIX is a registered trademark in the U.S. and other countries, exclusively licensed through X/Open\n * Company, Ltd.\n */\n</template><template autoinsert\="true" context\="methodbody_context" deleted\="false" description\="Code in created method stubs" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.methodbody" name\="methodbody">// ${todo} Auto-generated method stub\n${body_statement}</template><template autoinsert\="true" context\="settercomment_context" deleted\="false" description\="Comment for setter method" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.settercomment" name\="settercomment">/**\n * @param ${param} The ${bare_field_name} to set.\n */</template><template autoinsert\="true" context\="methodcomment_context" deleted\="false" description\="Comment for non-overriding methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.methodcomment" name\="methodcomment">/**\n * ${tags}\n */</template><template autoinsert\="true" context\="overridecomment_context" deleted\="false" description\="Comment for overriding methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.overridecomment" name\="overridecomment">/* (non-Javadoc)\n * ${see_to_overridden}\n */</template><template autoinsert\="true" context\="delegatecomment_context" deleted\="false" description\="Comment for delegate methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.delegatecomment" name\="delegatecomment">/**\n * ${tags}\n * ${see_to_target}\n */</template><template autoinsert\="true" context\="classbody_context" deleted\="false" description\="Code in new class type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.classbody" name\="classbody">\n</template><template autoinsert\="true" context\="interfacebody_context" deleted\="false" description\="Code in new interface type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.interfacebody" name\="interfacebody">\n</template><template autoinsert\="true" context\="enumbody_context" deleted\="false" description\="Code in new enum type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.enumbody" name\="enumbody">\n</template><template autoinsert\="true" context\="annotationbody_context" deleted\="false" description\="Code in new annotation type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.annotationbody" name\="annotationbody">\n</template></templates> +sp_cleanup.add_default_serial_version_id=true +sp_cleanup.add_generated_serial_version_id=false +sp_cleanup.add_missing_annotations=false +sp_cleanup.add_missing_deprecated_annotations=true +sp_cleanup.add_missing_methods=false +sp_cleanup.add_missing_nls_tags=false +sp_cleanup.add_missing_override_annotations=true +sp_cleanup.add_serial_version_id=false +sp_cleanup.always_use_blocks=true +sp_cleanup.always_use_parentheses_in_expressions=false +sp_cleanup.always_use_this_for_non_static_field_access=false +sp_cleanup.always_use_this_for_non_static_method_access=false +sp_cleanup.convert_to_enhanced_for_loop=false +sp_cleanup.correct_indentation=false +sp_cleanup.format_source_code=false +sp_cleanup.format_source_code_changes_only=false +sp_cleanup.make_local_variable_final=false +sp_cleanup.make_parameters_final=false +sp_cleanup.make_private_fields_final=true +sp_cleanup.make_variable_declarations_final=false +sp_cleanup.never_use_blocks=false +sp_cleanup.never_use_parentheses_in_expressions=true +sp_cleanup.on_save_use_additional_actions=true +sp_cleanup.organize_imports=false +sp_cleanup.qualify_static_field_accesses_with_declaring_class=false +sp_cleanup.qualify_static_member_accesses_through_instances_with_declaring_class=true +sp_cleanup.qualify_static_member_accesses_through_subtypes_with_declaring_class=true +sp_cleanup.qualify_static_member_accesses_with_declaring_class=false +sp_cleanup.qualify_static_method_accesses_with_declaring_class=false +sp_cleanup.remove_private_constructors=true +sp_cleanup.remove_trailing_whitespaces=true +sp_cleanup.remove_trailing_whitespaces_all=true +sp_cleanup.remove_trailing_whitespaces_ignore_empty=false +sp_cleanup.remove_unnecessary_casts=false +sp_cleanup.remove_unnecessary_nls_tags=false +sp_cleanup.remove_unused_imports=false +sp_cleanup.remove_unused_local_variables=false +sp_cleanup.remove_unused_private_fields=true +sp_cleanup.remove_unused_private_members=false +sp_cleanup.remove_unused_private_methods=true +sp_cleanup.remove_unused_private_types=true +sp_cleanup.sort_members=false +sp_cleanup.sort_members_all=false +sp_cleanup.use_blocks=false +sp_cleanup.use_blocks_only_for_return_and_throw=false +sp_cleanup.use_parentheses_in_expressions=false +sp_cleanup.use_this_for_non_static_field_access=false +sp_cleanup.use_this_for_non_static_field_access_only_if_necessary=true +sp_cleanup.use_this_for_non_static_method_access=false +sp_cleanup.use_this_for_non_static_method_access_only_if_necessary=true
--- a/c1x4hotspotsrc/HotSpotVM/src/com/sun/hotspot/c1x/C1XHotSpotTests.java Mon Jul 12 15:05:17 2010 -0700 +++ b/c1x4hotspotsrc/HotSpotVM/src/com/sun/hotspot/c1x/C1XHotSpotTests.java Tue Jul 13 11:47:55 2010 -0700 @@ -2,7 +2,7 @@ public class C1XHotSpotTests { - public static int add(int a, int b) { - return a + b; - } + public static int add(int a, int b) { + return a + b; + } }
--- a/c1x4hotspotsrc/HotSpotVM/src/com/sun/hotspot/c1x/Compiler.java Mon Jul 12 15:05:17 2010 -0700 +++ b/c1x4hotspotsrc/HotSpotVM/src/com/sun/hotspot/c1x/Compiler.java Tue Jul 13 11:47:55 2010 -0700 @@ -1,22 +1,19 @@ /* - * Copyright (c) 2009 Sun Microsystems, Inc. All rights reserved. + * Copyright (c) 2009 Sun Microsystems, Inc. All rights reserved. * - * Sun Microsystems, Inc. has intellectual property rights relating to technology embodied in the product - * that is described in this document. In particular, and without limitation, these intellectual property - * rights may include one or more of the U.S. patents listed at http://www.sun.com/patents and one or - * more additional patents or pending patent applications in the U.S. and in other countries. + * Sun Microsystems, Inc. has intellectual property rights relating to technology embodied in the product that is + * described in this document. In particular, and without limitation, these intellectual property rights may include one + * or more of the U.S. patents listed at http://www.sun.com/patents and one or more additional patents or pending patent + * applications in the U.S. and in other countries. * - * U.S. Government Rights - Commercial software. Government users are subject to the Sun - * Microsystems, Inc. standard license agreement and applicable provisions of the FAR and its - * supplements. + * U.S. Government Rights - Commercial software. Government users are subject to the Sun Microsystems, Inc. standard + * license agreement and applicable provisions of the FAR and its supplements. * - * Use is subject to license terms. Sun, Sun Microsystems, the Sun logo, Java and Solaris are trademarks or - * registered trademarks of Sun Microsystems, Inc. in the U.S. and other countries. All SPARC trademarks - * are used under license and are trademarks or registered trademarks of SPARC International, Inc. in the - * U.S. and other countries. + * Use is subject to license terms. Sun, Sun Microsystems, the Sun logo, Java and Solaris are trademarks or registered + * trademarks of Sun Microsystems, Inc. in the U.S. and other countries. All SPARC trademarks are used under license and + * are trademarks or registered trademarks of SPARC International, Inc. in the U.S. and other countries. * - * UNIX is a registered trademark in the U.S. and other countries, exclusively licensed through X/Open - * Company, Ltd. + * UNIX is a registered trademark in the U.S. and other countries, exclusively licensed through X/Open Company, Ltd. */ package com.sun.hotspot.c1x; @@ -29,44 +26,43 @@ import com.sun.cri.xir.RiXirGenerator; /** - * + * * @author Thomas Wuerthinger - * - * Singleton class holding the instance of the C1XCompiler. + * + * Singleton class holding the instance of the C1XCompiler. * */ public class Compiler { - private static CiCompiler compiler; - - public static CiCompiler getCompiler() { - - if (compiler == null) { - compiler = createCompiler(); - } - - return compiler; - } - - - private static CiCompiler createCompiler() { + private static CiCompiler compiler; + + public static CiCompiler getCompiler() { + + if (compiler == null) { + compiler = createCompiler(); + } - final HotSpotVMConfig config = VMEntries.getConfiguration(); - final HotSpotRuntime runtime = new HotSpotRuntime(config); - final RiXirGenerator generator = new HotSpotXirGenerator(config); - final int wordSize = 8; - final int stackFrameAlignment = 8; - final int pageSize = 1024; - final RiRegisterConfig registerConfig = new HotSpotRegisterConfig(config); + return compiler; + } + + private static CiCompiler createCompiler() { + + final HotSpotVMConfig config = VMEntries.getConfiguration(); + final HotSpotRuntime runtime = new HotSpotRuntime(config); + final RiXirGenerator generator = new HotSpotXirGenerator(config); + final int wordSize = 8; + final int stackFrameAlignment = 8; + final int pageSize = 1024; + final RiRegisterConfig registerConfig = new HotSpotRegisterConfig(config); final CiTarget target = new CiTarget(new AMD64(), registerConfig, true, wordSize, wordSize, wordSize, stackFrameAlignment, pageSize, wordSize, wordSize, 16); final CiCompiler compiler = new C1XCompiler(runtime, target, generator); - + C1XOptions.setOptimizationLevel(3); C1XOptions.TraceBytecodeParserLevel = 4; C1XOptions.PrintCFGToFile = false; - C1XOptions.PrintAssembly = false;//true; + C1XOptions.PrintAssembly = false;// true; C1XOptions.PrintCompilation = true; return compiler; - - } + + } }
--- a/c1x4hotspotsrc/HotSpotVM/src/com/sun/hotspot/c1x/HotSpotConstantPool.java Mon Jul 12 15:05:17 2010 -0700 +++ b/c1x4hotspotsrc/HotSpotVM/src/com/sun/hotspot/c1x/HotSpotConstantPool.java Tue Jul 13 11:47:55 2010 -0700 @@ -8,42 +8,42 @@ import com.sun.cri.ri.RiType; public class HotSpotConstantPool implements RiConstantPool { - - private final Object constantPoolOop; - - public HotSpotConstantPool(Object o) { - this.constantPoolOop = o; - } + + private final Object constantPoolOop; + + public HotSpotConstantPool(Object o) { + this.constantPoolOop = o; + } - @Override - public CiConstant encoding() { - // TODO: Check if this is correct. - return CiConstant.forObject(constantPoolOop); - } + @Override + public CiConstant encoding() { + // TODO: Check if this is correct. + return CiConstant.forObject(constantPoolOop); + } - @Override - public Object lookupConstant(int cpi) { - return VMEntries.RiConstantPool_lookupConstant(constantPoolOop, cpi); - } + @Override + public Object lookupConstant(int cpi) { + return VMEntries.RiConstantPool_lookupConstant(constantPoolOop, cpi); + } - @Override - public RiMethod lookupMethod(int cpi, int byteCode) { - return VMEntries.RiConstantPool_lookupMethod(constantPoolOop, cpi, (byte)byteCode); - } + @Override + public RiMethod lookupMethod(int cpi, int byteCode) { + return VMEntries.RiConstantPool_lookupMethod(constantPoolOop, cpi, (byte) byteCode); + } - @Override - public RiSignature lookupSignature(int cpi) { - return VMEntries.RiConstantPool_lookupSignature(constantPoolOop, cpi); - } + @Override + public RiSignature lookupSignature(int cpi) { + return VMEntries.RiConstantPool_lookupSignature(constantPoolOop, cpi); + } - @Override - public RiType lookupType(int cpi, int opcode) { - return VMEntries.RiConstantPool_lookupType(constantPoolOop, cpi); - } + @Override + public RiType lookupType(int cpi, int opcode) { + return VMEntries.RiConstantPool_lookupType(constantPoolOop, cpi); + } - @Override - public RiField lookupField(int cpi, int opcode) { - return VMEntries.RiConstantPool_lookupField(constantPoolOop, cpi); - } + @Override + public RiField lookupField(int cpi, int opcode) { + return VMEntries.RiConstantPool_lookupField(constantPoolOop, cpi); + } }
--- a/c1x4hotspotsrc/HotSpotVM/src/com/sun/hotspot/c1x/HotSpotField.java Mon Jul 12 15:05:17 2010 -0700 +++ b/c1x4hotspotsrc/HotSpotVM/src/com/sun/hotspot/c1x/HotSpotField.java Tue Jul 13 11:47:55 2010 -0700 @@ -6,61 +6,60 @@ import com.sun.cri.ri.RiType; public class HotSpotField implements RiField { - - private final RiType holder; - private final Object nameSymbol; - private final RiType type; - private final int offset; - - public HotSpotField(RiType holder, Object nameSymbol, RiType type, int offset) { - this.holder = holder; - this.nameSymbol = nameSymbol; - this.type = type; - this.offset = offset; - } + + private final RiType holder; + private final Object nameSymbol; + private final RiType type; + private final int offset; - @Override - public int accessFlags() { - // TODO Auto-generated method stub - return 0; - } + public HotSpotField(RiType holder, Object nameSymbol, RiType type, int offset) { + this.holder = holder; + this.nameSymbol = nameSymbol; + this.type = type; + this.offset = offset; + } - @Override - public CiConstant constantValue(Object object) { - // TODO Auto-generated method stub - return null; - } + @Override + public int accessFlags() { + // TODO Auto-generated method stub + return 0; + } + + @Override + public CiConstant constantValue(Object object) { + // TODO Auto-generated method stub + return null; + } - @Override - public RiType holder() { - return holder; - } + @Override + public RiType holder() { + return holder; + } - @Override - public boolean isConstant() { - // TODO Auto-generated method stub - return false; - } - - @Override - public boolean isResolved() { - return offset != -1; - } + @Override + public boolean isConstant() { + // TODO Auto-generated method stub + return false; + } - @Override - public CiKind kind() { - return type().kind(); - } + @Override + public boolean isResolved() { + return offset != -1; + } + + @Override + public CiKind kind() { + return type().kind(); + } - @Override - public String name() { - return VMEntries.RiSignature_symbolToString(nameSymbol); - } + @Override + public String name() { + return VMEntries.RiSignature_symbolToString(nameSymbol); + } - @Override - public RiType type() { - return type; - } - + @Override + public RiType type() { + return type; + } }
--- a/c1x4hotspotsrc/HotSpotVM/src/com/sun/hotspot/c1x/HotSpotMethod.java Mon Jul 12 15:05:17 2010 -0700 +++ b/c1x4hotspotsrc/HotSpotVM/src/com/sun/hotspot/c1x/HotSpotMethod.java Tue Jul 13 11:47:55 2010 -0700 @@ -7,117 +7,117 @@ import com.sun.cri.ri.RiType; public class HotSpotMethod implements RiMethod { - - Object methodOop; - private byte[] code; - - public HotSpotMethod(Object methodOop) { - this.methodOop = methodOop; - } + + Object methodOop; + private byte[] code; + + public HotSpotMethod(Object methodOop) { + this.methodOop = methodOop; + } - @Override - public int accessFlags() { - return VMEntries.RiMethod_accessFlags(methodOop); - } + @Override + public int accessFlags() { + return VMEntries.RiMethod_accessFlags(methodOop); + } - @Override - public boolean canBeStaticallyBound() { - // TODO Auto-generated method stub - return false; - } + @Override + public boolean canBeStaticallyBound() { + // TODO Auto-generated method stub + return false; + } + + @Override + public byte[] code() { + if (code == null) { + code = VMEntries.RiMethod_code(methodOop); + } - @Override - public byte[] code() { - if (code == null) { - code = VMEntries.RiMethod_code(methodOop); - } - - return code; - } + return code; + } - @Override - public RiExceptionHandler[] exceptionHandlers() { - // TODO: Add support for exception handlers - return new RiExceptionHandler[0]; - } + @Override + public RiExceptionHandler[] exceptionHandlers() { + // TODO: Add support for exception handlers + return new RiExceptionHandler[0]; + } - @Override - public boolean hasBalancedMonitors() { - // TODO Auto-generated method stub - return false; - } + @Override + public boolean hasBalancedMonitors() { + // TODO Auto-generated method stub + return false; + } - @Override - public RiType holder() { - return VMEntries.RiMethod_holder(methodOop); - } + @Override + public RiType holder() { + return VMEntries.RiMethod_holder(methodOop); + } - @Override - public boolean isClassInitializer() { - // TODO Auto-generated method stub - return false; - } + @Override + public boolean isClassInitializer() { + // TODO Auto-generated method stub + return false; + } - @Override - public boolean isConstructor() { - // TODO Auto-generated method stub - return false; - } + @Override + public boolean isConstructor() { + // TODO Auto-generated method stub + return false; + } - @Override - public boolean isLeafMethod() { - // TODO Auto-generated method stub - return false; - } + @Override + public boolean isLeafMethod() { + // TODO Auto-generated method stub + return false; + } - @Override - public boolean isOverridden() { - // TODO Auto-generated method stub - return false; - } + @Override + public boolean isOverridden() { + // TODO Auto-generated method stub + return false; + } - @Override - public boolean isResolved() { - // TODO Auto-generated method stub - return false; - } + @Override + public boolean isResolved() { + // TODO Auto-generated method stub + return false; + } - @Override - public String jniSymbol() { - // TODO Auto-generated method stub - return null; - } + @Override + public String jniSymbol() { + // TODO Auto-generated method stub + return null; + } - @Override - public Object liveness(int bci) { - // TODO Auto-generated method stub - return null; - } + @Override + public Object liveness(int bci) { + // TODO Auto-generated method stub + return null; + } - @Override - public int maxLocals() { - return VMEntries.RiMethod_maxLocals(methodOop); - } + @Override + public int maxLocals() { + return VMEntries.RiMethod_maxLocals(methodOop); + } - @Override - public int maxStackSize() { - return VMEntries.RiMethod_maxStackSize(methodOop); - } + @Override + public int maxStackSize() { + return VMEntries.RiMethod_maxStackSize(methodOop); + } - @Override - public RiMethodProfile methodData() { - // TODO Auto-generated method stub - return null; - } + @Override + public RiMethodProfile methodData() { + // TODO Auto-generated method stub + return null; + } - @Override - public String name() { - return VMEntries.RiMethod_name(methodOop); - } + @Override + public String name() { + return VMEntries.RiMethod_name(methodOop); + } - @Override - public RiSignature signature() { - return new HotSpotSignature(VMEntries.RiMethod_signature(methodOop)); - } + @Override + public RiSignature signature() { + return new HotSpotSignature(VMEntries.RiMethod_signature(methodOop)); + } }
--- a/c1x4hotspotsrc/HotSpotVM/src/com/sun/hotspot/c1x/HotSpotRegisterConfig.java Mon Jul 12 15:05:17 2010 -0700 +++ b/c1x4hotspotsrc/HotSpotVM/src/com/sun/hotspot/c1x/HotSpotRegisterConfig.java Tue Jul 13 11:47:55 2010 -0700 @@ -1,22 +1,19 @@ /* - * Copyright (c) 2009 Sun Microsystems, Inc. All rights reserved. + * Copyright (c) 2009 Sun Microsystems, Inc. All rights reserved. * - * Sun Microsystems, Inc. has intellectual property rights relating to technology embodied in the product - * that is described in this document. In particular, and without limitation, these intellectual property - * rights may include one or more of the U.S. patents listed at http://www.sun.com/patents and one or - * more additional patents or pending patent applications in the U.S. and in other countries. + * Sun Microsystems, Inc. has intellectual property rights relating to technology embodied in the product that is + * described in this document. In particular, and without limitation, these intellectual property rights may include one + * or more of the U.S. patents listed at http://www.sun.com/patents and one or more additional patents or pending patent + * applications in the U.S. and in other countries. * - * U.S. Government Rights - Commercial software. Government users are subject to the Sun - * Microsystems, Inc. standard license agreement and applicable provisions of the FAR and its - * supplements. + * U.S. Government Rights - Commercial software. Government users are subject to the Sun Microsystems, Inc. standard + * license agreement and applicable provisions of the FAR and its supplements. * - * Use is subject to license terms. Sun, Sun Microsystems, the Sun logo, Java and Solaris are trademarks or - * registered trademarks of Sun Microsystems, Inc. in the U.S. and other countries. All SPARC trademarks - * are used under license and are trademarks or registered trademarks of SPARC International, Inc. in the - * U.S. and other countries. + * Use is subject to license terms. Sun, Sun Microsystems, the Sun logo, Java and Solaris are trademarks or registered + * trademarks of Sun Microsystems, Inc. in the U.S. and other countries. All SPARC trademarks are used under license and + * are trademarks or registered trademarks of SPARC International, Inc. in the U.S. and other countries. * - * UNIX is a registered trademark in the U.S. and other countries, exclusively licensed through X/Open - * Company, Ltd. + * UNIX is a registered trademark in the U.S. and other countries, exclusively licensed through X/Open Company, Ltd. */ package com.sun.hotspot.c1x; @@ -36,46 +33,46 @@ */ public class HotSpotRegisterConfig implements RiRegisterConfig { - @Override - public CiRegister[] getAllocatableRegisters() { - return new CiRegister[]{ AMD64.rax, AMD64.rbx, AMD64.rcx, AMD64.rdx, AMD64.rsi, AMD64.rdi, AMD64.r10, AMD64.r11} ; - } - + @Override + public CiRegister[] getAllocatableRegisters() { + return new CiRegister[] { AMD64.rax, AMD64.rbx, AMD64.rcx, AMD64.rdx, AMD64.rsi, AMD64.rdi, AMD64.r10, AMD64.r11}; + } + private final CiRegister[] generalParameterRegisters; - private final CiRegister[] xmmParameterRegisters = new CiRegister[]{AMD64.xmm0, AMD64.xmm1, AMD64.xmm2, AMD64.xmm3, AMD64.xmm4, AMD64.xmm5, AMD64.xmm6, AMD64.xmm7}; + private final CiRegister[] xmmParameterRegisters = new CiRegister[] { AMD64.xmm0, AMD64.xmm1, AMD64.xmm2, AMD64.xmm3, AMD64.xmm4, AMD64.xmm5, AMD64.xmm6, AMD64.xmm7}; - public HotSpotRegisterConfig(HotSpotVMConfig config) { - if(config.isWindowsOs()) { - generalParameterRegisters = new CiRegister[]{AMD64.rdx, AMD64.r8, AMD64.r9, AMD64.rdi, AMD64.rsi, AMD64.rcx}; - } else { - generalParameterRegisters = new CiRegister[]{AMD64.rsi, AMD64.rdx, AMD64.rcx, AMD64.r8, AMD64.r9, AMD64.rdi}; - } - } + public HotSpotRegisterConfig(HotSpotVMConfig config) { + if (config.isWindowsOs()) { + generalParameterRegisters = new CiRegister[] { AMD64.rdx, AMD64.r8, AMD64.r9, AMD64.rdi, AMD64.rsi, AMD64.rcx}; + } else { + generalParameterRegisters = new CiRegister[] { AMD64.rsi, AMD64.rdx, AMD64.rcx, AMD64.r8, AMD64.r9, AMD64.rdi}; + } + } - @Override - public int getCalleeSaveRegisterOffset(CiRegister register) { - return 0; - } + @Override + public int getCalleeSaveRegisterOffset(CiRegister register) { + return 0; + } - @Override - public CiRegister[] getCallerSaveRegisters() { - return getAllocatableRegisters(); - } + @Override + public CiRegister[] getCallerSaveRegisters() { + return getAllocatableRegisters(); + } - @Override - public CiRegister getFramePointerRegister() { - return AMD64.rbp; - } + @Override + public CiRegister getFramePointerRegister() { + return AMD64.rbp; + } - @Override - public CiRegister getIntegerRegister(int index) { - throw new UnsupportedOperationException(); - } - - @Override - public CiCallingConvention getJavaCallingConvention(CiKind[] parameters, boolean outgoing, CiTarget target) { - return callingConvention(parameters, outgoing, target); - } + @Override + public CiRegister getIntegerRegister(int index) { + throw new UnsupportedOperationException(); + } + + @Override + public CiCallingConvention getJavaCallingConvention(CiKind[] parameters, boolean outgoing, CiTarget target) { + return callingConvention(parameters, outgoing, target); + } private CiCallingConvention callingConvention(CiKind[] types, boolean outgoing, CiTarget target) { CiValue[] locations = new CiValue[types.length]; @@ -123,39 +120,39 @@ return new CiCallingConvention(locations, currentStackIndex * target.spillSlotSize); } - @Override - public int getMinimumCalleeSaveFrameSize() { - return 0; - } + @Override + public int getMinimumCalleeSaveFrameSize() { + return 0; + } - @Override - public CiCallingConvention getNativeCallingConvention(CiKind[] parameters, boolean outgoing, CiTarget target) { - throw new UnsupportedOperationException(); - } + @Override + public CiCallingConvention getNativeCallingConvention(CiKind[] parameters, boolean outgoing, CiTarget target) { + throw new UnsupportedOperationException(); + } - @Override - public CiRegister[] getRegisterReferenceMapOrder() { - return getAllocatableRegisters(); - } + @Override + public CiRegister[] getRegisterReferenceMapOrder() { + return getAllocatableRegisters(); + } - @Override - public CiRegister getReturnRegister(CiKind kind) { - return AMD64.rax; - } + @Override + public CiRegister getReturnRegister(CiKind kind) { + return AMD64.rax; + } - @Override - public CiCallingConvention getRuntimeCallingConvention(CiKind[] parameters, CiTarget target) { - throw new UnsupportedOperationException(); - } + @Override + public CiCallingConvention getRuntimeCallingConvention(CiKind[] parameters, CiTarget target) { + throw new UnsupportedOperationException(); + } - @Override - public CiRegister getScratchRegister() { - return AMD64.r15; - } + @Override + public CiRegister getScratchRegister() { + return AMD64.r15; + } - @Override - public CiRegister getStackPointerRegister() { - return AMD64.rsp; - } + @Override + public CiRegister getStackPointerRegister() { + return AMD64.rsp; + } }
--- a/c1x4hotspotsrc/HotSpotVM/src/com/sun/hotspot/c1x/HotSpotRuntime.java Mon Jul 12 15:05:17 2010 -0700 +++ b/c1x4hotspotsrc/HotSpotVM/src/com/sun/hotspot/c1x/HotSpotRuntime.java Tue Jul 13 11:47:55 2010 -0700 @@ -1,22 +1,19 @@ /* - * Copyright (c) 2009 Sun Microsystems, Inc. All rights reserved. + * Copyright (c) 2009 Sun Microsystems, Inc. All rights reserved. * - * Sun Microsystems, Inc. has intellectual property rights relating to technology embodied in the product - * that is described in this document. In particular, and without limitation, these intellectual property - * rights may include one or more of the U.S. patents listed at http://www.sun.com/patents and one or - * more additional patents or pending patent applications in the U.S. and in other countries. + * Sun Microsystems, Inc. has intellectual property rights relating to technology embodied in the product that is + * described in this document. In particular, and without limitation, these intellectual property rights may include one + * or more of the U.S. patents listed at http://www.sun.com/patents and one or more additional patents or pending patent + * applications in the U.S. and in other countries. * - * U.S. Government Rights - Commercial software. Government users are subject to the Sun - * Microsystems, Inc. standard license agreement and applicable provisions of the FAR and its - * supplements. + * U.S. Government Rights - Commercial software. Government users are subject to the Sun Microsystems, Inc. standard + * license agreement and applicable provisions of the FAR and its supplements. * - * Use is subject to license terms. Sun, Sun Microsystems, the Sun logo, Java and Solaris are trademarks or - * registered trademarks of Sun Microsystems, Inc. in the U.S. and other countries. All SPARC trademarks - * are used under license and are trademarks or registered trademarks of SPARC International, Inc. in the - * U.S. and other countries. + * Use is subject to license terms. Sun, Sun Microsystems, the Sun logo, Java and Solaris are trademarks or registered + * trademarks of Sun Microsystems, Inc. in the U.S. and other countries. All SPARC trademarks are used under license and + * are trademarks or registered trademarks of SPARC International, Inc. in the U.S. and other countries. * - * UNIX is a registered trademark in the U.S. and other countries, exclusively licensed through X/Open - * Company, Ltd. + * UNIX is a registered trademark in the U.S. and other countries, exclusively licensed through X/Open Company, Ltd. */ package com.sun.hotspot.c1x; @@ -45,37 +42,37 @@ import com.sun.max.asm.dis.DisassemblyPrinter; /** - * + * * @author Thomas Wuerthinger - * - * CRI runtime implementation for the HotSpot VM. + * + * CRI runtime implementation for the HotSpot VM. * */ public class HotSpotRuntime implements RiRuntime { - private final HotSpotVMConfig config; + private final HotSpotVMConfig config; - public HotSpotRuntime(HotSpotVMConfig config) { - this.config = config; - } + public HotSpotRuntime(HotSpotVMConfig config) { + this.config = config; + } - @Override - public int basicObjectLockOffsetInBytes() { - // TODO Auto-generated method stub - return 0; - } + @Override + public int basicObjectLockOffsetInBytes() { + // TODO Auto-generated method stub + return 0; + } - @Override - public int codeOffset() { - // TODO Auto-generated method stub - return 0; - } + @Override + public int codeOffset() { + // TODO Auto-generated method stub + return 0; + } - @Override - public void codePrologue(RiMethod method, OutputStream out) { - // TODO Auto-generated method stub - - } + @Override + public void codePrologue(RiMethod method, OutputStream out) { + // TODO Auto-generated method stub + + } @Override public String disassemble(byte[] code) { @@ -149,87 +146,87 @@ return "No disassembler available"; } - @Override - public RiConstantPool getConstantPool(RiMethod method) { - return VMEntries.RiRuntime_getConstantPool(((HotSpotType)method.holder()).klassOop); - } + @Override + public RiConstantPool getConstantPool(RiMethod method) { + return VMEntries.RiRuntime_getConstantPool(((HotSpotType) method.holder()).klassOop); + } - @Override - public RiOsrFrame getOsrFrame(RiMethod method, int bci) { - // TODO Auto-generated method stub - return null; - } + @Override + public RiOsrFrame getOsrFrame(RiMethod method, int bci) { + // TODO Auto-generated method stub + return null; + } - @Override - public RiType getRiType(Class<?> javaClass) { - // TODO Auto-generated method stub - return null; - } + @Override + public RiType getRiType(Class< ? > javaClass) { + // TODO Auto-generated method stub + return null; + } - @Override - public RiSnippets getSnippets() { - // TODO Auto-generated method stub - return null; - } + @Override + public RiSnippets getSnippets() { + // TODO Auto-generated method stub + return null; + } - @Override - public boolean mustInline(RiMethod method) { - // TODO Auto-generated method stub - return false; - } + @Override + public boolean mustInline(RiMethod method) { + // TODO Auto-generated method stub + return false; + } - @Override - public boolean mustNotCompile(RiMethod method) { - // TODO Auto-generated method stub - return false; - } + @Override + public boolean mustNotCompile(RiMethod method) { + // TODO Auto-generated method stub + return false; + } - @Override - public boolean mustNotInline(RiMethod method) { - // TODO Auto-generated method stub - return false; - } + @Override + public boolean mustNotInline(RiMethod method) { + // TODO Auto-generated method stub + return false; + } - @Override - public Object registerTargetMethod(CiTargetMethod targetMethod, String name) { - // TODO Auto-generated method stub - return null; - } + @Override + public Object registerTargetMethod(CiTargetMethod targetMethod, String name) { + // TODO Auto-generated method stub + return null; + } - @Override - public int sizeofBasicObjectLock() { - // TODO Auto-generated method stub - return 0; - } + @Override + public int sizeofBasicObjectLock() { + // TODO Auto-generated method stub + return 0; + } - @Override - public RiField getRiField(Field javaField) { - // TODO Auto-generated method stub - return null; - } + @Override + public RiField getRiField(Field javaField) { + // TODO Auto-generated method stub + return null; + } - @Override - public RiMethod getRiMethod(Method javaMethod) { - // TODO Auto-generated method stub - return null; - } + @Override + public RiMethod getRiMethod(Method javaMethod) { + // TODO Auto-generated method stub + return null; + } - @Override - public RiMethod getRiMethod(Constructor<?> javaConstructor) { - // TODO Auto-generated method stub - return null; - } + @Override + public RiMethod getRiMethod(Constructor< ? > javaConstructor) { + // TODO Auto-generated method stub + return null; + } - @Override - public CiConstant invoke(RiMethod method, CiMethodInvokeArguments args) { - // TODO Auto-generated method stub - return null; - } + @Override + public CiConstant invoke(RiMethod method, CiMethodInvokeArguments args) { + // TODO Auto-generated method stub + return null; + } - @Override - public CiConstant foldWordOperation(int opcode, CiMethodInvokeArguments args) { - // TODO Auto-generated method stub - return null; - } + @Override + public CiConstant foldWordOperation(int opcode, CiMethodInvokeArguments args) { + // TODO Auto-generated method stub + return null; + } }
--- a/c1x4hotspotsrc/HotSpotVM/src/com/sun/hotspot/c1x/HotSpotSignature.java Mon Jul 12 15:05:17 2010 -0700 +++ b/c1x4hotspotsrc/HotSpotVM/src/com/sun/hotspot/c1x/HotSpotSignature.java Tue Jul 13 11:47:55 2010 -0700 @@ -94,11 +94,11 @@ @Override public RiType argumentTypeAt(int index, RiType accessingClass) { - System.out.println("argument type at " + index); - Object accessor = null; - if (accessingClass instanceof HotSpotType) { - accessor = ((HotSpotType)accessingClass).klassOop; - } + System.out.println("argument type at " + index); + Object accessor = null; + if (accessingClass instanceof HotSpotType) { + accessor = ((HotSpotType) accessingClass).klassOop; + } return VMEntries.RiSignature_lookupType(arguments.get(index), accessor); }
--- a/c1x4hotspotsrc/HotSpotVM/src/com/sun/hotspot/c1x/HotSpotType.java Mon Jul 12 15:05:17 2010 -0700 +++ b/c1x4hotspotsrc/HotSpotVM/src/com/sun/hotspot/c1x/HotSpotType.java Tue Jul 13 11:47:55 2010 -0700 @@ -5,126 +5,126 @@ import com.sun.cri.ri.*; public class HotSpotType implements RiType { - - final Object klassOop; - - public HotSpotType(Object o) { - this.klassOop = o; - assert klassOop != null; - } + + final Object klassOop; + + public HotSpotType(Object o) { + this.klassOop = o; + assert klassOop != null; + } - @Override - public int accessFlags() { - // TODO Auto-generated method stub - return 0; - } + @Override + public int accessFlags() { + // TODO Auto-generated method stub + return 0; + } - @Override - public RiType arrayOf() { - // TODO Auto-generated method stub - return null; - } + @Override + public RiType arrayOf() { + // TODO Auto-generated method stub + return null; + } - @Override - public RiType componentType() { - // TODO Auto-generated method stub - return null; - } + @Override + public RiType componentType() { + // TODO Auto-generated method stub + return null; + } - @Override - public RiType exactType() { - // TODO Auto-generated method stub - return null; - } + @Override + public RiType exactType() { + // TODO Auto-generated method stub + return null; + } - @Override - public CiConstant getEncoding(Representation r) { - // TODO Auto-generated method stub - return null; - } + @Override + public CiConstant getEncoding(Representation r) { + // TODO Auto-generated method stub + return null; + } - @Override - public CiKind getRepresentationKind(Representation r) { - // TODO Auto-generated method stub - return null; - } + @Override + public CiKind getRepresentationKind(Representation r) { + // TODO Auto-generated method stub + return null; + } - @Override - public boolean hasFinalizableSubclass() { - // TODO Auto-generated method stub - return false; - } + @Override + public boolean hasFinalizableSubclass() { + // TODO Auto-generated method stub + return false; + } - @Override - public boolean hasFinalizer() { - // TODO Auto-generated method stub - return false; - } + @Override + public boolean hasFinalizer() { + // TODO Auto-generated method stub + return false; + } - @Override - public boolean hasSubclass() { - // TODO Auto-generated method stub - return false; - } + @Override + public boolean hasSubclass() { + // TODO Auto-generated method stub + return false; + } - @Override - public boolean isArrayClass() { - System.out.println("Checking for array class " + name()); - return VMEntries.RiType_isArrayClass(klassOop); - } + @Override + public boolean isArrayClass() { + System.out.println("Checking for array class " + name()); + return VMEntries.RiType_isArrayClass(klassOop); + } - @Override - public boolean isInitialized() { - // TODO Auto-generated method stub - return false; - } + @Override + public boolean isInitialized() { + // TODO Auto-generated method stub + return false; + } - @Override - public boolean isInstance(Object obj) { - // TODO Auto-generated method stub - return false; - } + @Override + public boolean isInstance(Object obj) { + // TODO Auto-generated method stub + return false; + } - @Override - public boolean isInstanceClass() { - return VMEntries.RiType_isInstanceClass(klassOop); - } + @Override + public boolean isInstanceClass() { + return VMEntries.RiType_isInstanceClass(klassOop); + } - @Override - public boolean isInterface() { - return VMEntries.RiType_isInterface(klassOop); - } + @Override + public boolean isInterface() { + return VMEntries.RiType_isInterface(klassOop); + } - @Override - public boolean isResolved() { - return true; - } + @Override + public boolean isResolved() { + return true; + } - @Override - public boolean isSubtypeOf(RiType other) { - // TODO Auto-generated method stub - return false; - } + @Override + public boolean isSubtypeOf(RiType other) { + // TODO Auto-generated method stub + return false; + } - @Override - public Class<?> javaClass() { - return VMEntries.RiType_javaClass(klassOop); - } + @Override + public Class< ? > javaClass() { + return VMEntries.RiType_javaClass(klassOop); + } - @Override - public CiKind kind() { - return CiKind.Object; - } + @Override + public CiKind kind() { + return CiKind.Object; + } - @Override - public String name() { - return VMEntries.RiType_name(klassOop); - } + @Override + public String name() { + return VMEntries.RiType_name(klassOop); + } - @Override - public RiMethod resolveMethodImpl(RiMethod method) { - // TODO Auto-generated method stub - return null; - } + @Override + public RiMethod resolveMethodImpl(RiMethod method) { + // TODO Auto-generated method stub + return null; + } }
--- a/c1x4hotspotsrc/HotSpotVM/src/com/sun/hotspot/c1x/HotSpotTypePrimitive.java Mon Jul 12 15:05:17 2010 -0700 +++ b/c1x4hotspotsrc/HotSpotVM/src/com/sun/hotspot/c1x/HotSpotTypePrimitive.java Tue Jul 13 11:47:55 2010 -0700 @@ -7,127 +7,127 @@ public class HotSpotTypePrimitive implements RiType { - private CiKind kind; - - public HotSpotTypePrimitive(CiKind kind) { - this.kind = kind; - } - - @Override - public int accessFlags() { - // TODO Auto-generated method stub - return 0; - } + private CiKind kind; + + public HotSpotTypePrimitive(CiKind kind) { + this.kind = kind; + } + + @Override + public int accessFlags() { + // TODO Auto-generated method stub + return 0; + } - @Override - public RiType arrayOf() { - // TODO Auto-generated method stub - return null; - } + @Override + public RiType arrayOf() { + // TODO Auto-generated method stub + return null; + } - @Override - public RiType componentType() { - // TODO Auto-generated method stub - return null; - } + @Override + public RiType componentType() { + // TODO Auto-generated method stub + return null; + } - @Override - public RiType exactType() { - // TODO Auto-generated method stub - return null; - } + @Override + public RiType exactType() { + // TODO Auto-generated method stub + return null; + } - @Override - public CiConstant getEncoding(Representation r) { - // TODO Auto-generated method stub - - return null; - } + @Override + public CiConstant getEncoding(Representation r) { + // TODO Auto-generated method stub - @Override - public CiKind getRepresentationKind(Representation r) { - // TODO Auto-generated method stub - return null; - } + return null; + } + + @Override + public CiKind getRepresentationKind(Representation r) { + // TODO Auto-generated method stub + return null; + } - @Override - public boolean hasFinalizableSubclass() { - // TODO Auto-generated method stub - return false; - } + @Override + public boolean hasFinalizableSubclass() { + // TODO Auto-generated method stub + return false; + } - @Override - public boolean hasFinalizer() { - // TODO Auto-generated method stub - return false; - } + @Override + public boolean hasFinalizer() { + // TODO Auto-generated method stub + return false; + } - @Override - public boolean hasSubclass() { - // TODO Auto-generated method stub - return false; - } + @Override + public boolean hasSubclass() { + // TODO Auto-generated method stub + return false; + } - @Override - public boolean isArrayClass() { - // TODO Auto-generated method stub - return false; - } + @Override + public boolean isArrayClass() { + // TODO Auto-generated method stub + return false; + } - @Override - public boolean isInitialized() { - // TODO Auto-generated method stub - return false; - } + @Override + public boolean isInitialized() { + // TODO Auto-generated method stub + return false; + } - @Override - public boolean isInstance(Object obj) { - // TODO Auto-generated method stub - return false; - } + @Override + public boolean isInstance(Object obj) { + // TODO Auto-generated method stub + return false; + } - @Override - public boolean isInstanceClass() { - // TODO Auto-generated method stub - return false; - } + @Override + public boolean isInstanceClass() { + // TODO Auto-generated method stub + return false; + } - @Override - public boolean isInterface() { - // TODO Auto-generated method stub - return false; - } + @Override + public boolean isInterface() { + // TODO Auto-generated method stub + return false; + } - @Override - public boolean isResolved() { - // TODO Auto-generated method stub - return true; - } + @Override + public boolean isResolved() { + // TODO Auto-generated method stub + return true; + } - @Override - public boolean isSubtypeOf(RiType other) { - // TODO Auto-generated method stub - return false; - } + @Override + public boolean isSubtypeOf(RiType other) { + // TODO Auto-generated method stub + return false; + } - @Override - public Class<?> javaClass() { - return kind.toJavaClass(); - } + @Override + public Class< ? > javaClass() { + return kind.toJavaClass(); + } - @Override - public CiKind kind() { - return kind; - } + @Override + public CiKind kind() { + return kind; + } - @Override - public String name() { - return kind.toString(); - } + @Override + public String name() { + return kind.toString(); + } - @Override - public RiMethod resolveMethodImpl(RiMethod method) { - return null; - } + @Override + public RiMethod resolveMethodImpl(RiMethod method) { + return null; + } }
--- a/c1x4hotspotsrc/HotSpotVM/src/com/sun/hotspot/c1x/HotSpotTypeUnresolved.java Mon Jul 12 15:05:17 2010 -0700 +++ b/c1x4hotspotsrc/HotSpotVM/src/com/sun/hotspot/c1x/HotSpotTypeUnresolved.java Tue Jul 13 11:47:55 2010 -0700 @@ -1,22 +1,19 @@ /* - * Copyright (c) 2009 Sun Microsystems, Inc. All rights reserved. + * Copyright (c) 2009 Sun Microsystems, Inc. All rights reserved. * - * Sun Microsystems, Inc. has intellectual property rights relating to technology embodied in the product - * that is described in this document. In particular, and without limitation, these intellectual property - * rights may include one or more of the U.S. patents listed at http://www.sun.com/patents and one or - * more additional patents or pending patent applications in the U.S. and in other countries. + * Sun Microsystems, Inc. has intellectual property rights relating to technology embodied in the product that is + * described in this document. In particular, and without limitation, these intellectual property rights may include one + * or more of the U.S. patents listed at http://www.sun.com/patents and one or more additional patents or pending patent + * applications in the U.S. and in other countries. * - * U.S. Government Rights - Commercial software. Government users are subject to the Sun - * Microsystems, Inc. standard license agreement and applicable provisions of the FAR and its - * supplements. + * U.S. Government Rights - Commercial software. Government users are subject to the Sun Microsystems, Inc. standard + * license agreement and applicable provisions of the FAR and its supplements. * - * Use is subject to license terms. Sun, Sun Microsystems, the Sun logo, Java and Solaris are trademarks or - * registered trademarks of Sun Microsystems, Inc. in the U.S. and other countries. All SPARC trademarks - * are used under license and are trademarks or registered trademarks of SPARC International, Inc. in the - * U.S. and other countries. + * Use is subject to license terms. Sun, Sun Microsystems, the Sun logo, Java and Solaris are trademarks or registered + * trademarks of Sun Microsystems, Inc. in the U.S. and other countries. All SPARC trademarks are used under license and + * are trademarks or registered trademarks of SPARC International, Inc. in the U.S. and other countries. * - * UNIX is a registered trademark in the U.S. and other countries, exclusively licensed through X/Open - * Company, Ltd. + * UNIX is a registered trademark in the U.S. and other countries, exclusively licensed through X/Open Company, Ltd. */ package com.sun.hotspot.c1x; @@ -38,14 +35,14 @@ * @param cpi the index in {@code constantPool} of the unresolved type reference */ public HotSpotTypeUnresolved(String name) { - this.name = name; + this.name = name; } public String name() { - return name; + return name; } - public Class<?> javaClass() { + public Class< ? > javaClass() { throw unresolved("javaClass"); } @@ -94,17 +91,17 @@ } public RiType componentType() { - // TODO: Implement - throw new UnsupportedOperationException(); + // TODO: Implement + throw new UnsupportedOperationException(); } public RiType exactType() { throw unresolved("exactType()"); } - + public RiType arrayOf() { - // TODO: Implement - throw new UnsupportedOperationException(); + // TODO: Implement + throw new UnsupportedOperationException(); } public RiMethod resolveMethodImpl(RiMethod method) { @@ -112,7 +109,7 @@ } public CiKind kind() { - // TODO: Check if this is correct. + // TODO: Check if this is correct. return CiKind.Object; } @@ -140,7 +137,7 @@ } public CiKind getRepresentationKind(RiType.Representation r) { - // TODO: Check if this is correct. + // TODO: Check if this is correct. return CiKind.Object; } }
--- a/c1x4hotspotsrc/HotSpotVM/src/com/sun/hotspot/c1x/HotSpotVMConfig.java Mon Jul 12 15:05:17 2010 -0700 +++ b/c1x4hotspotsrc/HotSpotVM/src/com/sun/hotspot/c1x/HotSpotVMConfig.java Tue Jul 13 11:47:55 2010 -0700 @@ -1,36 +1,37 @@ /* - * Copyright (c) 2010 Sun Microsystems, Inc. All rights reserved. + * Copyright (c) 2010 Sun Microsystems, Inc. All rights reserved. * - * Sun Microsystems, Inc. has intellectual property rights relating to technology embodied in the product - * that is described in this document. In particular, and without limitation, these intellectual property - * rights may include one or more of the U.S. patents listed at http://www.sun.com/patents and one or - * more additional patents or pending patent applications in the U.S. and in other countries. + * Sun Microsystems, Inc. has intellectual property rights relating to technology embodied in the product that is + * described in this document. In particular, and without limitation, these intellectual property rights may include one + * or more of the U.S. patents listed at http://www.sun.com/patents and one or more additional patents or pending patent + * applications in the U.S. and in other countries. * - * U.S. Government Rights - Commercial software. Government users are subject to the Sun - * Microsystems, Inc. standard license agreement and applicable provisions of the FAR and its - * supplements. + * U.S. Government Rights - Commercial software. Government users are subject to the Sun Microsystems, Inc. standard + * license agreement and applicable provisions of the FAR and its supplements. * - * Use is subject to license terms. Sun, Sun Microsystems, the Sun logo, Java and Solaris are trademarks or - * registered trademarks of Sun Microsystems, Inc. in the U.S. and other countries. All SPARC trademarks - * are used under license and are trademarks or registered trademarks of SPARC International, Inc. in the - * U.S. and other countries. + * Use is subject to license terms. Sun, Sun Microsystems, the Sun logo, Java and Solaris are trademarks or registered + * trademarks of Sun Microsystems, Inc. in the U.S. and other countries. All SPARC trademarks are used under license and + * are trademarks or registered trademarks of SPARC International, Inc. in the U.S. and other countries. * - * UNIX is a registered trademark in the U.S. and other countries, exclusively licensed through X/Open - * Company, Ltd. + * UNIX is a registered trademark in the U.S. and other countries, exclusively licensed through X/Open Company, Ltd. */ package com.sun.hotspot.c1x; /** * Used to communicate configuration details, runtime offsets, etc. to c1x upon compileMethod. - * + * * @author Lukas Stadler - * + * */ public class HotSpotVMConfig { - private boolean windowsOs; - - public boolean isWindowsOs() { - return windowsOs; - } - + + // os information, register layout, code generation, ... + private boolean windowsOs; + + // offsets, ... + + public boolean isWindowsOs() { + return windowsOs; + } + }
--- a/c1x4hotspotsrc/HotSpotVM/src/com/sun/hotspot/c1x/HotSpotXirGenerator.java Mon Jul 12 15:05:17 2010 -0700 +++ b/c1x4hotspotsrc/HotSpotVM/src/com/sun/hotspot/c1x/HotSpotXirGenerator.java Tue Jul 13 11:47:55 2010 -0700 @@ -1,31 +1,30 @@ /* - * Copyright (c) 2009 Sun Microsystems, Inc. All rights reserved. + * Copyright (c) 2009 Sun Microsystems, Inc. All rights reserved. * - * Sun Microsystems, Inc. has intellectual property rights relating to technology embodied in the product - * that is described in this document. In particular, and without limitation, these intellectual property - * rights may include one or more of the U.S. patents listed at http://www.sun.com/patents and one or - * more additional patents or pending patent applications in the U.S. and in other countries. + * Sun Microsystems, Inc. has intellectual property rights relating to technology embodied in the product that is + * described in this document. In particular, and without limitation, these intellectual property rights may include one + * or more of the U.S. patents listed at http://www.sun.com/patents and one or more additional patents or pending patent + * applications in the U.S. and in other countries. * - * U.S. Government Rights - Commercial software. Government users are subject to the Sun - * Microsystems, Inc. standard license agreement and applicable provisions of the FAR and its - * supplements. + * U.S. Government Rights - Commercial software. Government users are subject to the Sun Microsystems, Inc. standard + * license agreement and applicable provisions of the FAR and its supplements. * - * Use is subject to license terms. Sun, Sun Microsystems, the Sun logo, Java and Solaris are trademarks or - * registered trademarks of Sun Microsystems, Inc. in the U.S. and other countries. All SPARC trademarks - * are used under license and are trademarks or registered trademarks of SPARC International, Inc. in the - * U.S. and other countries. + * Use is subject to license terms. Sun, Sun Microsystems, the Sun logo, Java and Solaris are trademarks or registered + * trademarks of Sun Microsystems, Inc. in the U.S. and other countries. All SPARC trademarks are used under license and + * are trademarks or registered trademarks of SPARC International, Inc. in the U.S. and other countries. * - * UNIX is a registered trademark in the U.S. and other countries, exclusively licensed through X/Open - * Company, Ltd. + * UNIX is a registered trademark in the U.S. and other countries, exclusively licensed through X/Open Company, Ltd. */ package com.sun.hotspot.c1x; +import java.lang.reflect.Modifier; import java.util.ArrayList; import java.util.List; import com.sun.cri.ci.CiKind; import com.sun.cri.ri.RiField; import com.sun.cri.ri.RiMethod; +import com.sun.cri.ri.RiRegisterConfig; import com.sun.cri.ri.RiType; import com.sun.cri.ri.RiType.Representation; import com.sun.cri.xir.CiXirAssembler; @@ -37,177 +36,156 @@ import com.sun.cri.xir.CiXirAssembler.XirOperand; /** - * + * * @author Thomas Wuerthinger - * + * */ public class HotSpotXirGenerator extends RiXirGenerator { - private XirTemplate[] emptyTemplates = new XirTemplate[CiKind.values().length]; - private final HotSpotVMConfig config; + private XirTemplate[] emptyTemplates = new XirTemplate[CiKind.values().length]; + private final HotSpotVMConfig config; - public HotSpotXirGenerator(HotSpotVMConfig config) { - this.config = config; - } + public HotSpotXirGenerator(HotSpotVMConfig config) { + this.config = config; + } - @Override - public List<XirTemplate> buildTemplates(CiXirAssembler asm) { + @Override + public List<XirTemplate> buildTemplates(CiXirAssembler asm) { + List<XirTemplate> templates = new ArrayList<XirTemplate>(); + for (int i = 0; i < CiKind.values().length; i++) { - List<XirTemplate> templates = new ArrayList<XirTemplate>(); - for (int i = 0; i < CiKind.values().length; i++) { - - CiKind curKind = CiKind.values()[i]; - - if (curKind == CiKind.Float || curKind == CiKind.Double) - continue; + CiKind curKind = CiKind.values()[i]; - if (CiKind.values()[i] == CiKind.Void) { - asm.restart(CiKind.values()[i]); - emptyTemplates[i] = asm.finishTemplate("empty-" - + CiKind.values()[i]); - } else { - asm.restart(); - XirOperand result = asm - .createTemp("result", CiKind.values()[i]); - emptyTemplates[i] = asm.finishTemplate(result, "empty-" - + CiKind.values()[i]); - } - templates.add(emptyTemplates[i]); - } + if (curKind == CiKind.Float || curKind == CiKind.Double) + continue; - return templates; - } + if (CiKind.values()[i] == CiKind.Void) { + asm.restart(CiKind.values()[i]); + emptyTemplates[i] = asm.finishTemplate("empty-" + CiKind.values()[i]); + } else { + asm.restart(); + XirOperand result = asm.createTemp("result", CiKind.values()[i]); + emptyTemplates[i] = asm.finishTemplate(result, "empty-" + CiKind.values()[i]); + } + templates.add(emptyTemplates[i]); + } - @Override - public XirSnippet genArrayLength(XirSite site, XirArgument array) { - return new XirSnippet(emptyTemplates[CiKind.Int.ordinal()]); - } + return templates; + } - @Override - public XirSnippet genArrayLoad(XirSite site, XirArgument array, - XirArgument index, XirArgument length, CiKind elementKind, - RiType elementType) { - return new XirSnippet(emptyTemplates[elementKind.ordinal()]); - } + @Override + public XirSnippet genArrayLength(XirSite site, XirArgument array) { + return new XirSnippet(emptyTemplates[CiKind.Int.ordinal()]); + } + + @Override + public XirSnippet genArrayLoad(XirSite site, XirArgument array, XirArgument index, XirArgument length, CiKind elementKind, RiType elementType) { + return new XirSnippet(emptyTemplates[elementKind.ordinal()]); + } - @Override - public XirSnippet genArrayStore(XirSite site, XirArgument array, - XirArgument index, XirArgument length, XirArgument value, - CiKind elementKind, RiType elementType) { - return new XirSnippet(emptyTemplates[CiKind.Void.ordinal()]); - } + @Override + public XirSnippet genArrayStore(XirSite site, XirArgument array, XirArgument index, XirArgument length, XirArgument value, CiKind elementKind, RiType elementType) { + return new XirSnippet(emptyTemplates[CiKind.Void.ordinal()]); + } - @Override - public XirSnippet genCheckCast(XirSite site, XirArgument receiver, - XirArgument hub, RiType type) { - return new XirSnippet(emptyTemplates[CiKind.Object.ordinal()]); - } + @Override + public XirSnippet genCheckCast(XirSite site, XirArgument receiver, XirArgument hub, RiType type) { + return new XirSnippet(emptyTemplates[CiKind.Object.ordinal()]); + } - @Override - public XirSnippet genEntrypoint(XirSite site) { - return null; - } + @Override + public XirSnippet genEntrypoint(XirSite site) { + return new XirSnippet(emptyTemplates[CiKind.Void.ordinal()]); + } - @Override - public XirSnippet genGetField(XirSite site, XirArgument receiver, - RiField field) { - return new XirSnippet(emptyTemplates[field.kind().ordinal()]); - } + @Override + public XirSnippet genGetField(XirSite site, XirArgument receiver, RiField field) { + return new XirSnippet(emptyTemplates[field.kind().ordinal()]); + } - @Override - public XirSnippet genGetStatic(XirSite site, XirArgument staticTuple, - RiField field) { - return new XirSnippet(emptyTemplates[field.kind().ordinal()]); - } + @Override + public XirSnippet genGetStatic(XirSite site, XirArgument staticTuple, RiField field) { + return new XirSnippet(emptyTemplates[field.kind().ordinal()]); + } - @Override - public XirSnippet genInstanceOf(XirSite site, XirArgument receiver, - XirArgument hub, RiType type) { - return new XirSnippet(emptyTemplates[CiKind.Boolean.ordinal()]); - } + @Override + public XirSnippet genInstanceOf(XirSite site, XirArgument receiver, XirArgument hub, RiType type) { + return new XirSnippet(emptyTemplates[CiKind.Boolean.ordinal()]); + } - @Override - public XirSnippet genIntrinsic(XirSite site, XirArgument[] arguments, - RiMethod method) { - return null; - } + @Override + public XirSnippet genIntrinsic(XirSite site, XirArgument[] arguments, RiMethod method) { + return null; + } - @Override - public XirSnippet genInvokeInterface(XirSite site, XirArgument receiver, - RiMethod method) { - return new XirSnippet(emptyTemplates[CiKind.Word.ordinal()]); - } + @Override + public XirSnippet genInvokeInterface(XirSite site, XirArgument receiver, RiMethod method) { + return new XirSnippet(emptyTemplates[CiKind.Word.ordinal()]); + } - @Override - public XirSnippet genInvokeSpecial(XirSite site, XirArgument receiver, - RiMethod method) { - return new XirSnippet(emptyTemplates[CiKind.Word.ordinal()]); - } + @Override + public XirSnippet genInvokeSpecial(XirSite site, XirArgument receiver, RiMethod method) { + return new XirSnippet(emptyTemplates[CiKind.Word.ordinal()]); + } - @Override - public XirSnippet genInvokeStatic(XirSite site, RiMethod method) { - return new XirSnippet(emptyTemplates[CiKind.Word.ordinal()]); - } + @Override + public XirSnippet genInvokeStatic(XirSite site, RiMethod method) { + return new XirSnippet(emptyTemplates[CiKind.Word.ordinal()]); + } + + @Override + public XirSnippet genInvokeVirtual(XirSite site, XirArgument receiver, RiMethod method) { + return new XirSnippet(emptyTemplates[CiKind.Word.ordinal()]); + } - @Override - public XirSnippet genInvokeVirtual(XirSite site, XirArgument receiver, - RiMethod method) { - return new XirSnippet(emptyTemplates[CiKind.Word.ordinal()]); - } + @Override + public XirSnippet genMonitorEnter(XirSite site, XirArgument receiver) { + return new XirSnippet(emptyTemplates[CiKind.Void.ordinal()]); + } - @Override - public XirSnippet genMonitorEnter(XirSite site, XirArgument receiver) { - return new XirSnippet(emptyTemplates[CiKind.Void.ordinal()]); - } - - @Override - public XirSnippet genMonitorExit(XirSite site, XirArgument receiver) { - return new XirSnippet(emptyTemplates[CiKind.Void.ordinal()]); - } + @Override + public XirSnippet genMonitorExit(XirSite site, XirArgument receiver) { + return new XirSnippet(emptyTemplates[CiKind.Void.ordinal()]); + } - @Override - public XirSnippet genNewArray(XirSite site, XirArgument length, - CiKind elementKind, RiType componentType, RiType arrayType) { - return new XirSnippet(emptyTemplates[CiKind.Object.ordinal()]); - } + @Override + public XirSnippet genNewArray(XirSite site, XirArgument length, CiKind elementKind, RiType componentType, RiType arrayType) { + return new XirSnippet(emptyTemplates[CiKind.Object.ordinal()]); + } + + @Override + public XirSnippet genNewInstance(XirSite site, RiType type) { + return new XirSnippet(emptyTemplates[CiKind.Object.ordinal()]); + } - @Override - public XirSnippet genNewInstance(XirSite site, RiType type) { - return new XirSnippet(emptyTemplates[CiKind.Object.ordinal()]); - } + @Override + public XirSnippet genNewMultiArray(XirSite site, XirArgument[] lengths, RiType type) { + return new XirSnippet(emptyTemplates[CiKind.Object.ordinal()]); + } - @Override - public XirSnippet genNewMultiArray(XirSite site, XirArgument[] lengths, - RiType type) { - return new XirSnippet(emptyTemplates[CiKind.Object.ordinal()]); - } + @Override + public XirSnippet genPutField(XirSite site, XirArgument receiver, RiField field, XirArgument value) { + return new XirSnippet(emptyTemplates[CiKind.Void.ordinal()]); + } - @Override - public XirSnippet genPutField(XirSite site, XirArgument receiver, - RiField field, XirArgument value) { - return new XirSnippet(emptyTemplates[CiKind.Void.ordinal()]); - } + @Override + public XirSnippet genPutStatic(XirSite site, XirArgument staticTuple, RiField field, XirArgument value) { + return new XirSnippet(emptyTemplates[CiKind.Void.ordinal()]); + } - @Override - public XirSnippet genPutStatic(XirSite site, XirArgument staticTuple, - RiField field, XirArgument value) { - return new XirSnippet(emptyTemplates[CiKind.Void.ordinal()]); - } + @Override + public XirSnippet genResolveClass(XirSite site, RiType type, Representation representation) { + return new XirSnippet(emptyTemplates[CiKind.Object.ordinal()]); + } - @Override - public XirSnippet genResolveClass(XirSite site, RiType type, - Representation representation) { - return new XirSnippet(emptyTemplates[CiKind.Object.ordinal()]); - } + @Override + public XirSnippet genSafepoint(XirSite site) { + return new XirSnippet(emptyTemplates[CiKind.Void.ordinal()]); + } - @Override - public XirSnippet genSafepoint(XirSite site) { - return new XirSnippet(emptyTemplates[CiKind.Void.ordinal()]); - } - - @Override - public XirSnippet genExceptionObject(XirSite site) { - return new XirSnippet(emptyTemplates[CiKind.Object.ordinal()]); - } + @Override + public XirSnippet genExceptionObject(XirSite site) { + return new XirSnippet(emptyTemplates[CiKind.Object.ordinal()]); + } }
--- a/c1x4hotspotsrc/HotSpotVM/src/com/sun/hotspot/c1x/VMEntries.java Mon Jul 12 15:05:17 2010 -0700 +++ b/c1x4hotspotsrc/HotSpotVM/src/com/sun/hotspot/c1x/VMEntries.java Tue Jul 13 11:47:55 2010 -0700 @@ -7,27 +7,50 @@ import com.sun.cri.ri.RiType; public class VMEntries { - public static native byte[] RiMethod_code(Object methodOop); - public static native int RiMethod_maxStackSize(Object methodOop); - public static native int RiMethod_maxLocals(Object methodOop); - public static native RiType RiMethod_holder(Object methodOop); - public static native String RiMethod_signature(Object methodOop); - public static native String RiMethod_name(Object methodOop); - public static native RiType RiSignature_lookupType(String returnType, Object accessingClass); - public static native String RiSignature_symbolToString(Object symbolOop); - public static native Class<?> RiType_javaClass(Object klassOop); - public static native String RiType_name(Object klassOop); - public static native Object RiConstantPool_lookupConstant(Object constantPoolOop, int cpi); - public static native RiMethod RiConstantPool_lookupMethod(Object constantPoolOop, int cpi, byte byteCode); - public static native RiSignature RiConstantPool_lookupSignature(Object constantPoolOop, int cpi); - public static native RiType RiConstantPool_lookupType(Object constantPoolOop, int cpi); - public static native RiField RiConstantPool_lookupField(Object constantPoolOop, int cpi); - public static native RiType findRiType(Object holderKlassOop); - public static native RiConstantPool RiRuntime_getConstantPool(Object klassOop); - public static native boolean RiType_isArrayClass(Object klassOop); - public static native boolean RiType_isInstanceClass(Object klassOop); - public static native boolean RiType_isInterface(Object klassOop); - public static native int RiMethod_accessFlags(Object methodOop); - public static native void installCode(Object methodOop, byte[] code, int frameSize); - public static native HotSpotVMConfig getConfiguration(); + + public static native byte[] RiMethod_code(Object methodOop); + + public static native int RiMethod_maxStackSize(Object methodOop); + + public static native int RiMethod_maxLocals(Object methodOop); + + public static native RiType RiMethod_holder(Object methodOop); + + public static native String RiMethod_signature(Object methodOop); + + public static native String RiMethod_name(Object methodOop); + + public static native RiType RiSignature_lookupType(String returnType, Object accessingClass); + + public static native String RiSignature_symbolToString(Object symbolOop); + + public static native Class< ? > RiType_javaClass(Object klassOop); + + public static native String RiType_name(Object klassOop); + + public static native Object RiConstantPool_lookupConstant(Object constantPoolOop, int cpi); + + public static native RiMethod RiConstantPool_lookupMethod(Object constantPoolOop, int cpi, byte byteCode); + + public static native RiSignature RiConstantPool_lookupSignature(Object constantPoolOop, int cpi); + + public static native RiType RiConstantPool_lookupType(Object constantPoolOop, int cpi); + + public static native RiField RiConstantPool_lookupField(Object constantPoolOop, int cpi); + + public static native RiType findRiType(Object holderKlassOop); + + public static native RiConstantPool RiRuntime_getConstantPool(Object klassOop); + + public static native boolean RiType_isArrayClass(Object klassOop); + + public static native boolean RiType_isInstanceClass(Object klassOop); + + public static native boolean RiType_isInterface(Object klassOop); + + public static native int RiMethod_accessFlags(Object methodOop); + + public static native void installCode(Object methodOop, byte[] code, int frameSize); + + public static native HotSpotVMConfig getConfiguration(); }
--- a/c1x4hotspotsrc/HotSpotVM/src/com/sun/hotspot/c1x/VMExits.java Mon Jul 12 15:05:17 2010 -0700 +++ b/c1x4hotspotsrc/HotSpotVM/src/com/sun/hotspot/c1x/VMExits.java Tue Jul 13 11:47:55 2010 -0700 @@ -1,22 +1,19 @@ /* - * Copyright (c) 2009 Sun Microsystems, Inc. All rights reserved. + * Copyright (c) 2009 Sun Microsystems, Inc. All rights reserved. * - * Sun Microsystems, Inc. has intellectual property rights relating to technology embodied in the product - * that is described in this document. In particular, and without limitation, these intellectual property - * rights may include one or more of the U.S. patents listed at http://www.sun.com/patents and one or - * more additional patents or pending patent applications in the U.S. and in other countries. + * Sun Microsystems, Inc. has intellectual property rights relating to technology embodied in the product that is + * described in this document. In particular, and without limitation, these intellectual property rights may include one + * or more of the U.S. patents listed at http://www.sun.com/patents and one or more additional patents or pending patent + * applications in the U.S. and in other countries. * - * U.S. Government Rights - Commercial software. Government users are subject to the Sun - * Microsystems, Inc. standard license agreement and applicable provisions of the FAR and its - * supplements. + * U.S. Government Rights - Commercial software. Government users are subject to the Sun Microsystems, Inc. standard + * license agreement and applicable provisions of the FAR and its supplements. * - * Use is subject to license terms. Sun, Sun Microsystems, the Sun logo, Java and Solaris are trademarks or - * registered trademarks of Sun Microsystems, Inc. in the U.S. and other countries. All SPARC trademarks - * are used under license and are trademarks or registered trademarks of SPARC International, Inc. in the - * U.S. and other countries. + * Use is subject to license terms. Sun, Sun Microsystems, the Sun logo, Java and Solaris are trademarks or registered + * trademarks of Sun Microsystems, Inc. in the U.S. and other countries. All SPARC trademarks are used under license and + * are trademarks or registered trademarks of SPARC International, Inc. in the U.S. and other countries. * - * UNIX is a registered trademark in the U.S. and other countries, exclusively licensed through X/Open - * Company, Ltd. + * UNIX is a registered trademark in the U.S. and other countries, exclusively licensed through X/Open Company, Ltd. */ package com.sun.hotspot.c1x; @@ -32,130 +29,130 @@ import com.sun.cri.ri.RiType; /** - * + * * @author Thomas Wuerthinger - * - * Exits from the HotSpot VM into Java code. + * + * Exits from the HotSpot VM into Java code. * */ public class VMExits { - - public static void compileMethod(RiMethod method, int entry_bci) { - - assert method instanceof RiMethod : "And YES, this assert is necessary and a potential life saver as this method is called from the VM ;-)"; - - System.out.println("compileMethod in Java code called!!"); - - CiCompiler compiler = Compiler.getCompiler(); - CiResult result = compiler.compileMethod(method, null); - - System.out.println("Compilation result: "); - if (result.bailout() != null) { - System.out.println("Bailout:"); - result.bailout().printStackTrace(); - } else { - System.out.println(result.targetMethod()); - VMEntries.installCode(((HotSpotMethod)method).methodOop, result.targetMethod().targetCode(), result.targetMethod().frameSize()); - } - } - - public static RiMethod createRiMethod(Object methodOop) { - System.out.println("creating RiMethod object"); - RiMethod m = new HotSpotMethod(methodOop); - System.out.println("returning " + m); - return m; - } - - public static RiSignature createRiSignature(Object symbolOop) { - System.out.println("Creating RiSignature object"); - String name = VMEntries.RiSignature_symbolToString(symbolOop); - System.out.println("Signature name: " + name); - return new HotSpotSignature(name); - } - - public static RiField createRiField(RiType holder, Object nameSymbol, RiType type, int offset) { - System.out.println("creating RiField object"); - return new HotSpotField(holder, nameSymbol, type, offset); - } - - public static RiType createRiType(Object klassOop) { - System.out.println("creating RiType object"); - return new HotSpotType(klassOop); - } + + public static void compileMethod(RiMethod method, int entry_bci) { + + assert method instanceof RiMethod : "And YES, this assert is necessary and a potential life saver as this method is called from the VM ;-)"; + + System.out.println("compileMethod in Java code called!!"); + + CiCompiler compiler = Compiler.getCompiler(); + CiResult result = compiler.compileMethod(method, null); + + System.out.println("Compilation result: "); + if (result.bailout() != null) { + System.out.println("Bailout:"); + result.bailout().printStackTrace(); + } else { + System.out.println(result.targetMethod()); + VMEntries.installCode(((HotSpotMethod) method).methodOop, result.targetMethod().targetCode(), result.targetMethod().frameSize()); + } + } + + public static RiMethod createRiMethod(Object methodOop) { + System.out.println("creating RiMethod object"); + RiMethod m = new HotSpotMethod(methodOop); + System.out.println("returning " + m); + return m; + } + + public static RiSignature createRiSignature(Object symbolOop) { + System.out.println("Creating RiSignature object"); + String name = VMEntries.RiSignature_symbolToString(symbolOop); + System.out.println("Signature name: " + name); + return new HotSpotSignature(name); + } + + public static RiField createRiField(RiType holder, Object nameSymbol, RiType type, int offset) { + System.out.println("creating RiField object"); + return new HotSpotField(holder, nameSymbol, type, offset); + } + + public static RiType createRiType(Object klassOop) { + System.out.println("creating RiType object"); + return new HotSpotType(klassOop); + } - public static RiType createRiTypePrimitive(int basicType) { - System.out.println("Creating primitive type with basicType " + basicType); - CiKind kind = null; - switch (basicType) { - case 4: - kind = CiKind.Boolean; - break; - case 5: - kind = CiKind.Char; - break; - case 6: - kind = CiKind.Float; - break; - case 7: - kind = CiKind.Double; - break; - case 8: - kind = CiKind.Byte; - break; - case 9: - kind = CiKind.Short; - break; - case 10: - kind = CiKind.Int; - break; - case 11: - kind = CiKind.Long; - break; - case 14: - kind = CiKind.Void; - break; - default: - throw new IllegalArgumentException("Unknown basic type: " + basicType); - } - System.out.println("Chosen kind: " + kind); - return new HotSpotTypePrimitive(kind); - } - - public static RiType createRiTypeUnresolved(Object symbolOop, Object accessingKlassOop) { - System.out.println("Creating unresolved RiType object"); - String name = VMEntries.RiSignature_symbolToString(symbolOop); - System.out.println("Class name: " + name); - return new HotSpotTypeUnresolved(name); - } - - public static RiConstantPool createRiConstantPool(Object constantPoolOop) { - System.out.println("creating RiConstantPool object"); - return new HotSpotConstantPool(constantPoolOop); - } - - public static CiConstant createCiConstantInt(int value) { - return CiConstant.forInt(value); - } + public static RiType createRiTypePrimitive(int basicType) { + System.out.println("Creating primitive type with basicType " + basicType); + CiKind kind = null; + switch (basicType) { + case 4: + kind = CiKind.Boolean; + break; + case 5: + kind = CiKind.Char; + break; + case 6: + kind = CiKind.Float; + break; + case 7: + kind = CiKind.Double; + break; + case 8: + kind = CiKind.Byte; + break; + case 9: + kind = CiKind.Short; + break; + case 10: + kind = CiKind.Int; + break; + case 11: + kind = CiKind.Long; + break; + case 14: + kind = CiKind.Void; + break; + default: + throw new IllegalArgumentException("Unknown basic type: " + basicType); + } + System.out.println("Chosen kind: " + kind); + return new HotSpotTypePrimitive(kind); + } - public static CiConstant createCiConstantLong(long value) { - return CiConstant.forLong(value); - } + public static RiType createRiTypeUnresolved(Object symbolOop, Object accessingKlassOop) { + System.out.println("Creating unresolved RiType object"); + String name = VMEntries.RiSignature_symbolToString(symbolOop); + System.out.println("Class name: " + name); + return new HotSpotTypeUnresolved(name); + } + + public static RiConstantPool createRiConstantPool(Object constantPoolOop) { + System.out.println("creating RiConstantPool object"); + return new HotSpotConstantPool(constantPoolOop); + } + + public static CiConstant createCiConstantInt(int value) { + return CiConstant.forInt(value); + } - public static CiConstant createCiConstantFloat(float value) { - return CiConstant.forFloat(value); - } - - public static CiConstant createCiConstantDouble(double value) { - return CiConstant.forDouble(value); - } + public static CiConstant createCiConstantLong(long value) { + return CiConstant.forLong(value); + } + + public static CiConstant createCiConstantFloat(float value) { + return CiConstant.forFloat(value); + } - public static CiConstant createCiConstantObject(Object value) { - return CiConstant.forObject(value); - } - - public static void main(String[] args) throws InterruptedException { - System.out.println(C1XHotSpotTests.add(1, 2)); - Thread.sleep(5000); - System.out.println(C1XHotSpotTests.add(1, 2)); - } + public static CiConstant createCiConstantDouble(double value) { + return CiConstant.forDouble(value); + } + + public static CiConstant createCiConstantObject(Object value) { + return CiConstant.forObject(value); + } + + public static void main(String[] args) throws InterruptedException { + System.out.println(C1XHotSpotTests.add(1, 2)); + Thread.sleep(5000); + System.out.println(C1XHotSpotTests.add(1, 2)); + } }