+- General keywords (TEST_OPTS)
- JTReg keywords
- Gtest keywords
- Microbenchmark keywords
@@ -102,11 +103,29 @@ TEST FAILURE
To separate multiple keyword=value pairs, use ; (semicolon). Since the shell normally eats ;, the recommended usage is to write the assignment inside qoutes, e.g. JTREG="...;...". This will also make sure spaces are preserved, as in JTREG="VM_OPTIONS=-XshowSettings -Xlog:gc+ref=debug".
(Other ways are possible, e.g. using backslash: JTREG=JOBS=1\;TIMEOUT=8. Also, as a special technique, the string %20 will be replaced with space for certain options, e.g. JTREG=VM_OPTIONS=-XshowSettings%20-Xlog:gc+ref=debug. This can be useful if you have layers of scripts and have trouble getting proper quoting of command line arguments through.)
As far as possible, the names of the keywords have been standardized between test suites.
-JTReg keywords
+General keywords (TEST_OPTS)
+Some keywords are valid across different test suites. If you want to run tests from multiple test suites, or just don't want to care which test suite specific control variable to use, then you can use the general TEST_OPTS control variable.
+There are also some keywords that applies globally to the test runner system, not to any specific test suites. These are also available as TEST_OPTS keywords.
JOBS
+Currently only applies to JTReg.
+TIMEOUT_FACTOR
+Currently only applies to JTReg.
+VM_OPTIONS
+Applies to JTReg, GTest and Micro.
+JAVA_OPTIONS
+Applies to JTReg, GTest and Micro.
+AOT_MODULES
+Applies to JTReg and GTest.
+JCOV
+This keywords applies globally to the test runner system. If set to true, it enables JCov coverage reporting for all tests run. To be useful, the JDK under test must be run with a JDK built with JCov instrumentation (configure --with-jcov=<path to directory containing lib/jcov.jar>, make jcov-image).
+The simplest way to run tests with JCov coverage report is to use the special target jcov-test instead of test, e.g. make jcov-test TEST=jdk_lang. This will make sure the JCov image is built, and that JCov reporting is enabled.
+The JCov report is stored in build/$BUILD/test-results/jcov-output.
+Please note that running with JCov reporting can be very memory intensive.
+JTReg keywords
+JOBS
The test concurrency (-concurrency).
Defaults to TEST_JOBS (if set by --with-test-jobs=), otherwise it defaults to JOBS, except for Hotspot, where the default is number of CPU cores/2, but never more than 12.
-TIMEOUT
+TIMEOUT_FACTOR
The timeout factor (-timeoutFactor).
Defaults to 4.
TEST_MODE
@@ -125,13 +144,21 @@ TEST FAILURE
Limit memory consumption (-Xmx and -vmoption:-Xmx, or none).
Limit memory consumption for JTReg test framework and VM under test. Set to 0 to disable the limits.
Defaults to 512m, except for hotspot, where it defaults to 0 (no limit).
+KEYWORDS
+JTReg kewords sent to JTReg using -k. Please be careful in making sure that spaces and special characters (like !) are properly quoted. To avoid some issues, the special value %20 can be used instead of space.
+
+Use additional problem lists file or files, in addition to the default ProblemList.txt located at the JTReg test roots.
+If multiple file names are specified, they should be separated by space (or, to help avoid quoting issues, the special value %20).
+The file names should be either absolute, or relative to the JTReg test root of the tests to be run.
OPTIONS
Additional options to the JTReg test framework.
Use JTREG="OPTIONS=--help all" to see all available JTReg options.
-JAVA_OPTIONS
+JAVA_OPTIONS
Additional Java options to JTReg (-javaoption).
-VM_OPTIONS
+VM_OPTIONS
Additional VM options to JTReg (-vmoption).
+AOT_MODULES
+Generate AOT modules before testing for the specified module, or set of modules. If multiple modules are specified, they should be separated by space (or, to help avoid quoting issues, the special value %20).
Gtest keywords
REPEAT
The number of times to repeat the tests (--gtest_repeat).
@@ -139,6 +166,8 @@ TEST FAILURE
OPTIONS
Additional options to the Gtest test framework.
Use GTEST="OPTIONS=--help" to see all available Gtest options.
+AOT_MODULES
+Generate AOT modules before testing for the specified module, or set of modules. If multiple modules are specified, they should be separated by space (or, to help avoid quoting issues, the special value %20).
Microbenchmark keywords
FORK
Override the number of benchmark forks to spawn. Same as specifying -f <num>.
@@ -152,7 +181,7 @@ TEST FAILURE
Amount of time to spend in each warmup iteration. Same as specifying -w <num>.
Specify to have the test run save a log of the values. Accepts the same values as -rff, i.e., text, csv, scsv, json, or latex.
-VM_OPTIONS
+VM_OPTIONS
Additional VM arguments to provide to forked off VMs. Same as -jvmArgs <args>
OPTIONS
Additional arguments to send to JMH.
diff --git a/doc/testing.md b/doc/testing.md
index 70f648cc6c7..b447cfdfe8b 100644
--- a/doc/testing.md
+++ b/doc/testing.md
@@ -40,8 +40,8 @@ environment variable to point to the JTReg home before running `configure`.)
To be able to run microbenchmarks, `configure` needs to know where to find
the JMH dependency. Use `--with-jmh=` to point to a directory
-containing the core JMH and transitive dependencies. The recommended dependencies
-can be retrieved by running `sh make/devkit/createJMHBundle.sh`, after which
+containing the core JMH and transitive dependencies. The recommended dependencies
+can be retrieved by running `sh make/devkit/createJMHBundle.sh`, after which
`--with-jmh=build/jmh/jars` should work.
## Test selection
@@ -202,6 +202,50 @@ proper quoting of command line arguments through.)
As far as possible, the names of the keywords have been standardized between
test suites.
+### General keywords (TEST_OPTS)
+
+Some keywords are valid across different test suites. If you want to run
+tests from multiple test suites, or just don't want to care which test suite specific
+control variable to use, then you can use the general TEST_OPTS control variable.
+
+There are also some keywords that applies globally to the test runner system,
+not to any specific test suites. These are also available as TEST_OPTS keywords.
+
+#### JOBS
+
+Currently only applies to JTReg.
+
+#### TIMEOUT_FACTOR
+
+Currently only applies to JTReg.
+
+#### VM_OPTIONS
+
+Applies to JTReg, GTest and Micro.
+
+#### JAVA_OPTIONS
+
+Applies to JTReg, GTest and Micro.
+
+#### AOT_MODULES
+
+Applies to JTReg and GTest.
+
+#### JCOV
+
+This keywords applies globally to the test runner system. If set to `true`, it
+enables JCov coverage reporting for all tests run. To be useful, the JDK under
+test must be run with a JDK built with JCov instrumentation (`configure
+--with-jcov=`, `make jcov-image`).
+
+The simplest way to run tests with JCov coverage report is to use the special
+target `jcov-test` instead of `test`, e.g. `make jcov-test TEST=jdk_lang`. This
+will make sure the JCov image is built, and that JCov reporting is enabled.
+
+The JCov report is stored in `build/$BUILD/test-results/jcov-output`.
+
+Please note that running with JCov reporting can be very memory intensive.
+
### JTReg keywords
#### JOBS
@@ -211,7 +255,7 @@ Defaults to TEST_JOBS (if set by `--with-test-jobs=`), otherwise it defaults to
JOBS, except for Hotspot, where the default is *number of CPU cores/2*, but
never more than 12.
-#### TIMEOUT
+#### TIMEOUT_FACTOR
The timeout factor (`-timeoutFactor`).
Defaults to 4.
@@ -245,6 +289,24 @@ to disable the limits.
Defaults to 512m, except for hotspot, where it defaults to 0 (no limit).
+#### KEYWORDS
+
+JTReg kewords sent to JTReg using `-k`. Please be careful in making sure that
+spaces and special characters (like `!`) are properly quoted. To avoid some
+issues, the special value `%20` can be used instead of space.
+
+#### EXTRA_PROBLEM_LISTS
+
+Use additional problem lists file or files, in addition to the default
+ProblemList.txt located at the JTReg test roots.
+
+If multiple file names are specified, they should be separated by space (or, to
+help avoid quoting issues, the special value `%20`).
+
+The file names should be either absolute, or relative to the JTReg test root of
+the tests to be run.
+
+
#### OPTIONS
Additional options to the JTReg test framework.
@@ -256,6 +318,12 @@ Additional Java options to JTReg (`-javaoption`).
#### VM_OPTIONS
Additional VM options to JTReg (`-vmoption`).
+#### AOT_MODULES
+
+Generate AOT modules before testing for the specified module, or set of
+modules. If multiple modules are specified, they should be separated by space
+(or, to help avoid quoting issues, the special value `%20`).
+
### Gtest keywords
#### REPEAT
@@ -270,6 +338,12 @@ Additional options to the Gtest test framework.
Use `GTEST="OPTIONS=--help"` to see all available Gtest options.
+#### AOT_MODULES
+
+Generate AOT modules before testing for the specified module, or set of
+modules. If multiple modules are specified, they should be separated by space
+(or, to help avoid quoting issues, the special value `%20`).
+
### Microbenchmark keywords
#### FORK
diff --git a/make/CompileToolsJdk.gmk b/make/CompileToolsJdk.gmk
index 9753eef44c2..b89afa0eafc 100644
--- a/make/CompileToolsJdk.gmk
+++ b/make/CompileToolsJdk.gmk
@@ -90,7 +90,7 @@ TARGETS += $(COMPILE_DEPEND) $(DEPEND_SERVICE_PROVIDER)
# To be able to call the javascript filter when generating man pages using
# pandoc, we need to create this executable wrapper script.
-ifneq ($(PANDOC), )
+ifeq ($(ENABLE_PANDOC), true)
# PANDOC_TROFF_MANPAGE_FILTER is duplicated for export in ToolsJdk.gmk.
PANDOC_TROFF_MANPAGE_FILTER := \
$(BUILDTOOLS_OUTPUTDIR)/manpages/pandoc-troff-manpage-filter
diff --git a/make/ExplodedImageOptimize.gmk b/make/ExplodedImageOptimize.gmk
index 78d4189efd8..865adb2f9b4 100644
--- a/make/ExplodedImageOptimize.gmk
+++ b/make/ExplodedImageOptimize.gmk
@@ -1,5 +1,5 @@
#
-# Copyright (c) 2016, 2018, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2016, 2019, Oracle and/or its affiliates. All rights reserved.
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
#
# This code is free software; you can redistribute it and/or modify it
@@ -34,7 +34,7 @@ include $(TOPDIR)/make/ModuleTools.gmk
################################################################################
PACKAGES_ATTRIBUTE_TARGET := $(JDK_OUTPUTDIR)/_packages_attribute.done
-ALL_MODULEINFO_CLASSES := $(wildcard $(JDK_OUTPUTDIR)/modules/*/module_info.class)
+ALL_MODULEINFO_CLASSES := $(wildcard $(JDK_OUTPUTDIR)/modules/*/module-info.class)
$(PACKAGES_ATTRIBUTE_TARGET): $(ALL_MODULEINFO_CLASSES) $(BUILD_JIGSAW_CLASSES)
$(call LogInfo, Optimizing the exploded image)
diff --git a/make/Main.gmk b/make/Main.gmk
index b276a023953..511b1020cb7 100644
--- a/make/Main.gmk
+++ b/make/Main.gmk
@@ -1,5 +1,5 @@
#
-# Copyright (c) 2011, 2018, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2019, Oracle and/or its affiliates. All rights reserved.
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
#
# This code is free software; you can redistribute it and/or modify it
@@ -479,12 +479,12 @@ ALL_TARGETS += $(INTERIM_JMOD_TARGETS) interim-image generate-link-opt-data
define DeclareRunTestRecipe
test-$1:
- +($(CD) $(TOPDIR)/make && $(MAKE) $(MAKE_ARGS) -f RunTests.gmk run-test TEST="$1")
+ +($(CD) $(TOPDIR)/make && $(MAKE) $(MAKE_ARGS) -f RunTests.gmk \
+ TEST="$1")
exploded-test-$1:
- +($(CD) $(TOPDIR)/make && $(MAKE) $(MAKE_ARGS) -f RunTests.gmk run-test \
+ +($(CD) $(TOPDIR)/make && $(MAKE) $(MAKE_ARGS) -f RunTests.gmk \
TEST="$1" JDK_IMAGE_DIR=$(JDK_OUTPUTDIR))
-
endef
# ALL_NAMED_TESTS is defined in FindTests.gmk
@@ -562,13 +562,18 @@ ALL_TARGETS += prepare-test-image build-test-hotspot-jtreg-native \
# Run tests
test:
- +($(CD) $(TOPDIR)/make && $(MAKE) $(MAKE_ARGS) -f RunTests.gmk run-test TEST="$(TEST)")
+ +($(CD) $(TOPDIR)/make && $(MAKE) $(MAKE_ARGS) -f RunTests.gmk \
+ TEST="$(TEST)")
exploded-test:
- +($(CD) $(TOPDIR)/make && $(MAKE) $(MAKE_ARGS) -f RunTests.gmk run-test \
+ +($(CD) $(TOPDIR)/make && $(MAKE) $(MAKE_ARGS) -f RunTests.gmk \
TEST="$(TEST)" JDK_IMAGE_DIR=$(JDK_OUTPUTDIR))
-ALL_TARGETS += test exploded-test
+jcov-test:
+ +($(CD) $(TOPDIR)/make && $(MAKE) $(MAKE_ARGS) -f RunTests.gmk \
+ TEST="$(TEST)" TEST_OPTS_JCOV=true)
+
+ALL_TARGETS += test exploded-test jcov-test
################################################################################
# Bundles
@@ -869,6 +874,8 @@ else
exploded-test: exploded-image test-image
+ jcov-test: jcov-image test-image
+
test-make: clean-test-make compile-commands
test-make-compile-commands: compile-commands
diff --git a/make/RunTests.gmk b/make/RunTests.gmk
index fe21aeaa5ff..38a8d354ae0 100644
--- a/make/RunTests.gmk
+++ b/make/RunTests.gmk
@@ -1,5 +1,5 @@
#
-# Copyright (c) 2016, 2018, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2016, 2019, Oracle and/or its affiliates. All rights reserved.
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
#
# This code is free software; you can redistribute it and/or modify it
@@ -45,8 +45,8 @@ ifneq ($(TEST_VM_OPTS), )
endif
$(eval $(call ParseKeywordVariable, TEST_OPTS, \
- SINGLE_KEYWORDS := JOBS TIMEOUT_FACTOR AOT_MODULES, \
- STRING_KEYWORDS := VM_OPTIONS JAVA_OPTIONS, \
+ SINGLE_KEYWORDS := JOBS TIMEOUT_FACTOR JCOV, \
+ STRING_KEYWORDS := VM_OPTIONS JAVA_OPTIONS AOT_MODULES, \
))
# Helper function to propagate TEST_OPTS values.
@@ -72,7 +72,7 @@ ifeq ($(OPENJDK_TARGET_OS), windows)
) \
))
export _NT_SYMBOL_PATH
- $(info _NT_SYMBOL_PATH=$(_NT_SYMBOL_PATH))
+ $(call LogDebug, Rewriting _NT_SYMBOL_PATH to $(_NT_SYMBOL_PATH))
endif
endif
@@ -81,6 +81,9 @@ endif
$(eval $(call IncludeCustomExtension, RunTests.gmk))
################################################################################
+# This is the JDK that we will test
+JDK_UNDER_TEST := $(JDK_IMAGE_DIR)
+
TEST_RESULTS_DIR := $(OUTPUTDIR)/test-results
TEST_SUPPORT_DIR := $(OUTPUTDIR)/test-support
TEST_SUMMARY := $(TEST_RESULTS_DIR)/test-summary.txt
@@ -104,8 +107,26 @@ ifneq ($(wildcard $(JTREG_FAILURE_HANDLER)), )
-timeoutHandlerTimeout:0
endif
-GTEST_LAUNCHER_DIRS := $(patsubst %/gtestLauncher, %, $(wildcard $(TEST_IMAGE_DIR)/hotspot/gtest/*/gtestLauncher))
-GTEST_VARIANTS := $(strip $(patsubst $(TEST_IMAGE_DIR)/hotspot/gtest/%, %, $(GTEST_LAUNCHER_DIRS)))
+GTEST_LAUNCHER_DIRS := $(patsubst %/gtestLauncher, %, \
+ $(wildcard $(TEST_IMAGE_DIR)/hotspot/gtest/*/gtestLauncher))
+GTEST_VARIANTS := $(strip $(patsubst $(TEST_IMAGE_DIR)/hotspot/gtest/%, %, \
+ $(GTEST_LAUNCHER_DIRS)))
+
+ifeq ($(TEST_OPTS_JCOV), true)
+ JCOV_OUTPUT_DIR := $(TEST_RESULTS_DIR)/jcov-output
+ JCOV_GRABBER_LOG := $(JCOV_OUTPUT_DIR)/grabber.log
+ JCOV_RESULT_FILE := $(JCOV_OUTPUT_DIR)/result.xml
+ JCOV_REPORT := $(JCOV_OUTPUT_DIR)/report
+ JCOV_MEM_OPTIONS := -Xms64m -Xmx4g
+
+ # Replace our normal test JDK with the JCov image.
+ JDK_UNDER_TEST := $(JCOV_IMAGE_DIR)
+
+ JCOV_ENVIRONMENT := JAVA_TOOL_OPTIONS="$(JCOV_MEM_OPTIONS)" \
+ _JAVA_OPTIONS="$(JCOV_MEM_OPTIONS)"
+ JTREG_JCOV_OPTIONS := -e:JAVA_TOOL_OPTIONS='$(JCOV_MEM_OPTIONS)' \
+ -e:_JAVA_OPTIONS='$(JCOV_MEM_OPTIONS)'
+endif
################################################################################
# Optionally create AOT libraries for specified modules before running tests.
@@ -129,38 +150,35 @@ define SetupAotModuleBody
$1_AOT_LIB := $$($1_BIN)/$$(call SHARED_LIBRARY,$$($1_MODULE))
$1_AOT_CCLIST := $$(wildcard $$(TOPDIR)/test/hotspot/jtreg/compiler/aot/scripts/$$($1_MODULE)-list.txt)
- ifeq ($(OPENJDK_TARGET_OS), windows)
- $1_LD := $$(addsuffix $$(EXE_SUFFIX), $$(filter-out $$(FIXPATH), $$(LD)))
- else
- $1_LD := $$(LD)
- endif
-
# Create jaotc flags.
- # VM flags which don't affect AOT code generation are filtered out: -Xcomp, -XX:+-TieredCompilation
+ # VM flags which don't affect AOT code generation are filtered out:
+ # -Xcomp, -XX:+-TieredCompilation
$1_JAOTC_OPTS := \
-J-Xmx4g --info \
$$(addprefix -J, $$(filter-out -Xcomp %TieredCompilation, $$($1_VM_OPTIONS))) \
$$(addprefix --compile-commands$(SPACE), $$($1_AOT_CCLIST)) \
- --linker-path $$($1_LD) \
+ --linker-path $$(LD_JAOTC) \
#
ifneq ($$(filter -ea, $$($1_VM_OPTIONS)), )
$1_JAOTC_OPTS += --compile-with-assertions
endif
- $$($1_AOT_LIB): $$(JDK_IMAGE_DIR)/release \
+ $$($1_AOT_LIB): $$(JDK_UNDER_TEST)/release \
$$(call DependOnVariable, $1_JAOTC_OPTS) \
- $$(call DependOnVariable, JDK_IMAGE_DIR)
+ $$(call DependOnVariable, JDK_UNDER_TEST)
$$(call LogWarn, Generating $$(patsubst $$(OUTPUTDIR)/%, %, $$@))
$$(call MakeTargetDir)
$$(call ExecuteWithLog, $$@, \
- $$(FIXPATH) $$(JDK_IMAGE_DIR)/bin/jaotc \
- $$($1_JAOTC_OPTS) --output $$@ --module $$($1_MODULE) \
+ $$(FIXPATH) $$(JDK_UNDER_TEST)/bin/jaotc \
+ $$($1_JAOTC_OPTS) --output $$@ --module $$($1_MODULE) \
)
$$(call ExecuteWithLog, $$@.check, \
- $$(FIXPATH) $$(JDK_IMAGE_DIR)/bin/java \
- $$($1_VM_OPTIONS) -XX:+PrintAOT -XX:+UseAOTStrictLoading -XX:AOTLibrary=$$@ -version \
- > $$@.verify-aot \
+ $$(FIXPATH) $$(JDK_UNDER_TEST)/bin/java \
+ $$($1_VM_OPTIONS) -XX:+UnlockDiagnosticVMOptions \
+ -XX:+PrintAOT -XX:+UseAOTStrictLoading \
+ -XX:AOTLibrary=$$@ -version \
+ > $$@.verify-aot \
)
$1_AOT_OPTIONS += -XX:AOTLibrary=$$($1_AOT_LIB)
@@ -249,9 +267,10 @@ $(eval $(call SetTestOpt,JOBS,JTREG))
$(eval $(call SetTestOpt,TIMEOUT_FACTOR,JTREG))
$(eval $(call ParseKeywordVariable, JTREG, \
- SINGLE_KEYWORDS := JOBS TIMEOUT_FACTOR TEST_MODE ASSERT VERBOSE RETAIN MAX_MEM \
- EXTRA_PROBLEM_LISTS KEYWORDS AOT_MODULES, \
- STRING_KEYWORDS := OPTIONS JAVA_OPTIONS VM_OPTIONS, \
+ SINGLE_KEYWORDS := JOBS TIMEOUT_FACTOR TEST_MODE ASSERT VERBOSE RETAIN \
+ MAX_MEM, \
+ STRING_KEYWORDS := OPTIONS JAVA_OPTIONS VM_OPTIONS KEYWORDS \
+ EXTRA_PROBLEM_LISTS AOT_MODULES, \
))
ifneq ($(JTREG), )
@@ -266,8 +285,8 @@ $(eval $(call SetTestOpt,JAVA_OPTIONS,GTEST))
$(eval $(call SetTestOpt,AOT_MODULES,GTEST))
$(eval $(call ParseKeywordVariable, GTEST, \
- SINGLE_KEYWORDS := REPEAT AOT_MODULES, \
- STRING_KEYWORDS := OPTIONS VM_OPTIONS JAVA_OPTIONS, \
+ SINGLE_KEYWORDS := REPEAT, \
+ STRING_KEYWORDS := OPTIONS VM_OPTIONS JAVA_OPTIONS AOT_MODULES, \
))
ifneq ($(GTEST), )
@@ -282,7 +301,8 @@ $(eval $(call SetTestOpt,JAVA_OPTIONS,MICRO))
$(eval $(call ParseKeywordVariable, MICRO, \
SINGLE_KEYWORDS := ITER FORK TIME WARMUP_ITER WARMUP_TIME, \
- STRING_KEYWORDS := OPTIONS JAVA_OPTIONS VM_OPTIONS RESULTS_FORMAT TEST_JDK BENCHMARKS_JAR, \
+ STRING_KEYWORDS := OPTIONS JAVA_OPTIONS VM_OPTIONS RESULTS_FORMAT TEST_JDK \
+ BENCHMARKS_JAR, \
))
ifneq ($(MICRO), )
@@ -348,8 +368,8 @@ endef
# Helper function to determine if a test specification is a microbenchmark test
#
-# It is a microbenchmark test if it is either "micro", or "micro:" followed by an optional
-# test filter string.
+# It is a microbenchmark test if it is either "micro", or "micro:" followed by
+# an optional test filter string.
define ParseMicroTestSelection
$(if $(filter micro%, $1), \
$(if $(filter micro, $1), \
@@ -439,8 +459,8 @@ endef
# Helper function to determine if a test specification is a special test
#
# It is a special test if it is "special:" followed by a test name,
-# if it is "make:" or "make-" followed by a make test, or any of the special test names
-# as a single word.
+# if it is "make:" or "make-" followed by a make test, or any of the special
+# test names as a single word.
define ParseSpecialTestSelection
$(if $(filter special:%, $1), \
$1 \
@@ -555,13 +575,13 @@ define SetupRunGtestTestBody
))
endif
- run-test-$1: $$($1_AOT_TARGETS)
+ run-test-$1: pre-run-test $$($1_AOT_TARGETS)
$$(call LogWarn)
$$(call LogWarn, Running test '$$($1_TEST)')
$$(call MakeDir, $$($1_TEST_RESULTS_DIR) $$($1_TEST_SUPPORT_DIR))
$$(call ExecuteWithLog, $$($1_TEST_SUPPORT_DIR)/gtest, \
$$(FIXPATH) $$(TEST_IMAGE_DIR)/hotspot/gtest/$$($1_VARIANT)/gtestLauncher \
- -jdk $(JDK_IMAGE_DIR) $$($1_GTEST_FILTER) \
+ -jdk $(JDK_UNDER_TEST) $$($1_GTEST_FILTER) \
--gtest_output=xml:$$($1_TEST_RESULTS_DIR)/gtest.xml \
$$($1_GTEST_REPEAT) $$(GTEST_OPTIONS) $$(GTEST_VM_OPTIONS) \
$$(GTEST_JAVA_OPTIONS) $$($1_AOT_OPTIONS) \
@@ -597,7 +617,9 @@ define SetupRunGtestTestBody
$1: run-test-$1 parse-test-$1
- TARGETS += $1
+ TARGETS += $1 run-test-$1 parse-test-$1
+ TEST_TARGETS += parse-test-$1
+
endef
################################################################################
@@ -631,7 +653,7 @@ define SetupRunMicroTestBody
$1_TEST_NAME := $$(strip $$(patsubst micro:%, %, $$($1_TEST)))
$$(eval $$(call SetMicroValue,$1,MICRO_BENCHMARKS_JAR,$$(TEST_IMAGE_DIR)/micro/benchmarks.jar))
- $$(eval $$(call SetMicroValue,$1,MICRO_TEST_JDK,$$(JDK_IMAGE_DIR)))
+ $$(eval $$(call SetMicroValue,$1,MICRO_TEST_JDK,$$(JDK_UNDER_TEST)))
$$(eval $$(call SetMicroValue,$1,MICRO_JAVA_OPTIONS))
# Current tests needs to open java.io
@@ -639,7 +661,8 @@ define SetupRunMicroTestBody
# Save output as JSON or CSV file
ifneq ($$(MICRO_RESULTS_FORMAT), )
- $1_MICRO_BASIC_OPTIONS += -rf $$(MICRO_RESULTS_FORMAT) -rff $$($1_TEST_RESULTS_DIR)/jmh-result.$(MICRO_RESULTS_FORMAT)
+ $1_MICRO_BASIC_OPTIONS += -rf $$(MICRO_RESULTS_FORMAT)
+ $1_MICRO_BASIC_OPTIONS += -rff $$($1_TEST_RESULTS_DIR)/jmh-result.$(MICRO_RESULTS_FORMAT)
endif
ifneq ($$(MICRO_VM_OPTIONS)$$(MICRO_JAVA_OPTIONS), )
@@ -662,7 +685,7 @@ define SetupRunMicroTestBody
$1_MICRO_WARMUP_TIME := -w $$(MICRO_WARMUP_TIME)
endif
- run-test-$1:
+ run-test-$1: pre-run-test
$$(call LogWarn)
$$(call LogWarn, Running test '$$($1_TEST)')
$$(call MakeDir, $$($1_TEST_RESULTS_DIR) $$($1_TEST_SUPPORT_DIR))
@@ -670,7 +693,7 @@ define SetupRunMicroTestBody
$$($1_MICRO_TEST_JDK)/bin/java $$($1_MICRO_JAVA_OPTIONS) -jar $$($1_MICRO_BENCHMARKS_JAR) \
$$($1_MICRO_ITER) $$($1_MICRO_FORK) $$($1_MICRO_TIME) \
$$($1_MICRO_WARMUP_ITER) $$($1_MICRO_WARMUP_TIME) \
- $$($1_MICRO_VM_OPTIONS) $$($1_MICRO_BASIC_OPTIONS) $$(MICRO_OPTIONS) \
+ $$($1_MICRO_VM_OPTIONS) $$($1_MICRO_BASIC_OPTIONS) $$(MICRO_OPTIONS) \
$$($1_TEST_NAME) \
> >($(TEE) $$($1_TEST_RESULTS_DIR)/micro.txt) \
&& $$(ECHO) $$$$? > $$($1_EXITCODE) \
@@ -704,7 +727,9 @@ define SetupRunMicroTestBody
$1: run-test-$1 parse-test-$1
- TARGETS += $1
+ TARGETS += $1 run-test-$1 parse-test-$1
+ TEST_TARGETS += parse-test-$1
+
endef
################################################################################
@@ -874,20 +899,22 @@ define SetupRunJtregTestBody
clean-workdir-$1:
$$(RM) -r $$($1_TEST_SUPPORT_DIR)
- run-test-$1: clean-workdir-$1 $$($1_AOT_TARGETS)
+ run-test-$1: pre-run-test clean-workdir-$1 $$($1_AOT_TARGETS)
$$(call LogWarn)
$$(call LogWarn, Running test '$$($1_TEST)')
$$(call MakeDir, $$($1_TEST_RESULTS_DIR) $$($1_TEST_SUPPORT_DIR))
$$(call ExecuteWithLog, $$($1_TEST_SUPPORT_DIR)/jtreg, \
+ $$(JCOV_ENVIRONMENT) \
$$(JAVA) $$($1_JTREG_LAUNCHER_OPTIONS) \
-Dprogram=jtreg -jar $$(JT_HOME)/lib/jtreg.jar \
$$($1_JTREG_BASIC_OPTIONS) \
- -testjdk:$$(JDK_IMAGE_DIR) \
+ -testjdk:$$(JDK_UNDER_TEST) \
-dir:$$(JTREG_TOPDIR) \
-reportDir:$$($1_TEST_RESULTS_DIR) \
-workDir:$$($1_TEST_SUPPORT_DIR) \
$$(JTREG_OPTIONS) \
$$(JTREG_FAILURE_HANDLER_OPTIONS) \
+ $$(JTREG_JCOV_OPTIONS) \
$$($1_TEST_NAME) \
&& $$(ECHO) $$$$? > $$($1_EXITCODE) \
|| $$(ECHO) $$$$? > $$($1_EXITCODE) \
@@ -921,9 +948,11 @@ define SetupRunJtregTestBody
$$(eval $1_TOTAL := 1) \
)
- $1: run-test-$1 parse-test-$1
+ $1: run-test-$1 parse-test-$1 clean-workdir-$1
+
+ TARGETS += $1 run-test-$1 parse-test-$1 clean-workdir-$1
+ TEST_TARGETS += parse-test-$1
- TARGETS += $1
endef
################################################################################
@@ -961,7 +990,7 @@ define SetupRunSpecialTestBody
$$(error Invalid special test specification: $$($1_TEST_NAME))
endif
- run-test-$1: $(TEST_PREREQS)
+ run-test-$1: pre-run-test
$$(call LogWarn)
$$(call LogWarn, Running test '$$($1_TEST)')
$$(call MakeDir, $$($1_TEST_RESULTS_DIR) $$($1_TEST_SUPPORT_DIR))
@@ -987,7 +1016,9 @@ define SetupRunSpecialTestBody
$1: run-test-$1 parse-test-$1
- TARGETS += $1
+ TARGETS += $1 run-test-$1 parse-test-$1
+ TEST_TARGETS += parse-test-$1
+
endef
################################################################################
@@ -1049,12 +1080,36 @@ endif
# The main target for RunTests.gmk
################################################################################
-# The SetupRun*Test functions have populated TARGETS.
+#
+# Provide hooks for adding functionality before and after all tests are run.
+#
+$(call LogInfo, RunTest setup starting)
+
+# This target depends on all actual test having been run (TEST_TARGETS has beeen
+# populated by the SetupRun*Test functions). If you need to provide a teardown
+# hook, you must let it depend on this target.
+run-all-tests: $(TEST_TARGETS)
+ $(call LogInfo, RunTest teardown starting)
+
+# This is an abstract target that will be run before any actual tests. Add your
+# target as a dependency to thisif you need "setup" type functionality executed
+# before all tests.
+pre-run-test:
+ $(call LogInfo, RunTest setup done)
+
+# This is an abstract target that will be run after all actual tests, but before
+# the test summary. If you need "teardown" type functionality, add your target
+# as a dependency on this, and let the teardown target depend on run-all-tests.
+post-run-test: run-all-tests
+ $(call LogInfo, RunTest teardown done)
+
+#
+# Create and print a table of the result of all tests run
+#
TEST_FAILURE := false
-run-test: $(TARGETS)
- # Create and print a table of the result of all tests run
+run-test-report: post-run-test
$(RM) $(TEST_SUMMARY).old 2> /dev/null
$(MV) $(TEST_SUMMARY) $(TEST_SUMMARY).old 2> /dev/null || true
$(RM) $(TEST_LAST_IDS).old 2> /dev/null
@@ -1098,8 +1153,54 @@ run-test: $(TARGETS)
$(CAT) $(TEST_SUMMARY)
$(ECHO)
+# The main run-test target
+run-test: run-test-report
+
+TARGETS += run-all-tests pre-run-test post-run-test run-test-report run-test
+
+################################################################################
+# Setup JCov
+################################################################################
+
+ifeq ($(TEST_OPTS_JCOV), true)
+
+ jcov-do-start-grabber:
+ $(call MakeDir, $(JCOV_OUTPUT_DIR))
+ if $(JAVA) -jar $(JCOV_HOME)/lib/jcov.jar GrabberManager -status 1>/dev/null 2>&1 ; then \
+ $(JAVA) -jar $(JCOV_HOME)/lib/jcov.jar GrabberManager -stop -stoptimeout 3600 ; \
+ fi
+ $(JAVA) -Xmx4g -jar $(JCOV_HOME)/lib/jcov.jar Grabber -v -t \
+ $(JCOV_IMAGE_DIR)/template.xml -o $(JCOV_RESULT_FILE) \
+ 1>$(JCOV_GRABBER_LOG) 2>&1 &
+
+ jcov-start-grabber: jcov-do-start-grabber
+ $(call LogWarn, Starting JCov Grabber...)
+ $(JAVA) -jar $(JCOV_HOME)/lib/jcov.jar GrabberManager -t 600 -wait
+
+ jcov-stop-grabber:
+ $(call LogWarn, Stopping JCov Grabber...)
+ $(JAVA) -jar $(JCOV_HOME)/lib/jcov.jar GrabberManager -stop -stoptimeout 3600
+
+ jcov-gen-report: jcov-stop-grabber
+ $(call LogWarn, Generating JCov report ...)
+ $(JAVA) -Xmx4g -jar $(JCOV_HOME)/lib/jcov.jar RepGen -sourcepath \
+ `$(ECHO) $(TOPDIR)/src/*/share/classes/ | $(TR) ' ' ':'` -fmt html \
+ -o $(JCOV_REPORT) $(JCOV_RESULT_FILE)
+
+ TARGETS += jcov-do-start-grabber jcov-start-grabber jcov-stop-grabber \
+ jcov-gen-report
+
+ # Hook this into the framework at appropriate places
+ pre-run-test: jcov-start-grabber
+
+ post-run-test: jcov-gen-report
+
+ jcov-gen-report: run-all-tests
+
+endif
+
################################################################################
all: run-test
-.PHONY: default all run-test $(TARGETS)
+.PHONY: default all $(TARGETS)
diff --git a/make/RunTestsPrebuilt.gmk b/make/RunTestsPrebuilt.gmk
index 3ab849ad64e..5a40f42270c 100644
--- a/make/RunTestsPrebuilt.gmk
+++ b/make/RunTestsPrebuilt.gmk
@@ -95,12 +95,12 @@ endef
# $1: The output file name
# $2..$N: The lines to output to the file
define CreateNewSpec
- $(if $(strip $(31)), \
+ $(if $(strip $(33)), \
$(error Internal makefile error: \
Too many arguments to macro, please update CreateNewSpec in RunTestsPrebuilt.gmk) \
) \
$(shell $(RM) $1) \
- $(foreach i, $(call sequence, 2, 30), \
+ $(foreach i, $(call sequence, 2, 32), \
$(if $(strip $($i)), \
$(call AppendFile, $(strip $($i)), $1) \
) \
@@ -254,31 +254,35 @@ endif
# Setup LD for AOT support
ifneq ($(DEVKIT_HOME), )
ifeq ($(OPENJDK_TARGET_OS), windows)
- LD := $(DEVKIT_HOME)/VC/bin/x64/link
+ LD_JAOTC := $(DEVKIT_HOME)/VC/bin/x64/link.exe
LIBRARY_PREFIX :=
SHARED_LIBRARY_SUFFIX := .dll
- EXE_SUFFIX := .exe
else ifeq ($(OPENJDK_TARGET_OS), linux)
- LD := $(DEVKIT_HOME)/bin/ld
+ LD_JAOTC := $(DEVKIT_HOME)/bin/ld
LIBRARY_PREFIX := lib
SHARED_LIBRARY_SUFFIX := .so
- EXE_SUFFIX :=
else ifeq ($(OPENJDK_TARGET_OS), macosx)
- LD := $(DEVKIT_HOME)/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/ld
+ LD_JAOTC := $(DEVKIT_HOME)/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/ld
LIBRARY_PREFIX := lib
SHARED_LIBRARY_SUFFIX := .dylib
- EXE_SUFFIX :=
else ifeq ($(OPENJDK_TARGET_OS), solaris)
# Prefer system linker for AOT on Solaris.
- LD := ld
+ LD_JAOTC := ld
LIBRARY_PREFIX := lib
SHARED_LIBRARY_SUFFIX := .so
- EXE_SUFFIX :=
endif
else
LD := ld
endif
+ifneq ($(wildcard $(JDK_IMAGE_DIR)/template.xml), )
+ TEST_OPTS_JCOV := true
+ JCOV_IMAGE_DIR := $(JDK_IMAGE_DIR)
+else
+ TEST_OPTS_JCOV := false
+ JCOV_IMAGE_DIR :=
+endif
+
################################################################################
# Generate the ephemeral spec file
################################################################################
@@ -299,6 +303,7 @@ $(call CreateNewSpec, $(NEW_SPEC), \
BOOT_JDK := $(BOOT_JDK), \
JT_HOME := $(JT_HOME), \
JDK_IMAGE_DIR := $(JDK_IMAGE_DIR), \
+ JCOV_IMAGE_DIR := $(JCOV_IMAGE_DIR), \
TEST_IMAGE_DIR := $(TEST_IMAGE_DIR), \
SYMBOLS_IMAGE_DIR := $(SYMBOLS_IMAGE_DIR), \
MAKE := $(MAKE), \
@@ -315,11 +320,11 @@ $(call CreateNewSpec, $(NEW_SPEC), \
OPENJDK_TARGET_CPU_ENDIAN := $(OPENJDK_TARGET_CPU_ENDIAN), \
NUM_CORES := $(NUM_CORES), \
MEMORY_SIZE := $(MEMORY_SIZE), \
- LD := $(LD), \
+ LD_JAOTC := $(LD_JAOTC), \
LIBRARY_PREFIX := $(LIBRARY_PREFIX), \
SHARED_LIBRARY_SUFFIX := $(SHARED_LIBRARY_SUFFIX), \
- EXE_SUFFIX := $(EXE_SUFFIX), \
include $(TOPDIR)/make/RunTestsPrebuiltSpec.gmk, \
+ TEST_OPTS_JCOV := $(TEST_OPTS_JCOV), \
$(CUSTOM_NEW_SPEC_LINE), \
)
diff --git a/make/UpdateBuildDocs.gmk b/make/UpdateBuildDocs.gmk
index 51f7a6588c5..011be4c620e 100644
--- a/make/UpdateBuildDocs.gmk
+++ b/make/UpdateBuildDocs.gmk
@@ -34,7 +34,7 @@ include ProcessMarkdown.gmk
#
################################################################################
-ifeq ($(PANDOC), )
+ifeq ($(ENABLE_PANDOC), false)
$(info No pandoc executable was detected by configure)
$(error Cannot continue)
endif
diff --git a/make/autoconf/basics.m4 b/make/autoconf/basics.m4
index 4ca536ac396..b8cbe91342d 100644
--- a/make/autoconf/basics.m4
+++ b/make/autoconf/basics.m4
@@ -999,7 +999,7 @@ AC_DEFUN([BASIC_CHECK_MAKE_VERSION],
elif test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.msys"; then
MAKE_EXPECTED_ENV='msys'
elif test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.wsl"; then
- MAKE_EXPECTED_ENV='x86_64-pc-linux-gnu'
+ MAKE_EXPECTED_ENV='x86_64-.*-linux-gnu'
else
AC_MSG_ERROR([Unknown Windows environment])
fi
diff --git a/make/autoconf/flags-cflags.m4 b/make/autoconf/flags-cflags.m4
index 48dccad5adb..14b4f1ae7d7 100644
--- a/make/autoconf/flags-cflags.m4
+++ b/make/autoconf/flags-cflags.m4
@@ -527,8 +527,8 @@ AC_DEFUN([FLAGS_SETUP_CFLAGS_HELPER],
fi
if test "x$TOOLCHAIN_TYPE" = xgcc; then
- TOOLCHAIN_CFLAGS_JVM="$TOOLCHAIN_CFLAGS_JVM -fcheck-new"
- TOOLCHAIN_CFLAGS_JDK="-pipe"
+ TOOLCHAIN_CFLAGS_JVM="$TOOLCHAIN_CFLAGS_JVM -fcheck-new -fstack-protector"
+ TOOLCHAIN_CFLAGS_JDK="-pipe -fstack-protector"
TOOLCHAIN_CFLAGS_JDK_CONLY="-fno-strict-aliasing" # technically NOT for CXX (but since this gives *worse* performance, use no-strict-aliasing everywhere!)
CXXSTD_CXXFLAG="-std=gnu++98"
@@ -572,10 +572,10 @@ AC_DEFUN([FLAGS_SETUP_CFLAGS_HELPER],
elif test "x$TOOLCHAIN_TYPE" = xxlc; then
# Suggested additions: -qsrcmsg to get improved error reporting
- TOOLCHAIN_CFLAGS_JDK="-qchars=signed -qfullpath -qsaveopt" # add on both CFLAGS
+ TOOLCHAIN_CFLAGS_JDK="-qchars=signed -qfullpath -qsaveopt -qstackprotect" # add on both CFLAGS
TOOLCHAIN_CFLAGS_JVM="-qtune=balanced \
-qalias=noansi -qstrict -qtls=default -qlanglvl=c99vla \
- -qlanglvl=noredefmac -qnortti -qnoeh -qignerrno"
+ -qlanglvl=noredefmac -qnortti -qnoeh -qignerrno -qstackprotect"
elif test "x$TOOLCHAIN_TYPE" = xmicrosoft; then
TOOLCHAIN_CFLAGS_JVM="-nologo -MD -MP"
TOOLCHAIN_CFLAGS_JDK="-nologo -MD -Zc:wchar_t-"
diff --git a/make/autoconf/hotspot.m4 b/make/autoconf/hotspot.m4
index ce9bab6923e..ae0a79ff380 100644
--- a/make/autoconf/hotspot.m4
+++ b/make/autoconf/hotspot.m4
@@ -47,8 +47,8 @@ AC_DEFUN([HOTSPOT_CHECK_JVM_VARIANT],
[ [ [[ " $JVM_VARIANTS " =~ " $1 " ]] ] ])
###############################################################################
-# Check if the specified JVM features are explicitly enabled. To be used in
-# shell if constructs, like this:
+# Check if the specified JVM feature is enabled. To be used in shell if
+# constructs, like this:
# if HOTSPOT_CHECK_JVM_FEATURE(jvmti); then
#
# Only valid to use after HOTSPOT_SETUP_JVM_FEATURES has setup features.
@@ -58,6 +58,20 @@ AC_DEFUN([HOTSPOT_CHECK_JVM_VARIANT],
AC_DEFUN([HOTSPOT_CHECK_JVM_FEATURE],
[ [ [[ " $JVM_FEATURES " =~ " $1 " ]] ] ])
+###############################################################################
+# Check if the specified JVM feature is explicitly disabled. To be used in
+# shell if constructs, like this:
+# if HOTSPOT_IS_JVM_FEATURE_DISABLED(jvmci); then
+#
+# This function is internal to hotspot.m4, and is only used when constructing
+# the valid set of enabled JVM features. Users outside of hotspot.m4 should just
+# use HOTSPOT_CHECK_JVM_FEATURE to check if a feature is enabled or not.
+
+# Definition kept in one line to allow inlining in if statements.
+# Additional [] needed to keep m4 from mangling shell constructs.
+AC_DEFUN([HOTSPOT_IS_JVM_FEATURE_DISABLED],
+[ [ [[ " $DISABLED_JVM_FEATURES " =~ " $1 " ]] ] ])
+
###############################################################################
# Check which variants of the JVM that we want to build. Available variants are:
# server: normal interpreter, and a tiered C1/C2 compiler
@@ -373,8 +387,7 @@ AC_DEFUN_ONCE([HOTSPOT_SETUP_JVM_FEATURES],
AC_MSG_CHECKING([if jvmci module jdk.internal.vm.ci should be built])
# Check if jvmci is diabled
- DISABLE_JVMCI=`$ECHO $DISABLED_JVM_FEATURES | $GREP jvmci`
- if test "x$DISABLE_JVMCI" = "xjvmci"; then
+ if HOTSPOT_IS_JVM_FEATURE_DISABLED(jvmci); then
AC_MSG_RESULT([no, forced])
JVM_FEATURES_jvmci=""
INCLUDE_JVMCI="false"
@@ -400,8 +413,7 @@ AC_DEFUN_ONCE([HOTSPOT_SETUP_JVM_FEATURES],
AC_MSG_CHECKING([if graal module jdk.internal.vm.compiler should be built])
# Check if graal is diabled
- DISABLE_GRAAL=`$ECHO $DISABLED_JVM_FEATURES | $GREP graal`
- if test "x$DISABLE_GRAAL" = "xgraal"; then
+ if HOTSPOT_IS_JVM_FEATURE_DISABLED(graal); then
AC_MSG_RESULT([no, forced])
JVM_FEATURES_graal=""
INCLUDE_GRAAL="false"
@@ -433,8 +445,7 @@ AC_DEFUN_ONCE([HOTSPOT_SETUP_JVM_FEATURES],
AC_SUBST(INCLUDE_GRAAL)
# Disable aot with '--with-jvm-features=-aot'
- DISABLE_AOT=`$ECHO $DISABLED_JVM_FEATURES | $GREP aot`
- if test "x$DISABLE_AOT" = "xaot"; then
+ if HOTSPOT_IS_JVM_FEATURE_DISABLED(aot); then
ENABLE_AOT="false"
fi
@@ -458,7 +469,7 @@ AC_DEFUN_ONCE([HOTSPOT_SETUP_JVM_FEATURES],
JVM_FEATURES_aot="aot"
fi
else
- if test "x$enable_aot" = "xno" || test "x$DISABLE_AOT" = "xaot"; then
+ if test "x$enable_aot" = "xno" || HOTSPOT_IS_JVM_FEATURE_DISABLED(aot); then
AC_MSG_RESULT([no, forced])
else
AC_MSG_RESULT([no])
@@ -490,8 +501,7 @@ AC_DEFUN_ONCE([HOTSPOT_SETUP_JVM_FEATURES],
fi
# Disable CDS if user requested it with --with-jvm-features=-cds.
- DISABLE_CDS=`$ECHO $DISABLED_JVM_FEATURES | $GREP cds`
- if test "x$DISABLE_CDS" = "xcds"; then
+ if HOTSPOT_IS_JVM_FEATURE_DISABLED(cds); then
ENABLE_CDS="false"
if test "x$enable_cds" = "xyes"; then
AC_MSG_ERROR([CDS was disabled by --with-jvm-features=-cds. Remove --enable-cds.])
diff --git a/make/autoconf/spec.gmk.in b/make/autoconf/spec.gmk.in
index b6d5a126d02..1571197503b 100644
--- a/make/autoconf/spec.gmk.in
+++ b/make/autoconf/spec.gmk.in
@@ -487,6 +487,9 @@ CPP:=@FIXPATH@ @CPP@
# The linker can be gcc or ld on unix systems, or link.exe on windows systems.
LD:=@FIXPATH@ @LD@
+# Linker used by the jaotc tool for AOT compilation.
+LD_JAOTC:=@LD_JAOTC@
+
# Xcode SDK path
SDKROOT:=@SDKROOT@
diff --git a/make/autoconf/toolchain.m4 b/make/autoconf/toolchain.m4
index c8c6dcc4d36..a967dd6110c 100644
--- a/make/autoconf/toolchain.m4
+++ b/make/autoconf/toolchain.m4
@@ -715,12 +715,18 @@ AC_DEFUN_ONCE([TOOLCHAIN_DETECT_TOOLCHAIN_CORE],
AC_MSG_RESULT([yes])
fi
LDCXX="$LD"
+ # jaotc being a windows program expects the linker to be supplied with exe suffix.
+ LD_JAOTC="$LD$EXE_SUFFIX"
else
# All other toolchains use the compiler to link.
LD="$CC"
LDCXX="$CXX"
+ # jaotc expects 'ld' as the linker rather than the compiler.
+ BASIC_CHECK_TOOLS([LD_JAOTC], ld)
+ BASIC_FIXUP_EXECUTABLE(LD_JAOTC)
fi
AC_SUBST(LD)
+ AC_SUBST(LD_JAOTC)
# FIXME: it should be CXXLD, according to standard (cf CXXCPP)
AC_SUBST(LDCXX)
diff --git a/make/autoconf/toolchain_windows.m4 b/make/autoconf/toolchain_windows.m4
index 75fee9fd332..4969dffb270 100644
--- a/make/autoconf/toolchain_windows.m4
+++ b/make/autoconf/toolchain_windows.m4
@@ -272,7 +272,26 @@ AC_DEFUN([TOOLCHAIN_FIND_VISUAL_STUDIO],
eval USE_UCRT="\${VS_USE_UCRT_${VS_VERSION}}"
eval VS_SUPPORTED="\${VS_SUPPORTED_${VS_VERSION}}"
eval PLATFORM_TOOLSET="\${VS_VS_PLATFORM_NAME_${VS_VERSION}}"
- VS_PATH="$TOOLCHAIN_PATH:$PATH"
+
+ # The TOOLCHAIN_PATH from a devkit is in Unix format. In WSL we need a
+ # windows version of the complete VS_PATH as VS_PATH_WINDOWS
+ if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.wsl"; then
+ # Convert the toolchain path
+ OLDIFS="$IFS"
+ IFS=":"
+ VS_PATH_WINDOWS=""
+ for i in $TOOLCHAIN_PATH; do
+ path=$i
+ BASIC_WINDOWS_REWRITE_AS_WINDOWS_MIXED_PATH([path])
+ VS_PATH_WINDOWS="$VS_PATH_WINDOWS;$path"
+ done
+ IFS="$OLDIFS"
+ # Append the current path from Windows env
+ WINDOWS_PATH="`$CMD /c echo %PATH%`"
+ VS_PATH_WINDOWS="$VS_PATH_WINDOWS;$WINDOWS_PATH"
+ else
+ VS_PATH="$TOOLCHAIN_PATH:$PATH"
+ fi
# Convert DEVKIT_VS_INCLUDE into windows style VS_INCLUDE so that it
# can still be exported as INCLUDE for compiler invocations without
@@ -450,6 +469,34 @@ AC_DEFUN([TOOLCHAIN_SETUP_VISUAL_STUDIO_ENV],
. $VS_ENV_TMP_DIR/set-vs-env.sh
# Now we have VS_PATH, VS_INCLUDE, VS_LIB. For further checking, we
# also define VCINSTALLDIR, WindowsSdkDir and WINDOWSSDKDIR.
+
+ # In WSL, the extracted VS_PATH is Windows style. This needs to be
+ # rewritten as Unix style and the Windows style version is saved
+ # in VS_PATH_WINDOWS.
+ if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.wsl"; then
+ OLDIFS="$IFS"
+ IFS=";"
+ # Convert VS_PATH to unix style
+ VS_PATH_WINDOWS="$VS_PATH"
+ VS_PATH=""
+ for i in $VS_PATH_WINDOWS; do
+ path=$i
+ # Only process non-empty elements
+ if test "x$path" != x; then
+ IFS="$OLDIFS"
+ # Check that directory exists before calling fixup_path
+ testpath=$path
+ BASIC_WINDOWS_REWRITE_AS_UNIX_PATH([testpath])
+ if test -d "$testpath"; then
+ BASIC_FIXUP_PATH([path])
+ BASIC_APPEND_TO_PATH(VS_PATH, $path)
+ fi
+ IFS=";"
+ fi
+ done
+ IFS="$OLDIFS"
+ fi
+
else
# We did not find a vsvars bat file, let's hope we are run from a VS command prompt.
AC_MSG_NOTICE([Cannot locate a valid Visual Studio installation, checking current environment])
@@ -483,29 +530,9 @@ AC_DEFUN([TOOLCHAIN_SETUP_VISUAL_STUDIO_ENV],
AC_SUBST(VS_INCLUDE)
AC_SUBST(VS_LIB)
+ # Convert VS_INCLUDE into SYSROOT_CFLAGS
OLDIFS="$IFS"
IFS=";"
- if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.wsl"; then
- # Convert VS_PATH to unix style
- VS_PATH_WINDOWS="$VS_PATH"
- VS_PATH=""
- for i in $VS_PATH_WINDOWS; do
- path=$i
- # Only process non-empty elements
- if test "x$path" != x; then
- IFS="$OLDIFS"
- # Check that directory exists before calling fixup_path
- testpath=$path
- BASIC_WINDOWS_REWRITE_AS_UNIX_PATH([testpath])
- if test -d "$testpath"; then
- BASIC_FIXUP_PATH([path])
- BASIC_APPEND_TO_PATH(VS_PATH, $path)
- fi
- IFS=";"
- fi
- done
- fi
- # Convert VS_INCLUDE into SYSROOT_CFLAGS
for i in $VS_INCLUDE; do
ipath=$i
# Only process non-empty elements
diff --git a/make/common/CopyFiles.gmk b/make/common/CopyFiles.gmk
new file mode 100644
index 00000000000..ac2ef69b4b1
--- /dev/null
+++ b/make/common/CopyFiles.gmk
@@ -0,0 +1,112 @@
+#
+# Copyright (c) 2011, 2019, Oracle and/or its affiliates. All rights reserved.
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+#
+# This code is free software; you can redistribute it and/or modify it
+# under the terms of the GNU General Public License version 2 only, as
+# published by the Free Software Foundation. Oracle designates this
+# particular file as subject to the "Classpath" exception as provided
+# by Oracle in the LICENSE file that accompanied this code.
+#
+# This code is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+# version 2 for more details (a copy is included in the LICENSE file that
+# accompanied this code).
+#
+# You should have received a copy of the GNU General Public License version
+# 2 along with this work; if not, write to the Free Software Foundation,
+# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+#
+# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+# or visit www.oracle.com if you need additional information or have any
+# questions.
+#
+
+ifeq (,$(_MAKEBASE_GMK))
+ $(error You must include MakeBase.gmk prior to including CopyFiles.gmk)
+endif
+
+################################################################################
+#
+# Code for handling the SetupCopyFiles macro.
+#
+################################################################################
+
+define AddFileToCopy
+ # Helper macro for SetupCopyFiles
+ # 1 : Source file
+ # 2 : Dest file
+ # 3 : Variable to add targets to
+ # 4 : Macro to call for copy operation
+ # 5 : Action text to log
+ $2: $1
+ $$(call LogInfo, $(strip $5) $$(patsubst $(OUTPUTDIR)/%,%,$$(call DecodeSpace, $$@)))
+ $$($$(strip $4))
+
+ $3 += $2
+ $3_SOURCES += $1
+endef
+
+# Returns the value of the first argument
+identity = \
+ $(strip $1)
+
+# Setup make rules for copying files, with an option to do more complex
+# processing instead of copying.
+#
+# Parameter 1 is the name of the rule. This name is used as variable prefix,
+# and the targets generated are listed in a variable by that name.
+#
+# The list of all source files is returned in $1_SOURCES.
+#
+# Remaining parameters are named arguments. These include:
+# SRC : Source root dir (defaults to dir of first file)
+# DEST : Dest root dir
+# FILES : List of files to copy with absolute paths, or path relative to SRC.
+# Must be in SRC.
+# FLATTEN : Set to flatten the directory structure in the DEST dir.
+# MACRO : Optionally override the default macro used for making the copy.
+# Default is 'install-file'
+# NAME_MACRO : Optionally supply a macro that rewrites the target file name
+# based on the source file name
+# LOG_ACTION : Optionally specify a different action text for log messages
+SetupCopyFiles = $(NamedParamsMacroTemplate)
+define SetupCopyFilesBody
+
+ ifeq ($$($1_MACRO), )
+ $1_MACRO := install-file
+ endif
+
+ # Default SRC to the dir of the first file.
+ ifeq ($$($1_SRC), )
+ $1_SRC := $$(dir $$(firstword $$($1_FILES)))
+ endif
+
+ ifeq ($$($1_NAME_MACRO), )
+ $1_NAME_MACRO := identity
+ endif
+
+ ifeq ($$($1_LOG_ACTION), )
+ $1_LOG_ACTION := Copying
+ endif
+
+ # Remove any trailing slash from SRC and DEST
+ $1_SRC := $$(patsubst %/,%,$$($1_SRC))
+ $1_DEST := $$(patsubst %/,%,$$($1_DEST))
+
+ # Need to wrap arguments in DoubleDollar because of the eval nested inside an
+ # eval macro body.
+ $$(foreach f, $$(patsubst $$($1_SRC)/%,%,$$($1_FILES)), \
+ $$(eval $$(call AddFileToCopy, \
+ $$(call DoubleDollar, $$($1_SRC)/$$f), \
+ $$(call DoubleDollar, \
+ $$($1_DEST)/$$(call $$(strip $$($1_NAME_MACRO)),$$(if $$($1_FLATTEN),$$(notdir $$f),$$f)) \
+ ), \
+ $1, \
+ $$($1_MACRO), \
+ $$($1_LOG_ACTION) \
+ )) \
+ )
+
+endef
diff --git a/make/common/FindTests.gmk b/make/common/FindTests.gmk
index 26525aec80c..1c7eeb6b18b 100644
--- a/make/common/FindTests.gmk
+++ b/make/common/FindTests.gmk
@@ -1,5 +1,5 @@
#
-# Copyright (c) 2017, 2018, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2017, 2019, Oracle and/or its affiliates. All rights reserved.
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
#
# This code is free software; you can redistribute it and/or modify it
diff --git a/make/common/MakeBase.gmk b/make/common/MakeBase.gmk
index de479e353ca..3cae04f7724 100644
--- a/make/common/MakeBase.gmk
+++ b/make/common/MakeBase.gmk
@@ -1,5 +1,5 @@
#
-# Copyright (c) 2011, 2018, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2019, Oracle and/or its affiliates. All rights reserved.
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
#
# This code is free software; you can redistribute it and/or modify it
@@ -70,17 +70,17 @@ ifeq (4.0, $(firstword $(sort 4.0 $(MAKE_VERSION))))
CORRECT_FUNCTION_IN_RECIPE_EVALUATION := true
endif
-##############################
-# Functions
-##############################
-### Debug functions
+# For convenience, MakeBase.gmk continues to include these separate files, at
+# least for now.
-# Prints the name and value of a variable
-PrintVar = \
- $(info $(strip $1) >$($(strip $1))<)
+include $(TOPDIR)/make/common/Utils.gmk
+include $(TOPDIR)/make/common/MakeIO.gmk
+include $(TOPDIR)/make/common/CopyFiles.gmk
-### Functions for timers
+################################################################################
+# Functions for timers
+################################################################################
# Store the build times in this directory.
BUILDTIMESDIR=$(OUTPUTDIR)/make-support/build-times
@@ -116,227 +116,6 @@ define TargetExit
"`$(CAT) $(BUILDTIMESDIR)/build_time_diff_$(patsubst %-only,%,$@) | $(CUT) -f 1 -d ' '`"
endef
-################################################################################
-# This macro translates $ into \$ to protect the $ from expansion in the shell.
-# To make this macro resilient against already escaped strings, first remove
-# any present escapes before escaping so that no double escapes are added.
-EscapeDollar = $(subst $$,\$$,$(subst \$$,$$,$(strip $1)))
-
-################################################################################
-# This macro works just like EscapeDollar above, but for #.
-EscapeHash = $(subst \#,\\\#,$(subst \\\#,\#,$(strip $1)))
-
-################################################################################
-# This macro translates $ into $$ to protect the string from make itself.
-DoubleDollar = $(subst $$,$$$$,$(strip $1))
-
-################################################################################
-# ListPathsSafely can be used to print command parameters to a file. This is
-# typically done if the command line lenght risk being too long for the
-# OS/shell. In later make versions, the file function can be used for this
-# purpose. For earlier versions, a more complex implementation is provided.
-#
-# The function ListPathsSafely can be called either directly or, more commonly
-# from a recipe line. If called from a recipe, it will be executed in the
-# evaluation phase of that recipe, which means that it will write to the file
-# before any other line in the recipe has been run.
-ifeq ($(HAS_FILE_FUNCTION), true)
- # Param 1 - Name of variable containing paths/arguments to output
- # Param 2 - File to print to
- # Param 3 - Set to true to append to file instead of overwriting
- define ListPathsSafely
- $$(call MakeDir, $$(dir $$(strip $2)))
- $$(file $$(if $$(filter true, $$(strip $3)),>>,>) \
- $$(strip $2),$$(subst $$(SPACE),$$(NEWLINE),$$(strip $$($$(strip $1)))))
- endef
-
-else # HAS_FILE_FUNCTION = false
-
- $(eval compress_paths = \
- $(strip $(shell $(CAT) $(TOPDIR)/make/common/support/ListPathsSafely-pre-compress.incl)))
- compress_paths += \
- $(subst $(TOPDIR),X97, \
- $(subst $(OUTPUTDIR),X98, \
- $(subst X,X00, \
- $(subst $(SPACE),\n,$(strip $1)))))
- $(eval compress_paths += \
- $(strip $(shell $(CAT) $(TOPDIR)/make/common/support/ListPathsSafely-post-compress.incl)))
-
- decompress_paths=$(SED) -f $(TOPDIR)/make/common/support/ListPathsSafely-uncompress.sed \
- -e 's|X99|\\n|g' \
- -e 's|X98|$(OUTPUTDIR)|g' -e 's|X97|$(TOPDIR)|g' \
- -e 's|X00|X|g'
-
- ListPathsSafely_IfPrintf = \
- $(if $(word $3,$($(strip $1))), \
- $(shell $(PRINTF) -- "$(strip $(call EscapeDollar, \
- $(call compress_paths, $(wordlist $3,$4,$($(strip $1))))))\n" \
- | $(decompress_paths) >> $2))
-
- # Param 1 - Name of variable containing paths/arguments to output
- # Param 2 - File to print to
- # Param 3 - Set to true to append to file instead of overwriting
- define ListPathsSafely
- ifneq (,$$(word 30001,$$($$(strip $1))))
- $$(error Cannot list safely more than 30000 paths. $1 has $$(words $$($$(strip $1))) paths!)
- endif
- $$(call MakeDir, $$(dir $2))
- ifneq ($$(strip $3), true)
- $$(shell $(RM) $$(strip $2))
- endif
-
- $$(call ListPathsSafely_IfPrintf,$1,$2,1,250)
- $$(call ListPathsSafely_IfPrintf,$1,$2,251,500)
- $$(call ListPathsSafely_IfPrintf,$1,$2,501,750)
- $$(call ListPathsSafely_IfPrintf,$1,$2,751,1000)
-
- $$(call ListPathsSafely_IfPrintf,$1,$2,1001,1250)
- $$(call ListPathsSafely_IfPrintf,$1,$2,1251,1500)
- $$(call ListPathsSafely_IfPrintf,$1,$2,1501,1750)
- $$(call ListPathsSafely_IfPrintf,$1,$2,1751,2000)
-
- $$(call ListPathsSafely_IfPrintf,$1,$2,2001,2250)
- $$(call ListPathsSafely_IfPrintf,$1,$2,2251,2500)
- $$(call ListPathsSafely_IfPrintf,$1,$2,2501,2750)
- $$(call ListPathsSafely_IfPrintf,$1,$2,2751,3000)
-
- $$(call ListPathsSafely_IfPrintf,$1,$2,3001,3250)
- $$(call ListPathsSafely_IfPrintf,$1,$2,3251,3500)
- $$(call ListPathsSafely_IfPrintf,$1,$2,3501,3750)
- $$(call ListPathsSafely_IfPrintf,$1,$2,3751,4000)
-
- $$(call ListPathsSafely_IfPrintf,$1,$2,4001,4250)
- $$(call ListPathsSafely_IfPrintf,$1,$2,4251,4500)
- $$(call ListPathsSafely_IfPrintf,$1,$2,4501,4750)
- $$(call ListPathsSafely_IfPrintf,$1,$2,4751,5000)
-
- $$(call ListPathsSafely_IfPrintf,$1,$2,5001,5250)
- $$(call ListPathsSafely_IfPrintf,$1,$2,5251,5500)
- $$(call ListPathsSafely_IfPrintf,$1,$2,5501,5750)
- $$(call ListPathsSafely_IfPrintf,$1,$2,5751,6000)
-
- $$(call ListPathsSafely_IfPrintf,$1,$2,6001,6250)
- $$(call ListPathsSafely_IfPrintf,$1,$2,6251,6500)
- $$(call ListPathsSafely_IfPrintf,$1,$2,6501,6750)
- $$(call ListPathsSafely_IfPrintf,$1,$2,6751,7000)
-
- $$(call ListPathsSafely_IfPrintf,$1,$2,7001,7250)
- $$(call ListPathsSafely_IfPrintf,$1,$2,7251,7500)
- $$(call ListPathsSafely_IfPrintf,$1,$2,7501,7750)
- $$(call ListPathsSafely_IfPrintf,$1,$2,7751,8000)
-
- $$(call ListPathsSafely_IfPrintf,$1,$2,8001,8250)
- $$(call ListPathsSafely_IfPrintf,$1,$2,8251,8500)
- $$(call ListPathsSafely_IfPrintf,$1,$2,8501,8750)
- $$(call ListPathsSafely_IfPrintf,$1,$2,8751,9000)
-
- $$(call ListPathsSafely_IfPrintf,$1,$2,9001,9250)
- $$(call ListPathsSafely_IfPrintf,$1,$2,9251,9500)
- $$(call ListPathsSafely_IfPrintf,$1,$2,9501,9750)
- $$(call ListPathsSafely_IfPrintf,$1,$2,9751,10000)
-
- $$(call ListPathsSafely_IfPrintf,$1,$2,10001,10250)
- $$(call ListPathsSafely_IfPrintf,$1,$2,10251,10500)
- $$(call ListPathsSafely_IfPrintf,$1,$2,10501,10750)
- $$(call ListPathsSafely_IfPrintf,$1,$2,10751,11000)
-
- $$(call ListPathsSafely_IfPrintf,$1,$2,11001,11250)
- $$(call ListPathsSafely_IfPrintf,$1,$2,11251,11500)
- $$(call ListPathsSafely_IfPrintf,$1,$2,11501,11750)
- $$(call ListPathsSafely_IfPrintf,$1,$2,11751,12000)
-
- $$(call ListPathsSafely_IfPrintf,$1,$2,12001,12250)
- $$(call ListPathsSafely_IfPrintf,$1,$2,12251,12500)
- $$(call ListPathsSafely_IfPrintf,$1,$2,12501,12750)
- $$(call ListPathsSafely_IfPrintf,$1,$2,12751,13000)
-
- $$(call ListPathsSafely_IfPrintf,$1,$2,13001,13250)
- $$(call ListPathsSafely_IfPrintf,$1,$2,13251,13500)
- $$(call ListPathsSafely_IfPrintf,$1,$2,13501,13750)
- $$(call ListPathsSafely_IfPrintf,$1,$2,13751,14000)
-
- $$(call ListPathsSafely_IfPrintf,$1,$2,14001,14250)
- $$(call ListPathsSafely_IfPrintf,$1,$2,14251,14500)
- $$(call ListPathsSafely_IfPrintf,$1,$2,14501,14750)
- $$(call ListPathsSafely_IfPrintf,$1,$2,14751,15000)
-
- $$(call ListPathsSafely_IfPrintf,$1,$2,15001,15250)
- $$(call ListPathsSafely_IfPrintf,$1,$2,15251,15500)
- $$(call ListPathsSafely_IfPrintf,$1,$2,15501,15750)
- $$(call ListPathsSafely_IfPrintf,$1,$2,15751,16000)
-
- $$(call ListPathsSafely_IfPrintf,$1,$2,16001,16250)
- $$(call ListPathsSafely_IfPrintf,$1,$2,16251,16500)
- $$(call ListPathsSafely_IfPrintf,$1,$2,16501,16750)
- $$(call ListPathsSafely_IfPrintf,$1,$2,16751,17000)
-
- $$(call ListPathsSafely_IfPrintf,$1,$2,17001,17250)
- $$(call ListPathsSafely_IfPrintf,$1,$2,17251,17500)
- $$(call ListPathsSafely_IfPrintf,$1,$2,17501,17750)
- $$(call ListPathsSafely_IfPrintf,$1,$2,17751,18000)
-
- $$(call ListPathsSafely_IfPrintf,$1,$2,18001,18250)
- $$(call ListPathsSafely_IfPrintf,$1,$2,18251,18500)
- $$(call ListPathsSafely_IfPrintf,$1,$2,18501,18750)
- $$(call ListPathsSafely_IfPrintf,$1,$2,18751,19000)
-
- $$(call ListPathsSafely_IfPrintf,$1,$2,19001,19250)
- $$(call ListPathsSafely_IfPrintf,$1,$2,19251,19500)
- $$(call ListPathsSafely_IfPrintf,$1,$2,19501,19750)
- $$(call ListPathsSafely_IfPrintf,$1,$2,19751,20000)
-
- $$(call ListPathsSafely_IfPrintf,$1,$2,20001,20250)
- $$(call ListPathsSafely_IfPrintf,$1,$2,20251,20500)
- $$(call ListPathsSafely_IfPrintf,$1,$2,20501,20750)
- $$(call ListPathsSafely_IfPrintf,$1,$2,20751,21000)
-
- $$(call ListPathsSafely_IfPrintf,$1,$2,21001,21250)
- $$(call ListPathsSafely_IfPrintf,$1,$2,21251,21500)
- $$(call ListPathsSafely_IfPrintf,$1,$2,21501,21750)
- $$(call ListPathsSafely_IfPrintf,$1,$2,21751,22000)
-
- $$(call ListPathsSafely_IfPrintf,$1,$2,22001,22250)
- $$(call ListPathsSafely_IfPrintf,$1,$2,22251,22500)
- $$(call ListPathsSafely_IfPrintf,$1,$2,22501,22750)
- $$(call ListPathsSafely_IfPrintf,$1,$2,22751,23000)
-
- $$(call ListPathsSafely_IfPrintf,$1,$2,23001,23250)
- $$(call ListPathsSafely_IfPrintf,$1,$2,23251,23500)
- $$(call ListPathsSafely_IfPrintf,$1,$2,23501,23750)
- $$(call ListPathsSafely_IfPrintf,$1,$2,23751,24000)
-
- $$(call ListPathsSafely_IfPrintf,$1,$2,24001,24250)
- $$(call ListPathsSafely_IfPrintf,$1,$2,24251,24500)
- $$(call ListPathsSafely_IfPrintf,$1,$2,24501,24750)
- $$(call ListPathsSafely_IfPrintf,$1,$2,24751,25000)
-
- $$(call ListPathsSafely_IfPrintf,$1,$2,25001,25250)
- $$(call ListPathsSafely_IfPrintf,$1,$2,25251,25500)
- $$(call ListPathsSafely_IfPrintf,$1,$2,25501,25750)
- $$(call ListPathsSafely_IfPrintf,$1,$2,25751,26000)
-
- $$(call ListPathsSafely_IfPrintf,$1,$2,26001,26250)
- $$(call ListPathsSafely_IfPrintf,$1,$2,26251,26500)
- $$(call ListPathsSafely_IfPrintf,$1,$2,26501,26750)
- $$(call ListPathsSafely_IfPrintf,$1,$2,26751,27000)
-
- $$(call ListPathsSafely_IfPrintf,$1,$2,27001,27250)
- $$(call ListPathsSafely_IfPrintf,$1,$2,27251,27500)
- $$(call ListPathsSafely_IfPrintf,$1,$2,27501,27750)
- $$(call ListPathsSafely_IfPrintf,$1,$2,27751,28000)
-
- $$(call ListPathsSafely_IfPrintf,$1,$2,28001,28250)
- $$(call ListPathsSafely_IfPrintf,$1,$2,28251,28500)
- $$(call ListPathsSafely_IfPrintf,$1,$2,28501,28750)
- $$(call ListPathsSafely_IfPrintf,$1,$2,28751,29000)
-
- $$(call ListPathsSafely_IfPrintf,$1,$2,29001,29250)
- $$(call ListPathsSafely_IfPrintf,$1,$2,29251,29500)
- $$(call ListPathsSafely_IfPrintf,$1,$2,29501,29750)
- $$(call ListPathsSafely_IfPrintf,$1,$2,29751,30000)
- endef
-endif # HAS_FILE_FUNCTION
-
################################################################################
# A file containing a way to uniquely identify the source code revision that
@@ -408,21 +187,6 @@ endef
# Make sure logging is setup for everyone that includes MakeBase.gmk.
$(eval $(call SetupLogging))
-################################################################################
-# Creates a sequence of increasing numbers (inclusive).
-# Param 1 - starting number
-# Param 2 - ending number
-sequence = \
- $(wordlist $1, $2, $(strip \
- $(eval SEQUENCE_COUNT :=) \
- $(call _sequence-do,$(strip $2))))
-
-_sequence-do = \
- $(if $(word $1, $(SEQUENCE_COUNT)),, \
- $(eval SEQUENCE_COUNT += .) \
- $(words $(SEQUENCE_COUNT)) \
- $(call _sequence-do,$1))
-
################################################################################
MAX_PARAMS := 36
@@ -464,16 +228,6 @@ define NamedParamsMacroTemplate
$(call $(0)Body,$(strip $1))
endef
-################################################################################
-# Replace question marks with space in string. This macro needs to be called on
-# files from CacheFind in case any of them contains space in their file name,
-# since CacheFind replaces space with ?.
-# Param 1 - String to replace in
-DecodeSpace = \
- $(subst ?,$(SPACE),$(strip $1))
-EncodeSpace = \
- $(subst $(SPACE),?,$(strip $1))
-
################################################################################
# Make directory without forking mkdir if not needed.
#
@@ -501,13 +255,6 @@ MakeDir = \
MakeTargetDir = \
$(call MakeDir, $(dir $(call EncodeSpace, $@)))
-################################################################################
-# Assign a variable only if it is empty
-# Param 1 - Variable to assign
-# Param 2 - Value to assign
-SetIfEmpty = \
- $(if $($(strip $1)),,$(eval $(strip $1) := $2))
-
################################################################################
# All install-file and related macros automatically call DecodeSpace when needed.
@@ -575,46 +322,6 @@ define install-file-nolink
$(CP) -f '$(call DecodeSpace, $<)' '$(call DecodeSpace, $@)'
endef
-################################################################################
-# Take two paths and return the path of the last common directory.
-# Ex: /foo/bar/baz, /foo/bar/banan -> /foo/bar
-# foo/bar/baz, /foo/bar ->
-#
-# The x prefix is used to preserve the presence of the initial slash
-#
-# $1 - Path to compare
-# $2 - Other path to compare
-FindCommonPathPrefix = \
- $(patsubst x%,%,$(subst $(SPACE),/,$(strip \
- $(call FindCommonPathPrefixHelper, \
- $(subst /,$(SPACE),x$(strip $1)), $(subst /,$(SPACE),x$(strip $2))) \
- )))
-
-FindCommonPathPrefixHelper = \
- $(if $(call equals, $(firstword $1), $(firstword $2)), \
- $(firstword $1) \
- $(call FindCommonPathPrefixHelper, \
- $(wordlist 2, $(words $1), $1), $(wordlist 2, $(words $2), $2) \
- ) \
- )
-
-# Convert a partial path into as many directory levels of ../, removing
-# leading and following /.
-# Ex: foo/bar/baz/ -> ../../..
-# foo/bar -> ../..
-# /foo -> ..
-DirToDotDot = \
- $(subst $(SPACE),/,$(foreach d, $(subst /,$(SPACE),$1),..))
-
-# Computes the relative path from a directory to a file
-# $1 - File to compute the relative path to
-# $2 - Directory to compute the relative path from
-RelativePath = \
- $(eval $1_prefix := $(call FindCommonPathPrefix, $1, $2)) \
- $(eval $1_dotdots := $(call DirToDotDot, $(patsubst $($(strip $1)_prefix)/%, %, $2))) \
- $(eval $1_suffix := $(patsubst $($(strip $1)_prefix)/%, %, $1)) \
- $($(strip $1)_dotdots)/$($(strip $1)_suffix)
-
################################################################################
# link-file-* works similarly to install-file but creates a symlink instead.
# There are two versions, either creating a relative or an absolute link. Be
@@ -632,60 +339,6 @@ define link-file-absolute
$(LN) -s '$(call DecodeSpace, $<)' '$(call DecodeSpace, $@)'
endef
-################################################################################
-# Filter out duplicate sub strings while preserving order. Keeps the first occurance.
-uniq = \
- $(strip $(if $1,$(firstword $1) $(call uniq,$(filter-out $(firstword $1),$1))))
-
-# Returns all whitespace-separated words in $2 where at least one of the
-# whitespace-separated words in $1 is a substring.
-containing = \
- $(strip \
- $(foreach v,$(strip $2),\
- $(call uniq,$(foreach p,$(strip $1),$(if $(findstring $p,$v),$v)))))
-
-# Returns all whitespace-separated words in $2 where none of the
-# whitespace-separated words in $1 is a substring.
-not-containing = \
- $(strip $(filter-out $(call containing,$1,$2),$2))
-
-# Return a list of all string elements that are duplicated in $1.
-dups = \
- $(strip $(foreach v, $(sort $1), $(if $(filter-out 1, \
- $(words $(filter $v, $1))), $v)))
-
-# String equals
-equals = \
- $(if $(strip $1)$(strip $2),$(strip \
- $(and $(findstring $(strip $1),$(strip $2)),\
- $(findstring $(strip $2),$(strip $1)))), \
- true \
- )
-
-# Remove a whole list of prefixes
-# $1 - List of prefixes
-# $2 - List of elements to process
-remove-prefixes = \
- $(strip $(if $1,$(patsubst $(firstword $1)%,%,\
- $(call remove-prefixes,$(filter-out $(firstword $1),$1),$2)),$2))
-
-# Convert the string given to upper case, without any $(shell)
-# Inspired by http://lists.gnu.org/archive/html/help-make/2013-09/msg00009.html
-uppercase_table := a,A b,B c,C d,D e,E f,F g,G h,H i,I j,J k,K l,L m,M n,N o,O \
- p,P q,Q r,R s,S t,T u,U v,V w,W x,X y,Y z,Z
-
-uppercase_internal = \
- $(if $(strip $1), $$(subst $(firstword $1), $(call uppercase_internal, \
- $(wordlist 2, $(words $1), $1), $2)), $2)
-
-# Convert a string to upper case. Works only on a-z.
-# $1 - The string to convert
-uppercase = \
- $(strip \
- $(eval uppercase_result := $(call uppercase_internal, $(uppercase_table), $1)) \
- $(uppercase_result) \
- )
-
################################################################################
ifneq ($(DISABLE_CACHE_FIND), true)
@@ -757,144 +410,6 @@ else
endef
endif
-################################################################################
-
-define AddFileToCopy
- # Helper macro for SetupCopyFiles
- # 1 : Source file
- # 2 : Dest file
- # 3 : Variable to add targets to
- # 4 : Macro to call for copy operation
- # 5 : Action text to log
- $2: $1
- $$(call LogInfo, $(strip $5) $$(patsubst $(OUTPUTDIR)/%,%,$$(call DecodeSpace, $$@)))
- $$($$(strip $4))
-
- $3 += $2
- $3_SOURCES += $1
-endef
-
-# Returns the value of the first argument
-identity = \
- $(strip $1)
-
-# Setup make rules for copying files, with an option to do more complex
-# processing instead of copying.
-#
-# Parameter 1 is the name of the rule. This name is used as variable prefix,
-# and the targets generated are listed in a variable by that name.
-#
-# The list of all source files is returned in $1_SOURCES.
-#
-# Remaining parameters are named arguments. These include:
-# SRC : Source root dir (defaults to dir of first file)
-# DEST : Dest root dir
-# FILES : List of files to copy with absolute paths, or path relative to SRC.
-# Must be in SRC.
-# FLATTEN : Set to flatten the directory structure in the DEST dir.
-# MACRO : Optionally override the default macro used for making the copy.
-# Default is 'install-file'
-# NAME_MACRO : Optionally supply a macro that rewrites the target file name
-# based on the source file name
-# LOG_ACTION : Optionally specify a different action text for log messages
-SetupCopyFiles = $(NamedParamsMacroTemplate)
-define SetupCopyFilesBody
-
- ifeq ($$($1_MACRO), )
- $1_MACRO := install-file
- endif
-
- # Default SRC to the dir of the first file.
- ifeq ($$($1_SRC), )
- $1_SRC := $$(dir $$(firstword $$($1_FILES)))
- endif
-
- ifeq ($$($1_NAME_MACRO), )
- $1_NAME_MACRO := identity
- endif
-
- ifeq ($$($1_LOG_ACTION), )
- $1_LOG_ACTION := Copying
- endif
-
- # Remove any trailing slash from SRC and DEST
- $1_SRC := $$(patsubst %/,%,$$($1_SRC))
- $1_DEST := $$(patsubst %/,%,$$($1_DEST))
-
- # Need to wrap arguments in DoubleDollar because of the eval nested inside an
- # eval macro body.
- $$(foreach f, $$(patsubst $$($1_SRC)/%,%,$$($1_FILES)), \
- $$(eval $$(call AddFileToCopy, \
- $$(call DoubleDollar, $$($1_SRC)/$$f), \
- $$(call DoubleDollar, \
- $$($1_DEST)/$$(call $$(strip $$($1_NAME_MACRO)),$$(if $$($1_FLATTEN),$$(notdir $$f),$$f)) \
- ), \
- $1, \
- $$($1_MACRO), \
- $$($1_LOG_ACTION) \
- )) \
- )
-
-endef
-
-################################################################################
-# Parse a multiple-keyword variable, like FOO="KEYWORD1=val1;KEYWORD2=val2;..."
-# These will be converted into a series of variables like FOO_KEYWORD1=val1,
-# FOO_KEYWORD2=val2, etc. Unknown keywords will cause an error.
-#
-# Parameter 1 is the name of the rule, and is also the name of the variable.
-#
-# Remaining parameters are named arguments. These include:
-# SINGLE_KEYWORDS A list of valid keywords with single string values
-# STRING_KEYWORDS A list of valid keywords, processed as string. This means
-# that '%20' will be replaced by ' ' to allow for multi-word strings.
-#
-ParseKeywordVariable = $(NamedParamsMacroTemplate)
-define ParseKeywordVariableBody
- ifneq ($$($1), )
- # To preserve spaces, substitute them with a hopefully unique pattern
- # before splitting and then re-substitute spaces back.
- $1_MANGLED := $$(subst $$(SPACE),||||,$$($1))
- $$(foreach mangled_part, $$(subst ;, , $$($1_MANGLED)), \
- $$(eval mangled_part_eval := $$(call DoubleDollar, $$(mangled_part))) \
- $$(eval part := $$$$(subst ||||,$$$$(SPACE),$$$$(mangled_part_eval))) \
- $$(eval $1_NO_MATCH := true) \
- $$(foreach keyword, $$($1_SINGLE_KEYWORDS), \
- $$(eval keyword_eval := $$(call DoubleDollar, $$(keyword))) \
- $$(if $$(filter $$(keyword)=%, $$(part)), \
- $$(eval $(strip $1)_$$$$(keyword_eval) := $$$$(strip $$$$(patsubst $$$$(keyword_eval)=%, %, $$$$(part)))) \
- $$(eval $1_NO_MATCH := ) \
- ) \
- ) \
- $$(foreach keyword, $$($1_STRING_KEYWORDS), \
- $$(eval keyword_eval := $$(call DoubleDollar, $$(keyword))) \
- $$(if $$(filter $$(keyword)=%, $$(part)), \
- $$(eval $(strip $1)_$$$$(keyword_eval) := $$$$(strip $$$$(subst %20, , $$$$(patsubst $$$$(keyword_eval)=%, %, $$$$(part))))) \
- $$(eval $1_NO_MATCH := ) \
- ) \
- ) \
- $$(if $$($1_NO_MATCH), \
- $$(if $$(filter $$(part), $$($1_SINGLE_KEYWORDS) $$($1_STRING_KEYWORDS)), \
- $$(info Keyword $$(part) for $1 needs to be assigned a value.) \
- , \
- $$(info $$(part) is not a valid keyword for $1.) \
- $$(info Valid keywords: $$($1_SINGLE_KEYWORDS) $$($1_STRING_KEYWORDS).) \
- ) \
- $$(error Cannot continue) \
- ) \
- )
- endif
-endef
-
-################################################################################
-# ShellQuote
-#
-# Quotes a string with single quotes and replaces single quotes with '\'' so
-# that the contents survives being given to the shell.
-
-ShellQuote = \
- $(SQUOTE)$(subst $(SQUOTE),$(SQUOTE)\$(SQUOTE)$(SQUOTE),$(strip $1))$(SQUOTE)
-
################################################################################
# FixPath
#
@@ -911,35 +426,6 @@ else
$1
endif
-################################################################################
-# Write to and read from file
-
-# Param 1 - File to read
-ReadFile = \
- $(shell $(CAT) $1)
-
-# Param 1 - Text to write
-# Param 2 - File to write to
-ifeq ($(HAS_FILE_FUNCTION), true)
- WriteFile = \
- $(file >$2,$(strip $1))
-else
- # Use printf to get consistent behavior on all platforms.
- WriteFile = \
- $(shell $(PRINTF) "%s" $(call ShellQuote, $1) > $2)
-endif
-
-# Param 1 - Text to write
-# Param 2 - File to write to
-ifeq ($(HAS_FILE_FUNCTION), true)
- AppendFile = \
- $(file >>$2,$(strip $1))
-else
- # Use printf to get consistent behavior on all platforms.
- AppendFile = \
- $(shell $(PRINTF) "%s" $(call ShellQuote, $1) >> $2)
-endif
-
################################################################################
# DependOnVariable
#
@@ -1025,75 +511,6 @@ ExecuteWithLog = \
$(CP) $(strip $1).cmdline $(MAKESUPPORT_OUTPUTDIR)/failure-logs/$(subst /,_,$(patsubst $(OUTPUTDIR)/%,%,$(strip $1))).cmdline && \
exit $(DOLLAR)exitcode ) )
-################################################################################
-# Find lib dir for module
-# Param 1 - module name
-FindLibDirForModule = \
- $(SUPPORT_OUTPUTDIR)/modules_libs/$(strip $1)
-
-################################################################################
-# Find executable dir for module
-# Param 1 - module name
-FindExecutableDirForModule = \
- $(SUPPORT_OUTPUTDIR)/modules_cmds/$(strip $1)
-
-################################################################################
-# Return a string suitable for use after a -classpath or --module-path option. It
-# will be correct and safe to use on all platforms. Arguments are given as space
-# separate classpath entries. Safe for multiple nested calls.
-# param 1 : A space separated list of classpath entries
-# The surrounding strip is needed to keep additional whitespace out
-PathList = \
- "$(subst $(SPACE),$(PATH_SEP),$(strip $(subst $(DQUOTE),,$1)))"
-
-################################################################################
-# Check if a specified hotspot variant is being built, or at least one of a
-# list of variants. Will return 'true' or 'false'.
-# $1 - the variant to test for
-check-jvm-variant = \
- $(strip \
- $(if $(filter-out $(VALID_JVM_VARIANTS), $1), \
- $(error Internal error: Invalid variant tested: $1)) \
- $(if $(filter $1, $(JVM_VARIANTS)), true, false))
-
-################################################################################
-# Converts a space separated list to a comma separated list.
-#
-# Replacing double-comma with a single comma is to workaround the issue with
-# some version of make on windows that doesn't substitute spaces with one comma
-# properly.
-CommaList = \
- $(strip \
- $(subst $(COMMA)$(COMMA),$(COMMA),$(subst $(SPACE),$(COMMA),$(strip $1))) \
- )
-
-################################################################################
-# Converts a space separated list to a colon separated list.
-#
-# Replacing double-colon with a single colon is to workaround the issue with
-# some version of make on windows that doesn't substitute spaces with one colon
-# properly.
-ColonList = \
- $(strip \
- $(subst ::,:,$(subst $(SPACE),:,$(strip $1))) \
- )
-
-################################################################################
-# Given a list of files, filters out locale specific files for translations
-# that should be excluded from this build.
-# $1 - The list of files to filter
-# $2 - The suffix of the files that should be considered (.java or .properties)
-FilterExcludedTranslations = \
- $(strip $(if $(EXCLUDE_TRANSLATIONS), \
- $(filter-out \
- $(foreach suffix, $2, \
- $(addprefix %_, $(addsuffix $(suffix), $(EXCLUDE_TRANSLATIONS))) \
- ), \
- $1 \
- ), \
- $1 \
- ))
-
################################################################################
# Hook to include the corresponding custom file, if present.
diff --git a/make/common/MakeIO.gmk b/make/common/MakeIO.gmk
new file mode 100644
index 00000000000..342e4f5c4b5
--- /dev/null
+++ b/make/common/MakeIO.gmk
@@ -0,0 +1,272 @@
+#
+# Copyright (c) 2011, 2019, Oracle and/or its affiliates. All rights reserved.
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+#
+# This code is free software; you can redistribute it and/or modify it
+# under the terms of the GNU General Public License version 2 only, as
+# published by the Free Software Foundation. Oracle designates this
+# particular file as subject to the "Classpath" exception as provided
+# by Oracle in the LICENSE file that accompanied this code.
+#
+# This code is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+# version 2 for more details (a copy is included in the LICENSE file that
+# accompanied this code).
+#
+# You should have received a copy of the GNU General Public License version
+# 2 along with this work; if not, write to the Free Software Foundation,
+# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+#
+# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+# or visit www.oracle.com if you need additional information or have any
+# questions.
+#
+
+ifeq (,$(_MAKEBASE_GMK))
+ $(error You must include MakeBase.gmk prior to including MakeIO.gmk)
+endif
+
+################################################################################
+#
+# Functions for dealing with reading and writing from makefiles. Prior to GNU
+# Make 4.0, this was tricky business.
+#
+################################################################################
+
+
+################################################################################
+# ListPathsSafely can be used to print command parameters to a file. This is
+# typically done if the command line lenght risk being too long for the
+# OS/shell. In later make versions, the file function can be used for this
+# purpose. For earlier versions, a more complex implementation is provided.
+#
+# The function ListPathsSafely can be called either directly or, more commonly
+# from a recipe line. If called from a recipe, it will be executed in the
+# evaluation phase of that recipe, which means that it will write to the file
+# before any other line in the recipe has been run.
+ifeq ($(HAS_FILE_FUNCTION), true)
+ # Param 1 - Name of variable containing paths/arguments to output
+ # Param 2 - File to print to
+ # Param 3 - Set to true to append to file instead of overwriting
+ define ListPathsSafely
+ $$(call MakeDir, $$(dir $$(strip $2)))
+ $$(file $$(if $$(filter true, $$(strip $3)),>>,>) \
+ $$(strip $2),$$(subst $$(SPACE),$$(NEWLINE),$$(strip $$($$(strip $1)))))
+ endef
+
+else # HAS_FILE_FUNCTION = false
+
+ $(eval compress_paths = \
+ $(strip $(shell $(CAT) $(TOPDIR)/make/common/support/ListPathsSafely-pre-compress.incl)))
+ compress_paths += \
+ $(subst $(TOPDIR),X97, \
+ $(subst $(OUTPUTDIR),X98, \
+ $(subst X,X00, \
+ $(subst $(SPACE),\n,$(strip $1)))))
+ $(eval compress_paths += \
+ $(strip $(shell $(CAT) $(TOPDIR)/make/common/support/ListPathsSafely-post-compress.incl)))
+
+ decompress_paths=$(SED) -f $(TOPDIR)/make/common/support/ListPathsSafely-uncompress.sed \
+ -e 's|X99|\\n|g' \
+ -e 's|X98|$(OUTPUTDIR)|g' -e 's|X97|$(TOPDIR)|g' \
+ -e 's|X00|X|g'
+
+ ListPathsSafely_IfPrintf = \
+ $(if $(word $3,$($(strip $1))), \
+ $(shell $(PRINTF) -- "$(strip $(call EscapeDollar, \
+ $(call compress_paths, $(wordlist $3,$4,$($(strip $1))))))\n" \
+ | $(decompress_paths) >> $2))
+
+ # Param 1 - Name of variable containing paths/arguments to output
+ # Param 2 - File to print to
+ # Param 3 - Set to true to append to file instead of overwriting
+ define ListPathsSafely
+ ifneq (,$$(word 30001,$$($$(strip $1))))
+ $$(error Cannot list safely more than 30000 paths. $1 has $$(words $$($$(strip $1))) paths!)
+ endif
+ $$(call MakeDir, $$(dir $2))
+ ifneq ($$(strip $3), true)
+ $$(shell $(RM) $$(strip $2))
+ endif
+
+ $$(call ListPathsSafely_IfPrintf,$1,$2,1,250)
+ $$(call ListPathsSafely_IfPrintf,$1,$2,251,500)
+ $$(call ListPathsSafely_IfPrintf,$1,$2,501,750)
+ $$(call ListPathsSafely_IfPrintf,$1,$2,751,1000)
+
+ $$(call ListPathsSafely_IfPrintf,$1,$2,1001,1250)
+ $$(call ListPathsSafely_IfPrintf,$1,$2,1251,1500)
+ $$(call ListPathsSafely_IfPrintf,$1,$2,1501,1750)
+ $$(call ListPathsSafely_IfPrintf,$1,$2,1751,2000)
+
+ $$(call ListPathsSafely_IfPrintf,$1,$2,2001,2250)
+ $$(call ListPathsSafely_IfPrintf,$1,$2,2251,2500)
+ $$(call ListPathsSafely_IfPrintf,$1,$2,2501,2750)
+ $$(call ListPathsSafely_IfPrintf,$1,$2,2751,3000)
+
+ $$(call ListPathsSafely_IfPrintf,$1,$2,3001,3250)
+ $$(call ListPathsSafely_IfPrintf,$1,$2,3251,3500)
+ $$(call ListPathsSafely_IfPrintf,$1,$2,3501,3750)
+ $$(call ListPathsSafely_IfPrintf,$1,$2,3751,4000)
+
+ $$(call ListPathsSafely_IfPrintf,$1,$2,4001,4250)
+ $$(call ListPathsSafely_IfPrintf,$1,$2,4251,4500)
+ $$(call ListPathsSafely_IfPrintf,$1,$2,4501,4750)
+ $$(call ListPathsSafely_IfPrintf,$1,$2,4751,5000)
+
+ $$(call ListPathsSafely_IfPrintf,$1,$2,5001,5250)
+ $$(call ListPathsSafely_IfPrintf,$1,$2,5251,5500)
+ $$(call ListPathsSafely_IfPrintf,$1,$2,5501,5750)
+ $$(call ListPathsSafely_IfPrintf,$1,$2,5751,6000)
+
+ $$(call ListPathsSafely_IfPrintf,$1,$2,6001,6250)
+ $$(call ListPathsSafely_IfPrintf,$1,$2,6251,6500)
+ $$(call ListPathsSafely_IfPrintf,$1,$2,6501,6750)
+ $$(call ListPathsSafely_IfPrintf,$1,$2,6751,7000)
+
+ $$(call ListPathsSafely_IfPrintf,$1,$2,7001,7250)
+ $$(call ListPathsSafely_IfPrintf,$1,$2,7251,7500)
+ $$(call ListPathsSafely_IfPrintf,$1,$2,7501,7750)
+ $$(call ListPathsSafely_IfPrintf,$1,$2,7751,8000)
+
+ $$(call ListPathsSafely_IfPrintf,$1,$2,8001,8250)
+ $$(call ListPathsSafely_IfPrintf,$1,$2,8251,8500)
+ $$(call ListPathsSafely_IfPrintf,$1,$2,8501,8750)
+ $$(call ListPathsSafely_IfPrintf,$1,$2,8751,9000)
+
+ $$(call ListPathsSafely_IfPrintf,$1,$2,9001,9250)
+ $$(call ListPathsSafely_IfPrintf,$1,$2,9251,9500)
+ $$(call ListPathsSafely_IfPrintf,$1,$2,9501,9750)
+ $$(call ListPathsSafely_IfPrintf,$1,$2,9751,10000)
+
+ $$(call ListPathsSafely_IfPrintf,$1,$2,10001,10250)
+ $$(call ListPathsSafely_IfPrintf,$1,$2,10251,10500)
+ $$(call ListPathsSafely_IfPrintf,$1,$2,10501,10750)
+ $$(call ListPathsSafely_IfPrintf,$1,$2,10751,11000)
+
+ $$(call ListPathsSafely_IfPrintf,$1,$2,11001,11250)
+ $$(call ListPathsSafely_IfPrintf,$1,$2,11251,11500)
+ $$(call ListPathsSafely_IfPrintf,$1,$2,11501,11750)
+ $$(call ListPathsSafely_IfPrintf,$1,$2,11751,12000)
+
+ $$(call ListPathsSafely_IfPrintf,$1,$2,12001,12250)
+ $$(call ListPathsSafely_IfPrintf,$1,$2,12251,12500)
+ $$(call ListPathsSafely_IfPrintf,$1,$2,12501,12750)
+ $$(call ListPathsSafely_IfPrintf,$1,$2,12751,13000)
+
+ $$(call ListPathsSafely_IfPrintf,$1,$2,13001,13250)
+ $$(call ListPathsSafely_IfPrintf,$1,$2,13251,13500)
+ $$(call ListPathsSafely_IfPrintf,$1,$2,13501,13750)
+ $$(call ListPathsSafely_IfPrintf,$1,$2,13751,14000)
+
+ $$(call ListPathsSafely_IfPrintf,$1,$2,14001,14250)
+ $$(call ListPathsSafely_IfPrintf,$1,$2,14251,14500)
+ $$(call ListPathsSafely_IfPrintf,$1,$2,14501,14750)
+ $$(call ListPathsSafely_IfPrintf,$1,$2,14751,15000)
+
+ $$(call ListPathsSafely_IfPrintf,$1,$2,15001,15250)
+ $$(call ListPathsSafely_IfPrintf,$1,$2,15251,15500)
+ $$(call ListPathsSafely_IfPrintf,$1,$2,15501,15750)
+ $$(call ListPathsSafely_IfPrintf,$1,$2,15751,16000)
+
+ $$(call ListPathsSafely_IfPrintf,$1,$2,16001,16250)
+ $$(call ListPathsSafely_IfPrintf,$1,$2,16251,16500)
+ $$(call ListPathsSafely_IfPrintf,$1,$2,16501,16750)
+ $$(call ListPathsSafely_IfPrintf,$1,$2,16751,17000)
+
+ $$(call ListPathsSafely_IfPrintf,$1,$2,17001,17250)
+ $$(call ListPathsSafely_IfPrintf,$1,$2,17251,17500)
+ $$(call ListPathsSafely_IfPrintf,$1,$2,17501,17750)
+ $$(call ListPathsSafely_IfPrintf,$1,$2,17751,18000)
+
+ $$(call ListPathsSafely_IfPrintf,$1,$2,18001,18250)
+ $$(call ListPathsSafely_IfPrintf,$1,$2,18251,18500)
+ $$(call ListPathsSafely_IfPrintf,$1,$2,18501,18750)
+ $$(call ListPathsSafely_IfPrintf,$1,$2,18751,19000)
+
+ $$(call ListPathsSafely_IfPrintf,$1,$2,19001,19250)
+ $$(call ListPathsSafely_IfPrintf,$1,$2,19251,19500)
+ $$(call ListPathsSafely_IfPrintf,$1,$2,19501,19750)
+ $$(call ListPathsSafely_IfPrintf,$1,$2,19751,20000)
+
+ $$(call ListPathsSafely_IfPrintf,$1,$2,20001,20250)
+ $$(call ListPathsSafely_IfPrintf,$1,$2,20251,20500)
+ $$(call ListPathsSafely_IfPrintf,$1,$2,20501,20750)
+ $$(call ListPathsSafely_IfPrintf,$1,$2,20751,21000)
+
+ $$(call ListPathsSafely_IfPrintf,$1,$2,21001,21250)
+ $$(call ListPathsSafely_IfPrintf,$1,$2,21251,21500)
+ $$(call ListPathsSafely_IfPrintf,$1,$2,21501,21750)
+ $$(call ListPathsSafely_IfPrintf,$1,$2,21751,22000)
+
+ $$(call ListPathsSafely_IfPrintf,$1,$2,22001,22250)
+ $$(call ListPathsSafely_IfPrintf,$1,$2,22251,22500)
+ $$(call ListPathsSafely_IfPrintf,$1,$2,22501,22750)
+ $$(call ListPathsSafely_IfPrintf,$1,$2,22751,23000)
+
+ $$(call ListPathsSafely_IfPrintf,$1,$2,23001,23250)
+ $$(call ListPathsSafely_IfPrintf,$1,$2,23251,23500)
+ $$(call ListPathsSafely_IfPrintf,$1,$2,23501,23750)
+ $$(call ListPathsSafely_IfPrintf,$1,$2,23751,24000)
+
+ $$(call ListPathsSafely_IfPrintf,$1,$2,24001,24250)
+ $$(call ListPathsSafely_IfPrintf,$1,$2,24251,24500)
+ $$(call ListPathsSafely_IfPrintf,$1,$2,24501,24750)
+ $$(call ListPathsSafely_IfPrintf,$1,$2,24751,25000)
+
+ $$(call ListPathsSafely_IfPrintf,$1,$2,25001,25250)
+ $$(call ListPathsSafely_IfPrintf,$1,$2,25251,25500)
+ $$(call ListPathsSafely_IfPrintf,$1,$2,25501,25750)
+ $$(call ListPathsSafely_IfPrintf,$1,$2,25751,26000)
+
+ $$(call ListPathsSafely_IfPrintf,$1,$2,26001,26250)
+ $$(call ListPathsSafely_IfPrintf,$1,$2,26251,26500)
+ $$(call ListPathsSafely_IfPrintf,$1,$2,26501,26750)
+ $$(call ListPathsSafely_IfPrintf,$1,$2,26751,27000)
+
+ $$(call ListPathsSafely_IfPrintf,$1,$2,27001,27250)
+ $$(call ListPathsSafely_IfPrintf,$1,$2,27251,27500)
+ $$(call ListPathsSafely_IfPrintf,$1,$2,27501,27750)
+ $$(call ListPathsSafely_IfPrintf,$1,$2,27751,28000)
+
+ $$(call ListPathsSafely_IfPrintf,$1,$2,28001,28250)
+ $$(call ListPathsSafely_IfPrintf,$1,$2,28251,28500)
+ $$(call ListPathsSafely_IfPrintf,$1,$2,28501,28750)
+ $$(call ListPathsSafely_IfPrintf,$1,$2,28751,29000)
+
+ $$(call ListPathsSafely_IfPrintf,$1,$2,29001,29250)
+ $$(call ListPathsSafely_IfPrintf,$1,$2,29251,29500)
+ $$(call ListPathsSafely_IfPrintf,$1,$2,29501,29750)
+ $$(call ListPathsSafely_IfPrintf,$1,$2,29751,30000)
+ endef
+endif # HAS_FILE_FUNCTION
+
+################################################################################
+# Write to and read from file
+
+# Param 1 - File to read
+ReadFile = \
+ $(shell $(CAT) $1)
+
+# Param 1 - Text to write
+# Param 2 - File to write to
+ifeq ($(HAS_FILE_FUNCTION), true)
+ WriteFile = \
+ $(file >$2,$(strip $1))
+else
+ # Use printf to get consistent behavior on all platforms.
+ WriteFile = \
+ $(shell $(PRINTF) "%s" $(call ShellQuote, $1) > $2)
+endif
+
+# Param 1 - Text to write
+# Param 2 - File to write to
+ifeq ($(HAS_FILE_FUNCTION), true)
+ AppendFile = \
+ $(file >>$2,$(strip $1))
+else
+ # Use printf to get consistent behavior on all platforms.
+ AppendFile = \
+ $(shell $(PRINTF) "%s" $(call ShellQuote, $1) >> $2)
+endif
diff --git a/make/common/Utils.gmk b/make/common/Utils.gmk
new file mode 100644
index 00000000000..175489925c1
--- /dev/null
+++ b/make/common/Utils.gmk
@@ -0,0 +1,307 @@
+#
+# Copyright (c) 2011, 2019, Oracle and/or its affiliates. All rights reserved.
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+#
+# This code is free software; you can redistribute it and/or modify it
+# under the terms of the GNU General Public License version 2 only, as
+# published by the Free Software Foundation. Oracle designates this
+# particular file as subject to the "Classpath" exception as provided
+# by Oracle in the LICENSE file that accompanied this code.
+#
+# This code is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+# version 2 for more details (a copy is included in the LICENSE file that
+# accompanied this code).
+#
+# You should have received a copy of the GNU General Public License version
+# 2 along with this work; if not, write to the Free Software Foundation,
+# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+#
+# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+# or visit www.oracle.com if you need additional information or have any
+# questions.
+#
+
+ifeq (,$(_MAKEBASE_GMK))
+ $(error You must include MakeBase.gmk prior to including Utils.gmk)
+endif
+
+################################################################################
+#
+# Common utility functions
+#
+################################################################################
+
+### Debug functions
+
+# Prints the name and value of a variable
+PrintVar = \
+ $(info $(strip $1) >$($(strip $1))<)
+
+################################################################################
+# This macro translates $ into \$ to protect the $ from expansion in the shell.
+# To make this macro resilient against already escaped strings, first remove
+# any present escapes before escaping so that no double escapes are added.
+EscapeDollar = $(subst $$,\$$,$(subst \$$,$$,$(strip $1)))
+
+################################################################################
+# This macro works just like EscapeDollar above, but for #.
+EscapeHash = $(subst \#,\\\#,$(subst \\\#,\#,$(strip $1)))
+
+################################################################################
+# This macro translates $ into $$ to protect the string from make itself.
+DoubleDollar = $(subst $$,$$$$,$(strip $1))
+
+################################################################################
+# Creates a sequence of increasing numbers (inclusive).
+# Param 1 - starting number
+# Param 2 - ending number
+sequence = \
+ $(wordlist $1, $2, $(strip \
+ $(eval SEQUENCE_COUNT :=) \
+ $(call _sequence-do,$(strip $2))))
+
+_sequence-do = \
+ $(if $(word $1, $(SEQUENCE_COUNT)),, \
+ $(eval SEQUENCE_COUNT += .) \
+ $(words $(SEQUENCE_COUNT)) \
+ $(call _sequence-do,$1))
+
+################################################################################
+# Replace question marks with space in string. This macro needs to be called on
+# files from CacheFind in case any of them contains space in their file name,
+# since CacheFind replaces space with ?.
+# Param 1 - String to replace in
+DecodeSpace = \
+ $(subst ?,$(SPACE),$(strip $1))
+
+EncodeSpace = \
+ $(subst $(SPACE),?,$(strip $1))
+
+################################################################################
+# Assign a variable only if it is empty
+# Param 1 - Variable to assign
+# Param 2 - Value to assign
+SetIfEmpty = \
+ $(if $($(strip $1)),,$(eval $(strip $1) := $2))
+
+################################################################################
+# Take two paths and return the path of the last common directory.
+# Ex: /foo/bar/baz, /foo/bar/banan -> /foo/bar
+# foo/bar/baz, /foo/bar ->
+#
+# The x prefix is used to preserve the presence of the initial slash
+#
+# $1 - Path to compare
+# $2 - Other path to compare
+FindCommonPathPrefix = \
+ $(patsubst x%,%,$(subst $(SPACE),/,$(strip \
+ $(call FindCommonPathPrefixHelper, \
+ $(subst /,$(SPACE),x$(strip $1)), $(subst /,$(SPACE),x$(strip $2))) \
+ )))
+
+FindCommonPathPrefixHelper = \
+ $(if $(call equals, $(firstword $1), $(firstword $2)), \
+ $(firstword $1) \
+ $(call FindCommonPathPrefixHelper, \
+ $(wordlist 2, $(words $1), $1), $(wordlist 2, $(words $2), $2) \
+ ) \
+ )
+
+# Convert a partial path into as many directory levels of ../, removing
+# leading and following /.
+# Ex: foo/bar/baz/ -> ../../..
+# foo/bar -> ../..
+# /foo -> ..
+DirToDotDot = \
+ $(subst $(SPACE),/,$(foreach d, $(subst /,$(SPACE),$1),..))
+
+# Computes the relative path from a directory to a file
+# $1 - File to compute the relative path to
+# $2 - Directory to compute the relative path from
+RelativePath = \
+ $(eval $1_prefix := $(call FindCommonPathPrefix, $1, $2)) \
+ $(eval $1_dotdots := $(call DirToDotDot, $(patsubst $($(strip $1)_prefix)/%, %, $2))) \
+ $(eval $1_suffix := $(patsubst $($(strip $1)_prefix)/%, %, $1)) \
+ $($(strip $1)_dotdots)/$($(strip $1)_suffix)
+
+################################################################################
+# Filter out duplicate sub strings while preserving order. Keeps the first occurance.
+uniq = \
+ $(strip $(if $1,$(firstword $1) $(call uniq,$(filter-out $(firstword $1),$1))))
+
+# Returns all whitespace-separated words in $2 where at least one of the
+# whitespace-separated words in $1 is a substring.
+containing = \
+ $(strip \
+ $(foreach v,$(strip $2),\
+ $(call uniq,$(foreach p,$(strip $1),$(if $(findstring $p,$v),$v)))))
+
+# Returns all whitespace-separated words in $2 where none of the
+# whitespace-separated words in $1 is a substring.
+not-containing = \
+ $(strip $(filter-out $(call containing,$1,$2),$2))
+
+# Return a list of all string elements that are duplicated in $1.
+dups = \
+ $(strip $(foreach v, $(sort $1), $(if $(filter-out 1, \
+ $(words $(filter $v, $1))), $v)))
+
+# String equals
+equals = \
+ $(if $(strip $1)$(strip $2),$(strip \
+ $(and $(findstring $(strip $1),$(strip $2)),\
+ $(findstring $(strip $2),$(strip $1)))), \
+ true \
+ )
+
+# Remove a whole list of prefixes
+# $1 - List of prefixes
+# $2 - List of elements to process
+remove-prefixes = \
+ $(strip $(if $1,$(patsubst $(firstword $1)%,%,\
+ $(call remove-prefixes,$(filter-out $(firstword $1),$1),$2)),$2))
+
+# Convert the string given to upper case, without any $(shell)
+# Inspired by http://lists.gnu.org/archive/html/help-make/2013-09/msg00009.html
+uppercase_table := a,A b,B c,C d,D e,E f,F g,G h,H i,I j,J k,K l,L m,M n,N o,O \
+ p,P q,Q r,R s,S t,T u,U v,V w,W x,X y,Y z,Z
+
+uppercase_internal = \
+ $(if $(strip $1), $$(subst $(firstword $1), $(call uppercase_internal, \
+ $(wordlist 2, $(words $1), $1), $2)), $2)
+
+# Convert a string to upper case. Works only on a-z.
+# $1 - The string to convert
+uppercase = \
+ $(strip \
+ $(eval uppercase_result := $(call uppercase_internal, $(uppercase_table), $1)) \
+ $(uppercase_result) \
+ )
+
+################################################################################
+# Parse a multiple-keyword variable, like FOO="KEYWORD1=val1;KEYWORD2=val2;..."
+# These will be converted into a series of variables like FOO_KEYWORD1=val1,
+# FOO_KEYWORD2=val2, etc. Unknown keywords will cause an error.
+#
+# Parameter 1 is the name of the rule, and is also the name of the variable.
+#
+# Remaining parameters are named arguments. These include:
+# SINGLE_KEYWORDS A list of valid keywords with single string values
+# STRING_KEYWORDS A list of valid keywords, processed as string. This means
+# that '%20' will be replaced by ' ' to allow for multi-word strings.
+#
+ParseKeywordVariable = $(NamedParamsMacroTemplate)
+define ParseKeywordVariableBody
+ ifneq ($$($1), )
+ # To preserve spaces, substitute them with a hopefully unique pattern
+ # before splitting and then re-substitute spaces back.
+ $1_MANGLED := $$(subst $$(SPACE),||||,$$($1))
+ $$(foreach mangled_part, $$(subst ;, , $$($1_MANGLED)), \
+ $$(eval mangled_part_eval := $$(call DoubleDollar, $$(mangled_part))) \
+ $$(eval part := $$$$(subst ||||,$$$$(SPACE),$$$$(mangled_part_eval))) \
+ $$(eval $1_NO_MATCH := true) \
+ $$(foreach keyword, $$($1_SINGLE_KEYWORDS), \
+ $$(eval keyword_eval := $$(call DoubleDollar, $$(keyword))) \
+ $$(if $$(filter $$(keyword)=%, $$(part)), \
+ $$(eval $(strip $1)_$$$$(keyword_eval) := $$$$(strip $$$$(patsubst $$$$(keyword_eval)=%, %, $$$$(part)))) \
+ $$(eval $1_NO_MATCH := ) \
+ ) \
+ ) \
+ $$(foreach keyword, $$($1_STRING_KEYWORDS), \
+ $$(eval keyword_eval := $$(call DoubleDollar, $$(keyword))) \
+ $$(if $$(filter $$(keyword)=%, $$(part)), \
+ $$(eval $(strip $1)_$$$$(keyword_eval) := $$$$(strip $$$$(subst %20, , $$$$(patsubst $$$$(keyword_eval)=%, %, $$$$(part))))) \
+ $$(eval $1_NO_MATCH := ) \
+ ) \
+ ) \
+ $$(if $$($1_NO_MATCH), \
+ $$(if $$(filter $$(part), $$($1_SINGLE_KEYWORDS) $$($1_STRING_KEYWORDS)), \
+ $$(info Keyword $$(part) for $1 needs to be assigned a value.) \
+ , \
+ $$(info $$(part) is not a valid keyword for $1.) \
+ $$(info Valid keywords: $$($1_SINGLE_KEYWORDS) $$($1_STRING_KEYWORDS).) \
+ ) \
+ $$(error Cannot continue) \
+ ) \
+ )
+ endif
+endef
+
+################################################################################
+# ShellQuote
+#
+# Quotes a string with single quotes and replaces single quotes with '\'' so
+# that the contents survives being given to the shell.
+ShellQuote = \
+ $(SQUOTE)$(subst $(SQUOTE),$(SQUOTE)\$(SQUOTE)$(SQUOTE),$(strip $1))$(SQUOTE)
+
+################################################################################
+# Find lib dir for module
+# Param 1 - module name
+FindLibDirForModule = \
+ $(SUPPORT_OUTPUTDIR)/modules_libs/$(strip $1)
+
+################################################################################
+# Find executable dir for module
+# Param 1 - module name
+FindExecutableDirForModule = \
+ $(SUPPORT_OUTPUTDIR)/modules_cmds/$(strip $1)
+
+################################################################################
+# Return a string suitable for use after a -classpath or --module-path option. It
+# will be correct and safe to use on all platforms. Arguments are given as space
+# separate classpath entries. Safe for multiple nested calls.
+# param 1 : A space separated list of classpath entries
+# The surrounding strip is needed to keep additional whitespace out
+PathList = \
+ "$(subst $(SPACE),$(PATH_SEP),$(strip $(subst $(DQUOTE),,$1)))"
+
+################################################################################
+# Check if a specified hotspot variant is being built, or at least one of a
+# list of variants. Will return 'true' or 'false'.
+# $1 - the variant to test for
+check-jvm-variant = \
+ $(strip \
+ $(if $(filter-out $(VALID_JVM_VARIANTS), $1), \
+ $(error Internal error: Invalid variant tested: $1)) \
+ $(if $(filter $1, $(JVM_VARIANTS)), true, false))
+
+################################################################################
+# Converts a space separated list to a comma separated list.
+#
+# Replacing double-comma with a single comma is to workaround the issue with
+# some version of make on windows that doesn't substitute spaces with one comma
+# properly.
+CommaList = \
+ $(strip \
+ $(subst $(COMMA)$(COMMA),$(COMMA),$(subst $(SPACE),$(COMMA),$(strip $1))) \
+ )
+
+################################################################################
+# Converts a space separated list to a colon separated list.
+#
+# Replacing double-colon with a single colon is to workaround the issue with
+# some version of make on windows that doesn't substitute spaces with one colon
+# properly.
+ColonList = \
+ $(strip \
+ $(subst ::,:,$(subst $(SPACE),:,$(strip $1))) \
+ )
+
+################################################################################
+# Given a list of files, filters out locale specific files for translations
+# that should be excluded from this build.
+# $1 - The list of files to filter
+# $2 - The suffix of the files that should be considered (.java or .properties)
+FilterExcludedTranslations = \
+ $(strip $(if $(EXCLUDE_TRANSLATIONS), \
+ $(filter-out \
+ $(foreach suffix, $2, \
+ $(addprefix %_, $(addsuffix $(suffix), $(EXCLUDE_TRANSLATIONS))) \
+ ), \
+ $1 \
+ ), \
+ $1 \
+ ))
diff --git a/make/conf/jib-profiles.js b/make/conf/jib-profiles.js
index 8cf01a4e0eb..f47ca0f036f 100644
--- a/make/conf/jib-profiles.js
+++ b/make/conf/jib-profiles.js
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2015, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -386,7 +386,9 @@ var getJibProfilesProfiles = function (input, common, data) {
target_cpu: "x64",
dependencies: ["devkit", "graphviz", "pandoc", "graalunit_lib"],
configure_args: concat(common.configure_args_64bit,
- "--enable-full-docs", "--with-zlib=system"),
+ "--enable-full-docs", "--with-zlib=system",
+ (isWsl(input) ? [ "--host=x86_64-unknown-linux-gnu",
+ "--build=x86_64-unknown-linux-gnu" ] : [])),
default_make_targets: ["docs-bundles"],
},
@@ -572,6 +574,20 @@ var getJibProfilesProfiles = function (input, common, data) {
profiles[bootcyclePrebuiltName].default_make_targets = [ "product-images" ];
});
+ // JCov profiles build JCov-instrumented JDK image based on images provided through dependencies.
+ [ "linux-x64", "macosx-x64", "solaris-sparcv9", "windows-x64"]
+ .forEach(function (name) {
+ var jcovName = name + "-jcov";
+ profiles[jcovName] = clone(common.main_profile_base);
+ profiles[jcovName].target_os = profiles[name].target_os
+ profiles[jcovName].target_cpu = profiles[name].target_cpu
+ profiles[jcovName].default_make_targets = [ "jcov-bundles" ];
+ profiles[jcovName].dependencies = concat(profiles[jcovName].dependencies,
+ [ name + ".jdk", "devkit" ]);
+ profiles[jcovName].configure_args = concat(profiles[jcovName].configure_args,
+ ["--with-jcov-input-jdk=" + input.get(name + ".jdk", "home_path")]);
+ });
+
//
// Define artifacts for profiles
//
@@ -705,6 +721,26 @@ var getJibProfilesProfiles = function (input, common, data) {
});
});
+ // Artifacts of JCov profiles
+ [ "linux-x64", "macosx-x64", "solaris-sparcv9", "windows-x64"]
+ .forEach(function (name) {
+ var o = artifactData[name]
+ var jdk_subdir = (o.jdk_subdir != null ? o.jdk_subdir : "jdk-" + data.version);
+ var jdk_suffix = (o.jdk_suffix != null ? o.jdk_suffix : "tar.gz");
+ var pf = o.platform
+ var jcovName = name + "-jcov";
+ profiles[jcovName].artifacts = {
+ jdk: {
+ local: "bundles/\\(jdk-jcov.*bin." + jdk_suffix + "\\)",
+ remote: [
+ "bundles/" + pf + "/jdk-jcov-" + data.version + "_" + pf + "_bin." + jdk_suffix
+ ],
+ subdir: jdk_subdir,
+ exploded: "images/jdk-jcov"
+ }
+ };
+ });
+
// Profiles used to run tests.
var testOnlyProfiles = {
"run-test": {
@@ -724,20 +760,27 @@ var getJibProfilesProfiles = function (input, common, data) {
if (testedProfile == null) {
testedProfile = input.build_os + "-" + input.build_cpu;
}
+ var testedProfileJDK = testedProfile + ".jdk";
+ var testedProfileTest = ""
+ if (testedProfile.endsWith("-jcov")) {
+ testedProfileTest = testedProfile.substring(0, testedProfile.length - "-jcov".length) + ".test";
+ } else {
+ testedProfileTest = testedProfile + ".test";
+ }
var testOnlyProfilesPrebuilt = {
"run-test-prebuilt": {
target_os: input.build_os,
target_cpu: input.build_cpu,
dependencies: [
- "jtreg", "gnumake", "boot_jdk", "devkit", "jib", testedProfile + ".jdk",
- testedProfile + ".test"
+ "jtreg", "gnumake", "boot_jdk", "devkit", "jib", "jcov", testedProfileJDK,
+ testedProfileTest
],
src: "src.conf",
make_args: [ "run-test-prebuilt", "LOG_CMDLINES=true", "JTREG_VERBOSE=fail,error,time" ],
environment: {
"BOOT_JDK": common.boot_jdk_home,
- "JDK_IMAGE_DIR": input.get(testedProfile + ".jdk", "home_path"),
- "TEST_IMAGE_DIR": input.get(testedProfile + ".test", "home_path")
+ "JDK_IMAGE_DIR": input.get(testedProfileJDK, "home_path"),
+ "TEST_IMAGE_DIR": input.get(testedProfileTest, "home_path")
},
labels: "test"
}
@@ -833,6 +876,13 @@ var getJibProfilesDependencies = function (input, common) {
var boot_jdk_platform = (input.build_os == "macosx" ? "osx" : input.build_os)
+ "-" + input.build_cpu;
+ var boot_jdk_ext = (input.build_os == "windows" ? ".zip" : ".tar.gz")
+ // If running in WSL and building for Windows, it will look like Linux,
+ // but we need a Windows boot JDK.
+ if (isWsl(input) && input.target_os == "windows") {
+ boot_jdk_platform = "windows-" + input.build_cpu;
+ boot_jdk_ext = ".zip";
+ }
var makeBinDir = (input.build_os == "windows"
? input.get("gnumake", "install_path") + "/cygwin/bin"
@@ -846,8 +896,7 @@ var getJibProfilesDependencies = function (input, common) {
version: common.boot_jdk_version,
build_number: "28",
file: "bundles/" + boot_jdk_platform + "/jdk-" + common.boot_jdk_version + "_"
- + boot_jdk_platform + "_bin"
- + (input.build_os == "windows" ? ".zip" : ".tar.gz"),
+ + boot_jdk_platform + "_bin" + boot_jdk_ext,
configure_args: "--with-boot-jdk=" + common.boot_jdk_home,
environment_path: common.boot_jdk_home + "/bin"
},
@@ -897,6 +946,7 @@ var getJibProfilesDependencies = function (input, common) {
version: "3.0",
build_number: "b07",
file: "bundles/jcov-3_0.zip",
+ environment_name: "JCOV_HOME",
},
gnumake: {
@@ -941,7 +991,7 @@ var getJibProfilesDependencies = function (input, common) {
organization: common.organization,
ext: "tar.gz",
revision: "2.3.1+1.0",
- module: "pandoc-" + input.target_platform,
+ module: "pandoc-" + input.build_platform,
configure_args: "PANDOC=" + input.get("pandoc", "install_path") + "/pandoc/pandoc",
environment_path: input.get("pandoc", "install_path") + "/pandoc"
},
@@ -1181,3 +1231,13 @@ var getVersionNumbers = function () {
}
return version_numbers;
}
+
+/**
+ * Returns true if running in Windows Subsystem for Linux. Jib does not yet
+ * detect wsl as osenv, so fall back on linux with version containing Microsoft.
+ */
+var isWsl = function (input) {
+ return ( input.build_osenv == "wsl"
+ || (input.build_os == "linux"
+ && java.lang.System.getProperty("os.version").contains("Microsoft")));
+}
diff --git a/make/data/charsetmapping/charsets b/make/data/charsetmapping/charsets
index 45b422fc6de..2699182a683 100644
--- a/make/data/charsetmapping/charsets
+++ b/make/data/charsetmapping/charsets
@@ -1,5 +1,5 @@
#
-# Copyright (c) 2000, 2018, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2000, 2019, Oracle and/or its affiliates. All rights reserved.
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
#
# This code is free software; you can redistribute it and/or modify it
@@ -1561,6 +1561,15 @@ charset x-IBM964 IBM964
alias ibm-euctw
alias 964
+charset x-IBM29626C IBM29626C
+ package sun.nio.cs.ext
+ type template
+ alias cp29626c # JDK historical
+ alias ibm29626c
+ alias ibm-29626c
+ alias 29626c
+ alias ibm-eucjp
+
charset x-IBM33722 IBM33722
package sun.nio.cs.ext
type source
diff --git a/make/data/charsetmapping/stdcs-aix b/make/data/charsetmapping/stdcs-aix
index 2ed31864268..762855e5763 100644
--- a/make/data/charsetmapping/stdcs-aix
+++ b/make/data/charsetmapping/stdcs-aix
@@ -5,6 +5,7 @@ Big5
Big5_Solaris
Big5_HKSCS
EUC_CN
+EUC_JP
EUC_KR
GBK
GB18030
@@ -22,8 +23,12 @@ IBM1046
IBM1124
IBM1129
IBM1383
+IBM29626C
ISO_8859_6
ISO_8859_8
+JIS_X_0201
+JIS_X_0208
+JIS_X_0212
MS1252
TIS_620
SimpleEUCEncoder
diff --git a/make/hotspot/symbols/symbols-unix b/make/hotspot/symbols/symbols-unix
index cf87a342d28..f223445e788 100644
--- a/make/hotspot/symbols/symbols-unix
+++ b/make/hotspot/symbols/symbols-unix
@@ -81,7 +81,6 @@ JVM_GetClassFieldsCount
JVM_GetClassInterfaces
JVM_GetClassMethodsCount
JVM_GetClassModifiers
-JVM_GetClassName
JVM_GetClassNameUTF
JVM_GetClassSignature
JVM_GetClassSigners
@@ -133,6 +132,7 @@ JVM_Halt
JVM_HasReferencePendingList
JVM_HoldsLock
JVM_IHashCode
+JVM_InitClassName
JVM_InitStackTraceElement
JVM_InitStackTraceElementArray
JVM_InitializeFromArchive
diff --git a/make/lib/Lib-java.base.gmk b/make/lib/Lib-java.base.gmk
index c39aad40e04..ac1cb8d7ada 100644
--- a/make/lib/Lib-java.base.gmk
+++ b/make/lib/Lib-java.base.gmk
@@ -56,7 +56,7 @@ $(eval $(call SetupJdkLibrary, BUILD_LIBNET, \
LIBS_solaris := -lnsl -lsocket $(LIBDL), \
LIBS_aix := $(LIBDL),\
LIBS_windows := ws2_32.lib jvm.lib secur32.lib iphlpapi.lib winhttp.lib \
- delayimp.lib $(WIN_JAVA_LIB) advapi32.lib, \
+ urlmon.lib delayimp.lib $(WIN_JAVA_LIB) advapi32.lib, \
LIBS_macosx := -framework CoreFoundation -framework CoreServices, \
))
diff --git a/make/lib/Lib-jdk.hotspot.agent.gmk b/make/lib/Lib-jdk.hotspot.agent.gmk
index d9f25168505..add447cf708 100644
--- a/make/lib/Lib-jdk.hotspot.agent.gmk
+++ b/make/lib/Lib-jdk.hotspot.agent.gmk
@@ -1,5 +1,5 @@
#
-# Copyright (c) 2015, 2018, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2015, 2019, Oracle and/or its affiliates. All rights reserved.
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
#
# This code is free software; you can redistribute it and/or modify it
@@ -66,7 +66,7 @@ $(eval $(call SetupJdkLibrary, BUILD_LIBSA, \
CXXFLAGS := $(CXXFLAGS_JDKLIB) $(SA_CFLAGS) $(SA_CXXFLAGS), \
EXTRA_SRC := $(LIBSA_EXTRA_SRC), \
LDFLAGS := $(LDFLAGS_JDKLIB) $(SA_LDFLAGS), \
- LIBS_linux := -lthread_db $(LIBDL), \
+ LIBS_linux := $(LIBDL), \
LIBS_solaris := -ldl -ldemangle -lthread -lproc, \
LIBS_macosx := -framework Foundation -framework JavaNativeFoundation \
-framework JavaRuntimeSupport -framework Security -framework CoreFoundation, \
diff --git a/make/nb_native/nbproject/configurations.xml b/make/nb_native/nbproject/configurations.xml
index 263756d71d3..7a98ad0f471 100644
--- a/make/nb_native/nbproject/configurations.xml
+++ b/make/nb_native/nbproject/configurations.xml
@@ -2,6711 +2,6 @@
-
- unshuffle_list.txt
-
-
-
-
-
-
- ad_x86_64.cpp
- ad_x86_64_clone.cpp
- ad_x86_64_expand.cpp
- ad_x86_64_format.cpp
- ad_x86_64_gen.cpp
- ad_x86_64_misc.cpp
- ad_x86_64_peephole.cpp
- ad_x86_64_pipeline.cpp
- dfa_x86_64.cpp
-
-
- bytecodeInterpreterWithChecks.cpp
- jvmtiEnter.cpp
- jvmtiEnterTrace.cpp
-
-
-
-
-
-
- ad_x86_64.cpp
- ad_x86_64_clone.cpp
- ad_x86_64_expand.cpp
- ad_x86_64_format.cpp
- ad_x86_64_gen.cpp
- ad_x86_64_misc.cpp
- ad_x86_64_peephole.cpp
- ad_x86_64_pipeline.cpp
- dfa_x86_64.cpp
-
-
- bytecodeInterpreterWithChecks.cpp
- jvmtiEnter.cpp
- jvmtiEnterTrace.cpp
-
-
-
-
- JvmOffsets.cpp
-
-
-
-
-
-
-
-
-
- ad_x86_64.cpp
- ad_x86_64_clone.cpp
- ad_x86_64_expand.cpp
- ad_x86_64_format.cpp
- ad_x86_64_gen.cpp
- ad_x86_64_misc.cpp
- ad_x86_64_peephole.cpp
- ad_x86_64_pipeline.cpp
- dfa_x86_64.cpp
-
-
- bytecodeInterpreterWithChecks.cpp
- jvmtiEnter.cpp
- jvmtiEnterTrace.cpp
-
-
-
-
-
-
-
-
-
- sizer.64.c
-
-
-
-
-
-
-
-
- Big5.map
- Big5_HKSCS.map
- Big5_Solaris.map
- EUC_CN.map
- EUC_JP.map
- EUC_JP_LINUX.map
- EUC_JP_Open.map
- EUC_KR.map
- EUC_TW.map
- GB18030.map
- GBK.map
- HKSCS2001.map
- HKSCS2008.map
- HKSCS_XP.map
- IBM037.map
- IBM1006.map
- IBM1025.map
- IBM1026.map
- IBM1046.map
- IBM1047.map
- IBM1097.map
- IBM1098.map
- IBM1112.map
- IBM1122.map
- IBM1123.map
- IBM1124.map
- IBM1129.map
- IBM1140.map
- IBM1141.map
- IBM1142.map
- IBM1143.map
- IBM1144.map
- IBM1145.map
- IBM1146.map
- IBM1147.map
- IBM1148.map
- IBM1149.map
- IBM1166.map
- IBM1364.map
- IBM1381.map
- IBM1383.map
- IBM273.map
- IBM277.map
- IBM278.map
- IBM280.map
- IBM284.map
- IBM285.map
- IBM290.map
- IBM297.map
- IBM300.map
- IBM420.map
- IBM424.map
- IBM437.map
- IBM500.map
- IBM737.map
- IBM775.map
- IBM833.map
- IBM838.map
- IBM850.map
- IBM852.map
- IBM855.map
- IBM856.map
- IBM857.map
- IBM858.map
- IBM860.map
- IBM861.map
- IBM862.map
- IBM863.map
- IBM864.map
- IBM865.map
- IBM866.map
- IBM868.map
- IBM869.map
- IBM870.map
- IBM871.map
- IBM874.map
- IBM875.map
- IBM918.map
- IBM921.map
- IBM922.map
- IBM930.map
- IBM933.map
- IBM935.map
- IBM937.map
- IBM939.map
- IBM942.map
- IBM943.map
- IBM948.map
- IBM949.map
- IBM950.map
- IBM970.map
- ISO_8859_11.map
- ISO_8859_13.map
- ISO_8859_15.map
- ISO_8859_16.map
- ISO_8859_2.map
- ISO_8859_3.map
- ISO_8859_4.map
- ISO_8859_5.map
- ISO_8859_6.map
- ISO_8859_7.map
- ISO_8859_8.map
- ISO_8859_9.map
- JIS_X_0201.map
- JIS_X_0208.map
- JIS_X_0208_MS5022X.map
- JIS_X_0208_MS932.map
- JIS_X_0208_Solaris.map
- JIS_X_0212.map
- JIS_X_0212_MS5022X.map
- JIS_X_0212_Solaris.map
- Johab.map
- KOI8_R.map
- KOI8_U.map
- MS1250.map
- MS1251.map
- MS1252.map
- MS1253.map
- MS1254.map
- MS1255.map
- MS1256.map
- MS1257.map
- MS1258.map
- MS874.map
- MS932.map
- MS936.map
- MS949.map
- MS950.map
- MS950_HKSCS_XP.map
- MacArabic.map
- MacCentralEurope.map
- MacCroatian.map
- MacCyrillic.map
- MacDingbat.map
- MacGreek.map
- MacHebrew.map
- MacIceland.map
- MacRoman.map
- MacRomania.map
- MacSymbol.map
- MacThai.map
- MacTurkish.map
- MacUkraine.map
- PCK.map
- SJIS.map
- TIS_620.map
- sjis0213.map
-
-
- public.map
-
-
- language-subtag-registry.txt
-
-
- java.activation-6.sym.txt
- java.activation-7.sym.txt
- java.activation-8.sym.txt
- java.annotations.common-6.sym.txt
- java.annotations.common-7.sym.txt
- java.annotations.common-8.sym.txt
- java.base-6.sym.txt
- java.base-7.sym.txt
- java.base-8.sym.txt
- java.compiler-6.sym.txt
- java.compiler-7.sym.txt
- java.compiler-8.sym.txt
- java.corba-6.sym.txt
- java.corba-7.sym.txt
- java.corba-8.sym.txt
- java.datatransfer-6.sym.txt
- java.datatransfer-7.sym.txt
- java.datatransfer-8.sym.txt
- java.desktop-6.sym.txt
- java.desktop-7.sym.txt
- java.desktop-8.sym.txt
- java.instrument-6.sym.txt
- java.instrument-7.sym.txt
- java.instrument-8.sym.txt
- java.logging-6.sym.txt
- java.logging-7.sym.txt
- java.logging-8.sym.txt
- java.management-6.sym.txt
- java.management-7.sym.txt
- java.management-8.sym.txt
- java.naming-6.sym.txt
- java.naming-7.sym.txt
- java.naming-8.sym.txt
- java.prefs-6.sym.txt
- java.prefs-7.sym.txt
- java.prefs-8.sym.txt
- java.rmi-6.sym.txt
- java.rmi-7.sym.txt
- java.rmi-8.sym.txt
- java.scripting-6.sym.txt
- java.scripting-7.sym.txt
- java.scripting-8.sym.txt
- java.security.jgss-6.sym.txt
- java.security.jgss-7.sym.txt
- java.security.jgss-8.sym.txt
- java.security.sasl-6.sym.txt
- java.security.sasl-7.sym.txt
- java.security.sasl-8.sym.txt
- java.sql-6.sym.txt
- java.sql-7.sym.txt
- java.sql-8.sym.txt
- java.sql.rowset-6.sym.txt
- java.sql.rowset-7.sym.txt
- java.sql.rowset-8.sym.txt
- java.transaction-6.sym.txt
- java.transaction-7.sym.txt
- java.transaction-8.sym.txt
- java.xml-6.sym.txt
- java.xml-7.sym.txt
- java.xml-8.sym.txt
- java.xml.bind-6.sym.txt
- java.xml.bind-7.sym.txt
- java.xml.bind-8.sym.txt
- java.xml.crypto-6.sym.txt
- java.xml.crypto-7.sym.txt
- java.xml.crypto-8.sym.txt
- java.xml.ws-6.sym.txt
- java.xml.ws-7.sym.txt
- java.xml.ws-8.sym.txt
- jdk.httpserver-6.sym.txt
- jdk.httpserver-7.sym.txt
- jdk.httpserver-8.sym.txt
- jdk.management-6.sym.txt
- jdk.management-7.sym.txt
- jdk.management-8.sym.txt
- jdk.scripting.nashorn-6.sym.txt
- jdk.scripting.nashorn-7.sym.txt
- jdk.scripting.nashorn-8.sym.txt
- jdk.sctp-6.sym.txt
- jdk.sctp-7.sym.txt
- jdk.sctp-8.sym.txt
- jdk.security.auth-6.sym.txt
- jdk.security.auth-7.sym.txt
- jdk.security.auth-8.sym.txt
- jdk.security.jgss-6.sym.txt
- jdk.security.jgss-7.sym.txt
- jdk.security.jgss-8.sym.txt
-
-
- PropList.txt
- Scripts.txt
- SpecialCasing.txt
- UnicodeData.txt
-
-
- functions.txt
- xlibtypes.txt
-
-
-
- solaris11.1-package-list.txt
-
-
-
-
-
- generateJvmOffsets.cpp
- generateJvmOffsets.h
- generateJvmOffsetsMain.c
-
-
-
-
-
-
-
- classes.gold.txt
- src.gold.txt
-
- HelloWorld.apt.gold.txt
- HelloWorld.gold.h
- HelloWorld.javadoc.gold.txt
- HelloWorld.javap.gold.txt
- contents.gold.txt
-
-
-
-
- exclude_list.txt
- exclude_list_cc.txt
-
-
-
-
- fixpath.c
-
-
-
-
-
-
-
-
-
-
- arabic.ut8.txt
- english.ut8.txt
- greek.ut8.txt
- hebrew.ut8.txt
- hindi.ut8.txt
- japanese.ut8.txt
- korean.ut8.txt
- thai.ut8.txt
-
-
-
-
-
-
- README.txt
-
-
- README.txt
-
-
- README.txt
-
-
- README.txt
-
-
- README.txt
-
-
- README.txt
-
-
- README.txt
-
-
- README.txt
-
-
-
-
-
-
-
- aarch64.ad
- aarch64Test.cpp
- aarch64_call.cpp
- aarch64_linkage.S
- abstractInterpreter_aarch64.cpp
- assembler_aarch64.cpp
- assembler_aarch64.hpp
- assembler_aarch64.inline.hpp
- bytecodes_aarch64.cpp
- bytecodes_aarch64.hpp
- bytes_aarch64.hpp
- c1_CodeStubs_aarch64.cpp
- c1_Defs_aarch64.hpp
- c1_FpuStackSim_aarch64.cpp
- c1_FpuStackSim_aarch64.hpp
- c1_FrameMap_aarch64.cpp
- c1_FrameMap_aarch64.hpp
- c1_LIRAssembler_aarch64.cpp
- c1_LIRAssembler_aarch64.hpp
- c1_LIRGenerator_aarch64.cpp
- c1_LIR_aarch64.cpp
- c1_LinearScan_aarch64.cpp
- c1_LinearScan_aarch64.hpp
- c1_MacroAssembler_aarch64.cpp
- c1_MacroAssembler_aarch64.hpp
- c1_Runtime1_aarch64.cpp
- c1_globals_aarch64.hpp
- c2_globals_aarch64.hpp
- c2_init_aarch64.cpp
- codeBuffer_aarch64.hpp
- compiledIC_aarch64.cpp
- copy_aarch64.hpp
- cpustate_aarch64.hpp
- decode_aarch64.hpp
- depChecker_aarch64.cpp
- depChecker_aarch64.hpp
- disassembler_aarch64.hpp
- frame_aarch64.cpp
- frame_aarch64.hpp
- frame_aarch64.inline.hpp
- globalDefinitions_aarch64.hpp
- globals_aarch64.hpp
- icBuffer_aarch64.cpp
- icache_aarch64.cpp
- icache_aarch64.hpp
- immediate_aarch64.cpp
- immediate_aarch64.hpp
- interp_masm_aarch64.cpp
- interp_masm_aarch64.hpp
- interpreterRT_aarch64.cpp
- interpreterRT_aarch64.hpp
- javaFrameAnchor_aarch64.hpp
- jniFastGetField_aarch64.cpp
- jniTypes_aarch64.hpp
- jni_aarch64.h
- jvmciCodeInstaller_aarch64.cpp
- macroAssembler_aarch64.cpp
- macroAssembler_aarch64.hpp
- macroAssembler_aarch64.inline.hpp
- methodHandles_aarch64.cpp
- methodHandles_aarch64.hpp
- nativeInst_aarch64.cpp
- nativeInst_aarch64.hpp
- registerMap_aarch64.hpp
- register_aarch64.cpp
- register_aarch64.hpp
- register_definitions_aarch64.cpp
- relocInfo_aarch64.cpp
- relocInfo_aarch64.hpp
- runtime_aarch64.cpp
- sharedRuntime_aarch64.cpp
- stubGenerator_aarch64.cpp
- stubRoutines_aarch64.cpp
- stubRoutines_aarch64.hpp
- templateInterpreterGenerator_aarch64.cpp
- templateTable_aarch64.cpp
- templateTable_aarch64.hpp
- vmStructs_aarch64.hpp
- vm_version_aarch64.cpp
- vm_version_aarch64.hpp
- vmreg_aarch64.cpp
- vmreg_aarch64.hpp
- vmreg_aarch64.inline.hpp
- vtableStubs_aarch64.cpp
-
-
- abstractInterpreter_arm.cpp
- arm.ad
- arm_32.ad
- arm_64.ad
- assembler_arm.cpp
- assembler_arm.hpp
- assembler_arm.inline.hpp
- assembler_arm_32.cpp
- assembler_arm_32.hpp
- assembler_arm_64.cpp
- assembler_arm_64.hpp
- bytes_arm.hpp
- c1_CodeStubs_arm.cpp
- c1_Defs_arm.hpp
- c1_FpuStackSim_arm.cpp
- c1_FpuStackSim_arm.hpp
- c1_FrameMap_arm.cpp
- c1_FrameMap_arm.hpp
- c1_LIRAssembler_arm.cpp
- c1_LIRAssembler_arm.hpp
- c1_LIRGenerator_arm.cpp
- c1_LIRGenerator_arm.hpp
- c1_LIR_arm.cpp
- c1_LinearScan_arm.cpp
- c1_LinearScan_arm.hpp
- c1_MacroAssembler_arm.cpp
- c1_MacroAssembler_arm.hpp
- c1_Runtime1_arm.cpp
- c1_globals_arm.hpp
- c2_globals_arm.hpp
- codeBuffer_arm.hpp
- compiledIC_arm.cpp
- copy_arm.hpp
- depChecker_arm.cpp
- depChecker_arm.hpp
- disassembler_arm.hpp
- frame_arm.cpp
- frame_arm.hpp
- frame_arm.inline.hpp
- globalDefinitions_arm.hpp
- globals_arm.hpp
- icBuffer_arm.cpp
- icache_arm.cpp
- icache_arm.hpp
- interp_masm_arm.cpp
- interp_masm_arm.hpp
- interpreterRT_arm.cpp
- interpreterRT_arm.hpp
- javaFrameAnchor_arm.hpp
- jniFastGetField_arm.cpp
- jniTypes_arm.hpp
- jni_arm.h
- jvmciCodeInstaller_arm.cpp
- macroAssembler_arm.cpp
- macroAssembler_arm.hpp
- macroAssembler_arm.inline.hpp
- methodHandles_arm.cpp
- methodHandles_arm.hpp
- nativeInst_arm.hpp
- nativeInst_arm_32.cpp
- nativeInst_arm_32.hpp
- nativeInst_arm_64.cpp
- nativeInst_arm_64.hpp
- registerMap_arm.hpp
- register_arm.cpp
- register_arm.hpp
- register_definitions_arm.cpp
- relocInfo_arm.cpp
- relocInfo_arm.hpp
- runtime_arm.cpp
- sharedRuntime_arm.cpp
- stubGenerator_arm.cpp
- stubRoutinesCrypto_arm.cpp
- stubRoutines_arm.cpp
- stubRoutines_arm.hpp
- templateInterpreterGenerator_arm.cpp
- templateTable_arm.cpp
- templateTable_arm.hpp
- vmStructs_arm.hpp
- vm_version_arm.hpp
- vm_version_arm_32.cpp
- vm_version_arm_64.cpp
- vmreg_arm.cpp
- vmreg_arm.hpp
- vmreg_arm.inline.hpp
- vtableStubs_arm.cpp
-
-
- abstractInterpreter_ppc.cpp
- assembler_ppc.cpp
- assembler_ppc.hpp
- assembler_ppc.inline.hpp
- bytes_ppc.hpp
- c1_CodeStubs_ppc.cpp
- c1_Defs_ppc.hpp
- c1_FpuStackSim_ppc.hpp
- c1_FrameMap_ppc.cpp
- c1_FrameMap_ppc.hpp
- c1_LIRAssembler_ppc.cpp
- c1_LIRAssembler_ppc.hpp
- c1_LIRGenerator_ppc.cpp
- c1_LIR_ppc.cpp
- c1_LinearScan_ppc.cpp
- c1_LinearScan_ppc.hpp
- c1_MacroAssembler_ppc.cpp
- c1_MacroAssembler_ppc.hpp
- c1_Runtime1_ppc.cpp
- c1_globals_ppc.hpp
- c2_globals_ppc.hpp
- c2_init_ppc.cpp
- codeBuffer_ppc.hpp
- compiledIC_ppc.cpp
- copy_ppc.hpp
- depChecker_ppc.hpp
- disassembler_ppc.hpp
- frame_ppc.cpp
- frame_ppc.hpp
- frame_ppc.inline.hpp
- globalDefinitions_ppc.hpp
- globals_ppc.hpp
- icBuffer_ppc.cpp
- icache_ppc.cpp
- icache_ppc.hpp
- interp_masm_ppc.hpp
- interp_masm_ppc_64.cpp
- interpreterRT_ppc.cpp
- interpreterRT_ppc.hpp
- javaFrameAnchor_ppc.hpp
- jniFastGetField_ppc.cpp
- jniTypes_ppc.hpp
- jni_ppc.h
- jvmciCodeInstaller_ppc.cpp
- macroAssembler_ppc.cpp
- macroAssembler_ppc.hpp
- macroAssembler_ppc.inline.hpp
- macroAssembler_ppc_sha.cpp
- methodHandles_ppc.cpp
- methodHandles_ppc.hpp
- nativeInst_ppc.cpp
- nativeInst_ppc.hpp
- ppc.ad
- registerMap_ppc.hpp
- register_definitions_ppc.cpp
- register_ppc.cpp
- register_ppc.hpp
- relocInfo_ppc.cpp
- relocInfo_ppc.hpp
- runtime_ppc.cpp
- sharedRuntime_ppc.cpp
- stubGenerator_ppc.cpp
- stubRoutines_ppc.hpp
- stubRoutines_ppc_64.cpp
- templateInterpreterGenerator_ppc.cpp
- templateTable_ppc.hpp
- templateTable_ppc_64.cpp
- vmStructs_ppc.hpp
- vm_version_ppc.cpp
- vm_version_ppc.hpp
- vmreg_ppc.cpp
- vmreg_ppc.hpp
- vmreg_ppc.inline.hpp
- vtableStubs_ppc_64.cpp
-
-
- abstractInterpreter_s390.cpp
- assembler_s390.cpp
- assembler_s390.hpp
- assembler_s390.inline.hpp
- bytes_s390.hpp
- c1_CodeStubs_s390.cpp
- c1_Defs_s390.hpp
- c1_FpuStackSim_s390.hpp
- c1_FrameMap_s390.cpp
- c1_FrameMap_s390.hpp
- c1_LIRAssembler_s390.cpp
- c1_LIRAssembler_s390.hpp
- c1_LIRGenerator_s390.cpp
- c1_LIR_s390.cpp
- c1_LinearScan_s390.cpp
- c1_LinearScan_s390.hpp
- c1_MacroAssembler_s390.cpp
- c1_MacroAssembler_s390.hpp
- c1_Runtime1_s390.cpp
- c1_globals_s390.hpp
- c2_globals_s390.hpp
- c2_init_s390.cpp
- codeBuffer_s390.hpp
- compiledIC_s390.cpp
- copy_s390.hpp
- depChecker_s390.hpp
- disassembler_s390.hpp
- frame_s390.cpp
- frame_s390.hpp
- frame_s390.inline.hpp
- globalDefinitions_s390.hpp
- globals_s390.hpp
- icBuffer_s390.cpp
- icache_s390.cpp
- icache_s390.hpp
- interp_masm_s390.cpp
- interp_masm_s390.hpp
- interpreterRT_s390.cpp
- interpreterRT_s390.hpp
- javaFrameAnchor_s390.hpp
- jniFastGetField_s390.cpp
- jniTypes_s390.hpp
- jni_s390.h
- jvmciCodeInstaller_s390.cpp
- macroAssembler_s390.cpp
- macroAssembler_s390.hpp
- macroAssembler_s390.inline.hpp
- methodHandles_s390.cpp
- methodHandles_s390.hpp
- nativeInst_s390.cpp
- nativeInst_s390.hpp
- registerMap_s390.hpp
- registerSaver_s390.hpp
- register_definitions_s390.cpp
- register_s390.cpp
- register_s390.hpp
- relocInfo_s390.cpp
- relocInfo_s390.hpp
- runtime_s390.cpp
- s390.ad
- sharedRuntime_s390.cpp
- stubGenerator_s390.cpp
- stubRoutines_s390.cpp
- stubRoutines_s390.hpp
- templateInterpreterGenerator_s390.cpp
- templateTable_s390.cpp
- templateTable_s390.hpp
- vmStructs_s390.hpp
- vm_version_s390.cpp
- vm_version_s390.hpp
- vmreg_s390.cpp
- vmreg_s390.hpp
- vmreg_s390.inline.hpp
- vtableStubs_s390.cpp
-
-
- abstractInterpreter_sparc.cpp
- args.cc
- assembler_sparc.cpp
- assembler_sparc.hpp
- assembler_sparc.inline.hpp
- bytes_sparc.hpp
- c1_CodeStubs_sparc.cpp
- c1_Defs_sparc.hpp
- c1_FpuStackSim_sparc.cpp
- c1_FpuStackSim_sparc.hpp
- c1_FrameMap_sparc.cpp
- c1_FrameMap_sparc.hpp
- c1_LIRAssembler_sparc.cpp
- c1_LIRAssembler_sparc.hpp
- c1_LIRGenerator_sparc.cpp
- c1_LIR_sparc.cpp
- c1_LinearScan_sparc.cpp
- c1_LinearScan_sparc.hpp
- c1_MacroAssembler_sparc.cpp
- c1_MacroAssembler_sparc.hpp
- c1_Runtime1_sparc.cpp
- c1_globals_sparc.hpp
- c2_globals_sparc.hpp
- c2_init_sparc.cpp
- codeBuffer_sparc.hpp
- compiledIC_sparc.cpp
- copy_sparc.hpp
- depChecker_sparc.cpp
- depChecker_sparc.hpp
- disassembler_sparc.hpp
- frame_sparc.cpp
- frame_sparc.hpp
- frame_sparc.inline.hpp
- globalDefinitions_sparc.hpp
- globals_sparc.hpp
- icBuffer_sparc.cpp
- icache_sparc.cpp
- icache_sparc.hpp
- interp_masm_sparc.cpp
- interp_masm_sparc.hpp
- interpreterRT_sparc.cpp
- interpreterRT_sparc.hpp
- javaFrameAnchor_sparc.hpp
- jniFastGetField_sparc.cpp
- jniTypes_sparc.hpp
- jni_sparc.h
- jvmciCodeInstaller_sparc.cpp
- macroAssembler_sparc.cpp
- macroAssembler_sparc.hpp
- macroAssembler_sparc.inline.hpp
- memset_with_concurrent_readers_sparc.cpp
- methodHandles_sparc.cpp
- methodHandles_sparc.hpp
- nativeInst_sparc.cpp
- nativeInst_sparc.hpp
- registerMap_sparc.hpp
- register_definitions_sparc.cpp
- register_sparc.cpp
- register_sparc.hpp
- relocInfo_sparc.cpp
- relocInfo_sparc.hpp
- runtime_sparc.cpp
- sharedRuntime_sparc.cpp
- sparc.ad
- stubGenerator_sparc.cpp
- stubRoutines_sparc.cpp
- stubRoutines_sparc.hpp
- templateInterpreterGenerator_sparc.cpp
- templateTable_sparc.cpp
- templateTable_sparc.hpp
- vmStructs_sparc.hpp
- vm_version_sparc.cpp
- vm_version_sparc.hpp
- vmreg_sparc.cpp
- vmreg_sparc.hpp
- vmreg_sparc.inline.hpp
- vtableStubs_sparc.cpp
-
-
- abstractInterpreter_x86.cpp
- assembler_x86.cpp
- assembler_x86.hpp
- assembler_x86.inline.hpp
- bytes_x86.hpp
- c1_CodeStubs_x86.cpp
- c1_Defs_x86.hpp
- c1_FpuStackSim_x86.cpp
- c1_FpuStackSim_x86.hpp
- c1_FrameMap_x86.cpp
- c1_FrameMap_x86.hpp
- c1_LIRAssembler_x86.cpp
- c1_LIRAssembler_x86.hpp
- c1_LIRGenerator_x86.cpp
- c1_LIR_x86.cpp
- c1_LinearScan_x86.cpp
- c1_LinearScan_x86.hpp
- c1_MacroAssembler_x86.cpp
- c1_MacroAssembler_x86.hpp
- c1_Runtime1_x86.cpp
- c1_globals_x86.hpp
- c2_globals_x86.hpp
- c2_init_x86.cpp
- codeBuffer_x86.hpp
- compiledIC_aot_x86_64.cpp
- compiledIC_x86.cpp
- copy_x86.hpp
- crc32c.h
- depChecker_x86.cpp
- depChecker_x86.hpp
- disassembler_x86.hpp
- frame_x86.cpp
- frame_x86.hpp
- frame_x86.inline.hpp
- globalDefinitions_x86.hpp
- globals_x86.hpp
- icBuffer_x86.cpp
- icache_x86.cpp
- icache_x86.hpp
- interp_masm_x86.cpp
- interp_masm_x86.hpp
- interpreterRT_x86.hpp
- interpreterRT_x86_32.cpp
- interpreterRT_x86_64.cpp
- javaFrameAnchor_x86.hpp
- jniFastGetField_x86_32.cpp
- jniFastGetField_x86_64.cpp
- jniTypes_x86.hpp
- jni_x86.h
- jvmciCodeInstaller_x86.cpp
- macroAssembler_x86.cpp
- macroAssembler_x86.hpp
- macroAssembler_x86.inline.hpp
- macroAssembler_x86_cos.cpp
- macroAssembler_x86_exp.cpp
- macroAssembler_x86_log.cpp
- macroAssembler_x86_log10.cpp
- macroAssembler_x86_pow.cpp
- macroAssembler_x86_sha.cpp
- macroAssembler_x86_sin.cpp
- macroAssembler_x86_tan.cpp
- methodHandles_x86.cpp
- methodHandles_x86.hpp
- nativeInst_x86.cpp
- nativeInst_x86.hpp
- registerMap_x86.cpp
- registerMap_x86.hpp
- register_definitions_x86.cpp
- register_x86.cpp
- register_x86.hpp
- relocInfo_x86.cpp
- relocInfo_x86.hpp
- runtime_x86_32.cpp
- runtime_x86_64.cpp
- sharedRuntime_x86.cpp
- sharedRuntime_x86_32.cpp
- sharedRuntime_x86_64.cpp
- stubGenerator_x86_32.cpp
- stubGenerator_x86_64.cpp
- stubRoutines_x86.cpp
- stubRoutines_x86.hpp
- stubRoutines_x86_32.cpp
- stubRoutines_x86_64.cpp
- templateInterpreterGenerator_x86.cpp
- templateInterpreterGenerator_x86_32.cpp
- templateInterpreterGenerator_x86_64.cpp
- templateTable_x86.cpp
- templateTable_x86.hpp
- vmStructs_x86.hpp
- vm_version_x86.cpp
- vm_version_x86.hpp
- vmreg_x86.cpp
- vmreg_x86.hpp
- vmreg_x86.inline.hpp
- vtableStubs_x86_32.cpp
- vtableStubs_x86_64.cpp
- x86.ad
- x86_32.ad
- x86_64.ad
-
-
- abstractInterpreter_zero.cpp
- assembler_zero.cpp
- assembler_zero.hpp
- assembler_zero.inline.hpp
- bytecodeInterpreter_zero.cpp
- bytecodeInterpreter_zero.hpp
- bytecodeInterpreter_zero.inline.hpp
- bytes_zero.hpp
- codeBuffer_zero.hpp
- compiledIC_zero.cpp
- copy_zero.hpp
- cppInterpreterGenerator_zero.cpp
- cppInterpreter_zero.cpp
- cppInterpreter_zero.hpp
- depChecker_zero.cpp
- depChecker_zero.hpp
- disassembler_zero.cpp
- disassembler_zero.hpp
- entryFrame_zero.hpp
- entry_zero.hpp
- fakeStubFrame_zero.hpp
- frame_zero.cpp
- frame_zero.hpp
- frame_zero.inline.hpp
- globalDefinitions_zero.hpp
- globals_zero.hpp
- icBuffer_zero.cpp
- icache_zero.cpp
- icache_zero.hpp
- interp_masm_zero.hpp
- interpreterFrame_zero.hpp
- interpreterRT_zero.cpp
- interpreterRT_zero.hpp
- javaFrameAnchor_zero.hpp
- jniFastGetField_zero.cpp
- jniTypes_zero.hpp
- jni_zero.h
- macroAssembler_zero.hpp
- macroAssembler_zero.inline.hpp
- methodHandles_zero.cpp
- methodHandles_zero.hpp
- nativeInst_zero.cpp
- nativeInst_zero.hpp
- registerMap_zero.hpp
- register_zero.cpp
- register_zero.hpp
- relocInfo_zero.cpp
- relocInfo_zero.hpp
- sharedRuntime_zero.cpp
- sharkFrame_zero.hpp
- shark_globals_zero.hpp
- stack_zero.cpp
- stack_zero.hpp
- stack_zero.inline.hpp
- stubGenerator_zero.cpp
- stubRoutines_zero.cpp
- stubRoutines_zero.hpp
- vmStructs_zero.hpp
- vm_version_zero.cpp
- vm_version_zero.hpp
- vmreg_zero.cpp
- vmreg_zero.hpp
- vmreg_zero.inline.hpp
- vtableStubs_zero.cpp
-
-
-
-
- attachListener_aix.cpp
- c1_globals_aix.hpp
- c2_globals_aix.hpp
- decoder_aix.hpp
- globals_aix.hpp
- jvm_aix.cpp
- jvm_aix.h
- libo4.cpp
- libo4.hpp
- libodm_aix.cpp
- libodm_aix.hpp
- libperfstat_aix.cpp
- libperfstat_aix.hpp
- loadlib_aix.cpp
- loadlib_aix.hpp
- misc_aix.cpp
- misc_aix.hpp
- osThread_aix.cpp
- osThread_aix.hpp
- os_aix.cpp
- os_aix.hpp
- os_aix.inline.hpp
- os_share_aix.hpp
- perfMemory_aix.cpp
- porting_aix.cpp
- porting_aix.hpp
- threadCritical_aix.cpp
- vmStructs_aix.hpp
-
-
- attachListener_bsd.cpp
- c1_globals_bsd.hpp
- c2_globals_bsd.hpp
- decoder_machO.cpp
- decoder_machO.hpp
- globals_bsd.hpp
- jvm_bsd.cpp
- jvm_bsd.h
- osThread_bsd.cpp
- osThread_bsd.hpp
- os_bsd.cpp
- os_bsd.hpp
- os_bsd.inline.hpp
- os_share_bsd.hpp
- perfMemory_bsd.cpp
- semaphore_bsd.hpp
- threadCritical_bsd.cpp
- vmStructs_bsd.hpp
-
-
- attachListener_linux.cpp
- c1_globals_linux.hpp
- c2_globals_linux.hpp
- decoder_linux.cpp
- globals_linux.hpp
- jvm_linux.cpp
- jvm_linux.h
- osThread_linux.cpp
- osThread_linux.hpp
- os_linux.cpp
- os_linux.hpp
- os_linux.inline.hpp
- os_share_linux.hpp
- perfMemory_linux.cpp
- threadCritical_linux.cpp
- vmStructs_linux.hpp
-
-
- os_posix.cpp
- os_posix.hpp
- semaphore_posix.hpp
- threadLocalStorage_posix.cpp
- vmError_posix.cpp
-
-
- attachListener_solaris.cpp
- c1_globals_solaris.hpp
- c2_globals_solaris.hpp
- decoder_solaris.cpp
- globals_solaris.hpp
- jvm_solaris.cpp
- jvm_solaris.h
- osThread_solaris.cpp
- osThread_solaris.hpp
- os_share_solaris.hpp
- os_solaris.cpp
- os_solaris.hpp
- os_solaris.inline.hpp
- perfMemory_solaris.cpp
- threadCritical_solaris.cpp
- vmStructs_solaris.hpp
-
-
- attachListener_windows.cpp
- c1_globals_windows.hpp
- c2_globals_windows.hpp
- decoder_windows.cpp
- decoder_windows.hpp
- globals_windows.hpp
- jvm_windows.cpp
- jvm_windows.h
- osThread_windows.cpp
- osThread_windows.hpp
- os_share_windows.hpp
- os_windows.cpp
- os_windows.hpp
- os_windows.inline.hpp
- perfMemory_windows.cpp
- semaphore_windows.hpp
- sharedRuntimeRem.cpp
- threadCritical_windows.cpp
- threadLocalStorage_windows.cpp
- vmError_windows.cpp
- vmStructs_windows.hpp
- windbghelp.cpp
- windbghelp.hpp
-
-
-
-
- atomic_aix_ppc.hpp
- bytes_aix_ppc.inline.hpp
- globals_aix_ppc.hpp
- orderAccess_aix_ppc.inline.hpp
- os_aix_ppc.cpp
- os_aix_ppc.hpp
- prefetch_aix_ppc.inline.hpp
- thread_aix_ppc.cpp
- thread_aix_ppc.hpp
- vmStructs_aix_ppc.hpp
-
-
- assembler_bsd_x86.cpp
- atomic_bsd_x86.hpp
- bsd_x86_32.s
- bsd_x86_64.s
- bytes_bsd_x86.inline.hpp
- copy_bsd_x86.inline.hpp
- globals_bsd_x86.hpp
- orderAccess_bsd_x86.inline.hpp
- os_bsd_x86.cpp
- os_bsd_x86.hpp
- os_bsd_x86.inline.hpp
- prefetch_bsd_x86.inline.hpp
- thread_bsd_x86.cpp
- thread_bsd_x86.hpp
- vmStructs_bsd_x86.hpp
- vm_version_bsd_x86.cpp
-
-
- assembler_bsd_zero.cpp
- atomic_bsd_zero.hpp
- bytes_bsd_zero.inline.hpp
- globals_bsd_zero.hpp
- orderAccess_bsd_zero.inline.hpp
- os_bsd_zero.cpp
- os_bsd_zero.hpp
- prefetch_bsd_zero.inline.hpp
- thread_bsd_zero.cpp
- thread_bsd_zero.hpp
- vmStructs_bsd_zero.hpp
- vm_version_bsd_zero.cpp
-
-
- assembler_linux_aarch64.cpp
- atomic_linux_aarch64.hpp
- bytes_linux_aarch64.inline.hpp
- copy_linux_aarch64.inline.hpp
- copy_linux_aarch64.s
- globals_linux_aarch64.hpp
- linux_aarch64.S
- linux_aarch64.ad
- orderAccess_linux_aarch64.inline.hpp
- os_linux_aarch64.cpp
- os_linux_aarch64.hpp
- os_linux_aarch64.inline.hpp
- prefetch_linux_aarch64.inline.hpp
- threadLS_linux_aarch64.s
- thread_linux_aarch64.cpp
- thread_linux_aarch64.hpp
- vmStructs_linux_aarch64.hpp
- vm_version_linux_aarch64.cpp
-
-
- atomic_linux_arm.hpp
- bytes_linux_arm.inline.hpp
- copy_linux_arm.inline.hpp
- globals_linux_arm.hpp
- linux_arm_32.s
- linux_arm_64.s
- macroAssembler_linux_arm_32.cpp
- orderAccess_linux_arm.inline.hpp
- os_linux_arm.cpp
- os_linux_arm.hpp
- prefetch_linux_arm.inline.hpp
- thread_linux_arm.cpp
- thread_linux_arm.hpp
- vmStructs_linux_arm.hpp
- vm_version_linux_arm_32.cpp
-
-
- atomic_linux_ppc.hpp
- bytes_linux_ppc.inline.hpp
- globals_linux_ppc.hpp
- orderAccess_linux_ppc.inline.hpp
- os_linux_ppc.cpp
- os_linux_ppc.hpp
- prefetch_linux_ppc.inline.hpp
- thread_linux_ppc.cpp
- thread_linux_ppc.hpp
- vmStructs_linux_ppc.hpp
-
-
- atomic_linux_s390.hpp
- bytes_linux_s390.inline.hpp
- globals_linux_s390.hpp
- orderAccess_linux_s390.inline.hpp
- os_linux_s390.cpp
- os_linux_s390.hpp
- prefetch_linux_s390.inline.hpp
- thread_linux_s390.cpp
- thread_linux_s390.hpp
- vmStructs_linux_s390.hpp
-
-
- atomic_linux_sparc.hpp
- globals_linux_sparc.hpp
- linux_sparc.ad
- linux_sparc.s
- orderAccess_linux_sparc.inline.hpp
- os_linux_sparc.cpp
- os_linux_sparc.hpp
- prefetch_linux_sparc.inline.hpp
- thread_linux_sparc.cpp
- thread_linux_sparc.hpp
- vmStructs_linux_sparc.hpp
- vm_version_linux_sparc.cpp
-
-
- assembler_linux_x86.cpp
- atomic_linux_x86.hpp
- bytes_linux_x86.inline.hpp
- copy_linux_x86.inline.hpp
- globals_linux_x86.hpp
- linux_x86_32.s
- linux_x86_64.s
- orderAccess_linux_x86.inline.hpp
- os_linux_x86.cpp
- os_linux_x86.hpp
- os_linux_x86.inline.hpp
- prefetch_linux_x86.inline.hpp
- thread_linux_x86.cpp
- thread_linux_x86.hpp
- vmStructs_linux_x86.hpp
- vm_version_linux_x86.cpp
-
-
- assembler_linux_zero.cpp
- atomic_linux_zero.hpp
- bytes_linux_zero.inline.hpp
- globals_linux_zero.hpp
- orderAccess_linux_zero.inline.hpp
- os_linux_zero.cpp
- os_linux_zero.hpp
- prefetch_linux_zero.inline.hpp
- thread_linux_zero.cpp
- thread_linux_zero.hpp
- vmStructs_linux_zero.hpp
- vm_version_linux_zero.cpp
-
-
- atomic_solaris_sparc.hpp
- count_trailing_zeros_solaris_sparc.hpp
- globals_solaris_sparc.hpp
- orderAccess_solaris_sparc.inline.hpp
- os_solaris_sparc.cpp
- os_solaris_sparc.hpp
- prefetch_solaris_sparc.inline.hpp
- solaris_sparc.il
- solaris_sparc.s
- thread_solaris_sparc.cpp
- thread_solaris_sparc.hpp
- vmStructs_solaris_sparc.hpp
- vm_version_solaris_sparc.cpp
-
-
- assembler_solaris_x86.cpp
- atomic_solaris_x86.hpp
- bytes_solaris_x86.inline.hpp
- copy_solaris_x86.inline.hpp
- count_trailing_zeros_solaris_x86.hpp
- globals_solaris_x86.hpp
- orderAccess_solaris_x86.inline.hpp
- os_solaris_x86.cpp
- os_solaris_x86.hpp
- os_solaris_x86.inline.hpp
- prefetch_solaris_x86.inline.hpp
- solaris_x86_64.il
- solaris_x86_64.s
- thread_solaris_x86.cpp
- thread_solaris_x86.hpp
- vmStructs_solaris_x86.hpp
- vm_version_solaris_x86.cpp
-
-
- assembler_windows_x86.cpp
- atomic_windows_x86.hpp
- bytes_windows_x86.inline.hpp
- copy_windows_x86.inline.hpp
- globals_windows_x86.hpp
- orderAccess_windows_x86.inline.hpp
- os_windows_x86.cpp
- os_windows_x86.hpp
- os_windows_x86.inline.hpp
- prefetch_windows_x86.inline.hpp
- thread_windows_x86.cpp
- thread_windows_x86.hpp
- unwind_windows_x86.hpp
- vmStructs_windows_x86.hpp
- vm_version_windows_x86.cpp
-
-
-
-
-
- i486.ad
-
- adlc.hpp
- adlparse.cpp
- adlparse.hpp
- archDesc.cpp
- archDesc.hpp
- arena.cpp
- arena.hpp
- dfa.cpp
- dict2.cpp
- dict2.hpp
- filebuff.cpp
- filebuff.hpp
- forms.cpp
- forms.hpp
- formsopt.cpp
- formsopt.hpp
- formssel.cpp
- formssel.hpp
- main.cpp
- output_c.cpp
- output_h.cpp
-
-
- aotCodeHeap.cpp
- aotCodeHeap.hpp
- aotCompiledMethod.cpp
- aotCompiledMethod.hpp
- aotLoader.cpp
- aotLoader.hpp
- aotLoader.inline.hpp
- compiledIC_aot.cpp
- compiledIC_aot.hpp
-
-
- assembler.cpp
- assembler.hpp
- assembler.inline.hpp
- codeBuffer.cpp
- codeBuffer.hpp
- macroAssembler.hpp
- macroAssembler.inline.hpp
- register.cpp
- register.hpp
-
-
- c1_CFGPrinter.cpp
- c1_CFGPrinter.hpp
- c1_Canonicalizer.cpp
- c1_Canonicalizer.hpp
- c1_CodeStubs.hpp
- c1_Compilation.cpp
- c1_Compilation.hpp
- c1_Compiler.cpp
- c1_Compiler.hpp
- c1_Defs.cpp
- c1_Defs.hpp
- c1_FpuStackSim.hpp
- c1_FrameMap.cpp
- c1_FrameMap.hpp
- c1_GraphBuilder.cpp
- c1_GraphBuilder.hpp
- c1_IR.cpp
- c1_IR.hpp
- c1_Instruction.cpp
- c1_Instruction.hpp
- c1_InstructionPrinter.cpp
- c1_InstructionPrinter.hpp
- c1_LIR.cpp
- c1_LIR.hpp
- c1_LIRAssembler.cpp
- c1_LIRAssembler.hpp
- c1_LIRGenerator.cpp
- c1_LIRGenerator.hpp
- c1_LinearScan.cpp
- c1_LinearScan.hpp
- c1_MacroAssembler.hpp
- c1_Optimizer.cpp
- c1_Optimizer.hpp
- c1_RangeCheckElimination.cpp
- c1_RangeCheckElimination.hpp
- c1_Runtime1.cpp
- c1_Runtime1.hpp
- c1_ValueMap.cpp
- c1_ValueMap.hpp
- c1_ValueSet.cpp
- c1_ValueSet.hpp
- c1_ValueSet.inline.hpp
- c1_ValueStack.cpp
- c1_ValueStack.hpp
- c1_ValueType.cpp
- c1_ValueType.hpp
- c1_globals.cpp
- c1_globals.hpp
-
-
- bcEscapeAnalyzer.cpp
- bcEscapeAnalyzer.hpp
- ciArray.cpp
- ciArray.hpp
- ciArrayKlass.cpp
- ciArrayKlass.hpp
- ciBaseObject.cpp
- ciBaseObject.hpp
- ciCallProfile.hpp
- ciCallSite.cpp
- ciCallSite.hpp
- ciClassList.hpp
- ciConstant.cpp
- ciConstant.hpp
- ciConstantPoolCache.cpp
- ciConstantPoolCache.hpp
- ciEnv.cpp
- ciEnv.hpp
- ciExceptionHandler.cpp
- ciExceptionHandler.hpp
- ciField.cpp
- ciField.hpp
- ciFlags.cpp
- ciFlags.hpp
- ciInstance.cpp
- ciInstance.hpp
- ciInstanceKlass.cpp
- ciInstanceKlass.hpp
- ciKlass.cpp
- ciKlass.hpp
- ciMemberName.cpp
- ciMemberName.hpp
- ciMetadata.cpp
- ciMetadata.hpp
- ciMethod.cpp
- ciMethod.hpp
- ciMethodBlocks.cpp
- ciMethodBlocks.hpp
- ciMethodData.cpp
- ciMethodData.hpp
- ciMethodHandle.cpp
- ciMethodHandle.hpp
- ciMethodType.hpp
- ciNullObject.cpp
- ciNullObject.hpp
- ciObjArray.cpp
- ciObjArray.hpp
- ciObjArrayKlass.cpp
- ciObjArrayKlass.hpp
- ciObject.cpp
- ciObject.hpp
- ciObjectFactory.cpp
- ciObjectFactory.hpp
- ciReplay.cpp
- ciReplay.hpp
- ciSignature.cpp
- ciSignature.hpp
- ciStreams.cpp
- ciStreams.hpp
- ciSymbol.cpp
- ciSymbol.hpp
- ciType.cpp
- ciType.hpp
- ciTypeArray.cpp
- ciTypeArray.hpp
- ciTypeArrayKlass.cpp
- ciTypeArrayKlass.hpp
- ciTypeFlow.cpp
- ciTypeFlow.hpp
- ciUtilities.cpp
- ciUtilities.hpp
- compilerInterface.hpp
-
-
- altHashing.cpp
- altHashing.hpp
- bytecodeAssembler.cpp
- bytecodeAssembler.hpp
- classFileError.cpp
- classFileParser.cpp
- classFileParser.hpp
- classFileStream.cpp
- classFileStream.hpp
- classListParser.cpp
- classListParser.hpp
- classLoader.cpp
- classLoader.hpp
- classLoaderData.cpp
- classLoaderData.hpp
- classLoaderData.inline.hpp
- classLoaderExt.cpp
- classLoaderExt.hpp
- classLoaderStats.cpp
- classLoaderStats.hpp
- compactHashtable.cpp
- compactHashtable.hpp
- compactHashtable.inline.hpp
- defaultMethods.cpp
- defaultMethods.hpp
- dictionary.cpp
- dictionary.hpp
- javaAssertions.cpp
- javaAssertions.hpp
- javaClasses.cpp
- javaClasses.hpp
- javaClasses.inline.hpp
- jimage.hpp
- klassFactory.cpp
- klassFactory.hpp
- loaderConstraints.cpp
- loaderConstraints.hpp
- metadataOnStackMark.cpp
- metadataOnStackMark.hpp
- moduleEntry.cpp
- moduleEntry.hpp
- modules.cpp
- modules.hpp
- packageEntry.cpp
- packageEntry.hpp
- placeholders.cpp
- placeholders.hpp
- protectionDomainCache.cpp
- protectionDomainCache.hpp
- resolutionErrors.cpp
- resolutionErrors.hpp
- sharedClassUtil.hpp
- sharedPathsMiscInfo.cpp
- sharedPathsMiscInfo.hpp
- stackMapFrame.cpp
- stackMapFrame.hpp
- stackMapTable.cpp
- stackMapTable.hpp
- stackMapTableFormat.hpp
- stringTable.cpp
- stringTable.hpp
- symbolTable.cpp
- symbolTable.hpp
- systemDictionary.cpp
- systemDictionary.hpp
- systemDictionaryShared.hpp
- systemDictionary_ext.hpp
- verificationType.cpp
- verificationType.hpp
- verifier.cpp
- verifier.hpp
- vmSymbols.cpp
- vmSymbols.hpp
- vmSymbols_ext.hpp
-
-
- codeBlob.cpp
- codeBlob.hpp
- codeCache.cpp
- codeCache.hpp
- compiledIC.cpp
- compiledIC.hpp
- compiledMethod.cpp
- compiledMethod.hpp
- compiledMethod.inline.hpp
- compressedStream.cpp
- compressedStream.hpp
- debugInfo.cpp
- debugInfo.hpp
- debugInfoRec.cpp
- debugInfoRec.hpp
- dependencies.cpp
- dependencies.hpp
- dependencyContext.cpp
- dependencyContext.hpp
- exceptionHandlerTable.cpp
- exceptionHandlerTable.hpp
- icBuffer.cpp
- icBuffer.hpp
- jvmticmlr.h
- location.cpp
- location.hpp
- nativeInst.hpp
- nmethod.cpp
- nmethod.hpp
- oopRecorder.cpp
- oopRecorder.hpp
- pcDesc.cpp
- pcDesc.hpp
- relocInfo.cpp
- relocInfo.hpp
- relocInfo_ext.cpp
- relocInfo_ext.hpp
- scopeDesc.cpp
- scopeDesc.hpp
- stubs.cpp
- stubs.hpp
- vmreg.cpp
- vmreg.hpp
- vmreg.inline.hpp
- vtableStubs.cpp
- vtableStubs.hpp
-
-
- abstractCompiler.cpp
- abstractCompiler.hpp
- compileBroker.cpp
- compileBroker.hpp
- compileLog.cpp
- compileLog.hpp
- compileTask.cpp
- compileTask.hpp
- compilerDefinitions.cpp
- compilerDefinitions.hpp
- compilerDirectives.cpp
- compilerDirectives.hpp
- compilerOracle.cpp
- compilerOracle.hpp
- directivesParser.cpp
- directivesParser.hpp
- disassembler.cpp
- disassembler.hpp
- methodLiveness.cpp
- methodLiveness.hpp
- methodMatcher.cpp
- methodMatcher.hpp
- oopMap.cpp
- oopMap.hpp
-
-
-
- adaptiveFreeList.cpp
- adaptiveFreeList.hpp
- allocationStats.cpp
- allocationStats.hpp
- cmsCollectorPolicy.cpp
- cmsCollectorPolicy.hpp
- cmsLockVerifier.cpp
- cmsLockVerifier.hpp
- cmsOopClosures.cpp
- cmsOopClosures.hpp
- cmsOopClosures.inline.hpp
- compactibleFreeListSpace.cpp
- compactibleFreeListSpace.hpp
- concurrentMarkSweepGeneration.cpp
- concurrentMarkSweepGeneration.hpp
- concurrentMarkSweepGeneration.inline.hpp
- concurrentMarkSweepThread.cpp
- concurrentMarkSweepThread.hpp
- freeChunk.cpp
- freeChunk.hpp
- gSpaceCounters.cpp
- gSpaceCounters.hpp
- parCardTableModRefBS.cpp
- parNewGeneration.cpp
- parNewGeneration.hpp
- parNewGeneration.inline.hpp
- parOopClosures.cpp
- parOopClosures.hpp
- parOopClosures.inline.hpp
- promotionInfo.cpp
- promotionInfo.hpp
- vmCMSOperations.cpp
- vmCMSOperations.hpp
- vmStructs_cms.hpp
- vmStructs_parNew.hpp
- yieldingWorkgroup.cpp
- yieldingWorkgroup.hpp
-
-
- bufferingOopClosure.hpp
- collectionSetChooser.cpp
- collectionSetChooser.hpp
- concurrentG1Refine.cpp
- concurrentG1Refine.hpp
- concurrentG1RefineThread.cpp
- concurrentG1RefineThread.hpp
- concurrentMarkThread.cpp
- concurrentMarkThread.hpp
- concurrentMarkThread.inline.hpp
- dirtyCardQueue.cpp
- dirtyCardQueue.hpp
- evacuationInfo.hpp
- g1AllocRegion.cpp
- g1AllocRegion.hpp
- g1AllocRegion.inline.hpp
- g1AllocationContext.hpp
- g1Allocator.cpp
- g1Allocator.hpp
- g1Allocator.inline.hpp
- g1Allocator_ext.cpp
- g1Analytics.cpp
- g1Analytics.hpp
- g1BiasedArray.cpp
- g1BiasedArray.hpp
- g1BlockOffsetTable.cpp
- g1BlockOffsetTable.hpp
- g1BlockOffsetTable.inline.hpp
- g1CardCounts.cpp
- g1CardCounts.hpp
- g1CardLiveData.cpp
- g1CardLiveData.hpp
- g1CardLiveData.inline.hpp
- g1CodeBlobClosure.cpp
- g1CodeBlobClosure.hpp
- g1CodeCacheRemSet.cpp
- g1CodeCacheRemSet.hpp
- g1CodeRootSetTable.hpp
- g1CollectedHeap.cpp
- g1CollectedHeap.hpp
- g1CollectedHeap.inline.hpp
- g1CollectedHeap_ext.cpp
- g1CollectionSet.cpp
- g1CollectionSet.hpp
- g1CollectorPolicy.cpp
- g1CollectorPolicy.hpp
- g1CollectorState.hpp
- g1ConcurrentMark.cpp
- g1ConcurrentMark.hpp
- g1ConcurrentMark.inline.hpp
- g1ConcurrentMarkBitMap.cpp
- g1ConcurrentMarkBitMap.hpp
- g1ConcurrentMarkBitMap.inline.hpp
- g1ConcurrentMarkObjArrayProcessor.cpp
- g1ConcurrentMarkObjArrayProcessor.hpp
- g1ConcurrentMarkObjArrayProcessor.inline.hpp
- g1DefaultPolicy.cpp
- g1DefaultPolicy.hpp
- g1EdenRegions.hpp
- g1EvacFailure.cpp
- g1EvacFailure.hpp
- g1EvacStats.cpp
- g1EvacStats.hpp
- g1EvacStats.inline.hpp
- g1FromCardCache.cpp
- g1FromCardCache.hpp
- g1FullGCScope.cpp
- g1FullGCScope.hpp
- g1GCPhaseTimes.cpp
- g1GCPhaseTimes.hpp
- g1HRPrinter.hpp
- g1HeapRegionTraceType.hpp
- g1HeapSizingPolicy.cpp
- g1HeapSizingPolicy.hpp
- g1HeapSizingPolicy_ext.cpp
- g1HeapTransition.cpp
- g1HeapTransition.hpp
- g1HeapVerifier.cpp
- g1HeapVerifier.hpp
- g1HotCardCache.cpp
- g1HotCardCache.hpp
- g1IHOPControl.cpp
- g1IHOPControl.hpp
- g1InCSetState.hpp
- g1InitialMarkToMixedTimeTracker.hpp
- g1MMUTracker.cpp
- g1MMUTracker.hpp
- g1MarkSweep.cpp
- g1MarkSweep.hpp
- g1MarkSweep_ext.cpp
- g1MonitoringSupport.cpp
- g1MonitoringSupport.hpp
- g1OopClosures.cpp
- g1OopClosures.hpp
- g1OopClosures.inline.hpp
- g1PageBasedVirtualSpace.cpp
- g1PageBasedVirtualSpace.hpp
- g1ParScanThreadState.cpp
- g1ParScanThreadState.hpp
- g1ParScanThreadState.inline.hpp
- g1ParScanThreadState_ext.cpp
- g1Policy.hpp
- g1Predictions.hpp
- g1RegionToSpaceMapper.cpp
- g1RegionToSpaceMapper.hpp
- g1RemSet.cpp
- g1RemSet.hpp
- g1RemSet.inline.hpp
- g1RemSetSummary.cpp
- g1RemSetSummary.hpp
- g1RootClosures.cpp
- g1RootClosures.hpp
- g1RootClosures_ext.cpp
- g1RootProcessor.cpp
- g1RootProcessor.hpp
- g1SATBCardTableModRefBS.cpp
- g1SATBCardTableModRefBS.hpp
- g1SATBCardTableModRefBS.inline.hpp
- g1SerialFullCollector.cpp
- g1SerialFullCollector.hpp
- g1SharedClosures.hpp
- g1StringDedup.cpp
- g1StringDedup.hpp
- g1StringDedupQueue.cpp
- g1StringDedupQueue.hpp
- g1StringDedupStat.cpp
- g1StringDedupStat.hpp
- g1StringDedupTable.cpp
- g1StringDedupTable.hpp
- g1StringDedupThread.cpp
- g1StringDedupThread.hpp
- g1SurvivorRegions.cpp
- g1SurvivorRegions.hpp
- g1YCTypes.hpp
- g1YoungGenSizer.cpp
- g1YoungGenSizer.hpp
- g1YoungRemSetSamplingThread.cpp
- g1YoungRemSetSamplingThread.hpp
- g1_globals.cpp
- g1_globals.hpp
- g1_specialized_oop_closures.hpp
- hSpaceCounters.cpp
- hSpaceCounters.hpp
- heapRegion.cpp
- heapRegion.hpp
- heapRegion.inline.hpp
- heapRegionBounds.hpp
- heapRegionBounds.inline.hpp
- heapRegionManager.cpp
- heapRegionManager.hpp
- heapRegionManager.inline.hpp
- heapRegionRemSet.cpp
- heapRegionRemSet.hpp
- heapRegionSet.cpp
- heapRegionSet.hpp
- heapRegionSet.inline.hpp
- heapRegionTracer.cpp
- heapRegionTracer.hpp
- heapRegionType.cpp
- heapRegionType.hpp
- ptrQueue.cpp
- ptrQueue.hpp
- satbMarkQueue.cpp
- satbMarkQueue.hpp
- sparsePRT.cpp
- sparsePRT.hpp
- survRateGroup.cpp
- survRateGroup.hpp
- suspendibleThreadSet.cpp
- suspendibleThreadSet.hpp
- vmStructs_g1.hpp
- vm_operations_g1.cpp
- vm_operations_g1.hpp
-
-
- adjoiningGenerations.cpp
- adjoiningGenerations.hpp
- adjoiningVirtualSpaces.cpp
- adjoiningVirtualSpaces.hpp
- asPSOldGen.cpp
- asPSOldGen.hpp
- asPSYoungGen.cpp
- asPSYoungGen.hpp
- cardTableExtension.cpp
- cardTableExtension.hpp
- gcAdaptivePolicyCounters.cpp
- gcAdaptivePolicyCounters.hpp
- gcTaskManager.cpp
- gcTaskManager.hpp
- gcTaskThread.cpp
- gcTaskThread.hpp
- generationSizer.cpp
- generationSizer.hpp
- immutableSpace.cpp
- immutableSpace.hpp
- mutableNUMASpace.cpp
- mutableNUMASpace.hpp
- mutableSpace.cpp
- mutableSpace.hpp
- objectStartArray.cpp
- objectStartArray.hpp
- objectStartArray.inline.hpp
- parMarkBitMap.cpp
- parMarkBitMap.hpp
- parMarkBitMap.inline.hpp
- parallelScavengeHeap.cpp
- parallelScavengeHeap.hpp
- parallelScavengeHeap.inline.hpp
- pcTasks.cpp
- pcTasks.hpp
- psAdaptiveSizePolicy.cpp
- psAdaptiveSizePolicy.hpp
- psCompactionManager.cpp
- psCompactionManager.hpp
- psCompactionManager.inline.hpp
- psGCAdaptivePolicyCounters.cpp
- psGCAdaptivePolicyCounters.hpp
- psGenerationCounters.cpp
- psGenerationCounters.hpp
- psMarkSweep.cpp
- psMarkSweep.hpp
- psMarkSweepDecorator.cpp
- psMarkSweepDecorator.hpp
- psOldGen.cpp
- psOldGen.hpp
- psParallelCompact.cpp
- psParallelCompact.hpp
- psParallelCompact.inline.hpp
- psPromotionLAB.cpp
- psPromotionLAB.hpp
- psPromotionLAB.inline.hpp
- psPromotionManager.cpp
- psPromotionManager.hpp
- psPromotionManager.inline.hpp
- psScavenge.cpp
- psScavenge.hpp
- psScavenge.inline.hpp
- psTasks.cpp
- psTasks.hpp
- psVirtualspace.cpp
- psVirtualspace.hpp
- psYoungGen.cpp
- psYoungGen.hpp
- spaceCounters.cpp
- spaceCounters.hpp
- vmPSOperations.cpp
- vmPSOperations.hpp
- vmStructs_parallelgc.hpp
-
-
- cSpaceCounters.cpp
- cSpaceCounters.hpp
- defNewGeneration.cpp
- defNewGeneration.hpp
- defNewGeneration.inline.hpp
- genMarkSweep.cpp
- genMarkSweep.hpp
- markSweep.cpp
- markSweep.hpp
- markSweep.inline.hpp
- tenuredGeneration.cpp
- tenuredGeneration.hpp
- tenuredGeneration.inline.hpp
-
-
- adaptiveSizePolicy.cpp
- adaptiveSizePolicy.hpp
- ageTable.cpp
- ageTable.hpp
- ageTable.inline.hpp
- ageTableTracer.cpp
- ageTableTracer.hpp
- allocTracer.cpp
- allocTracer.hpp
- barrierSet.cpp
- barrierSet.hpp
- barrierSet.inline.hpp
- blockOffsetTable.cpp
- blockOffsetTable.hpp
- blockOffsetTable.inline.hpp
- cardGeneration.cpp
- cardGeneration.hpp
- cardGeneration.inline.hpp
- cardTableModRefBS.cpp
- cardTableModRefBS.hpp
- cardTableModRefBS.inline.hpp
- cardTableModRefBSForCTRS.cpp
- cardTableModRefBSForCTRS.hpp
- cardTableRS.cpp
- cardTableRS.hpp
- collectedHeap.cpp
- collectedHeap.hpp
- collectedHeap.inline.hpp
- collectorCounters.cpp
- collectorCounters.hpp
- collectorPolicy.cpp
- collectorPolicy.hpp
- concurrentGCPhaseManager.cpp
- concurrentGCPhaseManager.hpp
- concurrentGCThread.cpp
- concurrentGCThread.hpp
- copyFailedInfo.hpp
- gcCause.cpp
- gcCause.hpp
- gcHeapSummary.hpp
- gcId.cpp
- gcId.hpp
- gcLocker.cpp
- gcLocker.hpp
- gcLocker.inline.hpp
- gcName.hpp
- gcPolicyCounters.cpp
- gcPolicyCounters.hpp
- gcStats.cpp
- gcStats.hpp
- gcTimer.cpp
- gcTimer.hpp
- gcTrace.cpp
- gcTrace.hpp
- gcTraceSend.cpp
- gcTraceTime.cpp
- gcTraceTime.hpp
- gcTraceTime.inline.hpp
- gcUtil.cpp
- gcUtil.hpp
- gcWhen.hpp
- genCollectedHeap.cpp
- genCollectedHeap.hpp
- genOopClosures.cpp
- genOopClosures.hpp
- genOopClosures.inline.hpp
- generation.cpp
- generation.hpp
- generationCounters.cpp
- generationCounters.hpp
- generationSpec.cpp
- generationSpec.hpp
- isGCActiveMark.hpp
- memset_with_concurrent_readers.hpp
- modRefBarrierSet.hpp
- objectCountEventSender.cpp
- objectCountEventSender.hpp
- plab.cpp
- plab.hpp
- plab.inline.hpp
- preservedMarks.cpp
- preservedMarks.hpp
- preservedMarks.inline.hpp
- referencePolicy.cpp
- referencePolicy.hpp
- referenceProcessor.cpp
- referenceProcessor.hpp
- referenceProcessor.inline.hpp
- referenceProcessorPhaseTimes.cpp
- referenceProcessorPhaseTimes.hpp
- referenceProcessorStats.hpp
- space.cpp
- space.hpp
- space.inline.hpp
- spaceDecorator.cpp
- spaceDecorator.hpp
- specialized_oop_closures.hpp
- strongRootsScope.cpp
- strongRootsScope.hpp
- taskqueue.cpp
- taskqueue.hpp
- taskqueue.inline.hpp
- threadLocalAllocBuffer.cpp
- threadLocalAllocBuffer.hpp
- threadLocalAllocBuffer.inline.hpp
- vmGCOperations.cpp
- vmGCOperations.hpp
- workerDataArray.cpp
- workerDataArray.hpp
- workerDataArray.inline.hpp
- workerManager.hpp
- workgroup.cpp
- workgroup.hpp
-
-
-
- abstractInterpreter.cpp
- abstractInterpreter.hpp
- bytecode.cpp
- bytecode.hpp
- bytecodeHistogram.cpp
- bytecodeHistogram.hpp
- bytecodeInterpreter.cpp
- bytecodeInterpreter.hpp
- bytecodeInterpreter.inline.hpp
- bytecodeInterpreterProfiling.hpp
- bytecodeStream.cpp
- bytecodeStream.hpp
- bytecodeTracer.cpp
- bytecodeTracer.hpp
- bytecodes.cpp
- bytecodes.hpp
- cppInterpreter.cpp
- cppInterpreter.hpp
- cppInterpreterGenerator.cpp
- cppInterpreterGenerator.hpp
- interp_masm.hpp
- interpreter.cpp
- interpreter.hpp
- interpreterRuntime.cpp
- interpreterRuntime.hpp
- invocationCounter.cpp
- invocationCounter.hpp
- linkResolver.cpp
- linkResolver.hpp
- oopMapCache.cpp
- oopMapCache.hpp
- rewriter.cpp
- rewriter.hpp
- templateInterpreter.cpp
- templateInterpreter.hpp
- templateInterpreterGenerator.cpp
- templateInterpreterGenerator.hpp
- templateTable.cpp
- templateTable.hpp
-
-
- compilerRuntime.cpp
- compilerRuntime.hpp
- jvmciCodeInstaller.cpp
- jvmciCodeInstaller.hpp
- jvmciCompiler.cpp
- jvmciCompiler.hpp
- jvmciCompilerToVM.cpp
- jvmciCompilerToVM.hpp
- jvmciEnv.cpp
- jvmciEnv.hpp
- jvmciJavaClasses.cpp
- jvmciJavaClasses.hpp
- jvmciRuntime.cpp
- jvmciRuntime.hpp
- jvmci_globals.cpp
- jvmci_globals.hpp
- systemDictionary_jvmci.hpp
- vmStructs_compiler_runtime.hpp
- vmStructs_jvmci.cpp
- vmStructs_jvmci.hpp
- vmSymbols_jvmci.hpp
-
-
- dict.cpp
- dict.hpp
- set.cpp
- set.hpp
- vectset.cpp
- vectset.hpp
-
-
- log.hpp
- logConfiguration.cpp
- logConfiguration.hpp
- logDecorations.cpp
- logDecorations.hpp
- logDecorators.cpp
- logDecorators.hpp
- logDiagnosticCommand.cpp
- logDiagnosticCommand.hpp
- logFileOutput.cpp
- logFileOutput.hpp
- logFileStreamOutput.cpp
- logFileStreamOutput.hpp
- logHandle.hpp
- logLevel.cpp
- logLevel.hpp
- logMessage.hpp
- logMessageBuffer.cpp
- logMessageBuffer.hpp
- logOutput.cpp
- logOutput.hpp
- logOutputList.cpp
- logOutputList.hpp
- logPrefix.hpp
- logStream.cpp
- logStream.hpp
- logTag.cpp
- logTag.hpp
- logTagLevelExpression.cpp
- logTagLevelExpression.hpp
- logTagSet.cpp
- logTagSet.hpp
- logTagSetDescriptions.cpp
- logTagSetDescriptions.hpp
- logTag_ext.hpp
-
-
- allocation.cpp
- allocation.hpp
- allocation.inline.hpp
- arena.cpp
- arena.hpp
- binaryTreeDictionary.cpp
- binaryTreeDictionary.hpp
- filemap.cpp
- filemap.hpp
- freeList.cpp
- freeList.hpp
- guardedMemory.cpp
- guardedMemory.hpp
- heap.cpp
- heap.hpp
- heapInspection.cpp
- heapInspection.hpp
- iterator.cpp
- iterator.hpp
- iterator.inline.hpp
- memRegion.cpp
- memRegion.hpp
- metachunk.cpp
- metachunk.hpp
- metadataFactory.hpp
- metaspace.cpp
- metaspace.hpp
- metaspaceChunkFreeListSummary.hpp
- metaspaceClosure.cpp
- metaspaceClosure.hpp
- metaspaceCounters.cpp
- metaspaceCounters.hpp
- metaspaceGCThresholdUpdater.hpp
- metaspaceShared.cpp
- metaspaceShared.hpp
- metaspaceTracer.cpp
- metaspaceTracer.hpp
- oopFactory.cpp
- oopFactory.hpp
- operator_new.cpp
- padded.hpp
- padded.inline.hpp
- referenceType.hpp
- resourceArea.cpp
- resourceArea.hpp
- universe.cpp
- universe.hpp
- universe.inline.hpp
- universe_ext.cpp
- virtualspace.cpp
- virtualspace.hpp
-
-
- conditional.hpp
- decay.hpp
- enableIf.hpp
- integralConstant.hpp
- isConst.hpp
- isFloatingPoint.hpp
- isIntegral.hpp
- isPointer.hpp
- isRegisteredEnum.hpp
- isSame.hpp
- isSigned.hpp
- isVolatile.hpp
- primitiveConversions.hpp
- removeCV.hpp
- removePointer.hpp
- removeReference.hpp
-
-
- annotations.cpp
- annotations.hpp
- array.hpp
- arrayKlass.cpp
- arrayKlass.hpp
- arrayKlass.inline.hpp
- arrayOop.hpp
- compiledICHolder.cpp
- compiledICHolder.hpp
- constMethod.cpp
- constMethod.hpp
- constantPool.cpp
- constantPool.hpp
- cpCache.cpp
- cpCache.hpp
- fieldInfo.hpp
- fieldStreams.hpp
- generateOopMap.cpp
- generateOopMap.hpp
- instanceClassLoaderKlass.hpp
- instanceClassLoaderKlass.inline.hpp
- instanceKlass.cpp
- instanceKlass.hpp
- instanceKlass.inline.hpp
- instanceMirrorKlass.cpp
- instanceMirrorKlass.hpp
- instanceMirrorKlass.inline.hpp
- instanceOop.cpp
- instanceOop.hpp
- instanceRefKlass.cpp
- instanceRefKlass.hpp
- instanceRefKlass.inline.hpp
- klass.cpp
- klass.hpp
- klass.inline.hpp
- klassVtable.cpp
- klassVtable.hpp
- markOop.cpp
- markOop.hpp
- markOop.inline.hpp
- metadata.cpp
- metadata.hpp
- method.cpp
- method.hpp
- methodCounters.cpp
- methodCounters.hpp
- methodData.cpp
- methodData.hpp
- objArrayKlass.cpp
- objArrayKlass.hpp
- objArrayKlass.inline.hpp
- objArrayOop.cpp
- objArrayOop.hpp
- objArrayOop.inline.hpp
- oop.cpp
- oop.hpp
- oop.inline.hpp
- oopHandle.hpp
- oopsHierarchy.cpp
- oopsHierarchy.hpp
- symbol.cpp
- symbol.hpp
- typeArrayKlass.cpp
- typeArrayKlass.hpp
- typeArrayKlass.inline.hpp
- typeArrayOop.hpp
- typeArrayOop.inline.hpp
- verifyOopClosure.hpp
-
-
- ad.hpp
- addnode.cpp
- addnode.hpp
- adlcVMDeps.hpp
- arraycopynode.cpp
- arraycopynode.hpp
- block.cpp
- block.hpp
- buildOopMap.cpp
- bytecodeInfo.cpp
- c2_globals.cpp
- c2_globals.hpp
- c2compiler.cpp
- c2compiler.hpp
- callGenerator.cpp
- callGenerator.hpp
- callnode.cpp
- callnode.hpp
- castnode.cpp
- castnode.hpp
- cfgnode.cpp
- cfgnode.hpp
- chaitin.cpp
- chaitin.hpp
- classes.cpp
- classes.hpp
- coalesce.cpp
- coalesce.hpp
- compile.cpp
- compile.hpp
- connode.cpp
- connode.hpp
- convertnode.cpp
- convertnode.hpp
- countbitsnode.cpp
- countbitsnode.hpp
- divnode.cpp
- divnode.hpp
- doCall.cpp
- domgraph.cpp
- escape.cpp
- escape.hpp
- gcm.cpp
- generateOptoStub.cpp
- graphKit.cpp
- graphKit.hpp
- idealGraphPrinter.cpp
- idealGraphPrinter.hpp
- idealKit.cpp
- idealKit.hpp
- ifg.cpp
- ifnode.cpp
- indexSet.cpp
- indexSet.hpp
- intrinsicnode.cpp
- intrinsicnode.hpp
- lcm.cpp
- library_call.cpp
- live.cpp
- live.hpp
- locknode.cpp
- locknode.hpp
- loopPredicate.cpp
- loopTransform.cpp
- loopUnswitch.cpp
- loopnode.cpp
- loopnode.hpp
- loopopts.cpp
- machnode.cpp
- machnode.hpp
- macro.cpp
- macro.hpp
- macroArrayCopy.cpp
- matcher.cpp
- matcher.hpp
- mathexactnode.cpp
- mathexactnode.hpp
- memnode.cpp
- memnode.hpp
- movenode.cpp
- movenode.hpp
- mulnode.cpp
- mulnode.hpp
- multnode.cpp
- multnode.hpp
- narrowptrnode.cpp
- narrowptrnode.hpp
- node.cpp
- node.hpp
- opaquenode.cpp
- opaquenode.hpp
- opcodes.cpp
- opcodes.hpp
- optoreg.hpp
- output.cpp
- output.hpp
- parse.hpp
- parse1.cpp
- parse2.cpp
- parse3.cpp
- parseHelper.cpp
- phase.cpp
- phase.hpp
- phaseX.cpp
- phaseX.hpp
- phasetype.hpp
- postaloc.cpp
- reg_split.cpp
- regalloc.cpp
- regalloc.hpp
- regmask.cpp
- regmask.hpp
- replacednodes.cpp
- replacednodes.hpp
- rootnode.cpp
- rootnode.hpp
- runtime.cpp
- runtime.hpp
- split_if.cpp
- stringopts.cpp
- stringopts.hpp
- subnode.cpp
- subnode.hpp
- superword.cpp
- superword.hpp
- type.cpp
- type.hpp
- vectornode.cpp
- vectornode.hpp
-
-
- precompiled.hpp
-
-
-
- parserTests.cpp
- parserTests.hpp
-
- evmCompat.cpp
- forte.cpp
- forte.hpp
- jni.cpp
- jni.h
- jniCheck.cpp
- jniCheck.hpp
- jniExport.hpp
- jniFastGetField.cpp
- jniFastGetField.hpp
- jni_md.h
- jvm.cpp
- jvm.h
- jvm_misc.hpp
- jvmtiAgentThread.hpp
- jvmtiClassFileReconstituter.cpp
- jvmtiClassFileReconstituter.hpp
- jvmtiCodeBlobEvents.cpp
- jvmtiCodeBlobEvents.hpp
- jvmtiEnter.inline.hpp
- jvmtiEnv.cpp
- jvmtiEnvBase.cpp
- jvmtiEnvBase.hpp
- jvmtiEnvThreadState.cpp
- jvmtiEnvThreadState.hpp
- jvmtiEventController.cpp
- jvmtiEventController.hpp
- jvmtiEventController.inline.hpp
- jvmtiExport.cpp
- jvmtiExport.hpp
- jvmtiExtensions.cpp
- jvmtiExtensions.hpp
- jvmtiGetLoadedClasses.cpp
- jvmtiGetLoadedClasses.hpp
- jvmtiImpl.cpp
- jvmtiImpl.hpp
- jvmtiManageCapabilities.cpp
- jvmtiManageCapabilities.hpp
- jvmtiRawMonitor.cpp
- jvmtiRawMonitor.hpp
- jvmtiRedefineClasses.cpp
- jvmtiRedefineClasses.hpp
- jvmtiTagMap.cpp
- jvmtiTagMap.hpp
- jvmtiThreadState.cpp
- jvmtiThreadState.hpp
- jvmtiThreadState.inline.hpp
- jvmtiTrace.cpp
- jvmtiTrace.hpp
- jvmtiUtil.cpp
- jvmtiUtil.hpp
- methodComparator.cpp
- methodComparator.hpp
- methodHandles.cpp
- methodHandles.hpp
- nativeLookup.cpp
- nativeLookup.hpp
- perf.cpp
- privilegedStack.cpp
- privilegedStack.hpp
- resolvedMethodTable.cpp
- resolvedMethodTable.hpp
- stackwalk.cpp
- stackwalk.hpp
- unsafe.cpp
- unsafe.hpp
- whitebox.cpp
- whitebox.hpp
- whitebox_ext.cpp
-
-
- advancedThresholdPolicy.cpp
- advancedThresholdPolicy.hpp
- arguments.cpp
- arguments.hpp
- arguments_ext.cpp
- atomic.hpp
- basicLock.cpp
- basicLock.hpp
- biasedLocking.cpp
- biasedLocking.hpp
- commandLineFlagConstraintList.cpp
- commandLineFlagConstraintList.hpp
- commandLineFlagConstraintsCompiler.cpp
- commandLineFlagConstraintsCompiler.hpp
- commandLineFlagConstraintsGC.cpp
- commandLineFlagConstraintsGC.hpp
- commandLineFlagConstraintsRuntime.cpp
- commandLineFlagConstraintsRuntime.hpp
- commandLineFlagRangeList.cpp
- commandLineFlagRangeList.hpp
- commandLineFlagWriteableList.cpp
- commandLineFlagWriteableList.hpp
- compilationPolicy.cpp
- compilationPolicy.hpp
- deoptimization.cpp
- deoptimization.hpp
- extendedPC.hpp
- fieldDescriptor.cpp
- fieldDescriptor.hpp
- fieldType.cpp
- fieldType.hpp
- frame.cpp
- frame.hpp
- frame.inline.hpp
- globals.cpp
- globals.hpp
- globals_ext.hpp
- globals_extension.hpp
- handles.cpp
- handles.hpp
- handles.inline.hpp
- icache.cpp
- icache.hpp
- init.cpp
- init.hpp
- interfaceSupport.cpp
- interfaceSupport.hpp
- java.cpp
- java.hpp
- javaCalls.cpp
- javaCalls.hpp
- javaFrameAnchor.hpp
- jfieldIDWorkaround.hpp
- jniHandles.cpp
- jniHandles.hpp
- jniPeriodicChecker.cpp
- jniPeriodicChecker.hpp
- memprofiler.cpp
- memprofiler.hpp
- monitorChunk.cpp
- monitorChunk.hpp
- mutex.cpp
- mutex.hpp
- mutexLocker.cpp
- mutexLocker.hpp
- objectMonitor.cpp
- objectMonitor.hpp
- objectMonitor.inline.hpp
- orderAccess.cpp
- orderAccess.hpp
- orderAccess.inline.hpp
- os.cpp
- os.hpp
- os.inline.hpp
- osThread.cpp
- osThread.hpp
- os_ext.hpp
- park.cpp
- park.hpp
- perfData.cpp
- perfData.hpp
- perfMemory.cpp
- perfMemory.hpp
- prefetch.hpp
- prefetch.inline.hpp
- reflection.cpp
- reflection.hpp
- reflectionUtils.cpp
- reflectionUtils.hpp
- registerMap.hpp
- relocator.cpp
- relocator.hpp
- rframe.cpp
- rframe.hpp
- rtmLocking.cpp
- rtmLocking.hpp
- safepoint.cpp
- safepoint.hpp
- semaphore.hpp
- serviceThread.cpp
- serviceThread.hpp
- sharedRuntime.cpp
- sharedRuntime.hpp
- sharedRuntimeMath.hpp
- sharedRuntimeTrans.cpp
- sharedRuntimeTrig.cpp
- signature.cpp
- signature.hpp
- simpleThresholdPolicy.cpp
- simpleThresholdPolicy.hpp
- simpleThresholdPolicy.inline.hpp
- stackValue.cpp
- stackValue.hpp
- stackValueCollection.cpp
- stackValueCollection.hpp
- statSampler.cpp
- statSampler.hpp
- stubCodeGenerator.cpp
- stubCodeGenerator.hpp
- stubRoutines.cpp
- stubRoutines.hpp
- sweeper.cpp
- sweeper.hpp
- synchronizer.cpp
- synchronizer.hpp
- task.cpp
- task.hpp
- thread.cpp
- thread.hpp
- thread.inline.hpp
- threadCritical.hpp
- threadLocalStorage.hpp
- thread_ext.cpp
- thread_ext.hpp
- timer.cpp
- timer.hpp
- timerTrace.cpp
- timerTrace.hpp
- unhandledOops.cpp
- unhandledOops.hpp
- vframe.cpp
- vframe.hpp
- vframeArray.cpp
- vframeArray.hpp
- vframe_hp.cpp
- vframe_hp.hpp
- vmStructs.cpp
- vmStructs.hpp
- vmStructs_ext.hpp
- vmStructs_trace.hpp
- vmThread.cpp
- vmThread.hpp
- vm_operations.cpp
- vm_operations.hpp
- vm_version.cpp
- vm_version.hpp
-
-
- allocationContextService.hpp
- allocationSite.hpp
- attachListener.cpp
- attachListener.hpp
- classLoadingService.cpp
- classLoadingService.hpp
- diagnosticArgument.cpp
- diagnosticArgument.hpp
- diagnosticCommand.cpp
- diagnosticCommand.hpp
- diagnosticFramework.cpp
- diagnosticFramework.hpp
- dtraceAttacher.cpp
- dtraceAttacher.hpp
- g1MemoryPool.cpp
- g1MemoryPool.hpp
- gcNotifier.cpp
- gcNotifier.hpp
- heapDumper.cpp
- heapDumper.hpp
- jmm.h
- lowMemoryDetector.cpp
- lowMemoryDetector.hpp
- mallocSiteTable.cpp
- mallocSiteTable.hpp
- mallocTracker.cpp
- mallocTracker.hpp
- mallocTracker.inline.hpp
- management.cpp
- management.hpp
- memBaseline.cpp
- memBaseline.hpp
- memReporter.cpp
- memReporter.hpp
- memTracker.cpp
- memTracker.hpp
- memoryManager.cpp
- memoryManager.hpp
- memoryPool.cpp
- memoryPool.hpp
- memoryService.cpp
- memoryService.hpp
- memoryUsage.hpp
- nmtCommon.cpp
- nmtCommon.hpp
- nmtDCmd.cpp
- nmtDCmd.hpp
- psMemoryPool.cpp
- psMemoryPool.hpp
- runtimeService.cpp
- runtimeService.hpp
- serviceUtil.hpp
- threadService.cpp
- threadService.hpp
- virtualMemoryTracker.cpp
- virtualMemoryTracker.hpp
- writeableFlags.cpp
- writeableFlags.hpp
-
-
- llvmHeaders.hpp
- llvmValue.hpp
- sharkBlock.cpp
- sharkBlock.hpp
- sharkBuilder.cpp
- sharkBuilder.hpp
- sharkCacheDecache.cpp
- sharkCacheDecache.hpp
- sharkCodeBuffer.hpp
- sharkCompiler.cpp
- sharkCompiler.hpp
- sharkConstant.cpp
- sharkConstant.hpp
- sharkContext.cpp
- sharkContext.hpp
- sharkEntry.hpp
- sharkFunction.cpp
- sharkFunction.hpp
- sharkInliner.cpp
- sharkInliner.hpp
- sharkIntrinsics.cpp
- sharkIntrinsics.hpp
- sharkInvariants.cpp
- sharkInvariants.hpp
- sharkMemoryManager.cpp
- sharkMemoryManager.hpp
- sharkNativeWrapper.cpp
- sharkNativeWrapper.hpp
- sharkRuntime.cpp
- sharkRuntime.hpp
- sharkStack.cpp
- sharkStack.hpp
- sharkState.cpp
- sharkState.hpp
- sharkStateScanner.cpp
- sharkStateScanner.hpp
- sharkTopLevelBlock.cpp
- sharkTopLevelBlock.hpp
- sharkType.hpp
- sharkValue.cpp
- sharkValue.hpp
- shark_globals.cpp
- shark_globals.hpp
-
-
- noTraceBackend.hpp
- traceBackend.cpp
- traceBackend.hpp
- traceDataTypes.hpp
- traceEvent.hpp
- traceMacros.hpp
- traceStream.cpp
- traceStream.hpp
- traceTime.hpp
- tracing.hpp
- xinclude.mod
-
-
- accessFlags.cpp
- accessFlags.hpp
- align.hpp
- bitMap.cpp
- bitMap.hpp
- bitMap.inline.hpp
- breakpoint.hpp
- bytes.hpp
- chunkedList.hpp
- compilerWarnings.hpp
- constantTag.cpp
- constantTag.hpp
- copy.cpp
- copy.hpp
- count_trailing_zeros.hpp
- debug.cpp
- debug.hpp
- decoder.cpp
- decoder.hpp
- decoder_elf.cpp
- decoder_elf.hpp
- defaultStream.hpp
- dtrace.hpp
- dtrace_disabled.hpp
- elfFile.cpp
- elfFile.hpp
- elfFuncDescTable.cpp
- elfFuncDescTable.hpp
- elfStringTable.cpp
- elfStringTable.hpp
- elfSymbolTable.cpp
- elfSymbolTable.hpp
- events.cpp
- events.hpp
- exceptions.cpp
- exceptions.hpp
- fakeRttiSupport.hpp
- formatBuffer.cpp
- formatBuffer.hpp
- globalDefinitions.cpp
- globalDefinitions.hpp
- globalDefinitions_gcc.hpp
- globalDefinitions_solstudio.hpp
- globalDefinitions_visCPP.hpp
- globalDefinitions_xlc.hpp
- growableArray.cpp
- growableArray.hpp
- hashtable.cpp
- hashtable.hpp
- hashtable.inline.hpp
- histogram.cpp
- histogram.hpp
- intHisto.cpp
- intHisto.hpp
- internalVMTests.cpp
- internalVMTests.hpp
- json.cpp
- json.hpp
- linkedlist.hpp
- macros.hpp
- nativeCallStack.cpp
- nativeCallStack.hpp
- numberSeq.cpp
- numberSeq.hpp
- ostream.cpp
- ostream.hpp
- pair.hpp
- preserveException.cpp
- preserveException.hpp
- quickSort.hpp
- resourceHash.hpp
- sizes.cpp
- sizes.hpp
- stack.hpp
- stack.inline.hpp
- stringUtils.cpp
- stringUtils.hpp
- ticks.cpp
- ticks.hpp
- utf8.cpp
- utf8.hpp
- vmError.cpp
- vmError.hpp
- xmlstream.cpp
- xmlstream.hpp
-
- Xusage.txt
-
-
-
-
-
-
- ProcessHandleImpl_aix.c
-
-
- java_md_aix.c
- java_md_aix.h
-
-
- jsig.c
-
-
- aix_close.c
-
-
-
- AixPollPort.c
-
-
- AixNativeDispatcher.c
-
-
-
-
-
-
-
- ProcessHandleImpl_linux.c
-
-
- jsig.c
-
-
- linux_close.c
-
-
-
- EPoll.c
- EPollArrayWrapper.c
- EPollPort.c
-
-
- LinuxNativeDispatcher.c
- LinuxWatchService.c
-
-
-
-
-
-
-
- jni_md.h
- jvm_md.h
-
-
- HostLocaleProviderAdapter_md.c
- ProcessHandleImpl_macosx.c
- java_props_macosx.c
- java_props_macosx.h
-
-
- java_md_macosx.c
- java_md_macosx.h
-
-
- jsig.c
-
-
- DefaultProxySelector.c
- bsd_close.c
-
-
-
- KQueue.c
- KQueueArrayWrapper.c
- KQueuePort.c
-
-
- BsdNativeDispatcher.c
- MacOSXNativeDispatcher.c
- UTIFileTypeDetector.c
-
-
-
- KeystoreImpl.m
-
-
-
-
-
-
-
-
-
-
- version.txt
-
-
-
-
-
-
-
-
-
- README.txt
-
-
-
-
-
- classfile_constants.h
- jni.h
- jvm.h
- jvmticmlr.h
-
-
- defines.h
- main.c
-
-
- e_acos.c
- e_asin.c
- e_atan2.c
- e_atanh.c
- e_cosh.c
- e_exp.c
- e_fmod.c
- e_log.c
- e_log10.c
- e_rem_pio2.c
- e_remainder.c
- e_scalb.c
- e_sinh.c
- e_sqrt.c
- fdlibm.h
- jfdlibm.h
- k_cos.c
- k_rem_pio2.c
- k_sin.c
- k_standard.c
- k_tan.c
- s_atan.c
- s_ceil.c
- s_copysign.c
- s_cos.c
- s_expm1.c
- s_fabs.c
- s_finite.c
- s_floor.c
- s_frexp.c
- s_ilogb.c
- s_isnan.c
- s_ldexp.c
- s_lib_version.c
- s_log1p.c
- s_logb.c
- s_matherr.c
- s_modf.c
- s_nextafter.c
- s_rint.c
- s_scalbn.c
- s_signgam.c
- s_significand.c
- s_sin.c
- s_tan.c
- s_tanh.c
- w_acos.c
- w_asin.c
- w_atan2.c
- w_atanh.c
- w_cosh.c
- w_exp.c
- w_fmod.c
- w_log.c
- w_log10.c
- w_remainder.c
- w_scalb.c
- w_sinh.c
- w_sqrt.c
-
-
- AccessController.c
- Array.c
- AtomicLong.c
- BootLoader.c
- Class.c
- ClassLoader.c
- ConstantPool.c
- Double.c
- Executable.c
- Field.c
- FileInputStream.c
- Float.c
- Module.c
- NativeAccessors.c
- Object.c
- ObjectInputStream.c
- ObjectOutputStream.c
- ObjectStreamClass.c
- RandomAccessFile.c
- Reference.c
- Reflection.c
- Runtime.c
- SecurityManager.c
- Shutdown.c
- Signal.c
- StackStreamFactory.c
- StackTraceElement.c
- StrictMath.c
- String.c
- StringCoding.c
- System.c
- Thread.c
- Throwable.c
- TimeZone.c
- VM.c
- VMSupport.c
- check_version.c
- gdefs.h
- io_util.c
- io_util.h
- java_props.h
- jdk_util.c
- jdk_util.h
- jio.c
- jlong.h
- jni_util.c
- jni_util.h
- sizecalc.h
- verify_stub.c
-
-
- NativeImageBuffer.cpp
- endian.cpp
- endian.hpp
- imageDecompressor.cpp
- imageDecompressor.hpp
- imageFile.cpp
- imageFile.hpp
- inttypes.hpp
- jimage.cpp
- jimage.hpp
- osSupport.hpp
-
-
- args.c
- emessages.h
- java.c
- java.h
- jli_util.c
- jli_util.h
- manifest_info.h
- parse_manifest.c
- splashscreen.h
- splashscreen_stubs.c
- wildcard.c
- wildcard.h
-
-
- DatagramPacket.c
- Inet4Address.c
- Inet6Address.c
- InetAddress.c
- net_util.c
- net_util.h
- proxy_util.c
- proxy_util.h
-
-
-
- nio.h
-
- nio_util.c
-
-
- check_code.c
- check_format.c
- opcodes.in_out
-
-
-
- compress.c
- crc32.h
- deflate.c
- deflate.h
- gzclose.c
- gzguts.h
- gzlib.c
- gzread.c
- gzwrite.c
- infback.c
- inffast.c
- inffast.h
- inffixed.h
- inflate.c
- inflate.h
- inftrees.c
- inftrees.h
- trees.c
- trees.h
- uncompr.c
- zadler32.c
- zconf.h
- zcrc32.c
- zlib.h
- zutil.c
- zutil.h
-
- Adler32.c
- CRC32.c
- Deflater.c
- Inflater.c
- zip_util.c
- zip_util.h
-
-
-
-
-
-
- ProcessHandleImpl_solaris.c
-
-
- jsig.c
-
-
- libjvm_db.c
- libjvm_db.h
-
-
- jvm_dtrace.c
- jvm_dtrace.h
-
-
- solaris_close.c
-
-
-
- DevPollArrayWrapper.c
- SolarisEventPort.c
-
-
- SolarisNativeDispatcher.c
- SolarisWatchService.c
-
-
-
-
-
-
-
- jni_md.h
- jvm_md.h
-
-
- jspawnhelper.c
-
-
- jexec.c
-
-
- Console_md.c
- FileDescriptor_md.c
- FileOutputStream_md.c
- ProcessEnvironment_md.c
- ProcessHandleImpl_unix.c
- ProcessHandleImpl_unix.h
- ProcessImpl_md.c
- TimeZone_md.c
- TimeZone_md.h
- UnixFileSystem_md.c
- VM_md.c
- canonicalize_md.c
- childproc.c
- childproc.h
- gdefs_md.h
- io_util_md.c
- io_util_md.h
- java_props_md.c
- jdk_util_md.c
- jdk_util_md.h
- jlong_md.h
- jni_util_md.c
- locale_str.h
-
-
- osSupport_unix.cpp
-
-
- java_md.h
- java_md_common.c
- java_md_solinux.c
- java_md_solinux.h
-
-
- DefaultProxySelector.c
- Inet4AddressImpl.c
- Inet6AddressImpl.c
- InetAddressImplFactory.c
- NetworkInterface.c
- PlainDatagramSocketImpl.c
- PlainSocketImpl.c
- ResolverConfigurationImpl.c
- SdpSupport.c
- SocketImpl.c
- SocketInputStream.c
- SocketOutputStream.c
- net_util_md.c
- net_util_md.h
- portconfig.c
-
-
-
- DatagramChannelImpl.c
- DatagramDispatcher.c
- FileChannelImpl.c
- FileDispatcherImpl.c
- FileKey.c
- IOUtil.c
- InheritedChannel.c
- NativeThread.c
- Net.c
- PollArrayWrapper.c
- ServerSocketChannelImpl.c
- SocketChannelImpl.c
- SocketDispatcher.c
- UnixAsynchronousServerSocketChannelImpl.c
- UnixAsynchronousSocketChannelImpl.c
- nio_util.h
-
-
- UnixCopyFile.c
- UnixNativeDispatcher.c
-
- MappedByteBuffer.c
-
-
-
-
-
-
- jni_md.h
- jvm_md.h
-
-
- Console_md.c
- FileDescriptor_md.c
- FileOutputStream_md.c
- HostLocaleProviderAdapter_md.c
- ProcessEnvironment_md.c
- ProcessHandleImpl_win.c
- ProcessImpl_md.c
- TimeZone_md.c
- TimeZone_md.h
- VM_md.c
- Win32ErrorMode.c
- WinCAPISeedGenerator.c
- WinNTFileSystem_md.c
- canonicalize_md.c
- dirent_md.c
- dirent_md.h
- gdefs_md.h
- io_util_md.c
- io_util_md.h
- java_main_md.h
- java_props_md.c
- jdk_util_md.c
- jdk_util_md.h
- jlong_md.h
- jni_util_md.c
- locale_str.h
-
-
- osSupport_windows.cpp
-
-
- cmdtoargs.c
- java_md.c
- java_md.h
-
-
- DefaultProxySelector.c
- DualStackPlainDatagramSocketImpl.c
- DualStackPlainSocketImpl.c
- Inet4AddressImpl.c
- Inet6AddressImpl.c
- InetAddressImplFactory.c
- NTLMAuthSequence.c
- NetworkInterface.c
- NetworkInterface.h
- NetworkInterface_winXP.c
- ResolverConfigurationImpl.c
- SocketImpl.c
- SocketInputStream.c
- SocketOutputStream.c
- TwoStacksPlainDatagramSocketImpl.c
- TwoStacksPlainSocketImpl.c
- net_util_md.c
- net_util_md.h
- portconfig.c
-
-
-
- DatagramChannelImpl.c
- DatagramDispatcher.c
- FileChannelImpl.c
- FileDispatcherImpl.c
- FileKey.c
- IOUtil.c
- Iocp.c
- Net.c
- ServerSocketChannelImpl.c
- SocketChannelImpl.c
- SocketDispatcher.c
- WindowsAsynchronousFileChannelImpl.c
- WindowsAsynchronousServerSocketChannelImpl.c
- WindowsAsynchronousSocketChannelImpl.c
- WindowsSelectorImpl.c
- nio_util.h
-
-
- RegistryFileTypeDetector.c
- WindowsNativeDispatcher.c
-
- MappedByteBuffer.c
-
-
-
-
-
-
-
-
-
-
-
-
-
- orb_config_design.txt
-
-
-
- minor_code_example.txt
- standard_minor_codes.txt
-
-
-
- parsing_combinators.txt
-
-
-
-
-
- README.txt
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- porting_aix.c
- porting_aix.h
-
-
-
-
-
-
- jawt_md.h
-
-
-
- AWTEvent.h
- AWTEvent.m
- AWTSurfaceLayers.h
- AWTSurfaceLayers.m
- AWTView.h
- AWTView.m
- AWTWindow.h
- AWTWindow.m
- ApplicationDelegate.h
- ApplicationDelegate.m
- CClipboard.m
- CCursorManager.m
- CDataTransferer.h
- CDataTransferer.m
- CDesktopPeer.m
- CDragSource.h
- CDragSource.m
- CDragSourceContextPeer.m
- CDropTarget.h
- CDropTarget.m
- CDropTargetContextPeer.m
- CFRetainedResource.m
- CFileDialog.h
- CFileDialog.m
- CGraphicsConfig.m
- CGraphicsDevice.m
- CGraphicsEnv.m
- CImage.m
- CInputMethod.m
- CMenu.h
- CMenu.m
- CMenuBar.h
- CMenuBar.m
- CMenuComponent.h
- CMenuComponent.m
- CMenuItem.h
- CMenuItem.m
- CPopupMenu.h
- CPopupMenu.m
- CPrinterJob.m
- CRobot.m
- CRobotKeyCode.h
- CRobotKeyCode.m
- CSystemColors.h
- CSystemColors.m
- CTextPipe.m
- CTrayIcon.h
- CTrayIcon.m
- CWrapper.m
- DnDUtilities.h
- DnDUtilities.m
- GeomUtilities.h
- GeomUtilities.m
- ImageSurfaceData.h
- ImageSurfaceData.m
- InitIDs.h
- InitIDs.m
- JavaAccessibilityAction.h
- JavaAccessibilityAction.m
- JavaAccessibilityUtilities.h
- JavaAccessibilityUtilities.m
- JavaComponentAccessibility.h
- JavaComponentAccessibility.m
- JavaTextAccessibility.h
- JavaTextAccessibility.m
- LWCToolkit.h
- LWCToolkit.m
- OSVersion.h
- OSVersion.m
- PrintModel.h
- PrintModel.m
- PrinterSurfaceData.h
- PrinterSurfaceData.m
- PrinterView.h
- PrinterView.m
- QuartzRenderer.m
- QuartzSurfaceData.h
- QuartzSurfaceData.m
- awt_DrawingSurface.m
-
-
- AWTFont.h
- AWTFont.m
- AWTStrike.h
- AWTStrike.m
- CCharToGlyphMapper.m
- CGGlyphImages.h
- CGGlyphImages.m
- CGGlyphOutlines.h
- CGGlyphOutlines.m
- CoreTextSupport.h
- CoreTextSupport.m
-
-
-
-
- cglext.h
-
- CGLGraphicsConfig.h
- CGLGraphicsConfig.m
- CGLLayer.h
- CGLLayer.m
- CGLSurfaceData.h
- CGLSurfaceData.m
- OGLFuncs_md.h
-
-
-
-
- jawt.m
-
-
- PLATFORM_API_MacOSX_MidiIn.c
- PLATFORM_API_MacOSX_MidiOut.c
- PLATFORM_API_MacOSX_MidiUtils.c
- PLATFORM_API_MacOSX_MidiUtils.h
- PLATFORM_API_MacOSX_PCM.cpp
- PLATFORM_API_MacOSX_Ports.cpp
- PLATFORM_API_MacOSX_Utils.cpp
- PLATFORM_API_MacOSX_Utils.h
-
-
- CFileManager.m
-
-
- AWT_debug.h
- AWT_debug.m
- NSApplicationAWT.h
- NSApplicationAWT.m
- PropertiesUtilities.h
- PropertiesUtilities.m
- QueuingApplicationDelegate.h
- QueuingApplicationDelegate.m
- ThreadUtilities.h
- ThreadUtilities.m
-
-
- AquaFileView.m
- AquaLookAndFeel.m
- AquaNativeResources.m
- JRSUIConstantSync.h
- JRSUIConstantSync.m
- JRSUIController.m
- JRSUIFocus.m
- ScreenMenu.h
- ScreenMenu.m
-
-
- splashscreen_config.h
- splashscreen_sys.m
-
-
-
-
-
-
-
-
-
-
- NeXT.txt
- ansi.txt
- cpg437.txt
- cpg850.txt
- mac.txt
-
-
-
-
-
-
-
-
-
-
- debug_assert.c
- debug_assert.h
- debug_mem.c
- debug_mem.h
- debug_trace.c
- debug_trace.h
- debug_util.c
- debug_util.h
-
-
- mlib_ImageCopy_Bit.c
- mlib_ImageCreate.c
- mlib_sys.c
-
-
- rect.c
-
-
-
- AccelGlyphCache.c
- AccelGlyphCache.h
- fontscalerdefs.h
- sunfontids.h
-
-
-
-
- gl.h
- glext.h
-
- OGLBlitLoops.c
- OGLBlitLoops.h
- OGLBufImgOps.c
- OGLBufImgOps.h
- OGLContext.c
- OGLContext.h
- OGLFuncMacros.h
- OGLFuncs.c
- OGLFuncs.h
- OGLMaskBlit.c
- OGLMaskBlit.h
- OGLMaskFill.c
- OGLMaskFill.h
- OGLPaints.c
- OGLPaints.h
- OGLRenderQueue.c
- OGLRenderQueue.h
- OGLRenderer.c
- OGLRenderer.h
- OGLSurfaceData.c
- OGLSurfaceData.h
- OGLTextRenderer.c
- OGLTextRenderer.h
- OGLVertexCache.c
- OGLVertexCache.h
-
-
-
-
- jawt.h
-
-
-
-
-
- img_alpha.h
- img_anycm.h
- img_colors.c
- img_colors.h
- img_dcm.h
- img_dcm8.h
- img_dir8dither.h
- img_dirdither.h
- img_fscolor.h
- img_fsdither.h
- img_fsgray.h
- img_fsutil.h
- img_globals.c
- img_globals.h
- img_icm.h
- img_input32.h
- img_input8.h
- img_input8_32.h
- img_nodither.h
- img_noscale.h
- img_opaque.h
- img_ordclrsgn.h
- img_ordclruns.h
- img_orddither.h
- img_ordgray.h
- img_output16.h
- img_output16_32.h
- img_output24.h
- img_output32.h
- img_output8.h
- img_output8_16_24.h
- img_output8_16_32.h
- img_output8_32.h
- img_replscale.h
- img_scaleloop.h
- img_util.h
-
-
- gifdecoder.c
-
- BufImgSurfaceData.c
- BufImgSurfaceData.h
- DataBufferNative.c
- awt_ImageRep.c
- awt_parseImage.c
- awt_parseImage.h
- dither.c
- dither.h
- imageInitIDs.c
- imageInitIDs.h
-
-
- awt_ImagingLib.c
- awt_ImagingLib.h
-
-
-
-
- AlphaMacros.c
- AlphaMacros.h
- AlphaMath.c
- AlphaMath.h
- Any3Byte.c
- Any3Byte.h
- Any4Byte.c
- Any4Byte.h
- AnyByte.c
- AnyByte.h
- AnyByteBinary.h
- AnyInt.c
- AnyInt.h
- AnyShort.c
- AnyShort.h
- Blit.c
- BlitBg.c
- ByteBinary1Bit.c
- ByteBinary1Bit.h
- ByteBinary2Bit.c
- ByteBinary2Bit.h
- ByteBinary4Bit.c
- ByteBinary4Bit.h
- ByteGray.c
- ByteGray.h
- ByteIndexed.c
- ByteIndexed.h
- DrawLine.c
- DrawParallelogram.c
- DrawPath.c
- DrawPath.h
- DrawPolygons.c
- DrawRect.c
- FillParallelogram.c
- FillPath.c
- FillRect.c
- FillSpans.c
- FourByteAbgr.c
- FourByteAbgr.h
- FourByteAbgrPre.c
- FourByteAbgrPre.h
- GlyphImageRef.h
- GraphicsPrimitiveMgr.c
- GraphicsPrimitiveMgr.h
- ImageData.h
- Index12Gray.c
- Index12Gray.h
- Index8Gray.c
- Index8Gray.h
- IntArgb.c
- IntArgb.h
- IntArgbBm.c
- IntArgbBm.h
- IntArgbPre.c
- IntArgbPre.h
- IntBgr.c
- IntBgr.h
- IntDcm.h
- IntRgb.c
- IntRgb.h
- IntRgbx.c
- IntRgbx.h
- LineUtils.h
- LoopMacros.h
- MapAccelFunc.c
- MaskBlit.c
- MaskFill.c
- ParallelogramUtils.h
- ProcessPath.c
- ProcessPath.h
- ScaledBlit.c
- ThreeByteBgr.c
- ThreeByteBgr.h
- TransformHelper.c
- Ushort4444Argb.c
- Ushort4444Argb.h
- Ushort555Rgb.c
- Ushort555Rgb.h
- Ushort555Rgbx.c
- Ushort555Rgbx.h
- Ushort565Rgb.c
- Ushort565Rgb.h
- UshortGray.c
- UshortGray.h
- UshortIndexed.c
- UshortIndexed.h
-
-
- BufferedMaskBlit.c
- BufferedRenderPipe.c
- PathConsumer2D.h
- Region.c
- Region.h
- ShapeSpanIterator.c
- SpanClipRenderer.c
- SpanIterator.h
-
- Disposer.c
- Disposer.h
- SurfaceData.c
- SurfaceData.h
- Trace.c
- Trace.h
-
-
-
-
-
- ucdn.c
- ucdn.h
- unicodedata_db.h
-
- hb-atomic-private.hh
- hb-blob.cc
- hb-blob.h
- hb-buffer-deserialize-json.hh
- hb-buffer-deserialize-text.hh
- hb-buffer-private.hh
- hb-buffer-serialize.cc
- hb-buffer.cc
- hb-buffer.h
- hb-cache-private.hh
- hb-common.cc
- hb-common.h
- hb-coretext.cc
- hb-coretext.h
- hb-deprecated.h
- hb-face-private.hh
- hb-face.cc
- hb-face.h
- hb-fallback-shape.cc
- hb-font-private.hh
- hb-font.cc
- hb-font.h
- hb-ft.cc
- hb-ft.h
- hb-mutex-private.hh
- hb-object-private.hh
- hb-open-file-private.hh
- hb-open-type-private.hh
- hb-ot-cbdt-table.hh
- hb-ot-cmap-table.hh
- hb-ot-font.cc
- hb-ot-font.h
- hb-ot-glyf-table.hh
- hb-ot-head-table.hh
- hb-ot-hhea-table.hh
- hb-ot-hmtx-table.hh
- hb-ot-layout-common-private.hh
- hb-ot-layout-gdef-table.hh
- hb-ot-layout-gpos-table.hh
- hb-ot-layout-gsub-table.hh
- hb-ot-layout-gsubgpos-private.hh
- hb-ot-layout-jstf-table.hh
- hb-ot-layout-private.hh
- hb-ot-layout.cc
- hb-ot-layout.h
- hb-ot-map-private.hh
- hb-ot-map.cc
- hb-ot-math.h
- hb-ot-maxp-table.hh
- hb-ot-name-table.hh
- hb-ot-os2-table.hh
- hb-ot-shape-complex-arabic-fallback.hh
- hb-ot-shape-complex-arabic-private.hh
- hb-ot-shape-complex-arabic-table.hh
- hb-ot-shape-complex-arabic-win1256.hh
- hb-ot-shape-complex-arabic.cc
- hb-ot-shape-complex-default.cc
- hb-ot-shape-complex-hangul.cc
- hb-ot-shape-complex-hebrew.cc
- hb-ot-shape-complex-indic-machine.hh
- hb-ot-shape-complex-indic-private.hh
- hb-ot-shape-complex-indic-table.cc
- hb-ot-shape-complex-indic.cc
- hb-ot-shape-complex-myanmar-machine.hh
- hb-ot-shape-complex-myanmar.cc
- hb-ot-shape-complex-private.hh
- hb-ot-shape-complex-thai.cc
- hb-ot-shape-complex-tibetan.cc
- hb-ot-shape-complex-use-machine.hh
- hb-ot-shape-complex-use-private.hh
- hb-ot-shape-complex-use-table.cc
- hb-ot-shape-complex-use.cc
- hb-ot-shape-fallback-private.hh
- hb-ot-shape-fallback.cc
- hb-ot-shape-normalize-private.hh
- hb-ot-shape-normalize.cc
- hb-ot-shape-private.hh
- hb-ot-shape.cc
- hb-ot-shape.h
- hb-ot-tag.cc
- hb-ot-tag.h
- hb-ot.h
- hb-private.hh
- hb-set-private.hh
- hb-set.cc
- hb-set.h
- hb-shape-plan-private.hh
- hb-shape-plan.cc
- hb-shape-plan.h
- hb-shape.cc
- hb-shape.h
- hb-shaper-impl-private.hh
- hb-shaper-list.hh
- hb-shaper-private.hh
- hb-shaper.cc
- hb-ucdn.cc
- hb-unicode-private.hh
- hb-unicode.cc
- hb-unicode.h
- hb-utf-private.hh
- hb-version.h
- hb-warning.cc
- hb.h
-
-
- AlternateSubstSubtables.cpp
- AlternateSubstSubtables.h
- AnchorTables.cpp
- AnchorTables.h
- ArabicLayoutEngine.cpp
- ArabicLayoutEngine.h
- ArabicShaping.cpp
- ArabicShaping.h
- AttachmentPosnSubtables.h
- CanonData.cpp
- CanonShaping.cpp
- CanonShaping.h
- CharSubstitutionFilter.h
- ClassDefinitionTables.cpp
- ClassDefinitionTables.h
- ContextualGlyphInsertion.h
- ContextualGlyphInsertionProc2.cpp
- ContextualGlyphInsertionProc2.h
- ContextualGlyphSubstProc.cpp
- ContextualGlyphSubstProc.h
- ContextualGlyphSubstProc2.cpp
- ContextualGlyphSubstProc2.h
- ContextualGlyphSubstitution.h
- ContextualSubstSubtables.cpp
- ContextualSubstSubtables.h
- CoverageTables.cpp
- CoverageTables.h
- CursiveAttachmentSubtables.cpp
- CursiveAttachmentSubtables.h
- DefaultCharMapper.h
- DeviceTables.cpp
- DeviceTables.h
- ExtensionSubtables.cpp
- ExtensionSubtables.h
- Features.cpp
- GDEFMarkFilter.cpp
- GDEFMarkFilter.h
- GXLayoutEngine.cpp
- GXLayoutEngine.h
- GXLayoutEngine2.cpp
- GXLayoutEngine2.h
- GlyphDefinitionTables.cpp
- GlyphDefinitionTables.h
- GlyphIterator.cpp
- GlyphIterator.h
- GlyphLookupTables.cpp
- GlyphLookupTables.h
- GlyphPositionAdjustments.cpp
- GlyphPositionAdjustments.h
- GlyphPositioningTables.cpp
- GlyphPositioningTables.h
- GlyphPosnLookupProc.cpp
- GlyphPosnLookupProc.h
- GlyphSubstLookupProc.cpp
- GlyphSubstLookupProc.h
- GlyphSubstitutionTables.cpp
- GlyphSubstitutionTables.h
- HanLayoutEngine.cpp
- HanLayoutEngine.h
- HangulLayoutEngine.cpp
- HangulLayoutEngine.h
- ICUFeatures.h
- IndicClassTables.cpp
- IndicLayoutEngine.cpp
- IndicLayoutEngine.h
- IndicRearrangement.h
- IndicRearrangementProcessor.cpp
- IndicRearrangementProcessor.h
- IndicRearrangementProcessor2.cpp
- IndicRearrangementProcessor2.h
- IndicReordering.cpp
- IndicReordering.h
- KernTable.cpp
- KernTable.h
- KhmerLayoutEngine.cpp
- KhmerLayoutEngine.h
- KhmerReordering.cpp
- KhmerReordering.h
- LEFontInstance.cpp
- LEFontInstance.h
- LEGlyphFilter.h
- LEGlyphStorage.cpp
- LEGlyphStorage.h
- LEInsertionList.cpp
- LEInsertionList.h
- LELanguages.h
- LEScripts.h
- LEStandalone.h
- LESwaps.h
- LETableReference.h
- LETypes.h
- LayoutEngine.cpp
- LayoutEngine.h
- LayoutTables.h
- LigatureSubstProc.cpp
- LigatureSubstProc.h
- LigatureSubstProc2.cpp
- LigatureSubstProc2.h
- LigatureSubstSubtables.cpp
- LigatureSubstSubtables.h
- LigatureSubstitution.h
- LookupProcessor.cpp
- LookupProcessor.h
- LookupTables.cpp
- LookupTables.h
- Lookups.cpp
- Lookups.h
- MPreFixups.cpp
- MPreFixups.h
- MarkArrays.cpp
- MarkArrays.h
- MarkToBasePosnSubtables.cpp
- MarkToBasePosnSubtables.h
- MarkToLigaturePosnSubtables.cpp
- MarkToLigaturePosnSubtables.h
- MarkToMarkPosnSubtables.cpp
- MarkToMarkPosnSubtables.h
- MirroredCharData.cpp
- MorphStateTables.h
- MorphTables.cpp
- MorphTables.h
- MorphTables2.cpp
- MultipleSubstSubtables.cpp
- MultipleSubstSubtables.h
- NonContextualGlyphSubst.h
- NonContextualGlyphSubstProc.cpp
- NonContextualGlyphSubstProc.h
- NonContextualGlyphSubstProc2.cpp
- NonContextualGlyphSubstProc2.h
- OpenTypeLayoutEngine.cpp
- OpenTypeLayoutEngine.h
- OpenTypeTables.h
- OpenTypeUtilities.cpp
- OpenTypeUtilities.h
- PairPositioningSubtables.cpp
- PairPositioningSubtables.h
- ScriptAndLanguage.cpp
- ScriptAndLanguage.h
- ScriptAndLanguageTags.cpp
- ScriptAndLanguageTags.h
- SegmentArrayProcessor.cpp
- SegmentArrayProcessor.h
- SegmentArrayProcessor2.cpp
- SegmentArrayProcessor2.h
- SegmentSingleProcessor.cpp
- SegmentSingleProcessor.h
- SegmentSingleProcessor2.cpp
- SegmentSingleProcessor2.h
- ShapingTypeData.cpp
- SimpleArrayProcessor.cpp
- SimpleArrayProcessor.h
- SimpleArrayProcessor2.cpp
- SimpleArrayProcessor2.h
- SinglePositioningSubtables.cpp
- SinglePositioningSubtables.h
- SingleSubstitutionSubtables.cpp
- SingleSubstitutionSubtables.h
- SingleTableProcessor.cpp
- SingleTableProcessor.h
- SingleTableProcessor2.cpp
- SingleTableProcessor2.h
- StateTableProcessor.cpp
- StateTableProcessor.h
- StateTableProcessor2.cpp
- StateTableProcessor2.h
- StateTables.h
- SubstitutionLookups.cpp
- SubstitutionLookups.h
- SubtableProcessor.cpp
- SubtableProcessor.h
- SubtableProcessor2.cpp
- SubtableProcessor2.h
- SunLayoutEngine.cpp
- ThaiLayoutEngine.cpp
- ThaiLayoutEngine.h
- ThaiShaping.cpp
- ThaiShaping.h
- ThaiStateTables.cpp
- TibetanLayoutEngine.cpp
- TibetanLayoutEngine.h
- TibetanReordering.cpp
- TibetanReordering.h
- TrimmedArrayProcessor.cpp
- TrimmedArrayProcessor.h
- TrimmedArrayProcessor2.cpp
- TrimmedArrayProcessor2.h
- ValueRecords.cpp
- ValueRecords.h
-
- DrawGlyphList.c
- FontInstanceAdapter.cpp
- FontInstanceAdapter.h
- HBShaper.c
- fontscaler.h
- freetypeScaler.c
- glyphblitting.h
- hb-jdk-font.cc
- hb-jdk.h
- scriptMapping.c
- scriptMapping.h
- sunFont.c
-
-
- imageioJPEG.c
- jcapimin.c
- jcapistd.c
- jccoefct.c
- jccolor.c
- jcdctmgr.c
- jchuff.c
- jchuff.h
- jcinit.c
- jcmainct.c
- jcmarker.c
- jcmaster.c
- jcomapi.c
- jconfig.h
- jcparam.c
- jcphuff.c
- jcprepct.c
- jcsample.c
- jctrans.c
- jdapimin.c
- jdapistd.c
- jdcoefct.c
- jdcolor.c
- jdct.h
- jddctmgr.c
- jdhuff.c
- jdhuff.h
- jdinput.c
- jdmainct.c
- jdmarker.c
- jdmaster.c
- jdmerge.c
- jdphuff.c
- jdpostct.c
- jdsample.c
- jdtrans.c
- jerror.c
- jerror.h
- jfdctflt.c
- jfdctfst.c
- jfdctint.c
- jidctflt.c
- jidctfst.c
- jidctint.c
- jidctred.c
- jinclude.h
- jmemmgr.c
- jmemnobs.c
- jmemsys.h
- jmorecfg.h
- jpegdecoder.c
- jpegint.h
- jpeglib.h
- jquant1.c
- jquant2.c
- jutils.c
- jversion.h
-
-
- Configure.h
- DirectAudio.h
- DirectAudioDevice.c
- DirectAudioDeviceProvider.c
- MidiInDevice.c
- MidiInDeviceProvider.c
- MidiOutDevice.c
- MidiOutDeviceProvider.c
- Platform.c
- PlatformMidi.c
- PlatformMidi.h
- PortMixer.c
- PortMixerProvider.c
- Ports.h
- SoundDefs.h
- Utilities.c
- Utilities.h
-
-
- LCMS.c
- cmsalpha.c
- cmscam02.c
- cmscgats.c
- cmscnvrt.c
- cmserr.c
- cmsgamma.c
- cmsgmt.c
- cmshalf.c
- cmsintrp.c
- cmsio0.c
- cmsio1.c
- cmslut.c
- cmsmd5.c
- cmsmtrx.c
- cmsnamed.c
- cmsopt.c
- cmspack.c
- cmspcs.c
- cmsplugin.c
- cmsps2.c
- cmssamp.c
- cmssm.c
- cmstypes.c
- cmsvirt.c
- cmswtpnt.c
- cmsxform.c
- lcms2.h
- lcms2_internal.h
- lcms2_plugin.h
-
-
- j2d_names.h
- mlib.h
- mlib_ImageAffine.c
- mlib_ImageAffine.h
- mlib_ImageAffineEdge.c
- mlib_ImageAffine_BC_D64.c
- mlib_ImageAffine_BC_F32.c
- mlib_ImageAffine_BC_S32.c
- mlib_ImageAffine_BL_D64.c
- mlib_ImageAffine_BL_F32.c
- mlib_ImageAffine_BL_S32.c
- mlib_ImageAffine_NN.c
- mlib_ImageAffine_NN_Bit.c
- mlib_ImageCheck.h
- mlib_ImageClipping.c
- mlib_ImageClipping.h
- mlib_ImageConv.h
- mlib_ImageConvClearEdge_Bit.c
- mlib_ImageConvClearEdge_Fp.c
- mlib_ImageConvCopyEdge_Bit.c
- mlib_ImageConvEdge.h
- mlib_ImageConvKernelConvert.c
- mlib_ImageConvMxN.c
- mlib_ImageConvMxN_Fp.c
- mlib_ImageConvMxN_ext.c
- mlib_ImageConv_16ext.c
- mlib_ImageConv_16nw.c
- mlib_ImageConv_32nw.c
- mlib_ImageConv_8ext.c
- mlib_ImageConv_8nw.c
- mlib_ImageConv_D64nw.c
- mlib_ImageConv_F32nw.c
- mlib_ImageConv_u16ext.c
- mlib_ImageConv_u16nw.c
- mlib_ImageCopy.h
- mlib_ImageCreate.h
- mlib_ImageDivTables.c
- mlib_ImageDivTables.h
- mlib_ImageFilters.c
- mlib_ImageFilters.h
- mlib_ImageLookUp.h
- mlib_ImageLookUp_64.c
- mlib_ImageLookUp_Bit.c
- mlib_ImageRowTable.h
- mlib_ImageScanPoly.c
- mlib_ImageUtils.c
- mlib_SysMath.h
- mlib_c_ImageAffine_BC.c
- mlib_c_ImageAffine_BC_S16.c
- mlib_c_ImageAffine_BC_U16.c
- mlib_c_ImageAffine_BL.c
- mlib_c_ImageAffine_BL_S16.c
- mlib_c_ImageAffine_BL_U16.c
- mlib_c_ImageAffine_NN.c
- mlib_c_ImageConv.h
- mlib_c_ImageConvClearEdge.c
- mlib_c_ImageConvCopyEdge.c
- mlib_c_ImageConvVersion.c
- mlib_c_ImageConv_f.c
- mlib_c_ImageCopy.c
- mlib_c_ImageLookUp.c
- mlib_c_ImageLookUp.h
- mlib_c_ImageLookUp_f.c
- mlib_image.h
- mlib_image_get.h
- mlib_image_proto.h
- mlib_image_types.h
- mlib_status.h
- mlib_sys.h
- mlib_sys_proto.h
- mlib_types.h
- safe_alloc.h
- safe_math.h
-
-
-
- dgif_lib.c
- gif_err.c
- gif_hash.h
- gif_lib.h
- gif_lib_private.h
- gifalloc.c
- openbsd-reallocarray.c
-
-
- png.c
- png.h
- pngconf.h
- pngdebug.h
- pngerror.c
- pngget.c
- pnginfo.h
- pnglibconf.h
- pngmem.c
- pngpread.c
- pngpriv.h
- pngread.c
- pngrio.c
- pngrtran.c
- pngrutil.c
- pngset.c
- pngstruct.h
- pngtrans.c
-
- java_awt_SplashScreen.c
- splashscreen_gfx.h
- splashscreen_gfx_impl.c
- splashscreen_gfx_impl.h
- splashscreen_gif.c
- splashscreen_impl.c
- splashscreen_impl.h
- splashscreen_jpeg.c
- splashscreen_png.c
-
-
-
-
-
-
-
-
-
- Modality.txt
-
- keysym2ucs.h
-
-
-
-
-
-
-
-
- mlib_v_ImageCopy_f.c
- mlib_v_ImageCopy_f.h
- vis_proto.h
-
-
- systemScale.c
- systemScale.h
-
-
- rect.h
-
- CUPSfuncs.c
- X11Color.c
- awt.h
- awt_Component.h
- awt_DrawingSurface.h
- awt_Font.c
- awt_Font.h
- awt_GraphicsEnv.h
- awt_Mlib.h
- awt_p.h
- awt_util.h
- color.h
- colordata.h
- fontconfig.h
- fontpath.c
- img_util_md.h
-
-
- X11FontScaler.h
-
-
-
-
- glx.h
- glxext.h
-
- GLXGraphicsConfig.c
- GLXGraphicsConfig.h
- GLXSurfaceData.c
- GLXSurfaceData.h
- OGLFuncs_md.h
-
-
- X11FontScaler_md.c
- X11PMBlitLoops.c
- X11Renderer.c
- X11SurfaceData.c
- X11SurfaceData.h
- X11TextRenderer_md.c
-
-
-
-
- jawt_md.h
-
-
-
- awt_LoadLibrary.c
- awt_Mlib.c
- initIDs.c
-
-
-
- java2d_Mlib.c
- java2d_Mlib.h
- mlib_ImageCopy.h
- mlib_ImageLogic_proto.h
- mlib_ImageZoom.h
- mlib_ImageZoom_NN.c
- mlib_v_ImageClear.c
- mlib_v_ImageClear_f.c
- mlib_v_ImageClear_f.h
- mlib_v_ImageConstLogic.h
- mlib_v_ImageConstXor.c
- mlib_v_ImageLogic.h
- mlib_v_ImageLogic_proto.h
- mlib_v_ImageXor.c
- mlib_v_ImageZoom_NN_f.c
- vis_AlphaMacros.c
- vis_AlphaMacros.h
- vis_AlphaMaskBlit.c
- vis_AlphaMaskFill.c
- vis_ByteGray.c
- vis_ByteGray_FromRgb.c
- vis_ByteGray_Mask.c
- vis_ByteIndexed.c
- vis_DrawLine.c
- vis_FourByteAbgr.c
- vis_FourByteAbgrPre.c
- vis_FuncArray.c
- vis_GlyphList.c
- vis_GlyphListXor.c
- vis_IntArgb.c
- vis_IntArgbBm.c
- vis_IntArgbPre.c
- vis_IntArgbPre_Mask.c
- vis_IntBgr.c
- vis_IntRgb.c
- vis_IntRgbx.c
- vis_Interp.c
- vis_SrcMaskFill.c
- vis_SrcOverMaskBlit.c
- vis_SrcOverMaskFill.c
- vis_ThreeByteBgr.c
- vis_UshortGray.c
- vis_UshortGray_FromRgb.c
- vis_XorBlit.c
-
- j2d_md.h
-
-
-
-
- HeadlessToolkit.c
-
-
-
-
- HPkeysym.h
- Xrandr.h
- awt_AWTEvent.c
- awt_AWTEvent.h
- awt_DrawingSurface.c
- awt_Event.c
- awt_Event.h
- awt_GraphicsEnv.c
- awt_InputMethod.c
- awt_Insets.c
- awt_Insets.h
- awt_MenuComponent.h
- awt_Robot.c
- awt_UNIXToolkit.c
- awt_util.c
- canvas.h
- gtk2_interface.c
- gtk2_interface.h
- gtk3_interface.c
- gtk3_interface.h
- gtk_interface.c
- gtk_interface.h
- list.c
- list.h
- multiVis.c
- multiVis.h
- multi_font.c
- multi_font.h
- randr.h
- robot_common.c
- robot_common.h
- sun_awt_X11_GtkFileDialogPeer.c
- swing_GTKEngine.c
- swing_GTKStyle.c
- wsutils.h
-
-
-
- XRBackendNative.c
- XRSurfaceData.c
-
-
-
- XToolkit.c
- XWindow.c
- XlibWrapper.c
- awt_Desktop.c
- awt_Taskbar.c
- awt_Taskbar.h
- gnome_interface.c
- gnome_interface.h
-
-
-
- X11FontScaler.c
- X11TextRenderer.c
-
-
- jawt.c
-
-
- PLATFORM_API_BsdOS_ALSA_CommonUtils.c
- PLATFORM_API_BsdOS_ALSA_CommonUtils.h
- PLATFORM_API_BsdOS_ALSA_MidiIn.c
- PLATFORM_API_BsdOS_ALSA_MidiOut.c
- PLATFORM_API_BsdOS_ALSA_MidiUtils.c
- PLATFORM_API_BsdOS_ALSA_MidiUtils.h
- PLATFORM_API_BsdOS_ALSA_PCM.c
- PLATFORM_API_BsdOS_ALSA_PCMUtils.c
- PLATFORM_API_BsdOS_ALSA_PCMUtils.h
- PLATFORM_API_BsdOS_ALSA_Ports.c
- PLATFORM_API_LinuxOS_ALSA_CommonUtils.c
- PLATFORM_API_LinuxOS_ALSA_CommonUtils.h
- PLATFORM_API_LinuxOS_ALSA_MidiIn.c
- PLATFORM_API_LinuxOS_ALSA_MidiOut.c
- PLATFORM_API_LinuxOS_ALSA_MidiUtils.c
- PLATFORM_API_LinuxOS_ALSA_MidiUtils.h
- PLATFORM_API_LinuxOS_ALSA_PCM.c
- PLATFORM_API_LinuxOS_ALSA_PCMUtils.c
- PLATFORM_API_LinuxOS_ALSA_PCMUtils.h
- PLATFORM_API_LinuxOS_ALSA_Ports.c
- PLATFORM_API_SolarisOS_PCM.c
- PLATFORM_API_SolarisOS_Ports.c
- PLATFORM_API_SolarisOS_Utils.c
- PLATFORM_API_SolarisOS_Utils.h
-
-
- mlib_ImageConvCopyEdge_Fp.c
- mlib_v_ImageAffine_BC.c
- mlib_v_ImageAffine_BC_S16.c
- mlib_v_ImageAffine_BC_U16.c
- mlib_v_ImageAffine_BL.c
- mlib_v_ImageAffine_BL_S16.c
- mlib_v_ImageAffine_BL_S16.h
- mlib_v_ImageAffine_BL_U16.c
- mlib_v_ImageAffine_NN.c
- mlib_v_ImageChannelExtract.h
- mlib_v_ImageChannelExtract_1.c
- mlib_v_ImageChannelExtract_43.c
- mlib_v_ImageChannelInsert.h
- mlib_v_ImageChannelInsert_1.c
- mlib_v_ImageConv.h
- mlib_v_ImageConvClearEdge.c
- mlib_v_ImageConvCopyEdge.c
- mlib_v_ImageConvMxN_8.c
- mlib_v_ImageConvMxN_8ext.c
- mlib_v_ImageConvVersion.c
- mlib_v_ImageConv_8nw.c
- mlib_v_ImageFilters.c
- mlib_v_ImageFilters.h
- mlib_v_ImageLookUp.c
- mlib_v_ImageLookUpFunc.h
- mlib_v_ImageLookUpS16S16Func.c
- mlib_v_ImageLookUpS16S32Func.c
- mlib_v_ImageLookUpS16U16Func.c
- mlib_v_ImageLookUpS16U8Func.c
- mlib_v_ImageLookUpS32S16Func.c
- mlib_v_ImageLookUpS32S32Func.c
- mlib_v_ImageLookUpS32U16Func.c
- mlib_v_ImageLookUpS32U8Func.c
- mlib_v_ImageLookUpSIS16S16Func.c
- mlib_v_ImageLookUpSIS16S32Func.c
- mlib_v_ImageLookUpSIS16U16Func.c
- mlib_v_ImageLookUpSIS16U8Func.c
- mlib_v_ImageLookUpSIS32S16Func.c
- mlib_v_ImageLookUpSIS32S32Func.c
- mlib_v_ImageLookUpSIS32U16Func.c
- mlib_v_ImageLookUpSIS32U8Func.c
- mlib_v_ImageLookUpSIU16S16Func.c
- mlib_v_ImageLookUpSIU16S32Func.c
- mlib_v_ImageLookUpSIU16U16Func.c
- mlib_v_ImageLookUpSIU16U8Func.c
- mlib_v_ImageLookUpSIU8S16Func.c
- mlib_v_ImageLookUpSIU8S32Func.c
- mlib_v_ImageLookUpSIU8U16Func.c
- mlib_v_ImageLookUpSIU8U8Func.c
- mlib_v_ImageLookUpU16S16Func.c
- mlib_v_ImageLookUpU16S32Func.c
- mlib_v_ImageLookUpU16U16Func.c
- mlib_v_ImageLookUpU16U8Func.c
- mlib_v_ImageLookUpU8S16Func.c
- mlib_v_ImageLookUpU8S32Func.c
- mlib_v_ImageLookUpU8U16Func.c
- mlib_v_ImageLookUpU8U8Func.c
- vis_32.il
- vis_64.il
-
-
- splashscreen_config.h
- splashscreen_sys.c
-
-
-
-
-
-
-
-
- systemScale.cpp
- systemScale.h
-
-
- rect.h
-
-
- awt_makecube.cpp
-
-
- jawt_md.h
-
-
-
-
- D3DBadHardware.h
- D3DBlitLoops.cpp
- D3DBlitLoops.h
- D3DBufImgOps.cpp
- D3DBufImgOps.h
- D3DContext.cpp
- D3DContext.h
- D3DGlyphCache.cpp
- D3DGlyphCache.h
- D3DGraphicsDevice.cpp
- D3DGraphicsDevice.h
- D3DMaskBlit.cpp
- D3DMaskBlit.h
- D3DMaskCache.cpp
- D3DMaskCache.h
- D3DMaskFill.cpp
- D3DMaskFill.h
- D3DPaints.cpp
- D3DPaints.h
- D3DPipeline.h
- D3DPipelineManager.cpp
- D3DPipelineManager.h
- D3DRenderQueue.cpp
- D3DRenderQueue.h
- D3DRenderer.cpp
- D3DRenderer.h
- D3DResourceManager.cpp
- D3DResourceManager.h
- D3DShaderGen.c
- D3DShaders.h
- D3DSurfaceData.cpp
- D3DSurfaceData.h
- D3DTextRenderer.cpp
- D3DTextRenderer.h
- D3DVertexCacher.cpp
- D3DVertexCacher.h
- ShaderList.c
- ShaderList.h
-
-
-
- wglext.h
-
- OGLFuncs_md.h
- WGLGraphicsConfig.c
- WGLGraphicsConfig.h
- WGLSurfaceData.c
- WGLSurfaceData.h
-
-
- GDIBlitLoops.cpp
- GDIRenderer.cpp
- GDIWindowSurfaceData.cpp
- GDIWindowSurfaceData.h
- WindowsFlags.cpp
- WindowsFlags.h
-
- j2d_md.h
-
-
- CmdIDList.cpp
- CmdIDList.h
- ComCtl32Util.cpp
- ComCtl32Util.h
- Devices.cpp
- Devices.h
- DllUtil.cpp
- DllUtil.h
- GDIHashtable.cpp
- GDIHashtable.h
- Hashtable.cpp
- Hashtable.h
- MouseInfo.cpp
- ObjectList.cpp
- ObjectList.h
- ShellFolder2.cpp
- ThemeReader.cpp
- WPrinterJob.cpp
- alloc.h
- awt.h
- awt_AWTEvent.cpp
- awt_AWTEvent.h
- awt_BitmapUtil.cpp
- awt_BitmapUtil.h
- awt_Brush.cpp
- awt_Brush.h
- awt_Button.cpp
- awt_Button.h
- awt_Canvas.cpp
- awt_Canvas.h
- awt_Checkbox.cpp
- awt_Checkbox.h
- awt_Choice.cpp
- awt_Choice.h
- awt_Clipboard.cpp
- awt_Clipboard.h
- awt_Color.cpp
- awt_Color.h
- awt_Component.cpp
- awt_Component.h
- awt_Container.cpp
- awt_Container.h
- awt_Cursor.cpp
- awt_Cursor.h
- awt_CustomPaletteDef.h
- awt_DCHolder.cpp
- awt_DCHolder.h
- awt_DataTransferer.cpp
- awt_DataTransferer.h
- awt_Debug.cpp
- awt_Debug.h
- awt_Desktop.cpp
- awt_DesktopProperties.cpp
- awt_DesktopProperties.h
- awt_Dialog.cpp
- awt_Dialog.h
- awt_Dimension.cpp
- awt_Dimension.h
- awt_DnDDS.cpp
- awt_DnDDS.h
- awt_DnDDT.cpp
- awt_DnDDT.h
- awt_DrawingSurface.cpp
- awt_DrawingSurface.h
- awt_Event.cpp
- awt_Event.h
- awt_FileDialog.cpp
- awt_FileDialog.h
- awt_Font.cpp
- awt_Font.h
- awt_Frame.cpp
- awt_Frame.h
- awt_GDIObject.cpp
- awt_GDIObject.h
- awt_IconCursor.cpp
- awt_IconCursor.h
- awt_InputEvent.cpp
- awt_InputEvent.h
- awt_InputMethod.cpp
- awt_InputTextInfor.cpp
- awt_InputTextInfor.h
- awt_Insets.cpp
- awt_Insets.h
- awt_KeyEvent.cpp
- awt_KeyEvent.h
- awt_KeyboardFocusManager.cpp
- awt_Label.cpp
- awt_Label.h
- awt_List.cpp
- awt_List.h
- awt_Menu.cpp
- awt_Menu.h
- awt_MenuBar.cpp
- awt_MenuBar.h
- awt_MenuItem.cpp
- awt_MenuItem.h
- awt_Mlib.cpp
- awt_Mlib.h
- awt_MouseEvent.cpp
- awt_MouseEvent.h
- awt_Object.cpp
- awt_Object.h
- awt_Palette.cpp
- awt_Palette.h
- awt_Panel.cpp
- awt_Panel.h
- awt_Pen.cpp
- awt_Pen.h
- awt_PopupMenu.cpp
- awt_PopupMenu.h
- awt_PrintControl.cpp
- awt_PrintControl.h
- awt_PrintDialog.cpp
- awt_PrintDialog.h
- awt_PrintJob.cpp
- awt_Rectangle.cpp
- awt_Rectangle.h
- awt_Robot.cpp
- awt_Robot.h
- awt_ScrollPane.cpp
- awt_ScrollPane.h
- awt_Scrollbar.cpp
- awt_Scrollbar.h
- awt_Taskbar.cpp
- awt_Taskbar.h
- awt_TextArea.cpp
- awt_TextArea.h
- awt_TextComponent.cpp
- awt_TextComponent.h
- awt_TextField.cpp
- awt_TextField.h
- awt_Toolkit.cpp
- awt_Toolkit.h
- awt_TrayIcon.cpp
- awt_TrayIcon.h
- awt_Win32GraphicsConfig.cpp
- awt_Win32GraphicsConfig.h
- awt_Win32GraphicsDevice.cpp
- awt_Win32GraphicsDevice.h
- awt_Win32GraphicsEnv.cpp
- awt_Window.cpp
- awt_Window.h
- awt_new.cpp
- awt_new.h
- awt_ole.cpp
- awt_ole.h
- awtmsg.h
- colordata.h
- img_util_md.h
- initIDs.cpp
- mlib_types_md.h
- stdhdrs.h
-
-
-
- fontpath.c
- lcdglyph.c
-
-
- jawt.cpp
-
-
- PLATFORM_API_WinOS_Charset_Util.cpp
- PLATFORM_API_WinOS_Charset_Util.h
- PLATFORM_API_WinOS_DirectSound.cpp
- PLATFORM_API_WinOS_MidiIn.cpp
- PLATFORM_API_WinOS_MidiOut.c
- PLATFORM_API_WinOS_Ports.c
- PLATFORM_API_WinOS_Util.c
- PLATFORM_API_WinOS_Util.h
-
-
- splashscreen_config.h
- splashscreen_sys.c
-
-
-
-
-
-
-
-
- EncodingSupport.c
- EncodingSupport.h
- FileSystemSupport.h
- InstrumentationImplNativeMethods.c
- InvocationAdapter.c
- JPLISAgent.c
- JPLISAgent.h
- JPLISAssert.c
- JPLISAssert.h
- JarFacade.c
- JarFacade.h
- JavaExceptions.c
- JavaExceptions.h
- PathCharsValidator.c
- PathCharsValidator.h
- Reentrancy.c
- Reentrancy.h
- Utilities.c
- Utilities.h
-
-
-
-
-
-
- EncodingSupport_md.c
- FileSystemSupport_md.c
- FileSystemSupport_md.h
-
-
-
-
-
-
- EncodingSupport_md.c
- FileSystemSupport_md.c
- FileSystemSupport_md.h
-
-
-
-
-
-
-
-
- jmm.h
-
-
- ClassLoadingImpl.c
- GarbageCollectorImpl.c
- HotspotThread.c
- MemoryImpl.c
- MemoryManagerImpl.c
- MemoryPoolImpl.c
- ThreadImpl.c
- VMManagementImpl.c
- management.c
- management.h
-
-
-
-
-
-
-
-
- MacOSXPreferencesFile.m
-
-
-
-
-
-
- FileSystemPreferences.c
-
-
-
-
-
-
- WindowsPreferences.c
-
-
-
-
-
-
-
-
- GC.c
-
-
-
-
-
-
-
-
- SCDynamicStoreConfig.m
- nativeccache.c
-
-
-
-
-
-
- GSSLibStub.c
- NativeUtil.c
- NativeUtil.h
- gssapi.h
-
-
-
-
-
-
- NativeFunc.c
- NativeFunc.h
-
-
-
-
-
-
- NativeCreds.c
- WindowsDirectory.c
-
-
-
-
-
-
-
-
- pcsc.c
-
-
-
-
-
-
-
- pcsclite.h
- winscard.h
-
- pcsc_md.c
- pcsc_md.h
-
-
-
-
-
-
- pcsc_md.c
- pcsc_md.h
-
-
-
-
-
-
-
-
- AccessBridgeCalls.c
-
-
- AccessBridgeDebug.cpp
- AccessBridgeDebug.h
- AccessBridgeMessages.cpp
- AccessBridgeMessages.h
- accessBridgeResource.h
- resource.h
-
-
-
- AccessBridgeCallbacks.h
- AccessBridgeCalls.h
- AccessBridgePackages.h
-
-
-
- jabswitch.cpp
-
-
- MessageHistory.cpp
- MessageHistory.h
- jaccessinspector.cpp
- jaccessinspector.h
- jaccessinspectorResource.h
-
-
- jaccesswalker.cpp
- jaccesswalker.h
- jaccesswalkerResource.h
-
-
- AccessBridgeSysInfo.cpp
-
-
- AccessBridgeATInstance.cpp
- AccessBridgeATInstance.h
- AccessBridgeJavaEntryPoints.cpp
- AccessBridgeJavaEntryPoints.h
- JavaAccessBridge.cpp
- JavaAccessBridge.h
-
-
- AccessBridgeEventHandler.cpp
- AccessBridgeEventHandler.h
- AccessBridgeJavaVMInstance.cpp
- AccessBridgeJavaVMInstance.h
- AccessBridgeMessageQueue.cpp
- AccessBridgeMessageQueue.h
- AccessBridgeWindowsEntryPoints.cpp
- AccessBridgeWindowsEntryPoints.h
- WinAccessBridge.cpp
- WinAccessBridge.h
-
-
- AccessInfo.cpp
- AccessInfo.h
-
-
-
-
-
-
-
-
- VirtualMachineImpl.c
-
-
-
-
-
-
- VirtualMachineImpl.c
-
-
-
-
-
-
- VirtualMachineImpl.c
-
-
-
-
-
-
- VirtualMachineImpl.c
-
-
-
-
-
-
- AttachProviderImpl.c
- VirtualMachineImpl.c
-
-
-
-
-
-
-
-
- j2secmod.c
- j2secmod.h
- p11_convert.c
- p11_crypt.c
- p11_digest.c
- p11_dual.c
- p11_general.c
- p11_keymgmt.c
- p11_mutex.c
- p11_objmgmt.c
- p11_sessmgmt.c
- p11_sign.c
- p11_util.c
- pkcs-11v2-20a3.h
- pkcs11.h
- pkcs11f.h
- pkcs11t.h
- pkcs11wrapper.h
-
-
-
-
-
-
- j2secmod_md.c
- j2secmod_md.h
- p11_md.c
- p11_md.h
-
-
-
-
-
-
- j2secmod_md.c
- j2secmod_md.h
- p11_md.c
- p11_md.h
-
-
-
-
-
-
-
-
-
- ec.c
- ec.h
- ec2.h
- ec2_163.c
- ec2_193.c
- ec2_233.c
- ec2_aff.c
- ec2_mont.c
- ec_naf.c
- ecc_impl.h
- ecdecode.c
- ecl-curve.h
- ecl-exp.h
- ecl-priv.h
- ecl.c
- ecl.h
- ecl_curve.c
- ecl_gf.c
- ecl_mult.c
- ecp.h
- ecp_192.c
- ecp_224.c
- ecp_256.c
- ecp_384.c
- ecp_521.c
- ecp_aff.c
- ecp_jac.c
- ecp_jm.c
- ecp_mont.c
- logtab.h
- mp_gf2m-priv.h
- mp_gf2m.c
- mp_gf2m.h
- mpi-config.h
- mpi-priv.h
- mpi.c
- mpi.h
- mplogic.c
- mplogic.h
- mpmontg.c
- mpprime.h
- oid.c
- secitem.c
- secoidt.h
-
- ECC_JNI.cpp
-
-
-
-
-
-
-
-
- security.cpp
-
-
-
-
-
-
-
-
- nativeCrypto.c
- nativeCrypto.h
- nativeCryptoMD.c
- nativeFunc.c
- nativeFunc.h
-
-
-
-
-
-
-
-
- LinuxDebuggerLocal.c
- elfmacros.h
- libproc.h
- libproc_impl.c
- libproc_impl.h
- proc_service.h
- ps_core.c
- ps_proc.c
- salibelf.c
- salibelf.h
- symtab.c
- symtab.h
- test.c
-
-
-
-
-
-
- BsdDebuggerLocal.c
- MacosxDebuggerLocal.m
- StubDebuggerLocal.c
- elfmacros.h
- libproc.h
- libproc_impl.c
- libproc_impl.h
- ps_core.c
- ps_proc.c
- salibelf.c
- salibelf.h
- symtab.c
- symtab.h
- test.c
-
-
-
-
-
-
- sadis.c
-
-
-
-
-
-
- libproc.h
- salibproc.h
- saproc.cpp
- saproc_audit.cpp
-
-
-
-
-
-
- sawindbg.cpp
-
-
-
-
-
-
-
-
- WindowsTerminal.cpp
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- CompilationBailoutActionHelp.txt
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- DumpHelp.txt
- MethodFilterHelp.txt
- MetricsFileHelp.txt
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- BenchmarkDynamicCountersHelp.txt
-
-
-
-
- ProfileAllocationsContextHelp.txt
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- jdk8_internals.txt
-
-
-
-
-
-
-
-
-
-
-
-
- SharedMemory.h
- SharedMemoryConnection.c
- SharedMemoryTransport.c
- shmemBack.c
- shmemBase.c
- shmemBase.h
- sysShmem.h
-
-
-
-
-
-
- shmem_md.c
- shmem_md.h
-
-
-
-
-
-
-
-
- jdwpTransport.h
-
-
- socketTransport.c
- socketTransport.h
- sysSocket.h
-
-
-
- sys.h
-
- ArrayReferenceImpl.c
- ArrayReferenceImpl.h
- ArrayTypeImpl.c
- ArrayTypeImpl.h
- ClassLoaderReferenceImpl.c
- ClassLoaderReferenceImpl.h
- ClassObjectReferenceImpl.c
- ClassObjectReferenceImpl.h
- ClassTypeImpl.c
- ClassTypeImpl.h
- EventRequestImpl.c
- EventRequestImpl.h
- FieldImpl.c
- FieldImpl.h
- FrameID.c
- FrameID.h
- InterfaceTypeImpl.c
- InterfaceTypeImpl.h
- JDWP.h
- MethodImpl.c
- MethodImpl.h
- ModuleReferenceImpl.c
- ModuleReferenceImpl.h
- ObjectReferenceImpl.c
- ObjectReferenceImpl.h
- ReferenceTypeImpl.c
- ReferenceTypeImpl.h
- SDE.c
- SDE.h
- StackFrameImpl.c
- StackFrameImpl.h
- StringReferenceImpl.c
- StringReferenceImpl.h
- ThreadGroupReferenceImpl.c
- ThreadGroupReferenceImpl.h
- ThreadReferenceImpl.c
- ThreadReferenceImpl.h
- VirtualMachineImpl.c
- VirtualMachineImpl.h
- bag.c
- bag.h
- classTrack.c
- classTrack.h
- commonRef.c
- commonRef.h
- debugDispatch.c
- debugDispatch.h
- debugInit.c
- debugInit.h
- debugLoop.c
- debugLoop.h
- error_messages.c
- error_messages.h
- eventFilter.c
- eventFilter.h
- eventFilterRestricted.h
- eventHandler.c
- eventHandler.h
- eventHandlerRestricted.h
- eventHelper.c
- eventHelper.h
- inStream.c
- inStream.h
- invoker.c
- invoker.h
- log_messages.c
- log_messages.h
- outStream.c
- outStream.h
- standardHandlers.c
- standardHandlers.h
- stepControl.c
- stepControl.h
- stream.c
- stream.h
- threadControl.c
- threadControl.h
- transport.c
- transport.h
- utf_util.c
- utf_util.h
- util.c
- util.h
- vm_interface.h
-
-
-
-
-
-
- socket_md.c
- socket_md.h
-
-
- exec_md.c
- linker_md.c
- path_md.h
- proc_md.h
- util_md.h
-
-
-
-
-
-
- socket_md.c
- socket_md.h
-
-
- exec_md.c
- linker_md.c
- mutex_md.h
- path_md.h
- proc_md.h
- util_md.h
-
-
-
-
-
-
-
-
-
-
-
- unicode-license.txt
-
-
-
-
-
-
-
-
-
-
-
- UnixOperatingSystem.c
-
-
-
-
-
-
- UnixOperatingSystem.c
-
-
-
-
-
-
- UnixOperatingSystem.c
-
-
-
-
-
-
- DiagnosticCommandImpl.c
- Flag.c
- GarbageCollectorExtImpl.c
- GcInfoBuilder.c
- HotSpotDiagnostic.c
- management_ext.c
- management_ext.h
-
-
-
-
-
-
- UnixOperatingSystem.c
-
-
-
-
-
-
- OperatingSystemImpl.c
-
-
-
-
-
-
- OperatingSystemImpl.c
-
-
-
-
-
-
-
-
- FileSystemImpl.c
-
-
-
-
-
-
- FileSystemImpl.c
-
-
-
-
-
-
-
-
- SolarisSocketOptions.c
- SolarisSocketOptions.h
-
-
-
-
-
-
-
-
- bands.cpp
- bands.h
- bytes.cpp
- bytes.h
- coding.cpp
- coding.h
- constants.h
- defines.h
- unpack.cpp
- unpack.h
- utils.cpp
- utils.h
- zip.cpp
- zip.h
-
-
- jni.cpp
-
-
- main.cpp
-
-
-
-
-
-
-
-
- Sctp.h
- SctpChannelImpl.c
- SctpNet.c
- SctpServerChannelImpl.c
-
-
-
-
-
-
-
-
- Unix.c
-
-
-
-
-
-
- nt.c
-
-
-
-
-
-
- Main.asm
-
-
-
-
- hsdis-demo.c
- hsdis.c
- hsdis.h
-
-
-
- mcount.c
- remove_mcount.c
- util-i586.il
- util-sparc.il
- util-sparcv9.il
-
-
-
-
-
-
-
-
-
-
- GatherProcessInfoTimeoutHandler.c
-
-
-
-
-
-
-
-
-
-
- gtest-death-test-internal.h
- gtest-filepath.h
- gtest-internal.h
- gtest-linked_ptr.h
- gtest-param-util-generated.h
- gtest-param-util.h
- gtest-port.h
- gtest-string.h
- gtest-tuple.h
- gtest-type-util.h
-
- gtest-death-test.h
- gtest-message.h
- gtest-param-test.h
- gtest-printers.h
- gtest-spi.h
- gtest-test-part.h
- gtest-typed-test.h
- gtest.h
- gtest_pred_impl.h
- gtest_prod.h
-
-
-
- gtest-all.cc
- gtest-death-test.cc
- gtest-filepath.cc
- gtest-internal-inl.h
- gtest-port.cc
- gtest-printers.cc
- gtest-test-part.cc
- gtest-typed-test.cc
- gtest.cc
- gtest_main.cc
-
-
-
-
-
-
- test_AltHashing.cpp
- test_symbolTable.cpp
-
-
- test_dependencyContext.cpp
-
-
-
- test_bufferingOopClosure.cpp
- test_freeRegionList.cpp
- test_g1BiasedArray.cpp
- test_g1CodeCacheRemSet.cpp
- test_g1IHOPControl.cpp
- test_g1Predictions.cpp
-
-
- test_psAdaptiveSizePolicy.cpp
- test_psParallelCompact.cpp
-
-
- test_collectedHeap.cpp
- test_collectorPolicy.cpp
- test_memset_with_concurrent_readers.cpp
- test_workerDataArray.cpp
-
-
-
- logTestFixture.cpp
- logTestFixture.hpp
- logTestUtils.inline.hpp
- test_gcTraceTime.cpp
- test_log.cpp
- test_logConfiguration.cpp
- test_logDecorations.cpp
- test_logDecorators.cpp
- test_logFileOutput.cpp
- test_logLevel.cpp
- test_logMessageTest.cpp
- test_logOutputList.cpp
- test_logStream.cpp
- test_logTag.cpp
- test_logTagLevelExpression.cpp
- test_logTagSet.cpp
- test_logTagSetDescriptions.cpp
-
-
- test_chunkManager.cpp
- test_guardedMemory.cpp
- test_metachunk.cpp
- test_spaceManager.cpp
-
-
- test_conditional.cpp
- test_decay.cpp
- test_enableIf.cpp
- test_isConst.cpp
- test_isFloatingPoint.cpp
- test_isIntegral.cpp
- test_isPointer.cpp
- test_isRegisteredEnum.cpp
- test_isSame.cpp
- test_isSigned.cpp
- test_isVolatile.cpp
- test_primitiveConversions.cpp
- test_removeCV.cpp
- test_removePointer.cpp
- test_removeReference.cpp
-
-
- test_arrayOop.cpp
- test_instanceKlass.cpp
-
-
- test_arguments.cpp
- test_classLoader.cpp
- test_globals.cpp
- test_os.cpp
- test_semaphore.cpp
- test_vmStructs.cpp
-
-
- test_align.cpp
- test_bitMap.cpp
- test_bitMap_search.cpp
- test_bitMap_setops.cpp
- test_chunkedList.cpp
- test_count_trailing_zeros.cpp
- test_globalDefinitions.cpp
- test_json.cpp
- test_linkedlist.cpp
- test_quicksort.cpp
- test_resourceHash.cpp
- test_utf8.cpp
-
- gtestLauncher.cpp
- gtestMain.cpp
- unittest.hpp
-
-
-
-
-
- java.base-list.txt
- jdk.internal.vm.compiler-list.txt
- jdk.scripting.nashorn-list.txt
-
-
-
-
- input6890943.txt
- output6890943.txt
-
-
-
-
- libCallsNative.c
-
- libTestDirtyInt.c
-
-
- control_off.txt
- control_on.txt
-
-
- libTestFloatJNIArgs.c
-
-
-
- libNativeCallTest.c
-
-
-
- command1.txt
- command2.txt
-
-
-
-
- libTestCSLocker.c
-
-
-
- libTestJNIWeakG1.c
-
-
-
-
- libTestGCLocker.c
-
-
-
-
- libJniVersion.c
-
-
-
- libNativeSmallIntCalls.c
-
-
- flagfile.txt
-
-
- libtest-rw.c
- libtest-rwx.c
-
-
-
- libUninitializedStrings.c
-
-
- libDefaultMethods.c
-
-
- exeFPRegs.c
-
-
- libCallWithJNIWeak.c
-
-
- libTestCheckedJniExceptionCheck.c
-
-
- libPrivateInterfaceMethods.c
-
-
- libReturnJNIWeak.c
-
-
- libToStringTest.c
-
-
-
- libTestJNI.c
-
-
- liboverflow.c
-
-
-
- libGetModule.c
-
-
-
- libNoClassDefFoundMsg.c
-
-
- libRedefineDoubleDelete.c
-
-
- libSameObject.c
-
-
- exeinvoke.c
-
-
- exeThreadSignalMask.c
-
-
-
-
-
- control1.txt
- control2.txt
-
-
-
-
- libAddModuleExportsAndOpensTest.c
-
-
- libAddModuleReadsTest.c
-
-
- libAddModuleUsesAndProvidesTest.c
-
-
- libJvmtiGetAllModulesTest.c
-
-
- libGetNamedModuleTest.c
-
-
- libGetOwnedMonitorInfoTest.c
-
-
- libIsModifiableModuleTest.c
-
-
- libHeapMonitorTest.c
-
-
- libVMEventTest.c
-
-
-
- libMAAClassFileLoadHook.c
-
-
- libMAAClassLoadPrepare.c
-
-
- libMAAThreadStart.c
-
-
-
-
- libAllowedFunctions.c
-
-
-
-
-
-
- libSimpleClassFileLoadHook.c
-
-
- ProblemList.txt
-
-
-
-
-
-
-
-
-
-
-
- Bug4858685.txt
-
-
-
-
-
-
-
-
- nodetest1.txt
-
-
-
-
- replace1.txt
-
-
- replace1.txt
- replace2.txt
-
-
-
-
-
-
- ProblemList.txt
-
-
-
-
-
-
-
-
-
- plain0.txt
- plain1.txt
- plain10.txt
- plain2.txt
- plain3.txt
- plain4.txt
- plain5.txt
- plain6.txt
- plain7.txt
- plain8.txt
- plain9.txt
-
-
-
- oaep-vect.txt
-
-
-
- keymatdata.txt
- masterdata.txt
- prf12data.txt
- prfdata.txt
-
-
-
-
-
-
-
- largefile.txt
- smallfile.txt
-
-
-
-
-
-
-
-
-
- myfile.c
- myfile.cpp
-
-
-
-
- SkipInput.txt
-
-
-
- input.txt
-
-
-
- input.txt
-
-
- SkipInput.txt
-
-
- input.txt
-
-
-
-
- PropList.txt
- PropertyValueAliases.txt
- Scripts.txt
-
-
-
- libstringPlatformChars.c
-
-
-
- locales.txt
-
-
-
-
-
-
- foo.txt
- notsobigfile.txt
- smallfile.txt
-
-
-
-
-
- Readme.txt
-
-
-
-
-
-
-
-
- Launcher.c
-
-
-
-
-
-
-
- broken_th_TH.txt
- test_th_TH.txt
-
-
-
- Bug4185732.ser.txt
-
-
- ChoiceFormat.ser.txt
- DateFormat.Field.ser.txt
- MessageFormat.Field.ser.txt
- NumberFormat.Field.ser.txt
-
-
- SDFserialized.ser.txt
-
-
- Bug4185816.ser.txt
- Bug4185816Corrupt.ser.txt
-
-
- DecimalFormat.114.txt
- DecimalFormatSymbols.114.txt
- DecimalFormatSymbols.142.txt
- NumberFormat4185761a.ser.txt
- NumberFormat4185761b.ser.txt
-
-
-
-
-
- baseEncode.txt
- mimeEncode.txt
- plain.txt
- urlEncode.txt
-
-
- tablea1.txt
-
-
-
- deflocale.c
-
- icuLocales.txt
-
-
-
- README.txt
-
-
-
- BMPTestCases.txt
- GraphemeBreakProperty.txt
- GraphemeBreakTest.txt
- SupplementaryTestCases.txt
- TestCases.txt
-
-
- input.txt
-
-
-
-
-
-
-
- NIST_800_38A_vectors.txt
-
-
-
- README.txt
-
-
-
-
-
-
- RandomGen.c
- RandomGen.h
-
-
-
-
-
-
-
- sample.txt
-
-
-
-
-
-
- bug4697612.txt
-
-
-
-
- DemandGTK2.txt
-
-
-
-
-
- bug8015853.txt
-
-
-
-
-
-
-
-
-
-
-
- leaf1.txt
- leaf2.txt
-
-
- leaf3.txt
- leaf4.txt
-
-
-
-
-
- leaf1.txt
- leaf2.txt
-
-
- leaf3.txt
- leaf4.txt
-
-
-
-
-
-
-
-
-
- exesanity_SimpleNativeLauncher.c
-
-
- libsanity_SimpleNativeLib.c
-
-
- libsanity_SimpleNativeLib2.c
-
-
-
-
-
-
-
-
-
-
-
-
-
- tree.txt
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- Readme.txt
-
- launcher.c
-
-
- REMOTE_TESTING.txt
-
-
-
- revokeall.c
-
-
-
-
-
-
-
-
-
- res1.txt
-
-
-
-
-
-
-
-
-
- p12passwords.txt
-
-
-
- msoid.txt
-
-
-
-
- p12passwords.txt
-
-
-
- p11-activcard.txt
- p11-ibutton.txt
- p11-nss.txt
- p11-sca1000.txt
- p11-solaris.txt
-
-
- p11-nss.txt
-
-
-
- p11-deimos.txt
- p11-nss.txt
-
-
- ConfigQuotedString-nss.txt
- Login-nss.txt
-
-
- keymatdata.txt
- masterdata.txt
- prfdata.txt
-
-
-
- README.txt
-
-
-
- p11-nss.txt
-
-
-
-
-
- dcmd-big-script.txt
- dcmd-script.txt
-
-
-
-
-
-
-
-
- manifest.txt
-
-
-
-
-
-
- Readme.txt
-
-
-
- ProblemList.txt
-
-
-
-
-
-
-
-
-
- testfile.txt
-
-
- testfile.txt
-
-
- testfile.txt
-
-
- testfile.txt
-
- testfile.txt
-
-
-
-
-
-
- test.txt
-
-
-
-
-
-
- README.txt
-
-
-
-
-
-
-
- README.txt
-
-
-
-
-
-
- README.txt
-
-
- README.txt
-
-
-
-
- README.examples.txt
- examples.not-yet.txt
-
-
-
-
-
-
- TestScanExpected.txt
-
-
-
-
-
- ProblemList.txt
-
-
-
-
-
-
-
-
-
-
- gay-fixed.txt
- gay-precision.txt
- gay-shortest.txt
-
-
-
-
-
-
-
-
- ProblemList.txt
-
-
../../Makefile
-
- default
- false
- false
-
-
-
-
-
-
- HOTSPOT_BUILD_TARGET="target"
- HOTSPOT_BUILD_USER="user"
- HOTSPOT_RELEASE_VERSION="version"
-
-
../..
${MAKE} -f Makefile images
${MAKE} -f Makefile clean
-
-
-
- THIS_FILE="MacosxDebuggerLocal.m"
-
-
../..
- sh ../configure --with-debug-level=slowdebug --disable-zip-debug-info
+ sh configure --with-debug-level=slowdebug
- -
-
-
-
- -
-
-
- THIS_FILE="ad_x86_64_clone.cpp"
-
-
-
- -
-
-
- THIS_FILE="ad_x86_64_expand.cpp"
-
-
-
- -
-
-
- THIS_FILE="ad_x86_64_format.cpp"
-
-
-
- -
-
-
- THIS_FILE="ad_x86_64_gen.cpp"
-
-
-
- -
-
-
- THIS_FILE="ad_x86_64_misc.cpp"
-
-
-
- -
-
-
- THIS_FILE="ad_x86_64_peephole.cpp"
-
-
-
- -
-
-
- THIS_FILE="ad_x86_64_pipeline.cpp"
-
-
-
- -
-
-
- THIS_FILE="dfa_x86_64.cpp"
-
-
-
- -
-
-
-
- -
-
-
- THIS_FILE="jvmtiEnter.cpp"
-
-
-
- -
-
-
- THIS_FILE="jvmtiEnterTrace.cpp"
-
-
-
- -
-
-
- ../../hotspot/src/share/vm/opto
- ../../hotspot/src/share/vm/code
- ../../hotspot/src/cpu/x86/vm
- ../../hotspot/src/share/vm/asm
- ../../hotspot/src/share/vm/memory
- ../../hotspot/src/share/vm/utilities
- ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc/adfiles
- /usr/include/c++/4.2.1
- ../../hotspot/src/share/vm/prims
- ../../hotspot/src/share/vm/runtime
- ../../hotspot/src/share/vm/logging
- ../../hotspot/make
- ../../hotspot/src/share/vm/ci
- ../../hotspot/src/share/vm/oops
- ../../hotspot/src/share/vm/trace
- ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc/jfrfiles
- ../../hotspot/src/share/vm/gc/parallel
- ../../hotspot/src/share/vm/gc/shared
- ../../hotspot/src/share/vm/classfile
- ../../hotspot/src/share/vm/compiler
- ../../hotspot/src/share/vm/interpreter
- ../../hotspot/src/share/vm/libadt
- ../../hotspot/src/os/bsd/vm
- ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc/jvmtifiles
- ../../hotspot/src/os/posix/vm
- ../../hotspot/src/os_cpu/bsd_x86/vm
- ../../hotspot/src/share/vm
- ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc
-
-
-
- -
-
-
- ../../hotspot/src/share/vm/memory
- ../../hotspot/src/share/vm/logging
- ../../hotspot/src/share/vm/utilities
- ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc/adfiles
- /usr/include/c++/4.2.1
- ../../hotspot/src/cpu/x86/vm
- ../../hotspot/src/share/vm/code
- ../../hotspot/src/share/vm/asm
- ../../hotspot/src/share/vm/runtime
- ../../hotspot/src/share/vm/prims
- ../../hotspot/src/share/vm/opto
- ../../hotspot/src/share/vm/ci
- ../../hotspot/src/share/vm/oops
- ../../hotspot/src/share/vm/trace
- ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc/tracefiles
- ../../hotspot/src/share/vm/gc/parallel
- ../../hotspot/src/share/vm/gc/shared
- ../../hotspot/src/share/vm/classfile
- ../../hotspot/src/share/vm/compiler
- ../../hotspot/src/share/vm/interpreter
- ../../hotspot/src/share/vm/libadt
- ../../hotspot/make
- ../../hotspot/src/share/vm
- ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc
-
-
-
- -
-
-
- ../../hotspot/src/share/vm/opto
- ../../hotspot/src/share/vm/code
- ../../hotspot/src/cpu/x86/vm
- ../../hotspot/src/share/vm/asm
- ../../hotspot/src/share/vm/memory
- ../../hotspot/src/share/vm/logging
- ../../hotspot/src/share/vm/utilities
- ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc/adfiles
- /usr/include/c++/4.2.1
- ../../hotspot/src/share/vm/runtime
- ../../hotspot/src/share/vm/ci
- ../../hotspot/src/share/vm/prims
- ../../hotspot/src/share/vm/oops
- ../../hotspot/src/share/vm/trace
- ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc/tracefiles
- ../../hotspot/src/share/vm/gc/parallel
- ../../hotspot/src/share/vm/gc/shared
- ../../hotspot/src/share/vm/classfile
- ../../hotspot/src/share/vm/compiler
- ../../hotspot/src/share/vm/interpreter
- ../../hotspot/src/share/vm/libadt
- ../../hotspot/make
- ../../hotspot/src/share/vm
- ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc
-
-
-
- -
-
-
- ../../hotspot/src/share/vm/memory
- ../../hotspot/src/share/vm/logging
- ../../hotspot/src/share/vm/utilities
- ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc/adfiles
- /usr/include/c++/4.2.1
- ../../hotspot/src/cpu/x86/vm
- ../../hotspot/src/share/vm
- ../../hotspot/make
-
-
-
- -
-
-
- ../../hotspot/src/share/vm/memory
- ../../hotspot/src/share/vm/logging
- ../../hotspot/src/share/vm/utilities
- /usr/include/c++/4.2.1
- ../../hotspot/src/cpu/x86/vm
- ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc/adfiles
- ../../hotspot/make
- ../../hotspot/src/share/vm/runtime
- ../../hotspot/src/share/vm/opto
- ../../hotspot/src/share/vm/ci
- ../../hotspot/src/share/vm/prims
- ../../hotspot/src/share/vm/oops
- ../../hotspot/src/share/vm/trace
- ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc/tracefiles
- ../../hotspot/src/share/vm/gc/parallel
- ../../hotspot/src/share/vm/gc/shared
- ../../hotspot/src/share/vm/classfile
- ../../hotspot/src/share/vm/compiler
- ../../hotspot/src/share/vm/code
- ../../hotspot/src/share/vm/asm
- ../../hotspot/src/share/vm/interpreter
- ../../hotspot/src/share/vm/libadt
- ../../hotspot/src/share/vm
- ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc
-
-
-
- -
-
-
- ../../hotspot/src/share/vm/memory
- ../../hotspot/src/share/vm/logging
- ../../hotspot/src/share/vm/utilities
- ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc/adfiles
- /usr/include/c++/4.2.1
- ../../hotspot/src/cpu/x86/vm
- ../../hotspot/src/share/vm/code
- ../../hotspot/src/share/vm/asm
- ../../hotspot/src/share/vm/runtime
- ../../hotspot/src/share/vm/prims
- ../../hotspot/src/share/vm/opto
- ../../hotspot/src/share/vm/ci
- ../../hotspot/src/share/vm/oops
- ../../hotspot/src/share/vm/trace
- ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc/tracefiles
- ../../hotspot/src/share/vm/gc/parallel
- ../../hotspot/src/share/vm/gc/shared
- ../../hotspot/src/share/vm/classfile
- ../../hotspot/src/share/vm/compiler
- ../../hotspot/src/share/vm/interpreter
- ../../hotspot/src/share/vm/libadt
- ../../hotspot/make
- ../../hotspot/src/share/vm
- ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc
-
-
-
- -
-
-
- ../../hotspot/src/share/vm/memory
- ../../hotspot/src/share/vm/logging
- ../../hotspot/src/share/vm/utilities
- ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc/adfiles
- /usr/include/c++/4.2.1
- ../../hotspot/src/cpu/x86/vm
- ../../hotspot/make
- ../../hotspot/src/share/vm/opto
- ../../hotspot/src/share/vm/runtime
- ../../hotspot/src/share/vm/ci
- ../../hotspot/src/share/vm/prims
- ../../hotspot/src/share/vm/oops
- ../../hotspot/src/share/vm/trace
- ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc/tracefiles
- ../../hotspot/src/share/vm/gc/parallel
- ../../hotspot/src/share/vm/gc/shared
- ../../hotspot/src/share/vm/classfile
- ../../hotspot/src/share/vm/compiler
- ../../hotspot/src/share/vm/code
- ../../hotspot/src/share/vm/asm
- ../../hotspot/src/share/vm/interpreter
- ../../hotspot/src/share/vm/libadt
- ../../hotspot/src/share/vm
- ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc
-
-
-
- -
-
-
- ../../hotspot/make
- ../../hotspot/src/share/vm/memory
- ../../hotspot/src/share/vm/logging
- ../../hotspot/src/share/vm/utilities
- ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc/adfiles
- /usr/include/c++/4.2.1
- ../../hotspot/src/cpu/x86/vm
- ../../hotspot/src/share/vm/opto
- ../../hotspot/src/share/vm/runtime
- ../../hotspot/src/share/vm/ci
- ../../hotspot/src/share/vm/prims
- ../../hotspot/src/share/vm/oops
- ../../hotspot/src/share/vm/trace
- ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc/tracefiles
- ../../hotspot/src/share/vm/gc/parallel
- ../../hotspot/src/share/vm/gc/shared
- ../../hotspot/src/share/vm/classfile
- ../../hotspot/src/share/vm/compiler
- ../../hotspot/src/share/vm/code
- ../../hotspot/src/share/vm/asm
- ../../hotspot/src/share/vm/interpreter
- ../../hotspot/src/share/vm/libadt
- ../../hotspot/src/share/vm
- ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc
-
-
-
- -
-
-
- ../../hotspot/src/share/vm/memory
- ../../hotspot/src/share/vm/logging
- ../../hotspot/src/share/vm/utilities
- /usr/include/c++/4.2.1
- ../../hotspot/src/cpu/x86/vm
- ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc/adfiles
- ../../hotspot/make
- ../../hotspot/src/share/vm/asm
- ../../hotspot/src/share/vm/code
- ../../hotspot/src/share/vm/runtime
- ../../hotspot/src/share/vm/prims
- ../../hotspot/src/share/vm/opto
- ../../hotspot/src/share/vm/oops
- ../../hotspot/src/share/vm/gc/parallel
- ../../hotspot/src/share/vm/gc/shared
- ../../hotspot/src/share/vm/classfile
- ../../hotspot/src/share/vm/trace
- ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc/tracefiles
- ../../hotspot/src/share/vm/ci
- ../../hotspot/src/share/vm/compiler
- ../../hotspot/src/share/vm/interpreter
- ../../hotspot/src/share/vm/libadt
- ../../hotspot/src/share/vm
- ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc
-
-
-
- -
-
-
- ../../hotspot/src/share/vm/logging
- ../../hotspot/src/share/vm/utilities
- ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc/jvmtifiles
- /usr/include/c++/4.2.1
- ../../hotspot/src/cpu/x86/vm
- ../../hotspot/src/share/vm
- ../../hotspot/make
-
-
-
- -
-
-
- ../../hotspot/src/share/vm/utilities
- ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc/jvmtifiles
- /usr/include/c++/4.2.1
- ../../hotspot/src/share/vm/prims
- ../../hotspot/src/cpu/x86/vm
- ../../hotspot/src/share/vm/logging
- ../../hotspot/src/share/vm/runtime
- ../../hotspot/src/share/vm/oops
- ../../hotspot/src/share/vm/gc/parallel
- ../../hotspot/src/share/vm/gc/shared
- ../../hotspot/src/share/vm/classfile
- ../../hotspot/src/share/vm/trace
- ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc/tracefiles
- ../../hotspot/src/os/bsd/vm
- ../../hotspot/src/share/vm/code
- ../../hotspot/src/share/vm/asm
- ../../hotspot/src/share/vm/interpreter
- ../../hotspot/src/os/posix/vm
- ../../hotspot/src/os_cpu/bsd_x86/vm
- ../../hotspot/src/share/vm
- ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc
- ../../hotspot/make
-
-
-
- -
-
-
- ../../hotspot/src/share/vm/prims
- ../../hotspot/src/cpu/x86/vm
- ../../hotspot/src/share/vm/oops
- ../../hotspot/src/share/vm/runtime
- ../../hotspot/src/share/vm/trace
- ../../hotspot/src/share/vm/utilities
- ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc/tracefiles
- ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc/jvmtifiles
- /usr/include/c++/4.2.1
- ../../hotspot/src/share/vm/gc/parallel
- ../../hotspot/src/share/vm/gc/shared
- ../../hotspot/src/share/vm/classfile
- ../../hotspot/src/share/vm/logging
- ../../hotspot/src/os/bsd/vm
- ../../hotspot/src/share/vm/code
- ../../hotspot/src/share/vm/asm
- ../../hotspot/src/share/vm/interpreter
- ../../hotspot/src/os/posix/vm
- ../../hotspot/src/os_cpu/bsd_x86/vm
- ../../hotspot/src/share/vm
- ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc
- ../../hotspot/make
-
-
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
-
-
-
- ../../hotspot/src/share/vm
- ../../hotspot/src/os/bsd/vm
- ../../hotspot/src/os/posix/vm
- ../../hotspot/src/cpu/x86/vm
- ../../hotspot/src/os_cpu/bsd_x86/vm
- ../../build/hotspot/variant-server/gensrc
- ../../hotspot/src/share/vm/precompiled
- ../../hotspot/src/share/vm/prims
- ../../hotspot/makefiles
-
-
- AMD64
- ASSERT
- COMPILER1
- COMPILER2
- DTRACE_ENABLED
- HOTSPOT_LIB_ARCH="amd64"
- TARGET_ARCH_MODEL_x86_64
- TARGET_ARCH_x86
- TARGET_COMPILER_gcc
- TARGET_OS_ARCH_MODEL_bsd_x86_64
- TARGET_OS_ARCH_bsd_x86
- TARGET_OS_FAMILY_bsd
- VM_LITTLE_ENDIAN
- _ALLBSD_SOURCE
- _DARWIN_C_SOURCE
- _GNU_SOURCE
- _LP64=1
- _NMT_NOINLINE_
- _XOPEN_SOURCE
-
-
-
-
-
-
- THIS_FILE="ad_x86_64.cpp"
-
-
-
-
-
-
- THIS_FILE="bytecodeInterpreterWithChecks.cpp"
-
-
-
-
-
-
- ../../hotspot/src/share/vm/memory
-
-
-
-
- default
- false
- false
-
-
-
-
-
-
-
- HOTSPOT_BUILD_TARGET="target"
- HOTSPOT_BUILD_USER="user"
- HOTSPOT_RELEASE_VERSION="version"
-
-
../..
${MAKE} -f Makefile images
${MAKE} -f Makefile clean
-
-
-
- LINUX
- _GNU_SOURCE
- _REENTRANT
-
-
../..
- sh ../configure --with-debug-level=slowdebug --disable-zip-debug-info
+ sh configure --with-debug-level=slowdebug
- -
-
-
-
- -
-
-
-
- -
-
-
-
- -
-
-
-
- -
-
-
-
- -
-
-
-
- -
-
-
-
- -
-
-
-
- -
-
-
-
- -
-
-
-
- -
-
-
-
- -
-
-
-
- -
-
-
-
-
-
-
- ../../jdk/src/java.base/share/native/include
- ../../jdk/src/java.base/unix/native/include
- ../../jdk/src/java.base/share/native/libjava
- ../../jdk/src/java.base/unix/native/libjava
- ../../jdk/src/java.desktop/unix/native/common/awt
- ../../jdk/src/java.desktop/share/native/common/awt/debug
- ../../jdk/src/java.desktop/share/native/libawt/awt/image/cvutils
-
-
-
-
- ../../build/hotspot/linux_amd64_compiler2/debug
- ../../hotspot/src/share/vm/prims
- ../../hotspot/src/share/vm
- ../../hotspot/src/share/vm/precompiled
- ../../hotspot/src/cpu/x86/vm
- ../../hotspot/src/os_cpu/linux_x86/vm
- ../../hotspot/src/os/linux/vm
- ../../hotspot/src/os/posix/vm
- ../../build/hotspot/linux_amd64_compiler2/generated
-
-
- AMD64
- ASSERT
- COMPILER1
- COMPILER2
- HOTSPOT_BUILD_USER="user"
- HOTSPOT_LIB_ARCH="amd64"
- HOTSPOT_VM_DISTRO="OpenJDK"
- TARGET_ARCH_MODEL_x86_64
- TARGET_ARCH_x86
- TARGET_COMPILER_gcc
- TARGET_OS_ARCH_MODEL_linux_x86_64
- TARGET_OS_ARCH_linux_x86
- TARGET_OS_FAMILY_linux
- VM_LITTLE_ENDIAN
- _LP64=1
- _NMT_NOINLINE_
-
-
-
-
- default
- false
- false
-
-
-
-
-
-
- HOTSPOT_BUILD_TARGET="target"
- HOTSPOT_BUILD_USER="user"
- HOTSPOT_RELEASE_VERSION="version"
-
-
../..
gmake -f Makefile images
gmake -f Makefile clean
-
-
-
- THIS_FILE="ad_x86_64.cpp"
-
-
../..
- sh ../configure --with-debug-level=slowdebug --disable-zip-debug-info
+ sh configure --with-debug-level=slowdebug
- -
-
-
-
- -
-
-
- THIS_FILE="ad_x86_64_clone.cpp"
-
-
-
- -
-
-
- THIS_FILE="ad_x86_64_expand.cpp"
-
-
-
- -
-
-
- THIS_FILE="ad_x86_64_format.cpp"
-
-
-
- -
-
-
- THIS_FILE="ad_x86_64_gen.cpp"
-
-
-
- -
-
-
- THIS_FILE="ad_x86_64_misc.cpp"
-
-
-
- -
-
-
- THIS_FILE="ad_x86_64_peephole.cpp"
-
-
-
- -
-
-
- THIS_FILE="ad_x86_64_pipeline.cpp"
-
-
-
- -
-
-
- THIS_FILE="dfa_x86_64.cpp"
-
-
-
- -
-
-
-
- -
-
-
- THIS_FILE="jvmtiEnter.cpp"
-
-
-
- -
-
-
- THIS_FILE="jvmtiEnterTrace.cpp"
-
-
-
- -
-
-
-
- -
-
-
-
- -
-
-
-
-
-
-
- /usr/openwin/include
- /usr/openwin/include/X11/extensions
- ../../jdk/src/java.base/share/native/include
- ../../jdk/src/java.base/unix/native/include
- ../../jdk/src/java.base/share/native/libjava
- ../../jdk/src/java.base/unix/native/libjava
- ../../jdk/src/java.desktop/unix/native/common/awt
- ../../jdk/src/java.desktop/share/native/common/awt/debug
- ../../jdk/src/java.desktop/share/native/libawt/awt/image/cvutils
-
-
-
-
- ../../hotspot/src/share/vm
- ../../hotspot/src/os/solaris/vm
- ../../hotspot/src/os/posix/vm
- ../../hotspot/src/cpu/x86/vm
- ../../hotspot/src/os_cpu/solaris_x86/vm
- ../../build/hotspot/variant-server/gensrc
- ../../hotspot/src/share/vm/precompiled
- ../../hotspot/src/share/vm/prims
- ../../hotspot/make
-
-
- AMD64
- ASSERT
- COMPILER1
- COMPILER2
- DONT_USE_PRECOMPILED_HEADER
- DTRACE_ENABLED
- HOTSPOT_LIB_ARCH="amd64"
- SOLARIS
- SPARC_WORKS
- TARGET_ARCH_MODEL_x86_64
- TARGET_ARCH_x86
- TARGET_COMPILER_solstudio
- TARGET_OS_ARCH_MODEL_solaris_x86_64
- TARGET_OS_ARCH_solaris_x86
- TARGET_OS_FAMILY_solaris
- VM_LITTLE_ENDIAN
- _Crun_inline_placement
- _NMT_NOINLINE_
-
-
-
-
-
-
- THIS_FILE="bytecodeInterpreterWithChecks.cpp"
-
-
-
-
-
-
- ../../build/hotspot/variant-server/support/dtrace
-
-
-
-
-
-
- ../../hotspot/src/share/vm
- ../../hotspot/src/os/solaris/vm
- ../../hotspot/src/os/posix/vm
- ../../hotspot/src/cpu/x86/vm
- ../../hotspot/src/os_cpu/solaris_x86/vm
- ../../build/hotspot/variant-server/gensrc
- ../../hotspot/src/share/vm/precompiled
- ../../hotspot/src/share/vm/prims
- ../../test/fmw/gtest
- ../../test/fmw/gtest/include
- ../../hotspot/test/native
- ../../hotspot/make
-
-
- AMD64
- ASSERT
- COMPILER1
- COMPILER2
- DONT_USE_PRECOMPILED_HEADER
- DTRACE_ENABLED
- GTEST_HAS_EXCEPTIONS=0
- HOTSPOT_LIB_ARCH="amd64"
- SOLARIS
- SPARC_WORKS
- TARGET_ARCH_MODEL_x86_64
- TARGET_ARCH_x86
- TARGET_COMPILER_solstudio
- TARGET_OS_ARCH_MODEL_solaris_x86_64
- TARGET_OS_ARCH_solaris_x86
- TARGET_OS_FAMILY_solaris
- THIS_FILE="gtest-all.cc"
- VM_LITTLE_ENDIAN
- _Crun_inline_placement
- _NMT_NOINLINE_
-
-
-
-
- default
- false
- false
-
-
-
../../../output
@@ -15943,24911 +69,6 @@
true
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
-
-
-
- ../../src/hotspot/cpu/x86
- ../../src/hotspot/os/windows
- ../../src/hotspot/os_cpu/windows_x86
- ../../src/hotspot/share
- ../../../output/hotspot/variant-server/gensrc/adfiles
-
-
-
-
- ../../src/hotspot/cpu/x86
- ../../src/hotspot/os/windows
- ../../src/hotspot/os_cpu/windows_x86
- ../../src/hotspot/share
- ../../../output/hotspot/variant-server/gensrc/adfiles
-
-
-
diff --git a/make/scripts/pandoc-html-manpage-filter.js b/make/scripts/pandoc-html-manpage-filter.js
index be63535d910..a7c671a078c 100644
--- a/make/scripts/pandoc-html-manpage-filter.js
+++ b/make/scripts/pandoc-html-manpage-filter.js
@@ -86,7 +86,7 @@ function MetaInlines(value) {
function change_title(type, value) {
if (type === 'MetaInlines') {
if (value[0].t === 'Str') {
- var match = value[0].c.match(/^([A-Z]+)\([0-9]+\)$/);
+ var match = value[0].c.match(/^([A-Z0-9]+)\([0-9]+\)$/);
if (match) {
return MetaInlines([
Str("The"), Space(),
diff --git a/src/hotspot/cpu/aarch64/aarch64.ad b/src/hotspot/cpu/aarch64/aarch64.ad
index cdef707d874..babb86c90dc 100644
--- a/src/hotspot/cpu/aarch64/aarch64.ad
+++ b/src/hotspot/cpu/aarch64/aarch64.ad
@@ -1,6 +1,6 @@
//
-// Copyright (c) 2003, 2018, Oracle and/or its affiliates. All rights reserved.
-// Copyright (c) 2014, 2018, Red Hat, Inc. All rights reserved.
+// Copyright (c) 2003, 2019, Oracle and/or its affiliates. All rights reserved.
+// Copyright (c) 2014, 2019, Red Hat, Inc. All rights reserved.
// DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
//
// This code is free software; you can redistribute it and/or modify it
@@ -3417,51 +3417,21 @@ encode %{
__ biased_locking_enter(box, oop, disp_hdr, tmp, true, cont);
}
- // Handle existing monitor
- // we can use AArch64's bit test and branch here but
- // markoopDesc does not define a bit index just the bit value
- // so assert in case the bit pos changes
-# define __monitor_value_log2 1
- assert(markOopDesc::monitor_value == (1 << __monitor_value_log2), "incorrect bit position");
- __ tbnz(disp_hdr, __monitor_value_log2, object_has_monitor);
-# undef __monitor_value_log2
+ // Check for existing monitor
+ __ tbnz(disp_hdr, exact_log2(markOopDesc::monitor_value), object_has_monitor);
- // Set displaced_header to be (markOop of object | UNLOCK_VALUE).
- __ orr(disp_hdr, disp_hdr, markOopDesc::unlocked_value);
-
- // Load Compare Value application register.
+ // Set tmp to be (markOop of object | UNLOCK_VALUE).
+ __ orr(tmp, disp_hdr, markOopDesc::unlocked_value);
// Initialize the box. (Must happen before we update the object mark!)
- __ str(disp_hdr, Address(box, BasicLock::displaced_header_offset_in_bytes()));
+ __ str(tmp, Address(box, BasicLock::displaced_header_offset_in_bytes()));
- // Compare object markOop with mark and if equal exchange scratch1
- // with object markOop.
- if (UseLSE) {
- __ mov(tmp, disp_hdr);
- __ casal(Assembler::xword, tmp, box, oop);
- __ cmp(tmp, disp_hdr);
- __ br(Assembler::EQ, cont);
- } else {
- Label retry_load;
- if ((VM_Version::features() & VM_Version::CPU_STXR_PREFETCH))
- __ prfm(Address(oop), PSTL1STRM);
- __ bind(retry_load);
- __ ldaxr(tmp, oop);
- __ cmp(tmp, disp_hdr);
- __ br(Assembler::NE, cas_failed);
- // use stlxr to ensure update is immediately visible
- __ stlxr(tmp, box, oop);
- __ cbzw(tmp, cont);
- __ b(retry_load);
- }
-
- // Formerly:
- // __ cmpxchgptr(/*oldv=*/disp_hdr,
- // /*newv=*/box,
- // /*addr=*/oop,
- // /*tmp=*/tmp,
- // cont,
- // /*fail*/NULL);
+ // Compare object markOop with an unlocked value (tmp) and if
+ // equal exchange the stack address of our box with object markOop.
+ // On failure disp_hdr contains the possibly locked markOop.
+ __ cmpxchg(oop, tmp, box, Assembler::xword, /*acquire*/ true,
+ /*release*/ true, /*weak*/ false, disp_hdr);
+ __ br(Assembler::EQ, cont);
assert(oopDesc::mark_offset_in_bytes() == 0, "offset of _mark is not 0");
@@ -3478,75 +3448,34 @@ encode %{
__ mov(tmp, (address) (~(os::vm_page_size()-1) | markOopDesc::lock_mask_in_place));
// If condition is true we are cont and hence we can store 0 as the
// displaced header in the box, which indicates that it is a recursive lock.
- __ ands(tmp/*==0?*/, disp_hdr, tmp);
+ __ ands(tmp/*==0?*/, disp_hdr, tmp); // Sets flags for result
__ str(tmp/*==0, perhaps*/, Address(box, BasicLock::displaced_header_offset_in_bytes()));
- // Handle existing monitor.
__ b(cont);
+ // Handle existing monitor.
__ bind(object_has_monitor);
+
// The object's monitor m is unlocked iff m->owner == NULL,
// otherwise m->owner may contain a thread or a stack address.
//
// Try to CAS m->owner from NULL to current thread.
__ add(tmp, disp_hdr, (ObjectMonitor::owner_offset_in_bytes()-markOopDesc::monitor_value));
- __ mov(disp_hdr, zr);
+ __ cmpxchg(tmp, zr, rthread, Assembler::xword, /*acquire*/ true,
+ /*release*/ true, /*weak*/ false, noreg); // Sets flags for result
- if (UseLSE) {
- __ mov(rscratch1, disp_hdr);
- __ casal(Assembler::xword, rscratch1, rthread, tmp);
- __ cmp(rscratch1, disp_hdr);
- } else {
- Label retry_load, fail;
- if ((VM_Version::features() & VM_Version::CPU_STXR_PREFETCH)) {
- __ prfm(Address(tmp), PSTL1STRM);
- }
- __ bind(retry_load);
- __ ldaxr(rscratch1, tmp);
- __ cmp(disp_hdr, rscratch1);
- __ br(Assembler::NE, fail);
- // use stlxr to ensure update is immediately visible
- __ stlxr(rscratch1, rthread, tmp);
- __ cbnzw(rscratch1, retry_load);
- __ bind(fail);
- }
-
- // Label next;
- // __ cmpxchgptr(/*oldv=*/disp_hdr,
- // /*newv=*/rthread,
- // /*addr=*/tmp,
- // /*tmp=*/rscratch1,
- // /*succeed*/next,
- // /*fail*/NULL);
- // __ bind(next);
-
- // store a non-null value into the box.
- __ str(box, Address(box, BasicLock::displaced_header_offset_in_bytes()));
-
- // PPC port checks the following invariants
- // #ifdef ASSERT
- // bne(flag, cont);
- // We have acquired the monitor, check some invariants.
- // addw(/*monitor=*/tmp, tmp, -ObjectMonitor::owner_offset_in_bytes());
- // Invariant 1: _recursions should be 0.
- // assert(ObjectMonitor::recursions_size_in_bytes() == 8, "unexpected size");
- // assert_mem8_is_zero(ObjectMonitor::recursions_offset_in_bytes(), tmp,
- // "monitor->_recursions should be 0", -1);
- // Invariant 2: OwnerIsThread shouldn't be 0.
- // assert(ObjectMonitor::OwnerIsThread_size_in_bytes() == 4, "unexpected size");
- //assert_mem4_isnot_zero(ObjectMonitor::OwnerIsThread_offset_in_bytes(), tmp,
- // "monitor->OwnerIsThread shouldn't be 0", -1);
- // #endif
+ // Store a non-null value into the box to avoid looking like a re-entrant
+ // lock. The fast-path monitor unlock code checks for
+ // markOopDesc::monitor_value so use markOopDesc::unused_mark which has the
+ // relevant bit set, and also matches ObjectSynchronizer::slow_enter.
+ __ mov(tmp, (address)markOopDesc::unused_mark());
+ __ str(tmp, Address(box, BasicLock::displaced_header_offset_in_bytes()));
__ bind(cont);
// flag == EQ indicates success
// flag == NE indicates failure
-
%}
- // TODO
- // reimplement this with custom cmpxchgptr code
- // which avoids some of the unnecessary branching
enc_class aarch64_enc_fast_unlock(iRegP object, iRegP box, iRegP tmp, iRegP tmp2) %{
MacroAssembler _masm(&cbuf);
Register oop = as_Register($object$$reg);
@@ -3555,7 +3484,6 @@ encode %{
Register tmp = as_Register($tmp2$$reg);
Label cont;
Label object_has_monitor;
- Label cas_failed;
assert_different_registers(oop, box, tmp, disp_hdr);
@@ -3570,7 +3498,6 @@ encode %{
__ cmp(disp_hdr, zr);
__ br(Assembler::EQ, cont);
-
// Handle existing monitor.
__ ldr(tmp, Address(oop, oopDesc::mark_offset_in_bytes()));
__ tbnz(disp_hdr, exact_log2(markOopDesc::monitor_value), object_has_monitor);
@@ -3579,54 +3506,30 @@ encode %{
// see the stack address of the basicLock in the markOop of the
// object.
- if (UseLSE) {
- __ mov(tmp, box);
- __ casl(Assembler::xword, tmp, disp_hdr, oop);
- __ cmp(tmp, box);
- } else {
- Label retry_load;
- if ((VM_Version::features() & VM_Version::CPU_STXR_PREFETCH))
- __ prfm(Address(oop), PSTL1STRM);
- __ bind(retry_load);
- __ ldxr(tmp, oop);
- __ cmp(box, tmp);
- __ br(Assembler::NE, cas_failed);
- // use stlxr to ensure update is immediately visible
- __ stlxr(tmp, disp_hdr, oop);
- __ cbzw(tmp, cont);
- __ b(retry_load);
- }
-
- // __ cmpxchgptr(/*compare_value=*/box,
- // /*exchange_value=*/disp_hdr,
- // /*where=*/oop,
- // /*result=*/tmp,
- // cont,
- // /*cas_failed*/NULL);
- assert(oopDesc::mark_offset_in_bytes() == 0, "offset of _mark is not 0");
-
- __ bind(cas_failed);
-
- // Handle existing monitor.
+ __ cmpxchg(oop, box, disp_hdr, Assembler::xword, /*acquire*/ false,
+ /*release*/ true, /*weak*/ false, tmp);
__ b(cont);
+ assert(oopDesc::mark_offset_in_bytes() == 0, "offset of _mark is not 0");
+
+ // Handle existing monitor.
__ bind(object_has_monitor);
__ add(tmp, tmp, -markOopDesc::monitor_value); // monitor
__ ldr(rscratch1, Address(tmp, ObjectMonitor::owner_offset_in_bytes()));
__ ldr(disp_hdr, Address(tmp, ObjectMonitor::recursions_offset_in_bytes()));
__ eor(rscratch1, rscratch1, rthread); // Will be 0 if we are the owner.
__ orr(rscratch1, rscratch1, disp_hdr); // Will be 0 if there are 0 recursions
- __ cmp(rscratch1, zr);
+ __ cmp(rscratch1, zr); // Sets flags for result
__ br(Assembler::NE, cont);
__ ldr(rscratch1, Address(tmp, ObjectMonitor::EntryList_offset_in_bytes()));
__ ldr(disp_hdr, Address(tmp, ObjectMonitor::cxq_offset_in_bytes()));
__ orr(rscratch1, rscratch1, disp_hdr); // Will be 0 if both are 0.
- __ cmp(rscratch1, zr);
+ __ cmp(rscratch1, zr); // Sets flags for result
__ cbnz(rscratch1, cont);
// need a release store here
__ lea(tmp, Address(tmp, ObjectMonitor::owner_offset_in_bytes()));
- __ stlr(rscratch1, tmp); // rscratch1 is zero
+ __ stlr(zr, tmp); // set unowned
__ bind(cont);
// flag == EQ indicates success
diff --git a/src/hotspot/cpu/aarch64/assembler_aarch64.hpp b/src/hotspot/cpu/aarch64/assembler_aarch64.hpp
index 1dbdf2bf79e..27aba9c35e0 100644
--- a/src/hotspot/cpu/aarch64/assembler_aarch64.hpp
+++ b/src/hotspot/cpu/aarch64/assembler_aarch64.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2019, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2014, 2015, Red Hat Inc. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
@@ -23,8 +23,8 @@
*
*/
-#ifndef CPU_AARCH64_VM_ASSEMBLER_AARCH64_HPP
-#define CPU_AARCH64_VM_ASSEMBLER_AARCH64_HPP
+#ifndef CPU_AARCH64_ASSEMBLER_AARCH64_HPP
+#define CPU_AARCH64_ASSEMBLER_AARCH64_HPP
#include "asm/register.hpp"
@@ -1118,7 +1118,7 @@ public:
Register Rn, enum operand_size sz, int op, bool ordered) {
starti;
f(sz, 31, 30), f(0b001000, 29, 24), f(op, 23, 21);
- rf(Rs, 16), f(ordered, 15), rf(Rt2, 10), srf(Rn, 5), rf(Rt1, 0);
+ rf(Rs, 16), f(ordered, 15), rf(Rt2, 10), srf(Rn, 5), zrf(Rt1, 0);
}
void load_exclusive(Register dst, Register addr,
@@ -2754,4 +2754,4 @@ class BiasedLockingCounters;
extern "C" void das(uint64_t start, int len);
-#endif // CPU_AARCH64_VM_ASSEMBLER_AARCH64_HPP
+#endif // CPU_AARCH64_ASSEMBLER_AARCH64_HPP
diff --git a/src/hotspot/cpu/aarch64/assembler_aarch64.inline.hpp b/src/hotspot/cpu/aarch64/assembler_aarch64.inline.hpp
index 86eb8c2f8ed..8b90131837f 100644
--- a/src/hotspot/cpu/aarch64/assembler_aarch64.inline.hpp
+++ b/src/hotspot/cpu/aarch64/assembler_aarch64.inline.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2019, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2014, Red Hat Inc. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
@@ -23,11 +23,11 @@
*
*/
-#ifndef CPU_AARCH64_VM_ASSEMBLER_AARCH64_INLINE_HPP
-#define CPU_AARCH64_VM_ASSEMBLER_AARCH64_INLINE_HPP
+#ifndef CPU_AARCH64_ASSEMBLER_AARCH64_INLINE_HPP
+#define CPU_AARCH64_ASSEMBLER_AARCH64_INLINE_HPP
#include "asm/assembler.inline.hpp"
#include "asm/codeBuffer.hpp"
#include "code/codeCache.hpp"
-#endif // CPU_AARCH64_VM_ASSEMBLER_AARCH64_INLINE_HPP
+#endif // CPU_AARCH64_ASSEMBLER_AARCH64_INLINE_HPP
diff --git a/src/hotspot/cpu/aarch64/bytecodes_aarch64.hpp b/src/hotspot/cpu/aarch64/bytecodes_aarch64.hpp
index f63a52ac588..1daf71388e3 100644
--- a/src/hotspot/cpu/aarch64/bytecodes_aarch64.hpp
+++ b/src/hotspot/cpu/aarch64/bytecodes_aarch64.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2019, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2014, Red Hat Inc. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
@@ -23,9 +23,9 @@
*
*/
-#ifndef CPU_AARCH64_VM_BYTECODES_AARCH64_HPP
-#define CPU_AARCH64_VM_BYTECODES_AARCH64_HPP
+#ifndef CPU_AARCH64_BYTECODES_AARCH64_HPP
+#define CPU_AARCH64_BYTECODES_AARCH64_HPP
// No aarch64 specific bytecodes
-#endif // CPU_AARCH64_VM_BYTECODES_AARCH64_HPP
+#endif // CPU_AARCH64_BYTECODES_AARCH64_HPP
diff --git a/src/hotspot/cpu/aarch64/bytes_aarch64.hpp b/src/hotspot/cpu/aarch64/bytes_aarch64.hpp
index 701d3af7fc0..596408643d2 100644
--- a/src/hotspot/cpu/aarch64/bytes_aarch64.hpp
+++ b/src/hotspot/cpu/aarch64/bytes_aarch64.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2019, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2014, Red Hat Inc. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
@@ -23,8 +23,8 @@
*
*/
-#ifndef CPU_AARCH64_VM_BYTES_AARCH64_HPP
-#define CPU_AARCH64_VM_BYTES_AARCH64_HPP
+#ifndef CPU_AARCH64_BYTES_AARCH64_HPP
+#define CPU_AARCH64_BYTES_AARCH64_HPP
#include "memory/allocation.hpp"
@@ -63,4 +63,4 @@ class Bytes: AllStatic {
// The following header contains the implementations of swap_u2, swap_u4, and swap_u8[_base]
#include OS_CPU_HEADER_INLINE(bytes)
-#endif // CPU_AARCH64_VM_BYTES_AARCH64_HPP
+#endif // CPU_AARCH64_BYTES_AARCH64_HPP
diff --git a/src/hotspot/cpu/aarch64/c1_Defs_aarch64.hpp b/src/hotspot/cpu/aarch64/c1_Defs_aarch64.hpp
index 7d4b50f0c8d..2bd4346452c 100644
--- a/src/hotspot/cpu/aarch64/c1_Defs_aarch64.hpp
+++ b/src/hotspot/cpu/aarch64/c1_Defs_aarch64.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2000, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2019, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2014, Red Hat Inc. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
@@ -23,8 +23,8 @@
*
*/
-#ifndef CPU_AARCH64_VM_C1_DEFS_AARCH64_HPP
-#define CPU_AARCH64_VM_C1_DEFS_AARCH64_HPP
+#ifndef CPU_AARCH64_C1_DEFS_AARCH64_HPP
+#define CPU_AARCH64_C1_DEFS_AARCH64_HPP
// native word offsets from memory address (little endian)
enum {
@@ -78,4 +78,4 @@ enum {
pd_float_saved_as_double = false
};
-#endif // CPU_AARCH64_VM_C1_DEFS_AARCH64_HPP
+#endif // CPU_AARCH64_C1_DEFS_AARCH64_HPP
diff --git a/src/hotspot/cpu/aarch64/c1_FpuStackSim_aarch64.hpp b/src/hotspot/cpu/aarch64/c1_FpuStackSim_aarch64.hpp
index d9bc47c7d1d..e1cfcf3de6c 100644
--- a/src/hotspot/cpu/aarch64/c1_FpuStackSim_aarch64.hpp
+++ b/src/hotspot/cpu/aarch64/c1_FpuStackSim_aarch64.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2005, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2019, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2014, Red Hat Inc. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
@@ -23,10 +23,10 @@
*
*/
-#ifndef CPU_AARCH64_VM_C1_FPUSTACKSIM_HPP
-#define CPU_AARCH64_VM_C1_FPUSTACKSIM_HPP
+#ifndef CPU_AARCH64_C1_FPUSTACKSIM_AARCH64_HPP
+#define CPU_AARCH64_C1_FPUSTACKSIM_AARCH64_HPP
// No FPU stack on AARCH64
class FpuStackSim;
-#endif // CPU_AARCH64_VM_C1_FPUSTACKSIM_HPP
+#endif // CPU_AARCH64_C1_FPUSTACKSIM_AARCH64_HPP
diff --git a/src/hotspot/cpu/aarch64/c1_FrameMap_aarch64.hpp b/src/hotspot/cpu/aarch64/c1_FrameMap_aarch64.hpp
index abafe3b41cf..3ec3ce1f679 100644
--- a/src/hotspot/cpu/aarch64/c1_FrameMap_aarch64.hpp
+++ b/src/hotspot/cpu/aarch64/c1_FrameMap_aarch64.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1999, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1999, 2019, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2014, Red Hat Inc. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
@@ -23,8 +23,8 @@
*
*/
-#ifndef CPU_AARCH64_VM_C1_FRAMEMAP_AARCH64_HPP
-#define CPU_AARCH64_VM_C1_FRAMEMAP_AARCH64_HPP
+#ifndef CPU_AARCH64_C1_FRAMEMAP_AARCH64_HPP
+#define CPU_AARCH64_C1_FRAMEMAP_AARCH64_HPP
// On AArch64 the frame looks as follows:
//
@@ -144,5 +144,4 @@
static int last_cpu_reg() { return pd_last_cpu_reg; }
static int last_byte_reg() { return pd_last_byte_reg; }
-#endif // CPU_AARCH64_VM_C1_FRAMEMAP_AARCH64_HPP
-
+#endif // CPU_AARCH64_C1_FRAMEMAP_AARCH64_HPP
diff --git a/src/hotspot/cpu/aarch64/c1_LIRAssembler_aarch64.hpp b/src/hotspot/cpu/aarch64/c1_LIRAssembler_aarch64.hpp
index 3ca37f48c55..3f577251b76 100644
--- a/src/hotspot/cpu/aarch64/c1_LIRAssembler_aarch64.hpp
+++ b/src/hotspot/cpu/aarch64/c1_LIRAssembler_aarch64.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2000, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2019, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2014, Red Hat Inc. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
@@ -23,8 +23,8 @@
*
*/
-#ifndef CPU_AARCH64_VM_C1_LIRASSEMBLER_AARCH64_HPP
-#define CPU_AARCH64_VM_C1_LIRASSEMBLER_AARCH64_HPP
+#ifndef CPU_AARCH64_C1_LIRASSEMBLER_AARCH64_HPP
+#define CPU_AARCH64_C1_LIRASSEMBLER_AARCH64_HPP
// ArrayCopyStub needs access to bailout
friend class ArrayCopyStub;
@@ -81,4 +81,4 @@ public:
void store_parameter(jint c, int offset_from_esp_in_words);
void store_parameter(jobject c, int offset_from_esp_in_words);
-#endif // CPU_AARCH64_VM_C1_LIRASSEMBLER_AARCH64_HPP
+#endif // CPU_AARCH64_C1_LIRASSEMBLER_AARCH64_HPP
diff --git a/src/hotspot/cpu/aarch64/c1_LinearScan_aarch64.hpp b/src/hotspot/cpu/aarch64/c1_LinearScan_aarch64.hpp
index 65a407c07e8..01a4d27532a 100644
--- a/src/hotspot/cpu/aarch64/c1_LinearScan_aarch64.hpp
+++ b/src/hotspot/cpu/aarch64/c1_LinearScan_aarch64.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2005, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2019, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2014, Red Hat Inc. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
@@ -23,8 +23,8 @@
*
*/
-#ifndef CPU_AARCH64_VM_C1_LINEARSCAN_HPP
-#define CPU_AARCH64_VM_C1_LINEARSCAN_HPP
+#ifndef CPU_AARCH64_C1_LINEARSCAN_AARCH64_HPP
+#define CPU_AARCH64_C1_LINEARSCAN_AARCH64_HPP
inline bool LinearScan::is_processed_reg_num(int reg_num) {
return reg_num <= FrameMap::last_cpu_reg() || reg_num >= pd_nof_cpu_regs_frame_map;
@@ -73,4 +73,4 @@ inline bool LinearScanWalker::pd_init_regs_for_alloc(Interval* cur) {
}
-#endif // CPU_AARCH64_VM_C1_LINEARSCAN_HPP
+#endif // CPU_AARCH64_C1_LINEARSCAN_AARCH64_HPP
diff --git a/src/hotspot/cpu/aarch64/c1_MacroAssembler_aarch64.hpp b/src/hotspot/cpu/aarch64/c1_MacroAssembler_aarch64.hpp
index 932a11bc194..67330bcda1b 100644
--- a/src/hotspot/cpu/aarch64/c1_MacroAssembler_aarch64.hpp
+++ b/src/hotspot/cpu/aarch64/c1_MacroAssembler_aarch64.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1999, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1999, 2019, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2014, 2015, Red Hat Inc. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
@@ -23,8 +23,8 @@
*
*/
-#ifndef CPU_AARCH64_VM_C1_MACROASSEMBLER_AARCH64_HPP
-#define CPU_AARCH64_VM_C1_MACROASSEMBLER_AARCH64_HPP
+#ifndef CPU_AARCH64_C1_MACROASSEMBLER_AARCH64_HPP
+#define CPU_AARCH64_C1_MACROASSEMBLER_AARCH64_HPP
using MacroAssembler::build_frame;
using MacroAssembler::null_check;
@@ -111,4 +111,4 @@ using MacroAssembler::null_check;
void load_parameter(int offset_in_words, Register reg);
-#endif // CPU_AARCH64_VM_C1_MACROASSEMBLER_AARCH64_HPP
+#endif // CPU_AARCH64_C1_MACROASSEMBLER_AARCH64_HPP
diff --git a/src/hotspot/cpu/aarch64/c1_globals_aarch64.hpp b/src/hotspot/cpu/aarch64/c1_globals_aarch64.hpp
index 3177a8980b9..420486e660b 100644
--- a/src/hotspot/cpu/aarch64/c1_globals_aarch64.hpp
+++ b/src/hotspot/cpu/aarch64/c1_globals_aarch64.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2000, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2019, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2014, Red Hat Inc. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
@@ -23,8 +23,8 @@
*
*/
-#ifndef CPU_AARCH64_VM_C1_GLOBALS_AARCH64_HPP
-#define CPU_AARCH64_VM_C1_GLOBALS_AARCH64_HPP
+#ifndef CPU_AARCH64_C1_GLOBALS_AARCH64_HPP
+#define CPU_AARCH64_C1_GLOBALS_AARCH64_HPP
#include "utilities/globalDefinitions.hpp"
#include "utilities/macros.hpp"
@@ -74,4 +74,4 @@ define_pd_global(bool, OptimizeSinglePrecision, true );
define_pd_global(bool, CSEArrayLength, false);
define_pd_global(bool, TwoOperandLIRForm, false );
-#endif // CPU_AARCH64_VM_C1_GLOBALS_AARCH64_HPP
+#endif // CPU_AARCH64_C1_GLOBALS_AARCH64_HPP
diff --git a/src/hotspot/cpu/aarch64/c2_globals_aarch64.hpp b/src/hotspot/cpu/aarch64/c2_globals_aarch64.hpp
index bb242a70da5..dde65ab3168 100644
--- a/src/hotspot/cpu/aarch64/c2_globals_aarch64.hpp
+++ b/src/hotspot/cpu/aarch64/c2_globals_aarch64.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2000, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2019, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2014, Red Hat Inc. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
@@ -23,8 +23,8 @@
*
*/
-#ifndef CPU_AARCH64_VM_C2_GLOBALS_AARCH64_HPP
-#define CPU_AARCH64_VM_C2_GLOBALS_AARCH64_HPP
+#ifndef CPU_AARCH64_C2_GLOBALS_AARCH64_HPP
+#define CPU_AARCH64_C2_GLOBALS_AARCH64_HPP
#include "utilities/globalDefinitions.hpp"
#include "utilities/macros.hpp"
@@ -87,4 +87,4 @@ define_pd_global(bool, NeverActAsServerClassMachine, false);
define_pd_global(bool, TrapBasedRangeChecks, false); // Not needed.
-#endif // CPU_AARCH64_VM_C2_GLOBALS_AARCH64_HPP
+#endif // CPU_AARCH64_C2_GLOBALS_AARCH64_HPP
diff --git a/src/hotspot/cpu/aarch64/codeBuffer_aarch64.hpp b/src/hotspot/cpu/aarch64/codeBuffer_aarch64.hpp
index cf49418f66e..647327f6f08 100644
--- a/src/hotspot/cpu/aarch64/codeBuffer_aarch64.hpp
+++ b/src/hotspot/cpu/aarch64/codeBuffer_aarch64.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2002, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2019, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2014, Red Hat Inc. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
@@ -23,8 +23,8 @@
*
*/
-#ifndef CPU_AARCH64_VM_CODEBUFFER_AARCH64_HPP
-#define CPU_AARCH64_VM_CODEBUFFER_AARCH64_HPP
+#ifndef CPU_AARCH64_CODEBUFFER_AARCH64_HPP
+#define CPU_AARCH64_CODEBUFFER_AARCH64_HPP
private:
void pd_initialize() {}
@@ -32,4 +32,4 @@ private:
public:
void flush_bundle(bool start_new_bundle) {}
-#endif // CPU_AARCH64_VM_CODEBUFFER_AARCH64_HPP
+#endif // CPU_AARCH64_CODEBUFFER_AARCH64_HPP
diff --git a/src/hotspot/cpu/aarch64/copy_aarch64.hpp b/src/hotspot/cpu/aarch64/copy_aarch64.hpp
index 2b7a36a2768..225d6b51886 100644
--- a/src/hotspot/cpu/aarch64/copy_aarch64.hpp
+++ b/src/hotspot/cpu/aarch64/copy_aarch64.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2003, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2019, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2014, Red Hat Inc. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
@@ -23,8 +23,8 @@
*
*/
-#ifndef CPU_AARCH64_VM_COPY_AARCH64_HPP
-#define CPU_AARCH64_VM_COPY_AARCH64_HPP
+#ifndef CPU_AARCH64_COPY_AARCH64_HPP
+#define CPU_AARCH64_COPY_AARCH64_HPP
// Inline functions for memory copy and fill.
@@ -56,4 +56,4 @@ static void pd_zero_to_bytes(void* to, size_t count) {
(void)memset(to, 0, count);
}
-#endif // CPU_AARCH64_VM_COPY_AARCH64_HPP
+#endif // CPU_AARCH64_COPY_AARCH64_HPP
diff --git a/src/hotspot/cpu/aarch64/depChecker_aarch64.hpp b/src/hotspot/cpu/aarch64/depChecker_aarch64.hpp
index ea35c53246a..de84b4ec163 100644
--- a/src/hotspot/cpu/aarch64/depChecker_aarch64.hpp
+++ b/src/hotspot/cpu/aarch64/depChecker_aarch64.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2002, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2019, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2014, Red Hat Inc. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
@@ -23,9 +23,9 @@
*
*/
-#ifndef CPU_AARCH64_VM_DEPCHECKER_AARCH64_HPP
-#define CPU_AARCH64_VM_DEPCHECKER_AARCH64_HPP
+#ifndef CPU_AARCH64_DEPCHECKER_AARCH64_HPP
+#define CPU_AARCH64_DEPCHECKER_AARCH64_HPP
// Nothing to do on aarch64
-#endif // CPU_AARCH64_VM_DEPCHECKER_AARCH64_HPP
+#endif // CPU_AARCH64_DEPCHECKER_AARCH64_HPP
diff --git a/src/hotspot/cpu/aarch64/disassembler_aarch64.hpp b/src/hotspot/cpu/aarch64/disassembler_aarch64.hpp
index 130c12ac3dd..f80a3612f82 100644
--- a/src/hotspot/cpu/aarch64/disassembler_aarch64.hpp
+++ b/src/hotspot/cpu/aarch64/disassembler_aarch64.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2019, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2014, Red Hat Inc. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
@@ -23,8 +23,8 @@
*
*/
-#ifndef CPU_AARCH64_VM_DISASSEMBLER_AARCH64_HPP
-#define CPU_AARCH64_VM_DISASSEMBLER_AARCH64_HPP
+#ifndef CPU_AARCH64_DISASSEMBLER_AARCH64_HPP
+#define CPU_AARCH64_DISASSEMBLER_AARCH64_HPP
static int pd_instruction_alignment() {
return 1;
@@ -34,4 +34,4 @@
return "";
}
-#endif // CPU_AARCH64_VM_DISASSEMBLER_AARCH64_HPP
+#endif // CPU_AARCH64_DISASSEMBLER_AARCH64_HPP
diff --git a/src/hotspot/cpu/aarch64/frame_aarch64.hpp b/src/hotspot/cpu/aarch64/frame_aarch64.hpp
index d8c94e28de0..a5c56932c40 100644
--- a/src/hotspot/cpu/aarch64/frame_aarch64.hpp
+++ b/src/hotspot/cpu/aarch64/frame_aarch64.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2019, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2014, Red Hat Inc. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
@@ -23,8 +23,8 @@
*
*/
-#ifndef CPU_AARCH64_VM_FRAME_AARCH64_HPP
-#define CPU_AARCH64_VM_FRAME_AARCH64_HPP
+#ifndef CPU_AARCH64_FRAME_AARCH64_HPP
+#define CPU_AARCH64_FRAME_AARCH64_HPP
#include "runtime/synchronizer.hpp"
@@ -160,4 +160,4 @@
static jint interpreter_frame_expression_stack_direction() { return -1; }
-#endif // CPU_AARCH64_VM_FRAME_AARCH64_HPP
+#endif // CPU_AARCH64_FRAME_AARCH64_HPP
diff --git a/src/hotspot/cpu/aarch64/frame_aarch64.inline.hpp b/src/hotspot/cpu/aarch64/frame_aarch64.inline.hpp
index 243cba92afd..a133f62bc61 100644
--- a/src/hotspot/cpu/aarch64/frame_aarch64.inline.hpp
+++ b/src/hotspot/cpu/aarch64/frame_aarch64.inline.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2019, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2014, Red Hat Inc. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
@@ -23,8 +23,8 @@
*
*/
-#ifndef CPU_AARCH64_VM_FRAME_AARCH64_INLINE_HPP
-#define CPU_AARCH64_VM_FRAME_AARCH64_INLINE_HPP
+#ifndef CPU_AARCH64_FRAME_AARCH64_INLINE_HPP
+#define CPU_AARCH64_FRAME_AARCH64_INLINE_HPP
#include "code/codeCache.hpp"
#include "code/vmreg.inline.hpp"
@@ -250,4 +250,4 @@ inline void frame::set_saved_oop_result(RegisterMap* map, oop obj) {
*result_adr = obj;
}
-#endif // CPU_AARCH64_VM_FRAME_AARCH64_INLINE_HPP
+#endif // CPU_AARCH64_FRAME_AARCH64_INLINE_HPP
diff --git a/src/hotspot/cpu/aarch64/gc/shared/cardTableBarrierSetAssembler_aarch64.hpp b/src/hotspot/cpu/aarch64/gc/shared/cardTableBarrierSetAssembler_aarch64.hpp
index d613c6d67cf..f58904430ca 100644
--- a/src/hotspot/cpu/aarch64/gc/shared/cardTableBarrierSetAssembler_aarch64.hpp
+++ b/src/hotspot/cpu/aarch64/gc/shared/cardTableBarrierSetAssembler_aarch64.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -39,4 +39,4 @@ protected:
};
-#endif // #ifndef CPU_AARCH64_GC_SHARED_CARDTABLEBARRIERSETASSEMBLER_AARCH64_HPP
+#endif // CPU_AARCH64_GC_SHARED_CARDTABLEBARRIERSETASSEMBLER_AARCH64_HPP
diff --git a/src/hotspot/cpu/aarch64/gc/shenandoah/shenandoahBarrierSetAssembler_aarch64.cpp b/src/hotspot/cpu/aarch64/gc/shenandoah/shenandoahBarrierSetAssembler_aarch64.cpp
index db13a870dda..69b4a700c30 100644
--- a/src/hotspot/cpu/aarch64/gc/shenandoah/shenandoahBarrierSetAssembler_aarch64.cpp
+++ b/src/hotspot/cpu/aarch64/gc/shenandoah/shenandoahBarrierSetAssembler_aarch64.cpp
@@ -423,45 +423,14 @@ void ShenandoahBarrierSetAssembler::resolve(MacroAssembler* masm, DecoratorSet d
}
void ShenandoahBarrierSetAssembler::cmpxchg_oop(MacroAssembler* masm, Register addr, Register expected, Register new_val,
- bool acquire, bool release, bool weak, bool encode,
- Register tmp1, Register tmp2, Register tmp3,
+ bool acquire, bool release, bool weak, bool is_cae,
Register result) {
- if (!ShenandoahCASBarrier) {
- if (UseCompressedOops) {
- if (encode) {
- __ encode_heap_oop(tmp1, expected);
- expected = tmp1;
- __ encode_heap_oop(tmp3, new_val);
- new_val = tmp3;
- }
- __ cmpxchg(addr, expected, new_val, Assembler::word, /* acquire*/ true, /* release*/ true, /* weak*/ false, rscratch1);
- __ membar(__ AnyAny);
- } else {
- __ cmpxchg(addr, expected, new_val, Assembler::xword, /* acquire*/ true, /* release*/ true, /* weak*/ false, rscratch1);
- __ membar(__ AnyAny);
- }
- return;
- }
-
- if (encode) {
- storeval_barrier(masm, new_val, tmp3);
- }
-
- if (UseCompressedOops) {
- if (encode) {
- __ encode_heap_oop(tmp1, expected);
- expected = tmp1;
- __ encode_heap_oop(tmp2, new_val);
- new_val = tmp2;
- }
- }
- bool is_cae = (result != noreg);
+ Register tmp = rscratch2;
bool is_narrow = UseCompressedOops;
Assembler::operand_size size = is_narrow ? Assembler::word : Assembler::xword;
- if (! is_cae) result = rscratch1;
- assert_different_registers(addr, expected, new_val, result, tmp3);
+ assert_different_registers(addr, expected, new_val, result, tmp);
Label retry, done, fail;
@@ -474,35 +443,38 @@ void ShenandoahBarrierSetAssembler::cmpxchg_oop(MacroAssembler* masm, Register a
__ cmp(result, expected);
}
__ br(Assembler::NE, fail);
- __ store_exclusive(tmp3, new_val, addr, size, release);
+ __ store_exclusive(tmp, new_val, addr, size, release);
if (weak) {
- __ cmpw(tmp3, 0u); // If the store fails, return NE to our caller
+ __ cmpw(tmp, 0u); // If the store fails, return NE to our caller
} else {
- __ cbnzw(tmp3, retry);
+ __ cbnzw(tmp, retry);
}
__ b(done);
__ bind(fail);
// Check if rb(expected)==rb(result)
// Shuffle registers so that we have memory value ready for next expected.
- __ mov(tmp3, expected);
+ __ mov(tmp, expected);
__ mov(expected, result);
if (is_narrow) {
__ decode_heap_oop(result, result);
- __ decode_heap_oop(tmp3, tmp3);
+ __ decode_heap_oop(tmp, tmp);
}
read_barrier_impl(masm, result);
- read_barrier_impl(masm, tmp3);
- __ cmp(result, tmp3);
+ read_barrier_impl(masm, tmp);
+ __ cmp(result, tmp);
// Retry with expected now being the value we just loaded from addr.
__ br(Assembler::EQ, retry);
- if (is_narrow && is_cae) {
+ if (is_cae && is_narrow) {
// For cmp-and-exchange and narrow oops, we need to restore
// the compressed old-value. We moved it to 'expected' a few lines up.
__ mov(result, expected);
}
__ bind(done);
+ if (!is_cae) {
+ __ cset(result, Assembler::EQ);
+ }
}
#ifdef COMPILER1
diff --git a/src/hotspot/cpu/aarch64/gc/shenandoah/shenandoahBarrierSetAssembler_aarch64.hpp b/src/hotspot/cpu/aarch64/gc/shenandoah/shenandoahBarrierSetAssembler_aarch64.hpp
index b3f89abf563..68cf6dce06b 100644
--- a/src/hotspot/cpu/aarch64/gc/shenandoah/shenandoahBarrierSetAssembler_aarch64.hpp
+++ b/src/hotspot/cpu/aarch64/gc/shenandoah/shenandoahBarrierSetAssembler_aarch64.hpp
@@ -60,7 +60,6 @@ private:
void read_barrier_not_null_impl(MacroAssembler* masm, Register dst);
void write_barrier(MacroAssembler* masm, Register dst);
void write_barrier_impl(MacroAssembler* masm, Register dst);
- void storeval_barrier(MacroAssembler* masm, Register dst, Register tmp);
void asm_acmp_barrier(MacroAssembler* masm, Register op1, Register op2);
address generate_shenandoah_wb(StubCodeGenerator* cgen);
@@ -68,6 +67,8 @@ private:
public:
static address shenandoah_wb();
+ void storeval_barrier(MacroAssembler* masm, Register dst, Register tmp);
+
#ifdef COMPILER1
void gen_pre_barrier_stub(LIR_Assembler* ce, ShenandoahPreBarrierStub* stub);
void gen_write_barrier_stub(LIR_Assembler* ce, ShenandoahWriteBarrierStub* stub);
@@ -92,9 +93,7 @@ public:
Label& slow_case);
void cmpxchg_oop(MacroAssembler* masm, Register addr, Register expected, Register new_val,
- bool acquire, bool release, bool weak, bool encode,
- Register tmp1, Register tmp2, Register tmp3 = rscratch2,
- Register result = noreg);
+ bool acquire, bool release, bool weak, bool is_cae, Register result);
virtual void barrier_stubs_init();
};
diff --git a/src/hotspot/cpu/aarch64/gc/shenandoah/shenandoahBarrierSetC1_aarch64.cpp b/src/hotspot/cpu/aarch64/gc/shenandoah/shenandoahBarrierSetC1_aarch64.cpp
index 13caaaffeac..c78392a1220 100644
--- a/src/hotspot/cpu/aarch64/gc/shenandoah/shenandoahBarrierSetC1_aarch64.cpp
+++ b/src/hotspot/cpu/aarch64/gc/shenandoah/shenandoahBarrierSetC1_aarch64.cpp
@@ -28,15 +28,30 @@
#include "gc/shenandoah/shenandoahBarrierSetAssembler.hpp"
#include "gc/shenandoah/c1/shenandoahBarrierSetC1.hpp"
+#define __ masm->masm()->
+
void LIR_OpShenandoahCompareAndSwap::emit_code(LIR_Assembler* masm) {
Register addr = _addr->as_register_lo();
Register newval = _new_value->as_register();
Register cmpval = _cmp_value->as_register();
Register tmp1 = _tmp1->as_register();
Register tmp2 = _tmp2->as_register();
- ShenandoahBarrierSet::assembler()->cmpxchg_oop(masm->masm(), addr, cmpval, newval, /*acquire*/ false, /*release*/ true, /*weak*/ false, true, tmp1, tmp2);
+ Register result = result_opr()->as_register();
+
+ ShenandoahBarrierSet::assembler()->storeval_barrier(masm->masm(), newval, rscratch2);
+
+ if (UseCompressedOops) {
+ __ encode_heap_oop(tmp1, cmpval);
+ cmpval = tmp1;
+ __ encode_heap_oop(tmp2, newval);
+ newval = tmp2;
+ }
+
+ ShenandoahBarrierSet::assembler()->cmpxchg_oop(masm->masm(), addr, cmpval, newval, /*acquire*/ false, /*release*/ true, /*weak*/ false, /*is_cae*/ false, result);
}
+#undef __
+
#ifdef ASSERT
#define __ gen->lir(__FILE__, __LINE__)->
#else
@@ -58,13 +73,9 @@ LIR_Opr ShenandoahBarrierSetC1::atomic_cmpxchg_at_resolved(LIRAccess& access, LI
LIR_Opr t1 = gen->new_register(T_OBJECT);
LIR_Opr t2 = gen->new_register(T_OBJECT);
LIR_Opr addr = access.resolved_addr()->as_address_ptr()->base();
-
- __ append(new LIR_OpShenandoahCompareAndSwap(addr, cmp_value.result(), new_value.result(), t1, t2,
- LIR_OprFact::illegalOpr));
-
LIR_Opr result = gen->new_register(T_INT);
- __ cmove(lir_cond_equal, LIR_OprFact::intConst(1), LIR_OprFact::intConst(0),
- result, T_INT);
+
+ __ append(new LIR_OpShenandoahCompareAndSwap(addr, cmp_value.result(), new_value.result(), t1, t2, result));
return result;
}
}
diff --git a/src/hotspot/cpu/aarch64/gc/shenandoah/shenandoah_aarch64.ad b/src/hotspot/cpu/aarch64/gc/shenandoah/shenandoah_aarch64.ad
index 45deb26fefe..c65fac0b724 100644
--- a/src/hotspot/cpu/aarch64/gc/shenandoah/shenandoah_aarch64.ad
+++ b/src/hotspot/cpu/aarch64/gc/shenandoah/shenandoah_aarch64.ad
@@ -26,22 +26,22 @@ source_hpp %{
%}
encode %{
- enc_class aarch64_enc_cmpxchg_oop_shenandoah(memory mem, iRegP oldval, iRegP newval, iRegPNoSp tmp) %{
+ enc_class aarch64_enc_cmpxchg_oop_shenandoah(memory mem, iRegP oldval, iRegP newval, iRegPNoSp tmp, iRegINoSp res) %{
MacroAssembler _masm(&cbuf);
guarantee($mem$$index == -1 && $mem$$disp == 0, "impossible encoding");
Register tmp = $tmp$$Register;
__ mov(tmp, $oldval$$Register); // Must not clobber oldval.
ShenandoahBarrierSet::assembler()->cmpxchg_oop(&_masm, $mem$$Register, tmp, $newval$$Register,
- /*acquire*/ false, /*release*/ true, /*weak*/ false, /*encode*/ false, noreg, noreg);
+ /*acquire*/ false, /*release*/ true, /*weak*/ false, /*is_cae*/ false, $res$$Register);
%}
- enc_class aarch64_enc_cmpxchg_acq_oop_shenandoah(memory mem, iRegP oldval, iRegP newval, iRegPNoSp tmp) %{
+ enc_class aarch64_enc_cmpxchg_acq_oop_shenandoah(memory mem, iRegP oldval, iRegP newval, iRegPNoSp tmp, iRegINoSp res) %{
MacroAssembler _masm(&cbuf);
guarantee($mem$$index == -1 && $mem$$disp == 0, "impossible encoding");
Register tmp = $tmp$$Register;
__ mov(tmp, $oldval$$Register); // Must not clobber oldval.
ShenandoahBarrierSet::assembler()->cmpxchg_oop(&_masm, $mem$$Register, tmp, $newval$$Register,
- /*acquire*/ true, /*release*/ true, /*weak*/ false, /*encode*/ false, noreg, noreg);
+ /*acquire*/ true, /*release*/ true, /*weak*/ false, /*is_cae*/ false, $res$$Register);
%}
%}
@@ -66,11 +66,9 @@ instruct compareAndSwapP_shenandoah(iRegINoSp res, indirect mem, iRegP oldval, i
format %{
"cmpxchg_shenandoah $mem, $oldval, $newval\t# (ptr) if $mem == $oldval then $mem <-- $newval with temp $tmp"
- "cset $res, EQ\t# $res <-- (EQ ? 1 : 0)"
%}
- ins_encode(aarch64_enc_cmpxchg_oop_shenandoah(mem, oldval, newval, tmp),
- aarch64_enc_cset_eq(res));
+ ins_encode(aarch64_enc_cmpxchg_oop_shenandoah(mem, oldval, newval, tmp, res));
ins_pipe(pipe_slow);
%}
@@ -84,14 +82,12 @@ instruct compareAndSwapN_shenandoah(iRegINoSp res, indirect mem, iRegN oldval, i
format %{
"cmpxchgw_shenandoah $mem, $oldval, $newval\t# (ptr) if $mem == $oldval then $mem <-- $newval with temp $tmp"
- "cset $res, EQ\t# $res <-- (EQ ? 1 : 0)"
%}
ins_encode %{
Register tmp = $tmp$$Register;
__ mov(tmp, $oldval$$Register); // Must not clobber oldval.
- ShenandoahBarrierSet::assembler()->cmpxchg_oop(&_masm, $mem$$Register, tmp, $newval$$Register, /*acquire*/ false, /*release*/ true, /*weak*/ false, /*encode*/ false, noreg, noreg);
- __ cset($res$$Register, Assembler::EQ);
+ ShenandoahBarrierSet::assembler()->cmpxchg_oop(&_masm, $mem$$Register, tmp, $newval$$Register, /*acquire*/ false, /*release*/ true, /*weak*/ false, /*is_cae*/ false, $res$$Register);
%}
ins_pipe(pipe_slow);
@@ -107,11 +103,9 @@ instruct compareAndSwapPAcq_shenandoah(iRegINoSp res, indirect mem, iRegP oldval
format %{
"cmpxchg_acq_shenandoah_oop $mem, $oldval, $newval\t# (ptr) if $mem == $oldval then $mem <-- $newval with temp $tmp"
- "cset $res, EQ\t# $res <-- (EQ ? 1 : 0)"
%}
- ins_encode(aarch64_enc_cmpxchg_acq_oop_shenandoah(mem, oldval, newval, tmp),
- aarch64_enc_cset_eq(res));
+ ins_encode(aarch64_enc_cmpxchg_acq_oop_shenandoah(mem, oldval, newval, tmp, res));
ins_pipe(pipe_slow);
%}
@@ -126,14 +120,12 @@ instruct compareAndSwapNAcq_shenandoah(iRegINoSp res, indirect mem, iRegN oldval
format %{
"cmpxchgw_acq_shenandoah_narrow_oop $mem, $oldval, $newval\t# (ptr) if $mem == $oldval then $mem <-- $newval with temp $tmp"
- "cset $res, EQ\t# $res <-- (EQ ? 1 : 0)"
%}
ins_encode %{
Register tmp = $tmp$$Register;
__ mov(tmp, $oldval$$Register); // Must not clobber oldval.
- ShenandoahBarrierSet::assembler()->cmpxchg_oop(&_masm, $mem$$Register, tmp, $newval$$Register, /*acquire*/ true, /*release*/ true, /*weak*/ false, /*encode*/ false, noreg, noreg);
- __ cset($res$$Register, Assembler::EQ);
+ ShenandoahBarrierSet::assembler()->cmpxchg_oop(&_masm, $mem$$Register, tmp, $newval$$Register, /*acquire*/ true, /*release*/ true, /*weak*/ false, /*is_cae*/ false, $res$$Register);
%}
ins_pipe(pipe_slow);
@@ -150,7 +142,7 @@ instruct compareAndExchangeN_shenandoah(iRegNNoSp res, indirect mem, iRegN oldva
Register tmp = $tmp$$Register;
__ mov(tmp, $oldval$$Register); // Must not clobber oldval.
ShenandoahBarrierSet::assembler()->cmpxchg_oop(&_masm, $mem$$Register, tmp, $newval$$Register,
- /*acquire*/ false, /*release*/ true, /*weak*/ false, /* encode*/ false, noreg, noreg, rscratch2, $res$$Register);
+ /*acquire*/ false, /*release*/ true, /*weak*/ false, /*is_cae*/ true, $res$$Register);
%}
ins_pipe(pipe_slow);
%}
@@ -166,7 +158,7 @@ instruct compareAndExchangeP_shenandoah(iRegPNoSp res, indirect mem, iRegP oldva
Register tmp = $tmp$$Register;
__ mov(tmp, $oldval$$Register); // Must not clobber oldval.
ShenandoahBarrierSet::assembler()->cmpxchg_oop(&_masm, $mem$$Register, tmp, $newval$$Register,
- /*acquire*/ false, /*release*/ true, /*weak*/ false, /*encode*/ false, noreg, noreg, rscratch2, $res$$Register);
+ /*acquire*/ false, /*release*/ true, /*weak*/ false, /*is_cae*/ true, $res$$Register);
%}
ins_pipe(pipe_slow);
%}
@@ -183,7 +175,7 @@ instruct compareAndExchangeNAcq_shenandoah(iRegNNoSp res, indirect mem, iRegN ol
Register tmp = $tmp$$Register;
__ mov(tmp, $oldval$$Register); // Must not clobber oldval.
ShenandoahBarrierSet::assembler()->cmpxchg_oop(&_masm, $mem$$Register, tmp, $newval$$Register,
- /*acquire*/ true, /*release*/ true, /*weak*/ false, /* encode*/ false, noreg, noreg, rscratch2, $res$$Register);
+ /*acquire*/ true, /*release*/ true, /*weak*/ false, /*is_cae*/ true, $res$$Register);
%}
ins_pipe(pipe_slow);
%}
@@ -200,7 +192,7 @@ instruct compareAndExchangePAcq_shenandoah(iRegPNoSp res, indirect mem, iRegP ol
Register tmp = $tmp$$Register;
__ mov(tmp, $oldval$$Register); // Must not clobber oldval.
ShenandoahBarrierSet::assembler()->cmpxchg_oop(&_masm, $mem$$Register, tmp, $newval$$Register,
- /*acquire*/ true, /*release*/ true, /*weak*/ false, /*encode*/ false, noreg, noreg, rscratch2, $res$$Register);
+ /*acquire*/ true, /*release*/ true, /*weak*/ false, /*is_cae*/ true, $res$$Register);
%}
ins_pipe(pipe_slow);
%}
@@ -217,8 +209,7 @@ instruct weakCompareAndSwapN_shenandoah(iRegINoSp res, indirect mem, iRegN oldva
Register tmp = $tmp$$Register;
__ mov(tmp, $oldval$$Register); // Must not clobber oldval.
ShenandoahBarrierSet::assembler()->cmpxchg_oop(&_masm, $mem$$Register, tmp, $newval$$Register,
- /*acquire*/ false, /*release*/ true, /*weak*/ true, /*encode*/ false, noreg, noreg);
- __ csetw($res$$Register, Assembler::EQ);
+ /*acquire*/ false, /*release*/ true, /*weak*/ true, /*is_cae*/ false, $res$$Register);
%}
ins_pipe(pipe_slow);
%}
@@ -229,14 +220,12 @@ instruct weakCompareAndSwapP_shenandoah(iRegINoSp res, indirect mem, iRegP oldva
effect(TEMP tmp, KILL cr);
format %{
"cmpxchg_shenandoah $res = $mem, $oldval, $newval\t# (ptr, weak) if $mem == $oldval then $mem <-- $newval"
- "csetw $res, EQ\t# $res <-- (EQ ? 1 : 0)"
%}
ins_encode %{
Register tmp = $tmp$$Register;
__ mov(tmp, $oldval$$Register); // Must not clobber oldval.
ShenandoahBarrierSet::assembler()->cmpxchg_oop(&_masm, $mem$$Register, tmp, $newval$$Register,
- /*acquire*/ false, /*release*/ true, /*weak*/ true, /*encode*/ false, noreg, noreg);
- __ csetw($res$$Register, Assembler::EQ);
+ /*acquire*/ false, /*release*/ true, /*weak*/ true, /*is_cae*/ false, $res$$Register);
%}
ins_pipe(pipe_slow);
%}
@@ -254,8 +243,7 @@ instruct weakCompareAndSwapNAcq_shenandoah(iRegINoSp res, indirect mem, iRegN ol
Register tmp = $tmp$$Register;
__ mov(tmp, $oldval$$Register); // Must not clobber oldval.
ShenandoahBarrierSet::assembler()->cmpxchg_oop(&_masm, $mem$$Register, tmp, $newval$$Register,
- /*acquire*/ true, /*release*/ true, /*weak*/ true, /*encode*/ false, noreg, noreg);
- __ csetw($res$$Register, Assembler::EQ);
+ /*acquire*/ true, /*release*/ true, /*weak*/ true, /*is_cae*/ false, $res$$Register);
%}
ins_pipe(pipe_slow);
%}
@@ -273,9 +261,7 @@ instruct weakCompareAndSwapPAcq_shenandoah(iRegINoSp res, indirect mem, iRegP ol
Register tmp = $tmp$$Register;
__ mov(tmp, $oldval$$Register); // Must not clobber oldval.
ShenandoahBarrierSet::assembler()->cmpxchg_oop(&_masm, $mem$$Register, tmp, $newval$$Register,
- /*acquire*/ true, /*release*/ true, /*weak*/ true, /*encode*/ false, noreg, noreg);
- __ csetw($res$$Register, Assembler::EQ);
+ /*acquire*/ true, /*release*/ true, /*weak*/ true, /*is_cae*/ false, $res$$Register);
%}
ins_pipe(pipe_slow);
%}
-
diff --git a/src/hotspot/cpu/aarch64/globalDefinitions_aarch64.hpp b/src/hotspot/cpu/aarch64/globalDefinitions_aarch64.hpp
index 5977764c2d2..1b7e70dc6a2 100644
--- a/src/hotspot/cpu/aarch64/globalDefinitions_aarch64.hpp
+++ b/src/hotspot/cpu/aarch64/globalDefinitions_aarch64.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1999, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1999, 2019, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2014, 2015, Red Hat Inc. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
@@ -23,8 +23,8 @@
*
*/
-#ifndef CPU_AARCH64_VM_GLOBALDEFINITIONS_AARCH64_HPP
-#define CPU_AARCH64_VM_GLOBALDEFINITIONS_AARCH64_HPP
+#ifndef CPU_AARCH64_GLOBALDEFINITIONS_AARCH64_HPP
+#define CPU_AARCH64_GLOBALDEFINITIONS_AARCH64_HPP
const int StackAlignmentInBytes = 16;
@@ -53,4 +53,4 @@ const bool CCallingConventionRequiresIntsAsLongs = false;
#define THREAD_LOCAL_POLL
-#endif // CPU_AARCH64_VM_GLOBALDEFINITIONS_AARCH64_HPP
+#endif // CPU_AARCH64_GLOBALDEFINITIONS_AARCH64_HPP
diff --git a/src/hotspot/cpu/aarch64/globals_aarch64.hpp b/src/hotspot/cpu/aarch64/globals_aarch64.hpp
index dcbab0aff61..c46237f03e9 100644
--- a/src/hotspot/cpu/aarch64/globals_aarch64.hpp
+++ b/src/hotspot/cpu/aarch64/globals_aarch64.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2000, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2019, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2015, Red Hat Inc. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
@@ -23,8 +23,8 @@
*
*/
-#ifndef CPU_AARCH64_VM_GLOBALS_AARCH64_HPP
-#define CPU_AARCH64_VM_GLOBALS_AARCH64_HPP
+#ifndef CPU_AARCH64_GLOBALS_AARCH64_HPP
+#define CPU_AARCH64_GLOBALS_AARCH64_HPP
#include "utilities/globalDefinitions.hpp"
#include "utilities/macros.hpp"
@@ -166,4 +166,4 @@ define_pd_global(intx, InlineSmallCode, 1000);
#endif
-#endif // CPU_AARCH64_VM_GLOBALS_AARCH64_HPP
+#endif // CPU_AARCH64_GLOBALS_AARCH64_HPP
diff --git a/src/hotspot/cpu/aarch64/icache_aarch64.hpp b/src/hotspot/cpu/aarch64/icache_aarch64.hpp
index 30c7a408a8d..869568baeed 100644
--- a/src/hotspot/cpu/aarch64/icache_aarch64.hpp
+++ b/src/hotspot/cpu/aarch64/icache_aarch64.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2019, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2014, Red Hat Inc. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
@@ -23,8 +23,8 @@
*
*/
-#ifndef CPU_AARCH64_VM_ICACHE_AARCH64_HPP
-#define CPU_AARCH64_VM_ICACHE_AARCH64_HPP
+#ifndef CPU_AARCH64_ICACHE_AARCH64_HPP
+#define CPU_AARCH64_ICACHE_AARCH64_HPP
// Interface for updating the instruction cache. Whenever the VM
// modifies code, part of the processor instruction cache potentially
@@ -41,4 +41,4 @@ class ICache : public AbstractICache {
}
};
-#endif // CPU_AARCH64_VM_ICACHE_AARCH64_HPP
+#endif // CPU_AARCH64_ICACHE_AARCH64_HPP
diff --git a/src/hotspot/cpu/aarch64/interp_masm_aarch64.hpp b/src/hotspot/cpu/aarch64/interp_masm_aarch64.hpp
index 1143f6b3c70..72ec4cd1e36 100644
--- a/src/hotspot/cpu/aarch64/interp_masm_aarch64.hpp
+++ b/src/hotspot/cpu/aarch64/interp_masm_aarch64.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2003, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2019, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2014, 2015, Red Hat Inc. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
@@ -23,8 +23,8 @@
*
*/
-#ifndef CPU_AARCH64_VM_INTERP_MASM_AARCH64_64_HPP
-#define CPU_AARCH64_VM_INTERP_MASM_AARCH64_64_HPP
+#ifndef CPU_AARCH64_INTERP_MASM_AARCH64_HPP
+#define CPU_AARCH64_INTERP_MASM_AARCH64_HPP
#include "asm/macroAssembler.hpp"
#include "interpreter/invocationCounter.hpp"
@@ -295,4 +295,4 @@ class InterpreterMacroAssembler: public MacroAssembler {
}
};
-#endif // CPU_AARCH64_VM_INTERP_MASM_AARCH64_64_HPP
+#endif // CPU_AARCH64_INTERP_MASM_AARCH64_HPP
diff --git a/src/hotspot/cpu/aarch64/interpreterRT_aarch64.hpp b/src/hotspot/cpu/aarch64/interpreterRT_aarch64.hpp
index 70dd029e067..fcceac33c15 100644
--- a/src/hotspot/cpu/aarch64/interpreterRT_aarch64.hpp
+++ b/src/hotspot/cpu/aarch64/interpreterRT_aarch64.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2019, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2014, Red Hat Inc. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
@@ -23,8 +23,8 @@
*
*/
-#ifndef CPU_AARCH64_VM_INTERPRETERRT_AARCH64_HPP
-#define CPU_AARCH64_VM_INTERPRETERRT_AARCH64_HPP
+#ifndef CPU_AARCH64_INTERPRETERRT_AARCH64_HPP
+#define CPU_AARCH64_INTERPRETERRT_AARCH64_HPP
// This is included in the middle of class Interpreter.
// Do not include files here.
@@ -58,4 +58,4 @@ class SignatureHandlerGenerator: public NativeSignatureIterator {
static Register temp();
};
-#endif // CPU_AARCH64_VM_INTERPRETERRT_AARCH64_HPP
+#endif // CPU_AARCH64_INTERPRETERRT_AARCH64_HPP
diff --git a/src/hotspot/cpu/aarch64/javaFrameAnchor_aarch64.hpp b/src/hotspot/cpu/aarch64/javaFrameAnchor_aarch64.hpp
index afdab23b9b5..9a2e96a6a6b 100644
--- a/src/hotspot/cpu/aarch64/javaFrameAnchor_aarch64.hpp
+++ b/src/hotspot/cpu/aarch64/javaFrameAnchor_aarch64.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2002, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2019, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2014, Red Hat Inc. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
@@ -23,8 +23,8 @@
*
*/
-#ifndef CPU_AARCH64_VM_JAVAFRAMEANCHOR_AARCH64_HPP
-#define CPU_AARCH64_VM_JAVAFRAMEANCHOR_AARCH64_HPP
+#ifndef CPU_AARCH64_JAVAFRAMEANCHOR_AARCH64_HPP
+#define CPU_AARCH64_JAVAFRAMEANCHOR_AARCH64_HPP
private:
@@ -84,4 +84,4 @@ public:
// Assert (last_Java_sp == NULL || fp == NULL)
void set_last_Java_fp(intptr_t* fp) { OrderAccess::release(); _last_Java_fp = fp; }
-#endif // CPU_AARCH64_VM_JAVAFRAMEANCHOR_AARCH64_HPP
+#endif // CPU_AARCH64_JAVAFRAMEANCHOR_AARCH64_HPP
diff --git a/src/hotspot/cpu/aarch64/jniTypes_aarch64.hpp b/src/hotspot/cpu/aarch64/jniTypes_aarch64.hpp
index bdf4d55bfbc..586d3663876 100644
--- a/src/hotspot/cpu/aarch64/jniTypes_aarch64.hpp
+++ b/src/hotspot/cpu/aarch64/jniTypes_aarch64.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2019, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2014, Red Hat Inc. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
@@ -23,8 +23,8 @@
*
*/
-#ifndef CPU_AARCH64_VM_JNITYPES_AARCH64_HPP
-#define CPU_AARCH64_VM_JNITYPES_AARCH64_HPP
+#ifndef CPU_AARCH64_JNITYPES_AARCH64_HPP
+#define CPU_AARCH64_JNITYPES_AARCH64_HPP
#include "jni.h"
#include "memory/allocation.hpp"
@@ -104,4 +104,4 @@ public:
#undef _JNI_SLOT_OFFSET
};
-#endif // CPU_AARCH64_VM_JNITYPES_AARCH64_HPP
+#endif // CPU_AARCH64_JNITYPES_AARCH64_HPP
diff --git a/src/hotspot/cpu/aarch64/macroAssembler_aarch64.hpp b/src/hotspot/cpu/aarch64/macroAssembler_aarch64.hpp
index 73c0723d80b..7b9f62f554b 100644
--- a/src/hotspot/cpu/aarch64/macroAssembler_aarch64.hpp
+++ b/src/hotspot/cpu/aarch64/macroAssembler_aarch64.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2019, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2014, 2015, Red Hat Inc. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
@@ -23,8 +23,8 @@
*
*/
-#ifndef CPU_AARCH64_VM_MACROASSEMBLER_AARCH64_HPP
-#define CPU_AARCH64_VM_MACROASSEMBLER_AARCH64_HPP
+#ifndef CPU_AARCH64_MACROASSEMBLER_AARCH64_HPP
+#define CPU_AARCH64_MACROASSEMBLER_AARCH64_HPP
#include "asm/assembler.hpp"
@@ -1391,4 +1391,4 @@ struct tableswitch {
Label _branches;
};
-#endif // CPU_AARCH64_VM_MACROASSEMBLER_AARCH64_HPP
+#endif // CPU_AARCH64_MACROASSEMBLER_AARCH64_HPP
diff --git a/src/hotspot/cpu/aarch64/macroAssembler_aarch64.inline.hpp b/src/hotspot/cpu/aarch64/macroAssembler_aarch64.inline.hpp
index 7f011b68db3..33c36cee853 100644
--- a/src/hotspot/cpu/aarch64/macroAssembler_aarch64.inline.hpp
+++ b/src/hotspot/cpu/aarch64/macroAssembler_aarch64.inline.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2019, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2014, Red Hat Inc. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
@@ -23,8 +23,8 @@
*
*/
-#ifndef CPU_AARCH64_VM_MACROASSEMBLER_AARCH64_INLINE_HPP
-#define CPU_AARCH64_VM_MACROASSEMBLER_AARCH64_INLINE_HPP
+#ifndef CPU_AARCH64_MACROASSEMBLER_AARCH64_INLINE_HPP
+#define CPU_AARCH64_MACROASSEMBLER_AARCH64_INLINE_HPP
#include "asm/assembler.hpp"
@@ -32,4 +32,4 @@
#endif // ndef PRODUCT
-#endif // CPU_AARCH64_VM_MACROASSEMBLER_AARCH64_INLINE_HPP
+#endif // CPU_AARCH64_MACROASSEMBLER_AARCH64_INLINE_HPP
diff --git a/src/hotspot/cpu/aarch64/nativeInst_aarch64.hpp b/src/hotspot/cpu/aarch64/nativeInst_aarch64.hpp
index ade2cfdb7fc..5f74fa28768 100644
--- a/src/hotspot/cpu/aarch64/nativeInst_aarch64.hpp
+++ b/src/hotspot/cpu/aarch64/nativeInst_aarch64.hpp
@@ -23,8 +23,8 @@
*
*/
-#ifndef CPU_AARCH64_VM_NATIVEINST_AARCH64_HPP
-#define CPU_AARCH64_VM_NATIVEINST_AARCH64_HPP
+#ifndef CPU_AARCH64_NATIVEINST_AARCH64_HPP
+#define CPU_AARCH64_NATIVEINST_AARCH64_HPP
#include "asm/assembler.hpp"
#include "runtime/icache.hpp"
@@ -703,4 +703,4 @@ inline NativeLdSt *NativeLdSt_at(address addr) {
assert(nativeInstruction_at(addr)->is_Imm_LdSt(), "no immediate load/store found");
return (NativeLdSt*)addr;
}
-#endif // CPU_AARCH64_VM_NATIVEINST_AARCH64_HPP
+#endif // CPU_AARCH64_NATIVEINST_AARCH64_HPP
diff --git a/src/hotspot/cpu/aarch64/registerMap_aarch64.hpp b/src/hotspot/cpu/aarch64/registerMap_aarch64.hpp
index b286d12c6c8..84c6eaaf458 100644
--- a/src/hotspot/cpu/aarch64/registerMap_aarch64.hpp
+++ b/src/hotspot/cpu/aarch64/registerMap_aarch64.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2019, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2014, Red Hat Inc. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
@@ -23,8 +23,8 @@
*
*/
-#ifndef CPU_AARCH64_VM_REGISTERMAP_AARCH64_HPP
-#define CPU_AARCH64_VM_REGISTERMAP_AARCH64_HPP
+#ifndef CPU_AARCH64_REGISTERMAP_AARCH64_HPP
+#define CPU_AARCH64_REGISTERMAP_AARCH64_HPP
// machine-dependent implemention for register maps
friend class frame;
@@ -42,4 +42,4 @@
void pd_initialize() {}
void pd_initialize_from(const RegisterMap* map) {}
-#endif // CPU_AARCH64_VM_REGISTERMAP_AARCH64_HPP
+#endif // CPU_AARCH64_REGISTERMAP_AARCH64_HPP
diff --git a/src/hotspot/cpu/aarch64/register_aarch64.hpp b/src/hotspot/cpu/aarch64/register_aarch64.hpp
index 8cda52a0acb..1d3e3239df7 100644
--- a/src/hotspot/cpu/aarch64/register_aarch64.hpp
+++ b/src/hotspot/cpu/aarch64/register_aarch64.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2000, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2019, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2014, Red Hat Inc. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
@@ -23,8 +23,8 @@
*
*/
-#ifndef CPU_AARCH64_VM_REGISTER_AARCH64_HPP
-#define CPU_AARCH64_VM_REGISTER_AARCH64_HPP
+#ifndef CPU_AARCH64_REGISTER_AARCH64_HPP
+#define CPU_AARCH64_REGISTER_AARCH64_HPP
#include "asm/register.hpp"
@@ -258,4 +258,4 @@ public:
uint32_t bits() const { return _bitset; }
};
-#endif // CPU_AARCH64_VM_REGISTER_AARCH64_HPP
+#endif // CPU_AARCH64_REGISTER_AARCH64_HPP
diff --git a/src/hotspot/cpu/aarch64/relocInfo_aarch64.hpp b/src/hotspot/cpu/aarch64/relocInfo_aarch64.hpp
index ae9b9bd77f2..13375e739d0 100644
--- a/src/hotspot/cpu/aarch64/relocInfo_aarch64.hpp
+++ b/src/hotspot/cpu/aarch64/relocInfo_aarch64.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2019, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2014, Red Hat Inc. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
@@ -23,8 +23,8 @@
*
*/
-#ifndef CPU_AARCH64_VM_RELOCINFO_AARCH64_HPP
-#define CPU_AARCH64_VM_RELOCINFO_AARCH64_HPP
+#ifndef CPU_AARCH64_RELOCINFO_AARCH64_HPP
+#define CPU_AARCH64_RELOCINFO_AARCH64_HPP
// machine-dependent parts of class relocInfo
private:
@@ -41,4 +41,4 @@
// listed in the oop section.
static bool mustIterateImmediateOopsInCode() { return false; }
-#endif // CPU_AARCH64_VM_RELOCINFO_AARCH64_HPP
+#endif // CPU_AARCH64_RELOCINFO_AARCH64_HPP
diff --git a/src/hotspot/cpu/aarch64/stubRoutines_aarch64.hpp b/src/hotspot/cpu/aarch64/stubRoutines_aarch64.hpp
index 4315b5194c4..f85497d1e1f 100644
--- a/src/hotspot/cpu/aarch64/stubRoutines_aarch64.hpp
+++ b/src/hotspot/cpu/aarch64/stubRoutines_aarch64.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2003, 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2019, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2014, Red Hat Inc. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
@@ -23,8 +23,8 @@
*
*/
-#ifndef CPU_AARCH64_VM_STUBROUTINES_AARCH64_HPP
-#define CPU_AARCH64_VM_STUBROUTINES_AARCH64_HPP
+#ifndef CPU_AARCH64_STUBROUTINES_AARCH64_HPP
+#define CPU_AARCH64_STUBROUTINES_AARCH64_HPP
// This file holds the platform specific parts of the StubRoutines
// definition. See stubRoutines.hpp for a description on how to
@@ -195,4 +195,4 @@ private:
// end trigonometric tables block
};
-#endif // CPU_AARCH64_VM_STUBROUTINES_AARCH64_HPP
+#endif // CPU_AARCH64_STUBROUTINES_AARCH64_HPP
diff --git a/src/hotspot/cpu/aarch64/templateTable_aarch64.hpp b/src/hotspot/cpu/aarch64/templateTable_aarch64.hpp
index ce929de36e5..e24740ed4ee 100644
--- a/src/hotspot/cpu/aarch64/templateTable_aarch64.hpp
+++ b/src/hotspot/cpu/aarch64/templateTable_aarch64.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2003, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2019, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2014, Red Hat Inc. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
@@ -23,8 +23,8 @@
*
*/
-#ifndef CPU_AARCH64_VM_TEMPLATETABLE_AARCH64_64_HPP
-#define CPU_AARCH64_VM_TEMPLATETABLE_AARCH64_64_HPP
+#ifndef CPU_AARCH64_TEMPLATETABLE_AARCH64_HPP
+#define CPU_AARCH64_TEMPLATETABLE_AARCH64_HPP
static void prepare_invoke(int byte_no,
Register method, // linked method (or i-klass)
@@ -39,4 +39,4 @@ static void prepare_invoke(int byte_no,
static void index_check(Register array, Register index);
static void index_check_without_pop(Register array, Register index);
-#endif // CPU_AARCH64_VM_TEMPLATETABLE_AARCH64_64_HPP
+#endif // CPU_AARCH64_TEMPLATETABLE_AARCH64_HPP
diff --git a/src/hotspot/cpu/aarch64/vmStructs_aarch64.hpp b/src/hotspot/cpu/aarch64/vmStructs_aarch64.hpp
index 66da9564512..b1bdccfc3cb 100644
--- a/src/hotspot/cpu/aarch64/vmStructs_aarch64.hpp
+++ b/src/hotspot/cpu/aarch64/vmStructs_aarch64.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2019, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2014, Red Hat Inc. All rights reserved. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
@@ -23,8 +23,8 @@
*
*/
-#ifndef CPU_AARCH64_VM_VMSTRUCTS_AARCH64_HPP
-#define CPU_AARCH64_VM_VMSTRUCTS_AARCH64_HPP
+#ifndef CPU_AARCH64_VMSTRUCTS_AARCH64_HPP
+#define CPU_AARCH64_VMSTRUCTS_AARCH64_HPP
// These are the CPU-specific fields, types and integer
// constants required by the Serviceability Agent. This file is
@@ -39,4 +39,4 @@
#define VM_LONG_CONSTANTS_CPU(declare_constant, declare_preprocessor_constant, declare_c1_constant, declare_c2_constant, declare_c2_preprocessor_constant)
-#endif // CPU_AARCH64_VM_VMSTRUCTS_AARCH64_HPP
+#endif // CPU_AARCH64_VMSTRUCTS_AARCH64_HPP
diff --git a/src/hotspot/cpu/aarch64/vm_version_aarch64.hpp b/src/hotspot/cpu/aarch64/vm_version_aarch64.hpp
index 0a17f3e7361..3aea9d2f75d 100644
--- a/src/hotspot/cpu/aarch64/vm_version_aarch64.hpp
+++ b/src/hotspot/cpu/aarch64/vm_version_aarch64.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2019, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2014, Red Hat Inc. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
@@ -23,8 +23,8 @@
*
*/
-#ifndef CPU_AARCH64_VM_VM_VERSION_AARCH64_HPP
-#define CPU_AARCH64_VM_VM_VERSION_AARCH64_HPP
+#ifndef CPU_AARCH64_VM_VERSION_AARCH64_HPP
+#define CPU_AARCH64_VM_VERSION_AARCH64_HPP
#include "runtime/globals_extension.hpp"
#include "runtime/vm_version.hpp"
@@ -121,4 +121,4 @@ public:
}
};
-#endif // CPU_AARCH64_VM_VM_VERSION_AARCH64_HPP
+#endif // CPU_AARCH64_VM_VERSION_AARCH64_HPP
diff --git a/src/hotspot/cpu/aarch64/vm_version_ext_aarch64.hpp b/src/hotspot/cpu/aarch64/vm_version_ext_aarch64.hpp
index 1bca629c661..2398f53d654 100644
--- a/src/hotspot/cpu/aarch64/vm_version_ext_aarch64.hpp
+++ b/src/hotspot/cpu/aarch64/vm_version_ext_aarch64.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2016, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
*
*/
-#ifndef CPU_AARCH64_VM_VM_VERSION_EXT_AARCH64_HPP
-#define CPU_AARCH64_VM_VM_VERSION_EXT_AARCH64_HPP
+#ifndef CPU_AARCH64_VM_VERSION_EXT_AARCH64_HPP
+#define CPU_AARCH64_VM_VERSION_EXT_AARCH64_HPP
#include "utilities/macros.hpp"
#include "vm_version_aarch64.hpp"
@@ -51,4 +51,4 @@ class VM_Version_Ext : public VM_Version {
};
-#endif // CPU_AARCH64_VM_VM_VERSION_EXT_AARCH64_HPP
+#endif // CPU_AARCH64_VM_VERSION_EXT_AARCH64_HPP
diff --git a/src/hotspot/cpu/aarch64/vmreg_aarch64.hpp b/src/hotspot/cpu/aarch64/vmreg_aarch64.hpp
index 0b1d000bb27..07ad197fae8 100644
--- a/src/hotspot/cpu/aarch64/vmreg_aarch64.hpp
+++ b/src/hotspot/cpu/aarch64/vmreg_aarch64.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2006, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2006, 2019, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2014, Red Hat Inc. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
@@ -23,8 +23,8 @@
*
*/
-#ifndef CPU_AARCH64_VM_VMREG_AARCH64_HPP
-#define CPU_AARCH64_VM_VMREG_AARCH64_HPP
+#ifndef CPU_AARCH64_VMREG_AARCH64_HPP
+#define CPU_AARCH64_VMREG_AARCH64_HPP
inline bool is_Register() {
return (unsigned int) value() < (unsigned int) ConcreteRegisterImpl::max_gpr;
@@ -52,4 +52,4 @@ inline bool is_concrete() {
return is_even(value());
}
-#endif // CPU_AARCH64_VM_VMREG_AARCH64_HPP
+#endif // CPU_AARCH64_VMREG_AARCH64_HPP
diff --git a/src/hotspot/cpu/aarch64/vmreg_aarch64.inline.hpp b/src/hotspot/cpu/aarch64/vmreg_aarch64.inline.hpp
index 145f9797fbd..5173a299b78 100644
--- a/src/hotspot/cpu/aarch64/vmreg_aarch64.inline.hpp
+++ b/src/hotspot/cpu/aarch64/vmreg_aarch64.inline.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2006, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2006, 2019, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2014, Red Hat Inc. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
@@ -23,8 +23,8 @@
*
*/
-#ifndef CPU_AARCH64_VM_VMREG_AARCH64_INLINE_HPP
-#define CPU_AARCH64_VM_VMREG_AARCH64_INLINE_HPP
+#ifndef CPU_AARCH64_VMREG_AARCH64_INLINE_HPP
+#define CPU_AARCH64_VMREG_AARCH64_INLINE_HPP
inline VMReg RegisterImpl::as_VMReg() {
if( this==noreg ) return VMRegImpl::Bad();
@@ -35,4 +35,4 @@ inline VMReg FloatRegisterImpl::as_VMReg() {
return VMRegImpl::as_VMReg((encoding() << 1) + ConcreteRegisterImpl::max_gpr);
}
-#endif // CPU_AARCH64_VM_VMREG_AARCH64_INLINE_HPP
+#endif // CPU_AARCH64_VMREG_AARCH64_INLINE_HPP
diff --git a/src/hotspot/cpu/arm/assembler_arm.hpp b/src/hotspot/cpu/arm/assembler_arm.hpp
index 4e0bd822e74..8beaa284a79 100644
--- a/src/hotspot/cpu/arm/assembler_arm.hpp
+++ b/src/hotspot/cpu/arm/assembler_arm.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2008, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2008, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
*
*/
-#ifndef CPU_ARM_VM_ASSEMBLER_ARM_HPP
-#define CPU_ARM_VM_ASSEMBLER_ARM_HPP
+#ifndef CPU_ARM_ASSEMBLER_ARM_HPP
+#define CPU_ARM_ASSEMBLER_ARM_HPP
#include "utilities/macros.hpp"
@@ -326,4 +326,4 @@ class VFP {
#include "assembler_arm_32.hpp"
-#endif // CPU_ARM_VM_ASSEMBLER_ARM_HPP
+#endif // CPU_ARM_ASSEMBLER_ARM_HPP
diff --git a/src/hotspot/cpu/arm/assembler_arm.inline.hpp b/src/hotspot/cpu/arm/assembler_arm.inline.hpp
index 76585f41ff1..055b53478d9 100644
--- a/src/hotspot/cpu/arm/assembler_arm.inline.hpp
+++ b/src/hotspot/cpu/arm/assembler_arm.inline.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2008, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2008, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
*
*/
-#ifndef CPU_ARM_VM_ASSEMBLER_ARM_INLINE_HPP
-#define CPU_ARM_VM_ASSEMBLER_ARM_INLINE_HPP
+#ifndef CPU_ARM_ASSEMBLER_ARM_INLINE_HPP
+#define CPU_ARM_ASSEMBLER_ARM_INLINE_HPP
-#endif // CPU_ARM_VM_ASSEMBLER_ARM_INLINE_HPP
+#endif // CPU_ARM_ASSEMBLER_ARM_INLINE_HPP
diff --git a/src/hotspot/cpu/arm/assembler_arm_32.hpp b/src/hotspot/cpu/arm/assembler_arm_32.hpp
index 357be6833fb..b972d544b9a 100644
--- a/src/hotspot/cpu/arm/assembler_arm_32.hpp
+++ b/src/hotspot/cpu/arm/assembler_arm_32.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2008, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2008, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
*
*/
-#ifndef CPU_ARM_VM_ASSEMBLER_ARM_32_HPP
-#define CPU_ARM_VM_ASSEMBLER_ARM_32_HPP
+#ifndef CPU_ARM_ASSEMBLER_ARM_32_HPP
+#define CPU_ARM_ASSEMBLER_ARM_32_HPP
// ARM Addressing Mode 1 - Data processing operands
class AsmOperand {
@@ -1250,4 +1250,4 @@ extern double __aeabi_dsub_glibc(double, double);
#endif // __SOFTFP__
-#endif // CPU_ARM_VM_ASSEMBLER_ARM_32_HPP
+#endif // CPU_ARM_ASSEMBLER_ARM_32_HPP
diff --git a/src/hotspot/cpu/arm/bytes_arm.hpp b/src/hotspot/cpu/arm/bytes_arm.hpp
index 0e5a894050a..7e8aae8173f 100644
--- a/src/hotspot/cpu/arm/bytes_arm.hpp
+++ b/src/hotspot/cpu/arm/bytes_arm.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2008, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2008, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
*
*/
-#ifndef CPU_ARM_VM_BYTES_ARM_HPP
-#define CPU_ARM_VM_BYTES_ARM_HPP
+#ifndef CPU_ARM_BYTES_ARM_HPP
+#define CPU_ARM_BYTES_ARM_HPP
#include "memory/allocation.hpp"
#include "utilities/macros.hpp"
@@ -186,4 +186,4 @@ class Bytes: AllStatic {
// The following header contains the implementations of swap_u2, swap_u4, and swap_u8
#include OS_CPU_HEADER_INLINE(bytes)
-#endif // CPU_ARM_VM_BYTES_ARM_HPP
+#endif // CPU_ARM_BYTES_ARM_HPP
diff --git a/src/hotspot/cpu/arm/c1_Defs_arm.hpp b/src/hotspot/cpu/arm/c1_Defs_arm.hpp
index f2baedf8593..fd165edb6dd 100644
--- a/src/hotspot/cpu/arm/c1_Defs_arm.hpp
+++ b/src/hotspot/cpu/arm/c1_Defs_arm.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2008, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2008, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
*
*/
-#ifndef CPU_ARM_VM_C1_DEFS_ARM_HPP
-#define CPU_ARM_VM_C1_DEFS_ARM_HPP
+#ifndef CPU_ARM_C1_DEFS_ARM_HPP
+#define CPU_ARM_C1_DEFS_ARM_HPP
// native word offsets from memory address (little endian)
enum {
@@ -78,4 +78,4 @@ enum {
#define CARDTABLEBARRIERSET_POST_BARRIER_HELPER
#define GENERATE_ADDRESS_IS_PREFERRED
-#endif // CPU_ARM_VM_C1_DEFS_ARM_HPP
+#endif // CPU_ARM_C1_DEFS_ARM_HPP
diff --git a/src/hotspot/cpu/arm/c1_FpuStackSim_arm.hpp b/src/hotspot/cpu/arm/c1_FpuStackSim_arm.hpp
index babd0616fde..74e5ebc81b7 100644
--- a/src/hotspot/cpu/arm/c1_FpuStackSim_arm.hpp
+++ b/src/hotspot/cpu/arm/c1_FpuStackSim_arm.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2008, 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2008, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -22,9 +22,9 @@
*
*/
-#ifndef CPU_ARM_VM_C1_FPUSTACKSIM_ARM_HPP
-#define CPU_ARM_VM_C1_FPUSTACKSIM_ARM_HPP
+#ifndef CPU_ARM_C1_FPUSTACKSIM_ARM_HPP
+#define CPU_ARM_C1_FPUSTACKSIM_ARM_HPP
// Nothing needed here
-#endif // CPU_ARM_VM_C1_FPUSTACKSIM_ARM_HPP
+#endif // CPU_ARM_C1_FPUSTACKSIM_ARM_HPP
diff --git a/src/hotspot/cpu/arm/c1_FrameMap_arm.hpp b/src/hotspot/cpu/arm/c1_FrameMap_arm.hpp
index 2309224f148..9c9877544ec 100644
--- a/src/hotspot/cpu/arm/c1_FrameMap_arm.hpp
+++ b/src/hotspot/cpu/arm/c1_FrameMap_arm.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2008, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2008, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
*
*/
-#ifndef CPU_ARM_VM_C1_FRAMEMAP_ARM_HPP
-#define CPU_ARM_VM_C1_FRAMEMAP_ARM_HPP
+#ifndef CPU_ARM_C1_FRAMEMAP_ARM_HPP
+#define CPU_ARM_C1_FRAMEMAP_ARM_HPP
public:
@@ -108,4 +108,4 @@
return pd_last_cpu_reg;
}
-#endif // CPU_ARM_VM_C1_FRAMEMAP_ARM_HPP
+#endif // CPU_ARM_C1_FRAMEMAP_ARM_HPP
diff --git a/src/hotspot/cpu/arm/c1_LIRAssembler_arm.hpp b/src/hotspot/cpu/arm/c1_LIRAssembler_arm.hpp
index 98cf334f1dc..4cd1f0d08ae 100644
--- a/src/hotspot/cpu/arm/c1_LIRAssembler_arm.hpp
+++ b/src/hotspot/cpu/arm/c1_LIRAssembler_arm.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2008, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2008, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
*
*/
-#ifndef CPU_ARM_VM_C1_LIRASSEMBLER_ARM_HPP
-#define CPU_ARM_VM_C1_LIRASSEMBLER_ARM_HPP
+#ifndef CPU_ARM_C1_LIRASSEMBLER_ARM_HPP
+#define CPU_ARM_C1_LIRASSEMBLER_ARM_HPP
private:
@@ -65,4 +65,4 @@
void store_parameter(jint c, int offset_from_sp_in_words);
void store_parameter(Metadata* m, int offset_from_sp_in_words);
-#endif // CPU_ARM_VM_C1_LIRASSEMBLER_ARM_HPP
+#endif // CPU_ARM_C1_LIRASSEMBLER_ARM_HPP
diff --git a/src/hotspot/cpu/arm/c1_LinearScan_arm.hpp b/src/hotspot/cpu/arm/c1_LinearScan_arm.hpp
index 5a5ad691b5b..f41721f4fe3 100644
--- a/src/hotspot/cpu/arm/c1_LinearScan_arm.hpp
+++ b/src/hotspot/cpu/arm/c1_LinearScan_arm.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2008, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2008, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
*
*/
-#ifndef CPU_ARM_VM_C1_LINEARSCAN_ARM_HPP
-#define CPU_ARM_VM_C1_LINEARSCAN_ARM_HPP
+#ifndef CPU_ARM_C1_LINEARSCAN_ARM_HPP
+#define CPU_ARM_C1_LINEARSCAN_ARM_HPP
inline bool LinearScan::is_processed_reg_num(int reg_num) {
return reg_num < pd_nof_cpu_regs_processed_in_linearscan ||
@@ -68,4 +68,4 @@ inline bool LinearScanWalker::pd_init_regs_for_alloc(Interval* cur) {
return true;
}
-#endif // CPU_ARM_VM_C1_LINEARSCAN_ARM_HPP
+#endif // CPU_ARM_C1_LINEARSCAN_ARM_HPP
diff --git a/src/hotspot/cpu/arm/c1_MacroAssembler_arm.hpp b/src/hotspot/cpu/arm/c1_MacroAssembler_arm.hpp
index b3d2457e64d..faf546db698 100644
--- a/src/hotspot/cpu/arm/c1_MacroAssembler_arm.hpp
+++ b/src/hotspot/cpu/arm/c1_MacroAssembler_arm.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2008, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2008, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
*
*/
-#ifndef CPU_ARM_VM_C1_MACROASSEMBLER_ARM_HPP
-#define CPU_ARM_VM_C1_MACROASSEMBLER_ARM_HPP
+#ifndef CPU_ARM_C1_MACROASSEMBLER_ARM_HPP
+#define CPU_ARM_C1_MACROASSEMBLER_ARM_HPP
private:
@@ -66,4 +66,4 @@
// This platform only uses signal-based null checks. The Label is not needed.
void null_check(Register r, Label *Lnull = NULL) { MacroAssembler::null_check(r); }
-#endif // CPU_ARM_VM_C1_MACROASSEMBLER_ARM_HPP
+#endif // CPU_ARM_C1_MACROASSEMBLER_ARM_HPP
diff --git a/src/hotspot/cpu/arm/c1_globals_arm.hpp b/src/hotspot/cpu/arm/c1_globals_arm.hpp
index 96a93bf7184..312c19f8b94 100644
--- a/src/hotspot/cpu/arm/c1_globals_arm.hpp
+++ b/src/hotspot/cpu/arm/c1_globals_arm.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2008, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2008, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
*
*/
-#ifndef CPU_ARM_VM_C1_GLOBALS_ARM_HPP
-#define CPU_ARM_VM_C1_GLOBALS_ARM_HPP
+#ifndef CPU_ARM_C1_GLOBALS_ARM_HPP
+#define CPU_ARM_C1_GLOBALS_ARM_HPP
#include "utilities/globalDefinitions.hpp"
#include "utilities/macros.hpp"
@@ -70,4 +70,4 @@ define_pd_global(bool, OptimizeSinglePrecision, true);
define_pd_global(bool, CSEArrayLength, true);
define_pd_global(bool, TwoOperandLIRForm, false);
-#endif // CPU_ARM_VM_C1_GLOBALS_ARM_HPP
+#endif // CPU_ARM_C1_GLOBALS_ARM_HPP
diff --git a/src/hotspot/cpu/arm/c2_globals_arm.hpp b/src/hotspot/cpu/arm/c2_globals_arm.hpp
index 636af54243a..282b4bfb655 100644
--- a/src/hotspot/cpu/arm/c2_globals_arm.hpp
+++ b/src/hotspot/cpu/arm/c2_globals_arm.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2008, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2008, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
*
*/
-#ifndef CPU_ARM_VM_C2_GLOBALS_ARM_HPP
-#define CPU_ARM_VM_C2_GLOBALS_ARM_HPP
+#ifndef CPU_ARM_C2_GLOBALS_ARM_HPP
+#define CPU_ARM_C2_GLOBALS_ARM_HPP
#include "utilities/globalDefinitions.hpp"
#include "utilities/macros.hpp"
@@ -108,4 +108,4 @@ define_pd_global(size_t, MetaspaceSize, ScaleForWordSize(16*M));
// Ergonomics related flags
define_pd_global(bool, NeverActAsServerClassMachine, false);
-#endif // CPU_ARM_VM_C2_GLOBALS_ARM_HPP
+#endif // CPU_ARM_C2_GLOBALS_ARM_HPP
diff --git a/src/hotspot/cpu/arm/codeBuffer_arm.hpp b/src/hotspot/cpu/arm/codeBuffer_arm.hpp
index 90534fd4825..c306e6a6a07 100644
--- a/src/hotspot/cpu/arm/codeBuffer_arm.hpp
+++ b/src/hotspot/cpu/arm/codeBuffer_arm.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2008, 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2008, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
*
*/
-#ifndef CPU_ARM_VM_CODEBUFFER_ARM_HPP
-#define CPU_ARM_VM_CODEBUFFER_ARM_HPP
+#ifndef CPU_ARM_CODEBUFFER_ARM_HPP
+#define CPU_ARM_CODEBUFFER_ARM_HPP
private:
void pd_initialize() {}
@@ -31,4 +31,4 @@ private:
public:
void flush_bundle(bool start_new_bundle) {}
-#endif // CPU_ARM_VM_CODEBUFFER_ARM_HPP
+#endif // CPU_ARM_CODEBUFFER_ARM_HPP
diff --git a/src/hotspot/cpu/arm/copy_arm.hpp b/src/hotspot/cpu/arm/copy_arm.hpp
index 47cef1f9d99..b81a0f18093 100644
--- a/src/hotspot/cpu/arm/copy_arm.hpp
+++ b/src/hotspot/cpu/arm/copy_arm.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2008, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2008, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
*
*/
-#ifndef CPU_ARM_VM_COPY_ARM_HPP
-#define CPU_ARM_VM_COPY_ARM_HPP
+#ifndef CPU_ARM_COPY_ARM_HPP
+#define CPU_ARM_COPY_ARM_HPP
#include "utilities/macros.hpp"
@@ -56,4 +56,4 @@ static void pd_zero_to_bytes(void* to, size_t count) {
memset(to, 0, count);
}
-#endif // CPU_ARM_VM_COPY_ARM_HPP
+#endif // CPU_ARM_COPY_ARM_HPP
diff --git a/src/hotspot/cpu/arm/depChecker_arm.hpp b/src/hotspot/cpu/arm/depChecker_arm.hpp
index 6a7161d4e7f..d703e5c4281 100644
--- a/src/hotspot/cpu/arm/depChecker_arm.hpp
+++ b/src/hotspot/cpu/arm/depChecker_arm.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2008, 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2008, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -22,9 +22,9 @@
*
*/
-#ifndef CPU_ARM_VM_DEPCHECKER_ARM_HPP
-#define CPU_ARM_VM_DEPCHECKER_ARM_HPP
+#ifndef CPU_ARM_DEPCHECKER_ARM_HPP
+#define CPU_ARM_DEPCHECKER_ARM_HPP
// Nothing to do
-#endif // CPU_ARM_VM_DEPCHECKER_ARM_HPP
+#endif // CPU_ARM_DEPCHECKER_ARM_HPP
diff --git a/src/hotspot/cpu/arm/disassembler_arm.hpp b/src/hotspot/cpu/arm/disassembler_arm.hpp
index ea201d79248..069ed47eb1b 100644
--- a/src/hotspot/cpu/arm/disassembler_arm.hpp
+++ b/src/hotspot/cpu/arm/disassembler_arm.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2008, 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2008, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
*
*/
-#ifndef CPU_ARM_VM_DISASSEMBLER_ARM_HPP
-#define CPU_ARM_VM_DISASSEMBLER_ARM_HPP
+#ifndef CPU_ARM_DISASSEMBLER_ARM_HPP
+#define CPU_ARM_DISASSEMBLER_ARM_HPP
static int pd_instruction_alignment() {
return sizeof(int);
@@ -33,4 +33,4 @@
return "";
}
-#endif // CPU_ARM_VM_DISASSEMBLER_ARM_HPP
+#endif // CPU_ARM_DISASSEMBLER_ARM_HPP
diff --git a/src/hotspot/cpu/arm/frame_arm.hpp b/src/hotspot/cpu/arm/frame_arm.hpp
index eba3fc58c78..011ceea7acf 100644
--- a/src/hotspot/cpu/arm/frame_arm.hpp
+++ b/src/hotspot/cpu/arm/frame_arm.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2008, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2008, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
*
*/
-#ifndef CPU_ARM_VM_FRAME_ARM_HPP
-#define CPU_ARM_VM_FRAME_ARM_HPP
+#ifndef CPU_ARM_FRAME_ARM_HPP
+#define CPU_ARM_FRAME_ARM_HPP
#include "runtime/synchronizer.hpp"
@@ -118,4 +118,4 @@
static jint interpreter_frame_expression_stack_direction() { return -1; }
-#endif // CPU_ARM_VM_FRAME_ARM_HPP
+#endif // CPU_ARM_FRAME_ARM_HPP
diff --git a/src/hotspot/cpu/arm/frame_arm.inline.hpp b/src/hotspot/cpu/arm/frame_arm.inline.hpp
index cb2c5e6d91d..4927f19c661 100644
--- a/src/hotspot/cpu/arm/frame_arm.inline.hpp
+++ b/src/hotspot/cpu/arm/frame_arm.inline.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2008, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2008, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
*
*/
-#ifndef CPU_ARM_VM_FRAME_ARM_INLINE_HPP
-#define CPU_ARM_VM_FRAME_ARM_INLINE_HPP
+#ifndef CPU_ARM_FRAME_ARM_INLINE_HPP
+#define CPU_ARM_FRAME_ARM_INLINE_HPP
#include "code/codeCache.hpp"
#include "code/vmreg.inline.hpp"
@@ -228,4 +228,4 @@ inline void frame::set_saved_oop_result(RegisterMap* map, oop obj) {
*result_adr = obj;
}
-#endif // CPU_ARM_VM_FRAME_ARM_INLINE_HPP
+#endif // CPU_ARM_FRAME_ARM_INLINE_HPP
diff --git a/src/hotspot/cpu/arm/gc/shared/cardTableBarrierSetAssembler_arm.hpp b/src/hotspot/cpu/arm/gc/shared/cardTableBarrierSetAssembler_arm.hpp
index 20dd400f5ce..e08a68445a8 100644
--- a/src/hotspot/cpu/arm/gc/shared/cardTableBarrierSetAssembler_arm.hpp
+++ b/src/hotspot/cpu/arm/gc/shared/cardTableBarrierSetAssembler_arm.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -43,4 +43,4 @@ protected:
Address obj, Register new_val, Register tmp1, Register tmp2, Register tmp3, bool is_null);
};
-#endif // #ifndef CPU_ARM_GC_SHARED_CARDTABLEBARRIERSETASSEMBLER_ARM_HPP
+#endif // CPU_ARM_GC_SHARED_CARDTABLEBARRIERSETASSEMBLER_ARM_HPP
diff --git a/src/hotspot/cpu/arm/globalDefinitions_arm.hpp b/src/hotspot/cpu/arm/globalDefinitions_arm.hpp
index 07a367c328f..56143c6b9f8 100644
--- a/src/hotspot/cpu/arm/globalDefinitions_arm.hpp
+++ b/src/hotspot/cpu/arm/globalDefinitions_arm.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2008, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2008, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
*
*/
-#ifndef CPU_ARM_VM_GLOBALDEFINITIONS_ARM_HPP
-#define CPU_ARM_VM_GLOBALDEFINITIONS_ARM_HPP
+#ifndef CPU_ARM_GLOBALDEFINITIONS_ARM_HPP
+#define CPU_ARM_GLOBALDEFINITIONS_ARM_HPP
const int StackAlignmentInBytes = 8;
@@ -59,4 +59,4 @@ const bool HaveVFP = true;
#endif
#endif
-#endif // CPU_ARM_VM_GLOBALDEFINITIONS_ARM_HPP
+#endif // CPU_ARM_GLOBALDEFINITIONS_ARM_HPP
diff --git a/src/hotspot/cpu/arm/globals_arm.hpp b/src/hotspot/cpu/arm/globals_arm.hpp
index cb58453c241..1af94a93dc7 100644
--- a/src/hotspot/cpu/arm/globals_arm.hpp
+++ b/src/hotspot/cpu/arm/globals_arm.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2008, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2008, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
*
*/
-#ifndef CPU_ARM_VM_GLOBALS_ARM_HPP
-#define CPU_ARM_VM_GLOBALS_ARM_HPP
+#ifndef CPU_ARM_GLOBALS_ARM_HPP
+#define CPU_ARM_GLOBALS_ARM_HPP
//
// Sets the default values for platform dependent flags used by the runtime system.
@@ -87,4 +87,4 @@ define_pd_global(bool, ThreadLocalHandshakes, false);
range, \
constraint, \
writeable)
-#endif // CPU_ARM_VM_GLOBALS_ARM_HPP
+#endif // CPU_ARM_GLOBALS_ARM_HPP
diff --git a/src/hotspot/cpu/arm/icache_arm.hpp b/src/hotspot/cpu/arm/icache_arm.hpp
index 6b8c5856a32..0db3a4b883e 100644
--- a/src/hotspot/cpu/arm/icache_arm.hpp
+++ b/src/hotspot/cpu/arm/icache_arm.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2008, 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2008, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
*
*/
-#ifndef CPU_ARM_VM_ICACHE_ARM_HPP
-#define CPU_ARM_VM_ICACHE_ARM_HPP
+#ifndef CPU_ARM_ICACHE_ARM_HPP
+#define CPU_ARM_ICACHE_ARM_HPP
// Interface for updating the instruction cache. Whenever the VM modifies
// code, part of the processor instruction cache potentially has to be flushed.
@@ -37,4 +37,4 @@ class ICache : public AbstractICache {
};
};
-#endif // CPU_ARM_VM_ICACHE_ARM_HPP
+#endif // CPU_ARM_ICACHE_ARM_HPP
diff --git a/src/hotspot/cpu/arm/interp_masm_arm.hpp b/src/hotspot/cpu/arm/interp_masm_arm.hpp
index 3b72f29f5fc..4b9a077fd42 100644
--- a/src/hotspot/cpu/arm/interp_masm_arm.hpp
+++ b/src/hotspot/cpu/arm/interp_masm_arm.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2008, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2008, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
*
*/
-#ifndef CPU_ARM_VM_INTERP_MASM_ARM_HPP
-#define CPU_ARM_VM_INTERP_MASM_ARM_HPP
+#ifndef CPU_ARM_INTERP_MASM_ARM_HPP
+#define CPU_ARM_INTERP_MASM_ARM_HPP
#include "asm/macroAssembler.hpp"
#include "interpreter/invocationCounter.hpp"
@@ -277,4 +277,4 @@ void get_method_counters(Register method,
Register reg3 = noreg);
};
-#endif // CPU_ARM_VM_INTERP_MASM_ARM_HPP
+#endif // CPU_ARM_INTERP_MASM_ARM_HPP
diff --git a/src/hotspot/cpu/arm/interpreterRT_arm.hpp b/src/hotspot/cpu/arm/interpreterRT_arm.hpp
index fc75c79bb29..d96d42e63be 100644
--- a/src/hotspot/cpu/arm/interpreterRT_arm.hpp
+++ b/src/hotspot/cpu/arm/interpreterRT_arm.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2008, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2008, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
*
*/
-#ifndef CPU_ARM_VM_INTERPRETERRT_ARM_HPP
-#define CPU_ARM_VM_INTERPRETERRT_ARM_HPP
+#ifndef CPU_ARM_INTERPRETERRT_ARM_HPP
+#define CPU_ARM_INTERPRETERRT_ARM_HPP
// native method calls
@@ -60,4 +60,4 @@ class SignatureHandlerGenerator: public NativeSignatureIterator {
// sharing). See normalize_fast_native_fingerprint
#define SHARING_FAST_NATIVE_FINGERPRINTS
-#endif // CPU_ARM_VM_INTERPRETERRT_ARM_HPP
+#endif // CPU_ARM_INTERPRETERRT_ARM_HPP
diff --git a/src/hotspot/cpu/arm/javaFrameAnchor_arm.hpp b/src/hotspot/cpu/arm/javaFrameAnchor_arm.hpp
index b8ac0b13523..73e375343ca 100644
--- a/src/hotspot/cpu/arm/javaFrameAnchor_arm.hpp
+++ b/src/hotspot/cpu/arm/javaFrameAnchor_arm.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2008, 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2008, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
*
*/
-#ifndef CPU_ARM_VM_JAVAFRAMEANCHOR_ARM_HPP
-#define CPU_ARM_VM_JAVAFRAMEANCHOR_ARM_HPP
+#ifndef CPU_ARM_JAVAFRAMEANCHOR_ARM_HPP
+#define CPU_ARM_JAVAFRAMEANCHOR_ARM_HPP
private:
@@ -83,4 +83,4 @@ public:
// Assert (last_Java_sp == NULL || fp == NULL)
void set_last_Java_fp(intptr_t* fp) { _last_Java_fp = fp; }
-#endif // CPU_ARM_VM_JAVAFRAMEANCHOR_ARM_HPP
+#endif // CPU_ARM_JAVAFRAMEANCHOR_ARM_HPP
diff --git a/src/hotspot/cpu/arm/jniTypes_arm.hpp b/src/hotspot/cpu/arm/jniTypes_arm.hpp
index 4c5d7739fd4..a5e2881b138 100644
--- a/src/hotspot/cpu/arm/jniTypes_arm.hpp
+++ b/src/hotspot/cpu/arm/jniTypes_arm.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2008, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2008, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
*
*/
-#ifndef CPU_ARM_VM_JNITYPES_ARM_HPP
-#define CPU_ARM_VM_JNITYPES_ARM_HPP
+#ifndef CPU_ARM_JNITYPES_ARM_HPP
+#define CPU_ARM_JNITYPES_ARM_HPP
#include "jni.h"
#include "memory/allocation.hpp"
@@ -79,4 +79,4 @@ public:
};
-#endif // CPU_ARM_VM_JNITYPES_ARM_HPP
+#endif // CPU_ARM_JNITYPES_ARM_HPP
diff --git a/src/hotspot/cpu/arm/macroAssembler_arm.hpp b/src/hotspot/cpu/arm/macroAssembler_arm.hpp
index 114246a85aa..91ed05a5a08 100644
--- a/src/hotspot/cpu/arm/macroAssembler_arm.hpp
+++ b/src/hotspot/cpu/arm/macroAssembler_arm.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2008, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2008, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
*
*/
-#ifndef CPU_ARM_VM_MACROASSEMBLER_ARM_HPP
-#define CPU_ARM_VM_MACROASSEMBLER_ARM_HPP
+#ifndef CPU_ARM_MACROASSEMBLER_ARM_HPP
+#define CPU_ARM_MACROASSEMBLER_ARM_HPP
#include "code/relocInfo.hpp"
#include "code/relocInfo_ext.hpp"
@@ -1097,4 +1097,4 @@ private:
};
-#endif // CPU_ARM_VM_MACROASSEMBLER_ARM_HPP
+#endif // CPU_ARM_MACROASSEMBLER_ARM_HPP
diff --git a/src/hotspot/cpu/arm/macroAssembler_arm.inline.hpp b/src/hotspot/cpu/arm/macroAssembler_arm.inline.hpp
index 1fd02c50812..03ea3bd6327 100644
--- a/src/hotspot/cpu/arm/macroAssembler_arm.inline.hpp
+++ b/src/hotspot/cpu/arm/macroAssembler_arm.inline.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2008, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2008, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
*
*/
-#ifndef CPU_ARM_VM_MACROASSEMBLER_ARM_INLINE_HPP
-#define CPU_ARM_VM_MACROASSEMBLER_ARM_INLINE_HPP
+#ifndef CPU_ARM_MACROASSEMBLER_ARM_INLINE_HPP
+#define CPU_ARM_MACROASSEMBLER_ARM_INLINE_HPP
#include "asm/assembler.inline.hpp"
#include "asm/codeBuffer.hpp"
@@ -63,4 +63,4 @@ inline void MacroAssembler::pd_patch_instruction(address branch, address target,
}
}
-#endif // CPU_ARM_VM_MACROASSEMBLER_ARM_INLINE_HPP
+#endif // CPU_ARM_MACROASSEMBLER_ARM_INLINE_HPP
diff --git a/src/hotspot/cpu/arm/nativeInst_arm.hpp b/src/hotspot/cpu/arm/nativeInst_arm.hpp
index 8240ab04ce1..dff04206099 100644
--- a/src/hotspot/cpu/arm/nativeInst_arm.hpp
+++ b/src/hotspot/cpu/arm/nativeInst_arm.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2008, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2008, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
*
*/
-#ifndef CPU_ARM_VM_NATIVEINST_ARM_HPP
-#define CPU_ARM_VM_NATIVEINST_ARM_HPP
+#ifndef CPU_ARM_NATIVEINST_ARM_HPP
+#define CPU_ARM_NATIVEINST_ARM_HPP
#include "asm/macroAssembler.hpp"
#include "runtime/icache.hpp"
@@ -33,4 +33,4 @@
#include "nativeInst_arm_32.hpp"
-#endif // CPU_ARM_VM_NATIVEINST_ARM_HPP
+#endif // CPU_ARM_NATIVEINST_ARM_HPP
diff --git a/src/hotspot/cpu/arm/nativeInst_arm_32.hpp b/src/hotspot/cpu/arm/nativeInst_arm_32.hpp
index 7893f38d985..4f01b7a1635 100644
--- a/src/hotspot/cpu/arm/nativeInst_arm_32.hpp
+++ b/src/hotspot/cpu/arm/nativeInst_arm_32.hpp
@@ -22,8 +22,8 @@
*
*/
-#ifndef CPU_ARM_VM_NATIVEINST_ARM_32_HPP
-#define CPU_ARM_VM_NATIVEINST_ARM_32_HPP
+#ifndef CPU_ARM_NATIVEINST_ARM_32_HPP
+#define CPU_ARM_NATIVEINST_ARM_32_HPP
#include "asm/macroAssembler.hpp"
#include "code/codeCache.hpp"
@@ -429,4 +429,4 @@ inline NativeCall* nativeCall_before(address return_address) {
return (NativeCall *) rawNativeCall_before(return_address);
}
-#endif // CPU_ARM_VM_NATIVEINST_ARM_32_HPP
+#endif // CPU_ARM_NATIVEINST_ARM_32_HPP
diff --git a/src/hotspot/cpu/arm/registerMap_arm.hpp b/src/hotspot/cpu/arm/registerMap_arm.hpp
index a19e594a1d1..08a339cd14b 100644
--- a/src/hotspot/cpu/arm/registerMap_arm.hpp
+++ b/src/hotspot/cpu/arm/registerMap_arm.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2008, 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2008, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
*
*/
-#ifndef CPU_ARM_VM_REGISTERMAP_ARM_HPP
-#define CPU_ARM_VM_REGISTERMAP_ARM_HPP
+#ifndef CPU_ARM_REGISTERMAP_ARM_HPP
+#define CPU_ARM_REGISTERMAP_ARM_HPP
// machine-dependent implemention for register maps
friend class frame;
@@ -41,4 +41,4 @@
void pd_initialize() {}
void pd_initialize_from(const RegisterMap* map) {}
-#endif // CPU_ARM_VM_REGISTERMAP_ARM_HPP
+#endif // CPU_ARM_REGISTERMAP_ARM_HPP
diff --git a/src/hotspot/cpu/arm/register_arm.hpp b/src/hotspot/cpu/arm/register_arm.hpp
index 3c108a8e813..550b48ca4f0 100644
--- a/src/hotspot/cpu/arm/register_arm.hpp
+++ b/src/hotspot/cpu/arm/register_arm.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2008, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2008, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
*
*/
-#ifndef CPU_ARM_VM_REGISTER_ARM_HPP
-#define CPU_ARM_VM_REGISTER_ARM_HPP
+#ifndef CPU_ARM_REGISTER_ARM_HPP
+#define CPU_ARM_REGISTER_ARM_HPP
#include "asm/register.hpp"
#include "vm_version_arm.hpp"
@@ -437,4 +437,4 @@ class VFPSystemRegisterImpl : public AbstractRegisterImpl {
#define j_rarg3 c_rarg3
-#endif // CPU_ARM_VM_REGISTER_ARM_HPP
+#endif // CPU_ARM_REGISTER_ARM_HPP
diff --git a/src/hotspot/cpu/arm/relocInfo_arm.hpp b/src/hotspot/cpu/arm/relocInfo_arm.hpp
index 668b1de6575..f1adb85ea46 100644
--- a/src/hotspot/cpu/arm/relocInfo_arm.hpp
+++ b/src/hotspot/cpu/arm/relocInfo_arm.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2008, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2008, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
*
*/
-#ifndef CPU_ARM_VM_RELOCINFO_ARM_HPP
-#define CPU_ARM_VM_RELOCINFO_ARM_HPP
+#ifndef CPU_ARM_RELOCINFO_ARM_HPP
+#define CPU_ARM_RELOCINFO_ARM_HPP
private:
@@ -38,4 +38,4 @@
// listed in the oop section.
static bool mustIterateImmediateOopsInCode() { return false; }
-#endif // CPU_ARM_VM_RELOCINFO_ARM_HPP
+#endif // CPU_ARM_RELOCINFO_ARM_HPP
diff --git a/src/hotspot/cpu/arm/stubRoutines_arm.hpp b/src/hotspot/cpu/arm/stubRoutines_arm.hpp
index 2c86038f456..c21c08f3e54 100644
--- a/src/hotspot/cpu/arm/stubRoutines_arm.hpp
+++ b/src/hotspot/cpu/arm/stubRoutines_arm.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2008, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2008, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
*
*/
-#ifndef CPU_ARM_VM_STUBROUTINES_ARM_HPP
-#define CPU_ARM_VM_STUBROUTINES_ARM_HPP
+#ifndef CPU_ARM_STUBROUTINES_ARM_HPP
+#define CPU_ARM_STUBROUTINES_ARM_HPP
// This file holds the platform specific parts of the StubRoutines
// definition. See stubRoutines.hpp for a description on how to
@@ -60,4 +60,4 @@ class Arm {
static address atomic_store_long_entry() { return _atomic_store_long_entry; }
-#endif // CPU_ARM_VM_STUBROUTINES_ARM_HPP
+#endif // CPU_ARM_STUBROUTINES_ARM_HPP
diff --git a/src/hotspot/cpu/arm/templateTable_arm.hpp b/src/hotspot/cpu/arm/templateTable_arm.hpp
index a7d604a084a..06c9d665ae7 100644
--- a/src/hotspot/cpu/arm/templateTable_arm.hpp
+++ b/src/hotspot/cpu/arm/templateTable_arm.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2008, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2008, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
*
*/
-#ifndef CPU_ARM_VM_TEMPLATETABLE_ARM_HPP
-#define CPU_ARM_VM_TEMPLATETABLE_ARM_HPP
+#ifndef CPU_ARM_TEMPLATETABLE_ARM_HPP
+#define CPU_ARM_TEMPLATETABLE_ARM_HPP
static void prepare_invoke(int byte_no,
Register method, // linked method (or i-klass)
@@ -59,4 +59,4 @@
static void jvmti_post_fast_field_mod(TosState state);
-#endif // CPU_ARM_VM_TEMPLATETABLE_ARM_HPP
+#endif // CPU_ARM_TEMPLATETABLE_ARM_HPP
diff --git a/src/hotspot/cpu/arm/vmStructs_arm.hpp b/src/hotspot/cpu/arm/vmStructs_arm.hpp
index 901af786dcc..4ce78d517e8 100644
--- a/src/hotspot/cpu/arm/vmStructs_arm.hpp
+++ b/src/hotspot/cpu/arm/vmStructs_arm.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2008, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2008, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
*
*/
-#ifndef CPU_ARM_VM_VMSTRUCTS_ARM_HPP
-#define CPU_ARM_VM_VMSTRUCTS_ARM_HPP
+#ifndef CPU_ARM_VMSTRUCTS_ARM_HPP
+#define CPU_ARM_VMSTRUCTS_ARM_HPP
// These are the CPU-specific fields, types and integer
// constants required by the Serviceability Agent. This file is
@@ -45,4 +45,4 @@
#define VM_LONG_CONSTANTS_CPU(declare_constant, declare_preprocessor_constant, declare_c1_constant, declare_c2_constant, declare_c2_preprocessor_constant)
-#endif // CPU_ARM_VM_VMSTRUCTS_ARM_HPP
+#endif // CPU_ARM_VMSTRUCTS_ARM_HPP
diff --git a/src/hotspot/cpu/arm/vm_version_arm.hpp b/src/hotspot/cpu/arm/vm_version_arm.hpp
index 16b9c32a5b9..0b318cfaea5 100644
--- a/src/hotspot/cpu/arm/vm_version_arm.hpp
+++ b/src/hotspot/cpu/arm/vm_version_arm.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2008, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2008, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
*
*/
-#ifndef CPU_ARM_VM_VM_VERSION_ARM_HPP
-#define CPU_ARM_VM_VM_VERSION_ARM_HPP
+#ifndef CPU_ARM_VM_VERSION_ARM_HPP
+#define CPU_ARM_VM_VERSION_ARM_HPP
#include "runtime/globals_extension.hpp"
#include "runtime/vm_version.hpp"
@@ -106,4 +106,4 @@ class VM_Version: public Abstract_VM_Version {
};
-#endif // CPU_ARM_VM_VM_VERSION_ARM_HPP
+#endif // CPU_ARM_VM_VERSION_ARM_HPP
diff --git a/src/hotspot/cpu/arm/vm_version_ext_arm.hpp b/src/hotspot/cpu/arm/vm_version_ext_arm.hpp
index 4502a1a0ca6..1c02869afca 100644
--- a/src/hotspot/cpu/arm/vm_version_ext_arm.hpp
+++ b/src/hotspot/cpu/arm/vm_version_ext_arm.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2013, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
*
*/
-#ifndef CPU_ARM_VM_VM_VERSION_EXT_ARM_HPP
-#define CPU_ARM_VM_VM_VERSION_EXT_ARM_HPP
+#ifndef CPU_ARM_VM_VERSION_EXT_ARM_HPP
+#define CPU_ARM_VM_VERSION_EXT_ARM_HPP
#include "utilities/macros.hpp"
#include "vm_version_arm.hpp"
@@ -51,4 +51,4 @@ class VM_Version_Ext : public VM_Version {
};
-#endif // CPU_ARM_VM_VM_VERSION_EXT_ARM_HPP
+#endif // CPU_ARM_VM_VERSION_EXT_ARM_HPP
diff --git a/src/hotspot/cpu/arm/vmreg_arm.hpp b/src/hotspot/cpu/arm/vmreg_arm.hpp
index 3db677c6c49..c13f443b804 100644
--- a/src/hotspot/cpu/arm/vmreg_arm.hpp
+++ b/src/hotspot/cpu/arm/vmreg_arm.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2008, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2008, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
*
*/
-#ifndef CPU_ARM_VM_VMREG_ARM_HPP
-#define CPU_ARM_VM_VMREG_ARM_HPP
+#ifndef CPU_ARM_VMREG_ARM_HPP
+#define CPU_ARM_VMREG_ARM_HPP
inline bool is_Register() {
return (unsigned int) value() < (unsigned int) ConcreteRegisterImpl::max_gpr;
@@ -55,4 +55,4 @@
}
}
-#endif // CPU_ARM_VM_VMREG_ARM_HPP
+#endif // CPU_ARM_VMREG_ARM_HPP
diff --git a/src/hotspot/cpu/arm/vmreg_arm.inline.hpp b/src/hotspot/cpu/arm/vmreg_arm.inline.hpp
index bf8e86b13aa..f122b9ede70 100644
--- a/src/hotspot/cpu/arm/vmreg_arm.inline.hpp
+++ b/src/hotspot/cpu/arm/vmreg_arm.inline.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2008, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2008, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
*
*/
-#ifndef CPU_ARM_VM_VMREG_ARM_INLINE_HPP
-#define CPU_ARM_VM_VMREG_ARM_INLINE_HPP
+#ifndef CPU_ARM_VMREG_ARM_INLINE_HPP
+#define CPU_ARM_VMREG_ARM_INLINE_HPP
inline VMReg RegisterImpl::as_VMReg() {
return VMRegImpl::as_VMReg(encoding() << ConcreteRegisterImpl::log_vmregs_per_gpr);
@@ -32,4 +32,4 @@ inline VMReg RegisterImpl::as_VMReg() {
inline VMReg FloatRegisterImpl::as_VMReg() {
return VMRegImpl::as_VMReg((encoding() << ConcreteRegisterImpl::log_vmregs_per_fpr) + ConcreteRegisterImpl::max_gpr);
}
-#endif // CPU_ARM_VM_VMREG_ARM_INLINE_HPP
+#endif // CPU_ARM_VMREG_ARM_INLINE_HPP
diff --git a/src/hotspot/cpu/ppc/assembler_ppc.hpp b/src/hotspot/cpu/ppc/assembler_ppc.hpp
index efad021b0ce..0546d812f0f 100644
--- a/src/hotspot/cpu/ppc/assembler_ppc.hpp
+++ b/src/hotspot/cpu/ppc/assembler_ppc.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2002, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2019, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2012, 2018 SAP SE. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
@@ -23,8 +23,8 @@
*
*/
-#ifndef CPU_PPC_VM_ASSEMBLER_PPC_HPP
-#define CPU_PPC_VM_ASSEMBLER_PPC_HPP
+#ifndef CPU_PPC_ASSEMBLER_PPC_HPP
+#define CPU_PPC_ASSEMBLER_PPC_HPP
#include "asm/register.hpp"
@@ -2450,4 +2450,4 @@ class Assembler : public AbstractAssembler {
};
-#endif // CPU_PPC_VM_ASSEMBLER_PPC_HPP
+#endif // CPU_PPC_ASSEMBLER_PPC_HPP
diff --git a/src/hotspot/cpu/ppc/assembler_ppc.inline.hpp b/src/hotspot/cpu/ppc/assembler_ppc.inline.hpp
index b8c912e7105..d30c6dffc4e 100644
--- a/src/hotspot/cpu/ppc/assembler_ppc.inline.hpp
+++ b/src/hotspot/cpu/ppc/assembler_ppc.inline.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2002, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2019, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2012, 2018 SAP SE. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
@@ -23,8 +23,8 @@
*
*/
-#ifndef CPU_PPC_VM_ASSEMBLER_PPC_INLINE_HPP
-#define CPU_PPC_VM_ASSEMBLER_PPC_INLINE_HPP
+#ifndef CPU_PPC_ASSEMBLER_PPC_INLINE_HPP
+#define CPU_PPC_ASSEMBLER_PPC_INLINE_HPP
#include "asm/assembler.inline.hpp"
#include "asm/codeBuffer.hpp"
@@ -1127,4 +1127,4 @@ inline void Assembler::load_const32(Register d, int i) {
ori(d, d, i & 0xFFFF);
}
-#endif // CPU_PPC_VM_ASSEMBLER_PPC_INLINE_HPP
+#endif // CPU_PPC_ASSEMBLER_PPC_INLINE_HPP
diff --git a/src/hotspot/cpu/ppc/bytes_ppc.hpp b/src/hotspot/cpu/ppc/bytes_ppc.hpp
index ac16dcb872d..18073517127 100644
--- a/src/hotspot/cpu/ppc/bytes_ppc.hpp
+++ b/src/hotspot/cpu/ppc/bytes_ppc.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2019, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2012, 2016 SAP SE. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
@@ -23,8 +23,8 @@
*
*/
-#ifndef CPU_PPC_VM_BYTES_PPC_HPP
-#define CPU_PPC_VM_BYTES_PPC_HPP
+#ifndef CPU_PPC_BYTES_PPC_HPP
+#define CPU_PPC_BYTES_PPC_HPP
#include "memory/allocation.hpp"
@@ -268,4 +268,4 @@ class Bytes: AllStatic {
#include OS_CPU_HEADER_INLINE(bytes)
-#endif // CPU_PPC_VM_BYTES_PPC_HPP
+#endif // CPU_PPC_BYTES_PPC_HPP
diff --git a/src/hotspot/cpu/ppc/c1_Defs_ppc.hpp b/src/hotspot/cpu/ppc/c1_Defs_ppc.hpp
index 4f7075c17fa..01d4ba39092 100644
--- a/src/hotspot/cpu/ppc/c1_Defs_ppc.hpp
+++ b/src/hotspot/cpu/ppc/c1_Defs_ppc.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2000, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2019, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2012, 2015 SAP SE. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
@@ -23,8 +23,8 @@
*
*/
-#ifndef CPU_PPC_VM_C1_DEFS_PPC_HPP
-#define CPU_PPC_VM_C1_DEFS_PPC_HPP
+#ifndef CPU_PPC_C1_DEFS_PPC_HPP
+#define CPU_PPC_C1_DEFS_PPC_HPP
// Native word offsets from memory address.
enum {
@@ -73,4 +73,4 @@ enum {
pd_float_saved_as_double = true
};
-#endif // CPU_PPC_VM_C1_DEFS_PPC_HPP
+#endif // CPU_PPC_C1_DEFS_PPC_HPP
diff --git a/src/hotspot/cpu/ppc/c1_FpuStackSim_ppc.hpp b/src/hotspot/cpu/ppc/c1_FpuStackSim_ppc.hpp
index 6f2f90ba0da..84d180a9b03 100644
--- a/src/hotspot/cpu/ppc/c1_FpuStackSim_ppc.hpp
+++ b/src/hotspot/cpu/ppc/c1_FpuStackSim_ppc.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2005, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2019, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2012, 2015 SAP SE. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
@@ -23,10 +23,10 @@
*
*/
-#ifndef CPU_PPC_VM_C1_FPUSTACKSIM_PPC_HPP
-#define CPU_PPC_VM_C1_FPUSTACKSIM_PPC_HPP
+#ifndef CPU_PPC_C1_FPUSTACKSIM_PPC_HPP
+#define CPU_PPC_C1_FPUSTACKSIM_PPC_HPP
// No FPU stack on PPC.
class FpuStackSim;
-#endif // CPU_PPC_VM_C1_FPUSTACKSIM_PPC_HPP
+#endif // CPU_PPC_C1_FPUSTACKSIM_PPC_HPP
diff --git a/src/hotspot/cpu/ppc/c1_FrameMap_ppc.hpp b/src/hotspot/cpu/ppc/c1_FrameMap_ppc.hpp
index 8ce25e97b87..7cfc1fe656e 100644
--- a/src/hotspot/cpu/ppc/c1_FrameMap_ppc.hpp
+++ b/src/hotspot/cpu/ppc/c1_FrameMap_ppc.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1999, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1999, 2019, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2012, 2015 SAP SE. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
@@ -23,8 +23,8 @@
*
*/
-#ifndef CPU_PPC_VM_C1_FRAMEMAP_PPC_HPP
-#define CPU_PPC_VM_C1_FRAMEMAP_PPC_HPP
+#ifndef CPU_PPC_C1_FRAMEMAP_PPC_HPP
+#define CPU_PPC_C1_FRAMEMAP_PPC_HPP
public:
@@ -199,4 +199,4 @@
// R29: global TOC
static bool reg_needs_save(Register r) { return r != R0 && r != R1 && r != R13 && r != R16 && r != R29; }
-#endif // CPU_PPC_VM_C1_FRAMEMAP_PPC_HPP
+#endif // CPU_PPC_C1_FRAMEMAP_PPC_HPP
diff --git a/src/hotspot/cpu/ppc/c1_LIRAssembler_ppc.hpp b/src/hotspot/cpu/ppc/c1_LIRAssembler_ppc.hpp
index ab4688e14fd..6eef210dccc 100644
--- a/src/hotspot/cpu/ppc/c1_LIRAssembler_ppc.hpp
+++ b/src/hotspot/cpu/ppc/c1_LIRAssembler_ppc.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2000, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2019, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2012, 2015 SAP SE. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
@@ -23,8 +23,8 @@
*
*/
-#ifndef CPU_PPC_VM_C1_LIRASSEMBLER_PPC_HPP
-#define CPU_PPC_VM_C1_LIRASSEMBLER_PPC_HPP
+#ifndef CPU_PPC_C1_LIRASSEMBLER_PPC_HPP
+#define CPU_PPC_C1_LIRASSEMBLER_PPC_HPP
private:
@@ -77,4 +77,4 @@ enum {
}
}
-#endif // CPU_PPC_VM_C1_LIRASSEMBLER_PPC_HPP
+#endif // CPU_PPC_C1_LIRASSEMBLER_PPC_HPP
diff --git a/src/hotspot/cpu/ppc/c1_LinearScan_ppc.hpp b/src/hotspot/cpu/ppc/c1_LinearScan_ppc.hpp
index 261db8d77ef..6bddb9bf350 100644
--- a/src/hotspot/cpu/ppc/c1_LinearScan_ppc.hpp
+++ b/src/hotspot/cpu/ppc/c1_LinearScan_ppc.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2005, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2019, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2012, 2015 SAP SE. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
@@ -23,8 +23,8 @@
*
*/
-#ifndef CPU_PPC_VM_C1_LINEARSCAN_PPC_HPP
-#define CPU_PPC_VM_C1_LINEARSCAN_PPC_HPP
+#ifndef CPU_PPC_C1_LINEARSCAN_PPC_HPP
+#define CPU_PPC_C1_LINEARSCAN_PPC_HPP
inline bool LinearScan::is_processed_reg_num(int reg_num) {
assert(FrameMap::R0_opr->cpu_regnr() == FrameMap::last_cpu_reg() + 1, "wrong assumption below");
@@ -70,4 +70,4 @@ inline bool LinearScanWalker::pd_init_regs_for_alloc(Interval* cur) {
return false;
}
-#endif // CPU_PPC_VM_C1_LINEARSCAN_PPC_HPP
+#endif // CPU_PPC_C1_LINEARSCAN_PPC_HPP
diff --git a/src/hotspot/cpu/ppc/c1_MacroAssembler_ppc.hpp b/src/hotspot/cpu/ppc/c1_MacroAssembler_ppc.hpp
index 4f40b20b551..f0a6707d1ae 100644
--- a/src/hotspot/cpu/ppc/c1_MacroAssembler_ppc.hpp
+++ b/src/hotspot/cpu/ppc/c1_MacroAssembler_ppc.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1999, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1999, 2019, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2012, 2015 SAP SE. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
@@ -23,8 +23,8 @@
*
*/
-#ifndef CPU_PPC_VM_C1_MACROASSEMBLER_PPC_HPP
-#define CPU_PPC_VM_C1_MACROASSEMBLER_PPC_HPP
+#ifndef CPU_PPC_C1_MACROASSEMBLER_PPC_HPP
+#define CPU_PPC_C1_MACROASSEMBLER_PPC_HPP
void pd_init() { /* nothing to do */ }
@@ -90,4 +90,4 @@
address call_c_with_frame_resize(address dest, int frame_resize);
-#endif // CPU_PPC_VM_C1_MACROASSEMBLER_PPC_HPP
+#endif // CPU_PPC_C1_MACROASSEMBLER_PPC_HPP
diff --git a/src/hotspot/cpu/ppc/c1_globals_ppc.hpp b/src/hotspot/cpu/ppc/c1_globals_ppc.hpp
index 66f6f913636..4a6c7149747 100644
--- a/src/hotspot/cpu/ppc/c1_globals_ppc.hpp
+++ b/src/hotspot/cpu/ppc/c1_globals_ppc.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2000, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2019, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2012, 2018 SAP SE. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
@@ -23,8 +23,8 @@
*
*/
-#ifndef CPU_PPC_VM_C1_GLOBALS_PPC_HPP
-#define CPU_PPC_VM_C1_GLOBALS_PPC_HPP
+#ifndef CPU_PPC_C1_GLOBALS_PPC_HPP
+#define CPU_PPC_C1_GLOBALS_PPC_HPP
#include "utilities/globalDefinitions.hpp"
#include "utilities/macros.hpp"
@@ -65,4 +65,4 @@ define_pd_global(bool, OptimizeSinglePrecision, false);
define_pd_global(bool, CSEArrayLength, true);
define_pd_global(bool, TwoOperandLIRForm, false);
-#endif // CPU_PPC_VM_C1_GLOBALS_PPC_HPP
+#endif // CPU_PPC_C1_GLOBALS_PPC_HPP
diff --git a/src/hotspot/cpu/ppc/c2_globals_ppc.hpp b/src/hotspot/cpu/ppc/c2_globals_ppc.hpp
index 96a2a5f9235..c9f9e78c501 100644
--- a/src/hotspot/cpu/ppc/c2_globals_ppc.hpp
+++ b/src/hotspot/cpu/ppc/c2_globals_ppc.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2000, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2019, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2012, 2018 SAP SE. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
@@ -23,8 +23,8 @@
*
*/
-#ifndef CPU_PPC_VM_C2_GLOBALS_PPC_HPP
-#define CPU_PPC_VM_C2_GLOBALS_PPC_HPP
+#ifndef CPU_PPC_C2_GLOBALS_PPC_HPP
+#define CPU_PPC_C2_GLOBALS_PPC_HPP
#include "utilities/globalDefinitions.hpp"
#include "utilities/macros.hpp"
@@ -101,4 +101,4 @@ define_pd_global(size_t, MetaspaceSize, ScaleForWordSize(16*M))
// Ergonomics related flags
define_pd_global(bool, NeverActAsServerClassMachine, false);
-#endif // CPU_PPC_VM_C2_GLOBALS_PPC_HPP
+#endif // CPU_PPC_C2_GLOBALS_PPC_HPP
diff --git a/src/hotspot/cpu/ppc/codeBuffer_ppc.hpp b/src/hotspot/cpu/ppc/codeBuffer_ppc.hpp
index ae618ceffd0..2fb9e5657a8 100644
--- a/src/hotspot/cpu/ppc/codeBuffer_ppc.hpp
+++ b/src/hotspot/cpu/ppc/codeBuffer_ppc.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2002, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2019, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2012, 2013 SAP SE. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
@@ -23,8 +23,8 @@
*
*/
-#ifndef CPU_PPC_VM_CODEBUFFER_PPC_HPP
-#define CPU_PPC_VM_CODEBUFFER_PPC_HPP
+#ifndef CPU_PPC_CODEBUFFER_PPC_HPP
+#define CPU_PPC_CODEBUFFER_PPC_HPP
private:
void pd_initialize() {}
@@ -32,4 +32,4 @@ private:
public:
void flush_bundle(bool start_new_bundle) {}
-#endif // CPU_PPC_VM_CODEBUFFER_PPC_HPP
+#endif // CPU_PPC_CODEBUFFER_PPC_HPP
diff --git a/src/hotspot/cpu/ppc/copy_ppc.hpp b/src/hotspot/cpu/ppc/copy_ppc.hpp
index 6e8740ce006..06eae3c3f09 100644
--- a/src/hotspot/cpu/ppc/copy_ppc.hpp
+++ b/src/hotspot/cpu/ppc/copy_ppc.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2000, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2019, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2012, 2013 SAP SE. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
@@ -23,8 +23,8 @@
*
*/
-#ifndef CPU_PPC_VM_COPY_PPC_HPP
-#define CPU_PPC_VM_COPY_PPC_HPP
+#ifndef CPU_PPC_COPY_PPC_HPP
+#define CPU_PPC_COPY_PPC_HPP
#ifndef PPC64
#error "copy currently only implemented for PPC64"
@@ -168,4 +168,4 @@ static void pd_zero_to_bytes(void* to, size_t count) {
(void)memset(to, 0, count);
}
-#endif // CPU_PPC_VM_COPY_PPC_HPP
+#endif // CPU_PPC_COPY_PPC_HPP
diff --git a/src/hotspot/cpu/ppc/depChecker_ppc.hpp b/src/hotspot/cpu/ppc/depChecker_ppc.hpp
index 07ed6267640..5956d7f7762 100644
--- a/src/hotspot/cpu/ppc/depChecker_ppc.hpp
+++ b/src/hotspot/cpu/ppc/depChecker_ppc.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2002, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2019, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2012, 2013 SAP SE. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
@@ -23,9 +23,9 @@
*
*/
-#ifndef CPU_PPC_VM_DEPCHECKER_PPC_HPP
-#define CPU_PPC_VM_DEPCHECKER_PPC_HPP
+#ifndef CPU_PPC_DEPCHECKER_PPC_HPP
+#define CPU_PPC_DEPCHECKER_PPC_HPP
// Nothing to do on ppc64
-#endif // CPU_PPC_VM_DEPCHECKER_PPC_HPP
+#endif // CPU_PPC_DEPCHECKER_PPC_HPP
diff --git a/src/hotspot/cpu/ppc/disassembler_ppc.hpp b/src/hotspot/cpu/ppc/disassembler_ppc.hpp
index dc98a8bb06a..e7fb356b3ec 100644
--- a/src/hotspot/cpu/ppc/disassembler_ppc.hpp
+++ b/src/hotspot/cpu/ppc/disassembler_ppc.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2002, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2019, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2012, 2013 SAP SE. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
@@ -23,8 +23,8 @@
*
*/
-#ifndef CPU_PPC_VM_DISASSEMBLER_PPC_HPP
-#define CPU_PPC_VM_DISASSEMBLER_PPC_HPP
+#ifndef CPU_PPC_DISASSEMBLER_PPC_HPP
+#define CPU_PPC_DISASSEMBLER_PPC_HPP
static int pd_instruction_alignment() {
return sizeof(int);
@@ -34,4 +34,4 @@
return "ppc64";
}
-#endif // CPU_PPC_VM_DISASSEMBLER_PPC_HPP
+#endif // CPU_PPC_DISASSEMBLER_PPC_HPP
diff --git a/src/hotspot/cpu/ppc/frame_ppc.hpp b/src/hotspot/cpu/ppc/frame_ppc.hpp
index 6a0c4bfd136..b8ec620d2bf 100644
--- a/src/hotspot/cpu/ppc/frame_ppc.hpp
+++ b/src/hotspot/cpu/ppc/frame_ppc.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2000, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2019, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2012, 2015 SAP SE. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
@@ -23,8 +23,8 @@
*
*/
-#ifndef CPU_PPC_VM_FRAME_PPC_HPP
-#define CPU_PPC_VM_FRAME_PPC_HPP
+#ifndef CPU_PPC_FRAME_PPC_HPP
+#define CPU_PPC_FRAME_PPC_HPP
#include "runtime/synchronizer.hpp"
@@ -427,4 +427,4 @@
static jint interpreter_frame_expression_stack_direction() { return -1; }
-#endif // CPU_PPC_VM_FRAME_PPC_HPP
+#endif // CPU_PPC_FRAME_PPC_HPP
diff --git a/src/hotspot/cpu/ppc/frame_ppc.inline.hpp b/src/hotspot/cpu/ppc/frame_ppc.inline.hpp
index a1a660041be..5ec3dec56fb 100644
--- a/src/hotspot/cpu/ppc/frame_ppc.inline.hpp
+++ b/src/hotspot/cpu/ppc/frame_ppc.inline.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2000, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2019, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2012, 2015 SAP SE. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
@@ -23,8 +23,8 @@
*
*/
-#ifndef CPU_PPC_VM_FRAME_PPC_INLINE_HPP
-#define CPU_PPC_VM_FRAME_PPC_INLINE_HPP
+#ifndef CPU_PPC_FRAME_PPC_INLINE_HPP
+#define CPU_PPC_FRAME_PPC_INLINE_HPP
#include "code/codeCache.hpp"
#include "code/vmreg.inline.hpp"
@@ -220,4 +220,4 @@ inline void frame::set_saved_oop_result(RegisterMap* map, oop obj) {
*((oop*)map->location(R3->as_VMReg())) = obj;
}
-#endif // CPU_PPC_VM_FRAME_PPC_INLINE_HPP
+#endif // CPU_PPC_FRAME_PPC_INLINE_HPP
diff --git a/src/hotspot/cpu/ppc/globalDefinitions_ppc.hpp b/src/hotspot/cpu/ppc/globalDefinitions_ppc.hpp
index 404ea99301b..777b3f78685 100644
--- a/src/hotspot/cpu/ppc/globalDefinitions_ppc.hpp
+++ b/src/hotspot/cpu/ppc/globalDefinitions_ppc.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1999, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1999, 2019, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2012, 2016 SAP SE. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
@@ -23,8 +23,8 @@
*
*/
-#ifndef CPU_PPC_VM_GLOBALDEFINITIONS_PPC_HPP
-#define CPU_PPC_VM_GLOBALDEFINITIONS_PPC_HPP
+#ifndef CPU_PPC_GLOBALDEFINITIONS_PPC_HPP
+#define CPU_PPC_GLOBALDEFINITIONS_PPC_HPP
#ifdef CC_INTERP
#error "CC_INTERP is no longer supported. Removed in change 8145117."
@@ -60,4 +60,4 @@ const bool CCallingConventionRequiresIntsAsLongs = true;
// Define the condition to use this -XX flag.
#define USE_POLL_BIT_ONLY UseSIGTRAP
-#endif // CPU_PPC_VM_GLOBALDEFINITIONS_PPC_HPP
+#endif // CPU_PPC_GLOBALDEFINITIONS_PPC_HPP
diff --git a/src/hotspot/cpu/ppc/globals_ppc.hpp b/src/hotspot/cpu/ppc/globals_ppc.hpp
index 61dce55d32c..5d908e6e6a8 100644
--- a/src/hotspot/cpu/ppc/globals_ppc.hpp
+++ b/src/hotspot/cpu/ppc/globals_ppc.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2002, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2019, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2012, 2018 SAP SE. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
@@ -23,8 +23,8 @@
*
*/
-#ifndef CPU_PPC_VM_GLOBALS_PPC_HPP
-#define CPU_PPC_VM_GLOBALS_PPC_HPP
+#ifndef CPU_PPC_GLOBALS_PPC_HPP
+#define CPU_PPC_GLOBALS_PPC_HPP
#include "utilities/globalDefinitions.hpp"
#include "utilities/macros.hpp"
@@ -207,4 +207,4 @@ define_pd_global(bool, ThreadLocalHandshakes, true);
experimental(bool, UseRTMXendForLockBusy, true, \
"Use RTM Xend instead of Xabort when lock busy") \
-#endif // CPU_PPC_VM_GLOBALS_PPC_HPP
+#endif // CPU_PPC_GLOBALS_PPC_HPP
diff --git a/src/hotspot/cpu/ppc/icache_ppc.hpp b/src/hotspot/cpu/ppc/icache_ppc.hpp
index fc9790f2133..449d2f2525e 100644
--- a/src/hotspot/cpu/ppc/icache_ppc.hpp
+++ b/src/hotspot/cpu/ppc/icache_ppc.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2002, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2019, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2012, 2013 SAP SE. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
@@ -23,8 +23,8 @@
*
*/
-#ifndef CPU_PPC_VM_ICACHE_PPC_HPP
-#define CPU_PPC_VM_ICACHE_PPC_HPP
+#ifndef CPU_PPC_ICACHE_PPC_HPP
+#define CPU_PPC_ICACHE_PPC_HPP
// Interface for updating the instruction cache. Whenever the VM modifies
// code, part of the processor instruction cache potentially has to be flushed.
@@ -49,4 +49,4 @@ class ICache : public AbstractICache {
}
};
-#endif // CPU_PPC_VM_ICACHE_PPC_HPP
+#endif // CPU_PPC_ICACHE_PPC_HPP
diff --git a/src/hotspot/cpu/ppc/interp_masm_ppc.hpp b/src/hotspot/cpu/ppc/interp_masm_ppc.hpp
index 65231b5f76a..0522422e9e4 100644
--- a/src/hotspot/cpu/ppc/interp_masm_ppc.hpp
+++ b/src/hotspot/cpu/ppc/interp_masm_ppc.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2002, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2019, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2012, 2017 SAP SE. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
@@ -23,8 +23,8 @@
*
*/
-#ifndef CPU_PPC_VM_INTERP_MASM_PPC_HPP
-#define CPU_PPC_VM_INTERP_MASM_PPC_HPP
+#ifndef CPU_PPC_INTERP_MASM_PPC_HPP
+#define CPU_PPC_INTERP_MASM_PPC_HPP
#include "asm/macroAssembler.hpp"
#include "interpreter/invocationCounter.hpp"
@@ -266,4 +266,4 @@ class InterpreterMacroAssembler: public MacroAssembler {
NotifyMethodExitMode mode, bool check_exceptions);
};
-#endif // CPU_PPC_VM_INTERP_MASM_PPC_HPP
+#endif // CPU_PPC_INTERP_MASM_PPC_HPP
diff --git a/src/hotspot/cpu/ppc/interpreterRT_ppc.hpp b/src/hotspot/cpu/ppc/interpreterRT_ppc.hpp
index 1aee98f7b84..ce591c4b24d 100644
--- a/src/hotspot/cpu/ppc/interpreterRT_ppc.hpp
+++ b/src/hotspot/cpu/ppc/interpreterRT_ppc.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2002, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2019, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2012, 2014 SAP SE. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
@@ -23,8 +23,8 @@
*
*/
-#ifndef CPU_PPC_VM_INTERPRETERRT_PPC_HPP
-#define CPU_PPC_VM_INTERPRETERRT_PPC_HPP
+#ifndef CPU_PPC_INTERPRETERRT_PPC_HPP
+#define CPU_PPC_INTERPRETERRT_PPC_HPP
// This is included in the middle of class Interpreter.
// Do not include files here.
@@ -57,4 +57,4 @@ static address get_result_handler(JavaThread* thread, Method* method);
// A function to get the signature.
static address get_signature(JavaThread* thread, Method* method);
-#endif // CPU_PPC_VM_INTERPRETERRT_PPC_HPP
+#endif // CPU_PPC_INTERPRETERRT_PPC_HPP
diff --git a/src/hotspot/cpu/ppc/javaFrameAnchor_ppc.hpp b/src/hotspot/cpu/ppc/javaFrameAnchor_ppc.hpp
index 2b66bbce292..a30ea1c175b 100644
--- a/src/hotspot/cpu/ppc/javaFrameAnchor_ppc.hpp
+++ b/src/hotspot/cpu/ppc/javaFrameAnchor_ppc.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2002, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2019, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2012, 2014 SAP SE. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
@@ -23,8 +23,8 @@
*
*/
-#ifndef CPU_PPC_VM_JAVAFRAMEANCHOR_PPC_HPP
-#define CPU_PPC_VM_JAVAFRAMEANCHOR_PPC_HPP
+#ifndef CPU_PPC_JAVAFRAMEANCHOR_PPC_HPP
+#define CPU_PPC_JAVAFRAMEANCHOR_PPC_HPP
public:
// Each arch must define reset, save, restore
@@ -75,4 +75,4 @@ public:
void set_last_Java_sp(intptr_t* sp) { OrderAccess::release(); _last_Java_sp = sp; }
-#endif // CPU_PPC_VM_JAVAFRAMEANCHOR_PPC_HPP
+#endif // CPU_PPC_JAVAFRAMEANCHOR_PPC_HPP
diff --git a/src/hotspot/cpu/ppc/jniTypes_ppc.hpp b/src/hotspot/cpu/ppc/jniTypes_ppc.hpp
index 6a6ecd24390..726c2e23b91 100644
--- a/src/hotspot/cpu/ppc/jniTypes_ppc.hpp
+++ b/src/hotspot/cpu/ppc/jniTypes_ppc.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2002, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2019, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2012, 2013 SAP SE. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
@@ -23,8 +23,8 @@
*
*/
-#ifndef CPU_PPC_VM_JNITYPES_PPC_HPP
-#define CPU_PPC_VM_JNITYPES_PPC_HPP
+#ifndef CPU_PPC_JNITYPES_PPC_HPP
+#define CPU_PPC_JNITYPES_PPC_HPP
#include "jni.h"
#include "memory/allocation.hpp"
@@ -107,4 +107,4 @@ class JNITypes : AllStatic {
static inline jdouble get_double(intptr_t *from) { return *(jdouble *)(from + 1); }
};
-#endif // CPU_PPC_VM_JNITYPES_PPC_HPP
+#endif // CPU_PPC_JNITYPES_PPC_HPP
diff --git a/src/hotspot/cpu/ppc/macroAssembler_ppc.cpp b/src/hotspot/cpu/ppc/macroAssembler_ppc.cpp
index 6418f3feac5..a15ec2ac682 100644
--- a/src/hotspot/cpu/ppc/macroAssembler_ppc.cpp
+++ b/src/hotspot/cpu/ppc/macroAssembler_ppc.cpp
@@ -1,6 +1,6 @@
/*
- * Copyright (c) 1997, 2018, Oracle and/or its affiliates. All rights reserved.
- * Copyright (c) 2012, 2018, SAP SE. All rights reserved.
+ * Copyright (c) 1997, 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2019, SAP SE. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -3859,31 +3859,20 @@ void MacroAssembler::load_reverse_32(Register dst, Register src) {
// Due to register shortage, setting tc3 may overwrite table. With the return offset
// at hand, the original table address can be easily reconstructed.
int MacroAssembler::crc32_table_columns(Register table, Register tc0, Register tc1, Register tc2, Register tc3) {
+ assert(!VM_Version::has_vpmsumb(), "Vector version should be used instead!");
+ // Point to 4 byte folding tables (byte-reversed version for Big Endian)
+ // Layout: See StubRoutines::generate_crc_constants.
#ifdef VM_LITTLE_ENDIAN
- // This is what we implement (the DOLIT4 part):
- // ========================================================================= */
- // #define DOLIT4 c ^= *buf4++; \
- // c = crc_table[3][c & 0xff] ^ crc_table[2][(c >> 8) & 0xff] ^ \
- // crc_table[1][(c >> 16) & 0xff] ^ crc_table[0][c >> 24]
- // #define DOLIT32 DOLIT4; DOLIT4; DOLIT4; DOLIT4; DOLIT4; DOLIT4; DOLIT4; DOLIT4
- // ========================================================================= */
- const int ix0 = 3*(4*CRC32_COLUMN_SIZE);
- const int ix1 = 2*(4*CRC32_COLUMN_SIZE);
- const int ix2 = 1*(4*CRC32_COLUMN_SIZE);
- const int ix3 = 0*(4*CRC32_COLUMN_SIZE);
+ const int ix0 = 3 * CRC32_TABLE_SIZE;
+ const int ix1 = 2 * CRC32_TABLE_SIZE;
+ const int ix2 = 1 * CRC32_TABLE_SIZE;
+ const int ix3 = 0 * CRC32_TABLE_SIZE;
#else
- // This is what we implement (the DOBIG4 part):
- // =========================================================================
- // #define DOBIG4 c ^= *++buf4; \
- // c = crc_table[4][c & 0xff] ^ crc_table[5][(c >> 8) & 0xff] ^ \
- // crc_table[6][(c >> 16) & 0xff] ^ crc_table[7][c >> 24]
- // #define DOBIG32 DOBIG4; DOBIG4; DOBIG4; DOBIG4; DOBIG4; DOBIG4; DOBIG4; DOBIG4
- // =========================================================================
- const int ix0 = 4*(4*CRC32_COLUMN_SIZE);
- const int ix1 = 5*(4*CRC32_COLUMN_SIZE);
- const int ix2 = 6*(4*CRC32_COLUMN_SIZE);
- const int ix3 = 7*(4*CRC32_COLUMN_SIZE);
+ const int ix0 = 1 * CRC32_TABLE_SIZE;
+ const int ix1 = 2 * CRC32_TABLE_SIZE;
+ const int ix2 = 3 * CRC32_TABLE_SIZE;
+ const int ix3 = 4 * CRC32_TABLE_SIZE;
#endif
assert_different_registers(table, tc0, tc1, tc2);
assert(table == tc3, "must be!");
@@ -3898,7 +3887,7 @@ int MacroAssembler::crc32_table_columns(Register table, Register tc0, Register t
/**
* uint32_t crc;
- * timesXtoThe32[crc & 0xFF] ^ (crc >> 8);
+ * table[crc & 0xFF] ^ (crc >> 8);
*/
void MacroAssembler::fold_byte_crc32(Register crc, Register val, Register table, Register tmp) {
assert_different_registers(crc, table, tmp);
@@ -3916,14 +3905,6 @@ void MacroAssembler::fold_byte_crc32(Register crc, Register val, Register table,
xorr(crc, crc, tmp);
}
-/**
- * uint32_t crc;
- * timesXtoThe32[crc & 0xFF] ^ (crc >> 8);
- */
-void MacroAssembler::fold_8bit_crc32(Register crc, Register table, Register tmp) {
- fold_byte_crc32(crc, crc, table, tmp);
-}
-
/**
* Emits code to update CRC-32 with a byte value according to constants in table.
*
@@ -3974,10 +3955,8 @@ void MacroAssembler::update_byteLoop_crc32(Register crc, Register buf, Register
* Emits code to update CRC-32 with a 4-byte value according to constants in table
* Implementation according to jdk/src/share/native/java/util/zip/zlib-1.2.8/crc32.c
*/
-// A not on the lookup table address(es):
-// The lookup table consists of two sets of four columns each.
-// The columns {0..3} are used for little-endian machines.
-// The columns {4..7} are used for big-endian machines.
+// A note on the lookup table address(es):
+// The implementation uses 4 table columns (byte-reversed versions for Big Endian).
// To save the effort of adding the column offset to the table address each time
// a table element is looked up, it is possible to pass the pre-calculated
// column addresses.
@@ -4111,93 +4090,57 @@ void MacroAssembler::kernel_crc32_1word(Register crc, Register buf, Register len
BLOCK_COMMENT("} kernel_crc32_1word");
}
-/**
- * @param crc register containing existing CRC (32-bit)
- * @param buf register pointing to input byte buffer (byte*)
- * @param len register containing number of bytes
- * @param table register pointing to CRC table
- *
- * Uses R7_ARG5, R8_ARG6 as work registers.
- */
-void MacroAssembler::kernel_crc32_1byte(Register crc, Register buf, Register len, Register table,
- Register t0, Register t1, Register t2, Register t3,
- bool invertCRC) {
- assert_different_registers(crc, buf, len, table);
-
- Register data = t0; // Holds the current byte to be folded into crc.
-
- BLOCK_COMMENT("kernel_crc32_1byte {");
-
- if (invertCRC) {
- nand(crc, crc, crc); // 1s complement of crc
- }
-
- // Process all bytes in a single-byte loop.
- update_byteLoop_crc32(crc, buf, len, table, data, true);
-
- if (invertCRC) {
- nand(crc, crc, crc); // 1s complement of crc
- }
- BLOCK_COMMENT("} kernel_crc32_1byte");
-}
-
/**
* @param crc register containing existing CRC (32-bit)
* @param buf register pointing to input byte buffer (byte*)
* @param len register containing number of bytes
- * @param table register pointing to CRC table
- * @param constants register pointing to CRC table for 128-bit aligned memory
- * @param barretConstants register pointing to table for barrett reduction
- * @param t0-t4 temp registers
+ * @param constants register pointing to precomputed constants
+ * @param t0-t6 temp registers
*/
-void MacroAssembler::kernel_crc32_1word_vpmsum(Register crc, Register buf, Register len, Register table,
- Register constants, Register barretConstants,
- Register t0, Register t1, Register t2, Register t3, Register t4,
- bool invertCRC) {
- assert_different_registers(crc, buf, len, table);
+void MacroAssembler::kernel_crc32_vpmsum(Register crc, Register buf, Register len, Register constants,
+ Register t0, Register t1, Register t2, Register t3,
+ Register t4, Register t5, Register t6, bool invertCRC) {
+ assert_different_registers(crc, buf, len, constants);
- Label L_alignedHead, L_tail;
+ Label L_tail;
- BLOCK_COMMENT("kernel_crc32_1word_vpmsum {");
+ BLOCK_COMMENT("kernel_crc32_vpmsum {");
- // 1. ~c
if (invertCRC) {
nand(crc, crc, crc); // 1s complement of crc
}
- // 2. use kernel_crc32_1word for short len
+ // Enforce 32 bit.
clrldi(len, len, 32);
- cmpdi(CCR0, len, 512);
- blt(CCR0, L_tail);
- // 3. calculate from 0 to first aligned address
- const int alignment = 16;
+ // Align if we have enough bytes for the fast version.
+ const int alignment = 16,
+ threshold = 32;
Register prealign = t0;
- andi_(prealign, buf, alignment - 1);
- beq(CCR0, L_alignedHead);
- subfic(prealign, prealign, alignment);
+ neg(prealign, buf);
+ addi(t1, len, -threshold);
+ andi(prealign, prealign, alignment - 1);
+ cmpw(CCR0, t1, prealign);
+ blt(CCR0, L_tail); // len - prealign < threshold?
subf(len, prealign, len);
- update_byteLoop_crc32(crc, buf, prealign, table, t2, false);
+ update_byteLoop_crc32(crc, buf, prealign, constants, t2, false);
- // 4. calculate from first aligned address as far as possible
- BIND(L_alignedHead);
- kernel_crc32_1word_aligned(crc, buf, len, constants, barretConstants, t0, t1, t2, t3, t4);
+ // Calculate from first aligned address as far as possible.
+ addi(constants, constants, CRC32_TABLE_SIZE); // Point to vector constants.
+ kernel_crc32_vpmsum_aligned(crc, buf, len, constants, t0, t1, t2, t3, t4, t5, t6);
+ addi(constants, constants, -CRC32_TABLE_SIZE); // Point to table again.
- // 5. remaining bytes
+ // Remaining bytes.
BIND(L_tail);
- Register tc0 = t4;
- Register tc1 = constants;
- Register tc2 = barretConstants;
- kernel_crc32_1word(crc, buf, len, table, t0, t1, t2, t3, tc0, tc1, tc2, table, false);
+ update_byteLoop_crc32(crc, buf, len, constants, t2, false);
- // 6. ~c
if (invertCRC) {
nand(crc, crc, crc); // 1s complement of crc
}
- BLOCK_COMMENT("} kernel_crc32_1word_vpmsum");
+ BLOCK_COMMENT("} kernel_crc32_vpmsum");
}
/**
@@ -4205,13 +4148,10 @@ void MacroAssembler::kernel_crc32_1word_vpmsum(Register crc, Register buf, Regis
* @param buf register pointing to input byte buffer (byte*)
* @param len register containing number of bytes (will get updated to remaining bytes)
* @param constants register pointing to CRC table for 128-bit aligned memory
- * @param barretConstants register pointing to table for barrett reduction
- * @param t0-t4 temp registers
- * Precondition: len should be >= 512. Otherwise, nothing will be done.
+ * @param t0-t6 temp registers
*/
-void MacroAssembler::kernel_crc32_1word_aligned(Register crc, Register buf, Register len,
- Register constants, Register barretConstants,
- Register t0, Register t1, Register t2, Register t3, Register t4) {
+void MacroAssembler::kernel_crc32_vpmsum_aligned(Register crc, Register buf, Register len, Register constants,
+ Register t0, Register t1, Register t2, Register t3, Register t4, Register t5, Register t6) {
// Save non-volatile vector registers (frameless).
Register offset = t1;
@@ -4227,8 +4167,6 @@ void MacroAssembler::kernel_crc32_1word_aligned(Register crc, Register buf, Regi
#endif
offsetInt -= 8; std(R14, offsetInt, R1_SP);
offsetInt -= 8; std(R15, offsetInt, R1_SP);
- offsetInt -= 8; std(R16, offsetInt, R1_SP);
- offsetInt -= 8; std(R17, offsetInt, R1_SP);
// Implementation uses an inner loop which uses between 256 and 16 * unroll_factor
// bytes per iteration. The basic scheme is:
@@ -4239,14 +4177,17 @@ void MacroAssembler::kernel_crc32_1word_aligned(Register crc, Register buf, Regi
// Outer loop performs the CRC shifts needed to combine the unroll_factor2 vectors.
// Using 16 * unroll_factor / unroll_factor_2 bytes for constants.
- const int unroll_factor = 2048;
- const int unroll_factor2 = 8;
+ const int unroll_factor = CRC32_UNROLL_FACTOR,
+ unroll_factor2 = CRC32_UNROLL_FACTOR2;
+
+ const int outer_consts_size = (unroll_factor2 - 1) * 16,
+ inner_consts_size = (unroll_factor / unroll_factor2) * 16;
// Support registers.
- Register offs[] = { noreg, t0, t1, t2, t3, t4, crc /* will live in VCRC */, R14 };
- Register num_bytes = R15,
- loop_count = R16,
- cur_const = R17;
+ Register offs[] = { noreg, t0, t1, t2, t3, t4, t5, t6 };
+ Register num_bytes = R14,
+ loop_count = R15,
+ cur_const = crc; // will live in VCRC
// Constant array for outer loop: unroll_factor2 - 1 registers,
// Constant array for inner loop: unroll_factor / unroll_factor2 registers.
VectorRegister consts0[] = { VR16, VR17, VR18, VR19, VR20, VR21, VR22 },
@@ -4268,7 +4209,7 @@ void MacroAssembler::kernel_crc32_1word_aligned(Register crc, Register buf, Regi
mtdscr(t0);
}
- mtvrwz(VCRC, crc); // crc lives lives in VCRC, now
+ mtvrwz(VCRC, crc); // crc lives in VCRC, now
for (int i = 1; i < unroll_factor2; ++i) {
li(offs[i], 16 * i);
@@ -4279,10 +4220,8 @@ void MacroAssembler::kernel_crc32_1word_aligned(Register crc, Register buf, Regi
for (int i = 1; i < unroll_factor2 - 1; ++i) {
lvx(consts0[i], offs[i], constants);
}
- addi(constants, constants, (unroll_factor2 - 1) * 16);
load_const_optimized(num_bytes, 16 * unroll_factor);
- load_const_optimized(loop_count, unroll_factor / (2 * unroll_factor2) - 1); // One double-iteration peeled off.
// Reuse data registers outside of the loop.
VectorRegister Vtmp = data1[0];
@@ -4310,13 +4249,15 @@ void MacroAssembler::kernel_crc32_1word_aligned(Register crc, Register buf, Regi
cmpd(CCR0, len, num_bytes);
blt(CCR0, L_last);
+ addi(cur_const, constants, outer_consts_size); // Point to consts for inner loop
+ load_const_optimized(loop_count, unroll_factor / (2 * unroll_factor2) - 1); // One double-iteration peeled off.
+
// ********** Main loop start **********
align(32);
bind(L_outer_loop);
// Begin of unrolled first iteration (no xor).
lvx(data1[0], buf);
- mr(cur_const, constants);
for (int i = 1; i < unroll_factor2 / 2; ++i) {
lvx(data1[i], offs[i], buf);
}
@@ -4369,6 +4310,8 @@ void MacroAssembler::kernel_crc32_1word_aligned(Register crc, Register buf, Regi
}
bdnz(L_inner_loop);
+ addi(cur_const, constants, outer_consts_size); // Reset
+
// Tail of last iteration (no loads).
for (int i = 0; i < unroll_factor2 / 2; ++i) {
BE_swap_bytes(data1[i + unroll_factor2 / 2]);
@@ -4397,15 +4340,15 @@ void MacroAssembler::kernel_crc32_1word_aligned(Register crc, Register buf, Regi
// Last chance with lower num_bytes.
bind(L_last);
srdi(loop_count, len, exact_log2(16 * 2 * unroll_factor2)); // Use double-iterations.
- add_const_optimized(constants, constants, 16 * (unroll_factor / unroll_factor2)); // Point behind last one.
+ // Point behind last const for inner loop.
+ add_const_optimized(cur_const, constants, outer_consts_size + inner_consts_size);
sldi(R0, loop_count, exact_log2(16 * 2)); // Bytes of constants to be used.
clrrdi(num_bytes, len, exact_log2(16 * 2 * unroll_factor2));
- subf(constants, R0, constants); // Point to constant to be used first.
+ subf(cur_const, R0, cur_const); // Point to constant to be used first.
addic_(loop_count, loop_count, -1); // One double-iteration peeled off.
bgt(CCR0, L_outer_loop);
// ********** Main loop end **********
-#undef BE_swap_bytes
// Restore DSCR pre-fetch value.
if (VM_Version::has_mfdscr()) {
@@ -4413,13 +4356,45 @@ void MacroAssembler::kernel_crc32_1word_aligned(Register crc, Register buf, Regi
mtdscr(t0);
}
+ // ********** Simple loop for remaining 16 byte blocks **********
+ {
+ Label L_loop, L_done;
+
+ srdi_(t0, len, 4); // 16 bytes per iteration
+ clrldi(len, len, 64-4);
+ beq(CCR0, L_done);
+
+ // Point to const (same as last const for inner loop).
+ add_const_optimized(cur_const, constants, outer_consts_size + inner_consts_size - 16);
+ mtctr(t0);
+ lvx(Vtmp2, cur_const);
+
+ align(32);
+ bind(L_loop);
+
+ lvx(Vtmp, buf);
+ addi(buf, buf, 16);
+ vpermxor(VCRC, VCRC, VCRC, Vc); // xor both halves to 64 bit result.
+ BE_swap_bytes(Vtmp);
+ vxor(VCRC, VCRC, Vtmp);
+ vpmsumw(VCRC, VCRC, Vtmp2);
+ bdnz(L_loop);
+
+ bind(L_done);
+ }
+ // ********** Simple loop end **********
+#undef BE_swap_bytes
+
+ // Point to Barrett constants
+ add_const_optimized(cur_const, constants, outer_consts_size + inner_consts_size);
+
vspltisb(zeroes, 0);
// Combine to 64 bit result.
vpermxor(VCRC, VCRC, VCRC, Vc); // xor both halves to 64 bit result.
// Reduce to 32 bit CRC: Remainder by multiply-high.
- lvx(Vtmp, barretConstants);
+ lvx(Vtmp, cur_const);
vsldoi(Vtmp2, zeroes, VCRC, 12); // Extract high 32 bit.
vpmsumd(Vtmp2, Vtmp2, Vtmp); // Multiply by inverse long poly.
vsldoi(Vtmp2, zeroes, Vtmp2, 12); // Extract high 32 bit.
@@ -4444,23 +4419,17 @@ void MacroAssembler::kernel_crc32_1word_aligned(Register crc, Register buf, Regi
#endif
offsetInt -= 8; ld(R14, offsetInt, R1_SP);
offsetInt -= 8; ld(R15, offsetInt, R1_SP);
- offsetInt -= 8; ld(R16, offsetInt, R1_SP);
- offsetInt -= 8; ld(R17, offsetInt, R1_SP);
}
-void MacroAssembler::kernel_crc32_singleByte(Register crc, Register buf, Register len, Register table, Register tmp, bool invertCRC) {
- assert_different_registers(crc, buf, /* len, not used!! */ table, tmp);
+void MacroAssembler::crc32(Register crc, Register buf, Register len, Register t0, Register t1, Register t2,
+ Register t3, Register t4, Register t5, Register t6, Register t7, bool is_crc32c) {
+ load_const_optimized(t0, is_crc32c ? StubRoutines::crc32c_table_addr()
+ : StubRoutines::crc_table_addr() , R0);
- BLOCK_COMMENT("kernel_crc32_singleByte:");
- if (invertCRC) {
- nand(crc, crc, crc); // 1s complement of crc
- }
-
- lbz(tmp, 0, buf); // Byte from buffer, zero-extended.
- update_byte_crc32(crc, tmp, table);
-
- if (invertCRC) {
- nand(crc, crc, crc); // 1s complement of crc
+ if (VM_Version::has_vpmsumb()) {
+ kernel_crc32_vpmsum(crc, buf, len, t0, t1, t2, t3, t4, t5, t6, t7, !is_crc32c);
+ } else {
+ kernel_crc32_1word(crc, buf, len, t0, t1, t2, t3, t4, t5, t6, t7, t0, !is_crc32c);
}
}
diff --git a/src/hotspot/cpu/ppc/macroAssembler_ppc.hpp b/src/hotspot/cpu/ppc/macroAssembler_ppc.hpp
index ec589f87ade..f16538c1682 100644
--- a/src/hotspot/cpu/ppc/macroAssembler_ppc.hpp
+++ b/src/hotspot/cpu/ppc/macroAssembler_ppc.hpp
@@ -1,6 +1,6 @@
/*
- * Copyright (c) 2002, 2018, Oracle and/or its affiliates. All rights reserved.
- * Copyright (c) 2012, 2018, SAP SE. All rights reserved.
+ * Copyright (c) 2002, 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2019, SAP SE. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -23,8 +23,8 @@
*
*/
-#ifndef CPU_PPC_VM_MACROASSEMBLER_PPC_HPP
-#define CPU_PPC_VM_MACROASSEMBLER_PPC_HPP
+#ifndef CPU_PPC_MACROASSEMBLER_PPC_HPP
+#define CPU_PPC_MACROASSEMBLER_PPC_HPP
#include "asm/assembler.hpp"
#include "oops/accessDecorators.hpp"
@@ -828,7 +828,6 @@ class MacroAssembler: public Assembler {
void load_reverse_32(Register dst, Register src);
int crc32_table_columns(Register table, Register tc0, Register tc1, Register tc2, Register tc3);
void fold_byte_crc32(Register crc, Register val, Register table, Register tmp);
- void fold_8bit_crc32(Register crc, Register table, Register tmp);
void update_byte_crc32(Register crc, Register val, Register table);
void update_byteLoop_crc32(Register crc, Register buf, Register len, Register table,
Register data, bool loopAlignment);
@@ -839,19 +838,16 @@ class MacroAssembler: public Assembler {
Register t0, Register t1, Register t2, Register t3,
Register tc0, Register tc1, Register tc2, Register tc3,
bool invertCRC);
- void kernel_crc32_1byte(Register crc, Register buf, Register len, Register table,
- Register t0, Register t1, Register t2, Register t3,
- bool invertCRC);
- void kernel_crc32_1word_vpmsum(Register crc, Register buf, Register len, Register table,
- Register constants, Register barretConstants,
- Register t0, Register t1, Register t2, Register t3, Register t4,
- bool invertCRC);
- void kernel_crc32_1word_aligned(Register crc, Register buf, Register len,
- Register constants, Register barretConstants,
- Register t0, Register t1, Register t2, Register t3, Register t4);
+ void kernel_crc32_vpmsum(Register crc, Register buf, Register len, Register constants,
+ Register t0, Register t1, Register t2, Register t3, Register t4,
+ Register t5, Register t6, bool invertCRC);
+ void kernel_crc32_vpmsum_aligned(Register crc, Register buf, Register len, Register constants,
+ Register t0, Register t1, Register t2, Register t3, Register t4,
+ Register t5, Register t6);
+ // Version which internally decides what to use.
+ void crc32(Register crc, Register buf, Register len, Register t0, Register t1, Register t2,
+ Register t3, Register t4, Register t5, Register t6, Register t7, bool is_crc32c);
- void kernel_crc32_singleByte(Register crc, Register buf, Register len, Register table, Register tmp,
- bool invertCRC);
void kernel_crc32_singleByteReg(Register crc, Register val, Register table,
bool invertCRC);
@@ -970,4 +966,4 @@ class SkipIfEqualZero : public StackObj {
~SkipIfEqualZero();
};
-#endif // CPU_PPC_VM_MACROASSEMBLER_PPC_HPP
+#endif // CPU_PPC_MACROASSEMBLER_PPC_HPP
diff --git a/src/hotspot/cpu/ppc/macroAssembler_ppc.inline.hpp b/src/hotspot/cpu/ppc/macroAssembler_ppc.inline.hpp
index e73e448edb6..e5eee458aa4 100644
--- a/src/hotspot/cpu/ppc/macroAssembler_ppc.inline.hpp
+++ b/src/hotspot/cpu/ppc/macroAssembler_ppc.inline.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2002, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2019, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2012, 2015 SAP SE. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
@@ -23,8 +23,8 @@
*
*/
-#ifndef CPU_PPC_VM_MACROASSEMBLER_PPC_INLINE_HPP
-#define CPU_PPC_VM_MACROASSEMBLER_PPC_INLINE_HPP
+#ifndef CPU_PPC_MACROASSEMBLER_PPC_INLINE_HPP
+#define CPU_PPC_MACROASSEMBLER_PPC_INLINE_HPP
#include "asm/assembler.inline.hpp"
#include "asm/macroAssembler.hpp"
@@ -480,4 +480,4 @@ inline address MacroAssembler::function_entry() { return pc(); }
inline address MacroAssembler::function_entry() { return emit_fd(); }
#endif
-#endif // CPU_PPC_VM_MACROASSEMBLER_PPC_INLINE_HPP
+#endif // CPU_PPC_MACROASSEMBLER_PPC_INLINE_HPP
diff --git a/src/hotspot/cpu/ppc/nativeInst_ppc.hpp b/src/hotspot/cpu/ppc/nativeInst_ppc.hpp
index 5d74962b488..cff865f5ba3 100644
--- a/src/hotspot/cpu/ppc/nativeInst_ppc.hpp
+++ b/src/hotspot/cpu/ppc/nativeInst_ppc.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2002, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2019, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2012, 2018 SAP SE. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
@@ -23,8 +23,8 @@
*
*/
-#ifndef CPU_PPC_VM_NATIVEINST_PPC_HPP
-#define CPU_PPC_VM_NATIVEINST_PPC_HPP
+#ifndef CPU_PPC_NATIVEINST_PPC_HPP
+#define CPU_PPC_NATIVEINST_PPC_HPP
#include "asm/macroAssembler.hpp"
#include "runtime/icache.hpp"
@@ -503,4 +503,4 @@ class NativeMovRegMem: public NativeInstruction {
}
};
-#endif // CPU_PPC_VM_NATIVEINST_PPC_HPP
+#endif // CPU_PPC_NATIVEINST_PPC_HPP
diff --git a/src/hotspot/cpu/ppc/registerMap_ppc.hpp b/src/hotspot/cpu/ppc/registerMap_ppc.hpp
index 06fdff2e891..8da66240938 100644
--- a/src/hotspot/cpu/ppc/registerMap_ppc.hpp
+++ b/src/hotspot/cpu/ppc/registerMap_ppc.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2000, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2019, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2012, 2013 SAP SE. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
@@ -23,8 +23,8 @@
*
*/
-#ifndef CPU_PPC_VM_REGISTERMAP_PPC_HPP
-#define CPU_PPC_VM_REGISTERMAP_PPC_HPP
+#ifndef CPU_PPC_REGISTERMAP_PPC_HPP
+#define CPU_PPC_REGISTERMAP_PPC_HPP
// machine-dependent implemention for register maps
friend class frame;
@@ -42,4 +42,4 @@
void pd_initialize() {}
void pd_initialize_from(const RegisterMap* map) {}
-#endif // CPU_PPC_VM_REGISTERMAP_PPC_HPP
+#endif // CPU_PPC_REGISTERMAP_PPC_HPP
diff --git a/src/hotspot/cpu/ppc/register_ppc.hpp b/src/hotspot/cpu/ppc/register_ppc.hpp
index 937767c74f3..87b82fb0952 100644
--- a/src/hotspot/cpu/ppc/register_ppc.hpp
+++ b/src/hotspot/cpu/ppc/register_ppc.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2000, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2019, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2012, 2018 SAP SE. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
@@ -23,8 +23,8 @@
*
*/
-#ifndef CPU_PPC_VM_REGISTER_PPC_HPP
-#define CPU_PPC_VM_REGISTER_PPC_HPP
+#ifndef CPU_PPC_REGISTER_PPC_HPP
+#define CPU_PPC_REGISTER_PPC_HPP
#include "asm/register.hpp"
@@ -818,4 +818,4 @@ REGISTER_DECLARATION(Register, R12_scratch2, R12);
#define R12_scratch2 AS_REGISTER(Register, R12)
#endif
-#endif // CPU_PPC_VM_REGISTER_PPC_HPP
+#endif // CPU_PPC_REGISTER_PPC_HPP
diff --git a/src/hotspot/cpu/ppc/relocInfo_ppc.hpp b/src/hotspot/cpu/ppc/relocInfo_ppc.hpp
index ba45be36498..f3c14c800c3 100644
--- a/src/hotspot/cpu/ppc/relocInfo_ppc.hpp
+++ b/src/hotspot/cpu/ppc/relocInfo_ppc.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2019, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2012, 2018 SAP SE. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
@@ -23,8 +23,8 @@
*
*/
-#ifndef CPU_PPC_VM_RELOCINFO_PPC_HPP
-#define CPU_PPC_VM_RELOCINFO_PPC_HPP
+#ifndef CPU_PPC_RELOCINFO_PPC_HPP
+#define CPU_PPC_RELOCINFO_PPC_HPP
// machine-dependent parts of class relocInfo
private:
@@ -49,4 +49,4 @@
// listed in the oop section.
static bool mustIterateImmediateOopsInCode() { return false; }
-#endif // CPU_PPC_VM_RELOCINFO_PPC_HPP
+#endif // CPU_PPC_RELOCINFO_PPC_HPP
diff --git a/src/hotspot/cpu/ppc/stubGenerator_ppc.cpp b/src/hotspot/cpu/ppc/stubGenerator_ppc.cpp
index 4bcd22e0a7e..3946026370d 100644
--- a/src/hotspot/cpu/ppc/stubGenerator_ppc.cpp
+++ b/src/hotspot/cpu/ppc/stubGenerator_ppc.cpp
@@ -1,6 +1,6 @@
/*
- * Copyright (c) 1997, 2018, Oracle and/or its affiliates. All rights reserved.
- * Copyright (c) 2012, 2018, SAP SE. All rights reserved.
+ * Copyright (c) 1997, 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2019, SAP SE. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -269,7 +269,7 @@ class StubGenerator: public StubCodeGenerator {
// when called via a c2i.
// Pass initial_caller_sp to framemanager.
- __ mr(R21_tmp1, R1_SP);
+ __ mr(R21_sender_SP, R1_SP);
// Do a light-weight C-call here, r_new_arg_entry holds the address
// of the interpreter entry point (frame manager or native entry)
@@ -3186,35 +3186,6 @@ class StubGenerator: public StubCodeGenerator {
return start;
}
-
- // Compute CRC32/CRC32C function.
- void generate_CRC_updateBytes(const char* name, Register table, bool invertCRC) {
-
- // arguments to kernel_crc32:
- const Register crc = R3_ARG1; // Current checksum, preset by caller or result from previous call.
- const Register data = R4_ARG2; // source byte array
- const Register dataLen = R5_ARG3; // #bytes to process
-
- const Register t0 = R2;
- const Register t1 = R7;
- const Register t2 = R8;
- const Register t3 = R9;
- const Register tc0 = R10;
- const Register tc1 = R11;
- const Register tc2 = R12;
-
- BLOCK_COMMENT("Stub body {");
- assert_different_registers(crc, data, dataLen, table);
-
- __ kernel_crc32_1word(crc, data, dataLen, table, t0, t1, t2, t3, tc0, tc1, tc2, table, invertCRC);
-
- BLOCK_COMMENT("return");
- __ mr_if_needed(R3_RET, crc); // Updated crc is function result. No copying required (R3_ARG1 == R3_RET).
- __ blr();
-
- BLOCK_COMMENT("} Stub body");
- }
-
/**
* Arguments:
*
@@ -3492,111 +3463,15 @@ class StubGenerator: public StubCodeGenerator {
* R3_RET - int crc result
*/
// Compute CRC32 function.
- address generate_CRC32_updateBytes(const char* name) {
+ address generate_CRC32_updateBytes(bool is_crc32c) {
__ align(CodeEntryAlignment);
- StubCodeMark mark(this, "StubRoutines", name);
+ StubCodeMark mark(this, "StubRoutines", is_crc32c ? "CRC32C_updateBytes" : "CRC32_updateBytes");
address start = __ function_entry(); // Remember stub start address (is rtn value).
-
- const Register table = R6; // crc table address
-
- // arguments to kernel_crc32:
- const Register crc = R3_ARG1; // Current checksum, preset by caller or result from previous call.
- const Register data = R4_ARG2; // source byte array
- const Register dataLen = R5_ARG3; // #bytes to process
-
- if (VM_Version::has_vpmsumb()) {
- const Register constants = R2; // constants address
- const Register bconstants = R8; // barret table address
-
- const Register t0 = R9;
- const Register t1 = R10;
- const Register t2 = R11;
- const Register t3 = R12;
- const Register t4 = R7;
-
- BLOCK_COMMENT("Stub body {");
- assert_different_registers(crc, data, dataLen, table);
-
- StubRoutines::ppc64::generate_load_crc_table_addr(_masm, table);
- StubRoutines::ppc64::generate_load_crc_constants_addr(_masm, constants);
- StubRoutines::ppc64::generate_load_crc_barret_constants_addr(_masm, bconstants);
-
- __ kernel_crc32_1word_vpmsum(crc, data, dataLen, table, constants, bconstants, t0, t1, t2, t3, t4, true);
-
- BLOCK_COMMENT("return");
- __ mr_if_needed(R3_RET, crc); // Updated crc is function result. No copying required (R3_ARG1 == R3_RET).
- __ blr();
-
- BLOCK_COMMENT("} Stub body");
- } else {
- StubRoutines::ppc64::generate_load_crc_table_addr(_masm, table);
- generate_CRC_updateBytes(name, table, true);
- }
-
+ __ crc32(R3_ARG1, R4_ARG2, R5_ARG3, R2, R6, R7, R8, R9, R10, R11, R12, is_crc32c);
+ __ blr();
return start;
}
-
- /**
- * Arguments:
- *
- * Inputs:
- * R3_ARG1 - int crc
- * R4_ARG2 - byte* buf
- * R5_ARG3 - int length (of buffer)
- *
- * scratch:
- * R2, R6-R12
- *
- * Ouput:
- * R3_RET - int crc result
- */
- // Compute CRC32C function.
- address generate_CRC32C_updateBytes(const char* name) {
- __ align(CodeEntryAlignment);
- StubCodeMark mark(this, "StubRoutines", name);
- address start = __ function_entry(); // Remember stub start address (is rtn value).
-
- const Register table = R6; // crc table address
-
- // arguments to kernel_crc32:
- const Register crc = R3_ARG1; // Current checksum, preset by caller or result from previous call.
- const Register data = R4_ARG2; // source byte array
- const Register dataLen = R5_ARG3; // #bytes to process
-
- if (VM_Version::has_vpmsumb()) {
- const Register constants = R2; // constants address
- const Register bconstants = R8; // barret table address
-
- const Register t0 = R9;
- const Register t1 = R10;
- const Register t2 = R11;
- const Register t3 = R12;
- const Register t4 = R7;
-
- BLOCK_COMMENT("Stub body {");
- assert_different_registers(crc, data, dataLen, table);
-
- StubRoutines::ppc64::generate_load_crc32c_table_addr(_masm, table);
- StubRoutines::ppc64::generate_load_crc32c_constants_addr(_masm, constants);
- StubRoutines::ppc64::generate_load_crc32c_barret_constants_addr(_masm, bconstants);
-
- __ kernel_crc32_1word_vpmsum(crc, data, dataLen, table, constants, bconstants, t0, t1, t2, t3, t4, false);
-
- BLOCK_COMMENT("return");
- __ mr_if_needed(R3_RET, crc); // Updated crc is function result. No copying required (R3_ARG1 == R3_RET).
- __ blr();
-
- BLOCK_COMMENT("} Stub body");
- } else {
- StubRoutines::ppc64::generate_load_crc32c_table_addr(_masm, table);
- generate_CRC_updateBytes(name, table, false);
- }
-
- return start;
- }
-
-
// Initialization
void generate_initial() {
// Generates all stubs and initializes the entry points
@@ -3621,14 +3496,14 @@ class StubGenerator: public StubCodeGenerator {
// CRC32 Intrinsics.
if (UseCRC32Intrinsics) {
- StubRoutines::_crc_table_adr = (address)StubRoutines::ppc64::_crc_table;
- StubRoutines::_updateBytesCRC32 = generate_CRC32_updateBytes("CRC32_updateBytes");
+ StubRoutines::_crc_table_adr = StubRoutines::generate_crc_constants(REVERSE_CRC32_POLY);
+ StubRoutines::_updateBytesCRC32 = generate_CRC32_updateBytes(false);
}
// CRC32C Intrinsics.
if (UseCRC32CIntrinsics) {
- StubRoutines::_crc32c_table_addr = (address)StubRoutines::ppc64::_crc32c_table;
- StubRoutines::_updateBytesCRC32C = generate_CRC32C_updateBytes("CRC32C_updateBytes");
+ StubRoutines::_crc32c_table_addr = StubRoutines::generate_crc_constants(REVERSE_CRC32C_POLY);
+ StubRoutines::_updateBytesCRC32C = generate_CRC32_updateBytes(true);
}
}
diff --git a/src/hotspot/cpu/ppc/stubRoutines_ppc.hpp b/src/hotspot/cpu/ppc/stubRoutines_ppc.hpp
index 2aa6ffc0fd2..f22e86fc500 100644
--- a/src/hotspot/cpu/ppc/stubRoutines_ppc.hpp
+++ b/src/hotspot/cpu/ppc/stubRoutines_ppc.hpp
@@ -1,6 +1,6 @@
/*
- * Copyright (c) 2002, 2018, Oracle and/or its affiliates. All rights reserved.
- * Copyright (c) 2012, 2018, SAP SE. All rights reserved.
+ * Copyright (c) 2002, 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2019, SAP SE. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -23,8 +23,8 @@
*
*/
-#ifndef CPU_PPC_VM_STUBROUTINES_PPC_HPP
-#define CPU_PPC_VM_STUBROUTINES_PPC_HPP
+#ifndef CPU_PPC_STUBROUTINES_PPC_HPP
+#define CPU_PPC_STUBROUTINES_PPC_HPP
// This file holds the platform specific parts of the StubRoutines
// definition. See stubRoutines.hpp for a description on how to
@@ -38,38 +38,14 @@ enum platform_dependent_constants {
};
// CRC32 Intrinsics.
-#define CRC32_COLUMN_SIZE 256
-#define CRC32_BYFOUR
-#ifdef CRC32_BYFOUR
- #define CRC32_TABLES 8
-#else
- #define CRC32_TABLES 1
-#endif
-#define CRC32_CONSTANTS_SIZE 1084
-#define CRC32_BARRET_CONSTANTS 10
+#define CRC32_TABLE_SIZE (4 * 256)
+#define REVERSE_CRC32_POLY 0xEDB88320
+#define REVERSE_CRC32C_POLY 0x82F63B78
+#define INVERSE_REVERSE_CRC32_POLY 0x1aab14226ull
+#define INVERSE_REVERSE_CRC32C_POLY 0x105fd79bdull
+#define CRC32_UNROLL_FACTOR 2048
+#define CRC32_UNROLL_FACTOR2 8
-class ppc64 {
- friend class StubGenerator;
+static address generate_crc_constants(juint reverse_poly);
- private:
-
- // CRC32 Intrinsics.
- static juint _crc_table[CRC32_TABLES][CRC32_COLUMN_SIZE];
- static juint _crc32c_table[CRC32_TABLES][CRC32_COLUMN_SIZE];
- static juint *_crc_constants, *_crc_barret_constants;
- static juint *_crc32c_constants, *_crc32c_barret_constants;
-
- public:
-
- // CRC32 Intrinsics.
- static void generate_load_crc_table_addr(MacroAssembler* masm, Register table);
- static void generate_load_crc_constants_addr(MacroAssembler* masm, Register table);
- static void generate_load_crc_barret_constants_addr(MacroAssembler* masm, Register table);
- static void generate_load_crc32c_table_addr(MacroAssembler* masm, Register table);
- static void generate_load_crc32c_constants_addr(MacroAssembler* masm, Register table);
- static void generate_load_crc32c_barret_constants_addr(MacroAssembler* masm, Register table);
- static juint* generate_crc_constants(juint reverse_poly);
- static juint* generate_crc_barret_constants(juint reverse_poly);
-};
-
-#endif // CPU_PPC_VM_STUBROUTINES_PPC_HPP
+#endif // CPU_PPC_STUBROUTINES_PPC_HPP
diff --git a/src/hotspot/cpu/ppc/stubRoutines_ppc_64.cpp b/src/hotspot/cpu/ppc/stubRoutines_ppc_64.cpp
index 15d3ebb64a3..2c7b3b137df 100644
--- a/src/hotspot/cpu/ppc/stubRoutines_ppc_64.cpp
+++ b/src/hotspot/cpu/ppc/stubRoutines_ppc_64.cpp
@@ -1,6 +1,6 @@
/*
- * Copyright (c) 2002, 2018, Oracle and/or its affiliates. All rights reserved.
- * Copyright (c) 2012, 2018, SAP SE. All rights reserved.
+ * Copyright (c) 2002, 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2019, SAP SE. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -26,6 +26,7 @@
#include "precompiled.hpp"
#include "asm/macroAssembler.inline.hpp"
#include "runtime/stubRoutines.hpp"
+#include "runtime/vm_version.hpp"
// Implementation of the platform-specific part of StubRoutines - for
// a description of how to extend it, see the stubRoutines.hpp file.
@@ -33,39 +34,15 @@
#define __ masm->
-// CRC32(C) Intrinsics.
-void StubRoutines::ppc64::generate_load_crc_table_addr(MacroAssembler* masm, Register table) {
- __ load_const_optimized(table, StubRoutines::_crc_table_adr, R0);
+// CRC constant compute functions
+static juint fold_byte(juint w, juint reverse_poly) {
+ for (int i = 0; i < 8; i++) {
+ int poly_if_odd = (-(w & 1)) & reverse_poly;
+ w = (w >> 1) ^ poly_if_odd;
+ }
+ return w;
}
-void StubRoutines::ppc64::generate_load_crc_constants_addr(MacroAssembler* masm, Register table) {
- __ load_const_optimized(table, (address)StubRoutines::ppc64::_crc_constants, R0);
-}
-
-void StubRoutines::ppc64::generate_load_crc_barret_constants_addr(MacroAssembler* masm, Register table) {
- __ load_const_optimized(table, (address)StubRoutines::ppc64::_crc_barret_constants, R0);
-}
-
-void StubRoutines::ppc64::generate_load_crc32c_table_addr(MacroAssembler* masm, Register table) {
- __ load_const_optimized(table, StubRoutines::_crc32c_table_addr, R0);
-}
-
-void StubRoutines::ppc64::generate_load_crc32c_constants_addr(MacroAssembler* masm, Register table) {
- __ load_const_optimized(table, (address)StubRoutines::ppc64::_crc32c_constants, R0);
-}
-
-void StubRoutines::ppc64::generate_load_crc32c_barret_constants_addr(MacroAssembler* masm, Register table) {
- __ load_const_optimized(table, (address)StubRoutines::ppc64::_crc32c_barret_constants, R0);
-}
-
-// CRC constants and compute functions
-#define REVERSE_CRC32_POLY 0xEDB88320
-#define REVERSE_CRC32C_POLY 0x82F63B78
-#define INVERSE_REVERSE_CRC32_POLY 0x1aab14226ull
-#define INVERSE_REVERSE_CRC32C_POLY 0x105fd79bdull
-#define UNROLL_FACTOR 2048
-#define UNROLL_FACTOR2 8
-
static juint fold_word(juint w, juint reverse_poly) {
for (int i = 0; i < 32; i++) {
int poly_if_odd = (-(w & 1)) & reverse_poly;
@@ -96,42 +73,102 @@ static julong compute_inverse_poly(julong long_poly) {
return div;
}
+#ifndef VM_LITTLE_ENDIAN
+static void reverse_bytes(juint &w) {
+ w = ((w >> 24) & 0xFF) | (((w >> 16) & 0xFF) << 8) | (((w >> 8) & 0xFF) << 16) | ((w & 0xFF) << 24);
+}
+#endif
+
// Constants to fold n words as needed by macroAssembler.
-juint* StubRoutines::ppc64::generate_crc_constants(juint reverse_poly) {
- juint* ptr = (juint*) malloc(sizeof(juint) * 4 * (UNROLL_FACTOR2 - 1 + UNROLL_FACTOR / UNROLL_FACTOR2));
- guarantee(((intptr_t)ptr & 0xF) == 0, "16-byte alignment needed");
- guarantee(ptr != NULL, "allocation error of a crc table");
+address StubRoutines::generate_crc_constants(juint reverse_poly) {
+ // Layout of constant table:
+ // <= Power7 Little Endian: 4 tables for byte folding
+ // <= Power7 Big Endian: 1 table for single byte folding + 4 tables for multi-byte folding
+ // >= Power8: 1 table for single byte folding + constants for fast vector implementation
+ const bool use_vector = VM_Version::has_vpmsumb();
+ const int vector_size = 16 * (CRC32_UNROLL_FACTOR2 + CRC32_UNROLL_FACTOR / CRC32_UNROLL_FACTOR2);
+
+ const int size = use_vector ? CRC32_TABLE_SIZE + vector_size : (4 BIG_ENDIAN_ONLY(+1)) * CRC32_TABLE_SIZE;
+ const address consts = (address)malloc(size);
+ if (consts == NULL) {
+ vm_exit_out_of_memory(size, OOM_MALLOC_ERROR, "CRC constants: no enough space");
+ }
+ juint* ptr = (juint*)consts;
+
+ // Simple table used for single byte folding
+ LITTLE_ENDIAN_ONLY(if (use_vector)) {
+ for (int i = 0; i < 256; ++i) {
+ ptr[i] = fold_byte(i, reverse_poly);
+ }
+ }
+
+ if (!use_vector) {
+ BIG_ENDIAN_ONLY(ptr = (juint*)(consts + CRC32_TABLE_SIZE);)
+ // <= Power7: 4 tables
+ for (int i = 0; i < 256; ++i) {
+ juint a = fold_byte(i, reverse_poly),
+ b = fold_byte(a, reverse_poly),
+ c = fold_byte(b, reverse_poly),
+ d = fold_byte(c, reverse_poly);
+#ifndef VM_LITTLE_ENDIAN
+ reverse_bytes(a);
+ reverse_bytes(b);
+ reverse_bytes(c);
+ reverse_bytes(d);
+#endif
+ ptr[i ] = a;
+ ptr[i + 256] = b;
+ ptr[i + 2* 256] = c;
+ ptr[i + 3* 256] = d;
+ }
+#if 0
+ for (int i = 0; i < 4; ++i) {
+ tty->print_cr("table %d:", i);
+ for (int j = 0; j < 32; ++j) {
+ for (int k = 0; k < 8; ++k) {
+ tty->print("%08x ", ptr[i*256 + j*8 + k]);
+ }
+ tty->cr();
+ }
+ }
+#endif
+ return consts;
+ }
+
+ // >= Power8: vector constants
+ juint* ptr1 = (juint*)(consts + CRC32_TABLE_SIZE);
+ guarantee(((intptr_t)ptr1 & 0xF) == 0, "16-byte alignment needed");
// Generate constants for outer loop
juint v0, v1, v2, v3 = 1;
- for (int i = 0; i < UNROLL_FACTOR2 - 1; ++i) {
+ for (int i = 0; i < CRC32_UNROLL_FACTOR2 - 1; ++i) {
v0 = fold_word(v3, reverse_poly);
v1 = fold_word(v0, reverse_poly);
v2 = fold_word(v1, reverse_poly);
v3 = fold_word(v2, reverse_poly);
#ifdef VM_LITTLE_ENDIAN
- ptr[4*i ] = v3;
- ptr[4*i+1] = v2;
- ptr[4*i+2] = v3;
- ptr[4*i+3] = v2;
+ ptr1[4*i ] = v3;
+ ptr1[4*i+1] = v2;
+ ptr1[4*i+2] = v3;
+ ptr1[4*i+3] = v2;
#else
- ptr[4*i ] = v2;
- ptr[4*i+1] = v3;
- ptr[4*i+2] = v2;
- ptr[4*i+3] = v3;
+ ptr1[4*i ] = v2;
+ ptr1[4*i+1] = v3;
+ ptr1[4*i+2] = v2;
+ ptr1[4*i+3] = v3;
#endif
}
// Generate constants for inner loop
- juint* ptr2 = ptr + 4 * (UNROLL_FACTOR2 - 1);
+ juint* ptr2 = ptr1 + 4 * (CRC32_UNROLL_FACTOR2 - 1);
v3 = 1; // Restart from scratch.
- for (int i = 0; i < UNROLL_FACTOR; ++i) {
+ for (int i = 0; i < CRC32_UNROLL_FACTOR; ++i) {
v0 = fold_word(v3, reverse_poly);
v1 = fold_word(v0, reverse_poly);
v2 = fold_word(v1, reverse_poly);
v3 = fold_word(v2, reverse_poly);
- if (i % UNROLL_FACTOR2 == 0) {
- int idx = UNROLL_FACTOR / UNROLL_FACTOR2 - 1 - i / UNROLL_FACTOR2;
+ if (i % CRC32_UNROLL_FACTOR2 == 0) {
+ int idx = CRC32_UNROLL_FACTOR / CRC32_UNROLL_FACTOR2 - 1 - i / CRC32_UNROLL_FACTOR2;
for (int j = 0; j < 4; ++j) {
#ifdef VM_LITTLE_ENDIAN
ptr2[4*idx ] = v3;
@@ -148,16 +185,9 @@ juint* StubRoutines::ppc64::generate_crc_constants(juint reverse_poly) {
}
}
- return ptr;
-}
-
-// Constants to reduce 64 to 32 bit as needed by macroAssembler.
-juint* StubRoutines::ppc64::generate_crc_barret_constants(juint reverse_poly) {
- juint* ptr = (juint*) malloc(sizeof(juint) * CRC32_BARRET_CONSTANTS);
- guarantee(((intptr_t)ptr & 0xF) == 0, "16-byte alignment needed");
- guarantee(ptr != NULL, "allocation error of a crc table");
-
- julong* c = (julong*)ptr;
+ // Constants to reduce 64 to 32 bit as needed by macroAssembler.
+ juint* ptr3 = ptr2 + 4 * (CRC32_UNROLL_FACTOR / CRC32_UNROLL_FACTOR2);
+ julong* c = (julong*)ptr3;
julong long_poly = (((julong)reverse_poly) << 1) | 1;
julong inverse_long_poly = compute_inverse_poly(long_poly);
#ifdef VM_LITTLE_ENDIAN
@@ -177,603 +207,6 @@ juint* StubRoutines::ppc64::generate_crc_barret_constants(juint reverse_poly) {
#endif
//printf("inv poly: 0x%016llx\n", (long long unsigned int)inverse_long_poly);
- return ptr;
+
+ return consts;
}
-
-// CRC32 Intrinsics.
-/**
- * crc_table[] from jdk/src/share/native/java/util/zip/zlib-1.2.8/crc32.h
- */
-juint StubRoutines::ppc64::_crc_table[CRC32_TABLES][CRC32_COLUMN_SIZE] = {
- /* polyBits = 7976584769 0x00000001db710641L, shifted = 0xedb88320 */
- /* CRC32 table for single bytes, auto-generated. DO NOT MODIFY! */
- /* CRC32 table 0 for quad-bytes (little-endian), auto-generated. DO NOT MODIFY! */
- {
- /* 0 */ 0x00000000U, 0x77073096U, 0xee0e612cU, 0x990951baU, 0x076dc419U, 0x706af48fU, 0xe963a535U, 0x9e6495a3U
- /* 8 */ , 0x0edb8832U, 0x79dcb8a4U, 0xe0d5e91eU, 0x97d2d988U, 0x09b64c2bU, 0x7eb17cbdU, 0xe7b82d07U, 0x90bf1d91U
- /* 16 */ , 0x1db71064U, 0x6ab020f2U, 0xf3b97148U, 0x84be41deU, 0x1adad47dU, 0x6ddde4ebU, 0xf4d4b551U, 0x83d385c7U
- /* 24 */ , 0x136c9856U, 0x646ba8c0U, 0xfd62f97aU, 0x8a65c9ecU, 0x14015c4fU, 0x63066cd9U, 0xfa0f3d63U, 0x8d080df5U
- /* 32 */ , 0x3b6e20c8U, 0x4c69105eU, 0xd56041e4U, 0xa2677172U, 0x3c03e4d1U, 0x4b04d447U, 0xd20d85fdU, 0xa50ab56bU
- /* 40 */ , 0x35b5a8faU, 0x42b2986cU, 0xdbbbc9d6U, 0xacbcf940U, 0x32d86ce3U, 0x45df5c75U, 0xdcd60dcfU, 0xabd13d59U
- /* 48 */ , 0x26d930acU, 0x51de003aU, 0xc8d75180U, 0xbfd06116U, 0x21b4f4b5U, 0x56b3c423U, 0xcfba9599U, 0xb8bda50fU
- /* 56 */ , 0x2802b89eU, 0x5f058808U, 0xc60cd9b2U, 0xb10be924U, 0x2f6f7c87U, 0x58684c11U, 0xc1611dabU, 0xb6662d3dU
- /* 64 */ , 0x76dc4190U, 0x01db7106U, 0x98d220bcU, 0xefd5102aU, 0x71b18589U, 0x06b6b51fU, 0x9fbfe4a5U, 0xe8b8d433U
- /* 72 */ , 0x7807c9a2U, 0x0f00f934U, 0x9609a88eU, 0xe10e9818U, 0x7f6a0dbbU, 0x086d3d2dU, 0x91646c97U, 0xe6635c01U
- /* 80 */ , 0x6b6b51f4U, 0x1c6c6162U, 0x856530d8U, 0xf262004eU, 0x6c0695edU, 0x1b01a57bU, 0x8208f4c1U, 0xf50fc457U
- /* 88 */ , 0x65b0d9c6U, 0x12b7e950U, 0x8bbeb8eaU, 0xfcb9887cU, 0x62dd1ddfU, 0x15da2d49U, 0x8cd37cf3U, 0xfbd44c65U
- /* 96 */ , 0x4db26158U, 0x3ab551ceU, 0xa3bc0074U, 0xd4bb30e2U, 0x4adfa541U, 0x3dd895d7U, 0xa4d1c46dU, 0xd3d6f4fbU
- /* 104 */ , 0x4369e96aU, 0x346ed9fcU, 0xad678846U, 0xda60b8d0U, 0x44042d73U, 0x33031de5U, 0xaa0a4c5fU, 0xdd0d7cc9U
- /* 112 */ , 0x5005713cU, 0x270241aaU, 0xbe0b1010U, 0xc90c2086U, 0x5768b525U, 0x206f85b3U, 0xb966d409U, 0xce61e49fU
- /* 120 */ , 0x5edef90eU, 0x29d9c998U, 0xb0d09822U, 0xc7d7a8b4U, 0x59b33d17U, 0x2eb40d81U, 0xb7bd5c3bU, 0xc0ba6cadU
- /* 128 */ , 0xedb88320U, 0x9abfb3b6U, 0x03b6e20cU, 0x74b1d29aU, 0xead54739U, 0x9dd277afU, 0x04db2615U, 0x73dc1683U
- /* 136 */ , 0xe3630b12U, 0x94643b84U, 0x0d6d6a3eU, 0x7a6a5aa8U, 0xe40ecf0bU, 0x9309ff9dU, 0x0a00ae27U, 0x7d079eb1U
- /* 144 */ , 0xf00f9344U, 0x8708a3d2U, 0x1e01f268U, 0x6906c2feU, 0xf762575dU, 0x806567cbU, 0x196c3671U, 0x6e6b06e7U
- /* 152 */ , 0xfed41b76U, 0x89d32be0U, 0x10da7a5aU, 0x67dd4accU, 0xf9b9df6fU, 0x8ebeeff9U, 0x17b7be43U, 0x60b08ed5U
- /* 160 */ , 0xd6d6a3e8U, 0xa1d1937eU, 0x38d8c2c4U, 0x4fdff252U, 0xd1bb67f1U, 0xa6bc5767U, 0x3fb506ddU, 0x48b2364bU
- /* 168 */ , 0xd80d2bdaU, 0xaf0a1b4cU, 0x36034af6U, 0x41047a60U, 0xdf60efc3U, 0xa867df55U, 0x316e8eefU, 0x4669be79U
- /* 176 */ , 0xcb61b38cU, 0xbc66831aU, 0x256fd2a0U, 0x5268e236U, 0xcc0c7795U, 0xbb0b4703U, 0x220216b9U, 0x5505262fU
- /* 184 */ , 0xc5ba3bbeU, 0xb2bd0b28U, 0x2bb45a92U, 0x5cb36a04U, 0xc2d7ffa7U, 0xb5d0cf31U, 0x2cd99e8bU, 0x5bdeae1dU
- /* 192 */ , 0x9b64c2b0U, 0xec63f226U, 0x756aa39cU, 0x026d930aU, 0x9c0906a9U, 0xeb0e363fU, 0x72076785U, 0x05005713U
- /* 200 */ , 0x95bf4a82U, 0xe2b87a14U, 0x7bb12baeU, 0x0cb61b38U, 0x92d28e9bU, 0xe5d5be0dU, 0x7cdcefb7U, 0x0bdbdf21U
- /* 208 */ , 0x86d3d2d4U, 0xf1d4e242U, 0x68ddb3f8U, 0x1fda836eU, 0x81be16cdU, 0xf6b9265bU, 0x6fb077e1U, 0x18b74777U
- /* 216 */ , 0x88085ae6U, 0xff0f6a70U, 0x66063bcaU, 0x11010b5cU, 0x8f659effU, 0xf862ae69U, 0x616bffd3U, 0x166ccf45U
- /* 224 */ , 0xa00ae278U, 0xd70dd2eeU, 0x4e048354U, 0x3903b3c2U, 0xa7672661U, 0xd06016f7U, 0x4969474dU, 0x3e6e77dbU
- /* 232 */ , 0xaed16a4aU, 0xd9d65adcU, 0x40df0b66U, 0x37d83bf0U, 0xa9bcae53U, 0xdebb9ec5U, 0x47b2cf7fU, 0x30b5ffe9U
- /* 240 */ , 0xbdbdf21cU, 0xcabac28aU, 0x53b39330U, 0x24b4a3a6U, 0xbad03605U, 0xcdd70693U, 0x54de5729U, 0x23d967bfU
- /* 248 */ , 0xb3667a2eU, 0xc4614ab8U, 0x5d681b02U, 0x2a6f2b94U, 0xb40bbe37U, 0xc30c8ea1U, 0x5a05df1bU, 0x2d02ef8dU
- }
- #ifdef CRC32_BYFOUR
- ,
- /* CRC32 table 1 for quad-bytes (little-endian), auto-generated. DO NOT MODIFY! */
- {
- /* 0 */ 0x00000000U, 0x191b3141U, 0x32366282U, 0x2b2d53c3U, 0x646cc504U, 0x7d77f445U, 0x565aa786U, 0x4f4196c7U
- /* 8 */ , 0xc8d98a08U, 0xd1c2bb49U, 0xfaefe88aU, 0xe3f4d9cbU, 0xacb54f0cU, 0xb5ae7e4dU, 0x9e832d8eU, 0x87981ccfU
- /* 16 */ , 0x4ac21251U, 0x53d92310U, 0x78f470d3U, 0x61ef4192U, 0x2eaed755U, 0x37b5e614U, 0x1c98b5d7U, 0x05838496U
- /* 24 */ , 0x821b9859U, 0x9b00a918U, 0xb02dfadbU, 0xa936cb9aU, 0xe6775d5dU, 0xff6c6c1cU, 0xd4413fdfU, 0xcd5a0e9eU
- /* 32 */ , 0x958424a2U, 0x8c9f15e3U, 0xa7b24620U, 0xbea97761U, 0xf1e8e1a6U, 0xe8f3d0e7U, 0xc3de8324U, 0xdac5b265U
- /* 40 */ , 0x5d5daeaaU, 0x44469febU, 0x6f6bcc28U, 0x7670fd69U, 0x39316baeU, 0x202a5aefU, 0x0b07092cU, 0x121c386dU
- /* 48 */ , 0xdf4636f3U, 0xc65d07b2U, 0xed705471U, 0xf46b6530U, 0xbb2af3f7U, 0xa231c2b6U, 0x891c9175U, 0x9007a034U
- /* 56 */ , 0x179fbcfbU, 0x0e848dbaU, 0x25a9de79U, 0x3cb2ef38U, 0x73f379ffU, 0x6ae848beU, 0x41c51b7dU, 0x58de2a3cU
- /* 64 */ , 0xf0794f05U, 0xe9627e44U, 0xc24f2d87U, 0xdb541cc6U, 0x94158a01U, 0x8d0ebb40U, 0xa623e883U, 0xbf38d9c2U
- /* 72 */ , 0x38a0c50dU, 0x21bbf44cU, 0x0a96a78fU, 0x138d96ceU, 0x5ccc0009U, 0x45d73148U, 0x6efa628bU, 0x77e153caU
- /* 80 */ , 0xbabb5d54U, 0xa3a06c15U, 0x888d3fd6U, 0x91960e97U, 0xded79850U, 0xc7cca911U, 0xece1fad2U, 0xf5facb93U
- /* 88 */ , 0x7262d75cU, 0x6b79e61dU, 0x4054b5deU, 0x594f849fU, 0x160e1258U, 0x0f152319U, 0x243870daU, 0x3d23419bU
- /* 96 */ , 0x65fd6ba7U, 0x7ce65ae6U, 0x57cb0925U, 0x4ed03864U, 0x0191aea3U, 0x188a9fe2U, 0x33a7cc21U, 0x2abcfd60U
- /* 104 */ , 0xad24e1afU, 0xb43fd0eeU, 0x9f12832dU, 0x8609b26cU, 0xc94824abU, 0xd05315eaU, 0xfb7e4629U, 0xe2657768U
- /* 112 */ , 0x2f3f79f6U, 0x362448b7U, 0x1d091b74U, 0x04122a35U, 0x4b53bcf2U, 0x52488db3U, 0x7965de70U, 0x607eef31U
- /* 120 */ , 0xe7e6f3feU, 0xfefdc2bfU, 0xd5d0917cU, 0xcccba03dU, 0x838a36faU, 0x9a9107bbU, 0xb1bc5478U, 0xa8a76539U
- /* 128 */ , 0x3b83984bU, 0x2298a90aU, 0x09b5fac9U, 0x10aecb88U, 0x5fef5d4fU, 0x46f46c0eU, 0x6dd93fcdU, 0x74c20e8cU
- /* 136 */ , 0xf35a1243U, 0xea412302U, 0xc16c70c1U, 0xd8774180U, 0x9736d747U, 0x8e2de606U, 0xa500b5c5U, 0xbc1b8484U
- /* 144 */ , 0x71418a1aU, 0x685abb5bU, 0x4377e898U, 0x5a6cd9d9U, 0x152d4f1eU, 0x0c367e5fU, 0x271b2d9cU, 0x3e001cddU
- /* 152 */ , 0xb9980012U, 0xa0833153U, 0x8bae6290U, 0x92b553d1U, 0xddf4c516U, 0xc4eff457U, 0xefc2a794U, 0xf6d996d5U
- /* 160 */ , 0xae07bce9U, 0xb71c8da8U, 0x9c31de6bU, 0x852aef2aU, 0xca6b79edU, 0xd37048acU, 0xf85d1b6fU, 0xe1462a2eU
- /* 168 */ , 0x66de36e1U, 0x7fc507a0U, 0x54e85463U, 0x4df36522U, 0x02b2f3e5U, 0x1ba9c2a4U, 0x30849167U, 0x299fa026U
- /* 176 */ , 0xe4c5aeb8U, 0xfdde9ff9U, 0xd6f3cc3aU, 0xcfe8fd7bU, 0x80a96bbcU, 0x99b25afdU, 0xb29f093eU, 0xab84387fU
- /* 184 */ , 0x2c1c24b0U, 0x350715f1U, 0x1e2a4632U, 0x07317773U, 0x4870e1b4U, 0x516bd0f5U, 0x7a468336U, 0x635db277U
- /* 192 */ , 0xcbfad74eU, 0xd2e1e60fU, 0xf9ccb5ccU, 0xe0d7848dU, 0xaf96124aU, 0xb68d230bU, 0x9da070c8U, 0x84bb4189U
- /* 200 */ , 0x03235d46U, 0x1a386c07U, 0x31153fc4U, 0x280e0e85U, 0x674f9842U, 0x7e54a903U, 0x5579fac0U, 0x4c62cb81U
- /* 208 */ , 0x8138c51fU, 0x9823f45eU, 0xb30ea79dU, 0xaa1596dcU, 0xe554001bU, 0xfc4f315aU, 0xd7626299U, 0xce7953d8U
- /* 216 */ , 0x49e14f17U, 0x50fa7e56U, 0x7bd72d95U, 0x62cc1cd4U, 0x2d8d8a13U, 0x3496bb52U, 0x1fbbe891U, 0x06a0d9d0U
- /* 224 */ , 0x5e7ef3ecU, 0x4765c2adU, 0x6c48916eU, 0x7553a02fU, 0x3a1236e8U, 0x230907a9U, 0x0824546aU, 0x113f652bU
- /* 232 */ , 0x96a779e4U, 0x8fbc48a5U, 0xa4911b66U, 0xbd8a2a27U, 0xf2cbbce0U, 0xebd08da1U, 0xc0fdde62U, 0xd9e6ef23U
- /* 240 */ , 0x14bce1bdU, 0x0da7d0fcU, 0x268a833fU, 0x3f91b27eU, 0x70d024b9U, 0x69cb15f8U, 0x42e6463bU, 0x5bfd777aU
- /* 248 */ , 0xdc656bb5U, 0xc57e5af4U, 0xee530937U, 0xf7483876U, 0xb809aeb1U, 0xa1129ff0U, 0x8a3fcc33U, 0x9324fd72U
- }
- ,
- /* CRC32 table 2 for quad-bytes (little-endian), auto-generated. DO NOT MODIFY! */
- {
- /* 0 */ 0x00000000U, 0x01c26a37U, 0x0384d46eU, 0x0246be59U, 0x0709a8dcU, 0x06cbc2ebU, 0x048d7cb2U, 0x054f1685U
- /* 8 */ , 0x0e1351b8U, 0x0fd13b8fU, 0x0d9785d6U, 0x0c55efe1U, 0x091af964U, 0x08d89353U, 0x0a9e2d0aU, 0x0b5c473dU
- /* 16 */ , 0x1c26a370U, 0x1de4c947U, 0x1fa2771eU, 0x1e601d29U, 0x1b2f0bacU, 0x1aed619bU, 0x18abdfc2U, 0x1969b5f5U
- /* 24 */ , 0x1235f2c8U, 0x13f798ffU, 0x11b126a6U, 0x10734c91U, 0x153c5a14U, 0x14fe3023U, 0x16b88e7aU, 0x177ae44dU
- /* 32 */ , 0x384d46e0U, 0x398f2cd7U, 0x3bc9928eU, 0x3a0bf8b9U, 0x3f44ee3cU, 0x3e86840bU, 0x3cc03a52U, 0x3d025065U
- /* 40 */ , 0x365e1758U, 0x379c7d6fU, 0x35dac336U, 0x3418a901U, 0x3157bf84U, 0x3095d5b3U, 0x32d36beaU, 0x331101ddU
- /* 48 */ , 0x246be590U, 0x25a98fa7U, 0x27ef31feU, 0x262d5bc9U, 0x23624d4cU, 0x22a0277bU, 0x20e69922U, 0x2124f315U
- /* 56 */ , 0x2a78b428U, 0x2bbade1fU, 0x29fc6046U, 0x283e0a71U, 0x2d711cf4U, 0x2cb376c3U, 0x2ef5c89aU, 0x2f37a2adU
- /* 64 */ , 0x709a8dc0U, 0x7158e7f7U, 0x731e59aeU, 0x72dc3399U, 0x7793251cU, 0x76514f2bU, 0x7417f172U, 0x75d59b45U
- /* 72 */ , 0x7e89dc78U, 0x7f4bb64fU, 0x7d0d0816U, 0x7ccf6221U, 0x798074a4U, 0x78421e93U, 0x7a04a0caU, 0x7bc6cafdU
- /* 80 */ , 0x6cbc2eb0U, 0x6d7e4487U, 0x6f38fadeU, 0x6efa90e9U, 0x6bb5866cU, 0x6a77ec5bU, 0x68315202U, 0x69f33835U
- /* 88 */ , 0x62af7f08U, 0x636d153fU, 0x612bab66U, 0x60e9c151U, 0x65a6d7d4U, 0x6464bde3U, 0x662203baU, 0x67e0698dU
- /* 96 */ , 0x48d7cb20U, 0x4915a117U, 0x4b531f4eU, 0x4a917579U, 0x4fde63fcU, 0x4e1c09cbU, 0x4c5ab792U, 0x4d98dda5U
- /* 104 */ , 0x46c49a98U, 0x4706f0afU, 0x45404ef6U, 0x448224c1U, 0x41cd3244U, 0x400f5873U, 0x4249e62aU, 0x438b8c1dU
- /* 112 */ , 0x54f16850U, 0x55330267U, 0x5775bc3eU, 0x56b7d609U, 0x53f8c08cU, 0x523aaabbU, 0x507c14e2U, 0x51be7ed5U
- /* 120 */ , 0x5ae239e8U, 0x5b2053dfU, 0x5966ed86U, 0x58a487b1U, 0x5deb9134U, 0x5c29fb03U, 0x5e6f455aU, 0x5fad2f6dU
- /* 128 */ , 0xe1351b80U, 0xe0f771b7U, 0xe2b1cfeeU, 0xe373a5d9U, 0xe63cb35cU, 0xe7fed96bU, 0xe5b86732U, 0xe47a0d05U
- /* 136 */ , 0xef264a38U, 0xeee4200fU, 0xeca29e56U, 0xed60f461U, 0xe82fe2e4U, 0xe9ed88d3U, 0xebab368aU, 0xea695cbdU
- /* 144 */ , 0xfd13b8f0U, 0xfcd1d2c7U, 0xfe976c9eU, 0xff5506a9U, 0xfa1a102cU, 0xfbd87a1bU, 0xf99ec442U, 0xf85cae75U
- /* 152 */ , 0xf300e948U, 0xf2c2837fU, 0xf0843d26U, 0xf1465711U, 0xf4094194U, 0xf5cb2ba3U, 0xf78d95faU, 0xf64fffcdU
- /* 160 */ , 0xd9785d60U, 0xd8ba3757U, 0xdafc890eU, 0xdb3ee339U, 0xde71f5bcU, 0xdfb39f8bU, 0xddf521d2U, 0xdc374be5U
- /* 168 */ , 0xd76b0cd8U, 0xd6a966efU, 0xd4efd8b6U, 0xd52db281U, 0xd062a404U, 0xd1a0ce33U, 0xd3e6706aU, 0xd2241a5dU
- /* 176 */ , 0xc55efe10U, 0xc49c9427U, 0xc6da2a7eU, 0xc7184049U, 0xc25756ccU, 0xc3953cfbU, 0xc1d382a2U, 0xc011e895U
- /* 184 */ , 0xcb4dafa8U, 0xca8fc59fU, 0xc8c97bc6U, 0xc90b11f1U, 0xcc440774U, 0xcd866d43U, 0xcfc0d31aU, 0xce02b92dU
- /* 192 */ , 0x91af9640U, 0x906dfc77U, 0x922b422eU, 0x93e92819U, 0x96a63e9cU, 0x976454abU, 0x9522eaf2U, 0x94e080c5U
- /* 200 */ , 0x9fbcc7f8U, 0x9e7eadcfU, 0x9c381396U, 0x9dfa79a1U, 0x98b56f24U, 0x99770513U, 0x9b31bb4aU, 0x9af3d17dU
- /* 208 */ , 0x8d893530U, 0x8c4b5f07U, 0x8e0de15eU, 0x8fcf8b69U, 0x8a809decU, 0x8b42f7dbU, 0x89044982U, 0x88c623b5U
- /* 216 */ , 0x839a6488U, 0x82580ebfU, 0x801eb0e6U, 0x81dcdad1U, 0x8493cc54U, 0x8551a663U, 0x8717183aU, 0x86d5720dU
- /* 224 */ , 0xa9e2d0a0U, 0xa820ba97U, 0xaa6604ceU, 0xaba46ef9U, 0xaeeb787cU, 0xaf29124bU, 0xad6fac12U, 0xacadc625U
- /* 232 */ , 0xa7f18118U, 0xa633eb2fU, 0xa4755576U, 0xa5b73f41U, 0xa0f829c4U, 0xa13a43f3U, 0xa37cfdaaU, 0xa2be979dU
- /* 240 */ , 0xb5c473d0U, 0xb40619e7U, 0xb640a7beU, 0xb782cd89U, 0xb2cddb0cU, 0xb30fb13bU, 0xb1490f62U, 0xb08b6555U
- /* 248 */ , 0xbbd72268U, 0xba15485fU, 0xb853f606U, 0xb9919c31U, 0xbcde8ab4U, 0xbd1ce083U, 0xbf5a5edaU, 0xbe9834edU
- }
- ,
- /* CRC32 table 3 for quad-bytes (little-endian), auto-generated. DO NOT MODIFY! */
- {
- /* 0 */ 0x00000000U, 0xb8bc6765U, 0xaa09c88bU, 0x12b5afeeU, 0x8f629757U, 0x37def032U, 0x256b5fdcU, 0x9dd738b9U
- /* 8 */ , 0xc5b428efU, 0x7d084f8aU, 0x6fbde064U, 0xd7018701U, 0x4ad6bfb8U, 0xf26ad8ddU, 0xe0df7733U, 0x58631056U
- /* 16 */ , 0x5019579fU, 0xe8a530faU, 0xfa109f14U, 0x42acf871U, 0xdf7bc0c8U, 0x67c7a7adU, 0x75720843U, 0xcdce6f26U
- /* 24 */ , 0x95ad7f70U, 0x2d111815U, 0x3fa4b7fbU, 0x8718d09eU, 0x1acfe827U, 0xa2738f42U, 0xb0c620acU, 0x087a47c9U
- /* 32 */ , 0xa032af3eU, 0x188ec85bU, 0x0a3b67b5U, 0xb28700d0U, 0x2f503869U, 0x97ec5f0cU, 0x8559f0e2U, 0x3de59787U
- /* 40 */ , 0x658687d1U, 0xdd3ae0b4U, 0xcf8f4f5aU, 0x7733283fU, 0xeae41086U, 0x525877e3U, 0x40edd80dU, 0xf851bf68U
- /* 48 */ , 0xf02bf8a1U, 0x48979fc4U, 0x5a22302aU, 0xe29e574fU, 0x7f496ff6U, 0xc7f50893U, 0xd540a77dU, 0x6dfcc018U
- /* 56 */ , 0x359fd04eU, 0x8d23b72bU, 0x9f9618c5U, 0x272a7fa0U, 0xbafd4719U, 0x0241207cU, 0x10f48f92U, 0xa848e8f7U
- /* 64 */ , 0x9b14583dU, 0x23a83f58U, 0x311d90b6U, 0x89a1f7d3U, 0x1476cf6aU, 0xaccaa80fU, 0xbe7f07e1U, 0x06c36084U
- /* 72 */ , 0x5ea070d2U, 0xe61c17b7U, 0xf4a9b859U, 0x4c15df3cU, 0xd1c2e785U, 0x697e80e0U, 0x7bcb2f0eU, 0xc377486bU
- /* 80 */ , 0xcb0d0fa2U, 0x73b168c7U, 0x6104c729U, 0xd9b8a04cU, 0x446f98f5U, 0xfcd3ff90U, 0xee66507eU, 0x56da371bU
- /* 88 */ , 0x0eb9274dU, 0xb6054028U, 0xa4b0efc6U, 0x1c0c88a3U, 0x81dbb01aU, 0x3967d77fU, 0x2bd27891U, 0x936e1ff4U
- /* 96 */ , 0x3b26f703U, 0x839a9066U, 0x912f3f88U, 0x299358edU, 0xb4446054U, 0x0cf80731U, 0x1e4da8dfU, 0xa6f1cfbaU
- /* 104 */ , 0xfe92dfecU, 0x462eb889U, 0x549b1767U, 0xec277002U, 0x71f048bbU, 0xc94c2fdeU, 0xdbf98030U, 0x6345e755U
- /* 112 */ , 0x6b3fa09cU, 0xd383c7f9U, 0xc1366817U, 0x798a0f72U, 0xe45d37cbU, 0x5ce150aeU, 0x4e54ff40U, 0xf6e89825U
- /* 120 */ , 0xae8b8873U, 0x1637ef16U, 0x048240f8U, 0xbc3e279dU, 0x21e91f24U, 0x99557841U, 0x8be0d7afU, 0x335cb0caU
- /* 128 */ , 0xed59b63bU, 0x55e5d15eU, 0x47507eb0U, 0xffec19d5U, 0x623b216cU, 0xda874609U, 0xc832e9e7U, 0x708e8e82U
- /* 136 */ , 0x28ed9ed4U, 0x9051f9b1U, 0x82e4565fU, 0x3a58313aU, 0xa78f0983U, 0x1f336ee6U, 0x0d86c108U, 0xb53aa66dU
- /* 144 */ , 0xbd40e1a4U, 0x05fc86c1U, 0x1749292fU, 0xaff54e4aU, 0x322276f3U, 0x8a9e1196U, 0x982bbe78U, 0x2097d91dU
- /* 152 */ , 0x78f4c94bU, 0xc048ae2eU, 0xd2fd01c0U, 0x6a4166a5U, 0xf7965e1cU, 0x4f2a3979U, 0x5d9f9697U, 0xe523f1f2U
- /* 160 */ , 0x4d6b1905U, 0xf5d77e60U, 0xe762d18eU, 0x5fdeb6ebU, 0xc2098e52U, 0x7ab5e937U, 0x680046d9U, 0xd0bc21bcU
- /* 168 */ , 0x88df31eaU, 0x3063568fU, 0x22d6f961U, 0x9a6a9e04U, 0x07bda6bdU, 0xbf01c1d8U, 0xadb46e36U, 0x15080953U
- /* 176 */ , 0x1d724e9aU, 0xa5ce29ffU, 0xb77b8611U, 0x0fc7e174U, 0x9210d9cdU, 0x2aacbea8U, 0x38191146U, 0x80a57623U
- /* 184 */ , 0xd8c66675U, 0x607a0110U, 0x72cfaefeU, 0xca73c99bU, 0x57a4f122U, 0xef189647U, 0xfdad39a9U, 0x45115eccU
- /* 192 */ , 0x764dee06U, 0xcef18963U, 0xdc44268dU, 0x64f841e8U, 0xf92f7951U, 0x41931e34U, 0x5326b1daU, 0xeb9ad6bfU
- /* 200 */ , 0xb3f9c6e9U, 0x0b45a18cU, 0x19f00e62U, 0xa14c6907U, 0x3c9b51beU, 0x842736dbU, 0x96929935U, 0x2e2efe50U
- /* 208 */ , 0x2654b999U, 0x9ee8defcU, 0x8c5d7112U, 0x34e11677U, 0xa9362eceU, 0x118a49abU, 0x033fe645U, 0xbb838120U
- /* 216 */ , 0xe3e09176U, 0x5b5cf613U, 0x49e959fdU, 0xf1553e98U, 0x6c820621U, 0xd43e6144U, 0xc68bceaaU, 0x7e37a9cfU
- /* 224 */ , 0xd67f4138U, 0x6ec3265dU, 0x7c7689b3U, 0xc4caeed6U, 0x591dd66fU, 0xe1a1b10aU, 0xf3141ee4U, 0x4ba87981U
- /* 232 */ , 0x13cb69d7U, 0xab770eb2U, 0xb9c2a15cU, 0x017ec639U, 0x9ca9fe80U, 0x241599e5U, 0x36a0360bU, 0x8e1c516eU
- /* 240 */ , 0x866616a7U, 0x3eda71c2U, 0x2c6fde2cU, 0x94d3b949U, 0x090481f0U, 0xb1b8e695U, 0xa30d497bU, 0x1bb12e1eU
- /* 248 */ , 0x43d23e48U, 0xfb6e592dU, 0xe9dbf6c3U, 0x516791a6U, 0xccb0a91fU, 0x740cce7aU, 0x66b96194U, 0xde0506f1U
- }
- ,
- /* CRC32 table 4 for quad-bytes ( big-endian ), auto-generated. DO NOT MODIFY! */
- {
- /* 0 */ 0x00000000U, 0x96300777U, 0x2c610eeeU, 0xba510999U, 0x19c46d07U, 0x8ff46a70U, 0x35a563e9U, 0xa395649eU
- /* 8 */ , 0x3288db0eU, 0xa4b8dc79U, 0x1ee9d5e0U, 0x88d9d297U, 0x2b4cb609U, 0xbd7cb17eU, 0x072db8e7U, 0x911dbf90U
- /* 16 */ , 0x6410b71dU, 0xf220b06aU, 0x4871b9f3U, 0xde41be84U, 0x7dd4da1aU, 0xebe4dd6dU, 0x51b5d4f4U, 0xc785d383U
- /* 24 */ , 0x56986c13U, 0xc0a86b64U, 0x7af962fdU, 0xecc9658aU, 0x4f5c0114U, 0xd96c0663U, 0x633d0ffaU, 0xf50d088dU
- /* 32 */ , 0xc8206e3bU, 0x5e10694cU, 0xe44160d5U, 0x727167a2U, 0xd1e4033cU, 0x47d4044bU, 0xfd850dd2U, 0x6bb50aa5U
- /* 40 */ , 0xfaa8b535U, 0x6c98b242U, 0xd6c9bbdbU, 0x40f9bcacU, 0xe36cd832U, 0x755cdf45U, 0xcf0dd6dcU, 0x593dd1abU
- /* 48 */ , 0xac30d926U, 0x3a00de51U, 0x8051d7c8U, 0x1661d0bfU, 0xb5f4b421U, 0x23c4b356U, 0x9995bacfU, 0x0fa5bdb8U
- /* 56 */ , 0x9eb80228U, 0x0888055fU, 0xb2d90cc6U, 0x24e90bb1U, 0x877c6f2fU, 0x114c6858U, 0xab1d61c1U, 0x3d2d66b6U
- /* 64 */ , 0x9041dc76U, 0x0671db01U, 0xbc20d298U, 0x2a10d5efU, 0x8985b171U, 0x1fb5b606U, 0xa5e4bf9fU, 0x33d4b8e8U
- /* 72 */ , 0xa2c90778U, 0x34f9000fU, 0x8ea80996U, 0x18980ee1U, 0xbb0d6a7fU, 0x2d3d6d08U, 0x976c6491U, 0x015c63e6U
- /* 80 */ , 0xf4516b6bU, 0x62616c1cU, 0xd8306585U, 0x4e0062f2U, 0xed95066cU, 0x7ba5011bU, 0xc1f40882U, 0x57c40ff5U
- /* 88 */ , 0xc6d9b065U, 0x50e9b712U, 0xeab8be8bU, 0x7c88b9fcU, 0xdf1ddd62U, 0x492dda15U, 0xf37cd38cU, 0x654cd4fbU
- /* 96 */ , 0x5861b24dU, 0xce51b53aU, 0x7400bca3U, 0xe230bbd4U, 0x41a5df4aU, 0xd795d83dU, 0x6dc4d1a4U, 0xfbf4d6d3U
- /* 104 */ , 0x6ae96943U, 0xfcd96e34U, 0x468867adU, 0xd0b860daU, 0x732d0444U, 0xe51d0333U, 0x5f4c0aaaU, 0xc97c0dddU
- /* 112 */ , 0x3c710550U, 0xaa410227U, 0x10100bbeU, 0x86200cc9U, 0x25b56857U, 0xb3856f20U, 0x09d466b9U, 0x9fe461ceU
- /* 120 */ , 0x0ef9de5eU, 0x98c9d929U, 0x2298d0b0U, 0xb4a8d7c7U, 0x173db359U, 0x810db42eU, 0x3b5cbdb7U, 0xad6cbac0U
- /* 128 */ , 0x2083b8edU, 0xb6b3bf9aU, 0x0ce2b603U, 0x9ad2b174U, 0x3947d5eaU, 0xaf77d29dU, 0x1526db04U, 0x8316dc73U
- /* 136 */ , 0x120b63e3U, 0x843b6494U, 0x3e6a6d0dU, 0xa85a6a7aU, 0x0bcf0ee4U, 0x9dff0993U, 0x27ae000aU, 0xb19e077dU
- /* 144 */ , 0x44930ff0U, 0xd2a30887U, 0x68f2011eU, 0xfec20669U, 0x5d5762f7U, 0xcb676580U, 0x71366c19U, 0xe7066b6eU
- /* 152 */ , 0x761bd4feU, 0xe02bd389U, 0x5a7ada10U, 0xcc4add67U, 0x6fdfb9f9U, 0xf9efbe8eU, 0x43beb717U, 0xd58eb060U
- /* 160 */ , 0xe8a3d6d6U, 0x7e93d1a1U, 0xc4c2d838U, 0x52f2df4fU, 0xf167bbd1U, 0x6757bca6U, 0xdd06b53fU, 0x4b36b248U
- /* 168 */ , 0xda2b0dd8U, 0x4c1b0aafU, 0xf64a0336U, 0x607a0441U, 0xc3ef60dfU, 0x55df67a8U, 0xef8e6e31U, 0x79be6946U
- /* 176 */ , 0x8cb361cbU, 0x1a8366bcU, 0xa0d26f25U, 0x36e26852U, 0x95770cccU, 0x03470bbbU, 0xb9160222U, 0x2f260555U
- /* 184 */ , 0xbe3bbac5U, 0x280bbdb2U, 0x925ab42bU, 0x046ab35cU, 0xa7ffd7c2U, 0x31cfd0b5U, 0x8b9ed92cU, 0x1daede5bU
- /* 192 */ , 0xb0c2649bU, 0x26f263ecU, 0x9ca36a75U, 0x0a936d02U, 0xa906099cU, 0x3f360eebU, 0x85670772U, 0x13570005U
- /* 200 */ , 0x824abf95U, 0x147ab8e2U, 0xae2bb17bU, 0x381bb60cU, 0x9b8ed292U, 0x0dbed5e5U, 0xb7efdc7cU, 0x21dfdb0bU
- /* 208 */ , 0xd4d2d386U, 0x42e2d4f1U, 0xf8b3dd68U, 0x6e83da1fU, 0xcd16be81U, 0x5b26b9f6U, 0xe177b06fU, 0x7747b718U
- /* 216 */ , 0xe65a0888U, 0x706a0fffU, 0xca3b0666U, 0x5c0b0111U, 0xff9e658fU, 0x69ae62f8U, 0xd3ff6b61U, 0x45cf6c16U
- /* 224 */ , 0x78e20aa0U, 0xeed20dd7U, 0x5483044eU, 0xc2b30339U, 0x612667a7U, 0xf71660d0U, 0x4d476949U, 0xdb776e3eU
- /* 232 */ , 0x4a6ad1aeU, 0xdc5ad6d9U, 0x660bdf40U, 0xf03bd837U, 0x53aebca9U, 0xc59ebbdeU, 0x7fcfb247U, 0xe9ffb530U
- /* 240 */ , 0x1cf2bdbdU, 0x8ac2bacaU, 0x3093b353U, 0xa6a3b424U, 0x0536d0baU, 0x9306d7cdU, 0x2957de54U, 0xbf67d923U
- /* 248 */ , 0x2e7a66b3U, 0xb84a61c4U, 0x021b685dU, 0x942b6f2aU, 0x37be0bb4U, 0xa18e0cc3U, 0x1bdf055aU, 0x8def022dU
- }
- ,
- /* CRC32 table 5 for quad-bytes ( big-endian ), auto-generated. DO NOT MODIFY! */
- {
- /* 0 */ 0x00000000U, 0x41311b19U, 0x82623632U, 0xc3532d2bU, 0x04c56c64U, 0x45f4777dU, 0x86a75a56U, 0xc796414fU
- /* 8 */ , 0x088ad9c8U, 0x49bbc2d1U, 0x8ae8effaU, 0xcbd9f4e3U, 0x0c4fb5acU, 0x4d7eaeb5U, 0x8e2d839eU, 0xcf1c9887U
- /* 16 */ , 0x5112c24aU, 0x1023d953U, 0xd370f478U, 0x9241ef61U, 0x55d7ae2eU, 0x14e6b537U, 0xd7b5981cU, 0x96848305U
- /* 24 */ , 0x59981b82U, 0x18a9009bU, 0xdbfa2db0U, 0x9acb36a9U, 0x5d5d77e6U, 0x1c6c6cffU, 0xdf3f41d4U, 0x9e0e5acdU
- /* 32 */ , 0xa2248495U, 0xe3159f8cU, 0x2046b2a7U, 0x6177a9beU, 0xa6e1e8f1U, 0xe7d0f3e8U, 0x2483dec3U, 0x65b2c5daU
- /* 40 */ , 0xaaae5d5dU, 0xeb9f4644U, 0x28cc6b6fU, 0x69fd7076U, 0xae6b3139U, 0xef5a2a20U, 0x2c09070bU, 0x6d381c12U
- /* 48 */ , 0xf33646dfU, 0xb2075dc6U, 0x715470edU, 0x30656bf4U, 0xf7f32abbU, 0xb6c231a2U, 0x75911c89U, 0x34a00790U
- /* 56 */ , 0xfbbc9f17U, 0xba8d840eU, 0x79dea925U, 0x38efb23cU, 0xff79f373U, 0xbe48e86aU, 0x7d1bc541U, 0x3c2ade58U
- /* 64 */ , 0x054f79f0U, 0x447e62e9U, 0x872d4fc2U, 0xc61c54dbU, 0x018a1594U, 0x40bb0e8dU, 0x83e823a6U, 0xc2d938bfU
- /* 72 */ , 0x0dc5a038U, 0x4cf4bb21U, 0x8fa7960aU, 0xce968d13U, 0x0900cc5cU, 0x4831d745U, 0x8b62fa6eU, 0xca53e177U
- /* 80 */ , 0x545dbbbaU, 0x156ca0a3U, 0xd63f8d88U, 0x970e9691U, 0x5098d7deU, 0x11a9ccc7U, 0xd2fae1ecU, 0x93cbfaf5U
- /* 88 */ , 0x5cd76272U, 0x1de6796bU, 0xdeb55440U, 0x9f844f59U, 0x58120e16U, 0x1923150fU, 0xda703824U, 0x9b41233dU
- /* 96 */ , 0xa76bfd65U, 0xe65ae67cU, 0x2509cb57U, 0x6438d04eU, 0xa3ae9101U, 0xe29f8a18U, 0x21cca733U, 0x60fdbc2aU
- /* 104 */ , 0xafe124adU, 0xeed03fb4U, 0x2d83129fU, 0x6cb20986U, 0xab2448c9U, 0xea1553d0U, 0x29467efbU, 0x687765e2U
- /* 112 */ , 0xf6793f2fU, 0xb7482436U, 0x741b091dU, 0x352a1204U, 0xf2bc534bU, 0xb38d4852U, 0x70de6579U, 0x31ef7e60U
- /* 120 */ , 0xfef3e6e7U, 0xbfc2fdfeU, 0x7c91d0d5U, 0x3da0cbccU, 0xfa368a83U, 0xbb07919aU, 0x7854bcb1U, 0x3965a7a8U
- /* 128 */ , 0x4b98833bU, 0x0aa99822U, 0xc9fab509U, 0x88cbae10U, 0x4f5def5fU, 0x0e6cf446U, 0xcd3fd96dU, 0x8c0ec274U
- /* 136 */ , 0x43125af3U, 0x022341eaU, 0xc1706cc1U, 0x804177d8U, 0x47d73697U, 0x06e62d8eU, 0xc5b500a5U, 0x84841bbcU
- /* 144 */ , 0x1a8a4171U, 0x5bbb5a68U, 0x98e87743U, 0xd9d96c5aU, 0x1e4f2d15U, 0x5f7e360cU, 0x9c2d1b27U, 0xdd1c003eU
- /* 152 */ , 0x120098b9U, 0x533183a0U, 0x9062ae8bU, 0xd153b592U, 0x16c5f4ddU, 0x57f4efc4U, 0x94a7c2efU, 0xd596d9f6U
- /* 160 */ , 0xe9bc07aeU, 0xa88d1cb7U, 0x6bde319cU, 0x2aef2a85U, 0xed796bcaU, 0xac4870d3U, 0x6f1b5df8U, 0x2e2a46e1U
- /* 168 */ , 0xe136de66U, 0xa007c57fU, 0x6354e854U, 0x2265f34dU, 0xe5f3b202U, 0xa4c2a91bU, 0x67918430U, 0x26a09f29U
- /* 176 */ , 0xb8aec5e4U, 0xf99fdefdU, 0x3accf3d6U, 0x7bfde8cfU, 0xbc6ba980U, 0xfd5ab299U, 0x3e099fb2U, 0x7f3884abU
- /* 184 */ , 0xb0241c2cU, 0xf1150735U, 0x32462a1eU, 0x73773107U, 0xb4e17048U, 0xf5d06b51U, 0x3683467aU, 0x77b25d63U
- /* 192 */ , 0x4ed7facbU, 0x0fe6e1d2U, 0xccb5ccf9U, 0x8d84d7e0U, 0x4a1296afU, 0x0b238db6U, 0xc870a09dU, 0x8941bb84U
- /* 200 */ , 0x465d2303U, 0x076c381aU, 0xc43f1531U, 0x850e0e28U, 0x42984f67U, 0x03a9547eU, 0xc0fa7955U, 0x81cb624cU
- /* 208 */ , 0x1fc53881U, 0x5ef42398U, 0x9da70eb3U, 0xdc9615aaU, 0x1b0054e5U, 0x5a314ffcU, 0x996262d7U, 0xd85379ceU
- /* 216 */ , 0x174fe149U, 0x567efa50U, 0x952dd77bU, 0xd41ccc62U, 0x138a8d2dU, 0x52bb9634U, 0x91e8bb1fU, 0xd0d9a006U
- /* 224 */ , 0xecf37e5eU, 0xadc26547U, 0x6e91486cU, 0x2fa05375U, 0xe836123aU, 0xa9070923U, 0x6a542408U, 0x2b653f11U
- /* 232 */ , 0xe479a796U, 0xa548bc8fU, 0x661b91a4U, 0x272a8abdU, 0xe0bccbf2U, 0xa18dd0ebU, 0x62defdc0U, 0x23efe6d9U
- /* 240 */ , 0xbde1bc14U, 0xfcd0a70dU, 0x3f838a26U, 0x7eb2913fU, 0xb924d070U, 0xf815cb69U, 0x3b46e642U, 0x7a77fd5bU
- /* 248 */ , 0xb56b65dcU, 0xf45a7ec5U, 0x370953eeU, 0x763848f7U, 0xb1ae09b8U, 0xf09f12a1U, 0x33cc3f8aU, 0x72fd2493U
- }
- ,
- /* CRC32 table 6 for quad-bytes ( big-endian ), auto-generated. DO NOT MODIFY! */
- {
- /* 0 */ 0x00000000U, 0x376ac201U, 0x6ed48403U, 0x59be4602U, 0xdca80907U, 0xebc2cb06U, 0xb27c8d04U, 0x85164f05U
- /* 8 */ , 0xb851130eU, 0x8f3bd10fU, 0xd685970dU, 0xe1ef550cU, 0x64f91a09U, 0x5393d808U, 0x0a2d9e0aU, 0x3d475c0bU
- /* 16 */ , 0x70a3261cU, 0x47c9e41dU, 0x1e77a21fU, 0x291d601eU, 0xac0b2f1bU, 0x9b61ed1aU, 0xc2dfab18U, 0xf5b56919U
- /* 24 */ , 0xc8f23512U, 0xff98f713U, 0xa626b111U, 0x914c7310U, 0x145a3c15U, 0x2330fe14U, 0x7a8eb816U, 0x4de47a17U
- /* 32 */ , 0xe0464d38U, 0xd72c8f39U, 0x8e92c93bU, 0xb9f80b3aU, 0x3cee443fU, 0x0b84863eU, 0x523ac03cU, 0x6550023dU
- /* 40 */ , 0x58175e36U, 0x6f7d9c37U, 0x36c3da35U, 0x01a91834U, 0x84bf5731U, 0xb3d59530U, 0xea6bd332U, 0xdd011133U
- /* 48 */ , 0x90e56b24U, 0xa78fa925U, 0xfe31ef27U, 0xc95b2d26U, 0x4c4d6223U, 0x7b27a022U, 0x2299e620U, 0x15f32421U
- /* 56 */ , 0x28b4782aU, 0x1fdeba2bU, 0x4660fc29U, 0x710a3e28U, 0xf41c712dU, 0xc376b32cU, 0x9ac8f52eU, 0xada2372fU
- /* 64 */ , 0xc08d9a70U, 0xf7e75871U, 0xae591e73U, 0x9933dc72U, 0x1c259377U, 0x2b4f5176U, 0x72f11774U, 0x459bd575U
- /* 72 */ , 0x78dc897eU, 0x4fb64b7fU, 0x16080d7dU, 0x2162cf7cU, 0xa4748079U, 0x931e4278U, 0xcaa0047aU, 0xfdcac67bU
- /* 80 */ , 0xb02ebc6cU, 0x87447e6dU, 0xdefa386fU, 0xe990fa6eU, 0x6c86b56bU, 0x5bec776aU, 0x02523168U, 0x3538f369U
- /* 88 */ , 0x087faf62U, 0x3f156d63U, 0x66ab2b61U, 0x51c1e960U, 0xd4d7a665U, 0xe3bd6464U, 0xba032266U, 0x8d69e067U
- /* 96 */ , 0x20cbd748U, 0x17a11549U, 0x4e1f534bU, 0x7975914aU, 0xfc63de4fU, 0xcb091c4eU, 0x92b75a4cU, 0xa5dd984dU
- /* 104 */ , 0x989ac446U, 0xaff00647U, 0xf64e4045U, 0xc1248244U, 0x4432cd41U, 0x73580f40U, 0x2ae64942U, 0x1d8c8b43U
- /* 112 */ , 0x5068f154U, 0x67023355U, 0x3ebc7557U, 0x09d6b756U, 0x8cc0f853U, 0xbbaa3a52U, 0xe2147c50U, 0xd57ebe51U
- /* 120 */ , 0xe839e25aU, 0xdf53205bU, 0x86ed6659U, 0xb187a458U, 0x3491eb5dU, 0x03fb295cU, 0x5a456f5eU, 0x6d2fad5fU
- /* 128 */ , 0x801b35e1U, 0xb771f7e0U, 0xeecfb1e2U, 0xd9a573e3U, 0x5cb33ce6U, 0x6bd9fee7U, 0x3267b8e5U, 0x050d7ae4U
- /* 136 */ , 0x384a26efU, 0x0f20e4eeU, 0x569ea2ecU, 0x61f460edU, 0xe4e22fe8U, 0xd388ede9U, 0x8a36abebU, 0xbd5c69eaU
- /* 144 */ , 0xf0b813fdU, 0xc7d2d1fcU, 0x9e6c97feU, 0xa90655ffU, 0x2c101afaU, 0x1b7ad8fbU, 0x42c49ef9U, 0x75ae5cf8U
- /* 152 */ , 0x48e900f3U, 0x7f83c2f2U, 0x263d84f0U, 0x115746f1U, 0x944109f4U, 0xa32bcbf5U, 0xfa958df7U, 0xcdff4ff6U
- /* 160 */ , 0x605d78d9U, 0x5737bad8U, 0x0e89fcdaU, 0x39e33edbU, 0xbcf571deU, 0x8b9fb3dfU, 0xd221f5ddU, 0xe54b37dcU
- /* 168 */ , 0xd80c6bd7U, 0xef66a9d6U, 0xb6d8efd4U, 0x81b22dd5U, 0x04a462d0U, 0x33cea0d1U, 0x6a70e6d3U, 0x5d1a24d2U
- /* 176 */ , 0x10fe5ec5U, 0x27949cc4U, 0x7e2adac6U, 0x494018c7U, 0xcc5657c2U, 0xfb3c95c3U, 0xa282d3c1U, 0x95e811c0U
- /* 184 */ , 0xa8af4dcbU, 0x9fc58fcaU, 0xc67bc9c8U, 0xf1110bc9U, 0x740744ccU, 0x436d86cdU, 0x1ad3c0cfU, 0x2db902ceU
- /* 192 */ , 0x4096af91U, 0x77fc6d90U, 0x2e422b92U, 0x1928e993U, 0x9c3ea696U, 0xab546497U, 0xf2ea2295U, 0xc580e094U
- /* 200 */ , 0xf8c7bc9fU, 0xcfad7e9eU, 0x9613389cU, 0xa179fa9dU, 0x246fb598U, 0x13057799U, 0x4abb319bU, 0x7dd1f39aU
- /* 208 */ , 0x3035898dU, 0x075f4b8cU, 0x5ee10d8eU, 0x698bcf8fU, 0xec9d808aU, 0xdbf7428bU, 0x82490489U, 0xb523c688U
- /* 216 */ , 0x88649a83U, 0xbf0e5882U, 0xe6b01e80U, 0xd1dadc81U, 0x54cc9384U, 0x63a65185U, 0x3a181787U, 0x0d72d586U
- /* 224 */ , 0xa0d0e2a9U, 0x97ba20a8U, 0xce0466aaU, 0xf96ea4abU, 0x7c78ebaeU, 0x4b1229afU, 0x12ac6fadU, 0x25c6adacU
- /* 232 */ , 0x1881f1a7U, 0x2feb33a6U, 0x765575a4U, 0x413fb7a5U, 0xc429f8a0U, 0xf3433aa1U, 0xaafd7ca3U, 0x9d97bea2U
- /* 240 */ , 0xd073c4b5U, 0xe71906b4U, 0xbea740b6U, 0x89cd82b7U, 0x0cdbcdb2U, 0x3bb10fb3U, 0x620f49b1U, 0x55658bb0U
- /* 248 */ , 0x6822d7bbU, 0x5f4815baU, 0x06f653b8U, 0x319c91b9U, 0xb48adebcU, 0x83e01cbdU, 0xda5e5abfU, 0xed3498beU
- }
- ,
- /* CRC32 table 7 for quad-bytes ( big-endian ), auto-generated. DO NOT MODIFY! */
- {
- /* 0 */ 0x00000000U, 0x6567bcb8U, 0x8bc809aaU, 0xeeafb512U, 0x5797628fU, 0x32f0de37U, 0xdc5f6b25U, 0xb938d79dU
- /* 8 */ , 0xef28b4c5U, 0x8a4f087dU, 0x64e0bd6fU, 0x018701d7U, 0xb8bfd64aU, 0xddd86af2U, 0x3377dfe0U, 0x56106358U
- /* 16 */ , 0x9f571950U, 0xfa30a5e8U, 0x149f10faU, 0x71f8ac42U, 0xc8c07bdfU, 0xada7c767U, 0x43087275U, 0x266fcecdU
- /* 24 */ , 0x707fad95U, 0x1518112dU, 0xfbb7a43fU, 0x9ed01887U, 0x27e8cf1aU, 0x428f73a2U, 0xac20c6b0U, 0xc9477a08U
- /* 32 */ , 0x3eaf32a0U, 0x5bc88e18U, 0xb5673b0aU, 0xd00087b2U, 0x6938502fU, 0x0c5fec97U, 0xe2f05985U, 0x8797e53dU
- /* 40 */ , 0xd1878665U, 0xb4e03addU, 0x5a4f8fcfU, 0x3f283377U, 0x8610e4eaU, 0xe3775852U, 0x0dd8ed40U, 0x68bf51f8U
- /* 48 */ , 0xa1f82bf0U, 0xc49f9748U, 0x2a30225aU, 0x4f579ee2U, 0xf66f497fU, 0x9308f5c7U, 0x7da740d5U, 0x18c0fc6dU
- /* 56 */ , 0x4ed09f35U, 0x2bb7238dU, 0xc518969fU, 0xa07f2a27U, 0x1947fdbaU, 0x7c204102U, 0x928ff410U, 0xf7e848a8U
- /* 64 */ , 0x3d58149bU, 0x583fa823U, 0xb6901d31U, 0xd3f7a189U, 0x6acf7614U, 0x0fa8caacU, 0xe1077fbeU, 0x8460c306U
- /* 72 */ , 0xd270a05eU, 0xb7171ce6U, 0x59b8a9f4U, 0x3cdf154cU, 0x85e7c2d1U, 0xe0807e69U, 0x0e2fcb7bU, 0x6b4877c3U
- /* 80 */ , 0xa20f0dcbU, 0xc768b173U, 0x29c70461U, 0x4ca0b8d9U, 0xf5986f44U, 0x90ffd3fcU, 0x7e5066eeU, 0x1b37da56U
- /* 88 */ , 0x4d27b90eU, 0x284005b6U, 0xc6efb0a4U, 0xa3880c1cU, 0x1ab0db81U, 0x7fd76739U, 0x9178d22bU, 0xf41f6e93U
- /* 96 */ , 0x03f7263bU, 0x66909a83U, 0x883f2f91U, 0xed589329U, 0x546044b4U, 0x3107f80cU, 0xdfa84d1eU, 0xbacff1a6U
- /* 104 */ , 0xecdf92feU, 0x89b82e46U, 0x67179b54U, 0x027027ecU, 0xbb48f071U, 0xde2f4cc9U, 0x3080f9dbU, 0x55e74563U
- /* 112 */ , 0x9ca03f6bU, 0xf9c783d3U, 0x176836c1U, 0x720f8a79U, 0xcb375de4U, 0xae50e15cU, 0x40ff544eU, 0x2598e8f6U
- /* 120 */ , 0x73888baeU, 0x16ef3716U, 0xf8408204U, 0x9d273ebcU, 0x241fe921U, 0x41785599U, 0xafd7e08bU, 0xcab05c33U
- /* 128 */ , 0x3bb659edU, 0x5ed1e555U, 0xb07e5047U, 0xd519ecffU, 0x6c213b62U, 0x094687daU, 0xe7e932c8U, 0x828e8e70U
- /* 136 */ , 0xd49eed28U, 0xb1f95190U, 0x5f56e482U, 0x3a31583aU, 0x83098fa7U, 0xe66e331fU, 0x08c1860dU, 0x6da63ab5U
- /* 144 */ , 0xa4e140bdU, 0xc186fc05U, 0x2f294917U, 0x4a4ef5afU, 0xf3762232U, 0x96119e8aU, 0x78be2b98U, 0x1dd99720U
- /* 152 */ , 0x4bc9f478U, 0x2eae48c0U, 0xc001fdd2U, 0xa566416aU, 0x1c5e96f7U, 0x79392a4fU, 0x97969f5dU, 0xf2f123e5U
- /* 160 */ , 0x05196b4dU, 0x607ed7f5U, 0x8ed162e7U, 0xebb6de5fU, 0x528e09c2U, 0x37e9b57aU, 0xd9460068U, 0xbc21bcd0U
- /* 168 */ , 0xea31df88U, 0x8f566330U, 0x61f9d622U, 0x049e6a9aU, 0xbda6bd07U, 0xd8c101bfU, 0x366eb4adU, 0x53090815U
- /* 176 */ , 0x9a4e721dU, 0xff29cea5U, 0x11867bb7U, 0x74e1c70fU, 0xcdd91092U, 0xa8beac2aU, 0x46111938U, 0x2376a580U
- /* 184 */ , 0x7566c6d8U, 0x10017a60U, 0xfeaecf72U, 0x9bc973caU, 0x22f1a457U, 0x479618efU, 0xa939adfdU, 0xcc5e1145U
- /* 192 */ , 0x06ee4d76U, 0x6389f1ceU, 0x8d2644dcU, 0xe841f864U, 0x51792ff9U, 0x341e9341U, 0xdab12653U, 0xbfd69aebU
- /* 200 */ , 0xe9c6f9b3U, 0x8ca1450bU, 0x620ef019U, 0x07694ca1U, 0xbe519b3cU, 0xdb362784U, 0x35999296U, 0x50fe2e2eU
- /* 208 */ , 0x99b95426U, 0xfcdee89eU, 0x12715d8cU, 0x7716e134U, 0xce2e36a9U, 0xab498a11U, 0x45e63f03U, 0x208183bbU
- /* 216 */ , 0x7691e0e3U, 0x13f65c5bU, 0xfd59e949U, 0x983e55f1U, 0x2106826cU, 0x44613ed4U, 0xaace8bc6U, 0xcfa9377eU
- /* 224 */ , 0x38417fd6U, 0x5d26c36eU, 0xb389767cU, 0xd6eecac4U, 0x6fd61d59U, 0x0ab1a1e1U, 0xe41e14f3U, 0x8179a84bU
- /* 232 */ , 0xd769cb13U, 0xb20e77abU, 0x5ca1c2b9U, 0x39c67e01U, 0x80fea99cU, 0xe5991524U, 0x0b36a036U, 0x6e511c8eU
- /* 240 */ , 0xa7166686U, 0xc271da3eU, 0x2cde6f2cU, 0x49b9d394U, 0xf0810409U, 0x95e6b8b1U, 0x7b490da3U, 0x1e2eb11bU
- /* 248 */ , 0x483ed243U, 0x2d596efbU, 0xc3f6dbe9U, 0xa6916751U, 0x1fa9b0ccU, 0x7ace0c74U, 0x9461b966U, 0xf10605deU
- }
- #endif
- };
-
-juint StubRoutines::ppc64::_crc32c_table[CRC32_TABLES][CRC32_COLUMN_SIZE] = {
- /* polyBits = 4394350321 0x0000000105ec76f1L, shifted = 0x82f63b78 */
- /* CRC32C table for single bytes, auto-generated. DO NOT MODIFY! */
- /* CRC32C table 0 for quad-bytes (little-endian), auto-generated. DO NOT MODIFY! */
- {
- /* 0 */ 0x00000000U, 0xf26b8303U, 0xe13b70f7U, 0x1350f3f4U, 0xc79a971fU, 0x35f1141cU, 0x26a1e7e8U, 0xd4ca64ebU
- /* 8 */ , 0x8ad958cfU, 0x78b2dbccU, 0x6be22838U, 0x9989ab3bU, 0x4d43cfd0U, 0xbf284cd3U, 0xac78bf27U, 0x5e133c24U
- /* 16 */ , 0x105ec76fU, 0xe235446cU, 0xf165b798U, 0x030e349bU, 0xd7c45070U, 0x25afd373U, 0x36ff2087U, 0xc494a384U
- /* 24 */ , 0x9a879fa0U, 0x68ec1ca3U, 0x7bbcef57U, 0x89d76c54U, 0x5d1d08bfU, 0xaf768bbcU, 0xbc267848U, 0x4e4dfb4bU
- /* 32 */ , 0x20bd8edeU, 0xd2d60dddU, 0xc186fe29U, 0x33ed7d2aU, 0xe72719c1U, 0x154c9ac2U, 0x061c6936U, 0xf477ea35U
- /* 40 */ , 0xaa64d611U, 0x580f5512U, 0x4b5fa6e6U, 0xb93425e5U, 0x6dfe410eU, 0x9f95c20dU, 0x8cc531f9U, 0x7eaeb2faU
- /* 48 */ , 0x30e349b1U, 0xc288cab2U, 0xd1d83946U, 0x23b3ba45U, 0xf779deaeU, 0x05125dadU, 0x1642ae59U, 0xe4292d5aU
- /* 56 */ , 0xba3a117eU, 0x4851927dU, 0x5b016189U, 0xa96ae28aU, 0x7da08661U, 0x8fcb0562U, 0x9c9bf696U, 0x6ef07595U
- /* 64 */ , 0x417b1dbcU, 0xb3109ebfU, 0xa0406d4bU, 0x522bee48U, 0x86e18aa3U, 0x748a09a0U, 0x67dafa54U, 0x95b17957U
- /* 72 */ , 0xcba24573U, 0x39c9c670U, 0x2a993584U, 0xd8f2b687U, 0x0c38d26cU, 0xfe53516fU, 0xed03a29bU, 0x1f682198U
- /* 80 */ , 0x5125dad3U, 0xa34e59d0U, 0xb01eaa24U, 0x42752927U, 0x96bf4dccU, 0x64d4cecfU, 0x77843d3bU, 0x85efbe38U
- /* 88 */ , 0xdbfc821cU, 0x2997011fU, 0x3ac7f2ebU, 0xc8ac71e8U, 0x1c661503U, 0xee0d9600U, 0xfd5d65f4U, 0x0f36e6f7U
- /* 96 */ , 0x61c69362U, 0x93ad1061U, 0x80fde395U, 0x72966096U, 0xa65c047dU, 0x5437877eU, 0x4767748aU, 0xb50cf789U
- /* 104 */ , 0xeb1fcbadU, 0x197448aeU, 0x0a24bb5aU, 0xf84f3859U, 0x2c855cb2U, 0xdeeedfb1U, 0xcdbe2c45U, 0x3fd5af46U
- /* 112 */ , 0x7198540dU, 0x83f3d70eU, 0x90a324faU, 0x62c8a7f9U, 0xb602c312U, 0x44694011U, 0x5739b3e5U, 0xa55230e6U
- /* 120 */ , 0xfb410cc2U, 0x092a8fc1U, 0x1a7a7c35U, 0xe811ff36U, 0x3cdb9bddU, 0xceb018deU, 0xdde0eb2aU, 0x2f8b6829U
- /* 128 */ , 0x82f63b78U, 0x709db87bU, 0x63cd4b8fU, 0x91a6c88cU, 0x456cac67U, 0xb7072f64U, 0xa457dc90U, 0x563c5f93U
- /* 136 */ , 0x082f63b7U, 0xfa44e0b4U, 0xe9141340U, 0x1b7f9043U, 0xcfb5f4a8U, 0x3dde77abU, 0x2e8e845fU, 0xdce5075cU
- /* 144 */ , 0x92a8fc17U, 0x60c37f14U, 0x73938ce0U, 0x81f80fe3U, 0x55326b08U, 0xa759e80bU, 0xb4091bffU, 0x466298fcU
- /* 152 */ , 0x1871a4d8U, 0xea1a27dbU, 0xf94ad42fU, 0x0b21572cU, 0xdfeb33c7U, 0x2d80b0c4U, 0x3ed04330U, 0xccbbc033U
- /* 160 */ , 0xa24bb5a6U, 0x502036a5U, 0x4370c551U, 0xb11b4652U, 0x65d122b9U, 0x97baa1baU, 0x84ea524eU, 0x7681d14dU
- /* 168 */ , 0x2892ed69U, 0xdaf96e6aU, 0xc9a99d9eU, 0x3bc21e9dU, 0xef087a76U, 0x1d63f975U, 0x0e330a81U, 0xfc588982U
- /* 176 */ , 0xb21572c9U, 0x407ef1caU, 0x532e023eU, 0xa145813dU, 0x758fe5d6U, 0x87e466d5U, 0x94b49521U, 0x66df1622U
- /* 184 */ , 0x38cc2a06U, 0xcaa7a905U, 0xd9f75af1U, 0x2b9cd9f2U, 0xff56bd19U, 0x0d3d3e1aU, 0x1e6dcdeeU, 0xec064eedU
- /* 192 */ , 0xc38d26c4U, 0x31e6a5c7U, 0x22b65633U, 0xd0ddd530U, 0x0417b1dbU, 0xf67c32d8U, 0xe52cc12cU, 0x1747422fU
- /* 200 */ , 0x49547e0bU, 0xbb3ffd08U, 0xa86f0efcU, 0x5a048dffU, 0x8ecee914U, 0x7ca56a17U, 0x6ff599e3U, 0x9d9e1ae0U
- /* 208 */ , 0xd3d3e1abU, 0x21b862a8U, 0x32e8915cU, 0xc083125fU, 0x144976b4U, 0xe622f5b7U, 0xf5720643U, 0x07198540U
- /* 216 */ , 0x590ab964U, 0xab613a67U, 0xb831c993U, 0x4a5a4a90U, 0x9e902e7bU, 0x6cfbad78U, 0x7fab5e8cU, 0x8dc0dd8fU
- /* 224 */ , 0xe330a81aU, 0x115b2b19U, 0x020bd8edU, 0xf0605beeU, 0x24aa3f05U, 0xd6c1bc06U, 0xc5914ff2U, 0x37faccf1U
- /* 232 */ , 0x69e9f0d5U, 0x9b8273d6U, 0x88d28022U, 0x7ab90321U, 0xae7367caU, 0x5c18e4c9U, 0x4f48173dU, 0xbd23943eU
- /* 240 */ , 0xf36e6f75U, 0x0105ec76U, 0x12551f82U, 0xe03e9c81U, 0x34f4f86aU, 0xc69f7b69U, 0xd5cf889dU, 0x27a40b9eU
- /* 248 */ , 0x79b737baU, 0x8bdcb4b9U, 0x988c474dU, 0x6ae7c44eU, 0xbe2da0a5U, 0x4c4623a6U, 0x5f16d052U, 0xad7d5351U
- }
- #ifdef CRC32_BYFOUR
- ,
- /* CRC32C table 1 for quad-bytes (little-endian), auto-generated. DO NOT MODIFY! */
- {
- /* 0 */ 0x00000000U, 0x13a29877U, 0x274530eeU, 0x34e7a899U, 0x4e8a61dcU, 0x5d28f9abU, 0x69cf5132U, 0x7a6dc945U
- /* 8 */ , 0x9d14c3b8U, 0x8eb65bcfU, 0xba51f356U, 0xa9f36b21U, 0xd39ea264U, 0xc03c3a13U, 0xf4db928aU, 0xe7790afdU
- /* 16 */ , 0x3fc5f181U, 0x2c6769f6U, 0x1880c16fU, 0x0b225918U, 0x714f905dU, 0x62ed082aU, 0x560aa0b3U, 0x45a838c4U
- /* 24 */ , 0xa2d13239U, 0xb173aa4eU, 0x859402d7U, 0x96369aa0U, 0xec5b53e5U, 0xfff9cb92U, 0xcb1e630bU, 0xd8bcfb7cU
- /* 32 */ , 0x7f8be302U, 0x6c297b75U, 0x58ced3ecU, 0x4b6c4b9bU, 0x310182deU, 0x22a31aa9U, 0x1644b230U, 0x05e62a47U
- /* 40 */ , 0xe29f20baU, 0xf13db8cdU, 0xc5da1054U, 0xd6788823U, 0xac154166U, 0xbfb7d911U, 0x8b507188U, 0x98f2e9ffU
- /* 48 */ , 0x404e1283U, 0x53ec8af4U, 0x670b226dU, 0x74a9ba1aU, 0x0ec4735fU, 0x1d66eb28U, 0x298143b1U, 0x3a23dbc6U
- /* 56 */ , 0xdd5ad13bU, 0xcef8494cU, 0xfa1fe1d5U, 0xe9bd79a2U, 0x93d0b0e7U, 0x80722890U, 0xb4958009U, 0xa737187eU
- /* 64 */ , 0xff17c604U, 0xecb55e73U, 0xd852f6eaU, 0xcbf06e9dU, 0xb19da7d8U, 0xa23f3fafU, 0x96d89736U, 0x857a0f41U
- /* 72 */ , 0x620305bcU, 0x71a19dcbU, 0x45463552U, 0x56e4ad25U, 0x2c896460U, 0x3f2bfc17U, 0x0bcc548eU, 0x186eccf9U
- /* 80 */ , 0xc0d23785U, 0xd370aff2U, 0xe797076bU, 0xf4359f1cU, 0x8e585659U, 0x9dface2eU, 0xa91d66b7U, 0xbabffec0U
- /* 88 */ , 0x5dc6f43dU, 0x4e646c4aU, 0x7a83c4d3U, 0x69215ca4U, 0x134c95e1U, 0x00ee0d96U, 0x3409a50fU, 0x27ab3d78U
- /* 96 */ , 0x809c2506U, 0x933ebd71U, 0xa7d915e8U, 0xb47b8d9fU, 0xce1644daU, 0xddb4dcadU, 0xe9537434U, 0xfaf1ec43U
- /* 104 */ , 0x1d88e6beU, 0x0e2a7ec9U, 0x3acdd650U, 0x296f4e27U, 0x53028762U, 0x40a01f15U, 0x7447b78cU, 0x67e52ffbU
- /* 112 */ , 0xbf59d487U, 0xacfb4cf0U, 0x981ce469U, 0x8bbe7c1eU, 0xf1d3b55bU, 0xe2712d2cU, 0xd69685b5U, 0xc5341dc2U
- /* 120 */ , 0x224d173fU, 0x31ef8f48U, 0x050827d1U, 0x16aabfa6U, 0x6cc776e3U, 0x7f65ee94U, 0x4b82460dU, 0x5820de7aU
- /* 128 */ , 0xfbc3faf9U, 0xe861628eU, 0xdc86ca17U, 0xcf245260U, 0xb5499b25U, 0xa6eb0352U, 0x920cabcbU, 0x81ae33bcU
- /* 136 */ , 0x66d73941U, 0x7575a136U, 0x419209afU, 0x523091d8U, 0x285d589dU, 0x3bffc0eaU, 0x0f186873U, 0x1cbaf004U
- /* 144 */ , 0xc4060b78U, 0xd7a4930fU, 0xe3433b96U, 0xf0e1a3e1U, 0x8a8c6aa4U, 0x992ef2d3U, 0xadc95a4aU, 0xbe6bc23dU
- /* 152 */ , 0x5912c8c0U, 0x4ab050b7U, 0x7e57f82eU, 0x6df56059U, 0x1798a91cU, 0x043a316bU, 0x30dd99f2U, 0x237f0185U
- /* 160 */ , 0x844819fbU, 0x97ea818cU, 0xa30d2915U, 0xb0afb162U, 0xcac27827U, 0xd960e050U, 0xed8748c9U, 0xfe25d0beU
- /* 168 */ , 0x195cda43U, 0x0afe4234U, 0x3e19eaadU, 0x2dbb72daU, 0x57d6bb9fU, 0x447423e8U, 0x70938b71U, 0x63311306U
- /* 176 */ , 0xbb8de87aU, 0xa82f700dU, 0x9cc8d894U, 0x8f6a40e3U, 0xf50789a6U, 0xe6a511d1U, 0xd242b948U, 0xc1e0213fU
- /* 184 */ , 0x26992bc2U, 0x353bb3b5U, 0x01dc1b2cU, 0x127e835bU, 0x68134a1eU, 0x7bb1d269U, 0x4f567af0U, 0x5cf4e287U
- /* 192 */ , 0x04d43cfdU, 0x1776a48aU, 0x23910c13U, 0x30339464U, 0x4a5e5d21U, 0x59fcc556U, 0x6d1b6dcfU, 0x7eb9f5b8U
- /* 200 */ , 0x99c0ff45U, 0x8a626732U, 0xbe85cfabU, 0xad2757dcU, 0xd74a9e99U, 0xc4e806eeU, 0xf00fae77U, 0xe3ad3600U
- /* 208 */ , 0x3b11cd7cU, 0x28b3550bU, 0x1c54fd92U, 0x0ff665e5U, 0x759baca0U, 0x663934d7U, 0x52de9c4eU, 0x417c0439U
- /* 216 */ , 0xa6050ec4U, 0xb5a796b3U, 0x81403e2aU, 0x92e2a65dU, 0xe88f6f18U, 0xfb2df76fU, 0xcfca5ff6U, 0xdc68c781U
- /* 224 */ , 0x7b5fdfffU, 0x68fd4788U, 0x5c1aef11U, 0x4fb87766U, 0x35d5be23U, 0x26772654U, 0x12908ecdU, 0x013216baU
- /* 232 */ , 0xe64b1c47U, 0xf5e98430U, 0xc10e2ca9U, 0xd2acb4deU, 0xa8c17d9bU, 0xbb63e5ecU, 0x8f844d75U, 0x9c26d502U
- /* 240 */ , 0x449a2e7eU, 0x5738b609U, 0x63df1e90U, 0x707d86e7U, 0x0a104fa2U, 0x19b2d7d5U, 0x2d557f4cU, 0x3ef7e73bU
- /* 248 */ , 0xd98eedc6U, 0xca2c75b1U, 0xfecbdd28U, 0xed69455fU, 0x97048c1aU, 0x84a6146dU, 0xb041bcf4U, 0xa3e32483U
- }
- ,
- /* CRC32C table 2 for quad-bytes (little-endian), auto-generated. DO NOT MODIFY! */
- {
- /* 0 */ 0x00000000U, 0xa541927eU, 0x4f6f520dU, 0xea2ec073U, 0x9edea41aU, 0x3b9f3664U, 0xd1b1f617U, 0x74f06469U
- /* 8 */ , 0x38513ec5U, 0x9d10acbbU, 0x773e6cc8U, 0xd27ffeb6U, 0xa68f9adfU, 0x03ce08a1U, 0xe9e0c8d2U, 0x4ca15aacU
- /* 16 */ , 0x70a27d8aU, 0xd5e3eff4U, 0x3fcd2f87U, 0x9a8cbdf9U, 0xee7cd990U, 0x4b3d4beeU, 0xa1138b9dU, 0x045219e3U
- /* 24 */ , 0x48f3434fU, 0xedb2d131U, 0x079c1142U, 0xa2dd833cU, 0xd62de755U, 0x736c752bU, 0x9942b558U, 0x3c032726U
- /* 32 */ , 0xe144fb14U, 0x4405696aU, 0xae2ba919U, 0x0b6a3b67U, 0x7f9a5f0eU, 0xdadbcd70U, 0x30f50d03U, 0x95b49f7dU
- /* 40 */ , 0xd915c5d1U, 0x7c5457afU, 0x967a97dcU, 0x333b05a2U, 0x47cb61cbU, 0xe28af3b5U, 0x08a433c6U, 0xade5a1b8U
- /* 48 */ , 0x91e6869eU, 0x34a714e0U, 0xde89d493U, 0x7bc846edU, 0x0f382284U, 0xaa79b0faU, 0x40577089U, 0xe516e2f7U
- /* 56 */ , 0xa9b7b85bU, 0x0cf62a25U, 0xe6d8ea56U, 0x43997828U, 0x37691c41U, 0x92288e3fU, 0x78064e4cU, 0xdd47dc32U
- /* 64 */ , 0xc76580d9U, 0x622412a7U, 0x880ad2d4U, 0x2d4b40aaU, 0x59bb24c3U, 0xfcfab6bdU, 0x16d476ceU, 0xb395e4b0U
- /* 72 */ , 0xff34be1cU, 0x5a752c62U, 0xb05bec11U, 0x151a7e6fU, 0x61ea1a06U, 0xc4ab8878U, 0x2e85480bU, 0x8bc4da75U
- /* 80 */ , 0xb7c7fd53U, 0x12866f2dU, 0xf8a8af5eU, 0x5de93d20U, 0x29195949U, 0x8c58cb37U, 0x66760b44U, 0xc337993aU
- /* 88 */ , 0x8f96c396U, 0x2ad751e8U, 0xc0f9919bU, 0x65b803e5U, 0x1148678cU, 0xb409f5f2U, 0x5e273581U, 0xfb66a7ffU
- /* 96 */ , 0x26217bcdU, 0x8360e9b3U, 0x694e29c0U, 0xcc0fbbbeU, 0xb8ffdfd7U, 0x1dbe4da9U, 0xf7908ddaU, 0x52d11fa4U
- /* 104 */ , 0x1e704508U, 0xbb31d776U, 0x511f1705U, 0xf45e857bU, 0x80aee112U, 0x25ef736cU, 0xcfc1b31fU, 0x6a802161U
- /* 112 */ , 0x56830647U, 0xf3c29439U, 0x19ec544aU, 0xbcadc634U, 0xc85da25dU, 0x6d1c3023U, 0x8732f050U, 0x2273622eU
- /* 120 */ , 0x6ed23882U, 0xcb93aafcU, 0x21bd6a8fU, 0x84fcf8f1U, 0xf00c9c98U, 0x554d0ee6U, 0xbf63ce95U, 0x1a225cebU
- /* 128 */ , 0x8b277743U, 0x2e66e53dU, 0xc448254eU, 0x6109b730U, 0x15f9d359U, 0xb0b84127U, 0x5a968154U, 0xffd7132aU
- /* 136 */ , 0xb3764986U, 0x1637dbf8U, 0xfc191b8bU, 0x595889f5U, 0x2da8ed9cU, 0x88e97fe2U, 0x62c7bf91U, 0xc7862defU
- /* 144 */ , 0xfb850ac9U, 0x5ec498b7U, 0xb4ea58c4U, 0x11abcabaU, 0x655baed3U, 0xc01a3cadU, 0x2a34fcdeU, 0x8f756ea0U
- /* 152 */ , 0xc3d4340cU, 0x6695a672U, 0x8cbb6601U, 0x29faf47fU, 0x5d0a9016U, 0xf84b0268U, 0x1265c21bU, 0xb7245065U
- /* 160 */ , 0x6a638c57U, 0xcf221e29U, 0x250cde5aU, 0x804d4c24U, 0xf4bd284dU, 0x51fcba33U, 0xbbd27a40U, 0x1e93e83eU
- /* 168 */ , 0x5232b292U, 0xf77320ecU, 0x1d5de09fU, 0xb81c72e1U, 0xccec1688U, 0x69ad84f6U, 0x83834485U, 0x26c2d6fbU
- /* 176 */ , 0x1ac1f1ddU, 0xbf8063a3U, 0x55aea3d0U, 0xf0ef31aeU, 0x841f55c7U, 0x215ec7b9U, 0xcb7007caU, 0x6e3195b4U
- /* 184 */ , 0x2290cf18U, 0x87d15d66U, 0x6dff9d15U, 0xc8be0f6bU, 0xbc4e6b02U, 0x190ff97cU, 0xf321390fU, 0x5660ab71U
- /* 192 */ , 0x4c42f79aU, 0xe90365e4U, 0x032da597U, 0xa66c37e9U, 0xd29c5380U, 0x77ddc1feU, 0x9df3018dU, 0x38b293f3U
- /* 200 */ , 0x7413c95fU, 0xd1525b21U, 0x3b7c9b52U, 0x9e3d092cU, 0xeacd6d45U, 0x4f8cff3bU, 0xa5a23f48U, 0x00e3ad36U
- /* 208 */ , 0x3ce08a10U, 0x99a1186eU, 0x738fd81dU, 0xd6ce4a63U, 0xa23e2e0aU, 0x077fbc74U, 0xed517c07U, 0x4810ee79U
- /* 216 */ , 0x04b1b4d5U, 0xa1f026abU, 0x4bdee6d8U, 0xee9f74a6U, 0x9a6f10cfU, 0x3f2e82b1U, 0xd50042c2U, 0x7041d0bcU
- /* 224 */ , 0xad060c8eU, 0x08479ef0U, 0xe2695e83U, 0x4728ccfdU, 0x33d8a894U, 0x96993aeaU, 0x7cb7fa99U, 0xd9f668e7U
- /* 232 */ , 0x9557324bU, 0x3016a035U, 0xda386046U, 0x7f79f238U, 0x0b899651U, 0xaec8042fU, 0x44e6c45cU, 0xe1a75622U
- /* 240 */ , 0xdda47104U, 0x78e5e37aU, 0x92cb2309U, 0x378ab177U, 0x437ad51eU, 0xe63b4760U, 0x0c158713U, 0xa954156dU
- /* 248 */ , 0xe5f54fc1U, 0x40b4ddbfU, 0xaa9a1dccU, 0x0fdb8fb2U, 0x7b2bebdbU, 0xde6a79a5U, 0x3444b9d6U, 0x91052ba8U
- }
- ,
- /* CRC32C table 3 for quad-bytes (little-endian), auto-generated. DO NOT MODIFY! */
- {
- /* 0 */ 0x00000000U, 0xdd45aab8U, 0xbf672381U, 0x62228939U, 0x7b2231f3U, 0xa6679b4bU, 0xc4451272U, 0x1900b8caU
- /* 8 */ , 0xf64463e6U, 0x2b01c95eU, 0x49234067U, 0x9466eadfU, 0x8d665215U, 0x5023f8adU, 0x32017194U, 0xef44db2cU
- /* 16 */ , 0xe964b13dU, 0x34211b85U, 0x560392bcU, 0x8b463804U, 0x924680ceU, 0x4f032a76U, 0x2d21a34fU, 0xf06409f7U
- /* 24 */ , 0x1f20d2dbU, 0xc2657863U, 0xa047f15aU, 0x7d025be2U, 0x6402e328U, 0xb9474990U, 0xdb65c0a9U, 0x06206a11U
- /* 32 */ , 0xd725148bU, 0x0a60be33U, 0x6842370aU, 0xb5079db2U, 0xac072578U, 0x71428fc0U, 0x136006f9U, 0xce25ac41U
- /* 40 */ , 0x2161776dU, 0xfc24ddd5U, 0x9e0654ecU, 0x4343fe54U, 0x5a43469eU, 0x8706ec26U, 0xe524651fU, 0x3861cfa7U
- /* 48 */ , 0x3e41a5b6U, 0xe3040f0eU, 0x81268637U, 0x5c632c8fU, 0x45639445U, 0x98263efdU, 0xfa04b7c4U, 0x27411d7cU
- /* 56 */ , 0xc805c650U, 0x15406ce8U, 0x7762e5d1U, 0xaa274f69U, 0xb327f7a3U, 0x6e625d1bU, 0x0c40d422U, 0xd1057e9aU
- /* 64 */ , 0xaba65fe7U, 0x76e3f55fU, 0x14c17c66U, 0xc984d6deU, 0xd0846e14U, 0x0dc1c4acU, 0x6fe34d95U, 0xb2a6e72dU
- /* 72 */ , 0x5de23c01U, 0x80a796b9U, 0xe2851f80U, 0x3fc0b538U, 0x26c00df2U, 0xfb85a74aU, 0x99a72e73U, 0x44e284cbU
- /* 80 */ , 0x42c2eedaU, 0x9f874462U, 0xfda5cd5bU, 0x20e067e3U, 0x39e0df29U, 0xe4a57591U, 0x8687fca8U, 0x5bc25610U
- /* 88 */ , 0xb4868d3cU, 0x69c32784U, 0x0be1aebdU, 0xd6a40405U, 0xcfa4bccfU, 0x12e11677U, 0x70c39f4eU, 0xad8635f6U
- /* 96 */ , 0x7c834b6cU, 0xa1c6e1d4U, 0xc3e468edU, 0x1ea1c255U, 0x07a17a9fU, 0xdae4d027U, 0xb8c6591eU, 0x6583f3a6U
- /* 104 */ , 0x8ac7288aU, 0x57828232U, 0x35a00b0bU, 0xe8e5a1b3U, 0xf1e51979U, 0x2ca0b3c1U, 0x4e823af8U, 0x93c79040U
- /* 112 */ , 0x95e7fa51U, 0x48a250e9U, 0x2a80d9d0U, 0xf7c57368U, 0xeec5cba2U, 0x3380611aU, 0x51a2e823U, 0x8ce7429bU
- /* 120 */ , 0x63a399b7U, 0xbee6330fU, 0xdcc4ba36U, 0x0181108eU, 0x1881a844U, 0xc5c402fcU, 0xa7e68bc5U, 0x7aa3217dU
- /* 128 */ , 0x52a0c93fU, 0x8fe56387U, 0xedc7eabeU, 0x30824006U, 0x2982f8ccU, 0xf4c75274U, 0x96e5db4dU, 0x4ba071f5U
- /* 136 */ , 0xa4e4aad9U, 0x79a10061U, 0x1b838958U, 0xc6c623e0U, 0xdfc69b2aU, 0x02833192U, 0x60a1b8abU, 0xbde41213U
- /* 144 */ , 0xbbc47802U, 0x6681d2baU, 0x04a35b83U, 0xd9e6f13bU, 0xc0e649f1U, 0x1da3e349U, 0x7f816a70U, 0xa2c4c0c8U
- /* 152 */ , 0x4d801be4U, 0x90c5b15cU, 0xf2e73865U, 0x2fa292ddU, 0x36a22a17U, 0xebe780afU, 0x89c50996U, 0x5480a32eU
- /* 160 */ , 0x8585ddb4U, 0x58c0770cU, 0x3ae2fe35U, 0xe7a7548dU, 0xfea7ec47U, 0x23e246ffU, 0x41c0cfc6U, 0x9c85657eU
- /* 168 */ , 0x73c1be52U, 0xae8414eaU, 0xcca69dd3U, 0x11e3376bU, 0x08e38fa1U, 0xd5a62519U, 0xb784ac20U, 0x6ac10698U
- /* 176 */ , 0x6ce16c89U, 0xb1a4c631U, 0xd3864f08U, 0x0ec3e5b0U, 0x17c35d7aU, 0xca86f7c2U, 0xa8a47efbU, 0x75e1d443U
- /* 184 */ , 0x9aa50f6fU, 0x47e0a5d7U, 0x25c22ceeU, 0xf8878656U, 0xe1873e9cU, 0x3cc29424U, 0x5ee01d1dU, 0x83a5b7a5U
- /* 192 */ , 0xf90696d8U, 0x24433c60U, 0x4661b559U, 0x9b241fe1U, 0x8224a72bU, 0x5f610d93U, 0x3d4384aaU, 0xe0062e12U
- /* 200 */ , 0x0f42f53eU, 0xd2075f86U, 0xb025d6bfU, 0x6d607c07U, 0x7460c4cdU, 0xa9256e75U, 0xcb07e74cU, 0x16424df4U
- /* 208 */ , 0x106227e5U, 0xcd278d5dU, 0xaf050464U, 0x7240aedcU, 0x6b401616U, 0xb605bcaeU, 0xd4273597U, 0x09629f2fU
- /* 216 */ , 0xe6264403U, 0x3b63eebbU, 0x59416782U, 0x8404cd3aU, 0x9d0475f0U, 0x4041df48U, 0x22635671U, 0xff26fcc9U
- /* 224 */ , 0x2e238253U, 0xf36628ebU, 0x9144a1d2U, 0x4c010b6aU, 0x5501b3a0U, 0x88441918U, 0xea669021U, 0x37233a99U
- /* 232 */ , 0xd867e1b5U, 0x05224b0dU, 0x6700c234U, 0xba45688cU, 0xa345d046U, 0x7e007afeU, 0x1c22f3c7U, 0xc167597fU
- /* 240 */ , 0xc747336eU, 0x1a0299d6U, 0x782010efU, 0xa565ba57U, 0xbc65029dU, 0x6120a825U, 0x0302211cU, 0xde478ba4U
- /* 248 */ , 0x31035088U, 0xec46fa30U, 0x8e647309U, 0x5321d9b1U, 0x4a21617bU, 0x9764cbc3U, 0xf54642faU, 0x2803e842U
- }
- ,
- /* CRC32C table 4 for quad-bytes ( big-endian ), auto-generated. DO NOT MODIFY! */
- {
- /* 0 */ 0x00000000U, 0x03836bf2U, 0xf7703be1U, 0xf4f35013U, 0x1f979ac7U, 0x1c14f135U, 0xe8e7a126U, 0xeb64cad4U
- /* 8 */ , 0xcf58d98aU, 0xccdbb278U, 0x3828e26bU, 0x3bab8999U, 0xd0cf434dU, 0xd34c28bfU, 0x27bf78acU, 0x243c135eU
- /* 16 */ , 0x6fc75e10U, 0x6c4435e2U, 0x98b765f1U, 0x9b340e03U, 0x7050c4d7U, 0x73d3af25U, 0x8720ff36U, 0x84a394c4U
- /* 24 */ , 0xa09f879aU, 0xa31cec68U, 0x57efbc7bU, 0x546cd789U, 0xbf081d5dU, 0xbc8b76afU, 0x487826bcU, 0x4bfb4d4eU
- /* 32 */ , 0xde8ebd20U, 0xdd0dd6d2U, 0x29fe86c1U, 0x2a7ded33U, 0xc11927e7U, 0xc29a4c15U, 0x36691c06U, 0x35ea77f4U
- /* 40 */ , 0x11d664aaU, 0x12550f58U, 0xe6a65f4bU, 0xe52534b9U, 0x0e41fe6dU, 0x0dc2959fU, 0xf931c58cU, 0xfab2ae7eU
- /* 48 */ , 0xb149e330U, 0xb2ca88c2U, 0x4639d8d1U, 0x45bab323U, 0xaede79f7U, 0xad5d1205U, 0x59ae4216U, 0x5a2d29e4U
- /* 56 */ , 0x7e113abaU, 0x7d925148U, 0x8961015bU, 0x8ae26aa9U, 0x6186a07dU, 0x6205cb8fU, 0x96f69b9cU, 0x9575f06eU
- /* 64 */ , 0xbc1d7b41U, 0xbf9e10b3U, 0x4b6d40a0U, 0x48ee2b52U, 0xa38ae186U, 0xa0098a74U, 0x54fada67U, 0x5779b195U
- /* 72 */ , 0x7345a2cbU, 0x70c6c939U, 0x8435992aU, 0x87b6f2d8U, 0x6cd2380cU, 0x6f5153feU, 0x9ba203edU, 0x9821681fU
- /* 80 */ , 0xd3da2551U, 0xd0594ea3U, 0x24aa1eb0U, 0x27297542U, 0xcc4dbf96U, 0xcfced464U, 0x3b3d8477U, 0x38beef85U
- /* 88 */ , 0x1c82fcdbU, 0x1f019729U, 0xebf2c73aU, 0xe871acc8U, 0x0315661cU, 0x00960deeU, 0xf4655dfdU, 0xf7e6360fU
- /* 96 */ , 0x6293c661U, 0x6110ad93U, 0x95e3fd80U, 0x96609672U, 0x7d045ca6U, 0x7e873754U, 0x8a746747U, 0x89f70cb5U
- /* 104 */ , 0xadcb1febU, 0xae487419U, 0x5abb240aU, 0x59384ff8U, 0xb25c852cU, 0xb1dfeedeU, 0x452cbecdU, 0x46afd53fU
- /* 112 */ , 0x0d549871U, 0x0ed7f383U, 0xfa24a390U, 0xf9a7c862U, 0x12c302b6U, 0x11406944U, 0xe5b33957U, 0xe63052a5U
- /* 120 */ , 0xc20c41fbU, 0xc18f2a09U, 0x357c7a1aU, 0x36ff11e8U, 0xdd9bdb3cU, 0xde18b0ceU, 0x2aebe0ddU, 0x29688b2fU
- /* 128 */ , 0x783bf682U, 0x7bb89d70U, 0x8f4bcd63U, 0x8cc8a691U, 0x67ac6c45U, 0x642f07b7U, 0x90dc57a4U, 0x935f3c56U
- /* 136 */ , 0xb7632f08U, 0xb4e044faU, 0x401314e9U, 0x43907f1bU, 0xa8f4b5cfU, 0xab77de3dU, 0x5f848e2eU, 0x5c07e5dcU
- /* 144 */ , 0x17fca892U, 0x147fc360U, 0xe08c9373U, 0xe30ff881U, 0x086b3255U, 0x0be859a7U, 0xff1b09b4U, 0xfc986246U
- /* 152 */ , 0xd8a47118U, 0xdb271aeaU, 0x2fd44af9U, 0x2c57210bU, 0xc733ebdfU, 0xc4b0802dU, 0x3043d03eU, 0x33c0bbccU
- /* 160 */ , 0xa6b54ba2U, 0xa5362050U, 0x51c57043U, 0x52461bb1U, 0xb922d165U, 0xbaa1ba97U, 0x4e52ea84U, 0x4dd18176U
- /* 168 */ , 0x69ed9228U, 0x6a6ef9daU, 0x9e9da9c9U, 0x9d1ec23bU, 0x767a08efU, 0x75f9631dU, 0x810a330eU, 0x828958fcU
- /* 176 */ , 0xc97215b2U, 0xcaf17e40U, 0x3e022e53U, 0x3d8145a1U, 0xd6e58f75U, 0xd566e487U, 0x2195b494U, 0x2216df66U
- /* 184 */ , 0x062acc38U, 0x05a9a7caU, 0xf15af7d9U, 0xf2d99c2bU, 0x19bd56ffU, 0x1a3e3d0dU, 0xeecd6d1eU, 0xed4e06ecU
- /* 192 */ , 0xc4268dc3U, 0xc7a5e631U, 0x3356b622U, 0x30d5ddd0U, 0xdbb11704U, 0xd8327cf6U, 0x2cc12ce5U, 0x2f424717U
- /* 200 */ , 0x0b7e5449U, 0x08fd3fbbU, 0xfc0e6fa8U, 0xff8d045aU, 0x14e9ce8eU, 0x176aa57cU, 0xe399f56fU, 0xe01a9e9dU
- /* 208 */ , 0xabe1d3d3U, 0xa862b821U, 0x5c91e832U, 0x5f1283c0U, 0xb4764914U, 0xb7f522e6U, 0x430672f5U, 0x40851907U
- /* 216 */ , 0x64b90a59U, 0x673a61abU, 0x93c931b8U, 0x904a5a4aU, 0x7b2e909eU, 0x78adfb6cU, 0x8c5eab7fU, 0x8fddc08dU
- /* 224 */ , 0x1aa830e3U, 0x192b5b11U, 0xedd80b02U, 0xee5b60f0U, 0x053faa24U, 0x06bcc1d6U, 0xf24f91c5U, 0xf1ccfa37U
- /* 232 */ , 0xd5f0e969U, 0xd673829bU, 0x2280d288U, 0x2103b97aU, 0xca6773aeU, 0xc9e4185cU, 0x3d17484fU, 0x3e9423bdU
- /* 240 */ , 0x756f6ef3U, 0x76ec0501U, 0x821f5512U, 0x819c3ee0U, 0x6af8f434U, 0x697b9fc6U, 0x9d88cfd5U, 0x9e0ba427U
- /* 248 */ , 0xba37b779U, 0xb9b4dc8bU, 0x4d478c98U, 0x4ec4e76aU, 0xa5a02dbeU, 0xa623464cU, 0x52d0165fU, 0x51537dadU
- }
- ,
- /* CRC32C table 5 for quad-bytes ( big-endian ), auto-generated. DO NOT MODIFY! */
- {
- /* 0 */ 0x00000000U, 0x7798a213U, 0xee304527U, 0x99a8e734U, 0xdc618a4eU, 0xabf9285dU, 0x3251cf69U, 0x45c96d7aU
- /* 8 */ , 0xb8c3149dU, 0xcf5bb68eU, 0x56f351baU, 0x216bf3a9U, 0x64a29ed3U, 0x133a3cc0U, 0x8a92dbf4U, 0xfd0a79e7U
- /* 16 */ , 0x81f1c53fU, 0xf669672cU, 0x6fc18018U, 0x1859220bU, 0x5d904f71U, 0x2a08ed62U, 0xb3a00a56U, 0xc438a845U
- /* 24 */ , 0x3932d1a2U, 0x4eaa73b1U, 0xd7029485U, 0xa09a3696U, 0xe5535becU, 0x92cbf9ffU, 0x0b631ecbU, 0x7cfbbcd8U
- /* 32 */ , 0x02e38b7fU, 0x757b296cU, 0xecd3ce58U, 0x9b4b6c4bU, 0xde820131U, 0xa91aa322U, 0x30b24416U, 0x472ae605U
- /* 40 */ , 0xba209fe2U, 0xcdb83df1U, 0x5410dac5U, 0x238878d6U, 0x664115acU, 0x11d9b7bfU, 0x8871508bU, 0xffe9f298U
- /* 48 */ , 0x83124e40U, 0xf48aec53U, 0x6d220b67U, 0x1abaa974U, 0x5f73c40eU, 0x28eb661dU, 0xb1438129U, 0xc6db233aU
- /* 56 */ , 0x3bd15addU, 0x4c49f8ceU, 0xd5e11ffaU, 0xa279bde9U, 0xe7b0d093U, 0x90287280U, 0x098095b4U, 0x7e1837a7U
- /* 64 */ , 0x04c617ffU, 0x735eb5ecU, 0xeaf652d8U, 0x9d6ef0cbU, 0xd8a79db1U, 0xaf3f3fa2U, 0x3697d896U, 0x410f7a85U
- /* 72 */ , 0xbc050362U, 0xcb9da171U, 0x52354645U, 0x25ade456U, 0x6064892cU, 0x17fc2b3fU, 0x8e54cc0bU, 0xf9cc6e18U
- /* 80 */ , 0x8537d2c0U, 0xf2af70d3U, 0x6b0797e7U, 0x1c9f35f4U, 0x5956588eU, 0x2ecefa9dU, 0xb7661da9U, 0xc0febfbaU
- /* 88 */ , 0x3df4c65dU, 0x4a6c644eU, 0xd3c4837aU, 0xa45c2169U, 0xe1954c13U, 0x960dee00U, 0x0fa50934U, 0x783dab27U
- /* 96 */ , 0x06259c80U, 0x71bd3e93U, 0xe815d9a7U, 0x9f8d7bb4U, 0xda4416ceU, 0xaddcb4ddU, 0x347453e9U, 0x43ecf1faU
- /* 104 */ , 0xbee6881dU, 0xc97e2a0eU, 0x50d6cd3aU, 0x274e6f29U, 0x62870253U, 0x151fa040U, 0x8cb74774U, 0xfb2fe567U
- /* 112 */ , 0x87d459bfU, 0xf04cfbacU, 0x69e41c98U, 0x1e7cbe8bU, 0x5bb5d3f1U, 0x2c2d71e2U, 0xb58596d6U, 0xc21d34c5U
- /* 120 */ , 0x3f174d22U, 0x488fef31U, 0xd1270805U, 0xa6bfaa16U, 0xe376c76cU, 0x94ee657fU, 0x0d46824bU, 0x7ade2058U
- /* 128 */ , 0xf9fac3fbU, 0x8e6261e8U, 0x17ca86dcU, 0x605224cfU, 0x259b49b5U, 0x5203eba6U, 0xcbab0c92U, 0xbc33ae81U
- /* 136 */ , 0x4139d766U, 0x36a17575U, 0xaf099241U, 0xd8913052U, 0x9d585d28U, 0xeac0ff3bU, 0x7368180fU, 0x04f0ba1cU
- /* 144 */ , 0x780b06c4U, 0x0f93a4d7U, 0x963b43e3U, 0xe1a3e1f0U, 0xa46a8c8aU, 0xd3f22e99U, 0x4a5ac9adU, 0x3dc26bbeU
- /* 152 */ , 0xc0c81259U, 0xb750b04aU, 0x2ef8577eU, 0x5960f56dU, 0x1ca99817U, 0x6b313a04U, 0xf299dd30U, 0x85017f23U
- /* 160 */ , 0xfb194884U, 0x8c81ea97U, 0x15290da3U, 0x62b1afb0U, 0x2778c2caU, 0x50e060d9U, 0xc94887edU, 0xbed025feU
- /* 168 */ , 0x43da5c19U, 0x3442fe0aU, 0xadea193eU, 0xda72bb2dU, 0x9fbbd657U, 0xe8237444U, 0x718b9370U, 0x06133163U
- /* 176 */ , 0x7ae88dbbU, 0x0d702fa8U, 0x94d8c89cU, 0xe3406a8fU, 0xa68907f5U, 0xd111a5e6U, 0x48b942d2U, 0x3f21e0c1U
- /* 184 */ , 0xc22b9926U, 0xb5b33b35U, 0x2c1bdc01U, 0x5b837e12U, 0x1e4a1368U, 0x69d2b17bU, 0xf07a564fU, 0x87e2f45cU
- /* 192 */ , 0xfd3cd404U, 0x8aa47617U, 0x130c9123U, 0x64943330U, 0x215d5e4aU, 0x56c5fc59U, 0xcf6d1b6dU, 0xb8f5b97eU
- /* 200 */ , 0x45ffc099U, 0x3267628aU, 0xabcf85beU, 0xdc5727adU, 0x999e4ad7U, 0xee06e8c4U, 0x77ae0ff0U, 0x0036ade3U
- /* 208 */ , 0x7ccd113bU, 0x0b55b328U, 0x92fd541cU, 0xe565f60fU, 0xa0ac9b75U, 0xd7343966U, 0x4e9cde52U, 0x39047c41U
- /* 216 */ , 0xc40e05a6U, 0xb396a7b5U, 0x2a3e4081U, 0x5da6e292U, 0x186f8fe8U, 0x6ff72dfbU, 0xf65fcacfU, 0x81c768dcU
- /* 224 */ , 0xffdf5f7bU, 0x8847fd68U, 0x11ef1a5cU, 0x6677b84fU, 0x23bed535U, 0x54267726U, 0xcd8e9012U, 0xba163201U
- /* 232 */ , 0x471c4be6U, 0x3084e9f5U, 0xa92c0ec1U, 0xdeb4acd2U, 0x9b7dc1a8U, 0xece563bbU, 0x754d848fU, 0x02d5269cU
- /* 240 */ , 0x7e2e9a44U, 0x09b63857U, 0x901edf63U, 0xe7867d70U, 0xa24f100aU, 0xd5d7b219U, 0x4c7f552dU, 0x3be7f73eU
- /* 248 */ , 0xc6ed8ed9U, 0xb1752ccaU, 0x28ddcbfeU, 0x5f4569edU, 0x1a8c0497U, 0x6d14a684U, 0xf4bc41b0U, 0x8324e3a3U
- }
- ,
- /* CRC32C table 6 for quad-bytes ( big-endian ), auto-generated. DO NOT MODIFY! */
- {
- /* 0 */ 0x00000000U, 0x7e9241a5U, 0x0d526f4fU, 0x73c02eeaU, 0x1aa4de9eU, 0x64369f3bU, 0x17f6b1d1U, 0x6964f074U
- /* 8 */ , 0xc53e5138U, 0xbbac109dU, 0xc86c3e77U, 0xb6fe7fd2U, 0xdf9a8fa6U, 0xa108ce03U, 0xd2c8e0e9U, 0xac5aa14cU
- /* 16 */ , 0x8a7da270U, 0xf4efe3d5U, 0x872fcd3fU, 0xf9bd8c9aU, 0x90d97ceeU, 0xee4b3d4bU, 0x9d8b13a1U, 0xe3195204U
- /* 24 */ , 0x4f43f348U, 0x31d1b2edU, 0x42119c07U, 0x3c83dda2U, 0x55e72dd6U, 0x2b756c73U, 0x58b54299U, 0x2627033cU
- /* 32 */ , 0x14fb44e1U, 0x6a690544U, 0x19a92baeU, 0x673b6a0bU, 0x0e5f9a7fU, 0x70cddbdaU, 0x030df530U, 0x7d9fb495U
- /* 40 */ , 0xd1c515d9U, 0xaf57547cU, 0xdc977a96U, 0xa2053b33U, 0xcb61cb47U, 0xb5f38ae2U, 0xc633a408U, 0xb8a1e5adU
- /* 48 */ , 0x9e86e691U, 0xe014a734U, 0x93d489deU, 0xed46c87bU, 0x8422380fU, 0xfab079aaU, 0x89705740U, 0xf7e216e5U
- /* 56 */ , 0x5bb8b7a9U, 0x252af60cU, 0x56ead8e6U, 0x28789943U, 0x411c6937U, 0x3f8e2892U, 0x4c4e0678U, 0x32dc47ddU
- /* 64 */ , 0xd98065c7U, 0xa7122462U, 0xd4d20a88U, 0xaa404b2dU, 0xc324bb59U, 0xbdb6fafcU, 0xce76d416U, 0xb0e495b3U
- /* 72 */ , 0x1cbe34ffU, 0x622c755aU, 0x11ec5bb0U, 0x6f7e1a15U, 0x061aea61U, 0x7888abc4U, 0x0b48852eU, 0x75dac48bU
- /* 80 */ , 0x53fdc7b7U, 0x2d6f8612U, 0x5eafa8f8U, 0x203de95dU, 0x49591929U, 0x37cb588cU, 0x440b7666U, 0x3a9937c3U
- /* 88 */ , 0x96c3968fU, 0xe851d72aU, 0x9b91f9c0U, 0xe503b865U, 0x8c674811U, 0xf2f509b4U, 0x8135275eU, 0xffa766fbU
- /* 96 */ , 0xcd7b2126U, 0xb3e96083U, 0xc0294e69U, 0xbebb0fccU, 0xd7dfffb8U, 0xa94dbe1dU, 0xda8d90f7U, 0xa41fd152U
- /* 104 */ , 0x0845701eU, 0x76d731bbU, 0x05171f51U, 0x7b855ef4U, 0x12e1ae80U, 0x6c73ef25U, 0x1fb3c1cfU, 0x6121806aU
- /* 112 */ , 0x47068356U, 0x3994c2f3U, 0x4a54ec19U, 0x34c6adbcU, 0x5da25dc8U, 0x23301c6dU, 0x50f03287U, 0x2e627322U
- /* 120 */ , 0x8238d26eU, 0xfcaa93cbU, 0x8f6abd21U, 0xf1f8fc84U, 0x989c0cf0U, 0xe60e4d55U, 0x95ce63bfU, 0xeb5c221aU
- /* 128 */ , 0x4377278bU, 0x3de5662eU, 0x4e2548c4U, 0x30b70961U, 0x59d3f915U, 0x2741b8b0U, 0x5481965aU, 0x2a13d7ffU
- /* 136 */ , 0x864976b3U, 0xf8db3716U, 0x8b1b19fcU, 0xf5895859U, 0x9ceda82dU, 0xe27fe988U, 0x91bfc762U, 0xef2d86c7U
- /* 144 */ , 0xc90a85fbU, 0xb798c45eU, 0xc458eab4U, 0xbacaab11U, 0xd3ae5b65U, 0xad3c1ac0U, 0xdefc342aU, 0xa06e758fU
- /* 152 */ , 0x0c34d4c3U, 0x72a69566U, 0x0166bb8cU, 0x7ff4fa29U, 0x16900a5dU, 0x68024bf8U, 0x1bc26512U, 0x655024b7U
- /* 160 */ , 0x578c636aU, 0x291e22cfU, 0x5ade0c25U, 0x244c4d80U, 0x4d28bdf4U, 0x33bafc51U, 0x407ad2bbU, 0x3ee8931eU
- /* 168 */ , 0x92b23252U, 0xec2073f7U, 0x9fe05d1dU, 0xe1721cb8U, 0x8816ecccU, 0xf684ad69U, 0x85448383U, 0xfbd6c226U
- /* 176 */ , 0xddf1c11aU, 0xa36380bfU, 0xd0a3ae55U, 0xae31eff0U, 0xc7551f84U, 0xb9c75e21U, 0xca0770cbU, 0xb495316eU
- /* 184 */ , 0x18cf9022U, 0x665dd187U, 0x159dff6dU, 0x6b0fbec8U, 0x026b4ebcU, 0x7cf90f19U, 0x0f3921f3U, 0x71ab6056U
- /* 192 */ , 0x9af7424cU, 0xe46503e9U, 0x97a52d03U, 0xe9376ca6U, 0x80539cd2U, 0xfec1dd77U, 0x8d01f39dU, 0xf393b238U
- /* 200 */ , 0x5fc91374U, 0x215b52d1U, 0x529b7c3bU, 0x2c093d9eU, 0x456dcdeaU, 0x3bff8c4fU, 0x483fa2a5U, 0x36ade300U
- /* 208 */ , 0x108ae03cU, 0x6e18a199U, 0x1dd88f73U, 0x634aced6U, 0x0a2e3ea2U, 0x74bc7f07U, 0x077c51edU, 0x79ee1048U
- /* 216 */ , 0xd5b4b104U, 0xab26f0a1U, 0xd8e6de4bU, 0xa6749feeU, 0xcf106f9aU, 0xb1822e3fU, 0xc24200d5U, 0xbcd04170U
- /* 224 */ , 0x8e0c06adU, 0xf09e4708U, 0x835e69e2U, 0xfdcc2847U, 0x94a8d833U, 0xea3a9996U, 0x99fab77cU, 0xe768f6d9U
- /* 232 */ , 0x4b325795U, 0x35a01630U, 0x466038daU, 0x38f2797fU, 0x5196890bU, 0x2f04c8aeU, 0x5cc4e644U, 0x2256a7e1U
- /* 240 */ , 0x0471a4ddU, 0x7ae3e578U, 0x0923cb92U, 0x77b18a37U, 0x1ed57a43U, 0x60473be6U, 0x1387150cU, 0x6d1554a9U
- /* 248 */ , 0xc14ff5e5U, 0xbfddb440U, 0xcc1d9aaaU, 0xb28fdb0fU, 0xdbeb2b7bU, 0xa5796adeU, 0xd6b94434U, 0xa82b0591U
- }
- ,
- /* CRC32C table 7 for quad-bytes ( big-endian ), auto-generated. DO NOT MODIFY! */
- {
- /* 0 */ 0x00000000U, 0xb8aa45ddU, 0x812367bfU, 0x39892262U, 0xf331227bU, 0x4b9b67a6U, 0x721245c4U, 0xcab80019U
- /* 8 */ , 0xe66344f6U, 0x5ec9012bU, 0x67402349U, 0xdfea6694U, 0x1552668dU, 0xadf82350U, 0x94710132U, 0x2cdb44efU
- /* 16 */ , 0x3db164e9U, 0x851b2134U, 0xbc920356U, 0x0438468bU, 0xce804692U, 0x762a034fU, 0x4fa3212dU, 0xf70964f0U
- /* 24 */ , 0xdbd2201fU, 0x637865c2U, 0x5af147a0U, 0xe25b027dU, 0x28e30264U, 0x904947b9U, 0xa9c065dbU, 0x116a2006U
- /* 32 */ , 0x8b1425d7U, 0x33be600aU, 0x0a374268U, 0xb29d07b5U, 0x782507acU, 0xc08f4271U, 0xf9066013U, 0x41ac25ceU
- /* 40 */ , 0x6d776121U, 0xd5dd24fcU, 0xec54069eU, 0x54fe4343U, 0x9e46435aU, 0x26ec0687U, 0x1f6524e5U, 0xa7cf6138U
- /* 48 */ , 0xb6a5413eU, 0x0e0f04e3U, 0x37862681U, 0x8f2c635cU, 0x45946345U, 0xfd3e2698U, 0xc4b704faU, 0x7c1d4127U
- /* 56 */ , 0x50c605c8U, 0xe86c4015U, 0xd1e56277U, 0x694f27aaU, 0xa3f727b3U, 0x1b5d626eU, 0x22d4400cU, 0x9a7e05d1U
- /* 64 */ , 0xe75fa6abU, 0x5ff5e376U, 0x667cc114U, 0xded684c9U, 0x146e84d0U, 0xacc4c10dU, 0x954de36fU, 0x2de7a6b2U
- /* 72 */ , 0x013ce25dU, 0xb996a780U, 0x801f85e2U, 0x38b5c03fU, 0xf20dc026U, 0x4aa785fbU, 0x732ea799U, 0xcb84e244U
- /* 80 */ , 0xdaeec242U, 0x6244879fU, 0x5bcda5fdU, 0xe367e020U, 0x29dfe039U, 0x9175a5e4U, 0xa8fc8786U, 0x1056c25bU
- /* 88 */ , 0x3c8d86b4U, 0x8427c369U, 0xbdaee10bU, 0x0504a4d6U, 0xcfbca4cfU, 0x7716e112U, 0x4e9fc370U, 0xf63586adU
- /* 96 */ , 0x6c4b837cU, 0xd4e1c6a1U, 0xed68e4c3U, 0x55c2a11eU, 0x9f7aa107U, 0x27d0e4daU, 0x1e59c6b8U, 0xa6f38365U
- /* 104 */ , 0x8a28c78aU, 0x32828257U, 0x0b0ba035U, 0xb3a1e5e8U, 0x7919e5f1U, 0xc1b3a02cU, 0xf83a824eU, 0x4090c793U
- /* 112 */ , 0x51fae795U, 0xe950a248U, 0xd0d9802aU, 0x6873c5f7U, 0xa2cbc5eeU, 0x1a618033U, 0x23e8a251U, 0x9b42e78cU
- /* 120 */ , 0xb799a363U, 0x0f33e6beU, 0x36bac4dcU, 0x8e108101U, 0x44a88118U, 0xfc02c4c5U, 0xc58be6a7U, 0x7d21a37aU
- /* 128 */ , 0x3fc9a052U, 0x8763e58fU, 0xbeeac7edU, 0x06408230U, 0xccf88229U, 0x7452c7f4U, 0x4ddbe596U, 0xf571a04bU
- /* 136 */ , 0xd9aae4a4U, 0x6100a179U, 0x5889831bU, 0xe023c6c6U, 0x2a9bc6dfU, 0x92318302U, 0xabb8a160U, 0x1312e4bdU
- /* 144 */ , 0x0278c4bbU, 0xbad28166U, 0x835ba304U, 0x3bf1e6d9U, 0xf149e6c0U, 0x49e3a31dU, 0x706a817fU, 0xc8c0c4a2U
- /* 152 */ , 0xe41b804dU, 0x5cb1c590U, 0x6538e7f2U, 0xdd92a22fU, 0x172aa236U, 0xaf80e7ebU, 0x9609c589U, 0x2ea38054U
- /* 160 */ , 0xb4dd8585U, 0x0c77c058U, 0x35fee23aU, 0x8d54a7e7U, 0x47eca7feU, 0xff46e223U, 0xc6cfc041U, 0x7e65859cU
- /* 168 */ , 0x52bec173U, 0xea1484aeU, 0xd39da6ccU, 0x6b37e311U, 0xa18fe308U, 0x1925a6d5U, 0x20ac84b7U, 0x9806c16aU
- /* 176 */ , 0x896ce16cU, 0x31c6a4b1U, 0x084f86d3U, 0xb0e5c30eU, 0x7a5dc317U, 0xc2f786caU, 0xfb7ea4a8U, 0x43d4e175U
- /* 184 */ , 0x6f0fa59aU, 0xd7a5e047U, 0xee2cc225U, 0x568687f8U, 0x9c3e87e1U, 0x2494c23cU, 0x1d1de05eU, 0xa5b7a583U
- /* 192 */ , 0xd89606f9U, 0x603c4324U, 0x59b56146U, 0xe11f249bU, 0x2ba72482U, 0x930d615fU, 0xaa84433dU, 0x122e06e0U
- /* 200 */ , 0x3ef5420fU, 0x865f07d2U, 0xbfd625b0U, 0x077c606dU, 0xcdc46074U, 0x756e25a9U, 0x4ce707cbU, 0xf44d4216U
- /* 208 */ , 0xe5276210U, 0x5d8d27cdU, 0x640405afU, 0xdcae4072U, 0x1616406bU, 0xaebc05b6U, 0x973527d4U, 0x2f9f6209U
- /* 216 */ , 0x034426e6U, 0xbbee633bU, 0x82674159U, 0x3acd0484U, 0xf075049dU, 0x48df4140U, 0x71566322U, 0xc9fc26ffU
- /* 224 */ , 0x5382232eU, 0xeb2866f3U, 0xd2a14491U, 0x6a0b014cU, 0xa0b30155U, 0x18194488U, 0x219066eaU, 0x993a2337U
- /* 232 */ , 0xb5e167d8U, 0x0d4b2205U, 0x34c20067U, 0x8c6845baU, 0x46d045a3U, 0xfe7a007eU, 0xc7f3221cU, 0x7f5967c1U
- /* 240 */ , 0x6e3347c7U, 0xd699021aU, 0xef102078U, 0x57ba65a5U, 0x9d0265bcU, 0x25a82061U, 0x1c210203U, 0xa48b47deU
- /* 248 */ , 0x88500331U, 0x30fa46ecU, 0x0973648eU, 0xb1d92153U, 0x7b61214aU, 0xc3cb6497U, 0xfa4246f5U, 0x42e80328U
- }
- #endif
- };
-
-juint* StubRoutines::ppc64::_crc_constants = StubRoutines::ppc64::generate_crc_constants(REVERSE_CRC32_POLY);
-juint* StubRoutines::ppc64::_crc32c_constants = StubRoutines::ppc64::generate_crc_constants(REVERSE_CRC32C_POLY);
-
-juint* StubRoutines::ppc64::_crc_barret_constants = StubRoutines::ppc64::generate_crc_barret_constants(REVERSE_CRC32_POLY);
-juint* StubRoutines::ppc64::_crc32c_barret_constants = StubRoutines::ppc64::generate_crc_barret_constants(REVERSE_CRC32C_POLY);
diff --git a/src/hotspot/cpu/ppc/templateInterpreterGenerator_ppc.cpp b/src/hotspot/cpu/ppc/templateInterpreterGenerator_ppc.cpp
index eb084dd1c95..f099cfbedd5 100644
--- a/src/hotspot/cpu/ppc/templateInterpreterGenerator_ppc.cpp
+++ b/src/hotspot/cpu/ppc/templateInterpreterGenerator_ppc.cpp
@@ -1,6 +1,6 @@
/*
- * Copyright (c) 2014, 2018, Oracle and/or its affiliates. All rights reserved.
- * Copyright (c) 2015, 2018, SAP SE. All rights reserved.
+ * Copyright (c) 2014, 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2019, SAP SE. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -532,14 +532,8 @@ address TemplateInterpreterGenerator::generate_Reference_get_entry(void) {
// these parameters the pre-barrier does not generate
// the load of the previous value.
- // Restore caller sp for c2i case.
-#ifdef ASSERT
- __ ld(R9_ARG7, 0, R1_SP);
- __ ld(R10_ARG8, 0, R21_sender_SP);
- __ cmpd(CCR0, R9_ARG7, R10_ARG8);
- __ asm_assert_eq("backlink", 0x544);
-#endif // ASSERT
- __ mr(R1_SP, R21_sender_SP); // Cut the stack back to where the caller started.
+ // Restore caller sp for c2i case (from compiled) and for resized sender frame (from interpreted).
+ __ resize_frame_absolute(R21_sender_SP, R11_scratch1, R0);
__ blr();
@@ -835,8 +829,13 @@ void TemplateInterpreterGenerator::generate_stack_overflow_check(Register Rmem_f
assert(StubRoutines::throw_StackOverflowError_entry() != NULL, "generated in wrong order");
__ load_const_optimized(Rscratch1, (StubRoutines::throw_StackOverflowError_entry()), R0);
__ mtctr(Rscratch1);
- // Restore caller_sp.
+ // Restore caller_sp (c2i adapter may exist, but no shrinking of interpreted caller frame).
#ifdef ASSERT
+ Label frame_not_shrunk;
+ __ cmpld(CCR0, R1_SP, R21_sender_SP);
+ __ ble(CCR0, frame_not_shrunk);
+ __ stop("frame shrunk", 0x546);
+ __ bind(frame_not_shrunk);
__ ld(Rscratch1, 0, R1_SP);
__ ld(R0, 0, R21_sender_SP);
__ cmpd(CCR0, R0, Rscratch1);
@@ -1155,15 +1154,6 @@ address TemplateInterpreterGenerator::generate_math_entry(AbstractInterpreter::M
}
}
- // Pop c2i arguments (if any) off when we return.
-#ifdef ASSERT
- __ ld(R9_ARG7, 0, R1_SP);
- __ ld(R10_ARG8, 0, R21_sender_SP);
- __ cmpd(CCR0, R9_ARG7, R10_ARG8);
- __ asm_assert_eq("backlink", 0x545);
-#endif // ASSERT
- __ mr(R1_SP, R21_sender_SP); // Cut the stack back to where the caller started.
-
if (use_instruction) {
switch (kind) {
case Interpreter::java_lang_math_sqrt: __ fsqrt(F1_RET, F1); break;
@@ -1188,6 +1178,8 @@ address TemplateInterpreterGenerator::generate_math_entry(AbstractInterpreter::M
__ restore_LR_CR(R0);
}
+ // Restore caller sp for c2i case (from compiled) and for resized sender frame (from interpreted).
+ __ resize_frame_absolute(R21_sender_SP, R11_scratch1, R0);
__ blr();
__ flush();
@@ -1823,28 +1815,26 @@ address TemplateInterpreterGenerator::generate_CRC32_update_entry() {
// R15_esp is callers operand stack pointer, i.e. it points to the parameters.
const Register argP = R15_esp;
const Register crc = R3_ARG1; // crc value
- const Register data = R4_ARG2; // address of java byte value (kernel_crc32 needs address)
- const Register dataLen = R5_ARG3; // source data len (1 byte). Not used because calling the single-byte emitter.
- const Register table = R6_ARG4; // address of crc32 table
- const Register tmp = dataLen; // Reuse unused len register to show we don't actually need a separate tmp here.
+ const Register data = R4_ARG2;
+ const Register table = R5_ARG3; // address of crc32 table
BLOCK_COMMENT("CRC32_update {");
// Arguments are reversed on java expression stack
#ifdef VM_LITTLE_ENDIAN
- __ addi(data, argP, 0+1*wordSize); // (stack) address of byte value. Emitter expects address, not value.
+ int data_offs = 0+1*wordSize; // (stack) address of byte value. Emitter expects address, not value.
// Being passed as an int, the single byte is at offset +0.
#else
- __ addi(data, argP, 3+1*wordSize); // (stack) address of byte value. Emitter expects address, not value.
+ int data_offs = 3+1*wordSize; // (stack) address of byte value. Emitter expects address, not value.
// Being passed from java as an int, the single byte is at offset +3.
#endif
- __ lwz(crc, 2*wordSize, argP); // Current crc state, zero extend to 64 bit to have a clean register.
+ __ lwz(crc, 2*wordSize, argP); // Current crc state, zero extend to 64 bit to have a clean register.
+ __ lbz(data, data_offs, argP); // Byte from buffer, zero-extended.
+ __ load_const_optimized(table, StubRoutines::crc_table_addr(), R0);
+ __ kernel_crc32_singleByteReg(crc, data, table, true);
- StubRoutines::ppc64::generate_load_crc_table_addr(_masm, table);
- __ kernel_crc32_singleByte(crc, data, dataLen, table, tmp, true);
-
- // Restore caller sp for c2i case and return.
- __ mr(R1_SP, R21_sender_SP); // Cut the stack back to where the caller started.
+ // Restore caller sp for c2i case (from compiled) and for resized sender frame (from interpreted).
+ __ resize_frame_absolute(R21_sender_SP, R11_scratch1, R0);
__ blr();
// Generate a vanilla native entry as the slow path.
@@ -1881,19 +1871,7 @@ address TemplateInterpreterGenerator::generate_CRC32_updateBytes_entry(AbstractI
const Register crc = R3_ARG1; // crc value
const Register data = R4_ARG2; // address of java byte array
const Register dataLen = R5_ARG3; // source data len
- const Register table = R6_ARG4; // address of crc32 table
-
- const Register t0 = R9; // scratch registers for crc calculation
- const Register t1 = R10;
- const Register t2 = R11;
- const Register t3 = R12;
-
- const Register tc0 = R2; // registers to hold pre-calculated column addresses
- const Register tc1 = R7;
- const Register tc2 = R8;
- const Register tc3 = table; // table address is reconstructed at the end of kernel_crc32_* emitters
-
- const Register tmp = t0; // Only used very locally to calculate byte buffer address.
+ const Register tmp = R11_scratch1;
// Arguments are reversed on java expression stack.
// Calculate address of start element.
@@ -1924,15 +1902,10 @@ address TemplateInterpreterGenerator::generate_CRC32_updateBytes_entry(AbstractI
__ addi(data, data, arrayOopDesc::base_offset_in_bytes(T_BYTE));
}
- StubRoutines::ppc64::generate_load_crc_table_addr(_masm, table);
+ __ crc32(crc, data, dataLen, R2, R6, R7, R8, R9, R10, R11, R12, false);
- // Performance measurements show the 1word and 2word variants to be almost equivalent,
- // with very light advantages for the 1word variant. We chose the 1word variant for
- // code compactness.
- __ kernel_crc32_1word(crc, data, dataLen, table, t0, t1, t2, t3, tc0, tc1, tc2, tc3, true);
-
- // Restore caller sp for c2i case and return.
- __ mr(R1_SP, R21_sender_SP); // Cut the stack back to where the caller started.
+ // Restore caller sp for c2i case (from compiled) and for resized sender frame (from interpreted).
+ __ resize_frame_absolute(R21_sender_SP, R11_scratch1, R0);
__ blr();
// Generate a vanilla native entry as the slow path.
@@ -1967,19 +1940,7 @@ address TemplateInterpreterGenerator::generate_CRC32C_updateBytes_entry(Abstract
const Register crc = R3_ARG1; // crc value
const Register data = R4_ARG2; // address of java byte array
const Register dataLen = R5_ARG3; // source data len
- const Register table = R6_ARG4; // address of crc32c table
-
- const Register t0 = R9; // scratch registers for crc calculation
- const Register t1 = R10;
- const Register t2 = R11;
- const Register t3 = R12;
-
- const Register tc0 = R2; // registers to hold pre-calculated column addresses
- const Register tc1 = R7;
- const Register tc2 = R8;
- const Register tc3 = table; // table address is reconstructed at the end of kernel_crc32_* emitters
-
- const Register tmp = t0; // Only used very locally to calculate byte buffer address.
+ const Register tmp = R11_scratch1;
// Arguments are reversed on java expression stack.
// Calculate address of start element.
@@ -2012,15 +1973,10 @@ address TemplateInterpreterGenerator::generate_CRC32C_updateBytes_entry(Abstract
__ addi(data, data, arrayOopDesc::base_offset_in_bytes(T_BYTE));
}
- StubRoutines::ppc64::generate_load_crc32c_table_addr(_masm, table);
+ __ crc32(crc, data, dataLen, R2, R6, R7, R8, R9, R10, R11, R12, true);
- // Performance measurements show the 1word and 2word variants to be almost equivalent,
- // with very light advantages for the 1word variant. We chose the 1word variant for
- // code compactness.
- __ kernel_crc32_1word(crc, data, dataLen, table, t0, t1, t2, t3, tc0, tc1, tc2, tc3, false);
-
- // Restore caller sp for c2i case and return.
- __ mr(R1_SP, R21_sender_SP); // Cut the stack back to where the caller started.
+ // Restore caller sp for c2i case (from compiled) and for resized sender frame (from interpreted).
+ __ resize_frame_absolute(R21_sender_SP, R11_scratch1, R0);
__ blr();
BLOCK_COMMENT("} CRC32C_update{Bytes|DirectByteBuffer}");
diff --git a/src/hotspot/cpu/ppc/templateTable_ppc.hpp b/src/hotspot/cpu/ppc/templateTable_ppc.hpp
index 05ce69093b3..0ab9814ebae 100644
--- a/src/hotspot/cpu/ppc/templateTable_ppc.hpp
+++ b/src/hotspot/cpu/ppc/templateTable_ppc.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2014, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2019, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2013, 2016 SAP SE. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
@@ -23,8 +23,8 @@
*
*/
-#ifndef CPU_PPC_VM_TEMPLATETABLE_PPC_HPP
-#define CPU_PPC_VM_TEMPLATETABLE_PPC_HPP
+#ifndef CPU_PPC_TEMPLATETABLE_PPC_HPP
+#define CPU_PPC_TEMPLATETABLE_PPC_HPP
static void prepare_invoke(int byte_no, Register Rmethod, Register Rret_addr, Register Rindex, Register Rrecv, Register Rflags, Register Rscratch);
static void invokevfinal_helper(Register Rmethod, Register Rflags, Register Rscratch1, Register Rscratch2);
@@ -35,4 +35,4 @@
static void branch_conditional(ConditionRegister crx, TemplateTable::Condition cc, Label& L, bool invert = false);
static void if_cmp_common(Register Rfirst, Register Rsecond, Register Rscratch1, Register Rscratch2, Condition cc, bool is_jint, bool cmp0);
-#endif // CPU_PPC_VM_TEMPLATETABLE_PPC_HPP
+#endif // CPU_PPC_TEMPLATETABLE_PPC_HPP
diff --git a/src/hotspot/cpu/ppc/vmStructs_ppc.hpp b/src/hotspot/cpu/ppc/vmStructs_ppc.hpp
index c5297f395e1..c1bdc1b1eb5 100644
--- a/src/hotspot/cpu/ppc/vmStructs_ppc.hpp
+++ b/src/hotspot/cpu/ppc/vmStructs_ppc.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2001, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2019, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2012, 2013 SAP SE. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
@@ -23,8 +23,8 @@
*
*/
-#ifndef CPU_PPC_VM_VMSTRUCTS_PPC_HPP
-#define CPU_PPC_VM_VMSTRUCTS_PPC_HPP
+#ifndef CPU_PPC_VMSTRUCTS_PPC_HPP
+#define CPU_PPC_VMSTRUCTS_PPC_HPP
// These are the CPU-specific fields, types and integer
// constants required by the Serviceability Agent. This file is
@@ -38,4 +38,4 @@
#define VM_LONG_CONSTANTS_CPU(declare_constant, declare_preprocessor_constant, declare_c1_constant, declare_c2_constant, declare_c2_preprocessor_constant)
-#endif // CPU_PPC_VM_VMSTRUCTS_PPC_HPP
+#endif // CPU_PPC_VMSTRUCTS_PPC_HPP
diff --git a/src/hotspot/cpu/ppc/vm_version_ext_ppc.hpp b/src/hotspot/cpu/ppc/vm_version_ext_ppc.hpp
index 5da856956c3..c73c5521617 100644
--- a/src/hotspot/cpu/ppc/vm_version_ext_ppc.hpp
+++ b/src/hotspot/cpu/ppc/vm_version_ext_ppc.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2013, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
*
*/
-#ifndef CPU_PPC_VM_VM_VERSION_EXT_PPC_HPP
-#define CPU_PPC_VM_VM_VERSION_EXT_PPC_HPP
+#ifndef CPU_PPC_VM_VERSION_EXT_PPC_HPP
+#define CPU_PPC_VM_VERSION_EXT_PPC_HPP
#include "utilities/macros.hpp"
#include "vm_version_ppc.hpp"
@@ -59,4 +59,4 @@ class VM_Version_Ext : public VM_Version {
static const char* cpu_description(void);
};
-#endif // CPU_PPC_VM_VM_VERSION_EXT_PPC_HPP
+#endif // CPU_PPC_VM_VERSION_EXT_PPC_HPP
diff --git a/src/hotspot/cpu/ppc/vm_version_ppc.hpp b/src/hotspot/cpu/ppc/vm_version_ppc.hpp
index 22ce3701aae..1b27617b9ed 100644
--- a/src/hotspot/cpu/ppc/vm_version_ppc.hpp
+++ b/src/hotspot/cpu/ppc/vm_version_ppc.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2019, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2012, 2018 SAP SE. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
@@ -23,8 +23,8 @@
*
*/
-#ifndef CPU_PPC_VM_VM_VERSION_PPC_HPP
-#define CPU_PPC_VM_VM_VERSION_PPC_HPP
+#ifndef CPU_PPC_VM_VERSION_PPC_HPP
+#define CPU_PPC_VM_VERSION_PPC_HPP
#include "runtime/globals_extension.hpp"
#include "runtime/vm_version.hpp"
@@ -123,4 +123,4 @@ public:
static uint64_t _dscr_val;
};
-#endif // CPU_PPC_VM_VM_VERSION_PPC_HPP
+#endif // CPU_PPC_VM_VERSION_PPC_HPP
diff --git a/src/hotspot/cpu/ppc/vmreg_ppc.hpp b/src/hotspot/cpu/ppc/vmreg_ppc.hpp
index 29f99765e88..090fe1d72a2 100644
--- a/src/hotspot/cpu/ppc/vmreg_ppc.hpp
+++ b/src/hotspot/cpu/ppc/vmreg_ppc.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2001, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2019, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2012, 2013 SAP SE. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
@@ -23,8 +23,8 @@
*
*/
-#ifndef CPU_PPC_VM_VMREG_PPC_HPP
-#define CPU_PPC_VM_VMREG_PPC_HPP
+#ifndef CPU_PPC_VMREG_PPC_HPP
+#define CPU_PPC_VMREG_PPC_HPP
inline bool is_Register() {
return (unsigned int)value() < (unsigned int)ConcreteRegisterImpl::max_gpr;
@@ -50,4 +50,4 @@ inline bool is_concrete() {
return is_even(value());
}
-#endif // CPU_PPC_VM_VMREG_PPC_HPP
+#endif // CPU_PPC_VMREG_PPC_HPP
diff --git a/src/hotspot/cpu/ppc/vmreg_ppc.inline.hpp b/src/hotspot/cpu/ppc/vmreg_ppc.inline.hpp
index b40135a627a..eb2f5310c42 100644
--- a/src/hotspot/cpu/ppc/vmreg_ppc.inline.hpp
+++ b/src/hotspot/cpu/ppc/vmreg_ppc.inline.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2002, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2019, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2012, 2018 SAP SE. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
@@ -23,8 +23,8 @@
*
*/
-#ifndef CPU_PPC_VM_VMREG_PPC_INLINE_HPP
-#define CPU_PPC_VM_VMREG_PPC_INLINE_HPP
+#ifndef CPU_PPC_VMREG_PPC_INLINE_HPP
+#define CPU_PPC_VMREG_PPC_INLINE_HPP
inline VMReg RegisterImpl::as_VMReg() {
if (this == noreg) return VMRegImpl::Bad();
@@ -50,4 +50,4 @@ inline VMReg SpecialRegisterImpl::as_VMReg() {
}
-#endif // CPU_PPC_VM_VMREG_PPC_INLINE_HPP
+#endif // CPU_PPC_VMREG_PPC_INLINE_HPP
diff --git a/src/hotspot/cpu/s390/assembler_s390.hpp b/src/hotspot/cpu/s390/assembler_s390.hpp
index 37fa82e8c68..88ab71322ae 100644
--- a/src/hotspot/cpu/s390/assembler_s390.hpp
+++ b/src/hotspot/cpu/s390/assembler_s390.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2016, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2019, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2016, 2017 SAP SE. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
@@ -23,8 +23,8 @@
*
*/
-#ifndef CPU_S390_VM_ASSEMBLER_S390_HPP
-#define CPU_S390_VM_ASSEMBLER_S390_HPP
+#ifndef CPU_S390_ASSEMBLER_S390_HPP
+#define CPU_S390_ASSEMBLER_S390_HPP
#undef LUCY_DBG
@@ -3284,4 +3284,4 @@ class Assembler : public AbstractAssembler {
};
-#endif // CPU_S390_VM_ASSEMBLER_S390_HPP
+#endif // CPU_S390_ASSEMBLER_S390_HPP
diff --git a/src/hotspot/cpu/s390/assembler_s390.inline.hpp b/src/hotspot/cpu/s390/assembler_s390.inline.hpp
index b96bd17fc92..be49de771ed 100644
--- a/src/hotspot/cpu/s390/assembler_s390.inline.hpp
+++ b/src/hotspot/cpu/s390/assembler_s390.inline.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2019, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2016, 2017 SAP SE. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
@@ -23,8 +23,8 @@
*
*/
-#ifndef CPU_S390_VM_ASSEMBLER_S390_INLINE_HPP
-#define CPU_S390_VM_ASSEMBLER_S390_INLINE_HPP
+#ifndef CPU_S390_ASSEMBLER_S390_INLINE_HPP
+#define CPU_S390_ASSEMBLER_S390_INLINE_HPP
#include "asm/assembler.inline.hpp"
#include "asm/codeBuffer.hpp"
@@ -1460,4 +1460,4 @@ inline bool Assembler::is_sigtrap_zero_check(address pc) {
return (is_equal(pc, CGIT_ZOPC, RIE_MASK) || is_equal(pc, CIT_ZOPC, RIE_MASK));
}
-#endif // CPU_S390_VM_ASSEMBLER_S390_INLINE_HPP
+#endif // CPU_S390_ASSEMBLER_S390_INLINE_HPP
diff --git a/src/hotspot/cpu/s390/bytes_s390.hpp b/src/hotspot/cpu/s390/bytes_s390.hpp
index 3b62a2e02ad..d69cdcd3fb5 100644
--- a/src/hotspot/cpu/s390/bytes_s390.hpp
+++ b/src/hotspot/cpu/s390/bytes_s390.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2016, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2019, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2016, 2018 SAP SE. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
@@ -23,8 +23,8 @@
*
*/
-#ifndef CPU_S390_VM_BYTES_S390_HPP
-#define CPU_S390_VM_BYTES_S390_HPP
+#ifndef CPU_S390_BYTES_S390_HPP
+#define CPU_S390_BYTES_S390_HPP
#include "memory/allocation.hpp"
@@ -63,4 +63,4 @@ class Bytes: AllStatic {
static inline void put_Java_u8(address p, u8 x) { put_native_u8(p, x); }
};
-#endif // CPU_S390_VM_BYTES_S390_HPP
+#endif // CPU_S390_BYTES_S390_HPP
diff --git a/src/hotspot/cpu/s390/c1_Defs_s390.hpp b/src/hotspot/cpu/s390/c1_Defs_s390.hpp
index e5bcc6776a6..8ee07273b3b 100644
--- a/src/hotspot/cpu/s390/c1_Defs_s390.hpp
+++ b/src/hotspot/cpu/s390/c1_Defs_s390.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2019, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2016 SAP SE. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
@@ -23,8 +23,8 @@
*
*/
-#ifndef CPU_S390_VM_C1_DEFS_S390_HPP
-#define CPU_S390_VM_C1_DEFS_S390_HPP
+#ifndef CPU_S390_C1_DEFS_S390_HPP
+#define CPU_S390_C1_DEFS_S390_HPP
// Native word offsets from memory address (big endian).
enum {
@@ -68,4 +68,4 @@ enum {
pd_float_saved_as_double = false
};
-#endif // CPU_S390_VM_C1_DEFS_S390_HPP
+#endif // CPU_S390_C1_DEFS_S390_HPP
diff --git a/src/hotspot/cpu/s390/c1_FpuStackSim_s390.hpp b/src/hotspot/cpu/s390/c1_FpuStackSim_s390.hpp
index b791562ed03..9a13f6ec70c 100644
--- a/src/hotspot/cpu/s390/c1_FpuStackSim_s390.hpp
+++ b/src/hotspot/cpu/s390/c1_FpuStackSim_s390.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2019, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2016 SAP SE. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
@@ -23,10 +23,10 @@
*
*/
-#ifndef CPU_S390_VM_C1_FPUSTACKSIM_S390_HPP
-#define CPU_S390_VM_C1_FPUSTACKSIM_S390_HPP
+#ifndef CPU_S390_C1_FPUSTACKSIM_S390_HPP
+#define CPU_S390_C1_FPUSTACKSIM_S390_HPP
// No FPU stack on ZARCH_64
class FpuStackSim;
-#endif // CPU_S390_VM_C1_FPUSTACKSIM_S390_HPP
+#endif // CPU_S390_C1_FPUSTACKSIM_S390_HPP
diff --git a/src/hotspot/cpu/s390/c1_FrameMap_s390.hpp b/src/hotspot/cpu/s390/c1_FrameMap_s390.hpp
index 8c0c1b596cf..ef20d0399c1 100644
--- a/src/hotspot/cpu/s390/c1_FrameMap_s390.hpp
+++ b/src/hotspot/cpu/s390/c1_FrameMap_s390.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2019, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2016 SAP SE. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
@@ -23,8 +23,8 @@
*
*/
-#ifndef CPU_S390_VM_C1_FRAMEMAP_S390_HPP
-#define CPU_S390_VM_C1_FRAMEMAP_S390_HPP
+#ifndef CPU_S390_C1_FRAMEMAP_S390_HPP
+#define CPU_S390_C1_FRAMEMAP_S390_HPP
public:
@@ -138,4 +138,4 @@
static int nof_caller_save_cpu_regs() { return pd_nof_caller_save_cpu_regs_frame_map; }
static int last_cpu_reg() { return pd_last_cpu_reg; }
-#endif // CPU_S390_VM_C1_FRAMEMAP_S390_HPP
+#endif // CPU_S390_C1_FRAMEMAP_S390_HPP
diff --git a/src/hotspot/cpu/s390/c1_LIRAssembler_s390.hpp b/src/hotspot/cpu/s390/c1_LIRAssembler_s390.hpp
index 2414001a2fa..d7bf1de6bd3 100644
--- a/src/hotspot/cpu/s390/c1_LIRAssembler_s390.hpp
+++ b/src/hotspot/cpu/s390/c1_LIRAssembler_s390.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2019, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2016 SAP SE. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
@@ -23,8 +23,8 @@
*
*/
-#ifndef CPU_S390_VM_C1_LIRASSEMBLER_S390_HPP
-#define CPU_S390_VM_C1_LIRASSEMBLER_S390_HPP
+#ifndef CPU_S390_C1_LIRASSEMBLER_S390_HPP
+#define CPU_S390_C1_LIRASSEMBLER_S390_HPP
private:
@@ -52,4 +52,4 @@
_deopt_handler_size = DEBUG_ONLY(1*K) NOT_DEBUG(64)
};
-#endif // CPU_S390_VM_C1_LIRASSEMBLER_S390_HPP
+#endif // CPU_S390_C1_LIRASSEMBLER_S390_HPP
diff --git a/src/hotspot/cpu/s390/c1_LinearScan_s390.hpp b/src/hotspot/cpu/s390/c1_LinearScan_s390.hpp
index 82f341360f9..7816db0ad82 100644
--- a/src/hotspot/cpu/s390/c1_LinearScan_s390.hpp
+++ b/src/hotspot/cpu/s390/c1_LinearScan_s390.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2019, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2016 SAP SE. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
@@ -23,8 +23,8 @@
*
*/
-#ifndef CPU_S390_VM_C1_LINEARSCAN_S390_HPP
-#define CPU_S390_VM_C1_LINEARSCAN_S390_HPP
+#ifndef CPU_S390_C1_LINEARSCAN_S390_HPP
+#define CPU_S390_C1_LINEARSCAN_S390_HPP
inline bool LinearScan::is_processed_reg_num(int reg_num) {
// unallocated: Z_thread, Z_fp, Z_SP, Z_R0_scratch, Z_R1_scratch, Z_R14
@@ -61,4 +61,4 @@ inline bool LinearScanWalker::pd_init_regs_for_alloc(Interval* cur) {
return false; // No special case behaviours.
}
-#endif // CPU_S390_VM_C1_LINEARSCAN_S390_HPP
+#endif // CPU_S390_C1_LINEARSCAN_S390_HPP
diff --git a/src/hotspot/cpu/s390/c1_MacroAssembler_s390.hpp b/src/hotspot/cpu/s390/c1_MacroAssembler_s390.hpp
index b8b63c9db59..1775f1ad554 100644
--- a/src/hotspot/cpu/s390/c1_MacroAssembler_s390.hpp
+++ b/src/hotspot/cpu/s390/c1_MacroAssembler_s390.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2019, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2016 SAP SE. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
@@ -23,8 +23,8 @@
*
*/
-#ifndef CPU_S390_VM_C1_MACROASSEMBLER_S390_HPP
-#define CPU_S390_VM_C1_MACROASSEMBLER_S390_HPP
+#ifndef CPU_S390_C1_MACROASSEMBLER_S390_HPP
+#define CPU_S390_C1_MACROASSEMBLER_S390_HPP
void pd_init() { /* nothing to do */ }
@@ -98,4 +98,4 @@
// This platform only uses signal-based null checks. The Label is not needed.
void null_check(Register r, Label *Lnull = NULL) { MacroAssembler::null_check(r); }
-#endif // CPU_S390_VM_C1_MACROASSEMBLER_S390_HPP
+#endif // CPU_S390_C1_MACROASSEMBLER_S390_HPP
diff --git a/src/hotspot/cpu/s390/c1_globals_s390.hpp b/src/hotspot/cpu/s390/c1_globals_s390.hpp
index 3869fb85342..ea9f5323c21 100644
--- a/src/hotspot/cpu/s390/c1_globals_s390.hpp
+++ b/src/hotspot/cpu/s390/c1_globals_s390.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2016, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2019, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2016, 2018 SAP SE. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
@@ -23,8 +23,8 @@
*
*/
-#ifndef CPU_S390_VM_C1_GLOBALS_S390_HPP
-#define CPU_S390_VM_C1_GLOBALS_S390_HPP
+#ifndef CPU_S390_C1_GLOBALS_S390_HPP
+#define CPU_S390_C1_GLOBALS_S390_HPP
#include "utilities/globalDefinitions.hpp"
#include "utilities/macros.hpp"
@@ -70,4 +70,4 @@ define_pd_global(bool, OptimizeSinglePrecision, false);
define_pd_global(bool, CSEArrayLength, true);
define_pd_global(bool, TwoOperandLIRForm, true);
-#endif // CPU_S390_VM_C1_GLOBALS_S390_HPP
+#endif // CPU_S390_C1_GLOBALS_S390_HPP
diff --git a/src/hotspot/cpu/s390/c2_globals_s390.hpp b/src/hotspot/cpu/s390/c2_globals_s390.hpp
index 7d944b9481b..c7ecba680b3 100644
--- a/src/hotspot/cpu/s390/c2_globals_s390.hpp
+++ b/src/hotspot/cpu/s390/c2_globals_s390.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2016, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2019, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2016, 2018 SAP SE. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
@@ -23,8 +23,8 @@
*
*/
-#ifndef CPU_S390_VM_C2_GLOBALS_S390_HPP
-#define CPU_S390_VM_C2_GLOBALS_S390_HPP
+#ifndef CPU_S390_C2_GLOBALS_S390_HPP
+#define CPU_S390_C2_GLOBALS_S390_HPP
#include "utilities/globalDefinitions.hpp"
#include "utilities/macros.hpp"
@@ -91,4 +91,4 @@ define_pd_global(size_t, MetaspaceSize, ScaleForWordSize(16*M));
// Ergonomics related flags
define_pd_global(bool, NeverActAsServerClassMachine, false);
-#endif // CPU_S390_VM_C2_GLOBALS_S390_HPP
+#endif // CPU_S390_C2_GLOBALS_S390_HPP
diff --git a/src/hotspot/cpu/s390/codeBuffer_s390.hpp b/src/hotspot/cpu/s390/codeBuffer_s390.hpp
index 1a32f94f4f1..b1499b037a3 100644
--- a/src/hotspot/cpu/s390/codeBuffer_s390.hpp
+++ b/src/hotspot/cpu/s390/codeBuffer_s390.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2019, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2016 SAP SE. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
@@ -23,8 +23,8 @@
*
*/
-#ifndef CPU_S390_VM_CODEBUFFER_S390_HPP
-#define CPU_S390_VM_CODEBUFFER_S390_HPP
+#ifndef CPU_S390_CODEBUFFER_S390_HPP
+#define CPU_S390_CODEBUFFER_S390_HPP
private:
void pd_initialize() {}
@@ -34,6 +34,4 @@
void getCpuData(const CodeBuffer * const cb) {}
-#endif // CPU_S390_VM_CODEBUFFER_S390_HPP
-
-
+#endif // CPU_S390_CODEBUFFER_S390_HPP
diff --git a/src/hotspot/cpu/s390/copy_s390.hpp b/src/hotspot/cpu/s390/copy_s390.hpp
index c7eb27dc98a..c0a19f72c12 100644
--- a/src/hotspot/cpu/s390/copy_s390.hpp
+++ b/src/hotspot/cpu/s390/copy_s390.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2016, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2019, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2016 SAP SE. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
@@ -25,8 +25,8 @@
// Major contributions by LS
-#ifndef CPU_S390_VM_COPY_S390_HPP
-#define CPU_S390_VM_COPY_S390_HPP
+#ifndef CPU_S390_COPY_S390_HPP
+#define CPU_S390_COPY_S390_HPP
// Inline functions for memory copy and fill.
@@ -1131,4 +1131,4 @@ static void pd_zero_to_bytes(void* to, size_t count) {
#endif
}
-#endif // CPU_S390_VM_COPY_S390_HPP
+#endif // CPU_S390_COPY_S390_HPP
diff --git a/src/hotspot/cpu/s390/depChecker_s390.hpp b/src/hotspot/cpu/s390/depChecker_s390.hpp
index f272becb982..5dd521baa80 100644
--- a/src/hotspot/cpu/s390/depChecker_s390.hpp
+++ b/src/hotspot/cpu/s390/depChecker_s390.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2019, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2016 SAP SE. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
@@ -23,9 +23,9 @@
*
*/
-#ifndef CPU_S390_VM_DEPCHECKER_S390_HPP
-#define CPU_S390_VM_DEPCHECKER_S390_HPP
+#ifndef CPU_S390_DEPCHECKER_S390_HPP
+#define CPU_S390_DEPCHECKER_S390_HPP
// Nothing to do on z/Architecture
-#endif // CPU_S390_VM_DEPCHECKER_S390_HPP
+#endif // CPU_S390_DEPCHECKER_S390_HPP
diff --git a/src/hotspot/cpu/s390/disassembler_s390.hpp b/src/hotspot/cpu/s390/disassembler_s390.hpp
index 5804b831a77..b25e971df13 100644
--- a/src/hotspot/cpu/s390/disassembler_s390.hpp
+++ b/src/hotspot/cpu/s390/disassembler_s390.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2019, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2016 SAP SE. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
@@ -23,8 +23,8 @@
*
*/
-#ifndef CPU_S390_VM_DISASSEMBLER_S390_HPP
-#define CPU_S390_VM_DISASSEMBLER_S390_HPP
+#ifndef CPU_S390_DISASSEMBLER_S390_HPP
+#define CPU_S390_DISASSEMBLER_S390_HPP
static int pd_instruction_alignment() {
return 1;
@@ -34,4 +34,4 @@
return "zarch";
}
-#endif // CPU_S390_VM_DISASSEMBLER_S390_HPP
+#endif // CPU_S390_DISASSEMBLER_S390_HPP
diff --git a/src/hotspot/cpu/s390/frame_s390.hpp b/src/hotspot/cpu/s390/frame_s390.hpp
index e7312676c7f..86622a96d4a 100644
--- a/src/hotspot/cpu/s390/frame_s390.hpp
+++ b/src/hotspot/cpu/s390/frame_s390.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2016, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2019, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2016 SAP SE. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
@@ -25,8 +25,8 @@
// Major contributions by ML, AHa.
-#ifndef CPU_S390_VM_FRAME_S390_HPP
-#define CPU_S390_VM_FRAME_S390_HPP
+#ifndef CPU_S390_FRAME_S390_HPP
+#define CPU_S390_FRAME_S390_HPP
#include "runtime/synchronizer.hpp"
@@ -554,4 +554,4 @@
static jint interpreter_frame_expression_stack_direction() { return -1; }
-#endif // CPU_S390_VM_FRAME_S390_HPP
+#endif // CPU_S390_FRAME_S390_HPP
diff --git a/src/hotspot/cpu/s390/frame_s390.inline.hpp b/src/hotspot/cpu/s390/frame_s390.inline.hpp
index 6cfee055314..77a6a06a985 100644
--- a/src/hotspot/cpu/s390/frame_s390.inline.hpp
+++ b/src/hotspot/cpu/s390/frame_s390.inline.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2016, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2019, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2016 SAP SE. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
@@ -23,8 +23,8 @@
*
*/
-#ifndef CPU_S390_VM_FRAME_S390_INLINE_HPP
-#define CPU_S390_VM_FRAME_S390_INLINE_HPP
+#ifndef CPU_S390_FRAME_S390_INLINE_HPP
+#define CPU_S390_FRAME_S390_INLINE_HPP
#include "code/codeCache.hpp"
#include "code/vmreg.inline.hpp"
@@ -296,4 +296,4 @@ inline intptr_t* frame::real_fp() const {
return fp();
}
-#endif // CPU_S390_VM_FRAME_S390_INLINE_HPP
+#endif // CPU_S390_FRAME_S390_INLINE_HPP
diff --git a/src/hotspot/cpu/s390/globalDefinitions_s390.hpp b/src/hotspot/cpu/s390/globalDefinitions_s390.hpp
index 8f8c37ed0c4..8629e322ff8 100644
--- a/src/hotspot/cpu/s390/globalDefinitions_s390.hpp
+++ b/src/hotspot/cpu/s390/globalDefinitions_s390.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2019, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2016 SAP SE. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
@@ -23,8 +23,8 @@
*
*/
-#ifndef CPU_S390_VM_GLOBALDEFINITIONS_S390_HPP
-#define CPU_S390_VM_GLOBALDEFINITIONS_S390_HPP
+#ifndef CPU_S390_GLOBALDEFINITIONS_S390_HPP
+#define CPU_S390_GLOBALDEFINITIONS_S390_HPP
#ifdef CC_INTERP
#error "CC_INTERP is not supported on z/Architecture."
@@ -56,4 +56,4 @@ const bool CCallingConventionRequiresIntsAsLongs = true;
#define THREAD_LOCAL_POLL
-#endif // CPU_S390_VM_GLOBALDEFINITIONS_S390_HPP
+#endif // CPU_S390_GLOBALDEFINITIONS_S390_HPP
diff --git a/src/hotspot/cpu/s390/globals_s390.hpp b/src/hotspot/cpu/s390/globals_s390.hpp
index c4607a16ec5..a60ab02ddd3 100644
--- a/src/hotspot/cpu/s390/globals_s390.hpp
+++ b/src/hotspot/cpu/s390/globals_s390.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2016, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2019, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2016, 2018 SAP SE. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
@@ -23,8 +23,8 @@
*
*/
-#ifndef CPU_S390_VM_GLOBALS_S390_HPP
-#define CPU_S390_VM_GLOBALS_S390_HPP
+#ifndef CPU_S390_GLOBALS_S390_HPP
+#define CPU_S390_GLOBALS_S390_HPP
#include "utilities/globalDefinitions.hpp"
#include "utilities/macros.hpp"
@@ -128,4 +128,4 @@ define_pd_global(bool, ThreadLocalHandshakes, true);
product(bool, TraceTraps, false, "Trace all traps the signal handler" \
"handles.")
-#endif // CPU_S390_VM_GLOBALS_S390_HPP
+#endif // CPU_S390_GLOBALS_S390_HPP
diff --git a/src/hotspot/cpu/s390/icache_s390.hpp b/src/hotspot/cpu/s390/icache_s390.hpp
index ee6b3671fff..2a68d00d87a 100644
--- a/src/hotspot/cpu/s390/icache_s390.hpp
+++ b/src/hotspot/cpu/s390/icache_s390.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2019, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2016 SAP SE. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
@@ -23,8 +23,8 @@
*
*/
-#ifndef CPU_S390_VM_ICACHE_S390_HPP
-#define CPU_S390_VM_ICACHE_S390_HPP
+#ifndef CPU_S390_ICACHE_S390_HPP
+#define CPU_S390_ICACHE_S390_HPP
// Interface for updating the instruction cache. Whenever the VM modifies
// code, part of the processor instruction cache potentially has to be flushed.
@@ -41,4 +41,4 @@ class ICache : public AbstractICache {
// Use default implementation.
};
-#endif // CPU_S390_VM_ICACHE_S390_HPP
+#endif // CPU_S390_ICACHE_S390_HPP
diff --git a/src/hotspot/cpu/s390/interp_masm_s390.hpp b/src/hotspot/cpu/s390/interp_masm_s390.hpp
index 29b9b3fe4dd..6b03643cd21 100644
--- a/src/hotspot/cpu/s390/interp_masm_s390.hpp
+++ b/src/hotspot/cpu/s390/interp_masm_s390.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2019, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2016, 2017 SAP SE. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
@@ -23,8 +23,8 @@
*
*/
-#ifndef CPU_S390_VM_INTERP_MASM_ZARCH_64_64_HPP
-#define CPU_S390_VM_INTERP_MASM_ZARCH_64_64_HPP
+#ifndef CPU_S390_INTERP_MASM_S390_HPP
+#define CPU_S390_INTERP_MASM_S390_HPP
#include "asm/macroAssembler.hpp"
#include "interpreter/invocationCounter.hpp"
@@ -330,4 +330,4 @@ class InterpreterMacroAssembler: public MacroAssembler {
void pop_interpreter_frame(Register return_pc, Register tmp1, Register tmp2);
};
-#endif // CPU_S390_VM_INTERP_MASM_ZARCH_64_64_HPP
+#endif // CPU_S390_INTERP_MASM_S390_HPP
diff --git a/src/hotspot/cpu/s390/interpreterRT_s390.hpp b/src/hotspot/cpu/s390/interpreterRT_s390.hpp
index 6da4c644543..7d213292bea 100644
--- a/src/hotspot/cpu/s390/interpreterRT_s390.hpp
+++ b/src/hotspot/cpu/s390/interpreterRT_s390.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2016, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2019, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2016 SAP SE. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
@@ -23,8 +23,8 @@
*
*/
-#ifndef CPU_S390_VM_INTERPRETERRT_S390_HPP
-#define CPU_S390_VM_INTERPRETERRT_S390_HPP
+#ifndef CPU_S390_INTERPRETERRT_S390_HPP
+#define CPU_S390_INTERPRETERRT_S390_HPP
// This is included in the middle of class Interpreter.
// Do not include files here.
@@ -62,4 +62,4 @@ static address get_result_handler(JavaThread* thread, Method* method);
static address get_signature(JavaThread* thread, Method* method);
-#endif // CPU_S390_VM_INTERPRETERRT_S390_HPP
+#endif // CPU_S390_INTERPRETERRT_S390_HPP
diff --git a/src/hotspot/cpu/s390/javaFrameAnchor_s390.hpp b/src/hotspot/cpu/s390/javaFrameAnchor_s390.hpp
index 5ef09d033a3..6c17541883d 100644
--- a/src/hotspot/cpu/s390/javaFrameAnchor_s390.hpp
+++ b/src/hotspot/cpu/s390/javaFrameAnchor_s390.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2019, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2016 SAP SE. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
@@ -23,8 +23,8 @@
*
*/
-#ifndef CPU_S390_VM_JAVAFRAMEANCHOR_S390_HPP
-#define CPU_S390_VM_JAVAFRAMEANCHOR_S390_HPP
+#ifndef CPU_S390_JAVAFRAMEANCHOR_S390_HPP
+#define CPU_S390_JAVAFRAMEANCHOR_S390_HPP
public:
@@ -84,4 +84,4 @@
address last_Java_pc(void) { return _last_Java_pc; }
-#endif // CPU_S390_VM_JAVAFRAMEANCHOR_S390_HPP
+#endif // CPU_S390_JAVAFRAMEANCHOR_S390_HPP
diff --git a/src/hotspot/cpu/s390/jniTypes_s390.hpp b/src/hotspot/cpu/s390/jniTypes_s390.hpp
index a10d9699a83..6a0456ef5ab 100644
--- a/src/hotspot/cpu/s390/jniTypes_s390.hpp
+++ b/src/hotspot/cpu/s390/jniTypes_s390.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2019, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2016 SAP SE. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
@@ -23,8 +23,8 @@
*
*/
-#ifndef CPU_S390_VM_JNITYPES_S390_HPP
-#define CPU_S390_VM_JNITYPES_S390_HPP
+#ifndef CPU_S390_JNITYPES_S390_HPP
+#define CPU_S390_JNITYPES_S390_HPP
// This file holds platform-dependent routines used to write primitive
// jni types to the array of arguments passed into JavaCalls::call.
@@ -138,4 +138,4 @@ class JNITypes : AllStatic {
}
};
-#endif // CPU_S390_VM_JNITYPES_S390_HPP
+#endif // CPU_S390_JNITYPES_S390_HPP
diff --git a/src/hotspot/cpu/s390/macroAssembler_s390.hpp b/src/hotspot/cpu/s390/macroAssembler_s390.hpp
index 5f4d83a6ae3..eb683b36e3b 100644
--- a/src/hotspot/cpu/s390/macroAssembler_s390.hpp
+++ b/src/hotspot/cpu/s390/macroAssembler_s390.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2016, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2019, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2016, 2018, SAP SE. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
@@ -23,8 +23,8 @@
*
*/
-#ifndef CPU_S390_VM_MACROASSEMBLER_S390_HPP
-#define CPU_S390_VM_MACROASSEMBLER_S390_HPP
+#ifndef CPU_S390_MACROASSEMBLER_S390_HPP
+#define CPU_S390_MACROASSEMBLER_S390_HPP
#include "asm/assembler.hpp"
#include "oops/accessDecorators.hpp"
@@ -1107,4 +1107,4 @@ class SkipIfEqual {
inline bool AbstractAssembler::pd_check_instruction_mark() { return false; }
#endif
-#endif // CPU_S390_VM_MACROASSEMBLER_S390_HPP
+#endif // CPU_S390_MACROASSEMBLER_S390_HPP
diff --git a/src/hotspot/cpu/s390/macroAssembler_s390.inline.hpp b/src/hotspot/cpu/s390/macroAssembler_s390.inline.hpp
index 4fca7129903..889820ef500 100644
--- a/src/hotspot/cpu/s390/macroAssembler_s390.inline.hpp
+++ b/src/hotspot/cpu/s390/macroAssembler_s390.inline.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2019, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2016 SAP SE. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
@@ -23,8 +23,8 @@
*
*/
-#ifndef CPU_S390_VM_MACROASSEMBLER_S390_INLINE_HPP
-#define CPU_S390_VM_MACROASSEMBLER_S390_INLINE_HPP
+#ifndef CPU_S390_MACROASSEMBLER_S390_INLINE_HPP
+#define CPU_S390_MACROASSEMBLER_S390_INLINE_HPP
#include "asm/assembler.inline.hpp"
#include "asm/macroAssembler.hpp"
@@ -311,4 +311,4 @@ inline void MacroAssembler::set_top_ijava_frame_at_SP_as_last_Java_frame_static(
set_top_ijava_frame_at_SP_as_last_Java_frame(sp, tmp1, true);
}
-#endif // CPU_S390_VM_MACROASSEMBLER_S390_INLINE_HPP
+#endif // CPU_S390_MACROASSEMBLER_S390_INLINE_HPP
diff --git a/src/hotspot/cpu/s390/nativeInst_s390.hpp b/src/hotspot/cpu/s390/nativeInst_s390.hpp
index 68f0732aa69..aabf543da72 100644
--- a/src/hotspot/cpu/s390/nativeInst_s390.hpp
+++ b/src/hotspot/cpu/s390/nativeInst_s390.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2016, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2019, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2016 SAP SE. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
@@ -25,8 +25,8 @@
// Major contributions by AHa, JL, LS
-#ifndef CPU_S390_VM_NATIVEINST_S390_HPP
-#define CPU_S390_VM_NATIVEINST_S390_HPP
+#ifndef CPU_S390_NATIVEINST_S390_HPP
+#define CPU_S390_NATIVEINST_S390_HPP
#include "asm/macroAssembler.hpp"
#include "runtime/icache.hpp"
@@ -663,4 +663,4 @@ class NativeGeneralJump: public NativeInstruction {
void verify() PRODUCT_RETURN;
};
-#endif // CPU_S390_VM_NATIVEINST_S390_HPP
+#endif // CPU_S390_NATIVEINST_S390_HPP
diff --git a/src/hotspot/cpu/s390/registerMap_s390.hpp b/src/hotspot/cpu/s390/registerMap_s390.hpp
index 8d717b5b19b..d2d60bce925 100644
--- a/src/hotspot/cpu/s390/registerMap_s390.hpp
+++ b/src/hotspot/cpu/s390/registerMap_s390.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2019, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2016 SAP SE. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
@@ -23,8 +23,8 @@
*
*/
-#ifndef CPU_S390_VM_REGISTERMAP_S390_HPP
-#define CPU_S390_VM_REGISTERMAP_S390_HPP
+#ifndef CPU_S390_REGISTERMAP_S390_HPP
+#define CPU_S390_REGISTERMAP_S390_HPP
// Machine-dependent implementation for register maps.
@@ -41,4 +41,4 @@
void pd_initialize() {}
void pd_initialize_from(const RegisterMap* map) {}
-#endif // CPU_S390_VM_REGISTERMAP_S390_HPP
+#endif // CPU_S390_REGISTERMAP_S390_HPP
diff --git a/src/hotspot/cpu/s390/registerSaver_s390.hpp b/src/hotspot/cpu/s390/registerSaver_s390.hpp
index 6b670007ea3..d95c8834c9b 100644
--- a/src/hotspot/cpu/s390/registerSaver_s390.hpp
+++ b/src/hotspot/cpu/s390/registerSaver_s390.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2019, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2016 SAP SE. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
@@ -23,8 +23,8 @@
*
*/
-#ifndef CPU_S390_VM_REGISTERSAVER_S390_HPP
-#define CPU_S390_VM_REGISTERSAVER_S390_HPP
+#ifndef CPU_S390_REGISTERSAVER_S390_HPP
+#define CPU_S390_REGISTERSAVER_S390_HPP
class RegisterSaver {
// Used for saving volatile registers.
@@ -79,4 +79,4 @@ class RegisterSaver {
};
-#endif // CPU_S390_VM_REGISTERSAVER_S390_HPP
+#endif // CPU_S390_REGISTERSAVER_S390_HPP
diff --git a/src/hotspot/cpu/s390/register_s390.hpp b/src/hotspot/cpu/s390/register_s390.hpp
index f8f218e1dd6..d832c38898c 100644
--- a/src/hotspot/cpu/s390/register_s390.hpp
+++ b/src/hotspot/cpu/s390/register_s390.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2019, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2016, 2017 SAP SE. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
@@ -23,8 +23,8 @@
*
*/
-#ifndef CPU_S390_VM_REGISTER_S390_HPP
-#define CPU_S390_VM_REGISTER_S390_HPP
+#ifndef CPU_S390_REGISTER_S390_HPP
+#define CPU_S390_REGISTER_S390_HPP
#include "asm/register.hpp"
#include "vm_version_s390.hpp"
@@ -579,4 +579,4 @@ REGISTER_DECLARATION(FloatRegister, Z_fscratch_1, Z_F1);
#endif
-#endif // CPU_S390_VM_REGISTER_S390_HPP
+#endif // CPU_S390_REGISTER_S390_HPP
diff --git a/src/hotspot/cpu/s390/relocInfo_s390.hpp b/src/hotspot/cpu/s390/relocInfo_s390.hpp
index ba9d40bbdfc..9b29c692291 100644
--- a/src/hotspot/cpu/s390/relocInfo_s390.hpp
+++ b/src/hotspot/cpu/s390/relocInfo_s390.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2016, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2019, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2016, 2018 SAP SE. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
@@ -23,8 +23,8 @@
*
*/
-#ifndef CPU_S390_VM_RELOCINFO_S390_HPP
-#define CPU_S390_VM_RELOCINFO_S390_HPP
+#ifndef CPU_S390_RELOCINFO_S390_HPP
+#define CPU_S390_RELOCINFO_S390_HPP
//----------------------------
// relocInfo layout
@@ -118,4 +118,4 @@
// Return indication if update happened.
static bool update_oop_pool(address begin, address end, address newTarget, CodeBlob* cb);
-#endif // CPU_S390_VM_RELOCINFO_S390_HPP
+#endif // CPU_S390_RELOCINFO_S390_HPP
diff --git a/src/hotspot/cpu/s390/stubRoutines_s390.hpp b/src/hotspot/cpu/s390/stubRoutines_s390.hpp
index b2509b23094..abadd3e372e 100644
--- a/src/hotspot/cpu/s390/stubRoutines_s390.hpp
+++ b/src/hotspot/cpu/s390/stubRoutines_s390.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2019, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2016, 2017, SAP SE. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
@@ -23,8 +23,8 @@
*
*/
-#ifndef CPU_S390_VM_STUBROUTINES_ZARCH_64_64_HPP
-#define CPU_S390_VM_STUBROUTINES_ZARCH_64_64_HPP
+#ifndef CPU_S390_STUBROUTINES_S390_HPP
+#define CPU_S390_STUBROUTINES_S390_HPP
// This file holds the platform specific parts of the StubRoutines
// definition. See stubRoutines.hpp for a description on how to extend it.
@@ -100,4 +100,4 @@ class zarch {
static void generate_load_trot_table_addr(MacroAssembler* masm, Register table);
};
-#endif // CPU_S390_VM_STUBROUTINES_ZARCH_64_64_HPP
+#endif // CPU_S390_STUBROUTINES_S390_HPP
diff --git a/src/hotspot/cpu/s390/templateTable_s390.hpp b/src/hotspot/cpu/s390/templateTable_s390.hpp
index 51a022cb3bc..2bee16d433a 100644
--- a/src/hotspot/cpu/s390/templateTable_s390.hpp
+++ b/src/hotspot/cpu/s390/templateTable_s390.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2019, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2016 SAP SE. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
@@ -23,8 +23,8 @@
*
*/
-#ifndef CPU_S390_VM_TEMPLATETABLE_S390_HPP
-#define CPU_S390_VM_TEMPLATETABLE_S390_HPP
+#ifndef CPU_S390_TEMPLATETABLE_S390_HPP
+#define CPU_S390_TEMPLATETABLE_S390_HPP
static void prepare_invoke(int byte_no,
Register method, // linked method (or i-klass)
@@ -38,4 +38,4 @@
static void index_check(Register array, Register index, unsigned int shift);
static void index_check_without_pop(Register array, Register index);
-#endif // CPU_S390_VM_TEMPLATETABLE_S390_HPP
+#endif // CPU_S390_TEMPLATETABLE_S390_HPP
diff --git a/src/hotspot/cpu/s390/vmStructs_s390.hpp b/src/hotspot/cpu/s390/vmStructs_s390.hpp
index e4c69a7f6d2..1f65002977a 100644
--- a/src/hotspot/cpu/s390/vmStructs_s390.hpp
+++ b/src/hotspot/cpu/s390/vmStructs_s390.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2019, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2016 SAP SE. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
@@ -23,8 +23,8 @@
*
*/
-#ifndef CPU_S390_VM_VMSTRUCTS_S390_HPP
-#define CPU_S390_VM_VMSTRUCTS_S390_HPP
+#ifndef CPU_S390_VMSTRUCTS_S390_HPP
+#define CPU_S390_VMSTRUCTS_S390_HPP
// These are the CPU-specific fields, types and integer
// constants required by the Serviceability Agent. This file is
@@ -38,4 +38,4 @@
#define VM_LONG_CONSTANTS_CPU(declare_constant, declare_preprocessor_constant, declare_c1_constant, declare_c2_constant, declare_c2_preprocessor_constant)
-#endif // CPU_S390_VM_VMSTRUCTS_S390_HPP
+#endif // CPU_S390_VMSTRUCTS_S390_HPP
diff --git a/src/hotspot/cpu/s390/vm_version_ext_s390.hpp b/src/hotspot/cpu/s390/vm_version_ext_s390.hpp
index dc18303c882..9c0970cf968 100644
--- a/src/hotspot/cpu/s390/vm_version_ext_s390.hpp
+++ b/src/hotspot/cpu/s390/vm_version_ext_s390.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2013, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
*
*/
-#ifndef CPU_S390_VM_VM_VERSION_EXT_S390_HPP
-#define CPU_S390_VM_VM_VERSION_EXT_S390_HPP
+#ifndef CPU_S390_VM_VERSION_EXT_S390_HPP
+#define CPU_S390_VM_VERSION_EXT_S390_HPP
#include "utilities/macros.hpp"
#include "vm_version_s390.hpp"
@@ -59,4 +59,4 @@ class VM_Version_Ext : public VM_Version {
static const char* cpu_description(void);
};
-#endif // CPU_S390_VM_VM_VERSION_EXT_S390_HPP
+#endif // CPU_S390_VM_VERSION_EXT_S390_HPP
diff --git a/src/hotspot/cpu/s390/vm_version_s390.hpp b/src/hotspot/cpu/s390/vm_version_s390.hpp
index 210ed1768c3..e8ce35f43c9 100644
--- a/src/hotspot/cpu/s390/vm_version_s390.hpp
+++ b/src/hotspot/cpu/s390/vm_version_s390.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2016, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2019, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2016, 2018 SAP SE. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
@@ -23,8 +23,8 @@
*
*/
-#ifndef CPU_S390_VM_VM_VERSION_S390_HPP
-#define CPU_S390_VM_VM_VERSION_S390_HPP
+#ifndef CPU_S390_VM_VERSION_S390_HPP
+#define CPU_S390_VM_VERSION_S390_HPP
#include "runtime/globals_extension.hpp"
@@ -487,4 +487,4 @@ class VM_Version: public Abstract_VM_Version {
static unsigned long z_SIGSEGV();
};
-#endif // CPU_S390_VM_VM_VERSION_S390_HPP
+#endif // CPU_S390_VM_VERSION_S390_HPP
diff --git a/src/hotspot/cpu/s390/vmreg_s390.hpp b/src/hotspot/cpu/s390/vmreg_s390.hpp
index d417f2718f3..3dd1bd9a16c 100644
--- a/src/hotspot/cpu/s390/vmreg_s390.hpp
+++ b/src/hotspot/cpu/s390/vmreg_s390.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2019, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2016 SAP SE. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
@@ -23,8 +23,8 @@
*
*/
-#ifndef CPU_S390_VM_VMREG_S390_HPP
-#define CPU_S390_VM_VMREG_S390_HPP
+#ifndef CPU_S390_VMREG_S390_HPP
+#define CPU_S390_VMREG_S390_HPP
inline bool is_Register() {
return (unsigned int)value() < (unsigned int)ConcreteRegisterImpl::max_gpr;
@@ -50,4 +50,4 @@ inline bool is_concrete() {
return is_even(value());
}
-#endif // CPU_S390_VM_VMREG_S390_HPP
+#endif // CPU_S390_VMREG_S390_HPP
diff --git a/src/hotspot/cpu/s390/vmreg_s390.inline.hpp b/src/hotspot/cpu/s390/vmreg_s390.inline.hpp
index b708ac365b0..a775c8f971a 100644
--- a/src/hotspot/cpu/s390/vmreg_s390.inline.hpp
+++ b/src/hotspot/cpu/s390/vmreg_s390.inline.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2019, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2016 SAP SE. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
@@ -23,8 +23,8 @@
*
*/
-#ifndef CPU_S390_VM_VMREG_S390_INLINE_HPP
-#define CPU_S390_VM_VMREG_S390_INLINE_HPP
+#ifndef CPU_S390_VMREG_S390_INLINE_HPP
+#define CPU_S390_VMREG_S390_INLINE_HPP
inline VMReg RegisterImpl::as_VMReg() {
if (this == noreg) {
@@ -41,4 +41,4 @@ inline VMReg ConditionRegisterImpl::as_VMReg() {
return VMRegImpl::as_VMReg((encoding() << 1) + ConcreteRegisterImpl::max_fpr);
}
-#endif // CPU_S390_VM_VMREG_S390_INLINE_HPP
+#endif // CPU_S390_VMREG_S390_INLINE_HPP
diff --git a/src/hotspot/cpu/sparc/assembler_sparc.hpp b/src/hotspot/cpu/sparc/assembler_sparc.hpp
index 01f0121bb42..a8dd8802fc8 100644
--- a/src/hotspot/cpu/sparc/assembler_sparc.hpp
+++ b/src/hotspot/cpu/sparc/assembler_sparc.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
*
*/
-#ifndef CPU_SPARC_VM_ASSEMBLER_SPARC_HPP
-#define CPU_SPARC_VM_ASSEMBLER_SPARC_HPP
+#ifndef CPU_SPARC_ASSEMBLER_SPARC_HPP
+#define CPU_SPARC_ASSEMBLER_SPARC_HPP
#include "asm/register.hpp"
@@ -1328,4 +1328,4 @@ class Assembler : public AbstractAssembler {
}
};
-#endif // CPU_SPARC_VM_ASSEMBLER_SPARC_HPP
+#endif // CPU_SPARC_ASSEMBLER_SPARC_HPP
diff --git a/src/hotspot/cpu/sparc/assembler_sparc.inline.hpp b/src/hotspot/cpu/sparc/assembler_sparc.inline.hpp
index b9a918e5e0b..df39dd9beac 100644
--- a/src/hotspot/cpu/sparc/assembler_sparc.inline.hpp
+++ b/src/hotspot/cpu/sparc/assembler_sparc.inline.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
*
*/
-#ifndef CPU_SPARC_VM_ASSEMBLER_SPARC_INLINE_HPP
-#define CPU_SPARC_VM_ASSEMBLER_SPARC_INLINE_HPP
+#ifndef CPU_SPARC_ASSEMBLER_SPARC_INLINE_HPP
+#define CPU_SPARC_ASSEMBLER_SPARC_INLINE_HPP
#include "asm/assembler.hpp"
@@ -1127,4 +1127,4 @@ inline void Assembler::mpmul(int uimm5) {
emit_int32(op(arith_op) | rd(0) | op3(mpmul_op3) | rs1(0) | opf(mpmul_opf) | uimm(uimm5, 5));
}
-#endif // CPU_SPARC_VM_ASSEMBLER_SPARC_INLINE_HPP
+#endif // CPU_SPARC_ASSEMBLER_SPARC_INLINE_HPP
diff --git a/src/hotspot/cpu/sparc/bytes_sparc.hpp b/src/hotspot/cpu/sparc/bytes_sparc.hpp
index 0ce1f5fac48..7d08f4d5249 100644
--- a/src/hotspot/cpu/sparc/bytes_sparc.hpp
+++ b/src/hotspot/cpu/sparc/bytes_sparc.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
*
*/
-#ifndef CPU_SPARC_VM_BYTES_SPARC_HPP
-#define CPU_SPARC_VM_BYTES_SPARC_HPP
+#ifndef CPU_SPARC_BYTES_SPARC_HPP
+#define CPU_SPARC_BYTES_SPARC_HPP
#include "memory/allocation.hpp"
@@ -157,4 +157,4 @@ class Bytes: AllStatic {
// 1.17 99/06/22 16:37:35 bytes_i486.hpp
//End
-#endif // CPU_SPARC_VM_BYTES_SPARC_HPP
+#endif // CPU_SPARC_BYTES_SPARC_HPP
diff --git a/src/hotspot/cpu/sparc/c1_Defs_sparc.hpp b/src/hotspot/cpu/sparc/c1_Defs_sparc.hpp
index a63e28fafe3..2a2f75ace11 100644
--- a/src/hotspot/cpu/sparc/c1_Defs_sparc.hpp
+++ b/src/hotspot/cpu/sparc/c1_Defs_sparc.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2000, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
*
*/
-#ifndef CPU_SPARC_VM_C1_DEFS_SPARC_HPP
-#define CPU_SPARC_VM_C1_DEFS_SPARC_HPP
+#ifndef CPU_SPARC_C1_DEFS_SPARC_HPP
+#define CPU_SPARC_C1_DEFS_SPARC_HPP
// native word offsets from memory address (big endian)
enum {
@@ -69,4 +69,4 @@ enum {
pd_float_saved_as_double = false
};
-#endif // CPU_SPARC_VM_C1_DEFS_SPARC_HPP
+#endif // CPU_SPARC_C1_DEFS_SPARC_HPP
diff --git a/src/hotspot/cpu/sparc/c1_FpuStackSim_sparc.hpp b/src/hotspot/cpu/sparc/c1_FpuStackSim_sparc.hpp
index 83f14968bb1..bc0717bdc2b 100644
--- a/src/hotspot/cpu/sparc/c1_FpuStackSim_sparc.hpp
+++ b/src/hotspot/cpu/sparc/c1_FpuStackSim_sparc.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2005, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -22,10 +22,10 @@
*
*/
-#ifndef CPU_SPARC_VM_C1_FPUSTACKSIM_SPARC_HPP
-#define CPU_SPARC_VM_C1_FPUSTACKSIM_SPARC_HPP
+#ifndef CPU_SPARC_C1_FPUSTACKSIM_SPARC_HPP
+#define CPU_SPARC_C1_FPUSTACKSIM_SPARC_HPP
// No FPU stack on SPARC
class FpuStackSim;
-#endif // CPU_SPARC_VM_C1_FPUSTACKSIM_SPARC_HPP
+#endif // CPU_SPARC_C1_FPUSTACKSIM_SPARC_HPP
diff --git a/src/hotspot/cpu/sparc/c1_FrameMap_sparc.hpp b/src/hotspot/cpu/sparc/c1_FrameMap_sparc.hpp
index 71e6276f09c..aec9611d38d 100644
--- a/src/hotspot/cpu/sparc/c1_FrameMap_sparc.hpp
+++ b/src/hotspot/cpu/sparc/c1_FrameMap_sparc.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1999, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1999, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
*
*/
-#ifndef CPU_SPARC_VM_C1_FRAMEMAP_SPARC_HPP
-#define CPU_SPARC_VM_C1_FRAMEMAP_SPARC_HPP
+#ifndef CPU_SPARC_C1_FRAMEMAP_SPARC_HPP
+#define CPU_SPARC_C1_FRAMEMAP_SPARC_HPP
public:
@@ -182,4 +182,4 @@
static int nof_caller_save_cpu_regs() { return pd_nof_caller_save_cpu_regs_frame_map; }
static int last_cpu_reg() { return pd_last_cpu_reg; }
-#endif // CPU_SPARC_VM_C1_FRAMEMAP_SPARC_HPP
+#endif // CPU_SPARC_C1_FRAMEMAP_SPARC_HPP
diff --git a/src/hotspot/cpu/sparc/c1_LIRAssembler_sparc.hpp b/src/hotspot/cpu/sparc/c1_LIRAssembler_sparc.hpp
index 37a3b38cfb3..0777ada12de 100644
--- a/src/hotspot/cpu/sparc/c1_LIRAssembler_sparc.hpp
+++ b/src/hotspot/cpu/sparc/c1_LIRAssembler_sparc.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2000, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
*
*/
-#ifndef CPU_SPARC_VM_C1_LIRASSEMBLER_SPARC_HPP
-#define CPU_SPARC_VM_C1_LIRASSEMBLER_SPARC_HPP
+#ifndef CPU_SPARC_C1_LIRASSEMBLER_SPARC_HPP
+#define CPU_SPARC_C1_LIRASSEMBLER_SPARC_HPP
private:
@@ -71,4 +71,4 @@
void pack64(LIR_Opr src, LIR_Opr dst);
void unpack64(LIR_Opr src, LIR_Opr dst);
-#endif // CPU_SPARC_VM_C1_LIRASSEMBLER_SPARC_HPP
+#endif // CPU_SPARC_C1_LIRASSEMBLER_SPARC_HPP
diff --git a/src/hotspot/cpu/sparc/c1_LinearScan_sparc.hpp b/src/hotspot/cpu/sparc/c1_LinearScan_sparc.hpp
index 6656056bb6f..9feabab963c 100644
--- a/src/hotspot/cpu/sparc/c1_LinearScan_sparc.hpp
+++ b/src/hotspot/cpu/sparc/c1_LinearScan_sparc.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2005, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
*
*/
-#ifndef CPU_SPARC_VM_C1_LINEARSCAN_SPARC_HPP
-#define CPU_SPARC_VM_C1_LINEARSCAN_SPARC_HPP
+#ifndef CPU_SPARC_C1_LINEARSCAN_SPARC_HPP
+#define CPU_SPARC_C1_LINEARSCAN_SPARC_HPP
inline bool LinearScan::is_processed_reg_num(int reg_num) {
return reg_num < 26 || reg_num > 31;
@@ -67,4 +67,4 @@ inline bool LinearScanWalker::pd_init_regs_for_alloc(Interval* cur) {
return false;
}
-#endif // CPU_SPARC_VM_C1_LINEARSCAN_SPARC_HPP
+#endif // CPU_SPARC_C1_LINEARSCAN_SPARC_HPP
diff --git a/src/hotspot/cpu/sparc/c1_MacroAssembler_sparc.hpp b/src/hotspot/cpu/sparc/c1_MacroAssembler_sparc.hpp
index ad669c3bfc2..532ef0261df 100644
--- a/src/hotspot/cpu/sparc/c1_MacroAssembler_sparc.hpp
+++ b/src/hotspot/cpu/sparc/c1_MacroAssembler_sparc.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1999, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1999, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
*
*/
-#ifndef CPU_SPARC_VM_C1_MACROASSEMBLER_SPARC_HPP
-#define CPU_SPARC_VM_C1_MACROASSEMBLER_SPARC_HPP
+#ifndef CPU_SPARC_C1_MACROASSEMBLER_SPARC_HPP
+#define CPU_SPARC_C1_MACROASSEMBLER_SPARC_HPP
void pd_init() { /* nothing to do */ }
@@ -95,4 +95,4 @@
void save_live_registers_no_oop_map(bool save_fpu_registers);
void restore_live_registers(bool restore_fpu_registers);
-#endif // CPU_SPARC_VM_C1_MACROASSEMBLER_SPARC_HPP
+#endif // CPU_SPARC_C1_MACROASSEMBLER_SPARC_HPP
diff --git a/src/hotspot/cpu/sparc/c1_globals_sparc.hpp b/src/hotspot/cpu/sparc/c1_globals_sparc.hpp
index dd06cf40094..378480c4226 100644
--- a/src/hotspot/cpu/sparc/c1_globals_sparc.hpp
+++ b/src/hotspot/cpu/sparc/c1_globals_sparc.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2000, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
*
*/
-#ifndef CPU_SPARC_VM_C1_GLOBALS_SPARC_HPP
-#define CPU_SPARC_VM_C1_GLOBALS_SPARC_HPP
+#ifndef CPU_SPARC_C1_GLOBALS_SPARC_HPP
+#define CPU_SPARC_C1_GLOBALS_SPARC_HPP
#include "utilities/globalDefinitions.hpp"
#include "utilities/macros.hpp"
@@ -68,4 +68,4 @@ define_pd_global(bool, OptimizeSinglePrecision, false);
define_pd_global(bool, CSEArrayLength, true );
define_pd_global(bool, TwoOperandLIRForm, false);
-#endif // CPU_SPARC_VM_C1_GLOBALS_SPARC_HPP
+#endif // CPU_SPARC_C1_GLOBALS_SPARC_HPP
diff --git a/src/hotspot/cpu/sparc/c2_globals_sparc.hpp b/src/hotspot/cpu/sparc/c2_globals_sparc.hpp
index d4279eab5de..0084e53337a 100644
--- a/src/hotspot/cpu/sparc/c2_globals_sparc.hpp
+++ b/src/hotspot/cpu/sparc/c2_globals_sparc.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2000, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
*
*/
-#ifndef CPU_SPARC_VM_C2_GLOBALS_SPARC_HPP
-#define CPU_SPARC_VM_C2_GLOBALS_SPARC_HPP
+#ifndef CPU_SPARC_C2_GLOBALS_SPARC_HPP
+#define CPU_SPARC_C2_GLOBALS_SPARC_HPP
#include "utilities/globalDefinitions.hpp"
#include "utilities/macros.hpp"
@@ -91,4 +91,4 @@ define_pd_global(size_t, MetaspaceSize, ScaleForWordSize(16*M));
// Ergonomics related flags
define_pd_global(bool, NeverActAsServerClassMachine, false);
-#endif // CPU_SPARC_VM_C2_GLOBALS_SPARC_HPP
+#endif // CPU_SPARC_C2_GLOBALS_SPARC_HPP
diff --git a/src/hotspot/cpu/sparc/codeBuffer_sparc.hpp b/src/hotspot/cpu/sparc/codeBuffer_sparc.hpp
index d3c0744d56c..14011d68f1c 100644
--- a/src/hotspot/cpu/sparc/codeBuffer_sparc.hpp
+++ b/src/hotspot/cpu/sparc/codeBuffer_sparc.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2002, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
*
*/
-#ifndef CPU_SPARC_VM_CODEBUFFER_SPARC_HPP
-#define CPU_SPARC_VM_CODEBUFFER_SPARC_HPP
+#ifndef CPU_SPARC_CODEBUFFER_SPARC_HPP
+#define CPU_SPARC_CODEBUFFER_SPARC_HPP
private:
void pd_initialize() {}
@@ -31,4 +31,4 @@ private:
public:
void flush_bundle(bool start_new_bundle) {}
-#endif // CPU_SPARC_VM_CODEBUFFER_SPARC_HPP
+#endif // CPU_SPARC_CODEBUFFER_SPARC_HPP
diff --git a/src/hotspot/cpu/sparc/copy_sparc.hpp b/src/hotspot/cpu/sparc/copy_sparc.hpp
index 17835ca9ce4..68f2f600c4b 100644
--- a/src/hotspot/cpu/sparc/copy_sparc.hpp
+++ b/src/hotspot/cpu/sparc/copy_sparc.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2003, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
*
*/
-#ifndef CPU_SPARC_VM_COPY_SPARC_HPP
-#define CPU_SPARC_VM_COPY_SPARC_HPP
+#ifndef CPU_SPARC_COPY_SPARC_HPP
+#define CPU_SPARC_COPY_SPARC_HPP
// Inline functions for memory copy and fill.
@@ -210,4 +210,4 @@ static void pd_zero_to_bytes(void* to, size_t count) {
(void)memset(to, 0, count);
}
-#endif // CPU_SPARC_VM_COPY_SPARC_HPP
+#endif // CPU_SPARC_COPY_SPARC_HPP
diff --git a/src/hotspot/cpu/sparc/depChecker_sparc.hpp b/src/hotspot/cpu/sparc/depChecker_sparc.hpp
index 6e275437fae..c17c5e1d7f4 100644
--- a/src/hotspot/cpu/sparc/depChecker_sparc.hpp
+++ b/src/hotspot/cpu/sparc/depChecker_sparc.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2002, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -22,9 +22,9 @@
*
*/
-#ifndef CPU_SPARC_VM_DEPCHECKER_SPARC_HPP
-#define CPU_SPARC_VM_DEPCHECKER_SPARC_HPP
+#ifndef CPU_SPARC_DEPCHECKER_SPARC_HPP
+#define CPU_SPARC_DEPCHECKER_SPARC_HPP
// Nothing to do on Sparc
-#endif // CPU_SPARC_VM_DEPCHECKER_SPARC_HPP
+#endif // CPU_SPARC_DEPCHECKER_SPARC_HPP
diff --git a/src/hotspot/cpu/sparc/disassembler_sparc.hpp b/src/hotspot/cpu/sparc/disassembler_sparc.hpp
index 069840975d2..dac9d2873fd 100644
--- a/src/hotspot/cpu/sparc/disassembler_sparc.hpp
+++ b/src/hotspot/cpu/sparc/disassembler_sparc.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
*
*/
-#ifndef CPU_SPARC_VM_DISASSEMBLER_SPARC_HPP
-#define CPU_SPARC_VM_DISASSEMBLER_SPARC_HPP
+#ifndef CPU_SPARC_DISASSEMBLER_SPARC_HPP
+#define CPU_SPARC_DISASSEMBLER_SPARC_HPP
static int pd_instruction_alignment() {
return sizeof(int);
@@ -33,4 +33,4 @@
return "v9only";
}
-#endif // CPU_SPARC_VM_DISASSEMBLER_SPARC_HPP
+#endif // CPU_SPARC_DISASSEMBLER_SPARC_HPP
diff --git a/src/hotspot/cpu/sparc/frame_sparc.hpp b/src/hotspot/cpu/sparc/frame_sparc.hpp
index 640e94c653d..9fcae7a34e6 100644
--- a/src/hotspot/cpu/sparc/frame_sparc.hpp
+++ b/src/hotspot/cpu/sparc/frame_sparc.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
*
*/
-#ifndef CPU_SPARC_VM_FRAME_SPARC_HPP
-#define CPU_SPARC_VM_FRAME_SPARC_HPP
+#ifndef CPU_SPARC_FRAME_SPARC_HPP
+#define CPU_SPARC_FRAME_SPARC_HPP
#include "runtime/synchronizer.hpp"
@@ -242,4 +242,4 @@
static jint interpreter_frame_expression_stack_direction() { return -1; }
-#endif // CPU_SPARC_VM_FRAME_SPARC_HPP
+#endif // CPU_SPARC_FRAME_SPARC_HPP
diff --git a/src/hotspot/cpu/sparc/frame_sparc.inline.hpp b/src/hotspot/cpu/sparc/frame_sparc.inline.hpp
index 4bd4f76726a..d0a6a7696c0 100644
--- a/src/hotspot/cpu/sparc/frame_sparc.inline.hpp
+++ b/src/hotspot/cpu/sparc/frame_sparc.inline.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
*
*/
-#ifndef CPU_SPARC_VM_FRAME_SPARC_INLINE_HPP
-#define CPU_SPARC_VM_FRAME_SPARC_INLINE_HPP
+#ifndef CPU_SPARC_FRAME_SPARC_INLINE_HPP
+#define CPU_SPARC_FRAME_SPARC_INLINE_HPP
#include "asm/macroAssembler.hpp"
#include "code/vmreg.inline.hpp"
@@ -191,4 +191,4 @@ inline void frame::set_saved_oop_result(RegisterMap* map, oop obj) {
*((oop*) map->location(O0->as_VMReg())) = obj;
}
-#endif // CPU_SPARC_VM_FRAME_SPARC_INLINE_HPP
+#endif // CPU_SPARC_FRAME_SPARC_INLINE_HPP
diff --git a/src/hotspot/cpu/sparc/globalDefinitions_sparc.hpp b/src/hotspot/cpu/sparc/globalDefinitions_sparc.hpp
index 998119fe7d4..2f0bc10a31b 100644
--- a/src/hotspot/cpu/sparc/globalDefinitions_sparc.hpp
+++ b/src/hotspot/cpu/sparc/globalDefinitions_sparc.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1999, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1999, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
*
*/
-#ifndef CPU_SPARC_VM_GLOBALDEFINITIONS_SPARC_HPP
-#define CPU_SPARC_VM_GLOBALDEFINITIONS_SPARC_HPP
+#ifndef CPU_SPARC_GLOBALDEFINITIONS_SPARC_HPP
+#define CPU_SPARC_GLOBALDEFINITIONS_SPARC_HPP
// Size of Sparc Instructions
const int BytesPerInstWord = 4;
@@ -55,4 +55,4 @@ const bool CCallingConventionRequiresIntsAsLongs = true;
// SPARC have implemented the local polling
#define THREAD_LOCAL_POLL
-#endif // CPU_SPARC_VM_GLOBALDEFINITIONS_SPARC_HPP
+#endif // CPU_SPARC_GLOBALDEFINITIONS_SPARC_HPP
diff --git a/src/hotspot/cpu/sparc/globals_sparc.hpp b/src/hotspot/cpu/sparc/globals_sparc.hpp
index 479f84bbb24..6147e934817 100644
--- a/src/hotspot/cpu/sparc/globals_sparc.hpp
+++ b/src/hotspot/cpu/sparc/globals_sparc.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2000, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
*
*/
-#ifndef CPU_SPARC_VM_GLOBALS_SPARC_HPP
-#define CPU_SPARC_VM_GLOBALS_SPARC_HPP
+#ifndef CPU_SPARC_GLOBALS_SPARC_HPP
+#define CPU_SPARC_GLOBALS_SPARC_HPP
#include "utilities/globalDefinitions.hpp"
#include "utilities/macros.hpp"
@@ -134,4 +134,4 @@ define_pd_global(bool, ThreadLocalHandshakes, true);
"Distance to prefetch destination array in arraycopy") \
constraint(ArraycopyDstPrefetchDistanceConstraintFunc, AfterErgo) \
-#endif // CPU_SPARC_VM_GLOBALS_SPARC_HPP
+#endif // CPU_SPARC_GLOBALS_SPARC_HPP
diff --git a/src/hotspot/cpu/sparc/icache_sparc.hpp b/src/hotspot/cpu/sparc/icache_sparc.hpp
index e3b5bad7aa1..7d3feea4a95 100644
--- a/src/hotspot/cpu/sparc/icache_sparc.hpp
+++ b/src/hotspot/cpu/sparc/icache_sparc.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
*
*/
-#ifndef CPU_SPARC_VM_ICACHE_SPARC_HPP
-#define CPU_SPARC_VM_ICACHE_SPARC_HPP
+#ifndef CPU_SPARC_ICACHE_SPARC_HPP
+#define CPU_SPARC_ICACHE_SPARC_HPP
// Interface for updating the instruction cache. Whenever the VM modifies
// code, part of the processor instruction cache potentially has to be flushed.
@@ -40,4 +40,4 @@ class ICache : public AbstractICache {
// Use default implementation
};
-#endif // CPU_SPARC_VM_ICACHE_SPARC_HPP
+#endif // CPU_SPARC_ICACHE_SPARC_HPP
diff --git a/src/hotspot/cpu/sparc/interp_masm_sparc.hpp b/src/hotspot/cpu/sparc/interp_masm_sparc.hpp
index da3d920e1d4..31303b7815d 100644
--- a/src/hotspot/cpu/sparc/interp_masm_sparc.hpp
+++ b/src/hotspot/cpu/sparc/interp_masm_sparc.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
*
*/
-#ifndef CPU_SPARC_VM_INTERP_MASM_SPARC_HPP
-#define CPU_SPARC_VM_INTERP_MASM_SPARC_HPP
+#ifndef CPU_SPARC_INTERP_MASM_SPARC_HPP
+#define CPU_SPARC_INTERP_MASM_SPARC_HPP
#include "asm/macroAssembler.hpp"
#include "interpreter/invocationCounter.hpp"
@@ -334,4 +334,4 @@ class InterpreterMacroAssembler: public MacroAssembler {
};
-#endif // CPU_SPARC_VM_INTERP_MASM_SPARC_HPP
+#endif // CPU_SPARC_INTERP_MASM_SPARC_HPP
diff --git a/src/hotspot/cpu/sparc/interpreterRT_sparc.hpp b/src/hotspot/cpu/sparc/interpreterRT_sparc.hpp
index 025a70c4803..11f3c2e9c74 100644
--- a/src/hotspot/cpu/sparc/interpreterRT_sparc.hpp
+++ b/src/hotspot/cpu/sparc/interpreterRT_sparc.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
*
*/
-#ifndef CPU_SPARC_VM_INTERPRETERRT_SPARC_HPP
-#define CPU_SPARC_VM_INTERPRETERRT_SPARC_HPP
+#ifndef CPU_SPARC_INTERPRETERRT_SPARC_HPP
+#define CPU_SPARC_INTERPRETERRT_SPARC_HPP
// This is included in the middle of class Interpreter.
// Do not include files here.
@@ -60,4 +60,4 @@ class SignatureHandlerGenerator: public NativeSignatureIterator {
void generate( uint64_t fingerprint );
};
-#endif // CPU_SPARC_VM_INTERPRETERRT_SPARC_HPP
+#endif // CPU_SPARC_INTERPRETERRT_SPARC_HPP
diff --git a/src/hotspot/cpu/sparc/javaFrameAnchor_sparc.hpp b/src/hotspot/cpu/sparc/javaFrameAnchor_sparc.hpp
index c51545c09cc..dadf4a1481c 100644
--- a/src/hotspot/cpu/sparc/javaFrameAnchor_sparc.hpp
+++ b/src/hotspot/cpu/sparc/javaFrameAnchor_sparc.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2002, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
*
*/
-#ifndef CPU_SPARC_VM_JAVAFRAMEANCHOR_SPARC_HPP
-#define CPU_SPARC_VM_JAVAFRAMEANCHOR_SPARC_HPP
+#ifndef CPU_SPARC_JAVAFRAMEANCHOR_SPARC_HPP
+#define CPU_SPARC_JAVAFRAMEANCHOR_SPARC_HPP
private:
volatile int _flags;
@@ -99,4 +99,4 @@ private:
OrderAccess::fence();
}
-#endif // CPU_SPARC_VM_JAVAFRAMEANCHOR_SPARC_HPP
+#endif // CPU_SPARC_JAVAFRAMEANCHOR_SPARC_HPP
diff --git a/src/hotspot/cpu/sparc/jniTypes_sparc.hpp b/src/hotspot/cpu/sparc/jniTypes_sparc.hpp
index bbdb064a9f1..75ecf48ec64 100644
--- a/src/hotspot/cpu/sparc/jniTypes_sparc.hpp
+++ b/src/hotspot/cpu/sparc/jniTypes_sparc.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
*
*/
-#ifndef CPU_SPARC_VM_JNITYPES_SPARC_HPP
-#define CPU_SPARC_VM_JNITYPES_SPARC_HPP
+#ifndef CPU_SPARC_JNITYPES_SPARC_HPP
+#define CPU_SPARC_JNITYPES_SPARC_HPP
#include "jni.h"
#include "memory/allocation.hpp"
@@ -88,4 +88,4 @@ public:
};
-#endif // CPU_SPARC_VM_JNITYPES_SPARC_HPP
+#endif // CPU_SPARC_JNITYPES_SPARC_HPP
diff --git a/src/hotspot/cpu/sparc/macroAssembler_sparc.hpp b/src/hotspot/cpu/sparc/macroAssembler_sparc.hpp
index 357e14cdbf6..a5cc2180fc3 100644
--- a/src/hotspot/cpu/sparc/macroAssembler_sparc.hpp
+++ b/src/hotspot/cpu/sparc/macroAssembler_sparc.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
*
*/
-#ifndef CPU_SPARC_VM_MACROASSEMBLER_SPARC_HPP
-#define CPU_SPARC_VM_MACROASSEMBLER_SPARC_HPP
+#ifndef CPU_SPARC_MACROASSEMBLER_SPARC_HPP
+#define CPU_SPARC_MACROASSEMBLER_SPARC_HPP
#include "asm/assembler.hpp"
#include "utilities/macros.hpp"
@@ -1397,4 +1397,4 @@ class SkipIfEqual : public StackObj {
~SkipIfEqual();
};
-#endif // CPU_SPARC_VM_MACROASSEMBLER_SPARC_HPP
+#endif // CPU_SPARC_MACROASSEMBLER_SPARC_HPP
diff --git a/src/hotspot/cpu/sparc/macroAssembler_sparc.inline.hpp b/src/hotspot/cpu/sparc/macroAssembler_sparc.inline.hpp
index af57b1cd384..0b5519eac1e 100644
--- a/src/hotspot/cpu/sparc/macroAssembler_sparc.inline.hpp
+++ b/src/hotspot/cpu/sparc/macroAssembler_sparc.inline.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
*
*/
-#ifndef CPU_SPARC_VM_MACROASSEMBLER_SPARC_INLINE_HPP
-#define CPU_SPARC_VM_MACROASSEMBLER_SPARC_INLINE_HPP
+#ifndef CPU_SPARC_MACROASSEMBLER_SPARC_INLINE_HPP
+#define CPU_SPARC_MACROASSEMBLER_SPARC_INLINE_HPP
#include "asm/assembler.inline.hpp"
#include "asm/macroAssembler.hpp"
@@ -719,4 +719,4 @@ inline void MacroAssembler::swap(const Address& a, Register d, int offset) {
if (a.has_index()) { assert(offset == 0, ""); swap(a.base(), a.index(), d ); }
else { swap(a.base(), a.disp() + offset, d); }
}
-#endif // CPU_SPARC_VM_MACROASSEMBLER_SPARC_INLINE_HPP
+#endif // CPU_SPARC_MACROASSEMBLER_SPARC_INLINE_HPP
diff --git a/src/hotspot/cpu/sparc/nativeInst_sparc.hpp b/src/hotspot/cpu/sparc/nativeInst_sparc.hpp
index 3d0023d68f1..605a45255d4 100644
--- a/src/hotspot/cpu/sparc/nativeInst_sparc.hpp
+++ b/src/hotspot/cpu/sparc/nativeInst_sparc.hpp
@@ -22,8 +22,8 @@
*
*/
-#ifndef CPU_SPARC_VM_NATIVEINST_SPARC_HPP
-#define CPU_SPARC_VM_NATIVEINST_SPARC_HPP
+#ifndef CPU_SPARC_NATIVEINST_SPARC_HPP
+#define CPU_SPARC_NATIVEINST_SPARC_HPP
#include "asm/macroAssembler.hpp"
#include "runtime/icache.hpp"
@@ -809,4 +809,4 @@ class NativeIllegalInstruction: public NativeInstruction {
static void insert(address code_pos);
};
-#endif // CPU_SPARC_VM_NATIVEINST_SPARC_HPP
+#endif // CPU_SPARC_NATIVEINST_SPARC_HPP
diff --git a/src/hotspot/cpu/sparc/registerMap_sparc.hpp b/src/hotspot/cpu/sparc/registerMap_sparc.hpp
index d67b3aeefa4..182c824ed73 100644
--- a/src/hotspot/cpu/sparc/registerMap_sparc.hpp
+++ b/src/hotspot/cpu/sparc/registerMap_sparc.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
*
*/
-#ifndef CPU_SPARC_VM_REGISTERMAP_SPARC_HPP
-#define CPU_SPARC_VM_REGISTERMAP_SPARC_HPP
+#ifndef CPU_SPARC_REGISTERMAP_SPARC_HPP
+#define CPU_SPARC_REGISTERMAP_SPARC_HPP
// machine-dependent implemention for register maps
friend class frame;
@@ -56,4 +56,4 @@
// When popping out of compiled frames, we make all IRegs disappear.
void make_integer_regs_unsaved() { _location_valid[0] = 0; }
-#endif // CPU_SPARC_VM_REGISTERMAP_SPARC_HPP
+#endif // CPU_SPARC_REGISTERMAP_SPARC_HPP
diff --git a/src/hotspot/cpu/sparc/register_sparc.hpp b/src/hotspot/cpu/sparc/register_sparc.hpp
index 17430e4bbb7..d68c19fc0db 100644
--- a/src/hotspot/cpu/sparc/register_sparc.hpp
+++ b/src/hotspot/cpu/sparc/register_sparc.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2000, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
*
*/
-#ifndef CPU_SPARC_VM_REGISTER_SPARC_HPP
-#define CPU_SPARC_VM_REGISTER_SPARC_HPP
+#ifndef CPU_SPARC_REGISTER_SPARC_HPP
+#define CPU_SPARC_REGISTER_SPARC_HPP
#include "asm/register.hpp"
@@ -337,4 +337,4 @@ class QuadFloatRegisterImpl {
}
};
-#endif // CPU_SPARC_VM_REGISTER_SPARC_HPP
+#endif // CPU_SPARC_REGISTER_SPARC_HPP
diff --git a/src/hotspot/cpu/sparc/relocInfo_sparc.hpp b/src/hotspot/cpu/sparc/relocInfo_sparc.hpp
index a9571060e81..0dc2b7fcda5 100644
--- a/src/hotspot/cpu/sparc/relocInfo_sparc.hpp
+++ b/src/hotspot/cpu/sparc/relocInfo_sparc.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
*
*/
-#ifndef CPU_SPARC_VM_RELOCINFO_SPARC_HPP
-#define CPU_SPARC_VM_RELOCINFO_SPARC_HPP
+#ifndef CPU_SPARC_RELOCINFO_SPARC_HPP
+#define CPU_SPARC_RELOCINFO_SPARC_HPP
// machine-dependent parts of class relocInfo
private:
@@ -54,4 +54,4 @@
// 1.9 99/07/16 11:12:11 relocInfo_i486.hpp
//End
-#endif // CPU_SPARC_VM_RELOCINFO_SPARC_HPP
+#endif // CPU_SPARC_RELOCINFO_SPARC_HPP
diff --git a/src/hotspot/cpu/sparc/stubRoutines_sparc.hpp b/src/hotspot/cpu/sparc/stubRoutines_sparc.hpp
index d41c5b8e4ae..06669701238 100644
--- a/src/hotspot/cpu/sparc/stubRoutines_sparc.hpp
+++ b/src/hotspot/cpu/sparc/stubRoutines_sparc.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
*
*/
-#ifndef CPU_SPARC_VM_STUBROUTINES_SPARC_HPP
-#define CPU_SPARC_VM_STUBROUTINES_SPARC_HPP
+#ifndef CPU_SPARC_STUBROUTINES_SPARC_HPP
+#define CPU_SPARC_STUBROUTINES_SPARC_HPP
// This file holds the platform specific parts of the StubRoutines
// definition. See stubRoutines.hpp for a description on how to
@@ -73,4 +73,4 @@ class Sparc {
static address crc_by128_masks_addr() { return (address)_crc_by128_masks; }
};
-#endif // CPU_SPARC_VM_STUBROUTINES_SPARC_HPP
+#endif // CPU_SPARC_STUBROUTINES_SPARC_HPP
diff --git a/src/hotspot/cpu/sparc/templateTable_sparc.hpp b/src/hotspot/cpu/sparc/templateTable_sparc.hpp
index cae9564cdea..e5c54a1bc6f 100644
--- a/src/hotspot/cpu/sparc/templateTable_sparc.hpp
+++ b/src/hotspot/cpu/sparc/templateTable_sparc.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
*
*/
-#ifndef CPU_SPARC_VM_TEMPLATETABLE_SPARC_HPP
-#define CPU_SPARC_VM_TEMPLATETABLE_SPARC_HPP
+#ifndef CPU_SPARC_TEMPLATETABLE_SPARC_HPP
+#define CPU_SPARC_TEMPLATETABLE_SPARC_HPP
static void prepare_invoke(int byte_no,
Register method, // linked method (or i-klass)
@@ -40,4 +40,4 @@
static void generate_vtable_call(Register Rrecv, Register Rindex, Register Rret);
static void volatile_barrier(Assembler::Membar_mask_bits order_constraint);
-#endif // CPU_SPARC_VM_TEMPLATETABLE_SPARC_HPP
+#endif // CPU_SPARC_TEMPLATETABLE_SPARC_HPP
diff --git a/src/hotspot/cpu/sparc/vmStructs_sparc.hpp b/src/hotspot/cpu/sparc/vmStructs_sparc.hpp
index d678b4dbfd4..305145d51ff 100644
--- a/src/hotspot/cpu/sparc/vmStructs_sparc.hpp
+++ b/src/hotspot/cpu/sparc/vmStructs_sparc.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2001, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
*
*/
-#ifndef CPU_SPARC_VM_VMSTRUCTS_SPARC_HPP
-#define CPU_SPARC_VM_VMSTRUCTS_SPARC_HPP
+#ifndef CPU_SPARC_VMSTRUCTS_SPARC_HPP
+#define CPU_SPARC_VMSTRUCTS_SPARC_HPP
// These are the CPU-specific fields, types and integer
// constants required by the Serviceability Agent. This file is
@@ -119,4 +119,4 @@
#define VM_LONG_CONSTANTS_CPU(declare_constant, declare_preprocessor_constant, declare_c1_constant, declare_c2_constant, declare_c2_preprocessor_constant)
-#endif // CPU_SPARC_VM_VMSTRUCTS_SPARC_HPP
+#endif // CPU_SPARC_VMSTRUCTS_SPARC_HPP
diff --git a/src/hotspot/cpu/sparc/vm_version_ext_sparc.hpp b/src/hotspot/cpu/sparc/vm_version_ext_sparc.hpp
index 767cc24cb67..753ca74224d 100644
--- a/src/hotspot/cpu/sparc/vm_version_ext_sparc.hpp
+++ b/src/hotspot/cpu/sparc/vm_version_ext_sparc.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2013, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
*
*/
-#ifndef CPU_SPARC_VM_VM_VERSION_EXT_SPARC_HPP
-#define CPU_SPARC_VM_VM_VERSION_EXT_SPARC_HPP
+#ifndef CPU_SPARC_VM_VERSION_EXT_SPARC_HPP
+#define CPU_SPARC_VM_VERSION_EXT_SPARC_HPP
#include "utilities/macros.hpp"
#include "vm_version_sparc.hpp"
@@ -66,4 +66,4 @@ class VM_Version_Ext : public VM_Version {
static const char* cpu_description(void);
};
-#endif // CPU_SPARC_VM_VM_VERSION_EXT_SPARC_HPP
+#endif // CPU_SPARC_VM_VERSION_EXT_SPARC_HPP
diff --git a/src/hotspot/cpu/sparc/vm_version_sparc.hpp b/src/hotspot/cpu/sparc/vm_version_sparc.hpp
index e1115077543..ee13dea759e 100644
--- a/src/hotspot/cpu/sparc/vm_version_sparc.hpp
+++ b/src/hotspot/cpu/sparc/vm_version_sparc.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
*
*/
-#ifndef CPU_SPARC_VM_VM_VERSION_SPARC_HPP
-#define CPU_SPARC_VM_VM_VERSION_SPARC_HPP
+#ifndef CPU_SPARC_VM_VERSION_SPARC_HPP
+#define CPU_SPARC_VM_VERSION_SPARC_HPP
#include "runtime/globals_extension.hpp"
#include "runtime/vm_version.hpp"
@@ -373,4 +373,4 @@ public:
}
};
-#endif // CPU_SPARC_VM_VM_VERSION_SPARC_HPP
+#endif // CPU_SPARC_VM_VERSION_SPARC_HPP
diff --git a/src/hotspot/cpu/sparc/vmreg_sparc.hpp b/src/hotspot/cpu/sparc/vmreg_sparc.hpp
index e1f4591002d..2eefe37cbd4 100644
--- a/src/hotspot/cpu/sparc/vmreg_sparc.hpp
+++ b/src/hotspot/cpu/sparc/vmreg_sparc.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2006, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2006, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
*
*/
-#ifndef CPU_SPARC_VM_VMREG_SPARC_HPP
-#define CPU_SPARC_VM_VMREG_SPARC_HPP
+#ifndef CPU_SPARC_VMREG_SPARC_HPP
+#define CPU_SPARC_VMREG_SPARC_HPP
inline bool is_Register() { return value() >= 0 && value() < ConcreteRegisterImpl::max_gpr; }
inline bool is_FloatRegister() { return value() >= ConcreteRegisterImpl::max_gpr &&
@@ -55,4 +55,4 @@ inline bool is_concrete() {
return false;
}
-#endif // CPU_SPARC_VM_VMREG_SPARC_HPP
+#endif // CPU_SPARC_VMREG_SPARC_HPP
diff --git a/src/hotspot/cpu/sparc/vmreg_sparc.inline.hpp b/src/hotspot/cpu/sparc/vmreg_sparc.inline.hpp
index 936d39db68b..26f402742a1 100644
--- a/src/hotspot/cpu/sparc/vmreg_sparc.inline.hpp
+++ b/src/hotspot/cpu/sparc/vmreg_sparc.inline.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2006, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2006, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
*
*/
-#ifndef CPU_SPARC_VM_VMREG_SPARC_INLINE_HPP
-#define CPU_SPARC_VM_VMREG_SPARC_INLINE_HPP
+#ifndef CPU_SPARC_VMREG_SPARC_INLINE_HPP
+#define CPU_SPARC_VMREG_SPARC_INLINE_HPP
inline VMReg RegisterImpl::as_VMReg() {
if( this==noreg ) return VMRegImpl::Bad();
@@ -34,4 +34,4 @@ inline VMReg FloatRegisterImpl::as_VMReg() { return VMRegImpl::as_VMReg( Concret
-#endif // CPU_SPARC_VM_VMREG_SPARC_INLINE_HPP
+#endif // CPU_SPARC_VMREG_SPARC_INLINE_HPP
diff --git a/src/hotspot/cpu/x86/assembler_x86.hpp b/src/hotspot/cpu/x86/assembler_x86.hpp
index 7ad59531479..62ec2a004d7 100644
--- a/src/hotspot/cpu/x86/assembler_x86.hpp
+++ b/src/hotspot/cpu/x86/assembler_x86.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
*
*/
-#ifndef CPU_X86_VM_ASSEMBLER_X86_HPP
-#define CPU_X86_VM_ASSEMBLER_X86_HPP
+#ifndef CPU_X86_ASSEMBLER_X86_HPP
+#define CPU_X86_ASSEMBLER_X86_HPP
#include "asm/register.hpp"
#include "vm_version_x86.hpp"
@@ -2310,4 +2310,4 @@ public:
};
-#endif // CPU_X86_VM_ASSEMBLER_X86_HPP
+#endif // CPU_X86_ASSEMBLER_X86_HPP
diff --git a/src/hotspot/cpu/x86/assembler_x86.inline.hpp b/src/hotspot/cpu/x86/assembler_x86.inline.hpp
index 7219943a969..66aebb32e21 100644
--- a/src/hotspot/cpu/x86/assembler_x86.inline.hpp
+++ b/src/hotspot/cpu/x86/assembler_x86.inline.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
*
*/
-#ifndef CPU_X86_VM_ASSEMBLER_X86_INLINE_HPP
-#define CPU_X86_VM_ASSEMBLER_X86_INLINE_HPP
+#ifndef CPU_X86_ASSEMBLER_X86_INLINE_HPP
+#define CPU_X86_ASSEMBLER_X86_INLINE_HPP
#include "asm/assembler.inline.hpp"
#include "asm/codeBuffer.hpp"
@@ -49,4 +49,4 @@ inline void Assembler::prefix(Address adr, XMMRegister reg) {}
inline void Assembler::prefixq(Address adr, XMMRegister reg) {}
#endif // _LP64
-#endif // CPU_X86_VM_ASSEMBLER_X86_INLINE_HPP
+#endif // CPU_X86_ASSEMBLER_X86_INLINE_HPP
diff --git a/src/hotspot/cpu/x86/bytes_x86.hpp b/src/hotspot/cpu/x86/bytes_x86.hpp
index 8636e8810fe..d2ef7bf8f96 100644
--- a/src/hotspot/cpu/x86/bytes_x86.hpp
+++ b/src/hotspot/cpu/x86/bytes_x86.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
*
*/
-#ifndef CPU_X86_VM_BYTES_X86_HPP
-#define CPU_X86_VM_BYTES_X86_HPP
+#ifndef CPU_X86_BYTES_X86_HPP
+#define CPU_X86_BYTES_X86_HPP
#include "memory/allocation.hpp"
#include "utilities/align.hpp"
@@ -124,4 +124,4 @@ class Bytes: AllStatic {
// The following header contains the implementations of swap_u2, swap_u4, and swap_u8[_base]
#include OS_CPU_HEADER_INLINE(bytes)
-#endif // CPU_X86_VM_BYTES_X86_HPP
+#endif // CPU_X86_BYTES_X86_HPP
diff --git a/src/hotspot/cpu/x86/c1_Defs_x86.hpp b/src/hotspot/cpu/x86/c1_Defs_x86.hpp
index dab876adc8a..27e9889bcbe 100644
--- a/src/hotspot/cpu/x86/c1_Defs_x86.hpp
+++ b/src/hotspot/cpu/x86/c1_Defs_x86.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2000, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
*
*/
-#ifndef CPU_X86_VM_C1_DEFS_X86_HPP
-#define CPU_X86_VM_C1_DEFS_X86_HPP
+#ifndef CPU_X86_C1_DEFS_X86_HPP
+#define CPU_X86_C1_DEFS_X86_HPP
// native word offsets from memory address (little endian)
enum {
@@ -75,4 +75,4 @@ enum {
pd_float_saved_as_double = true
};
-#endif // CPU_X86_VM_C1_DEFS_X86_HPP
+#endif // CPU_X86_C1_DEFS_X86_HPP
diff --git a/src/hotspot/cpu/x86/c1_FpuStackSim_x86.hpp b/src/hotspot/cpu/x86/c1_FpuStackSim_x86.hpp
index c63742311dc..405aebe9a75 100644
--- a/src/hotspot/cpu/x86/c1_FpuStackSim_x86.hpp
+++ b/src/hotspot/cpu/x86/c1_FpuStackSim_x86.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2005, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
*
*/
-#ifndef CPU_X86_VM_C1_FPUSTACKSIM_X86_HPP
-#define CPU_X86_VM_C1_FPUSTACKSIM_X86_HPP
+#ifndef CPU_X86_C1_FPUSTACKSIM_X86_HPP
+#define CPU_X86_C1_FPUSTACKSIM_X86_HPP
// Simulates the FPU stack and maintains mapping [fpu-register -> stack offset]
// FPU registers are described as numbers from 0..nof_fpu_regs-1
@@ -69,4 +69,4 @@ class FpuStackSim {
void print() PRODUCT_RETURN;
};
-#endif // CPU_X86_VM_C1_FPUSTACKSIM_X86_HPP
+#endif // CPU_X86_C1_FPUSTACKSIM_X86_HPP
diff --git a/src/hotspot/cpu/x86/c1_FrameMap_x86.hpp b/src/hotspot/cpu/x86/c1_FrameMap_x86.hpp
index 0b3bafb2e15..b6091c494bd 100644
--- a/src/hotspot/cpu/x86/c1_FrameMap_x86.hpp
+++ b/src/hotspot/cpu/x86/c1_FrameMap_x86.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1999, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1999, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
*
*/
-#ifndef CPU_X86_VM_C1_FRAMEMAP_X86_HPP
-#define CPU_X86_VM_C1_FRAMEMAP_X86_HPP
+#ifndef CPU_X86_C1_FRAMEMAP_X86_HPP
+#define CPU_X86_C1_FRAMEMAP_X86_HPP
// On i486 the frame looks as follows:
//
@@ -166,5 +166,4 @@
static int last_cpu_reg() { return adjust_reg_range(pd_last_cpu_reg); }
static int last_byte_reg() { return adjust_reg_range(pd_last_byte_reg); }
-#endif // CPU_X86_VM_C1_FRAMEMAP_X86_HPP
-
+#endif // CPU_X86_C1_FRAMEMAP_X86_HPP
diff --git a/src/hotspot/cpu/x86/c1_LIRAssembler_x86.hpp b/src/hotspot/cpu/x86/c1_LIRAssembler_x86.hpp
index 680793b1891..39bddc52280 100644
--- a/src/hotspot/cpu/x86/c1_LIRAssembler_x86.hpp
+++ b/src/hotspot/cpu/x86/c1_LIRAssembler_x86.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2000, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
*
*/
-#ifndef CPU_X86_VM_C1_LIRASSEMBLER_X86_HPP
-#define CPU_X86_VM_C1_LIRASSEMBLER_X86_HPP
+#ifndef CPU_X86_C1_LIRASSEMBLER_X86_HPP
+#define CPU_X86_C1_LIRASSEMBLER_X86_HPP
private:
@@ -62,4 +62,4 @@ public:
void store_parameter(jobject c, int offset_from_esp_in_words);
void store_parameter(Metadata* c, int offset_from_esp_in_words);
-#endif // CPU_X86_VM_C1_LIRASSEMBLER_X86_HPP
+#endif // CPU_X86_C1_LIRASSEMBLER_X86_HPP
diff --git a/src/hotspot/cpu/x86/c1_LinearScan_x86.hpp b/src/hotspot/cpu/x86/c1_LinearScan_x86.hpp
index 7a1c6f3493d..462321ca345 100644
--- a/src/hotspot/cpu/x86/c1_LinearScan_x86.hpp
+++ b/src/hotspot/cpu/x86/c1_LinearScan_x86.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2005, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
*
*/
-#ifndef CPU_X86_VM_C1_LINEARSCAN_X86_HPP
-#define CPU_X86_VM_C1_LINEARSCAN_X86_HPP
+#ifndef CPU_X86_C1_LINEARSCAN_X86_HPP
+#define CPU_X86_C1_LINEARSCAN_X86_HPP
inline bool LinearScan::is_processed_reg_num(int reg_num) {
#ifndef _LP64
@@ -195,4 +195,4 @@ class FpuStackAllocator {
void allocate();
};
-#endif // CPU_X86_VM_C1_LINEARSCAN_X86_HPP
+#endif // CPU_X86_C1_LINEARSCAN_X86_HPP
diff --git a/src/hotspot/cpu/x86/c1_MacroAssembler_x86.hpp b/src/hotspot/cpu/x86/c1_MacroAssembler_x86.hpp
index e3254b456fb..77d5fc6eccd 100644
--- a/src/hotspot/cpu/x86/c1_MacroAssembler_x86.hpp
+++ b/src/hotspot/cpu/x86/c1_MacroAssembler_x86.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1999, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1999, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
*
*/
-#ifndef CPU_X86_VM_C1_MACROASSEMBLER_X86_HPP
-#define CPU_X86_VM_C1_MACROASSEMBLER_X86_HPP
+#ifndef CPU_X86_C1_MACROASSEMBLER_X86_HPP
+#define CPU_X86_C1_MACROASSEMBLER_X86_HPP
// C1_MacroAssembler contains high-level macros for C1
@@ -127,4 +127,4 @@
void restore_live_registers_except_rax(bool restore_fpu_registers);
void restore_live_registers(bool restore_fpu_registers);
-#endif // CPU_X86_VM_C1_MACROASSEMBLER_X86_HPP
+#endif // CPU_X86_C1_MACROASSEMBLER_X86_HPP
diff --git a/src/hotspot/cpu/x86/c1_globals_x86.hpp b/src/hotspot/cpu/x86/c1_globals_x86.hpp
index 43a394b9823..b9dd15b59fb 100644
--- a/src/hotspot/cpu/x86/c1_globals_x86.hpp
+++ b/src/hotspot/cpu/x86/c1_globals_x86.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2000, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
*
*/
-#ifndef CPU_X86_VM_C1_GLOBALS_X86_HPP
-#define CPU_X86_VM_C1_GLOBALS_X86_HPP
+#ifndef CPU_X86_C1_GLOBALS_X86_HPP
+#define CPU_X86_C1_GLOBALS_X86_HPP
#include "utilities/globalDefinitions.hpp"
#include "utilities/macros.hpp"
@@ -67,4 +67,4 @@ define_pd_global(bool, OptimizeSinglePrecision, true );
define_pd_global(bool, CSEArrayLength, false);
define_pd_global(bool, TwoOperandLIRForm, true );
-#endif // CPU_X86_VM_C1_GLOBALS_X86_HPP
+#endif // CPU_X86_C1_GLOBALS_X86_HPP
diff --git a/src/hotspot/cpu/x86/c2_globals_x86.hpp b/src/hotspot/cpu/x86/c2_globals_x86.hpp
index b7e759738fa..75a90c4b88d 100644
--- a/src/hotspot/cpu/x86/c2_globals_x86.hpp
+++ b/src/hotspot/cpu/x86/c2_globals_x86.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2000, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
*
*/
-#ifndef CPU_X86_VM_C2_GLOBALS_X86_HPP
-#define CPU_X86_VM_C2_GLOBALS_X86_HPP
+#ifndef CPU_X86_C2_GLOBALS_X86_HPP
+#define CPU_X86_C2_GLOBALS_X86_HPP
#include "utilities/globalDefinitions.hpp"
#include "utilities/macros.hpp"
@@ -99,4 +99,4 @@ define_pd_global(size_t, MetaspaceSize, ScaleForWordSize(16*M));
// Ergonomics related flags
define_pd_global(bool, NeverActAsServerClassMachine, false);
-#endif // CPU_X86_VM_C2_GLOBALS_X86_HPP
+#endif // CPU_X86_C2_GLOBALS_X86_HPP
diff --git a/src/hotspot/cpu/x86/codeBuffer_x86.hpp b/src/hotspot/cpu/x86/codeBuffer_x86.hpp
index 7f20314ffca..ae03833595c 100644
--- a/src/hotspot/cpu/x86/codeBuffer_x86.hpp
+++ b/src/hotspot/cpu/x86/codeBuffer_x86.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2002, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
*
*/
-#ifndef CPU_X86_VM_CODEBUFFER_X86_HPP
-#define CPU_X86_VM_CODEBUFFER_X86_HPP
+#ifndef CPU_X86_CODEBUFFER_X86_HPP
+#define CPU_X86_CODEBUFFER_X86_HPP
private:
void pd_initialize() {}
@@ -31,4 +31,4 @@ private:
public:
void flush_bundle(bool start_new_bundle) {}
-#endif // CPU_X86_VM_CODEBUFFER_X86_HPP
+#endif // CPU_X86_CODEBUFFER_X86_HPP
diff --git a/src/hotspot/cpu/x86/copy_x86.hpp b/src/hotspot/cpu/x86/copy_x86.hpp
index e07b64e5310..92da60fa010 100644
--- a/src/hotspot/cpu/x86/copy_x86.hpp
+++ b/src/hotspot/cpu/x86/copy_x86.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2003, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
*
*/
-#ifndef CPU_X86_VM_COPY_X86_HPP
-#define CPU_X86_VM_COPY_X86_HPP
+#ifndef CPU_X86_COPY_X86_HPP
+#define CPU_X86_COPY_X86_HPP
// Inline functions for memory copy and fill.
@@ -62,4 +62,4 @@ static void pd_zero_to_bytes(void* to, size_t count) {
(void)memset(to, 0, count);
}
-#endif // CPU_X86_VM_COPY_X86_HPP
+#endif // CPU_X86_COPY_X86_HPP
diff --git a/src/hotspot/cpu/x86/depChecker_x86.hpp b/src/hotspot/cpu/x86/depChecker_x86.hpp
index 5654bbd12d4..13b4054f5d5 100644
--- a/src/hotspot/cpu/x86/depChecker_x86.hpp
+++ b/src/hotspot/cpu/x86/depChecker_x86.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2002, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -22,9 +22,9 @@
*
*/
-#ifndef CPU_X86_VM_DEPCHECKER_X86_HPP
-#define CPU_X86_VM_DEPCHECKER_X86_HPP
+#ifndef CPU_X86_DEPCHECKER_X86_HPP
+#define CPU_X86_DEPCHECKER_X86_HPP
// Nothing to do on i486
-#endif // CPU_X86_VM_DEPCHECKER_X86_HPP
+#endif // CPU_X86_DEPCHECKER_X86_HPP
diff --git a/src/hotspot/cpu/x86/disassembler_x86.hpp b/src/hotspot/cpu/x86/disassembler_x86.hpp
index a3b74bac422..7163c07edb5 100644
--- a/src/hotspot/cpu/x86/disassembler_x86.hpp
+++ b/src/hotspot/cpu/x86/disassembler_x86.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
*
*/
-#ifndef CPU_X86_VM_DISASSEMBLER_X86_HPP
-#define CPU_X86_VM_DISASSEMBLER_X86_HPP
+#ifndef CPU_X86_DISASSEMBLER_X86_HPP
+#define CPU_X86_DISASSEMBLER_X86_HPP
static int pd_instruction_alignment() {
return 1;
@@ -33,4 +33,4 @@
return "";
}
-#endif // CPU_X86_VM_DISASSEMBLER_X86_HPP
+#endif // CPU_X86_DISASSEMBLER_X86_HPP
diff --git a/src/hotspot/cpu/x86/frame_x86.hpp b/src/hotspot/cpu/x86/frame_x86.hpp
index 0c5a73b5395..31dfc4d2481 100644
--- a/src/hotspot/cpu/x86/frame_x86.hpp
+++ b/src/hotspot/cpu/x86/frame_x86.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
*
*/
-#ifndef CPU_X86_VM_FRAME_X86_HPP
-#define CPU_X86_VM_FRAME_X86_HPP
+#ifndef CPU_X86_FRAME_X86_HPP
+#define CPU_X86_FRAME_X86_HPP
#include "runtime/synchronizer.hpp"
@@ -156,4 +156,4 @@
static jint interpreter_frame_expression_stack_direction() { return -1; }
-#endif // CPU_X86_VM_FRAME_X86_HPP
+#endif // CPU_X86_FRAME_X86_HPP
diff --git a/src/hotspot/cpu/x86/frame_x86.inline.hpp b/src/hotspot/cpu/x86/frame_x86.inline.hpp
index 4ce45f1ed4f..a308729150c 100644
--- a/src/hotspot/cpu/x86/frame_x86.inline.hpp
+++ b/src/hotspot/cpu/x86/frame_x86.inline.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
*
*/
-#ifndef CPU_X86_VM_FRAME_X86_INLINE_HPP
-#define CPU_X86_VM_FRAME_X86_INLINE_HPP
+#ifndef CPU_X86_FRAME_X86_INLINE_HPP
+#define CPU_X86_FRAME_X86_INLINE_HPP
#include "code/codeCache.hpp"
#include "code/vmreg.inline.hpp"
@@ -245,4 +245,4 @@ inline void frame::set_saved_oop_result(RegisterMap* map, oop obj) {
*result_adr = obj;
}
-#endif // CPU_X86_VM_FRAME_X86_INLINE_HPP
+#endif // CPU_X86_FRAME_X86_INLINE_HPP
diff --git a/src/hotspot/cpu/x86/gc/shenandoah/shenandoahBarrierSetAssembler_x86.cpp b/src/hotspot/cpu/x86/gc/shenandoah/shenandoahBarrierSetAssembler_x86.cpp
index b30dfe2aa2a..9dc94ef79fb 100644
--- a/src/hotspot/cpu/x86/gc/shenandoah/shenandoahBarrierSetAssembler_x86.cpp
+++ b/src/hotspot/cpu/x86/gc/shenandoah/shenandoahBarrierSetAssembler_x86.cpp
@@ -592,64 +592,19 @@ void ShenandoahBarrierSetAssembler::resolve(MacroAssembler* masm, DecoratorSet d
#ifndef _LP64
void ShenandoahBarrierSetAssembler::cmpxchg_oop(MacroAssembler* masm,
Register res, Address addr, Register oldval, Register newval,
- bool exchange, bool encode, Register tmp1, Register tmp2) {
+ bool exchange, Register tmp1, Register tmp2) {
// Shenandoah has no 32-bit version for this.
Unimplemented();
}
#else
void ShenandoahBarrierSetAssembler::cmpxchg_oop(MacroAssembler* masm,
Register res, Address addr, Register oldval, Register newval,
- bool exchange, bool encode, Register tmp1, Register tmp2) {
- if (!ShenandoahCASBarrier) {
-#ifdef _LP64
- if (UseCompressedOops) {
- if (encode) {
- __ encode_heap_oop(oldval);
- __ mov(rscratch1, newval);
- __ encode_heap_oop(rscratch1);
- newval = rscratch1;
- }
- if (os::is_MP()) {
- __ lock();
- }
- // oldval (rax) is implicitly used by this instruction
- __ cmpxchgl(newval, addr);
- } else
-#endif
- {
- if (os::is_MP()) {
- __ lock();
- }
- __ cmpxchgptr(newval, addr);
- }
-
- if (!exchange) {
- assert(res != NULL, "need result register");
- __ setb(Assembler::equal, res);
- __ movzbl(res, res);
- }
- return;
- }
-
+ bool exchange, Register tmp1, Register tmp2) {
assert(ShenandoahCASBarrier, "Should only be used when CAS barrier is enabled");
assert(oldval == rax, "must be in rax for implicit use in cmpxchg");
Label retry, done;
- // Apply storeval barrier to newval.
- if (encode) {
- storeval_barrier(masm, newval, tmp1);
- }
-
- if (UseCompressedOops) {
- if (encode) {
- __ encode_heap_oop(oldval);
- __ mov(rscratch1, newval);
- __ encode_heap_oop(rscratch1);
- newval = rscratch1;
- }
- }
-
// Remember oldval for retry logic below
if (UseCompressedOops) {
__ movl(tmp1, oldval);
diff --git a/src/hotspot/cpu/x86/gc/shenandoah/shenandoahBarrierSetAssembler_x86.hpp b/src/hotspot/cpu/x86/gc/shenandoah/shenandoahBarrierSetAssembler_x86.hpp
index c373409ec67..afbd204d7be 100644
--- a/src/hotspot/cpu/x86/gc/shenandoah/shenandoahBarrierSetAssembler_x86.hpp
+++ b/src/hotspot/cpu/x86/gc/shenandoah/shenandoahBarrierSetAssembler_x86.hpp
@@ -64,7 +64,6 @@ private:
void write_barrier(MacroAssembler* masm, Register dst);
void write_barrier_impl(MacroAssembler* masm, Register dst);
- void storeval_barrier(MacroAssembler* masm, Register dst, Register tmp);
void storeval_barrier_impl(MacroAssembler* masm, Register dst, Register tmp);
address generate_shenandoah_wb(StubCodeGenerator* cgen);
@@ -75,6 +74,7 @@ private:
public:
static address shenandoah_wb();
+ void storeval_barrier(MacroAssembler* masm, Register dst, Register tmp);
#ifdef COMPILER1
void gen_pre_barrier_stub(LIR_Assembler* ce, ShenandoahPreBarrierStub* stub);
void gen_write_barrier_stub(LIR_Assembler* ce, ShenandoahWriteBarrierStub* stub);
@@ -83,7 +83,7 @@ public:
void cmpxchg_oop(MacroAssembler* masm,
Register res, Address addr, Register oldval, Register newval,
- bool exchange, bool encode, Register tmp1, Register tmp2);
+ bool exchange, Register tmp1, Register tmp2);
virtual void arraycopy_prologue(MacroAssembler* masm, DecoratorSet decorators, BasicType type,
Register src, Register dst, Register count);
virtual void arraycopy_epilogue(MacroAssembler* masm, DecoratorSet decorators, BasicType type,
diff --git a/src/hotspot/cpu/x86/gc/shenandoah/shenandoahBarrierSetC1_x86.cpp b/src/hotspot/cpu/x86/gc/shenandoah/shenandoahBarrierSetC1_x86.cpp
index 2e1c5e87ba8..c2a73d2b9a7 100644
--- a/src/hotspot/cpu/x86/gc/shenandoah/shenandoahBarrierSetC1_x86.cpp
+++ b/src/hotspot/cpu/x86/gc/shenandoah/shenandoahBarrierSetC1_x86.cpp
@@ -28,20 +28,36 @@
#include "gc/shenandoah/shenandoahBarrierSetAssembler.hpp"
#include "gc/shenandoah/c1/shenandoahBarrierSetC1.hpp"
+#define __ masm->masm()->
+
void LIR_OpShenandoahCompareAndSwap::emit_code(LIR_Assembler* masm) {
Register addr = _addr->as_register_lo();
Register newval = _new_value->as_register();
Register cmpval = _cmp_value->as_register();
Register tmp1 = _tmp1->as_register();
Register tmp2 = _tmp2->as_register();
+ Register result = result_opr()->as_register();
assert(cmpval == rax, "wrong register");
assert(newval != NULL, "new val must be register");
assert(cmpval != newval, "cmp and new values must be in different registers");
assert(cmpval != addr, "cmp and addr must be in different registers");
assert(newval != addr, "new value and addr must be in different registers");
- ShenandoahBarrierSet::assembler()->cmpxchg_oop(masm->masm(), NULL, Address(addr, 0), cmpval, newval, true, true, tmp1, tmp2);
+
+ // Apply storeval barrier to newval.
+ ShenandoahBarrierSet::assembler()->storeval_barrier(masm->masm(), newval, tmp1);
+
+ if (UseCompressedOops) {
+ __ encode_heap_oop(cmpval);
+ __ mov(rscratch1, newval);
+ __ encode_heap_oop(rscratch1);
+ newval = rscratch1;
+ }
+
+ ShenandoahBarrierSet::assembler()->cmpxchg_oop(masm->masm(), result, Address(addr, 0), cmpval, newval, false, tmp1, tmp2);
}
+#undef __
+
#ifdef ASSERT
#define __ gen->lir(__FILE__, __LINE__)->
#else
@@ -63,12 +79,9 @@ LIR_Opr ShenandoahBarrierSetC1::atomic_cmpxchg_at_resolved(LIRAccess& access, LI
LIR_Opr t1 = gen->new_register(T_OBJECT);
LIR_Opr t2 = gen->new_register(T_OBJECT);
LIR_Opr addr = access.resolved_addr()->as_address_ptr()->base();
-
- __ append(new LIR_OpShenandoahCompareAndSwap(addr, cmp_value.result(), new_value.result(), t1, t2, LIR_OprFact::illegalOpr));
-
LIR_Opr result = gen->new_register(T_INT);
- __ cmove(lir_cond_equal, LIR_OprFact::intConst(1), LIR_OprFact::intConst(0),
- result, T_INT);
+
+ __ append(new LIR_OpShenandoahCompareAndSwap(addr, cmp_value.result(), new_value.result(), t1, t2, result));
return result;
}
}
diff --git a/src/hotspot/cpu/x86/gc/shenandoah/shenandoah_x86_64.ad b/src/hotspot/cpu/x86/gc/shenandoah/shenandoah_x86_64.ad
index 40cdde133df..40387d0c0d1 100644
--- a/src/hotspot/cpu/x86/gc/shenandoah/shenandoah_x86_64.ad
+++ b/src/hotspot/cpu/x86/gc/shenandoah/shenandoah_x86_64.ad
@@ -83,7 +83,7 @@ instruct compareAndSwapP_shenandoah(rRegI res,
ShenandoahBarrierSet::assembler()->cmpxchg_oop(&_masm,
$res$$Register, $mem_ptr$$Address, $oldval$$Register, $newval$$Register,
false, // swap
- false, $tmp1$$Register, $tmp2$$Register
+ $tmp1$$Register, $tmp2$$Register
);
%}
ins_pipe( pipe_cmpxchg );
@@ -104,7 +104,7 @@ instruct compareAndSwapN_shenandoah(rRegI res,
ShenandoahBarrierSet::assembler()->cmpxchg_oop(&_masm,
$res$$Register, $mem_ptr$$Address, $oldval$$Register, $newval$$Register,
false, // swap
- false, $tmp1$$Register, $tmp2$$Register
+ $tmp1$$Register, $tmp2$$Register
);
%}
ins_pipe( pipe_cmpxchg );
@@ -123,7 +123,7 @@ instruct compareAndExchangeN_shenandoah(memory mem_ptr,
ShenandoahBarrierSet::assembler()->cmpxchg_oop(&_masm,
NULL, $mem_ptr$$Address, $oldval$$Register, $newval$$Register,
true, // exchange
- false, $tmp1$$Register, $tmp2$$Register
+ $tmp1$$Register, $tmp2$$Register
);
%}
ins_pipe( pipe_cmpxchg );
@@ -145,7 +145,7 @@ instruct compareAndExchangeP_shenandoah(memory mem_ptr,
ShenandoahBarrierSet::assembler()->cmpxchg_oop(&_masm,
NULL, $mem_ptr$$Address, $oldval$$Register, $newval$$Register,
true, // exchange
- false, $tmp1$$Register, $tmp2$$Register
+ $tmp1$$Register, $tmp2$$Register
);
%}
ins_pipe( pipe_cmpxchg );
diff --git a/src/hotspot/cpu/x86/gc/z/zBarrierSetAssembler_x86.cpp b/src/hotspot/cpu/x86/gc/z/zBarrierSetAssembler_x86.cpp
index 4901eeae6c7..69315758607 100644
--- a/src/hotspot/cpu/x86/gc/z/zBarrierSetAssembler_x86.cpp
+++ b/src/hotspot/cpu/x86/gc/z/zBarrierSetAssembler_x86.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -37,8 +37,9 @@
#include "gc/z/c1/zBarrierSetC1.hpp"
#endif // COMPILER1
-#undef __
-#define __ masm->
+ZBarrierSetAssembler::ZBarrierSetAssembler() :
+ _load_barrier_slow_stub(),
+ _load_barrier_weak_slow_stub() {}
#ifdef PRODUCT
#define BLOCK_COMMENT(str) /* nothing */
@@ -46,6 +47,9 @@
#define BLOCK_COMMENT(str) __ block_comment(str)
#endif
+#undef __
+#define __ masm->
+
static void call_vm(MacroAssembler* masm,
address entry_point,
Register arg0,
@@ -280,7 +284,7 @@ void ZBarrierSetAssembler::generate_c1_load_barrier_stub(LIR_Assembler* ce,
ref_addr = stub->ref_addr()->as_pointer_register();
} else {
// Load address into tmp register
- ce->leal(stub->ref_addr(), stub->tmp(), stub->patch_code(), stub->patch_info());
+ ce->leal(stub->ref_addr(), stub->tmp());
ref_addr = stub->tmp()->as_pointer_register();
}
@@ -357,7 +361,7 @@ static address generate_load_barrier_stub(StubCodeGenerator* cgen, Register radd
// Create stub name
char name[64];
const bool weak = (decorators & ON_WEAK_OOP_REF) != 0;
- os::snprintf(name, sizeof(name), "load_barrier%s_stub_%s", weak ? "_weak" : "", raddr->name());
+ os::snprintf(name, sizeof(name), "zgc_load_barrier%s_stub_%s", weak ? "_weak" : "", raddr->name());
__ align(CodeEntryAlignment);
StubCodeMark mark(cgen, "StubRoutines", os::strdup(name, mtCode));
@@ -393,7 +397,7 @@ static address generate_load_barrier_stub(StubCodeGenerator* cgen, Register radd
}
// Setup arguments
- if (c_rarg1 != raddr) {
+ if (raddr != c_rarg1) {
__ movq(c_rarg1, raddr);
}
__ movq(c_rarg0, Address(raddr, 0));
@@ -442,19 +446,30 @@ static address generate_load_barrier_stub(StubCodeGenerator* cgen, Register radd
#undef __
-void ZBarrierSetAssembler::barrier_stubs_init() {
- // Load barrier stubs
- int stub_code_size = 256 * 16; // Rough estimate of code size
+static void barrier_stubs_init_inner(const char* label, const DecoratorSet decorators, address* stub) {
+ const int nregs = RegisterImpl::number_of_registers;
+ const int code_size = nregs * 128; // Rough estimate of code size
ResourceMark rm;
- BufferBlob* bb = BufferBlob::create("zgc_load_barrier_stubs", stub_code_size);
- CodeBuffer buf(bb);
+
+ CodeBuffer buf(BufferBlob::create(label, code_size));
StubCodeGenerator cgen(&buf);
- Register rr = as_Register(0);
- for (int i = 0; i < RegisterImpl::number_of_registers; i++) {
- _load_barrier_slow_stub[i] = generate_load_barrier_stub(&cgen, rr, ON_STRONG_OOP_REF);
- _load_barrier_weak_slow_stub[i] = generate_load_barrier_stub(&cgen, rr, ON_WEAK_OOP_REF);
- rr = rr->successor();
+ for (int i = 0; i < nregs; i++) {
+ const Register reg = as_Register(i);
+ stub[i] = generate_load_barrier_stub(&cgen, reg, decorators);
}
}
+
+void ZBarrierSetAssembler::barrier_stubs_init() {
+ barrier_stubs_init_inner("zgc_load_barrier_stubs", ON_STRONG_OOP_REF, _load_barrier_slow_stub);
+ barrier_stubs_init_inner("zgc_load_barrier_weak_stubs", ON_WEAK_OOP_REF, _load_barrier_weak_slow_stub);
+}
+
+address ZBarrierSetAssembler::load_barrier_slow_stub(Register reg) {
+ return _load_barrier_slow_stub[reg->encoding()];
+}
+
+address ZBarrierSetAssembler::load_barrier_weak_slow_stub(Register reg) {
+ return _load_barrier_weak_slow_stub[reg->encoding()];
+}
diff --git a/src/hotspot/cpu/x86/gc/z/zBarrierSetAssembler_x86.hpp b/src/hotspot/cpu/x86/gc/z/zBarrierSetAssembler_x86.hpp
index 3687754e71a..1f5ec4042c4 100644
--- a/src/hotspot/cpu/x86/gc/z/zBarrierSetAssembler_x86.hpp
+++ b/src/hotspot/cpu/x86/gc/z/zBarrierSetAssembler_x86.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -33,16 +33,12 @@ class ZLoadBarrierStubC1;
#endif // COMPILER1
class ZBarrierSetAssembler : public ZBarrierSetAssemblerBase {
+private:
address _load_barrier_slow_stub[RegisterImpl::number_of_registers];
address _load_barrier_weak_slow_stub[RegisterImpl::number_of_registers];
public:
- ZBarrierSetAssembler() :
- _load_barrier_slow_stub(),
- _load_barrier_weak_slow_stub() {}
-
- address load_barrier_slow_stub(Register reg) { return _load_barrier_slow_stub[reg->encoding()]; }
- address load_barrier_weak_slow_stub(Register reg) { return _load_barrier_weak_slow_stub[reg->encoding()]; }
+ ZBarrierSetAssembler();
virtual void load_at(MacroAssembler* masm,
DecoratorSet decorators,
@@ -87,6 +83,9 @@ public:
#endif // COMPILER1
virtual void barrier_stubs_init();
+
+ address load_barrier_slow_stub(Register reg);
+ address load_barrier_weak_slow_stub(Register reg);
};
#endif // CPU_X86_GC_Z_ZBARRIERSETASSEMBLER_X86_HPP
diff --git a/src/hotspot/cpu/x86/globalDefinitions_x86.hpp b/src/hotspot/cpu/x86/globalDefinitions_x86.hpp
index 94d1ee20eca..f247d30d079 100644
--- a/src/hotspot/cpu/x86/globalDefinitions_x86.hpp
+++ b/src/hotspot/cpu/x86/globalDefinitions_x86.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1999, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1999, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
*
*/
-#ifndef CPU_X86_VM_GLOBALDEFINITIONS_X86_HPP
-#define CPU_X86_VM_GLOBALDEFINITIONS_X86_HPP
+#ifndef CPU_X86_GLOBALDEFINITIONS_X86_HPP
+#define CPU_X86_GLOBALDEFINITIONS_X86_HPP
const int StackAlignmentInBytes = 16;
@@ -67,4 +67,4 @@ const bool CCallingConventionRequiresIntsAsLongs = false;
#define THREAD_LOCAL_POLL
-#endif // CPU_X86_VM_GLOBALDEFINITIONS_X86_HPP
+#endif // CPU_X86_GLOBALDEFINITIONS_X86_HPP
diff --git a/src/hotspot/cpu/x86/globals_x86.hpp b/src/hotspot/cpu/x86/globals_x86.hpp
index 0918662f355..d859e1ae82d 100644
--- a/src/hotspot/cpu/x86/globals_x86.hpp
+++ b/src/hotspot/cpu/x86/globals_x86.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2000, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
*
*/
-#ifndef CPU_X86_VM_GLOBALS_X86_HPP
-#define CPU_X86_VM_GLOBALS_X86_HPP
+#ifndef CPU_X86_GLOBALS_X86_HPP
+#define CPU_X86_GLOBALS_X86_HPP
#include "utilities/globalDefinitions.hpp"
#include "utilities/macros.hpp"
@@ -215,4 +215,4 @@ define_pd_global(bool, ThreadLocalHandshakes, false);
\
diagnostic(bool, UseLibmIntrinsic, true, \
"Use Libm Intrinsics")
-#endif // CPU_X86_VM_GLOBALS_X86_HPP
+#endif // CPU_X86_GLOBALS_X86_HPP
diff --git a/src/hotspot/cpu/x86/icache_x86.hpp b/src/hotspot/cpu/x86/icache_x86.hpp
index 914158a6531..48286a7e3b3 100644
--- a/src/hotspot/cpu/x86/icache_x86.hpp
+++ b/src/hotspot/cpu/x86/icache_x86.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
*
*/
-#ifndef CPU_X86_VM_ICACHE_X86_HPP
-#define CPU_X86_VM_ICACHE_X86_HPP
+#ifndef CPU_X86_ICACHE_X86_HPP
+#define CPU_X86_ICACHE_X86_HPP
// Interface for updating the instruction cache. Whenever the VM modifies
// code, part of the processor instruction cache potentially has to be flushed.
@@ -57,4 +57,4 @@ class ICache : public AbstractICache {
#endif // AMD64
};
-#endif // CPU_X86_VM_ICACHE_X86_HPP
+#endif // CPU_X86_ICACHE_X86_HPP
diff --git a/src/hotspot/cpu/x86/interp_masm_x86.hpp b/src/hotspot/cpu/x86/interp_masm_x86.hpp
index ca50de919e9..9ec5c0fe368 100644
--- a/src/hotspot/cpu/x86/interp_masm_x86.hpp
+++ b/src/hotspot/cpu/x86/interp_masm_x86.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
*
*/
-#ifndef CPU_X86_VM_INTERP_MASM_X86_HPP
-#define CPU_X86_VM_INTERP_MASM_X86_HPP
+#ifndef CPU_X86_INTERP_MASM_X86_HPP
+#define CPU_X86_INTERP_MASM_X86_HPP
#include "asm/macroAssembler.hpp"
#include "interpreter/invocationCounter.hpp"
@@ -298,4 +298,4 @@ class InterpreterMacroAssembler: public MacroAssembler {
};
-#endif // CPU_X86_VM_INTERP_MASM_X86_HPP
+#endif // CPU_X86_INTERP_MASM_X86_HPP
diff --git a/src/hotspot/cpu/x86/interpreterRT_x86.hpp b/src/hotspot/cpu/x86/interpreterRT_x86.hpp
index f53e1e1995d..e914b4947a1 100644
--- a/src/hotspot/cpu/x86/interpreterRT_x86.hpp
+++ b/src/hotspot/cpu/x86/interpreterRT_x86.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
*
*/
-#ifndef CPU_X86_VM_INTERPRETERRT_X86_HPP
-#define CPU_X86_VM_INTERPRETERRT_X86_HPP
+#ifndef CPU_X86_INTERPRETERRT_X86_HPP
+#define CPU_X86_INTERPRETERRT_X86_HPP
// This is included in the middle of class Interpreter.
// Do not include files here.
@@ -67,4 +67,4 @@ class SignatureHandlerGenerator: public NativeSignatureIterator {
static Register temp();
};
-#endif // CPU_X86_VM_INTERPRETERRT_X86_HPP
+#endif // CPU_X86_INTERPRETERRT_X86_HPP
diff --git a/src/hotspot/cpu/x86/javaFrameAnchor_x86.hpp b/src/hotspot/cpu/x86/javaFrameAnchor_x86.hpp
index 40eedf019ae..785856e38f2 100644
--- a/src/hotspot/cpu/x86/javaFrameAnchor_x86.hpp
+++ b/src/hotspot/cpu/x86/javaFrameAnchor_x86.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2002, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
*
*/
-#ifndef CPU_X86_VM_JAVAFRAMEANCHOR_X86_HPP
-#define CPU_X86_VM_JAVAFRAMEANCHOR_X86_HPP
+#ifndef CPU_X86_JAVAFRAMEANCHOR_X86_HPP
+#define CPU_X86_JAVAFRAMEANCHOR_X86_HPP
private:
@@ -82,4 +82,4 @@ public:
// Assert (last_Java_sp == NULL || fp == NULL)
void set_last_Java_fp(intptr_t* fp) { _last_Java_fp = fp; }
-#endif // CPU_X86_VM_JAVAFRAMEANCHOR_X86_HPP
+#endif // CPU_X86_JAVAFRAMEANCHOR_X86_HPP
diff --git a/src/hotspot/cpu/x86/jniTypes_x86.hpp b/src/hotspot/cpu/x86/jniTypes_x86.hpp
index ad888dbf059..bc526d793bf 100644
--- a/src/hotspot/cpu/x86/jniTypes_x86.hpp
+++ b/src/hotspot/cpu/x86/jniTypes_x86.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
*
*/
-#ifndef CPU_X86_VM_JNITYPES_X86_HPP
-#define CPU_X86_VM_JNITYPES_X86_HPP
+#ifndef CPU_X86_JNITYPES_X86_HPP
+#define CPU_X86_JNITYPES_X86_HPP
#include "jni.h"
#include "memory/allocation.hpp"
@@ -130,4 +130,4 @@ public:
#undef _JNI_SLOT_OFFSET
};
-#endif // CPU_X86_VM_JNITYPES_X86_HPP
+#endif // CPU_X86_JNITYPES_X86_HPP
diff --git a/src/hotspot/cpu/x86/macroAssembler_x86.hpp b/src/hotspot/cpu/x86/macroAssembler_x86.hpp
index c60076e60f0..187dfe3477d 100644
--- a/src/hotspot/cpu/x86/macroAssembler_x86.hpp
+++ b/src/hotspot/cpu/x86/macroAssembler_x86.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
*
*/
-#ifndef CPU_X86_VM_MACROASSEMBLER_X86_HPP
-#define CPU_X86_VM_MACROASSEMBLER_X86_HPP
+#ifndef CPU_X86_MACROASSEMBLER_X86_HPP
+#define CPU_X86_MACROASSEMBLER_X86_HPP
#include "asm/assembler.hpp"
#include "utilities/macros.hpp"
@@ -1779,4 +1779,4 @@ class SkipIfEqual {
~SkipIfEqual();
};
-#endif // CPU_X86_VM_MACROASSEMBLER_X86_HPP
+#endif // CPU_X86_MACROASSEMBLER_X86_HPP
diff --git a/src/hotspot/cpu/x86/macroAssembler_x86.inline.hpp b/src/hotspot/cpu/x86/macroAssembler_x86.inline.hpp
index d23bdb40231..e94c2ad51b8 100644
--- a/src/hotspot/cpu/x86/macroAssembler_x86.inline.hpp
+++ b/src/hotspot/cpu/x86/macroAssembler_x86.inline.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -22,9 +22,9 @@
*
*/
-#ifndef CPU_X86_VM_MACROASSEMBLER_X86_INLINE_HPP
-#define CPU_X86_VM_MACROASSEMBLER_X86_INLINE_HPP
+#ifndef CPU_X86_MACROASSEMBLER_X86_INLINE_HPP
+#define CPU_X86_MACROASSEMBLER_X86_INLINE_HPP
// Still empty.
-#endif // CPU_X86_VM_MACROASSEMBLER_X86_INLINE_HPP
+#endif // CPU_X86_MACROASSEMBLER_X86_INLINE_HPP
diff --git a/src/hotspot/cpu/x86/nativeInst_x86.hpp b/src/hotspot/cpu/x86/nativeInst_x86.hpp
index f7a11c8d3a3..5bb455e4f22 100644
--- a/src/hotspot/cpu/x86/nativeInst_x86.hpp
+++ b/src/hotspot/cpu/x86/nativeInst_x86.hpp
@@ -22,8 +22,8 @@
*
*/
-#ifndef CPU_X86_VM_NATIVEINST_X86_HPP
-#define CPU_X86_VM_NATIVEINST_X86_HPP
+#ifndef CPU_X86_NATIVEINST_X86_HPP
+#define CPU_X86_NATIVEINST_X86_HPP
#include "asm/assembler.hpp"
#include "runtime/icache.hpp"
@@ -753,4 +753,4 @@ inline bool NativeInstruction::is_mov_literal64() {
#endif // AMD64
}
-#endif // CPU_X86_VM_NATIVEINST_X86_HPP
+#endif // CPU_X86_NATIVEINST_X86_HPP
diff --git a/src/hotspot/cpu/x86/rdtsc_x86.hpp b/src/hotspot/cpu/x86/rdtsc_x86.hpp
index c455c0018b6..f66997c9cfe 100644
--- a/src/hotspot/cpu/x86/rdtsc_x86.hpp
+++ b/src/hotspot/cpu/x86/rdtsc_x86.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
*
*/
-#ifndef CPU_X86_VM_RDTSC_X86_HPP
-#define CPU_X86_VM_RDTSC_X86_HPP
+#ifndef CPU_X86_RDTSC_X86_HPP
+#define CPU_X86_RDTSC_X86_HPP
#include "memory/allocation.hpp"
#include "utilities/macros.hpp"
@@ -47,4 +47,4 @@ class Rdtsc : AllStatic {
static bool initialize();
};
-#endif // CPU_X86_VM_RDTSC_X86_HPP
+#endif // CPU_X86_RDTSC_X86_HPP
diff --git a/src/hotspot/cpu/x86/registerMap_x86.hpp b/src/hotspot/cpu/x86/registerMap_x86.hpp
index 0cbf0646831..7806c5a71c0 100644
--- a/src/hotspot/cpu/x86/registerMap_x86.hpp
+++ b/src/hotspot/cpu/x86/registerMap_x86.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
*
*/
-#ifndef CPU_X86_VM_REGISTERMAP_X86_HPP
-#define CPU_X86_VM_REGISTERMAP_X86_HPP
+#ifndef CPU_X86_REGISTERMAP_X86_HPP
+#define CPU_X86_REGISTERMAP_X86_HPP
// machine-dependent implemention for register maps
friend class frame;
@@ -37,4 +37,4 @@
void pd_initialize() {}
void pd_initialize_from(const RegisterMap* map) {}
-#endif // CPU_X86_VM_REGISTERMAP_X86_HPP
+#endif // CPU_X86_REGISTERMAP_X86_HPP
diff --git a/src/hotspot/cpu/x86/register_x86.hpp b/src/hotspot/cpu/x86/register_x86.hpp
index f5c44964b96..8fa5d2d5ca6 100644
--- a/src/hotspot/cpu/x86/register_x86.hpp
+++ b/src/hotspot/cpu/x86/register_x86.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2000, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
*
*/
-#ifndef CPU_X86_VM_REGISTER_X86_HPP
-#define CPU_X86_VM_REGISTER_X86_HPP
+#ifndef CPU_X86_REGISTER_X86_HPP
+#define CPU_X86_REGISTER_X86_HPP
#include "asm/register.hpp"
@@ -291,4 +291,4 @@ class ConcreteRegisterImpl : public AbstractRegisterImpl {
};
-#endif // CPU_X86_VM_REGISTER_X86_HPP
+#endif // CPU_X86_REGISTER_X86_HPP
diff --git a/src/hotspot/cpu/x86/relocInfo_x86.hpp b/src/hotspot/cpu/x86/relocInfo_x86.hpp
index 714b405ac59..621bf7ae728 100644
--- a/src/hotspot/cpu/x86/relocInfo_x86.hpp
+++ b/src/hotspot/cpu/x86/relocInfo_x86.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
*
*/
-#ifndef CPU_X86_VM_RELOCINFO_X86_HPP
-#define CPU_X86_VM_RELOCINFO_X86_HPP
+#ifndef CPU_X86_RELOCINFO_X86_HPP
+#define CPU_X86_RELOCINFO_X86_HPP
// machine-dependent parts of class relocInfo
private:
@@ -46,4 +46,4 @@
// listed in the oop section.
static bool mustIterateImmediateOopsInCode() { return true; }
-#endif // CPU_X86_VM_RELOCINFO_X86_HPP
+#endif // CPU_X86_RELOCINFO_X86_HPP
diff --git a/src/hotspot/cpu/x86/stubRoutines_x86.hpp b/src/hotspot/cpu/x86/stubRoutines_x86.hpp
index 728b6f84c28..8c462c82c18 100644
--- a/src/hotspot/cpu/x86/stubRoutines_x86.hpp
+++ b/src/hotspot/cpu/x86/stubRoutines_x86.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2013, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
*
*/
-#ifndef CPU_X86_VM_STUBROUTINES_X86_HPP
-#define CPU_X86_VM_STUBROUTINES_X86_HPP
+#ifndef CPU_X86_STUBROUTINES_X86_HPP
+#define CPU_X86_STUBROUTINES_X86_HPP
// This file holds the platform specific parts of the StubRoutines
// definition. See stubRoutines.hpp for a description on how to
@@ -248,4 +248,4 @@ class x86 {
};
-#endif // CPU_X86_VM_STUBROUTINES_X86_HPP
+#endif // CPU_X86_STUBROUTINES_X86_HPP
diff --git a/src/hotspot/cpu/x86/templateTable_x86.hpp b/src/hotspot/cpu/x86/templateTable_x86.hpp
index b5b4a670ebc..73a0fdd12fd 100644
--- a/src/hotspot/cpu/x86/templateTable_x86.hpp
+++ b/src/hotspot/cpu/x86/templateTable_x86.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
*
*/
-#ifndef CPU_X86_VM_TEMPLATETABLE_X86_HPP
-#define CPU_X86_VM_TEMPLATETABLE_X86_HPP
+#ifndef CPU_X86_TEMPLATETABLE_X86_HPP
+#define CPU_X86_TEMPLATETABLE_X86_HPP
static void prepare_invoke(int byte_no,
Register method, // linked method (or i-klass)
@@ -43,4 +43,4 @@
Register obj, Register off, Register flags);
static void fast_storefield_helper(Address field, Register rax);
-#endif // CPU_X86_VM_TEMPLATETABLE_X86_HPP
+#endif // CPU_X86_TEMPLATETABLE_X86_HPP
diff --git a/src/hotspot/cpu/x86/vmStructs_x86.hpp b/src/hotspot/cpu/x86/vmStructs_x86.hpp
index 7fc5e451d08..13334f26a10 100644
--- a/src/hotspot/cpu/x86/vmStructs_x86.hpp
+++ b/src/hotspot/cpu/x86/vmStructs_x86.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2001, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
*
*/
-#ifndef CPU_X86_VM_VMSTRUCTS_X86_HPP
-#define CPU_X86_VM_VMSTRUCTS_X86_HPP
+#ifndef CPU_X86_VMSTRUCTS_X86_HPP
+#define CPU_X86_VMSTRUCTS_X86_HPP
// These are the CPU-specific fields, types and integer
// constants required by the Serviceability Agent. This file is
@@ -77,4 +77,4 @@
declare_preprocessor_constant("VM_Version::CPU_FMA", CPU_FMA) \
declare_preprocessor_constant("VM_Version::CPU_VZEROUPPER", CPU_VZEROUPPER)
-#endif // CPU_X86_VM_VMSTRUCTS_X86_HPP
+#endif // CPU_X86_VMSTRUCTS_X86_HPP
diff --git a/src/hotspot/cpu/x86/vm_version_ext_x86.hpp b/src/hotspot/cpu/x86/vm_version_ext_x86.hpp
index 78fb001cb39..02c9c338f4e 100644
--- a/src/hotspot/cpu/x86/vm_version_ext_x86.hpp
+++ b/src/hotspot/cpu/x86/vm_version_ext_x86.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2013, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
*
*/
-#ifndef CPU_X86_VM_VM_VERSION_EXT_X86_HPP
-#define CPU_X86_VM_VM_VERSION_EXT_X86_HPP
+#ifndef CPU_X86_VM_VERSION_EXT_X86_HPP
+#define CPU_X86_VM_VERSION_EXT_X86_HPP
#include "utilities/macros.hpp"
#include "vm_version_x86.hpp"
@@ -97,4 +97,4 @@ class VM_Version_Ext : public VM_Version {
static void initialize();
};
-#endif // CPU_X86_VM_VM_VERSION_EXT_X86_HPP
+#endif // CPU_X86_VM_VERSION_EXT_X86_HPP
diff --git a/src/hotspot/cpu/x86/vm_version_x86.hpp b/src/hotspot/cpu/x86/vm_version_x86.hpp
index e435ea53be6..ed5d8f03359 100644
--- a/src/hotspot/cpu/x86/vm_version_x86.hpp
+++ b/src/hotspot/cpu/x86/vm_version_x86.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
*
*/
-#ifndef CPU_X86_VM_VM_VERSION_X86_HPP
-#define CPU_X86_VM_VM_VERSION_X86_HPP
+#ifndef CPU_X86_VM_VERSION_X86_HPP
+#define CPU_X86_VM_VERSION_X86_HPP
#include "runtime/globals_extension.hpp"
#include "runtime/vm_version.hpp"
@@ -932,4 +932,4 @@ public:
static bool supports_on_spin_wait() { return supports_sse2(); }
};
-#endif // CPU_X86_VM_VM_VERSION_X86_HPP
+#endif // CPU_X86_VM_VERSION_X86_HPP
diff --git a/src/hotspot/cpu/x86/vmreg_x86.hpp b/src/hotspot/cpu/x86/vmreg_x86.hpp
index b382110d2a5..200a59bef18 100644
--- a/src/hotspot/cpu/x86/vmreg_x86.hpp
+++ b/src/hotspot/cpu/x86/vmreg_x86.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2006, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2006, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
*
*/
-#ifndef CPU_X86_VM_VMREG_X86_HPP
-#define CPU_X86_VM_VMREG_X86_HPP
+#ifndef CPU_X86_VMREG_X86_HPP
+#define CPU_X86_VMREG_X86_HPP
@@ -93,4 +93,4 @@ inline bool is_concrete() {
return is_even(value());
}
-#endif // CPU_X86_VM_VMREG_X86_HPP
+#endif // CPU_X86_VMREG_X86_HPP
diff --git a/src/hotspot/cpu/x86/vmreg_x86.inline.hpp b/src/hotspot/cpu/x86/vmreg_x86.inline.hpp
index bad5235c35d..31bf814a7f4 100644
--- a/src/hotspot/cpu/x86/vmreg_x86.inline.hpp
+++ b/src/hotspot/cpu/x86/vmreg_x86.inline.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2006, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2006, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
*
*/
-#ifndef CPU_X86_VM_VMREG_X86_INLINE_HPP
-#define CPU_X86_VM_VMREG_X86_INLINE_HPP
+#ifndef CPU_X86_VMREG_X86_INLINE_HPP
+#define CPU_X86_VMREG_X86_INLINE_HPP
inline VMReg RegisterImpl::as_VMReg() {
if( this==noreg ) return VMRegImpl::Bad();
@@ -46,4 +46,4 @@ inline VMReg KRegisterImpl::as_VMReg() {
return VMRegImpl::as_VMReg(encoding() + ConcreteRegisterImpl::max_xmm);
}
-#endif // CPU_X86_VM_VMREG_X86_INLINE_HPP
+#endif // CPU_X86_VMREG_X86_INLINE_HPP
diff --git a/src/hotspot/cpu/x86/x86.ad b/src/hotspot/cpu/x86/x86.ad
index 0850bec9a45..328f0b9bfde 100644
--- a/src/hotspot/cpu/x86/x86.ad
+++ b/src/hotspot/cpu/x86/x86.ad
@@ -1638,6 +1638,7 @@ bool Matcher::clone_address_expressions(AddPNode* m, Matcher::MStack& mstack, Ve
// Cheap to find it by looking for screwy base.
if (adr->is_AddP() &&
!adr->in(AddPNode::Base)->is_top() &&
+ LP64_ONLY( off->get_long() == (int) (off->get_long()) && ) // immL32
// Are there other uses besides address expressions?
!is_visited(adr)) {
address_visited.set(adr->_idx); // Flag as address_visited
@@ -9936,6 +9937,7 @@ instruct vmuladdadd4S2I_reg(vecD dst, vecD src1, vecD src2) %{
__ evpdpwssd($dst$$XMMRegister, $src1$$XMMRegister, $src2$$XMMRegister, vector_len);
%}
ins_pipe( pipe_slow );
+ ins_cost(10);
%}
instruct vmuladdadd8S4I_reg(vecX dst, vecX src1, vecX src2) %{
@@ -9947,6 +9949,7 @@ instruct vmuladdadd8S4I_reg(vecX dst, vecX src1, vecX src2) %{
__ evpdpwssd($dst$$XMMRegister, $src1$$XMMRegister, $src2$$XMMRegister, vector_len);
%}
ins_pipe( pipe_slow );
+ ins_cost(10);
%}
instruct vmuladdadd16S8I_reg(vecY dst, vecY src1, vecY src2) %{
@@ -9958,6 +9961,7 @@ instruct vmuladdadd16S8I_reg(vecY dst, vecY src1, vecY src2) %{
__ evpdpwssd($dst$$XMMRegister, $src1$$XMMRegister, $src2$$XMMRegister, vector_len);
%}
ins_pipe( pipe_slow );
+ ins_cost(10);
%}
instruct vmuladdadd32S16I_reg(vecZ dst, vecZ src1, vecZ src2) %{
@@ -9969,6 +9973,7 @@ instruct vmuladdadd32S16I_reg(vecZ dst, vecZ src1, vecZ src2) %{
__ evpdpwssd($dst$$XMMRegister, $src1$$XMMRegister, $src2$$XMMRegister, vector_len);
%}
ins_pipe( pipe_slow );
+ ins_cost(10);
%}
// --------------------------------- PopCount --------------------------------------
diff --git a/src/hotspot/cpu/zero/assembler_zero.hpp b/src/hotspot/cpu/zero/assembler_zero.hpp
index 898ae66f2c6..a9e7b9f150c 100644
--- a/src/hotspot/cpu/zero/assembler_zero.hpp
+++ b/src/hotspot/cpu/zero/assembler_zero.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2019, Oracle and/or its affiliates. All rights reserved.
* Copyright 2007, 2008, 2009 Red Hat, Inc.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
@@ -23,8 +23,8 @@
*
*/
-#ifndef CPU_ZERO_VM_ASSEMBLER_ZERO_HPP
-#define CPU_ZERO_VM_ASSEMBLER_ZERO_HPP
+#ifndef CPU_ZERO_ASSEMBLER_ZERO_HPP
+#define CPU_ZERO_ASSEMBLER_ZERO_HPP
// In normal, CPU-specific ports of HotSpot these two classes are used
// for generating assembly language. We don't do any of this in zero,
@@ -59,4 +59,4 @@ class MacroAssembler : public Assembler {
address ShouldNotCallThisStub();
address ShouldNotCallThisEntry();
-#endif // CPU_ZERO_VM_ASSEMBLER_ZERO_HPP
+#endif // CPU_ZERO_ASSEMBLER_ZERO_HPP
diff --git a/src/hotspot/cpu/zero/assembler_zero.inline.hpp b/src/hotspot/cpu/zero/assembler_zero.inline.hpp
index 274ded2a097..0a3f4fc25fa 100644
--- a/src/hotspot/cpu/zero/assembler_zero.inline.hpp
+++ b/src/hotspot/cpu/zero/assembler_zero.inline.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2019, Oracle and/or its affiliates. All rights reserved.
* Copyright 2009 Red Hat, Inc.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
@@ -23,8 +23,8 @@
*
*/
-#ifndef CPU_ZERO_VM_ASSEMBLER_ZERO_INLINE_HPP
-#define CPU_ZERO_VM_ASSEMBLER_ZERO_INLINE_HPP
+#ifndef CPU_ZERO_ASSEMBLER_ZERO_INLINE_HPP
+#define CPU_ZERO_ASSEMBLER_ZERO_INLINE_HPP
#include "asm/assembler.inline.hpp"
#include "asm/codeBuffer.hpp"
@@ -33,4 +33,4 @@
// This file is intentionally empty
-#endif // CPU_ZERO_VM_ASSEMBLER_ZERO_INLINE_HPP
+#endif // CPU_ZERO_ASSEMBLER_ZERO_INLINE_HPP
diff --git a/src/hotspot/cpu/zero/bytecodeInterpreter_zero.hpp b/src/hotspot/cpu/zero/bytecodeInterpreter_zero.hpp
index e7ef4c1a26e..7ba2625fcb3 100644
--- a/src/hotspot/cpu/zero/bytecodeInterpreter_zero.hpp
+++ b/src/hotspot/cpu/zero/bytecodeInterpreter_zero.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2002, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2019, Oracle and/or its affiliates. All rights reserved.
* Copyright 2007, 2008, 2011 Red Hat, Inc.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
@@ -23,8 +23,8 @@
*
*/
-#ifndef CPU_ZERO_VM_BYTECODEINTERPRETER_ZERO_HPP
-#define CPU_ZERO_VM_BYTECODEINTERPRETER_ZERO_HPP
+#ifndef CPU_ZERO_BYTECODEINTERPRETER_ZERO_HPP
+#define CPU_ZERO_BYTECODEINTERPRETER_ZERO_HPP
// Platform specific for C++ based Interpreter
@@ -171,4 +171,4 @@
#define SET_VMSLOTS_DOUBLE(value, offset) (((VMJavaVal64*)&vmslots[(offset) - 1])->d = (value))
#define SET_VMSLOTS_LONG(value, offset) (((VMJavaVal64*)&vmslots[(offset) - 1])->l = (value))
-#endif // CPU_ZERO_VM_BYTECODEINTERPRETER_ZERO_HPP
+#endif // CPU_ZERO_BYTECODEINTERPRETER_ZERO_HPP
diff --git a/src/hotspot/cpu/zero/bytecodeInterpreter_zero.inline.hpp b/src/hotspot/cpu/zero/bytecodeInterpreter_zero.inline.hpp
index 6a32ea6a39f..4d813cd53c6 100644
--- a/src/hotspot/cpu/zero/bytecodeInterpreter_zero.inline.hpp
+++ b/src/hotspot/cpu/zero/bytecodeInterpreter_zero.inline.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2002, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2019, Oracle and/or its affiliates. All rights reserved.
* Copyright 2007, 2010 Red Hat, Inc.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
@@ -23,8 +23,8 @@
*
*/
-#ifndef CPU_ZERO_VM_BYTECODEINTERPRETER_ZERO_INLINE_HPP
-#define CPU_ZERO_VM_BYTECODEINTERPRETER_ZERO_INLINE_HPP
+#ifndef CPU_ZERO_BYTECODEINTERPRETER_ZERO_INLINE_HPP
+#define CPU_ZERO_BYTECODEINTERPRETER_ZERO_INLINE_HPP
// Inline interpreter functions for zero
@@ -303,4 +303,4 @@ inline jbyte BytecodeInterpreter::VMint2Byte(jint val) {
return (jbyte) val;
}
-#endif // CPU_ZERO_VM_BYTECODEINTERPRETER_ZERO_INLINE_HPP
+#endif // CPU_ZERO_BYTECODEINTERPRETER_ZERO_INLINE_HPP
diff --git a/src/hotspot/cpu/zero/bytes_zero.hpp b/src/hotspot/cpu/zero/bytes_zero.hpp
index 9b56c01e586..c78289184ab 100644
--- a/src/hotspot/cpu/zero/bytes_zero.hpp
+++ b/src/hotspot/cpu/zero/bytes_zero.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2019, Oracle and/or its affiliates. All rights reserved.
* Copyright 2007, 2008, 2009 Red Hat, Inc.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
@@ -23,8 +23,8 @@
*
*/
-#ifndef CPU_ZERO_VM_BYTES_ZERO_HPP
-#define CPU_ZERO_VM_BYTES_ZERO_HPP
+#ifndef CPU_ZERO_BYTES_ZERO_HPP
+#define CPU_ZERO_BYTES_ZERO_HPP
#include "memory/allocation.hpp"
@@ -160,4 +160,4 @@ class Bytes: AllStatic {
#endif // VM_LITTLE_ENDIAN
-#endif // CPU_ZERO_VM_BYTES_ZERO_HPP
+#endif // CPU_ZERO_BYTES_ZERO_HPP
diff --git a/src/hotspot/cpu/zero/codeBuffer_zero.hpp b/src/hotspot/cpu/zero/codeBuffer_zero.hpp
index 7837f9a239c..f35294be0c1 100644
--- a/src/hotspot/cpu/zero/codeBuffer_zero.hpp
+++ b/src/hotspot/cpu/zero/codeBuffer_zero.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2003, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2019, Oracle and/or its affiliates. All rights reserved.
* Copyright 2007 Red Hat, Inc.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
@@ -23,10 +23,10 @@
*
*/
-#ifndef CPU_ZERO_VM_CODEBUFFER_ZERO_HPP
-#define CPU_ZERO_VM_CODEBUFFER_ZERO_HPP
+#ifndef CPU_ZERO_CODEBUFFER_ZERO_HPP
+#define CPU_ZERO_CODEBUFFER_ZERO_HPP
private:
void pd_initialize() {}
-#endif // CPU_ZERO_VM_CODEBUFFER_ZERO_HPP
+#endif // CPU_ZERO_CODEBUFFER_ZERO_HPP
diff --git a/src/hotspot/cpu/zero/copy_zero.hpp b/src/hotspot/cpu/zero/copy_zero.hpp
index 7c7e179c7cb..e45e598f74c 100644
--- a/src/hotspot/cpu/zero/copy_zero.hpp
+++ b/src/hotspot/cpu/zero/copy_zero.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2003, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2019, Oracle and/or its affiliates. All rights reserved.
* Copyright 2007 Red Hat, Inc.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
@@ -23,8 +23,8 @@
*
*/
-#ifndef CPU_ZERO_VM_COPY_ZERO_HPP
-#define CPU_ZERO_VM_COPY_ZERO_HPP
+#ifndef CPU_ZERO_COPY_ZERO_HPP
+#define CPU_ZERO_COPY_ZERO_HPP
// Inline functions for memory copy and fill.
@@ -180,4 +180,4 @@ static void pd_zero_to_bytes(void* to, size_t count) {
memset(to, 0, count);
}
-#endif // CPU_ZERO_VM_COPY_ZERO_HPP
+#endif // CPU_ZERO_COPY_ZERO_HPP
diff --git a/src/hotspot/cpu/zero/cppInterpreter_zero.hpp b/src/hotspot/cpu/zero/cppInterpreter_zero.hpp
index 9c0a2a01091..40811cacdf0 100644
--- a/src/hotspot/cpu/zero/cppInterpreter_zero.hpp
+++ b/src/hotspot/cpu/zero/cppInterpreter_zero.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2019, Oracle and/or its affiliates. All rights reserved.
* Copyright 2007, 2008, 2010, 2011 Red Hat, Inc.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
@@ -23,8 +23,8 @@
*
*/
-#ifndef CPU_ZERO_VM_CPPINTERPRETER_ZERO_HPP
-#define CPU_ZERO_VM_CPPINTERPRETER_ZERO_HPP
+#ifndef CPU_ZERO_CPPINTERPRETER_ZERO_HPP
+#define CPU_ZERO_CPPINTERPRETER_ZERO_HPP
protected:
// Size of interpreter code
@@ -49,4 +49,4 @@
static intptr_t* calculate_unwind_sp(ZeroStack* stack, oop method_handle);
static void throw_exception(JavaThread* thread, Symbol* name,char *msg=NULL);
-#endif // CPU_ZERO_VM_CPPINTERPRETER_ZERO_HPP
+#endif // CPU_ZERO_CPPINTERPRETER_ZERO_HPP
diff --git a/src/hotspot/cpu/zero/depChecker_zero.hpp b/src/hotspot/cpu/zero/depChecker_zero.hpp
index cf5a401c4a8..602bd64ba43 100644
--- a/src/hotspot/cpu/zero/depChecker_zero.hpp
+++ b/src/hotspot/cpu/zero/depChecker_zero.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2019, Oracle and/or its affiliates. All rights reserved.
* Copyright 2009 Red Hat, Inc.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
@@ -23,9 +23,9 @@
*
*/
-#ifndef CPU_ZERO_VM_DEPCHECKER_ZERO_HPP
-#define CPU_ZERO_VM_DEPCHECKER_ZERO_HPP
+#ifndef CPU_ZERO_DEPCHECKER_ZERO_HPP
+#define CPU_ZERO_DEPCHECKER_ZERO_HPP
// This file is intentionally empty
-#endif // CPU_ZERO_VM_DEPCHECKER_ZERO_HPP
+#endif // CPU_ZERO_DEPCHECKER_ZERO_HPP
diff --git a/src/hotspot/cpu/zero/disassembler_zero.hpp b/src/hotspot/cpu/zero/disassembler_zero.hpp
index 889b91330e6..ed2af04af19 100644
--- a/src/hotspot/cpu/zero/disassembler_zero.hpp
+++ b/src/hotspot/cpu/zero/disassembler_zero.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2003, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2019, Oracle and/or its affiliates. All rights reserved.
* Copyright 2007, 2010 Red Hat, Inc.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
@@ -23,8 +23,8 @@
*
*/
-#ifndef CPU_ZERO_VM_DISASSEMBLER_ZERO_HPP
-#define CPU_ZERO_VM_DISASSEMBLER_ZERO_HPP
+#ifndef CPU_ZERO_DISASSEMBLER_ZERO_HPP
+#define CPU_ZERO_DISASSEMBLER_ZERO_HPP
static int pd_instruction_alignment() {
return 1;
@@ -34,4 +34,4 @@
return "";
}
-#endif // CPU_ZERO_VM_DISASSEMBLER_ZERO_HPP
+#endif // CPU_ZERO_DISASSEMBLER_ZERO_HPP
diff --git a/src/hotspot/cpu/zero/entryFrame_zero.hpp b/src/hotspot/cpu/zero/entryFrame_zero.hpp
index 5c6be60bab4..fea7d98105b 100644
--- a/src/hotspot/cpu/zero/entryFrame_zero.hpp
+++ b/src/hotspot/cpu/zero/entryFrame_zero.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2003, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2019, Oracle and/or its affiliates. All rights reserved.
* Copyright 2008, 2010 Red Hat, Inc.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
@@ -23,8 +23,8 @@
*
*/
-#ifndef CPU_ZERO_VM_ENTRYFRAME_ZERO_HPP
-#define CPU_ZERO_VM_ENTRYFRAME_ZERO_HPP
+#ifndef CPU_ZERO_ENTRYFRAME_ZERO_HPP
+#define CPU_ZERO_ENTRYFRAME_ZERO_HPP
#include "runtime/javaCalls.hpp"
#include "stack_zero.hpp"
@@ -70,4 +70,4 @@ class EntryFrame : public ZeroFrame {
int buflen) const;
};
-#endif // CPU_ZERO_VM_ENTRYFRAME_ZERO_HPP
+#endif // CPU_ZERO_ENTRYFRAME_ZERO_HPP
diff --git a/src/hotspot/cpu/zero/entry_zero.hpp b/src/hotspot/cpu/zero/entry_zero.hpp
index afef3d82476..ad14a96822b 100644
--- a/src/hotspot/cpu/zero/entry_zero.hpp
+++ b/src/hotspot/cpu/zero/entry_zero.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2003, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2019, Oracle and/or its affiliates. All rights reserved.
* Copyright 2008, 2009, 2010 Red Hat, Inc.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
@@ -23,8 +23,8 @@
*
*/
-#ifndef CPU_ZERO_VM_ENTRY_ZERO_HPP
-#define CPU_ZERO_VM_ENTRY_ZERO_HPP
+#ifndef CPU_ZERO_ENTRY_ZERO_HPP
+#define CPU_ZERO_ENTRY_ZERO_HPP
#include "interpreter/cppInterpreter.hpp"
@@ -78,4 +78,4 @@ class ZeroEntry {
}
};
-#endif // CPU_ZERO_VM_ENTRY_ZERO_HPP
+#endif // CPU_ZERO_ENTRY_ZERO_HPP
diff --git a/src/hotspot/cpu/zero/fakeStubFrame_zero.hpp b/src/hotspot/cpu/zero/fakeStubFrame_zero.hpp
index b7a3b01ca80..2b72fe112a5 100644
--- a/src/hotspot/cpu/zero/fakeStubFrame_zero.hpp
+++ b/src/hotspot/cpu/zero/fakeStubFrame_zero.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2003, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2019, Oracle and/or its affiliates. All rights reserved.
* Copyright 2008, 2010 Red Hat, Inc.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
@@ -23,8 +23,8 @@
*
*/
-#ifndef CPU_ZERO_VM_FAKESTUBFRAME_ZERO_HPP
-#define CPU_ZERO_VM_FAKESTUBFRAME_ZERO_HPP
+#ifndef CPU_ZERO_FAKESTUBFRAME_ZERO_HPP
+#define CPU_ZERO_FAKESTUBFRAME_ZERO_HPP
#include "stack_zero.hpp"
@@ -57,4 +57,4 @@ class FakeStubFrame : public ZeroFrame {
int buflen) const {}
};
-#endif // CPU_ZERO_VM_FAKESTUBFRAME_ZERO_HPP
+#endif // CPU_ZERO_FAKESTUBFRAME_ZERO_HPP
diff --git a/src/hotspot/cpu/zero/frame_zero.hpp b/src/hotspot/cpu/zero/frame_zero.hpp
index e957f4f4e09..375bc032424 100644
--- a/src/hotspot/cpu/zero/frame_zero.hpp
+++ b/src/hotspot/cpu/zero/frame_zero.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2003, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2019, Oracle and/or its affiliates. All rights reserved.
* Copyright 2007, 2008, 2009, 2010 Red Hat, Inc.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
@@ -23,8 +23,8 @@
*
*/
-#ifndef CPU_ZERO_VM_FRAME_ZERO_HPP
-#define CPU_ZERO_VM_FRAME_ZERO_HPP
+#ifndef CPU_ZERO_FRAME_ZERO_HPP
+#define CPU_ZERO_FRAME_ZERO_HPP
#include "runtime/synchronizer.hpp"
@@ -77,4 +77,4 @@
static jint interpreter_frame_expression_stack_direction() { return -1; }
-#endif // CPU_ZERO_VM_FRAME_ZERO_HPP
+#endif // CPU_ZERO_FRAME_ZERO_HPP
diff --git a/src/hotspot/cpu/zero/frame_zero.inline.hpp b/src/hotspot/cpu/zero/frame_zero.inline.hpp
index a7540dea7fe..598d6c1cc04 100644
--- a/src/hotspot/cpu/zero/frame_zero.inline.hpp
+++ b/src/hotspot/cpu/zero/frame_zero.inline.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2003, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2019, Oracle and/or its affiliates. All rights reserved.
* Copyright 2007, 2008, 2009, 2010 Red Hat, Inc.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
@@ -23,8 +23,8 @@
*
*/
-#ifndef CPU_ZERO_VM_FRAME_ZERO_INLINE_HPP
-#define CPU_ZERO_VM_FRAME_ZERO_INLINE_HPP
+#ifndef CPU_ZERO_FRAME_ZERO_INLINE_HPP
+#define CPU_ZERO_FRAME_ZERO_INLINE_HPP
#include "code/codeCache.hpp"
@@ -164,4 +164,4 @@ inline intptr_t* frame::unextended_sp() const {
return (intptr_t *) -1;
}
-#endif // CPU_ZERO_VM_FRAME_ZERO_INLINE_HPP
+#endif // CPU_ZERO_FRAME_ZERO_INLINE_HPP
diff --git a/src/hotspot/cpu/zero/globalDefinitions_zero.hpp b/src/hotspot/cpu/zero/globalDefinitions_zero.hpp
index 2591f49a902..f441b91354a 100644
--- a/src/hotspot/cpu/zero/globalDefinitions_zero.hpp
+++ b/src/hotspot/cpu/zero/globalDefinitions_zero.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2019, Oracle and/or its affiliates. All rights reserved.
* Copyright 2009, 2015, Red Hat, Inc.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
@@ -23,8 +23,8 @@
*
*/
-#ifndef CPU_ZERO_VM_GLOBALDEFINITIONS_ZERO_HPP
-#define CPU_ZERO_VM_GLOBALDEFINITIONS_ZERO_HPP
+#ifndef CPU_ZERO_GLOBALDEFINITIONS_ZERO_HPP
+#define CPU_ZERO_GLOBALDEFINITIONS_ZERO_HPP
#ifdef _LP64
#define SUPPORTS_NATIVE_CX8
@@ -36,4 +36,4 @@
// 32-bit integer argument values are extended to 64 bits.
const bool CCallingConventionRequiresIntsAsLongs = false;
-#endif // CPU_ZERO_VM_GLOBALDEFINITIONS_ZERO_HPP
+#endif // CPU_ZERO_GLOBALDEFINITIONS_ZERO_HPP
diff --git a/src/hotspot/cpu/zero/globals_zero.hpp b/src/hotspot/cpu/zero/globals_zero.hpp
index f30a2565de1..69a6dd5ddf9 100644
--- a/src/hotspot/cpu/zero/globals_zero.hpp
+++ b/src/hotspot/cpu/zero/globals_zero.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2000, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2019, Oracle and/or its affiliates. All rights reserved.
* Copyright 2007, 2008, 2009, 2010, 2011 Red Hat, Inc.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
@@ -23,8 +23,8 @@
*
*/
-#ifndef CPU_ZERO_VM_GLOBALS_ZERO_HPP
-#define CPU_ZERO_VM_GLOBALS_ZERO_HPP
+#ifndef CPU_ZERO_GLOBALS_ZERO_HPP
+#define CPU_ZERO_GLOBALS_ZERO_HPP
#include "utilities/globalDefinitions.hpp"
#include "utilities/macros.hpp"
@@ -97,4 +97,4 @@ define_pd_global(bool, ThreadLocalHandshakes, false);
"Use fast method entry code for accessor methods") \
\
-#endif // CPU_ZERO_VM_GLOBALS_ZERO_HPP
+#endif // CPU_ZERO_GLOBALS_ZERO_HPP
diff --git a/src/hotspot/cpu/zero/icache_zero.hpp b/src/hotspot/cpu/zero/icache_zero.hpp
index eefe552f78d..b40e07d5e3b 100644
--- a/src/hotspot/cpu/zero/icache_zero.hpp
+++ b/src/hotspot/cpu/zero/icache_zero.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2003, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2019, Oracle and/or its affiliates. All rights reserved.
* Copyright 2007, 2009 Red Hat, Inc.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
@@ -23,8 +23,8 @@
*
*/
-#ifndef CPU_ZERO_VM_ICACHE_ZERO_HPP
-#define CPU_ZERO_VM_ICACHE_ZERO_HPP
+#ifndef CPU_ZERO_ICACHE_ZERO_HPP
+#define CPU_ZERO_ICACHE_ZERO_HPP
// Interface for updating the instruction cache. Whenever the VM
// modifies code, part of the processor instruction cache potentially
@@ -38,4 +38,4 @@ class ICache : public AbstractICache {
static void invalidate_range(address start, int nbytes) {}
};
-#endif // CPU_ZERO_VM_ICACHE_ZERO_HPP
+#endif // CPU_ZERO_ICACHE_ZERO_HPP
diff --git a/src/hotspot/cpu/zero/interp_masm_zero.hpp b/src/hotspot/cpu/zero/interp_masm_zero.hpp
index 296bdb68a36..5d8aa9a3bdc 100644
--- a/src/hotspot/cpu/zero/interp_masm_zero.hpp
+++ b/src/hotspot/cpu/zero/interp_masm_zero.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2003, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2019, Oracle and/or its affiliates. All rights reserved.
* Copyright 2007 Red Hat, Inc.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
@@ -23,8 +23,8 @@
*
*/
-#ifndef CPU_ZERO_VM_INTERP_MASM_ZERO_HPP
-#define CPU_ZERO_VM_INTERP_MASM_ZERO_HPP
+#ifndef CPU_ZERO_INTERP_MASM_ZERO_HPP
+#define CPU_ZERO_INTERP_MASM_ZERO_HPP
#include "asm/codeBuffer.hpp"
#include "asm/macroAssembler.hpp"
@@ -45,4 +45,4 @@ class InterpreterMacroAssembler : public MacroAssembler {
}
};
-#endif // CPU_ZERO_VM_INTERP_MASM_ZERO_HPP
+#endif // CPU_ZERO_INTERP_MASM_ZERO_HPP
diff --git a/src/hotspot/cpu/zero/interpreterFrame_zero.hpp b/src/hotspot/cpu/zero/interpreterFrame_zero.hpp
index 1cb658d18a3..cd32fd3bac2 100644
--- a/src/hotspot/cpu/zero/interpreterFrame_zero.hpp
+++ b/src/hotspot/cpu/zero/interpreterFrame_zero.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2003, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2019, Oracle and/or its affiliates. All rights reserved.
* Copyright 2008, 2010 Red Hat, Inc.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
@@ -23,8 +23,8 @@
*
*/
-#ifndef CPU_ZERO_VM_INTERPRETERFRAME_ZERO_HPP
-#define CPU_ZERO_VM_INTERPRETERFRAME_ZERO_HPP
+#ifndef CPU_ZERO_INTERPRETERFRAME_ZERO_HPP
+#define CPU_ZERO_INTERPRETERFRAME_ZERO_HPP
#include "interpreter/bytecodeInterpreter.hpp"
#include "oops/method.hpp"
@@ -81,4 +81,4 @@ class InterpreterFrame : public ZeroFrame {
};
#endif // CC_INTERP
-#endif // CPU_ZERO_VM_INTERPRETERFRAME_ZERO_HPP
+#endif // CPU_ZERO_INTERPRETERFRAME_ZERO_HPP
diff --git a/src/hotspot/cpu/zero/interpreterRT_zero.hpp b/src/hotspot/cpu/zero/interpreterRT_zero.hpp
index 2637522693b..b9bf4e4ffcd 100644
--- a/src/hotspot/cpu/zero/interpreterRT_zero.hpp
+++ b/src/hotspot/cpu/zero/interpreterRT_zero.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2003, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2019, Oracle and/or its affiliates. All rights reserved.
* Copyright 2007, 2008 Red Hat, Inc.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
@@ -23,8 +23,8 @@
*
*/
-#ifndef CPU_ZERO_VM_INTERPRETERRT_ZERO_HPP
-#define CPU_ZERO_VM_INTERPRETERRT_ZERO_HPP
+#ifndef CPU_ZERO_INTERPRETERRT_ZERO_HPP
+#define CPU_ZERO_INTERPRETERRT_ZERO_HPP
// This is included in the middle of class Interpreter.
// Do not include files here.
@@ -133,4 +133,4 @@ class SlowSignatureHandlerGenerator : public SignatureHandlerGeneratorBase {
}
};
-#endif // CPU_ZERO_VM_INTERPRETERRT_ZERO_HPP
+#endif // CPU_ZERO_INTERPRETERRT_ZERO_HPP
diff --git a/src/hotspot/cpu/zero/javaFrameAnchor_zero.hpp b/src/hotspot/cpu/zero/javaFrameAnchor_zero.hpp
index 275fcf53dca..43754afce02 100644
--- a/src/hotspot/cpu/zero/javaFrameAnchor_zero.hpp
+++ b/src/hotspot/cpu/zero/javaFrameAnchor_zero.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2003, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2019, Oracle and/or its affiliates. All rights reserved.
* Copyright 2007, 2008, 2010 Red Hat, Inc.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
@@ -23,8 +23,8 @@
*
*/
-#ifndef CPU_ZERO_VM_JAVAFRAMEANCHOR_ZERO_HPP
-#define CPU_ZERO_VM_JAVAFRAMEANCHOR_ZERO_HPP
+#ifndef CPU_ZERO_JAVAFRAMEANCHOR_ZERO_HPP
+#define CPU_ZERO_JAVAFRAMEANCHOR_ZERO_HPP
private:
ZeroFrame* volatile _last_Java_fp;
@@ -93,4 +93,4 @@
return byte_offset_of(JavaFrameAnchor, _last_Java_fp);
}
-#endif // CPU_ZERO_VM_JAVAFRAMEANCHOR_ZERO_HPP
+#endif // CPU_ZERO_JAVAFRAMEANCHOR_ZERO_HPP
diff --git a/src/hotspot/cpu/zero/jniTypes_zero.hpp b/src/hotspot/cpu/zero/jniTypes_zero.hpp
index ae464c77aae..c184901983b 100644
--- a/src/hotspot/cpu/zero/jniTypes_zero.hpp
+++ b/src/hotspot/cpu/zero/jniTypes_zero.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
*
*/
-#ifndef CPU_ZERO_VM_JNITYPES_ZERO_HPP
-#define CPU_ZERO_VM_JNITYPES_ZERO_HPP
+#ifndef CPU_ZERO_JNITYPES_ZERO_HPP
+#define CPU_ZERO_JNITYPES_ZERO_HPP
#include "jni.h"
#include "memory/allocation.hpp"
@@ -114,4 +114,4 @@ public:
};
-#endif // CPU_ZERO_VM_JNITYPES_ZERO_HPP
+#endif // CPU_ZERO_JNITYPES_ZERO_HPP
diff --git a/src/hotspot/cpu/zero/macroAssembler_zero.hpp b/src/hotspot/cpu/zero/macroAssembler_zero.hpp
index 3477989faab..82a0e050f92 100644
--- a/src/hotspot/cpu/zero/macroAssembler_zero.hpp
+++ b/src/hotspot/cpu/zero/macroAssembler_zero.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -22,9 +22,9 @@
*
*/
-#ifndef CPU_ZERO_VM_MACROASSEMBLER_ZERO_HPP
-#define CPU_ZERO_VM_MACROASSEMBLER_ZERO_HPP
+#ifndef CPU_ZERO_MACROASSEMBLER_ZERO_HPP
+#define CPU_ZERO_MACROASSEMBLER_ZERO_HPP
// Needed for includes in shared files.
-#endif // CPU_ZERO_VM_MACROASSEMBLER_ZERO_HPP
+#endif // CPU_ZERO_MACROASSEMBLER_ZERO_HPP
diff --git a/src/hotspot/cpu/zero/macroAssembler_zero.inline.hpp b/src/hotspot/cpu/zero/macroAssembler_zero.inline.hpp
index 47ce5e5d558..99ce1d5b23c 100644
--- a/src/hotspot/cpu/zero/macroAssembler_zero.inline.hpp
+++ b/src/hotspot/cpu/zero/macroAssembler_zero.inline.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -22,9 +22,9 @@
*
*/
-#ifndef CPU_ZERO_VM_MACROASSEMBLER_ZERO_INLINE_HPP
-#define CPU_ZERO_VM_MACROASSEMBLER_ZERO_INLINE_HPP
+#ifndef CPU_ZERO_MACROASSEMBLER_ZERO_INLINE_HPP
+#define CPU_ZERO_MACROASSEMBLER_ZERO_INLINE_HPP
// Needed for includes in shared files.
-#endif // CPU_ZERO_VM_MACROASSEMBLER_ZERO_INLINE_HPP
+#endif // CPU_ZERO_MACROASSEMBLER_ZERO_INLINE_HPP
diff --git a/src/hotspot/cpu/zero/nativeInst_zero.hpp b/src/hotspot/cpu/zero/nativeInst_zero.hpp
index 4baf8cdc98d..9979ac07dea 100644
--- a/src/hotspot/cpu/zero/nativeInst_zero.hpp
+++ b/src/hotspot/cpu/zero/nativeInst_zero.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2003, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2019, Oracle and/or its affiliates. All rights reserved.
* Copyright 2007 Red Hat, Inc.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
@@ -23,8 +23,8 @@
*
*/
-#ifndef CPU_ZERO_VM_NATIVEINST_ZERO_HPP
-#define CPU_ZERO_VM_NATIVEINST_ZERO_HPP
+#ifndef CPU_ZERO_NATIVEINST_ZERO_HPP
+#define CPU_ZERO_NATIVEINST_ZERO_HPP
#include "asm/assembler.hpp"
#include "runtime/icache.hpp"
@@ -210,4 +210,4 @@ inline NativeGeneralJump* nativeGeneralJump_at(address address) {
return NULL;
}
-#endif // CPU_ZERO_VM_NATIVEINST_ZERO_HPP
+#endif // CPU_ZERO_NATIVEINST_ZERO_HPP
diff --git a/src/hotspot/cpu/zero/registerMap_zero.hpp b/src/hotspot/cpu/zero/registerMap_zero.hpp
index 6c9e0e6827b..e468ab886b7 100644
--- a/src/hotspot/cpu/zero/registerMap_zero.hpp
+++ b/src/hotspot/cpu/zero/registerMap_zero.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
*
*/
-#ifndef CPU_ZERO_VM_REGISTERMAP_ZERO_HPP
-#define CPU_ZERO_VM_REGISTERMAP_ZERO_HPP
+#ifndef CPU_ZERO_REGISTERMAP_ZERO_HPP
+#define CPU_ZERO_REGISTERMAP_ZERO_HPP
// machine-dependent implemention for register maps
friend class frame;
@@ -41,4 +41,4 @@
void pd_initialize() {}
void pd_initialize_from(const RegisterMap* map) {}
-#endif // CPU_ZERO_VM_REGISTERMAP_ZERO_HPP
+#endif // CPU_ZERO_REGISTERMAP_ZERO_HPP
diff --git a/src/hotspot/cpu/zero/register_zero.hpp b/src/hotspot/cpu/zero/register_zero.hpp
index 1ce7141adaf..8916d8ae5d6 100644
--- a/src/hotspot/cpu/zero/register_zero.hpp
+++ b/src/hotspot/cpu/zero/register_zero.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2000, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2019, Oracle and/or its affiliates. All rights reserved.
* Copyright 2007 Red Hat, Inc.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
@@ -23,8 +23,8 @@
*
*/
-#ifndef CPU_ZERO_VM_REGISTER_ZERO_HPP
-#define CPU_ZERO_VM_REGISTER_ZERO_HPP
+#ifndef CPU_ZERO_REGISTER_ZERO_HPP
+#define CPU_ZERO_REGISTER_ZERO_HPP
#include "asm/register.hpp"
#include "vm_version_zero.hpp"
@@ -118,4 +118,4 @@ CONSTANT_REGISTER_DECLARATION(Register, noreg, (-1));
#define noreg ((Register)(noreg_RegisterEnumValue))
#endif
-#endif // CPU_ZERO_VM_REGISTER_ZERO_HPP
+#endif // CPU_ZERO_REGISTER_ZERO_HPP
diff --git a/src/hotspot/cpu/zero/relocInfo_zero.hpp b/src/hotspot/cpu/zero/relocInfo_zero.hpp
index d97364b37ad..ec33241ad91 100644
--- a/src/hotspot/cpu/zero/relocInfo_zero.hpp
+++ b/src/hotspot/cpu/zero/relocInfo_zero.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2003, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2019, Oracle and/or its affiliates. All rights reserved.
* Copyright 2007 Red Hat, Inc.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
@@ -23,8 +23,8 @@
*
*/
-#ifndef CPU_ZERO_VM_RELOCINFO_ZERO_HPP
-#define CPU_ZERO_VM_RELOCINFO_ZERO_HPP
+#ifndef CPU_ZERO_RELOCINFO_ZERO_HPP
+#define CPU_ZERO_RELOCINFO_ZERO_HPP
// machine-dependent parts of class relocInfo
private:
@@ -38,4 +38,4 @@
static bool mustIterateImmediateOopsInCode() { return true; }
-#endif // CPU_ZERO_VM_RELOCINFO_ZERO_HPP
+#endif // CPU_ZERO_RELOCINFO_ZERO_HPP
diff --git a/src/hotspot/cpu/zero/stack_zero.hpp b/src/hotspot/cpu/zero/stack_zero.hpp
index b610f45ac32..b5742b6a381 100644
--- a/src/hotspot/cpu/zero/stack_zero.hpp
+++ b/src/hotspot/cpu/zero/stack_zero.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2003, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2019, Oracle and/or its affiliates. All rights reserved.
* Copyright 2008, 2009, 2010 Red Hat, Inc.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
@@ -23,8 +23,8 @@
*
*/
-#ifndef CPU_ZERO_VM_STACK_ZERO_HPP
-#define CPU_ZERO_VM_STACK_ZERO_HPP
+#ifndef CPU_ZERO_STACK_ZERO_HPP
+#define CPU_ZERO_STACK_ZERO_HPP
#include "utilities/align.hpp"
#include "utilities/sizes.hpp"
@@ -212,4 +212,4 @@ class ZeroFrame {
int buflen) const;
};
-#endif // CPU_ZERO_VM_STACK_ZERO_HPP
+#endif // CPU_ZERO_STACK_ZERO_HPP
diff --git a/src/hotspot/cpu/zero/stack_zero.inline.hpp b/src/hotspot/cpu/zero/stack_zero.inline.hpp
index 3398df72486..538a21fa52f 100644
--- a/src/hotspot/cpu/zero/stack_zero.inline.hpp
+++ b/src/hotspot/cpu/zero/stack_zero.inline.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2003, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2019, Oracle and/or its affiliates. All rights reserved.
* Copyright 2010 Red Hat, Inc.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
@@ -23,8 +23,8 @@
*
*/
-#ifndef CPU_ZERO_VM_STACK_ZERO_INLINE_HPP
-#define CPU_ZERO_VM_STACK_ZERO_INLINE_HPP
+#ifndef CPU_ZERO_STACK_ZERO_INLINE_HPP
+#define CPU_ZERO_STACK_ZERO_INLINE_HPP
#include "runtime/thread.hpp"
#include "stack_zero.hpp"
@@ -54,4 +54,4 @@ inline int ZeroStack::abi_stack_available(Thread *thread) const {
return stack_free;
}
-#endif // CPU_ZERO_VM_STACK_ZERO_INLINE_HPP
+#endif // CPU_ZERO_STACK_ZERO_INLINE_HPP
diff --git a/src/hotspot/cpu/zero/stubRoutines_zero.hpp b/src/hotspot/cpu/zero/stubRoutines_zero.hpp
index cee7d14b95f..13607fe0691 100644
--- a/src/hotspot/cpu/zero/stubRoutines_zero.hpp
+++ b/src/hotspot/cpu/zero/stubRoutines_zero.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2003, 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2019, Oracle and/or its affiliates. All rights reserved.
* Copyright 2007, 2008, 2009, 2010 Red Hat, Inc.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
@@ -23,8 +23,8 @@
*
*/
-#ifndef CPU_ZERO_VM_STUBROUTINES_ZERO_HPP
-#define CPU_ZERO_VM_STUBROUTINES_ZERO_HPP
+#ifndef CPU_ZERO_STUBROUTINES_ZERO_HPP
+#define CPU_ZERO_STUBROUTINES_ZERO_HPP
// This file holds the platform specific parts of the StubRoutines
// definition. See stubRoutines.hpp for a description on how to
@@ -48,4 +48,4 @@
method_handles_adapters_code_size = 0
};
-#endif // CPU_ZERO_VM_STUBROUTINES_ZERO_HPP
+#endif // CPU_ZERO_STUBROUTINES_ZERO_HPP
diff --git a/src/hotspot/cpu/zero/vmStructs_zero.hpp b/src/hotspot/cpu/zero/vmStructs_zero.hpp
index 72783cf341a..64a9300e25c 100644
--- a/src/hotspot/cpu/zero/vmStructs_zero.hpp
+++ b/src/hotspot/cpu/zero/vmStructs_zero.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2003, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2019, Oracle and/or its affiliates. All rights reserved.
* Copyright 2007 Red Hat, Inc.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
@@ -23,8 +23,8 @@
*
*/
-#ifndef CPU_ZERO_VM_VMSTRUCTS_ZERO_HPP
-#define CPU_ZERO_VM_VMSTRUCTS_ZERO_HPP
+#ifndef CPU_ZERO_VMSTRUCTS_ZERO_HPP
+#define CPU_ZERO_VMSTRUCTS_ZERO_HPP
// These are the CPU-specific fields, types and integer
// constants required by the Serviceability Agent. This file is
@@ -38,4 +38,4 @@
#define VM_LONG_CONSTANTS_CPU(declare_constant, declare_preprocessor_constant, declare_c1_constant, declare_c2_constant, declare_c2_preprocessor_constant)
-#endif // CPU_ZERO_VM_VMSTRUCTS_ZERO_HPP
+#endif // CPU_ZERO_VMSTRUCTS_ZERO_HPP
diff --git a/src/hotspot/cpu/zero/vm_version_ext_zero.hpp b/src/hotspot/cpu/zero/vm_version_ext_zero.hpp
index f44c6021387..f22ed3244a7 100644
--- a/src/hotspot/cpu/zero/vm_version_ext_zero.hpp
+++ b/src/hotspot/cpu/zero/vm_version_ext_zero.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2013, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
*
*/
-#ifndef CPU_ZERO_VM_VM_VERSION_EXT_ZERO_HPP
-#define CPU_ZERO_VM_VM_VERSION_EXT_ZERO_HPP
+#ifndef CPU_ZERO_VM_VERSION_EXT_ZERO_HPP
+#define CPU_ZERO_VM_VERSION_EXT_ZERO_HPP
#include "utilities/macros.hpp"
#include "vm_version_zero.hpp"
@@ -51,4 +51,4 @@ class VM_Version_Ext : public VM_Version {
};
-#endif // CPU_ZERO_VM_VM_VERSION_EXT_ZERO_HPP
+#endif // CPU_ZERO_VM_VERSION_EXT_ZERO_HPP
diff --git a/src/hotspot/cpu/zero/vm_version_zero.hpp b/src/hotspot/cpu/zero/vm_version_zero.hpp
index 51b9c5b3035..431bebba429 100644
--- a/src/hotspot/cpu/zero/vm_version_zero.hpp
+++ b/src/hotspot/cpu/zero/vm_version_zero.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2003, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2019, Oracle and/or its affiliates. All rights reserved.
* Copyright 2007 Red Hat, Inc.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
@@ -23,8 +23,8 @@
*
*/
-#ifndef CPU_ZERO_VM_VM_VERSION_ZERO_HPP
-#define CPU_ZERO_VM_VM_VERSION_ZERO_HPP
+#ifndef CPU_ZERO_VM_VERSION_ZERO_HPP
+#define CPU_ZERO_VM_VERSION_ZERO_HPP
#include "runtime/globals_extension.hpp"
#include "runtime/vm_version.hpp"
@@ -34,4 +34,4 @@ class VM_Version : public Abstract_VM_Version {
static void initialize();
};
-#endif // CPU_ZERO_VM_VM_VERSION_ZERO_HPP
+#endif // CPU_ZERO_VM_VERSION_ZERO_HPP
diff --git a/src/hotspot/cpu/zero/vmreg_zero.hpp b/src/hotspot/cpu/zero/vmreg_zero.hpp
index 60354a11ca0..11ff7deccea 100644
--- a/src/hotspot/cpu/zero/vmreg_zero.hpp
+++ b/src/hotspot/cpu/zero/vmreg_zero.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2006, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2006, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
*
*/
-#ifndef CPU_ZERO_VM_VMREG_ZERO_HPP
-#define CPU_ZERO_VM_VMREG_ZERO_HPP
+#ifndef CPU_ZERO_VMREG_ZERO_HPP
+#define CPU_ZERO_VMREG_ZERO_HPP
bool is_Register();
Register as_Register();
@@ -31,4 +31,4 @@
bool is_FloatRegister();
FloatRegister as_FloatRegister();
-#endif // CPU_ZERO_VM_VMREG_ZERO_HPP
+#endif // CPU_ZERO_VMREG_ZERO_HPP
diff --git a/src/hotspot/cpu/zero/vmreg_zero.inline.hpp b/src/hotspot/cpu/zero/vmreg_zero.inline.hpp
index 0c771062a25..a4f2dd4e0ee 100644
--- a/src/hotspot/cpu/zero/vmreg_zero.inline.hpp
+++ b/src/hotspot/cpu/zero/vmreg_zero.inline.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2006, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2006, 2019, Oracle and/or its affiliates. All rights reserved.
* Copyright 2007 Red Hat, Inc.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
@@ -23,8 +23,8 @@
*
*/
-#ifndef CPU_ZERO_VM_VMREG_ZERO_INLINE_HPP
-#define CPU_ZERO_VM_VMREG_ZERO_INLINE_HPP
+#ifndef CPU_ZERO_VMREG_ZERO_INLINE_HPP
+#define CPU_ZERO_VMREG_ZERO_INLINE_HPP
inline VMReg RegisterImpl::as_VMReg() {
return VMRegImpl::as_VMReg(encoding());
@@ -34,4 +34,4 @@ inline VMReg FloatRegisterImpl::as_VMReg() {
return VMRegImpl::as_VMReg(encoding() + ConcreteRegisterImpl::max_gpr);
}
-#endif // CPU_ZERO_VM_VMREG_ZERO_INLINE_HPP
+#endif // CPU_ZERO_VMREG_ZERO_INLINE_HPP
diff --git a/src/hotspot/os/aix/c1_globals_aix.hpp b/src/hotspot/os/aix/c1_globals_aix.hpp
index 0d4affd2bab..1d5cf980104 100644
--- a/src/hotspot/os/aix/c1_globals_aix.hpp
+++ b/src/hotspot/os/aix/c1_globals_aix.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2000, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2019, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2012, 2015 SAP SE. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
@@ -23,8 +23,8 @@
*
*/
-#ifndef OS_AIX_VM_C1_GLOBALS_AIX_HPP
-#define OS_AIX_VM_C1_GLOBALS_AIX_HPP
+#ifndef OS_AIX_C1_GLOBALS_AIX_HPP
+#define OS_AIX_C1_GLOBALS_AIX_HPP
#include "utilities/globalDefinitions.hpp"
#include "utilities/macros.hpp"
@@ -34,4 +34,4 @@
// client compiler. (see c1_globals.hpp)
//
-#endif // OS_AIX_VM_C1_GLOBALS_AIX_HPP
+#endif // OS_AIX_C1_GLOBALS_AIX_HPP
diff --git a/src/hotspot/os/aix/c2_globals_aix.hpp b/src/hotspot/os/aix/c2_globals_aix.hpp
index b42a7051fea..8bc2a6cdd55 100644
--- a/src/hotspot/os/aix/c2_globals_aix.hpp
+++ b/src/hotspot/os/aix/c2_globals_aix.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2000, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2019, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2012, 2013 SAP SE. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
@@ -23,8 +23,8 @@
*
*/
-#ifndef OS_AIX_VM_C2_GLOBALS_AIX_HPP
-#define OS_AIX_VM_C2_GLOBALS_AIX_HPP
+#ifndef OS_AIX_C2_GLOBALS_AIX_HPP
+#define OS_AIX_C2_GLOBALS_AIX_HPP
#include "utilities/globalDefinitions.hpp"
#include "utilities/macros.hpp"
@@ -34,4 +34,4 @@
// server compiler. (see c2_globals.hpp)
//
-#endif // OS_AIX_VM_C2_GLOBALS_AIX_HPP
+#endif // OS_AIX_C2_GLOBALS_AIX_HPP
diff --git a/src/hotspot/os/aix/globals_aix.hpp b/src/hotspot/os/aix/globals_aix.hpp
index c006834cbb8..753fe95223f 100644
--- a/src/hotspot/os/aix/globals_aix.hpp
+++ b/src/hotspot/os/aix/globals_aix.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2005, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2019, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2012, 2018 SAP SE. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
@@ -23,8 +23,8 @@
*
*/
-#ifndef OS_AIX_VM_GLOBALS_AIX_HPP
-#define OS_AIX_VM_GLOBALS_AIX_HPP
+#ifndef OS_AIX_GLOBALS_AIX_HPP
+#define OS_AIX_GLOBALS_AIX_HPP
//
// Defines Aix specific flags. They are not available on other platforms.
@@ -94,4 +94,4 @@ define_pd_global(bool, UseLargePagesIndividualAllocation, false);
define_pd_global(bool, UseOSErrorReporting, false);
define_pd_global(bool, UseThreadPriorities, true) ;
-#endif // OS_AIX_VM_GLOBALS_AIX_HPP
+#endif // OS_AIX_GLOBALS_AIX_HPP
diff --git a/src/hotspot/os/aix/libo4.hpp b/src/hotspot/os/aix/libo4.hpp
index 6f9134f84e9..fe642ebe38b 100644
--- a/src/hotspot/os/aix/libo4.hpp
+++ b/src/hotspot/os/aix/libo4.hpp
@@ -29,8 +29,8 @@
// functionality (aka ILE layer) to close some functional gaps that exist in
// the PASE layer.
-#ifndef OS_AIX_VM_LIBO4_HPP
-#define OS_AIX_VM_LIBO4_HPP
+#ifndef OS_AIX_LIBO4_HPP
+#define OS_AIX_LIBO4_HPP
class libo4 {
public:
@@ -87,4 +87,4 @@ public:
static bool removeEscapeMessageFromJoblogByContext(const void* context);
};
-#endif // OS_AIX_VM_LIBO4_HPP
+#endif // OS_AIX_LIBO4_HPP
diff --git a/src/hotspot/os/aix/libodm_aix.hpp b/src/hotspot/os/aix/libodm_aix.hpp
index 920b58f746f..00bd38d91a5 100644
--- a/src/hotspot/os/aix/libodm_aix.hpp
+++ b/src/hotspot/os/aix/libodm_aix.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2015, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2019, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2015, 2015 SAP SE. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
@@ -25,8 +25,8 @@
// Encapsulates the libodm library and provides more convenient interfaces.
-#ifndef OS_AIX_VM_LIBODM_AIX_HPP
-#define OS_AIX_VM_LIBODM_AIX_HPP
+#ifndef OS_AIX_LIBODM_AIX_HPP
+#define OS_AIX_LIBODM_AIX_HPP
#include
@@ -103,4 +103,4 @@ class odmWrapper : private dynamicOdm {
static void determine_os_kernel_version(uint32_t* p_ver);
};
-#endif // OS_AIX_VM_LIBODM_AIX_HPP
+#endif // OS_AIX_LIBODM_AIX_HPP
diff --git a/src/hotspot/os/aix/libperfstat_aix.hpp b/src/hotspot/os/aix/libperfstat_aix.hpp
index a0c74bd4d43..d323b8e8bbc 100644
--- a/src/hotspot/os/aix/libperfstat_aix.hpp
+++ b/src/hotspot/os/aix/libperfstat_aix.hpp
@@ -29,8 +29,8 @@
// AIX-specific library which only exists on AIX, not on PASE. If I want to
// share binaries between AIX and PASE, I cannot directly link against libperfstat.so.
-#ifndef OS_AIX_VM_LIBPERFSTAT_AIX_HPP
-#define OS_AIX_VM_LIBPERFSTAT_AIX_HPP
+#ifndef OS_AIX_LIBPERFSTAT_AIX_HPP
+#define OS_AIX_LIBPERFSTAT_AIX_HPP
#include
#include
@@ -966,4 +966,4 @@ public:
static bool get_wparinfo(wparinfo_t* pwi);
};
-#endif // OS_AIX_VM_LIBPERFSTAT_AIX_HPP
+#endif // OS_AIX_LIBPERFSTAT_AIX_HPP
diff --git a/src/hotspot/os/aix/loadlib_aix.hpp b/src/hotspot/os/aix/loadlib_aix.hpp
index 0f5b1489719..354dccf4c7b 100644
--- a/src/hotspot/os/aix/loadlib_aix.hpp
+++ b/src/hotspot/os/aix/loadlib_aix.hpp
@@ -29,8 +29,8 @@
// It is needed, among other things, to provide dladdr(3), which is
// missing on AIX.
-#ifndef OS_AIX_VM_LOADLIB_AIX_HPP
-#define OS_AIX_VM_LOADLIB_AIX_HPP
+#ifndef OS_AIX_LOADLIB_AIX_HPP
+#define OS_AIX_LOADLIB_AIX_HPP
#include
@@ -101,4 +101,4 @@ class LoadedLibraries
};
-#endif // OS_AIX_VM_LOADLIB_AIX_HPP
+#endif // OS_AIX_LOADLIB_AIX_HPP
diff --git a/src/hotspot/os/aix/misc_aix.hpp b/src/hotspot/os/aix/misc_aix.hpp
index 44e074f4f61..771e7490bee 100644
--- a/src/hotspot/os/aix/misc_aix.hpp
+++ b/src/hotspot/os/aix/misc_aix.hpp
@@ -23,8 +23,8 @@
*/
-#ifndef OS_AIX_VM_MISC_AIX_HPP
-#define OS_AIX_VM_MISC_AIX_HPP
+#ifndef OS_AIX_MISC_AIX_HPP
+#define OS_AIX_MISC_AIX_HPP
// misc_aix.hpp, misc_aix.cpp: convenience functions needed for the OpenJDK AIX
// port.
@@ -90,5 +90,4 @@ namespace MiscUtils {
};
}
-#endif // OS_AIX_VM_MISC_AIX_HPP
-
+#endif // OS_AIX_MISC_AIX_HPP
diff --git a/src/hotspot/os/aix/osThread_aix.hpp b/src/hotspot/os/aix/osThread_aix.hpp
index 405b2a4b103..0c8706d4add 100644
--- a/src/hotspot/os/aix/osThread_aix.hpp
+++ b/src/hotspot/os/aix/osThread_aix.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1999, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1999, 2019, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2012, 2013 SAP SE. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
@@ -23,8 +23,8 @@
*
*/
-#ifndef OS_AIX_VM_OSTHREAD_AIX_HPP
-#define OS_AIX_VM_OSTHREAD_AIX_HPP
+#ifndef OS_AIX_OSTHREAD_AIX_HPP
+#define OS_AIX_OSTHREAD_AIX_HPP
public:
typedef pthread_t thread_id_t;
@@ -150,4 +150,4 @@
jlong user;
} _last_cpu_times;
-#endif // OS_AIX_VM_OSTHREAD_AIX_HPP
+#endif // OS_AIX_OSTHREAD_AIX_HPP
diff --git a/src/hotspot/os/aix/os_aix.cpp b/src/hotspot/os/aix/os_aix.cpp
index b5ac60e433d..20b540fe34a 100644
--- a/src/hotspot/os/aix/os_aix.cpp
+++ b/src/hotspot/os/aix/os_aix.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1999, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1999, 2019, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2012, 2018 SAP SE. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
@@ -2594,14 +2594,6 @@ char* os::pd_attempt_reserve_memory_at(size_t bytes, char* requested_addr) {
return addr;
}
-size_t os::read(int fd, void *buf, unsigned int nBytes) {
- return ::read(fd, buf, nBytes);
-}
-
-size_t os::read_at(int fd, void *buf, unsigned int nBytes, jlong offset) {
- return ::pread(fd, buf, nBytes, offset);
-}
-
// Sleep forever; naked call to OS-specific sleep; use with CAUTION
void os::infinite_sleep() {
while (true) { // sleep forever ...
diff --git a/src/hotspot/os/aix/os_aix.hpp b/src/hotspot/os/aix/os_aix.hpp
index 515edfd0b07..6a5a13da844 100644
--- a/src/hotspot/os/aix/os_aix.hpp
+++ b/src/hotspot/os/aix/os_aix.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1999, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1999, 2019, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2013, 2016 SAP SE. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
@@ -23,8 +23,8 @@
*
*/
-#ifndef OS_AIX_VM_OS_AIX_HPP
-#define OS_AIX_VM_OS_AIX_HPP
+#ifndef OS_AIX_OS_AIX_HPP
+#define OS_AIX_OS_AIX_HPP
// Information about the protection of the page at address '0' on this os.
static bool zero_page_read_protected() { return false; }
@@ -212,4 +212,4 @@ class Aix {
};
-#endif // OS_AIX_VM_OS_AIX_HPP
+#endif // OS_AIX_OS_AIX_HPP
diff --git a/src/hotspot/os/aix/os_aix.inline.hpp b/src/hotspot/os/aix/os_aix.inline.hpp
index de5a79c818c..6d9acbaad50 100644
--- a/src/hotspot/os/aix/os_aix.inline.hpp
+++ b/src/hotspot/os/aix/os_aix.inline.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1999, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1999, 2019, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2012, 2018 SAP SE. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
@@ -23,8 +23,8 @@
*
*/
-#ifndef OS_AIX_VM_OS_AIX_INLINE_HPP
-#define OS_AIX_VM_OS_AIX_INLINE_HPP
+#ifndef OS_AIX_OS_AIX_INLINE_HPP
+#define OS_AIX_OS_AIX_INLINE_HPP
#include "runtime/os.hpp"
@@ -98,12 +98,6 @@ inline int os::ftruncate(int fd, jlong length) {
inline bool os::numa_has_static_binding() { ShouldNotReachHere(); return true; }
inline bool os::numa_has_group_homing() { ShouldNotReachHere(); return false; }
-inline size_t os::restartable_read(int fd, void *buf, unsigned int nBytes) {
- size_t res;
- RESTARTABLE( (size_t) ::read(fd, buf, (size_t) nBytes), res);
- return res;
-}
-
inline size_t os::write(int fd, const void *buf, unsigned int nBytes) {
size_t res;
RESTARTABLE((size_t) ::write(fd, buf, (size_t) nBytes), res);
@@ -151,4 +145,4 @@ inline void os::exit(int num) {
::exit(num);
}
-#endif // OS_AIX_VM_OS_AIX_INLINE_HPP
+#endif // OS_AIX_OS_AIX_INLINE_HPP
diff --git a/src/hotspot/os/aix/os_share_aix.hpp b/src/hotspot/os/aix/os_share_aix.hpp
index f1da96aea58..c208ff2f743 100644
--- a/src/hotspot/os/aix/os_share_aix.hpp
+++ b/src/hotspot/os/aix/os_share_aix.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1999, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1999, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
*
*/
-#ifndef OS_AIX_VM_OS_SHARE_AIX_HPP
-#define OS_AIX_VM_OS_SHARE_AIX_HPP
+#ifndef OS_AIX_OS_SHARE_AIX_HPP
+#define OS_AIX_OS_SHARE_AIX_HPP
// misc
void handle_unexpected_exception(Thread* thread, int sig, siginfo_t* info, address pc, address adjusted_pc);
@@ -33,4 +33,4 @@ void continue_with_dump(void);
#define PROCFILE_LENGTH 128
-#endif // OS_AIX_VM_OS_SHARE_AIX_HPP
+#endif // OS_AIX_OS_SHARE_AIX_HPP
diff --git a/src/hotspot/os/aix/porting_aix.hpp b/src/hotspot/os/aix/porting_aix.hpp
index cfe41a7b8a6..b778c4a3561 100644
--- a/src/hotspot/os/aix/porting_aix.hpp
+++ b/src/hotspot/os/aix/porting_aix.hpp
@@ -22,8 +22,8 @@
*
*/
-#ifndef OS_AIX_VM_PORTING_AIX_HPP
-#define OS_AIX_VM_PORTING_AIX_HPP
+#ifndef OS_AIX_PORTING_AIX_HPP
+#define OS_AIX_PORTING_AIX_HPP
#include
@@ -107,5 +107,4 @@ class AixMisc {
};
-#endif // OS_AIX_VM_PORTING_AIX_HPP
-
+#endif // OS_AIX_PORTING_AIX_HPP
diff --git a/src/hotspot/os/aix/vmStructs_aix.hpp b/src/hotspot/os/aix/vmStructs_aix.hpp
index d86287d94c2..1a2f4c4bf6e 100644
--- a/src/hotspot/os/aix/vmStructs_aix.hpp
+++ b/src/hotspot/os/aix/vmStructs_aix.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
*
*/
-#ifndef OS_AIX_VM_VMSTRUCTS_AIX_HPP
-#define OS_AIX_VM_VMSTRUCTS_AIX_HPP
+#ifndef OS_AIX_VMSTRUCTS_AIX_HPP
+#define OS_AIX_VMSTRUCTS_AIX_HPP
// These are the OS-specific fields, types and integer
// constants required by the Serviceability Agent. This file is
@@ -39,4 +39,4 @@
#define VM_ADDRESSES_OS(declare_address, declare_preprocessor_address, declare_function)
-#endif // OS_AIX_VM_VMSTRUCTS_AIX_HPP
+#endif // OS_AIX_VMSTRUCTS_AIX_HPP
diff --git a/src/hotspot/os/bsd/c1_globals_bsd.hpp b/src/hotspot/os/bsd/c1_globals_bsd.hpp
index 27e26af1194..aa24414612a 100644
--- a/src/hotspot/os/bsd/c1_globals_bsd.hpp
+++ b/src/hotspot/os/bsd/c1_globals_bsd.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2000, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
*
*/
-#ifndef OS_BSD_VM_C1_GLOBALS_BSD_HPP
-#define OS_BSD_VM_C1_GLOBALS_BSD_HPP
+#ifndef OS_BSD_C1_GLOBALS_BSD_HPP
+#define OS_BSD_C1_GLOBALS_BSD_HPP
#include "utilities/globalDefinitions.hpp"
#include "utilities/macros.hpp"
@@ -33,4 +33,4 @@
// client compiler. (see c1_globals.hpp)
//
-#endif // OS_BSD_VM_C1_GLOBALS_BSD_HPP
+#endif // OS_BSD_C1_GLOBALS_BSD_HPP
diff --git a/src/hotspot/os/bsd/c2_globals_bsd.hpp b/src/hotspot/os/bsd/c2_globals_bsd.hpp
index 21737f19be6..1e8a89ef4a8 100644
--- a/src/hotspot/os/bsd/c2_globals_bsd.hpp
+++ b/src/hotspot/os/bsd/c2_globals_bsd.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2000, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
*
*/
-#ifndef OS_BSD_VM_C2_GLOBALS_BSD_HPP
-#define OS_BSD_VM_C2_GLOBALS_BSD_HPP
+#ifndef OS_BSD_C2_GLOBALS_BSD_HPP
+#define OS_BSD_C2_GLOBALS_BSD_HPP
#include "utilities/globalDefinitions.hpp"
#include "utilities/macros.hpp"
@@ -33,4 +33,4 @@
// server compiler. (see c2_globals.hpp)
//
-#endif // OS_BSD_VM_C2_GLOBALS_BSD_HPP
+#endif // OS_BSD_C2_GLOBALS_BSD_HPP
diff --git a/src/hotspot/os/bsd/decoder_machO.hpp b/src/hotspot/os/bsd/decoder_machO.hpp
index d15dc738d34..5ceda782c6e 100644
--- a/src/hotspot/os/bsd/decoder_machO.hpp
+++ b/src/hotspot/os/bsd/decoder_machO.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2011, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
*
*/
-#ifndef OS_BSD_VM_DECODER_MACHO_HPP
-#define OS_BSD_VM_DECODER_MACHO_HPP
+#ifndef OS_BSD_DECODER_MACHO_HPP
+#define OS_BSD_DECODER_MACHO_HPP
#ifdef __APPLE__
@@ -51,4 +51,4 @@ class MachODecoder : public AbstractDecoder {
#endif
-#endif // OS_BSD_VM_DECODER_MACHO_HPP
+#endif // OS_BSD_DECODER_MACHO_HPP
diff --git a/src/hotspot/os/bsd/globals_bsd.hpp b/src/hotspot/os/bsd/globals_bsd.hpp
index c00c3847d23..b4e6b5bd0af 100644
--- a/src/hotspot/os/bsd/globals_bsd.hpp
+++ b/src/hotspot/os/bsd/globals_bsd.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2005, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
*
*/
-#ifndef OS_BSD_VM_GLOBALS_BSD_HPP
-#define OS_BSD_VM_GLOBALS_BSD_HPP
+#ifndef OS_BSD_GLOBALS_BSD_HPP
+#define OS_BSD_GLOBALS_BSD_HPP
//
// Defines Bsd specific flags. They are not available on other platforms.
@@ -56,4 +56,4 @@ define_pd_global(bool, UseLargePagesIndividualAllocation, false);
define_pd_global(bool, UseOSErrorReporting, false);
define_pd_global(bool, UseThreadPriorities, true) ;
-#endif // OS_BSD_VM_GLOBALS_BSD_HPP
+#endif // OS_BSD_GLOBALS_BSD_HPP
diff --git a/src/hotspot/os/bsd/osThread_bsd.hpp b/src/hotspot/os/bsd/osThread_bsd.hpp
index f4553821267..1b910a18181 100644
--- a/src/hotspot/os/bsd/osThread_bsd.hpp
+++ b/src/hotspot/os/bsd/osThread_bsd.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1999, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1999, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
*
*/
-#ifndef OS_BSD_VM_OSTHREAD_BSD_HPP
-#define OS_BSD_VM_OSTHREAD_BSD_HPP
+#ifndef OS_BSD_OSTHREAD_BSD_HPP
+#define OS_BSD_OSTHREAD_BSD_HPP
private:
int _thread_type;
@@ -149,4 +149,4 @@ private:
// osThread_solaris.hpp 1.24 99/08/27 13:11:54
// End
-#endif // OS_BSD_VM_OSTHREAD_BSD_HPP
+#endif // OS_BSD_OSTHREAD_BSD_HPP
diff --git a/src/hotspot/os/bsd/os_bsd.cpp b/src/hotspot/os/bsd/os_bsd.cpp
index fd007ae527e..2e71bfd09be 100644
--- a/src/hotspot/os/bsd/os_bsd.cpp
+++ b/src/hotspot/os/bsd/os_bsd.cpp
@@ -2217,14 +2217,6 @@ char* os::pd_attempt_reserve_memory_at(size_t bytes, char* requested_addr) {
}
}
-size_t os::read(int fd, void *buf, unsigned int nBytes) {
- RESTARTABLE_RETURN_INT(::read(fd, buf, nBytes));
-}
-
-size_t os::read_at(int fd, void *buf, unsigned int nBytes, jlong offset) {
- RESTARTABLE_RETURN_INT(::pread(fd, buf, nBytes, offset));
-}
-
// Sleep forever; naked call to OS-specific sleep; use with CAUTION
void os::infinite_sleep() {
while (true) { // sleep forever ...
@@ -2573,7 +2565,7 @@ static bool do_suspend(OSThread* osthread) {
// managed to send the signal and switch to SUSPEND_REQUEST, now wait for SUSPENDED
while (true) {
- if (sr_semaphore.timedwait(0, 2 * NANOSECS_PER_MILLISEC)) {
+ if (sr_semaphore.timedwait(2)) {
break;
} else {
// timeout
@@ -2607,7 +2599,7 @@ static void do_resume(OSThread* osthread) {
while (true) {
if (sr_notify(osthread) == 0) {
- if (sr_semaphore.timedwait(0, 2 * NANOSECS_PER_MILLISEC)) {
+ if (sr_semaphore.timedwait(2)) {
if (osthread->sr.is_running()) {
return;
}
diff --git a/src/hotspot/os/bsd/os_bsd.hpp b/src/hotspot/os/bsd/os_bsd.hpp
index b04da8cbc5c..cc8a282c65a 100644
--- a/src/hotspot/os/bsd/os_bsd.hpp
+++ b/src/hotspot/os/bsd/os_bsd.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1999, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1999, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
*
*/
-#ifndef OS_BSD_VM_OS_BSD_HPP
-#define OS_BSD_VM_OS_BSD_HPP
+#ifndef OS_BSD_OS_BSD_HPP
+#define OS_BSD_OS_BSD_HPP
// Bsd_OS defines the interface to Bsd operating systems
@@ -159,4 +159,4 @@ class Bsd {
static int get_node_by_cpu(int cpu_id);
};
-#endif // OS_BSD_VM_OS_BSD_HPP
+#endif // OS_BSD_OS_BSD_HPP
diff --git a/src/hotspot/os/bsd/os_bsd.inline.hpp b/src/hotspot/os/bsd/os_bsd.inline.hpp
index 7669f133739..591cead568f 100644
--- a/src/hotspot/os/bsd/os_bsd.inline.hpp
+++ b/src/hotspot/os/bsd/os_bsd.inline.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1999, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1999, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
*
*/
-#ifndef OS_BSD_VM_OS_BSD_INLINE_HPP
-#define OS_BSD_VM_OS_BSD_INLINE_HPP
+#ifndef OS_BSD_OS_BSD_INLINE_HPP
+#define OS_BSD_OS_BSD_INLINE_HPP
#include "runtime/os.hpp"
@@ -100,12 +100,6 @@ inline int os::ftruncate(int fd, jlong length) {
inline bool os::numa_has_static_binding() { return true; }
inline bool os::numa_has_group_homing() { return false; }
-inline size_t os::restartable_read(int fd, void *buf, unsigned int nBytes) {
- size_t res;
- RESTARTABLE( (size_t) ::read(fd, buf, (size_t) nBytes), res);
- return res;
-}
-
inline size_t os::write(int fd, const void *buf, unsigned int nBytes) {
size_t res;
RESTARTABLE((size_t) ::write(fd, buf, (size_t) nBytes), res);
@@ -156,4 +150,4 @@ inline void os::exit(int num) {
::exit(num);
}
-#endif // OS_BSD_VM_OS_BSD_INLINE_HPP
+#endif // OS_BSD_OS_BSD_INLINE_HPP
diff --git a/src/hotspot/os/bsd/os_share_bsd.hpp b/src/hotspot/os/bsd/os_share_bsd.hpp
index 9a2a7ef2638..e6c7f5a34b2 100644
--- a/src/hotspot/os/bsd/os_share_bsd.hpp
+++ b/src/hotspot/os/bsd/os_share_bsd.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1999, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1999, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
*
*/
-#ifndef OS_BSD_VM_OS_SHARE_BSD_HPP
-#define OS_BSD_VM_OS_SHARE_BSD_HPP
+#ifndef OS_BSD_OS_SHARE_BSD_HPP
+#define OS_BSD_OS_SHARE_BSD_HPP
// misc
void handle_unexpected_exception(Thread* thread, int sig, siginfo_t* info, address pc, address adjusted_pc);
@@ -33,4 +33,4 @@ void continue_with_dump(void);
#define PROCFILE_LENGTH 128
-#endif // OS_BSD_VM_OS_SHARE_BSD_HPP
+#endif // OS_BSD_OS_SHARE_BSD_HPP
diff --git a/src/hotspot/os/bsd/semaphore_bsd.cpp b/src/hotspot/os/bsd/semaphore_bsd.cpp
index fb365911a7f..63290572711 100644
--- a/src/hotspot/os/bsd/semaphore_bsd.cpp
+++ b/src/hotspot/os/bsd/semaphore_bsd.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -24,6 +24,7 @@
#include "precompiled/precompiled.hpp"
#include "semaphore_bsd.hpp"
+#include "runtime/os.hpp"
#include "utilities/debug.hpp"
#include
@@ -65,29 +66,27 @@ void OSXSemaphore::wait() {
assert(ret == KERN_SUCCESS, "Failed to wait on semaphore");
}
-int64_t OSXSemaphore::currenttime() {
- struct timeval tv;
- gettimeofday(&tv, NULL);
- return (tv.tv_sec * NANOSECS_PER_SEC) + (tv.tv_usec * 1000);
-}
-
bool OSXSemaphore::trywait() {
- return timedwait(0, 0);
+ return timedwait(0);
}
-bool OSXSemaphore::timedwait(unsigned int sec, int nsec) {
+bool OSXSemaphore::timedwait(int64_t millis) {
kern_return_t kr = KERN_ABORTED;
- mach_timespec_t waitspec;
- waitspec.tv_sec = sec;
- waitspec.tv_nsec = nsec;
- int64_t starttime = currenttime();
+ // kernel semaphores take a relative timeout
+ mach_timespec_t waitspec;
+ int secs = millis / MILLIUNITS;
+ int nsecs = (millis % MILLIUNITS) * NANOSECS_PER_MILLISEC;
+ waitspec.tv_sec = secs;
+ waitspec.tv_nsec = nsecs;
+
+ int64_t starttime = os::javaTimeMillis() * NANOSECS_PER_MILLISEC;
kr = semaphore_timedwait(_semaphore, waitspec);
while (kr == KERN_ABORTED) {
- int64_t totalwait = (sec * NANOSECS_PER_SEC) + nsec;
-
- int64_t current = currenttime();
+ // reduce the timout and try again
+ int64_t totalwait = millis * NANOSECS_PER_MILLISEC;
+ int64_t current = os::javaTimeMillis() * NANOSECS_PER_MILLISEC;
int64_t passedtime = current - starttime;
if (passedtime >= totalwait) {
diff --git a/src/hotspot/os/bsd/semaphore_bsd.hpp b/src/hotspot/os/bsd/semaphore_bsd.hpp
index 901d81eab0b..fe9f91bd0c0 100644
--- a/src/hotspot/os/bsd/semaphore_bsd.hpp
+++ b/src/hotspot/os/bsd/semaphore_bsd.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2015, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
*
*/
-#ifndef OS_BSD_VM_SEMAPHORE_BSD_HPP
-#define OS_BSD_VM_SEMAPHORE_BSD_HPP
+#ifndef OS_BSD_SEMAPHORE_BSD_HPP
+#define OS_BSD_SEMAPHORE_BSD_HPP
#ifndef __APPLE__
// Use POSIX semaphores.
@@ -50,14 +50,13 @@ class OSXSemaphore : public CHeapObj{
void wait();
bool trywait();
- bool timedwait(unsigned int sec, int nsec);
- private:
- static int64_t currenttime();
+ // wait until the given relative time elapses
+ bool timedwait(int64_t millis);
};
typedef OSXSemaphore SemaphoreImpl;
#endif // __APPLE__
-#endif // OS_BSD_VM_SEMAPHORE_BSD_HPP
+#endif // OS_BSD_SEMAPHORE_BSD_HPP
diff --git a/src/hotspot/os/bsd/vmStructs_bsd.hpp b/src/hotspot/os/bsd/vmStructs_bsd.hpp
index 7e35c42e2bf..84c1be77374 100644
--- a/src/hotspot/os/bsd/vmStructs_bsd.hpp
+++ b/src/hotspot/os/bsd/vmStructs_bsd.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
*
*/
-#ifndef OS_BSD_VM_VMSTRUCTS_BSD_HPP
-#define OS_BSD_VM_VMSTRUCTS_BSD_HPP
+#ifndef OS_BSD_VMSTRUCTS_BSD_HPP
+#define OS_BSD_VMSTRUCTS_BSD_HPP
#include
@@ -42,4 +42,4 @@
#define VM_ADDRESSES_OS(declare_address, declare_preprocessor_address, declare_function) \
declare_preprocessor_address("RTLD_DEFAULT", RTLD_DEFAULT)
-#endif // OS_BSD_VM_VMSTRUCTS_BSD_HPP
+#endif // OS_BSD_VMSTRUCTS_BSD_HPP
diff --git a/src/hotspot/os/linux/c1_globals_linux.hpp b/src/hotspot/os/linux/c1_globals_linux.hpp
index 0507898060a..8f7f0e367d7 100644
--- a/src/hotspot/os/linux/c1_globals_linux.hpp
+++ b/src/hotspot/os/linux/c1_globals_linux.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2000, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
*
*/
-#ifndef OS_LINUX_VM_C1_GLOBALS_LINUX_HPP
-#define OS_LINUX_VM_C1_GLOBALS_LINUX_HPP
+#ifndef OS_LINUX_C1_GLOBALS_LINUX_HPP
+#define OS_LINUX_C1_GLOBALS_LINUX_HPP
#include "utilities/globalDefinitions.hpp"
#include "utilities/macros.hpp"
@@ -33,4 +33,4 @@
// client compiler. (see c1_globals.hpp)
//
-#endif // OS_LINUX_VM_C1_GLOBALS_LINUX_HPP
+#endif // OS_LINUX_C1_GLOBALS_LINUX_HPP
diff --git a/src/hotspot/os/linux/c2_globals_linux.hpp b/src/hotspot/os/linux/c2_globals_linux.hpp
index d81638946c4..c6199253f3e 100644
--- a/src/hotspot/os/linux/c2_globals_linux.hpp
+++ b/src/hotspot/os/linux/c2_globals_linux.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2000, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
*
*/
-#ifndef OS_LINUX_VM_C2_GLOBALS_LINUX_HPP
-#define OS_LINUX_VM_C2_GLOBALS_LINUX_HPP
+#ifndef OS_LINUX_C2_GLOBALS_LINUX_HPP
+#define OS_LINUX_C2_GLOBALS_LINUX_HPP
#include "utilities/globalDefinitions.hpp"
#include "utilities/macros.hpp"
@@ -33,4 +33,4 @@
// server compiler. (see c2_globals.hpp)
//
-#endif // OS_LINUX_VM_C2_GLOBALS_LINUX_HPP
+#endif // OS_LINUX_C2_GLOBALS_LINUX_HPP
diff --git a/src/hotspot/os/linux/globals_linux.hpp b/src/hotspot/os/linux/globals_linux.hpp
index 86d77bb18f9..cef31620f3b 100644
--- a/src/hotspot/os/linux/globals_linux.hpp
+++ b/src/hotspot/os/linux/globals_linux.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2005, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
*
*/
-#ifndef OS_LINUX_VM_GLOBALS_LINUX_HPP
-#define OS_LINUX_VM_GLOBALS_LINUX_HPP
+#ifndef OS_LINUX_GLOBALS_LINUX_HPP
+#define OS_LINUX_GLOBALS_LINUX_HPP
//
// Defines Linux specific flags. They are not available on other platforms.
@@ -84,4 +84,4 @@ define_pd_global(bool, UseLargePagesIndividualAllocation, false);
define_pd_global(bool, UseOSErrorReporting, false);
define_pd_global(bool, UseThreadPriorities, true) ;
-#endif // OS_LINUX_VM_GLOBALS_LINUX_HPP
+#endif // OS_LINUX_GLOBALS_LINUX_HPP
diff --git a/src/hotspot/os/linux/osContainer_linux.cpp b/src/hotspot/os/linux/osContainer_linux.cpp
index 0b35bb32c5d..093f42f69aa 100644
--- a/src/hotspot/os/linux/osContainer_linux.cpp
+++ b/src/hotspot/os/linux/osContainer_linux.cpp
@@ -31,6 +31,24 @@
#include "logging/log.hpp"
#include "osContainer_linux.hpp"
+/*
+ * PER_CPU_SHARES has been set to 1024 because CPU shares' quota
+ * is commonly used in cloud frameworks like Kubernetes[1],
+ * AWS[2] and Mesos[3] in a similar way. They spawn containers with
+ * --cpu-shares option values scaled by PER_CPU_SHARES. Thus, we do
+ * the inverse for determining the number of possible available
+ * CPUs to the JVM inside a container. See JDK-8216366.
+ *
+ * [1] https://kubernetes.io/docs/concepts/configuration/manage-compute-resources-container/#meaning-of-cpu
+ * In particular:
+ * When using Docker:
+ * The spec.containers[].resources.requests.cpu is converted to its core value, which is potentially
+ * fractional, and multiplied by 1024. The greater of this number or 2 is used as the value of the
+ * --cpu-shares flag in the docker run command.
+ * [2] https://docs.aws.amazon.com/AmazonECS/latest/APIReference/API_ContainerDefinition.html
+ * [3] https://github.com/apache/mesos/blob/3478e344fb77d931f6122980c6e94cd3913c441d/src/docker/docker.cpp#L648
+ * https://github.com/apache/mesos/blob/3478e344fb77d931f6122980c6e94cd3913c441d/src/slave/containerizer/mesos/isolators/cgroups/constants.hpp#L30
+ */
#define PER_CPU_SHARES 1024
bool OSContainer::_is_initialized = false;
diff --git a/src/hotspot/os/linux/osContainer_linux.hpp b/src/hotspot/os/linux/osContainer_linux.hpp
index 0a81364fc8d..cdb29c88451 100644
--- a/src/hotspot/os/linux/osContainer_linux.hpp
+++ b/src/hotspot/os/linux/osContainer_linux.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
*
*/
-#ifndef OS_LINUX_VM_OSCONTAINER_LINUX_HPP
-#define OS_LINUX_VM_OSCONTAINER_LINUX_HPP
+#ifndef OS_LINUX_OSCONTAINER_LINUX_HPP
+#define OS_LINUX_OSCONTAINER_LINUX_HPP
#include "utilities/globalDefinitions.hpp"
#include "utilities/macros.hpp"
@@ -65,4 +65,4 @@ inline bool OSContainer::is_containerized() {
return _is_containerized;
}
-#endif // OS_LINUX_VM_OSCONTAINER_LINUX_HPP
+#endif // OS_LINUX_OSCONTAINER_LINUX_HPP
diff --git a/src/hotspot/os/linux/osThread_linux.hpp b/src/hotspot/os/linux/osThread_linux.hpp
index c9e53c249a7..01c93f6eb9a 100644
--- a/src/hotspot/os/linux/osThread_linux.hpp
+++ b/src/hotspot/os/linux/osThread_linux.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1999, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1999, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
*
*/
-#ifndef OS_LINUX_VM_OSTHREAD_LINUX_HPP
-#define OS_LINUX_VM_OSTHREAD_LINUX_HPP
+#ifndef OS_LINUX_OSTHREAD_LINUX_HPP
+#define OS_LINUX_OSTHREAD_LINUX_HPP
public:
typedef pid_t thread_id_t;
@@ -132,4 +132,4 @@ private:
// osThread_solaris.hpp 1.24 99/08/27 13:11:54
// End
-#endif // OS_LINUX_VM_OSTHREAD_LINUX_HPP
+#endif // OS_LINUX_OSTHREAD_LINUX_HPP
diff --git a/src/hotspot/os/linux/os_linux.cpp b/src/hotspot/os/linux/os_linux.cpp
index 17a75bd458e..902a4d8fec8 100644
--- a/src/hotspot/os/linux/os_linux.cpp
+++ b/src/hotspot/os/linux/os_linux.cpp
@@ -33,6 +33,7 @@
#include "compiler/disassembler.hpp"
#include "interpreter/interpreter.hpp"
#include "logging/log.hpp"
+#include "logging/logStream.hpp"
#include "memory/allocation.inline.hpp"
#include "memory/filemap.hpp"
#include "oops/oop.inline.hpp"
@@ -1884,7 +1885,7 @@ int os::get_loaded_modules_info(os::LoadedModulesCallbackFunc callback, void *pa
char name[PATH_MAX + 1];
// Parse fields from line
- sscanf(line, UINT64_FORMAT_X "-" UINT64_FORMAT_X " %4s " UINT64_FORMAT_X " %5s " INT64_FORMAT " %s",
+ sscanf(line, UINT64_FORMAT_X "-" UINT64_FORMAT_X " %4s " UINT64_FORMAT_X " %7s " INT64_FORMAT " %s",
&base, &top, permissions, &offset, device, &inode, name);
// Filter by device id '00:00' so that we only get file system mapped files.
@@ -2435,26 +2436,6 @@ void* os::user_handler() {
return CAST_FROM_FN_PTR(void*, UserHandler);
}
-static struct timespec create_semaphore_timespec(unsigned int sec, int nsec) {
- struct timespec ts;
- // Semaphore's are always associated with CLOCK_REALTIME
- os::Posix::clock_gettime(CLOCK_REALTIME, &ts);
- // see os_posix.cpp for discussion on overflow checking
- if (sec >= MAX_SECS) {
- ts.tv_sec += MAX_SECS;
- ts.tv_nsec = 0;
- } else {
- ts.tv_sec += sec;
- ts.tv_nsec += nsec;
- if (ts.tv_nsec >= NANOSECS_PER_SEC) {
- ts.tv_nsec -= NANOSECS_PER_SEC;
- ++ts.tv_sec; // note: this must be <= max_secs
- }
- }
-
- return ts;
-}
-
extern "C" {
typedef void (*sa_handler_t)(int);
typedef void (*sa_sigaction_t)(int, siginfo_t *, void *);
@@ -2780,7 +2761,7 @@ int os::Linux::get_existing_num_nodes() {
// Get the total number of nodes in the system including nodes without memory.
for (node = 0; node <= highest_node_number; node++) {
- if (isnode_in_existing_nodes(node)) {
+ if (is_node_in_existing_nodes(node)) {
num_nodes++;
}
}
@@ -2796,7 +2777,7 @@ size_t os::numa_get_leaf_groups(int *ids, size_t size) {
// node number. If the nodes have been bound explicitly using numactl membind,
// then allocate memory from those nodes only.
for (int node = 0; node <= highest_node_number; node++) {
- if (Linux::isnode_in_bound_nodes((unsigned int)node)) {
+ if (Linux::is_node_in_bound_nodes((unsigned int)node)) {
ids[i++] = node;
}
}
@@ -2899,11 +2880,15 @@ bool os::Linux::libnuma_init() {
libnuma_dlsym(handle, "numa_distance")));
set_numa_get_membind(CAST_TO_FN_PTR(numa_get_membind_func_t,
libnuma_v2_dlsym(handle, "numa_get_membind")));
+ set_numa_get_interleave_mask(CAST_TO_FN_PTR(numa_get_interleave_mask_func_t,
+ libnuma_v2_dlsym(handle, "numa_get_interleave_mask")));
if (numa_available() != -1) {
set_numa_all_nodes((unsigned long*)libnuma_dlsym(handle, "numa_all_nodes"));
set_numa_all_nodes_ptr((struct bitmask **)libnuma_dlsym(handle, "numa_all_nodes_ptr"));
set_numa_nodes_ptr((struct bitmask **)libnuma_dlsym(handle, "numa_nodes_ptr"));
+ set_numa_interleave_bitmask(_numa_get_interleave_mask());
+ set_numa_membind_bitmask(_numa_get_membind());
// Create an index -> node mapping, since nodes are not always consecutive
_nindex_to_node = new (ResourceObj::C_HEAP, mtInternal) GrowableArray(0, true);
rebuild_nindex_to_node_map();
@@ -2929,7 +2914,7 @@ void os::Linux::rebuild_nindex_to_node_map() {
nindex_to_node()->clear();
for (int node = 0; node <= highest_node_number; node++) {
- if (Linux::isnode_in_existing_nodes(node)) {
+ if (Linux::is_node_in_existing_nodes(node)) {
nindex_to_node()->append(node);
}
}
@@ -2966,16 +2951,16 @@ void os::Linux::rebuild_cpu_to_node_map() {
// the closest configured node. Check also if node is bound, i.e. it's allowed
// to allocate memory from the node. If it's not allowed, map cpus in that node
// to the closest node from which memory allocation is allowed.
- if (!isnode_in_configured_nodes(nindex_to_node()->at(i)) ||
- !isnode_in_bound_nodes(nindex_to_node()->at(i))) {
+ if (!is_node_in_configured_nodes(nindex_to_node()->at(i)) ||
+ !is_node_in_bound_nodes(nindex_to_node()->at(i))) {
closest_distance = INT_MAX;
// Check distance from all remaining nodes in the system. Ignore distance
// from itself, from another non-configured node, and from another non-bound
// node.
for (size_t m = 0; m < node_num; m++) {
if (m != i &&
- isnode_in_configured_nodes(nindex_to_node()->at(m)) &&
- isnode_in_bound_nodes(nindex_to_node()->at(m))) {
+ is_node_in_configured_nodes(nindex_to_node()->at(m)) &&
+ is_node_in_bound_nodes(nindex_to_node()->at(m))) {
distance = numa_distance(nindex_to_node()->at(i), nindex_to_node()->at(m));
// If a closest node is found, update. There is always at least one
// configured and bound node in the system so there is always at least
@@ -3030,9 +3015,13 @@ os::Linux::numa_set_bind_policy_func_t os::Linux::_numa_set_bind_policy;
os::Linux::numa_bitmask_isbitset_func_t os::Linux::_numa_bitmask_isbitset;
os::Linux::numa_distance_func_t os::Linux::_numa_distance;
os::Linux::numa_get_membind_func_t os::Linux::_numa_get_membind;
+os::Linux::numa_get_interleave_mask_func_t os::Linux::_numa_get_interleave_mask;
+os::Linux::NumaAllocationPolicy os::Linux::_current_numa_policy;
unsigned long* os::Linux::_numa_all_nodes;
struct bitmask* os::Linux::_numa_all_nodes_ptr;
struct bitmask* os::Linux::_numa_nodes_ptr;
+struct bitmask* os::Linux::_numa_interleave_bitmask;
+struct bitmask* os::Linux::_numa_membind_bitmask;
bool os::pd_uncommit_memory(char* addr, size_t size) {
uintptr_t res = (uintptr_t) ::mmap(addr, size, PROT_NONE,
@@ -4027,14 +4016,6 @@ char* os::pd_attempt_reserve_memory_at(size_t bytes, char* requested_addr) {
}
}
-size_t os::read(int fd, void *buf, unsigned int nBytes) {
- return ::read(fd, buf, nBytes);
-}
-
-size_t os::read_at(int fd, void *buf, unsigned int nBytes, jlong offset) {
- return ::pread(fd, buf, nBytes, offset);
-}
-
// Sleep forever; naked call to OS-specific sleep; use with CAUTION
void os::infinite_sleep() {
while (true) { // sleep forever ...
@@ -4326,7 +4307,7 @@ static bool do_suspend(OSThread* osthread) {
// managed to send the signal and switch to SUSPEND_REQUEST, now wait for SUSPENDED
while (true) {
- if (sr_semaphore.timedwait(create_semaphore_timespec(0, 2 * NANOSECS_PER_MILLISEC))) {
+ if (sr_semaphore.timedwait(2)) {
break;
} else {
// timeout
@@ -4360,7 +4341,7 @@ static void do_resume(OSThread* osthread) {
while (true) {
if (sr_notify(osthread) == 0) {
- if (sr_semaphore.timedwait(create_semaphore_timespec(0, 2 * NANOSECS_PER_MILLISEC))) {
+ if (sr_semaphore.timedwait(2)) {
if (osthread->sr.is_running()) {
return;
}
@@ -4944,6 +4925,74 @@ void os::pd_init_container_support() {
OSContainer::init();
}
+void os::Linux::numa_init() {
+
+ // Java can be invoked as
+ // 1. Without numactl and heap will be allocated/configured on all nodes as
+ // per the system policy.
+ // 2. With numactl --interleave:
+ // Use numa_get_interleave_mask(v2) API to get nodes bitmask. The same
+ // API for membind case bitmask is reset.
+ // Interleave is only hint and Kernel can fallback to other nodes if
+ // no memory is available on the target nodes.
+ // 3. With numactl --membind:
+ // Use numa_get_membind(v2) API to get nodes bitmask. The same API for
+ // interleave case returns bitmask of all nodes.
+ // numa_all_nodes_ptr holds bitmask of all nodes.
+ // numa_get_interleave_mask(v2) and numa_get_membind(v2) APIs returns correct
+ // bitmask when externally configured to run on all or fewer nodes.
+
+ if (!Linux::libnuma_init()) {
+ UseNUMA = false;
+ } else {
+ if ((Linux::numa_max_node() < 1) || Linux::is_bound_to_single_node()) {
+ // If there's only one node (they start from 0) or if the process
+ // is bound explicitly to a single node using membind, disable NUMA.
+ UseNUMA = false;
+ } else {
+
+ LogTarget(Info,os) log;
+ LogStream ls(log);
+
+ Linux::set_configured_numa_policy(Linux::identify_numa_policy());
+
+ struct bitmask* bmp = Linux::_numa_membind_bitmask;
+ const char* numa_mode = "membind";
+
+ if (Linux::is_running_in_interleave_mode()) {
+ bmp = Linux::_numa_interleave_bitmask;
+ numa_mode = "interleave";
+ }
+
+ ls.print("UseNUMA is enabled and invoked in '%s' mode."
+ " Heap will be configured using NUMA memory nodes:", numa_mode);
+
+ for (int node = 0; node <= Linux::numa_max_node(); node++) {
+ if (Linux::_numa_bitmask_isbitset(bmp, node)) {
+ ls.print(" %d", node);
+ }
+ }
+ }
+ }
+
+ if (UseParallelGC && UseNUMA && UseLargePages && !can_commit_large_page_memory()) {
+ // With SHM and HugeTLBFS large pages we cannot uncommit a page, so there's no way
+ // we can make the adaptive lgrp chunk resizing work. If the user specified both
+ // UseNUMA and UseLargePages (or UseSHM/UseHugeTLBFS) on the command line - warn
+ // and disable adaptive resizing.
+ if (UseAdaptiveSizePolicy || UseAdaptiveNUMAChunkSizing) {
+ warning("UseNUMA is not fully compatible with SHM/HugeTLBFS large pages, "
+ "disabling adaptive resizing (-XX:-UseAdaptiveSizePolicy -XX:-UseAdaptiveNUMAChunkSizing)");
+ UseAdaptiveSizePolicy = false;
+ UseAdaptiveNUMAChunkSizing = false;
+ }
+ }
+
+ if (!UseNUMA && ForceNUMA) {
+ UseNUMA = true;
+ }
+}
+
// this is called _after_ the global arguments have been parsed
jint os::init_2(void) {
@@ -4988,32 +5037,7 @@ jint os::init_2(void) {
Linux::glibc_version(), Linux::libpthread_version());
if (UseNUMA) {
- if (!Linux::libnuma_init()) {
- UseNUMA = false;
- } else {
- if ((Linux::numa_max_node() < 1) || Linux::isbound_to_single_node()) {
- // If there's only one node (they start from 0) or if the process
- // is bound explicitly to a single node using membind, disable NUMA.
- UseNUMA = false;
- }
- }
-
- if (UseParallelGC && UseNUMA && UseLargePages && !can_commit_large_page_memory()) {
- // With SHM and HugeTLBFS large pages we cannot uncommit a page, so there's no way
- // we can make the adaptive lgrp chunk resizing work. If the user specified both
- // UseNUMA and UseLargePages (or UseSHM/UseHugeTLBFS) on the command line - warn
- // and disable adaptive resizing.
- if (UseAdaptiveSizePolicy || UseAdaptiveNUMAChunkSizing) {
- warning("UseNUMA is not fully compatible with SHM/HugeTLBFS large pages, "
- "disabling adaptive resizing (-XX:-UseAdaptiveSizePolicy -XX:-UseAdaptiveNUMAChunkSizing)");
- UseAdaptiveSizePolicy = false;
- UseAdaptiveNUMAChunkSizing = false;
- }
- }
-
- if (!UseNUMA && ForceNUMA) {
- UseNUMA = true;
- }
+ Linux::numa_init();
}
if (MaxFDLimit) {
diff --git a/src/hotspot/os/linux/os_linux.hpp b/src/hotspot/os/linux/os_linux.hpp
index 01ba65cd865..7c365ffd2b9 100644
--- a/src/hotspot/os/linux/os_linux.hpp
+++ b/src/hotspot/os/linux/os_linux.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1999, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1999, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
*
*/
-#ifndef OS_LINUX_VM_OS_LINUX_HPP
-#define OS_LINUX_VM_OS_LINUX_HPP
+#ifndef OS_LINUX_OS_LINUX_HPP
+#define OS_LINUX_OS_LINUX_HPP
// Linux_OS defines the interface to Linux operating systems
@@ -211,6 +211,7 @@ class Linux {
// none present
private:
+ static void numa_init();
static void expand_stack_to(address bottom);
typedef int (*sched_getcpu_func_t)(void);
@@ -222,6 +223,7 @@ class Linux {
typedef void (*numa_interleave_memory_func_t)(void *start, size_t size, unsigned long *nodemask);
typedef void (*numa_interleave_memory_v2_func_t)(void *start, size_t size, struct bitmask* mask);
typedef struct bitmask* (*numa_get_membind_func_t)(void);
+ typedef struct bitmask* (*numa_get_interleave_mask_func_t)(void);
typedef void (*numa_set_bind_policy_func_t)(int policy);
typedef int (*numa_bitmask_isbitset_func_t)(struct bitmask *bmp, unsigned int n);
@@ -239,9 +241,12 @@ class Linux {
static numa_bitmask_isbitset_func_t _numa_bitmask_isbitset;
static numa_distance_func_t _numa_distance;
static numa_get_membind_func_t _numa_get_membind;
+ static numa_get_interleave_mask_func_t _numa_get_interleave_mask;
static unsigned long* _numa_all_nodes;
static struct bitmask* _numa_all_nodes_ptr;
static struct bitmask* _numa_nodes_ptr;
+ static struct bitmask* _numa_interleave_bitmask;
+ static struct bitmask* _numa_membind_bitmask;
static void set_sched_getcpu(sched_getcpu_func_t func) { _sched_getcpu = func; }
static void set_numa_node_to_cpus(numa_node_to_cpus_func_t func) { _numa_node_to_cpus = func; }
@@ -255,10 +260,21 @@ class Linux {
static void set_numa_bitmask_isbitset(numa_bitmask_isbitset_func_t func) { _numa_bitmask_isbitset = func; }
static void set_numa_distance(numa_distance_func_t func) { _numa_distance = func; }
static void set_numa_get_membind(numa_get_membind_func_t func) { _numa_get_membind = func; }
+ static void set_numa_get_interleave_mask(numa_get_interleave_mask_func_t func) { _numa_get_interleave_mask = func; }
static void set_numa_all_nodes(unsigned long* ptr) { _numa_all_nodes = ptr; }
static void set_numa_all_nodes_ptr(struct bitmask **ptr) { _numa_all_nodes_ptr = (ptr == NULL ? NULL : *ptr); }
static void set_numa_nodes_ptr(struct bitmask **ptr) { _numa_nodes_ptr = (ptr == NULL ? NULL : *ptr); }
+ static void set_numa_interleave_bitmask(struct bitmask* ptr) { _numa_interleave_bitmask = ptr ; }
+ static void set_numa_membind_bitmask(struct bitmask* ptr) { _numa_membind_bitmask = ptr ; }
static int sched_getcpu_syscall(void);
+
+ enum NumaAllocationPolicy{
+ NotInitialized,
+ Membind,
+ Interleave
+ };
+ static NumaAllocationPolicy _current_numa_policy;
+
public:
static int sched_getcpu() { return _sched_getcpu != NULL ? _sched_getcpu() : -1; }
static int numa_node_to_cpus(int node, unsigned long *buffer, int bufferlen) {
@@ -272,11 +288,33 @@ class Linux {
static int numa_tonode_memory(void *start, size_t size, int node) {
return _numa_tonode_memory != NULL ? _numa_tonode_memory(start, size, node) : -1;
}
+
+ static bool is_running_in_interleave_mode() {
+ return _current_numa_policy == Interleave;
+ }
+
+ static void set_configured_numa_policy(NumaAllocationPolicy numa_policy) {
+ _current_numa_policy = numa_policy;
+ }
+
+ static NumaAllocationPolicy identify_numa_policy() {
+ for (int node = 0; node <= Linux::numa_max_node(); node++) {
+ if (Linux::_numa_bitmask_isbitset(Linux::_numa_interleave_bitmask, node)) {
+ return Interleave;
+ }
+ }
+ return Membind;
+ }
+
static void numa_interleave_memory(void *start, size_t size) {
- // Use v2 api if available
- if (_numa_interleave_memory_v2 != NULL && _numa_all_nodes_ptr != NULL) {
- _numa_interleave_memory_v2(start, size, _numa_all_nodes_ptr);
- } else if (_numa_interleave_memory != NULL && _numa_all_nodes != NULL) {
+ // Prefer v2 API
+ if (_numa_interleave_memory_v2 != NULL) {
+ if (is_running_in_interleave_mode()) {
+ _numa_interleave_memory_v2(start, size, _numa_interleave_bitmask);
+ } else if (_numa_membind_bitmask != NULL) {
+ _numa_interleave_memory_v2(start, size, _numa_membind_bitmask);
+ }
+ } else if (_numa_interleave_memory != NULL) {
_numa_interleave_memory(start, size, _numa_all_nodes);
}
}
@@ -291,14 +329,14 @@ class Linux {
static int get_node_by_cpu(int cpu_id);
static int get_existing_num_nodes();
// Check if numa node is configured (non-zero memory node).
- static bool isnode_in_configured_nodes(unsigned int n) {
+ static bool is_node_in_configured_nodes(unsigned int n) {
if (_numa_bitmask_isbitset != NULL && _numa_all_nodes_ptr != NULL) {
return _numa_bitmask_isbitset(_numa_all_nodes_ptr, n);
} else
return false;
}
// Check if numa node exists in the system (including zero memory nodes).
- static bool isnode_in_existing_nodes(unsigned int n) {
+ static bool is_node_in_existing_nodes(unsigned int n) {
if (_numa_bitmask_isbitset != NULL && _numa_nodes_ptr != NULL) {
return _numa_bitmask_isbitset(_numa_nodes_ptr, n);
} else if (_numa_bitmask_isbitset != NULL && _numa_all_nodes_ptr != NULL) {
@@ -317,16 +355,19 @@ class Linux {
return false;
}
// Check if node is in bound node set.
- static bool isnode_in_bound_nodes(int node) {
- if (_numa_get_membind != NULL && _numa_bitmask_isbitset != NULL) {
- return _numa_bitmask_isbitset(_numa_get_membind(), node);
- } else {
- return false;
+ static bool is_node_in_bound_nodes(int node) {
+ if (_numa_bitmask_isbitset != NULL) {
+ if (is_running_in_interleave_mode()) {
+ return _numa_bitmask_isbitset(_numa_interleave_bitmask, node);
+ } else {
+ return _numa_membind_bitmask != NULL ? _numa_bitmask_isbitset(_numa_membind_bitmask, node) : false;
+ }
}
+ return false;
}
// Check if bound to only one numa node.
// Returns true if bound to a single numa node, otherwise returns false.
- static bool isbound_to_single_node() {
+ static bool is_bound_to_single_node() {
int nodes = 0;
struct bitmask* bmp = NULL;
unsigned int node = 0;
@@ -353,4 +394,4 @@ class Linux {
}
};
-#endif // OS_LINUX_VM_OS_LINUX_HPP
+#endif // OS_LINUX_OS_LINUX_HPP
diff --git a/src/hotspot/os/linux/os_linux.inline.hpp b/src/hotspot/os/linux/os_linux.inline.hpp
index 5a751f0b6d5..17961c21c9f 100644
--- a/src/hotspot/os/linux/os_linux.inline.hpp
+++ b/src/hotspot/os/linux/os_linux.inline.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1999, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1999, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
*
*/
-#ifndef OS_LINUX_VM_OS_LINUX_INLINE_HPP
-#define OS_LINUX_VM_OS_LINUX_INLINE_HPP
+#ifndef OS_LINUX_OS_LINUX_INLINE_HPP
+#define OS_LINUX_OS_LINUX_INLINE_HPP
#include "runtime/os.hpp"
@@ -92,12 +92,6 @@ inline int os::ftruncate(int fd, jlong length) {
inline bool os::numa_has_static_binding() { return true; }
inline bool os::numa_has_group_homing() { return false; }
-inline size_t os::restartable_read(int fd, void *buf, unsigned int nBytes) {
- size_t res;
- RESTARTABLE( (size_t) ::read(fd, buf, (size_t) nBytes), res);
- return res;
-}
-
inline size_t os::write(int fd, const void *buf, unsigned int nBytes) {
size_t res;
RESTARTABLE((size_t) ::write(fd, buf, (size_t) nBytes), res);
@@ -144,4 +138,4 @@ inline void os::exit(int num) {
::exit(num);
}
-#endif // OS_LINUX_VM_OS_LINUX_INLINE_HPP
+#endif // OS_LINUX_OS_LINUX_INLINE_HPP
diff --git a/src/hotspot/os/linux/os_share_linux.hpp b/src/hotspot/os/linux/os_share_linux.hpp
index b233d76b3ea..0c92d3a5571 100644
--- a/src/hotspot/os/linux/os_share_linux.hpp
+++ b/src/hotspot/os/linux/os_share_linux.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1999, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1999, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
*
*/
-#ifndef OS_LINUX_VM_OS_SHARE_LINUX_HPP
-#define OS_LINUX_VM_OS_SHARE_LINUX_HPP
+#ifndef OS_LINUX_OS_SHARE_LINUX_HPP
+#define OS_LINUX_OS_SHARE_LINUX_HPP
// misc
void handle_unexpected_exception(Thread* thread, int sig, siginfo_t* info, address pc, address adjusted_pc);
@@ -33,4 +33,4 @@ void continue_with_dump(void);
#define PROCFILE_LENGTH 128
-#endif // OS_LINUX_VM_OS_SHARE_LINUX_HPP
+#endif // OS_LINUX_OS_SHARE_LINUX_HPP
diff --git a/src/hotspot/os/linux/vmStructs_linux.hpp b/src/hotspot/os/linux/vmStructs_linux.hpp
index d9ac4dc9ec8..818f6bb188f 100644
--- a/src/hotspot/os/linux/vmStructs_linux.hpp
+++ b/src/hotspot/os/linux/vmStructs_linux.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
*
*/
-#ifndef OS_LINUX_VM_VMSTRUCTS_LINUX_HPP
-#define OS_LINUX_VM_VMSTRUCTS_LINUX_HPP
+#ifndef OS_LINUX_VMSTRUCTS_LINUX_HPP
+#define OS_LINUX_VMSTRUCTS_LINUX_HPP
#include
@@ -42,4 +42,4 @@
#define VM_ADDRESSES_OS(declare_address, declare_preprocessor_address, declare_function) \
declare_preprocessor_address("RTLD_DEFAULT", RTLD_DEFAULT)
-#endif // OS_LINUX_VM_VMSTRUCTS_LINUX_HPP
+#endif // OS_LINUX_VMSTRUCTS_LINUX_HPP
diff --git a/src/hotspot/os/linux/waitBarrier_linux.cpp b/src/hotspot/os/linux/waitBarrier_linux.cpp
new file mode 100644
index 00000000000..88cf1e7b3c6
--- /dev/null
+++ b/src/hotspot/os/linux/waitBarrier_linux.cpp
@@ -0,0 +1,80 @@
+/*
+ * Copyright (c) 2019, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ *
+ */
+
+#include "precompiled/precompiled.hpp"
+#include "runtime/orderAccess.hpp"
+#include "runtime/os.hpp"
+#include "waitBarrier_linux.hpp"
+#include
+#include
+
+#define check_with_errno(check_type, cond, msg) \
+ do { \
+ int err = errno; \
+ check_type(cond, "%s: error='%s' (errno=%s)", msg, os::strerror(err), \
+ os::errno_name(err)); \
+} while (false)
+
+#define guarantee_with_errno(cond, msg) check_with_errno(guarantee, cond, msg)
+
+static int futex(volatile int *addr, int futex_op, int op_arg) {
+ return syscall(SYS_futex, addr, futex_op, op_arg, NULL, NULL, 0);
+}
+
+void LinuxWaitBarrier::arm(int barrier_tag) {
+ assert(_futex_barrier == 0, "Should not be already armed: "
+ "_futex_barrier=%d", _futex_barrier);
+ _futex_barrier = barrier_tag;
+ OrderAccess::fence();
+}
+
+void LinuxWaitBarrier::disarm() {
+ assert(_futex_barrier != 0, "Should be armed/non-zero.");
+ _futex_barrier = 0;
+ int s = futex(&_futex_barrier,
+ FUTEX_WAKE_PRIVATE,
+ INT_MAX /* wake a max of this many threads */);
+ guarantee_with_errno(s > -1, "futex FUTEX_WAKE failed");
+}
+
+void LinuxWaitBarrier::wait(int barrier_tag) {
+ assert(barrier_tag != 0, "Trying to wait on disarmed value");
+ if (barrier_tag == 0 ||
+ barrier_tag != _futex_barrier) {
+ OrderAccess::fence();
+ return;
+ }
+ do {
+ int s = futex(&_futex_barrier,
+ FUTEX_WAIT_PRIVATE,
+ barrier_tag /* should be this tag */);
+ guarantee_with_errno((s == 0) ||
+ (s == -1 && errno == EAGAIN) ||
+ (s == -1 && errno == EINTR),
+ "futex FUTEX_WAIT failed");
+ // Return value 0: woken up, but re-check in case of spurious wakeup.
+ // Error EINTR: woken by signal, so re-check and re-wait if necessary.
+ // Error EAGAIN: we are already disarmed and so will pass the check.
+ } while (barrier_tag == _futex_barrier);
+}
diff --git a/src/hotspot/os/linux/waitBarrier_linux.hpp b/src/hotspot/os/linux/waitBarrier_linux.hpp
new file mode 100644
index 00000000000..cdface30ae7
--- /dev/null
+++ b/src/hotspot/os/linux/waitBarrier_linux.hpp
@@ -0,0 +1,48 @@
+/*
+ * Copyright (c) 2019, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ *
+ */
+
+#ifndef OS_LINUX_WAITBARRIER_LINUX_HPP
+#define OS_LINUX_WAITBARRIER_LINUX_HPP
+
+#include "memory/allocation.hpp"
+
+class LinuxWaitBarrier : public CHeapObj {
+ volatile int _futex_barrier;
+
+ // Prevent copying and assignment of LinuxWaitBarrier instances.
+ LinuxWaitBarrier(const LinuxWaitBarrier&);
+ LinuxWaitBarrier& operator=(const LinuxWaitBarrier&);
+
+ public:
+ LinuxWaitBarrier() : _futex_barrier(0) {};
+ ~LinuxWaitBarrier() {};
+
+ const char* description() { return "futex"; }
+
+ void arm(int barrier_tag);
+ void disarm();
+ void wait(int barrier_tag);
+};
+
+#endif // OS_LINUX_WAITBARRIER_LINUX_HPP
diff --git a/src/hotspot/os/posix/os_posix.cpp b/src/hotspot/os/posix/os_posix.cpp
index 17679bf4f03..c0ec207181c 100644
--- a/src/hotspot/os/posix/os_posix.cpp
+++ b/src/hotspot/os/posix/os_posix.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1999, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1999, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -554,6 +554,10 @@ FILE* os::open(int fd, const char* mode) {
return ::fdopen(fd, mode);
}
+ssize_t os::read_at(int fd, void *buf, unsigned int nBytes, jlong offset) {
+ return ::pread(fd, buf, nBytes, offset);
+}
+
void os::flockfile(FILE* fp) {
::flockfile(fp);
}
@@ -1615,11 +1619,9 @@ void os::ThreadCrashProtection::check_crash_protection(int sig,
}
}
-
-// Shared pthread_mutex/cond based PlatformEvent implementation.
-// Not currently usable by Solaris.
-
-#ifndef SOLARIS
+// Shared clock/time and other supporting routines for pthread_mutex/cond
+// initialization. This is enabled on Solaris but only some of the clock/time
+// functionality is actually used there.
// Shared condattr object for use with relative timed-waits. Will be associated
// with CLOCK_MONOTONIC if available to avoid issues with time-of-day changes,
@@ -1657,11 +1659,11 @@ static void pthread_init_common(void) {
// This means we have clockid_t, clock_gettime et al and CLOCK_MONOTONIC
-static int (*_clock_gettime)(clockid_t, struct timespec *);
-static int (*_clock_getres)(clockid_t, struct timespec *);
-static int (*_pthread_condattr_setclock)(pthread_condattr_t *, clockid_t);
+static int (*_clock_gettime)(clockid_t, struct timespec *) = NULL;
+static int (*_clock_getres)(clockid_t, struct timespec *) = NULL;
+static int (*_pthread_condattr_setclock)(pthread_condattr_t *, clockid_t) = NULL;
-static bool _use_clock_monotonic_condattr;
+static bool _use_clock_monotonic_condattr = false;
// Exported clock functionality
@@ -1703,9 +1705,6 @@ void os::Posix::init(void) {
handle = RTLD_DEFAULT;
}
- _clock_gettime = NULL;
- _clock_getres = NULL;
-
int (*clock_getres_func)(clockid_t, struct timespec*) =
(int(*)(clockid_t, struct timespec*))dlsym(handle, "clock_getres");
int (*clock_gettime_func)(clockid_t, struct timespec*) =
@@ -1732,8 +1731,6 @@ void os::Posix::init(void) {
// 2. Check for pthread_condattr_setclock support.
- _pthread_condattr_setclock = NULL;
-
// libpthread is already loaded.
int (*condattr_setclock_func)(pthread_condattr_t*, clockid_t) =
(int (*)(pthread_condattr_t*, clockid_t))dlsym(RTLD_DEFAULT,
@@ -1746,6 +1743,7 @@ void os::Posix::init(void) {
pthread_init_common();
+#ifndef SOLARIS
int status;
if (_pthread_condattr_setclock != NULL && _clock_gettime != NULL) {
if ((status = _pthread_condattr_setclock(_condAttr, CLOCK_MONOTONIC)) != 0) {
@@ -1759,18 +1757,20 @@ void os::Posix::init(void) {
} else {
_use_clock_monotonic_condattr = true;
}
- } else {
- _use_clock_monotonic_condattr = false;
}
+#endif // !SOLARIS
+
}
void os::Posix::init_2(void) {
+#ifndef SOLARIS
log_info(os)("Use of CLOCK_MONOTONIC is%s supported",
(_clock_gettime != NULL ? "" : " not"));
log_info(os)("Use of pthread_condattr_setclock is%s supported",
(_pthread_condattr_setclock != NULL ? "" : " not"));
log_info(os)("Relative timed-wait using pthread_cond_timedwait is associated with %s",
_use_clock_monotonic_condattr ? "CLOCK_MONOTONIC" : "the default clock");
+#endif // !SOLARIS
}
#else // !SUPPORTS_CLOCK_MONOTONIC
@@ -1780,30 +1780,25 @@ void os::Posix::init(void) {
}
void os::Posix::init_2(void) {
+#ifndef SOLARIS
log_info(os)("Use of CLOCK_MONOTONIC is not supported");
log_info(os)("Use of pthread_condattr_setclock is not supported");
log_info(os)("Relative timed-wait using pthread_cond_timedwait is associated with the default clock");
+#endif // !SOLARIS
}
#endif // SUPPORTS_CLOCK_MONOTONIC
-os::PlatformEvent::PlatformEvent() {
- int status = pthread_cond_init(_cond, _condAttr);
- assert_status(status == 0, status, "cond_init");
- status = pthread_mutex_init(_mutex, _mutexAttr);
- assert_status(status == 0, status, "mutex_init");
- _event = 0;
- _nParked = 0;
-}
-
// Utility to convert the given timeout to an absolute timespec
-// (based on the appropriate clock) to use with pthread_cond_timewait.
+// (based on the appropriate clock) to use with pthread_cond_timewait,
+// and sem_timedwait().
// The clock queried here must be the clock used to manage the
-// timeout of the condition variable.
+// timeout of the condition variable or semaphore.
//
// The passed in timeout value is either a relative time in nanoseconds
// or an absolute time in milliseconds. A relative timeout will be
-// associated with CLOCK_MONOTONIC if available; otherwise, or if absolute,
+// associated with CLOCK_MONOTONIC if available, unless the real-time clock
+// is explicitly requested; otherwise, or if absolute,
// the default time-of-day clock will be used.
// Given time is a 64-bit value and the time_t used in the timespec is
@@ -1820,7 +1815,7 @@ os::PlatformEvent::PlatformEvent() {
// Calculate a new absolute time that is "timeout" nanoseconds from "now".
// "unit" indicates the unit of "now_part_sec" (may be nanos or micros depending
-// on which clock is being used).
+// on which clock API is being used).
static void calc_rel_time(timespec* abstime, jlong timeout, jlong now_sec,
jlong now_part_sec, jlong unit) {
time_t max_secs = now_sec + MAX_SECS;
@@ -1845,6 +1840,7 @@ static void calc_rel_time(timespec* abstime, jlong timeout, jlong now_sec,
// Unpack the given deadline in milliseconds since the epoch, into the given timespec.
// The current time in seconds is also passed in to enforce an upper bound as discussed above.
+// This is only used with gettimeofday, when clock_gettime is not available.
static void unpack_abs_time(timespec* abstime, jlong deadline, jlong now_sec) {
time_t max_secs = now_sec + MAX_SECS;
@@ -1861,7 +1857,18 @@ static void unpack_abs_time(timespec* abstime, jlong deadline, jlong now_sec) {
}
}
-static void to_abstime(timespec* abstime, jlong timeout, bool isAbsolute) {
+static jlong millis_to_nanos(jlong millis) {
+ // We have to watch for overflow when converting millis to nanos,
+ // but if millis is that large then we will end up limiting to
+ // MAX_SECS anyway, so just do that here.
+ if (millis / MILLIUNITS > MAX_SECS) {
+ millis = jlong(MAX_SECS) * MILLIUNITS;
+ }
+ return millis * (NANOUNITS / MILLIUNITS);
+}
+
+static void to_abstime(timespec* abstime, jlong timeout,
+ bool isAbsolute, bool isRealtime) {
DEBUG_ONLY(int max_secs = MAX_SECS;)
if (timeout < 0) {
@@ -1870,9 +1877,14 @@ static void to_abstime(timespec* abstime, jlong timeout, bool isAbsolute) {
#ifdef SUPPORTS_CLOCK_MONOTONIC
- if (_use_clock_monotonic_condattr && !isAbsolute) {
+ clockid_t clock = CLOCK_MONOTONIC;
+ // need to ensure we have a runtime check for clock_gettime support
+ if (!isAbsolute && _clock_gettime != NULL) {
+ if (!_use_clock_monotonic_condattr || isRealtime) {
+ clock = CLOCK_REALTIME;
+ }
struct timespec now;
- int status = _clock_gettime(CLOCK_MONOTONIC, &now);
+ int status = _clock_gettime(clock, &now);
assert_status(status == 0, status, "clock_gettime");
calc_rel_time(abstime, timeout, now.tv_sec, now.tv_nsec, NANOUNITS);
DEBUG_ONLY(max_secs += now.tv_sec;)
@@ -1902,6 +1914,19 @@ static void to_abstime(timespec* abstime, jlong timeout, bool isAbsolute) {
assert(abstime->tv_nsec < NANOUNITS, "tv_nsec >= NANOUNITS");
}
+// Create an absolute time 'millis' milliseconds in the future, using the
+// real-time (time-of-day) clock. Used by PosixSemaphore.
+void os::Posix::to_RTC_abstime(timespec* abstime, int64_t millis) {
+ to_abstime(abstime, millis_to_nanos(millis),
+ false /* not absolute */,
+ true /* use real-time clock */);
+}
+
+// Shared pthread_mutex/cond based PlatformEvent implementation.
+// Not currently usable by Solaris.
+
+#ifndef SOLARIS
+
// PlatformEvent
//
// Assumption:
@@ -1917,6 +1942,15 @@ static void to_abstime(timespec* abstime, jlong timeout, bool isAbsolute) {
// Having three states allows for some detection of bad usage - see
// comments on unpark().
+os::PlatformEvent::PlatformEvent() {
+ int status = pthread_cond_init(_cond, _condAttr);
+ assert_status(status == 0, status, "cond_init");
+ status = pthread_mutex_init(_mutex, _mutexAttr);
+ assert_status(status == 0, status, "mutex_init");
+ _event = 0;
+ _nParked = 0;
+}
+
void os::PlatformEvent::park() { // AKA "down()"
// Transitions for _event:
// -1 => -1 : illegal
@@ -1978,13 +2012,7 @@ int os::PlatformEvent::park(jlong millis) {
if (v == 0) { // Do this the hard way by blocking ...
struct timespec abst;
- // We have to watch for overflow when converting millis to nanos,
- // but if millis is that large then we will end up limiting to
- // MAX_SECS anyway, so just do that here.
- if (millis / MILLIUNITS > MAX_SECS) {
- millis = jlong(MAX_SECS) * MILLIUNITS;
- }
- to_abstime(&abst, millis * (NANOUNITS / MILLIUNITS), false);
+ to_abstime(&abst, millis_to_nanos(millis), false, false);
int ret = OS_TIMEOUT;
int status = pthread_mutex_lock(_mutex);
@@ -2102,7 +2130,7 @@ void Parker::park(bool isAbsolute, jlong time) {
return;
}
if (time > 0) {
- to_abstime(&absTime, time, isAbsolute);
+ to_abstime(&absTime, time, isAbsolute, false);
}
// Enter safepoint region
diff --git a/src/hotspot/os/posix/os_posix.hpp b/src/hotspot/os/posix/os_posix.hpp
index b7b91912d03..75973188800 100644
--- a/src/hotspot/os/posix/os_posix.hpp
+++ b/src/hotspot/os/posix/os_posix.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1999, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1999, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -24,8 +24,8 @@
#include "runtime/os.hpp"
-#ifndef OS_POSIX_VM_OS_POSIX_HPP
-#define OS_POSIX_VM_OS_POSIX_HPP
+#ifndef OS_POSIX_OS_POSIX_HPP
+#define OS_POSIX_OS_POSIX_HPP
// File conventions
static const char* file_separator() { return "/"; }
@@ -132,6 +132,8 @@ public:
static bool supports_monotonic_clock() { return false; }
#endif
+
+ static void to_RTC_abstime(timespec* abstime, int64_t millis);
};
/*
@@ -224,4 +226,4 @@ class PlatformParker : public CHeapObj {
#endif // !SOLARIS
-#endif // OS_POSIX_VM_OS_POSIX_HPP
+#endif // OS_POSIX_OS_POSIX_HPP
diff --git a/src/hotspot/os/posix/semaphore_posix.cpp b/src/hotspot/os/posix/semaphore_posix.cpp
index 6e02ea402f6..fa37c7b0fed 100644
--- a/src/hotspot/os/posix/semaphore_posix.cpp
+++ b/src/hotspot/os/posix/semaphore_posix.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -79,6 +79,12 @@ bool PosixSemaphore::trywait() {
return ret == 0;
}
+bool PosixSemaphore::timedwait(int64_t millis) {
+ struct timespec ts;
+ os::Posix::to_RTC_abstime(&ts, millis);
+ return timedwait(ts);
+}
+
bool PosixSemaphore::timedwait(struct timespec ts) {
while (true) {
int result = sem_timedwait(&_semaphore, &ts);
diff --git a/src/hotspot/os/posix/semaphore_posix.hpp b/src/hotspot/os/posix/semaphore_posix.hpp
index 1fda6741fe0..2e408f7a111 100644
--- a/src/hotspot/os/posix/semaphore_posix.hpp
+++ b/src/hotspot/os/posix/semaphore_posix.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2015, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
*
*/
-#ifndef OS_POSIX_VM_SEMAPHORE_POSIX_HPP
-#define OS_POSIX_VM_SEMAPHORE_POSIX_HPP
+#ifndef OS_POSIX_SEMAPHORE_POSIX_HPP
+#define OS_POSIX_SEMAPHORE_POSIX_HPP
#include "memory/allocation.hpp"
@@ -45,9 +45,12 @@ class PosixSemaphore : public CHeapObj {
void wait();
bool trywait();
+ // wait until the given absolute time is reached
bool timedwait(struct timespec ts);
+ // wait until the given relative time elapses
+ bool timedwait(int64_t millis);
};
typedef PosixSemaphore SemaphoreImpl;
-#endif // OS_POSIX_VM_SEMAPHORE_POSIX_HPP
+#endif // OS_POSIX_SEMAPHORE_POSIX_HPP
diff --git a/src/hotspot/os/solaris/c1_globals_solaris.hpp b/src/hotspot/os/solaris/c1_globals_solaris.hpp
index ad2075dbc10..3c01a6cd2dc 100644
--- a/src/hotspot/os/solaris/c1_globals_solaris.hpp
+++ b/src/hotspot/os/solaris/c1_globals_solaris.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2000, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
*
*/
-#ifndef OS_SOLARIS_VM_C1_GLOBALS_SOLARIS_HPP
-#define OS_SOLARIS_VM_C1_GLOBALS_SOLARIS_HPP
+#ifndef OS_SOLARIS_C1_GLOBALS_SOLARIS_HPP
+#define OS_SOLARIS_C1_GLOBALS_SOLARIS_HPP
#include "utilities/globalDefinitions.hpp"
#include "utilities/macros.hpp"
@@ -33,4 +33,4 @@
// client compiler. (see c1_globals.hpp)
//
-#endif // OS_SOLARIS_VM_C1_GLOBALS_SOLARIS_HPP
+#endif // OS_SOLARIS_C1_GLOBALS_SOLARIS_HPP
diff --git a/src/hotspot/os/solaris/c2_globals_solaris.hpp b/src/hotspot/os/solaris/c2_globals_solaris.hpp
index 9909831d983..b4348b34df9 100644
--- a/src/hotspot/os/solaris/c2_globals_solaris.hpp
+++ b/src/hotspot/os/solaris/c2_globals_solaris.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2000, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
*
*/
-#ifndef OS_SOLARIS_VM_C2_GLOBALS_SOLARIS_HPP
-#define OS_SOLARIS_VM_C2_GLOBALS_SOLARIS_HPP
+#ifndef OS_SOLARIS_C2_GLOBALS_SOLARIS_HPP
+#define OS_SOLARIS_C2_GLOBALS_SOLARIS_HPP
#include "utilities/globalDefinitions.hpp"
#include "utilities/macros.hpp"
@@ -33,4 +33,4 @@
// server compiler. (see c2_globals.hpp)
//
-#endif // OS_SOLARIS_VM_C2_GLOBALS_SOLARIS_HPP
+#endif // OS_SOLARIS_C2_GLOBALS_SOLARIS_HPP
diff --git a/src/hotspot/os/solaris/globals_solaris.hpp b/src/hotspot/os/solaris/globals_solaris.hpp
index 685fd4f5c4c..65cb1a02429 100644
--- a/src/hotspot/os/solaris/globals_solaris.hpp
+++ b/src/hotspot/os/solaris/globals_solaris.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2005, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
*
*/
-#ifndef OS_SOLARIS_VM_GLOBALS_SOLARIS_HPP
-#define OS_SOLARIS_VM_GLOBALS_SOLARIS_HPP
+#ifndef OS_SOLARIS_GLOBALS_SOLARIS_HPP
+#define OS_SOLARIS_GLOBALS_SOLARIS_HPP
//
// Defines Solaris specific flags. They are not available on other platforms.
@@ -51,4 +51,4 @@ define_pd_global(bool, UseLargePagesIndividualAllocation, false);
define_pd_global(bool, UseOSErrorReporting, false);
define_pd_global(bool, UseThreadPriorities, false);
-#endif // OS_SOLARIS_VM_GLOBALS_SOLARIS_HPP
+#endif // OS_SOLARIS_GLOBALS_SOLARIS_HPP
diff --git a/src/hotspot/os/solaris/osThread_solaris.hpp b/src/hotspot/os/solaris/osThread_solaris.hpp
index 597750adf5b..d54ebae2dc5 100644
--- a/src/hotspot/os/solaris/osThread_solaris.hpp
+++ b/src/hotspot/os/solaris/osThread_solaris.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
*
*/
-#ifndef OS_SOLARIS_VM_OSTHREAD_SOLARIS_HPP
-#define OS_SOLARIS_VM_OSTHREAD_SOLARIS_HPP
+#ifndef OS_SOLARIS_OSTHREAD_SOLARIS_HPP
+#define OS_SOLARIS_OSTHREAD_SOLARIS_HPP
// This is embedded via include into the class OSThread
public:
@@ -85,4 +85,4 @@ private:
void pd_initialize();
void pd_destroy();
-#endif // OS_SOLARIS_VM_OSTHREAD_SOLARIS_HPP
+#endif // OS_SOLARIS_OSTHREAD_SOLARIS_HPP
diff --git a/src/hotspot/os/solaris/os_share_solaris.hpp b/src/hotspot/os/solaris/os_share_solaris.hpp
index 81df0d27a6d..aa7f613b0d3 100644
--- a/src/hotspot/os/solaris/os_share_solaris.hpp
+++ b/src/hotspot/os/solaris/os_share_solaris.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1999, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1999, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
*
*/
-#ifndef OS_SOLARIS_VM_OS_SHARE_SOLARIS_HPP
-#define OS_SOLARIS_VM_OS_SHARE_SOLARIS_HPP
+#ifndef OS_SOLARIS_OS_SHARE_SOLARIS_HPP
+#define OS_SOLARIS_OS_SHARE_SOLARIS_HPP
// Defines the interfaces to Solaris operating systems that vary across platforms
@@ -39,4 +39,4 @@ void continue_with_dump(void);
#define PROCFILE_LENGTH 128
-#endif // OS_SOLARIS_VM_OS_SHARE_SOLARIS_HPP
+#endif // OS_SOLARIS_OS_SHARE_SOLARIS_HPP
diff --git a/src/hotspot/os/solaris/os_solaris.cpp b/src/hotspot/os/solaris/os_solaris.cpp
index 43a5492021d..05b0df5d678 100644
--- a/src/hotspot/os/solaris/os_solaris.cpp
+++ b/src/hotspot/os/solaris/os_solaris.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -2011,13 +2011,6 @@ void* os::user_handler() {
return CAST_FROM_FN_PTR(void*, UserHandler);
}
-static struct timespec create_semaphore_timespec(unsigned int sec, int nsec) {
- struct timespec ts;
- unpackTime(&ts, false, (sec * NANOSECS_PER_SEC) + nsec);
-
- return ts;
-}
-
extern "C" {
typedef void (*sa_handler_t)(int);
typedef void (*sa_sigaction_t)(int, siginfo_t *, void *);
@@ -2844,33 +2837,6 @@ bool os::can_execute_large_page_memory() {
return true;
}
-// Read calls from inside the vm need to perform state transitions
-size_t os::read(int fd, void *buf, unsigned int nBytes) {
- size_t res;
- JavaThread* thread = (JavaThread*)Thread::current();
- assert(thread->thread_state() == _thread_in_vm, "Assumed _thread_in_vm");
- ThreadBlockInVM tbiv(thread);
- RESTARTABLE(::read(fd, buf, (size_t) nBytes), res);
- return res;
-}
-
-size_t os::read_at(int fd, void *buf, unsigned int nBytes, jlong offset) {
- size_t res;
- JavaThread* thread = (JavaThread*)Thread::current();
- assert(thread->thread_state() == _thread_in_vm, "Assumed _thread_in_vm");
- ThreadBlockInVM tbiv(thread);
- RESTARTABLE(::pread(fd, buf, (size_t) nBytes, offset), res);
- return res;
-}
-
-size_t os::restartable_read(int fd, void *buf, unsigned int nBytes) {
- size_t res;
- assert(((JavaThread*)Thread::current())->thread_state() == _thread_in_native,
- "Assumed _thread_in_native");
- RESTARTABLE(::read(fd, buf, (size_t) nBytes), res);
- return res;
-}
-
// Sleep forever; naked call to OS-specific sleep; use with CAUTION
void os::infinite_sleep() {
while (true) { // sleep forever ...
@@ -3520,7 +3486,7 @@ static bool do_suspend(OSThread* osthread) {
// managed to send the signal and switch to SUSPEND_REQUEST, now wait for SUSPENDED
while (true) {
- if (sr_semaphore.timedwait(create_semaphore_timespec(0, 2000 * NANOSECS_PER_MILLISEC))) {
+ if (sr_semaphore.timedwait(2000)) {
break;
} else {
// timeout
@@ -3554,7 +3520,7 @@ static void do_resume(OSThread* osthread) {
while (true) {
if (sr_notify(osthread) == 0) {
- if (sr_semaphore.timedwait(create_semaphore_timespec(0, 2 * NANOSECS_PER_MILLISEC))) {
+ if (sr_semaphore.timedwait(2)) {
if (osthread->sr.is_running()) {
return;
}
@@ -4139,6 +4105,9 @@ void os::init(void) {
Solaris::_pthread_setname_np = // from 11.3
(Solaris::pthread_setname_np_func_t)dlsym(handle, "pthread_setname_np");
}
+
+ // Shared Posix initialization
+ os::Posix::init();
}
// To install functions for atexit system call
@@ -4245,6 +4214,9 @@ jint os::init_2(void) {
// Init pset_loadavg function pointer
init_pset_getloadavg_ptr();
+ // Shared Posix initialization
+ os::Posix::init_2();
+
return JNI_OK;
}
diff --git a/src/hotspot/os/solaris/os_solaris.hpp b/src/hotspot/os/solaris/os_solaris.hpp
index fa86bc9cd14..2ebbe736f9a 100644
--- a/src/hotspot/os/solaris/os_solaris.hpp
+++ b/src/hotspot/os/solaris/os_solaris.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
*
*/
-#ifndef OS_SOLARIS_VM_OS_SOLARIS_HPP
-#define OS_SOLARIS_VM_OS_SOLARIS_HPP
+#ifndef OS_SOLARIS_OS_SOLARIS_HPP
+#define OS_SOLARIS_OS_SOLARIS_HPP
// Solaris_OS defines the interface to Solaris operating systems
@@ -335,4 +335,4 @@ class PlatformParker : public CHeapObj {
}
};
-#endif // OS_SOLARIS_VM_OS_SOLARIS_HPP
+#endif // OS_SOLARIS_OS_SOLARIS_HPP
diff --git a/src/hotspot/os/solaris/os_solaris.inline.hpp b/src/hotspot/os/solaris/os_solaris.inline.hpp
index 22084022b0f..dc4c9525059 100644
--- a/src/hotspot/os/solaris/os_solaris.inline.hpp
+++ b/src/hotspot/os/solaris/os_solaris.inline.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
*
*/
-#ifndef OS_SOLARIS_VM_OS_SOLARIS_INLINE_HPP
-#define OS_SOLARIS_VM_OS_SOLARIS_INLINE_HPP
+#ifndef OS_SOLARIS_OS_SOLARIS_INLINE_HPP
+#define OS_SOLARIS_OS_SOLARIS_INLINE_HPP
#include "runtime/os.hpp"
@@ -105,4 +105,4 @@ inline void os::exit(int num) {
::exit(num);
}
-#endif // OS_SOLARIS_VM_OS_SOLARIS_INLINE_HPP
+#endif // OS_SOLARIS_OS_SOLARIS_INLINE_HPP
diff --git a/src/hotspot/os/solaris/vmStructs_solaris.hpp b/src/hotspot/os/solaris/vmStructs_solaris.hpp
index c8ba51b502f..7a64aafc34c 100644
--- a/src/hotspot/os/solaris/vmStructs_solaris.hpp
+++ b/src/hotspot/os/solaris/vmStructs_solaris.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
*
*/
-#ifndef OS_SOLARIS_VM_VMSTRUCTS_SOLARIS_HPP
-#define OS_SOLARIS_VM_VMSTRUCTS_SOLARIS_HPP
+#ifndef OS_SOLARIS_VMSTRUCTS_SOLARIS_HPP
+#define OS_SOLARIS_VMSTRUCTS_SOLARIS_HPP
// These are the OS-specific fields, types and integer
// constants required by the Serviceability Agent. This file is
@@ -41,4 +41,4 @@
#define VM_ADDRESSES_OS(declare_address, declare_preprocessor_address, declare_function)
-#endif // OS_SOLARIS_VM_VMSTRUCTS_SOLARIS_HPP
+#endif // OS_SOLARIS_VMSTRUCTS_SOLARIS_HPP
diff --git a/src/hotspot/os/windows/c1_globals_windows.hpp b/src/hotspot/os/windows/c1_globals_windows.hpp
index 41789768d3d..06e6da5d68c 100644
--- a/src/hotspot/os/windows/c1_globals_windows.hpp
+++ b/src/hotspot/os/windows/c1_globals_windows.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2000, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
*
*/
-#ifndef OS_WINDOWS_VM_C1_GLOBALS_WINDOWS_HPP
-#define OS_WINDOWS_VM_C1_GLOBALS_WINDOWS_HPP
+#ifndef OS_WINDOWS_C1_GLOBALS_WINDOWS_HPP
+#define OS_WINDOWS_C1_GLOBALS_WINDOWS_HPP
#include "utilities/globalDefinitions.hpp"
#include "utilities/macros.hpp"
@@ -33,4 +33,4 @@
// client compiler. (see c1_globals.hpp)
//
-#endif // OS_WINDOWS_VM_C1_GLOBALS_WINDOWS_HPP
+#endif // OS_WINDOWS_C1_GLOBALS_WINDOWS_HPP
diff --git a/src/hotspot/os/windows/c2_globals_windows.hpp b/src/hotspot/os/windows/c2_globals_windows.hpp
index a79fbdc7bda..6891113d2cd 100644
--- a/src/hotspot/os/windows/c2_globals_windows.hpp
+++ b/src/hotspot/os/windows/c2_globals_windows.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2000, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
*
*/
-#ifndef OS_WINDOWS_VM_C2_GLOBALS_WINDOWS_HPP
-#define OS_WINDOWS_VM_C2_GLOBALS_WINDOWS_HPP
+#ifndef OS_WINDOWS_C2_GLOBALS_WINDOWS_HPP
+#define OS_WINDOWS_C2_GLOBALS_WINDOWS_HPP
#include "utilities/globalDefinitions.hpp"
#include "utilities/macros.hpp"
@@ -33,4 +33,4 @@
// server compiler. (see c2_globals.hpp)
//
-#endif // OS_WINDOWS_VM_C2_GLOBALS_WINDOWS_HPP
+#endif // OS_WINDOWS_C2_GLOBALS_WINDOWS_HPP
diff --git a/src/hotspot/os/windows/globals_windows.hpp b/src/hotspot/os/windows/globals_windows.hpp
index fca47f23cfb..378ab4dcc75 100644
--- a/src/hotspot/os/windows/globals_windows.hpp
+++ b/src/hotspot/os/windows/globals_windows.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2005, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
*
*/
-#ifndef OS_WINDOWS_VM_GLOBALS_WINDOWS_HPP
-#define OS_WINDOWS_VM_GLOBALS_WINDOWS_HPP
+#ifndef OS_WINDOWS_GLOBALS_WINDOWS_HPP
+#define OS_WINDOWS_GLOBALS_WINDOWS_HPP
//
// Defines Windows specific flags. They are not available on other platforms.
@@ -49,4 +49,4 @@ define_pd_global(bool, UseLargePagesIndividualAllocation, true);
define_pd_global(bool, UseOSErrorReporting, false); // for now.
define_pd_global(bool, UseThreadPriorities, true) ;
-#endif // OS_WINDOWS_VM_GLOBALS_WINDOWS_HPP
+#endif // OS_WINDOWS_GLOBALS_WINDOWS_HPP
diff --git a/src/hotspot/os/windows/iphlp_interface.hpp b/src/hotspot/os/windows/iphlp_interface.hpp
index e69912f09d0..0ebe971a5f1 100644
--- a/src/hotspot/os/windows/iphlp_interface.hpp
+++ b/src/hotspot/os/windows/iphlp_interface.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
*
*/
-#ifndef OS_WINDOWS_VM_IPHLP_INTERFACE_HPP
-#define OS_WINDOWS_VM_IPHLP_INTERFACE_HPP
+#ifndef OS_WINDOWS_IPHLP_INTERFACE_HPP
+#define OS_WINDOWS_IPHLP_INTERFACE_HPP
#include "memory/allocation.hpp"
#include "utilities/macros.hpp"
@@ -48,4 +48,4 @@ class IphlpDll : public AllStatic {
static bool IphlpDetach(void);
};
-#endif // OS_WINDOWS_VM_IPHLP_INTERFACE_HPP
+#endif // OS_WINDOWS_IPHLP_INTERFACE_HPP
diff --git a/src/hotspot/os/windows/osThread_windows.hpp b/src/hotspot/os/windows/osThread_windows.hpp
index af07695aa75..cc3822d79d2 100644
--- a/src/hotspot/os/windows/osThread_windows.hpp
+++ b/src/hotspot/os/windows/osThread_windows.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
*
*/
-#ifndef OS_WINDOWS_VM_OSTHREAD_WINDOWS_HPP
-#define OS_WINDOWS_VM_OSTHREAD_WINDOWS_HPP
+#ifndef OS_WINDOWS_OSTHREAD_WINDOWS_HPP
+#define OS_WINDOWS_OSTHREAD_WINDOWS_HPP
typedef void* HANDLE;
public:
@@ -66,4 +66,4 @@
void pd_initialize();
void pd_destroy();
-#endif // OS_WINDOWS_VM_OSTHREAD_WINDOWS_HPP
+#endif // OS_WINDOWS_OSTHREAD_WINDOWS_HPP
diff --git a/src/hotspot/os/windows/os_share_windows.hpp b/src/hotspot/os/windows/os_share_windows.hpp
index 447fc9438c4..001c1e07f87 100644
--- a/src/hotspot/os/windows/os_share_windows.hpp
+++ b/src/hotspot/os/windows/os_share_windows.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1999, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1999, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -22,9 +22,9 @@
*
*/
-#ifndef OS_WINDOWS_VM_OS_SHARE_WINDOWS_HPP
-#define OS_WINDOWS_VM_OS_SHARE_WINDOWS_HPP
+#ifndef OS_WINDOWS_OS_SHARE_WINDOWS_HPP
+#define OS_WINDOWS_OS_SHARE_WINDOWS_HPP
// Defines the interfaces to Windows operating system that vary across platforms
-#endif // OS_WINDOWS_VM_OS_SHARE_WINDOWS_HPP
+#endif // OS_WINDOWS_OS_SHARE_WINDOWS_HPP
diff --git a/src/hotspot/os/windows/os_windows.cpp b/src/hotspot/os/windows/os_windows.cpp
index c3660678281..217bdefbf7d 100644
--- a/src/hotspot/os/windows/os_windows.cpp
+++ b/src/hotspot/os/windows/os_windows.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -4539,7 +4539,7 @@ jlong os::lseek(int fd, jlong offset, int whence) {
return (jlong) ::_lseeki64(fd, offset, whence);
}
-size_t os::read_at(int fd, void *buf, unsigned int nBytes, jlong offset) {
+ssize_t os::read_at(int fd, void *buf, unsigned int nBytes, jlong offset) {
OVERLAPPED ov;
DWORD nread;
BOOL result;
@@ -4707,9 +4707,6 @@ int os::fsync(int fd) {
static int nonSeekAvailable(int, long *);
static int stdinAvailable(int, long *);
-#define S_ISCHR(mode) (((mode) & _S_IFCHR) == _S_IFCHR)
-#define S_ISFIFO(mode) (((mode) & _S_IFIFO) == _S_IFIFO)
-
// This code is a copy of JDK's sysAvailable
// from src/windows/hpi/src/sys_api_md.c
diff --git a/src/hotspot/os/windows/os_windows.hpp b/src/hotspot/os/windows/os_windows.hpp
index 644582df5e2..e448ce512b6 100644
--- a/src/hotspot/os/windows/os_windows.hpp
+++ b/src/hotspot/os/windows/os_windows.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -22,13 +22,16 @@
*
*/
-#ifndef OS_WINDOWS_VM_OS_WINDOWS_HPP
-#define OS_WINDOWS_VM_OS_WINDOWS_HPP
+#ifndef OS_WINDOWS_OS_WINDOWS_HPP
+#define OS_WINDOWS_OS_WINDOWS_HPP
// Win32_OS defines the interface to windows operating systems
// strtok_s is the Windows thread-safe equivalent of POSIX strtok_r
#define strtok_r strtok_s
+#define S_ISCHR(mode) (((mode) & _S_IFCHR) == _S_IFCHR)
+#define S_ISFIFO(mode) (((mode) & _S_IFIFO) == _S_IFIFO)
+
// Information about the protection of the page at address '0' on this os.
static bool zero_page_read_protected() { return true; }
@@ -184,4 +187,4 @@ class PlatformParker : public CHeapObj {
} ;
-#endif // OS_WINDOWS_VM_OS_WINDOWS_HPP
+#endif // OS_WINDOWS_OS_WINDOWS_HPP
diff --git a/src/hotspot/os/windows/os_windows.inline.hpp b/src/hotspot/os/windows/os_windows.inline.hpp
index 94455cad51b..8515a23350f 100644
--- a/src/hotspot/os/windows/os_windows.inline.hpp
+++ b/src/hotspot/os/windows/os_windows.inline.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
*
*/
-#ifndef OS_WINDOWS_VM_OS_WINDOWS_INLINE_HPP
-#define OS_WINDOWS_VM_OS_WINDOWS_INLINE_HPP
+#ifndef OS_WINDOWS_OS_WINDOWS_INLINE_HPP
+#define OS_WINDOWS_OS_WINDOWS_INLINE_HPP
#include "runtime/os.hpp"
#include "runtime/thread.hpp"
@@ -70,14 +70,6 @@ inline void os::map_stack_shadow_pages(address sp) {
inline bool os::numa_has_static_binding() { return true; }
inline bool os::numa_has_group_homing() { return false; }
-inline size_t os::read(int fd, void *buf, unsigned int nBytes) {
- return ::read(fd, buf, nBytes);
-}
-
-inline size_t os::restartable_read(int fd, void *buf, unsigned int nBytes) {
- return ::read(fd, buf, nBytes);
-}
-
inline size_t os::write(int fd, const void *buf, unsigned int nBytes) {
return ::write(fd, buf, nBytes);
}
@@ -94,4 +86,4 @@ inline void os::exit(int num) {
win32::exit_process_or_thread(win32::EPT_PROCESS, num);
}
-#endif // OS_WINDOWS_VM_OS_WINDOWS_INLINE_HPP
+#endif // OS_WINDOWS_OS_WINDOWS_INLINE_HPP
diff --git a/src/hotspot/os/windows/pdh_interface.hpp b/src/hotspot/os/windows/pdh_interface.hpp
index 06a9526e028..f639d1ce301 100644
--- a/src/hotspot/os/windows/pdh_interface.hpp
+++ b/src/hotspot/os/windows/pdh_interface.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
*
*/
-#ifndef OS_WINDOWS_VM_PDH_INTERFACE_HPP
-#define OS_WINDOWS_VM_PDH_INTERFACE_HPP
+#ifndef OS_WINDOWS_PDH_INTERFACE_HPP
+#define OS_WINDOWS_PDH_INTERFACE_HPP
#include "memory/allocation.hpp"
#include
@@ -61,4 +61,4 @@ class PdhDll: public AllStatic {
static bool PdhDetach();
};
-#endif // OS_WINDOWS_VM_PDH_INTERFACE_HPP
+#endif // OS_WINDOWS_PDH_INTERFACE_HPP
diff --git a/src/hotspot/os/windows/semaphore_windows.hpp b/src/hotspot/os/windows/semaphore_windows.hpp
index cb62acda61f..c72fa52350e 100644
--- a/src/hotspot/os/windows/semaphore_windows.hpp
+++ b/src/hotspot/os/windows/semaphore_windows.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2015, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
*
*/
-#ifndef OS_WINDOWS_VM_SEMAPHORE_WINDOWS_HPP
-#define OS_WINDOWS_VM_SEMAPHORE_WINDOWS_HPP
+#ifndef OS_WINDOWS_SEMAPHORE_WINDOWS_HPP
+#define OS_WINDOWS_SEMAPHORE_WINDOWS_HPP
#include "memory/allocation.hpp"
@@ -49,4 +49,4 @@ class WindowsSemaphore : public CHeapObj {
typedef WindowsSemaphore SemaphoreImpl;
-#endif // OS_WINDOWS_VM_SEMAPHORE_WINDOWS_HPP
+#endif // OS_WINDOWS_SEMAPHORE_WINDOWS_HPP
diff --git a/src/hotspot/os/windows/symbolengine.hpp b/src/hotspot/os/windows/symbolengine.hpp
index c01bd9fc93c..8023cd9ddf0 100644
--- a/src/hotspot/os/windows/symbolengine.hpp
+++ b/src/hotspot/os/windows/symbolengine.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 2019, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2017, SAP SE. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
@@ -23,8 +23,8 @@
*
*/
-#ifndef OS_WINDOWS_VM_SYMBOLENGINE_HPP
-#define OS_WINDOWS_VM_SYMBOLENGINE_HPP
+#ifndef OS_WINDOWS_SYMBOLENGINE_HPP
+#define OS_WINDOWS_SYMBOLENGINE_HPP
class outputStream;
@@ -58,6 +58,4 @@ namespace SymbolEngine {
};
-#endif // #ifndef OS_WINDOWS_VM_SYMBOLENGINE_HPP
-
-
+#endif // OS_WINDOWS_SYMBOLENGINE_HPP
diff --git a/src/hotspot/os/windows/vmStructs_windows.hpp b/src/hotspot/os/windows/vmStructs_windows.hpp
index 6133261f07e..2550e685f16 100644
--- a/src/hotspot/os/windows/vmStructs_windows.hpp
+++ b/src/hotspot/os/windows/vmStructs_windows.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
*
*/
-#ifndef OS_WINDOWS_VM_VMSTRUCTS_WINDOWS_HPP
-#define OS_WINDOWS_VM_VMSTRUCTS_WINDOWS_HPP
+#ifndef OS_WINDOWS_VMSTRUCTS_WINDOWS_HPP
+#define OS_WINDOWS_VMSTRUCTS_WINDOWS_HPP
// These are the OS-specific fields, types and integer
// constants required by the Serviceability Agent. This file is
@@ -39,4 +39,4 @@
#define VM_ADDRESSES_OS(declare_address, declare_preprocessor_address, declare_function)
-#endif // OS_WINDOWS_VM_VMSTRUCTS_WINDOWS_HPP
+#endif // OS_WINDOWS_VMSTRUCTS_WINDOWS_HPP
diff --git a/src/hotspot/os/windows/windbghelp.hpp b/src/hotspot/os/windows/windbghelp.hpp
index f55c55384ec..3a329c5654e 100644
--- a/src/hotspot/os/windows/windbghelp.hpp
+++ b/src/hotspot/os/windows/windbghelp.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2017, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -72,4 +72,3 @@ namespace WindowsDbgHelp {
};
#endif // OS_WINDOWS_WINDBGHELP_HPP
-
diff --git a/src/hotspot/os_cpu/aix_ppc/atomic_aix_ppc.hpp b/src/hotspot/os_cpu/aix_ppc/atomic_aix_ppc.hpp
index a5afdd2b689..f7ceae477ca 100644
--- a/src/hotspot/os_cpu/aix_ppc/atomic_aix_ppc.hpp
+++ b/src/hotspot/os_cpu/aix_ppc/atomic_aix_ppc.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2019, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2012, 2018 SAP SE. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
@@ -23,8 +23,8 @@
*
*/
-#ifndef OS_CPU_AIX_OJDKPPC_VM_ATOMIC_AIX_PPC_HPP
-#define OS_CPU_AIX_OJDKPPC_VM_ATOMIC_AIX_PPC_HPP
+#ifndef OS_CPU_AIX_PPC_ATOMIC_AIX_PPC_HPP
+#define OS_CPU_AIX_PPC_ATOMIC_AIX_PPC_HPP
#ifndef PPC64
#error "Atomic currently only implemented for PPC64"
@@ -417,4 +417,4 @@ inline T Atomic::PlatformCmpxchg<8>::operator()(T exchange_value,
#undef strasm_nobarrier
#undef strasm_nobarrier_clobber_memory
-#endif // OS_CPU_AIX_OJDKPPC_VM_ATOMIC_AIX_PPC_HPP
+#endif // OS_CPU_AIX_PPC_ATOMIC_AIX_PPC_HPP
diff --git a/src/hotspot/os_cpu/aix_ppc/bytes_aix_ppc.inline.hpp b/src/hotspot/os_cpu/aix_ppc/bytes_aix_ppc.inline.hpp
index 2e6ec996b4f..fdf19f76df1 100644
--- a/src/hotspot/os_cpu/aix_ppc/bytes_aix_ppc.inline.hpp
+++ b/src/hotspot/os_cpu/aix_ppc/bytes_aix_ppc.inline.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -22,11 +22,11 @@
*
*/
-#ifndef OS_CPU_AIX_PPC_VM_BYTES_AIX_PPC_INLINE_HPP
-#define OS_CPU_AIX_PPC_VM_BYTES_AIX_PPC_INLINE_HPP
+#ifndef OS_CPU_AIX_PPC_BYTES_AIX_PPC_INLINE_HPP
+#define OS_CPU_AIX_PPC_BYTES_AIX_PPC_INLINE_HPP
#if defined(VM_LITTLE_ENDIAN)
// Aix is not little endian.
#endif // VM_LITTLE_ENDIAN
-#endif // OS_CPU_AIX_PPC_VM_BYTES_AIX_PPC_INLINE_HPP
+#endif // OS_CPU_AIX_PPC_BYTES_AIX_PPC_INLINE_HPP
diff --git a/src/hotspot/os_cpu/aix_ppc/globals_aix_ppc.hpp b/src/hotspot/os_cpu/aix_ppc/globals_aix_ppc.hpp
index 50096a18c53..b946ce15fa0 100644
--- a/src/hotspot/os_cpu/aix_ppc/globals_aix_ppc.hpp
+++ b/src/hotspot/os_cpu/aix_ppc/globals_aix_ppc.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2002, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2019, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2012, 2015 SAP SE. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
@@ -23,8 +23,8 @@
*
*/
-#ifndef OS_CPU_AIX_OJDKPPC_VM_GLOBALS_AIX_PPC_HPP
-#define OS_CPU_AIX_OJDKPPC_VM_GLOBALS_AIX_PPC_HPP
+#ifndef OS_CPU_AIX_PPC_GLOBALS_AIX_PPC_HPP
+#define OS_CPU_AIX_PPC_GLOBALS_AIX_PPC_HPP
// Sets the default values for platform dependent flags used by the runtime system.
// (see globals.hpp)
@@ -41,4 +41,4 @@ define_pd_global(size_t, JVMInvokeMethodSlack, 8192);
// Only used on 64 bit platforms
define_pd_global(size_t, HeapBaseMinAddress, 2*G);
-#endif // OS_CPU_AIX_OJDKPPC_VM_GLOBALS_AIX_PPC_HPP
+#endif // OS_CPU_AIX_PPC_GLOBALS_AIX_PPC_HPP
diff --git a/src/hotspot/os_cpu/aix_ppc/orderAccess_aix_ppc.hpp b/src/hotspot/os_cpu/aix_ppc/orderAccess_aix_ppc.hpp
index d126d42beb7..1aea4e78d93 100644
--- a/src/hotspot/os_cpu/aix_ppc/orderAccess_aix_ppc.hpp
+++ b/src/hotspot/os_cpu/aix_ppc/orderAccess_aix_ppc.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2019, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2012, 2014 SAP SE. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
@@ -23,8 +23,8 @@
*
*/
-#ifndef OS_CPU_AIX_OJDKPPC_VM_ORDERACCESS_AIX_PPC_HPP
-#define OS_CPU_AIX_OJDKPPC_VM_ORDERACCESS_AIX_PPC_HPP
+#ifndef OS_CPU_AIX_PPC_ORDERACCESS_AIX_PPC_HPP
+#define OS_CPU_AIX_PPC_ORDERACCESS_AIX_PPC_HPP
// Included in orderAccess.hpp header file.
@@ -90,4 +90,4 @@ struct OrderAccess::PlatformOrderedLoad
#undef inlasm_eieio
#undef inlasm_isync
-#endif // OS_CPU_AIX_OJDKPPC_VM_ORDERACCESS_AIX_PPC_HPP
+#endif // OS_CPU_AIX_PPC_ORDERACCESS_AIX_PPC_HPP
diff --git a/src/hotspot/os_cpu/aix_ppc/os_aix_ppc.hpp b/src/hotspot/os_cpu/aix_ppc/os_aix_ppc.hpp
index 569445ed284..a3d89699135 100644
--- a/src/hotspot/os_cpu/aix_ppc/os_aix_ppc.hpp
+++ b/src/hotspot/os_cpu/aix_ppc/os_aix_ppc.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2002, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2019, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2012, 2013 SAP SE. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
@@ -23,8 +23,8 @@
*
*/
-#ifndef OS_CPU_AIX_PPC_VM_OS_AIX_PPC_HPP
-#define OS_CPU_AIX_PPC_VM_OS_AIX_PPC_HPP
+#ifndef OS_CPU_AIX_PPC_OS_AIX_PPC_HPP
+#define OS_CPU_AIX_PPC_OS_AIX_PPC_HPP
static void setup_fpu() {}
@@ -36,4 +36,4 @@
static bool platform_print_native_stack(outputStream* st, void* context,
char *buf, int buf_size);
-#endif // OS_CPU_AIX_PPC_VM_OS_AIX_PPC_HPP
+#endif // OS_CPU_AIX_PPC_OS_AIX_PPC_HPP
diff --git a/src/hotspot/os_cpu/aix_ppc/prefetch_aix_ppc.inline.hpp b/src/hotspot/os_cpu/aix_ppc/prefetch_aix_ppc.inline.hpp
index bcbb30d7b92..bcc42836bde 100644
--- a/src/hotspot/os_cpu/aix_ppc/prefetch_aix_ppc.inline.hpp
+++ b/src/hotspot/os_cpu/aix_ppc/prefetch_aix_ppc.inline.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2019, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2012, 2013 SAP SE. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
@@ -23,8 +23,8 @@
*
*/
-#ifndef OS_CPU_AIX_PPC_VM_PREFETCH_AIX_PPC_INLINE_HPP
-#define OS_CPU_AIX_PPC_VM_PREFETCH_AIX_PPC_INLINE_HPP
+#ifndef OS_CPU_AIX_PPC_PREFETCH_AIX_PPC_INLINE_HPP
+#define OS_CPU_AIX_PPC_PREFETCH_AIX_PPC_INLINE_HPP
#include "runtime/prefetch.hpp"
@@ -55,4 +55,4 @@ inline void Prefetch::write(void *loc, intx interval) {
#endif
}
-#endif // OS_CPU_AIX_PPC_VM_PREFETCH_AIX_PPC_INLINE_HPP
+#endif // OS_CPU_AIX_PPC_PREFETCH_AIX_PPC_INLINE_HPP
diff --git a/src/hotspot/os_cpu/aix_ppc/thread_aix_ppc.hpp b/src/hotspot/os_cpu/aix_ppc/thread_aix_ppc.hpp
index 69d59a00720..fe7d64cad50 100644
--- a/src/hotspot/os_cpu/aix_ppc/thread_aix_ppc.hpp
+++ b/src/hotspot/os_cpu/aix_ppc/thread_aix_ppc.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2000, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2019, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2012, 2013 SAP SE. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
@@ -23,8 +23,8 @@
*
*/
-#ifndef OS_CPU_AIX_PPC_VM_THREAD_AIX_PPC_HPP
-#define OS_CPU_AIX_PPC_VM_THREAD_AIX_PPC_HPP
+#ifndef OS_CPU_AIX_PPC_THREAD_AIX_PPC_HPP
+#define OS_CPU_AIX_PPC_THREAD_AIX_PPC_HPP
private:
void pd_initialize() {
@@ -51,4 +51,4 @@
bool pd_get_top_frame_for_profiling(frame* fr_addr, void* ucontext,
bool isInJava);
-#endif // OS_CPU_AIX_PPC_VM_THREAD_AIX_PPC_HPP
+#endif // OS_CPU_AIX_PPC_THREAD_AIX_PPC_HPP
diff --git a/src/hotspot/os_cpu/aix_ppc/vmStructs_aix_ppc.hpp b/src/hotspot/os_cpu/aix_ppc/vmStructs_aix_ppc.hpp
index 1dbcb8a7c93..157d57f8e0f 100644
--- a/src/hotspot/os_cpu/aix_ppc/vmStructs_aix_ppc.hpp
+++ b/src/hotspot/os_cpu/aix_ppc/vmStructs_aix_ppc.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2000, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2019, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2012, 2013 SAP SE. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
@@ -23,8 +23,8 @@
*
*/
-#ifndef OS_CPU_AIX_OJDKPPC_VM_VMSTRUCTS_AIX_PPC_HPP
-#define OS_CPU_AIX_OJDKPPC_VM_VMSTRUCTS_AIX_PPC_HPP
+#ifndef OS_CPU_AIX_PPC_VMSTRUCTS_AIX_PPC_HPP
+#define OS_CPU_AIX_PPC_VMSTRUCTS_AIX_PPC_HPP
// These are the OS and CPU-specific fields, types and integer
// constants required by the Serviceability Agent. This file is
@@ -50,4 +50,4 @@
#define VM_LONG_CONSTANTS_OS_CPU(declare_constant, declare_preprocessor_constant, declare_c1_constant, declare_c2_constant, declare_c2_preprocessor_constant)
-#endif // OS_CPU_AIX_OJDKPPC_VM_VMSTRUCTS_AIX_PPC_HPP
+#endif // OS_CPU_AIX_PPC_VMSTRUCTS_AIX_PPC_HPP
diff --git a/src/hotspot/os_cpu/bsd_x86/atomic_bsd_x86.hpp b/src/hotspot/os_cpu/bsd_x86/atomic_bsd_x86.hpp
index c5ba0dd1c24..26fa7e5c4fd 100644
--- a/src/hotspot/os_cpu/bsd_x86/atomic_bsd_x86.hpp
+++ b/src/hotspot/os_cpu/bsd_x86/atomic_bsd_x86.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1999, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1999, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
*
*/
-#ifndef OS_CPU_BSD_X86_VM_ATOMIC_BSD_X86_HPP
-#define OS_CPU_BSD_X86_VM_ATOMIC_BSD_X86_HPP
+#ifndef OS_CPU_BSD_X86_ATOMIC_BSD_X86_HPP
+#define OS_CPU_BSD_X86_ATOMIC_BSD_X86_HPP
// Implementation of class atomic
@@ -169,4 +169,4 @@ inline void Atomic::PlatformStore<8>::operator()(T store_value,
#endif // AMD64
-#endif // OS_CPU_BSD_X86_VM_ATOMIC_BSD_X86_HPP
+#endif // OS_CPU_BSD_X86_ATOMIC_BSD_X86_HPP
diff --git a/src/hotspot/os_cpu/bsd_x86/bytes_bsd_x86.inline.hpp b/src/hotspot/os_cpu/bsd_x86/bytes_bsd_x86.inline.hpp
index c2256d56fd8..ded9e8f400b 100644
--- a/src/hotspot/os_cpu/bsd_x86/bytes_bsd_x86.inline.hpp
+++ b/src/hotspot/os_cpu/bsd_x86/bytes_bsd_x86.inline.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1999, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1999, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
*
*/
-#ifndef OS_CPU_BSD_X86_VM_BYTES_BSD_X86_INLINE_HPP
-#define OS_CPU_BSD_X86_VM_BYTES_BSD_X86_INLINE_HPP
+#ifndef OS_CPU_BSD_X86_BYTES_BSD_X86_INLINE_HPP
+#define OS_CPU_BSD_X86_BYTES_BSD_X86_INLINE_HPP
#ifdef __APPLE__
#include
@@ -109,4 +109,4 @@ inline u8 Bytes::swap_u8(u8 x) {
}
#endif // !AMD64
-#endif // OS_CPU_BSD_X86_VM_BYTES_BSD_X86_INLINE_HPP
+#endif // OS_CPU_BSD_X86_BYTES_BSD_X86_INLINE_HPP
diff --git a/src/hotspot/os_cpu/bsd_x86/copy_bsd_x86.inline.hpp b/src/hotspot/os_cpu/bsd_x86/copy_bsd_x86.inline.hpp
index 4e71dbd5875..6b8705a1bf2 100644
--- a/src/hotspot/os_cpu/bsd_x86/copy_bsd_x86.inline.hpp
+++ b/src/hotspot/os_cpu/bsd_x86/copy_bsd_x86.inline.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2003, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
*
*/
-#ifndef OS_CPU_BSD_X86_VM_COPY_BSD_X86_INLINE_HPP
-#define OS_CPU_BSD_X86_VM_COPY_BSD_X86_INLINE_HPP
+#ifndef OS_CPU_BSD_X86_COPY_BSD_X86_INLINE_HPP
+#define OS_CPU_BSD_X86_COPY_BSD_X86_INLINE_HPP
static void pd_conjoint_words(const HeapWord* from, HeapWord* to, size_t count) {
#ifdef AMD64
@@ -306,4 +306,4 @@ static void pd_arrayof_conjoint_oops(const HeapWord* from, HeapWord* to, size_t
#endif // AMD64
}
-#endif // OS_CPU_BSD_X86_VM_COPY_BSD_X86_INLINE_HPP
+#endif // OS_CPU_BSD_X86_COPY_BSD_X86_INLINE_HPP
diff --git a/src/hotspot/os_cpu/bsd_x86/globals_bsd_x86.hpp b/src/hotspot/os_cpu/bsd_x86/globals_bsd_x86.hpp
index b17ee1c2f86..a434e329a8b 100644
--- a/src/hotspot/os_cpu/bsd_x86/globals_bsd_x86.hpp
+++ b/src/hotspot/os_cpu/bsd_x86/globals_bsd_x86.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2000, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
*
*/
-#ifndef OS_CPU_BSD_X86_VM_GLOBALS_BSD_X86_HPP
-#define OS_CPU_BSD_X86_VM_GLOBALS_BSD_X86_HPP
+#ifndef OS_CPU_BSD_X86_GLOBALS_BSD_X86_HPP
+#define OS_CPU_BSD_X86_GLOBALS_BSD_X86_HPP
//
// Sets the default values for platform dependent flags used by the runtime system.
@@ -49,4 +49,4 @@ define_pd_global(size_t, JVMInvokeMethodSlack, 8192);
// Used on 64 bit platforms for UseCompressedOops base address
define_pd_global(size_t, HeapBaseMinAddress, 2*G);
-#endif // OS_CPU_BSD_X86_VM_GLOBALS_BSD_X86_HPP
+#endif // OS_CPU_BSD_X86_GLOBALS_BSD_X86_HPP
diff --git a/src/hotspot/os_cpu/bsd_x86/orderAccess_bsd_x86.hpp b/src/hotspot/os_cpu/bsd_x86/orderAccess_bsd_x86.hpp
index 7a59abe3a80..6f54eee501b 100644
--- a/src/hotspot/os_cpu/bsd_x86/orderAccess_bsd_x86.hpp
+++ b/src/hotspot/os_cpu/bsd_x86/orderAccess_bsd_x86.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2003, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
*
*/
-#ifndef OS_CPU_BSD_X86_VM_ORDERACCESS_BSD_X86_HPP
-#define OS_CPU_BSD_X86_VM_ORDERACCESS_BSD_X86_HPP
+#ifndef OS_CPU_BSD_X86_ORDERACCESS_BSD_X86_HPP
+#define OS_CPU_BSD_X86_ORDERACCESS_BSD_X86_HPP
// Included in orderAccess.hpp header file.
@@ -109,4 +109,4 @@ struct OrderAccess::PlatformOrderedStore<8, RELEASE_X_FENCE>
};
#endif // AMD64
-#endif // OS_CPU_BSD_X86_VM_ORDERACCESS_BSD_X86_HPP
+#endif // OS_CPU_BSD_X86_ORDERACCESS_BSD_X86_HPP
diff --git a/src/hotspot/os_cpu/bsd_x86/os_bsd_x86.hpp b/src/hotspot/os_cpu/bsd_x86/os_bsd_x86.hpp
index cf83423bf3d..1326b08725e 100644
--- a/src/hotspot/os_cpu/bsd_x86/os_bsd_x86.hpp
+++ b/src/hotspot/os_cpu/bsd_x86/os_bsd_x86.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1999, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1999, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
*
*/
-#ifndef OS_CPU_BSD_X86_VM_OS_BSD_X86_HPP
-#define OS_CPU_BSD_X86_VM_OS_BSD_X86_HPP
+#ifndef OS_CPU_BSD_X86_OS_BSD_X86_HPP
+#define OS_CPU_BSD_X86_OS_BSD_X86_HPP
static void setup_fpu();
static bool supports_sse();
@@ -36,4 +36,4 @@
// Note: Currently only used in 64 bit Windows implementations
static bool register_code_area(char *low, char *high) { return true; }
-#endif // OS_CPU_BSD_X86_VM_OS_BSD_X86_HPP
+#endif // OS_CPU_BSD_X86_OS_BSD_X86_HPP
diff --git a/src/hotspot/os_cpu/bsd_x86/os_bsd_x86.inline.hpp b/src/hotspot/os_cpu/bsd_x86/os_bsd_x86.inline.hpp
index 145e608f547..b78490caeb5 100644
--- a/src/hotspot/os_cpu/bsd_x86/os_bsd_x86.inline.hpp
+++ b/src/hotspot/os_cpu/bsd_x86/os_bsd_x86.inline.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2011, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
*
*/
-#ifndef OS_CPU_BSD_X86_VM_OS_BSD_X86_INLINE_HPP
-#define OS_CPU_BSD_X86_VM_OS_BSD_X86_INLINE_HPP
+#ifndef OS_CPU_BSD_X86_OS_BSD_X86_INLINE_HPP
+#define OS_CPU_BSD_X86_OS_BSD_X86_INLINE_HPP
#include "runtime/os.hpp"
@@ -43,4 +43,4 @@ inline jlong os::rdtsc() {
#endif // AMD64
}
-#endif // OS_CPU_BSD_X86_VM_OS_BSD_X86_INLINE_HPP
+#endif // OS_CPU_BSD_X86_OS_BSD_X86_INLINE_HPP
diff --git a/src/hotspot/os_cpu/bsd_x86/prefetch_bsd_x86.inline.hpp b/src/hotspot/os_cpu/bsd_x86/prefetch_bsd_x86.inline.hpp
index 6da429be0a8..35bf6bbc4fd 100644
--- a/src/hotspot/os_cpu/bsd_x86/prefetch_bsd_x86.inline.hpp
+++ b/src/hotspot/os_cpu/bsd_x86/prefetch_bsd_x86.inline.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2003, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
*
*/
-#ifndef OS_CPU_BSD_X86_VM_PREFETCH_BSD_X86_INLINE_HPP
-#define OS_CPU_BSD_X86_VM_PREFETCH_BSD_X86_INLINE_HPP
+#ifndef OS_CPU_BSD_X86_PREFETCH_BSD_X86_INLINE_HPP
+#define OS_CPU_BSD_X86_PREFETCH_BSD_X86_INLINE_HPP
#include "runtime/prefetch.hpp"
@@ -44,4 +44,4 @@ inline void Prefetch::write(void *loc, intx interval) {
#endif // AMD64
}
-#endif // OS_CPU_BSD_X86_VM_PREFETCH_BSD_X86_INLINE_HPP
+#endif // OS_CPU_BSD_X86_PREFETCH_BSD_X86_INLINE_HPP
diff --git a/src/hotspot/os_cpu/bsd_x86/thread_bsd_x86.hpp b/src/hotspot/os_cpu/bsd_x86/thread_bsd_x86.hpp
index 2d8d2a07aa9..66db2e79c47 100644
--- a/src/hotspot/os_cpu/bsd_x86/thread_bsd_x86.hpp
+++ b/src/hotspot/os_cpu/bsd_x86/thread_bsd_x86.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2000, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
*
*/
-#ifndef OS_CPU_BSD_X86_VM_THREAD_BSD_X86_HPP
-#define OS_CPU_BSD_X86_VM_THREAD_BSD_X86_HPP
+#ifndef OS_CPU_BSD_X86_THREAD_BSD_X86_HPP
+#define OS_CPU_BSD_X86_THREAD_BSD_X86_HPP
private:
void pd_initialize() {
@@ -66,4 +66,4 @@ public:
static void enable_register_stack_guard() {}
static void disable_register_stack_guard() {}
-#endif // OS_CPU_BSD_X86_VM_THREAD_BSD_X86_HPP
+#endif // OS_CPU_BSD_X86_THREAD_BSD_X86_HPP
diff --git a/src/hotspot/os_cpu/bsd_x86/vmStructs_bsd_x86.hpp b/src/hotspot/os_cpu/bsd_x86/vmStructs_bsd_x86.hpp
index 32d0fdc66a2..fb43541fa77 100644
--- a/src/hotspot/os_cpu/bsd_x86/vmStructs_bsd_x86.hpp
+++ b/src/hotspot/os_cpu/bsd_x86/vmStructs_bsd_x86.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2000, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
*
*/
-#ifndef OS_CPU_BSD_X86_VM_VMSTRUCTS_BSD_X86_HPP
-#define OS_CPU_BSD_X86_VM_VMSTRUCTS_BSD_X86_HPP
+#ifndef OS_CPU_BSD_X86_VMSTRUCTS_BSD_X86_HPP
+#define OS_CPU_BSD_X86_VMSTRUCTS_BSD_X86_HPP
// These are the OS and CPU-specific fields, types and integer
// constants required by the Serviceability Agent. This file is
@@ -50,4 +50,4 @@
#define VM_LONG_CONSTANTS_OS_CPU(declare_constant, declare_preprocessor_constant, declare_c1_constant, declare_c2_constant, declare_c2_preprocessor_constant)
-#endif // OS_CPU_BSD_X86_VM_VMSTRUCTS_BSD_X86_HPP
+#endif // OS_CPU_BSD_X86_VMSTRUCTS_BSD_X86_HPP
diff --git a/src/hotspot/os_cpu/bsd_zero/atomic_bsd_zero.hpp b/src/hotspot/os_cpu/bsd_zero/atomic_bsd_zero.hpp
index c699918f2f8..0d901ebc03a 100644
--- a/src/hotspot/os_cpu/bsd_zero/atomic_bsd_zero.hpp
+++ b/src/hotspot/os_cpu/bsd_zero/atomic_bsd_zero.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2003, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2019, Oracle and/or its affiliates. All rights reserved.
* Copyright 2007, 2008, 2011, 2015, Red Hat, Inc.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
@@ -23,8 +23,8 @@
*
*/
-#ifndef OS_CPU_BSD_ZERO_VM_ATOMIC_BSD_ZERO_HPP
-#define OS_CPU_BSD_ZERO_VM_ATOMIC_BSD_ZERO_HPP
+#ifndef OS_CPU_BSD_ZERO_ATOMIC_BSD_ZERO_HPP
+#define OS_CPU_BSD_ZERO_ATOMIC_BSD_ZERO_HPP
#include "runtime/os.hpp"
@@ -282,4 +282,4 @@ inline void Atomic::PlatformStore<8>::operator()(T store_value,
os::atomic_copy64(reinterpret_cast(&store_value), reinterpret_cast(dest));
}
-#endif // OS_CPU_BSD_ZERO_VM_ATOMIC_BSD_ZERO_HPP
+#endif // OS_CPU_BSD_ZERO_ATOMIC_BSD_ZERO_HPP
diff --git a/src/hotspot/os_cpu/bsd_zero/bytes_bsd_zero.inline.hpp b/src/hotspot/os_cpu/bsd_zero/bytes_bsd_zero.inline.hpp
index 368e90ca6ae..20125b8a0a0 100644
--- a/src/hotspot/os_cpu/bsd_zero/bytes_bsd_zero.inline.hpp
+++ b/src/hotspot/os_cpu/bsd_zero/bytes_bsd_zero.inline.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2003, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
*
*/
-#ifndef OS_CPU_BSD_ZERO_VM_BYTES_BSD_ZERO_INLINE_HPP
-#define OS_CPU_BSD_ZERO_VM_BYTES_BSD_ZERO_INLINE_HPP
+#ifndef OS_CPU_BSD_ZERO_BYTES_BSD_ZERO_INLINE_HPP
+#define OS_CPU_BSD_ZERO_BYTES_BSD_ZERO_INLINE_HPP
// Efficient swapping of data bytes from Java byte
// ordering to native byte ordering and vice versa.
@@ -64,4 +64,4 @@ inline u8 Bytes::swap_u8(u8 x) {
return bswap_64(x);
}
-#endif // OS_CPU_BSD_ZERO_VM_BYTES_BSD_ZERO_INLINE_HPP
+#endif // OS_CPU_BSD_ZERO_BYTES_BSD_ZERO_INLINE_HPP
diff --git a/src/hotspot/os_cpu/bsd_zero/globals_bsd_zero.hpp b/src/hotspot/os_cpu/bsd_zero/globals_bsd_zero.hpp
index 057d4ac1c69..71aa9043e9e 100644
--- a/src/hotspot/os_cpu/bsd_zero/globals_bsd_zero.hpp
+++ b/src/hotspot/os_cpu/bsd_zero/globals_bsd_zero.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2000, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2019, Oracle and/or its affiliates. All rights reserved.
* Copyright 2007, 2008, 2010 Red Hat, Inc.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
@@ -23,8 +23,8 @@
*
*/
-#ifndef OS_CPU_BSD_ZERO_VM_GLOBALS_BSD_ZERO_HPP
-#define OS_CPU_BSD_ZERO_VM_GLOBALS_BSD_ZERO_HPP
+#ifndef OS_CPU_BSD_ZERO_GLOBALS_BSD_ZERO_HPP
+#define OS_CPU_BSD_ZERO_GLOBALS_BSD_ZERO_HPP
//
// Set the default values for platform dependent flags used by the
@@ -44,4 +44,4 @@ define_pd_global(size_t, JVMInvokeMethodSlack, 8192);
// Used on 64 bit platforms for UseCompressedOops base address
define_pd_global(size_t, HeapBaseMinAddress, 2*G);
-#endif // OS_CPU_BSD_ZERO_VM_GLOBALS_BSD_ZERO_HPP
+#endif // OS_CPU_BSD_ZERO_GLOBALS_BSD_ZERO_HPP
diff --git a/src/hotspot/os_cpu/bsd_zero/orderAccess_bsd_zero.hpp b/src/hotspot/os_cpu/bsd_zero/orderAccess_bsd_zero.hpp
index 532b48be46d..44bcca78579 100644
--- a/src/hotspot/os_cpu/bsd_zero/orderAccess_bsd_zero.hpp
+++ b/src/hotspot/os_cpu/bsd_zero/orderAccess_bsd_zero.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2003, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2019, Oracle and/or its affiliates. All rights reserved.
* Copyright 2007, 2008, 2009 Red Hat, Inc.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
@@ -23,8 +23,8 @@
*
*/
-#ifndef OS_CPU_BSD_ZERO_VM_ORDERACCESS_BSD_ZERO_HPP
-#define OS_CPU_BSD_ZERO_VM_ORDERACCESS_BSD_ZERO_HPP
+#ifndef OS_CPU_BSD_ZERO_ORDERACCESS_BSD_ZERO_HPP
+#define OS_CPU_BSD_ZERO_ORDERACCESS_BSD_ZERO_HPP
// Included in orderAccess.hpp header file.
@@ -74,4 +74,4 @@ inline void OrderAccess::acquire() { LIGHT_MEM_BARRIER; }
inline void OrderAccess::release() { LIGHT_MEM_BARRIER; }
inline void OrderAccess::fence() { FULL_MEM_BARRIER; }
-#endif // OS_CPU_BSD_ZERO_VM_ORDERACCESS_BSD_ZERO_HPP
+#endif // OS_CPU_BSD_ZERO_ORDERACCESS_BSD_ZERO_HPP
diff --git a/src/hotspot/os_cpu/bsd_zero/os_bsd_zero.hpp b/src/hotspot/os_cpu/bsd_zero/os_bsd_zero.hpp
index 0e388aa2b2a..511400ae0d2 100644
--- a/src/hotspot/os_cpu/bsd_zero/os_bsd_zero.hpp
+++ b/src/hotspot/os_cpu/bsd_zero/os_bsd_zero.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2003, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2019, Oracle and/or its affiliates. All rights reserved.
* Copyright 2007, 2008, 2010 Red Hat, Inc.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
@@ -23,8 +23,8 @@
*
*/
-#ifndef OS_CPU_BSD_ZERO_VM_OS_BSD_ZERO_HPP
-#define OS_CPU_BSD_ZERO_VM_OS_BSD_ZERO_HPP
+#ifndef OS_CPU_BSD_ZERO_OS_BSD_ZERO_HPP
+#define OS_CPU_BSD_ZERO_OS_BSD_ZERO_HPP
static void setup_fpu() {}
@@ -53,4 +53,4 @@
#endif
}
-#endif // OS_CPU_BSD_ZERO_VM_OS_BSD_ZERO_HPP
+#endif // OS_CPU_BSD_ZERO_OS_BSD_ZERO_HPP
diff --git a/src/hotspot/os_cpu/bsd_zero/prefetch_bsd_zero.inline.hpp b/src/hotspot/os_cpu/bsd_zero/prefetch_bsd_zero.inline.hpp
index 7c4f7867ccf..794f26e8a84 100644
--- a/src/hotspot/os_cpu/bsd_zero/prefetch_bsd_zero.inline.hpp
+++ b/src/hotspot/os_cpu/bsd_zero/prefetch_bsd_zero.inline.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2003, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2019, Oracle and/or its affiliates. All rights reserved.
* Copyright 2007, 2008 Red Hat, Inc.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
@@ -23,8 +23,8 @@
*
*/
-#ifndef OS_CPU_BSD_ZERO_VM_PREFETCH_BSD_ZERO_INLINE_HPP
-#define OS_CPU_BSD_ZERO_VM_PREFETCH_BSD_ZERO_INLINE_HPP
+#ifndef OS_CPU_BSD_ZERO_PREFETCH_BSD_ZERO_INLINE_HPP
+#define OS_CPU_BSD_ZERO_PREFETCH_BSD_ZERO_INLINE_HPP
#include "runtime/prefetch.hpp"
@@ -34,4 +34,4 @@ inline void Prefetch::read(void* loc, intx interval) {
inline void Prefetch::write(void* loc, intx interval) {
}
-#endif // OS_CPU_BSD_ZERO_VM_PREFETCH_BSD_ZERO_INLINE_HPP
+#endif // OS_CPU_BSD_ZERO_PREFETCH_BSD_ZERO_INLINE_HPP
diff --git a/src/hotspot/os_cpu/bsd_zero/thread_bsd_zero.hpp b/src/hotspot/os_cpu/bsd_zero/thread_bsd_zero.hpp
index e37018587ad..3a0484b386b 100644
--- a/src/hotspot/os_cpu/bsd_zero/thread_bsd_zero.hpp
+++ b/src/hotspot/os_cpu/bsd_zero/thread_bsd_zero.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2000, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2019, Oracle and/or its affiliates. All rights reserved.
* Copyright 2007, 2008, 2009, 2010 Red Hat, Inc.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
@@ -23,8 +23,8 @@
*
*/
-#ifndef OS_CPU_BSD_ZERO_VM_THREAD_BSD_ZERO_HPP
-#define OS_CPU_BSD_ZERO_VM_THREAD_BSD_ZERO_HPP
+#ifndef OS_CPU_BSD_ZERO_THREAD_BSD_ZERO_HPP
+#define OS_CPU_BSD_ZERO_THREAD_BSD_ZERO_HPP
private:
ZeroStack _zero_stack;
@@ -116,4 +116,4 @@
static void enable_register_stack_guard() {}
static void disable_register_stack_guard() {}
-#endif // OS_CPU_BSD_ZERO_VM_THREAD_BSD_ZERO_HPP
+#endif // OS_CPU_BSD_ZERO_THREAD_BSD_ZERO_HPP
diff --git a/src/hotspot/os_cpu/bsd_zero/vmStructs_bsd_zero.hpp b/src/hotspot/os_cpu/bsd_zero/vmStructs_bsd_zero.hpp
index 48e40a8e33f..ea3771b7ce6 100644
--- a/src/hotspot/os_cpu/bsd_zero/vmStructs_bsd_zero.hpp
+++ b/src/hotspot/os_cpu/bsd_zero/vmStructs_bsd_zero.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2003, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2019, Oracle and/or its affiliates. All rights reserved.
* Copyright 2007 Red Hat, Inc.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
@@ -23,8 +23,8 @@
*
*/
-#ifndef OS_CPU_BSD_ZERO_VM_VMSTRUCTS_BSD_ZERO_HPP
-#define OS_CPU_BSD_ZERO_VM_VMSTRUCTS_BSD_ZERO_HPP
+#ifndef OS_CPU_BSD_ZERO_VMSTRUCTS_BSD_ZERO_HPP
+#define OS_CPU_BSD_ZERO_VMSTRUCTS_BSD_ZERO_HPP
// These are the OS and CPU-specific fields, types and integer
// constants required by the Serviceability Agent. This file is
@@ -39,4 +39,4 @@
#define VM_LONG_CONSTANTS_OS_CPU(declare_constant, declare_preprocessor_constant, declare_c1_constant, declare_c2_constant, declare_c2_preprocessor_constant)
-#endif // OS_CPU_BSD_ZERO_VM_VMSTRUCTS_BSD_ZERO_HPP
+#endif // OS_CPU_BSD_ZERO_VMSTRUCTS_BSD_ZERO_HPP
diff --git a/src/hotspot/os_cpu/linux_aarch64/atomic_linux_aarch64.hpp b/src/hotspot/os_cpu/linux_aarch64/atomic_linux_aarch64.hpp
index e1f59bb43e5..0c2010fa920 100644
--- a/src/hotspot/os_cpu/linux_aarch64/atomic_linux_aarch64.hpp
+++ b/src/hotspot/os_cpu/linux_aarch64/atomic_linux_aarch64.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1999, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1999, 2019, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2014, Red Hat Inc. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
@@ -23,8 +23,8 @@
*
*/
-#ifndef OS_CPU_LINUX_AARCH64_VM_ATOMIC_LINUX_AARCH64_HPP
-#define OS_CPU_LINUX_AARCH64_VM_ATOMIC_LINUX_AARCH64_HPP
+#ifndef OS_CPU_LINUX_AARCH64_ATOMIC_LINUX_AARCH64_HPP
+#define OS_CPU_LINUX_AARCH64_ATOMIC_LINUX_AARCH64_HPP
#include "vm_version_aarch64.hpp"
@@ -72,4 +72,4 @@ inline T Atomic::PlatformCmpxchg::operator()(T exchange_value,
}
}
-#endif // OS_CPU_LINUX_AARCH64_VM_ATOMIC_LINUX_AARCH64_HPP
+#endif // OS_CPU_LINUX_AARCH64_ATOMIC_LINUX_AARCH64_HPP
diff --git a/src/hotspot/os_cpu/linux_aarch64/bytes_linux_aarch64.inline.hpp b/src/hotspot/os_cpu/linux_aarch64/bytes_linux_aarch64.inline.hpp
index e283f86d10f..b508760cfc4 100644
--- a/src/hotspot/os_cpu/linux_aarch64/bytes_linux_aarch64.inline.hpp
+++ b/src/hotspot/os_cpu/linux_aarch64/bytes_linux_aarch64.inline.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1999, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1999, 2019, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2014, Red Hat Inc. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
@@ -23,8 +23,8 @@
*
*/
-#ifndef OS_CPU_LINUX_AARCH64_VM_BYTES_LINUX_AARCH64_INLINE_HPP
-#define OS_CPU_LINUX_AARCH64_VM_BYTES_LINUX_AARCH64_INLINE_HPP
+#ifndef OS_CPU_LINUX_AARCH64_BYTES_LINUX_AARCH64_INLINE_HPP
+#define OS_CPU_LINUX_AARCH64_BYTES_LINUX_AARCH64_INLINE_HPP
#include
@@ -42,4 +42,4 @@ inline u8 Bytes::swap_u8(u8 x) {
return bswap_64(x);
}
-#endif // OS_CPU_LINUX_AARCH64_VM_BYTES_LINUX_AARCH64_INLINE_HPP
+#endif // OS_CPU_LINUX_AARCH64_BYTES_LINUX_AARCH64_INLINE_HPP
diff --git a/src/hotspot/os_cpu/linux_aarch64/copy_linux_aarch64.inline.hpp b/src/hotspot/os_cpu/linux_aarch64/copy_linux_aarch64.inline.hpp
index 794ab349b0a..ce4dd61e2c7 100644
--- a/src/hotspot/os_cpu/linux_aarch64/copy_linux_aarch64.inline.hpp
+++ b/src/hotspot/os_cpu/linux_aarch64/copy_linux_aarch64.inline.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2003, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2019, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2014, Red Hat Inc. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
@@ -23,8 +23,8 @@
*
*/
-#ifndef OS_CPU_LINUX_AARCH64_VM_COPY_LINUX_AARCH64_INLINE_HPP
-#define OS_CPU_LINUX_AARCH64_VM_COPY_LINUX_AARCH64_INLINE_HPP
+#ifndef OS_CPU_LINUX_AARCH64_COPY_LINUX_AARCH64_INLINE_HPP
+#define OS_CPU_LINUX_AARCH64_COPY_LINUX_AARCH64_INLINE_HPP
#define COPY_SMALL(from, to, count) \
{ \
@@ -185,4 +185,4 @@ static void pd_arrayof_conjoint_oops(const HeapWord* from, HeapWord* to, size_t
_Copy_arrayof_conjoint_jlongs(from, to, count);
}
-#endif // OS_CPU_LINUX_AARCH64_VM_COPY_LINUX_AARCH64_INLINE_HPP
+#endif // OS_CPU_LINUX_AARCH64_COPY_LINUX_AARCH64_INLINE_HPP
diff --git a/src/hotspot/os_cpu/linux_aarch64/globals_linux_aarch64.hpp b/src/hotspot/os_cpu/linux_aarch64/globals_linux_aarch64.hpp
index 947a1e7dea0..6f33872bc23 100644
--- a/src/hotspot/os_cpu/linux_aarch64/globals_linux_aarch64.hpp
+++ b/src/hotspot/os_cpu/linux_aarch64/globals_linux_aarch64.hpp
@@ -23,8 +23,8 @@
*
*/
-#ifndef OS_CPU_LINUX_AARCH64_VM_GLOBALS_LINUX_AARCH64_HPP
-#define OS_CPU_LINUX_AARCH64_VM_GLOBALS_LINUX_AARCH64_HPP
+#ifndef OS_CPU_LINUX_AARCH64_GLOBALS_LINUX_AARCH64_HPP
+#define OS_CPU_LINUX_AARCH64_GLOBALS_LINUX_AARCH64_HPP
// Sets the default values for platform dependent flags used by the runtime system.
// (see globals.hpp)
@@ -43,4 +43,4 @@ define_pd_global(uintx,HeapBaseMinAddress, 2*G);
class Thread;
extern __thread Thread *aarch64_currentThread;
-#endif // OS_CPU_LINUX_AARCH64_VM_GLOBALS_LINUX_AARCH64_HPP
+#endif // OS_CPU_LINUX_AARCH64_GLOBALS_LINUX_AARCH64_HPP
diff --git a/src/hotspot/os_cpu/linux_aarch64/orderAccess_linux_aarch64.hpp b/src/hotspot/os_cpu/linux_aarch64/orderAccess_linux_aarch64.hpp
index b733db19577..052e66630cc 100644
--- a/src/hotspot/os_cpu/linux_aarch64/orderAccess_linux_aarch64.hpp
+++ b/src/hotspot/os_cpu/linux_aarch64/orderAccess_linux_aarch64.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2003, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2019, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2014, Red Hat Inc. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
@@ -23,8 +23,8 @@
*
*/
-#ifndef OS_CPU_LINUX_AARCH64_VM_ORDERACCESS_LINUX_AARCH64_HPP
-#define OS_CPU_LINUX_AARCH64_VM_ORDERACCESS_LINUX_AARCH64_HPP
+#ifndef OS_CPU_LINUX_AARCH64_ORDERACCESS_LINUX_AARCH64_HPP
+#define OS_CPU_LINUX_AARCH64_ORDERACCESS_LINUX_AARCH64_HPP
// Included in orderAccess.hpp header file.
@@ -70,4 +70,4 @@ struct OrderAccess::PlatformOrderedStore
void operator()(T v, volatile T* p) const { release_store(p, v); fence(); }
};
-#endif // OS_CPU_LINUX_AARCH64_VM_ORDERACCESS_LINUX_AARCH64_HPP
+#endif // OS_CPU_LINUX_AARCH64_ORDERACCESS_LINUX_AARCH64_HPP
diff --git a/src/hotspot/os_cpu/linux_aarch64/os_linux_aarch64.hpp b/src/hotspot/os_cpu/linux_aarch64/os_linux_aarch64.hpp
index d2d02efc543..5692f3d7170 100644
--- a/src/hotspot/os_cpu/linux_aarch64/os_linux_aarch64.hpp
+++ b/src/hotspot/os_cpu/linux_aarch64/os_linux_aarch64.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1999, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1999, 2019, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2014, Red Hat Inc. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
@@ -23,8 +23,8 @@
*
*/
-#ifndef OS_CPU_LINUX_AARCH64_VM_OS_LINUX_AARCH64_HPP
-#define OS_CPU_LINUX_AARCH64_VM_OS_LINUX_AARCH64_HPP
+#ifndef OS_CPU_LINUX_AARCH64_OS_LINUX_AARCH64_HPP
+#define OS_CPU_LINUX_AARCH64_OS_LINUX_AARCH64_HPP
static void setup_fpu();
static bool supports_sse();
@@ -42,4 +42,4 @@
*(jlong *) dst = *(const jlong *) src;
}
-#endif // OS_CPU_LINUX_AARCH64_VM_OS_LINUX_AARCH64_HPP
+#endif // OS_CPU_LINUX_AARCH64_OS_LINUX_AARCH64_HPP
diff --git a/src/hotspot/os_cpu/linux_aarch64/os_linux_aarch64.inline.hpp b/src/hotspot/os_cpu/linux_aarch64/os_linux_aarch64.inline.hpp
index 2402d135402..7190e845006 100644
--- a/src/hotspot/os_cpu/linux_aarch64/os_linux_aarch64.inline.hpp
+++ b/src/hotspot/os_cpu/linux_aarch64/os_linux_aarch64.inline.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2019, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2014, Red Hat Inc. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
@@ -23,8 +23,8 @@
*
*/
-#ifndef OS_CPU_LINUX_AARCH64_VM_OS_LINUX_AARCH64_INLINE_HPP
-#define OS_CPU_LINUX_AARCH64_VM_OS_LINUX_AARCH64_INLINE_HPP
+#ifndef OS_CPU_LINUX_AARCH64_OS_LINUX_AARCH64_INLINE_HPP
+#define OS_CPU_LINUX_AARCH64_OS_LINUX_AARCH64_INLINE_HPP
#include "runtime/os.hpp"
@@ -37,4 +37,4 @@ inline jlong os::rdtsc() {
return (jlong)res;
}
-#endif // OS_CPU_LINUX_AARCH64_VM_OS_LINUX_AARCH64_INLINE_HPP
+#endif // OS_CPU_LINUX_AARCH64_OS_LINUX_AARCH64_INLINE_HPP
diff --git a/src/hotspot/os_cpu/linux_aarch64/prefetch_linux_aarch64.inline.hpp b/src/hotspot/os_cpu/linux_aarch64/prefetch_linux_aarch64.inline.hpp
index 687eb50babe..70c12f3ee8d 100644
--- a/src/hotspot/os_cpu/linux_aarch64/prefetch_linux_aarch64.inline.hpp
+++ b/src/hotspot/os_cpu/linux_aarch64/prefetch_linux_aarch64.inline.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2003, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2019, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2014, Red Hat Inc. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
@@ -23,8 +23,8 @@
*
*/
-#ifndef OS_CPU_LINUX_AARCH64_VM_PREFETCH_LINUX_AARCH64_INLINE_HPP
-#define OS_CPU_LINUX_AARCH64_VM_PREFETCH_LINUX_AARCH64_INLINE_HPP
+#ifndef OS_CPU_LINUX_AARCH64_PREFETCH_LINUX_AARCH64_INLINE_HPP
+#define OS_CPU_LINUX_AARCH64_PREFETCH_LINUX_AARCH64_INLINE_HPP
#include "runtime/prefetch.hpp"
@@ -43,4 +43,4 @@ inline void Prefetch::write(void *loc, intx interval) {
#endif
}
-#endif // OS_CPU_LINUX_AARCH64_VM_PREFETCH_LINUX_AARCH64_INLINE_HPP
+#endif // OS_CPU_LINUX_AARCH64_PREFETCH_LINUX_AARCH64_INLINE_HPP
diff --git a/src/hotspot/os_cpu/linux_aarch64/thread_linux_aarch64.hpp b/src/hotspot/os_cpu/linux_aarch64/thread_linux_aarch64.hpp
index a2261b19062..35b64a91113 100644
--- a/src/hotspot/os_cpu/linux_aarch64/thread_linux_aarch64.hpp
+++ b/src/hotspot/os_cpu/linux_aarch64/thread_linux_aarch64.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2000, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2019, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2014, Red Hat Inc. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
@@ -23,8 +23,8 @@
*
*/
-#ifndef OS_CPU_LINUX_AARCH64_VM_THREAD_LINUX_AARCH64_HPP
-#define OS_CPU_LINUX_AARCH64_VM_THREAD_LINUX_AARCH64_HPP
+#ifndef OS_CPU_LINUX_AARCH64_THREAD_LINUX_AARCH64_HPP
+#define OS_CPU_LINUX_AARCH64_THREAD_LINUX_AARCH64_HPP
private:
#ifdef ASSERT
@@ -77,4 +77,4 @@ public:
static void enable_register_stack_guard() {}
static void disable_register_stack_guard() {}
-#endif // OS_CPU_LINUX_AARCH64_VM_THREAD_LINUX_AARCH64_HPP
+#endif // OS_CPU_LINUX_AARCH64_THREAD_LINUX_AARCH64_HPP
diff --git a/src/hotspot/os_cpu/linux_aarch64/vmStructs_linux_aarch64.hpp b/src/hotspot/os_cpu/linux_aarch64/vmStructs_linux_aarch64.hpp
index fa5885ca62a..f2ad002996b 100644
--- a/src/hotspot/os_cpu/linux_aarch64/vmStructs_linux_aarch64.hpp
+++ b/src/hotspot/os_cpu/linux_aarch64/vmStructs_linux_aarch64.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2000, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2019, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2014, Red Hat Inc. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
@@ -23,8 +23,8 @@
*
*/
-#ifndef OS_CPU_LINUX_AARCH64_VM_VMSTRUCTS_LINUX_AARCH64_HPP
-#define OS_CPU_LINUX_AARCH64_VM_VMSTRUCTS_LINUX_AARCH64_HPP
+#ifndef OS_CPU_LINUX_AARCH64_VMSTRUCTS_LINUX_AARCH64_HPP
+#define OS_CPU_LINUX_AARCH64_VMSTRUCTS_LINUX_AARCH64_HPP
// These are the OS and CPU-specific fields, types and integer
// constants required by the Serviceability Agent. This file is
@@ -52,4 +52,4 @@
#define VM_LONG_CONSTANTS_OS_CPU(declare_constant, declare_preprocessor_constant, declare_c1_constant, declare_c2_constant, declare_c2_preprocessor_constant)
-#endif // OS_CPU_LINUX_AARCH64_VM_VMSTRUCTS_LINUX_AARCH64_HPP
+#endif // OS_CPU_LINUX_AARCH64_VMSTRUCTS_LINUX_AARCH64_HPP
diff --git a/src/hotspot/os_cpu/linux_arm/atomic_linux_arm.hpp b/src/hotspot/os_cpu/linux_arm/atomic_linux_arm.hpp
index eccf35b35bc..637ca83ee77 100644
--- a/src/hotspot/os_cpu/linux_arm/atomic_linux_arm.hpp
+++ b/src/hotspot/os_cpu/linux_arm/atomic_linux_arm.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2008, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2008, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
*
*/
-#ifndef OS_CPU_LINUX_ARM_VM_ATOMIC_LINUX_ARM_HPP
-#define OS_CPU_LINUX_ARM_VM_ATOMIC_LINUX_ARM_HPP
+#ifndef OS_CPU_LINUX_ARM_ATOMIC_LINUX_ARM_HPP
+#define OS_CPU_LINUX_ARM_ATOMIC_LINUX_ARM_HPP
#include "runtime/os.hpp"
#include "vm_version_arm.hpp"
@@ -137,4 +137,4 @@ inline T Atomic::PlatformCmpxchg<8>::operator()(T exchange_value,
return cmpxchg_using_helper(reorder_cmpxchg_long_func, exchange_value, dest, compare_value);
}
-#endif // OS_CPU_LINUX_ARM_VM_ATOMIC_LINUX_ARM_HPP
+#endif // OS_CPU_LINUX_ARM_ATOMIC_LINUX_ARM_HPP
diff --git a/src/hotspot/os_cpu/linux_arm/bytes_linux_arm.inline.hpp b/src/hotspot/os_cpu/linux_arm/bytes_linux_arm.inline.hpp
index df0f0b834b1..41642b17bb7 100644
--- a/src/hotspot/os_cpu/linux_arm/bytes_linux_arm.inline.hpp
+++ b/src/hotspot/os_cpu/linux_arm/bytes_linux_arm.inline.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2008, 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2008, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
*
*/
-#ifndef OS_CPU_LINUX_ARM_VM_BYTES_LINUX_ARM_INLINE_HPP
-#define OS_CPU_LINUX_ARM_VM_BYTES_LINUX_ARM_INLINE_HPP
+#ifndef OS_CPU_LINUX_ARM_BYTES_LINUX_ARM_INLINE_HPP
+#define OS_CPU_LINUX_ARM_BYTES_LINUX_ARM_INLINE_HPP
#include
@@ -44,4 +44,4 @@ inline u8 Bytes::swap_u8(u8 x) {
return bswap_64(x);
}
-#endif // OS_CPU_LINUX_ARM_VM_BYTES_LINUX_ARM_INLINE_HPP
+#endif // OS_CPU_LINUX_ARM_BYTES_LINUX_ARM_INLINE_HPP
diff --git a/src/hotspot/os_cpu/linux_arm/copy_linux_arm.inline.hpp b/src/hotspot/os_cpu/linux_arm/copy_linux_arm.inline.hpp
index 06d91b928e1..78ed14cf2ca 100644
--- a/src/hotspot/os_cpu/linux_arm/copy_linux_arm.inline.hpp
+++ b/src/hotspot/os_cpu/linux_arm/copy_linux_arm.inline.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2008, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2008, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
*
*/
-#ifndef OS_CPU_LINUX_ARM_VM_COPY_LINUX_ARM_INLINE_HPP
-#define OS_CPU_LINUX_ARM_VM_COPY_LINUX_ARM_INLINE_HPP
+#ifndef OS_CPU_LINUX_ARM_COPY_LINUX_ARM_INLINE_HPP
+#define OS_CPU_LINUX_ARM_COPY_LINUX_ARM_INLINE_HPP
static void pd_conjoint_words(const HeapWord* from, HeapWord* to, size_t count) {
_Copy_conjoint_words(from, to, count * HeapWordSize);
@@ -92,4 +92,4 @@ static void pd_arrayof_conjoint_oops(const HeapWord* from, HeapWord* to, size_t
pd_conjoint_oops_atomic((const oop*)from, (oop*)to, count);
}
-#endif // OS_CPU_LINUX_ARM_VM_COPY_LINUX_ARM_INLINE_HPP
+#endif // OS_CPU_LINUX_ARM_COPY_LINUX_ARM_INLINE_HPP
diff --git a/src/hotspot/os_cpu/linux_arm/globals_linux_arm.hpp b/src/hotspot/os_cpu/linux_arm/globals_linux_arm.hpp
index 497322093a4..4f2d3918a4d 100644
--- a/src/hotspot/os_cpu/linux_arm/globals_linux_arm.hpp
+++ b/src/hotspot/os_cpu/linux_arm/globals_linux_arm.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2008, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2008, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
*
*/
-#ifndef OS_CPU_LINUX_ARM_VM_GLOBALS_LINUX_ARM_HPP
-#define OS_CPU_LINUX_ARM_VM_GLOBALS_LINUX_ARM_HPP
+#ifndef OS_CPU_LINUX_ARM_GLOBALS_LINUX_ARM_HPP
+#define OS_CPU_LINUX_ARM_GLOBALS_LINUX_ARM_HPP
//
// Sets the default values for platform dependent flags used by the runtime system.
@@ -40,4 +40,4 @@ define_pd_global(size_t, JVMInvokeMethodSlack, 8192);
// Used on 64 bit platforms for UseCompressedOops base address or CDS
define_pd_global(size_t, HeapBaseMinAddress, 2*G);
-#endif // OS_CPU_LINUX_ARM_VM_GLOBALS_LINUX_ARM_HPP
+#endif // OS_CPU_LINUX_ARM_GLOBALS_LINUX_ARM_HPP
diff --git a/src/hotspot/os_cpu/linux_arm/orderAccess_linux_arm.hpp b/src/hotspot/os_cpu/linux_arm/orderAccess_linux_arm.hpp
index a4557bf1fd3..6125bd5d040 100644
--- a/src/hotspot/os_cpu/linux_arm/orderAccess_linux_arm.hpp
+++ b/src/hotspot/os_cpu/linux_arm/orderAccess_linux_arm.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2008, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2008, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
*
*/
-#ifndef OS_CPU_LINUX_ARM_VM_ORDERACCESS_LINUX_ARM_HPP
-#define OS_CPU_LINUX_ARM_VM_ORDERACCESS_LINUX_ARM_HPP
+#ifndef OS_CPU_LINUX_ARM_ORDERACCESS_LINUX_ARM_HPP
+#define OS_CPU_LINUX_ARM_ORDERACCESS_LINUX_ARM_HPP
// Included in orderAccess.hpp header file.
@@ -102,4 +102,4 @@ inline void OrderAccess::storeload() { dmb_sy(); }
inline void OrderAccess::release() { dmb_sy(); }
inline void OrderAccess::fence() { dmb_sy(); }
-#endif // OS_CPU_LINUX_ARM_VM_ORDERACCESS_LINUX_ARM_HPP
+#endif // OS_CPU_LINUX_ARM_ORDERACCESS_LINUX_ARM_HPP
diff --git a/src/hotspot/os_cpu/linux_arm/os_linux_arm.hpp b/src/hotspot/os_cpu/linux_arm/os_linux_arm.hpp
index a2b6e4a43bf..9c5d629b095 100644
--- a/src/hotspot/os_cpu/linux_arm/os_linux_arm.hpp
+++ b/src/hotspot/os_cpu/linux_arm/os_linux_arm.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2008, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2008, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
*
*/
-#ifndef OS_CPU_LINUX_ARM_VM_OS_LINUX_ARM_HPP
-#define OS_CPU_LINUX_ARM_VM_OS_LINUX_ARM_HPP
+#ifndef OS_CPU_LINUX_ARM_OS_LINUX_ARM_HPP
+#define OS_CPU_LINUX_ARM_OS_LINUX_ARM_HPP
#ifndef __thumb__
enum {
@@ -70,4 +70,4 @@
int32_t exchange_value,
volatile int32_t *dest);
-#endif // OS_CPU_LINUX_ARM_VM_OS_LINUX_ARM_HPP
+#endif // OS_CPU_LINUX_ARM_OS_LINUX_ARM_HPP
diff --git a/src/hotspot/os_cpu/linux_arm/prefetch_linux_arm.inline.hpp b/src/hotspot/os_cpu/linux_arm/prefetch_linux_arm.inline.hpp
index 5fa93c92024..e75a8c5c90d 100644
--- a/src/hotspot/os_cpu/linux_arm/prefetch_linux_arm.inline.hpp
+++ b/src/hotspot/os_cpu/linux_arm/prefetch_linux_arm.inline.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2008, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2008, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
*
*/
-#ifndef OS_CPU_LINUX_ARM_VM_PREFETCH_LINUX_ARM_INLINE_HPP
-#define OS_CPU_LINUX_ARM_VM_PREFETCH_LINUX_ARM_INLINE_HPP
+#ifndef OS_CPU_LINUX_ARM_PREFETCH_LINUX_ARM_INLINE_HPP
+#define OS_CPU_LINUX_ARM_PREFETCH_LINUX_ARM_INLINE_HPP
#include "runtime/prefetch.hpp"
@@ -37,4 +37,4 @@ inline void Prefetch::write(void *loc, intx interval) {
// Not available on 32-bit ARM (prior to ARMv7 with MP extensions)
}
-#endif // OS_CPU_LINUX_ARM_VM_PREFETCH_LINUX_ARM_INLINE_HPP
+#endif // OS_CPU_LINUX_ARM_PREFETCH_LINUX_ARM_INLINE_HPP
diff --git a/src/hotspot/os_cpu/linux_arm/thread_linux_arm.hpp b/src/hotspot/os_cpu/linux_arm/thread_linux_arm.hpp
index 1fe4ca9b710..2da1e800868 100644
--- a/src/hotspot/os_cpu/linux_arm/thread_linux_arm.hpp
+++ b/src/hotspot/os_cpu/linux_arm/thread_linux_arm.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2008, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2008, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
*
*/
-#ifndef OS_CPU_LINUX_ARM_VM_THREAD_LINUX_ARM_HPP
-#define OS_CPU_LINUX_ARM_VM_THREAD_LINUX_ARM_HPP
+#ifndef OS_CPU_LINUX_ARM_THREAD_LINUX_ARM_HPP
+#define OS_CPU_LINUX_ARM_THREAD_LINUX_ARM_HPP
private:
// The following thread-local variables replicate corresponding global variables.
@@ -84,4 +84,4 @@ public:
static void enable_register_stack_guard() {}
static void disable_register_stack_guard() {}
-#endif // OS_CPU_LINUX_ARM_VM_THREAD_LINUX_ARM_HPP
+#endif // OS_CPU_LINUX_ARM_THREAD_LINUX_ARM_HPP
diff --git a/src/hotspot/os_cpu/linux_arm/vmStructs_linux_arm.hpp b/src/hotspot/os_cpu/linux_arm/vmStructs_linux_arm.hpp
index e34d06d12d3..9b4bd0faf0a 100644
--- a/src/hotspot/os_cpu/linux_arm/vmStructs_linux_arm.hpp
+++ b/src/hotspot/os_cpu/linux_arm/vmStructs_linux_arm.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2008, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2008, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
*
*/
-#ifndef OS_CPU_LINUX_ARM_VM_VMSTRUCTS_LINUX_ARM_HPP
-#define OS_CPU_LINUX_ARM_VM_VMSTRUCTS_LINUX_ARM_HPP
+#ifndef OS_CPU_LINUX_ARM_VMSTRUCTS_LINUX_ARM_HPP
+#define OS_CPU_LINUX_ARM_VMSTRUCTS_LINUX_ARM_HPP
// These are the OS and CPU-specific fields, types and integer
// constants required by the Serviceability Agent. This file is
@@ -50,4 +50,4 @@
#define VM_LONG_CONSTANTS_OS_CPU(declare_constant, declare_preprocessor_constant, declare_c1_constant, declare_c2_constant, declare_c2_preprocessor_constant)
-#endif // OS_CPU_LINUX_ARM_VM_VMSTRUCTS_LINUX_ARM_HPP
+#endif // OS_CPU_LINUX_ARM_VMSTRUCTS_LINUX_ARM_HPP
diff --git a/src/hotspot/os_cpu/linux_ppc/atomic_linux_ppc.hpp b/src/hotspot/os_cpu/linux_ppc/atomic_linux_ppc.hpp
index 2d008a1ff6d..591f3aaa32b 100644
--- a/src/hotspot/os_cpu/linux_ppc/atomic_linux_ppc.hpp
+++ b/src/hotspot/os_cpu/linux_ppc/atomic_linux_ppc.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2019, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2012, 2018 SAP SE. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
@@ -23,8 +23,8 @@
*
*/
-#ifndef OS_CPU_LINUX_PPC_VM_ATOMIC_LINUX_PPC_HPP
-#define OS_CPU_LINUX_PPC_VM_ATOMIC_LINUX_PPC_HPP
+#ifndef OS_CPU_LINUX_PPC_ATOMIC_LINUX_PPC_HPP
+#define OS_CPU_LINUX_PPC_ATOMIC_LINUX_PPC_HPP
#ifndef PPC64
#error "Atomic currently only implemented for PPC64"
@@ -415,4 +415,4 @@ inline T Atomic::PlatformCmpxchg<8>::operator()(T exchange_value,
#undef strasm_nobarrier
#undef strasm_nobarrier_clobber_memory
-#endif // OS_CPU_LINUX_PPC_VM_ATOMIC_LINUX_PPC_HPP
+#endif // OS_CPU_LINUX_PPC_ATOMIC_LINUX_PPC_HPP
diff --git a/src/hotspot/os_cpu/linux_ppc/bytes_linux_ppc.inline.hpp b/src/hotspot/os_cpu/linux_ppc/bytes_linux_ppc.inline.hpp
index d1a9e98d677..5e11244940e 100644
--- a/src/hotspot/os_cpu/linux_ppc/bytes_linux_ppc.inline.hpp
+++ b/src/hotspot/os_cpu/linux_ppc/bytes_linux_ppc.inline.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2002, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2019, Oracle and/or its affiliates. All rights reserved.
* Copyright 2014 Google Inc. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
@@ -23,8 +23,8 @@
*
*/
-#ifndef OS_CPU_LINUX_PPC_VM_BYTES_LINUX_PPC_INLINE_HPP
-#define OS_CPU_LINUX_PPC_VM_BYTES_LINUX_PPC_INLINE_HPP
+#ifndef OS_CPU_LINUX_PPC_BYTES_LINUX_PPC_INLINE_HPP
+#define OS_CPU_LINUX_PPC_BYTES_LINUX_PPC_INLINE_HPP
#if defined(VM_LITTLE_ENDIAN)
#include
@@ -36,4 +36,4 @@ inline u4 Bytes::swap_u4(u4 x) { return bswap_32(x); }
inline u8 Bytes::swap_u8(u8 x) { return bswap_64(x); }
#endif // VM_LITTLE_ENDIAN
-#endif // OS_CPU_LINUX_PPC_VM_BYTES_LINUX_PPC_INLINE_HPP
+#endif // OS_CPU_LINUX_PPC_BYTES_LINUX_PPC_INLINE_HPP
diff --git a/src/hotspot/os_cpu/linux_ppc/globals_linux_ppc.hpp b/src/hotspot/os_cpu/linux_ppc/globals_linux_ppc.hpp
index 3787aeb1168..182c55b9f96 100644
--- a/src/hotspot/os_cpu/linux_ppc/globals_linux_ppc.hpp
+++ b/src/hotspot/os_cpu/linux_ppc/globals_linux_ppc.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2002, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2019, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2012, 2015 SAP SE. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
@@ -23,8 +23,8 @@
*
*/
-#ifndef OS_CPU_LINUX_PPC_VM_GLOBALS_LINUX_PPC_HPP
-#define OS_CPU_LINUX_PPC_VM_GLOBALS_LINUX_PPC_HPP
+#ifndef OS_CPU_LINUX_PPC_GLOBALS_LINUX_PPC_HPP
+#define OS_CPU_LINUX_PPC_GLOBALS_LINUX_PPC_HPP
// Sets the default values for platform dependent flags used by the runtime system.
// (see globals.hpp)
@@ -41,4 +41,4 @@ define_pd_global(size_t, JVMInvokeMethodSlack, 8192);
// Only used on 64 bit platforms
define_pd_global(size_t, HeapBaseMinAddress, 2*G);
-#endif // OS_CPU_LINUX_PPC_VM_GLOBALS_LINUX_PPC_HPP
+#endif // OS_CPU_LINUX_PPC_GLOBALS_LINUX_PPC_HPP
diff --git a/src/hotspot/os_cpu/linux_ppc/orderAccess_linux_ppc.hpp b/src/hotspot/os_cpu/linux_ppc/orderAccess_linux_ppc.hpp
index a57a1154a33..928c2d8339b 100644
--- a/src/hotspot/os_cpu/linux_ppc/orderAccess_linux_ppc.hpp
+++ b/src/hotspot/os_cpu/linux_ppc/orderAccess_linux_ppc.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2019, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2012, 2014 SAP SE. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
@@ -23,8 +23,8 @@
*
*/
-#ifndef OS_CPU_LINUX_PPC_VM_ORDERACCESS_LINUX_PPC_HPP
-#define OS_CPU_LINUX_PPC_VM_ORDERACCESS_LINUX_PPC_HPP
+#ifndef OS_CPU_LINUX_PPC_ORDERACCESS_LINUX_PPC_HPP
+#define OS_CPU_LINUX_PPC_ORDERACCESS_LINUX_PPC_HPP
// Included in orderAccess.hpp header file.
@@ -94,4 +94,4 @@ struct OrderAccess::PlatformOrderedLoad
#undef inlasm_isync
#undef inlasm_acquire_reg
-#endif // OS_CPU_LINUX_PPC_VM_ORDERACCESS_LINUX_PPC_HPP
+#endif // OS_CPU_LINUX_PPC_ORDERACCESS_LINUX_PPC_HPP
diff --git a/src/hotspot/os_cpu/linux_ppc/os_linux_ppc.hpp b/src/hotspot/os_cpu/linux_ppc/os_linux_ppc.hpp
index 73937ddac4d..1c108de12a0 100644
--- a/src/hotspot/os_cpu/linux_ppc/os_linux_ppc.hpp
+++ b/src/hotspot/os_cpu/linux_ppc/os_linux_ppc.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2002, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2019, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2012, 2013 SAP SE. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
@@ -23,8 +23,8 @@
*
*/
-#ifndef OS_CPU_LINUX_PPC_VM_OS_LINUX_PPC_HPP
-#define OS_CPU_LINUX_PPC_VM_OS_LINUX_PPC_HPP
+#ifndef OS_CPU_LINUX_PPC_OS_LINUX_PPC_HPP
+#define OS_CPU_LINUX_PPC_OS_LINUX_PPC_HPP
static void setup_fpu() {}
@@ -32,4 +32,4 @@
// Note: Currently only used in 64 bit Windows implementations
static bool register_code_area(char *low, char *high) { return true; }
-#endif // OS_CPU_LINUX_PPC_VM_OS_LINUX_PPC_HPP
+#endif // OS_CPU_LINUX_PPC_OS_LINUX_PPC_HPP
diff --git a/src/hotspot/os_cpu/linux_ppc/prefetch_linux_ppc.inline.hpp b/src/hotspot/os_cpu/linux_ppc/prefetch_linux_ppc.inline.hpp
index 41d8445382c..d795d0c91bb 100644
--- a/src/hotspot/os_cpu/linux_ppc/prefetch_linux_ppc.inline.hpp
+++ b/src/hotspot/os_cpu/linux_ppc/prefetch_linux_ppc.inline.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2019, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2012, 2013 SAP SE. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
@@ -23,8 +23,8 @@
*
*/
-#ifndef OS_CPU_LINUX_PPC_VM_PREFETCH_LINUX_PPC_INLINE_HPP
-#define OS_CPU_LINUX_PPC_VM_PREFETCH_LINUX_PPC_INLINE_HPP
+#ifndef OS_CPU_LINUX_PPC_PREFETCH_LINUX_PPC_INLINE_HPP
+#define OS_CPU_LINUX_PPC_PREFETCH_LINUX_PPC_INLINE_HPP
#include "runtime/prefetch.hpp"
@@ -47,4 +47,4 @@ inline void Prefetch::write(void *loc, intx interval) {
);
}
-#endif // OS_CPU_LINUX_PPC_VM_PREFETCH_LINUX_PPC_INLINE_HPP
+#endif // OS_CPU_LINUX_PPC_PREFETCH_LINUX_PPC_INLINE_HPP
diff --git a/src/hotspot/os_cpu/linux_ppc/thread_linux_ppc.hpp b/src/hotspot/os_cpu/linux_ppc/thread_linux_ppc.hpp
index 4d518eee251..fec8af87338 100644
--- a/src/hotspot/os_cpu/linux_ppc/thread_linux_ppc.hpp
+++ b/src/hotspot/os_cpu/linux_ppc/thread_linux_ppc.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2000, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2019, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2012, 2013 SAP SE. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
@@ -23,8 +23,8 @@
*
*/
-#ifndef OS_CPU_LINUX_PPC_VM_THREAD_LINUX_PPC_HPP
-#define OS_CPU_LINUX_PPC_VM_THREAD_LINUX_PPC_HPP
+#ifndef OS_CPU_LINUX_PPC_THREAD_LINUX_PPC_HPP
+#define OS_CPU_LINUX_PPC_THREAD_LINUX_PPC_HPP
private:
@@ -51,4 +51,4 @@
bool pd_get_top_frame_for_profiling(frame* fr_addr, void* ucontext, bool isInJava);
-#endif // OS_CPU_LINUX_PPC_VM_THREAD_LINUX_PPC_HPP
+#endif // OS_CPU_LINUX_PPC_THREAD_LINUX_PPC_HPP
diff --git a/src/hotspot/os_cpu/linux_ppc/vmStructs_linux_ppc.hpp b/src/hotspot/os_cpu/linux_ppc/vmStructs_linux_ppc.hpp
index a0adde047d2..9464c359770 100644
--- a/src/hotspot/os_cpu/linux_ppc/vmStructs_linux_ppc.hpp
+++ b/src/hotspot/os_cpu/linux_ppc/vmStructs_linux_ppc.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2000, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2019, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2012, 2013 SAP SE. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
@@ -23,8 +23,8 @@
*
*/
-#ifndef OS_CPU_LINUX_PPC_VM_VMSTRUCTS_LINUX_PPC_HPP
-#define OS_CPU_LINUX_PPC_VM_VMSTRUCTS_LINUX_PPC_HPP
+#ifndef OS_CPU_LINUX_PPC_VMSTRUCTS_LINUX_PPC_HPP
+#define OS_CPU_LINUX_PPC_VMSTRUCTS_LINUX_PPC_HPP
// These are the OS and CPU-specific fields, types and integer
// constants required by the Serviceability Agent. This file is
@@ -52,4 +52,4 @@
#define VM_LONG_CONSTANTS_OS_CPU(declare_constant, declare_preprocessor_constant, declare_c1_constant, declare_c2_constant, declare_c2_preprocessor_constant)
-#endif // OS_CPU_LINUX_PPC_VM_VMSTRUCTS_LINUX_PPC_HPP
+#endif // OS_CPU_LINUX_PPC_VMSTRUCTS_LINUX_PPC_HPP
diff --git a/src/hotspot/os_cpu/linux_s390/atomic_linux_s390.hpp b/src/hotspot/os_cpu/linux_s390/atomic_linux_s390.hpp
index 8462f4b6da0..ff78872a3b5 100644
--- a/src/hotspot/os_cpu/linux_s390/atomic_linux_s390.hpp
+++ b/src/hotspot/os_cpu/linux_s390/atomic_linux_s390.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2016, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2019, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2016, 2018 SAP SE. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
@@ -23,8 +23,8 @@
*
*/
-#ifndef OS_CPU_LINUX_S390_VM_ATOMIC_LINUX_S390_INLINE_HPP
-#define OS_CPU_LINUX_S390_VM_ATOMIC_LINUX_S390_INLINE_HPP
+#ifndef OS_CPU_LINUX_S390_ATOMIC_LINUX_S390_HPP
+#define OS_CPU_LINUX_S390_ATOMIC_LINUX_S390_HPP
#include "runtime/atomic.hpp"
#include "runtime/os.hpp"
@@ -335,4 +335,4 @@ inline T Atomic::PlatformCmpxchg<8>::operator()(T xchg_val,
return old;
}
-#endif // OS_CPU_LINUX_S390_VM_ATOMIC_LINUX_S390_INLINE_HPP
+#endif // OS_CPU_LINUX_S390_ATOMIC_LINUX_S390_HPP
diff --git a/src/hotspot/os_cpu/linux_s390/bytes_linux_s390.inline.hpp b/src/hotspot/os_cpu/linux_s390/bytes_linux_s390.inline.hpp
index 3471b647871..a05ac92a26b 100644
--- a/src/hotspot/os_cpu/linux_s390/bytes_linux_s390.inline.hpp
+++ b/src/hotspot/os_cpu/linux_s390/bytes_linux_s390.inline.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2019, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2016 SAP SE. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
@@ -23,8 +23,8 @@
*
*/
-#ifndef OS_CPU_LINUX_S390_VM_BYTES_LINUX_S390_INLINE_HPP
-#define OS_CPU_LINUX_S390_VM_BYTES_LINUX_S390_INLINE_HPP
+#ifndef OS_CPU_LINUX_S390_BYTES_LINUX_S390_INLINE_HPP
+#define OS_CPU_LINUX_S390_BYTES_LINUX_S390_INLINE_HPP
// Efficient swapping of data bytes from Java byte
// ordering to native byte ordering and vice versa.
@@ -43,4 +43,4 @@ inline u8 swap_u8(u8 x) {
return bswap_64(x);
}
-#endif // OS_CPU_LINUX_S390_VM_BYTES_LINUX_S390_INLINE_HPP
+#endif // OS_CPU_LINUX_S390_BYTES_LINUX_S390_INLINE_HPP
diff --git a/src/hotspot/os_cpu/linux_s390/globals_linux_s390.hpp b/src/hotspot/os_cpu/linux_s390/globals_linux_s390.hpp
index 39050ac6fb6..295dd665d2d 100644
--- a/src/hotspot/os_cpu/linux_s390/globals_linux_s390.hpp
+++ b/src/hotspot/os_cpu/linux_s390/globals_linux_s390.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2019, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2016 SAP SE. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
@@ -25,8 +25,8 @@
// Sorted according to linux_x86.
-#ifndef OS_CPU_LINUX_S390_VM_GLOBALS_LINUX_S390_HPP
-#define OS_CPU_LINUX_S390_VM_GLOBALS_LINUX_S390_HPP
+#ifndef OS_CPU_LINUX_S390_GLOBALS_LINUX_S390_HPP
+#define OS_CPU_LINUX_S390_GLOBALS_LINUX_S390_HPP
// Sets the default values for platform dependent flags used by the
// runtime system (see globals.hpp).
@@ -49,6 +49,4 @@ define_pd_global(size_t, JVMInvokeMethodSlack, 8192);
// Only used on 64 bit platforms.
define_pd_global(size_t, HeapBaseMinAddress, 2*G);
-#endif // OS_CPU_LINUX_S390_VM_GLOBALS_LINUX_S390_HPP
-
-
+#endif // OS_CPU_LINUX_S390_GLOBALS_LINUX_S390_HPP
diff --git a/src/hotspot/os_cpu/linux_s390/orderAccess_linux_s390.hpp b/src/hotspot/os_cpu/linux_s390/orderAccess_linux_s390.hpp
index 5d2264cdbe3..d8decefbc97 100644
--- a/src/hotspot/os_cpu/linux_s390/orderAccess_linux_s390.hpp
+++ b/src/hotspot/os_cpu/linux_s390/orderAccess_linux_s390.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2016, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2019, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2016 SAP SE. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
@@ -23,8 +23,8 @@
*
*/
-#ifndef OS_CPU_LINUX_S390_VM_ORDERACCESS_LINUX_S390_HPP
-#define OS_CPU_LINUX_S390_VM_ORDERACCESS_LINUX_S390_HPP
+#ifndef OS_CPU_LINUX_S390_ORDERACCESS_LINUX_S390_HPP
+#define OS_CPU_LINUX_S390_ORDERACCESS_LINUX_S390_HPP
// Included in orderAccess.hpp header file.
@@ -88,4 +88,4 @@ struct OrderAccess::PlatformOrderedLoad
#undef inlasm_zarch_acquire
#undef inlasm_zarch_fence
-#endif // OS_CPU_LINUX_S390_VM_ORDERACCESS_LINUX_S390_HPP
+#endif // OS_CPU_LINUX_S390_ORDERACCESS_LINUX_S390_HPP
diff --git a/src/hotspot/os_cpu/linux_s390/os_linux_s390.hpp b/src/hotspot/os_cpu/linux_s390/os_linux_s390.hpp
index 5dbb610dd16..35618f4e8f4 100644
--- a/src/hotspot/os_cpu/linux_s390/os_linux_s390.hpp
+++ b/src/hotspot/os_cpu/linux_s390/os_linux_s390.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2019, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2016 SAP SE. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
@@ -23,13 +23,12 @@
*
*/
-#ifndef OS_CPU_LINUX_S390_VM_OS_LINUX_S390_HPP
-#define OS_CPU_LINUX_S390_VM_OS_LINUX_S390_HPP
+#ifndef OS_CPU_LINUX_S390_OS_LINUX_S390_HPP
+#define OS_CPU_LINUX_S390_OS_LINUX_S390_HPP
static void setup_fpu() {}
// Used to register dynamic code cache area with the OS.
static bool register_code_area(char *low, char *high) { return true; }
-#endif // OS_CPU_LINUX_S390_VM_OS_LINUX_S390_HPP
-
+#endif // OS_CPU_LINUX_S390_OS_LINUX_S390_HPP
diff --git a/src/hotspot/os_cpu/linux_s390/prefetch_linux_s390.inline.hpp b/src/hotspot/os_cpu/linux_s390/prefetch_linux_s390.inline.hpp
index 0009e059c40..e922b6dc853 100644
--- a/src/hotspot/os_cpu/linux_s390/prefetch_linux_s390.inline.hpp
+++ b/src/hotspot/os_cpu/linux_s390/prefetch_linux_s390.inline.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2019, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2016 SAP SE. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
@@ -23,8 +23,8 @@
*
*/
-#ifndef OS_CPU_LINUX_S390_VM_PREFETCH_LINUX_S390_INLINE_HPP
-#define OS_CPU_LINUX_S390_VM_PREFETCH_LINUX_S390_INLINE_HPP
+#ifndef OS_CPU_LINUX_S390_PREFETCH_LINUX_S390_INLINE_HPP
+#define OS_CPU_LINUX_S390_PREFETCH_LINUX_S390_INLINE_HPP
#include "runtime/prefetch.hpp"
@@ -36,4 +36,4 @@ inline void Prefetch::write(void* loc, intx interval) {
// No prefetch instructions on z/Architecture -> implement trivially.
}
-#endif // OS_CPU_LINUX_S390_VM_PREFETCH_LINUX_S390_INLINE_HPP
+#endif // OS_CPU_LINUX_S390_PREFETCH_LINUX_S390_INLINE_HPP
diff --git a/src/hotspot/os_cpu/linux_s390/thread_linux_s390.hpp b/src/hotspot/os_cpu/linux_s390/thread_linux_s390.hpp
index baabcc542e8..526876ed0d5 100644
--- a/src/hotspot/os_cpu/linux_s390/thread_linux_s390.hpp
+++ b/src/hotspot/os_cpu/linux_s390/thread_linux_s390.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2016, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2019, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2016 SAP SE. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
@@ -23,8 +23,8 @@
*
*/
-#ifndef OS_CPU_LINUX_S390_VM_THREAD_LINUX_S390_HPP
-#define OS_CPU_LINUX_S390_VM_THREAD_LINUX_S390_HPP
+#ifndef OS_CPU_LINUX_S390_THREAD_LINUX_S390_HPP
+#define OS_CPU_LINUX_S390_THREAD_LINUX_S390_HPP
private:
@@ -50,4 +50,4 @@
bool pd_get_top_frame_for_profiling(frame* fr_addr, void* ucontext, bool isInJava);
-#endif // OS_CPU_LINUX_S390_VM_THREAD_LINUX_S390_HPP
+#endif // OS_CPU_LINUX_S390_THREAD_LINUX_S390_HPP
diff --git a/src/hotspot/os_cpu/linux_s390/vmStructs_linux_s390.hpp b/src/hotspot/os_cpu/linux_s390/vmStructs_linux_s390.hpp
index 5439fc5a8e4..0442510fa24 100644
--- a/src/hotspot/os_cpu/linux_s390/vmStructs_linux_s390.hpp
+++ b/src/hotspot/os_cpu/linux_s390/vmStructs_linux_s390.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2019, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2016 SAP SE. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
@@ -23,8 +23,8 @@
*
*/
-#ifndef OS_CPU_LINUX_S390_VM_VMSTRUCTS_LINUX_S390_HPP
-#define OS_CPU_LINUX_S390_VM_VMSTRUCTS_LINUX_S390_HPP
+#ifndef OS_CPU_LINUX_S390_VMSTRUCTS_LINUX_S390_HPP
+#define OS_CPU_LINUX_S390_VMSTRUCTS_LINUX_S390_HPP
// These are the OS and CPU-specific fields, types and integer
// constants required by the Serviceability Agent. This file is
@@ -52,5 +52,4 @@
#define VM_LONG_CONSTANTS_OS_CPU(declare_constant, declare_preprocessor_constant, declare_c1_constant, declare_c2_constant, declare_c2_preprocessor_constant)
-#endif // OS_CPU_LINUX_S390_VM_VMSTRUCTS_LINUX_S390_HPP
-
+#endif // OS_CPU_LINUX_S390_VMSTRUCTS_LINUX_S390_HPP
diff --git a/src/hotspot/os_cpu/linux_sparc/atomic_linux_sparc.hpp b/src/hotspot/os_cpu/linux_sparc/atomic_linux_sparc.hpp
index f572d1b10a2..0112c6b5efd 100644
--- a/src/hotspot/os_cpu/linux_sparc/atomic_linux_sparc.hpp
+++ b/src/hotspot/os_cpu/linux_sparc/atomic_linux_sparc.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1999, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1999, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
*
*/
-#ifndef OS_CPU_LINUX_SPARC_VM_ATOMIC_LINUX_SPARC_INLINE_HPP
-#define OS_CPU_LINUX_SPARC_VM_ATOMIC_LINUX_SPARC_INLINE_HPP
+#ifndef OS_CPU_LINUX_SPARC_ATOMIC_LINUX_SPARC_HPP
+#define OS_CPU_LINUX_SPARC_ATOMIC_LINUX_SPARC_HPP
// Implementation of class atomic
@@ -154,4 +154,4 @@ inline T Atomic::PlatformCmpxchg<8>::operator()(T exchange_value,
return rv;
}
-#endif // OS_CPU_LINUX_SPARC_VM_ATOMIC_LINUX_SPARC_INLINE_HPP
+#endif // OS_CPU_LINUX_SPARC_ATOMIC_LINUX_SPARC_HPP
diff --git a/src/hotspot/os_cpu/linux_sparc/globals_linux_sparc.hpp b/src/hotspot/os_cpu/linux_sparc/globals_linux_sparc.hpp
index df6cad419fb..39fab0a1def 100644
--- a/src/hotspot/os_cpu/linux_sparc/globals_linux_sparc.hpp
+++ b/src/hotspot/os_cpu/linux_sparc/globals_linux_sparc.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2000, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
*
*/
-#ifndef OS_CPU_LINUX_SPARC_VM_GLOBALS_LINUX_SPARC_HPP
-#define OS_CPU_LINUX_SPARC_VM_GLOBALS_LINUX_SPARC_HPP
+#ifndef OS_CPU_LINUX_SPARC_GLOBALS_LINUX_SPARC_HPP
+#define OS_CPU_LINUX_SPARC_GLOBALS_LINUX_SPARC_HPP
//
// Sets the default values for platform dependent flags used by the
@@ -35,4 +35,4 @@ define_pd_global(size_t, JVMInvokeMethodSlack, 12288);
// Used on 64 bit platforms for UseCompressedOops base address
define_pd_global(size_t, HeapBaseMinAddress, CONST64(4)*G);
-#endif // OS_CPU_LINUX_SPARC_VM_GLOBALS_LINUX_SPARC_HPP
+#endif // OS_CPU_LINUX_SPARC_GLOBALS_LINUX_SPARC_HPP
diff --git a/src/hotspot/os_cpu/linux_sparc/orderAccess_linux_sparc.hpp b/src/hotspot/os_cpu/linux_sparc/orderAccess_linux_sparc.hpp
index 5ac28841849..5a456e8b8d1 100644
--- a/src/hotspot/os_cpu/linux_sparc/orderAccess_linux_sparc.hpp
+++ b/src/hotspot/os_cpu/linux_sparc/orderAccess_linux_sparc.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2003, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
*
*/
-#ifndef OS_CPU_LINUX_SPARC_VM_ORDERACCESS_LINUX_SPARC_HPP
-#define OS_CPU_LINUX_SPARC_VM_ORDERACCESS_LINUX_SPARC_HPP
+#ifndef OS_CPU_LINUX_SPARC_ORDERACCESS_LINUX_SPARC_HPP
+#define OS_CPU_LINUX_SPARC_ORDERACCESS_LINUX_SPARC_HPP
// Included in orderAccess.hpp header file.
@@ -48,4 +48,4 @@ inline void OrderAccess::fence() {
__asm__ volatile ("membar #StoreLoad" : : : "memory");
}
-#endif // OS_CPU_LINUX_SPARC_VM_ORDERACCESS_LINUX_SPARC_HPP
+#endif // OS_CPU_LINUX_SPARC_ORDERACCESS_LINUX_SPARC_HPP
diff --git a/src/hotspot/os_cpu/linux_sparc/os_linux_sparc.hpp b/src/hotspot/os_cpu/linux_sparc/os_linux_sparc.hpp
index 4107cfa0ba4..df6fc0b8e75 100644
--- a/src/hotspot/os_cpu/linux_sparc/os_linux_sparc.hpp
+++ b/src/hotspot/os_cpu/linux_sparc/os_linux_sparc.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1999, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1999, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
*
*/
-#ifndef OS_CPU_LINUX_SPARC_VM_OS_LINUX_SPARC_HPP
-#define OS_CPU_LINUX_SPARC_VM_OS_LINUX_SPARC_HPP
+#ifndef OS_CPU_LINUX_SPARC_OS_LINUX_SPARC_HPP
+#define OS_CPU_LINUX_SPARC_OS_LINUX_SPARC_HPP
//
// NOTE: we are back in class os here, not Linux
@@ -46,4 +46,4 @@
// Note: Currently only used in 64 bit Windows implementations
static bool register_code_area(char *low, char *high) { return true; }
-#endif // OS_CPU_LINUX_SPARC_VM_OS_LINUX_SPARC_HPP
+#endif // OS_CPU_LINUX_SPARC_OS_LINUX_SPARC_HPP
diff --git a/src/hotspot/os_cpu/linux_sparc/prefetch_linux_sparc.inline.hpp b/src/hotspot/os_cpu/linux_sparc/prefetch_linux_sparc.inline.hpp
index 195860b08ab..e8fc035b838 100644
--- a/src/hotspot/os_cpu/linux_sparc/prefetch_linux_sparc.inline.hpp
+++ b/src/hotspot/os_cpu/linux_sparc/prefetch_linux_sparc.inline.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2003, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
*
*/
-#ifndef OS_CPU_LINUX_SPARC_VM_PREFETCH_LINUX_SPARC_INLINE_HPP
-#define OS_CPU_LINUX_SPARC_VM_PREFETCH_LINUX_SPARC_INLINE_HPP
+#ifndef OS_CPU_LINUX_SPARC_PREFETCH_LINUX_SPARC_INLINE_HPP
+#define OS_CPU_LINUX_SPARC_PREFETCH_LINUX_SPARC_INLINE_HPP
#include "runtime/prefetch.hpp"
@@ -35,4 +35,4 @@ inline void Prefetch::write(void *loc, intx interval) {
__asm__ volatile("prefetch [%0+%1], 2" : : "r" (loc), "r" (interval) : "memory" );
}
-#endif // OS_CPU_LINUX_SPARC_VM_PREFETCH_LINUX_SPARC_INLINE_HPP
+#endif // OS_CPU_LINUX_SPARC_PREFETCH_LINUX_SPARC_INLINE_HPP
diff --git a/src/hotspot/os_cpu/linux_sparc/thread_linux_sparc.hpp b/src/hotspot/os_cpu/linux_sparc/thread_linux_sparc.hpp
index 43959b26f69..96ba2ebf865 100644
--- a/src/hotspot/os_cpu/linux_sparc/thread_linux_sparc.hpp
+++ b/src/hotspot/os_cpu/linux_sparc/thread_linux_sparc.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
*
*/
-#ifndef OS_CPU_LINUX_SPARC_VM_THREAD_LINUX_SPARC_HPP
-#define OS_CPU_LINUX_SPARC_VM_THREAD_LINUX_SPARC_HPP
+#ifndef OS_CPU_LINUX_SPARC_THREAD_LINUX_SPARC_HPP
+#define OS_CPU_LINUX_SPARC_THREAD_LINUX_SPARC_HPP
private:
@@ -95,4 +95,4 @@ public:
static void enable_register_stack_guard() {}
static void disable_register_stack_guard() {}
-#endif // OS_CPU_LINUX_SPARC_VM_THREAD_LINUX_SPARC_HPP
+#endif // OS_CPU_LINUX_SPARC_THREAD_LINUX_SPARC_HPP
diff --git a/src/hotspot/os_cpu/linux_sparc/vmStructs_linux_sparc.hpp b/src/hotspot/os_cpu/linux_sparc/vmStructs_linux_sparc.hpp
index 1e9280fe36c..380b2aceb52 100644
--- a/src/hotspot/os_cpu/linux_sparc/vmStructs_linux_sparc.hpp
+++ b/src/hotspot/os_cpu/linux_sparc/vmStructs_linux_sparc.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2000, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
*
*/
-#ifndef OS_CPU_LINUX_SPARC_VM_VMSTRUCTS_LINUX_SPARC_HPP
-#define OS_CPU_LINUX_SPARC_VM_VMSTRUCTS_LINUX_SPARC_HPP
+#ifndef OS_CPU_LINUX_SPARC_VMSTRUCTS_LINUX_SPARC_HPP
+#define OS_CPU_LINUX_SPARC_VMSTRUCTS_LINUX_SPARC_HPP
// These are the OS and CPU-specific fields, types and integer
// constants required by the Serviceability Agent. This file is
@@ -60,4 +60,4 @@
#define VM_LONG_CONSTANTS_OS_CPU(declare_constant, declare_preprocessor_constant, declare_c1_constant, declare_c2_constant, declare_c2_preprocessor_constant)
-#endif // OS_CPU_LINUX_SPARC_VM_VMSTRUCTS_LINUX_SPARC_HPP
+#endif // OS_CPU_LINUX_SPARC_VMSTRUCTS_LINUX_SPARC_HPP
diff --git a/src/hotspot/os_cpu/linux_x86/atomic_linux_x86.hpp b/src/hotspot/os_cpu/linux_x86/atomic_linux_x86.hpp
index f4f8d9898c1..4960f7532bb 100644
--- a/src/hotspot/os_cpu/linux_x86/atomic_linux_x86.hpp
+++ b/src/hotspot/os_cpu/linux_x86/atomic_linux_x86.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1999, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1999, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
*
*/
-#ifndef OS_CPU_LINUX_X86_VM_ATOMIC_LINUX_X86_HPP
-#define OS_CPU_LINUX_X86_VM_ATOMIC_LINUX_X86_HPP
+#ifndef OS_CPU_LINUX_X86_ATOMIC_LINUX_X86_HPP
+#define OS_CPU_LINUX_X86_ATOMIC_LINUX_X86_HPP
// Implementation of class atomic
@@ -169,4 +169,4 @@ inline void Atomic::PlatformStore<8>::operator()(T store_value,
#endif // AMD64
-#endif // OS_CPU_LINUX_X86_VM_ATOMIC_LINUX_X86_HPP
+#endif // OS_CPU_LINUX_X86_ATOMIC_LINUX_X86_HPP
diff --git a/src/hotspot/os_cpu/linux_x86/bytes_linux_x86.inline.hpp b/src/hotspot/os_cpu/linux_x86/bytes_linux_x86.inline.hpp
index 93cb9882263..e6b85a40791 100644
--- a/src/hotspot/os_cpu/linux_x86/bytes_linux_x86.inline.hpp
+++ b/src/hotspot/os_cpu/linux_x86/bytes_linux_x86.inline.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1999, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1999, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
*
*/
-#ifndef OS_CPU_LINUX_X86_VM_BYTES_LINUX_X86_INLINE_HPP
-#define OS_CPU_LINUX_X86_VM_BYTES_LINUX_X86_INLINE_HPP
+#ifndef OS_CPU_LINUX_X86_BYTES_LINUX_X86_INLINE_HPP
+#define OS_CPU_LINUX_X86_BYTES_LINUX_X86_INLINE_HPP
#include
@@ -87,4 +87,4 @@ inline u8 Bytes::swap_u8(u8 x) {
}
#endif // !AMD64
-#endif // OS_CPU_LINUX_X86_VM_BYTES_LINUX_X86_INLINE_HPP
+#endif // OS_CPU_LINUX_X86_BYTES_LINUX_X86_INLINE_HPP
diff --git a/src/hotspot/os_cpu/linux_x86/copy_linux_x86.inline.hpp b/src/hotspot/os_cpu/linux_x86/copy_linux_x86.inline.hpp
index 24a47e62019..7cb8e71f365 100644
--- a/src/hotspot/os_cpu/linux_x86/copy_linux_x86.inline.hpp
+++ b/src/hotspot/os_cpu/linux_x86/copy_linux_x86.inline.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2003, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
*
*/
-#ifndef OS_CPU_LINUX_X86_VM_COPY_LINUX_X86_INLINE_HPP
-#define OS_CPU_LINUX_X86_VM_COPY_LINUX_X86_INLINE_HPP
+#ifndef OS_CPU_LINUX_X86_COPY_LINUX_X86_INLINE_HPP
+#define OS_CPU_LINUX_X86_COPY_LINUX_X86_INLINE_HPP
static void pd_conjoint_words(const HeapWord* from, HeapWord* to, size_t count) {
#ifdef AMD64
@@ -306,4 +306,4 @@ static void pd_arrayof_conjoint_oops(const HeapWord* from, HeapWord* to, size_t
#endif // AMD64
}
-#endif // OS_CPU_LINUX_X86_VM_COPY_LINUX_X86_INLINE_HPP
+#endif // OS_CPU_LINUX_X86_COPY_LINUX_X86_INLINE_HPP
diff --git a/src/hotspot/os_cpu/linux_x86/gc/z/zAddress_linux_x86.inline.hpp b/src/hotspot/os_cpu/linux_x86/gc/z/zAddress_linux_x86.inline.hpp
index 3dfea712969..e54cf237b5c 100644
--- a/src/hotspot/os_cpu/linux_x86/gc/z/zAddress_linux_x86.inline.hpp
+++ b/src/hotspot/os_cpu/linux_x86/gc/z/zAddress_linux_x86.inline.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -21,11 +21,11 @@
* questions.
*/
-#ifndef OS_CPU_LINUX_X86_ZADDRESS_LINUX_X86_INLINE_HPP
-#define OS_CPU_LINUX_X86_ZADDRESS_LINUX_X86_INLINE_HPP
+#ifndef OS_CPU_LINUX_X86_GC_Z_ZADDRESS_LINUX_X86_INLINE_HPP
+#define OS_CPU_LINUX_X86_GC_Z_ZADDRESS_LINUX_X86_INLINE_HPP
inline uintptr_t ZAddress::address(uintptr_t value) {
return value;
}
-#endif // OS_CPU_LINUX_X86_ZADDRESS_LINUX_X86_INLINE_HPP
+#endif // OS_CPU_LINUX_X86_GC_Z_ZADDRESS_LINUX_X86_INLINE_HPP
diff --git a/src/hotspot/os_cpu/linux_x86/gc/z/zArguments_linux_x86.cpp b/src/hotspot/os_cpu/linux_x86/gc/z/zArguments_linux_x86.cpp
index bd0415e63eb..ea042837816 100644
--- a/src/hotspot/os_cpu/linux_x86/gc/z/zArguments_linux_x86.cpp
+++ b/src/hotspot/os_cpu/linux_x86/gc/z/zArguments_linux_x86.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -28,6 +28,7 @@
#include "utilities/debug.hpp"
void ZArguments::initialize_platform() {
+#ifdef COMPILER2
// The C2 barrier slow path expects vector registers to be least
// 16 bytes wide, which is the minimum width available on all
// x86-64 systems. However, the user could have speficied a lower
@@ -37,4 +38,5 @@ void ZArguments::initialize_platform() {
warning("ZGC requires MaxVectorSize to be at least 16");
FLAG_SET_DEFAULT(MaxVectorSize, 16);
}
+#endif
}
diff --git a/src/hotspot/os_cpu/linux_x86/gc/z/zBackingFile_linux_x86.hpp b/src/hotspot/os_cpu/linux_x86/gc/z/zBackingFile_linux_x86.hpp
index 3852a02531d..202004a65b7 100644
--- a/src/hotspot/os_cpu/linux_x86/gc/z/zBackingFile_linux_x86.hpp
+++ b/src/hotspot/os_cpu/linux_x86/gc/z/zBackingFile_linux_x86.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2015, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -21,8 +21,8 @@
* questions.
*/
-#ifndef OS_CPU_LINUX_X86_ZBACKINGFILE_LINUX_X86_HPP
-#define OS_CPU_LINUX_X86_ZBACKINGFILE_LINUX_X86_HPP
+#ifndef OS_CPU_LINUX_X86_GC_Z_ZBACKINGFILE_LINUX_X86_HPP
+#define OS_CPU_LINUX_X86_GC_Z_ZBACKINGFILE_LINUX_X86_HPP
#include "memory/allocation.hpp"
@@ -60,4 +60,4 @@ public:
size_t try_expand(size_t offset, size_t length, size_t alignment) const;
};
-#endif // OS_CPU_LINUX_X86_ZBACKINGFILE_LINUX_X86_HPP
+#endif // OS_CPU_LINUX_X86_GC_Z_ZBACKINGFILE_LINUX_X86_HPP
diff --git a/src/hotspot/os_cpu/linux_x86/gc/z/zBackingPath_linux_x86.hpp b/src/hotspot/os_cpu/linux_x86/gc/z/zBackingPath_linux_x86.hpp
index bdbf46d5937..995a7b6248a 100644
--- a/src/hotspot/os_cpu/linux_x86/gc/z/zBackingPath_linux_x86.hpp
+++ b/src/hotspot/os_cpu/linux_x86/gc/z/zBackingPath_linux_x86.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2016, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -21,8 +21,8 @@
* questions.
*/
-#ifndef OS_CPU_LINUX_X86_ZBACKINGPATH_LINUX_X86_HPP
-#define OS_CPU_LINUX_X86_ZBACKINGPATH_LINUX_X86_HPP
+#ifndef OS_CPU_LINUX_X86_GC_Z_ZBACKINGPATH_LINUX_X86_HPP
+#define OS_CPU_LINUX_X86_GC_Z_ZBACKINGPATH_LINUX_X86_HPP
#include "gc/z/zArray.hpp"
#include "memory/allocation.hpp"
@@ -49,4 +49,4 @@ public:
const char* get() const;
};
-#endif // OS_CPU_LINUX_X86_ZBACKINGPATH_LINUX_X86_HPP
+#endif // OS_CPU_LINUX_X86_GC_Z_ZBACKINGPATH_LINUX_X86_HPP
diff --git a/src/hotspot/os_cpu/linux_x86/gc/z/zGlobals_linux_x86.hpp b/src/hotspot/os_cpu/linux_x86/gc/z/zGlobals_linux_x86.hpp
index b7cbbd26719..c5cf76f9992 100644
--- a/src/hotspot/os_cpu/linux_x86/gc/z/zGlobals_linux_x86.hpp
+++ b/src/hotspot/os_cpu/linux_x86/gc/z/zGlobals_linux_x86.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2015, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -21,8 +21,8 @@
* questions.
*/
-#ifndef OS_CPU_LINUX_X86_ZGLOBALS_LINUX_X86_HPP
-#define OS_CPU_LINUX_X86_ZGLOBALS_LINUX_X86_HPP
+#ifndef OS_CPU_LINUX_X86_GC_Z_ZGLOBALS_LINUX_X86_HPP
+#define OS_CPU_LINUX_X86_GC_Z_ZGLOBALS_LINUX_X86_HPP
//
// Page Allocation Tiers
@@ -87,4 +87,4 @@ const size_t ZPlatformNMethodDisarmedOffset = 4;
const size_t ZPlatformCacheLineSize = 64;
-#endif // OS_CPU_LINUX_X86_ZGLOBALS_LINUX_X86_HPP
+#endif // OS_CPU_LINUX_X86_GC_Z_ZGLOBALS_LINUX_X86_HPP
diff --git a/src/hotspot/os_cpu/linux_x86/gc/z/zPhysicalMemoryBacking_linux_x86.hpp b/src/hotspot/os_cpu/linux_x86/gc/z/zPhysicalMemoryBacking_linux_x86.hpp
index 9a09955f227..2770dfdcde5 100644
--- a/src/hotspot/os_cpu/linux_x86/gc/z/zPhysicalMemoryBacking_linux_x86.hpp
+++ b/src/hotspot/os_cpu/linux_x86/gc/z/zPhysicalMemoryBacking_linux_x86.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2015, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -21,8 +21,8 @@
* questions.
*/
-#ifndef OS_CPU_LINUX_X86_ZPHYSICALMEMORYBACKING_LINUX_X86_HPP
-#define OS_CPU_LINUX_X86_ZPHYSICALMEMORYBACKING_LINUX_X86_HPP
+#ifndef OS_CPU_LINUX_X86_GC_Z_ZPHYSICALMEMORYBACKING_LINUX_X86_HPP
+#define OS_CPU_LINUX_X86_GC_Z_ZPHYSICALMEMORYBACKING_LINUX_X86_HPP
#include "gc/z/zBackingFile_linux_x86.hpp"
#include "gc/z/zMemory.hpp"
@@ -62,4 +62,4 @@ public:
void flip(ZPhysicalMemory pmem, uintptr_t offset) const;
};
-#endif // OS_CPU_LINUX_X86_ZPHYSICALMEMORYBACKING_LINUX_X86_HPP
+#endif // OS_CPU_LINUX_X86_GC_Z_ZPHYSICALMEMORYBACKING_LINUX_X86_HPP
diff --git a/src/hotspot/os_cpu/linux_x86/globals_linux_x86.hpp b/src/hotspot/os_cpu/linux_x86/globals_linux_x86.hpp
index 4d5069e5a8c..f5fdd6399fe 100644
--- a/src/hotspot/os_cpu/linux_x86/globals_linux_x86.hpp
+++ b/src/hotspot/os_cpu/linux_x86/globals_linux_x86.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2000, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
*
*/
-#ifndef OS_CPU_LINUX_X86_VM_GLOBALS_LINUX_X86_HPP
-#define OS_CPU_LINUX_X86_VM_GLOBALS_LINUX_X86_HPP
+#ifndef OS_CPU_LINUX_X86_GLOBALS_LINUX_X86_HPP
+#define OS_CPU_LINUX_X86_GLOBALS_LINUX_X86_HPP
// Sets the default values for platform dependent flags used by the runtime system.
// (see globals.hpp)
@@ -47,4 +47,4 @@ define_pd_global(size_t, JVMInvokeMethodSlack, 8192);
// Used on 64 bit platforms for UseCompressedOops base address
define_pd_global(size_t, HeapBaseMinAddress, 2*G);
-#endif // OS_CPU_LINUX_X86_VM_GLOBALS_LINUX_X86_HPP
+#endif // OS_CPU_LINUX_X86_GLOBALS_LINUX_X86_HPP
diff --git a/src/hotspot/os_cpu/linux_x86/orderAccess_linux_x86.hpp b/src/hotspot/os_cpu/linux_x86/orderAccess_linux_x86.hpp
index 0cf302992c1..768a977946a 100644
--- a/src/hotspot/os_cpu/linux_x86/orderAccess_linux_x86.hpp
+++ b/src/hotspot/os_cpu/linux_x86/orderAccess_linux_x86.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2003, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
*
*/
-#ifndef OS_CPU_LINUX_X86_VM_ORDERACCESS_LINUX_X86_HPP
-#define OS_CPU_LINUX_X86_VM_ORDERACCESS_LINUX_X86_HPP
+#ifndef OS_CPU_LINUX_X86_ORDERACCESS_LINUX_X86_HPP
+#define OS_CPU_LINUX_X86_ORDERACCESS_LINUX_X86_HPP
// Included in orderAccess.hpp header file.
@@ -105,4 +105,4 @@ struct OrderAccess::PlatformOrderedStore<8, RELEASE_X_FENCE>
};
#endif // AMD64
-#endif // OS_CPU_LINUX_X86_VM_ORDERACCESS_LINUX_X86_HPP
+#endif // OS_CPU_LINUX_X86_ORDERACCESS_LINUX_X86_HPP
diff --git a/src/hotspot/os_cpu/linux_x86/os_linux_x86.hpp b/src/hotspot/os_cpu/linux_x86/os_linux_x86.hpp
index 1ccfad76fe7..652bd910103 100644
--- a/src/hotspot/os_cpu/linux_x86/os_linux_x86.hpp
+++ b/src/hotspot/os_cpu/linux_x86/os_linux_x86.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1999, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1999, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
*
*/
-#ifndef OS_CPU_LINUX_X86_VM_OS_LINUX_X86_HPP
-#define OS_CPU_LINUX_X86_VM_OS_LINUX_X86_HPP
+#ifndef OS_CPU_LINUX_X86_OS_LINUX_X86_HPP
+#define OS_CPU_LINUX_X86_OS_LINUX_X86_HPP
static void setup_fpu();
static bool supports_sse();
@@ -49,4 +49,4 @@
*/
static void workaround_expand_exec_shield_cs_limit();
-#endif // OS_CPU_LINUX_X86_VM_OS_LINUX_X86_HPP
+#endif // OS_CPU_LINUX_X86_OS_LINUX_X86_HPP
diff --git a/src/hotspot/os_cpu/linux_x86/os_linux_x86.inline.hpp b/src/hotspot/os_cpu/linux_x86/os_linux_x86.inline.hpp
index f6996fd1a25..535f318cfbd 100644
--- a/src/hotspot/os_cpu/linux_x86/os_linux_x86.inline.hpp
+++ b/src/hotspot/os_cpu/linux_x86/os_linux_x86.inline.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2011, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
*
*/
-#ifndef OS_CPU_LINUX_X86_VM_OS_LINUX_X86_INLINE_HPP
-#define OS_CPU_LINUX_X86_VM_OS_LINUX_X86_INLINE_HPP
+#ifndef OS_CPU_LINUX_X86_OS_LINUX_X86_INLINE_HPP
+#define OS_CPU_LINUX_X86_OS_LINUX_X86_INLINE_HPP
#include "runtime/os.hpp"
@@ -43,4 +43,4 @@ inline jlong os::rdtsc() {
#endif // AMD64
}
-#endif // OS_CPU_LINUX_X86_VM_OS_LINUX_X86_INLINE_HPP
+#endif // OS_CPU_LINUX_X86_OS_LINUX_X86_INLINE_HPP
diff --git a/src/hotspot/os_cpu/linux_x86/prefetch_linux_x86.inline.hpp b/src/hotspot/os_cpu/linux_x86/prefetch_linux_x86.inline.hpp
index ba1cf32aacb..c15cc75b31e 100644
--- a/src/hotspot/os_cpu/linux_x86/prefetch_linux_x86.inline.hpp
+++ b/src/hotspot/os_cpu/linux_x86/prefetch_linux_x86.inline.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2003, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
*
*/
-#ifndef OS_CPU_LINUX_X86_VM_PREFETCH_LINUX_X86_INLINE_HPP
-#define OS_CPU_LINUX_X86_VM_PREFETCH_LINUX_X86_INLINE_HPP
+#ifndef OS_CPU_LINUX_X86_PREFETCH_LINUX_X86_INLINE_HPP
+#define OS_CPU_LINUX_X86_PREFETCH_LINUX_X86_INLINE_HPP
#include "runtime/prefetch.hpp"
@@ -44,4 +44,4 @@ inline void Prefetch::write(void *loc, intx interval) {
#endif // AMD64
}
-#endif // OS_CPU_LINUX_X86_VM_PREFETCH_LINUX_X86_INLINE_HPP
+#endif // OS_CPU_LINUX_X86_PREFETCH_LINUX_X86_INLINE_HPP
diff --git a/src/hotspot/os_cpu/linux_x86/thread_linux_x86.hpp b/src/hotspot/os_cpu/linux_x86/thread_linux_x86.hpp
index c7759eb5772..3ee496cfcbf 100644
--- a/src/hotspot/os_cpu/linux_x86/thread_linux_x86.hpp
+++ b/src/hotspot/os_cpu/linux_x86/thread_linux_x86.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2000, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
*
*/
-#ifndef OS_CPU_LINUX_X86_VM_THREAD_LINUX_X86_HPP
-#define OS_CPU_LINUX_X86_VM_THREAD_LINUX_X86_HPP
+#ifndef OS_CPU_LINUX_X86_THREAD_LINUX_X86_HPP
+#define OS_CPU_LINUX_X86_THREAD_LINUX_X86_HPP
private:
void pd_initialize() {
@@ -64,4 +64,4 @@ public:
static void enable_register_stack_guard() {}
static void disable_register_stack_guard() {}
-#endif // OS_CPU_LINUX_X86_VM_THREAD_LINUX_X86_HPP
+#endif // OS_CPU_LINUX_X86_THREAD_LINUX_X86_HPP
diff --git a/src/hotspot/os_cpu/linux_x86/vmStructs_linux_x86.hpp b/src/hotspot/os_cpu/linux_x86/vmStructs_linux_x86.hpp
index 897e48aa19f..277486549c0 100644
--- a/src/hotspot/os_cpu/linux_x86/vmStructs_linux_x86.hpp
+++ b/src/hotspot/os_cpu/linux_x86/vmStructs_linux_x86.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2000, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
*
*/
-#ifndef OS_CPU_LINUX_X86_VM_VMSTRUCTS_LINUX_X86_HPP
-#define OS_CPU_LINUX_X86_VM_VMSTRUCTS_LINUX_X86_HPP
+#ifndef OS_CPU_LINUX_X86_VMSTRUCTS_LINUX_X86_HPP
+#define OS_CPU_LINUX_X86_VMSTRUCTS_LINUX_X86_HPP
// These are the OS and CPU-specific fields, types and integer
// constants required by the Serviceability Agent. This file is
@@ -51,4 +51,4 @@
#define VM_LONG_CONSTANTS_OS_CPU(declare_constant, declare_preprocessor_constant, declare_c1_constant, declare_c2_constant, declare_c2_preprocessor_constant)
-#endif // OS_CPU_LINUX_X86_VM_VMSTRUCTS_LINUX_X86_HPP
+#endif // OS_CPU_LINUX_X86_VMSTRUCTS_LINUX_X86_HPP
diff --git a/src/hotspot/os_cpu/linux_zero/atomic_linux_zero.hpp b/src/hotspot/os_cpu/linux_zero/atomic_linux_zero.hpp
index 2ab748c9785..7f6dd1f2972 100644
--- a/src/hotspot/os_cpu/linux_zero/atomic_linux_zero.hpp
+++ b/src/hotspot/os_cpu/linux_zero/atomic_linux_zero.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2003, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2019, Oracle and/or its affiliates. All rights reserved.
* Copyright 2007, 2008, 2011, 2015, Red Hat, Inc.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
@@ -23,8 +23,8 @@
*
*/
-#ifndef OS_CPU_LINUX_ZERO_VM_ATOMIC_LINUX_ZERO_HPP
-#define OS_CPU_LINUX_ZERO_VM_ATOMIC_LINUX_ZERO_HPP
+#ifndef OS_CPU_LINUX_ZERO_ATOMIC_LINUX_ZERO_HPP
+#define OS_CPU_LINUX_ZERO_ATOMIC_LINUX_ZERO_HPP
#include "runtime/os.hpp"
@@ -128,4 +128,4 @@ inline void Atomic::PlatformStore<8>::operator()(T store_value,
os::atomic_copy64(reinterpret_cast(&store_value), reinterpret_cast(dest));
}
-#endif // OS_CPU_LINUX_ZERO_VM_ATOMIC_LINUX_ZERO_HPP
+#endif // OS_CPU_LINUX_ZERO_ATOMIC_LINUX_ZERO_HPP
diff --git a/src/hotspot/os_cpu/linux_zero/bytes_linux_zero.inline.hpp b/src/hotspot/os_cpu/linux_zero/bytes_linux_zero.inline.hpp
index 707cba2d057..1a25ba15c99 100644
--- a/src/hotspot/os_cpu/linux_zero/bytes_linux_zero.inline.hpp
+++ b/src/hotspot/os_cpu/linux_zero/bytes_linux_zero.inline.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2003, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
*
*/
-#ifndef OS_CPU_LINUX_ZERO_VM_BYTES_LINUX_ZERO_INLINE_HPP
-#define OS_CPU_LINUX_ZERO_VM_BYTES_LINUX_ZERO_INLINE_HPP
+#ifndef OS_CPU_LINUX_ZERO_BYTES_LINUX_ZERO_INLINE_HPP
+#define OS_CPU_LINUX_ZERO_BYTES_LINUX_ZERO_INLINE_HPP
// Efficient swapping of data bytes from Java byte
// ordering to native byte ordering and vice versa.
@@ -42,4 +42,4 @@ inline u8 Bytes::swap_u8(u8 x) {
return bswap_64(x);
}
-#endif // OS_CPU_LINUX_ZERO_VM_BYTES_LINUX_ZERO_INLINE_HPP
+#endif // OS_CPU_LINUX_ZERO_BYTES_LINUX_ZERO_INLINE_HPP
diff --git a/src/hotspot/os_cpu/linux_zero/globals_linux_zero.hpp b/src/hotspot/os_cpu/linux_zero/globals_linux_zero.hpp
index f1b6d212a8f..957c5c4a12a 100644
--- a/src/hotspot/os_cpu/linux_zero/globals_linux_zero.hpp
+++ b/src/hotspot/os_cpu/linux_zero/globals_linux_zero.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2000, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2019, Oracle and/or its affiliates. All rights reserved.
* Copyright 2007, 2008, 2010 Red Hat, Inc.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
@@ -23,8 +23,8 @@
*
*/
-#ifndef OS_CPU_LINUX_ZERO_VM_GLOBALS_LINUX_ZERO_HPP
-#define OS_CPU_LINUX_ZERO_VM_GLOBALS_LINUX_ZERO_HPP
+#ifndef OS_CPU_LINUX_ZERO_GLOBALS_LINUX_ZERO_HPP
+#define OS_CPU_LINUX_ZERO_GLOBALS_LINUX_ZERO_HPP
//
// Set the default values for platform dependent flags used by the
@@ -44,4 +44,4 @@ define_pd_global(size_t, JVMInvokeMethodSlack, 8192);
// Used on 64 bit platforms for UseCompressedOops base address
define_pd_global(size_t, HeapBaseMinAddress, 2*G);
-#endif // OS_CPU_LINUX_ZERO_VM_GLOBALS_LINUX_ZERO_HPP
+#endif // OS_CPU_LINUX_ZERO_GLOBALS_LINUX_ZERO_HPP
diff --git a/src/hotspot/os_cpu/linux_zero/orderAccess_linux_zero.hpp b/src/hotspot/os_cpu/linux_zero/orderAccess_linux_zero.hpp
index 950a4819f36..490e76b916a 100644
--- a/src/hotspot/os_cpu/linux_zero/orderAccess_linux_zero.hpp
+++ b/src/hotspot/os_cpu/linux_zero/orderAccess_linux_zero.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2003, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2019, Oracle and/or its affiliates. All rights reserved.
* Copyright 2007, 2008, 2009 Red Hat, Inc.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
@@ -23,8 +23,8 @@
*
*/
-#ifndef OS_CPU_LINUX_ZERO_VM_ORDERACCESS_LINUX_ZERO_HPP
-#define OS_CPU_LINUX_ZERO_VM_ORDERACCESS_LINUX_ZERO_HPP
+#ifndef OS_CPU_LINUX_ZERO_ORDERACCESS_LINUX_ZERO_HPP
+#define OS_CPU_LINUX_ZERO_ORDERACCESS_LINUX_ZERO_HPP
// Included in orderAccess.hpp header file.
@@ -83,4 +83,4 @@ inline void OrderAccess::release() { LIGHT_MEM_BARRIER; }
inline void OrderAccess::fence() { FULL_MEM_BARRIER; }
-#endif // OS_CPU_LINUX_ZERO_VM_ORDERACCESS_LINUX_ZERO_HPP
+#endif // OS_CPU_LINUX_ZERO_ORDERACCESS_LINUX_ZERO_HPP
diff --git a/src/hotspot/os_cpu/linux_zero/os_linux_zero.hpp b/src/hotspot/os_cpu/linux_zero/os_linux_zero.hpp
index 3c13b5b7d2b..77309f0331a 100644
--- a/src/hotspot/os_cpu/linux_zero/os_linux_zero.hpp
+++ b/src/hotspot/os_cpu/linux_zero/os_linux_zero.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2003, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2019, Oracle and/or its affiliates. All rights reserved.
* Copyright 2007, 2008, 2010, 2018, Red Hat, Inc.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
@@ -23,8 +23,8 @@
*
*/
-#ifndef OS_CPU_LINUX_ZERO_VM_OS_LINUX_ZERO_HPP
-#define OS_CPU_LINUX_ZERO_VM_OS_LINUX_ZERO_HPP
+#ifndef OS_CPU_LINUX_ZERO_OS_LINUX_ZERO_HPP
+#define OS_CPU_LINUX_ZERO_OS_LINUX_ZERO_HPP
static void setup_fpu() {}
@@ -69,4 +69,4 @@
#endif
}
-#endif // OS_CPU_LINUX_ZERO_VM_OS_LINUX_ZERO_HPP
+#endif // OS_CPU_LINUX_ZERO_OS_LINUX_ZERO_HPP
diff --git a/src/hotspot/os_cpu/linux_zero/prefetch_linux_zero.inline.hpp b/src/hotspot/os_cpu/linux_zero/prefetch_linux_zero.inline.hpp
index e34fef0b85d..85cf90b42d3 100644
--- a/src/hotspot/os_cpu/linux_zero/prefetch_linux_zero.inline.hpp
+++ b/src/hotspot/os_cpu/linux_zero/prefetch_linux_zero.inline.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2003, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2019, Oracle and/or its affiliates. All rights reserved.
* Copyright 2007, 2008 Red Hat, Inc.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
@@ -23,8 +23,8 @@
*
*/
-#ifndef OS_CPU_LINUX_ZERO_VM_PREFETCH_LINUX_ZERO_INLINE_HPP
-#define OS_CPU_LINUX_ZERO_VM_PREFETCH_LINUX_ZERO_INLINE_HPP
+#ifndef OS_CPU_LINUX_ZERO_PREFETCH_LINUX_ZERO_INLINE_HPP
+#define OS_CPU_LINUX_ZERO_PREFETCH_LINUX_ZERO_INLINE_HPP
#include "runtime/prefetch.hpp"
@@ -34,4 +34,4 @@ inline void Prefetch::read(void* loc, intx interval) {
inline void Prefetch::write(void* loc, intx interval) {
}
-#endif // OS_CPU_LINUX_ZERO_VM_PREFETCH_LINUX_ZERO_INLINE_HPP
+#endif // OS_CPU_LINUX_ZERO_PREFETCH_LINUX_ZERO_INLINE_HPP
diff --git a/src/hotspot/os_cpu/linux_zero/thread_linux_zero.hpp b/src/hotspot/os_cpu/linux_zero/thread_linux_zero.hpp
index 3a09948b072..b3b44530dba 100644
--- a/src/hotspot/os_cpu/linux_zero/thread_linux_zero.hpp
+++ b/src/hotspot/os_cpu/linux_zero/thread_linux_zero.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2000, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2019, Oracle and/or its affiliates. All rights reserved.
* Copyright 2007, 2008, 2009, 2010 Red Hat, Inc.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
@@ -23,8 +23,8 @@
*
*/
-#ifndef OS_CPU_LINUX_ZERO_VM_THREAD_LINUX_ZERO_HPP
-#define OS_CPU_LINUX_ZERO_VM_THREAD_LINUX_ZERO_HPP
+#ifndef OS_CPU_LINUX_ZERO_THREAD_LINUX_ZERO_HPP
+#define OS_CPU_LINUX_ZERO_THREAD_LINUX_ZERO_HPP
private:
ZeroStack _zero_stack;
@@ -124,4 +124,4 @@
static void enable_register_stack_guard() {}
static void disable_register_stack_guard() {}
-#endif // OS_CPU_LINUX_ZERO_VM_THREAD_LINUX_ZERO_HPP
+#endif // OS_CPU_LINUX_ZERO_THREAD_LINUX_ZERO_HPP
diff --git a/src/hotspot/os_cpu/linux_zero/vmStructs_linux_zero.hpp b/src/hotspot/os_cpu/linux_zero/vmStructs_linux_zero.hpp
index fe0cc5e10a1..271193cd705 100644
--- a/src/hotspot/os_cpu/linux_zero/vmStructs_linux_zero.hpp
+++ b/src/hotspot/os_cpu/linux_zero/vmStructs_linux_zero.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2003, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2019, Oracle and/or its affiliates. All rights reserved.
* Copyright 2007 Red Hat, Inc.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
@@ -23,8 +23,8 @@
*
*/
-#ifndef OS_CPU_LINUX_ZERO_VM_VMSTRUCTS_LINUX_ZERO_HPP
-#define OS_CPU_LINUX_ZERO_VM_VMSTRUCTS_LINUX_ZERO_HPP
+#ifndef OS_CPU_LINUX_ZERO_VMSTRUCTS_LINUX_ZERO_HPP
+#define OS_CPU_LINUX_ZERO_VMSTRUCTS_LINUX_ZERO_HPP
// These are the OS and CPU-specific fields, types and integer
// constants required by the Serviceability Agent. This file is
@@ -38,4 +38,4 @@
#define VM_LONG_CONSTANTS_OS_CPU(declare_constant, declare_preprocessor_constant, declare_c1_constant, declare_c2_constant, declare_c2_preprocessor_constant)
-#endif // OS_CPU_LINUX_ZERO_VM_VMSTRUCTS_LINUX_ZERO_HPP
+#endif // OS_CPU_LINUX_ZERO_VMSTRUCTS_LINUX_ZERO_HPP
diff --git a/src/hotspot/os_cpu/solaris_sparc/atomic_solaris_sparc.hpp b/src/hotspot/os_cpu/solaris_sparc/atomic_solaris_sparc.hpp
index 0ca8811771a..616afbf7ce3 100644
--- a/src/hotspot/os_cpu/solaris_sparc/atomic_solaris_sparc.hpp
+++ b/src/hotspot/os_cpu/solaris_sparc/atomic_solaris_sparc.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1999, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1999, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
*
*/
-#ifndef OS_CPU_SOLARIS_SPARC_VM_ATOMIC_SOLARIS_SPARC_HPP
-#define OS_CPU_SOLARIS_SPARC_VM_ATOMIC_SOLARIS_SPARC_HPP
+#ifndef OS_CPU_SOLARIS_SPARC_ATOMIC_SOLARIS_SPARC_HPP
+#define OS_CPU_SOLARIS_SPARC_ATOMIC_SOLARIS_SPARC_HPP
// Implementation of class atomic
@@ -107,4 +107,4 @@ inline T Atomic::PlatformCmpxchg<8>::operator()(T exchange_value,
return rv;
}
-#endif // OS_CPU_SOLARIS_SPARC_VM_ATOMIC_SOLARIS_SPARC_HPP
+#endif // OS_CPU_SOLARIS_SPARC_ATOMIC_SOLARIS_SPARC_HPP
diff --git a/src/hotspot/os_cpu/solaris_sparc/count_trailing_zeros_solaris_sparc.hpp b/src/hotspot/os_cpu/solaris_sparc/count_trailing_zeros_solaris_sparc.hpp
index 39c6df52871..37544b0d26e 100644
--- a/src/hotspot/os_cpu/solaris_sparc/count_trailing_zeros_solaris_sparc.hpp
+++ b/src/hotspot/os_cpu/solaris_sparc/count_trailing_zeros_solaris_sparc.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
*
*/
-#ifndef OS_CPU_SOLARIS_SPARC_VM_COUNTTRAILINGZEROS_HPP
-#define OS_CPU_SOLARIS_SPARC_VM_COUNTTRAILINGZEROS_HPP
+#ifndef OS_CPU_SOLARIS_SPARC_COUNT_TRAILING_ZEROS_SOLARIS_SPARC_HPP
+#define OS_CPU_SOLARIS_SPARC_COUNT_TRAILING_ZEROS_SOLARIS_SPARC_HPP
#include "utilities/globalDefinitions.hpp"
@@ -38,4 +38,4 @@ inline unsigned count_trailing_zeros(uintx x) {
return result;
}
-#endif // include guard
+#endif // OS_CPU_SOLARIS_SPARC_COUNT_TRAILING_ZEROS_SOLARIS_SPARC_HPP
diff --git a/src/hotspot/os_cpu/solaris_sparc/globals_solaris_sparc.hpp b/src/hotspot/os_cpu/solaris_sparc/globals_solaris_sparc.hpp
index b5a4f399328..63d5221a165 100644
--- a/src/hotspot/os_cpu/solaris_sparc/globals_solaris_sparc.hpp
+++ b/src/hotspot/os_cpu/solaris_sparc/globals_solaris_sparc.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2000, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
*
*/
-#ifndef OS_CPU_SOLARIS_SPARC_VM_GLOBALS_SOLARIS_SPARC_HPP
-#define OS_CPU_SOLARIS_SPARC_VM_GLOBALS_SOLARIS_SPARC_HPP
+#ifndef OS_CPU_SOLARIS_SPARC_GLOBALS_SOLARIS_SPARC_HPP
+#define OS_CPU_SOLARIS_SPARC_GLOBALS_SOLARIS_SPARC_HPP
//
// Sets the default values for platform dependent flags used by the runtime system.
@@ -39,4 +39,4 @@ define_pd_global(size_t, HeapBaseMinAddress, CONST64(6)*G);
-#endif // OS_CPU_SOLARIS_SPARC_VM_GLOBALS_SOLARIS_SPARC_HPP
+#endif // OS_CPU_SOLARIS_SPARC_GLOBALS_SOLARIS_SPARC_HPP
diff --git a/src/hotspot/os_cpu/solaris_sparc/orderAccess_solaris_sparc.hpp b/src/hotspot/os_cpu/solaris_sparc/orderAccess_solaris_sparc.hpp
index 14422eb1252..189e03c1f90 100644
--- a/src/hotspot/os_cpu/solaris_sparc/orderAccess_solaris_sparc.hpp
+++ b/src/hotspot/os_cpu/solaris_sparc/orderAccess_solaris_sparc.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2003, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
*
*/
-#ifndef OS_CPU_SOLARIS_SPARC_VM_ORDERACCESS_SOLARIS_SPARC_HPP
-#define OS_CPU_SOLARIS_SPARC_VM_ORDERACCESS_SOLARIS_SPARC_HPP
+#ifndef OS_CPU_SOLARIS_SPARC_ORDERACCESS_SOLARIS_SPARC_HPP
+#define OS_CPU_SOLARIS_SPARC_ORDERACCESS_SOLARIS_SPARC_HPP
// Included in orderAccess.hpp header file.
@@ -51,4 +51,4 @@ inline void OrderAccess::fence() {
__asm__ volatile ("membar #StoreLoad" : : : "memory");
}
-#endif // OS_CPU_SOLARIS_SPARC_VM_ORDERACCESS_SOLARIS_SPARC_HPP
+#endif // OS_CPU_SOLARIS_SPARC_ORDERACCESS_SOLARIS_SPARC_HPP
diff --git a/src/hotspot/os_cpu/solaris_sparc/os_solaris_sparc.hpp b/src/hotspot/os_cpu/solaris_sparc/os_solaris_sparc.hpp
index 82557d91f70..f787fd66d1b 100644
--- a/src/hotspot/os_cpu/solaris_sparc/os_solaris_sparc.hpp
+++ b/src/hotspot/os_cpu/solaris_sparc/os_solaris_sparc.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1999, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1999, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
*
*/
-#ifndef OS_CPU_SOLARIS_SPARC_VM_OS_SOLARIS_SPARC_HPP
-#define OS_CPU_SOLARIS_SPARC_VM_OS_SOLARIS_SPARC_HPP
+#ifndef OS_CPU_SOLARIS_SPARC_OS_SOLARIS_SPARC_HPP
+#define OS_CPU_SOLARIS_SPARC_OS_SOLARIS_SPARC_HPP
//
// NOTE: we are back in class os here, not Solaris
@@ -46,4 +46,4 @@
// Note: Currently only used in 64 bit Windows implementations
static bool register_code_area(char *low, char *high) { return true; }
-#endif // OS_CPU_SOLARIS_SPARC_VM_OS_SOLARIS_SPARC_HPP
+#endif // OS_CPU_SOLARIS_SPARC_OS_SOLARIS_SPARC_HPP
diff --git a/src/hotspot/os_cpu/solaris_sparc/prefetch_solaris_sparc.inline.hpp b/src/hotspot/os_cpu/solaris_sparc/prefetch_solaris_sparc.inline.hpp
index 6469ff50967..1b7cdef70cf 100644
--- a/src/hotspot/os_cpu/solaris_sparc/prefetch_solaris_sparc.inline.hpp
+++ b/src/hotspot/os_cpu/solaris_sparc/prefetch_solaris_sparc.inline.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2003, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
*
*/
-#ifndef OS_CPU_SOLARIS_SPARC_VM_PREFETCH_SOLARIS_SPARC_INLINE_HPP
-#define OS_CPU_SOLARIS_SPARC_VM_PREFETCH_SOLARIS_SPARC_INLINE_HPP
+#ifndef OS_CPU_SOLARIS_SPARC_PREFETCH_SOLARIS_SPARC_INLINE_HPP
+#define OS_CPU_SOLARIS_SPARC_PREFETCH_SOLARIS_SPARC_INLINE_HPP
#include "runtime/prefetch.hpp"
@@ -40,4 +40,4 @@ inline void Prefetch::write(void *loc, intx interval) {
_Prefetch_write(loc, interval);
}
-#endif // OS_CPU_SOLARIS_SPARC_VM_PREFETCH_SOLARIS_SPARC_INLINE_HPP
+#endif // OS_CPU_SOLARIS_SPARC_PREFETCH_SOLARIS_SPARC_INLINE_HPP
diff --git a/src/hotspot/os_cpu/solaris_sparc/thread_solaris_sparc.hpp b/src/hotspot/os_cpu/solaris_sparc/thread_solaris_sparc.hpp
index d4bbb11332e..52db0680521 100644
--- a/src/hotspot/os_cpu/solaris_sparc/thread_solaris_sparc.hpp
+++ b/src/hotspot/os_cpu/solaris_sparc/thread_solaris_sparc.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
*
*/
-#ifndef OS_CPU_SOLARIS_SPARC_VM_THREAD_SOLARIS_SPARC_HPP
-#define OS_CPU_SOLARIS_SPARC_VM_THREAD_SOLARIS_SPARC_HPP
+#ifndef OS_CPU_SOLARIS_SPARC_THREAD_SOLARIS_SPARC_HPP
+#define OS_CPU_SOLARIS_SPARC_THREAD_SOLARIS_SPARC_HPP
private:
void pd_initialize() {
@@ -94,4 +94,4 @@ public:
static void enable_register_stack_guard() {}
static void disable_register_stack_guard() {}
-#endif // OS_CPU_SOLARIS_SPARC_VM_THREAD_SOLARIS_SPARC_HPP
+#endif // OS_CPU_SOLARIS_SPARC_THREAD_SOLARIS_SPARC_HPP
diff --git a/src/hotspot/os_cpu/solaris_sparc/vmStructs_solaris_sparc.hpp b/src/hotspot/os_cpu/solaris_sparc/vmStructs_solaris_sparc.hpp
index a01e18dd0fc..0d1c9ac0bf2 100644
--- a/src/hotspot/os_cpu/solaris_sparc/vmStructs_solaris_sparc.hpp
+++ b/src/hotspot/os_cpu/solaris_sparc/vmStructs_solaris_sparc.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2000, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
*
*/
-#ifndef OS_CPU_SOLARIS_SPARC_VM_VMSTRUCTS_SOLARIS_SPARC_HPP
-#define OS_CPU_SOLARIS_SPARC_VM_VMSTRUCTS_SOLARIS_SPARC_HPP
+#ifndef OS_CPU_SOLARIS_SPARC_VMSTRUCTS_SOLARIS_SPARC_HPP
+#define OS_CPU_SOLARIS_SPARC_VMSTRUCTS_SOLARIS_SPARC_HPP
// These are the OS and CPU-specific fields, types and integer
// constants required by the Serviceability Agent. This file is
@@ -39,4 +39,4 @@
#define VM_LONG_CONSTANTS_OS_CPU(declare_constant, declare_preprocessor_constant, declare_c1_constant, declare_c2_constant, declare_c2_preprocessor_constant)
-#endif // OS_CPU_SOLARIS_SPARC_VM_VMSTRUCTS_SOLARIS_SPARC_HPP
+#endif // OS_CPU_SOLARIS_SPARC_VMSTRUCTS_SOLARIS_SPARC_HPP
diff --git a/src/hotspot/os_cpu/solaris_x86/atomic_solaris_x86.hpp b/src/hotspot/os_cpu/solaris_x86/atomic_solaris_x86.hpp
index ebb0d8325cc..99c23284573 100644
--- a/src/hotspot/os_cpu/solaris_x86/atomic_solaris_x86.hpp
+++ b/src/hotspot/os_cpu/solaris_x86/atomic_solaris_x86.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1999, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1999, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
*
*/
-#ifndef OS_CPU_SOLARIS_X86_VM_ATOMIC_SOLARIS_X86_HPP
-#define OS_CPU_SOLARIS_X86_VM_ATOMIC_SOLARIS_X86_HPP
+#ifndef OS_CPU_SOLARIS_X86_ATOMIC_SOLARIS_X86_HPP
+#define OS_CPU_SOLARIS_X86_ATOMIC_SOLARIS_X86_HPP
// For Sun Studio - implementation is in solaris_x86_64.il.
@@ -141,4 +141,4 @@ inline T Atomic::PlatformCmpxchg<8>::operator()(T exchange_value,
PrimitiveConversions::cast(compare_value)));
}
-#endif // OS_CPU_SOLARIS_X86_VM_ATOMIC_SOLARIS_X86_HPP
+#endif // OS_CPU_SOLARIS_X86_ATOMIC_SOLARIS_X86_HPP
diff --git a/src/hotspot/os_cpu/solaris_x86/bytes_solaris_x86.inline.hpp b/src/hotspot/os_cpu/solaris_x86/bytes_solaris_x86.inline.hpp
index 30095d19cda..a4bf5a8155f 100644
--- a/src/hotspot/os_cpu/solaris_x86/bytes_solaris_x86.inline.hpp
+++ b/src/hotspot/os_cpu/solaris_x86/bytes_solaris_x86.inline.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
*
*/
-#ifndef OS_CPU_SOLARIS_X86_VM_BYTES_SOLARIS_X86_INLINE_HPP
-#define OS_CPU_SOLARIS_X86_VM_BYTES_SOLARIS_X86_INLINE_HPP
+#ifndef OS_CPU_SOLARIS_X86_BYTES_SOLARIS_X86_INLINE_HPP
+#define OS_CPU_SOLARIS_X86_BYTES_SOLARIS_X86_INLINE_HPP
// For Sun Studio - implementation is in solaris_i486.il.
// For gcc - implementation is just below.
@@ -61,4 +61,4 @@ inline u8 Bytes::swap_u8_base(u4 x, u4 y) {
}
#endif // !AMD64
-#endif // OS_CPU_SOLARIS_X86_VM_BYTES_SOLARIS_X86_INLINE_HPP
+#endif // OS_CPU_SOLARIS_X86_BYTES_SOLARIS_X86_INLINE_HPP
diff --git a/src/hotspot/os_cpu/solaris_x86/copy_solaris_x86.inline.hpp b/src/hotspot/os_cpu/solaris_x86/copy_solaris_x86.inline.hpp
index 7dbbe019fff..48b3136ce37 100644
--- a/src/hotspot/os_cpu/solaris_x86/copy_solaris_x86.inline.hpp
+++ b/src/hotspot/os_cpu/solaris_x86/copy_solaris_x86.inline.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2003, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
*
*/
-#ifndef OS_CPU_SOLARIS_X86_VM_COPY_SOLARIS_X86_INLINE_HPP
-#define OS_CPU_SOLARIS_X86_VM_COPY_SOLARIS_X86_INLINE_HPP
+#ifndef OS_CPU_SOLARIS_X86_COPY_SOLARIS_X86_INLINE_HPP
+#define OS_CPU_SOLARIS_X86_COPY_SOLARIS_X86_INLINE_HPP
static void pd_conjoint_words(const HeapWord* from, HeapWord* to, size_t count) {
(void)memmove(to, from, count * HeapWordSize);
@@ -140,4 +140,4 @@ static void pd_arrayof_conjoint_oops(const HeapWord* from, HeapWord* to, size_t
#endif // AMD64
}
-#endif // OS_CPU_SOLARIS_X86_VM_COPY_SOLARIS_X86_INLINE_HPP
+#endif // OS_CPU_SOLARIS_X86_COPY_SOLARIS_X86_INLINE_HPP
diff --git a/src/hotspot/os_cpu/solaris_x86/count_trailing_zeros_solaris_x86.hpp b/src/hotspot/os_cpu/solaris_x86/count_trailing_zeros_solaris_x86.hpp
index 6d74f818ee5..2937b1f23af 100644
--- a/src/hotspot/os_cpu/solaris_x86/count_trailing_zeros_solaris_x86.hpp
+++ b/src/hotspot/os_cpu/solaris_x86/count_trailing_zeros_solaris_x86.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
*
*/
-#ifndef OS_CPU_SOLARIS_X86_VM_COUNTTRAILINGZEROS_HPP
-#define OS_CPU_SOLARIS_X86_VM_COUNTTRAILINGZEROS_HPP
+#ifndef OS_CPU_SOLARIS_X86_COUNT_TRAILING_ZEROS_SOLARIS_X86_HPP
+#define OS_CPU_SOLARIS_X86_COUNT_TRAILING_ZEROS_SOLARIS_X86_HPP
#include "utilities/globalDefinitions.hpp"
@@ -34,4 +34,4 @@ inline unsigned count_trailing_zeros(uintx x) {
return result;
}
-#endif // include guard
+#endif // OS_CPU_SOLARIS_X86_COUNT_TRAILING_ZEROS_SOLARIS_X86_HPP
diff --git a/src/hotspot/os_cpu/solaris_x86/globals_solaris_x86.hpp b/src/hotspot/os_cpu/solaris_x86/globals_solaris_x86.hpp
index 632dc1e0c85..50cf1504602 100644
--- a/src/hotspot/os_cpu/solaris_x86/globals_solaris_x86.hpp
+++ b/src/hotspot/os_cpu/solaris_x86/globals_solaris_x86.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2000, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
*
*/
-#ifndef OS_CPU_SOLARIS_X86_VM_GLOBALS_SOLARIS_X86_HPP
-#define OS_CPU_SOLARIS_X86_VM_GLOBALS_SOLARIS_X86_HPP
+#ifndef OS_CPU_SOLARIS_X86_GLOBALS_SOLARIS_X86_HPP
+#define OS_CPU_SOLARIS_X86_GLOBALS_SOLARIS_X86_HPP
// Sets the default values for platform dependent flags used by the runtime system.
// (see globals.hpp)
@@ -47,4 +47,4 @@ define_pd_global(size_t, JVMInvokeMethodSlack, 10*K);
// Used on 64 bit platforms for UseCompressedOops base address
define_pd_global(size_t, HeapBaseMinAddress, 2*G);
-#endif // OS_CPU_SOLARIS_X86_VM_GLOBALS_SOLARIS_X86_HPP
+#endif // OS_CPU_SOLARIS_X86_GLOBALS_SOLARIS_X86_HPP
diff --git a/src/hotspot/os_cpu/solaris_x86/orderAccess_solaris_x86.hpp b/src/hotspot/os_cpu/solaris_x86/orderAccess_solaris_x86.hpp
index ad18c0f349c..3ee65bd736d 100644
--- a/src/hotspot/os_cpu/solaris_x86/orderAccess_solaris_x86.hpp
+++ b/src/hotspot/os_cpu/solaris_x86/orderAccess_solaris_x86.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2003, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
*
*/
-#ifndef OS_CPU_SOLARIS_X86_VM_ORDERACCESS_SOLARIS_X86_HPP
-#define OS_CPU_SOLARIS_X86_VM_ORDERACCESS_SOLARIS_X86_HPP
+#ifndef OS_CPU_SOLARIS_X86_ORDERACCESS_SOLARIS_X86_HPP
+#define OS_CPU_SOLARIS_X86_ORDERACCESS_SOLARIS_X86_HPP
// Included in orderAccess.hpp header file.
@@ -54,4 +54,4 @@ inline void OrderAccess::fence() {
compiler_barrier();
}
-#endif // OS_CPU_SOLARIS_X86_VM_ORDERACCESS_SOLARIS_X86_HPP
+#endif // OS_CPU_SOLARIS_X86_ORDERACCESS_SOLARIS_X86_HPP
diff --git a/src/hotspot/os_cpu/solaris_x86/os_solaris_x86.cpp b/src/hotspot/os_cpu/solaris_x86/os_solaris_x86.cpp
index d40251b82d5..fe73914f6a2 100644
--- a/src/hotspot/os_cpu/solaris_x86/os_solaris_x86.cpp
+++ b/src/hotspot/os_cpu/solaris_x86/os_solaris_x86.cpp
@@ -686,54 +686,6 @@ JVM_handle_solaris_signal(int sig, siginfo_t* info, void* ucVoid,
return true;
}
-#ifndef AMD64
- // Workaround (bug 4900493) for Solaris kernel bug 4966651.
- // Handle an undefined selector caused by an attempt to assign
- // fs in libthread getipriptr(). With the current libthread design every 512
- // thread creations the LDT for a private thread data structure is extended
- // and thre is a hazard that and another thread attempting a thread creation
- // will use a stale LDTR that doesn't reflect the structure's growth,
- // causing a GP fault.
- // Enforce the probable limit of passes through here to guard against an
- // infinite loop if some other move to fs caused the GP fault. Note that
- // this loop counter is ultimately a heuristic as it is possible for
- // more than one thread to generate this fault at a time in an MP system.
- // In the case of the loop count being exceeded or if the poll fails
- // just fall through to a fatal error.
- // If there is some other source of T_GPFLT traps and the text at EIP is
- // unreadable this code will loop infinitely until the stack is exausted.
- // The key to diagnosis in this case is to look for the bottom signal handler
- // frame.
-
- if(! IgnoreLibthreadGPFault) {
- if (sig == SIGSEGV && uc->uc_mcontext.gregs[TRAPNO] == T_GPFLT) {
- const unsigned char *p =
- (unsigned const char *) uc->uc_mcontext.gregs[EIP];
-
- // Expected instruction?
-
- if(p[0] == movlfs[0] && p[1] == movlfs[1]) {
-
- Atomic::inc(&ldtr_refresh);
-
- // Infinite loop?
-
- if(ldtr_refresh < ((2 << 16) / PAGESIZE)) {
-
- // No, force scheduling to get a fresh view of the LDTR
-
- if(poll(NULL, 0, 10) == 0) {
-
- // Retry the move
-
- return false;
- }
- }
- }
- }
- }
-#endif // !AMD64
-
if (!abort_if_unrecognized) {
// caller wants another chance, so give it to him
return false;
diff --git a/src/hotspot/os_cpu/solaris_x86/os_solaris_x86.hpp b/src/hotspot/os_cpu/solaris_x86/os_solaris_x86.hpp
index f4c91a5a453..289b9b836d8 100644
--- a/src/hotspot/os_cpu/solaris_x86/os_solaris_x86.hpp
+++ b/src/hotspot/os_cpu/solaris_x86/os_solaris_x86.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1999, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1999, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
*
*/
-#ifndef OS_CPU_SOLARIS_X86_VM_OS_SOLARIS_X86_HPP
-#define OS_CPU_SOLARIS_X86_VM_OS_SOLARIS_X86_HPP
+#ifndef OS_CPU_SOLARIS_X86_OS_SOLARIS_X86_HPP
+#define OS_CPU_SOLARIS_X86_OS_SOLARIS_X86_HPP
//
// NOTE: we are back in class os here, not Solaris
@@ -54,4 +54,4 @@
// Note: Currently only used in 64 bit Windows implementations
static bool register_code_area(char *low, char *high) { return true; }
-#endif // OS_CPU_SOLARIS_X86_VM_OS_SOLARIS_X86_HPP
+#endif // OS_CPU_SOLARIS_X86_OS_SOLARIS_X86_HPP
diff --git a/src/hotspot/os_cpu/solaris_x86/os_solaris_x86.inline.hpp b/src/hotspot/os_cpu/solaris_x86/os_solaris_x86.inline.hpp
index db90eb4b1f2..92b8450ecdb 100644
--- a/src/hotspot/os_cpu/solaris_x86/os_solaris_x86.inline.hpp
+++ b/src/hotspot/os_cpu/solaris_x86/os_solaris_x86.inline.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2011, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
*
*/
-#ifndef OS_CPU_SOLARIS_X86_VM_OS_SOLARIS_X86_INLINE_HPP
-#define OS_CPU_SOLARIS_X86_VM_OS_SOLARIS_X86_INLINE_HPP
+#ifndef OS_CPU_SOLARIS_X86_OS_SOLARIS_X86_INLINE_HPP
+#define OS_CPU_SOLARIS_X86_OS_SOLARIS_X86_INLINE_HPP
#include "runtime/os.hpp"
@@ -31,4 +31,4 @@ extern "C" jlong _raw_rdtsc(); // In .il file
inline jlong os::rdtsc() { return _raw_rdtsc(); }
-#endif // OS_CPU_SOLARIS_X86_VM_OS_SOLARIS_X86_INLINE_HPP
+#endif // OS_CPU_SOLARIS_X86_OS_SOLARIS_X86_INLINE_HPP
diff --git a/src/hotspot/os_cpu/solaris_x86/prefetch_solaris_x86.inline.hpp b/src/hotspot/os_cpu/solaris_x86/prefetch_solaris_x86.inline.hpp
index a83b6f6d659..9c5d5ddbe94 100644
--- a/src/hotspot/os_cpu/solaris_x86/prefetch_solaris_x86.inline.hpp
+++ b/src/hotspot/os_cpu/solaris_x86/prefetch_solaris_x86.inline.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2003, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
*
*/
-#ifndef OS_CPU_SOLARIS_X86_VM_PREFETCH_SOLARIS_X86_INLINE_HPP
-#define OS_CPU_SOLARIS_X86_VM_PREFETCH_SOLARIS_X86_INLINE_HPP
+#ifndef OS_CPU_SOLARIS_X86_PREFETCH_SOLARIS_X86_INLINE_HPP
+#define OS_CPU_SOLARIS_X86_PREFETCH_SOLARIS_X86_INLINE_HPP
#include "runtime/prefetch.hpp"
@@ -45,4 +45,4 @@ inline void Prefetch::write(void *loc, intx interval) {
#endif // AMD64
}
-#endif // OS_CPU_SOLARIS_X86_VM_PREFETCH_SOLARIS_X86_INLINE_HPP
+#endif // OS_CPU_SOLARIS_X86_PREFETCH_SOLARIS_X86_INLINE_HPP
diff --git a/src/hotspot/os_cpu/solaris_x86/thread_solaris_x86.hpp b/src/hotspot/os_cpu/solaris_x86/thread_solaris_x86.hpp
index b2e46771c6e..22be00a54de 100644
--- a/src/hotspot/os_cpu/solaris_x86/thread_solaris_x86.hpp
+++ b/src/hotspot/os_cpu/solaris_x86/thread_solaris_x86.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1999, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1999, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
*
*/
-#ifndef OS_CPU_SOLARIS_X86_VM_THREAD_SOLARIS_X86_HPP
-#define OS_CPU_SOLARIS_X86_VM_THREAD_SOLARIS_X86_HPP
+#ifndef OS_CPU_SOLARIS_X86_THREAD_SOLARIS_X86_HPP
+#define OS_CPU_SOLARIS_X86_THREAD_SOLARIS_X86_HPP
private:
void pd_initialize() { _anchor.clear(); }
@@ -59,4 +59,4 @@ public:
static void enable_register_stack_guard() {}
static void disable_register_stack_guard() {}
-#endif // OS_CPU_SOLARIS_X86_VM_THREAD_SOLARIS_X86_HPP
+#endif // OS_CPU_SOLARIS_X86_THREAD_SOLARIS_X86_HPP
diff --git a/src/hotspot/os_cpu/solaris_x86/vmStructs_solaris_x86.hpp b/src/hotspot/os_cpu/solaris_x86/vmStructs_solaris_x86.hpp
index dc8b8b9b16a..1b5d2e94b61 100644
--- a/src/hotspot/os_cpu/solaris_x86/vmStructs_solaris_x86.hpp
+++ b/src/hotspot/os_cpu/solaris_x86/vmStructs_solaris_x86.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2000, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
*
*/
-#ifndef OS_CPU_SOLARIS_X86_VM_VMSTRUCTS_SOLARIS_X86_HPP
-#define OS_CPU_SOLARIS_X86_VM_VMSTRUCTS_SOLARIS_X86_HPP
+#ifndef OS_CPU_SOLARIS_X86_VMSTRUCTS_SOLARIS_X86_HPP
+#define OS_CPU_SOLARIS_X86_VMSTRUCTS_SOLARIS_X86_HPP
// These are the OS and CPU-specific fields, types and integer
// constants required by the Serviceability Agent. This file is
@@ -37,4 +37,4 @@
#define VM_LONG_CONSTANTS_OS_CPU(declare_constant, declare_preprocessor_constant, declare_c1_constant, declare_c2_constant, declare_c2_preprocessor_constant)
-#endif // OS_CPU_SOLARIS_X86_VM_VMSTRUCTS_SOLARIS_X86_HPP
+#endif // OS_CPU_SOLARIS_X86_VMSTRUCTS_SOLARIS_X86_HPP
diff --git a/src/hotspot/os_cpu/windows_x86/atomic_windows_x86.hpp b/src/hotspot/os_cpu/windows_x86/atomic_windows_x86.hpp
index 7872c9b6fd4..c068680a587 100644
--- a/src/hotspot/os_cpu/windows_x86/atomic_windows_x86.hpp
+++ b/src/hotspot/os_cpu/windows_x86/atomic_windows_x86.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1999, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1999, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
*
*/
-#ifndef OS_CPU_WINDOWS_X86_VM_ATOMIC_WINDOWS_X86_HPP
-#define OS_CPU_WINDOWS_X86_VM_ATOMIC_WINDOWS_X86_HPP
+#ifndef OS_CPU_WINDOWS_X86_ATOMIC_WINDOWS_X86_HPP
+#define OS_CPU_WINDOWS_X86_ATOMIC_WINDOWS_X86_HPP
#include "runtime/os.hpp"
@@ -218,4 +218,4 @@ inline void Atomic::PlatformStore<8>::operator()(T store_value,
#pragma warning(default: 4035) // Enables warnings reporting missing return statement
-#endif // OS_CPU_WINDOWS_X86_VM_ATOMIC_WINDOWS_X86_HPP
+#endif // OS_CPU_WINDOWS_X86_ATOMIC_WINDOWS_X86_HPP
diff --git a/src/hotspot/os_cpu/windows_x86/bytes_windows_x86.inline.hpp b/src/hotspot/os_cpu/windows_x86/bytes_windows_x86.inline.hpp
index 49a79e40974..bbbe822d192 100644
--- a/src/hotspot/os_cpu/windows_x86/bytes_windows_x86.inline.hpp
+++ b/src/hotspot/os_cpu/windows_x86/bytes_windows_x86.inline.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
*
*/
-#ifndef OS_CPU_WINDOWS_X86_VM_BYTES_WINDOWS_X86_INLINE_HPP
-#define OS_CPU_WINDOWS_X86_VM_BYTES_WINDOWS_X86_INLINE_HPP
+#ifndef OS_CPU_WINDOWS_X86_BYTES_WINDOWS_X86_INLINE_HPP
+#define OS_CPU_WINDOWS_X86_BYTES_WINDOWS_X86_INLINE_HPP
#pragma warning(disable: 4035) // Disable warning 4035: no return value
@@ -84,4 +84,4 @@ inline u8 Bytes::swap_u8(u8 x) {
#pragma warning(default: 4035) // Enable warning 4035: no return value
-#endif // OS_CPU_WINDOWS_X86_VM_BYTES_WINDOWS_X86_INLINE_HPP
+#endif // OS_CPU_WINDOWS_X86_BYTES_WINDOWS_X86_INLINE_HPP
diff --git a/src/hotspot/os_cpu/windows_x86/copy_windows_x86.inline.hpp b/src/hotspot/os_cpu/windows_x86/copy_windows_x86.inline.hpp
index 0cf94f2e02d..30eb75fc5b4 100644
--- a/src/hotspot/os_cpu/windows_x86/copy_windows_x86.inline.hpp
+++ b/src/hotspot/os_cpu/windows_x86/copy_windows_x86.inline.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2003, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
*
*/
-#ifndef OS_CPU_WINDOWS_X86_VM_COPY_WINDOWS_X86_INLINE_HPP
-#define OS_CPU_WINDOWS_X86_VM_COPY_WINDOWS_X86_INLINE_HPP
+#ifndef OS_CPU_WINDOWS_X86_COPY_WINDOWS_X86_INLINE_HPP
+#define OS_CPU_WINDOWS_X86_COPY_WINDOWS_X86_INLINE_HPP
static void pd_conjoint_words(const HeapWord* from, HeapWord* to, size_t count) {
(void)memmove(to, from, count * HeapWordSize);
@@ -190,4 +190,4 @@ static void pd_arrayof_conjoint_oops(const HeapWord* from, HeapWord* to, size_t
pd_conjoint_oops_atomic((const oop*)from, (oop*)to, count);
}
-#endif // OS_CPU_WINDOWS_X86_VM_COPY_WINDOWS_X86_INLINE_HPP
+#endif // OS_CPU_WINDOWS_X86_COPY_WINDOWS_X86_INLINE_HPP
diff --git a/src/hotspot/os_cpu/windows_x86/globals_windows_x86.hpp b/src/hotspot/os_cpu/windows_x86/globals_windows_x86.hpp
index aa1734e1f7e..c94796b097a 100644
--- a/src/hotspot/os_cpu/windows_x86/globals_windows_x86.hpp
+++ b/src/hotspot/os_cpu/windows_x86/globals_windows_x86.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2000, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
*
*/
-#ifndef OS_CPU_WINDOWS_X86_VM_GLOBALS_WINDOWS_X86_HPP
-#define OS_CPU_WINDOWS_X86_VM_GLOBALS_WINDOWS_X86_HPP
+#ifndef OS_CPU_WINDOWS_X86_GLOBALS_WINDOWS_X86_HPP
+#define OS_CPU_WINDOWS_X86_GLOBALS_WINDOWS_X86_HPP
// Sets the default values for platform dependent flags used by the runtime system.
// (see globals.hpp)
@@ -48,4 +48,4 @@ define_pd_global(size_t, JVMInvokeMethodSlack, 8192);
// Used on 64 bit platforms for UseCompressedOops base address
define_pd_global(size_t, HeapBaseMinAddress, 2*G);
-#endif // OS_CPU_WINDOWS_X86_VM_GLOBALS_WINDOWS_X86_HPP
+#endif // OS_CPU_WINDOWS_X86_GLOBALS_WINDOWS_X86_HPP
diff --git a/src/hotspot/os_cpu/windows_x86/orderAccess_windows_x86.hpp b/src/hotspot/os_cpu/windows_x86/orderAccess_windows_x86.hpp
index 0f06f1b58bd..94c10e0b008 100644
--- a/src/hotspot/os_cpu/windows_x86/orderAccess_windows_x86.hpp
+++ b/src/hotspot/os_cpu/windows_x86/orderAccess_windows_x86.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2003, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
*
*/
-#ifndef OS_CPU_WINDOWS_X86_VM_ORDERACCESS_WINDOWS_X86_HPP
-#define OS_CPU_WINDOWS_X86_VM_ORDERACCESS_WINDOWS_X86_HPP
+#ifndef OS_CPU_WINDOWS_X86_ORDERACCESS_WINDOWS_X86_HPP
+#define OS_CPU_WINDOWS_X86_ORDERACCESS_WINDOWS_X86_HPP
// Included in orderAccess.hpp header file.
@@ -110,4 +110,4 @@ struct OrderAccess::PlatformOrderedStore<4, RELEASE_X_FENCE>
};
#endif // AMD64
-#endif // OS_CPU_WINDOWS_X86_VM_ORDERACCESS_WINDOWS_X86_HPP
+#endif // OS_CPU_WINDOWS_X86_ORDERACCESS_WINDOWS_X86_HPP
diff --git a/src/hotspot/os_cpu/windows_x86/os_windows_x86.hpp b/src/hotspot/os_cpu/windows_x86/os_windows_x86.hpp
index c3964929d19..d5706e0416e 100644
--- a/src/hotspot/os_cpu/windows_x86/os_windows_x86.hpp
+++ b/src/hotspot/os_cpu/windows_x86/os_windows_x86.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1999, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1999, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
*
*/
-#ifndef OS_CPU_WINDOWS_X86_VM_OS_WINDOWS_X86_HPP
-#define OS_CPU_WINDOWS_X86_VM_OS_WINDOWS_X86_HPP
+#ifndef OS_CPU_WINDOWS_X86_OS_WINDOWS_X86_HPP
+#define OS_CPU_WINDOWS_X86_OS_WINDOWS_X86_HPP
//
// NOTE: we are back in class os here, not win32
@@ -70,4 +70,4 @@ static bool platform_print_native_stack(outputStream* st, const void* context,
char *buf, int buf_size);
#endif
-#endif // OS_CPU_WINDOWS_X86_VM_OS_WINDOWS_X86_HPP
+#endif // OS_CPU_WINDOWS_X86_OS_WINDOWS_X86_HPP
diff --git a/src/hotspot/os_cpu/windows_x86/os_windows_x86.inline.hpp b/src/hotspot/os_cpu/windows_x86/os_windows_x86.inline.hpp
index 1bf7c1a30a6..3a9754532f7 100644
--- a/src/hotspot/os_cpu/windows_x86/os_windows_x86.inline.hpp
+++ b/src/hotspot/os_cpu/windows_x86/os_windows_x86.inline.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2011, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
*
*/
-#ifndef OS_CPU_WINDOWS_X86_VM_OS_WINDOWS_X86_INLINE_HPP
-#define OS_CPU_WINDOWS_X86_VM_OS_WINDOWS_X86_INLINE_HPP
+#ifndef OS_CPU_WINDOWS_X86_OS_WINDOWS_X86_INLINE_HPP
+#define OS_CPU_WINDOWS_X86_OS_WINDOWS_X86_INLINE_HPP
#include "runtime/os.hpp"
@@ -35,4 +35,4 @@ inline jlong os::rdtsc() {
return (jlong)res;
}
-#endif // OS_CPU_WINDOWS_X86_VM_OS_WINDOWS_X86_INLINE_HPP
+#endif // OS_CPU_WINDOWS_X86_OS_WINDOWS_X86_INLINE_HPP
diff --git a/src/hotspot/os_cpu/windows_x86/prefetch_windows_x86.inline.hpp b/src/hotspot/os_cpu/windows_x86/prefetch_windows_x86.inline.hpp
index a09c1947755..d4a5fd32eab 100644
--- a/src/hotspot/os_cpu/windows_x86/prefetch_windows_x86.inline.hpp
+++ b/src/hotspot/os_cpu/windows_x86/prefetch_windows_x86.inline.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2003, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -22,12 +22,12 @@
*
*/
-#ifndef OS_CPU_WINDOWS_X86_VM_PREFETCH_WINDOWS_X86_INLINE_HPP
-#define OS_CPU_WINDOWS_X86_VM_PREFETCH_WINDOWS_X86_INLINE_HPP
+#ifndef OS_CPU_WINDOWS_X86_PREFETCH_WINDOWS_X86_INLINE_HPP
+#define OS_CPU_WINDOWS_X86_PREFETCH_WINDOWS_X86_INLINE_HPP
#include "runtime/prefetch.hpp"
inline void Prefetch::read (void *loc, intx interval) {}
inline void Prefetch::write(void *loc, intx interval) {}
-#endif // OS_CPU_WINDOWS_X86_VM_PREFETCH_WINDOWS_X86_INLINE_HPP
+#endif // OS_CPU_WINDOWS_X86_PREFETCH_WINDOWS_X86_INLINE_HPP
diff --git a/src/hotspot/os_cpu/windows_x86/thread_windows_x86.hpp b/src/hotspot/os_cpu/windows_x86/thread_windows_x86.hpp
index 5821d14ab38..f141691ff4e 100644
--- a/src/hotspot/os_cpu/windows_x86/thread_windows_x86.hpp
+++ b/src/hotspot/os_cpu/windows_x86/thread_windows_x86.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1999, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1999, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
*
*/
-#ifndef OS_CPU_WINDOWS_X86_VM_THREAD_WINDOWS_X86_HPP
-#define OS_CPU_WINDOWS_X86_VM_THREAD_WINDOWS_X86_HPP
+#ifndef OS_CPU_WINDOWS_X86_THREAD_WINDOWS_X86_HPP
+#define OS_CPU_WINDOWS_X86_THREAD_WINDOWS_X86_HPP
private:
// On windows, in the stubGenerator, there's nowhere to save callee saved regs
@@ -71,4 +71,4 @@ private:
static void enable_register_stack_guard() {}
static void disable_register_stack_guard() {}
-#endif // OS_CPU_WINDOWS_X86_VM_THREAD_WINDOWS_X86_HPP
+#endif // OS_CPU_WINDOWS_X86_THREAD_WINDOWS_X86_HPP
diff --git a/src/hotspot/os_cpu/windows_x86/unwind_windows_x86.hpp b/src/hotspot/os_cpu/windows_x86/unwind_windows_x86.hpp
index f4ea83debf4..2cda604d888 100644
--- a/src/hotspot/os_cpu/windows_x86/unwind_windows_x86.hpp
+++ b/src/hotspot/os_cpu/windows_x86/unwind_windows_x86.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2004, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2004, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
*
*/
-#ifndef OS_CPU_WINDOWS_X86_VM_UNWIND_WINDOWS_X86_HPP
-#define OS_CPU_WINDOWS_X86_VM_UNWIND_WINDOWS_X86_HPP
+#ifndef OS_CPU_WINDOWS_X86_UNWIND_WINDOWS_X86_HPP
+#define OS_CPU_WINDOWS_X86_UNWIND_WINDOWS_X86_HPP
#ifdef AMD64
@@ -95,4 +95,4 @@ typedef EXCEPTION_DISPOSITION (*PEXCEPTION_ROUTINE) (
#endif // AMD64
-#endif // OS_CPU_WINDOWS_X86_VM_UNWIND_WINDOWS_X86_HPP
+#endif // OS_CPU_WINDOWS_X86_UNWIND_WINDOWS_X86_HPP
diff --git a/src/hotspot/os_cpu/windows_x86/vmStructs_windows_x86.hpp b/src/hotspot/os_cpu/windows_x86/vmStructs_windows_x86.hpp
index b629e23205a..9f50a7ed9ae 100644
--- a/src/hotspot/os_cpu/windows_x86/vmStructs_windows_x86.hpp
+++ b/src/hotspot/os_cpu/windows_x86/vmStructs_windows_x86.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2000, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
*
*/
-#ifndef OS_CPU_WINDOWS_X86_VM_VMSTRUCTS_WINDOWS_X86_HPP
-#define OS_CPU_WINDOWS_X86_VM_VMSTRUCTS_WINDOWS_X86_HPP
+#ifndef OS_CPU_WINDOWS_X86_VMSTRUCTS_WINDOWS_X86_HPP
+#define OS_CPU_WINDOWS_X86_VMSTRUCTS_WINDOWS_X86_HPP
// These are the OS and CPU-specific fields, types and integer
// constants required by the Serviceability Agent. This file is
@@ -46,4 +46,4 @@
#define VM_LONG_CONSTANTS_OS_CPU(declare_constant, declare_preprocessor_constant, declare_c1_constant, declare_c2_constant, declare_c2_preprocessor_constant)
-#endif // OS_CPU_WINDOWS_X86_VM_VMSTRUCTS_WINDOWS_X86_HPP
+#endif // OS_CPU_WINDOWS_X86_VMSTRUCTS_WINDOWS_X86_HPP
diff --git a/src/hotspot/share/adlc/adlc.hpp b/src/hotspot/share/adlc/adlc.hpp
index 1342d753396..297d5cb0133 100644
--- a/src/hotspot/share/adlc/adlc.hpp
+++ b/src/hotspot/share/adlc/adlc.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
*
*/
-#ifndef SHARE_VM_ADLC_ADLC_HPP
-#define SHARE_VM_ADLC_ADLC_HPP
+#ifndef SHARE_ADLC_ADLC_HPP
+#define SHARE_ADLC_ADLC_HPP
//
// Standard include file for ADLC parser
@@ -108,4 +108,4 @@ typedef unsigned int uintptr_t;
// it everywhere it needs to be available.
extern ArchDesc* globalAD;
-#endif // SHARE_VM_ADLC_ADLC_HPP
+#endif // SHARE_ADLC_ADLC_HPP
diff --git a/src/hotspot/share/adlc/adlparse.hpp b/src/hotspot/share/adlc/adlparse.hpp
index 8c5442b4c95..b1d27bd50d1 100644
--- a/src/hotspot/share/adlc/adlparse.hpp
+++ b/src/hotspot/share/adlc/adlparse.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
*
*/
-#ifndef SHARE_VM_ADLC_ADLPARSE_HPP
-#define SHARE_VM_ADLC_ADLPARSE_HPP
+#ifndef SHARE_ADLC_ADLPARSE_HPP
+#define SHARE_ADLC_ADLPARSE_HPP
// ADLPARSE.HPP - Definitions for Architecture Description Language Parser
// Authors: Chris Vick and Mike Paleczny
@@ -289,4 +289,4 @@ public:
static void trim(char* &token); // trim leading & trailing spaces
};
-#endif // SHARE_VM_ADLC_ADLPARSE_HPP
+#endif // SHARE_ADLC_ADLPARSE_HPP
diff --git a/src/hotspot/share/adlc/archDesc.hpp b/src/hotspot/share/adlc/archDesc.hpp
index fb8322a0cbe..e357873f479 100644
--- a/src/hotspot/share/adlc/archDesc.hpp
+++ b/src/hotspot/share/adlc/archDesc.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
*
*/
-#ifndef SHARE_VM_ADLC_ARCHDESC_HPP
-#define SHARE_VM_ADLC_ARCHDESC_HPP
+#ifndef SHARE_ADLC_ARCHDESC_HPP
+#define SHARE_ADLC_ARCHDESC_HPP
// Definitions for Error Flags
#define WARN 0
@@ -410,4 +410,4 @@ public:
virtual void record_position(OutputMap::position place, int index) {}
};
-#endif // SHARE_VM_ADLC_ARCHDESC_HPP
+#endif // SHARE_ADLC_ARCHDESC_HPP
diff --git a/src/hotspot/share/adlc/arena.cpp b/src/hotspot/share/adlc/arena.cpp
index e984dc3667e..60a546e7961 100644
--- a/src/hotspot/share/adlc/arena.cpp
+++ b/src/hotspot/share/adlc/arena.cpp
@@ -34,6 +34,16 @@ void* AllocateHeap(size_t size) {
return ptr;
}
+void* ReAllocateHeap(void* old_ptr, size_t size) {
+ unsigned char* ptr = (unsigned char*) realloc(old_ptr, size);
+ if (ptr == NULL && size != 0) {
+ fprintf(stderr, "Error: Out of memory in ADLC\n"); // logging can cause crash!
+ fflush(stderr);
+ exit(1);
+ }
+ return ptr;
+}
+
void* Chunk::operator new(size_t requested_size, size_t length) throw() {
return CHeapObj::operator new(requested_size + length);
}
diff --git a/src/hotspot/share/adlc/arena.hpp b/src/hotspot/share/adlc/arena.hpp
index 83a4e598dc2..d0dac9d45ca 100644
--- a/src/hotspot/share/adlc/arena.hpp
+++ b/src/hotspot/share/adlc/arena.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -22,10 +22,11 @@
*
*/
-#ifndef SHARE_VM_ADLC_ARENA_HPP
-#define SHARE_VM_ADLC_ARENA_HPP
+#ifndef SHARE_ADLC_ARENA_HPP
+#define SHARE_ADLC_ARENA_HPP
void* AllocateHeap(size_t size);
+void* ReAllocateHeap(void* old_ptr, size_t size);
// All classes in adlc may be derived
// from one of the following allocation classes:
@@ -151,4 +152,4 @@ public:
void set_size_in_bytes(size_t size) { _size_in_bytes = size; }
};
-#endif // SHARE_VM_ADLC_ARENA_HPP
+#endif // SHARE_ADLC_ARENA_HPP
diff --git a/src/hotspot/share/adlc/dict2.hpp b/src/hotspot/share/adlc/dict2.hpp
index 1d0d22aa0f6..a9790088dfb 100644
--- a/src/hotspot/share/adlc/dict2.hpp
+++ b/src/hotspot/share/adlc/dict2.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
*
*/
-#ifndef SHARE_VM_ADLC_DICT2_HPP
-#define SHARE_VM_ADLC_DICT2_HPP
+#ifndef SHARE_ADLC_DICT2_HPP
+#define SHARE_ADLC_DICT2_HPP
// Dictionaries - An Abstract Data Type
@@ -118,4 +118,4 @@ class DictI {
int test(void) { return _i<_d->_size;} // Test for end of iteration
};
-#endif // SHARE_VM_ADLC_DICT2_HPP
+#endif // SHARE_ADLC_DICT2_HPP
diff --git a/src/hotspot/share/adlc/filebuff.hpp b/src/hotspot/share/adlc/filebuff.hpp
index e2ed6a75665..9086f8224d2 100644
--- a/src/hotspot/share/adlc/filebuff.hpp
+++ b/src/hotspot/share/adlc/filebuff.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
*
*/
-#ifndef SHARE_VM_ADLC_FILEBUFF_HPP
-#define SHARE_VM_ADLC_FILEBUFF_HPP
+#ifndef SHARE_ADLC_FILEBUFF_HPP
+#define SHARE_ADLC_FILEBUFF_HPP
// FILEBUFF.HPP - Definitions for parser file buffering routines
@@ -78,4 +78,4 @@ class FileBuff {
// when the pointer is valid (i.e. just obtained from getline()).
long getoff(const char* s) { return _bufoff + (long)(s - _buf); }
};
-#endif // SHARE_VM_ADLC_FILEBUFF_HPP
+#endif // SHARE_ADLC_FILEBUFF_HPP
diff --git a/src/hotspot/share/adlc/forms.cpp b/src/hotspot/share/adlc/forms.cpp
index 5e2fb3f5c0e..ef72faa4a57 100644
--- a/src/hotspot/share/adlc/forms.cpp
+++ b/src/hotspot/share/adlc/forms.cpp
@@ -48,7 +48,9 @@ NameList::~NameList() {
}
void NameList::addName(const char *name) {
- if (_cur == _max) _names =(const char**)realloc(_names,(_max *=2)*sizeof(char*));
+ if (_cur == _max) {
+ _names = (const char**) ReAllocateHeap(_names, (_max *=2)*sizeof(char*));
+ }
_names[_cur++] = name;
}
diff --git a/src/hotspot/share/adlc/forms.hpp b/src/hotspot/share/adlc/forms.hpp
index 073ca4c810d..b4e115229c3 100644
--- a/src/hotspot/share/adlc/forms.hpp
+++ b/src/hotspot/share/adlc/forms.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
*
*/
-#ifndef SHARE_VM_ADLC_FORMS_HPP
-#define SHARE_VM_ADLC_FORMS_HPP
+#ifndef SHARE_ADLC_FORMS_HPP
+#define SHARE_ADLC_FORMS_HPP
// FORMS.HPP - ADL Parser Generic and Utility Forms Classes
@@ -596,4 +596,4 @@ public:
void dump();
};
-#endif // SHARE_VM_ADLC_FORMS_HPP
+#endif // SHARE_ADLC_FORMS_HPP
diff --git a/src/hotspot/share/adlc/formsopt.hpp b/src/hotspot/share/adlc/formsopt.hpp
index 8ba8e64d99c..113489696a5 100644
--- a/src/hotspot/share/adlc/formsopt.hpp
+++ b/src/hotspot/share/adlc/formsopt.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
*
*/
-#ifndef SHARE_VM_ADLC_FORMSOPT_HPP
-#define SHARE_VM_ADLC_FORMSOPT_HPP
+#ifndef SHARE_ADLC_FORMSOPT_HPP
+#define SHARE_ADLC_FORMSOPT_HPP
// FORMSOPT.HPP - ADL Parser Target Specific Optimization Forms Classes
@@ -674,4 +674,4 @@ public:
void output(FILE *fp);
};
-#endif // SHARE_VM_ADLC_FORMSOPT_HPP
+#endif // SHARE_ADLC_FORMSOPT_HPP
diff --git a/src/hotspot/share/adlc/formssel.hpp b/src/hotspot/share/adlc/formssel.hpp
index 3ed16562c51..dd9d3f15c55 100644
--- a/src/hotspot/share/adlc/formssel.hpp
+++ b/src/hotspot/share/adlc/formssel.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
*
*/
-#ifndef SHARE_VM_ADLC_FORMSSEL_HPP
-#define SHARE_VM_ADLC_FORMSSEL_HPP
+#ifndef SHARE_ADLC_FORMSSEL_HPP
+#define SHARE_ADLC_FORMSSEL_HPP
// FORMSSEL.HPP - ADL Parser Instruction Selection Forms Classes
@@ -1093,4 +1093,4 @@ public:
void output(FILE *fp);
};
-#endif // SHARE_VM_ADLC_FORMSSEL_HPP
+#endif // SHARE_ADLC_FORMSSEL_HPP
diff --git a/src/hotspot/share/aot/aotCodeHeap.hpp b/src/hotspot/share/aot/aotCodeHeap.hpp
index 694adfea8cb..be722a97bb2 100644
--- a/src/hotspot/share/aot/aotCodeHeap.hpp
+++ b/src/hotspot/share/aot/aotCodeHeap.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2016, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -21,8 +21,8 @@
* questions.
*/
-#ifndef SHARE_VM_AOT_AOTCODEHEAP_HPP
-#define SHARE_VM_AOT_AOTCODEHEAP_HPP
+#ifndef SHARE_AOT_AOTCODEHEAP_HPP
+#define SHARE_AOT_AOTCODEHEAP_HPP
#include "aot/aotCompiledMethod.hpp"
#include "classfile/symbolTable.hpp"
@@ -311,4 +311,4 @@ private:
};
-#endif // SHARE_VM_AOT_AOTCODEHEAP_HPP
+#endif // SHARE_AOT_AOTCODEHEAP_HPP
diff --git a/src/hotspot/share/aot/aotCompiledMethod.hpp b/src/hotspot/share/aot/aotCompiledMethod.hpp
index 79b79579591..03483e1c52d 100644
--- a/src/hotspot/share/aot/aotCompiledMethod.hpp
+++ b/src/hotspot/share/aot/aotCompiledMethod.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2016, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -21,8 +21,8 @@
* questions.
*/
-#ifndef SHARE_VM_AOT_AOTCOMPILEDMETHOD_HPP
-#define SHARE_VM_AOT_AOTCOMPILEDMETHOD_HPP
+#ifndef SHARE_AOT_AOTCOMPILEDMETHOD_HPP
+#define SHARE_AOT_AOTCOMPILEDMETHOD_HPP
#include "code/codeCache.hpp"
#include "code/compiledIC.hpp"
@@ -314,4 +314,4 @@ public:
}
};
-#endif //SHARE_VM_AOT_AOTCOMPILEDMETHOD_HPP
+#endif // SHARE_AOT_AOTCOMPILEDMETHOD_HPP
diff --git a/src/hotspot/share/aot/aotLoader.hpp b/src/hotspot/share/aot/aotLoader.hpp
index 461e9f54d2c..f0c8de99c6f 100644
--- a/src/hotspot/share/aot/aotLoader.hpp
+++ b/src/hotspot/share/aot/aotLoader.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2016, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -21,8 +21,8 @@
* questions.
*/
-#ifndef SHARE_VM_AOT_AOTLOADER_HPP
-#define SHARE_VM_AOT_AOTLOADER_HPP
+#ifndef SHARE_AOT_AOTLOADER_HPP
+#define SHARE_AOT_AOTLOADER_HPP
#include "runtime/globals_extension.hpp"
#include "runtime/handles.hpp"
@@ -69,4 +69,4 @@ public:
static bool reconcile_dynamic_invoke(InstanceKlass* holder, int index, Method* adapter_method, Klass *appendix_klass) NOT_AOT({ return true; });
};
-#endif // SHARE_VM_AOT_AOTLOADER_HPP
+#endif // SHARE_AOT_AOTLOADER_HPP
diff --git a/src/hotspot/share/aot/aotLoader.inline.hpp b/src/hotspot/share/aot/aotLoader.inline.hpp
index 0f3ba55566f..7044e3a4aec 100644
--- a/src/hotspot/share/aot/aotLoader.inline.hpp
+++ b/src/hotspot/share/aot/aotLoader.inline.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -21,8 +21,8 @@
* questions.
*/
-#ifndef SHARE_VM_AOT_AOTLOADER_INLLINE_HPP
-#define SHARE_VM_AOT_AOTLOADER_INLLINE_HPP
+#ifndef SHARE_AOT_AOTLOADER_INLINE_HPP
+#define SHARE_AOT_AOTLOADER_INLINE_HPP
#include "aot/aotLoader.hpp"
#include "utilities/growableArray.hpp"
@@ -36,4 +36,4 @@ void AOTLoader::add_heap(AOTCodeHeap *heap) { heaps()->append(heap); }
void AOTLoader::add_library(AOTLib *lib) { libraries()->append(lib); }
#endif
-#endif // SHARE_VM_AOT_AOTLOADER_INLLINE_HPP
+#endif // SHARE_AOT_AOTLOADER_INLINE_HPP
diff --git a/src/hotspot/share/aot/compiledIC_aot.hpp b/src/hotspot/share/aot/compiledIC_aot.hpp
index e2d256950bf..e46fc97d117 100644
--- a/src/hotspot/share/aot/compiledIC_aot.hpp
+++ b/src/hotspot/share/aot/compiledIC_aot.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -21,8 +21,8 @@
* questions.
*/
-#ifndef SHARE_VM_AOT_COMPILEDIC_AOT_HPP
-#define SHARE_VM_AOT_COMPILEDIC_AOT_HPP
+#ifndef SHARE_AOT_COMPILEDIC_AOT_HPP
+#define SHARE_AOT_COMPILEDIC_AOT_HPP
#include "code/compiledIC.hpp"
#include "code/nativeInst.hpp"
@@ -80,4 +80,4 @@ class CompiledPltStaticCall: public CompiledStaticCall {
virtual const char* name() const { return "CompiledPltStaticCall"; }
};
-#endif // SHARE_VM_AOT_COMPILEDIC_AOT_HPP
+#endif // SHARE_AOT_COMPILEDIC_AOT_HPP
diff --git a/src/hotspot/share/asm/assembler.hpp b/src/hotspot/share/asm/assembler.hpp
index 7856558f1ae..3f792583ce4 100644
--- a/src/hotspot/share/asm/assembler.hpp
+++ b/src/hotspot/share/asm/assembler.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
*
*/
-#ifndef SHARE_VM_ASM_ASSEMBLER_HPP
-#define SHARE_VM_ASM_ASSEMBLER_HPP
+#ifndef SHARE_ASM_ASSEMBLER_HPP
+#define SHARE_ASM_ASSEMBLER_HPP
#include "asm/codeBuffer.hpp"
#include "asm/register.hpp"
@@ -458,4 +458,4 @@ class AbstractAssembler : public ResourceObj {
#include CPU_HEADER(assembler)
-#endif // SHARE_VM_ASM_ASSEMBLER_HPP
+#endif // SHARE_ASM_ASSEMBLER_HPP
diff --git a/src/hotspot/share/asm/assembler.inline.hpp b/src/hotspot/share/asm/assembler.inline.hpp
index 8b35e12724d..c9862aa90a9 100644
--- a/src/hotspot/share/asm/assembler.inline.hpp
+++ b/src/hotspot/share/asm/assembler.inline.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -22,11 +22,11 @@
*
*/
-#ifndef SHARE_VM_ASM_ASSEMBLER_INLINE_HPP
-#define SHARE_VM_ASM_ASSEMBLER_INLINE_HPP
+#ifndef SHARE_ASM_ASSEMBLER_INLINE_HPP
+#define SHARE_ASM_ASSEMBLER_INLINE_HPP
#include "asm/assembler.hpp"
#include CPU_HEADER_INLINE(assembler)
-#endif // SHARE_VM_ASM_ASSEMBLER_INLINE_HPP
+#endif // SHARE_ASM_ASSEMBLER_INLINE_HPP
diff --git a/src/hotspot/share/asm/codeBuffer.hpp b/src/hotspot/share/asm/codeBuffer.hpp
index c7f056fcf3c..9600dbee79f 100644
--- a/src/hotspot/share/asm/codeBuffer.hpp
+++ b/src/hotspot/share/asm/codeBuffer.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
*
*/
-#ifndef SHARE_VM_ASM_CODEBUFFER_HPP
-#define SHARE_VM_ASM_CODEBUFFER_HPP
+#ifndef SHARE_ASM_CODEBUFFER_HPP
+#define SHARE_ASM_CODEBUFFER_HPP
#include "code/oopRecorder.hpp"
#include "code/relocInfo.hpp"
@@ -670,4 +670,4 @@ inline bool CodeSection::maybe_expand_to_ensure_remaining(csize_t amount) {
return false;
}
-#endif // SHARE_VM_ASM_CODEBUFFER_HPP
+#endif // SHARE_ASM_CODEBUFFER_HPP
diff --git a/src/hotspot/share/asm/macroAssembler.hpp b/src/hotspot/share/asm/macroAssembler.hpp
index 84289ff1b81..35265de35ef 100644
--- a/src/hotspot/share/asm/macroAssembler.hpp
+++ b/src/hotspot/share/asm/macroAssembler.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -22,12 +22,12 @@
*
*/
-#ifndef SHARE_VM_ASM_MACROASSEMBLER_HPP
-#define SHARE_VM_ASM_MACROASSEMBLER_HPP
+#ifndef SHARE_ASM_MACROASSEMBLER_HPP
+#define SHARE_ASM_MACROASSEMBLER_HPP
#include "asm/assembler.hpp"
#include "utilities/macros.hpp"
#include CPU_HEADER(macroAssembler)
-#endif // SHARE_VM_ASM_MACROASSEMBLER_HPP
+#endif // SHARE_ASM_MACROASSEMBLER_HPP
diff --git a/src/hotspot/share/asm/macroAssembler.inline.hpp b/src/hotspot/share/asm/macroAssembler.inline.hpp
index 51a1f72e1f3..bd62f82e4ac 100644
--- a/src/hotspot/share/asm/macroAssembler.inline.hpp
+++ b/src/hotspot/share/asm/macroAssembler.inline.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -22,10 +22,10 @@
*
*/
-#ifndef SHARE_VM_ASM_MACROASSEMBLER_INLINE_HPP
-#define SHARE_VM_ASM_MACROASSEMBLER_INLINE_HPP
+#ifndef SHARE_ASM_MACROASSEMBLER_INLINE_HPP
+#define SHARE_ASM_MACROASSEMBLER_INLINE_HPP
#include "asm/macroAssembler.hpp"
#include CPU_HEADER_INLINE(macroAssembler)
-#endif // SHARE_VM_ASM_MACROASSEMBLER_INLINE_HPP
+#endif // SHARE_ASM_MACROASSEMBLER_INLINE_HPP
diff --git a/src/hotspot/share/asm/register.hpp b/src/hotspot/share/asm/register.hpp
index 3c71d94cc63..66f58d52953 100644
--- a/src/hotspot/share/asm/register.hpp
+++ b/src/hotspot/share/asm/register.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2000, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
*
*/
-#ifndef SHARE_VM_ASM_REGISTER_HPP
-#define SHARE_VM_ASM_REGISTER_HPP
+#ifndef SHARE_ASM_REGISTER_HPP
+#define SHARE_ASM_REGISTER_HPP
#include "utilities/debug.hpp"
#include "utilities/globalDefinitions.hpp"
@@ -358,4 +358,4 @@ inline void assert_different_registers(
);
}
-#endif // SHARE_VM_ASM_REGISTER_HPP
+#endif // SHARE_ASM_REGISTER_HPP
diff --git a/src/hotspot/share/c1/c1_CFGPrinter.hpp b/src/hotspot/share/c1/c1_CFGPrinter.hpp
index dfc63e3e199..9467e271018 100644
--- a/src/hotspot/share/c1/c1_CFGPrinter.hpp
+++ b/src/hotspot/share/c1/c1_CFGPrinter.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2005, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
*
*/
-#ifndef SHARE_VM_C1_C1_CFGPRINTER_HPP
-#define SHARE_VM_C1_C1_CFGPRINTER_HPP
+#ifndef SHARE_C1_C1_CFGPRINTER_HPP
+#define SHARE_C1_C1_CFGPRINTER_HPP
#include "c1/c1_Compilation.hpp"
#include "c1/c1_Instruction.hpp"
@@ -88,4 +88,4 @@ class CFGPrinterOutput : public CHeapObj {
#endif
-#endif // SHARE_VM_C1_C1_CFGPRINTER_HPP
+#endif // SHARE_C1_C1_CFGPRINTER_HPP
diff --git a/src/hotspot/share/c1/c1_Canonicalizer.hpp b/src/hotspot/share/c1/c1_Canonicalizer.hpp
index c0d5488d970..b55cacf086d 100644
--- a/src/hotspot/share/c1/c1_Canonicalizer.hpp
+++ b/src/hotspot/share/c1/c1_Canonicalizer.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1999, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1999, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
*
*/
-#ifndef SHARE_VM_C1_C1_CANONICALIZER_HPP
-#define SHARE_VM_C1_C1_CANONICALIZER_HPP
+#ifndef SHARE_C1_C1_CANONICALIZER_HPP
+#define SHARE_C1_C1_CANONICALIZER_HPP
#include "c1/c1_Instruction.hpp"
@@ -116,4 +116,4 @@ class Canonicalizer: InstructionVisitor {
#endif
};
-#endif // SHARE_VM_C1_C1_CANONICALIZER_HPP
+#endif // SHARE_C1_C1_CANONICALIZER_HPP
diff --git a/src/hotspot/share/c1/c1_CodeStubs.hpp b/src/hotspot/share/c1/c1_CodeStubs.hpp
index 5b15f19f6ae..c79319ae720 100644
--- a/src/hotspot/share/c1/c1_CodeStubs.hpp
+++ b/src/hotspot/share/c1/c1_CodeStubs.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1999, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1999, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
*
*/
-#ifndef SHARE_VM_C1_C1_CODESTUBS_HPP
-#define SHARE_VM_C1_C1_CODESTUBS_HPP
+#ifndef SHARE_C1_C1_CODESTUBS_HPP
+#define SHARE_C1_C1_CODESTUBS_HPP
#include "c1/c1_FrameMap.hpp"
#include "c1/c1_IR.hpp"
@@ -536,4 +536,4 @@ class ArrayCopyStub: public CodeStub {
#endif // PRODUCT
};
-#endif // SHARE_VM_C1_C1_CODESTUBS_HPP
+#endif // SHARE_C1_C1_CODESTUBS_HPP
diff --git a/src/hotspot/share/c1/c1_Compilation.hpp b/src/hotspot/share/c1/c1_Compilation.hpp
index 868cf19e2dc..906947eaa74 100644
--- a/src/hotspot/share/c1/c1_Compilation.hpp
+++ b/src/hotspot/share/c1/c1_Compilation.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1999, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1999, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
*
*/
-#ifndef SHARE_VM_C1_C1_COMPILATION_HPP
-#define SHARE_VM_C1_C1_COMPILATION_HPP
+#ifndef SHARE_C1_C1_COMPILATION_HPP
+#define SHARE_C1_C1_COMPILATION_HPP
#include "ci/ciEnv.hpp"
#include "ci/ciMethodData.hpp"
@@ -347,4 +347,4 @@ class ExceptionInfo: public CompilationResourceObj {
XHandlers* exception_handlers() { return _exception_handlers; }
};
-#endif // SHARE_VM_C1_C1_COMPILATION_HPP
+#endif // SHARE_C1_C1_COMPILATION_HPP
diff --git a/src/hotspot/share/c1/c1_Compiler.hpp b/src/hotspot/share/c1/c1_Compiler.hpp
index fb3f1877eb6..eda25290316 100644
--- a/src/hotspot/share/c1/c1_Compiler.hpp
+++ b/src/hotspot/share/c1/c1_Compiler.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1999, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1999, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
*
*/
-#ifndef SHARE_VM_C1_C1_COMPILER_HPP
-#define SHARE_VM_C1_C1_COMPILER_HPP
+#ifndef SHARE_C1_C1_COMPILER_HPP
+#define SHARE_C1_C1_COMPILER_HPP
#include "compiler/abstractCompiler.hpp"
#include "compiler/compilerDirectives.hpp"
@@ -63,4 +63,4 @@ class Compiler: public AbstractCompiler {
static int code_buffer_size();
};
-#endif // SHARE_VM_C1_C1_COMPILER_HPP
+#endif // SHARE_C1_C1_COMPILER_HPP
diff --git a/src/hotspot/share/c1/c1_Decorators.hpp b/src/hotspot/share/c1/c1_Decorators.hpp
index 7bbdbef8439..a545de11a63 100644
--- a/src/hotspot/share/c1/c1_Decorators.hpp
+++ b/src/hotspot/share/c1/c1_Decorators.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
*
*/
-#ifndef SHARE_VM_C1_C1_DECORATORS_HPP
-#define SHARE_VM_C1_C1_DECORATORS_HPP
+#ifndef SHARE_C1_C1_DECORATORS_HPP
+#define SHARE_C1_C1_DECORATORS_HPP
#include "oops/accessDecorators.hpp"
#include "utilities/globalDefinitions.hpp"
@@ -35,4 +35,4 @@ const DecoratorSet C1_NEEDS_PATCHING = DECORATOR_LAST << 1;
// needs to be masked.
const DecoratorSet C1_MASK_BOOLEAN = DECORATOR_LAST << 2;
-#endif // SHARE_VM_C1_C1_DECORATORS_HPP
+#endif // SHARE_C1_C1_DECORATORS_HPP
diff --git a/src/hotspot/share/c1/c1_Defs.hpp b/src/hotspot/share/c1/c1_Defs.hpp
index 9cd61c46e57..183509e3b26 100644
--- a/src/hotspot/share/c1/c1_Defs.hpp
+++ b/src/hotspot/share/c1/c1_Defs.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2000, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
*
*/
-#ifndef SHARE_VM_C1_C1_DEFS_HPP
-#define SHARE_VM_C1_C1_DEFS_HPP
+#ifndef SHARE_C1_C1_DEFS_HPP
+#define SHARE_C1_C1_DEFS_HPP
#include "asm/register.hpp"
#include "utilities/globalDefinitions.hpp"
@@ -56,4 +56,4 @@ enum {
float_saved_as_double = pd_float_saved_as_double
};
-#endif // SHARE_VM_C1_C1_DEFS_HPP
+#endif // SHARE_C1_C1_DEFS_HPP
diff --git a/src/hotspot/share/c1/c1_FpuStackSim.hpp b/src/hotspot/share/c1/c1_FpuStackSim.hpp
index 973ef76456d..3fcf1103eb5 100644
--- a/src/hotspot/share/c1/c1_FpuStackSim.hpp
+++ b/src/hotspot/share/c1/c1_FpuStackSim.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2005, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
*
*/
-#ifndef SHARE_VM_C1_C1_FPUSTACKSIM_HPP
-#define SHARE_VM_C1_C1_FPUSTACKSIM_HPP
+#ifndef SHARE_C1_C1_FPUSTACKSIM_HPP
+#define SHARE_C1_C1_FPUSTACKSIM_HPP
#include "c1/c1_FrameMap.hpp"
#include "utilities/macros.hpp"
@@ -34,4 +34,4 @@ class FpuStackSim;
#include CPU_HEADER(c1_FpuStackSim)
-#endif // SHARE_VM_C1_C1_FPUSTACKSIM_HPP
+#endif // SHARE_C1_C1_FPUSTACKSIM_HPP
diff --git a/src/hotspot/share/c1/c1_FrameMap.hpp b/src/hotspot/share/c1/c1_FrameMap.hpp
index a8081110e01..b993e231fa8 100644
--- a/src/hotspot/share/c1/c1_FrameMap.hpp
+++ b/src/hotspot/share/c1/c1_FrameMap.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2000, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
*
*/
-#ifndef SHARE_VM_C1_C1_FRAMEMAP_HPP
-#define SHARE_VM_C1_C1_FRAMEMAP_HPP
+#ifndef SHARE_C1_C1_FRAMEMAP_HPP
+#define SHARE_C1_C1_FRAMEMAP_HPP
#include "asm/macroAssembler.hpp"
#include "c1/c1_Defs.hpp"
@@ -280,4 +280,4 @@ class CallingConvention: public ResourceObj {
#endif // PRODUCT
};
-#endif // SHARE_VM_C1_C1_FRAMEMAP_HPP
+#endif // SHARE_C1_C1_FRAMEMAP_HPP
diff --git a/src/hotspot/share/c1/c1_GraphBuilder.cpp b/src/hotspot/share/c1/c1_GraphBuilder.cpp
index 6c268839be9..fe3032146fc 100644
--- a/src/hotspot/share/c1/c1_GraphBuilder.cpp
+++ b/src/hotspot/share/c1/c1_GraphBuilder.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1999, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1999, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -1451,9 +1451,6 @@ void GraphBuilder::call_register_finalizer() {
}
if (needs_check) {
- // Not a trivial method because C2 can do better with inlined check.
- compilation()->set_would_profile(true);
-
// Perform the registration of finalizable objects.
ValueStack* state_before = copy_state_for_exception();
load_local(objectType, 0);
@@ -3569,9 +3566,6 @@ void GraphBuilder::build_graph_for_intrinsic(ciMethod* callee, bool ignore_retur
}
bool GraphBuilder::try_inline_intrinsics(ciMethod* callee, bool ignore_return) {
- // Not a trivial method because C2 may do intrinsics better.
- compilation()->set_would_profile(true);
-
// For calling is_intrinsic_available we need to transition to
// the '_thread_in_vm' state because is_intrinsic_available()
// accesses critical VM-internal data.
diff --git a/src/hotspot/share/c1/c1_GraphBuilder.hpp b/src/hotspot/share/c1/c1_GraphBuilder.hpp
index bab39b09714..34a97abf8b0 100644
--- a/src/hotspot/share/c1/c1_GraphBuilder.hpp
+++ b/src/hotspot/share/c1/c1_GraphBuilder.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1999, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1999, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
*
*/
-#ifndef SHARE_VM_C1_C1_GRAPHBUILDER_HPP
-#define SHARE_VM_C1_C1_GRAPHBUILDER_HPP
+#ifndef SHARE_C1_C1_GRAPHBUILDER_HPP
+#define SHARE_C1_C1_GRAPHBUILDER_HPP
#include "c1/c1_IR.hpp"
#include "c1/c1_Instruction.hpp"
@@ -424,4 +424,4 @@ class GraphBuilder {
BlockBegin* start() const { return _start; }
};
-#endif // SHARE_VM_C1_C1_GRAPHBUILDER_HPP
+#endif // SHARE_C1_C1_GRAPHBUILDER_HPP
diff --git a/src/hotspot/share/c1/c1_IR.hpp b/src/hotspot/share/c1/c1_IR.hpp
index e0239dde8a0..ab63b32c14b 100644
--- a/src/hotspot/share/c1/c1_IR.hpp
+++ b/src/hotspot/share/c1/c1_IR.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1999, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1999, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
*
*/
-#ifndef SHARE_VM_C1_C1_IR_HPP
-#define SHARE_VM_C1_C1_IR_HPP
+#ifndef SHARE_C1_C1_IR_HPP
+#define SHARE_C1_C1_IR_HPP
#include "c1/c1_Instruction.hpp"
#include "ci/ciExceptionHandler.hpp"
@@ -356,4 +356,4 @@ class SubstitutionResolver: public BlockClosure, ValueVisitor {
virtual void block_do(BlockBegin* block);
};
-#endif // SHARE_VM_C1_C1_IR_HPP
+#endif // SHARE_C1_C1_IR_HPP
diff --git a/src/hotspot/share/c1/c1_Instruction.hpp b/src/hotspot/share/c1/c1_Instruction.hpp
index 472b41baf5c..e856aed4d2e 100644
--- a/src/hotspot/share/c1/c1_Instruction.hpp
+++ b/src/hotspot/share/c1/c1_Instruction.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1999, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1999, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
*
*/
-#ifndef SHARE_VM_C1_C1_INSTRUCTION_HPP
-#define SHARE_VM_C1_C1_INSTRUCTION_HPP
+#ifndef SHARE_C1_C1_INSTRUCTION_HPP
+#define SHARE_C1_C1_INSTRUCTION_HPP
#include "c1/c1_Compilation.hpp"
#include "c1/c1_LIR.hpp"
@@ -2632,4 +2632,4 @@ inline void BlockBegin::add_successor(BlockBegin* sux) { assert(_end ==
#undef ASSERT_VALUES
-#endif // SHARE_VM_C1_C1_INSTRUCTION_HPP
+#endif // SHARE_C1_C1_INSTRUCTION_HPP
diff --git a/src/hotspot/share/c1/c1_InstructionPrinter.hpp b/src/hotspot/share/c1/c1_InstructionPrinter.hpp
index f133853da02..b1d28f8a2e8 100644
--- a/src/hotspot/share/c1/c1_InstructionPrinter.hpp
+++ b/src/hotspot/share/c1/c1_InstructionPrinter.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1999, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1999, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
*
*/
-#ifndef SHARE_VM_C1_C1_INSTRUCTIONPRINTER_HPP
-#define SHARE_VM_C1_C1_INSTRUCTIONPRINTER_HPP
+#ifndef SHARE_C1_C1_INSTRUCTIONPRINTER_HPP
+#define SHARE_C1_C1_INSTRUCTIONPRINTER_HPP
#include "c1/c1_IR.hpp"
#include "c1/c1_Instruction.hpp"
@@ -141,4 +141,4 @@ class InstructionPrinter: public InstructionVisitor {
};
#endif // PRODUCT
-#endif // SHARE_VM_C1_C1_INSTRUCTIONPRINTER_HPP
+#endif // SHARE_C1_C1_INSTRUCTIONPRINTER_HPP
diff --git a/src/hotspot/share/c1/c1_LIR.hpp b/src/hotspot/share/c1/c1_LIR.hpp
index 736bd1d944b..392bb0df50f 100644
--- a/src/hotspot/share/c1/c1_LIR.hpp
+++ b/src/hotspot/share/c1/c1_LIR.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2000, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
*
*/
-#ifndef SHARE_VM_C1_C1_LIR_HPP
-#define SHARE_VM_C1_C1_LIR_HPP
+#ifndef SHARE_C1_C1_LIR_HPP
+#define SHARE_C1_C1_LIR_HPP
#include "c1/c1_Defs.hpp"
#include "c1/c1_ValueType.hpp"
@@ -949,7 +949,6 @@ enum LIR_Code {
, lir_ushr
, lir_alloc_array
, lir_throw
- , lir_compare_to
, lir_xadd
, lir_xchg
, end_op2
@@ -2129,10 +2128,6 @@ class LIR_List: public CompilationResourceObj {
append(new LIR_Op1(lir_unwind, exceptionOop));
}
- void compare_to (LIR_Opr left, LIR_Opr right, LIR_Opr dst) {
- append(new LIR_Op2(lir_compare_to, left, right, dst));
- }
-
void push(LIR_Opr opr) { append(new LIR_Op1(lir_push, opr)); }
void pop(LIR_Opr reg) { append(new LIR_Op1(lir_pop, reg)); }
@@ -2469,4 +2464,4 @@ class LIR_OpVisitState: public StackObj {
inline LIR_Opr LIR_OprDesc::illegalOpr() { return LIR_OprFact::illegalOpr; };
-#endif // SHARE_VM_C1_C1_LIR_HPP
+#endif // SHARE_C1_C1_LIR_HPP
diff --git a/src/hotspot/share/c1/c1_LIRAssembler.hpp b/src/hotspot/share/c1/c1_LIRAssembler.hpp
index 8937b014ff9..448518e099a 100644
--- a/src/hotspot/share/c1/c1_LIRAssembler.hpp
+++ b/src/hotspot/share/c1/c1_LIRAssembler.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2000, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
*
*/
-#ifndef SHARE_VM_C1_C1_LIRASSEMBLER_HPP
-#define SHARE_VM_C1_C1_LIRASSEMBLER_HPP
+#ifndef SHARE_C1_C1_LIRASSEMBLER_HPP
+#define SHARE_C1_C1_LIRASSEMBLER_HPP
#include "c1/c1_CodeStubs.hpp"
#include "ci/ciMethodData.hpp"
@@ -240,7 +240,7 @@ class LIR_Assembler: public CompilationResourceObj {
void align_call(LIR_Code code);
void negate(LIR_Opr left, LIR_Opr dest, LIR_Opr tmp = LIR_OprFact::illegalOpr);
- void leal(LIR_Opr src, LIR_Opr dest, LIR_PatchCode patch_code, CodeEmitInfo* info);
+ void leal(LIR_Opr src, LIR_Opr dest, LIR_PatchCode patch_code = lir_patch_none, CodeEmitInfo* info = NULL);
void rt_call(LIR_Opr result, address dest, const LIR_OprList* args, LIR_Opr tmp, CodeEmitInfo* info);
@@ -279,4 +279,4 @@ class LIR_Assembler: public CompilationResourceObj {
}
};
-#endif // SHARE_VM_C1_C1_LIRASSEMBLER_HPP
+#endif // SHARE_C1_C1_LIRASSEMBLER_HPP
diff --git a/src/hotspot/share/c1/c1_LIRGenerator.hpp b/src/hotspot/share/c1/c1_LIRGenerator.hpp
index 5350447f336..cce6ac4f8d2 100644
--- a/src/hotspot/share/c1/c1_LIRGenerator.hpp
+++ b/src/hotspot/share/c1/c1_LIRGenerator.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2005, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
*
*/
-#ifndef SHARE_VM_C1_C1_LIRGENERATOR_HPP
-#define SHARE_VM_C1_C1_LIRGENERATOR_HPP
+#ifndef SHARE_C1_C1_LIRGENERATOR_HPP
+#define SHARE_C1_C1_LIRGENERATOR_HPP
#include "c1/c1_Decorators.hpp"
#include "c1/c1_Instruction.hpp"
@@ -686,4 +686,4 @@ class LIRItem: public CompilationResourceObj {
jint get_address_constant() const;
};
-#endif // SHARE_VM_C1_C1_LIRGENERATOR_HPP
+#endif // SHARE_C1_C1_LIRGENERATOR_HPP
diff --git a/src/hotspot/share/c1/c1_LinearScan.hpp b/src/hotspot/share/c1/c1_LinearScan.hpp
index 1fddb6ddf0a..95ffaf1e34b 100644
--- a/src/hotspot/share/c1/c1_LinearScan.hpp
+++ b/src/hotspot/share/c1/c1_LinearScan.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2005, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
*
*/
-#ifndef SHARE_VM_C1_C1_LINEARSCAN_HPP
-#define SHARE_VM_C1_C1_LINEARSCAN_HPP
+#ifndef SHARE_C1_C1_LINEARSCAN_HPP
+#define SHARE_C1_C1_LINEARSCAN_HPP
#include "c1/c1_FpuStackSim.hpp"
#include "c1/c1_FrameMap.hpp"
@@ -964,4 +964,4 @@ class LinearScanTimers : public StackObj {
// Pick up platform-dependent implementation details
#include CPU_HEADER(c1_LinearScan)
-#endif // SHARE_VM_C1_C1_LINEARSCAN_HPP
+#endif // SHARE_C1_C1_LINEARSCAN_HPP
diff --git a/src/hotspot/share/c1/c1_MacroAssembler.hpp b/src/hotspot/share/c1/c1_MacroAssembler.hpp
index 0f73a54f0c8..206eda91e2a 100644
--- a/src/hotspot/share/c1/c1_MacroAssembler.hpp
+++ b/src/hotspot/share/c1/c1_MacroAssembler.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2000, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
*
*/
-#ifndef SHARE_VM_C1_C1_MACROASSEMBLER_HPP
-#define SHARE_VM_C1_C1_MACROASSEMBLER_HPP
+#ifndef SHARE_C1_C1_MACROASSEMBLER_HPP
+#define SHARE_C1_C1_MACROASSEMBLER_HPP
#include "asm/macroAssembler.hpp"
#include "utilities/macros.hpp"
@@ -93,4 +93,4 @@ class StubAssembler: public C1_MacroAssembler {
void epilogue();
};
-#endif // SHARE_VM_C1_C1_MACROASSEMBLER_HPP
+#endif // SHARE_C1_C1_MACROASSEMBLER_HPP
diff --git a/src/hotspot/share/c1/c1_Optimizer.hpp b/src/hotspot/share/c1/c1_Optimizer.hpp
index 7ae188001d9..542ee8acbd0 100644
--- a/src/hotspot/share/c1/c1_Optimizer.hpp
+++ b/src/hotspot/share/c1/c1_Optimizer.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1999, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1999, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
*
*/
-#ifndef SHARE_VM_C1_C1_OPTIMIZER_HPP
-#define SHARE_VM_C1_C1_OPTIMIZER_HPP
+#ifndef SHARE_C1_C1_OPTIMIZER_HPP
+#define SHARE_C1_C1_OPTIMIZER_HPP
#include "c1/c1_IR.hpp"
#include "c1/c1_Instruction.hpp"
@@ -42,4 +42,4 @@ class Optimizer {
void eliminate_null_checks();
};
-#endif // SHARE_VM_C1_C1_OPTIMIZER_HPP
+#endif // SHARE_C1_C1_OPTIMIZER_HPP
diff --git a/src/hotspot/share/c1/c1_RangeCheckElimination.hpp b/src/hotspot/share/c1/c1_RangeCheckElimination.hpp
index ba67209f27f..629d89245cf 100644
--- a/src/hotspot/share/c1/c1_RangeCheckElimination.hpp
+++ b/src/hotspot/share/c1/c1_RangeCheckElimination.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
*
*/
-#ifndef SHARE_VM_C1_C1_RANGECHECKELIMINATION_HPP
-#define SHARE_VM_C1_C1_RANGECHECKELIMINATION_HPP
+#ifndef SHARE_C1_C1_RANGECHECKELIMINATION_HPP
+#define SHARE_C1_C1_RANGECHECKELIMINATION_HPP
#include "c1/c1_Instruction.hpp"
@@ -240,4 +240,4 @@ public:
static void print_statistics();
};
-#endif // SHARE_VM_C1_C1_RANGECHECKELIMINATION_HPP
+#endif // SHARE_C1_C1_RANGECHECKELIMINATION_HPP
diff --git a/src/hotspot/share/c1/c1_Runtime1.hpp b/src/hotspot/share/c1/c1_Runtime1.hpp
index fe512b00b7f..1f6adaa6d16 100644
--- a/src/hotspot/share/c1/c1_Runtime1.hpp
+++ b/src/hotspot/share/c1/c1_Runtime1.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1999, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1999, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
*
*/
-#ifndef SHARE_VM_C1_C1_RUNTIME1_HPP
-#define SHARE_VM_C1_C1_RUNTIME1_HPP
+#ifndef SHARE_C1_C1_RUNTIME1_HPP
+#define SHARE_C1_C1_RUNTIME1_HPP
#include "c1/c1_FrameMap.hpp"
#include "code/stubs.hpp"
@@ -199,4 +199,4 @@ class Runtime1: public AllStatic {
static void print_statistics() PRODUCT_RETURN;
};
-#endif // SHARE_VM_C1_C1_RUNTIME1_HPP
+#endif // SHARE_C1_C1_RUNTIME1_HPP
diff --git a/src/hotspot/share/c1/c1_ValueMap.hpp b/src/hotspot/share/c1/c1_ValueMap.hpp
index 5b1342ede66..735ad6a2750 100644
--- a/src/hotspot/share/c1/c1_ValueMap.hpp
+++ b/src/hotspot/share/c1/c1_ValueMap.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1999, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1999, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
*
*/
-#ifndef SHARE_VM_C1_C1_VALUEMAP_HPP
-#define SHARE_VM_C1_C1_VALUEMAP_HPP
+#ifndef SHARE_C1_C1_VALUEMAP_HPP
+#define SHARE_C1_C1_VALUEMAP_HPP
#include "c1/c1_Instruction.hpp"
#include "c1/c1_ValueSet.hpp"
@@ -257,4 +257,4 @@ class GlobalValueNumbering: public ValueNumberingVisitor {
void substitute(Instruction* instr); // substitute instruction if it is contained in current value map
};
-#endif // SHARE_VM_C1_C1_VALUEMAP_HPP
+#endif // SHARE_C1_C1_VALUEMAP_HPP
diff --git a/src/hotspot/share/c1/c1_ValueSet.hpp b/src/hotspot/share/c1/c1_ValueSet.hpp
index 4372378b418..71b67f24017 100644
--- a/src/hotspot/share/c1/c1_ValueSet.hpp
+++ b/src/hotspot/share/c1/c1_ValueSet.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2001, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
*
*/
-#ifndef SHARE_VM_C1_C1_VALUESET_HPP
-#define SHARE_VM_C1_C1_VALUESET_HPP
+#ifndef SHARE_C1_C1_VALUESET_HPP
+#define SHARE_C1_C1_VALUESET_HPP
#include "c1/c1_Instruction.hpp"
#include "memory/allocation.hpp"
@@ -52,4 +52,4 @@ class ValueSet: public CompilationResourceObj {
bool equals (ValueSet* other);
};
-#endif // SHARE_VM_C1_C1_VALUESET_HPP
+#endif // SHARE_C1_C1_VALUESET_HPP
diff --git a/src/hotspot/share/c1/c1_ValueSet.inline.hpp b/src/hotspot/share/c1/c1_ValueSet.inline.hpp
index 5834c2d6863..026c9f3c62d 100644
--- a/src/hotspot/share/c1/c1_ValueSet.inline.hpp
+++ b/src/hotspot/share/c1/c1_ValueSet.inline.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
*
*/
-#ifndef SHARE_VM_C1_C1_VALUESET_INLINE_HPP
-#define SHARE_VM_C1_C1_VALUESET_INLINE_HPP
+#ifndef SHARE_C1_C1_VALUESET_INLINE_HPP
+#define SHARE_C1_C1_VALUESET_INLINE_HPP
#include "c1/c1_Instruction.hpp"
#include "c1/c1_ValueSet.hpp"
@@ -70,4 +70,4 @@ inline bool ValueSet::equals(ValueSet* other) {
return _map.is_same(other->_map);
}
-#endif // SHARE_VM_C1_C1_VALUESET_INLINE_HPP
+#endif // SHARE_C1_C1_VALUESET_INLINE_HPP
diff --git a/src/hotspot/share/c1/c1_ValueStack.hpp b/src/hotspot/share/c1/c1_ValueStack.hpp
index c58a9f59b7a..d3edfa7257c 100644
--- a/src/hotspot/share/c1/c1_ValueStack.hpp
+++ b/src/hotspot/share/c1/c1_ValueStack.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1999, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1999, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
*
*/
-#ifndef SHARE_VM_C1_C1_VALUESTACK_HPP
-#define SHARE_VM_C1_C1_VALUESTACK_HPP
+#ifndef SHARE_C1_C1_VALUESTACK_HPP
+#define SHARE_C1_C1_VALUESTACK_HPP
#include "c1/c1_Instruction.hpp"
@@ -331,4 +331,4 @@ class ValueStack: public CompilationResourceObj {
} \
}
-#endif // SHARE_VM_C1_C1_VALUESTACK_HPP
+#endif // SHARE_C1_C1_VALUESTACK_HPP
diff --git a/src/hotspot/share/c1/c1_ValueType.hpp b/src/hotspot/share/c1/c1_ValueType.hpp
index 2b6c91582cb..05dfd483bc7 100644
--- a/src/hotspot/share/c1/c1_ValueType.hpp
+++ b/src/hotspot/share/c1/c1_ValueType.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1999, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1999, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
*
*/
-#ifndef SHARE_VM_C1_C1_VALUETYPE_HPP
-#define SHARE_VM_C1_C1_VALUETYPE_HPP
+#ifndef SHARE_C1_C1_VALUETYPE_HPP
+#define SHARE_C1_C1_VALUETYPE_HPP
#include "c1/c1_Compilation.hpp"
#include "ci/ciConstant.hpp"
@@ -515,4 +515,4 @@ BasicType as_BasicType(ValueType* type);
inline ValueType* as_ValueType(ciType* type) { return as_ValueType(type->basic_type()); }
-#endif // SHARE_VM_C1_C1_VALUETYPE_HPP
+#endif // SHARE_C1_C1_VALUETYPE_HPP
diff --git a/src/hotspot/share/c1/c1_globals.hpp b/src/hotspot/share/c1/c1_globals.hpp
index a07f8443584..b386aa9ca4a 100644
--- a/src/hotspot/share/c1/c1_globals.hpp
+++ b/src/hotspot/share/c1/c1_globals.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2000, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
*
*/
-#ifndef SHARE_VM_C1_C1_GLOBALS_HPP
-#define SHARE_VM_C1_C1_GLOBALS_HPP
+#ifndef SHARE_C1_C1_GLOBALS_HPP
+#define SHARE_C1_C1_GLOBALS_HPP
#include "runtime/globals.hpp"
#include "utilities/macros.hpp"
@@ -337,4 +337,4 @@ C1_FLAGS(DECLARE_DEVELOPER_FLAG, \
IGNORE_CONSTRAINT, \
IGNORE_WRITEABLE)
-#endif // SHARE_VM_C1_C1_GLOBALS_HPP
+#endif // SHARE_C1_C1_GLOBALS_HPP
diff --git a/src/hotspot/share/ci/bcEscapeAnalyzer.cpp b/src/hotspot/share/ci/bcEscapeAnalyzer.cpp
index 515c48711a1..3f7ac3ab79c 100644
--- a/src/hotspot/share/ci/bcEscapeAnalyzer.cpp
+++ b/src/hotspot/share/ci/bcEscapeAnalyzer.cpp
@@ -79,7 +79,6 @@ public:
void add_unknown() { _bits = UNKNOWN; }
void add_allocated() { _bits = ALLOCATED; }
void set_union(const ArgumentMap &am) { _bits |= am._bits; }
- void set_intersect(const ArgumentMap &am) { _bits |= am._bits; }
void set_difference(const ArgumentMap &am) { _bits &= ~am._bits; }
void operator=(const ArgumentMap &am) { _bits = am._bits; }
bool operator==(const ArgumentMap &am) { return _bits == am._bits; }
@@ -1219,8 +1218,6 @@ vmIntrinsics::ID BCEscapeAnalyzer::known_intrinsic() {
}
bool BCEscapeAnalyzer::compute_escape_for_intrinsic(vmIntrinsics::ID iid) {
- ArgumentMap arg;
- arg.clear();
switch (iid) {
case vmIntrinsics::_getClass:
_return_local = false;
diff --git a/src/hotspot/share/ci/bcEscapeAnalyzer.hpp b/src/hotspot/share/ci/bcEscapeAnalyzer.hpp
index 74a0d3106b7..0d109e8b195 100644
--- a/src/hotspot/share/ci/bcEscapeAnalyzer.hpp
+++ b/src/hotspot/share/ci/bcEscapeAnalyzer.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2005, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
*
*/
-#ifndef SHARE_VM_CI_BCESCAPEANALYZER_HPP
-#define SHARE_VM_CI_BCESCAPEANALYZER_HPP
+#ifndef SHARE_CI_BCESCAPEANALYZER_HPP
+#define SHARE_CI_BCESCAPEANALYZER_HPP
#ifdef COMPILER2
#include "ci/ciObject.hpp"
@@ -162,4 +162,4 @@ class BCEscapeAnalyzer : public ResourceObj {
#endif
};
-#endif // SHARE_VM_CI_BCESCAPEANALYZER_HPP
+#endif // SHARE_CI_BCESCAPEANALYZER_HPP
diff --git a/src/hotspot/share/ci/ciArray.hpp b/src/hotspot/share/ci/ciArray.hpp
index d5ff40ba695..7d81cb8ec22 100644
--- a/src/hotspot/share/ci/ciArray.hpp
+++ b/src/hotspot/share/ci/ciArray.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1999, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1999, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
*
*/
-#ifndef SHARE_VM_CI_CIARRAY_HPP
-#define SHARE_VM_CI_CIARRAY_HPP
+#ifndef SHARE_CI_CIARRAY_HPP
+#define SHARE_CI_CIARRAY_HPP
#include "ci/ciArrayKlass.hpp"
#include "ci/ciConstant.hpp"
@@ -76,4 +76,4 @@ public:
bool is_java_object() { return true; }
};
-#endif // SHARE_VM_CI_CIARRAY_HPP
+#endif // SHARE_CI_CIARRAY_HPP
diff --git a/src/hotspot/share/ci/ciArrayKlass.hpp b/src/hotspot/share/ci/ciArrayKlass.hpp
index afb55bb5e44..f801c4399e9 100644
--- a/src/hotspot/share/ci/ciArrayKlass.hpp
+++ b/src/hotspot/share/ci/ciArrayKlass.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1999, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1999, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
*
*/
-#ifndef SHARE_VM_CI_CIARRAYKLASS_HPP
-#define SHARE_VM_CI_CIARRAYKLASS_HPP
+#ifndef SHARE_CI_CIARRAYKLASS_HPP
+#define SHARE_CI_CIARRAYKLASS_HPP
#include "ci/ciKlass.hpp"
@@ -59,4 +59,4 @@ public:
static ciArrayKlass* make(ciType* element_type);
};
-#endif // SHARE_VM_CI_CIARRAYKLASS_HPP
+#endif // SHARE_CI_CIARRAYKLASS_HPP
diff --git a/src/hotspot/share/ci/ciBaseObject.hpp b/src/hotspot/share/ci/ciBaseObject.hpp
index dc7a8d450af..dae3f6de50a 100644
--- a/src/hotspot/share/ci/ciBaseObject.hpp
+++ b/src/hotspot/share/ci/ciBaseObject.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2011, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
*
*/
-#ifndef SHARE_VM_CI_CIBASEOBJECT_HPP
-#define SHARE_VM_CI_CIBASEOBJECT_HPP
+#ifndef SHARE_CI_CIBASEOBJECT_HPP
+#define SHARE_CI_CIBASEOBJECT_HPP
#include "ci/ciClassList.hpp"
#include "memory/allocation.hpp"
@@ -87,4 +87,4 @@ public:
return (ciMetadata*)this;
}
};
-#endif // SHARE_VM_CI_CIBASEOBJECT_HPP
+#endif // SHARE_CI_CIBASEOBJECT_HPP
diff --git a/src/hotspot/share/ci/ciCallProfile.hpp b/src/hotspot/share/ci/ciCallProfile.hpp
index 081014954db..b77507b445a 100644
--- a/src/hotspot/share/ci/ciCallProfile.hpp
+++ b/src/hotspot/share/ci/ciCallProfile.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1999, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1999, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
*
*/
-#ifndef SHARE_VM_CI_CICALLPROFILE_HPP
-#define SHARE_VM_CI_CICALLPROFILE_HPP
+#ifndef SHARE_CI_CICALLPROFILE_HPP
+#define SHARE_CI_CICALLPROFILE_HPP
#include "ci/ciClassList.hpp"
#include "memory/allocation.hpp"
@@ -92,4 +92,4 @@ public:
}
};
-#endif // SHARE_VM_CI_CICALLPROFILE_HPP
+#endif // SHARE_CI_CICALLPROFILE_HPP
diff --git a/src/hotspot/share/ci/ciCallSite.hpp b/src/hotspot/share/ci/ciCallSite.hpp
index 063f1e3a5fe..92fcdb2b968 100644
--- a/src/hotspot/share/ci/ciCallSite.hpp
+++ b/src/hotspot/share/ci/ciCallSite.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2009, 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2009, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
*
*/
-#ifndef SHARE_VM_CI_CICALLSITE_HPP
-#define SHARE_VM_CI_CICALLSITE_HPP
+#ifndef SHARE_CI_CICALLSITE_HPP
+#define SHARE_CI_CICALLSITE_HPP
#include "ci/ciInstance.hpp"
@@ -47,4 +47,4 @@ public:
void print();
};
-#endif // SHARE_VM_CI_CICALLSITE_HPP
+#endif // SHARE_CI_CICALLSITE_HPP
diff --git a/src/hotspot/share/ci/ciClassList.hpp b/src/hotspot/share/ci/ciClassList.hpp
index 1e6816030f7..d49a8c797f6 100644
--- a/src/hotspot/share/ci/ciClassList.hpp
+++ b/src/hotspot/share/ci/ciClassList.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1999, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1999, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
*
*/
-#ifndef SHARE_VM_CI_CICLASSLIST_HPP
-#define SHARE_VM_CI_CICLASSLIST_HPP
+#ifndef SHARE_CI_CICLASSLIST_HPP
+#define SHARE_CI_CICLASSLIST_HPP
class ciEnv;
class ciObjectFactory;
@@ -118,4 +118,4 @@ friend class ciArrayKlass; \
friend class ciObjArrayKlass; \
friend class ciTypeArrayKlass; \
-#endif // SHARE_VM_CI_CICLASSLIST_HPP
+#endif // SHARE_CI_CICLASSLIST_HPP
diff --git a/src/hotspot/share/ci/ciConstant.hpp b/src/hotspot/share/ci/ciConstant.hpp
index 656bd79f1af..7c8266d1059 100644
--- a/src/hotspot/share/ci/ciConstant.hpp
+++ b/src/hotspot/share/ci/ciConstant.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1999, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1999, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
*
*/
-#ifndef SHARE_VM_CI_CICONSTANT_HPP
-#define SHARE_VM_CI_CICONSTANT_HPP
+#ifndef SHARE_CI_CICONSTANT_HPP
+#define SHARE_CI_CICONSTANT_HPP
#include "ci/ciClassList.hpp"
#include "ci/ciNullObject.hpp"
@@ -131,4 +131,4 @@ public:
void print();
};
-#endif // SHARE_VM_CI_CICONSTANT_HPP
+#endif // SHARE_CI_CICONSTANT_HPP
diff --git a/src/hotspot/share/ci/ciConstantPoolCache.hpp b/src/hotspot/share/ci/ciConstantPoolCache.hpp
index 8c726a0154f..3fff96e735d 100644
--- a/src/hotspot/share/ci/ciConstantPoolCache.hpp
+++ b/src/hotspot/share/ci/ciConstantPoolCache.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1999, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1999, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
*
*/
-#ifndef SHARE_VM_CI_CICONSTANTPOOLCACHE_HPP
-#define SHARE_VM_CI_CICONSTANTPOOLCACHE_HPP
+#ifndef SHARE_CI_CICONSTANTPOOLCACHE_HPP
+#define SHARE_CI_CICONSTANTPOOLCACHE_HPP
#include "memory/resourceArea.hpp"
#include "utilities/growableArray.hpp"
@@ -52,4 +52,4 @@ public:
void print();
};
-#endif // SHARE_VM_CI_CICONSTANTPOOLCACHE_HPP
+#endif // SHARE_CI_CICONSTANTPOOLCACHE_HPP
diff --git a/src/hotspot/share/ci/ciEnv.cpp b/src/hotspot/share/ci/ciEnv.cpp
index d3f100b2629..85cb2303f71 100644
--- a/src/hotspot/share/ci/ciEnv.cpp
+++ b/src/hotspot/share/ci/ciEnv.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1999, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1999, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -233,10 +233,6 @@ void ciEnv::cache_jvmti_state() {
_jvmti_can_pop_frame = JvmtiExport::can_pop_frame();
}
-bool ciEnv::should_retain_local_variables() const {
- return _jvmti_can_access_local_variables || _jvmti_can_pop_frame;
-}
-
bool ciEnv::jvmti_state_changed() const {
if (!_jvmti_can_access_local_variables &&
JvmtiExport::can_access_local_variables()) {
@@ -919,10 +915,17 @@ bool ciEnv::is_in_vm() {
return JavaThread::current()->thread_state() == _thread_in_vm;
}
-bool ciEnv::system_dictionary_modification_counter_changed() {
+bool ciEnv::system_dictionary_modification_counter_changed_locked() {
+ assert_locked_or_safepoint(Compile_lock);
return _system_dictionary_modification_counter != SystemDictionary::number_of_modifications();
}
+bool ciEnv::system_dictionary_modification_counter_changed() {
+ VM_ENTRY_MARK;
+ MutexLocker ml(Compile_lock, THREAD); // lock with safepoint check
+ return system_dictionary_modification_counter_changed_locked();
+}
+
// ------------------------------------------------------------------
// ciEnv::validate_compile_task_dependencies
//
@@ -931,7 +934,7 @@ bool ciEnv::system_dictionary_modification_counter_changed() {
void ciEnv::validate_compile_task_dependencies(ciMethod* target) {
if (failing()) return; // no need for further checks
- bool counter_changed = system_dictionary_modification_counter_changed();
+ bool counter_changed = system_dictionary_modification_counter_changed_locked();
Dependencies::DepType result = dependencies()->validate_dependencies(_task, counter_changed);
if (result != Dependencies::end_marker) {
if (result == Dependencies::call_site_target_value) {
diff --git a/src/hotspot/share/ci/ciEnv.hpp b/src/hotspot/share/ci/ciEnv.hpp
index 7397c9ecef1..3af89e51973 100644
--- a/src/hotspot/share/ci/ciEnv.hpp
+++ b/src/hotspot/share/ci/ciEnv.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1999, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1999, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
*
*/
-#ifndef SHARE_VM_CI_CIENV_HPP
-#define SHARE_VM_CI_CIENV_HPP
+#ifndef SHARE_CI_CIENV_HPP
+#define SHARE_CI_CIENV_HPP
#include "ci/ciClassList.hpp"
#include "ci/ciObjectFactory.hpp"
@@ -46,6 +46,7 @@ class ciEnv : StackObj {
friend class CompileBroker;
friend class Dependencies; // for get_object, during logging
+ friend class PrepareExtraDataClosure;
private:
Arena* _arena; // Alias for _ciEnv_arena except in init_shared_objects()
@@ -188,6 +189,10 @@ private:
}
}
+ ciMetadata* cached_metadata(Metadata* o) {
+ return _factory->cached_metadata(o);
+ }
+
ciInstance* get_instance(oop o) {
if (o == NULL) return NULL;
return get_object(o)->as_instance();
@@ -287,6 +292,8 @@ private:
// respect to method dependencies (e.g. concurrent class loading).
void validate_compile_task_dependencies(ciMethod* target);
+ // Call internally when Compile_lock is already held.
+ bool system_dictionary_modification_counter_changed_locked();
public:
enum {
MethodCompilable,
@@ -338,7 +345,9 @@ public:
// Cache Jvmti state
void cache_jvmti_state();
bool jvmti_state_changed() const;
- bool should_retain_local_variables() const;
+ bool should_retain_local_variables() const {
+ return _jvmti_can_access_local_variables || _jvmti_can_pop_frame;
+ }
bool jvmti_can_hotswap_or_post_breakpoint() const { return _jvmti_can_hotswap_or_post_breakpoint; }
bool jvmti_can_post_on_exceptions() const { return _jvmti_can_post_on_exceptions; }
@@ -466,4 +475,4 @@ public:
void dump_compile_data(outputStream* out);
};
-#endif // SHARE_VM_CI_CIENV_HPP
+#endif // SHARE_CI_CIENV_HPP
diff --git a/src/hotspot/share/ci/ciExceptionHandler.hpp b/src/hotspot/share/ci/ciExceptionHandler.hpp
index aae74e7c3d7..2a2f8f852f1 100644
--- a/src/hotspot/share/ci/ciExceptionHandler.hpp
+++ b/src/hotspot/share/ci/ciExceptionHandler.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1999, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1999, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
*
*/
-#ifndef SHARE_VM_CI_CIEXCEPTIONHANDLER_HPP
-#define SHARE_VM_CI_CIEXCEPTIONHANDLER_HPP
+#ifndef SHARE_CI_CIEXCEPTIONHANDLER_HPP
+#define SHARE_CI_CIEXCEPTIONHANDLER_HPP
#include "ci/ciClassList.hpp"
#include "ci/ciInstanceKlass.hpp"
@@ -80,4 +80,4 @@ public:
void print();
};
-#endif // SHARE_VM_CI_CIEXCEPTIONHANDLER_HPP
+#endif // SHARE_CI_CIEXCEPTIONHANDLER_HPP
diff --git a/src/hotspot/share/ci/ciField.hpp b/src/hotspot/share/ci/ciField.hpp
index 281e72fd92b..218b5c1f17e 100644
--- a/src/hotspot/share/ci/ciField.hpp
+++ b/src/hotspot/share/ci/ciField.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1999, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1999, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
*
*/
-#ifndef SHARE_VM_CI_CIFIELD_HPP
-#define SHARE_VM_CI_CIFIELD_HPP
+#ifndef SHARE_CI_CIFIELD_HPP
+#define SHARE_CI_CIFIELD_HPP
#include "ci/ciClassList.hpp"
#include "ci/ciConstant.hpp"
@@ -201,4 +201,4 @@ public:
void print_name_on(outputStream* st);
};
-#endif // SHARE_VM_CI_CIFIELD_HPP
+#endif // SHARE_CI_CIFIELD_HPP
diff --git a/src/hotspot/share/ci/ciFlags.hpp b/src/hotspot/share/ci/ciFlags.hpp
index 974701a2f54..4e5c81e527c 100644
--- a/src/hotspot/share/ci/ciFlags.hpp
+++ b/src/hotspot/share/ci/ciFlags.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1999, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1999, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
*
*/
-#ifndef SHARE_VM_CI_CIFLAGS_HPP
-#define SHARE_VM_CI_CIFLAGS_HPP
+#ifndef SHARE_CI_CIFLAGS_HPP
+#define SHARE_CI_CIFLAGS_HPP
#include "jvm.h"
#include "ci/ciClassList.hpp"
@@ -74,4 +74,4 @@ public:
void print(outputStream* st = tty);
};
-#endif // SHARE_VM_CI_CIFLAGS_HPP
+#endif // SHARE_CI_CIFLAGS_HPP
diff --git a/src/hotspot/share/ci/ciInstance.hpp b/src/hotspot/share/ci/ciInstance.hpp
index 96c470e54ee..c0ba114284c 100644
--- a/src/hotspot/share/ci/ciInstance.hpp
+++ b/src/hotspot/share/ci/ciInstance.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1999, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1999, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
*
*/
-#ifndef SHARE_VM_CI_CIINSTANCE_HPP
-#define SHARE_VM_CI_CIINSTANCE_HPP
+#ifndef SHARE_CI_CIINSTANCE_HPP
+#define SHARE_CI_CIINSTANCE_HPP
#include "ci/ciObject.hpp"
#include "oops/instanceOop.hpp"
@@ -72,4 +72,4 @@ public:
ciKlass* java_lang_Class_klass();
};
-#endif // SHARE_VM_CI_CIINSTANCE_HPP
+#endif // SHARE_CI_CIINSTANCE_HPP
diff --git a/src/hotspot/share/ci/ciInstanceKlass.hpp b/src/hotspot/share/ci/ciInstanceKlass.hpp
index e98f98b588c..d608ea8c05a 100644
--- a/src/hotspot/share/ci/ciInstanceKlass.hpp
+++ b/src/hotspot/share/ci/ciInstanceKlass.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1999, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1999, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
*
*/
-#ifndef SHARE_VM_CI_CIINSTANCEKLASS_HPP
-#define SHARE_VM_CI_CIINSTANCEKLASS_HPP
+#ifndef SHARE_CI_CIINSTANCEKLASS_HPP
+#define SHARE_CI_CIINSTANCEKLASS_HPP
#include "ci/ciConstantPoolCache.hpp"
#include "ci/ciFlags.hpp"
@@ -281,4 +281,4 @@ public:
#endif
};
-#endif // SHARE_VM_CI_CIINSTANCEKLASS_HPP
+#endif // SHARE_CI_CIINSTANCEKLASS_HPP
diff --git a/src/hotspot/share/ci/ciKlass.hpp b/src/hotspot/share/ci/ciKlass.hpp
index 896f489453a..2e329d2a32a 100644
--- a/src/hotspot/share/ci/ciKlass.hpp
+++ b/src/hotspot/share/ci/ciKlass.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1999, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1999, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
*
*/
-#ifndef SHARE_VM_CI_CIKLASS_HPP
-#define SHARE_VM_CI_CIKLASS_HPP
+#ifndef SHARE_CI_CIKLASS_HPP
+#define SHARE_CI_CIKLASS_HPP
#include "ci/ciType.hpp"
#include "oops/klass.hpp"
@@ -131,4 +131,4 @@ public:
const char* external_name() const;
};
-#endif // SHARE_VM_CI_CIKLASS_HPP
+#endif // SHARE_CI_CIKLASS_HPP
diff --git a/src/hotspot/share/ci/ciMemberName.hpp b/src/hotspot/share/ci/ciMemberName.hpp
index fdb6bad274c..0d6471a365d 100644
--- a/src/hotspot/share/ci/ciMemberName.hpp
+++ b/src/hotspot/share/ci/ciMemberName.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
*
*/
-#ifndef SHARE_VM_CI_CIMEMBERNAME_HPP
-#define SHARE_VM_CI_CIMEMBERNAME_HPP
+#ifndef SHARE_CI_CIMEMBERNAME_HPP
+#define SHARE_CI_CIMEMBERNAME_HPP
#include "ci/ciCallProfile.hpp"
#include "ci/ciInstance.hpp"
@@ -41,4 +41,4 @@ public:
ciMethod* get_vmtarget() const;
};
-#endif // SHARE_VM_CI_CIMEMBERNAME_HPP
+#endif // SHARE_CI_CIMEMBERNAME_HPP
diff --git a/src/hotspot/share/ci/ciMetadata.hpp b/src/hotspot/share/ci/ciMetadata.hpp
index bd8dc52dbf6..07449787be4 100644
--- a/src/hotspot/share/ci/ciMetadata.hpp
+++ b/src/hotspot/share/ci/ciMetadata.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1999, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1999, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
*
*/
-#ifndef SHARE_VM_CI_CIMETADATA_HPP
-#define SHARE_VM_CI_CIMETADATA_HPP
+#ifndef SHARE_CI_CIMETADATA_HPP
+#define SHARE_CI_CIMETADATA_HPP
#include "ci/ciBaseObject.hpp"
#include "ci/ciClassList.hpp"
@@ -117,4 +117,4 @@ class ciMetadata: public ciBaseObject {
void print_metadata(outputStream* st = tty);
};
-#endif // SHARE_VM_CI_CIMETADATA_HPP
+#endif // SHARE_CI_CIMETADATA_HPP
diff --git a/src/hotspot/share/ci/ciMethod.cpp b/src/hotspot/share/ci/ciMethod.cpp
index a19d7219d8c..d7d159aebd0 100644
--- a/src/hotspot/share/ci/ciMethod.cpp
+++ b/src/hotspot/share/ci/ciMethod.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1999, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1999, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -402,12 +402,14 @@ MethodLivenessResult ciMethod::raw_liveness_at_bci(int bci) {
// will return true for all locals in some cases to improve debug
// information.
MethodLivenessResult ciMethod::liveness_at_bci(int bci) {
- MethodLivenessResult result = raw_liveness_at_bci(bci);
if (CURRENT_ENV->should_retain_local_variables() || DeoptimizeALot) {
// Keep all locals live for the user's edification and amusement.
- result.at_put_range(0, result.size(), true);
+ MethodLivenessResult result(_max_locals);
+ result.set_range(0, _max_locals);
+ result.set_is_valid();
+ return result;
}
- return result;
+ return raw_liveness_at_bci(bci);
}
// ciMethod::live_local_oops_at_bci
diff --git a/src/hotspot/share/ci/ciMethod.hpp b/src/hotspot/share/ci/ciMethod.hpp
index 57f1a9efdf4..cea268be662 100644
--- a/src/hotspot/share/ci/ciMethod.hpp
+++ b/src/hotspot/share/ci/ciMethod.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1999, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1999, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
*
*/
-#ifndef SHARE_VM_CI_CIMETHOD_HPP
-#define SHARE_VM_CI_CIMETHOD_HPP
+#ifndef SHARE_CI_CIMETHOD_HPP
+#define SHARE_CI_CIMETHOD_HPP
#include "ci/ciFlags.hpp"
#include "ci/ciInstanceKlass.hpp"
@@ -363,4 +363,4 @@ class ciMethod : public ciMetadata {
static bool is_consistent_info(ciMethod* declared_method, ciMethod* resolved_method);
};
-#endif // SHARE_VM_CI_CIMETHOD_HPP
+#endif // SHARE_CI_CIMETHOD_HPP
diff --git a/src/hotspot/share/ci/ciMethodBlocks.hpp b/src/hotspot/share/ci/ciMethodBlocks.hpp
index 784c6a7266d..92967c185fd 100644
--- a/src/hotspot/share/ci/ciMethodBlocks.hpp
+++ b/src/hotspot/share/ci/ciMethodBlocks.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2006, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2006, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
*
*/
-#ifndef SHARE_VM_CI_CIMETHODBLOCKS_HPP
-#define SHARE_VM_CI_CIMETHODBLOCKS_HPP
+#ifndef SHARE_CI_CIMETHODBLOCKS_HPP
+#define SHARE_CI_CIMETHODBLOCKS_HPP
#include "ci/ciMethod.hpp"
#include "memory/resourceArea.hpp"
@@ -129,4 +129,4 @@ public:
#endif
};
-#endif // SHARE_VM_CI_CIMETHODBLOCKS_HPP
+#endif // SHARE_CI_CIMETHODBLOCKS_HPP
diff --git a/src/hotspot/share/ci/ciMethodData.cpp b/src/hotspot/share/ci/ciMethodData.cpp
index 45c7b9deb9c..55e9e4bc7b6 100644
--- a/src/hotspot/share/ci/ciMethodData.cpp
+++ b/src/hotspot/share/ci/ciMethodData.cpp
@@ -78,10 +78,81 @@ ciMethodData::ciMethodData() : ciMetadata(NULL) {
_parameters = NULL;
}
-void ciMethodData::load_extra_data() {
+// Check for entries that reference an unloaded method
+class PrepareExtraDataClosure : public CleanExtraDataClosure {
+ MethodData* _mdo;
+ uint64_t _safepoint_counter;
+ GrowableArray _uncached_methods;
+
+public:
+ PrepareExtraDataClosure(MethodData* mdo)
+ : _mdo(mdo),
+ _safepoint_counter(SafepointSynchronize::safepoint_counter()),
+ _uncached_methods()
+ { }
+
+ bool is_live(Method* m) {
+ if (!m->method_holder()->is_loader_alive()) {
+ return false;
+ }
+ if (CURRENT_ENV->cached_metadata(m) == NULL) {
+ // Uncached entries need to be pre-populated.
+ _uncached_methods.append(m);
+ }
+ return true;
+ }
+
+ bool has_safepointed() {
+ return SafepointSynchronize::safepoint_counter() != _safepoint_counter;
+ }
+
+ bool finish() {
+ if (_uncached_methods.length() == 0) {
+ // Preparation finished iff all Methods* were already cached.
+ return true;
+ }
+ // Holding locks through safepoints is bad practice.
+ MutexUnlocker mu(_mdo->extra_data_lock());
+ for (int i = 0; i < _uncached_methods.length(); ++i) {
+ if (has_safepointed()) {
+ // The metadata in the growable array might contain stale
+ // entries after a safepoint.
+ return false;
+ }
+ Method* method = _uncached_methods.at(i);
+ // Populating ciEnv caches may cause safepoints due
+ // to taking the Compile_lock with safepoint checks.
+ (void)CURRENT_ENV->get_method(method);
+ }
+ return false;
+ }
+};
+
+void ciMethodData::prepare_metadata() {
MethodData* mdo = get_MethodData();
+ for (;;) {
+ ResourceMark rm;
+ PrepareExtraDataClosure cl(mdo);
+ mdo->clean_extra_data(&cl);
+ if (cl.finish()) {
+ // When encountering uncached metadata, the Compile_lock might be
+ // acquired when creating ciMetadata handles, causing safepoints
+ // which requires a new round of preparation to clean out potentially
+ // new unloading metadata.
+ return;
+ }
+ }
+}
+
+void ciMethodData::load_extra_data() {
+ MethodData* mdo = get_MethodData();
MutexLocker ml(mdo->extra_data_lock());
+ // Deferred metadata cleaning due to concurrent class unloading.
+ prepare_metadata();
+ // After metadata preparation, there is no stale metadata,
+ // and no safepoints can introduce more stale metadata.
+ NoSafepointVerifier no_safepoint;
// speculative trap entries also hold a pointer to a Method so need to be translated
DataLayout* dp_src = mdo->extra_data_base();
@@ -94,22 +165,21 @@ void ciMethodData::load_extra_data() {
// New traps in the MDO may have been added since we copied the
// data (concurrent deoptimizations before we acquired
// extra_data_lock above) or can be removed (a safepoint may occur
- // in the translate_from call below) as we translate the copy:
+ // in the prepare_metadata call above) as we translate the copy:
// update the copy as we go.
int tag = dp_src->tag();
- if (tag != DataLayout::arg_info_data_tag) {
- memcpy(dp_dst, dp_src, ((intptr_t)MethodData::next_extra(dp_src)) - ((intptr_t)dp_src));
+ size_t entry_size = DataLayout::header_size_in_bytes();
+ if (tag != DataLayout::no_tag) {
+ ProfileData* src_data = dp_src->data_in();
+ entry_size = src_data->size_in_bytes();
}
+ memcpy(dp_dst, dp_src, entry_size);
switch(tag) {
case DataLayout::speculative_trap_data_tag: {
ciSpeculativeTrapData data_dst(dp_dst);
SpeculativeTrapData data_src(dp_src);
-
- { // During translation a safepoint can happen or VM lock can be taken (e.g., Compile_lock).
- MutexUnlocker ml(mdo->extra_data_lock());
- data_dst.translate_from(&data_src);
- }
+ data_dst.translate_from(&data_src);
break;
}
case DataLayout::bit_data_tag:
diff --git a/src/hotspot/share/ci/ciMethodData.hpp b/src/hotspot/share/ci/ciMethodData.hpp
index fd81d373e9a..1aa6c766089 100644
--- a/src/hotspot/share/ci/ciMethodData.hpp
+++ b/src/hotspot/share/ci/ciMethodData.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2001, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
*
*/
-#ifndef SHARE_VM_CI_CIMETHODDATA_HPP
-#define SHARE_VM_CI_CIMETHODDATA_HPP
+#ifndef SHARE_CI_CIMETHODDATA_HPP
+#define SHARE_CI_CIMETHODDATA_HPP
#include "ci/ciClassList.hpp"
#include "ci/ciKlass.hpp"
@@ -475,6 +475,7 @@ private:
return (address) _data;
}
+ void prepare_metadata();
void load_extra_data();
ciProfileData* bci_to_extra_data(int bci, ciMethod* m, bool& two_free_slots);
@@ -602,4 +603,4 @@ public:
void dump_replay_data(outputStream* out);
};
-#endif // SHARE_VM_CI_CIMETHODDATA_HPP
+#endif // SHARE_CI_CIMETHODDATA_HPP
diff --git a/src/hotspot/share/ci/ciMethodHandle.hpp b/src/hotspot/share/ci/ciMethodHandle.hpp
index 355657eeadd..c57dfdc7d05 100644
--- a/src/hotspot/share/ci/ciMethodHandle.hpp
+++ b/src/hotspot/share/ci/ciMethodHandle.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2009, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2009, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
*
*/
-#ifndef SHARE_VM_CI_CIMETHODHANDLE_HPP
-#define SHARE_VM_CI_CIMETHODHANDLE_HPP
+#ifndef SHARE_CI_CIMETHODHANDLE_HPP
+#define SHARE_CI_CIMETHODHANDLE_HPP
#include "ci/ciClassList.hpp"
#include "ci/ciInstance.hpp"
@@ -41,4 +41,4 @@ public:
ciMethod* get_vmtarget() const;
};
-#endif // SHARE_VM_CI_CIMETHODHANDLE_HPP
+#endif // SHARE_CI_CIMETHODHANDLE_HPP
diff --git a/src/hotspot/share/ci/ciMethodType.hpp b/src/hotspot/share/ci/ciMethodType.hpp
index 4dd54e9a7f3..1cdf77893af 100644
--- a/src/hotspot/share/ci/ciMethodType.hpp
+++ b/src/hotspot/share/ci/ciMethodType.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
*
*/
-#ifndef SHARE_VM_CI_CIMETHODTYPE_HPP
-#define SHARE_VM_CI_CIMETHODTYPE_HPP
+#ifndef SHARE_CI_CIMETHODTYPE_HPP
+#define SHARE_CI_CIMETHODTYPE_HPP
#include "ci/ciInstance.hpp"
@@ -48,4 +48,4 @@ public:
ciType* ptype_at(int index) const;
};
-#endif // SHARE_VM_CI_CIMETHODTYPE_HPP
+#endif // SHARE_CI_CIMETHODTYPE_HPP
diff --git a/src/hotspot/share/ci/ciNullObject.hpp b/src/hotspot/share/ci/ciNullObject.hpp
index f3fa5ae0730..d3dd2229a6c 100644
--- a/src/hotspot/share/ci/ciNullObject.hpp
+++ b/src/hotspot/share/ci/ciNullObject.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1999, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1999, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
*
*/
-#ifndef SHARE_VM_CI_CINULLOBJECT_HPP
-#define SHARE_VM_CI_CINULLOBJECT_HPP
+#ifndef SHARE_CI_CINULLOBJECT_HPP
+#define SHARE_CI_CINULLOBJECT_HPP
#include "ci/ciClassList.hpp"
#include "ci/ciObject.hpp"
@@ -54,4 +54,4 @@ public:
static ciNullObject* make();
};
-#endif // SHARE_VM_CI_CINULLOBJECT_HPP
+#endif // SHARE_CI_CINULLOBJECT_HPP
diff --git a/src/hotspot/share/ci/ciObjArray.hpp b/src/hotspot/share/ci/ciObjArray.hpp
index 6a3abc55164..69254eaa25d 100644
--- a/src/hotspot/share/ci/ciObjArray.hpp
+++ b/src/hotspot/share/ci/ciObjArray.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1999, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1999, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
*
*/
-#ifndef SHARE_VM_CI_CIOBJARRAY_HPP
-#define SHARE_VM_CI_CIOBJARRAY_HPP
+#ifndef SHARE_CI_CIOBJARRAY_HPP
+#define SHARE_CI_CIOBJARRAY_HPP
#include "ci/ciArray.hpp"
#include "ci/ciClassList.hpp"
@@ -54,4 +54,4 @@ public:
ciObject* obj_at(int index);
};
-#endif // SHARE_VM_CI_CIOBJARRAY_HPP
+#endif // SHARE_CI_CIOBJARRAY_HPP
diff --git a/src/hotspot/share/ci/ciObjArrayKlass.hpp b/src/hotspot/share/ci/ciObjArrayKlass.hpp
index 264fa66ced3..d5a0e84c979 100644
--- a/src/hotspot/share/ci/ciObjArrayKlass.hpp
+++ b/src/hotspot/share/ci/ciObjArrayKlass.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1999, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1999, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
*
*/
-#ifndef SHARE_VM_CI_CIOBJARRAYKLASS_HPP
-#define SHARE_VM_CI_CIOBJARRAYKLASS_HPP
+#ifndef SHARE_CI_CIOBJARRAYKLASS_HPP
+#define SHARE_CI_CIOBJARRAYKLASS_HPP
#include "ci/ciArrayKlass.hpp"
@@ -77,4 +77,4 @@ public:
virtual ciKlass* exact_klass();
};
-#endif // SHARE_VM_CI_CIOBJARRAYKLASS_HPP
+#endif // SHARE_CI_CIOBJARRAYKLASS_HPP
diff --git a/src/hotspot/share/ci/ciObject.hpp b/src/hotspot/share/ci/ciObject.hpp
index 4a8070704c5..260bb8e0256 100644
--- a/src/hotspot/share/ci/ciObject.hpp
+++ b/src/hotspot/share/ci/ciObject.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1999, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1999, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
*
*/
-#ifndef SHARE_VM_CI_CIOBJECT_HPP
-#define SHARE_VM_CI_CIOBJECT_HPP
+#ifndef SHARE_CI_CIOBJECT_HPP
+#define SHARE_CI_CIOBJECT_HPP
#include "ci/ciBaseObject.hpp"
#include "ci/ciClassList.hpp"
@@ -185,4 +185,4 @@ public:
void print_oop(outputStream* st = tty);
};
-#endif // SHARE_VM_CI_CIOBJECT_HPP
+#endif // SHARE_CI_CIOBJECT_HPP
diff --git a/src/hotspot/share/ci/ciObjectFactory.cpp b/src/hotspot/share/ci/ciObjectFactory.cpp
index 6d42e84863c..7c889a277b2 100644
--- a/src/hotspot/share/ci/ciObjectFactory.cpp
+++ b/src/hotspot/share/ci/ciObjectFactory.cpp
@@ -265,6 +265,24 @@ int ciObjectFactory::metadata_compare(Metadata* const& key, ciMetadata* const& e
else return 0;
}
+// ------------------------------------------------------------------
+// ciObjectFactory::cached_metadata
+//
+// Get the ciMetadata corresponding to some Metadata. If the ciMetadata has
+// already been created, it is returned. Otherwise, null is returned.
+ciMetadata* ciObjectFactory::cached_metadata(Metadata* key) {
+ ASSERT_IN_VM;
+
+ bool found = false;
+ int index = _ci_metadata->find_sorted(key, found);
+
+ if (!found) {
+ return NULL;
+ }
+ return _ci_metadata->at(index)->as_metadata();
+}
+
+
// ------------------------------------------------------------------
// ciObjectFactory::get_metadata
//
diff --git a/src/hotspot/share/ci/ciObjectFactory.hpp b/src/hotspot/share/ci/ciObjectFactory.hpp
index 6660148a017..3037ad49395 100644
--- a/src/hotspot/share/ci/ciObjectFactory.hpp
+++ b/src/hotspot/share/ci/ciObjectFactory.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1999, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1999, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
*
*/
-#ifndef SHARE_VM_CI_CIOBJECTFACTORY_HPP
-#define SHARE_VM_CI_CIOBJECTFACTORY_HPP
+#ifndef SHARE_CI_CIOBJECTFACTORY_HPP
+#define SHARE_CI_CIOBJECTFACTORY_HPP
#include "ci/ciClassList.hpp"
#include "ci/ciObject.hpp"
@@ -100,6 +100,7 @@ public:
// Get the ciObject corresponding to some oop.
ciObject* get(oop key);
ciMetadata* get_metadata(Metadata* key);
+ ciMetadata* cached_metadata(Metadata* key);
ciSymbol* get_symbol(Symbol* key);
// Get the ciSymbol corresponding to one of the vmSymbols.
@@ -145,4 +146,4 @@ public:
void print();
};
-#endif // SHARE_VM_CI_CIOBJECTFACTORY_HPP
+#endif // SHARE_CI_CIOBJECTFACTORY_HPP
diff --git a/src/hotspot/share/ci/ciReplay.hpp b/src/hotspot/share/ci/ciReplay.hpp
index 90c503a64d8..c224ba556d7 100644
--- a/src/hotspot/share/ci/ciReplay.hpp
+++ b/src/hotspot/share/ci/ciReplay.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
*
*/
-#ifndef SHARE_VM_CI_CIREPLAY_HPP
-#define SHARE_VM_CI_CIREPLAY_HPP
+#ifndef SHARE_CI_CIREPLAY_HPP
+#define SHARE_CI_CIREPLAY_HPP
#include "ci/ciMethod.hpp"
@@ -125,4 +125,4 @@ class ciReplay {
#endif
};
-#endif // SHARE_VM_CI_CIREPLAY_HPP
+#endif // SHARE_CI_CIREPLAY_HPP
diff --git a/src/hotspot/share/ci/ciSignature.hpp b/src/hotspot/share/ci/ciSignature.hpp
index 5df41e6772c..79341bab7d2 100644
--- a/src/hotspot/share/ci/ciSignature.hpp
+++ b/src/hotspot/share/ci/ciSignature.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1999, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1999, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
*
*/
-#ifndef SHARE_VM_CI_CISIGNATURE_HPP
-#define SHARE_VM_CI_CISIGNATURE_HPP
+#ifndef SHARE_CI_CISIGNATURE_HPP
+#define SHARE_CI_CISIGNATURE_HPP
#include "ci/ciClassList.hpp"
#include "ci/ciSymbol.hpp"
@@ -72,4 +72,4 @@ public:
void print();
};
-#endif // SHARE_VM_CI_CISIGNATURE_HPP
+#endif // SHARE_CI_CISIGNATURE_HPP
diff --git a/src/hotspot/share/ci/ciStreams.hpp b/src/hotspot/share/ci/ciStreams.hpp
index 07e573b5963..facbd9256c2 100644
--- a/src/hotspot/share/ci/ciStreams.hpp
+++ b/src/hotspot/share/ci/ciStreams.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1999, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1999, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
*
*/
-#ifndef SHARE_VM_CI_CISTREAMS_HPP
-#define SHARE_VM_CI_CISTREAMS_HPP
+#ifndef SHARE_CI_CISTREAMS_HPP
+#define SHARE_CI_CISTREAMS_HPP
#include "ci/ciClassList.hpp"
#include "ci/ciExceptionHandler.hpp"
@@ -438,4 +438,4 @@ Bytecode::Bytecode(const ciBytecodeStream* stream, address bcp): _bcp(bcp != NUL
Bytecode_lookupswitch::Bytecode_lookupswitch(const ciBytecodeStream* stream): Bytecode(stream) { verify(); }
Bytecode_tableswitch::Bytecode_tableswitch(const ciBytecodeStream* stream): Bytecode(stream) { verify(); }
-#endif // SHARE_VM_CI_CISTREAMS_HPP
+#endif // SHARE_CI_CISTREAMS_HPP
diff --git a/src/hotspot/share/ci/ciSymbol.hpp b/src/hotspot/share/ci/ciSymbol.hpp
index 150627e5c2f..fb05a6239f4 100644
--- a/src/hotspot/share/ci/ciSymbol.hpp
+++ b/src/hotspot/share/ci/ciSymbol.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1999, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1999, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
*
*/
-#ifndef SHARE_VM_CI_CISYMBOL_HPP
-#define SHARE_VM_CI_CISYMBOL_HPP
+#ifndef SHARE_CI_CISYMBOL_HPP
+#define SHARE_CI_CISYMBOL_HPP
#include "ci/ciBaseObject.hpp"
#include "ci/ciObject.hpp"
@@ -114,4 +114,4 @@ public:
bool is_signature_polymorphic_name() const;
};
-#endif // SHARE_VM_CI_CISYMBOL_HPP
+#endif // SHARE_CI_CISYMBOL_HPP
diff --git a/src/hotspot/share/ci/ciType.hpp b/src/hotspot/share/ci/ciType.hpp
index ad8718da664..b687b6945fb 100644
--- a/src/hotspot/share/ci/ciType.hpp
+++ b/src/hotspot/share/ci/ciType.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2000, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
*
*/
-#ifndef SHARE_VM_CI_CITYPE_HPP
-#define SHARE_VM_CI_CITYPE_HPP
+#ifndef SHARE_CI_CITYPE_HPP
+#define SHARE_CI_CITYPE_HPP
#include "ci/ciMetadata.hpp"
@@ -112,4 +112,4 @@ public:
static ciReturnAddress* make(int bci);
};
-#endif // SHARE_VM_CI_CITYPE_HPP
+#endif // SHARE_CI_CITYPE_HPP
diff --git a/src/hotspot/share/ci/ciTypeArray.hpp b/src/hotspot/share/ci/ciTypeArray.hpp
index ca4c99995b4..deda926f9fe 100644
--- a/src/hotspot/share/ci/ciTypeArray.hpp
+++ b/src/hotspot/share/ci/ciTypeArray.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1999, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1999, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
*
*/
-#ifndef SHARE_VM_CI_CITYPEARRAY_HPP
-#define SHARE_VM_CI_CITYPEARRAY_HPP
+#ifndef SHARE_CI_CITYPEARRAY_HPP
+#define SHARE_CI_CITYPEARRAY_HPP
#include "ci/ciArray.hpp"
#include "ci/ciClassList.hpp"
@@ -61,4 +61,4 @@ public:
};
-#endif // SHARE_VM_CI_CITYPEARRAY_HPP
+#endif // SHARE_CI_CITYPEARRAY_HPP
diff --git a/src/hotspot/share/ci/ciTypeArrayKlass.hpp b/src/hotspot/share/ci/ciTypeArrayKlass.hpp
index fe06621068a..294e307f886 100644
--- a/src/hotspot/share/ci/ciTypeArrayKlass.hpp
+++ b/src/hotspot/share/ci/ciTypeArrayKlass.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1999, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1999, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
*
*/
-#ifndef SHARE_VM_CI_CITYPEARRAYKLASS_HPP
-#define SHARE_VM_CI_CITYPEARRAYKLASS_HPP
+#ifndef SHARE_CI_CITYPEARRAYKLASS_HPP
+#define SHARE_CI_CITYPEARRAYKLASS_HPP
#include "ci/ciArrayKlass.hpp"
@@ -63,4 +63,4 @@ public:
}
};
-#endif // SHARE_VM_CI_CITYPEARRAYKLASS_HPP
+#endif // SHARE_CI_CITYPEARRAYKLASS_HPP
diff --git a/src/hotspot/share/ci/ciTypeFlow.hpp b/src/hotspot/share/ci/ciTypeFlow.hpp
index b184d2c418e..533d02b68e1 100644
--- a/src/hotspot/share/ci/ciTypeFlow.hpp
+++ b/src/hotspot/share/ci/ciTypeFlow.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2000, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
*
*/
-#ifndef SHARE_VM_CI_CITYPEFLOW_HPP
-#define SHARE_VM_CI_CITYPEFLOW_HPP
+#ifndef SHARE_CI_CITYPEFLOW_HPP
+#define SHARE_CI_CITYPEFLOW_HPP
#ifdef COMPILER2
#include "ci/ciEnv.hpp"
@@ -950,4 +950,4 @@ public:
void rpo_print_on(outputStream* st) const PRODUCT_RETURN;
};
-#endif // SHARE_VM_CI_CITYPEFLOW_HPP
+#endif // SHARE_CI_CITYPEFLOW_HPP
diff --git a/src/hotspot/share/ci/ciUtilities.hpp b/src/hotspot/share/ci/ciUtilities.hpp
index 43cd91e7474..0710d812b4b 100644
--- a/src/hotspot/share/ci/ciUtilities.hpp
+++ b/src/hotspot/share/ci/ciUtilities.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1999, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1999, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
*
*/
-#ifndef SHARE_VM_CI_CIUTILITIES_HPP
-#define SHARE_VM_CI_CIUTILITIES_HPP
+#ifndef SHARE_CI_CIUTILITIES_HPP
+#define SHARE_CI_CIUTILITIES_HPP
#include "ci/ciEnv.hpp"
#include "utilities/globalDefinitions.hpp"
@@ -56,4 +56,4 @@ template T ci_card_table_address_as() {
return reinterpret_cast(ci_card_table_address());
}
-#endif // SHARE_VM_CI_CIUTILITIES_HPP
+#endif // SHARE_CI_CIUTILITIES_HPP
diff --git a/src/hotspot/share/ci/ciUtilities.inline.hpp b/src/hotspot/share/ci/ciUtilities.inline.hpp
index 25d8b616896..5c6293145a4 100644
--- a/src/hotspot/share/ci/ciUtilities.inline.hpp
+++ b/src/hotspot/share/ci/ciUtilities.inline.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
*
*/
-#ifndef SHARE_VM_CI_CIUTILITIES_INLINE_HPP
-#define SHARE_VM_CI_CIUTILITIES_INLINE_HPP
+#ifndef SHARE_CI_CIUTILITIES_INLINE_HPP
+#define SHARE_CI_CIUTILITIES_INLINE_HPP
#include "ci/ciUtilities.hpp"
#include "runtime/interfaceSupport.inline.hpp"
@@ -89,5 +89,4 @@
} \
(void)(0
-#endif // SHARE_VM_CI_CIUTILITIES_INLINE_HPP
-
+#endif // SHARE_CI_CIUTILITIES_INLINE_HPP
diff --git a/src/hotspot/share/ci/compilerInterface.hpp b/src/hotspot/share/ci/compilerInterface.hpp
index cb667e7a97a..c332f7ed618 100644
--- a/src/hotspot/share/ci/compilerInterface.hpp
+++ b/src/hotspot/share/ci/compilerInterface.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1999, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1999, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
*
*/
-#ifndef SHARE_VM_CI_COMPILERINTERFACE_HPP
-#define SHARE_VM_CI_COMPILERINTERFACE_HPP
+#ifndef SHARE_CI_COMPILERINTERFACE_HPP
+#define SHARE_CI_COMPILERINTERFACE_HPP
#include "ci/ciArray.hpp"
#include "ci/ciArrayKlass.hpp"
@@ -50,4 +50,4 @@
// This is a dummy file used for including the complete
// compiler interface.
-#endif // SHARE_VM_CI_COMPILERINTERFACE_HPP
+#endif // SHARE_CI_COMPILERINTERFACE_HPP
diff --git a/src/hotspot/share/classfile/altHashing.hpp b/src/hotspot/share/classfile/altHashing.hpp
index 3bcfef3888a..8af990d26ee 100644
--- a/src/hotspot/share/classfile/altHashing.hpp
+++ b/src/hotspot/share/classfile/altHashing.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
*
*/
-#ifndef SHARE_VM_CLASSFILE_ALTHASHING_HPP
-#define SHARE_VM_CLASSFILE_ALTHASHING_HPP
+#ifndef SHARE_CLASSFILE_ALTHASHING_HPP
+#define SHARE_CLASSFILE_ALTHASHING_HPP
#include "jni.h"
#include "classfile/symbolTable.hpp"
@@ -51,4 +51,4 @@ class AltHashing : AllStatic {
static juint murmur3_32(juint seed, const jbyte* data, int len);
static juint murmur3_32(juint seed, const jchar* data, int len);
};
-#endif // SHARE_VM_CLASSFILE_ALTHASHING_HPP
+#endif // SHARE_CLASSFILE_ALTHASHING_HPP
diff --git a/src/hotspot/share/classfile/bytecodeAssembler.hpp b/src/hotspot/share/classfile/bytecodeAssembler.hpp
index 43b87ccdc99..7bb80df05c4 100644
--- a/src/hotspot/share/classfile/bytecodeAssembler.hpp
+++ b/src/hotspot/share/classfile/bytecodeAssembler.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
*
*/
-#ifndef SHARE_VM_CLASSFILE_BYTECODEASSEMBLER_HPP
-#define SHARE_VM_CLASSFILE_BYTECODEASSEMBLER_HPP
+#ifndef SHARE_CLASSFILE_BYTECODEASSEMBLER_HPP
+#define SHARE_CLASSFILE_BYTECODEASSEMBLER_HPP
#include "memory/allocation.hpp"
#include "oops/method.hpp"
@@ -211,4 +211,4 @@ class BytecodeAssembler : StackObj {
void _return(BasicType bt);
};
-#endif // SHARE_VM_CLASSFILE_BYTECODEASSEMBLER_HPP
+#endif // SHARE_CLASSFILE_BYTECODEASSEMBLER_HPP
diff --git a/src/hotspot/share/classfile/classFileParser.cpp b/src/hotspot/share/classfile/classFileParser.cpp
index 18a3f4877df..70c4f00cc83 100644
--- a/src/hotspot/share/classfile/classFileParser.cpp
+++ b/src/hotspot/share/classfile/classFileParser.cpp
@@ -2120,12 +2120,7 @@ AnnotationCollector::annotation_index(const ClassLoaderData* loader_data,
if (!privileged) break; // only allow in privileged code
return _method_LambdaForm_Compiled;
}
- case vmSymbols::VM_SYMBOL_ENUM_NAME(java_lang_invoke_LambdaForm_Hidden_signature): {
- if (_location != _in_method) break; // only allow for methods
- if (!privileged) break; // only allow in privileged code
- return _method_Hidden;
- }
- case vmSymbols::VM_SYMBOL_ENUM_NAME(java_security_AccessController_Hidden_signature): {
+ case vmSymbols::VM_SYMBOL_ENUM_NAME(jdk_internal_vm_annotation_Hidden_signature): {
if (_location != _in_method) break; // only allow for methods
if (!privileged) break; // only allow in privileged code
return _method_Hidden;
@@ -4486,33 +4481,6 @@ void ClassFileParser::set_precomputed_flags(InstanceKlass* ik) {
}
}
-// Attach super classes and interface classes to class loader data
-static void record_defined_class_dependencies(const InstanceKlass* defined_klass,
- TRAPS) {
- assert(defined_klass != NULL, "invariant");
-
- ClassLoaderData* const defining_loader_data = defined_klass->class_loader_data();
- if (defining_loader_data->is_the_null_class_loader_data()) {
- // Dependencies to null class loader data are implicit.
- return;
- } else {
- // add super class dependency
- Klass* const super = defined_klass->super();
- if (super != NULL) {
- defining_loader_data->record_dependency(super);
- }
-
- // add super interface dependencies
- const Array* const local_interfaces = defined_klass->local_interfaces();
- if (local_interfaces != NULL) {
- const int length = local_interfaces->length();
- for (int i = 0; i < length; i++) {
- defining_loader_data->record_dependency(local_interfaces->at(i));
- }
- }
- }
-}
-
// utility methods for appending an array with check for duplicates
static void append_interfaces(GrowableArray* result,
@@ -5719,9 +5687,6 @@ void ClassFileParser::fill_instance_klass(InstanceKlass* ik, bool changed_by_loa
}
}
- // Update the loader_data graph.
- record_defined_class_dependencies(ik, CHECK);
-
ClassLoadingService::notify_class_loaded(ik, false /* not shared class */);
if (!is_internal()) {
diff --git a/src/hotspot/share/classfile/classFileParser.hpp b/src/hotspot/share/classfile/classFileParser.hpp
index 74baeca1a56..aba8208c57f 100644
--- a/src/hotspot/share/classfile/classFileParser.hpp
+++ b/src/hotspot/share/classfile/classFileParser.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
*
*/
-#ifndef SHARE_VM_CLASSFILE_CLASSFILEPARSER_HPP
-#define SHARE_VM_CLASSFILE_CLASSFILEPARSER_HPP
+#ifndef SHARE_CLASSFILE_CLASSFILEPARSER_HPP
+#define SHARE_CLASSFILE_CLASSFILEPARSER_HPP
#include "memory/referenceType.hpp"
#include "oops/annotations.hpp"
@@ -546,4 +546,4 @@ class ClassFileParser {
};
-#endif // SHARE_VM_CLASSFILE_CLASSFILEPARSER_HPP
+#endif // SHARE_CLASSFILE_CLASSFILEPARSER_HPP
diff --git a/src/hotspot/share/classfile/classFileStream.hpp b/src/hotspot/share/classfile/classFileStream.hpp
index 58358bbb598..7b1b108af9c 100644
--- a/src/hotspot/share/classfile/classFileStream.hpp
+++ b/src/hotspot/share/classfile/classFileStream.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
*
*/
-#ifndef SHARE_VM_CLASSFILE_CLASSFILESTREAM_HPP
-#define SHARE_VM_CLASSFILE_CLASSFILESTREAM_HPP
+#ifndef SHARE_CLASSFILE_CLASSFILESTREAM_HPP
+#define SHARE_CLASSFILE_CLASSFILESTREAM_HPP
#include "memory/allocation.hpp"
#include "utilities/bytes.hpp"
@@ -143,4 +143,4 @@ class ClassFileStream: public ResourceObj {
uint64_t compute_fingerprint() const;
};
-#endif // SHARE_VM_CLASSFILE_CLASSFILESTREAM_HPP
+#endif // SHARE_CLASSFILE_CLASSFILESTREAM_HPP
diff --git a/src/hotspot/share/classfile/classListParser.cpp b/src/hotspot/share/classfile/classListParser.cpp
index 65d26a8a151..8318efe1712 100644
--- a/src/hotspot/share/classfile/classListParser.cpp
+++ b/src/hotspot/share/classfile/classListParser.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2015, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -47,7 +47,15 @@ ClassListParser::ClassListParser(const char* file) {
assert(_instance == NULL, "must be singleton");
_instance = this;
_classlist_file = file;
- _file = fopen(file, "r");
+ _file = NULL;
+ // Use os::open() because neither fopen() nor os::fopen()
+ // can handle long path name on Windows.
+ int fd = os::open(file, O_RDONLY, S_IREAD);
+ if (fd != -1) {
+ // Obtain a File* from the file descriptor so that fgets()
+ // can be used in parse_one_line()
+ _file = os::open(fd, "r");
+ }
if (_file == NULL) {
char errmsg[JVM_MAXPATHLEN];
os::lasterror(errmsg, JVM_MAXPATHLEN);
diff --git a/src/hotspot/share/classfile/classListParser.hpp b/src/hotspot/share/classfile/classListParser.hpp
index 2d82f00b87d..72cdf5c5961 100644
--- a/src/hotspot/share/classfile/classListParser.hpp
+++ b/src/hotspot/share/classfile/classListParser.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2015, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
*
*/
-#ifndef SHARE_VM_MEMORY_CLASSLISTPARSER_HPP
-#define SHARE_VM_MEMORY_CLASSLISTPARSER_HPP
+#ifndef SHARE_CLASSFILE_CLASSLISTPARSER_HPP
+#define SHARE_CLASSFILE_CLASSLISTPARSER_HPP
#include "utilities/exceptions.hpp"
#include "utilities/globalDefinitions.hpp"
@@ -127,4 +127,4 @@ public:
InstanceKlass* lookup_super_for_current_class(Symbol* super_name);
InstanceKlass* lookup_interface_for_current_class(Symbol* interface_name);
};
-#endif
+#endif // SHARE_CLASSFILE_CLASSLISTPARSER_HPP
diff --git a/src/hotspot/share/classfile/classLoader.cpp b/src/hotspot/share/classfile/classLoader.cpp
index 7406cb2a99d..e9a8fdbe7de 100644
--- a/src/hotspot/share/classfile/classLoader.cpp
+++ b/src/hotspot/share/classfile/classLoader.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -1724,7 +1724,7 @@ void ClassLoader::create_javabase() {
{
MutexLocker ml(Module_lock, THREAD);
- ModuleEntry* jb_module = null_cld_modules->locked_create_entry_or_null(Handle(),
+ ModuleEntry* jb_module = null_cld_modules->locked_create_entry(Handle(),
false, vmSymbols::java_base(), NULL, NULL, null_cld);
if (jb_module == NULL) {
vm_exit_during_initialization("Unable to create ModuleEntry for " JAVA_BASE_NAME);
diff --git a/src/hotspot/share/classfile/classLoader.hpp b/src/hotspot/share/classfile/classLoader.hpp
index a753ec83542..4e556baeff6 100644
--- a/src/hotspot/share/classfile/classLoader.hpp
+++ b/src/hotspot/share/classfile/classLoader.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
*
*/
-#ifndef SHARE_VM_CLASSFILE_CLASSLOADER_HPP
-#define SHARE_VM_CLASSFILE_CLASSLOADER_HPP
+#ifndef SHARE_CLASSFILE_CLASSLOADER_HPP
+#define SHARE_CLASSFILE_CLASSLOADER_HPP
#include "jimage.hpp"
#include "runtime/handles.hpp"
@@ -506,4 +506,4 @@ class PerfClassTraceTime {
void initialize();
};
-#endif // SHARE_VM_CLASSFILE_CLASSLOADER_HPP
+#endif // SHARE_CLASSFILE_CLASSLOADER_HPP
diff --git a/src/hotspot/share/classfile/classLoader.inline.hpp b/src/hotspot/share/classfile/classLoader.inline.hpp
index 731dc0cb1e8..643c9d2f146 100644
--- a/src/hotspot/share/classfile/classLoader.inline.hpp
+++ b/src/hotspot/share/classfile/classLoader.inline.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
*
*/
-#ifndef SHARE_VM_CLASSFILE_CLASSLOADER_INLINE_HPP
-#define SHARE_VM_CLASSFILE_CLASSLOADER_INLINE_HPP
+#ifndef SHARE_CLASSFILE_CLASSLOADER_INLINE_HPP
+#define SHARE_CLASSFILE_CLASSLOADER_INLINE_HPP
#include "classfile/classLoader.hpp"
#include "runtime/orderAccess.hpp"
@@ -96,4 +96,4 @@ inline int ClassLoader::num_app_classpath_entries() {
#endif // INCLUDE_CDS
-#endif // SHARE_VM_CLASSFILE_CLASSLOADER_INLINE_HPP
+#endif // SHARE_CLASSFILE_CLASSLOADER_INLINE_HPP
diff --git a/src/hotspot/share/classfile/classLoaderData.hpp b/src/hotspot/share/classfile/classLoaderData.hpp
index 71234280472..b3ad83480a0 100644
--- a/src/hotspot/share/classfile/classLoaderData.hpp
+++ b/src/hotspot/share/classfile/classLoaderData.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
*
*/
-#ifndef SHARE_VM_CLASSFILE_CLASSLOADERDATA_HPP
-#define SHARE_VM_CLASSFILE_CLASSLOADERDATA_HPP
+#ifndef SHARE_CLASSFILE_CLASSLOADERDATA_HPP
+#define SHARE_CLASSFILE_CLASSLOADERDATA_HPP
#include "memory/allocation.hpp"
#include "memory/memRegion.hpp"
@@ -327,4 +327,4 @@ class ClassLoaderData : public CHeapObj {
JFR_ONLY(DEFINE_TRACE_ID_METHODS;)
};
-#endif // SHARE_VM_CLASSFILE_CLASSLOADERDATA_HPP
+#endif // SHARE_CLASSFILE_CLASSLOADERDATA_HPP
diff --git a/src/hotspot/share/classfile/classLoaderData.inline.hpp b/src/hotspot/share/classfile/classLoaderData.inline.hpp
index eb37fcb76a2..794fe8ae1c5 100644
--- a/src/hotspot/share/classfile/classLoaderData.inline.hpp
+++ b/src/hotspot/share/classfile/classLoaderData.inline.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2011, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
*
*/
-#ifndef SHARE_VM_CLASSFILE_CLASSLOADERDATA_INLINE_HPP
-#define SHARE_VM_CLASSFILE_CLASSLOADERDATA_INLINE_HPP
+#ifndef SHARE_CLASSFILE_CLASSLOADERDATA_INLINE_HPP
+#define SHARE_CLASSFILE_CLASSLOADERDATA_INLINE_HPP
#include "classfile/classLoaderData.hpp"
#include "classfile/javaClasses.hpp"
@@ -55,4 +55,4 @@ inline ClassLoaderData* ClassLoaderData::class_loader_data(oop loader) {
return loader_data;
}
-#endif // SHARE_VM_CLASSFILE_CLASSLOADERDATA_INLINE_HPP
+#endif // SHARE_CLASSFILE_CLASSLOADERDATA_INLINE_HPP
diff --git a/src/hotspot/share/classfile/classLoaderDataGraph.cpp b/src/hotspot/share/classfile/classLoaderDataGraph.cpp
index 249809ebe35..02b8620d838 100644
--- a/src/hotspot/share/classfile/classLoaderDataGraph.cpp
+++ b/src/hotspot/share/classfile/classLoaderDataGraph.cpp
@@ -561,11 +561,6 @@ void ClassLoaderDataGraph::clean_module_and_package_info() {
ClassLoaderData* data = _head;
while (data != NULL) {
- // Remove entries in the dictionary of live class loader that have
- // initiated loading classes in a dead class loader.
- if (data->dictionary() != NULL) {
- data->dictionary()->do_unloading();
- }
// Walk a ModuleEntry's reads, and a PackageEntry's exports
// lists to determine if there are modules on those lists that are now
// dead and should be removed. A module's life cycle is equivalent
diff --git a/src/hotspot/share/classfile/classLoaderDataGraph.hpp b/src/hotspot/share/classfile/classLoaderDataGraph.hpp
index efc9a2d1dc7..942bb83b5d4 100644
--- a/src/hotspot/share/classfile/classLoaderDataGraph.hpp
+++ b/src/hotspot/share/classfile/classLoaderDataGraph.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
*
*/
-#ifndef SHARE_VM_CLASSFILE_CLASSLOADERDATAGRAPH_HPP
-#define SHARE_VM_CLASSFILE_CLASSLOADERDATAGRAPH_HPP
+#ifndef SHARE_CLASSFILE_CLASSLOADERDATAGRAPH_HPP
+#define SHARE_CLASSFILE_CLASSLOADERDATAGRAPH_HPP
#include "classfile/classLoaderData.hpp"
#include "memory/allocation.hpp"
@@ -185,4 +185,4 @@ class ClassLoaderDataGraphMetaspaceIterator : public StackObj {
bool repeat() { return _data != NULL; }
ClassLoaderMetaspace* get_next();
};
-#endif // SHARE_VM_CLASSFILE_CLASSLOADERDATAGRAPH_HPP
+#endif // SHARE_CLASSFILE_CLASSLOADERDATAGRAPH_HPP
diff --git a/src/hotspot/share/classfile/classLoaderDataGraph.inline.hpp b/src/hotspot/share/classfile/classLoaderDataGraph.inline.hpp
index 1e631d9d1f1..7e79caaf1e6 100644
--- a/src/hotspot/share/classfile/classLoaderDataGraph.inline.hpp
+++ b/src/hotspot/share/classfile/classLoaderDataGraph.inline.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
*
*/
-#ifndef SHARE_VM_CLASSFILE_CLASSLOADERDATAGRAPH_INLINE_HPP
-#define SHARE_VM_CLASSFILE_CLASSLOADERDATAGRAPH_INLINE_HPP
+#ifndef SHARE_CLASSFILE_CLASSLOADERDATAGRAPH_INLINE_HPP
+#define SHARE_CLASSFILE_CLASSLOADERDATAGRAPH_INLINE_HPP
#include "classfile/classLoaderDataGraph.hpp"
#include "classfile/javaClasses.hpp"
@@ -79,4 +79,4 @@ bool ClassLoaderDataGraph::should_clean_metaspaces_and_reset() {
return do_cleaning;
}
-#endif // SHARE_VM_CLASSFILE_CLASSLOADERDATAGRAPH_INLINE_HPP
+#endif // SHARE_CLASSFILE_CLASSLOADERDATAGRAPH_INLINE_HPP
diff --git a/src/hotspot/share/classfile/classLoaderExt.hpp b/src/hotspot/share/classfile/classLoaderExt.hpp
index 6f2bd29d1d0..a9adf71ae09 100644
--- a/src/hotspot/share/classfile/classLoaderExt.hpp
+++ b/src/hotspot/share/classfile/classLoaderExt.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2014, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
*
*/
-#ifndef SHARE_VM_CLASSFILE_CLASSLOADEREXT_HPP
-#define SHARE_VM_CLASSFILE_CLASSLOADEREXT_HPP
+#ifndef SHARE_CLASSFILE_CLASSLOADEREXT_HPP
+#define SHARE_CLASSFILE_CLASSLOADEREXT_HPP
#include "classfile/classLoader.hpp"
#include "classfile/moduleEntry.hpp"
@@ -124,4 +124,4 @@ public:
#endif
};
-#endif // SHARE_VM_CLASSFILE_CLASSLOADEREXT_HPP
+#endif // SHARE_CLASSFILE_CLASSLOADEREXT_HPP
diff --git a/src/hotspot/share/classfile/classLoaderHierarchyDCmd.hpp b/src/hotspot/share/classfile/classLoaderHierarchyDCmd.hpp
index 595586b70d9..10b486b6a17 100644
--- a/src/hotspot/share/classfile/classLoaderHierarchyDCmd.hpp
+++ b/src/hotspot/share/classfile/classLoaderHierarchyDCmd.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2019, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2018 SAP SE. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
@@ -23,8 +23,8 @@
*
*/
-#ifndef HOTSPOT_SHARE_CLASSFILE_CLASSLOADERHIERARCHYDCMD_HPP_
-#define HOTSPOT_SHARE_CLASSFILE_CLASSLOADERHIERARCHYDCMD_HPP_
+#ifndef SHARE_CLASSFILE_CLASSLOADERHIERARCHYDCMD_HPP
+#define SHARE_CLASSFILE_CLASSLOADERHIERARCHYDCMD_HPP
#include "services/diagnosticCommand.hpp"
@@ -56,4 +56,4 @@ public:
};
-#endif /* HOTSPOT_SHARE_CLASSFILE_CLASSLOADERHIERARCHYDCMD_HPP_ */
+#endif // SHARE_CLASSFILE_CLASSLOADERHIERARCHYDCMD_HPP
diff --git a/src/hotspot/share/classfile/classLoaderStats.hpp b/src/hotspot/share/classfile/classLoaderStats.hpp
index c625ef2ef73..cb43be14e6c 100644
--- a/src/hotspot/share/classfile/classLoaderStats.hpp
+++ b/src/hotspot/share/classfile/classLoaderStats.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2014, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
*
*/
-#ifndef SHARE_VM_CLASSFILE_CLASSLOADERSTATS_HPP
-#define SHARE_VM_CLASSFILE_CLASSLOADERSTATS_HPP
+#ifndef SHARE_CLASSFILE_CLASSLOADERSTATS_HPP
+#define SHARE_CLASSFILE_CLASSLOADERSTATS_HPP
#include "classfile/classLoaderData.hpp"
@@ -150,4 +150,4 @@ public:
void doit();
};
-#endif // SHARE_VM_CLASSFILE_CLASSLOADERSTATS_HPP
+#endif // SHARE_CLASSFILE_CLASSLOADERSTATS_HPP
diff --git a/src/hotspot/share/classfile/compactHashtable.hpp b/src/hotspot/share/classfile/compactHashtable.hpp
index bd9d3fdbe05..587a34ad017 100644
--- a/src/hotspot/share/classfile/compactHashtable.hpp
+++ b/src/hotspot/share/classfile/compactHashtable.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
*
*/
-#ifndef SHARE_VM_CLASSFILE_COMPACTHASHTABLE_HPP
-#define SHARE_VM_CLASSFILE_COMPACTHASHTABLE_HPP
+#ifndef SHARE_CLASSFILE_COMPACTHASHTABLE_HPP
+#define SHARE_CLASSFILE_COMPACTHASHTABLE_HPP
#include "oops/array.hpp"
#include "oops/symbol.hpp"
@@ -428,4 +428,4 @@ public:
static void put_utf8(outputStream* st, const char* utf8_string, int utf8_length);
};
-#endif // SHARE_VM_CLASSFILE_COMPACTHASHTABLE_HPP
+#endif // SHARE_CLASSFILE_COMPACTHASHTABLE_HPP
diff --git a/src/hotspot/share/classfile/defaultMethods.cpp b/src/hotspot/share/classfile/defaultMethods.cpp
index 66ae4ccdd18..c814c2bd12c 100644
--- a/src/hotspot/share/classfile/defaultMethods.cpp
+++ b/src/hotspot/share/classfile/defaultMethods.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -988,7 +988,7 @@ static void create_default_methods( InstanceKlass* klass,
for (int index = 0; index < new_size; index++ ) {
total_default_methods->at_put(index, new_methods->at(index));
}
- Method::sort_methods(total_default_methods, false, false);
+ Method::sort_methods(total_default_methods, /*set_idnums=*/false);
klass->set_default_methods(total_default_methods);
}
diff --git a/src/hotspot/share/classfile/defaultMethods.hpp b/src/hotspot/share/classfile/defaultMethods.hpp
index 0e034a29b40..2176488726d 100644
--- a/src/hotspot/share/classfile/defaultMethods.hpp
+++ b/src/hotspot/share/classfile/defaultMethods.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
*
*/
-#ifndef SHARE_VM_CLASSFILE_DEFAULTMETHODS_HPP
-#define SHARE_VM_CLASSFILE_DEFAULTMETHODS_HPP
+#ifndef SHARE_CLASSFILE_DEFAULTMETHODS_HPP
+#define SHARE_CLASSFILE_DEFAULTMETHODS_HPP
#include "runtime/handles.hpp"
#include "utilities/growableArray.hpp"
@@ -45,4 +45,4 @@ class DefaultMethods : AllStatic {
static void generate_default_methods(
InstanceKlass* klass, const GrowableArray* mirandas, TRAPS);
};
-#endif // SHARE_VM_CLASSFILE_DEFAULTMETHODS_HPP
+#endif // SHARE_CLASSFILE_DEFAULTMETHODS_HPP
diff --git a/src/hotspot/share/classfile/dictionary.cpp b/src/hotspot/share/classfile/dictionary.cpp
index 612591fa551..61073764fa4 100644
--- a/src/hotspot/share/classfile/dictionary.cpp
+++ b/src/hotspot/share/classfile/dictionary.cpp
@@ -233,40 +233,6 @@ void Dictionary::clean_cached_protection_domains(DictionaryEntry* probe) {
}
}
-
-void Dictionary::do_unloading() {
- assert_locked_or_safepoint(SystemDictionary_lock);
-
- // The NULL class loader doesn't initiate loading classes from other class loaders
- if (loader_data() == ClassLoaderData::the_null_class_loader_data()) {
- return;
- }
-
- // Remove unloaded entries and classes from this dictionary
- DictionaryEntry* probe = NULL;
- for (int index = 0; index < table_size(); index++) {
- for (DictionaryEntry** p = bucket_addr(index); *p != NULL; ) {
- probe = *p;
- InstanceKlass* ik = probe->instance_klass();
- ClassLoaderData* k_def_class_loader_data = ik->class_loader_data();
-
- // If the klass that this loader initiated is dead,
- // (determined by checking the defining class loader)
- // remove this entry.
- if (k_def_class_loader_data->is_unloading()) {
- assert(k_def_class_loader_data != loader_data(),
- "cannot have live defining loader and unreachable klass");
- *p = probe->next();
- free_entry(probe);
- continue;
- }
- // Clean pd_set
- clean_cached_protection_domains(probe);
- p = probe->next_addr();
- }
- }
-}
-
// Just the classes from defining class loaders
void Dictionary::classes_do(void f(InstanceKlass*)) {
for (int index = 0; index < table_size(); index++) {
diff --git a/src/hotspot/share/classfile/dictionary.hpp b/src/hotspot/share/classfile/dictionary.hpp
index 087b5e6c62f..c00e871205f 100644
--- a/src/hotspot/share/classfile/dictionary.hpp
+++ b/src/hotspot/share/classfile/dictionary.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2003, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
*
*/
-#ifndef SHARE_VM_CLASSFILE_DICTIONARY_HPP
-#define SHARE_VM_CLASSFILE_DICTIONARY_HPP
+#ifndef SHARE_CLASSFILE_DICTIONARY_HPP
+#define SHARE_CLASSFILE_DICTIONARY_HPP
#include "classfile/protectionDomainCache.hpp"
#include "classfile/systemDictionary.hpp"
@@ -74,9 +74,6 @@ public:
void unlink();
- // Unload classes whose defining loaders are unloaded
- void do_unloading();
-
// Protection domains
InstanceKlass* find(unsigned int hash, Symbol* name, Handle protection_domain);
bool is_valid_protection_domain(unsigned int hash,
@@ -307,4 +304,4 @@ public:
return (SymbolPropertyEntry*) Hashtable::bucket(i);
}
};
-#endif // SHARE_VM_CLASSFILE_DICTIONARY_HPP
+#endif // SHARE_CLASSFILE_DICTIONARY_HPP
diff --git a/src/hotspot/share/classfile/dictionary.inline.hpp b/src/hotspot/share/classfile/dictionary.inline.hpp
index 4e1c73bbb5b..fa04e0a2f51 100644
--- a/src/hotspot/share/classfile/dictionary.inline.hpp
+++ b/src/hotspot/share/classfile/dictionary.inline.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
*
*/
-#ifndef SHARE_VM_CLASSFILE_DICTIONARY_INLINE_HPP
-#define SHARE_VM_CLASSFILE_DICTIONARY_INLINE_HPP
+#ifndef SHARE_CLASSFILE_DICTIONARY_INLINE_HPP
+#define SHARE_CLASSFILE_DICTIONARY_INLINE_HPP
#include "classfile/dictionary.hpp"
#include "runtime/orderAccess.hpp"
@@ -36,4 +36,4 @@ inline void DictionaryEntry::release_set_pd_set(ProtectionDomainEntry* new_head)
OrderAccess::release_store(&_pd_set, new_head);
}
-#endif // SHARE_VM_CLASSFILE_DICTIONARY_INLINE_HPP
+#endif // SHARE_CLASSFILE_DICTIONARY_INLINE_HPP
diff --git a/src/hotspot/share/classfile/javaAssertions.hpp b/src/hotspot/share/classfile/javaAssertions.hpp
index 8746b8477d2..b2fa038b24a 100644
--- a/src/hotspot/share/classfile/javaAssertions.hpp
+++ b/src/hotspot/share/classfile/javaAssertions.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2000, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
*
*/
-#ifndef SHARE_VM_CLASSFILE_JAVAASSERTIONS_HPP
-#define SHARE_VM_CLASSFILE_JAVAASSERTIONS_HPP
+#ifndef SHARE_CLASSFILE_JAVAASSERTIONS_HPP
+#define SHARE_CLASSFILE_JAVAASSERTIONS_HPP
#include "oops/objArrayOop.hpp"
#include "oops/typeArrayOop.hpp"
@@ -104,4 +104,4 @@ inline void JavaAssertions::setSystemClassDefault(bool enabled) {
_sysDefault = enabled;
}
-#endif // SHARE_VM_CLASSFILE_JAVAASSERTIONS_HPP
+#endif // SHARE_CLASSFILE_JAVAASSERTIONS_HPP
diff --git a/src/hotspot/share/classfile/javaClasses.cpp b/src/hotspot/share/classfile/javaClasses.cpp
index f50270c5a4e..ee53285e247 100644
--- a/src/hotspot/share/classfile/javaClasses.cpp
+++ b/src/hotspot/share/classfile/javaClasses.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -421,7 +421,7 @@ Handle java_lang_String::char_converter(Handle java_string, jchar from_char, jch
oop obj = java_string();
// Typical usage is to convert all '/' to '.' in string.
typeArrayOop value = java_lang_String::value(obj);
- int length = java_lang_String::length(obj);
+ int length = java_lang_String::length(obj, value);
bool is_latin1 = java_lang_String::is_latin1(obj);
// First check if any from_char exist
@@ -485,7 +485,7 @@ Handle java_lang_String::char_converter(Handle java_string, jchar from_char, jch
jchar* java_lang_String::as_unicode_string(oop java_string, int& length, TRAPS) {
typeArrayOop value = java_lang_String::value(java_string);
- length = java_lang_String::length(java_string);
+ length = java_lang_String::length(java_string, value);
bool is_latin1 = java_lang_String::is_latin1(java_string);
jchar* result = NEW_RESOURCE_ARRAY_RETURN_NULL(jchar, length);
@@ -506,11 +506,11 @@ jchar* java_lang_String::as_unicode_string(oop java_string, int& length, TRAPS)
}
unsigned int java_lang_String::hash_code(oop java_string) {
- int length = java_lang_String::length(java_string);
+ typeArrayOop value = java_lang_String::value(java_string);
+ int length = java_lang_String::length(java_string, value);
// Zero length string will hash to zero with String.hashCode() function.
if (length == 0) return 0;
- typeArrayOop value = java_lang_String::value(java_string);
bool is_latin1 = java_lang_String::is_latin1(java_string);
if (is_latin1) {
@@ -522,7 +522,7 @@ unsigned int java_lang_String::hash_code(oop java_string) {
char* java_lang_String::as_quoted_ascii(oop java_string) {
typeArrayOop value = java_lang_String::value(java_string);
- int length = java_lang_String::length(java_string);
+ int length = java_lang_String::length(java_string, value);
bool is_latin1 = java_lang_String::is_latin1(java_string);
if (length == 0) return NULL;
@@ -547,7 +547,7 @@ char* java_lang_String::as_quoted_ascii(oop java_string) {
Symbol* java_lang_String::as_symbol(oop java_string, TRAPS) {
typeArrayOop value = java_lang_String::value(java_string);
- int length = java_lang_String::length(java_string);
+ int length = java_lang_String::length(java_string, value);
bool is_latin1 = java_lang_String::is_latin1(java_string);
if (!is_latin1) {
jchar* base = (length == 0) ? NULL : value->char_at_addr(0);
@@ -564,7 +564,7 @@ Symbol* java_lang_String::as_symbol(oop java_string, TRAPS) {
Symbol* java_lang_String::as_symbol_or_null(oop java_string) {
typeArrayOop value = java_lang_String::value(java_string);
- int length = java_lang_String::length(java_string);
+ int length = java_lang_String::length(java_string, value);
bool is_latin1 = java_lang_String::is_latin1(java_string);
if (!is_latin1) {
jchar* base = (length == 0) ? NULL : value->char_at_addr(0);
@@ -577,23 +577,28 @@ Symbol* java_lang_String::as_symbol_or_null(oop java_string) {
}
}
-int java_lang_String::utf8_length(oop java_string) {
- typeArrayOop value = java_lang_String::value(java_string);
- int length = java_lang_String::length(java_string);
- bool is_latin1 = java_lang_String::is_latin1(java_string);
+int java_lang_String::utf8_length(oop java_string, typeArrayOop value) {
+ assert(oopDesc::equals(value, java_lang_String::value(java_string)),
+ "value must be same as java_lang_String::value(java_string)");
+ int length = java_lang_String::length(java_string, value);
if (length == 0) {
return 0;
}
- if (!is_latin1) {
+ if (!java_lang_String::is_latin1(java_string)) {
return UNICODE::utf8_length(value->char_at_addr(0), length);
} else {
return UNICODE::utf8_length(value->byte_at_addr(0), length);
}
}
+int java_lang_String::utf8_length(oop java_string) {
+ typeArrayOop value = java_lang_String::value(java_string);
+ return utf8_length(java_string, value);
+}
+
char* java_lang_String::as_utf8_string(oop java_string) {
typeArrayOop value = java_lang_String::value(java_string);
- int length = java_lang_String::length(java_string);
+ int length = java_lang_String::length(java_string, value);
bool is_latin1 = java_lang_String::is_latin1(java_string);
if (!is_latin1) {
jchar* position = (length == 0) ? NULL : value->char_at_addr(0);
@@ -604,24 +609,29 @@ char* java_lang_String::as_utf8_string(oop java_string) {
}
}
+char* java_lang_String::as_utf8_string(oop java_string, typeArrayOop value, char* buf, int buflen) {
+ assert(oopDesc::equals(value, java_lang_String::value(java_string)),
+ "value must be same as java_lang_String::value(java_string)");
+ int length = java_lang_String::length(java_string, value);
+ bool is_latin1 = java_lang_String::is_latin1(java_string);
+ if (!is_latin1) {
+ jchar* position = (length == 0) ? NULL : value->char_at_addr(0);
+ return UNICODE::as_utf8(position, length, buf, buflen);
+ } else {
+ jbyte* position = (length == 0) ? NULL : value->byte_at_addr(0);
+ return UNICODE::as_utf8(position, length, buf, buflen);
+ }
+}
+
char* java_lang_String::as_utf8_string(oop java_string, char* buf, int buflen) {
- typeArrayOop value = java_lang_String::value(java_string);
- int length = java_lang_String::length(java_string);
- bool is_latin1 = java_lang_String::is_latin1(java_string);
- if (!is_latin1) {
- jchar* position = (length == 0) ? NULL : value->char_at_addr(0);
- return UNICODE::as_utf8(position, length, buf, buflen);
- } else {
- jbyte* position = (length == 0) ? NULL : value->byte_at_addr(0);
- return UNICODE::as_utf8(position, length, buf, buflen);
- }
+ typeArrayOop value = java_lang_String::value(java_string);
+ return as_utf8_string(java_string, value, buf, buflen);
}
char* java_lang_String::as_utf8_string(oop java_string, int start, int len) {
typeArrayOop value = java_lang_String::value(java_string);
- int length = java_lang_String::length(java_string);
- assert(start + len <= length, "just checking");
bool is_latin1 = java_lang_String::is_latin1(java_string);
+ assert(start + len <= java_lang_String::length(java_string), "just checking");
if (!is_latin1) {
jchar* position = value->char_at_addr(start);
return UNICODE::as_utf8(position, len);
@@ -631,11 +641,11 @@ char* java_lang_String::as_utf8_string(oop java_string, int start, int len) {
}
}
-char* java_lang_String::as_utf8_string(oop java_string, int start, int len, char* buf, int buflen) {
- typeArrayOop value = java_lang_String::value(java_string);
- int length = java_lang_String::length(java_string);
- assert(start + len <= length, "just checking");
- bool is_latin1 = java_lang_String::is_latin1(java_string);
+char* java_lang_String::as_utf8_string(oop java_string, typeArrayOop value, int start, int len, char* buf, int buflen) {
+ assert(oopDesc::equals(value, java_lang_String::value(java_string)),
+ "value must be same as java_lang_String::value(java_string)");
+ assert(start + len <= java_lang_String::length(java_string), "just checking");
+ bool is_latin1 = java_lang_String::is_latin1(java_string);
if (!is_latin1) {
jchar* position = value->char_at_addr(start);
return UNICODE::as_utf8(position, len, buf, buflen);
@@ -649,7 +659,7 @@ bool java_lang_String::equals(oop java_string, const jchar* chars, int len) {
assert(java_string->klass() == SystemDictionary::String_klass(),
"must be java_string");
typeArrayOop value = java_lang_String::value_no_keepalive(java_string);
- int length = java_lang_String::length(java_string);
+ int length = java_lang_String::length(java_string, value);
if (length != len) {
return false;
}
@@ -676,10 +686,10 @@ bool java_lang_String::equals(oop str1, oop str2) {
assert(str2->klass() == SystemDictionary::String_klass(),
"must be java String");
typeArrayOop value1 = java_lang_String::value_no_keepalive(str1);
- int length1 = java_lang_String::length(str1);
+ int length1 = java_lang_String::length(str1, value1);
bool is_latin1 = java_lang_String::is_latin1(str1);
typeArrayOop value2 = java_lang_String::value_no_keepalive(str2);
- int length2 = java_lang_String::length(str2);
+ int length2 = java_lang_String::length(str2, value2);
bool is_latin2 = java_lang_String::is_latin1(str2);
if ((length1 != length2) || (is_latin1 != is_latin2)) {
@@ -707,7 +717,7 @@ void java_lang_String::print(oop java_string, outputStream* st) {
return;
}
- int length = java_lang_String::length(java_string);
+ int length = java_lang_String::length(java_string, value);
bool is_latin1 = java_lang_String::is_latin1(java_string);
st->print("\"");
@@ -1257,12 +1267,6 @@ int java_lang_Class::oop_size(oop java_class) {
return size;
}
-int java_lang_Class::oop_size_raw(oop java_class) {
- assert(_oop_size_offset != 0, "must be set");
- int size = java_class->int_field_raw(_oop_size_offset);
- assert(size > 0, "Oop size must be greater than zero, not %d", size);
- return size;
-}
void java_lang_Class::set_oop_size(HeapWord* java_class, int size) {
assert(_oop_size_offset != 0, "must be set");
@@ -1344,6 +1348,26 @@ void java_lang_Class::set_module(oop java_class, oop module) {
java_class->obj_field_put(_module_offset, module);
}
+oop java_lang_Class::name(Handle java_class, TRAPS) {
+ assert(_name_offset != 0, "must be set");
+ oop o = java_class->obj_field(_name_offset);
+ if (o == NULL) {
+ o = StringTable::intern(java_lang_Class::as_external_name(java_class()), THREAD);
+ java_class->obj_field_put(_name_offset, o);
+ }
+ return o;
+}
+
+oop java_lang_Class::source_file(oop java_class) {
+ assert(_source_file_offset != 0, "must be set");
+ return java_class->obj_field(_source_file_offset);
+}
+
+void java_lang_Class::set_source_file(oop java_class, oop source_file) {
+ assert(_source_file_offset != 0, "must be set");
+ java_class->obj_field_put(_source_file_offset, source_file);
+}
+
oop java_lang_Class::create_basic_type_mirror(const char* basic_type_name, BasicType type, TRAPS) {
// This should be improved by adding a field at the Java level or by
// introducing a new VM klass (see comment in ClassFileParser)
@@ -1504,7 +1528,8 @@ int java_lang_Class::classRedefinedCount_offset = -1;
macro(classRedefinedCount_offset, k, "classRedefinedCount", int_signature, false) ; \
macro(_class_loader_offset, k, "classLoader", classloader_signature, false); \
macro(_component_mirror_offset, k, "componentType", class_signature, false); \
- macro(_module_offset, k, "module", module_signature, false)
+ macro(_module_offset, k, "module", module_signature, false); \
+ macro(_name_offset, k, "name", string_signature, false); \
void java_lang_Class::compute_offsets() {
if (offsets_computed) {
@@ -2550,12 +2575,14 @@ void java_lang_StackTraceElement::fill_in(Handle element,
int version, int bci, Symbol* name, TRAPS) {
assert(element->is_a(SystemDictionary::StackTraceElement_klass()), "sanity check");
- // Fill in class name
ResourceMark rm(THREAD);
- const char* str = holder->external_name();
- oop classname = StringTable::intern(str, CHECK);
+ HandleMark hm(THREAD);
+
+ // Fill in class name
+ Handle java_class(THREAD, holder->java_mirror());
+ oop classname = java_lang_Class::name(java_class, CHECK);
java_lang_StackTraceElement::set_declaringClass(element(), classname);
- java_lang_StackTraceElement::set_declaringClassObject(element(), holder->java_mirror());
+ java_lang_StackTraceElement::set_declaringClassObject(element(), java_class());
oop loader = holder->class_loader();
if (loader != NULL) {
@@ -2589,10 +2616,26 @@ void java_lang_StackTraceElement::fill_in(Handle element,
} else {
// Fill in source file name and line number.
Symbol* source = Backtrace::get_source_file_name(holder, version);
- if (ShowHiddenFrames && source == NULL)
- source = vmSymbols::unknown_class_name();
- oop filename = StringTable::intern(source, CHECK);
- java_lang_StackTraceElement::set_fileName(element(), filename);
+ oop source_file = java_lang_Class::source_file(java_class());
+ if (source != NULL) {
+ // Class was not redefined. We can trust its cache if set,
+ // else we have to initialize it.
+ if (source_file == NULL) {
+ source_file = StringTable::intern(source, CHECK);
+ java_lang_Class::set_source_file(java_class(), source_file);
+ }
+ } else {
+ // Class was redefined. Dump the cache if it was set.
+ if (source_file != NULL) {
+ source_file = NULL;
+ java_lang_Class::set_source_file(java_class(), source_file);
+ }
+ if (ShowHiddenFrames) {
+ source = vmSymbols::unknown_class_name();
+ source_file = StringTable::intern(source, CHECK);
+ }
+ }
+ java_lang_StackTraceElement::set_fileName(element(), source_file);
int line_number = Backtrace::get_line_number(method, bci);
java_lang_StackTraceElement::set_lineNumber(element(), line_number);
@@ -2600,6 +2643,7 @@ void java_lang_StackTraceElement::fill_in(Handle element,
}
Method* java_lang_StackFrameInfo::get_method(Handle stackFrame, InstanceKlass* holder, TRAPS) {
+ HandleMark hm(THREAD);
Handle mname(THREAD, stackFrame->obj_field(_memberName_offset));
Method* method = (Method*)java_lang_invoke_MemberName::vmtarget(mname());
// we should expand MemberName::name when Throwable uses StackTrace
@@ -2609,6 +2653,7 @@ Method* java_lang_StackFrameInfo::get_method(Handle stackFrame, InstanceKlass* h
void java_lang_StackFrameInfo::set_method_and_bci(Handle stackFrame, const methodHandle& method, int bci, TRAPS) {
// set Method* or mid/cpref
+ HandleMark hm(THREAD);
Handle mname(Thread::current(), stackFrame->obj_field(_memberName_offset));
InstanceKlass* ik = method->method_holder();
CallInfo info(method(), ik, CHECK);
@@ -2623,6 +2668,7 @@ void java_lang_StackFrameInfo::set_method_and_bci(Handle stackFrame, const metho
void java_lang_StackFrameInfo::to_stack_trace_element(Handle stackFrame, Handle stack_trace_element, TRAPS) {
ResourceMark rm(THREAD);
+ HandleMark hm(THREAD);
Handle mname(THREAD, stackFrame->obj_field(java_lang_StackFrameInfo::_memberName_offset));
Klass* clazz = java_lang_Class::as_Klass(java_lang_invoke_MemberName::clazz(mname()));
InstanceKlass* holder = InstanceKlass::cast(clazz);
@@ -3963,6 +4009,8 @@ int java_lang_Class::_protection_domain_offset;
int java_lang_Class::_component_mirror_offset;
int java_lang_Class::_init_lock_offset;
int java_lang_Class::_signers_offset;
+int java_lang_Class::_name_offset;
+int java_lang_Class::_source_file_offset;
GrowableArray* java_lang_Class::_fixup_mirror_list = NULL;
GrowableArray* java_lang_Class::_fixup_module_field_list = NULL;
int java_lang_Throwable::backtrace_offset;
diff --git a/src/hotspot/share/classfile/javaClasses.hpp b/src/hotspot/share/classfile/javaClasses.hpp
index 477be15219b..9095a57da9e 100644
--- a/src/hotspot/share/classfile/javaClasses.hpp
+++ b/src/hotspot/share/classfile/javaClasses.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
*
*/
-#ifndef SHARE_VM_CLASSFILE_JAVACLASSES_HPP
-#define SHARE_VM_CLASSFILE_JAVACLASSES_HPP
+#ifndef SHARE_CLASSFILE_JAVACLASSES_HPP
+#define SHARE_CLASSFILE_JAVACLASSES_HPP
#include "classfile/systemDictionary.hpp"
#include "jvmtifiles/jvmti.h"
@@ -147,13 +147,16 @@ class java_lang_String : AllStatic {
static inline unsigned int hash(oop java_string);
static inline bool is_latin1(oop java_string);
static inline int length(oop java_string);
+ static inline int length(oop java_string, typeArrayOop string_value);
static int utf8_length(oop java_string);
+ static int utf8_length(oop java_string, typeArrayOop string_value);
// String converters
static char* as_utf8_string(oop java_string);
static char* as_utf8_string(oop java_string, char* buf, int buflen);
static char* as_utf8_string(oop java_string, int start, int len);
- static char* as_utf8_string(oop java_string, int start, int len, char* buf, int buflen);
+ static char* as_utf8_string(oop java_string, typeArrayOop value, char* buf, int buflen);
+ static char* as_utf8_string(oop java_string, typeArrayOop value, int start, int len, char* buf, int buflen);
static char* as_platform_dependent_str(Handle java_string, TRAPS);
static jchar* as_unicode_string(oop java_string, int& length, TRAPS);
// produce an ascii string with all other values quoted using \u####
@@ -219,7 +222,8 @@ class java_lang_String : AllStatic {
macro(java_lang_Class, oop_size, int_signature, false) \
macro(java_lang_Class, static_oop_field_count, int_signature, false) \
macro(java_lang_Class, protection_domain, object_signature, false) \
- macro(java_lang_Class, signers, object_signature, false)
+ macro(java_lang_Class, signers, object_signature, false) \
+ macro(java_lang_Class, source_file, object_signature, false) \
class java_lang_Class : AllStatic {
friend class VMStructs;
@@ -240,6 +244,8 @@ class java_lang_Class : AllStatic {
static int _class_loader_offset;
static int _module_offset;
static int _component_mirror_offset;
+ static int _name_offset;
+ static int _source_file_offset;
static bool offsets_computed;
static int classRedefinedCount_offset;
@@ -310,6 +316,11 @@ class java_lang_Class : AllStatic {
static void set_module(oop java_class, oop module);
static oop module(oop java_class);
+ static oop name(Handle java_class, TRAPS);
+
+ static oop source_file(oop java_class);
+ static void set_source_file(oop java_class, oop source_file);
+
static int oop_size(oop java_class);
static int oop_size_raw(oop java_class);
static void set_oop_size(HeapWord* java_class, int size);
@@ -1538,4 +1549,4 @@ class JavaClasses : AllStatic {
#undef DECLARE_INJECTED_FIELD_ENUM
-#endif // SHARE_VM_CLASSFILE_JAVACLASSES_HPP
+#endif // SHARE_CLASSFILE_JAVACLASSES_HPP
diff --git a/src/hotspot/share/classfile/javaClasses.inline.hpp b/src/hotspot/share/classfile/javaClasses.inline.hpp
index 1a38445fb0d..813aeb8745f 100644
--- a/src/hotspot/share/classfile/javaClasses.inline.hpp
+++ b/src/hotspot/share/classfile/javaClasses.inline.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2015, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
*
*/
-#ifndef SHARE_VM_CLASSFILE_JAVACLASSES_INLINE_HPP
-#define SHARE_VM_CLASSFILE_JAVACLASSES_INLINE_HPP
+#ifndef SHARE_CLASSFILE_JAVACLASSES_INLINE_HPP
+#define SHARE_CLASSFILE_JAVACLASSES_INLINE_HPP
#include "classfile/javaClasses.hpp"
#include "oops/access.inline.hpp"
@@ -71,10 +71,11 @@ bool java_lang_String::is_latin1(oop java_string) {
assert(CompactStrings || coder == CODER_UTF16, "Must be UTF16 without CompactStrings");
return coder == CODER_LATIN1;
}
-int java_lang_String::length(oop java_string) {
+int java_lang_String::length(oop java_string, typeArrayOop value) {
assert(initialized, "Must be initialized");
assert(is_instance(java_string), "must be java_string");
- typeArrayOop value = java_lang_String::value_no_keepalive(java_string);
+ assert(oopDesc::equals(value, java_lang_String::value(java_string)),
+ "value must be same as java_lang_String::value(java_string)");
if (value == NULL) {
return 0;
}
@@ -85,6 +86,12 @@ int java_lang_String::length(oop java_string) {
}
return arr_length;
}
+int java_lang_String::length(oop java_string) {
+ assert(initialized, "Must be initialized");
+ assert(is_instance(java_string), "must be java_string");
+ typeArrayOop value = java_lang_String::value_no_keepalive(java_string);
+ return length(java_string, value);
+}
bool java_lang_String::is_instance_inlined(oop obj) {
return obj != NULL && obj->klass() == SystemDictionary::String_klass();
@@ -190,6 +197,13 @@ inline bool java_lang_Class::is_primitive(oop java_class) {
return is_primitive;
}
+inline int java_lang_Class::oop_size_raw(oop java_class) {
+ assert(_oop_size_offset != 0, "must be set");
+ int size = java_class->int_field_raw(_oop_size_offset);
+ assert(size > 0, "Oop size must be greater than zero, not %d", size);
+ return size;
+}
+
inline bool java_lang_invoke_DirectMethodHandle::is_instance(oop obj) {
return obj != NULL && is_subclass(obj->klass());
}
@@ -258,4 +272,4 @@ inline Symbol* Backtrace::get_source_file_name(InstanceKlass* holder, int versio
}
}
-#endif // SHARE_VM_CLASSFILE_JAVACLASSES_INLINE_HPP
+#endif // SHARE_CLASSFILE_JAVACLASSES_INLINE_HPP
diff --git a/src/hotspot/share/classfile/klassFactory.hpp b/src/hotspot/share/classfile/klassFactory.hpp
index a864b05e122..11132eeb395 100644
--- a/src/hotspot/share/classfile/klassFactory.hpp
+++ b/src/hotspot/share/classfile/klassFactory.hpp
@@ -1,5 +1,5 @@
/*
-* Copyright (c) 2015, 2018, Oracle and/or its affiliates. All rights reserved.
+* Copyright (c) 2015, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
*
*/
-#ifndef SHARE_VM_CLASSFILE_KLASSFACTORY_HPP
-#define SHARE_VM_CLASSFILE_KLASSFACTORY_HPP
+#ifndef SHARE_CLASSFILE_KLASSFACTORY_HPP
+#define SHARE_CLASSFILE_KLASSFACTORY_HPP
#include "memory/allocation.hpp"
#include "runtime/handles.hpp"
@@ -83,4 +83,4 @@ class KlassFactory : AllStatic {
Handle protection_domain, TRAPS);
};
-#endif // SHARE_VM_CLASSFILE_KLASSFACTORY_HPP
+#endif // SHARE_CLASSFILE_KLASSFACTORY_HPP
diff --git a/src/hotspot/share/classfile/loaderConstraints.hpp b/src/hotspot/share/classfile/loaderConstraints.hpp
index 8a7a1248e62..c074ab3a250 100644
--- a/src/hotspot/share/classfile/loaderConstraints.hpp
+++ b/src/hotspot/share/classfile/loaderConstraints.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2003, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
*
*/
-#ifndef SHARE_VM_CLASSFILE_LOADERCONSTRAINTS_HPP
-#define SHARE_VM_CLASSFILE_LOADERCONSTRAINTS_HPP
+#ifndef SHARE_CLASSFILE_LOADERCONSTRAINTS_HPP
+#define SHARE_CLASSFILE_LOADERCONSTRAINTS_HPP
#include "classfile/placeholders.hpp"
#include "utilities/hashtable.hpp"
@@ -130,4 +130,4 @@ public:
void set_loader(int i, oop p);
};
-#endif // SHARE_VM_CLASSFILE_LOADERCONSTRAINTS_HPP
+#endif // SHARE_CLASSFILE_LOADERCONSTRAINTS_HPP
diff --git a/src/hotspot/share/classfile/metadataOnStackMark.hpp b/src/hotspot/share/classfile/metadataOnStackMark.hpp
index 8da4ac6f92b..ba00839f832 100644
--- a/src/hotspot/share/classfile/metadataOnStackMark.hpp
+++ b/src/hotspot/share/classfile/metadataOnStackMark.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2013, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
*
*/
-#ifndef SHARE_VM_CLASSFILE_METADATAONSTACKMARK_HPP
-#define SHARE_VM_CLASSFILE_METADATAONSTACKMARK_HPP
+#ifndef SHARE_CLASSFILE_METADATAONSTACKMARK_HPP
+#define SHARE_CLASSFILE_METADATAONSTACKMARK_HPP
#include "memory/allocation.hpp"
#include "utilities/chunkedList.hpp"
@@ -55,4 +55,4 @@ class MetadataOnStackMark : public StackObj {
static void retire_current_buffer();
};
-#endif // SHARE_VM_CLASSFILE_METADATAONSTACKMARK_HPP
+#endif // SHARE_CLASSFILE_METADATAONSTACKMARK_HPP
diff --git a/src/hotspot/share/classfile/moduleEntry.cpp b/src/hotspot/share/classfile/moduleEntry.cpp
index dc0db180914..f2d3891b612 100644
--- a/src/hotspot/share/classfile/moduleEntry.cpp
+++ b/src/hotspot/share/classfile/moduleEntry.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2016, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -398,23 +398,22 @@ void ModuleEntryTable::add_entry(int index, ModuleEntry* new_entry) {
Hashtable::add_entry(index, (HashtableEntry*)new_entry);
}
-ModuleEntry* ModuleEntryTable::locked_create_entry_or_null(Handle module_handle,
- bool is_open,
- Symbol* module_name,
- Symbol* module_version,
- Symbol* module_location,
- ClassLoaderData* loader_data) {
- assert(module_name != NULL, "ModuleEntryTable locked_create_entry_or_null should never be called for unnamed module.");
+// Create an entry in the class loader's module_entry_table. It is the
+// caller's responsibility to ensure that the entry has not already been
+// created.
+ModuleEntry* ModuleEntryTable::locked_create_entry(Handle module_handle,
+ bool is_open,
+ Symbol* module_name,
+ Symbol* module_version,
+ Symbol* module_location,
+ ClassLoaderData* loader_data) {
+ assert(module_name != NULL, "ModuleEntryTable locked_create_entry should never be called for unnamed module.");
assert(Module_lock->owned_by_self(), "should have the Module_lock");
- // Check if module already exists.
- if (lookup_only(module_name) != NULL) {
- return NULL;
- } else {
- ModuleEntry* entry = new_entry(compute_hash(module_name), module_handle, is_open, module_name,
- module_version, module_location, loader_data);
- add_entry(index_for(module_name), entry);
- return entry;
- }
+ assert(lookup_only(module_name) == NULL, "Module already exists");
+ ModuleEntry* entry = new_entry(compute_hash(module_name), module_handle, is_open, module_name,
+ module_version, module_location, loader_data);
+ add_entry(index_for(module_name), entry);
+ return entry;
}
// lookup_only by Symbol* to find a ModuleEntry.
diff --git a/src/hotspot/share/classfile/moduleEntry.hpp b/src/hotspot/share/classfile/moduleEntry.hpp
index 9c288a454f0..ed93ce59917 100644
--- a/src/hotspot/share/classfile/moduleEntry.hpp
+++ b/src/hotspot/share/classfile/moduleEntry.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2016, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
*
*/
-#ifndef SHARE_VM_CLASSFILE_MODULEENTRY_HPP
-#define SHARE_VM_CLASSFILE_MODULEENTRY_HPP
+#ifndef SHARE_CLASSFILE_MODULEENTRY_HPP
+#define SHARE_CLASSFILE_MODULEENTRY_HPP
#include "jni.h"
#include "classfile/classLoaderData.hpp"
@@ -236,14 +236,14 @@ public:
return (ModuleEntry*)Hashtable::bucket(i);
}
- // Create module in loader's module entry table, if already exists then
- // return null. Assume Module_lock has been locked by caller.
- ModuleEntry* locked_create_entry_or_null(Handle module_handle,
- bool is_open,
- Symbol* module_name,
- Symbol* module_version,
- Symbol* module_location,
- ClassLoaderData* loader_data);
+ // Create module in loader's module entry table. Assume Module_lock
+ // has been locked by caller.
+ ModuleEntry* locked_create_entry(Handle module_handle,
+ bool is_open,
+ Symbol* module_name,
+ Symbol* module_version,
+ Symbol* module_location,
+ ClassLoaderData* loader_data);
// Only lookup module within loader's module entry table. The table read is lock-free.
ModuleEntry* lookup_only(Symbol* name);
@@ -253,7 +253,10 @@ public:
// Special handling for java.base
static ModuleEntry* javabase_moduleEntry() { return _javabase_module; }
- static void set_javabase_moduleEntry(ModuleEntry* java_base) { _javabase_module = java_base; }
+ static void set_javabase_moduleEntry(ModuleEntry* java_base) {
+ assert(_javabase_module == NULL, "_javabase_module is already defined");
+ _javabase_module = java_base;
+ }
static bool javabase_defined() { return ((_javabase_module != NULL) &&
(_javabase_module->module() != NULL)); }
@@ -264,4 +267,4 @@ public:
void verify();
};
-#endif // SHARE_VM_CLASSFILE_MODULEENTRY_HPP
+#endif // SHARE_CLASSFILE_MODULEENTRY_HPP
diff --git a/src/hotspot/share/classfile/modules.cpp b/src/hotspot/share/classfile/modules.cpp
index e551c7a0ce7..3386faa12e9 100644
--- a/src/hotspot/share/classfile/modules.cpp
+++ b/src/hotspot/share/classfile/modules.cpp
@@ -1,5 +1,5 @@
/*
-* Copyright (c) 2016, 2018, Oracle and/or its affiliates. All rights reserved.
+* Copyright (c) 2016, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -206,13 +206,12 @@ static void define_javabase_module(jobject module, jstring version,
package_table->verify_javabase_packages(pkg_list);
// loop through and add any new packages for java.base
- PackageEntry* pkg;
for (int x = 0; x < pkg_list->length(); x++) {
// Some of java.base's packages were added early in bootstrapping, ignore duplicates.
- if (package_table->lookup_only(pkg_list->at(x)) == NULL) {
- pkg = package_table->locked_create_entry_or_null(pkg_list->at(x), ModuleEntryTable::javabase_moduleEntry());
- assert(pkg != NULL, "Unable to create a " JAVA_BASE_NAME " package entry");
- }
+ package_table->locked_create_entry_if_not_exist(pkg_list->at(x),
+ ModuleEntryTable::javabase_moduleEntry());
+ assert(package_table->locked_lookup_only(pkg_list->at(x)) != NULL,
+ "Unable to create a " JAVA_BASE_NAME " package entry");
// Unable to have a GrowableArray of TempNewSymbol. Must decrement the refcount of
// the Symbol* that was created above for each package. The refcount was incremented
// by SymbolTable::new_symbol and as well by the PackageEntry creation.
@@ -388,7 +387,7 @@ void Modules::define_module(jobject module, jboolean is_open, jstring version,
// Check that none of the packages exist in the class loader's package table.
for (int x = 0; x < pkg_list->length(); x++) {
- existing_pkg = package_table->lookup_only(pkg_list->at(x));
+ existing_pkg = package_table->locked_lookup_only(pkg_list->at(x));
if (existing_pkg != NULL) {
// This could be because the module was already defined. If so,
// report that error instead of the package error.
@@ -402,20 +401,17 @@ void Modules::define_module(jobject module, jboolean is_open, jstring version,
// Add the module and its packages.
if (!dupl_modules && existing_pkg == NULL) {
- // Create the entry for this module in the class loader's module entry table.
- ModuleEntry* module_entry = module_table->locked_create_entry_or_null(module_handle,
+ if (module_table->lookup_only(module_symbol) == NULL) {
+ // Create the entry for this module in the class loader's module entry table.
+ ModuleEntry* module_entry = module_table->locked_create_entry(module_handle,
(is_open == JNI_TRUE), module_symbol,
version_symbol, location_symbol, loader_data);
+ assert(module_entry != NULL, "module_entry creation failed");
- if (module_entry == NULL) {
- dupl_modules = true;
- } else {
// Add the packages.
assert(pkg_list->length() == 0 || package_table != NULL, "Bad package table");
- PackageEntry* pkg;
for (int y = 0; y < pkg_list->length(); y++) {
- pkg = package_table->locked_create_entry_or_null(pkg_list->at(y), module_entry);
- assert(pkg != NULL, "Unable to create a module's package entry");
+ package_table->locked_create_entry(pkg_list->at(y), module_entry);
// Unable to have a GrowableArray of TempNewSymbol. Must decrement the refcount of
// the Symbol* that was created above for each package. The refcount was incremented
@@ -425,6 +421,8 @@ void Modules::define_module(jobject module, jboolean is_open, jstring version,
// Store pointer to ModuleEntry record in java.lang.Module object.
java_lang_Module::set_module_entry(module_handle(), module_entry);
+ } else {
+ dupl_modules = true;
}
}
} // Release the lock
diff --git a/src/hotspot/share/classfile/modules.hpp b/src/hotspot/share/classfile/modules.hpp
index 2c9d48ac269..41e69cc7f8a 100644
--- a/src/hotspot/share/classfile/modules.hpp
+++ b/src/hotspot/share/classfile/modules.hpp
@@ -1,5 +1,5 @@
/*
-* Copyright (c) 2016, 2018, Oracle and/or its affiliates. All rights reserved.
+* Copyright (c) 2016, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
*
*/
-#ifndef SHARE_VM_CLASSFILE_MODULES_HPP
-#define SHARE_VM_CLASSFILE_MODULES_HPP
+#ifndef SHARE_CLASSFILE_MODULES_HPP
+#define SHARE_CLASSFILE_MODULES_HPP
#include "memory/allocation.hpp"
#include "runtime/handles.hpp"
@@ -126,4 +126,4 @@ public:
static ModuleEntryTable* get_module_entry_table(Handle h_loader);
};
-#endif // SHARE_VM_CLASSFILE_MODULES_HPP
+#endif // SHARE_CLASSFILE_MODULES_HPP
diff --git a/src/hotspot/share/classfile/packageEntry.cpp b/src/hotspot/share/classfile/packageEntry.cpp
index 4863ec75f22..08000ccb8c5 100644
--- a/src/hotspot/share/classfile/packageEntry.cpp
+++ b/src/hotspot/share/classfile/packageEntry.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2016, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -211,23 +211,28 @@ void PackageEntryTable::add_entry(int index, PackageEntry* new_entry) {
Hashtable::add_entry(index, (HashtableEntry*)new_entry);
}
-// Create package in loader's package entry table and return the entry.
-// If entry already exists, return null. Assume Module lock was taken by caller.
-PackageEntry* PackageEntryTable::locked_create_entry_or_null(Symbol* name, ModuleEntry* module) {
+// Create package entry in loader's package entry table. Assume Module lock
+// was taken by caller.
+void PackageEntryTable::locked_create_entry(Symbol* name, ModuleEntry* module) {
assert(Module_lock->owned_by_self(), "should have the Module_lock");
- // Check if package already exists. Return NULL if it does.
- if (lookup_only(name) != NULL) {
- return NULL;
- } else {
- PackageEntry* entry = new_entry(compute_hash(name), name, module);
- add_entry(index_for(name), entry);
- return entry;
+ assert(locked_lookup_only(name) == NULL, "Package entry already exists");
+ PackageEntry* entry = new_entry(compute_hash(name), name, module);
+ add_entry(index_for(name), entry);
+}
+
+// Create package entry in loader's package entry table if it does not already
+// exist. Assume Module lock was taken by caller.
+void PackageEntryTable::locked_create_entry_if_not_exist(Symbol* name, ModuleEntry* module) {
+ assert(Module_lock->owned_by_self(), "should have the Module_lock");
+ // Check if package entry already exists. If not, create it.
+ if (locked_lookup_only(name) == NULL) {
+ locked_create_entry(name, module);
}
}
PackageEntry* PackageEntryTable::lookup(Symbol* name, ModuleEntry* module) {
MutexLocker ml(Module_lock);
- PackageEntry* p = lookup_only(name);
+ PackageEntry* p = locked_lookup_only(name);
if (p != NULL) {
return p;
} else {
@@ -239,7 +244,13 @@ PackageEntry* PackageEntryTable::lookup(Symbol* name, ModuleEntry* module) {
}
PackageEntry* PackageEntryTable::lookup_only(Symbol* name) {
- MutexLockerEx ml(Module_lock->owned_by_self() ? NULL : Module_lock);
+ assert(!Module_lock->owned_by_self(), "should not have the Module_lock - use locked_lookup_only");
+ MutexLockerEx ml(Module_lock);
+ return locked_lookup_only(name);
+}
+
+PackageEntry* PackageEntryTable::locked_lookup_only(Symbol* name) {
+ assert(Module_lock->owned_by_self(), "should have the Module_lock");
int index = index_for(name);
for (PackageEntry* p = bucket(index); p != NULL; p = p->next()) {
if (p->name()->fast_compare(name) == 0) {
diff --git a/src/hotspot/share/classfile/packageEntry.hpp b/src/hotspot/share/classfile/packageEntry.hpp
index 98bbfdc11df..1cb982160e6 100644
--- a/src/hotspot/share/classfile/packageEntry.hpp
+++ b/src/hotspot/share/classfile/packageEntry.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2016, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
*
*/
-#ifndef SHARE_VM_CLASSFILE_PACKAGEENTRY_HPP
-#define SHARE_VM_CLASSFILE_PACKAGEENTRY_HPP
+#ifndef SHARE_CLASSFILE_PACKAGEENTRY_HPP
+#define SHARE_CLASSFILE_PACKAGEENTRY_HPP
#include "classfile/moduleEntry.hpp"
#include "oops/symbol.hpp"
@@ -246,16 +246,26 @@ public:
return (PackageEntry*)Hashtable::bucket(i);
}
- // Create package in loader's package entry table and return the entry.
- // If entry already exists, return null. Assume Module lock was taken by caller.
- PackageEntry* locked_create_entry_or_null(Symbol* name, ModuleEntry* module);
+ // Create package entry in loader's package entry table. Assume Module
+ // lock was taken by caller.
+ void locked_create_entry(Symbol* name, ModuleEntry* module);
- // lookup Package with loader's package entry table, if not found add
+ // Create package entry in loader's package entry table if it does not
+ // already exist. Assume Module lock was taken by caller.
+ void locked_create_entry_if_not_exist(Symbol* name, ModuleEntry* module);
+
+ // Lookup Package with loader's package entry table, add it if not found.
+ // This will acquire the Module lock.
PackageEntry* lookup(Symbol* name, ModuleEntry* module);
// Only lookup Package within loader's package entry table.
+ // This will acquire the Module lock.
PackageEntry* lookup_only(Symbol* Package);
+ // Only lookup Package within loader's package entry table. Assume Module lock
+ // was taken by caller.
+ PackageEntry* locked_lookup_only(Symbol* Package);
+
void verify_javabase_packages(GrowableArray *pkg_list);
// purge dead weak references out of exported list
@@ -265,4 +275,4 @@ public:
void verify();
};
-#endif // SHARE_VM_CLASSFILE_PACKAGEENTRY_HPP
+#endif // SHARE_CLASSFILE_PACKAGEENTRY_HPP
diff --git a/src/hotspot/share/classfile/placeholders.hpp b/src/hotspot/share/classfile/placeholders.hpp
index d66db6bb283..57c6ee1f559 100644
--- a/src/hotspot/share/classfile/placeholders.hpp
+++ b/src/hotspot/share/classfile/placeholders.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2003, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
*
*/
-#ifndef SHARE_VM_CLASSFILE_PLACEHOLDERS_HPP
-#define SHARE_VM_CLASSFILE_PLACEHOLDERS_HPP
+#ifndef SHARE_CLASSFILE_PLACEHOLDERS_HPP
+#define SHARE_CLASSFILE_PLACEHOLDERS_HPP
#include "runtime/thread.hpp"
#include "utilities/hashtable.hpp"
@@ -321,4 +321,4 @@ class PlaceholderEntry : public HashtableEntry {
void verify() const;
};
-#endif // SHARE_VM_CLASSFILE_PLACEHOLDERS_HPP
+#endif // SHARE_CLASSFILE_PLACEHOLDERS_HPP
diff --git a/src/hotspot/share/classfile/protectionDomainCache.hpp b/src/hotspot/share/classfile/protectionDomainCache.hpp
index 14681804217..e3a1cdf5497 100644
--- a/src/hotspot/share/classfile/protectionDomainCache.hpp
+++ b/src/hotspot/share/classfile/protectionDomainCache.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2017, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
*
*/
-#ifndef SHARE_VM_CLASSFILE_PROTECTIONDOMAINCACHE_HPP
-#define SHARE_VM_CLASSFILE_PROTECTIONDOMAINCACHE_HPP
+#ifndef SHARE_CLASSFILE_PROTECTIONDOMAINCACHE_HPP
+#define SHARE_CLASSFILE_PROTECTIONDOMAINCACHE_HPP
#include "oops/oop.hpp"
#include "oops/weakHandle.hpp"
@@ -120,4 +120,4 @@ class ProtectionDomainEntry :public CHeapObj {
oop object();
oop object_no_keepalive();
};
-#endif // SHARE_VM_CLASSFILE_PROTECTIONDOMAINCACHE_HPP
+#endif // SHARE_CLASSFILE_PROTECTIONDOMAINCACHE_HPP
diff --git a/src/hotspot/share/classfile/resolutionErrors.hpp b/src/hotspot/share/classfile/resolutionErrors.hpp
index bba235453a3..772e8df342b 100644
--- a/src/hotspot/share/classfile/resolutionErrors.hpp
+++ b/src/hotspot/share/classfile/resolutionErrors.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2005, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
*
*/
-#ifndef SHARE_VM_CLASSFILE_RESOLUTIONERRORS_HPP
-#define SHARE_VM_CLASSFILE_RESOLUTIONERRORS_HPP
+#ifndef SHARE_CLASSFILE_RESOLUTIONERRORS_HPP
+#define SHARE_CLASSFILE_RESOLUTIONERRORS_HPP
#include "oops/constantPool.hpp"
#include "utilities/hashtable.hpp"
@@ -117,4 +117,4 @@ class ResolutionErrorEntry : public HashtableEntry {
}
};
-#endif // SHARE_VM_CLASSFILE_RESOLUTIONERRORS_HPP
+#endif // SHARE_CLASSFILE_RESOLUTIONERRORS_HPP
diff --git a/src/hotspot/share/classfile/sharedPathsMiscInfo.hpp b/src/hotspot/share/classfile/sharedPathsMiscInfo.hpp
index 6c4b0b84e9f..2111881814b 100644
--- a/src/hotspot/share/classfile/sharedPathsMiscInfo.hpp
+++ b/src/hotspot/share/classfile/sharedPathsMiscInfo.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2014, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
*
*/
-#ifndef SHARE_VM_CLASSFILE_SHAREDPATHSMISCINFO_HPP
-#define SHARE_VM_CLASSFILE_SHAREDPATHSMISCINFO_HPP
+#ifndef SHARE_CLASSFILE_SHAREDPATHSMISCINFO_HPP
+#define SHARE_CLASSFILE_SHAREDPATHSMISCINFO_HPP
#include "classfile/classLoader.hpp"
#include "runtime/os.hpp"
@@ -165,4 +165,4 @@ public:
bool check();
};
-#endif // SHARE_VM_CLASSFILE_SHAREDPATHSMISCINFO_HPP
+#endif // SHARE_CLASSFILE_SHAREDPATHSMISCINFO_HPP
diff --git a/src/hotspot/share/classfile/stackMapFrame.hpp b/src/hotspot/share/classfile/stackMapFrame.hpp
index 4627010b615..28f9aa4a0fd 100644
--- a/src/hotspot/share/classfile/stackMapFrame.hpp
+++ b/src/hotspot/share/classfile/stackMapFrame.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2003, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
*
*/
-#ifndef SHARE_VM_CLASSFILE_STACKMAPFRAME_HPP
-#define SHARE_VM_CLASSFILE_STACKMAPFRAME_HPP
+#ifndef SHARE_CLASSFILE_STACKMAPFRAME_HPP
+#define SHARE_CLASSFILE_STACKMAPFRAME_HPP
#include "classfile/verificationType.hpp"
#include "classfile/verifier.hpp"
@@ -295,4 +295,4 @@ class StackMapFrame : public ResourceObj {
void print_on(outputStream* str) const;
};
-#endif // SHARE_VM_CLASSFILE_STACKMAPFRAME_HPP
+#endif // SHARE_CLASSFILE_STACKMAPFRAME_HPP
diff --git a/src/hotspot/share/classfile/stackMapTable.hpp b/src/hotspot/share/classfile/stackMapTable.hpp
index 2a0bffcb024..c0e33ae176c 100644
--- a/src/hotspot/share/classfile/stackMapTable.hpp
+++ b/src/hotspot/share/classfile/stackMapTable.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2003, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
*
*/
-#ifndef SHARE_VM_CLASSFILE_STACKMAPTABLE_HPP
-#define SHARE_VM_CLASSFILE_STACKMAPTABLE_HPP
+#ifndef SHARE_CLASSFILE_STACKMAPTABLE_HPP
+#define SHARE_CLASSFILE_STACKMAPTABLE_HPP
#include "classfile/stackMapFrame.hpp"
#include "classfile/verifier.hpp"
@@ -155,4 +155,4 @@ class StackMapReader : StackObj {
}
};
-#endif // SHARE_VM_CLASSFILE_STACKMAPTABLE_HPP
+#endif // SHARE_CLASSFILE_STACKMAPTABLE_HPP
diff --git a/src/hotspot/share/classfile/stackMapTableFormat.hpp b/src/hotspot/share/classfile/stackMapTableFormat.hpp
index 85d08e603e3..59fa03cdeb4 100644
--- a/src/hotspot/share/classfile/stackMapTableFormat.hpp
+++ b/src/hotspot/share/classfile/stackMapTableFormat.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2010, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
*
*/
-#ifndef SHARE_VM_CLASSFILE_STACKMAPTABLEFORMAT_HPP
-#define SHARE_VM_CLASSFILE_STACKMAPTABLEFORMAT_HPP
+#ifndef SHARE_CLASSFILE_STACKMAPTABLEFORMAT_HPP
+#define SHARE_CLASSFILE_STACKMAPTABLEFORMAT_HPP
#include "classfile/verificationType.hpp"
@@ -963,4 +963,4 @@ class stack_map_table_attribute {
#undef FOR_EACH_STACKMAP_FRAME_TYPE
-#endif // SHARE_VM_CLASSFILE_STACKMAPTABLEFORMAT_HPP
+#endif // SHARE_CLASSFILE_STACKMAPTABLEFORMAT_HPP
diff --git a/src/hotspot/share/classfile/stringTable.hpp b/src/hotspot/share/classfile/stringTable.hpp
index 90f00ec047c..dc0967f0c8e 100644
--- a/src/hotspot/share/classfile/stringTable.hpp
+++ b/src/hotspot/share/classfile/stringTable.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
*
*/
-#ifndef SHARE_VM_CLASSFILE_STRINGTABLE_HPP
-#define SHARE_VM_CLASSFILE_STRINGTABLE_HPP
+#ifndef SHARE_CLASSFILE_STRINGTABLE_HPP
+#define SHARE_CLASSFILE_STRINGTABLE_HPP
#include "gc/shared/oopStorage.hpp"
#include "gc/shared/oopStorageParState.hpp"
@@ -177,4 +177,4 @@ private:
static void verify();
};
-#endif // SHARE_VM_CLASSFILE_STRINGTABLE_HPP
+#endif // SHARE_CLASSFILE_STRINGTABLE_HPP
diff --git a/src/hotspot/share/classfile/symbolTable.hpp b/src/hotspot/share/classfile/symbolTable.hpp
index 183cb4fb017..680d6668dea 100644
--- a/src/hotspot/share/classfile/symbolTable.hpp
+++ b/src/hotspot/share/classfile/symbolTable.hpp
@@ -22,8 +22,8 @@
*
*/
-#ifndef SHARE_VM_CLASSFILE_SYMBOLTABLE_HPP
-#define SHARE_VM_CLASSFILE_SYMBOLTABLE_HPP
+#ifndef SHARE_CLASSFILE_SYMBOLTABLE_HPP
+#define SHARE_CLASSFILE_SYMBOLTABLE_HPP
#include "memory/allocation.hpp"
#include "memory/padded.hpp"
@@ -259,4 +259,4 @@ public:
static void print_histogram() PRODUCT_RETURN;
};
-#endif // SHARE_VM_CLASSFILE_SYMBOLTABLE_HPP
+#endif // SHARE_CLASSFILE_SYMBOLTABLE_HPP
diff --git a/src/hotspot/share/classfile/systemDictionary.cpp b/src/hotspot/share/classfile/systemDictionary.cpp
index 4d0310c83ff..b6a656e052a 100644
--- a/src/hotspot/share/classfile/systemDictionary.cpp
+++ b/src/hotspot/share/classfile/systemDictionary.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -860,8 +860,15 @@ InstanceKlass* SystemDictionary::resolve_instance_class_or_null(Symbol* name,
check_constraints(d_hash, k, class_loader, false, THREAD);
// Need to check for a PENDING_EXCEPTION again; check_constraints
- // can throw and doesn't use the CHECK macro.
+ // can throw but we may have to remove entry from the placeholder table below.
if (!HAS_PENDING_EXCEPTION) {
+ // Record dependency for non-parent delegation.
+ // This recording keeps the defining class loader of the klass (k) found
+ // from being unloaded while the initiating class loader is loaded
+ // even if the reference to the defining class loader is dropped
+ // before references to the initiating class loader.
+ loader_data->record_dependency(k);
+
{ // Grabbing the Compile_lock prevents systemDictionary updates
// during compilations.
MutexLocker mu(Compile_lock, THREAD);
@@ -1787,14 +1794,17 @@ void SystemDictionary::add_to_hierarchy(InstanceKlass* k, TRAPS) {
assert(k != NULL, "just checking");
assert_locked_or_safepoint(Compile_lock);
- // Link into hierachy. Make sure the vtables are initialized before linking into
+ k->set_init_state(InstanceKlass::loaded);
+ // make sure init_state store is already done.
+ // The compiler reads the hierarchy outside of the Compile_lock.
+ // Access ordering is used to add to hierarchy.
+
+ // Link into hierachy.
k->append_to_sibling_list(); // add to superklass/sibling list
k->process_interfaces(THREAD); // handle all "implements" declarations
- k->set_init_state(InstanceKlass::loaded);
+
// Now flush all code that depended on old class hierarchy.
// Note: must be done *after* linking k into the hierarchy (was bug 12/9/97)
- // Also, first reinitialize vtable because it may have gotten out of synch
- // while the new class wasn't connected to the class hierarchy.
CodeCache::flush_dependents_on(k);
}
@@ -2176,6 +2186,7 @@ void SystemDictionary::update_dictionary(unsigned int d_hash,
InstanceKlass* sd_check = find_class(d_hash, name, dictionary);
if (sd_check == NULL) {
dictionary->add_klass(d_hash, name, k);
+
notice_modification();
}
#ifdef ASSERT
diff --git a/src/hotspot/share/classfile/systemDictionary.hpp b/src/hotspot/share/classfile/systemDictionary.hpp
index 083e15bfb15..384852dea61 100644
--- a/src/hotspot/share/classfile/systemDictionary.hpp
+++ b/src/hotspot/share/classfile/systemDictionary.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
*
*/
-#ifndef SHARE_VM_CLASSFILE_SYSTEMDICTIONARY_HPP
-#define SHARE_VM_CLASSFILE_SYSTEMDICTIONARY_HPP
+#ifndef SHARE_CLASSFILE_SYSTEMDICTIONARY_HPP
+#define SHARE_CLASSFILE_SYSTEMDICTIONARY_HPP
#include "classfile/classLoader.hpp"
#include "jvmci/systemDictionary_jvmci.hpp"
@@ -703,4 +703,4 @@ private:
static bool _has_checkPackageAccess;
};
-#endif // SHARE_VM_CLASSFILE_SYSTEMDICTIONARY_HPP
+#endif // SHARE_CLASSFILE_SYSTEMDICTIONARY_HPP
diff --git a/src/hotspot/share/classfile/systemDictionaryShared.cpp b/src/hotspot/share/classfile/systemDictionaryShared.cpp
index c9333114a26..91cfeee4e5c 100644
--- a/src/hotspot/share/classfile/systemDictionaryShared.cpp
+++ b/src/hotspot/share/classfile/systemDictionaryShared.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2014, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -503,26 +503,33 @@ Handle SystemDictionaryShared::get_shared_protection_domain(Handle class_loader,
Handle SystemDictionaryShared::get_shared_protection_domain(Handle class_loader,
ModuleEntry* mod, TRAPS) {
ClassLoaderData *loader_data = mod->loader_data();
- Handle protection_domain;
if (mod->shared_protection_domain() == NULL) {
Symbol* location = mod->location();
if (location != NULL) {
- Handle url_string = java_lang_String::create_from_symbol(
- location, CHECK_(protection_domain));
+ Handle location_string = java_lang_String::create_from_symbol(
+ location, CHECK_NH);
+ Handle url;
JavaValue result(T_OBJECT);
- Klass* classLoaders_klass =
- SystemDictionary::jdk_internal_loader_ClassLoaders_klass();
- JavaCalls::call_static(&result, classLoaders_klass, vmSymbols::toFileURL_name(),
+ if (location->starts_with("jrt:/")) {
+ url = JavaCalls::construct_new_instance(SystemDictionary::URL_klass(),
+ vmSymbols::string_void_signature(),
+ location_string, CHECK_NH);
+ } else {
+ Klass* classLoaders_klass =
+ SystemDictionary::jdk_internal_loader_ClassLoaders_klass();
+ JavaCalls::call_static(&result, classLoaders_klass, vmSymbols::toFileURL_name(),
vmSymbols::toFileURL_signature(),
- url_string, CHECK_(protection_domain));
- Handle url = Handle(THREAD, (oop)result.get_jobject());
+ location_string, CHECK_NH);
+ url = Handle(THREAD, (oop)result.get_jobject());
+ }
- Handle pd = get_protection_domain_from_classloader(class_loader, url, THREAD);
+ Handle pd = get_protection_domain_from_classloader(class_loader, url,
+ CHECK_NH);
mod->set_shared_protection_domain(loader_data, pd);
}
}
- protection_domain = Handle(THREAD, mod->shared_protection_domain());
+ Handle protection_domain(THREAD, mod->shared_protection_domain());
assert(protection_domain.not_null(), "sanity");
return protection_domain;
}
diff --git a/src/hotspot/share/classfile/systemDictionaryShared.hpp b/src/hotspot/share/classfile/systemDictionaryShared.hpp
index 5a4ab1d051a..378941e48e9 100644
--- a/src/hotspot/share/classfile/systemDictionaryShared.hpp
+++ b/src/hotspot/share/classfile/systemDictionaryShared.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2014, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
*
*/
-#ifndef SHARE_VM_CLASSFILE_SYSTEMDICTIONARYSHARED_HPP
-#define SHARE_VM_CLASSFILE_SYSTEMDICTIONARYSHARED_HPP
+#ifndef SHARE_CLASSFILE_SYSTEMDICTIONARYSHARED_HPP
+#define SHARE_CLASSFILE_SYSTEMDICTIONARYSHARED_HPP
#include "oops/klass.hpp"
#include "classfile/dictionary.hpp"
@@ -300,4 +300,4 @@ public:
DEBUG_ONLY(static bool checked_excluded_classes() {return _checked_excluded_classes;})
};
-#endif // SHARE_VM_CLASSFILE_SYSTEMDICTIONARYSHARED_HPP
+#endif // SHARE_CLASSFILE_SYSTEMDICTIONARYSHARED_HPP
diff --git a/src/hotspot/share/classfile/verificationType.cpp b/src/hotspot/share/classfile/verificationType.cpp
index 99e9a9d4385..125ce30249a 100644
--- a/src/hotspot/share/classfile/verificationType.cpp
+++ b/src/hotspot/share/classfile/verificationType.cpp
@@ -50,7 +50,6 @@ bool VerificationType::resolve_and_check_assignability(InstanceKlass* klass, Sym
Klass* this_class = SystemDictionary::resolve_or_fail(
name, Handle(THREAD, klass->class_loader()),
Handle(THREAD, klass->protection_domain()), true, CHECK_false);
- klass->class_loader_data()->record_dependency(this_class);
if (log_is_enabled(Debug, class, resolve)) {
Verifier::trace_class_resolution(this_class, klass);
}
@@ -68,7 +67,6 @@ bool VerificationType::resolve_and_check_assignability(InstanceKlass* klass, Sym
Klass* from_class = SystemDictionary::resolve_or_fail(
from_name, Handle(THREAD, klass->class_loader()),
Handle(THREAD, klass->protection_domain()), true, CHECK_false);
- klass->class_loader_data()->record_dependency(from_class);
if (log_is_enabled(Debug, class, resolve)) {
Verifier::trace_class_resolution(from_class, klass);
}
diff --git a/src/hotspot/share/classfile/verificationType.hpp b/src/hotspot/share/classfile/verificationType.hpp
index fba473980fe..9a9b7bb2d91 100644
--- a/src/hotspot/share/classfile/verificationType.hpp
+++ b/src/hotspot/share/classfile/verificationType.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2003, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
*
*/
-#ifndef SHARE_VM_CLASSFILE_VERIFICATIONTYPE_HPP
-#define SHARE_VM_CLASSFILE_VERIFICATIONTYPE_HPP
+#ifndef SHARE_CLASSFILE_VERIFICATIONTYPE_HPP
+#define SHARE_CLASSFILE_VERIFICATIONTYPE_HPP
#include "classfile/systemDictionary.hpp"
#include "oops/instanceKlass.hpp"
@@ -341,4 +341,4 @@ class VerificationType {
TRAPS);
};
-#endif // SHARE_VM_CLASSFILE_VERIFICATIONTYPE_HPP
+#endif // SHARE_CLASSFILE_VERIFICATIONTYPE_HPP
diff --git a/src/hotspot/share/classfile/verifier.cpp b/src/hotspot/share/classfile/verifier.cpp
index a0894cda415..97cf4e7ff50 100644
--- a/src/hotspot/share/classfile/verifier.cpp
+++ b/src/hotspot/share/classfile/verifier.cpp
@@ -2015,7 +2015,6 @@ Klass* ClassVerifier::load_class(Symbol* name, TRAPS) {
true, THREAD);
if (kls != NULL) {
- current_class()->class_loader_data()->record_dependency(kls);
if (log_is_enabled(Debug, class, resolve)) {
Verifier::trace_class_resolution(kls, current_class());
}
diff --git a/src/hotspot/share/classfile/verifier.hpp b/src/hotspot/share/classfile/verifier.hpp
index 586f9a98b92..2f4fa513703 100644
--- a/src/hotspot/share/classfile/verifier.hpp
+++ b/src/hotspot/share/classfile/verifier.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
*
*/
-#ifndef SHARE_VM_CLASSFILE_VERIFIER_HPP
-#define SHARE_VM_CLASSFILE_VERIFIER_HPP
+#ifndef SHARE_CLASSFILE_VERIFIER_HPP
+#define SHARE_CLASSFILE_VERIFIER_HPP
#include "classfile/verificationType.hpp"
#include "oops/klass.hpp"
@@ -463,4 +463,4 @@ inline int ClassVerifier::change_sig_to_verificationType(
}
}
-#endif // SHARE_VM_CLASSFILE_VERIFIER_HPP
+#endif // SHARE_CLASSFILE_VERIFIER_HPP
diff --git a/src/hotspot/share/classfile/vmSymbols.hpp b/src/hotspot/share/classfile/vmSymbols.hpp
index 371613b3117..da923d99dc4 100644
--- a/src/hotspot/share/classfile/vmSymbols.hpp
+++ b/src/hotspot/share/classfile/vmSymbols.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
*
*/
-#ifndef SHARE_VM_CLASSFILE_VMSYMBOLS_HPP
-#define SHARE_VM_CLASSFILE_VMSYMBOLS_HPP
+#ifndef SHARE_CLASSFILE_VMSYMBOLS_HPP
+#define SHARE_CLASSFILE_VMSYMBOLS_HPP
#include "classfile/moduleEntry.hpp"
#include "jfr/support/jfrIntrinsics.hpp"
@@ -278,9 +278,10 @@
\
/* Intrinsic Annotation (JDK 9 and above) */ \
template(jdk_internal_HotSpotIntrinsicCandidate_signature, "Ljdk/internal/HotSpotIntrinsicCandidate;") \
- template(jdk_internal_vm_annotation_ForceInline_signature, "Ljdk/internal/vm/annotation/ForceInline;") \
template(jdk_internal_vm_annotation_DontInline_signature, "Ljdk/internal/vm/annotation/DontInline;") \
- template(jdk_internal_vm_annotation_Stable_signature, "Ljdk/internal/vm/annotation/Stable;") \
+ template(jdk_internal_vm_annotation_ForceInline_signature, "Ljdk/internal/vm/annotation/ForceInline;") \
+ template(jdk_internal_vm_annotation_Hidden_signature, "Ljdk/internal/vm/annotation/Hidden;") \
+ template(jdk_internal_vm_annotation_Stable_signature, "Ljdk/internal/vm/annotation/Stable;") \
\
/* Support for JSR 292 & invokedynamic (JDK 1.7 and above) */ \
template(java_lang_invoke_CallSite, "java/lang/invoke/CallSite") \
@@ -304,9 +305,7 @@
template(java_lang_invoke_LambdaForm, "java/lang/invoke/LambdaForm") \
template(java_lang_invoke_InjectedProfile_signature, "Ljava/lang/invoke/InjectedProfile;") \
template(java_lang_invoke_LambdaForm_Compiled_signature, "Ljava/lang/invoke/LambdaForm$Compiled;") \
- template(java_lang_invoke_LambdaForm_Hidden_signature, "Ljava/lang/invoke/LambdaForm$Hidden;") \
template(java_lang_invoke_MethodHandleNatives_CallSiteContext_signature, "Ljava/lang/invoke/MethodHandleNatives$CallSiteContext;") \
- template(java_security_AccessController_Hidden_signature, "Ljava/security/AccessController$Hidden;") \
/* internal up-calls made only by the JVM, via class sun.invoke.MethodHandleNatives: */ \
template(findMethodHandleType_name, "findMethodHandleType") \
template(findMethodHandleType_signature, "(Ljava/lang/Class;[Ljava/lang/Class;)Ljava/lang/invoke/MethodType;") \
@@ -425,6 +424,7 @@
template(static_oop_field_count_name, "static_oop_field_count") \
template(protection_domain_name, "protection_domain") \
template(signers_name, "signers_name") \
+ template(source_file_name, "source_file") \
template(loader_data_name, "loader_data") \
template(vmdependencies_name, "vmdependencies") \
template(last_cleanup_name, "last_cleanup") \
@@ -1656,4 +1656,4 @@ public:
static bool is_intrinsic_available(vmIntrinsics::ID id);
};
-#endif // SHARE_VM_CLASSFILE_VMSYMBOLS_HPP
+#endif // SHARE_CLASSFILE_VMSYMBOLS_HPP
diff --git a/src/hotspot/share/code/codeBlob.hpp b/src/hotspot/share/code/codeBlob.hpp
index ed4131d76d1..3963f7eb7af 100644
--- a/src/hotspot/share/code/codeBlob.hpp
+++ b/src/hotspot/share/code/codeBlob.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
*
*/
-#ifndef SHARE_VM_CODE_CODEBLOB_HPP
-#define SHARE_VM_CODE_CODEBLOB_HPP
+#ifndef SHARE_CODE_CODEBLOB_HPP
+#define SHARE_CODE_CODEBLOB_HPP
#include "asm/codeBuffer.hpp"
#include "compiler/compilerDefinitions.hpp"
@@ -732,4 +732,4 @@ class SafepointBlob: public SingletonBlob {
bool is_safepoint_stub() const { return true; }
};
-#endif // SHARE_VM_CODE_CODEBLOB_HPP
+#endif // SHARE_CODE_CODEBLOB_HPP
diff --git a/src/hotspot/share/code/codeCache.hpp b/src/hotspot/share/code/codeCache.hpp
index a58c0adbdda..11223b359e3 100644
--- a/src/hotspot/share/code/codeCache.hpp
+++ b/src/hotspot/share/code/codeCache.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
*
*/
-#ifndef SHARE_VM_CODE_CODECACHE_HPP
-#define SHARE_VM_CODE_CODECACHE_HPP
+#ifndef SHARE_CODE_CODECACHE_HPP
+#define SHARE_CODE_CODECACHE_HPP
#include "code/codeBlob.hpp"
#include "code/nmethod.hpp"
@@ -430,4 +430,4 @@ struct NMethodFilter {
typedef CodeBlobIterator CompiledMethodIterator;
typedef CodeBlobIterator NMethodIterator;
-#endif // SHARE_VM_CODE_CODECACHE_HPP
+#endif // SHARE_CODE_CODECACHE_HPP
diff --git a/src/hotspot/share/code/codeHeapState.cpp b/src/hotspot/share/code/codeHeapState.cpp
index c21235ea10f..6e8fab9bc31 100644
--- a/src/hotspot/share/code/codeHeapState.cpp
+++ b/src/hotspot/share/code/codeHeapState.cpp
@@ -1,6 +1,6 @@
/*
* Copyright (c) 2018, 2019, Oracle and/or its affiliates. All rights reserved.
- * Copyright (c) 2018 SAP SE. All rights reserved.
+ * Copyright (c) 2018, 2019 SAP SE. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -40,15 +40,17 @@
// contain enough detail to gain initial insight while keeping the
// internal structure sizes in check.
//
-// The CodeHeap is a living thing. Therefore, the aggregate is collected
-// under the CodeCache_lock. The subsequent print steps are only locked
-// against concurrent aggregations. That keeps the impact on
-// "normal operation" (JIT compiler and sweeper activity) to a minimum.
-//
// The second part, which consists of several, independent steps,
// prints the previously collected information with emphasis on
// various aspects.
//
+// The CodeHeap is a living thing. Therefore, protection against concurrent
+// modification (by acquiring the CodeCache_lock) is necessary. It has
+// to be provided by the caller of the analysis functions.
+// If the CodeCache_lock is not held, the analysis functions may print
+// less detailed information or may just do nothing. It is by intention
+// that an unprotected invocation is not abnormally terminated.
+//
// Data collection and printing is done on an "on request" basis.
// While no request is being processed, there is no impact on performance.
// The CodeHeap state analytics do have some memory footprint.
@@ -456,7 +458,7 @@ void CodeHeapState::aggregate(outputStream* out, CodeHeap* heap, const char* gra
bool done = false;
const int min_granules = 256;
const int max_granules = 512*K; // limits analyzable CodeHeap (with segment_granules) to 32M..128M
- // results in StatArray size of 20M (= max_granules * 40 Bytes per element)
+ // results in StatArray size of 24M (= max_granules * 48 Bytes per element)
// For a 1GB CodeHeap, the granule size must be at least 2kB to not violate the max_granles limit.
const char* heapName = get_heapName(heap);
STRINGSTREAM_DECL(ast, out)
@@ -495,6 +497,12 @@ void CodeHeapState::aggregate(outputStream* out, CodeHeap* heap, const char* gra
return;
}
+ if (!CodeCache_lock->owned_by_self()) {
+ printBox(ast, '-', "aggregate function called without holding the CodeCache_lock for ", heapName);
+ STRINGSTREAM_FLUSH("")
+ return;
+ }
+
// Calculate granularity of analysis (and output).
// The CodeHeap is managed (allocated) in segments (units) of CodeCacheSegmentSize.
// The CodeHeap can become fairly large, in particular in productive real-life systems.
@@ -1028,6 +1036,7 @@ void CodeHeapState::aggregate(outputStream* out, CodeHeap* heap, const char* gra
STRINGSTREAM_FLUSH("\n")
// This loop is intentionally printing directly to "out".
+ // It should not print anything, anyway.
out->print("Verifying collected data...");
size_t granule_segs = granule_size>>log2_seg_size;
for (unsigned int ix = 0; ix < granules; ix++) {
@@ -1071,6 +1080,7 @@ void CodeHeapState::aggregate(outputStream* out, CodeHeap* heap, const char* gra
}
// This loop is intentionally printing directly to "out".
+ // It should not print anything, anyway.
if (used_topSizeBlocks > 0) {
unsigned int j = 0;
if (TopSizeArray[0].len != currMax) {
@@ -1166,6 +1176,7 @@ void CodeHeapState::aggregate(outputStream* out, CodeHeap* heap, const char* gra
//---< calculate and fill remaining fields >---
if (FreeArray != NULL) {
// This loop is intentionally printing directly to "out".
+ // It should not print anything, anyway.
for (unsigned int ix = 0; ix < alloc_freeBlocks-1; ix++) {
size_t lenSum = 0;
FreeArray[ix].gap = (unsigned int)((address)FreeArray[ix+1].start - ((address)FreeArray[ix].start + FreeArray[ix].len));
@@ -1223,6 +1234,7 @@ void CodeHeapState::print_usedSpace(outputStream* out, CodeHeap* heap) {
//----------------------------
{
char* low_bound = heap->low_boundary();
+ bool have_CodeCache_lock = CodeCache_lock->owned_by_self();
printBox(ast, '-', "Largest Used Blocks in ", heapName);
print_blobType_legend(ast);
@@ -1241,12 +1253,19 @@ void CodeHeapState::print_usedSpace(outputStream* out, CodeHeap* heap) {
unsigned int printed_topSizeBlocks = 0;
for (unsigned int i = 0; i != tsbStopper; i = TopSizeArray[i].index) {
printed_topSizeBlocks++;
- CodeBlob* this_blob = (CodeBlob*)(heap->find_start(TopSizeArray[i].start));
nmethod* nm = NULL;
- const char* blob_name = "unnamed blob";
- if (this_blob != NULL) {
- blob_name = this_blob->name();
- nm = this_blob->as_nmethod_or_null();
+ const char* blob_name = "unnamed blob or blob name unavailable";
+ // heap->find_start() is safe. Only works on _segmap.
+ // Returns NULL or void*. Returned CodeBlob may be uninitialized.
+ HeapBlock* heapBlock = TopSizeArray[i].start;
+ CodeBlob* this_blob = (CodeBlob*)(heap->find_start(heapBlock));
+ bool blob_is_safe = blob_access_is_safe(this_blob, NULL);
+ if (blob_is_safe) {
+ //---< access these fields only if we own the CodeCache_lock >---
+ if (have_CodeCache_lock) {
+ blob_name = this_blob->name();
+ nm = this_blob->as_nmethod_or_null();
+ }
//---< blob address >---
ast->print(INTPTR_FORMAT, p2i(this_blob));
ast->fill_to(19);
@@ -1262,10 +1281,18 @@ void CodeHeapState::print_usedSpace(outputStream* out, CodeHeap* heap) {
ast->fill_to(33);
}
-
//---< print size, name, and signature (for nMethods) >---
- if ((nm != NULL) && (nm->method() != NULL)) {
+ // access nmethod and Method fields only if we own the CodeCache_lock.
+ // This fact is implicitly transported via nm != NULL.
+ if (CompiledMethod::nmethod_access_is_safe(nm)) {
ResourceMark rm;
+ Method* method = nm->method();
+ if (nm->is_in_use()) {
+ blob_name = method->name_and_sig_as_C_string();
+ }
+ if (nm->is_not_entrant()) {
+ blob_name = method->name_and_sig_as_C_string();
+ }
//---< nMethod size in hex >---
unsigned int total_size = nm->total_size();
ast->print(PTR32_FORMAT, total_size);
@@ -1280,10 +1307,12 @@ void CodeHeapState::print_usedSpace(outputStream* out, CodeHeap* heap) {
ast->print("%5d", nm->hotness_counter());
//---< name and signature >---
ast->fill_to(67+6);
- if (nm->is_in_use()) {blob_name = nm->method()->name_and_sig_as_C_string(); }
- if (nm->is_not_entrant()) {blob_name = nm->method()->name_and_sig_as_C_string(); }
- if (nm->is_not_installed()) {ast->print("%s", " not (yet) installed method "); }
- if (nm->is_zombie()) {ast->print("%s", " zombie method "); }
+ if (nm->is_not_installed()) {
+ ast->print(" not (yet) installed method ");
+ }
+ if (nm->is_zombie()) {
+ ast->print(" zombie method ");
+ }
ast->print("%s", blob_name);
} else {
//---< block size in hex >---
@@ -2083,10 +2112,11 @@ void CodeHeapState::print_names(outputStream* out, CodeHeap* heap) {
}
STRINGSTREAM_DECL(ast, out)
- unsigned int granules_per_line = 128;
- char* low_bound = heap->low_boundary();
- CodeBlob* last_blob = NULL;
- bool name_in_addr_range = true;
+ unsigned int granules_per_line = 128;
+ char* low_bound = heap->low_boundary();
+ CodeBlob* last_blob = NULL;
+ bool name_in_addr_range = true;
+ bool have_CodeCache_lock = CodeCache_lock->owned_by_self();
//---< print at least 128K per block (i.e. between headers) >---
if (granules_per_line*granule_size < 128*K) {
@@ -2121,16 +2151,14 @@ void CodeHeapState::print_names(outputStream* out, CodeHeap* heap) {
StatArray[ix].stub_count + StatArray[ix].dead_count;
if (nBlobs > 0 ) {
for (unsigned int is = 0; is < granule_size; is+=(unsigned int)seg_size) {
- // heap->find_start() is safe. Only working with _segmap. Returns NULL or void*. Returned CodeBlob may be uninitialized.
- CodeBlob* this_blob = (CodeBlob *)(heap->find_start(low_bound+ix*granule_size+is));
- bool blob_initialized = (this_blob != NULL) && (this_blob->header_size() >= 0) && (this_blob->relocation_size() >= 0) &&
- ((address)this_blob + this_blob->header_size() == (address)(this_blob->relocation_begin())) &&
- ((address)this_blob + CodeBlob::align_code_offset(this_blob->header_size() + this_blob->relocation_size()) == (address)(this_blob->content_begin())) &&
- os::is_readable_pointer((address)(this_blob->relocation_begin())) &&
- os::is_readable_pointer(this_blob->content_begin());
+ // heap->find_start() is safe. Only works on _segmap.
+ // Returns NULL or void*. Returned CodeBlob may be uninitialized.
+ char* this_seg = low_bound + ix*granule_size + is;
+ CodeBlob* this_blob = (CodeBlob*)(heap->find_start(this_seg));
+ bool blob_is_safe = blob_access_is_safe(this_blob, NULL);
// blob could have been flushed, freed, and merged.
// this_blob < last_blob is an indicator for that.
- if (blob_initialized && (this_blob > last_blob)) {
+ if (blob_is_safe && (this_blob > last_blob)) {
last_blob = this_blob;
//---< get type and name >---
@@ -2138,12 +2166,22 @@ void CodeHeapState::print_names(outputStream* out, CodeHeap* heap) {
if (segment_granules) {
cbType = (blobType)StatArray[ix].type;
} else {
- cbType = get_cbType(this_blob);
+ //---< access these fields only if we own the CodeCache_lock >---
+ if (have_CodeCache_lock) {
+ cbType = get_cbType(this_blob);
+ }
}
- // this_blob->name() could return NULL if no name was given to CTOR. Inlined, maybe invisible on stack
- const char* blob_name = this_blob->name();
- if ((blob_name == NULL) || !os::is_readable_pointer(blob_name)) {
- blob_name = "";
+
+ //---< access these fields only if we own the CodeCache_lock >---
+ const char* blob_name = "";
+ nmethod* nm = NULL;
+ if (have_CodeCache_lock) {
+ blob_name = this_blob->name();
+ nm = this_blob->as_nmethod_or_null();
+ // this_blob->name() could return NULL if no name was given to CTOR. Inlined, maybe invisible on stack
+ if ((blob_name == NULL) || !os::is_readable_pointer(blob_name)) {
+ blob_name = "";
+ }
}
//---< print table header for new print range >---
@@ -2163,8 +2201,8 @@ void CodeHeapState::print_names(outputStream* out, CodeHeap* heap) {
ast->print("(+" PTR32_FORMAT ")", (unsigned int)((char*)this_blob-low_bound));
ast->fill_to(33);
- // this_blob->as_nmethod_or_null() is safe. Inlined, maybe invisible on stack.
- nmethod* nm = this_blob->as_nmethod_or_null();
+ // access nmethod and Method fields only if we own the CodeCache_lock.
+ // This fact is implicitly transported via nm != NULL.
if (CompiledMethod::nmethod_access_is_safe(nm)) {
Method* method = nm->method();
ResourceMark rm;
@@ -2201,14 +2239,17 @@ void CodeHeapState::print_names(outputStream* out, CodeHeap* heap) {
} else {
ast->print("%s", blob_name);
}
- } else {
+ } else if (blob_is_safe) {
ast->fill_to(62+6);
ast->print("%s", blobTypeName[cbType]);
ast->fill_to(82+6);
ast->print("%s", blob_name);
+ } else {
+ ast->fill_to(62+6);
+ ast->print("");
}
STRINGSTREAM_FLUSH_LOCKED("\n")
- } else if (!blob_initialized && (this_blob != last_blob) && (this_blob != NULL)) {
+ } else if (!blob_is_safe && (this_blob != last_blob) && (this_blob != NULL)) {
last_blob = this_blob;
STRINGSTREAM_FLUSH_LOCKED("\n")
}
@@ -2375,16 +2416,31 @@ CodeHeapState::blobType CodeHeapState::get_cbType(CodeBlob* cb) {
if (cb->is_method_handles_adapter_blob()) return mh_adapterBlob;
if (cb->is_buffer_blob()) return bufferBlob;
- nmethod* nm = cb->as_nmethod_or_null();
- if (nm != NULL) { // no is_readable check required, nm = (nmethod*)cb.
- if (nm->is_not_installed()) return nMethod_inconstruction;
- if (nm->is_zombie()) return nMethod_dead;
- if (nm->is_unloaded()) return nMethod_unloaded;
- if (nm->is_in_use()) return nMethod_inuse;
- if (nm->is_alive() && !(nm->is_not_entrant())) return nMethod_notused;
- if (nm->is_alive()) return nMethod_alive;
- return nMethod_dead;
+ //---< access these fields only if we own the CodeCache_lock >---
+ // Should be ensured by caller. aggregate() amd print_names() do that.
+ if (CodeCache_lock->owned_by_self()) {
+ nmethod* nm = cb->as_nmethod_or_null();
+ if (nm != NULL) { // no is_readable check required, nm = (nmethod*)cb.
+ if (nm->is_not_installed()) return nMethod_inconstruction;
+ if (nm->is_zombie()) return nMethod_dead;
+ if (nm->is_unloaded()) return nMethod_unloaded;
+ if (nm->is_in_use()) return nMethod_inuse;
+ if (nm->is_alive() && !(nm->is_not_entrant())) return nMethod_notused;
+ if (nm->is_alive()) return nMethod_alive;
+ return nMethod_dead;
+ }
}
}
return noType;
}
+
+bool CodeHeapState::blob_access_is_safe(CodeBlob* this_blob, CodeBlob* prev_blob) {
+ return (this_blob != NULL) && // a blob must have been found, obviously
+ ((this_blob == prev_blob) || (prev_blob == NULL)) && // when re-checking, the same blob must have been found
+ (this_blob->header_size() >= 0) &&
+ (this_blob->relocation_size() >= 0) &&
+ ((address)this_blob + this_blob->header_size() == (address)(this_blob->relocation_begin())) &&
+ ((address)this_blob + CodeBlob::align_code_offset(this_blob->header_size() + this_blob->relocation_size()) == (address)(this_blob->content_begin())) &&
+ os::is_readable_pointer((address)(this_blob->relocation_begin())) &&
+ os::is_readable_pointer(this_blob->content_begin());
+}
diff --git a/src/hotspot/share/code/codeHeapState.hpp b/src/hotspot/share/code/codeHeapState.hpp
index 46b860ba526..076d43d34ed 100644
--- a/src/hotspot/share/code/codeHeapState.hpp
+++ b/src/hotspot/share/code/codeHeapState.hpp
@@ -1,6 +1,6 @@
/*
- * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved.
- * Copyright (c) 2018 SAP SE. All rights reserved.
+ * Copyright (c) 2018, 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2019 SAP SE. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -95,6 +95,7 @@ class CodeHeapState : public CHeapObj {
static void print_line_delim(outputStream* out, bufferedStream *sst, char* low_bound, unsigned int ix, unsigned int gpl);
static void print_line_delim(outputStream* out, outputStream *sst, char* low_bound, unsigned int ix, unsigned int gpl);
static blobType get_cbType(CodeBlob* cb);
+ static bool blob_access_is_safe(CodeBlob* this_blob, CodeBlob* prev_blob);
public:
static void discard(outputStream* out, CodeHeap* heap);
diff --git a/src/hotspot/share/code/compiledIC.cpp b/src/hotspot/share/code/compiledIC.cpp
index d1c31f69acc..8aec3d77d29 100644
--- a/src/hotspot/share/code/compiledIC.cpp
+++ b/src/hotspot/share/code/compiledIC.cpp
@@ -482,10 +482,10 @@ bool CompiledIC::set_to_monomorphic(CompiledICInfo& info) {
if (TraceICs) {
ResourceMark rm(thread);
assert(info.cached_metadata() == NULL || info.cached_metadata()->is_klass(), "must be");
- tty->print_cr ("IC@" INTPTR_FORMAT ": monomorphic to compiled (rcvr klass) %s: %s",
+ tty->print_cr ("IC@" INTPTR_FORMAT ": monomorphic to compiled (rcvr klass = %s) %s",
p2i(instruction_address()),
- ((Klass*)info.cached_metadata())->print_value_string(),
- (safe) ? "" : "via stub");
+ (info.cached_metadata() != NULL) ? ((Klass*)info.cached_metadata())->print_value_string() : "NULL",
+ (safe) ? "" : " via stub");
}
}
// We can't check this anymore. With lazy deopt we could have already
diff --git a/src/hotspot/share/code/compiledIC.hpp b/src/hotspot/share/code/compiledIC.hpp
index 803b6b12c10..a1d7583b7d0 100644
--- a/src/hotspot/share/code/compiledIC.hpp
+++ b/src/hotspot/share/code/compiledIC.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
*
*/
-#ifndef SHARE_VM_CODE_COMPILEDIC_HPP
-#define SHARE_VM_CODE_COMPILEDIC_HPP
+#ifndef SHARE_CODE_COMPILEDIC_HPP
+#define SHARE_CODE_COMPILEDIC_HPP
#include "code/nativeInst.hpp"
#include "interpreter/linkResolver.hpp"
@@ -454,4 +454,4 @@ private:
virtual const char* name() const { return "CompiledDirectStaticCall"; }
};
-#endif // SHARE_VM_CODE_COMPILEDIC_HPP
+#endif // SHARE_CODE_COMPILEDIC_HPP
diff --git a/src/hotspot/share/code/compiledMethod.hpp b/src/hotspot/share/code/compiledMethod.hpp
index 66a2326dfe4..3c5f4eaa2da 100644
--- a/src/hotspot/share/code/compiledMethod.hpp
+++ b/src/hotspot/share/code/compiledMethod.hpp
@@ -22,8 +22,8 @@
*
*/
-#ifndef SHARE_VM_CODE_COMPILEDMETHOD_HPP
-#define SHARE_VM_CODE_COMPILEDMETHOD_HPP
+#ifndef SHARE_CODE_COMPILEDMETHOD_HPP
+#define SHARE_CODE_COMPILEDMETHOD_HPP
#include "code/codeBlob.hpp"
#include "code/pcDesc.hpp"
@@ -414,4 +414,4 @@ protected:
nmethod* _scavenge_root_link; // from CodeCache::scavenge_root_nmethods
};
-#endif //SHARE_VM_CODE_COMPILEDMETHOD_HPP
+#endif // SHARE_CODE_COMPILEDMETHOD_HPP
diff --git a/src/hotspot/share/code/compiledMethod.inline.hpp b/src/hotspot/share/code/compiledMethod.inline.hpp
index d6381df60c4..d69dc799429 100644
--- a/src/hotspot/share/code/compiledMethod.inline.hpp
+++ b/src/hotspot/share/code/compiledMethod.inline.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2017, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
*
*/
-#ifndef SHARE_VM_CODE_COMPILEDMETHOD_INLINE_HPP
-#define SHARE_VM_CODE_COMPILEDMETHOD_INLINE_HPP
+#ifndef SHARE_CODE_COMPILEDMETHOD_INLINE_HPP
+#define SHARE_CODE_COMPILEDMETHOD_INLINE_HPP
#include "code/compiledMethod.hpp"
#include "code/nativeInst.hpp"
@@ -77,4 +77,4 @@ address ExceptionCache::handler_at(int index) {
inline void ExceptionCache::increment_count() { OrderAccess::release_store(&_count, _count + 1); }
-#endif //SHARE_VM_CODE_COMPILEDMETHOD_INLINE_HPP
+#endif // SHARE_CODE_COMPILEDMETHOD_INLINE_HPP
diff --git a/src/hotspot/share/code/compressedStream.hpp b/src/hotspot/share/code/compressedStream.hpp
index d3d1b73d90d..9e655329d7f 100644
--- a/src/hotspot/share/code/compressedStream.hpp
+++ b/src/hotspot/share/code/compressedStream.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
*
*/
-#ifndef SHARE_VM_CODE_COMPRESSEDSTREAM_HPP
-#define SHARE_VM_CODE_COMPRESSEDSTREAM_HPP
+#ifndef SHARE_CODE_COMPRESSEDSTREAM_HPP
+#define SHARE_CODE_COMPRESSEDSTREAM_HPP
#include "memory/allocation.hpp"
@@ -157,4 +157,4 @@ class CompressedWriteStream : public CompressedStream {
void write_long(jlong value); // write_signed_int()
};
-#endif // SHARE_VM_CODE_COMPRESSEDSTREAM_HPP
+#endif // SHARE_CODE_COMPRESSEDSTREAM_HPP
diff --git a/src/hotspot/share/code/debugInfo.hpp b/src/hotspot/share/code/debugInfo.hpp
index cbd9aceac2f..b7787c3fb87 100644
--- a/src/hotspot/share/code/debugInfo.hpp
+++ b/src/hotspot/share/code/debugInfo.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
*
*/
-#ifndef SHARE_VM_CODE_DEBUGINFO_HPP
-#define SHARE_VM_CODE_DEBUGINFO_HPP
+#ifndef SHARE_CODE_DEBUGINFO_HPP
+#define SHARE_CODE_DEBUGINFO_HPP
#include "code/compressedStream.hpp"
#include "code/location.hpp"
@@ -301,4 +301,4 @@ class DebugInfoWriteStream : public CompressedWriteStream {
void write_metadata(Metadata* m);
};
-#endif // SHARE_VM_CODE_DEBUGINFO_HPP
+#endif // SHARE_CODE_DEBUGINFO_HPP
diff --git a/src/hotspot/share/code/debugInfoRec.hpp b/src/hotspot/share/code/debugInfoRec.hpp
index 26dacd54c06..2f64d6b1bd4 100644
--- a/src/hotspot/share/code/debugInfoRec.hpp
+++ b/src/hotspot/share/code/debugInfoRec.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
*
*/
-#ifndef SHARE_VM_CODE_DEBUGINFOREC_HPP
-#define SHARE_VM_CODE_DEBUGINFOREC_HPP
+#ifndef SHARE_CODE_DEBUGINFOREC_HPP
+#define SHARE_CODE_DEBUGINFOREC_HPP
#include "ci/ciClassList.hpp"
#include "ci/ciInstanceKlass.hpp"
@@ -208,4 +208,4 @@ class DebugInformationRecorder: public ResourceObj {
enum { serialized_null = 0 };
};
-#endif // SHARE_VM_CODE_DEBUGINFOREC_HPP
+#endif // SHARE_CODE_DEBUGINFOREC_HPP
diff --git a/src/hotspot/share/code/dependencies.hpp b/src/hotspot/share/code/dependencies.hpp
index a220af0cec5..deb33ef7874 100644
--- a/src/hotspot/share/code/dependencies.hpp
+++ b/src/hotspot/share/code/dependencies.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2005, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
*
*/
-#ifndef SHARE_VM_CODE_DEPENDENCIES_HPP
-#define SHARE_VM_CODE_DEPENDENCIES_HPP
+#ifndef SHARE_CODE_DEPENDENCIES_HPP
+#define SHARE_CODE_DEPENDENCIES_HPP
#include "ci/ciCallSite.hpp"
#include "ci/ciKlass.hpp"
@@ -799,4 +799,4 @@ class CallSiteDepChange : public DepChange {
oop method_handle() const { return _method_handle(); }
};
-#endif // SHARE_VM_CODE_DEPENDENCIES_HPP
+#endif // SHARE_CODE_DEPENDENCIES_HPP
diff --git a/src/hotspot/share/code/dependencyContext.hpp b/src/hotspot/share/code/dependencyContext.hpp
index c113a533df9..76fa92dd832 100644
--- a/src/hotspot/share/code/dependencyContext.hpp
+++ b/src/hotspot/share/code/dependencyContext.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2015, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
*
*/
-#ifndef SHARE_VM_CODE_DEPENDENCYCONTEXT_HPP
-#define SHARE_VM_CODE_DEPENDENCYCONTEXT_HPP
+#ifndef SHARE_CODE_DEPENDENCYCONTEXT_HPP
+#define SHARE_CODE_DEPENDENCYCONTEXT_HPP
#include "memory/allocation.hpp"
#include "oops/oop.hpp"
@@ -132,4 +132,4 @@ class DependencyContext : public StackObj {
bool is_dependent_nmethod(nmethod* nm);
#endif //PRODUCT
};
-#endif // SHARE_VM_CODE_DEPENDENCYCONTEXT_HPP
+#endif // SHARE_CODE_DEPENDENCYCONTEXT_HPP
diff --git a/src/hotspot/share/code/exceptionHandlerTable.hpp b/src/hotspot/share/code/exceptionHandlerTable.hpp
index 0a3fc8be4fc..e5a407ec0d2 100644
--- a/src/hotspot/share/code/exceptionHandlerTable.hpp
+++ b/src/hotspot/share/code/exceptionHandlerTable.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
*
*/
-#ifndef SHARE_VM_CODE_EXCEPTIONHANDLERTABLE_HPP
-#define SHARE_VM_CODE_EXCEPTIONHANDLERTABLE_HPP
+#ifndef SHARE_CODE_EXCEPTIONHANDLERTABLE_HPP
+#define SHARE_CODE_EXCEPTIONHANDLERTABLE_HPP
#include "memory/allocation.hpp"
#include "oops/method.hpp"
@@ -163,4 +163,4 @@ public:
void verify(nmethod *nm) const;
};
-#endif // SHARE_VM_CODE_EXCEPTIONHANDLERTABLE_HPP
+#endif // SHARE_CODE_EXCEPTIONHANDLERTABLE_HPP
diff --git a/src/hotspot/share/code/icBuffer.hpp b/src/hotspot/share/code/icBuffer.hpp
index 24621cac6b4..5289738fa0d 100644
--- a/src/hotspot/share/code/icBuffer.hpp
+++ b/src/hotspot/share/code/icBuffer.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
*
*/
-#ifndef SHARE_VM_CODE_ICBUFFER_HPP
-#define SHARE_VM_CODE_ICBUFFER_HPP
+#ifndef SHARE_CODE_ICBUFFER_HPP
+#define SHARE_CODE_ICBUFFER_HPP
#include "asm/codeBuffer.hpp"
#include "code/stubs.hpp"
@@ -178,4 +178,4 @@ class InlineCacheBuffer: public AllStatic {
static void* cached_value_for(CompiledIC *ic);
};
-#endif // SHARE_VM_CODE_ICBUFFER_HPP
+#endif // SHARE_CODE_ICBUFFER_HPP
diff --git a/src/hotspot/share/code/location.hpp b/src/hotspot/share/code/location.hpp
index 50903507623..b90dd939512 100644
--- a/src/hotspot/share/code/location.hpp
+++ b/src/hotspot/share/code/location.hpp
@@ -22,8 +22,8 @@
*
*/
-#ifndef SHARE_VM_CODE_LOCATION_HPP
-#define SHARE_VM_CODE_LOCATION_HPP
+#ifndef SHARE_CODE_LOCATION_HPP
+#define SHARE_CODE_LOCATION_HPP
#include "asm/assembler.hpp"
#include "code/vmreg.hpp"
@@ -123,4 +123,4 @@ class Location {
static bool legal_offset_in_bytes(int offset_in_bytes);
};
-#endif // SHARE_VM_CODE_LOCATION_HPP
+#endif // SHARE_CODE_LOCATION_HPP
diff --git a/src/hotspot/share/code/nativeInst.hpp b/src/hotspot/share/code/nativeInst.hpp
index dd8f7ee2739..3cfa7dbbc33 100644
--- a/src/hotspot/share/code/nativeInst.hpp
+++ b/src/hotspot/share/code/nativeInst.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2014, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -22,11 +22,11 @@
*
*/
-#ifndef SHARE_VM_CODE_NATIVEINST_HPP
-#define SHARE_VM_CODE_NATIVEINST_HPP
+#ifndef SHARE_CODE_NATIVEINST_HPP
+#define SHARE_CODE_NATIVEINST_HPP
#include "utilities/macros.hpp"
#include CPU_HEADER(nativeInst)
-#endif // SHARE_VM_CODE_NATIVEINST_HPP
+#endif // SHARE_CODE_NATIVEINST_HPP
diff --git a/src/hotspot/share/code/nmethod.cpp b/src/hotspot/share/code/nmethod.cpp
index 3c422fcc08b..340be95ba7d 100644
--- a/src/hotspot/share/code/nmethod.cpp
+++ b/src/hotspot/share/code/nmethod.cpp
@@ -1100,7 +1100,11 @@ void nmethod::make_unloaded() {
"must be at safepoint");
// Unregister must be done before the state change
- Universe::heap()->unregister_nmethod(this);
+ {
+ MutexLockerEx ml(SafepointSynchronize::is_at_safepoint() ? NULL : CodeCache_lock,
+ Mutex::_no_safepoint_check_flag);
+ Universe::heap()->unregister_nmethod(this);
+ }
// Log the unloading.
log_state_change();
@@ -1159,6 +1163,19 @@ void nmethod::log_state_change() const {
}
}
+void nmethod::unlink_from_method(bool acquire_lock) {
+ // We need to check if both the _code and _from_compiled_code_entry_point
+ // refer to this nmethod because there is a race in setting these two fields
+ // in Method* as seen in bugid 4947125.
+ // If the vep() points to the zombie nmethod, the memory for the nmethod
+ // could be flushed and the compiler and vtable stubs could still call
+ // through it.
+ if (method() != NULL && (method()->code() == this ||
+ method()->from_compiled_entry() == verified_entry_point())) {
+ method()->clear_code(acquire_lock);
+ }
+}
+
/**
* Common functionality for both make_not_entrant and make_zombie
*/
@@ -1246,17 +1263,7 @@ bool nmethod::make_not_entrant_or_zombie(int state) {
JVMCI_ONLY(maybe_invalidate_installed_code());
// Remove nmethod from method.
- // We need to check if both the _code and _from_compiled_code_entry_point
- // refer to this nmethod because there is a race in setting these two fields
- // in Method* as seen in bugid 4947125.
- // If the vep() points to the zombie nmethod, the memory for the nmethod
- // could be flushed and the compiler and vtable stubs could still call
- // through it.
- if (method() != NULL && (method()->code() == this ||
- method()->from_compiled_entry() == verified_entry_point())) {
- HandleMark hm;
- method()->clear_code(false /* already owns Patching_lock */);
- }
+ unlink_from_method(false /* already owns Patching_lock */);
} // leave critical region under Patching_lock
#ifdef ASSERT
diff --git a/src/hotspot/share/code/nmethod.hpp b/src/hotspot/share/code/nmethod.hpp
index 234ad2c0413..450a6266d7a 100644
--- a/src/hotspot/share/code/nmethod.hpp
+++ b/src/hotspot/share/code/nmethod.hpp
@@ -22,8 +22,8 @@
*
*/
-#ifndef SHARE_VM_CODE_NMETHOD_HPP
-#define SHARE_VM_CODE_NMETHOD_HPP
+#ifndef SHARE_CODE_NMETHOD_HPP
+#define SHARE_CODE_NMETHOD_HPP
#include "code/compiledMethod.hpp"
@@ -377,6 +377,8 @@ class nmethod : public CompiledMethod {
int comp_level() const { return _comp_level; }
+ void unlink_from_method(bool acquire_lock);
+
// Support for oops in scopes and relocs:
// Note: index 0 is reserved for null.
oop oop_at(int index) const;
@@ -668,4 +670,4 @@ class nmethodLocker : public StackObj {
}
};
-#endif // SHARE_VM_CODE_NMETHOD_HPP
+#endif // SHARE_CODE_NMETHOD_HPP
diff --git a/src/hotspot/share/code/oopRecorder.hpp b/src/hotspot/share/code/oopRecorder.hpp
index adb32cb5d97..24b044ab01f 100644
--- a/src/hotspot/share/code/oopRecorder.hpp
+++ b/src/hotspot/share/code/oopRecorder.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
*
*/
-#ifndef SHARE_VM_CODE_OOPRECORDER_HPP
-#define SHARE_VM_CODE_OOPRECORDER_HPP
+#ifndef SHARE_CODE_OOPRECORDER_HPP
+#define SHARE_CODE_OOPRECORDER_HPP
#include "memory/universe.hpp"
#include "runtime/handles.hpp"
@@ -257,4 +257,4 @@ class OopRecorder : public ResourceObj {
};
-#endif // SHARE_VM_CODE_OOPRECORDER_HPP
+#endif // SHARE_CODE_OOPRECORDER_HPP
diff --git a/src/hotspot/share/code/pcDesc.hpp b/src/hotspot/share/code/pcDesc.hpp
index f98e976c3e7..373af434389 100644
--- a/src/hotspot/share/code/pcDesc.hpp
+++ b/src/hotspot/share/code/pcDesc.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
*
*/
-#ifndef SHARE_VM_CODE_PCDESC_HPP
-#define SHARE_VM_CODE_PCDESC_HPP
+#ifndef SHARE_CODE_PCDESC_HPP
+#define SHARE_CODE_PCDESC_HPP
// PcDescs map a physical PC (given as offset from start of nmethod) to
@@ -96,4 +96,4 @@ class PcDesc {
bool verify(CompiledMethod* code);
};
-#endif // SHARE_VM_CODE_PCDESC_HPP
+#endif // SHARE_CODE_PCDESC_HPP
diff --git a/src/hotspot/share/code/relocInfo.hpp b/src/hotspot/share/code/relocInfo.hpp
index 69afef49499..4e073c19081 100644
--- a/src/hotspot/share/code/relocInfo.hpp
+++ b/src/hotspot/share/code/relocInfo.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -22,13 +22,14 @@
*
*/
-#ifndef SHARE_VM_CODE_RELOCINFO_HPP
-#define SHARE_VM_CODE_RELOCINFO_HPP
+#ifndef SHARE_CODE_RELOCINFO_HPP
+#define SHARE_CODE_RELOCINFO_HPP
#include "runtime/os.hpp"
#include "utilities/macros.hpp"
class nmethod;
+class CodeBlob;
class CompiledMethod;
class Metadata;
class NativeMovConstReg;
@@ -1391,4 +1392,4 @@ inline RelocIterator::RelocIterator(CompiledMethod* nm, address begin, address l
initialize(nm, begin, limit);
}
-#endif // SHARE_VM_CODE_RELOCINFO_HPP
+#endif // SHARE_CODE_RELOCINFO_HPP
diff --git a/src/hotspot/share/code/relocInfo_ext.hpp b/src/hotspot/share/code/relocInfo_ext.hpp
index b8d1b10732a..49093b8422a 100644
--- a/src/hotspot/share/code/relocInfo_ext.hpp
+++ b/src/hotspot/share/code/relocInfo_ext.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
*
*/
-#ifndef SHARE_VM_CODE_RELOCINFO_EXT_HPP
-#define SHARE_VM_CODE_RELOCINFO_EXT_HPP
+#ifndef SHARE_CODE_RELOCINFO_EXT_HPP
+#define SHARE_CODE_RELOCINFO_EXT_HPP
// symbolic_Relocation allows to anotate some addresses in the generated code.
//
@@ -58,4 +58,4 @@ class symbolic_Relocation : AllStatic {
static address symbolic_value(symbolic_reference t);
};
-#endif // SHARE_VM_CODE_RELOCINFO_EXT_HPP
+#endif // SHARE_CODE_RELOCINFO_EXT_HPP
diff --git a/src/hotspot/share/code/scopeDesc.hpp b/src/hotspot/share/code/scopeDesc.hpp
index f7ed903f771..44c7f160156 100644
--- a/src/hotspot/share/code/scopeDesc.hpp
+++ b/src/hotspot/share/code/scopeDesc.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
*
*/
-#ifndef SHARE_VM_CODE_SCOPEDESC_HPP
-#define SHARE_VM_CODE_SCOPEDESC_HPP
+#ifndef SHARE_CODE_SCOPEDESC_HPP
+#define SHARE_CODE_SCOPEDESC_HPP
#include "code/debugInfo.hpp"
#include "code/pcDesc.hpp"
@@ -141,4 +141,4 @@ class ScopeDesc : public ResourceObj {
#endif
};
-#endif // SHARE_VM_CODE_SCOPEDESC_HPP
+#endif // SHARE_CODE_SCOPEDESC_HPP
diff --git a/src/hotspot/share/code/stubs.hpp b/src/hotspot/share/code/stubs.hpp
index ffd3cf4aca0..60ca20679cc 100644
--- a/src/hotspot/share/code/stubs.hpp
+++ b/src/hotspot/share/code/stubs.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
*
*/
-#ifndef SHARE_VM_CODE_STUBS_HPP
-#define SHARE_VM_CODE_STUBS_HPP
+#ifndef SHARE_CODE_STUBS_HPP
+#define SHARE_CODE_STUBS_HPP
#include "asm/codeBuffer.hpp"
#include "memory/allocation.hpp"
@@ -215,4 +215,4 @@ class StubQueue: public CHeapObj {
};
-#endif // SHARE_VM_CODE_STUBS_HPP
+#endif // SHARE_CODE_STUBS_HPP
diff --git a/src/hotspot/share/code/vmreg.hpp b/src/hotspot/share/code/vmreg.hpp
index 956a8577dfa..4afdcad5b07 100644
--- a/src/hotspot/share/code/vmreg.hpp
+++ b/src/hotspot/share/code/vmreg.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
*
*/
-#ifndef SHARE_VM_CODE_VMREG_HPP
-#define SHARE_VM_CODE_VMREG_HPP
+#ifndef SHARE_CODE_VMREG_HPP
+#define SHARE_CODE_VMREG_HPP
#include "asm/register.hpp"
#include "utilities/globalDefinitions.hpp"
@@ -197,4 +197,4 @@ public:
VMRegPair() { _second = VMRegImpl::Bad(); _first = VMRegImpl::Bad(); }
};
-#endif // SHARE_VM_CODE_VMREG_HPP
+#endif // SHARE_CODE_VMREG_HPP
diff --git a/src/hotspot/share/code/vmreg.inline.hpp b/src/hotspot/share/code/vmreg.inline.hpp
index 1124e66ea8a..ad6f5af4170 100644
--- a/src/hotspot/share/code/vmreg.inline.hpp
+++ b/src/hotspot/share/code/vmreg.inline.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2014, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -22,11 +22,11 @@
*
*/
-#ifndef SHARE_VM_CODE_VMREG_INLINE_HPP
-#define SHARE_VM_CODE_VMREG_INLINE_HPP
+#ifndef SHARE_CODE_VMREG_INLINE_HPP
+#define SHARE_CODE_VMREG_INLINE_HPP
#include "asm/register.hpp"
#include "code/vmreg.hpp"
#include CPU_HEADER_INLINE(vmreg)
-#endif // SHARE_VM_CODE_VMREG_INLINE_HPP
+#endif // SHARE_CODE_VMREG_INLINE_HPP
diff --git a/src/hotspot/share/code/vtableStubs.hpp b/src/hotspot/share/code/vtableStubs.hpp
index 415bfb2688d..0816efd3460 100644
--- a/src/hotspot/share/code/vtableStubs.hpp
+++ b/src/hotspot/share/code/vtableStubs.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
*
*/
-#ifndef SHARE_VM_CODE_VTABLESTUBS_HPP
-#define SHARE_VM_CODE_VTABLESTUBS_HPP
+#ifndef SHARE_CODE_VTABLESTUBS_HPP
+#define SHARE_CODE_VTABLESTUBS_HPP
#include "asm/macroAssembler.hpp"
#include "code/vmreg.hpp"
@@ -181,4 +181,4 @@ class VtableStub {
};
-#endif // SHARE_VM_CODE_VTABLESTUBS_HPP
+#endif // SHARE_CODE_VTABLESTUBS_HPP
diff --git a/src/hotspot/share/compiler/abstractCompiler.hpp b/src/hotspot/share/compiler/abstractCompiler.hpp
index 654dafe5525..252bf4c157e 100644
--- a/src/hotspot/share/compiler/abstractCompiler.hpp
+++ b/src/hotspot/share/compiler/abstractCompiler.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1999, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1999, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
*
*/
-#ifndef SHARE_VM_COMPILER_ABSTRACTCOMPILER_HPP
-#define SHARE_VM_COMPILER_ABSTRACTCOMPILER_HPP
+#ifndef SHARE_COMPILER_ABSTRACTCOMPILER_HPP
+#define SHARE_COMPILER_ABSTRACTCOMPILER_HPP
#include "ci/compilerInterface.hpp"
#include "compiler/compilerDefinitions.hpp"
@@ -184,4 +184,4 @@ class AbstractCompiler : public CHeapObj {
#endif
};
-#endif // SHARE_VM_COMPILER_ABSTRACTCOMPILER_HPP
+#endif // SHARE_COMPILER_ABSTRACTCOMPILER_HPP
diff --git a/src/hotspot/share/compiler/compileBroker.cpp b/src/hotspot/share/compiler/compileBroker.cpp
index c8204120eb8..8b744c6554e 100644
--- a/src/hotspot/share/compiler/compileBroker.cpp
+++ b/src/hotspot/share/compiler/compileBroker.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1999, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1999, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -2045,6 +2045,7 @@ void CompileBroker::invoke_compiler_on_method(CompileTask* task) {
Method* target_handle = task->method();
int compilable = ciEnv::MethodCompilable;
const char* failure_reason = NULL;
+ bool failure_reason_on_C_heap = false;
const char* retry_message = NULL;
int system_dictionary_modification_counter;
@@ -2071,6 +2072,7 @@ void CompileBroker::invoke_compiler_on_method(CompileTask* task) {
jvmci->compile_method(method, osr_bci, &env);
failure_reason = env.failure_reason();
+ failure_reason_on_C_heap = env.failure_reason_on_C_heap();
if (!env.retryable()) {
retry_message = "not retryable";
compilable = ciEnv::MethodCompilable_not_at_tier;
@@ -2146,7 +2148,7 @@ void CompileBroker::invoke_compiler_on_method(CompileTask* task) {
pop_jni_handle_block();
if (failure_reason != NULL) {
- task->set_failure_reason(failure_reason);
+ task->set_failure_reason(failure_reason, failure_reason_on_C_heap);
if (_compilation_log != NULL) {
_compilation_log->log_failure(thread, task, failure_reason, retry_message);
}
@@ -2212,15 +2214,6 @@ void CompileBroker::invoke_compiler_on_method(CompileTask* task) {
// the point somewhat) our clearing of the bits must be occurring
// only after the setting of the bits. See also 14012000 above.
method->clear_queued_for_compilation();
-
-#ifdef ASSERT
- if (CollectedHeap::fired_fake_oom()) {
- // The current compile received a fake OOM during compilation so
- // go ahead and exit the VM since the test apparently succeeded
- tty->print_cr("*** Shutting down VM after successful fake OOM");
- vm_exit(0);
- }
-#endif
}
/**
@@ -2672,6 +2665,7 @@ void CompileBroker::print_info(outputStream *out) {
// preventing concurrently printing threads from stalling a long time.
void CompileBroker::print_heapinfo(outputStream* out, const char* function, const char* granularity) {
TimeStamp ts_total;
+ TimeStamp ts_global;
TimeStamp ts;
bool allFun = !strcmp(function, "all");
@@ -2701,35 +2695,43 @@ void CompileBroker::print_heapinfo(outputStream* out, const char* function, cons
}
// We hold the CodeHeapStateAnalytics_lock all the time, from here until we leave this function.
- // That helps us getting a consistent view on the CodeHeap, at least for the "all" function.
+ // That prevents another thread from destroying our view on the CodeHeap.
// When we request individual parts of the analysis via the jcmd interface, it is possible
// that in between another thread (another jcmd user or the vm running into CodeCache OOM)
// updated the aggregated data. That's a tolerable tradeoff because we can't hold a lock
// across user interaction.
+ // Acquire this lock before acquiring the CodeCache_lock.
+ // CodeHeapStateAnalytics_lock could be held by a concurrent thread for a long time,
+ // leading to an unnecessarily long hold time of the CodeCache_lock.
ts.update(); // record starting point
MutexLockerEx mu1(CodeHeapStateAnalytics_lock, Mutex::_no_safepoint_check_flag);
- out->cr();
- out->print_cr("__ CodeHeapStateAnalytics lock wait took %10.3f seconds _________", ts.seconds());
- out->cr();
+ out->print_cr("\n__ CodeHeapStateAnalytics lock wait took %10.3f seconds _________\n", ts.seconds());
+
+ // If we serve an "allFun" call, it is beneficial to hold the CodeCache_lock
+ // for the entire duration of aggregation and printing. That makes sure
+ // we see a consistent picture and do not run into issues caused by
+ // the CodeHeap being altered concurrently.
+ Monitor* global_lock = allFun ? CodeCache_lock : NULL;
+ Monitor* function_lock = allFun ? NULL : CodeCache_lock;
+ ts_global.update(); // record starting point
+ MutexLockerEx mu2(global_lock, Mutex::_no_safepoint_check_flag);
+ if (global_lock != NULL) {
+ out->print_cr("\n__ CodeCache (global) lock wait took %10.3f seconds _________\n", ts_global.seconds());
+ ts_global.update(); // record starting point
+ }
if (aggregate) {
- // It is sufficient to hold the CodeCache_lock only for the aggregate step.
- // All other functions operate on aggregated data - except MethodNames, but that should be safe.
- // The separate CodeHeapStateAnalytics_lock protects the printing functions against
- // concurrent aggregate steps. Acquire this lock before acquiring the CodeCache_lock.
- // CodeHeapStateAnalytics_lock could be held by a concurrent thread for a long time,
- // leading to an unnecessarily long hold time of the CodeCache_lock.
ts.update(); // record starting point
- MutexLockerEx mu2(CodeCache_lock, Mutex::_no_safepoint_check_flag);
- out->cr();
- out->print_cr("__ CodeCache lock wait took %10.3f seconds _________", ts.seconds());
- out->cr();
+ MutexLockerEx mu3(function_lock, Mutex::_no_safepoint_check_flag);
+ if (function_lock != NULL) {
+ out->print_cr("\n__ CodeCache (function) lock wait took %10.3f seconds _________\n", ts.seconds());
+ }
ts.update(); // record starting point
CodeCache::aggregate(out, granularity);
- out->cr();
- out->print_cr("__ CodeCache lock hold took %10.3f seconds _________", ts.seconds());
- out->cr();
+ if (function_lock != NULL) {
+ out->print_cr("\n__ CodeCache (function) lock hold took %10.3f seconds _________\n", ts.seconds());
+ }
}
if (usedSpace) CodeCache::print_usedSpace(out);
@@ -2737,10 +2739,16 @@ void CompileBroker::print_heapinfo(outputStream* out, const char* function, cons
if (methodCount) CodeCache::print_count(out);
if (methodSpace) CodeCache::print_space(out);
if (methodAge) CodeCache::print_age(out);
- if (methodNames) CodeCache::print_names(out);
+ if (methodNames) {
+ // print_names() has shown to be sensitive to concurrent CodeHeap modifications.
+ // Therefore, request the CodeCache_lock before calling...
+ MutexLockerEx mu3(function_lock, Mutex::_no_safepoint_check_flag);
+ CodeCache::print_names(out);
+ }
if (discard) CodeCache::discard(out);
- out->cr();
- out->print_cr("__ CodeHeapStateAnalytics total duration %10.3f seconds _________", ts_total.seconds());
- out->cr();
+ if (global_lock != NULL) {
+ out->print_cr("\n__ CodeCache (global) lock hold took %10.3f seconds _________\n", ts_global.seconds());
+ }
+ out->print_cr("\n__ CodeHeapStateAnalytics total duration %10.3f seconds _________\n", ts_total.seconds());
}
diff --git a/src/hotspot/share/compiler/compileBroker.hpp b/src/hotspot/share/compiler/compileBroker.hpp
index 6947e72a0d6..71be6382f9e 100644
--- a/src/hotspot/share/compiler/compileBroker.hpp
+++ b/src/hotspot/share/compiler/compileBroker.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1999, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1999, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
*
*/
-#ifndef SHARE_VM_COMPILER_COMPILEBROKER_HPP
-#define SHARE_VM_COMPILER_COMPILEBROKER_HPP
+#ifndef SHARE_COMPILER_COMPILEBROKER_HPP
+#define SHARE_COMPILER_COMPILEBROKER_HPP
#include "ci/compilerInterface.hpp"
#include "compiler/abstractCompiler.hpp"
@@ -426,4 +426,4 @@ public:
static void print_heapinfo(outputStream *out, const char* function, const char* granularity );
};
-#endif // SHARE_VM_COMPILER_COMPILEBROKER_HPP
+#endif // SHARE_COMPILER_COMPILEBROKER_HPP
diff --git a/src/hotspot/share/compiler/compileLog.hpp b/src/hotspot/share/compiler/compileLog.hpp
index 49e2b6a6180..d91819104a5 100644
--- a/src/hotspot/share/compiler/compileLog.hpp
+++ b/src/hotspot/share/compiler/compileLog.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2002, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
*
*/
-#ifndef SHARE_VM_COMPILER_COMPILELOG_HPP
-#define SHARE_VM_COMPILER_COMPILELOG_HPP
+#ifndef SHARE_COMPILER_COMPILELOG_HPP
+#define SHARE_COMPILER_COMPILELOG_HPP
#include "utilities/xmlstream.hpp"
@@ -97,4 +97,4 @@ class CompileLog : public xmlStream {
static void finish_log_on_error(outputStream* out, char *buf, int buflen);
};
-#endif // SHARE_VM_COMPILER_COMPILELOG_HPP
+#endif // SHARE_COMPILER_COMPILELOG_HPP
diff --git a/src/hotspot/share/compiler/compileTask.cpp b/src/hotspot/share/compiler/compileTask.cpp
index 370deff9e2a..2987030e285 100644
--- a/src/hotspot/share/compiler/compileTask.cpp
+++ b/src/hotspot/share/compiler/compileTask.cpp
@@ -72,6 +72,12 @@ void CompileTask::free(CompileTask* task) {
JNIHandles::destroy_global(task->_method_holder);
JNIHandles::destroy_global(task->_hot_method_holder);
+ if (task->_failure_reason_on_C_heap && task->_failure_reason != NULL) {
+ os::free((void*) task->_failure_reason);
+ }
+ task->_failure_reason = NULL;
+ task->_failure_reason_on_C_heap = false;
+
task->set_is_free(true);
task->set_next(_task_free_list);
_task_free_list = task;
@@ -110,6 +116,7 @@ void CompileTask::initialize(int compile_id,
_time_queued = 0; // tidy
_compile_reason = compile_reason;
_failure_reason = NULL;
+ _failure_reason_on_C_heap = false;
if (LogCompilation) {
_time_queued = os::elapsed_counter();
diff --git a/src/hotspot/share/compiler/compileTask.hpp b/src/hotspot/share/compiler/compileTask.hpp
index 3522ee4f10e..66cad935022 100644
--- a/src/hotspot/share/compiler/compileTask.hpp
+++ b/src/hotspot/share/compiler/compileTask.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
*
*/
-#ifndef SHARE_VM_COMPILER_COMPILETASK_HPP
-#define SHARE_VM_COMPILER_COMPILETASK_HPP
+#ifndef SHARE_COMPILER_COMPILETASK_HPP
+#define SHARE_COMPILER_COMPILETASK_HPP
#include "ci/ciMethod.hpp"
#include "code/nmethod.hpp"
@@ -104,9 +104,11 @@ class CompileTask : public CHeapObj {
int _hot_count; // information about its invocation counter
CompileReason _compile_reason; // more info about the task
const char* _failure_reason;
+ // Specifies if _failure_reason is on the C heap.
+ bool _failure_reason_on_C_heap;
public:
- CompileTask() {
+ CompileTask() : _failure_reason(NULL), _failure_reason_on_C_heap(false) {
_lock = new Monitor(Mutex::nonleaf+2, "CompileTaskLock");
}
@@ -199,8 +201,9 @@ public:
void log_task_start(CompileLog* log);
void log_task_done(CompileLog* log);
- void set_failure_reason(const char* reason) {
+ void set_failure_reason(const char* reason, bool on_C_heap = false) {
_failure_reason = reason;
+ _failure_reason_on_C_heap = on_C_heap;
}
bool check_break_at_flags();
@@ -212,4 +215,4 @@ public:
static void print_inlining_ul(ciMethod* method, int inline_level, int bci, const char* msg = NULL);
};
-#endif // SHARE_VM_COMPILER_COMPILETASK_HPP
+#endif // SHARE_COMPILER_COMPILETASK_HPP
diff --git a/src/hotspot/share/compiler/compilerDefinitions.hpp b/src/hotspot/share/compiler/compilerDefinitions.hpp
index 12589e11c2e..e1fea39a418 100644
--- a/src/hotspot/share/compiler/compilerDefinitions.hpp
+++ b/src/hotspot/share/compiler/compilerDefinitions.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2016, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
*
*/
-#ifndef SHARE_VM_COMPILER_COMPILERDEFINITIONS_HPP
-#define SHARE_VM_COMPILER_COMPILERDEFINITIONS_HPP
+#ifndef SHARE_COMPILER_COMPILERDEFINITIONS_HPP
+#define SHARE_COMPILER_COMPILERDEFINITIONS_HPP
#include "memory/allocation.hpp"
@@ -132,4 +132,4 @@ private:
static void set_tiered_flags();
};
-#endif // SHARE_VM_COMPILER_COMPILERDEFINITIONS_HPP
+#endif // SHARE_COMPILER_COMPILERDEFINITIONS_HPP
diff --git a/src/hotspot/share/compiler/compilerDirectives.hpp b/src/hotspot/share/compiler/compilerDirectives.hpp
index c06d6b89919..e4ae88a5cd8 100644
--- a/src/hotspot/share/compiler/compilerDirectives.hpp
+++ b/src/hotspot/share/compiler/compilerDirectives.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
*
*/
-#ifndef SHARE_VM_COMPILER_COMPILERDIRECTIVES_HPP
-#define SHARE_VM_COMPILER_COMPILERDIRECTIVES_HPP
+#ifndef SHARE_COMPILER_COMPILERDIRECTIVES_HPP
+#define SHARE_COMPILER_COMPILERDIRECTIVES_HPP
#include "ci/ciMetadata.hpp"
#include "ci/ciMethod.hpp"
@@ -186,4 +186,4 @@ public:
DirectiveSet* _c2_store;
};
-#endif // SHARE_VM_COMPILER_COMPILERDIRECTIVES_HPP
+#endif // SHARE_COMPILER_COMPILERDIRECTIVES_HPP
diff --git a/src/hotspot/share/compiler/compilerOracle.hpp b/src/hotspot/share/compiler/compilerOracle.hpp
index 02a10d80d19..1d13374725f 100644
--- a/src/hotspot/share/compiler/compilerOracle.hpp
+++ b/src/hotspot/share/compiler/compilerOracle.hpp
@@ -22,8 +22,8 @@
*
*/
-#ifndef SHARE_VM_COMPILER_COMPILERORACLE_HPP
-#define SHARE_VM_COMPILER_COMPILERORACLE_HPP
+#ifndef SHARE_COMPILER_COMPILERORACLE_HPP
+#define SHARE_COMPILER_COMPILERORACLE_HPP
#include "memory/allocation.hpp"
#include "oops/oopsHierarchy.hpp"
@@ -91,4 +91,4 @@ class CompilerOracle : AllStatic {
static bool should_print_methods();
};
-#endif // SHARE_VM_COMPILER_COMPILERORACLE_HPP
+#endif // SHARE_COMPILER_COMPILERORACLE_HPP
diff --git a/src/hotspot/share/compiler/directivesParser.cpp b/src/hotspot/share/compiler/directivesParser.cpp
index 31ed599406b..504da1a8f9e 100644
--- a/src/hotspot/share/compiler/directivesParser.cpp
+++ b/src/hotspot/share/compiler/directivesParser.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2015, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -94,11 +94,13 @@ bool DirectivesParser::parse_from_file_inner(const char* filename, outputStream*
if (file_handle != -1) {
// read contents into resource array
char* buffer = NEW_RESOURCE_ARRAY(char, st.st_size+1);
- size_t num_read = os::read(file_handle, (char*) buffer, st.st_size);
- buffer[num_read] = '\0';
- // close file
- os::close(file_handle);
- return parse_string(buffer, stream) > 0;
+ ssize_t num_read = os::read(file_handle, (char*) buffer, st.st_size);
+ if (num_read >= 0) {
+ buffer[num_read] = '\0';
+ // close file
+ os::close(file_handle);
+ return parse_string(buffer, stream) > 0;
+ }
}
}
return false;
diff --git a/src/hotspot/share/compiler/directivesParser.hpp b/src/hotspot/share/compiler/directivesParser.hpp
index 479bfc47068..f7a9f9d2cb8 100644
--- a/src/hotspot/share/compiler/directivesParser.hpp
+++ b/src/hotspot/share/compiler/directivesParser.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2015, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
*
*/
-#ifndef SHARE_VM_COMPILER_DIRECTIVESPARSER_HPP
-#define SHARE_VM_COMPILER_DIRECTIVESPARSER_HPP
+#ifndef SHARE_COMPILER_DIRECTIVESPARSER_HPP
+#define SHARE_COMPILER_DIRECTIVESPARSER_HPP
#include "utilities/json.hpp"
#include "compiler/compilerDirectives.hpp"
@@ -139,4 +139,4 @@ class DirectivesParser : public JSON {
static uint mask(keytype kt);
};
-#endif // SHARE_VM_COMPILER_DIRECTIVESPARSER_HPP
+#endif // SHARE_COMPILER_DIRECTIVESPARSER_HPP
diff --git a/src/hotspot/share/compiler/disassembler.hpp b/src/hotspot/share/compiler/disassembler.hpp
index fd70141919e..9ba32f7ecfb 100644
--- a/src/hotspot/share/compiler/disassembler.hpp
+++ b/src/hotspot/share/compiler/disassembler.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2008, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2008, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
*
*/
-#ifndef SHARE_VM_COMPILER_DISASSEMBLER_HPP
-#define SHARE_VM_COMPILER_DISASSEMBLER_HPP
+#ifndef SHARE_COMPILER_DISASSEMBLER_HPP
+#define SHARE_COMPILER_DISASSEMBLER_HPP
#include "asm/codeBuffer.hpp"
#include "runtime/globals.hpp"
@@ -90,4 +90,4 @@ class Disassembler {
}
};
-#endif // SHARE_VM_COMPILER_DISASSEMBLER_HPP
+#endif // SHARE_COMPILER_DISASSEMBLER_HPP
diff --git a/src/hotspot/share/compiler/methodLiveness.cpp b/src/hotspot/share/compiler/methodLiveness.cpp
index 9f37f388a3f..7cff216b0c5 100644
--- a/src/hotspot/share/compiler/methodLiveness.cpp
+++ b/src/hotspot/share/compiler/methodLiveness.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -31,7 +31,6 @@
#include "interpreter/bytecodes.hpp"
#include "memory/allocation.inline.hpp"
#include "memory/resourceArea.hpp"
-#include "runtime/timerTrace.hpp"
#include "utilities/bitMap.inline.hpp"
// The MethodLiveness class performs a simple liveness analysis on a method
@@ -71,64 +70,6 @@
// a single set (_exception_exit), losing some information but simplifying the
// analysis.
-
-//--------------------------------------------------------------------------
-// The BitCounter class is used for counting the number of bits set in
-// some BitMap. It is only used when collecting liveness statistics.
-
-#ifndef PRODUCT
-
-class BitCounter: public BitMapClosure {
- private:
- int _count;
- public:
- BitCounter() : _count(0) {}
-
- // Callback when bit in map is set
- virtual bool do_bit(size_t offset) {
- _count++;
- return true;
- }
-
- int count() {
- return _count;
- }
-};
-
-
-//--------------------------------------------------------------------------
-
-
-// Counts
-long MethodLiveness::_total_bytes = 0;
-int MethodLiveness::_total_methods = 0;
-
-long MethodLiveness::_total_blocks = 0;
-int MethodLiveness::_max_method_blocks = 0;
-
-long MethodLiveness::_total_edges = 0;
-int MethodLiveness::_max_block_edges = 0;
-
-long MethodLiveness::_total_exc_edges = 0;
-int MethodLiveness::_max_block_exc_edges = 0;
-
-long MethodLiveness::_total_method_locals = 0;
-int MethodLiveness::_max_method_locals = 0;
-
-long MethodLiveness::_total_locals_queried = 0;
-long MethodLiveness::_total_live_locals_queried = 0;
-
-long MethodLiveness::_total_visits = 0;
-
-#endif
-
-// Timers
-elapsedTimer MethodLiveness::_time_build_graph;
-elapsedTimer MethodLiveness::_time_gen_kill;
-elapsedTimer MethodLiveness::_time_flow;
-elapsedTimer MethodLiveness::_time_query;
-elapsedTimer MethodLiveness::_time_total;
-
MethodLiveness::MethodLiveness(Arena* arena, ciMethod* method)
#ifdef COMPILER1
: _bci_block_start(arena, method->code_size())
@@ -146,52 +87,11 @@ void MethodLiveness::compute_liveness() {
tty->print("# Computing liveness information for ");
method()->print_short_name();
}
-
- if (TimeLivenessAnalysis) _time_total.start();
#endif
- {
- TraceTime buildGraph(NULL, &_time_build_graph, TimeLivenessAnalysis);
- init_basic_blocks();
- }
- {
- TraceTime genKill(NULL, &_time_gen_kill, TimeLivenessAnalysis);
- init_gen_kill();
- }
- {
- TraceTime flow(NULL, &_time_flow, TimeLivenessAnalysis);
- propagate_liveness();
- }
-
-#ifndef PRODUCT
- if (TimeLivenessAnalysis) _time_total.stop();
-
- if (TimeLivenessAnalysis) {
- // Collect statistics
- _total_bytes += method()->code_size();
- _total_methods++;
-
- int num_blocks = _block_count;
- _total_blocks += num_blocks;
- _max_method_blocks = MAX2(num_blocks,_max_method_blocks);
-
- for (int i=0; i_normal_predecessors->length();
- int numExcEdges = block->_exception_predecessors->length();
-
- _total_edges += numEdges;
- _total_exc_edges += numExcEdges;
- _max_block_edges = MAX2(numEdges,_max_block_edges);
- _max_block_exc_edges = MAX2(numExcEdges,_max_block_exc_edges);
- }
-
- int numLocals = _bit_map_size_bits;
- _total_method_locals += numLocals;
- _max_method_locals = MAX2(numLocals,_max_method_locals);
- }
-#endif
+ init_basic_blocks();
+ init_gen_kill();
+ propagate_liveness();
}
@@ -440,7 +340,6 @@ void MethodLiveness::propagate_liveness() {
while ((block = work_list_get()) != NULL) {
block->propagate(this);
- NOT_PRODUCT(_total_visits++;)
}
}
@@ -473,8 +372,6 @@ MethodLivenessResult MethodLiveness::get_liveness_at(int entry_bci) {
MethodLivenessResult answer;
if (_block_count > 0) {
- if (TimeLivenessAnalysis) _time_total.start();
- if (TimeLivenessAnalysis) _time_query.start();
assert( 0 <= bci && bci < method()->code_size(), "bci out of range" );
BasicBlock *block = _block_map->at(bci);
@@ -501,73 +398,12 @@ MethodLivenessResult MethodLiveness::get_liveness_at(int entry_bci) {
tty->print(" @ %d : result is ", bci);
answer.print_on(tty);
}
-
- if (TimeLivenessAnalysis) _time_query.stop();
- if (TimeLivenessAnalysis) _time_total.stop();
#endif
}
-#ifndef PRODUCT
- if (TimeLivenessAnalysis) {
- // Collect statistics.
- _total_locals_queried += _bit_map_size_bits;
- BitCounter counter;
- answer.iterate(&counter);
- _total_live_locals_queried += counter.count();
- }
-#endif
-
return answer;
}
-
-#ifndef PRODUCT
-
-void MethodLiveness::print_times() {
- tty->print_cr ("Accumulated liveness analysis times/statistics:");
- tty->print_cr ("-----------------------------------------------");
- tty->print_cr (" Total : %3.3f sec.", _time_total.seconds());
- tty->print_cr (" Build graph : %3.3f sec. (%2.2f%%)", _time_build_graph.seconds(),
- _time_build_graph.seconds() * 100 / _time_total.seconds());
- tty->print_cr (" Gen / Kill : %3.3f sec. (%2.2f%%)", _time_gen_kill.seconds(),
- _time_gen_kill.seconds() * 100 / _time_total.seconds());
- tty->print_cr (" Dataflow : %3.3f sec. (%2.2f%%)", _time_flow.seconds(),
- _time_flow.seconds() * 100 / _time_total.seconds());
- tty->print_cr (" Query : %3.3f sec. (%2.2f%%)", _time_query.seconds(),
- _time_query.seconds() * 100 / _time_total.seconds());
- tty->print_cr (" #bytes : %8ld (%3.0f bytes per sec)",
- _total_bytes,
- _total_bytes / _time_total.seconds());
- tty->print_cr (" #methods : %8d (%3.0f methods per sec)",
- _total_methods,
- _total_methods / _time_total.seconds());
- tty->print_cr (" avg locals : %3.3f max locals : %3d",
- (float)_total_method_locals / _total_methods,
- _max_method_locals);
- tty->print_cr (" avg blocks : %3.3f max blocks : %3d",
- (float)_total_blocks / _total_methods,
- _max_method_blocks);
- tty->print_cr (" avg bytes : %3.3f",
- (float)_total_bytes / _total_methods);
- tty->print_cr (" #blocks : %8ld",
- _total_blocks);
- tty->print_cr (" avg normal predecessors : %3.3f max normal predecessors : %3d",
- (float)_total_edges / _total_blocks,
- _max_block_edges);
- tty->print_cr (" avg exception predecessors : %3.3f max exception predecessors : %3d",
- (float)_total_exc_edges / _total_blocks,
- _max_block_exc_edges);
- tty->print_cr (" avg visits : %3.3f",
- (float)_total_visits / _total_blocks);
- tty->print_cr (" #locals queried : %8ld #live : %8ld %%live : %2.2f%%",
- _total_locals_queried,
- _total_live_locals_queried,
- 100.0 * _total_live_locals_queried / _total_locals_queried);
-}
-
-#endif
-
-
MethodLiveness::BasicBlock::BasicBlock(MethodLiveness *analyzer, int start, int limit) :
_entry(analyzer->arena(), analyzer->bit_map_size_bits()),
_normal_exit(analyzer->arena(), analyzer->bit_map_size_bits()),
diff --git a/src/hotspot/share/compiler/methodLiveness.hpp b/src/hotspot/share/compiler/methodLiveness.hpp
index 60ad42a70e6..d4926e40ca9 100644
--- a/src/hotspot/share/compiler/methodLiveness.hpp
+++ b/src/hotspot/share/compiler/methodLiveness.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
*
*/
-#ifndef SHARE_VM_COMPILER_METHODLIVENESS_HPP
-#define SHARE_VM_COMPILER_METHODLIVENESS_HPP
+#ifndef SHARE_COMPILER_METHODLIVENESS_HPP
+#define SHARE_COMPILER_METHODLIVENESS_HPP
#include "utilities/bitMap.hpp"
#include "utilities/growableArray.hpp"
@@ -222,41 +222,6 @@ class MethodLiveness : public ResourceObj {
BasicBlock *work_list_get();
void work_list_add(BasicBlock *block);
- // -- Timing and Statistics.
-
-
- // Timers
- static elapsedTimer _time_build_graph;
- static elapsedTimer _time_gen_kill;
- static elapsedTimer _time_flow;
- static elapsedTimer _time_query;
- static elapsedTimer _time_total;
-
-#ifndef PRODUCT
-
- // Counts
- static long _total_bytes;
- static int _total_methods;
-
- static long _total_blocks;
- static int _max_method_blocks;
-
- static long _total_edges;
- static int _max_block_edges;
-
- static long _total_exc_edges;
- static int _max_block_exc_edges;
-
- static long _total_method_locals;
- static int _max_method_locals;
-
- static long _total_locals_queried;
- static long _total_live_locals_queried;
-
- static long _total_visits;
-
-#endif
-
public:
// Create a liveness analyzer for a method
MethodLiveness(Arena* arena, ciMethod* method);
@@ -271,7 +236,6 @@ class MethodLiveness : public ResourceObj {
const BitMap& get_bci_block_start() const { return _bci_block_start; }
#endif // COMPILER1
- static void print_times() PRODUCT_RETURN;
};
-#endif // SHARE_VM_COMPILER_METHODLIVENESS_HPP
+#endif // SHARE_COMPILER_METHODLIVENESS_HPP
diff --git a/src/hotspot/share/compiler/methodMatcher.hpp b/src/hotspot/share/compiler/methodMatcher.hpp
index 41f73fb2b93..b9f2acb5b61 100644
--- a/src/hotspot/share/compiler/methodMatcher.hpp
+++ b/src/hotspot/share/compiler/methodMatcher.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2015, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
*
*/
-#ifndef SHARE_VM_COMPILER_METHODMATCHER_HPP
-#define SHARE_VM_COMPILER_METHODMATCHER_HPP
+#ifndef SHARE_COMPILER_METHODMATCHER_HPP
+#define SHARE_COMPILER_METHODMATCHER_HPP
#include "memory/allocation.hpp"
#include "runtime/handles.hpp"
@@ -123,5 +123,4 @@ public:
InlineMatcher* clone();
};
-#endif // SHARE_VM_COMPILER_METHODMATCHER_HPP
-
+#endif // SHARE_COMPILER_METHODMATCHER_HPP
diff --git a/src/hotspot/share/compiler/oopMap.hpp b/src/hotspot/share/compiler/oopMap.hpp
index 853f42a6f0d..f2bc829118f 100644
--- a/src/hotspot/share/compiler/oopMap.hpp
+++ b/src/hotspot/share/compiler/oopMap.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
*
*/
-#ifndef SHARE_VM_COMPILER_OOPMAP_HPP
-#define SHARE_VM_COMPILER_OOPMAP_HPP
+#ifndef SHARE_COMPILER_OOPMAP_HPP
+#define SHARE_COMPILER_OOPMAP_HPP
#include "code/compressedStream.hpp"
#include "code/vmreg.hpp"
@@ -467,4 +467,4 @@ class DerivedPointerTableDeactivate: public StackObj {
};
#endif // COMPILER2_OR_JVMCI
-#endif // SHARE_VM_COMPILER_OOPMAP_HPP
+#endif // SHARE_COMPILER_OOPMAP_HPP
diff --git a/src/hotspot/share/gc/cms/adaptiveFreeList.hpp b/src/hotspot/share/gc/cms/adaptiveFreeList.hpp
index d4757eb0c15..5061d379fec 100644
--- a/src/hotspot/share/gc/cms/adaptiveFreeList.hpp
+++ b/src/hotspot/share/gc/cms/adaptiveFreeList.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2001, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
*
*/
-#ifndef SHARE_VM_GC_CMS_ADAPTIVEFREELIST_HPP
-#define SHARE_VM_GC_CMS_ADAPTIVEFREELIST_HPP
+#ifndef SHARE_GC_CMS_ADAPTIVEFREELIST_HPP
+#define SHARE_GC_CMS_ADAPTIVEFREELIST_HPP
#include "gc/cms/allocationStats.hpp"
#include "memory/freeList.hpp"
@@ -226,4 +226,4 @@ class AdaptiveFreeList : public FreeList {
#endif // NOT PRODUCT
};
-#endif // SHARE_VM_GC_CMS_ADAPTIVEFREELIST_HPP
+#endif // SHARE_GC_CMS_ADAPTIVEFREELIST_HPP
diff --git a/src/hotspot/share/gc/cms/allocationStats.hpp b/src/hotspot/share/gc/cms/allocationStats.hpp
index 9aad1568db7..5ac95b43eb5 100644
--- a/src/hotspot/share/gc/cms/allocationStats.hpp
+++ b/src/hotspot/share/gc/cms/allocationStats.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2001, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
*
*/
-#ifndef SHARE_VM_GC_CMS_ALLOCATIONSTATS_HPP
-#define SHARE_VM_GC_CMS_ALLOCATIONSTATS_HPP
+#ifndef SHARE_GC_CMS_ALLOCATIONSTATS_HPP
+#define SHARE_GC_CMS_ALLOCATIONSTATS_HPP
#include "gc/shared/gcUtil.hpp"
#include "logging/log.hpp"
@@ -150,4 +150,4 @@ class AllocationStats {
)
};
-#endif // SHARE_VM_GC_CMS_ALLOCATIONSTATS_HPP
+#endif // SHARE_GC_CMS_ALLOCATIONSTATS_HPP
diff --git a/src/hotspot/share/gc/cms/cmsCollectorPolicy.hpp b/src/hotspot/share/gc/cms/cmsCollectorPolicy.hpp
index 24211499901..63ec3b47b16 100644
--- a/src/hotspot/share/gc/cms/cmsCollectorPolicy.hpp
+++ b/src/hotspot/share/gc/cms/cmsCollectorPolicy.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2007, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
*
*/
-#ifndef SHARE_VM_GC_CMS_CMSCOLLECTORPOLICY_HPP
-#define SHARE_VM_GC_CMS_CMSCOLLECTORPOLICY_HPP
+#ifndef SHARE_GC_CMS_CMSCOLLECTORPOLICY_HPP
+#define SHARE_GC_CMS_CMSCOLLECTORPOLICY_HPP
#include "gc/shared/collectorPolicy.hpp"
@@ -35,4 +35,4 @@ class ConcurrentMarkSweepPolicy : public GenCollectorPolicy {
ConcurrentMarkSweepPolicy() {}
};
-#endif // SHARE_VM_GC_CMS_CMSCOLLECTORPOLICY_HPP
+#endif // SHARE_GC_CMS_CMSCOLLECTORPOLICY_HPP
diff --git a/src/hotspot/share/gc/cms/cmsHeap.hpp b/src/hotspot/share/gc/cms/cmsHeap.hpp
index 93f177aadec..edea4d165e8 100644
--- a/src/hotspot/share/gc/cms/cmsHeap.hpp
+++ b/src/hotspot/share/gc/cms/cmsHeap.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2017, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
*
*/
-#ifndef SHARE_VM_GC_CMS_CMSHEAP_HPP
-#define SHARE_VM_GC_CMS_CMSHEAP_HPP
+#ifndef SHARE_GC_CMS_CMSHEAP_HPP
+#define SHARE_GC_CMS_CMSHEAP_HPP
#include "gc/cms/concurrentMarkSweepGeneration.hpp"
#include "gc/cms/parNewGeneration.hpp"
@@ -139,4 +139,4 @@ private:
void collect_mostly_concurrent(GCCause::Cause cause);
};
-#endif // SHARE_VM_GC_CMS_CMSHEAP_HPP
+#endif // SHARE_GC_CMS_CMSHEAP_HPP
diff --git a/src/hotspot/share/gc/cms/cmsLockVerifier.hpp b/src/hotspot/share/gc/cms/cmsLockVerifier.hpp
index 10825aab999..7196faa8911 100644
--- a/src/hotspot/share/gc/cms/cmsLockVerifier.hpp
+++ b/src/hotspot/share/gc/cms/cmsLockVerifier.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2002, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
*
*/
-#ifndef SHARE_VM_GC_CMS_CMSLOCKVERIFIER_HPP
-#define SHARE_VM_GC_CMS_CMSLOCKVERIFIER_HPP
+#ifndef SHARE_GC_CMS_CMSLOCKVERIFIER_HPP
+#define SHARE_GC_CMS_CMSLOCKVERIFIER_HPP
#include "runtime/mutex.hpp"
@@ -44,4 +44,4 @@ class CMSLockVerifier: AllStatic {
}
};
-#endif // SHARE_VM_GC_CMS_CMSLOCKVERIFIER_HPP
+#endif // SHARE_GC_CMS_CMSLOCKVERIFIER_HPP
diff --git a/src/hotspot/share/gc/cms/cmsOopClosures.hpp b/src/hotspot/share/gc/cms/cmsOopClosures.hpp
index 5ee3ae9a8a5..ec84ba13ac1 100644
--- a/src/hotspot/share/gc/cms/cmsOopClosures.hpp
+++ b/src/hotspot/share/gc/cms/cmsOopClosures.hpp
@@ -22,8 +22,8 @@
*
*/
-#ifndef SHARE_VM_GC_CMS_CMSOOPCLOSURES_HPP
-#define SHARE_VM_GC_CMS_CMSOOPCLOSURES_HPP
+#ifndef SHARE_GC_CMS_CMSOOPCLOSURES_HPP
+#define SHARE_GC_CMS_CMSOOPCLOSURES_HPP
#include "gc/shared/genOopClosures.hpp"
#include "gc/shared/taskqueue.hpp"
@@ -330,4 +330,4 @@ class CMSParKeepAliveClosure: public MetadataVisitingOopIterateClosure {
virtual void do_oop(narrowOop* p);
};
-#endif // SHARE_VM_GC_CMS_CMSOOPCLOSURES_HPP
+#endif // SHARE_GC_CMS_CMSOOPCLOSURES_HPP
diff --git a/src/hotspot/share/gc/cms/cmsOopClosures.inline.hpp b/src/hotspot/share/gc/cms/cmsOopClosures.inline.hpp
index 8f6a772cfa6..91547779bd0 100644
--- a/src/hotspot/share/gc/cms/cmsOopClosures.inline.hpp
+++ b/src/hotspot/share/gc/cms/cmsOopClosures.inline.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2007, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
*
*/
-#ifndef SHARE_VM_GC_CMS_CMSOOPCLOSURES_INLINE_HPP
-#define SHARE_VM_GC_CMS_CMSOOPCLOSURES_INLINE_HPP
+#ifndef SHARE_GC_CMS_CMSOOPCLOSURES_INLINE_HPP
+#define SHARE_GC_CMS_CMSOOPCLOSURES_INLINE_HPP
#include "gc/cms/cmsOopClosures.hpp"
#include "gc/cms/concurrentMarkSweepGeneration.hpp"
@@ -85,4 +85,4 @@ DO_OOP_WORK_IMPL(CMSKeepAliveClosure)
DO_OOP_WORK_IMPL(CMSInnerParMarkAndPushClosure)
DO_OOP_WORK_IMPL(CMSParKeepAliveClosure)
-#endif // SHARE_VM_GC_CMS_CMSOOPCLOSURES_INLINE_HPP
+#endif // SHARE_GC_CMS_CMSOOPCLOSURES_INLINE_HPP
diff --git a/src/hotspot/share/gc/cms/cmsVMOperations.hpp b/src/hotspot/share/gc/cms/cmsVMOperations.hpp
index e0811703ec7..702fdc0b6e0 100644
--- a/src/hotspot/share/gc/cms/cmsVMOperations.hpp
+++ b/src/hotspot/share/gc/cms/cmsVMOperations.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2005, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
*
*/
-#ifndef SHARE_VM_GC_CMS_CMSVMOPERATIONS_HPP
-#define SHARE_VM_GC_CMS_CMSVMOPERATIONS_HPP
+#ifndef SHARE_GC_CMS_CMSVMOPERATIONS_HPP
+#define SHARE_GC_CMS_CMSVMOPERATIONS_HPP
#include "gc/cms/concurrentMarkSweepGeneration.hpp"
#include "gc/shared/gcCause.hpp"
@@ -143,4 +143,4 @@ class VM_GenCollectFullConcurrent: public VM_GC_Operation {
virtual bool evaluate_at_safepoint() const;
};
-#endif // SHARE_VM_GC_CMS_CMSVMOPERATIONS_HPP
+#endif // SHARE_GC_CMS_CMSVMOPERATIONS_HPP
diff --git a/src/hotspot/share/gc/cms/compactibleFreeListSpace.hpp b/src/hotspot/share/gc/cms/compactibleFreeListSpace.hpp
index 4ca620b8bd2..8c759da45b6 100644
--- a/src/hotspot/share/gc/cms/compactibleFreeListSpace.hpp
+++ b/src/hotspot/share/gc/cms/compactibleFreeListSpace.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2001, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
*
*/
-#ifndef SHARE_VM_GC_CMS_COMPACTIBLEFREELISTSPACE_HPP
-#define SHARE_VM_GC_CMS_COMPACTIBLEFREELISTSPACE_HPP
+#ifndef SHARE_GC_CMS_COMPACTIBLEFREELISTSPACE_HPP
+#define SHARE_GC_CMS_COMPACTIBLEFREELISTSPACE_HPP
#include "gc/cms/adaptiveFreeList.hpp"
#include "gc/cms/promotionInfo.hpp"
@@ -741,4 +741,4 @@ size_t PromotionInfo::refillSize() const {
return CompactibleFreeListSpace::adjustObjectSize(sz);
}
-#endif // SHARE_VM_GC_CMS_COMPACTIBLEFREELISTSPACE_HPP
+#endif // SHARE_GC_CMS_COMPACTIBLEFREELISTSPACE_HPP
diff --git a/src/hotspot/share/gc/cms/concurrentMarkSweepGeneration.hpp b/src/hotspot/share/gc/cms/concurrentMarkSweepGeneration.hpp
index 1e53187b8a7..deae24aeb0f 100644
--- a/src/hotspot/share/gc/cms/concurrentMarkSweepGeneration.hpp
+++ b/src/hotspot/share/gc/cms/concurrentMarkSweepGeneration.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2001, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
*
*/
-#ifndef SHARE_VM_GC_CMS_CONCURRENTMARKSWEEPGENERATION_HPP
-#define SHARE_VM_GC_CMS_CONCURRENTMARKSWEEPGENERATION_HPP
+#ifndef SHARE_GC_CMS_CONCURRENTMARKSWEEPGENERATION_HPP
+#define SHARE_GC_CMS_CONCURRENTMARKSWEEPGENERATION_HPP
#include "gc/cms/cmsOopClosures.hpp"
#include "gc/cms/gSpaceCounters.hpp"
@@ -1793,4 +1793,4 @@ class TraceCMSMemoryManagerStats : public TraceMemoryManagerStats {
};
-#endif // SHARE_VM_GC_CMS_CONCURRENTMARKSWEEPGENERATION_HPP
+#endif // SHARE_GC_CMS_CONCURRENTMARKSWEEPGENERATION_HPP
diff --git a/src/hotspot/share/gc/cms/concurrentMarkSweepGeneration.inline.hpp b/src/hotspot/share/gc/cms/concurrentMarkSweepGeneration.inline.hpp
index a8c711b4c9c..4187ba971dd 100644
--- a/src/hotspot/share/gc/cms/concurrentMarkSweepGeneration.inline.hpp
+++ b/src/hotspot/share/gc/cms/concurrentMarkSweepGeneration.inline.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2001, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
*
*/
-#ifndef SHARE_VM_GC_CMS_CONCURRENTMARKSWEEPGENERATION_INLINE_HPP
-#define SHARE_VM_GC_CMS_CONCURRENTMARKSWEEPGENERATION_INLINE_HPP
+#ifndef SHARE_GC_CMS_CONCURRENTMARKSWEEPGENERATION_INLINE_HPP
+#define SHARE_GC_CMS_CONCURRENTMARKSWEEPGENERATION_INLINE_HPP
#include "gc/cms/cmsHeap.hpp"
#include "gc/cms/cmsLockVerifier.hpp"
@@ -469,4 +469,4 @@ inline void ModUnionClosurePar::do_MemRegion(MemRegion mr) {
_t->par_mark_range(mr2);
}
-#endif // SHARE_VM_GC_CMS_CONCURRENTMARKSWEEPGENERATION_INLINE_HPP
+#endif // SHARE_GC_CMS_CONCURRENTMARKSWEEPGENERATION_INLINE_HPP
diff --git a/src/hotspot/share/gc/cms/concurrentMarkSweepThread.hpp b/src/hotspot/share/gc/cms/concurrentMarkSweepThread.hpp
index ccb69ea89f4..c3ab4655dbd 100644
--- a/src/hotspot/share/gc/cms/concurrentMarkSweepThread.hpp
+++ b/src/hotspot/share/gc/cms/concurrentMarkSweepThread.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2001, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
*
*/
-#ifndef SHARE_VM_GC_CMS_CONCURRENTMARKSWEEPTHREAD_HPP
-#define SHARE_VM_GC_CMS_CONCURRENTMARKSWEEPTHREAD_HPP
+#ifndef SHARE_GC_CMS_CONCURRENTMARKSWEEPTHREAD_HPP
+#define SHARE_GC_CMS_CONCURRENTMARKSWEEPTHREAD_HPP
#include "gc/cms/concurrentMarkSweepGeneration.hpp"
#include "gc/shared/concurrentGCThread.hpp"
@@ -166,4 +166,4 @@ class CMSLoopCountWarn: public StackObj {
}
};
-#endif // SHARE_VM_GC_CMS_CONCURRENTMARKSWEEPTHREAD_HPP
+#endif // SHARE_GC_CMS_CONCURRENTMARKSWEEPTHREAD_HPP
diff --git a/src/hotspot/share/gc/cms/freeChunk.hpp b/src/hotspot/share/gc/cms/freeChunk.hpp
index a48a6dd1fff..91732de36f5 100644
--- a/src/hotspot/share/gc/cms/freeChunk.hpp
+++ b/src/hotspot/share/gc/cms/freeChunk.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2001, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
*
*/
-#ifndef SHARE_VM_GC_CMS_FREECHUNK_HPP
-#define SHARE_VM_GC_CMS_FREECHUNK_HPP
+#ifndef SHARE_GC_CMS_FREECHUNK_HPP
+#define SHARE_GC_CMS_FREECHUNK_HPP
#include "memory/memRegion.hpp"
#include "oops/markOop.hpp"
@@ -147,4 +147,4 @@ class FreeChunk {
extern size_t MinChunkSize;
-#endif // SHARE_VM_GC_CMS_FREECHUNK_HPP
+#endif // SHARE_GC_CMS_FREECHUNK_HPP
diff --git a/src/hotspot/share/gc/cms/gSpaceCounters.hpp b/src/hotspot/share/gc/cms/gSpaceCounters.hpp
index 40f181f4c4c..3508f9d4d9d 100644
--- a/src/hotspot/share/gc/cms/gSpaceCounters.hpp
+++ b/src/hotspot/share/gc/cms/gSpaceCounters.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2002, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
*
*/
-#ifndef SHARE_VM_GC_CMS_GSPACECOUNTERS_HPP
-#define SHARE_VM_GC_CMS_GSPACECOUNTERS_HPP
+#ifndef SHARE_GC_CMS_GSPACECOUNTERS_HPP
+#define SHARE_GC_CMS_GSPACECOUNTERS_HPP
#include "gc/shared/generation.hpp"
#include "gc/shared/generationCounters.hpp"
@@ -107,4 +107,4 @@ class GenerationUsedHelper : public PerfLongSampleHelper {
}
};
-#endif // SHARE_VM_GC_CMS_GSPACECOUNTERS_HPP
+#endif // SHARE_GC_CMS_GSPACECOUNTERS_HPP
diff --git a/src/hotspot/share/gc/cms/jvmFlagConstraintsCMS.hpp b/src/hotspot/share/gc/cms/jvmFlagConstraintsCMS.hpp
index eabb9fc3933..d6dc610319f 100644
--- a/src/hotspot/share/gc/cms/jvmFlagConstraintsCMS.hpp
+++ b/src/hotspot/share/gc/cms/jvmFlagConstraintsCMS.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2015, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
*
*/
-#ifndef SHARE_GC_CMS_COMMANDLINEFLAGCONSTRAINTSCMS_HPP
-#define SHARE_GC_CMS_COMMANDLINEFLAGCONSTRAINTSCMS_HPP
+#ifndef SHARE_GC_CMS_JVMFLAGCONSTRAINTSCMS_HPP
+#define SHARE_GC_CMS_JVMFLAGCONSTRAINTSCMS_HPP
#include "runtime/globals.hpp"
#include "utilities/globalDefinitions.hpp"
@@ -45,4 +45,4 @@ JVMFlag::Error CMSBitMapYieldQuantumConstraintFunc(size_t value, bool verbose);
JVMFlag::Error ParallelGCThreadsConstraintFuncCMS(uint value, bool verbose);
JVMFlag::Error OldPLABSizeConstraintFuncCMS(size_t value, bool verbose);
-#endif // SHARE_GC_CMS_COMMANDLINEFLAGCONSTRAINTSCMS_HPP
+#endif // SHARE_GC_CMS_JVMFLAGCONSTRAINTSCMS_HPP
diff --git a/src/hotspot/share/gc/cms/parNewGeneration.hpp b/src/hotspot/share/gc/cms/parNewGeneration.hpp
index 5e4d7a5e7a0..5c2aa943c8e 100644
--- a/src/hotspot/share/gc/cms/parNewGeneration.hpp
+++ b/src/hotspot/share/gc/cms/parNewGeneration.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2001, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
*
*/
-#ifndef SHARE_VM_GC_CMS_PARNEWGENERATION_HPP
-#define SHARE_VM_GC_CMS_PARNEWGENERATION_HPP
+#ifndef SHARE_GC_CMS_PARNEWGENERATION_HPP
+#define SHARE_GC_CMS_PARNEWGENERATION_HPP
#include "gc/cms/parOopClosures.hpp"
#include "gc/serial/defNewGeneration.hpp"
@@ -415,4 +415,4 @@ class ParNewGeneration: public DefNewGeneration {
static oop real_forwardee(oop obj);
};
-#endif // SHARE_VM_GC_CMS_PARNEWGENERATION_HPP
+#endif // SHARE_GC_CMS_PARNEWGENERATION_HPP
diff --git a/src/hotspot/share/gc/cms/parNewGeneration.inline.hpp b/src/hotspot/share/gc/cms/parNewGeneration.inline.hpp
index 8eb3f276482..ae2fa96d615 100644
--- a/src/hotspot/share/gc/cms/parNewGeneration.inline.hpp
+++ b/src/hotspot/share/gc/cms/parNewGeneration.inline.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
*
*/
-#ifndef SHARE_VM_GC_CMS_PARNEWGENERATION_INLINE_HPP
-#define SHARE_VM_GC_CMS_PARNEWGENERATION_INLINE_HPP
+#ifndef SHARE_GC_CMS_PARNEWGENERATION_INLINE_HPP
+#define SHARE_GC_CMS_PARNEWGENERATION_INLINE_HPP
#include "gc/cms/parNewGeneration.hpp"
#include "gc/shared/plab.inline.hpp"
@@ -34,4 +34,4 @@ inline HeapWord* ParScanThreadState::alloc_in_to_space(size_t word_sz) {
if (obj != NULL) return obj;
else return alloc_in_to_space_slow(word_sz);
}
-#endif // SHARE_VM_GC_CMS_PARNEWGENERATION_INLINE_HPP
+#endif // SHARE_GC_CMS_PARNEWGENERATION_INLINE_HPP
diff --git a/src/hotspot/share/gc/cms/parOopClosures.hpp b/src/hotspot/share/gc/cms/parOopClosures.hpp
index 23ba55aabeb..0d9b786206e 100644
--- a/src/hotspot/share/gc/cms/parOopClosures.hpp
+++ b/src/hotspot/share/gc/cms/parOopClosures.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2007, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
*
*/
-#ifndef SHARE_VM_GC_CMS_PAROOPCLOSURES_HPP
-#define SHARE_VM_GC_CMS_PAROOPCLOSURES_HPP
+#ifndef SHARE_GC_CMS_PAROOPCLOSURES_HPP
+#define SHARE_GC_CMS_PAROOPCLOSURES_HPP
#include "gc/shared/genOopClosures.hpp"
#include "gc/shared/taskqueue.hpp"
@@ -143,4 +143,4 @@ class ParEvacuateFollowersClosure: public VoidClosure {
virtual void do_void();
};
-#endif // SHARE_VM_GC_CMS_PAROOPCLOSURES_HPP
+#endif // SHARE_GC_CMS_PAROOPCLOSURES_HPP
diff --git a/src/hotspot/share/gc/cms/parOopClosures.inline.hpp b/src/hotspot/share/gc/cms/parOopClosures.inline.hpp
index 1e206292d8c..7f323537940 100644
--- a/src/hotspot/share/gc/cms/parOopClosures.inline.hpp
+++ b/src/hotspot/share/gc/cms/parOopClosures.inline.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2007, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
*
*/
-#ifndef SHARE_VM_GC_CMS_PAROOPCLOSURES_INLINE_HPP
-#define SHARE_VM_GC_CMS_PAROOPCLOSURES_INLINE_HPP
+#ifndef SHARE_GC_CMS_PAROOPCLOSURES_INLINE_HPP
+#define SHARE_GC_CMS_PAROOPCLOSURES_INLINE_HPP
#include "gc/cms/cmsHeap.hpp"
#include "gc/cms/parNewGeneration.hpp"
@@ -143,4 +143,4 @@ inline void ParScanWithBarrierClosure::do_oop(narrowOop* p) { ParScanClosure::do
inline void ParScanWithoutBarrierClosure::do_oop(oop* p) { ParScanClosure::do_oop_work(p, false, false); }
inline void ParScanWithoutBarrierClosure::do_oop(narrowOop* p) { ParScanClosure::do_oop_work(p, false, false); }
-#endif // SHARE_VM_GC_CMS_PAROOPCLOSURES_INLINE_HPP
+#endif // SHARE_GC_CMS_PAROOPCLOSURES_INLINE_HPP
diff --git a/src/hotspot/share/gc/cms/promotionInfo.hpp b/src/hotspot/share/gc/cms/promotionInfo.hpp
index aa2de84b77b..474603340c8 100644
--- a/src/hotspot/share/gc/cms/promotionInfo.hpp
+++ b/src/hotspot/share/gc/cms/promotionInfo.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2010, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
*
*/
-#ifndef SHARE_VM_GC_CMS_PROMOTIONINFO_HPP
-#define SHARE_VM_GC_CMS_PROMOTIONINFO_HPP
+#ifndef SHARE_GC_CMS_PROMOTIONINFO_HPP
+#define SHARE_GC_CMS_PROMOTIONINFO_HPP
#include "gc/cms/freeChunk.hpp"
@@ -185,4 +185,4 @@ class PromotionInfo {
};
-#endif // SHARE_VM_GC_CMS_PROMOTIONINFO_HPP
+#endif // SHARE_GC_CMS_PROMOTIONINFO_HPP
diff --git a/src/hotspot/share/gc/cms/promotionInfo.inline.hpp b/src/hotspot/share/gc/cms/promotionInfo.inline.hpp
index 97a71ede522..4e12e1e4b7d 100644
--- a/src/hotspot/share/gc/cms/promotionInfo.inline.hpp
+++ b/src/hotspot/share/gc/cms/promotionInfo.inline.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2010, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -74,4 +74,4 @@ void PromotionInfo::promoted_oops_iterate(OopClosureType* cl) {
assert(_firstIndex == _nextIndex, "empty buffer");
}
-#endif // SHARE_GC_CMS_PROMOTIONINFO_INLINE_HPP
+#endif // SHARE_GC_CMS_PROMOTIONINFO_INLINE_HPP
diff --git a/src/hotspot/share/gc/cms/vmStructs_cms.hpp b/src/hotspot/share/gc/cms/vmStructs_cms.hpp
index 2b0b53c862f..688938d8577 100644
--- a/src/hotspot/share/gc/cms/vmStructs_cms.hpp
+++ b/src/hotspot/share/gc/cms/vmStructs_cms.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2007, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
*
*/
-#ifndef SHARE_VM_GC_CMS_VMSTRUCTS_CMS_HPP
-#define SHARE_VM_GC_CMS_VMSTRUCTS_CMS_HPP
+#ifndef SHARE_GC_CMS_VMSTRUCTS_CMS_HPP
+#define SHARE_GC_CMS_VMSTRUCTS_CMS_HPP
#include "gc/cms/cmsHeap.hpp"
#include "gc/cms/compactibleFreeListSpace.hpp"
@@ -88,4 +88,4 @@
declare_constant(Generation::ConcurrentMarkSweep) \
declare_constant(Generation::ParNew)
-#endif // SHARE_VM_GC_CMS_VMSTRUCTS_CMS_HPP
+#endif // SHARE_GC_CMS_VMSTRUCTS_CMS_HPP
diff --git a/src/hotspot/share/gc/cms/yieldingWorkgroup.hpp b/src/hotspot/share/gc/cms/yieldingWorkgroup.hpp
index 612ab8f9f26..bdda460c24f 100644
--- a/src/hotspot/share/gc/cms/yieldingWorkgroup.hpp
+++ b/src/hotspot/share/gc/cms/yieldingWorkgroup.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2005, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
*
*/
-#ifndef SHARE_VM_GC_CMS_YIELDINGWORKGROUP_HPP
-#define SHARE_VM_GC_CMS_YIELDINGWORKGROUP_HPP
+#ifndef SHARE_GC_CMS_YIELDINGWORKGROUP_HPP
+#define SHARE_GC_CMS_YIELDINGWORKGROUP_HPP
#include "gc/shared/workgroup.hpp"
#include "utilities/macros.hpp"
@@ -269,4 +269,4 @@ private:
void internal_note_finish();
};
-#endif // SHARE_VM_GC_CMS_YIELDINGWORKGROUP_HPP
+#endif // SHARE_GC_CMS_YIELDINGWORKGROUP_HPP
diff --git a/src/hotspot/share/gc/epsilon/epsilonBarrierSet.hpp b/src/hotspot/share/gc/epsilon/epsilonBarrierSet.hpp
index 420e38fd13e..8089a75af9d 100644
--- a/src/hotspot/share/gc/epsilon/epsilonBarrierSet.hpp
+++ b/src/hotspot/share/gc/epsilon/epsilonBarrierSet.hpp
@@ -21,8 +21,8 @@
*
*/
-#ifndef SHARE_VM_GC_EPSILON_BARRIERSET_HPP
-#define SHARE_VM_GC_EPSILON_BARRIERSET_HPP
+#ifndef SHARE_GC_EPSILON_EPSILONBARRIERSET_HPP
+#define SHARE_GC_EPSILON_EPSILONBARRIERSET_HPP
#include "gc/shared/barrierSetAssembler.hpp"
#include "gc/shared/barrierSet.hpp"
@@ -54,4 +54,4 @@ struct BarrierSet::GetType {
typedef ::EpsilonBarrierSet type;
};
-#endif // SHARE_VM_GC_EPSILON_BARRIERSET_HPP
+#endif // SHARE_GC_EPSILON_EPSILONBARRIERSET_HPP
diff --git a/src/hotspot/share/gc/epsilon/epsilonCollectorPolicy.hpp b/src/hotspot/share/gc/epsilon/epsilonCollectorPolicy.hpp
index 855395e51e7..9f6503b319d 100644
--- a/src/hotspot/share/gc/epsilon/epsilonCollectorPolicy.hpp
+++ b/src/hotspot/share/gc/epsilon/epsilonCollectorPolicy.hpp
@@ -21,8 +21,8 @@
*
*/
-#ifndef SHARE_VM_GC_EPSILON_COLLECTORPOLICY_HPP
-#define SHARE_VM_GC_EPSILON_COLLECTORPOLICY_HPP
+#ifndef SHARE_GC_EPSILON_EPSILONCOLLECTORPOLICY_HPP
+#define SHARE_GC_EPSILON_EPSILONCOLLECTORPOLICY_HPP
#include "gc/shared/collectorPolicy.hpp"
@@ -39,4 +39,4 @@ public:
EpsilonCollectorPolicy() : CollectorPolicy() {};
};
-#endif // SHARE_VM_GC_EPSILON_COLLECTORPOLICY_HPP
+#endif // SHARE_GC_EPSILON_EPSILONCOLLECTORPOLICY_HPP
diff --git a/src/hotspot/share/gc/epsilon/epsilonHeap.cpp b/src/hotspot/share/gc/epsilon/epsilonHeap.cpp
index 3a4cbcbf377..d7698786b9d 100644
--- a/src/hotspot/share/gc/epsilon/epsilonHeap.cpp
+++ b/src/hotspot/share/gc/epsilon/epsilonHeap.cpp
@@ -161,12 +161,8 @@ HeapWord* EpsilonHeap::allocate_work(size_t size) {
{
size_t last = _last_heap_print;
if ((used - last >= _step_heap_print) && Atomic::cmpxchg(used, &_last_heap_print, last) == last) {
- log_info(gc)("Heap: " SIZE_FORMAT "M reserved, " SIZE_FORMAT "M (%.2f%%) committed, " SIZE_FORMAT "M (%.2f%%) used",
- max_capacity() / M,
- capacity() / M,
- capacity() * 100.0 / max_capacity(),
- used / M,
- used * 100.0 / max_capacity());
+ print_heap_info(used);
+ print_metaspace_info();
}
}
@@ -268,13 +264,26 @@ HeapWord* EpsilonHeap::mem_allocate(size_t size, bool *gc_overhead_limit_was_exc
}
void EpsilonHeap::collect(GCCause::Cause cause) {
- log_info(gc)("GC request for \"%s\" is ignored", GCCause::to_string(cause));
+ switch (cause) {
+ case GCCause::_metadata_GC_threshold:
+ case GCCause::_metadata_GC_clear_soft_refs:
+ // Receiving these causes means the VM itself entered the safepoint for metadata collection.
+ // While Epsilon does not do GC, it has to perform sizing adjustments, otherwise we would
+ // re-enter the safepoint again very soon.
+
+ assert(SafepointSynchronize::is_at_safepoint(), "Expected at safepoint");
+ log_info(gc)("GC request for \"%s\" is handled", GCCause::to_string(cause));
+ MetaspaceGC::compute_new_size();
+ print_metaspace_info();
+ break;
+ default:
+ log_info(gc)("GC request for \"%s\" is ignored", GCCause::to_string(cause));
+ }
_monitoring_support->update_counters();
}
void EpsilonHeap::do_full_collection(bool clear_all_soft_refs) {
- log_info(gc)("Full GC request for \"%s\" is ignored", GCCause::to_string(gc_cause()));
- _monitoring_support->update_counters();
+ collect(gc_cause());
}
void EpsilonHeap::safe_object_iterate(ObjectClosure *cl) {
@@ -289,13 +298,46 @@ void EpsilonHeap::print_on(outputStream *st) const {
st->print_cr("Allocation space:");
_space->print_on(st);
+
+ MetaspaceUtils::print_on(st);
}
void EpsilonHeap::print_tracing_info() const {
- Log(gc) log;
- size_t allocated_kb = used() / K;
- log.info("Total allocated: " SIZE_FORMAT " KB",
- allocated_kb);
- log.info("Average allocation rate: " SIZE_FORMAT " KB/sec",
- (size_t)(allocated_kb * NANOSECS_PER_SEC / os::elapsed_counter()));
+ print_heap_info(used());
+ print_metaspace_info();
+}
+
+void EpsilonHeap::print_heap_info(size_t used) const {
+ size_t reserved = max_capacity();
+ size_t committed = capacity();
+
+ if (reserved != 0) {
+ log_info(gc)("Heap: " SIZE_FORMAT "%s reserved, " SIZE_FORMAT "%s (%.2f%%) committed, "
+ SIZE_FORMAT "%s (%.2f%%) used",
+ byte_size_in_proper_unit(reserved), proper_unit_for_byte_size(reserved),
+ byte_size_in_proper_unit(committed), proper_unit_for_byte_size(committed),
+ committed * 100.0 / reserved,
+ byte_size_in_proper_unit(used), proper_unit_for_byte_size(used),
+ used * 100.0 / reserved);
+ } else {
+ log_info(gc)("Heap: no reliable data");
+ }
+}
+
+void EpsilonHeap::print_metaspace_info() const {
+ size_t reserved = MetaspaceUtils::reserved_bytes();
+ size_t committed = MetaspaceUtils::committed_bytes();
+ size_t used = MetaspaceUtils::used_bytes();
+
+ if (reserved != 0) {
+ log_info(gc, metaspace)("Metaspace: " SIZE_FORMAT "%s reserved, " SIZE_FORMAT "%s (%.2f%%) committed, "
+ SIZE_FORMAT "%s (%.2f%%) used",
+ byte_size_in_proper_unit(reserved), proper_unit_for_byte_size(reserved),
+ byte_size_in_proper_unit(committed), proper_unit_for_byte_size(committed),
+ committed * 100.0 / reserved,
+ byte_size_in_proper_unit(used), proper_unit_for_byte_size(used),
+ used * 100.0 / reserved);
+ } else {
+ log_info(gc, metaspace)("Metaspace: no reliable data");
+ }
}
diff --git a/src/hotspot/share/gc/epsilon/epsilonHeap.hpp b/src/hotspot/share/gc/epsilon/epsilonHeap.hpp
index 628860e916a..44c88fa8c22 100644
--- a/src/hotspot/share/gc/epsilon/epsilonHeap.hpp
+++ b/src/hotspot/share/gc/epsilon/epsilonHeap.hpp
@@ -21,8 +21,8 @@
*
*/
-#ifndef SHARE_VM_GC_EPSILON_COLLECTEDHEAP_HPP
-#define SHARE_VM_GC_EPSILON_COLLECTEDHEAP_HPP
+#ifndef SHARE_GC_EPSILON_EPSILONHEAP_HPP
+#define SHARE_GC_EPSILON_EPSILONHEAP_HPP
#include "gc/shared/collectedHeap.hpp"
#include "gc/shared/softRefPolicy.hpp"
@@ -147,6 +147,10 @@ public:
virtual void print_on(outputStream* st) const;
virtual void print_tracing_info() const;
+private:
+ void print_heap_info(size_t used) const;
+ void print_metaspace_info() const;
+
};
-#endif // SHARE_VM_GC_EPSILON_COLLECTEDHEAP_HPP
+#endif // SHARE_GC_EPSILON_EPSILONHEAP_HPP
diff --git a/src/hotspot/share/gc/epsilon/epsilonMemoryPool.hpp b/src/hotspot/share/gc/epsilon/epsilonMemoryPool.hpp
index 97f85b036fb..042e8d46f88 100644
--- a/src/hotspot/share/gc/epsilon/epsilonMemoryPool.hpp
+++ b/src/hotspot/share/gc/epsilon/epsilonMemoryPool.hpp
@@ -21,8 +21,8 @@
*
*/
-#ifndef SHARE_VM_GC_EPSILON_EPSILONMEMORYPOOL_HPP
-#define SHARE_VM_GC_EPSILON_EPSILONMEMORYPOOL_HPP
+#ifndef SHARE_GC_EPSILON_EPSILONMEMORYPOOL_HPP
+#define SHARE_GC_EPSILON_EPSILONMEMORYPOOL_HPP
#include "gc/epsilon/epsilonHeap.hpp"
#include "services/memoryPool.hpp"
@@ -41,4 +41,4 @@ public:
MemoryUsage get_memory_usage();
};
-#endif // SHARE_VM_GC_EPSILON_EPSILONMEMORYPOOL_HPP
+#endif // SHARE_GC_EPSILON_EPSILONMEMORYPOOL_HPP
diff --git a/src/hotspot/share/gc/epsilon/epsilonMonitoringSupport.hpp b/src/hotspot/share/gc/epsilon/epsilonMonitoringSupport.hpp
index 5747bcaaaa1..f18c035d4fd 100644
--- a/src/hotspot/share/gc/epsilon/epsilonMonitoringSupport.hpp
+++ b/src/hotspot/share/gc/epsilon/epsilonMonitoringSupport.hpp
@@ -21,8 +21,8 @@
*
*/
-#ifndef SHARE_VM_GC_EPSILON_EPSILONMONITORINGSUPPORT_HPP
-#define SHARE_VM_GC_EPSILON_EPSILONMONITORINGSUPPORT_HPP
+#ifndef SHARE_GC_EPSILON_EPSILONMONITORINGSUPPORT_HPP
+#define SHARE_GC_EPSILON_EPSILONMONITORINGSUPPORT_HPP
#include "memory/allocation.hpp"
@@ -40,5 +40,4 @@ public:
void update_counters();
};
-#endif // SHARE_VM_GC_EPSILON_EPSILONMONITORINGSUPPORT_HPP
-
+#endif // SHARE_GC_EPSILON_EPSILONMONITORINGSUPPORT_HPP
diff --git a/src/hotspot/share/gc/epsilon/epsilonThreadLocalData.hpp b/src/hotspot/share/gc/epsilon/epsilonThreadLocalData.hpp
index 5d614b86c0d..a0c14b73b93 100644
--- a/src/hotspot/share/gc/epsilon/epsilonThreadLocalData.hpp
+++ b/src/hotspot/share/gc/epsilon/epsilonThreadLocalData.hpp
@@ -21,8 +21,8 @@
*
*/
-#ifndef SHARE_VM_GC_EPSILON_EPSILONTHREADLOCALDATA_HPP
-#define SHARE_VM_GC_EPSILON_EPSILONTHREADLOCALDATA_HPP
+#ifndef SHARE_GC_EPSILON_EPSILONTHREADLOCALDATA_HPP
+#define SHARE_GC_EPSILON_EPSILONTHREADLOCALDATA_HPP
#include "runtime/thread.hpp"
#include "utilities/debug.hpp"
@@ -67,4 +67,4 @@ public:
}
};
-#endif // SHARE_VM_GC_EPSILON_EPSILONTHREADLOCALDATA_HPP
+#endif // SHARE_GC_EPSILON_EPSILONTHREADLOCALDATA_HPP
diff --git a/src/hotspot/share/gc/epsilon/epsilon_globals.hpp b/src/hotspot/share/gc/epsilon/epsilon_globals.hpp
index 097506c5e2e..07560a71b04 100644
--- a/src/hotspot/share/gc/epsilon/epsilon_globals.hpp
+++ b/src/hotspot/share/gc/epsilon/epsilon_globals.hpp
@@ -22,8 +22,8 @@
*
*/
-#ifndef SHARE_VM_GC_EPSILON_GLOBALS_HPP
-#define SHARE_VM_GC_EPSILON_GLOBALS_HPP
+#ifndef SHARE_GC_EPSILON_EPSILON_GLOBALS_HPP
+#define SHARE_GC_EPSILON_EPSILON_GLOBALS_HPP
#include "runtime/globals.hpp"
//
@@ -93,4 +93,4 @@
"at the potential expense of memory waste.") \
range(1, max_intx)
-#endif // SHARE_VM_GC_EPSILON_GLOBALS_HPP
+#endif // SHARE_GC_EPSILON_EPSILON_GLOBALS_HPP
diff --git a/src/hotspot/share/gc/epsilon/vmStructs_epsilon.hpp b/src/hotspot/share/gc/epsilon/vmStructs_epsilon.hpp
index 39072ad649e..748abdb638d 100644
--- a/src/hotspot/share/gc/epsilon/vmStructs_epsilon.hpp
+++ b/src/hotspot/share/gc/epsilon/vmStructs_epsilon.hpp
@@ -22,8 +22,8 @@
*
*/
-#ifndef SHARE_GC_EPSILON_VMSTRUCTS_HPP
-#define SHARE_GC_EPSILON_VMSTRUCTS_HPP
+#ifndef SHARE_GC_EPSILON_VMSTRUCTS_EPSILON_HPP
+#define SHARE_GC_EPSILON_VMSTRUCTS_EPSILON_HPP
#include "gc/epsilon/epsilonHeap.hpp"
#include "gc/shared/space.hpp"
@@ -43,4 +43,4 @@
#define VM_INT_CONSTANTS_EPSILONGC(declare_constant, \
declare_constant_with_value)
-#endif // SHARE_GC_EPSILON_VMSTRUCTS_HPP
+#endif // SHARE_GC_EPSILON_VMSTRUCTS_EPSILON_HPP
diff --git a/src/hotspot/share/gc/g1/c2/g1BarrierSetC2.hpp b/src/hotspot/share/gc/g1/c2/g1BarrierSetC2.hpp
index fbb5de13d9f..3002daa5cfc 100644
--- a/src/hotspot/share/gc/g1/c2/g1BarrierSetC2.hpp
+++ b/src/hotspot/share/gc/g1/c2/g1BarrierSetC2.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
*
*/
-#ifndef SHARE_GC_SHARED_C2_G1BARRIERSETC2_HPP
-#define SHARE_GC_SHARED_C2_G1BARRIERSETC2_HPP
+#ifndef SHARE_GC_G1_C2_G1BARRIERSETC2_HPP
+#define SHARE_GC_G1_C2_G1BARRIERSETC2_HPP
#include "gc/shared/c2/cardTableBarrierSetC2.hpp"
@@ -96,4 +96,4 @@ protected:
virtual bool escape_add_to_con_graph(ConnectionGraph* conn_graph, PhaseGVN* gvn, Unique_Node_List* delayed_worklist, Node* n, uint opcode) const;
};
-#endif // SHARE_GC_SHARED_C2_G1BARRIERSETC2_HPP
+#endif // SHARE_GC_G1_C2_G1BARRIERSETC2_HPP
diff --git a/src/hotspot/share/gc/g1/collectionSetChooser.hpp b/src/hotspot/share/gc/g1/collectionSetChooser.hpp
index f25bee5e4c9..915eb62509c 100644
--- a/src/hotspot/share/gc/g1/collectionSetChooser.hpp
+++ b/src/hotspot/share/gc/g1/collectionSetChooser.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2001, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
*
*/
-#ifndef SHARE_VM_GC_G1_COLLECTIONSETCHOOSER_HPP
-#define SHARE_VM_GC_G1_COLLECTIONSETCHOOSER_HPP
+#ifndef SHARE_GC_G1_COLLECTIONSETCHOOSER_HPP
+#define SHARE_GC_G1_COLLECTIONSETCHOOSER_HPP
#include "gc/g1/heapRegion.hpp"
#include "utilities/growableArray.hpp"
@@ -199,5 +199,4 @@ public:
bool should_add(HeapRegion* hr) { return _chooser->should_add(hr); }
};
-#endif // SHARE_VM_GC_G1_COLLECTIONSETCHOOSER_HPP
-
+#endif // SHARE_GC_G1_COLLECTIONSETCHOOSER_HPP
diff --git a/src/hotspot/share/gc/g1/dirtyCardQueue.cpp b/src/hotspot/share/gc/g1/dirtyCardQueue.cpp
index 920df866052..ce5bb918008 100644
--- a/src/hotspot/share/gc/g1/dirtyCardQueue.cpp
+++ b/src/hotspot/share/gc/g1/dirtyCardQueue.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2001, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -25,6 +25,7 @@
#include "precompiled.hpp"
#include "gc/g1/dirtyCardQueue.hpp"
#include "gc/g1/g1CollectedHeap.inline.hpp"
+#include "gc/g1/g1FreeIdSet.hpp"
#include "gc/g1/g1RemSet.hpp"
#include "gc/g1/g1ThreadLocalData.hpp"
#include "gc/g1/heapRegionRemSet.hpp"
@@ -55,72 +56,6 @@ public:
}
};
-// Represents a set of free small integer ids.
-class FreeIdSet : public CHeapObj {
- enum {
- end_of_list = UINT_MAX,
- claimed = UINT_MAX - 1
- };
-
- uint _size;
- Monitor* _mon;
-
- uint* _ids;
- uint _hd;
- uint _waiters;
- uint _claimed;
-
-public:
- FreeIdSet(uint size, Monitor* mon);
- ~FreeIdSet();
-
- // Returns an unclaimed parallel id (waiting for one to be released if
- // necessary).
- uint claim_par_id();
-
- void release_par_id(uint id);
-};
-
-FreeIdSet::FreeIdSet(uint size, Monitor* mon) :
- _size(size), _mon(mon), _hd(0), _waiters(0), _claimed(0)
-{
- guarantee(size != 0, "must be");
- _ids = NEW_C_HEAP_ARRAY(uint, size, mtGC);
- for (uint i = 0; i < size - 1; i++) {
- _ids[i] = i+1;
- }
- _ids[size-1] = end_of_list; // end of list.
-}
-
-FreeIdSet::~FreeIdSet() {
- FREE_C_HEAP_ARRAY(uint, _ids);
-}
-
-uint FreeIdSet::claim_par_id() {
- MutexLockerEx x(_mon, Mutex::_no_safepoint_check_flag);
- while (_hd == end_of_list) {
- _waiters++;
- _mon->wait(Mutex::_no_safepoint_check_flag);
- _waiters--;
- }
- uint res = _hd;
- _hd = _ids[res];
- _ids[res] = claimed; // For debugging.
- _claimed++;
- return res;
-}
-
-void FreeIdSet::release_par_id(uint id) {
- MutexLockerEx x(_mon, Mutex::_no_safepoint_check_flag);
- assert(_ids[id] == claimed, "Precondition.");
- _ids[id] = _hd;
- _hd = id;
- _claimed--;
- if (_waiters > 0) {
- _mon->notify_all();
- }
-}
-
DirtyCardQueue::DirtyCardQueue(DirtyCardQueueSet* qset, bool permanent) :
// Dirty card queues are always active, so we create them with their
// active field set to true.
@@ -144,6 +79,10 @@ DirtyCardQueueSet::DirtyCardQueueSet(bool notify_when_complete) :
_all_active = true;
}
+DirtyCardQueueSet::~DirtyCardQueueSet() {
+ delete _free_ids;
+}
+
// Determines how many mutator threads can process the buffers in parallel.
uint DirtyCardQueueSet::num_par_ids() {
return (uint)os::initial_active_processor_count();
@@ -156,7 +95,7 @@ void DirtyCardQueueSet::initialize(Monitor* cbl_mon,
PtrQueueSet::initialize(cbl_mon, allocator);
_shared_dirty_card_queue.set_lock(lock);
if (init_free_ids) {
- _free_ids = new FreeIdSet(num_par_ids(), cbl_mon);
+ _free_ids = new G1FreeIdSet(0, num_par_ids());
}
}
diff --git a/src/hotspot/share/gc/g1/dirtyCardQueue.hpp b/src/hotspot/share/gc/g1/dirtyCardQueue.hpp
index 81ea4834a34..7619c3a8f8b 100644
--- a/src/hotspot/share/gc/g1/dirtyCardQueue.hpp
+++ b/src/hotspot/share/gc/g1/dirtyCardQueue.hpp
@@ -22,14 +22,14 @@
*
*/
-#ifndef SHARE_VM_GC_G1_DIRTYCARDQUEUE_HPP
-#define SHARE_VM_GC_G1_DIRTYCARDQUEUE_HPP
+#ifndef SHARE_GC_G1_DIRTYCARDQUEUE_HPP
+#define SHARE_GC_G1_DIRTYCARDQUEUE_HPP
#include "gc/shared/ptrQueue.hpp"
#include "memory/allocation.hpp"
-class FreeIdSet;
class DirtyCardQueueSet;
+class G1FreeIdSet;
class JavaThread;
class Monitor;
@@ -103,8 +103,7 @@ class DirtyCardQueueSet: public PtrQueueSet {
bool mut_process_buffer(BufferNode* node);
- // Protected by the _cbl_mon.
- FreeIdSet* _free_ids;
+ G1FreeIdSet* _free_ids;
// The number of completed buffers processed by mutator and rs thread,
// respectively.
@@ -118,6 +117,7 @@ class DirtyCardQueueSet: public PtrQueueSet {
public:
DirtyCardQueueSet(bool notify_when_complete = true);
+ ~DirtyCardQueueSet();
void initialize(Monitor* cbl_mon,
BufferNode::Allocator* allocator,
@@ -164,4 +164,4 @@ public:
};
-#endif // SHARE_VM_GC_G1_DIRTYCARDQUEUE_HPP
+#endif // SHARE_GC_G1_DIRTYCARDQUEUE_HPP
diff --git a/src/hotspot/share/gc/g1/g1AllocRegion.hpp b/src/hotspot/share/gc/g1/g1AllocRegion.hpp
index 593612975f8..aa220c1765e 100644
--- a/src/hotspot/share/gc/g1/g1AllocRegion.hpp
+++ b/src/hotspot/share/gc/g1/g1AllocRegion.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2011, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
*
*/
-#ifndef SHARE_VM_GC_G1_G1ALLOCREGION_HPP
-#define SHARE_VM_GC_G1_G1ALLOCREGION_HPP
+#ifndef SHARE_GC_G1_G1ALLOCREGION_HPP
+#define SHARE_GC_G1_G1ALLOCREGION_HPP
#include "gc/g1/heapRegion.hpp"
#include "gc/g1/g1EvacStats.hpp"
@@ -281,4 +281,4 @@ public:
virtual HeapRegion* release();
};
-#endif // SHARE_VM_GC_G1_G1ALLOCREGION_HPP
+#endif // SHARE_GC_G1_G1ALLOCREGION_HPP
diff --git a/src/hotspot/share/gc/g1/g1AllocRegion.inline.hpp b/src/hotspot/share/gc/g1/g1AllocRegion.inline.hpp
index fdf7712dfbe..79fb4862490 100644
--- a/src/hotspot/share/gc/g1/g1AllocRegion.inline.hpp
+++ b/src/hotspot/share/gc/g1/g1AllocRegion.inline.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2011, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
*
*/
-#ifndef SHARE_VM_GC_G1_G1ALLOCREGION_INLINE_HPP
-#define SHARE_VM_GC_G1_G1ALLOCREGION_INLINE_HPP
+#ifndef SHARE_GC_G1_G1ALLOCREGION_INLINE_HPP
+#define SHARE_GC_G1_G1ALLOCREGION_INLINE_HPP
#include "gc/g1/g1AllocRegion.hpp"
#include "gc/g1/heapRegion.inline.hpp"
@@ -143,4 +143,4 @@ inline HeapWord* MutatorAllocRegion::attempt_retained_allocation(size_t min_word
return NULL;
}
-#endif // SHARE_VM_GC_G1_G1ALLOCREGION_INLINE_HPP
+#endif // SHARE_GC_G1_G1ALLOCREGION_INLINE_HPP
diff --git a/src/hotspot/share/gc/g1/g1Allocator.cpp b/src/hotspot/share/gc/g1/g1Allocator.cpp
index d4969c66ac9..05fd6fbb841 100644
--- a/src/hotspot/share/gc/g1/g1Allocator.cpp
+++ b/src/hotspot/share/gc/g1/g1Allocator.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2014, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -26,6 +26,7 @@
#include "gc/g1/g1Allocator.inline.hpp"
#include "gc/g1/g1AllocRegion.inline.hpp"
#include "gc/g1/g1EvacStats.inline.hpp"
+#include "gc/g1/g1EvacuationInfo.hpp"
#include "gc/g1/g1CollectedHeap.inline.hpp"
#include "gc/g1/g1Policy.hpp"
#include "gc/g1/heapRegion.inline.hpp"
@@ -57,7 +58,7 @@ bool G1Allocator::is_retained_old_region(HeapRegion* hr) {
return _retained_old_gc_alloc_region == hr;
}
-void G1Allocator::reuse_retained_old_region(EvacuationInfo& evacuation_info,
+void G1Allocator::reuse_retained_old_region(G1EvacuationInfo& evacuation_info,
OldGCAllocRegion* old,
HeapRegion** retained_old) {
HeapRegion* retained_region = *retained_old;
@@ -90,7 +91,7 @@ void G1Allocator::reuse_retained_old_region(EvacuationInfo& evacuation_info,
}
}
-void G1Allocator::init_gc_alloc_regions(EvacuationInfo& evacuation_info) {
+void G1Allocator::init_gc_alloc_regions(G1EvacuationInfo& evacuation_info) {
assert_at_safepoint_on_vm_thread();
_survivor_is_full = false;
@@ -103,7 +104,7 @@ void G1Allocator::init_gc_alloc_regions(EvacuationInfo& evacuation_info) {
&_retained_old_gc_alloc_region);
}
-void G1Allocator::release_gc_alloc_regions(EvacuationInfo& evacuation_info) {
+void G1Allocator::release_gc_alloc_regions(G1EvacuationInfo& evacuation_info) {
evacuation_info.set_allocation_regions(survivor_gc_alloc_region()->count() +
old_gc_alloc_region()->count());
survivor_gc_alloc_region()->release();
diff --git a/src/hotspot/share/gc/g1/g1Allocator.hpp b/src/hotspot/share/gc/g1/g1Allocator.hpp
index 7c5269ed113..25f0e2f9599 100644
--- a/src/hotspot/share/gc/g1/g1Allocator.hpp
+++ b/src/hotspot/share/gc/g1/g1Allocator.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2014, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -22,15 +22,15 @@
*
*/
-#ifndef SHARE_VM_GC_G1_G1ALLOCATOR_HPP
-#define SHARE_VM_GC_G1_G1ALLOCATOR_HPP
+#ifndef SHARE_GC_G1_G1ALLOCATOR_HPP
+#define SHARE_GC_G1_G1ALLOCATOR_HPP
#include "gc/g1/g1AllocRegion.hpp"
#include "gc/g1/g1InCSetState.hpp"
#include "gc/shared/collectedHeap.hpp"
#include "gc/shared/plab.hpp"
-class EvacuationInfo;
+class G1EvacuationInfo;
// Interface to keep track of which regions G1 is currently allocating into. Provides
// some accessors (e.g. allocating into them, or getting their occupancy).
@@ -63,7 +63,7 @@ private:
void set_survivor_full();
void set_old_full();
- void reuse_retained_old_region(EvacuationInfo& evacuation_info,
+ void reuse_retained_old_region(G1EvacuationInfo& evacuation_info,
OldGCAllocRegion* old,
HeapRegion** retained);
@@ -92,8 +92,8 @@ public:
void init_mutator_alloc_region();
void release_mutator_alloc_region();
- void init_gc_alloc_regions(EvacuationInfo& evacuation_info);
- void release_gc_alloc_regions(EvacuationInfo& evacuation_info);
+ void init_gc_alloc_regions(G1EvacuationInfo& evacuation_info);
+ void release_gc_alloc_regions(G1EvacuationInfo& evacuation_info);
void abandon_gc_alloc_regions();
bool is_retained_old_region(HeapRegion* hr);
@@ -288,4 +288,4 @@ private:
static inline bool archive_check_enabled();
};
-#endif // SHARE_VM_GC_G1_G1ALLOCATOR_HPP
+#endif // SHARE_GC_G1_G1ALLOCATOR_HPP
diff --git a/src/hotspot/share/gc/g1/g1Allocator.inline.hpp b/src/hotspot/share/gc/g1/g1Allocator.inline.hpp
index 7df57b5c991..c7cebad9a85 100644
--- a/src/hotspot/share/gc/g1/g1Allocator.inline.hpp
+++ b/src/hotspot/share/gc/g1/g1Allocator.inline.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2015, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
*
*/
-#ifndef SHARE_VM_GC_G1_G1ALLOCATOR_INLINE_HPP
-#define SHARE_VM_GC_G1_G1ALLOCATOR_INLINE_HPP
+#ifndef SHARE_GC_G1_G1ALLOCATOR_INLINE_HPP
+#define SHARE_GC_G1_G1ALLOCATOR_INLINE_HPP
#include "gc/g1/g1Allocator.hpp"
#include "gc/g1/g1AllocRegion.inline.hpp"
@@ -164,4 +164,4 @@ inline bool G1ArchiveAllocator::is_archived_object(oop object) {
in_open_archive_range(object)));
}
-#endif // SHARE_VM_GC_G1_G1ALLOCATOR_HPP
+#endif // SHARE_GC_G1_G1ALLOCATOR_INLINE_HPP
diff --git a/src/hotspot/share/gc/g1/g1Analytics.hpp b/src/hotspot/share/gc/g1/g1Analytics.hpp
index 17847e6e23d..e286089fe3d 100644
--- a/src/hotspot/share/gc/g1/g1Analytics.hpp
+++ b/src/hotspot/share/gc/g1/g1Analytics.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2016, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
*
*/
-#ifndef SHARE_VM_GC_G1_G1MEASUREMENTS_HPP
-#define SHARE_VM_GC_G1_G1MEASUREMENTS_HPP
+#ifndef SHARE_GC_G1_G1ANALYTICS_HPP
+#define SHARE_GC_G1_G1ANALYTICS_HPP
#include "memory/allocation.hpp"
#include "utilities/globalDefinitions.hpp"
@@ -158,4 +158,4 @@ public:
double last_known_gc_end_time_sec() const;
};
-#endif // SHARE_VM_GC_G1_G1MEASUREMENTS_HPP
+#endif // SHARE_GC_G1_G1ANALYTICS_HPP
diff --git a/src/hotspot/share/gc/g1/g1BarrierSet.cpp b/src/hotspot/share/gc/g1/g1BarrierSet.cpp
index 2788c4877e0..119171b43d4 100644
--- a/src/hotspot/share/gc/g1/g1BarrierSet.cpp
+++ b/src/hotspot/share/gc/g1/g1BarrierSet.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2001, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -55,8 +55,8 @@ G1BarrierSet::G1BarrierSet(G1CardTable* card_table) :
make_barrier_set_c2(),
card_table,
BarrierSet::FakeRtti(BarrierSet::G1BarrierSet)),
- _satb_mark_queue_buffer_allocator(G1SATBBufferSize, SATB_Q_FL_lock),
- _dirty_card_queue_buffer_allocator(G1UpdateBufferSize, DirtyCardQ_FL_lock),
+ _satb_mark_queue_buffer_allocator("SATB Buffer Allocator", G1SATBBufferSize),
+ _dirty_card_queue_buffer_allocator("DC Buffer Allocator", G1UpdateBufferSize),
_satb_mark_queue_set(),
_dirty_card_queue_set()
{}
diff --git a/src/hotspot/share/gc/g1/g1BarrierSet.hpp b/src/hotspot/share/gc/g1/g1BarrierSet.hpp
index be26748c7cb..4b60b4b26e1 100644
--- a/src/hotspot/share/gc/g1/g1BarrierSet.hpp
+++ b/src/hotspot/share/gc/g1/g1BarrierSet.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2001, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
*
*/
-#ifndef SHARE_VM_GC_G1_G1BARRIERSET_HPP
-#define SHARE_VM_GC_G1_G1BARRIERSET_HPP
+#ifndef SHARE_GC_G1_G1BARRIERSET_HPP
+#define SHARE_GC_G1_G1BARRIERSET_HPP
#include "gc/g1/dirtyCardQueue.hpp"
#include "gc/g1/g1SATBMarkQueueSet.hpp"
@@ -126,4 +126,4 @@ struct BarrierSet::GetType {
typedef ::G1BarrierSet type;
};
-#endif // SHARE_VM_GC_G1_G1BARRIERSET_HPP
+#endif // SHARE_GC_G1_G1BARRIERSET_HPP
diff --git a/src/hotspot/share/gc/g1/g1BarrierSet.inline.hpp b/src/hotspot/share/gc/g1/g1BarrierSet.inline.hpp
index 8fc692fbb24..acf47a11dce 100644
--- a/src/hotspot/share/gc/g1/g1BarrierSet.inline.hpp
+++ b/src/hotspot/share/gc/g1/g1BarrierSet.inline.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2016, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
*
*/
-#ifndef SHARE_VM_GC_G1_G1BARRIERSET_INLINE_HPP
-#define SHARE_VM_GC_G1_G1BARRIERSET_INLINE_HPP
+#ifndef SHARE_GC_G1_G1BARRIERSET_INLINE_HPP
+#define SHARE_GC_G1_G1BARRIERSET_INLINE_HPP
#include "gc/g1/g1BarrierSet.hpp"
#include "gc/g1/g1CardTable.hpp"
@@ -105,4 +105,4 @@ oop_store_not_in_heap(T* addr, oop new_value) {
Raw::oop_store(addr, new_value);
}
-#endif // SHARE_VM_GC_G1_G1BARRIERSET_INLINE_HPP
+#endif // SHARE_GC_G1_G1BARRIERSET_INLINE_HPP
diff --git a/src/hotspot/share/gc/g1/g1BiasedArray.hpp b/src/hotspot/share/gc/g1/g1BiasedArray.hpp
index 9400d8ac912..308ed285506 100644
--- a/src/hotspot/share/gc/g1/g1BiasedArray.hpp
+++ b/src/hotspot/share/gc/g1/g1BiasedArray.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2013, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
*
*/
-#ifndef SHARE_VM_GC_G1_G1BIASEDARRAY_HPP
-#define SHARE_VM_GC_G1_G1BIASEDARRAY_HPP
+#ifndef SHARE_GC_G1_G1BIASEDARRAY_HPP
+#define SHARE_GC_G1_G1BIASEDARRAY_HPP
#include "memory/memRegion.hpp"
#include "utilities/debug.hpp"
@@ -194,4 +194,4 @@ public:
}
};
-#endif // SHARE_VM_GC_G1_G1BIASEDARRAY_HPP
+#endif // SHARE_GC_G1_G1BIASEDARRAY_HPP
diff --git a/src/hotspot/share/gc/g1/g1BlockOffsetTable.hpp b/src/hotspot/share/gc/g1/g1BlockOffsetTable.hpp
index e6099a44d81..fa7a84ad4ff 100644
--- a/src/hotspot/share/gc/g1/g1BlockOffsetTable.hpp
+++ b/src/hotspot/share/gc/g1/g1BlockOffsetTable.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2001, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
*
*/
-#ifndef SHARE_VM_GC_G1_G1BLOCKOFFSETTABLE_HPP
-#define SHARE_VM_GC_G1_G1BLOCKOFFSETTABLE_HPP
+#ifndef SHARE_GC_G1_G1BLOCKOFFSETTABLE_HPP
+#define SHARE_GC_G1_G1BLOCKOFFSETTABLE_HPP
#include "gc/g1/g1RegionToSpaceMapper.hpp"
#include "gc/shared/blockOffsetTable.hpp"
@@ -232,4 +232,4 @@ public:
void print_on(outputStream* out) PRODUCT_RETURN;
};
-#endif // SHARE_VM_GC_G1_G1BLOCKOFFSETTABLE_HPP
+#endif // SHARE_GC_G1_G1BLOCKOFFSETTABLE_HPP
diff --git a/src/hotspot/share/gc/g1/g1BlockOffsetTable.inline.hpp b/src/hotspot/share/gc/g1/g1BlockOffsetTable.inline.hpp
index d845c02c36c..186f135e0d4 100644
--- a/src/hotspot/share/gc/g1/g1BlockOffsetTable.inline.hpp
+++ b/src/hotspot/share/gc/g1/g1BlockOffsetTable.inline.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2001, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
*
*/
-#ifndef SHARE_VM_GC_G1_G1BLOCKOFFSETTABLE_INLINE_HPP
-#define SHARE_VM_GC_G1_G1BLOCKOFFSETTABLE_INLINE_HPP
+#ifndef SHARE_GC_G1_G1BLOCKOFFSETTABLE_INLINE_HPP
+#define SHARE_GC_G1_G1BLOCKOFFSETTABLE_INLINE_HPP
#include "gc/g1/g1BlockOffsetTable.hpp"
#include "gc/g1/heapRegion.hpp"
@@ -165,4 +165,4 @@ inline HeapWord* G1BlockOffsetTablePart::forward_to_block_containing_addr(HeapWo
return q;
}
-#endif // SHARE_VM_GC_G1_G1BLOCKOFFSETTABLE_INLINE_HPP
+#endif // SHARE_GC_G1_G1BLOCKOFFSETTABLE_INLINE_HPP
diff --git a/src/hotspot/share/gc/g1/g1CardCounts.hpp b/src/hotspot/share/gc/g1/g1CardCounts.hpp
index 61378137785..e9d2f764271 100644
--- a/src/hotspot/share/gc/g1/g1CardCounts.hpp
+++ b/src/hotspot/share/gc/g1/g1CardCounts.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2013, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
*
*/
-#ifndef SHARE_VM_GC_G1_G1CARDCOUNTS_HPP
-#define SHARE_VM_GC_G1_G1CARDCOUNTS_HPP
+#ifndef SHARE_GC_G1_G1CARDCOUNTS_HPP
+#define SHARE_GC_G1_G1CARDCOUNTS_HPP
#include "gc/g1/g1CardTable.hpp"
#include "gc/g1/g1RegionToSpaceMapper.hpp"
@@ -128,4 +128,4 @@ class G1CardCounts: public CHeapObj {
void clear_all();
};
-#endif // SHARE_VM_GC_G1_G1CARDCOUNTS_HPP
+#endif // SHARE_GC_G1_G1CARDCOUNTS_HPP
diff --git a/src/hotspot/share/gc/g1/g1CardTable.hpp b/src/hotspot/share/gc/g1/g1CardTable.hpp
index bd6ac37da0c..8f0b4461f23 100644
--- a/src/hotspot/share/gc/g1/g1CardTable.hpp
+++ b/src/hotspot/share/gc/g1/g1CardTable.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2001, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
*
*/
-#ifndef SHARE_VM_GC_G1_G1CARDTABLE_HPP
-#define SHARE_VM_GC_G1_G1CARDTABLE_HPP
+#ifndef SHARE_GC_G1_G1CARDTABLE_HPP
+#define SHARE_GC_G1_G1CARDTABLE_HPP
#include "gc/g1/g1RegionToSpaceMapper.hpp"
#include "gc/shared/cardTable.hpp"
@@ -110,4 +110,4 @@ public:
virtual bool is_in_young(oop obj) const;
};
-#endif // SHARE_VM_GC_G1_G1CARDTABLE_HPP
+#endif // SHARE_GC_G1_G1CARDTABLE_HPP
diff --git a/src/hotspot/share/gc/g1/g1CardTable.inline.hpp b/src/hotspot/share/gc/g1/g1CardTable.inline.hpp
index 5ca09d42835..cfefac79b78 100644
--- a/src/hotspot/share/gc/g1/g1CardTable.inline.hpp
+++ b/src/hotspot/share/gc/g1/g1CardTable.inline.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2001, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
*
*/
-#ifndef SHARE_VM_GC_G1_G1CARDTABLE_INLINE_HPP
-#define SHARE_VM_GC_G1_G1CARDTABLE_INLINE_HPP
+#ifndef SHARE_GC_G1_G1CARDTABLE_INLINE_HPP
+#define SHARE_GC_G1_G1CARDTABLE_INLINE_HPP
#include "gc/g1/g1CardTable.hpp"
@@ -37,4 +37,4 @@ void G1CardTable::set_card_claimed(size_t card_index) {
_byte_map[card_index] = val;
}
-#endif // SHARE_VM_GC_G1_G1CARDTABLE_INLINE_HPP
+#endif // SHARE_GC_G1_G1CARDTABLE_INLINE_HPP
diff --git a/src/hotspot/share/gc/g1/g1CodeBlobClosure.hpp b/src/hotspot/share/gc/g1/g1CodeBlobClosure.hpp
index e3c9c30d19f..94c6587cfc8 100644
--- a/src/hotspot/share/gc/g1/g1CodeBlobClosure.hpp
+++ b/src/hotspot/share/gc/g1/g1CodeBlobClosure.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
*
*/
-#ifndef SHARE_VM_GC_G1_G1CODEBLOBCLOSURE_HPP
-#define SHARE_VM_GC_G1_G1CODEBLOBCLOSURE_HPP
+#ifndef SHARE_GC_G1_G1CODEBLOBCLOSURE_HPP
+#define SHARE_GC_G1_G1CODEBLOBCLOSURE_HPP
#include "gc/g1/g1CollectedHeap.hpp"
#include "memory/iterator.hpp"
@@ -57,5 +57,4 @@ public:
void do_code_blob(CodeBlob* cb);
};
-#endif // SHARE_VM_GC_G1_G1CODEBLOBCLOSURE_HPP
-
+#endif // SHARE_GC_G1_G1CODEBLOBCLOSURE_HPP
diff --git a/src/hotspot/share/gc/g1/g1CodeCacheRemSet.hpp b/src/hotspot/share/gc/g1/g1CodeCacheRemSet.hpp
index af39ab76315..c9f6aa666e5 100644
--- a/src/hotspot/share/gc/g1/g1CodeCacheRemSet.hpp
+++ b/src/hotspot/share/gc/g1/g1CodeCacheRemSet.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2014, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
*
*/
-#ifndef SHARE_VM_GC_G1_G1CODECACHEREMSET_HPP
-#define SHARE_VM_GC_G1_G1CODECACHEREMSET_HPP
+#ifndef SHARE_GC_G1_G1CODECACHEREMSET_HPP
+#define SHARE_GC_G1_G1CODECACHEREMSET_HPP
class CodeBlobClosure;
class G1CodeRootSetTable;
@@ -84,4 +84,4 @@ class G1CodeRootSet {
};
-#endif // SHARE_VM_GC_G1_G1CODECACHEREMSET_HPP
+#endif // SHARE_GC_G1_G1CODECACHEREMSET_HPP
diff --git a/src/hotspot/share/gc/g1/g1CodeRootSetTable.hpp b/src/hotspot/share/gc/g1/g1CodeRootSetTable.hpp
index 4a3b6bbc25b..3f199915370 100644
--- a/src/hotspot/share/gc/g1/g1CodeRootSetTable.hpp
+++ b/src/hotspot/share/gc/g1/g1CodeRootSetTable.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -21,8 +21,8 @@
* questions.
*/
-#ifndef SHARE_VM_GC_G1_G1CODEROOTSETTABLE_HPP
-#define SHARE_VM_GC_G1_G1CODEROOTSETTABLE_HPP
+#ifndef SHARE_GC_G1_G1CODEROOTSETTABLE_HPP
+#define SHARE_GC_G1_G1CODEROOTSETTABLE_HPP
#include "utilities/hashtable.hpp"
@@ -73,4 +73,4 @@ class G1CodeRootSetTable : public Hashtable {
size_t mem_size();
};
-#endif /* SHARE_VM_GC_G1_G1CODEROOTSETTABLE_HPP */
+#endif // SHARE_GC_G1_G1CODEROOTSETTABLE_HPP
diff --git a/src/hotspot/share/gc/g1/g1CollectedHeap.cpp b/src/hotspot/share/gc/g1/g1CollectedHeap.cpp
index c1fd5aad086..14786cc11b5 100644
--- a/src/hotspot/share/gc/g1/g1CollectedHeap.cpp
+++ b/src/hotspot/share/gc/g1/g1CollectedHeap.cpp
@@ -2918,7 +2918,7 @@ G1CollectedHeap::do_collection_pause_at_safepoint(double target_pause_time_ms) {
// Inner scope for scope based logging, timers, and stats collection
{
- EvacuationInfo evacuation_info;
+ G1EvacuationInfo evacuation_info;
if (collector_state()->in_initial_mark_gc()) {
// We are about to start a marking cycle, so we increment the
@@ -3899,7 +3899,7 @@ void G1CollectedHeap::evacuate_optional_collection_set(G1ParScanThreadStateSet*
phase_times->record_optional_evacuation((os::elapsedTime() - start_time_sec) * 1000.0);
}
-void G1CollectedHeap::post_evacuate_collection_set(EvacuationInfo& evacuation_info, G1ParScanThreadStateSet* per_thread_states) {
+void G1CollectedHeap::post_evacuate_collection_set(G1EvacuationInfo& evacuation_info, G1ParScanThreadStateSet* per_thread_states) {
// Also cleans the card table from temporary duplicate detection information used
// during UpdateRS/ScanRS.
g1_rem_set()->cleanup_after_oops_into_collection_set_do();
@@ -4033,7 +4033,7 @@ private:
// be done serially in a single thread.
class G1SerialFreeCollectionSetClosure : public HeapRegionClosure {
private:
- EvacuationInfo* _evacuation_info;
+ G1EvacuationInfo* _evacuation_info;
const size_t* _surviving_young_words;
// Bytes used in successfully evacuated regions before the evacuation.
@@ -4048,7 +4048,7 @@ private:
FreeRegionList _local_free_list;
public:
- G1SerialFreeCollectionSetClosure(EvacuationInfo* evacuation_info, const size_t* surviving_young_words) :
+ G1SerialFreeCollectionSetClosure(G1EvacuationInfo* evacuation_info, const size_t* surviving_young_words) :
HeapRegionClosure(),
_evacuation_info(evacuation_info),
_surviving_young_words(surviving_young_words),
@@ -4202,7 +4202,7 @@ private:
policy->cset_regions_freed();
}
public:
- G1FreeCollectionSetTask(G1CollectionSet* collection_set, EvacuationInfo* evacuation_info, const size_t* surviving_young_words) :
+ G1FreeCollectionSetTask(G1CollectionSet* collection_set, G1EvacuationInfo* evacuation_info, const size_t* surviving_young_words) :
AbstractGangTask("G1 Free Collection Set"),
_collection_set(collection_set),
_cl(evacuation_info, surviving_young_words),
@@ -4285,7 +4285,7 @@ public:
}
};
-void G1CollectedHeap::free_collection_set(G1CollectionSet* collection_set, EvacuationInfo& evacuation_info, const size_t* surviving_young_words) {
+void G1CollectedHeap::free_collection_set(G1CollectionSet* collection_set, G1EvacuationInfo& evacuation_info, const size_t* surviving_young_words) {
_eden.clear();
double free_cset_start_time = os::elapsedTime();
diff --git a/src/hotspot/share/gc/g1/g1CollectedHeap.hpp b/src/hotspot/share/gc/g1/g1CollectedHeap.hpp
index 6eb00bc23ba..86bcde941ea 100644
--- a/src/hotspot/share/gc/g1/g1CollectedHeap.hpp
+++ b/src/hotspot/share/gc/g1/g1CollectedHeap.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2001, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -22,10 +22,9 @@
*
*/
-#ifndef SHARE_VM_GC_G1_G1COLLECTEDHEAP_HPP
-#define SHARE_VM_GC_G1_G1COLLECTEDHEAP_HPP
+#ifndef SHARE_GC_G1_G1COLLECTEDHEAP_HPP
+#define SHARE_GC_G1_G1COLLECTEDHEAP_HPP
-#include "gc/g1/evacuationInfo.hpp"
#include "gc/g1/g1BarrierSet.hpp"
#include "gc/g1/g1BiasedArray.hpp"
#include "gc/g1/g1CardTable.hpp"
@@ -35,6 +34,7 @@
#include "gc/g1/g1EdenRegions.hpp"
#include "gc/g1/g1EvacFailure.hpp"
#include "gc/g1/g1EvacStats.hpp"
+#include "gc/g1/g1EvacuationInfo.hpp"
#include "gc/g1/g1GCPhaseTimes.hpp"
#include "gc/g1/g1HeapTransition.hpp"
#include "gc/g1/g1HeapVerifier.hpp"
@@ -735,7 +735,7 @@ private:
void evacuate_optional_regions(G1ParScanThreadStateSet* per_thread_states, G1OptionalCSet* ocset);
void pre_evacuate_collection_set();
- void post_evacuate_collection_set(EvacuationInfo& evacuation_info, G1ParScanThreadStateSet* pss);
+ void post_evacuate_collection_set(G1EvacuationInfo& evacuation_info, G1ParScanThreadStateSet* pss);
// Print the header for the per-thread termination statistics.
static void print_termination_stats_hdr();
@@ -762,7 +762,7 @@ private:
// After a collection pause, convert the regions in the collection set into free
// regions.
- void free_collection_set(G1CollectionSet* collection_set, EvacuationInfo& evacuation_info, const size_t* surviving_young_words);
+ void free_collection_set(G1CollectionSet* collection_set, G1EvacuationInfo& evacuation_info, const size_t* surviving_young_words);
// Abandon the current collection set without recording policy
// statistics or updating free lists.
@@ -1452,4 +1452,4 @@ private:
inline bool offer_termination();
};
-#endif // SHARE_VM_GC_G1_G1COLLECTEDHEAP_HPP
+#endif // SHARE_GC_G1_G1COLLECTEDHEAP_HPP
diff --git a/src/hotspot/share/gc/g1/g1CollectedHeap.inline.hpp b/src/hotspot/share/gc/g1/g1CollectedHeap.inline.hpp
index c800f0d4236..aa7cce30cca 100644
--- a/src/hotspot/share/gc/g1/g1CollectedHeap.inline.hpp
+++ b/src/hotspot/share/gc/g1/g1CollectedHeap.inline.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2001, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
*
*/
-#ifndef SHARE_VM_GC_G1_G1COLLECTEDHEAP_INLINE_HPP
-#define SHARE_VM_GC_G1_G1COLLECTEDHEAP_INLINE_HPP
+#ifndef SHARE_GC_G1_G1COLLECTEDHEAP_INLINE_HPP
+#define SHARE_GC_G1_G1COLLECTEDHEAP_INLINE_HPP
#include "gc/g1/g1BarrierSet.hpp"
#include "gc/g1/g1CollectedHeap.hpp"
@@ -293,4 +293,4 @@ inline void G1CollectedHeap::set_humongous_is_live(oop obj) {
}
}
-#endif // SHARE_VM_GC_G1_G1COLLECTEDHEAP_INLINE_HPP
+#endif // SHARE_GC_G1_G1COLLECTEDHEAP_INLINE_HPP
diff --git a/src/hotspot/share/gc/g1/g1CollectionSet.hpp b/src/hotspot/share/gc/g1/g1CollectionSet.hpp
index 63bc5833e71..2b438d5d259 100644
--- a/src/hotspot/share/gc/g1/g1CollectionSet.hpp
+++ b/src/hotspot/share/gc/g1/g1CollectionSet.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2016, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
*
*/
-#ifndef SHARE_VM_GC_G1_G1COLLECTIONSET_HPP
-#define SHARE_VM_GC_G1_G1COLLECTIONSET_HPP
+#ifndef SHARE_GC_G1_G1COLLECTIONSET_HPP
+#define SHARE_GC_G1_G1COLLECTIONSET_HPP
#include "gc/g1/collectionSetChooser.hpp"
#include "utilities/debug.hpp"
@@ -275,5 +275,4 @@ public:
bool evacuation_failed();
};
-#endif // SHARE_VM_GC_G1_G1COLLECTIONSET_HPP
-
+#endif // SHARE_GC_G1_G1COLLECTIONSET_HPP
diff --git a/src/hotspot/share/gc/g1/g1CollectorPolicy.hpp b/src/hotspot/share/gc/g1/g1CollectorPolicy.hpp
index 94a00844f68..e536b9111ae 100644
--- a/src/hotspot/share/gc/g1/g1CollectorPolicy.hpp
+++ b/src/hotspot/share/gc/g1/g1CollectorPolicy.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2001, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
*
*/
-#ifndef SHARE_VM_GC_G1_G1COLLECTORPOLICY_HPP
-#define SHARE_VM_GC_G1_G1COLLECTORPOLICY_HPP
+#ifndef SHARE_GC_G1_G1COLLECTORPOLICY_HPP
+#define SHARE_GC_G1_G1COLLECTORPOLICY_HPP
#include "gc/shared/collectorPolicy.hpp"
@@ -41,4 +41,4 @@ public:
virtual size_t heap_reserved_size_bytes() const;
virtual bool is_hetero_heap() const;
};
-#endif // SHARE_VM_GC_G1_G1COLLECTORPOLICY_HPP
+#endif // SHARE_GC_G1_G1COLLECTORPOLICY_HPP
diff --git a/src/hotspot/share/gc/g1/g1CollectorState.hpp b/src/hotspot/share/gc/g1/g1CollectorState.hpp
index da983cc7977..059df97a30a 100644
--- a/src/hotspot/share/gc/g1/g1CollectorState.hpp
+++ b/src/hotspot/share/gc/g1/g1CollectorState.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2015, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
*
*/
-#ifndef SHARE_VM_GC_G1_G1COLLECTORSTATE_HPP
-#define SHARE_VM_GC_G1_G1COLLECTORSTATE_HPP
+#ifndef SHARE_GC_G1_G1COLLECTORSTATE_HPP
+#define SHARE_GC_G1_G1COLLECTORSTATE_HPP
#include "gc/g1/g1YCTypes.hpp"
#include "utilities/globalDefinitions.hpp"
@@ -123,4 +123,4 @@ public:
}
};
-#endif // SHARE_VM_GC_G1_G1COLLECTORSTATE_HPP
+#endif // SHARE_GC_G1_G1COLLECTORSTATE_HPP
diff --git a/src/hotspot/share/gc/g1/g1ConcurrentMark.cpp b/src/hotspot/share/gc/g1/g1ConcurrentMark.cpp
index 17a711ade47..d7e46476814 100644
--- a/src/hotspot/share/gc/g1/g1ConcurrentMark.cpp
+++ b/src/hotspot/share/gc/g1/g1ConcurrentMark.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2001, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -2178,7 +2178,10 @@ void G1CMTask::reset(G1CMBitMap* next_mark_bitmap) {
}
bool G1CMTask::should_exit_termination() {
- regular_clock_call();
+ if (!regular_clock_call()) {
+ return true;
+ }
+
// This is called when we are in the termination protocol. We should
// quit if, for some reason, this task wants to abort or the global
// stack is not empty (this means that we can get work from it).
@@ -2189,12 +2192,12 @@ void G1CMTask::reached_limit() {
assert(_words_scanned >= _words_scanned_limit ||
_refs_reached >= _refs_reached_limit ,
"shouldn't have been called otherwise");
- regular_clock_call();
+ abort_marking_if_regular_check_fail();
}
-void G1CMTask::regular_clock_call() {
+bool G1CMTask::regular_clock_call() {
if (has_aborted()) {
- return;
+ return false;
}
// First, we need to recalculate the words scanned and refs reached
@@ -2205,21 +2208,19 @@ void G1CMTask::regular_clock_call() {
// (1) If an overflow has been flagged, then we abort.
if (_cm->has_overflown()) {
- set_has_aborted();
- return;
+ return false;
}
// If we are not concurrent (i.e. we're doing remark) we don't need
// to check anything else. The other steps are only needed during
// the concurrent marking phase.
if (!_cm->concurrent()) {
- return;
+ return true;
}
// (2) If marking has been aborted for Full GC, then we also abort.
if (_cm->has_aborted()) {
- set_has_aborted();
- return;
+ return false;
}
double curr_time_ms = os::elapsedVTime() * 1000.0;
@@ -2228,17 +2229,15 @@ void G1CMTask::regular_clock_call() {
if (SuspendibleThreadSet::should_yield()) {
// We should yield. To do this we abort the task. The caller is
// responsible for yielding.
- set_has_aborted();
- return;
+ return false;
}
// (5) We check whether we've reached our time quota. If we have,
// then we abort.
double elapsed_time_ms = curr_time_ms - _start_time_ms;
if (elapsed_time_ms > _time_target_ms) {
- set_has_aborted();
_has_timed_out = true;
- return;
+ return false;
}
// (6) Finally, we check whether there are enough completed STAB
@@ -2247,9 +2246,9 @@ void G1CMTask::regular_clock_call() {
if (!_draining_satb_buffers && satb_mq_set.process_completed_buffers()) {
// we do need to process SATB buffers, we'll abort and restart
// the marking task to do so
- set_has_aborted();
- return;
+ return false;
}
+ return true;
}
void G1CMTask::recalculate_limits() {
@@ -2404,7 +2403,7 @@ void G1CMTask::drain_satb_buffers() {
// until we run out of buffers or we need to abort.
while (!has_aborted() &&
satb_mq_set.apply_closure_to_completed_buffer(&satb_cl)) {
- regular_clock_call();
+ abort_marking_if_regular_check_fail();
}
_draining_satb_buffers = false;
@@ -2647,7 +2646,7 @@ void G1CMTask::do_marking_step(double time_target_ms,
// If the iteration is successful, give up the region.
if (mr.is_empty()) {
giveup_current_region();
- regular_clock_call();
+ abort_marking_if_regular_check_fail();
} else if (_curr_region->is_humongous() && mr.start() == _curr_region->bottom()) {
if (_next_mark_bitmap->is_marked(mr.start())) {
// The object is marked - apply the closure
@@ -2656,10 +2655,10 @@ void G1CMTask::do_marking_step(double time_target_ms,
// Even if this task aborted while scanning the humongous object
// we can (and should) give up the current region.
giveup_current_region();
- regular_clock_call();
+ abort_marking_if_regular_check_fail();
} else if (_next_mark_bitmap->iterate(&bitmap_closure, mr)) {
giveup_current_region();
- regular_clock_call();
+ abort_marking_if_regular_check_fail();
} else {
assert(has_aborted(), "currently the only way to do so");
// The only way to abort the bitmap iteration is to return
@@ -2714,7 +2713,7 @@ void G1CMTask::do_marking_step(double time_target_ms,
// block of empty regions. So we need to call the regular clock
// method once round the loop to make sure it's called
// frequently enough.
- regular_clock_call();
+ abort_marking_if_regular_check_fail();
}
if (!has_aborted() && _curr_region == NULL) {
@@ -2792,6 +2791,7 @@ void G1CMTask::do_marking_step(double time_target_ms,
guarantee(_cm->mark_stack_empty(), "only way to reach here");
guarantee(_task_queue->size() == 0, "only way to reach here");
guarantee(!_cm->has_overflown(), "only way to reach here");
+ guarantee(!has_aborted(), "should never happen if termination has completed");
} else {
// Apparently there's more work to do. Let's abort this task. It
// will restart it and we can hopefully find more things to do.
diff --git a/src/hotspot/share/gc/g1/g1ConcurrentMark.hpp b/src/hotspot/share/gc/g1/g1ConcurrentMark.hpp
index a12d8d72bb3..b879e83680b 100644
--- a/src/hotspot/share/gc/g1/g1ConcurrentMark.hpp
+++ b/src/hotspot/share/gc/g1/g1ConcurrentMark.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2001, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
*
*/
-#ifndef SHARE_VM_GC_G1_G1CONCURRENTMARK_HPP
-#define SHARE_VM_GC_G1_G1CONCURRENTMARK_HPP
+#ifndef SHARE_GC_G1_G1CONCURRENTMARK_HPP
+#define SHARE_GC_G1_G1CONCURRENTMARK_HPP
#include "gc/g1/g1ConcurrentMarkBitMap.hpp"
#include "gc/g1/g1ConcurrentMarkObjArrayProcessor.hpp"
@@ -727,7 +727,11 @@ private:
// Supposed to be called regularly during a marking step as
// it checks a bunch of conditions that might cause the marking step
// to abort
- void regular_clock_call();
+ // Return true if the marking step should continue. Otherwise, return false to abort
+ bool regular_clock_call();
+
+ // Set abort flag if regular_clock_call() check fails
+ inline void abort_marking_if_regular_check_fail();
// Test whether obj might have already been passed over by the
// mark bitmap scan, and so needs to be pushed onto the mark stack.
@@ -869,4 +873,4 @@ public:
~G1PrintRegionLivenessInfoClosure();
};
-#endif // SHARE_VM_GC_G1_G1CONCURRENTMARK_HPP
+#endif // SHARE_GC_G1_G1CONCURRENTMARK_HPP
diff --git a/src/hotspot/share/gc/g1/g1ConcurrentMark.inline.hpp b/src/hotspot/share/gc/g1/g1ConcurrentMark.inline.hpp
index 226b650f403..08c7c86b564 100644
--- a/src/hotspot/share/gc/g1/g1ConcurrentMark.inline.hpp
+++ b/src/hotspot/share/gc/g1/g1ConcurrentMark.inline.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2001, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
*
*/
-#ifndef SHARE_VM_GC_G1_G1CONCURRENTMARK_INLINE_HPP
-#define SHARE_VM_GC_G1_G1CONCURRENTMARK_INLINE_HPP
+#ifndef SHARE_GC_G1_G1CONCURRENTMARK_INLINE_HPP
+#define SHARE_GC_G1_G1CONCURRENTMARK_INLINE_HPP
#include "gc/g1/g1CollectedHeap.inline.hpp"
#include "gc/g1/g1ConcurrentMark.hpp"
@@ -210,6 +210,12 @@ inline void G1ConcurrentMark::add_to_liveness(uint worker_id, oop const obj, siz
task(worker_id)->update_liveness(obj, size);
}
+inline void G1CMTask::abort_marking_if_regular_check_fail() {
+ if (!regular_clock_call()) {
+ set_has_aborted();
+ }
+}
+
inline bool G1CMTask::make_reference_grey(oop obj) {
if (!_cm->mark_in_next_bitmap(_worker_id, obj)) {
return false;
@@ -287,4 +293,4 @@ inline bool G1ConcurrentMark::do_yield_check() {
}
}
-#endif // SHARE_VM_GC_G1_G1CONCURRENTMARK_INLINE_HPP
+#endif // SHARE_GC_G1_G1CONCURRENTMARK_INLINE_HPP
diff --git a/src/hotspot/share/gc/g1/g1ConcurrentMarkBitMap.hpp b/src/hotspot/share/gc/g1/g1ConcurrentMarkBitMap.hpp
index 5319cbe56cf..dcaea16c0d6 100644
--- a/src/hotspot/share/gc/g1/g1ConcurrentMarkBitMap.hpp
+++ b/src/hotspot/share/gc/g1/g1ConcurrentMarkBitMap.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2017, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
*
*/
-#ifndef SHARE_VM_GC_G1_G1CONCURRENTMARKBITMAP_HPP
-#define SHARE_VM_GC_G1_G1CONCURRENTMARKBITMAP_HPP
+#ifndef SHARE_GC_G1_G1CONCURRENTMARKBITMAP_HPP
+#define SHARE_GC_G1_G1CONCURRENTMARKBITMAP_HPP
#include "gc/g1/g1RegionToSpaceMapper.hpp"
#include "gc/shared/markBitMap.hpp"
@@ -81,4 +81,4 @@ public:
void clear_region(HeapRegion* hr);
};
-#endif // SHARE_VM_GC_G1_G1CONCURRENTMARKBITMAP_HPP
+#endif // SHARE_GC_G1_G1CONCURRENTMARKBITMAP_HPP
diff --git a/src/hotspot/share/gc/g1/g1ConcurrentMarkBitMap.inline.hpp b/src/hotspot/share/gc/g1/g1ConcurrentMarkBitMap.inline.hpp
index 27ab31d442f..851a8fb909a 100644
--- a/src/hotspot/share/gc/g1/g1ConcurrentMarkBitMap.inline.hpp
+++ b/src/hotspot/share/gc/g1/g1ConcurrentMarkBitMap.inline.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2017, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
*
*/
-#ifndef SHARE_VM_GC_G1_G1CONCURRENTMARKBITMAP_INLINE_HPP
-#define SHARE_VM_GC_G1_G1CONCURRENTMARKBITMAP_INLINE_HPP
+#ifndef SHARE_GC_G1_G1CONCURRENTMARKBITMAP_INLINE_HPP
+#define SHARE_GC_G1_G1CONCURRENTMARKBITMAP_INLINE_HPP
#include "gc/g1/g1ConcurrentMarkBitMap.hpp"
#include "gc/shared/markBitMap.inline.hpp"
@@ -51,4 +51,4 @@ inline bool G1CMBitMap::iterate(G1CMBitMapClosure* cl, MemRegion mr) {
return true;
}
-#endif // SHARE_VM_GC_G1_G1CONCURRENTMARKBITMAP_INLINE_HPP
+#endif // SHARE_GC_G1_G1CONCURRENTMARKBITMAP_INLINE_HPP
diff --git a/src/hotspot/share/gc/g1/g1ConcurrentMarkObjArrayProcessor.hpp b/src/hotspot/share/gc/g1/g1ConcurrentMarkObjArrayProcessor.hpp
index 284a336d4d7..c2737dbbda6 100644
--- a/src/hotspot/share/gc/g1/g1ConcurrentMarkObjArrayProcessor.hpp
+++ b/src/hotspot/share/gc/g1/g1ConcurrentMarkObjArrayProcessor.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2016, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
*
*/
-#ifndef SHARE_VM_GC_G1_G1CONCURRENTMARKOBJARRAYPROCESSOR_HPP
-#define SHARE_VM_GC_G1_G1CONCURRENTMARKOBJARRAYPROCESSOR_HPP
+#ifndef SHARE_GC_G1_G1CONCURRENTMARKOBJARRAYPROCESSOR_HPP
+#define SHARE_GC_G1_G1CONCURRENTMARKOBJARRAYPROCESSOR_HPP
#include "oops/oopsHierarchy.hpp"
@@ -56,4 +56,4 @@ public:
size_t process_obj(oop obj);
};
-#endif /* SHARE_VM_GC_G1_G1CONCURRENTMARKOBJARRAYPROCESSOR_HPP */
+#endif // SHARE_GC_G1_G1CONCURRENTMARKOBJARRAYPROCESSOR_HPP
diff --git a/src/hotspot/share/gc/g1/g1ConcurrentMarkObjArrayProcessor.inline.hpp b/src/hotspot/share/gc/g1/g1ConcurrentMarkObjArrayProcessor.inline.hpp
index 8c8481b9deb..3cf69f2b034 100644
--- a/src/hotspot/share/gc/g1/g1ConcurrentMarkObjArrayProcessor.inline.hpp
+++ b/src/hotspot/share/gc/g1/g1ConcurrentMarkObjArrayProcessor.inline.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
*
*/
-#ifndef SHARE_VM_GC_G1_G1CONCURRENTMARKOBJARRAYPROCESSOR_INLINE_HPP
-#define SHARE_VM_GC_G1_G1CONCURRENTMARKOBJARRAYPROCESSOR_INLINE_HPP
+#ifndef SHARE_GC_G1_G1CONCURRENTMARKOBJARRAYPROCESSOR_INLINE_HPP
+#define SHARE_GC_G1_G1CONCURRENTMARKOBJARRAYPROCESSOR_INLINE_HPP
#include "oops/oop.inline.hpp"
#include "oops/oopsHierarchy.hpp"
@@ -33,4 +33,4 @@ inline bool G1CMObjArrayProcessor::should_be_sliced(oop obj) {
return obj->is_objArray() && ((size_t)((objArrayOop)obj)->size()) >= 2 * ObjArrayMarkingStride;
}
-#endif /* SHARE_VM_GC_G1_G1CONCURRENTMARKOBJARRAYPROCESSOR_INLINE_HPP */
+#endif // SHARE_GC_G1_G1CONCURRENTMARKOBJARRAYPROCESSOR_INLINE_HPP
diff --git a/src/hotspot/share/gc/g1/g1ConcurrentMarkThread.hpp b/src/hotspot/share/gc/g1/g1ConcurrentMarkThread.hpp
index a2b496fda3f..299a59fd0f4 100644
--- a/src/hotspot/share/gc/g1/g1ConcurrentMarkThread.hpp
+++ b/src/hotspot/share/gc/g1/g1ConcurrentMarkThread.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2001, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
*
*/
-#ifndef SHARE_VM_GC_G1_G1CONCURRENTMARKTHREAD_HPP
-#define SHARE_VM_GC_G1_G1CONCURRENTMARKTHREAD_HPP
+#ifndef SHARE_GC_G1_G1CONCURRENTMARKTHREAD_HPP
+#define SHARE_GC_G1_G1CONCURRENTMARKTHREAD_HPP
#include "gc/shared/concurrentGCPhaseManager.hpp"
#include "gc/shared/concurrentGCThread.hpp"
@@ -98,4 +98,4 @@ class G1ConcurrentMarkThread: public ConcurrentGCThread {
}
};
-#endif // SHARE_VM_GC_G1_G1CONCURRENTMARKTHREAD_HPP
+#endif // SHARE_GC_G1_G1CONCURRENTMARKTHREAD_HPP
diff --git a/src/hotspot/share/gc/g1/g1ConcurrentMarkThread.inline.hpp b/src/hotspot/share/gc/g1/g1ConcurrentMarkThread.inline.hpp
index ba63799e0de..7cf7c35e3c4 100644
--- a/src/hotspot/share/gc/g1/g1ConcurrentMarkThread.inline.hpp
+++ b/src/hotspot/share/gc/g1/g1ConcurrentMarkThread.inline.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2001, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
*
*/
-#ifndef SHARE_VM_GC_G1_G1CONCURRENTMARKTHREAD_INLINE_HPP
-#define SHARE_VM_GC_G1_G1CONCURRENTMARKTHREAD_INLINE_HPP
+#ifndef SHARE_GC_G1_G1CONCURRENTMARKTHREAD_INLINE_HPP
+#define SHARE_GC_G1_G1CONCURRENTMARKTHREAD_INLINE_HPP
#include "gc/g1/g1ConcurrentMark.hpp"
#include "gc/g1/g1ConcurrentMarkThread.hpp"
@@ -38,4 +38,4 @@ inline double G1ConcurrentMarkThread::vtime_mark_accum() {
return _vtime_mark_accum + _cm->all_task_accum_vtime();
}
-#endif // SHARE_VM_GC_G1_G1CONCURRENTMARKTHREAD_INLINE_HPP
+#endif // SHARE_GC_G1_G1CONCURRENTMARKTHREAD_INLINE_HPP
diff --git a/src/hotspot/share/gc/g1/g1ConcurrentRefine.hpp b/src/hotspot/share/gc/g1/g1ConcurrentRefine.hpp
index f4b2054f460..ce0fbac1a2e 100644
--- a/src/hotspot/share/gc/g1/g1ConcurrentRefine.hpp
+++ b/src/hotspot/share/gc/g1/g1ConcurrentRefine.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2001, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
*
*/
-#ifndef SHARE_VM_GC_G1_G1CONCURRENTREFINE_HPP
-#define SHARE_VM_GC_G1_G1CONCURRENTREFINE_HPP
+#ifndef SHARE_GC_G1_G1CONCURRENTREFINE_HPP
+#define SHARE_GC_G1_G1CONCURRENTREFINE_HPP
#include "memory/allocation.hpp"
#include "utilities/globalDefinitions.hpp"
@@ -136,4 +136,4 @@ public:
size_t red_zone() const { return _red_zone; }
};
-#endif // SHARE_VM_GC_G1_G1CONCURRENTREFINE_HPP
+#endif // SHARE_GC_G1_G1CONCURRENTREFINE_HPP
diff --git a/src/hotspot/share/gc/g1/g1ConcurrentRefineThread.hpp b/src/hotspot/share/gc/g1/g1ConcurrentRefineThread.hpp
index 3dd501ead3a..8dee30b8d3e 100644
--- a/src/hotspot/share/gc/g1/g1ConcurrentRefineThread.hpp
+++ b/src/hotspot/share/gc/g1/g1ConcurrentRefineThread.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2001, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
*
*/
-#ifndef SHARE_VM_GC_G1_G1CONCURRENTREFINETHREAD_HPP
-#define SHARE_VM_GC_G1_G1CONCURRENTREFINETHREAD_HPP
+#ifndef SHARE_GC_G1_G1CONCURRENTREFINETHREAD_HPP
+#define SHARE_GC_G1_G1CONCURRENTREFINETHREAD_HPP
#include "gc/g1/dirtyCardQueue.hpp"
#include "gc/shared/concurrentGCThread.hpp"
@@ -67,4 +67,4 @@ public:
double vtime_accum() { return _vtime_accum; }
};
-#endif // SHARE_VM_GC_G1_G1CONCURRENTREFINETHREAD_HPP
+#endif // SHARE_GC_G1_G1CONCURRENTREFINETHREAD_HPP
diff --git a/src/hotspot/share/gc/g1/g1EdenRegions.hpp b/src/hotspot/share/gc/g1/g1EdenRegions.hpp
index 6d16f8c594c..2f7cf8bb411 100644
--- a/src/hotspot/share/gc/g1/g1EdenRegions.hpp
+++ b/src/hotspot/share/gc/g1/g1EdenRegions.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2015, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
*
*/
-#ifndef SHARE_VM_GC_G1_G1EDENREGIONS_HPP
-#define SHARE_VM_GC_G1_G1EDENREGIONS_HPP
+#ifndef SHARE_GC_G1_G1EDENREGIONS_HPP
+#define SHARE_GC_G1_G1EDENREGIONS_HPP
#include "gc/g1/heapRegion.hpp"
#include "runtime/globals.hpp"
@@ -46,4 +46,4 @@ public:
uint length() const { return _length; }
};
-#endif // SHARE_VM_GC_G1_G1EDENREGIONS_HPP
+#endif // SHARE_GC_G1_G1EDENREGIONS_HPP
diff --git a/src/hotspot/share/gc/g1/g1EvacFailure.hpp b/src/hotspot/share/gc/g1/g1EvacFailure.hpp
index 9e1945efdd9..df9024ce39f 100644
--- a/src/hotspot/share/gc/g1/g1EvacFailure.hpp
+++ b/src/hotspot/share/gc/g1/g1EvacFailure.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
*
*/
-#ifndef SHARE_VM_GC_G1_G1EVACFAILURE_HPP
-#define SHARE_VM_GC_G1_G1EVACFAILURE_HPP
+#ifndef SHARE_GC_G1_G1EVACFAILURE_HPP
+#define SHARE_GC_G1_G1EVACFAILURE_HPP
#include "gc/g1/g1OopClosures.hpp"
#include "gc/g1/heapRegionManager.hpp"
@@ -45,4 +45,4 @@ public:
void work(uint worker_id);
};
-#endif // SHARE_VM_GC_G1_G1EVACFAILURE_HPP
+#endif // SHARE_GC_G1_G1EVACFAILURE_HPP
diff --git a/src/hotspot/share/gc/g1/g1EvacStats.hpp b/src/hotspot/share/gc/g1/g1EvacStats.hpp
index 4ac6fd9f563..22be30ef3a4 100644
--- a/src/hotspot/share/gc/g1/g1EvacStats.hpp
+++ b/src/hotspot/share/gc/g1/g1EvacStats.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2015, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
*
*/
-#ifndef SHARE_VM_GC_G1_G1EVACSTATS_HPP
-#define SHARE_VM_GC_G1_G1EVACSTATS_HPP
+#ifndef SHARE_GC_G1_G1EVACSTATS_HPP
+#define SHARE_GC_G1_G1EVACSTATS_HPP
#include "gc/shared/plab.hpp"
@@ -74,4 +74,4 @@ class G1EvacStats : public PLABStats {
inline void add_failure_used_and_waste(size_t used, size_t waste);
};
-#endif // SHARE_VM_GC_G1_G1EVACSTATS_HPP
+#endif // SHARE_GC_G1_G1EVACSTATS_HPP
diff --git a/src/hotspot/share/gc/g1/g1EvacStats.inline.hpp b/src/hotspot/share/gc/g1/g1EvacStats.inline.hpp
index 5acd4c146f6..1c8ed3b7b5b 100644
--- a/src/hotspot/share/gc/g1/g1EvacStats.inline.hpp
+++ b/src/hotspot/share/gc/g1/g1EvacStats.inline.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2015, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
*
*/
-#ifndef SHARE_VM_GC_G1_G1EVACSTATS_INLINE_HPP
-#define SHARE_VM_GC_G1_G1EVACSTATS_INLINE_HPP
+#ifndef SHARE_GC_G1_G1EVACSTATS_INLINE_HPP
+#define SHARE_GC_G1_G1EVACSTATS_INLINE_HPP
#include "gc/g1/g1EvacStats.hpp"
#include "runtime/atomic.hpp"
@@ -42,4 +42,4 @@ inline void G1EvacStats::add_failure_used_and_waste(size_t used, size_t waste) {
Atomic::add(waste, &_failure_waste);
}
-#endif // SHARE_VM_GC_G1_G1EVACSTATS_INLINE_HPP
+#endif // SHARE_GC_G1_G1EVACSTATS_INLINE_HPP
diff --git a/src/hotspot/share/gc/g1/evacuationInfo.hpp b/src/hotspot/share/gc/g1/g1EvacuationInfo.hpp
similarity index 88%
rename from src/hotspot/share/gc/g1/evacuationInfo.hpp
rename to src/hotspot/share/gc/g1/g1EvacuationInfo.hpp
index 17677537835..93da9e90369 100644
--- a/src/hotspot/share/gc/g1/evacuationInfo.hpp
+++ b/src/hotspot/share/gc/g1/g1EvacuationInfo.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2013, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -22,12 +22,12 @@
*
*/
-#ifndef SHARE_VM_GC_G1_EVACUATIONINFO_HPP
-#define SHARE_VM_GC_G1_EVACUATIONINFO_HPP
+#ifndef SHARE_GC_G1_G1EVACUATIONINFO_HPP
+#define SHARE_GC_G1_G1EVACUATIONINFO_HPP
#include "memory/allocation.hpp"
-class EvacuationInfo : public StackObj {
+class G1EvacuationInfo : public StackObj {
uint _collectionset_regions;
uint _allocation_regions;
size_t _collectionset_used_before;
@@ -37,7 +37,7 @@ class EvacuationInfo : public StackObj {
uint _regions_freed;
public:
- EvacuationInfo() : _collectionset_regions(0), _allocation_regions(0), _collectionset_used_before(0),
+ G1EvacuationInfo() : _collectionset_regions(0), _allocation_regions(0), _collectionset_used_before(0),
_collectionset_used_after(0), _alloc_regions_used_before(0),
_bytes_copied(0), _regions_freed(0) { }
@@ -78,4 +78,4 @@ public:
uint regions_freed() { return _regions_freed; }
};
-#endif // SHARE_VM_GC_G1_EVACUATIONINFO_HPP
+#endif // SHARE_GC_G1_G1EVACUATIONINFO_HPP
diff --git a/src/hotspot/share/gc/g1/g1FreeIdSet.cpp b/src/hotspot/share/gc/g1/g1FreeIdSet.cpp
new file mode 100644
index 00000000000..8b4650a9d9d
--- /dev/null
+++ b/src/hotspot/share/gc/g1/g1FreeIdSet.cpp
@@ -0,0 +1,104 @@
+/*
+ * Copyright (c) 2019, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ *
+ */
+
+#include "precompiled.hpp"
+#include "gc/g1/g1FreeIdSet.hpp"
+#include "memory/allocation.inline.hpp"
+#include "runtime/atomic.hpp"
+#include "utilities/debug.hpp"
+#include "utilities/globalDefinitions.hpp"
+#include "utilities/macros.hpp"
+
+G1FreeIdSet::G1FreeIdSet(uint start, uint size) :
+ _sem(size), // counting semaphore for available ids
+ _next(NULL), // array of "next" indices
+ _start(start), // first id value
+ _size(size), // number of available ids
+ _head_index_mask(0), // mask for extracting index from a _head value.
+ _head(0) // low part: index; high part: update counter
+{
+ assert(size != 0, "precondition");
+ assert(start <= (UINT_MAX - size),
+ "start (%u) + size (%u) overflow: ", start, size);
+ // 2^shift must be greater than size. Equal is not permitted, because
+ // size is the "end of list" value, and can be the index part of _head.
+ uint shift = log2_intptr((uintptr_t)size) + 1;
+ assert(shift <= (BitsPerWord / 2), "excessive size %u", size);
+ _head_index_mask = (uintx(1) << shift) - 1;
+ assert(size <= _head_index_mask, "invariant");
+ _next = NEW_C_HEAP_ARRAY(uint, size, mtGC);
+ for (uint i = 0; i < size; ++i) {
+ _next[i] = i + 1;
+ }
+}
+
+G1FreeIdSet::~G1FreeIdSet() {
+ FREE_C_HEAP_ARRAY(uint, _next);
+}
+
+uint G1FreeIdSet::head_index(uintx head) const {
+ return head & _head_index_mask;
+}
+
+uintx G1FreeIdSet::make_head(uint index, uintx old_head) const {
+ // Include incremented old update counter to avoid ABA problem.
+ return index | ((old_head & ~_head_index_mask) + 1 + _head_index_mask);
+}
+
+const uint Claimed = UINT_MAX;
+
+uint G1FreeIdSet::claim_par_id() {
+ _sem.wait();
+ // Semaphore gate permits passage by no more than the number of
+ // available ids, so there must be one that we can claim. But there
+ // may be multiple threads trying to claim ids at the same time.
+ uintx old_head = Atomic::load(&_head);
+ uint index;
+ while (true) {
+ index = head_index(old_head);
+ assert(index < _size, "invariant");
+ uintx new_head = make_head(_next[index], old_head);
+ new_head = Atomic::cmpxchg(new_head, &_head, old_head);
+ if (new_head == old_head) break;
+ old_head = new_head;
+ }
+ DEBUG_ONLY(_next[index] = Claimed;)
+ return _start + index;
+}
+
+void G1FreeIdSet::release_par_id(uint id) {
+ uint index = id - _start;
+ assert(index < _size, "invalid id %u", id);
+ assert(_next[index] == Claimed, "precondition");
+ uintx old_head = Atomic::load(&_head);
+ while (true) {
+ _next[index] = head_index(old_head);
+ uintx new_head = make_head(index, old_head);
+ new_head = Atomic::cmpxchg(new_head, &_head, old_head);
+ if (new_head == old_head) break;
+ old_head = new_head;
+ }
+ // Now that id has been released, permit another thread through the gate.
+ _sem.signal();
+}
diff --git a/src/hotspot/share/gc/g1/g1FreeIdSet.hpp b/src/hotspot/share/gc/g1/g1FreeIdSet.hpp
new file mode 100644
index 00000000000..062a75d856a
--- /dev/null
+++ b/src/hotspot/share/gc/g1/g1FreeIdSet.hpp
@@ -0,0 +1,65 @@
+/*
+ * Copyright (c) 2019, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ *
+ */
+
+#ifndef SHARE_GC_G1_G1FREEIDSET_HPP
+#define SHARE_GC_G1_G1FREEIDSET_HPP
+
+#include "memory/allocation.hpp"
+#include "runtime/semaphore.hpp"
+#include "utilities/globalDefinitions.hpp"
+
+// Represents a set of small integer ids, from which elements can be
+// temporarily allocated for exclusive use. The ids are in a
+// contiguous range from 'start' to 'start + size'. Used to obtain a
+// distinct worker_id value for a mutator thread that doesn't normally
+// have such an id.
+class G1FreeIdSet : public CHeapObj {
+ Semaphore _sem;
+ uint* _next;
+ uint _start;
+ uint _size;
+ uintx _head_index_mask;
+ volatile uintx _head;
+
+ uint head_index(uintx head) const;
+ uintx make_head(uint index, uintx old_head) const;
+
+ // Noncopyable.
+ G1FreeIdSet(const G1FreeIdSet&);
+ G1FreeIdSet& operator=(const G1FreeIdSet&);
+
+public:
+ G1FreeIdSet(uint start, uint size);
+ ~G1FreeIdSet();
+
+ // Returns an unclaimed parallel id (waiting for one to be released if
+ // necessary). Must not safepoint while holding a claimed id.
+ uint claim_par_id();
+
+ void release_par_id(uint id);
+
+ struct TestSupport; // For unit test access.
+};
+
+#endif // SHARE_GC_G1_G1FREEIDSET_HPP
diff --git a/src/hotspot/share/gc/g1/g1FromCardCache.hpp b/src/hotspot/share/gc/g1/g1FromCardCache.hpp
index 958d4b0abcb..22f837dd2ef 100644
--- a/src/hotspot/share/gc/g1/g1FromCardCache.hpp
+++ b/src/hotspot/share/gc/g1/g1FromCardCache.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2013, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
*
*/
-#ifndef SHARE_VM_GC_G1_G1FROMCARDCACHE_HPP
-#define SHARE_VM_GC_G1_G1FROMCARDCACHE_HPP
+#ifndef SHARE_GC_G1_G1FROMCARDCACHE_HPP
+#define SHARE_GC_G1_G1FROMCARDCACHE_HPP
#include "memory/allocation.hpp"
#include "utilities/ostream.hpp"
@@ -90,4 +90,4 @@ public:
}
};
-#endif // SHARE_VM_GC_G1_G1FROMCARDCACHE_HPP
+#endif // SHARE_GC_G1_G1FROMCARDCACHE_HPP
diff --git a/src/hotspot/share/gc/g1/g1FullGCMarker.inline.hpp b/src/hotspot/share/gc/g1/g1FullGCMarker.inline.hpp
index fdb35312cae..365300ee219 100644
--- a/src/hotspot/share/gc/g1/g1FullGCMarker.inline.hpp
+++ b/src/hotspot/share/gc/g1/g1FullGCMarker.inline.hpp
@@ -22,8 +22,8 @@
*
*/
-#ifndef SHARE_VM_GC_G1_G1MARKSTACK_INLINE_HPP
-#define SHARE_VM_GC_G1_G1MARKSTACK_INLINE_HPP
+#ifndef SHARE_GC_G1_G1FULLGCMARKER_INLINE_HPP
+#define SHARE_GC_G1_G1FULLGCMARKER_INLINE_HPP
#include "gc/g1/g1Allocator.inline.hpp"
#include "gc/g1/g1ConcurrentMarkBitMap.inline.hpp"
@@ -173,4 +173,4 @@ inline void G1FullGCMarker::follow_cld(ClassLoaderData* cld) {
_cld_closure.do_cld(cld);
}
-#endif
+#endif // SHARE_GC_G1_G1FULLGCMARKER_INLINE_HPP
diff --git a/src/hotspot/share/gc/g1/g1FullGCOopClosures.inline.hpp b/src/hotspot/share/gc/g1/g1FullGCOopClosures.inline.hpp
index bc60f26c9b9..20d16bb2dda 100644
--- a/src/hotspot/share/gc/g1/g1FullGCOopClosures.inline.hpp
+++ b/src/hotspot/share/gc/g1/g1FullGCOopClosures.inline.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2017, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
*
*/
-#ifndef SHARE_VM_GC_G1_G1FULLGCOOPCLOSURES_INLINE_HPP
-#define SHARE_VM_GC_G1_G1FULLGCOOPCLOSURES_INLINE_HPP
+#ifndef SHARE_GC_G1_G1FULLGCOOPCLOSURES_INLINE_HPP
+#define SHARE_GC_G1_G1FULLGCOOPCLOSURES_INLINE_HPP
#include "gc/g1/g1Allocator.inline.hpp"
#include "gc/g1/g1ConcurrentMarkBitMap.inline.hpp"
@@ -101,4 +101,4 @@ inline void G1FullKeepAliveClosure::do_oop_work(T* p) {
_marker->mark_and_push(p);
}
-#endif
+#endif // SHARE_GC_G1_G1FULLGCOOPCLOSURES_INLINE_HPP
diff --git a/src/hotspot/share/gc/g1/g1FullGCScope.hpp b/src/hotspot/share/gc/g1/g1FullGCScope.hpp
index e17e1471b61..23eccd54f09 100644
--- a/src/hotspot/share/gc/g1/g1FullGCScope.hpp
+++ b/src/hotspot/share/gc/g1/g1FullGCScope.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2017, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
*
*/
-#ifndef SHARE_VM_GC_G1_G1FULLGCSCOPE_HPP
-#define SHARE_VM_GC_G1_G1FULLGCSCOPE_HPP
+#ifndef SHARE_GC_G1_G1FULLGCSCOPE_HPP
+#define SHARE_GC_G1_G1FULLGCSCOPE_HPP
#include "gc/g1/g1CollectedHeap.hpp"
#include "gc/g1/g1HeapTransition.hpp"
@@ -65,4 +65,4 @@ public:
G1HeapTransition* heap_transition();
};
-#endif //SHARE_VM_GC_G1_G1FULLGCSCOPE_HPP
+#endif // SHARE_GC_G1_G1FULLGCSCOPE_HPP
diff --git a/src/hotspot/share/gc/g1/g1GCPhaseTimes.hpp b/src/hotspot/share/gc/g1/g1GCPhaseTimes.hpp
index daf5ef8fa58..ca76f51f046 100644
--- a/src/hotspot/share/gc/g1/g1GCPhaseTimes.hpp
+++ b/src/hotspot/share/gc/g1/g1GCPhaseTimes.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2013, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
*
*/
-#ifndef SHARE_VM_GC_G1_G1GCPHASETIMES_HPP
-#define SHARE_VM_GC_G1_G1GCPHASETIMES_HPP
+#ifndef SHARE_GC_G1_G1GCPHASETIMES_HPP
+#define SHARE_GC_G1_G1GCPHASETIMES_HPP
#include "gc/shared/referenceProcessorPhaseTimes.hpp"
#include "gc/shared/weakProcessorPhaseTimes.hpp"
@@ -425,4 +425,4 @@ public:
virtual ~G1EvacPhaseTimesTracker();
};
-#endif // SHARE_VM_GC_G1_G1GCPHASETIMES_HPP
+#endif // SHARE_GC_G1_G1GCPHASETIMES_HPP
diff --git a/src/hotspot/share/gc/g1/g1HRPrinter.hpp b/src/hotspot/share/gc/g1/g1HRPrinter.hpp
index 6859bccaaa1..bf32427032f 100644
--- a/src/hotspot/share/gc/g1/g1HRPrinter.hpp
+++ b/src/hotspot/share/gc/g1/g1HRPrinter.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2011, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
*
*/
-#ifndef SHARE_VM_GC_G1_G1HRPRINTER_HPP
-#define SHARE_VM_GC_G1_G1HRPRINTER_HPP
+#ifndef SHARE_GC_G1_G1HRPRINTER_HPP
+#define SHARE_GC_G1_G1HRPRINTER_HPP
#include "gc/g1/heapRegion.hpp"
#include "logging/log.hpp"
@@ -105,4 +105,4 @@ public:
}
};
-#endif // SHARE_VM_GC_G1_G1HRPRINTER_HPP
+#endif // SHARE_GC_G1_G1HRPRINTER_HPP
diff --git a/src/hotspot/share/gc/g1/g1HeapRegionEventSender.hpp b/src/hotspot/share/gc/g1/g1HeapRegionEventSender.hpp
index 1a7dc7b0ca2..c8518a5172e 100644
--- a/src/hotspot/share/gc/g1/g1HeapRegionEventSender.hpp
+++ b/src/hotspot/share/gc/g1/g1HeapRegionEventSender.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2016, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
*
*/
-#ifndef SHARE_VM_GC_G1_G1HEAPREGIONEVENTSENDER_HPP
-#define SHARE_VM_GC_G1_G1HEAPREGIONEVENTSENDER_HPP
+#ifndef SHARE_GC_G1_G1HEAPREGIONEVENTSENDER_HPP
+#define SHARE_GC_G1_G1HEAPREGIONEVENTSENDER_HPP
#include "memory/allocation.hpp"
@@ -32,4 +32,4 @@ public:
static void send_events();
};
-#endif // SHARE_VM_GC_G1_G1HEAPREGIONEVENTSENDER_HPP
+#endif // SHARE_GC_G1_G1HEAPREGIONEVENTSENDER_HPP
diff --git a/src/hotspot/share/gc/g1/g1HeapRegionTraceType.hpp b/src/hotspot/share/gc/g1/g1HeapRegionTraceType.hpp
index b727e81fe8a..ab3ee03137c 100644
--- a/src/hotspot/share/gc/g1/g1HeapRegionTraceType.hpp
+++ b/src/hotspot/share/gc/g1/g1HeapRegionTraceType.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2016, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
*
*/
-#ifndef SHARE_VM_GC_G1_G1HEAPREGIONTRACETYPE_HPP
-#define SHARE_VM_GC_G1_G1HEAPREGIONTRACETYPE_HPP
+#ifndef SHARE_GC_G1_G1HEAPREGIONTRACETYPE_HPP
+#define SHARE_GC_G1_G1HEAPREGIONTRACETYPE_HPP
#include "memory/allocation.hpp"
#include "utilities/debug.hpp"
@@ -57,4 +57,4 @@ class G1HeapRegionTraceType : AllStatic {
}
};
-#endif // SHARE_VM_GC_G1_G1HEAPREGIONTRACETYPE_HPP
+#endif // SHARE_GC_G1_G1HEAPREGIONTRACETYPE_HPP
diff --git a/src/hotspot/share/gc/g1/g1HeapSizingPolicy.hpp b/src/hotspot/share/gc/g1/g1HeapSizingPolicy.hpp
index 2b20a712b09..5ef237707d6 100644
--- a/src/hotspot/share/gc/g1/g1HeapSizingPolicy.hpp
+++ b/src/hotspot/share/gc/g1/g1HeapSizingPolicy.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
*
*/
-#ifndef SHARE_VM_GC_G1_G1HEAPSIZINGPOLICY_HPP
-#define SHARE_VM_GC_G1_G1HEAPSIZINGPOLICY_HPP
+#ifndef SHARE_GC_G1_G1HEAPSIZINGPOLICY_HPP
+#define SHARE_GC_G1_G1HEAPSIZINGPOLICY_HPP
#include "memory/allocation.hpp"
@@ -60,4 +60,4 @@ public:
static G1HeapSizingPolicy* create(const G1CollectedHeap* g1h, const G1Analytics* analytics);
};
-#endif // SRC_SHARE_VM_GC_G1_G1HEAPSIZINGPOLICY_HPP
+#endif // SHARE_GC_G1_G1HEAPSIZINGPOLICY_HPP
diff --git a/src/hotspot/share/gc/g1/g1HeapTransition.hpp b/src/hotspot/share/gc/g1/g1HeapTransition.hpp
index 9aa927f0e11..868a01ec57b 100644
--- a/src/hotspot/share/gc/g1/g1HeapTransition.hpp
+++ b/src/hotspot/share/gc/g1/g1HeapTransition.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2016, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
*
*/
-#ifndef SHARE_VM_GC_G1_G1HEAPTRANSITION_HPP
-#define SHARE_VM_GC_G1_G1HEAPTRANSITION_HPP
+#ifndef SHARE_GC_G1_G1HEAPTRANSITION_HPP
+#define SHARE_GC_G1_G1HEAPTRANSITION_HPP
#include "gc/shared/plab.hpp"
@@ -50,4 +50,4 @@ public:
void print();
};
-#endif // SHARE_VM_GC_G1_G1HEAPTRANSITION_HPP
+#endif // SHARE_GC_G1_G1HEAPTRANSITION_HPP
diff --git a/src/hotspot/share/gc/g1/g1HeapVerifier.hpp b/src/hotspot/share/gc/g1/g1HeapVerifier.hpp
index d40ee9770da..08d5a8ea1e1 100644
--- a/src/hotspot/share/gc/g1/g1HeapVerifier.hpp
+++ b/src/hotspot/share/gc/g1/g1HeapVerifier.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2016, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
*
*/
-#ifndef SHARE_VM_GC_G1_G1HEAPVERIFIER_HPP
-#define SHARE_VM_GC_G1_G1HEAPVERIFIER_HPP
+#ifndef SHARE_GC_G1_G1HEAPVERIFIER_HPP
+#define SHARE_GC_G1_G1HEAPVERIFIER_HPP
#include "gc/g1/heapRegionSet.hpp"
#include "memory/allocation.hpp"
@@ -119,4 +119,4 @@ public:
static void verify_archive_regions();
};
-#endif // SHARE_VM_GC_G1_G1HEAPVERIFIER_HPP
+#endif // SHARE_GC_G1_G1HEAPVERIFIER_HPP
diff --git a/src/hotspot/share/gc/g1/g1HeterogeneousCollectorPolicy.hpp b/src/hotspot/share/gc/g1/g1HeterogeneousCollectorPolicy.hpp
index 9e4f097ebb2..abaafa3812f 100644
--- a/src/hotspot/share/gc/g1/g1HeterogeneousCollectorPolicy.hpp
+++ b/src/hotspot/share/gc/g1/g1HeterogeneousCollectorPolicy.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
*
*/
-#ifndef SHARE_VM_GC_G1_G1HETEROGENEOUSCOLLECTORPOLICY_HPP
-#define SHARE_VM_GC_G1_G1HETEROGENEOUSCOLLECTORPOLICY_HPP
+#ifndef SHARE_GC_G1_G1HETEROGENEOUSCOLLECTORPOLICY_HPP
+#define SHARE_GC_G1_G1HETEROGENEOUSCOLLECTORPOLICY_HPP
#include "gc/g1/g1CollectorPolicy.hpp"
#include "gc/g1/g1HeterogeneousHeapYoungGenSizer.hpp"
@@ -45,4 +45,4 @@ public:
static size_t reasonable_max_memory_for_young();
};
-#endif // SHARE_VM_GC_G1_G1HETEROGENEOUSCOLLECTORPOLICY_HPP
+#endif // SHARE_GC_G1_G1HETEROGENEOUSCOLLECTORPOLICY_HPP
diff --git a/src/hotspot/share/gc/g1/g1HeterogeneousHeapPolicy.hpp b/src/hotspot/share/gc/g1/g1HeterogeneousHeapPolicy.hpp
index 37402f77741..a8d44d5fbb0 100644
--- a/src/hotspot/share/gc/g1/g1HeterogeneousHeapPolicy.hpp
+++ b/src/hotspot/share/gc/g1/g1HeterogeneousHeapPolicy.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
*
*/
-#ifndef SHARE_VM_GC_G1_G1HETEROGENEOUSHEAPPOLICY_HPP
-#define SHARE_VM_GC_G1_G1HETEROGENEOUSHEAPPOLICY_HPP
+#ifndef SHARE_GC_G1_G1HETEROGENEOUSHEAPPOLICY_HPP
+#define SHARE_GC_G1_G1HETEROGENEOUSHEAPPOLICY_HPP
#include "gc/g1/g1CollectorPolicy.hpp"
#include "gc/g1/g1Policy.hpp"
@@ -45,4 +45,4 @@ public:
virtual bool force_upgrade_to_full();
};
-#endif // SHARE_VM_GC_G1_G1HETEROGENEOUSHEAPPOLICY_HPP
+#endif // SHARE_GC_G1_G1HETEROGENEOUSHEAPPOLICY_HPP
diff --git a/src/hotspot/share/gc/g1/g1HeterogeneousHeapYoungGenSizer.hpp b/src/hotspot/share/gc/g1/g1HeterogeneousHeapYoungGenSizer.hpp
index 329b124584b..6f676a425ca 100644
--- a/src/hotspot/share/gc/g1/g1HeterogeneousHeapYoungGenSizer.hpp
+++ b/src/hotspot/share/gc/g1/g1HeterogeneousHeapYoungGenSizer.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
*
*/
-#ifndef SHARE_VM_GC_G1_G1HETEROGENEOUSHEAPYOUNGGENSIZER_HPP
-#define SHARE_VM_GC_G1_G1HETEROGENEOUSHEAPYOUNGGENSIZER_HPP
+#ifndef SHARE_GC_G1_G1HETEROGENEOUSHEAPYOUNGGENSIZER_HPP
+#define SHARE_GC_G1_G1HETEROGENEOUSHEAPYOUNGGENSIZER_HPP
#include "gc/g1/g1YoungGenSizer.hpp"
@@ -48,4 +48,4 @@ public:
virtual void heap_size_changed(uint new_number_of_heap_regions);
};
-#endif // SHARE_VM_GC_G1_G1HETEROGENEOUSHEAPYOUNGGENSIZER_HPP
+#endif // SHARE_GC_G1_G1HETEROGENEOUSHEAPYOUNGGENSIZER_HPP
diff --git a/src/hotspot/share/gc/g1/g1HotCardCache.hpp b/src/hotspot/share/gc/g1/g1HotCardCache.hpp
index fec688a18bf..614d6953cc4 100644
--- a/src/hotspot/share/gc/g1/g1HotCardCache.hpp
+++ b/src/hotspot/share/gc/g1/g1HotCardCache.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2013, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
*
*/
-#ifndef SHARE_VM_GC_G1_G1HOTCARDCACHE_HPP
-#define SHARE_VM_GC_G1_G1HOTCARDCACHE_HPP
+#ifndef SHARE_GC_G1_G1HOTCARDCACHE_HPP
+#define SHARE_GC_G1_G1HOTCARDCACHE_HPP
#include "gc/g1/g1CardCounts.hpp"
#include "gc/g1/g1_globals.hpp"
@@ -141,4 +141,4 @@ class G1HotCardCache: public CHeapObj {
}
};
-#endif // SHARE_VM_GC_G1_G1HOTCARDCACHE_HPP
+#endif // SHARE_GC_G1_G1HOTCARDCACHE_HPP
diff --git a/src/hotspot/share/gc/g1/g1IHOPControl.hpp b/src/hotspot/share/gc/g1/g1IHOPControl.hpp
index c8018949b39..5b1e4e01a00 100644
--- a/src/hotspot/share/gc/g1/g1IHOPControl.hpp
+++ b/src/hotspot/share/gc/g1/g1IHOPControl.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2015, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
*
*/
-#ifndef SHARE_VM_GC_G1_G1IHOPCONTROL_HPP
-#define SHARE_VM_GC_G1_G1IHOPCONTROL_HPP
+#ifndef SHARE_GC_G1_G1IHOPCONTROL_HPP
+#define SHARE_GC_G1_G1IHOPCONTROL_HPP
#include "memory/allocation.hpp"
#include "utilities/numberSeq.hpp"
@@ -146,4 +146,4 @@ class G1AdaptiveIHOPControl : public G1IHOPControl {
virtual void send_trace_event(G1NewTracer* tracer);
};
-#endif // SHARE_VM_GC_G1_G1IHOPCONTROL_HPP
+#endif // SHARE_GC_G1_G1IHOPCONTROL_HPP
diff --git a/src/hotspot/share/gc/g1/g1InCSetState.hpp b/src/hotspot/share/gc/g1/g1InCSetState.hpp
index 1dea5a37fa1..2cecddf8dbb 100644
--- a/src/hotspot/share/gc/g1/g1InCSetState.hpp
+++ b/src/hotspot/share/gc/g1/g1InCSetState.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2014, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
*
*/
-#ifndef SHARE_VM_GC_G1_G1INCSETSTATE_HPP
-#define SHARE_VM_GC_G1_G1INCSETSTATE_HPP
+#ifndef SHARE_GC_G1_G1INCSETSTATE_HPP
+#define SHARE_GC_G1_G1INCSETSTATE_HPP
#include "gc/g1/g1BiasedArray.hpp"
#include "gc/g1/heapRegion.hpp"
@@ -139,4 +139,4 @@ class G1InCSetStateFastTestBiasedMappedArray : public G1BiasedMappedArrayhrm_index(), InCSetState::NotInCSet); }
};
-#endif // SHARE_VM_GC_G1_G1INCSETSTATE_HPP
+#endif // SHARE_GC_G1_G1INCSETSTATE_HPP
diff --git a/src/hotspot/share/gc/g1/g1InitialMarkToMixedTimeTracker.hpp b/src/hotspot/share/gc/g1/g1InitialMarkToMixedTimeTracker.hpp
index 5acd7c7a590..372464a3dad 100644
--- a/src/hotspot/share/gc/g1/g1InitialMarkToMixedTimeTracker.hpp
+++ b/src/hotspot/share/gc/g1/g1InitialMarkToMixedTimeTracker.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2001, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
*
*/
-#ifndef SHARE_VM_GC_G1_G1INITIALMARKTOMIXEDTIMETRACKER_HPP
-#define SHARE_VM_GC_G1_G1INITIALMARKTOMIXEDTIMETRACKER_HPP
+#ifndef SHARE_GC_G1_G1INITIALMARKTOMIXEDTIMETRACKER_HPP
+#define SHARE_GC_G1_G1INITIALMARKTOMIXEDTIMETRACKER_HPP
#include "utilities/globalDefinitions.hpp"
#include "utilities/debug.hpp"
@@ -84,4 +84,4 @@ public:
bool has_result() const { return _mixed_start_time > 0.0 && _initial_mark_end_time > 0.0; }
};
-#endif // SHARE_VM_GC_G1_G1INITIALMARKTOMIXEDTIMETRACKER_HPP
+#endif // SHARE_GC_G1_G1INITIALMARKTOMIXEDTIMETRACKER_HPP
diff --git a/src/hotspot/share/gc/g1/g1MMUTracker.hpp b/src/hotspot/share/gc/g1/g1MMUTracker.hpp
index cdb135fcff9..96c3ec58172 100644
--- a/src/hotspot/share/gc/g1/g1MMUTracker.hpp
+++ b/src/hotspot/share/gc/g1/g1MMUTracker.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2001, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
*
*/
-#ifndef SHARE_VM_GC_G1_G1MMUTRACKER_HPP
-#define SHARE_VM_GC_G1_G1MMUTRACKER_HPP
+#ifndef SHARE_GC_G1_G1MMUTRACKER_HPP
+#define SHARE_GC_G1_G1MMUTRACKER_HPP
#include "gc/shared/gcId.hpp"
#include "memory/allocation.hpp"
@@ -142,4 +142,4 @@ public:
virtual double when_sec(double current_time, double pause_time);
};
-#endif // SHARE_VM_GC_G1_G1MMUTRACKER_HPP
+#endif // SHARE_GC_G1_G1MMUTRACKER_HPP
diff --git a/src/hotspot/share/gc/g1/g1MemoryPool.hpp b/src/hotspot/share/gc/g1/g1MemoryPool.hpp
index ffdd092df71..4d7128b77eb 100644
--- a/src/hotspot/share/gc/g1/g1MemoryPool.hpp
+++ b/src/hotspot/share/gc/g1/g1MemoryPool.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2007, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
*
*/
-#ifndef SHARE_VM_GC_G1_G1MEMORYPOOL_HPP
-#define SHARE_VM_GC_G1_G1MEMORYPOOL_HPP
+#ifndef SHARE_GC_G1_G1MEMORYPOOL_HPP
+#define SHARE_GC_G1_G1MEMORYPOOL_HPP
#include "gc/g1/g1MonitoringSupport.hpp"
#include "services/memoryPool.hpp"
@@ -93,4 +93,4 @@ public:
MemoryUsage get_memory_usage();
};
-#endif // SHARE_VM_GC_G1_G1MEMORYPOOL_HPP
+#endif // SHARE_GC_G1_G1MEMORYPOOL_HPP
diff --git a/src/hotspot/share/gc/g1/g1MonitoringSupport.hpp b/src/hotspot/share/gc/g1/g1MonitoringSupport.hpp
index 1076d22e22a..0b86b66c263 100644
--- a/src/hotspot/share/gc/g1/g1MonitoringSupport.hpp
+++ b/src/hotspot/share/gc/g1/g1MonitoringSupport.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2011, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
*
*/
-#ifndef SHARE_VM_GC_G1_G1MONITORINGSUPPORT_HPP
-#define SHARE_VM_GC_G1_G1MONITORINGSUPPORT_HPP
+#ifndef SHARE_GC_G1_G1MONITORINGSUPPORT_HPP
+#define SHARE_GC_G1_G1MONITORINGSUPPORT_HPP
#include "gc/shared/collectorCounters.hpp"
#include "gc/shared/generationCounters.hpp"
@@ -259,4 +259,4 @@ public:
G1MonitoringScope(G1MonitoringSupport* g1mm, bool full_gc, bool all_memory_pools_affected);
};
-#endif // SHARE_VM_GC_G1_G1MONITORINGSUPPORT_HPP
+#endif // SHARE_GC_G1_G1MONITORINGSUPPORT_HPP
diff --git a/src/hotspot/share/gc/g1/g1OopClosures.hpp b/src/hotspot/share/gc/g1/g1OopClosures.hpp
index 94701e74c39..2af8712e2a4 100644
--- a/src/hotspot/share/gc/g1/g1OopClosures.hpp
+++ b/src/hotspot/share/gc/g1/g1OopClosures.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2001, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
*
*/
-#ifndef SHARE_VM_GC_G1_G1OOPCLOSURES_HPP
-#define SHARE_VM_GC_G1_G1OOPCLOSURES_HPP
+#ifndef SHARE_GC_G1_G1OOPCLOSURES_HPP
+#define SHARE_GC_G1_G1OOPCLOSURES_HPP
#include "gc/g1/g1InCSetState.hpp"
#include "memory/iterator.hpp"
@@ -251,4 +251,4 @@ public:
virtual ReferenceIterationMode reference_iteration_mode() { return DO_FIELDS; }
};
-#endif // SHARE_VM_GC_G1_G1OOPCLOSURES_HPP
+#endif // SHARE_GC_G1_G1OOPCLOSURES_HPP
diff --git a/src/hotspot/share/gc/g1/g1OopClosures.inline.hpp b/src/hotspot/share/gc/g1/g1OopClosures.inline.hpp
index 8944810f70e..68400154a58 100644
--- a/src/hotspot/share/gc/g1/g1OopClosures.inline.hpp
+++ b/src/hotspot/share/gc/g1/g1OopClosures.inline.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2001, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
*
*/
-#ifndef SHARE_VM_GC_G1_G1OOPCLOSURES_INLINE_HPP
-#define SHARE_VM_GC_G1_G1OOPCLOSURES_INLINE_HPP
+#ifndef SHARE_GC_G1_G1OOPCLOSURES_INLINE_HPP
+#define SHARE_GC_G1_G1OOPCLOSURES_INLINE_HPP
#include "gc/g1/g1CollectedHeap.hpp"
#include "gc/g1/g1ConcurrentMark.inline.hpp"
@@ -279,4 +279,4 @@ template void G1RebuildRemSetClosure::do_oop_work(T* p) {
rem_set->add_reference(p, _worker_id);
}
-#endif // SHARE_VM_GC_G1_G1OOPCLOSURES_INLINE_HPP
+#endif // SHARE_GC_G1_G1OOPCLOSURES_INLINE_HPP
diff --git a/src/hotspot/share/gc/g1/g1PageBasedVirtualSpace.hpp b/src/hotspot/share/gc/g1/g1PageBasedVirtualSpace.hpp
index 5792ca56f52..3a1319dde41 100644
--- a/src/hotspot/share/gc/g1/g1PageBasedVirtualSpace.hpp
+++ b/src/hotspot/share/gc/g1/g1PageBasedVirtualSpace.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2014, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
*
*/
-#ifndef SHARE_VM_GC_G1_G1PAGEBASEDVIRTUALSPACE_HPP
-#define SHARE_VM_GC_G1_G1PAGEBASEDVIRTUALSPACE_HPP
+#ifndef SHARE_GC_G1_G1PAGEBASEDVIRTUALSPACE_HPP
+#define SHARE_GC_G1_G1PAGEBASEDVIRTUALSPACE_HPP
#include "memory/memRegion.hpp"
#include "memory/virtualspace.hpp"
@@ -152,4 +152,4 @@ class G1PageBasedVirtualSpace {
void print();
};
-#endif // SHARE_VM_GC_G1_G1PAGEBASEDVIRTUALSPACE_HPP
+#endif // SHARE_GC_G1_G1PAGEBASEDVIRTUALSPACE_HPP
diff --git a/src/hotspot/share/gc/g1/g1ParScanThreadState.hpp b/src/hotspot/share/gc/g1/g1ParScanThreadState.hpp
index c689a6b1d28..231dbdce714 100644
--- a/src/hotspot/share/gc/g1/g1ParScanThreadState.hpp
+++ b/src/hotspot/share/gc/g1/g1ParScanThreadState.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2014, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
*
*/
-#ifndef SHARE_VM_GC_G1_G1PARSCANTHREADSTATE_HPP
-#define SHARE_VM_GC_G1_G1PARSCANTHREADSTATE_HPP
+#ifndef SHARE_GC_G1_G1PARSCANTHREADSTATE_HPP
+#define SHARE_GC_G1_G1PARSCANTHREADSTATE_HPP
#include "gc/g1/dirtyCardQueue.hpp"
#include "gc/g1/g1CardTable.hpp"
@@ -249,4 +249,4 @@ class G1ParScanThreadStateSet : public StackObj {
G1ParScanThreadState* new_par_scan_state(uint worker_id, size_t young_cset_length);
};
-#endif // SHARE_VM_GC_G1_G1PARSCANTHREADSTATE_HPP
+#endif // SHARE_GC_G1_G1PARSCANTHREADSTATE_HPP
diff --git a/src/hotspot/share/gc/g1/g1ParScanThreadState.inline.hpp b/src/hotspot/share/gc/g1/g1ParScanThreadState.inline.hpp
index 533819b9b25..e5f1e3a28f6 100644
--- a/src/hotspot/share/gc/g1/g1ParScanThreadState.inline.hpp
+++ b/src/hotspot/share/gc/g1/g1ParScanThreadState.inline.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2014, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
*
*/
-#ifndef SHARE_VM_GC_G1_G1PARSCANTHREADSTATE_INLINE_HPP
-#define SHARE_VM_GC_G1_G1PARSCANTHREADSTATE_INLINE_HPP
+#ifndef SHARE_GC_G1_G1PARSCANTHREADSTATE_INLINE_HPP
+#define SHARE_GC_G1_G1PARSCANTHREADSTATE_INLINE_HPP
#include "gc/g1/g1CollectedHeap.inline.hpp"
#include "gc/g1/g1OopStarChunkedList.inline.hpp"
@@ -223,4 +223,4 @@ G1OopStarChunkedList* G1ParScanThreadState::oops_into_optional_region(const Heap
return &_oops_into_optional_regions[hr->index_in_opt_cset()];
}
-#endif // SHARE_VM_GC_G1_G1PARSCANTHREADSTATE_INLINE_HPP
+#endif // SHARE_GC_G1_G1PARSCANTHREADSTATE_INLINE_HPP
diff --git a/src/hotspot/share/gc/g1/g1Policy.hpp b/src/hotspot/share/gc/g1/g1Policy.hpp
index 3c75f3b502d..1376fafd62f 100644
--- a/src/hotspot/share/gc/g1/g1Policy.hpp
+++ b/src/hotspot/share/gc/g1/g1Policy.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2016, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
*
*/
-#ifndef SHARE_VM_GC_G1_G1POLICY_HPP
-#define SHARE_VM_GC_G1_G1POLICY_HPP
+#ifndef SHARE_GC_G1_G1POLICY_HPP
+#define SHARE_GC_G1_G1POLICY_HPP
#include "gc/g1/g1CollectorPolicy.hpp"
#include "gc/g1/g1CollectorState.hpp"
@@ -441,4 +441,4 @@ public:
}
};
-#endif // SHARE_VM_GC_G1_G1POLICY_HPP
+#endif // SHARE_GC_G1_G1POLICY_HPP
diff --git a/src/hotspot/share/gc/g1/g1Predictions.hpp b/src/hotspot/share/gc/g1/g1Predictions.hpp
index bfb0db05d53..97afc0a9812 100644
--- a/src/hotspot/share/gc/g1/g1Predictions.hpp
+++ b/src/hotspot/share/gc/g1/g1Predictions.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2015, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
*
*/
-#ifndef SHARE_VM_GC_G1_G1PREDICTIONS_HPP
-#define SHARE_VM_GC_G1_G1PREDICTIONS_HPP
+#ifndef SHARE_GC_G1_G1PREDICTIONS_HPP
+#define SHARE_GC_G1_G1PREDICTIONS_HPP
#include "utilities/numberSeq.hpp"
@@ -59,4 +59,4 @@ class G1Predictions {
}
};
-#endif // SHARE_VM_GC_G1_G1PREDICTIONS_HPP
+#endif // SHARE_GC_G1_G1PREDICTIONS_HPP
diff --git a/src/hotspot/share/gc/g1/g1RegionMarkStatsCache.hpp b/src/hotspot/share/gc/g1/g1RegionMarkStatsCache.hpp
index b35312f240c..cf3b4a7f027 100644
--- a/src/hotspot/share/gc/g1/g1RegionMarkStatsCache.hpp
+++ b/src/hotspot/share/gc/g1/g1RegionMarkStatsCache.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
*
*/
-#ifndef SHARE_VM_GC_G1_G1REGIONMARKSTATSCACHE_HPP
-#define SHARE_VM_GC_G1_G1REGIONMARKSTATSCACHE_HPP
+#ifndef SHARE_GC_G1_G1REGIONMARKSTATSCACHE_HPP
+#define SHARE_GC_G1_G1REGIONMARKSTATSCACHE_HPP
#include "memory/allocation.hpp"
#include "utilities/debug.hpp"
@@ -127,4 +127,4 @@ public:
size_t misses() const { return _cache_misses; }
};
-#endif // SHARE_VM_GC_G1_G1REGIONMARKSTATSCACHE_HPP
+#endif // SHARE_GC_G1_G1REGIONMARKSTATSCACHE_HPP
diff --git a/src/hotspot/share/gc/g1/g1RegionMarkStatsCache.inline.hpp b/src/hotspot/share/gc/g1/g1RegionMarkStatsCache.inline.hpp
index 3afbe4b2d07..430565e66f3 100644
--- a/src/hotspot/share/gc/g1/g1RegionMarkStatsCache.inline.hpp
+++ b/src/hotspot/share/gc/g1/g1RegionMarkStatsCache.inline.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
*
*/
-#ifndef SHARE_VM_GC_G1_G1REGIONMARKSTATSCACHE_INLINE_HPP
-#define SHARE_VM_GC_G1_G1REGIONMARKSTATSCACHE_INLINE_HPP
+#ifndef SHARE_GC_G1_G1REGIONMARKSTATSCACHE_INLINE_HPP
+#define SHARE_GC_G1_G1REGIONMARKSTATSCACHE_INLINE_HPP
#include "gc/g1/g1RegionMarkStatsCache.hpp"
#include "runtime/atomic.hpp"
@@ -51,4 +51,4 @@ inline void G1RegionMarkStatsCache::evict(uint idx) {
cur->clear();
}
-#endif // SHARE_VM_GC_G1_G1REGIONMARKSTATSCACHE_INLINE_HPP
+#endif // SHARE_GC_G1_G1REGIONMARKSTATSCACHE_INLINE_HPP
diff --git a/src/hotspot/share/gc/g1/g1RegionToSpaceMapper.hpp b/src/hotspot/share/gc/g1/g1RegionToSpaceMapper.hpp
index 53bb04f3fb6..a0c70db9ee5 100644
--- a/src/hotspot/share/gc/g1/g1RegionToSpaceMapper.hpp
+++ b/src/hotspot/share/gc/g1/g1RegionToSpaceMapper.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2014, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
*
*/
-#ifndef SHARE_VM_GC_G1_G1REGIONTOSPACEMAPPER_HPP
-#define SHARE_VM_GC_G1_G1REGIONTOSPACEMAPPER_HPP
+#ifndef SHARE_GC_G1_G1REGIONTOSPACEMAPPER_HPP
+#define SHARE_GC_G1_G1REGIONTOSPACEMAPPER_HPP
#include "gc/g1/g1PageBasedVirtualSpace.hpp"
#include "memory/allocation.hpp"
@@ -121,4 +121,4 @@ public:
virtual void commit_regions(uint start_idx, size_t num_regions = 1, WorkGang* pretouch_workers = NULL);
virtual void uncommit_regions(uint start_idx, size_t num_regions = 1);
};
-#endif // SHARE_VM_GC_G1_G1REGIONTOSPACEMAPPER_HPP
+#endif // SHARE_GC_G1_G1REGIONTOSPACEMAPPER_HPP
diff --git a/src/hotspot/share/gc/g1/g1RemSet.hpp b/src/hotspot/share/gc/g1/g1RemSet.hpp
index 1e1cca1ee60..a6fa4f45e84 100644
--- a/src/hotspot/share/gc/g1/g1RemSet.hpp
+++ b/src/hotspot/share/gc/g1/g1RemSet.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2001, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
*
*/
-#ifndef SHARE_VM_GC_G1_G1REMSET_HPP
-#define SHARE_VM_GC_G1_G1REMSET_HPP
+#ifndef SHARE_GC_G1_G1REMSET_HPP
+#define SHARE_GC_G1_G1REMSET_HPP
#include "gc/g1/dirtyCardQueue.hpp"
#include "gc/g1/g1CardTable.hpp"
@@ -178,4 +178,4 @@ public:
size_t cards_skipped() const { return _cards_skipped; }
};
-#endif // SHARE_VM_GC_G1_G1REMSET_HPP
+#endif // SHARE_GC_G1_G1REMSET_HPP
diff --git a/src/hotspot/share/gc/g1/g1RemSetSummary.hpp b/src/hotspot/share/gc/g1/g1RemSetSummary.hpp
index 65320a49a7e..ec941ed7e5b 100644
--- a/src/hotspot/share/gc/g1/g1RemSetSummary.hpp
+++ b/src/hotspot/share/gc/g1/g1RemSetSummary.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2013, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
*
*/
-#ifndef SHARE_VM_GC_G1_G1REMSETSUMMARY_HPP
-#define SHARE_VM_GC_G1_G1REMSETSUMMARY_HPP
+#ifndef SHARE_GC_G1_G1REMSETSUMMARY_HPP
+#define SHARE_GC_G1_G1REMSETSUMMARY_HPP
#include "utilities/globalDefinitions.hpp"
#include "utilities/ostream.hpp"
@@ -97,4 +97,4 @@ public:
}
};
-#endif // SHARE_VM_GC_G1_G1REMSETSUMMARY_HPP
+#endif // SHARE_GC_G1_G1REMSETSUMMARY_HPP
diff --git a/src/hotspot/share/gc/g1/g1RemSetTrackingPolicy.hpp b/src/hotspot/share/gc/g1/g1RemSetTrackingPolicy.hpp
index c67e9a8674d..0e7403dedd7 100644
--- a/src/hotspot/share/gc/g1/g1RemSetTrackingPolicy.hpp
+++ b/src/hotspot/share/gc/g1/g1RemSetTrackingPolicy.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
*
*/
-#ifndef SHARE_VM_GC_G1_G1REMSETTRACKINGPOLICY_HPP
-#define SHARE_VM_GC_G1_G1REMSETTRACKINGPOLICY_HPP
+#ifndef SHARE_GC_G1_G1REMSETTRACKINGPOLICY_HPP
+#define SHARE_GC_G1_G1REMSETTRACKINGPOLICY_HPP
#include "gc/g1/heapRegion.hpp"
#include "gc/g1/heapRegionType.hpp"
@@ -54,5 +54,4 @@ public:
void update_at_free(HeapRegion* r);
};
-#endif /* SHARE_VM_GC_G1_G1REMSETTRACKINGPOLICY_HPP */
-
+#endif // SHARE_GC_G1_G1REMSETTRACKINGPOLICY_HPP
diff --git a/src/hotspot/share/gc/g1/g1RootClosures.hpp b/src/hotspot/share/gc/g1/g1RootClosures.hpp
index cc86b1d7d62..f2266dfce81 100644
--- a/src/hotspot/share/gc/g1/g1RootClosures.hpp
+++ b/src/hotspot/share/gc/g1/g1RootClosures.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2015, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
*
*/
-#ifndef SHARE_VM_GC_G1_G1ROOTCLOSURESET_HPP
-#define SHARE_VM_GC_G1_G1ROOTCLOSURESET_HPP
+#ifndef SHARE_GC_G1_G1ROOTCLOSURES_HPP
+#define SHARE_GC_G1_G1ROOTCLOSURES_HPP
#include "memory/allocation.hpp"
#include "memory/iterator.hpp"
@@ -65,4 +65,4 @@ public:
static G1EvacuationRootClosures* create_root_closures(G1ParScanThreadState* pss, G1CollectedHeap* g1h);
};
-#endif // SHARE_VM_GC_G1_G1ROOTCLOSURESET_HPP
+#endif // SHARE_GC_G1_G1ROOTCLOSURES_HPP
diff --git a/src/hotspot/share/gc/g1/g1RootProcessor.hpp b/src/hotspot/share/gc/g1/g1RootProcessor.hpp
index b94c4db0284..0692915e3b2 100644
--- a/src/hotspot/share/gc/g1/g1RootProcessor.hpp
+++ b/src/hotspot/share/gc/g1/g1RootProcessor.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2015, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
*
*/
-#ifndef SHARE_VM_GC_G1_G1ROOTPROCESSOR_HPP
-#define SHARE_VM_GC_G1_G1ROOTPROCESSOR_HPP
+#ifndef SHARE_GC_G1_G1ROOTPROCESSOR_HPP
+#define SHARE_GC_G1_G1ROOTPROCESSOR_HPP
#include "gc/shared/oopStorageParState.hpp"
#include "gc/shared/strongRootsScope.hpp"
@@ -125,4 +125,4 @@ public:
uint n_workers() const;
};
-#endif // SHARE_VM_GC_G1_G1ROOTPROCESSOR_HPP
+#endif // SHARE_GC_G1_G1ROOTPROCESSOR_HPP
diff --git a/src/hotspot/share/gc/g1/g1SATBMarkQueueSet.hpp b/src/hotspot/share/gc/g1/g1SATBMarkQueueSet.hpp
index 505e2fb2345..f48f4b37698 100644
--- a/src/hotspot/share/gc/g1/g1SATBMarkQueueSet.hpp
+++ b/src/hotspot/share/gc/g1/g1SATBMarkQueueSet.hpp
@@ -22,8 +22,8 @@
*
*/
-#ifndef SHARE_VM_GC_G1_G1SATBMARKQUEUE_HPP
-#define SHARE_VM_GC_G1_G1SATBMARKQUEUE_HPP
+#ifndef SHARE_GC_G1_G1SATBMARKQUEUESET_HPP
+#define SHARE_GC_G1_G1SATBMARKQUEUESET_HPP
#include "gc/shared/satbMarkQueue.hpp"
@@ -49,4 +49,4 @@ public:
virtual void filter(SATBMarkQueue* queue);
};
-#endif // SHARE_VM_GC_G1_G1SATBMARKQUEUE_HPP
+#endif // SHARE_GC_G1_G1SATBMARKQUEUESET_HPP
diff --git a/src/hotspot/share/gc/g1/g1StringDedup.hpp b/src/hotspot/share/gc/g1/g1StringDedup.hpp
index f7b4d12ac23..90c0e6df525 100644
--- a/src/hotspot/share/gc/g1/g1StringDedup.hpp
+++ b/src/hotspot/share/gc/g1/g1StringDedup.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2014, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
*
*/
-#ifndef SHARE_VM_GC_G1_G1STRINGDEDUP_HPP
-#define SHARE_VM_GC_G1_G1STRINGDEDUP_HPP
+#ifndef SHARE_GC_G1_G1STRINGDEDUP_HPP
+#define SHARE_GC_G1_G1STRINGDEDUP_HPP
//
// G1 string deduplication candidate selection
@@ -109,4 +109,4 @@ public:
}
};
-#endif // SHARE_VM_GC_G1_G1STRINGDEDUP_HPP
+#endif // SHARE_GC_G1_G1STRINGDEDUP_HPP
diff --git a/src/hotspot/share/gc/g1/g1StringDedupQueue.hpp b/src/hotspot/share/gc/g1/g1StringDedupQueue.hpp
index 20e13fc4494..95203ee4e47 100644
--- a/src/hotspot/share/gc/g1/g1StringDedupQueue.hpp
+++ b/src/hotspot/share/gc/g1/g1StringDedupQueue.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2014, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
*
*/
-#ifndef SHARE_VM_GC_G1_G1STRINGDEDUPQUEUE_HPP
-#define SHARE_VM_GC_G1_G1STRINGDEDUPQUEUE_HPP
+#ifndef SHARE_GC_G1_G1STRINGDEDUPQUEUE_HPP
+#define SHARE_GC_G1_G1STRINGDEDUPQUEUE_HPP
#include "gc/shared/stringdedup/stringDedupQueue.hpp"
#include "memory/allocation.hpp"
@@ -84,4 +84,4 @@ protected:
void verify_impl();
};
-#endif // SHARE_VM_GC_G1_G1STRINGDEDUPQUEUE_HPP
+#endif // SHARE_GC_G1_G1STRINGDEDUPQUEUE_HPP
diff --git a/src/hotspot/share/gc/g1/g1StringDedupStat.hpp b/src/hotspot/share/gc/g1/g1StringDedupStat.hpp
index 0b30beeb95b..e3efdac007f 100644
--- a/src/hotspot/share/gc/g1/g1StringDedupStat.hpp
+++ b/src/hotspot/share/gc/g1/g1StringDedupStat.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
*
*/
-#ifndef SHARE_VM_GC_G1_G1STRINGDEDUPSTAT_HPP
-#define SHARE_VM_GC_G1_G1STRINGDEDUPSTAT_HPP
+#ifndef SHARE_GC_G1_G1STRINGDEDUPSTAT_HPP
+#define SHARE_GC_G1_G1STRINGDEDUPSTAT_HPP
#include "gc/shared/stringdedup/stringDedupStat.hpp"
@@ -49,4 +49,4 @@ public:
void reset();
};
-#endif // SHARE_VM_GC_G1_G1STRINGDEDUPSTAT_HPP
+#endif // SHARE_GC_G1_G1STRINGDEDUPSTAT_HPP
diff --git a/src/hotspot/share/gc/g1/g1SurvivorRegions.hpp b/src/hotspot/share/gc/g1/g1SurvivorRegions.hpp
index 6c375997733..ed6d57a56de 100644
--- a/src/hotspot/share/gc/g1/g1SurvivorRegions.hpp
+++ b/src/hotspot/share/gc/g1/g1SurvivorRegions.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2015, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
*
*/
-#ifndef SHARE_VM_GC_G1_G1SURVIVORREGIONS_HPP
-#define SHARE_VM_GC_G1_G1SURVIVORREGIONS_HPP
+#ifndef SHARE_GC_G1_G1SURVIVORREGIONS_HPP
+#define SHARE_GC_G1_G1SURVIVORREGIONS_HPP
#include "runtime/globals.hpp"
@@ -51,4 +51,4 @@ public:
}
};
-#endif // SHARE_VM_GC_G1_G1SURVIVORREGIONS_HPP
+#endif // SHARE_GC_G1_G1SURVIVORREGIONS_HPP
diff --git a/src/hotspot/share/gc/g1/g1VMOperations.hpp b/src/hotspot/share/gc/g1/g1VMOperations.hpp
index fd31140eddf..de4dbbb9a51 100644
--- a/src/hotspot/share/gc/g1/g1VMOperations.hpp
+++ b/src/hotspot/share/gc/g1/g1VMOperations.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2001, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
*
*/
-#ifndef SHARE_VM_GC_G1_G1VMOPERATIONS_HPP
-#define SHARE_VM_GC_G1_G1VMOPERATIONS_HPP
+#ifndef SHARE_GC_G1_G1VMOPERATIONS_HPP
+#define SHARE_GC_G1_G1VMOPERATIONS_HPP
#include "gc/shared/gcId.hpp"
#include "gc/shared/gcVMOperations.hpp"
@@ -81,4 +81,4 @@ public:
virtual void doit_epilogue();
};
-#endif // SHARE_VM_GC_G1_G1VMOPERATIONS_HPP
+#endif // SHARE_GC_G1_G1VMOPERATIONS_HPP
diff --git a/src/hotspot/share/gc/g1/g1YCTypes.hpp b/src/hotspot/share/gc/g1/g1YCTypes.hpp
index af1ebcaa4b1..bcc0cda74c7 100644
--- a/src/hotspot/share/gc/g1/g1YCTypes.hpp
+++ b/src/hotspot/share/gc/g1/g1YCTypes.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
*
*/
-#ifndef SHARE_VM_GC_G1_G1YCTYPES_HPP
-#define SHARE_VM_GC_G1_G1YCTYPES_HPP
+#ifndef SHARE_GC_G1_G1YCTYPES_HPP
+#define SHARE_GC_G1_G1YCTYPES_HPP
#include "utilities/debug.hpp"
@@ -48,4 +48,4 @@ class G1YCTypeHelper {
}
};
-#endif // SHARE_VM_GC_G1_G1YCTYPES_HPP
+#endif // SHARE_GC_G1_G1YCTYPES_HPP
diff --git a/src/hotspot/share/gc/g1/g1YoungGenSizer.hpp b/src/hotspot/share/gc/g1/g1YoungGenSizer.hpp
index 0be87271a43..a08b0576f81 100644
--- a/src/hotspot/share/gc/g1/g1YoungGenSizer.hpp
+++ b/src/hotspot/share/gc/g1/g1YoungGenSizer.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2016, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
*
*/
-#ifndef SHARE_VM_GC_G1_G1YOUNGGENSIZER_HPP
-#define SHARE_VM_GC_G1_G1YOUNGGENSIZER_HPP
+#ifndef SHARE_GC_G1_G1YOUNGGENSIZER_HPP
+#define SHARE_GC_G1_G1YOUNGGENSIZER_HPP
#include "gc/g1/g1CollectorPolicy.hpp"
#include "utilities/globalDefinitions.hpp"
@@ -111,4 +111,4 @@ public:
static G1YoungGenSizer* create_gen_sizer(G1CollectorPolicy* policy);
};
-#endif // SHARE_VM_GC_G1_G1YOUNGGENSIZER_HPP
+#endif // SHARE_GC_G1_G1YOUNGGENSIZER_HPP
diff --git a/src/hotspot/share/gc/g1/g1YoungRemSetSamplingThread.cpp b/src/hotspot/share/gc/g1/g1YoungRemSetSamplingThread.cpp
index 7a752e8bb46..377c847101a 100644
--- a/src/hotspot/share/gc/g1/g1YoungRemSetSamplingThread.cpp
+++ b/src/hotspot/share/gc/g1/g1YoungRemSetSamplingThread.cpp
@@ -62,9 +62,8 @@ bool G1YoungRemSetSamplingThread::should_start_periodic_gc() {
}
// Check if enough time has passed since the last GC.
- uintx time_since_last_gc;
- if ((G1PeriodicGCInterval == 0) ||
- ((time_since_last_gc = (uintx)Universe::heap()->millis_since_last_gc()) < G1PeriodicGCInterval)) {
+ uintx time_since_last_gc = (uintx)Universe::heap()->millis_since_last_gc();
+ if ((time_since_last_gc < G1PeriodicGCInterval)) {
log_debug(gc, periodic)("Last GC occurred " UINTX_FORMAT "ms before which is below threshold " UINTX_FORMAT "ms. Skipping.",
time_since_last_gc, G1PeriodicGCInterval);
return false;
@@ -83,6 +82,10 @@ bool G1YoungRemSetSamplingThread::should_start_periodic_gc() {
}
void G1YoungRemSetSamplingThread::check_for_periodic_gc(){
+ // If disabled, just return.
+ if (G1PeriodicGCInterval == 0) {
+ return;
+ }
if ((os::elapsedTime() - _last_periodic_gc_attempt_s) > (G1PeriodicGCInterval / 1000.0)) {
log_debug(gc, periodic)("Checking for periodic GC.");
if (should_start_periodic_gc()) {
@@ -95,6 +98,13 @@ void G1YoungRemSetSamplingThread::check_for_periodic_gc(){
void G1YoungRemSetSamplingThread::run_service() {
double vtime_start = os::elapsedVTime();
+ // Print a message about periodic GC configuration.
+ if (G1PeriodicGCInterval != 0) {
+ log_info(gc)("Periodic GC enabled with interval " UINTX_FORMAT "ms", G1PeriodicGCInterval);
+ } else {
+ log_info(gc)("Periodic GC disabled");
+ }
+
while (!should_terminate()) {
sample_young_list_rs_lengths();
diff --git a/src/hotspot/share/gc/g1/g1YoungRemSetSamplingThread.hpp b/src/hotspot/share/gc/g1/g1YoungRemSetSamplingThread.hpp
index f0068a24db8..65e4d03f2af 100644
--- a/src/hotspot/share/gc/g1/g1YoungRemSetSamplingThread.hpp
+++ b/src/hotspot/share/gc/g1/g1YoungRemSetSamplingThread.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2015, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
*
*/
-#ifndef SHARE_VM_GC_G1_G1YOUNGREMSETSAMPLINGTHREAD_HPP
-#define SHARE_VM_GC_G1_G1YOUNGREMSETSAMPLINGTHREAD_HPP
+#ifndef SHARE_GC_G1_G1YOUNGREMSETSAMPLINGTHREAD_HPP
+#define SHARE_GC_G1_G1YOUNGREMSETSAMPLINGTHREAD_HPP
#include "gc/shared/concurrentGCThread.hpp"
@@ -63,4 +63,4 @@ public:
double vtime_accum() { return _vtime_accum; }
};
-#endif // SHARE_VM_GC_G1_G1YOUNGREMSETSAMPLINGTHREAD_HPP
+#endif // SHARE_GC_G1_G1YOUNGREMSETSAMPLINGTHREAD_HPP
diff --git a/src/hotspot/share/gc/g1/g1_globals.hpp b/src/hotspot/share/gc/g1/g1_globals.hpp
index d98e69404a1..fef3d1fab64 100644
--- a/src/hotspot/share/gc/g1/g1_globals.hpp
+++ b/src/hotspot/share/gc/g1/g1_globals.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2001, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
*
*/
-#ifndef SHARE_VM_GC_G1_G1_GLOBALS_HPP
-#define SHARE_VM_GC_G1_G1_GLOBALS_HPP
+#ifndef SHARE_GC_G1_G1_GLOBALS_HPP
+#define SHARE_GC_G1_G1_GLOBALS_HPP
#include // for DBL_MAX
//
@@ -328,4 +328,4 @@
range(0, 100) \
-#endif // SHARE_VM_GC_G1_G1_GLOBALS_HPP
+#endif // SHARE_GC_G1_G1_GLOBALS_HPP
diff --git a/src/hotspot/share/gc/g1/heapRegion.hpp b/src/hotspot/share/gc/g1/heapRegion.hpp
index 4b3a99f4112..d3ab70fd7a0 100644
--- a/src/hotspot/share/gc/g1/heapRegion.hpp
+++ b/src/hotspot/share/gc/g1/heapRegion.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2001, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
*
*/
-#ifndef SHARE_VM_GC_G1_HEAPREGION_HPP
-#define SHARE_VM_GC_G1_HEAPREGION_HPP
+#ifndef SHARE_GC_G1_HEAPREGION_HPP
+#define SHARE_GC_G1_HEAPREGION_HPP
#include "gc/g1/g1BlockOffsetTable.hpp"
#include "gc/g1/g1HeapRegionTraceType.hpp"
@@ -721,4 +721,4 @@ class HeapRegionClosure : public StackObj {
bool is_complete() { return _is_complete; }
};
-#endif // SHARE_VM_GC_G1_HEAPREGION_HPP
+#endif // SHARE_GC_G1_HEAPREGION_HPP
diff --git a/src/hotspot/share/gc/g1/heapRegion.inline.hpp b/src/hotspot/share/gc/g1/heapRegion.inline.hpp
index 4cd800059b0..bf468566228 100644
--- a/src/hotspot/share/gc/g1/heapRegion.inline.hpp
+++ b/src/hotspot/share/gc/g1/heapRegion.inline.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2001, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
*
*/
-#ifndef SHARE_VM_GC_G1_HEAPREGION_INLINE_HPP
-#define SHARE_VM_GC_G1_HEAPREGION_INLINE_HPP
+#ifndef SHARE_GC_G1_HEAPREGION_INLINE_HPP
+#define SHARE_GC_G1_HEAPREGION_INLINE_HPP
#include "gc/g1/g1BlockOffsetTable.inline.hpp"
#include "gc/g1/g1CollectedHeap.inline.hpp"
@@ -362,4 +362,4 @@ bool HeapRegion::oops_on_card_seq_iterate_careful(MemRegion mr,
return true;
}
-#endif // SHARE_VM_GC_G1_HEAPREGION_INLINE_HPP
+#endif // SHARE_GC_G1_HEAPREGION_INLINE_HPP
diff --git a/src/hotspot/share/gc/g1/heapRegionBounds.hpp b/src/hotspot/share/gc/g1/heapRegionBounds.hpp
index cda26941798..b7fbef34183 100644
--- a/src/hotspot/share/gc/g1/heapRegionBounds.hpp
+++ b/src/hotspot/share/gc/g1/heapRegionBounds.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2014, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
*
*/
-#ifndef SHARE_VM_GC_G1_HEAPREGIONBOUNDS_HPP
-#define SHARE_VM_GC_G1_HEAPREGIONBOUNDS_HPP
+#ifndef SHARE_GC_G1_HEAPREGIONBOUNDS_HPP
+#define SHARE_GC_G1_HEAPREGIONBOUNDS_HPP
#include "memory/allocation.hpp"
@@ -51,4 +51,4 @@ public:
static inline size_t target_number();
};
-#endif // SHARE_VM_GC_G1_HEAPREGIONBOUNDS_HPP
+#endif // SHARE_GC_G1_HEAPREGIONBOUNDS_HPP
diff --git a/src/hotspot/share/gc/g1/heapRegionBounds.inline.hpp b/src/hotspot/share/gc/g1/heapRegionBounds.inline.hpp
index 29530a1077a..20d81f6a62e 100644
--- a/src/hotspot/share/gc/g1/heapRegionBounds.inline.hpp
+++ b/src/hotspot/share/gc/g1/heapRegionBounds.inline.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
*
*/
-#ifndef SHARE_VM_GC_G1_HEAPREGIONBOUNDS_INLINE_HPP
-#define SHARE_VM_GC_G1_HEAPREGIONBOUNDS_INLINE_HPP
+#ifndef SHARE_GC_G1_HEAPREGIONBOUNDS_INLINE_HPP
+#define SHARE_GC_G1_HEAPREGIONBOUNDS_INLINE_HPP
#include "gc/g1/heapRegionBounds.hpp"
@@ -39,4 +39,4 @@ size_t HeapRegionBounds::target_number() {
return TARGET_REGION_NUMBER;
}
-#endif // SHARE_VM_GC_G1_HEAPREGIONBOUNDS_INLINE_HPP
+#endif // SHARE_GC_G1_HEAPREGIONBOUNDS_INLINE_HPP
diff --git a/src/hotspot/share/gc/g1/heapRegionManager.hpp b/src/hotspot/share/gc/g1/heapRegionManager.hpp
index 8c2389ad461..c6bf1e6ace8 100644
--- a/src/hotspot/share/gc/g1/heapRegionManager.hpp
+++ b/src/hotspot/share/gc/g1/heapRegionManager.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2001, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
*
*/
-#ifndef SHARE_VM_GC_G1_HEAPREGIONMANAGER_HPP
-#define SHARE_VM_GC_G1_HEAPREGIONMANAGER_HPP
+#ifndef SHARE_GC_G1_HEAPREGIONMANAGER_HPP
+#define SHARE_GC_G1_HEAPREGIONMANAGER_HPP
#include "gc/g1/g1BiasedArray.hpp"
#include "gc/g1/g1CollectorPolicy.hpp"
@@ -295,4 +295,4 @@ class HeapRegionClaimer : public StackObj {
// Claim the given region, returns true if successfully claimed.
bool claim_region(uint region_index);
};
-#endif // SHARE_VM_GC_G1_HEAPREGIONMANAGER_HPP
+#endif // SHARE_GC_G1_HEAPREGIONMANAGER_HPP
diff --git a/src/hotspot/share/gc/g1/heapRegionManager.inline.hpp b/src/hotspot/share/gc/g1/heapRegionManager.inline.hpp
index de6e85a4225..d12ba65bc16 100644
--- a/src/hotspot/share/gc/g1/heapRegionManager.inline.hpp
+++ b/src/hotspot/share/gc/g1/heapRegionManager.inline.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2001, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
*
*/
-#ifndef SHARE_VM_GC_G1_HEAPREGIONMANAGER_INLINE_HPP
-#define SHARE_VM_GC_G1_HEAPREGIONMANAGER_INLINE_HPP
+#ifndef SHARE_GC_G1_HEAPREGIONMANAGER_INLINE_HPP
+#define SHARE_GC_G1_HEAPREGIONMANAGER_INLINE_HPP
#include "gc/g1/heapRegion.hpp"
#include "gc/g1/heapRegionManager.hpp"
@@ -77,4 +77,4 @@ inline void HeapRegionManager::allocate_free_regions_starting_at(uint first, uin
_free_list.remove_starting_at(at(first), num_regions);
}
-#endif // SHARE_VM_GC_G1_HEAPREGIONMANAGER_INLINE_HPP
+#endif // SHARE_GC_G1_HEAPREGIONMANAGER_INLINE_HPP
diff --git a/src/hotspot/share/gc/g1/heapRegionRemSet.hpp b/src/hotspot/share/gc/g1/heapRegionRemSet.hpp
index 5b0471ebc5d..6ba1acc4afd 100644
--- a/src/hotspot/share/gc/g1/heapRegionRemSet.hpp
+++ b/src/hotspot/share/gc/g1/heapRegionRemSet.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2001, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
*
*/
-#ifndef SHARE_VM_GC_G1_HEAPREGIONREMSET_HPP
-#define SHARE_VM_GC_G1_HEAPREGIONREMSET_HPP
+#ifndef SHARE_GC_G1_HEAPREGIONREMSET_HPP
+#define SHARE_GC_G1_HEAPREGIONREMSET_HPP
#include "gc/g1/g1CodeCacheRemSet.hpp"
#include "gc/g1/g1FromCardCache.hpp"
@@ -404,4 +404,4 @@ public:
}
};
-#endif // SHARE_VM_GC_G1_HEAPREGIONREMSET_HPP
+#endif // SHARE_GC_G1_HEAPREGIONREMSET_HPP
diff --git a/src/hotspot/share/gc/g1/heapRegionSet.hpp b/src/hotspot/share/gc/g1/heapRegionSet.hpp
index ff4e35872fc..f92fa08c8b0 100644
--- a/src/hotspot/share/gc/g1/heapRegionSet.hpp
+++ b/src/hotspot/share/gc/g1/heapRegionSet.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2011, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
*
*/
-#ifndef SHARE_VM_GC_G1_HEAPREGIONSET_HPP
-#define SHARE_VM_GC_G1_HEAPREGIONSET_HPP
+#ifndef SHARE_GC_G1_HEAPREGIONSET_HPP
+#define SHARE_GC_G1_HEAPREGIONSET_HPP
#include "gc/g1/heapRegion.hpp"
#include "utilities/macros.hpp"
@@ -230,4 +230,4 @@ public:
}
};
-#endif // SHARE_VM_GC_G1_HEAPREGIONSET_HPP
+#endif // SHARE_GC_G1_HEAPREGIONSET_HPP
diff --git a/src/hotspot/share/gc/g1/heapRegionSet.inline.hpp b/src/hotspot/share/gc/g1/heapRegionSet.inline.hpp
index 06cdd773840..01da9314ad0 100644
--- a/src/hotspot/share/gc/g1/heapRegionSet.inline.hpp
+++ b/src/hotspot/share/gc/g1/heapRegionSet.inline.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
*
*/
-#ifndef SHARE_VM_GC_G1_HEAPREGIONSET_INLINE_HPP
-#define SHARE_VM_GC_G1_HEAPREGIONSET_INLINE_HPP
+#ifndef SHARE_GC_G1_HEAPREGIONSET_INLINE_HPP
+#define SHARE_GC_G1_HEAPREGIONSET_INLINE_HPP
#include "gc/g1/heapRegionSet.hpp"
@@ -147,5 +147,4 @@ inline HeapRegion* FreeRegionList::remove_region(bool from_head) {
return hr;
}
-#endif // SHARE_VM_GC_G1_HEAPREGIONSET_INLINE_HPP
-
+#endif // SHARE_GC_G1_HEAPREGIONSET_INLINE_HPP
diff --git a/src/hotspot/share/gc/g1/heapRegionTracer.hpp b/src/hotspot/share/gc/g1/heapRegionTracer.hpp
index d95cd736998..bdfcd1cfd8e 100644
--- a/src/hotspot/share/gc/g1/heapRegionTracer.hpp
+++ b/src/hotspot/share/gc/g1/heapRegionTracer.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
*
*/
-#ifndef SHARE_VM_GC_G1_HEAPREGIONTRACER_HPP
-#define SHARE_VM_GC_G1_HEAPREGIONTRACER_HPP
+#ifndef SHARE_GC_G1_HEAPREGIONTRACER_HPP
+#define SHARE_GC_G1_HEAPREGIONTRACER_HPP
#include "gc/g1/g1HeapRegionTraceType.hpp"
#include "memory/allocation.hpp"
@@ -37,4 +37,4 @@ class HeapRegionTracer : AllStatic {
size_t used);
};
-#endif // SHARE_VM_GC_G1_HEAPREGIONTRACER_HPP
+#endif // SHARE_GC_G1_HEAPREGIONTRACER_HPP
diff --git a/src/hotspot/share/gc/g1/heapRegionType.hpp b/src/hotspot/share/gc/g1/heapRegionType.hpp
index 5d15d98b7c5..404ba2bfaa7 100644
--- a/src/hotspot/share/gc/g1/heapRegionType.hpp
+++ b/src/hotspot/share/gc/g1/heapRegionType.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2014, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
*
*/
-#ifndef SHARE_VM_GC_G1_HEAPREGIONTYPE_HPP
-#define SHARE_VM_GC_G1_HEAPREGIONTYPE_HPP
+#ifndef SHARE_GC_G1_HEAPREGIONTYPE_HPP
+#define SHARE_GC_G1_HEAPREGIONTYPE_HPP
#include "gc/g1/g1HeapRegionTraceType.hpp"
@@ -196,4 +196,4 @@ public:
static const HeapRegionType Humongous;
};
-#endif // SHARE_VM_GC_G1_HEAPREGIONTYPE_HPP
+#endif // SHARE_GC_G1_HEAPREGIONTYPE_HPP
diff --git a/src/hotspot/share/gc/g1/heterogeneousHeapRegionManager.hpp b/src/hotspot/share/gc/g1/heterogeneousHeapRegionManager.hpp
index cc4321e2a0c..634edebfd49 100644
--- a/src/hotspot/share/gc/g1/heterogeneousHeapRegionManager.hpp
+++ b/src/hotspot/share/gc/g1/heterogeneousHeapRegionManager.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
*
*/
-#ifndef SHARE_VM_GC_G1_HETEROGENEOUSHEAPREGIONMANAGER_HPP
-#define SHARE_VM_GC_G1_HETEROGENEOUSHEAPREGIONMANAGER_HPP
+#ifndef SHARE_GC_G1_HETEROGENEOUSHEAPREGIONMANAGER_HPP
+#define SHARE_GC_G1_HETEROGENEOUSHEAPREGIONMANAGER_HPP
#include "gc/g1/heapRegionManager.hpp"
@@ -147,4 +147,4 @@ public:
void verify();
};
-#endif // SHARE_VM_GC_G1_HETEROGENEOUSHEAPREGIONMANAGER_HPP
+#endif // SHARE_GC_G1_HETEROGENEOUSHEAPREGIONMANAGER_HPP
diff --git a/src/hotspot/share/gc/g1/jvmFlagConstraintsG1.hpp b/src/hotspot/share/gc/g1/jvmFlagConstraintsG1.hpp
index 29a98038296..7f6ae92a811 100644
--- a/src/hotspot/share/gc/g1/jvmFlagConstraintsG1.hpp
+++ b/src/hotspot/share/gc/g1/jvmFlagConstraintsG1.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2015, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
*
*/
-#ifndef SHARE_GC_G1_COMMANDLINEFLAGCONSTRAINTSG1_HPP
-#define SHARE_GC_G1_COMMANDLINEFLAGCONSTRAINTSG1_HPP
+#ifndef SHARE_GC_G1_JVMFLAGCONSTRAINTSG1_HPP
+#define SHARE_GC_G1_JVMFLAGCONSTRAINTSG1_HPP
#include "runtime/globals.hpp"
#include "utilities/globalDefinitions.hpp"
@@ -43,4 +43,4 @@ JVMFlag::Error NewSizeConstraintFuncG1(size_t value, bool verbose);
size_t MaxSizeForHeapAlignmentG1();
-#endif // SHARE_GC_SHARED_COMMANDLINEFLAGCONSTRAINTSG1_HPP
+#endif // SHARE_GC_G1_JVMFLAGCONSTRAINTSG1_HPP
diff --git a/src/hotspot/share/gc/g1/sparsePRT.hpp b/src/hotspot/share/gc/g1/sparsePRT.hpp
index 297bf512e4f..6155ea83f07 100644
--- a/src/hotspot/share/gc/g1/sparsePRT.hpp
+++ b/src/hotspot/share/gc/g1/sparsePRT.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2001, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
*
*/
-#ifndef SHARE_VM_GC_G1_SPARSEPRT_HPP
-#define SHARE_VM_GC_G1_SPARSEPRT_HPP
+#ifndef SHARE_GC_G1_SPARSEPRT_HPP
+#define SHARE_GC_G1_SPARSEPRT_HPP
#include "gc/g1/g1CollectedHeap.hpp"
#include "gc/g1/heapRegion.hpp"
@@ -264,4 +264,4 @@ public:
}
};
-#endif // SHARE_VM_GC_G1_SPARSEPRT_HPP
+#endif // SHARE_GC_G1_SPARSEPRT_HPP
diff --git a/src/hotspot/share/gc/g1/survRateGroup.hpp b/src/hotspot/share/gc/g1/survRateGroup.hpp
index 58f458c79be..65a3d73dddf 100644
--- a/src/hotspot/share/gc/g1/survRateGroup.hpp
+++ b/src/hotspot/share/gc/g1/survRateGroup.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2001, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
*
*/
-#ifndef SHARE_VM_GC_G1_SURVRATEGROUP_HPP
-#define SHARE_VM_GC_G1_SURVRATEGROUP_HPP
+#ifndef SHARE_GC_G1_SURVRATEGROUP_HPP
+#define SHARE_GC_G1_SURVRATEGROUP_HPP
#include "utilities/numberSeq.hpp"
@@ -88,4 +88,4 @@ public:
};
-#endif // SHARE_VM_GC_G1_SURVRATEGROUP_HPP
+#endif // SHARE_GC_G1_SURVRATEGROUP_HPP
diff --git a/src/hotspot/share/gc/g1/vmStructs_g1.hpp b/src/hotspot/share/gc/g1/vmStructs_g1.hpp
index 961143a8cfc..4f43dea3202 100644
--- a/src/hotspot/share/gc/g1/vmStructs_g1.hpp
+++ b/src/hotspot/share/gc/g1/vmStructs_g1.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2011, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
*
*/
-#ifndef SHARE_VM_GC_G1_VMSTRUCTS_G1_HPP
-#define SHARE_VM_GC_G1_VMSTRUCTS_G1_HPP
+#ifndef SHARE_GC_G1_VMSTRUCTS_G1_HPP
+#define SHARE_GC_G1_VMSTRUCTS_G1_HPP
#include "gc/g1/g1CollectedHeap.hpp"
#include "gc/g1/heapRegion.hpp"
@@ -110,4 +110,4 @@
\
declare_integer_type(HeapRegionType::Tag volatile)
-#endif // SHARE_VM_GC_G1_VMSTRUCTS_G1_HPP
+#endif // SHARE_GC_G1_VMSTRUCTS_G1_HPP
diff --git a/src/hotspot/share/gc/parallel/adjoiningGenerations.hpp b/src/hotspot/share/gc/parallel/adjoiningGenerations.hpp
index 7212918e92d..8b73dcc56e1 100644
--- a/src/hotspot/share/gc/parallel/adjoiningGenerations.hpp
+++ b/src/hotspot/share/gc/parallel/adjoiningGenerations.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2003, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
*
*/
-#ifndef SHARE_VM_GC_PARALLEL_ADJOININGGENERATIONS_HPP
-#define SHARE_VM_GC_PARALLEL_ADJOININGGENERATIONS_HPP
+#ifndef SHARE_GC_PARALLEL_ADJOININGGENERATIONS_HPP
+#define SHARE_GC_PARALLEL_ADJOININGGENERATIONS_HPP
#include "gc/parallel/adjoiningVirtualSpaces.hpp"
#include "gc/parallel/asPSOldGen.hpp"
@@ -81,4 +81,4 @@ class AdjoiningGenerations : public CHeapObj {
// Return new AdjoiningGenerations instance based on collector policy (specifically - whether heap is heterogeneous).
static AdjoiningGenerations* create_adjoining_generations(ReservedSpace rs, GenerationSizer* policy, size_t alignment);
};
-#endif // SHARE_VM_GC_PARALLEL_ADJOININGGENERATIONS_HPP
+#endif // SHARE_GC_PARALLEL_ADJOININGGENERATIONS_HPP
diff --git a/src/hotspot/share/gc/parallel/adjoiningGenerationsForHeteroHeap.hpp b/src/hotspot/share/gc/parallel/adjoiningGenerationsForHeteroHeap.hpp
index 4e0accba451..a5defda1902 100644
--- a/src/hotspot/share/gc/parallel/adjoiningGenerationsForHeteroHeap.hpp
+++ b/src/hotspot/share/gc/parallel/adjoiningGenerationsForHeteroHeap.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
*
*/
-#ifndef SHARE_VM_GC_PARALLEL_ADJOININGGENERATIONSFORHETEROHEAP_HPP
-#define SHARE_VM_GC_PARALLEL_ADJOININGGENERATIONSFORHETEROHEAP_HPP
+#ifndef SHARE_GC_PARALLEL_ADJOININGGENERATIONSFORHETEROHEAP_HPP
+#define SHARE_GC_PARALLEL_ADJOININGGENERATIONSFORHETEROHEAP_HPP
#include "gc/parallel/adjoiningGenerations.hpp"
@@ -81,5 +81,4 @@ public:
// Return the total byte size of the reserved space
size_t reserved_byte_size();
};
-#endif // SHARE_VM_GC_PARALLEL_ADJOININGGENERATIONSFORHETEROHEAP_HPP
-
+#endif // SHARE_GC_PARALLEL_ADJOININGGENERATIONSFORHETEROHEAP_HPP
diff --git a/src/hotspot/share/gc/parallel/adjoiningVirtualSpaces.hpp b/src/hotspot/share/gc/parallel/adjoiningVirtualSpaces.hpp
index 89fb5e5b018..79782573849 100644
--- a/src/hotspot/share/gc/parallel/adjoiningVirtualSpaces.hpp
+++ b/src/hotspot/share/gc/parallel/adjoiningVirtualSpaces.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2003, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
*
*/
-#ifndef SHARE_VM_GC_PARALLEL_ADJOININGVIRTUALSPACES_HPP
-#define SHARE_VM_GC_PARALLEL_ADJOININGVIRTUALSPACES_HPP
+#ifndef SHARE_GC_PARALLEL_ADJOININGVIRTUALSPACES_HPP
+#define SHARE_GC_PARALLEL_ADJOININGVIRTUALSPACES_HPP
#include "gc/parallel/psVirtualspace.hpp"
@@ -112,4 +112,4 @@ protected:
size_t init_low_byte_size,
size_t init_high_byte_size);
};
-#endif // SHARE_VM_GC_PARALLEL_ADJOININGVIRTUALSPACES_HPP
+#endif // SHARE_GC_PARALLEL_ADJOININGVIRTUALSPACES_HPP
diff --git a/src/hotspot/share/gc/parallel/asPSOldGen.hpp b/src/hotspot/share/gc/parallel/asPSOldGen.hpp
index 861ab9a6fa2..beaa4a80a09 100644
--- a/src/hotspot/share/gc/parallel/asPSOldGen.hpp
+++ b/src/hotspot/share/gc/parallel/asPSOldGen.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2003, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
*
*/
-#ifndef SHARE_VM_GC_PARALLEL_ASPSOLDGEN_HPP
-#define SHARE_VM_GC_PARALLEL_ASPSOLDGEN_HPP
+#ifndef SHARE_GC_PARALLEL_ASPSOLDGEN_HPP
+#define SHARE_GC_PARALLEL_ASPSOLDGEN_HPP
#include "gc/parallel/mutableSpace.hpp"
#include "gc/parallel/objectStartArray.hpp"
@@ -68,4 +68,4 @@ class ASPSOldGen : public PSOldGen {
virtual const char* short_name() const { return "ASPSOldGen"; }
};
-#endif // SHARE_VM_GC_PARALLEL_ASPSOLDGEN_HPP
+#endif // SHARE_GC_PARALLEL_ASPSOLDGEN_HPP
diff --git a/src/hotspot/share/gc/parallel/asPSYoungGen.hpp b/src/hotspot/share/gc/parallel/asPSYoungGen.hpp
index 15db0efe778..2fec4013871 100644
--- a/src/hotspot/share/gc/parallel/asPSYoungGen.hpp
+++ b/src/hotspot/share/gc/parallel/asPSYoungGen.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2003, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
*
*/
-#ifndef SHARE_VM_GC_PARALLEL_ASPSYOUNGGEN_HPP
-#define SHARE_VM_GC_PARALLEL_ASPSYOUNGGEN_HPP
+#ifndef SHARE_GC_PARALLEL_ASPSYOUNGGEN_HPP
+#define SHARE_GC_PARALLEL_ASPSYOUNGGEN_HPP
#include "gc/parallel/mutableSpace.hpp"
#include "gc/parallel/objectStartArray.hpp"
@@ -74,4 +74,4 @@ class ASPSYoungGen : public PSYoungGen {
virtual const char* short_name() const { return "ASPSYoungGen"; }
};
-#endif // SHARE_VM_GC_PARALLEL_ASPSYOUNGGEN_HPP
+#endif // SHARE_GC_PARALLEL_ASPSYOUNGGEN_HPP
diff --git a/src/hotspot/share/gc/parallel/gcAdaptivePolicyCounters.hpp b/src/hotspot/share/gc/parallel/gcAdaptivePolicyCounters.hpp
index 3e7202b22dd..57b48d49f95 100644
--- a/src/hotspot/share/gc/parallel/gcAdaptivePolicyCounters.hpp
+++ b/src/hotspot/share/gc/parallel/gcAdaptivePolicyCounters.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2004, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2004, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
*
*/
-#ifndef SHARE_VM_GC_PARALLEL_GCADAPTIVEPOLICYCOUNTERS_HPP
-#define SHARE_VM_GC_PARALLEL_GCADAPTIVEPOLICYCOUNTERS_HPP
+#ifndef SHARE_GC_PARALLEL_GCADAPTIVEPOLICYCOUNTERS_HPP
+#define SHARE_GC_PARALLEL_GCADAPTIVEPOLICYCOUNTERS_HPP
#include "gc/shared/adaptiveSizePolicy.hpp"
#include "gc/shared/gcPolicyCounters.hpp"
@@ -230,4 +230,4 @@ class GCAdaptivePolicyCounters : public GCPolicyCounters {
}
};
-#endif // SHARE_VM_GC_PARALLEL_GCADAPTIVEPOLICYCOUNTERS_HPP
+#endif // SHARE_GC_PARALLEL_GCADAPTIVEPOLICYCOUNTERS_HPP
diff --git a/src/hotspot/share/gc/parallel/gcTaskManager.hpp b/src/hotspot/share/gc/parallel/gcTaskManager.hpp
index beb907a9024..c29bfa028b0 100644
--- a/src/hotspot/share/gc/parallel/gcTaskManager.hpp
+++ b/src/hotspot/share/gc/parallel/gcTaskManager.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2002, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
*
*/
-#ifndef SHARE_VM_GC_PARALLEL_GCTASKMANAGER_HPP
-#define SHARE_VM_GC_PARALLEL_GCTASKMANAGER_HPP
+#ifndef SHARE_GC_PARALLEL_GCTASKMANAGER_HPP
+#define SHARE_GC_PARALLEL_GCTASKMANAGER_HPP
#include "runtime/mutex.hpp"
#include "utilities/growableArray.hpp"
@@ -665,4 +665,4 @@ private:
}
};
-#endif // SHARE_VM_GC_PARALLEL_GCTASKMANAGER_HPP
+#endif // SHARE_GC_PARALLEL_GCTASKMANAGER_HPP
diff --git a/src/hotspot/share/gc/parallel/gcTaskThread.hpp b/src/hotspot/share/gc/parallel/gcTaskThread.hpp
index d4fbe4b96b7..ae2b8d488ad 100644
--- a/src/hotspot/share/gc/parallel/gcTaskThread.hpp
+++ b/src/hotspot/share/gc/parallel/gcTaskThread.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2002, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
*
*/
-#ifndef SHARE_VM_GC_PARALLEL_GCTASKTHREAD_HPP
-#define SHARE_VM_GC_PARALLEL_GCTASKTHREAD_HPP
+#ifndef SHARE_GC_PARALLEL_GCTASKTHREAD_HPP
+#define SHARE_GC_PARALLEL_GCTASKTHREAD_HPP
#include "runtime/thread.hpp"
@@ -105,4 +105,4 @@ class GCTaskTimeStamp : public CHeapObj
void set_name(const char* name) { _name = name; }
};
-#endif // SHARE_VM_GC_PARALLEL_GCTASKTHREAD_HPP
+#endif // SHARE_GC_PARALLEL_GCTASKTHREAD_HPP
diff --git a/src/hotspot/share/gc/parallel/generationSizer.hpp b/src/hotspot/share/gc/parallel/generationSizer.hpp
index 80ee613901c..985168d4ac2 100644
--- a/src/hotspot/share/gc/parallel/generationSizer.hpp
+++ b/src/hotspot/share/gc/parallel/generationSizer.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2001, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
*
*/
-#ifndef SHARE_VM_GC_PARALLEL_GENERATIONSIZER_HPP
-#define SHARE_VM_GC_PARALLEL_GENERATIONSIZER_HPP
+#ifndef SHARE_GC_PARALLEL_GENERATIONSIZER_HPP
+#define SHARE_GC_PARALLEL_GENERATIONSIZER_HPP
#include "gc/shared/collectorPolicy.hpp"
@@ -45,4 +45,4 @@ class GenerationSizer : public GenCollectorPolicy {
virtual size_t heap_reserved_size_bytes() const;
virtual bool is_hetero_heap() const;
};
-#endif // SHARE_VM_GC_PARALLEL_GENERATIONSIZER_HPP
+#endif // SHARE_GC_PARALLEL_GENERATIONSIZER_HPP
diff --git a/src/hotspot/share/gc/parallel/heterogeneousGenerationSizer.hpp b/src/hotspot/share/gc/parallel/heterogeneousGenerationSizer.hpp
index 809e00e5c18..ef0139f6df7 100644
--- a/src/hotspot/share/gc/parallel/heterogeneousGenerationSizer.hpp
+++ b/src/hotspot/share/gc/parallel/heterogeneousGenerationSizer.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
*
*/
-#ifndef SHARE_VM_GC_PARALLEL_HETEROGENEOUSGENERATIONSIZER_HPP
-#define SHARE_VM_GC_PARALLEL_HETEROGENEOUSGENERATIONSIZER_HPP
+#ifndef SHARE_GC_PARALLEL_HETEROGENEOUSGENERATIONSIZER_HPP
+#define SHARE_GC_PARALLEL_HETEROGENEOUSGENERATIONSIZER_HPP
#include "gc/parallel/generationSizer.hpp"
@@ -43,4 +43,4 @@ public:
virtual size_t heap_reserved_size_bytes() const;
virtual bool is_hetero_heap() const;
};
-#endif // SHARE_VM_GC_PARALLEL_HETEROGENEOUSGENERATIONSIZER_HPP
+#endif // SHARE_GC_PARALLEL_HETEROGENEOUSGENERATIONSIZER_HPP
diff --git a/src/hotspot/share/gc/parallel/immutableSpace.hpp b/src/hotspot/share/gc/parallel/immutableSpace.hpp
index f6d51450dac..d10a40382bc 100644
--- a/src/hotspot/share/gc/parallel/immutableSpace.hpp
+++ b/src/hotspot/share/gc/parallel/immutableSpace.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2001, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
*
*/
-#ifndef SHARE_VM_GC_PARALLEL_IMMUTABLESPACE_HPP
-#define SHARE_VM_GC_PARALLEL_IMMUTABLESPACE_HPP
+#ifndef SHARE_GC_PARALLEL_IMMUTABLESPACE_HPP
+#define SHARE_GC_PARALLEL_IMMUTABLESPACE_HPP
#include "memory/iterator.hpp"
@@ -68,4 +68,4 @@ class ImmutableSpace: public CHeapObj {
virtual void verify();
};
-#endif // SHARE_VM_GC_PARALLEL_IMMUTABLESPACE_HPP
+#endif // SHARE_GC_PARALLEL_IMMUTABLESPACE_HPP
diff --git a/src/hotspot/share/gc/parallel/jvmFlagConstraintsParallel.hpp b/src/hotspot/share/gc/parallel/jvmFlagConstraintsParallel.hpp
index b945d8ea3bf..1f07a2104ef 100644
--- a/src/hotspot/share/gc/parallel/jvmFlagConstraintsParallel.hpp
+++ b/src/hotspot/share/gc/parallel/jvmFlagConstraintsParallel.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2015, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
*
*/
-#ifndef SHARE_GC_PARALLEL_COMMANDLINEFLAGCONSTRAINTSPARALLEL_HPP
-#define SHARE_GC_PARALLEL_COMMANDLINEFLAGCONSTRAINTSPARALLEL_HPP
+#ifndef SHARE_GC_PARALLEL_JVMFLAGCONSTRAINTSPARALLEL_HPP
+#define SHARE_GC_PARALLEL_JVMFLAGCONSTRAINTSPARALLEL_HPP
#include "runtime/globals.hpp"
#include "utilities/globalDefinitions.hpp"
@@ -33,4 +33,4 @@ JVMFlag::Error ParallelGCThreadsConstraintFuncParallel(uint value, bool verbose)
JVMFlag::Error InitialTenuringThresholdConstraintFuncParallel(uintx value, bool verbose);
JVMFlag::Error MaxTenuringThresholdConstraintFuncParallel(uintx value, bool verbose);
-#endif // SHARE_GC_PARALLEL_COMMANDLINEFLAGCONSTRAINTSPARALLEL_HPP
+#endif // SHARE_GC_PARALLEL_JVMFLAGCONSTRAINTSPARALLEL_HPP
diff --git a/src/hotspot/share/gc/parallel/mutableNUMASpace.hpp b/src/hotspot/share/gc/parallel/mutableNUMASpace.hpp
index 66a7e3b8fd0..bc4b73639ad 100644
--- a/src/hotspot/share/gc/parallel/mutableNUMASpace.hpp
+++ b/src/hotspot/share/gc/parallel/mutableNUMASpace.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2006, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2006, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
*
*/
-#ifndef SHARE_VM_GC_PARALLEL_MUTABLENUMASPACE_HPP
-#define SHARE_VM_GC_PARALLEL_MUTABLENUMASPACE_HPP
+#ifndef SHARE_GC_PARALLEL_MUTABLENUMASPACE_HPP
+#define SHARE_GC_PARALLEL_MUTABLENUMASPACE_HPP
#include "gc/parallel/mutableSpace.hpp"
#include "gc/shared/gcUtil.hpp"
@@ -232,4 +232,4 @@ class MutableNUMASpace : public MutableSpace {
virtual void set_top(HeapWord* value);
};
-#endif // SHARE_VM_GC_PARALLEL_MUTABLENUMASPACE_HPP
+#endif // SHARE_GC_PARALLEL_MUTABLENUMASPACE_HPP
diff --git a/src/hotspot/share/gc/parallel/mutableSpace.hpp b/src/hotspot/share/gc/parallel/mutableSpace.hpp
index a66105c543a..acc4285f576 100644
--- a/src/hotspot/share/gc/parallel/mutableSpace.hpp
+++ b/src/hotspot/share/gc/parallel/mutableSpace.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2001, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
*
*/
-#ifndef SHARE_VM_GC_PARALLEL_MUTABLESPACE_HPP
-#define SHARE_VM_GC_PARALLEL_MUTABLESPACE_HPP
+#ifndef SHARE_GC_PARALLEL_MUTABLESPACE_HPP
+#define SHARE_GC_PARALLEL_MUTABLESPACE_HPP
#include "gc/parallel/immutableSpace.hpp"
#include "memory/memRegion.hpp"
@@ -145,4 +145,4 @@ class MutableSpace: public ImmutableSpace {
virtual void verify();
};
-#endif // SHARE_VM_GC_PARALLEL_MUTABLESPACE_HPP
+#endif // SHARE_GC_PARALLEL_MUTABLESPACE_HPP
diff --git a/src/hotspot/share/gc/parallel/objectStartArray.hpp b/src/hotspot/share/gc/parallel/objectStartArray.hpp
index 3b801c8f63d..0093e575277 100644
--- a/src/hotspot/share/gc/parallel/objectStartArray.hpp
+++ b/src/hotspot/share/gc/parallel/objectStartArray.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2001, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
*
*/
-#ifndef SHARE_VM_GC_PARALLEL_OBJECTSTARTARRAY_HPP
-#define SHARE_VM_GC_PARALLEL_OBJECTSTARTARRAY_HPP
+#ifndef SHARE_GC_PARALLEL_OBJECTSTARTARRAY_HPP
+#define SHARE_GC_PARALLEL_OBJECTSTARTARRAY_HPP
#include "gc/parallel/psVirtualspace.hpp"
#include "memory/allocation.hpp"
@@ -156,4 +156,4 @@ class ObjectStartArray : public CHeapObj {
bool object_starts_in_range(HeapWord* start_addr, HeapWord* end_addr) const;
};
-#endif // SHARE_VM_GC_PARALLEL_OBJECTSTARTARRAY_HPP
+#endif // SHARE_GC_PARALLEL_OBJECTSTARTARRAY_HPP
diff --git a/src/hotspot/share/gc/parallel/objectStartArray.inline.hpp b/src/hotspot/share/gc/parallel/objectStartArray.inline.hpp
index 53d9fea5fd6..6af0fed77e1 100644
--- a/src/hotspot/share/gc/parallel/objectStartArray.inline.hpp
+++ b/src/hotspot/share/gc/parallel/objectStartArray.inline.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
*
*/
-#ifndef SHARE_VM_GC_PARALLEL_OBJECTSTARTARRAY_INLINE_HPP
-#define SHARE_VM_GC_PARALLEL_OBJECTSTARTARRAY_INLINE_HPP
+#ifndef SHARE_GC_PARALLEL_OBJECTSTARTARRAY_INLINE_HPP
+#define SHARE_GC_PARALLEL_OBJECTSTARTARRAY_INLINE_HPP
#include "gc/parallel/objectStartArray.hpp"
@@ -50,4 +50,4 @@ HeapWord* ObjectStartArray::object_start(HeapWord* addr) const {
}
-#endif // SHARE_VM_GC_PARALLEL_OBJECTSTARTARRAY_INLINE_HPP
+#endif // SHARE_GC_PARALLEL_OBJECTSTARTARRAY_INLINE_HPP
diff --git a/src/hotspot/share/gc/parallel/parMarkBitMap.hpp b/src/hotspot/share/gc/parallel/parMarkBitMap.hpp
index d281fd1c690..17e8be8dc50 100644
--- a/src/hotspot/share/gc/parallel/parMarkBitMap.hpp
+++ b/src/hotspot/share/gc/parallel/parMarkBitMap.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2005, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
*
*/
-#ifndef SHARE_VM_GC_PARALLEL_PARMARKBITMAP_HPP
-#define SHARE_VM_GC_PARALLEL_PARMARKBITMAP_HPP
+#ifndef SHARE_GC_PARALLEL_PARMARKBITMAP_HPP
+#define SHARE_GC_PARALLEL_PARMARKBITMAP_HPP
#include "memory/memRegion.hpp"
#include "oops/oop.hpp"
@@ -188,4 +188,4 @@ private:
size_t _reserved_byte_size;
};
-#endif // SHARE_VM_GC_PARALLEL_PARMARKBITMAP_HPP
+#endif // SHARE_GC_PARALLEL_PARMARKBITMAP_HPP
diff --git a/src/hotspot/share/gc/parallel/parMarkBitMap.inline.hpp b/src/hotspot/share/gc/parallel/parMarkBitMap.inline.hpp
index 02beec33529..cf9bbe82f52 100644
--- a/src/hotspot/share/gc/parallel/parMarkBitMap.inline.hpp
+++ b/src/hotspot/share/gc/parallel/parMarkBitMap.inline.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
*
*/
-#ifndef SHARE_VM_GC_PARALLEL_PARMARKBITMAP_INLINE_HPP
-#define SHARE_VM_GC_PARALLEL_PARMARKBITMAP_INLINE_HPP
+#ifndef SHARE_GC_PARALLEL_PARMARKBITMAP_INLINE_HPP
+#define SHARE_GC_PARALLEL_PARMARKBITMAP_INLINE_HPP
#include "gc/parallel/parMarkBitMap.hpp"
#include "utilities/bitMap.inline.hpp"
@@ -195,4 +195,4 @@ inline void ParMarkBitMap::verify_addr(HeapWord* addr) const {
}
#endif // #ifdef ASSERT
-#endif /* SHARE_VM_GC_PARALLEL_PARMARKBITMAP_INLINE_HPP */
+#endif // SHARE_GC_PARALLEL_PARMARKBITMAP_INLINE_HPP
diff --git a/src/hotspot/share/gc/parallel/parallelArguments.hpp b/src/hotspot/share/gc/parallel/parallelArguments.hpp
index f07662d615d..c34c41b1aa9 100644
--- a/src/hotspot/share/gc/parallel/parallelArguments.hpp
+++ b/src/hotspot/share/gc/parallel/parallelArguments.hpp
@@ -36,4 +36,4 @@ public:
virtual CollectedHeap* create_heap();
};
-#endif // SHARE_GC_CMS_PARALLELARGUMENTS_HPP
+#endif // SHARE_GC_PARALLEL_PARALLELARGUMENTS_HPP
diff --git a/src/hotspot/share/gc/parallel/parallelScavengeHeap.hpp b/src/hotspot/share/gc/parallel/parallelScavengeHeap.hpp
index bddf4f2b84c..ed035391736 100644
--- a/src/hotspot/share/gc/parallel/parallelScavengeHeap.hpp
+++ b/src/hotspot/share/gc/parallel/parallelScavengeHeap.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2001, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
*
*/
-#ifndef SHARE_VM_GC_PARALLEL_PARALLELSCAVENGEHEAP_HPP
-#define SHARE_VM_GC_PARALLEL_PARALLELSCAVENGEHEAP_HPP
+#ifndef SHARE_GC_PARALLEL_PARALLELSCAVENGEHEAP_HPP
+#define SHARE_GC_PARALLEL_PARALLELSCAVENGEHEAP_HPP
#include "gc/parallel/generationSizer.hpp"
#include "gc/parallel/objectStartArray.hpp"
@@ -311,4 +311,4 @@ class AdaptiveSizePolicyOutput : AllStatic {
}
};
-#endif // SHARE_VM_GC_PARALLEL_PARALLELSCAVENGEHEAP_HPP
+#endif // SHARE_GC_PARALLEL_PARALLELSCAVENGEHEAP_HPP
diff --git a/src/hotspot/share/gc/parallel/parallelScavengeHeap.inline.hpp b/src/hotspot/share/gc/parallel/parallelScavengeHeap.inline.hpp
index d33eafefc06..83f2fa96e01 100644
--- a/src/hotspot/share/gc/parallel/parallelScavengeHeap.inline.hpp
+++ b/src/hotspot/share/gc/parallel/parallelScavengeHeap.inline.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2006, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2006, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
*
*/
-#ifndef SHARE_VM_GC_PARALLEL_PARALLELSCAVENGEHEAP_INLINE_HPP
-#define SHARE_VM_GC_PARALLEL_PARALLELSCAVENGEHEAP_INLINE_HPP
+#ifndef SHARE_GC_PARALLEL_PARALLELSCAVENGEHEAP_INLINE_HPP
+#define SHARE_GC_PARALLEL_PARALLELSCAVENGEHEAP_INLINE_HPP
#include "gc/parallel/parallelScavengeHeap.hpp"
#include "gc/parallel/psMarkSweepProxy.hpp"
@@ -51,4 +51,4 @@ inline bool ParallelScavengeHeap::is_in_young(oop p) {
"incorrect test - result=%d, p=" PTR_FORMAT, result, p2i((void*)p));
return result;
}
-#endif // SHARE_VM_GC_PARALLEL_PARALLELSCAVENGEHEAP_INLINE_HPP
+#endif // SHARE_GC_PARALLEL_PARALLELSCAVENGEHEAP_INLINE_HPP
diff --git a/src/hotspot/share/gc/parallel/pcTasks.hpp b/src/hotspot/share/gc/parallel/pcTasks.hpp
index 71ea5a5b0de..f84d20897b7 100644
--- a/src/hotspot/share/gc/parallel/pcTasks.hpp
+++ b/src/hotspot/share/gc/parallel/pcTasks.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2005, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
*
*/
-#ifndef SHARE_VM_GC_PARALLEL_PCTASKS_HPP
-#define SHARE_VM_GC_PARALLEL_PCTASKS_HPP
+#ifndef SHARE_GC_PARALLEL_PCTASKS_HPP
+#define SHARE_GC_PARALLEL_PCTASKS_HPP
#include "gc/parallel/gcTaskManager.hpp"
#include "gc/parallel/psParallelCompact.hpp"
@@ -205,4 +205,4 @@ class UpdateDensePrefixTask : public GCTask {
virtual void do_it(GCTaskManager* manager, uint which);
};
-#endif // SHARE_VM_GC_PARALLEL_PCTASKS_HPP
+#endif // SHARE_GC_PARALLEL_PCTASKS_HPP
diff --git a/src/hotspot/share/gc/parallel/psAdaptiveSizePolicy.hpp b/src/hotspot/share/gc/parallel/psAdaptiveSizePolicy.hpp
index d597b753328..96a2393ef94 100644
--- a/src/hotspot/share/gc/parallel/psAdaptiveSizePolicy.hpp
+++ b/src/hotspot/share/gc/parallel/psAdaptiveSizePolicy.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2002, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
*
*/
-#ifndef SHARE_VM_GC_PARALLEL_PSADAPTIVESIZEPOLICY_HPP
-#define SHARE_VM_GC_PARALLEL_PSADAPTIVESIZEPOLICY_HPP
+#ifndef SHARE_GC_PARALLEL_PSADAPTIVESIZEPOLICY_HPP
+#define SHARE_GC_PARALLEL_PSADAPTIVESIZEPOLICY_HPP
#include "gc/shared/adaptiveSizePolicy.hpp"
#include "gc/shared/gcCause.hpp"
@@ -402,4 +402,4 @@ class PSAdaptiveSizePolicy : public AdaptiveSizePolicy {
void decay_supplemental_growth(bool is_full_gc);
};
-#endif // SHARE_VM_GC_PARALLEL_PSADAPTIVESIZEPOLICY_HPP
+#endif // SHARE_GC_PARALLEL_PSADAPTIVESIZEPOLICY_HPP
diff --git a/src/hotspot/share/gc/parallel/psCardTable.hpp b/src/hotspot/share/gc/parallel/psCardTable.hpp
index 3c79f26a463..cbdd7c26095 100644
--- a/src/hotspot/share/gc/parallel/psCardTable.hpp
+++ b/src/hotspot/share/gc/parallel/psCardTable.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2001, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
*
*/
-#ifndef SHARE_VM_GC_PARALLEL_PSCARDTABLE_HPP
-#define SHARE_VM_GC_PARALLEL_PSCARDTABLE_HPP
+#ifndef SHARE_GC_PARALLEL_PSCARDTABLE_HPP
+#define SHARE_GC_PARALLEL_PSCARDTABLE_HPP
#include "gc/shared/cardTable.hpp"
#include "oops/oop.hpp"
@@ -109,4 +109,4 @@ class PSCardTable: public CardTable {
void verify_all_young_refs_precise();
};
-#endif // SHARE_VM_GC_PARALLEL_PSCARDTABLE
+#endif // SHARE_GC_PARALLEL_PSCARDTABLE_HPP
diff --git a/src/hotspot/share/gc/parallel/psClosure.inline.hpp b/src/hotspot/share/gc/parallel/psClosure.inline.hpp
index 67708779c4a..b8d338ca190 100644
--- a/src/hotspot/share/gc/parallel/psClosure.inline.hpp
+++ b/src/hotspot/share/gc/parallel/psClosure.inline.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
*
*/
-#ifndef SHARE_VM_GC_PARALLEL_PSCLOSURE_INLINE_HPP
-#define SHARE_VM_GC_PARALLEL_PSCLOSURE_INLINE_HPP
+#ifndef SHARE_GC_PARALLEL_PSCLOSURE_INLINE_HPP
+#define SHARE_GC_PARALLEL_PSCLOSURE_INLINE_HPP
#include "gc/parallel/psPromotionManager.inline.hpp"
#include "gc/parallel/psScavenge.inline.hpp"
@@ -118,4 +118,4 @@ public:
}
};
-#endif
+#endif // SHARE_GC_PARALLEL_PSCLOSURE_INLINE_HPP
diff --git a/src/hotspot/share/gc/parallel/psCompactionManager.hpp b/src/hotspot/share/gc/parallel/psCompactionManager.hpp
index 782f26d813d..0bf4e6c9679 100644
--- a/src/hotspot/share/gc/parallel/psCompactionManager.hpp
+++ b/src/hotspot/share/gc/parallel/psCompactionManager.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2005, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
*
*/
-#ifndef SHARE_VM_GC_PARALLEL_PSCOMPACTIONMANAGER_HPP
-#define SHARE_VM_GC_PARALLEL_PSCOMPACTIONMANAGER_HPP
+#ifndef SHARE_GC_PARALLEL_PSCOMPACTIONMANAGER_HPP
+#define SHARE_GC_PARALLEL_PSCOMPACTIONMANAGER_HPP
#include "gc/shared/taskqueue.hpp"
#include "memory/allocation.hpp"
@@ -194,4 +194,4 @@ bool ParCompactionManager::marking_stacks_empty() const {
return _marking_stack.is_empty() && _objarray_stack.is_empty();
}
-#endif // SHARE_VM_GC_PARALLEL_PSCOMPACTIONMANAGER_HPP
+#endif // SHARE_GC_PARALLEL_PSCOMPACTIONMANAGER_HPP
diff --git a/src/hotspot/share/gc/parallel/psCompactionManager.inline.hpp b/src/hotspot/share/gc/parallel/psCompactionManager.inline.hpp
index b34e2275be2..1a1cd8d85f6 100644
--- a/src/hotspot/share/gc/parallel/psCompactionManager.inline.hpp
+++ b/src/hotspot/share/gc/parallel/psCompactionManager.inline.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2010, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
*
*/
-#ifndef SHARE_VM_GC_PARALLEL_PSCOMPACTIONMANAGER_INLINE_HPP
-#define SHARE_VM_GC_PARALLEL_PSCOMPACTIONMANAGER_INLINE_HPP
+#ifndef SHARE_GC_PARALLEL_PSCOMPACTIONMANAGER_INLINE_HPP
+#define SHARE_GC_PARALLEL_PSCOMPACTIONMANAGER_INLINE_HPP
#include "classfile/javaClasses.inline.hpp"
#include "gc/parallel/parMarkBitMap.hpp"
@@ -177,4 +177,4 @@ inline void ParCompactionManager::follow_contents(oop obj) {
}
}
-#endif // SHARE_VM_GC_PARALLEL_PSCOMPACTIONMANAGER_INLINE_HPP
+#endif // SHARE_GC_PARALLEL_PSCOMPACTIONMANAGER_INLINE_HPP
diff --git a/src/hotspot/share/gc/parallel/psFileBackedVirtualspace.hpp b/src/hotspot/share/gc/parallel/psFileBackedVirtualspace.hpp
index ae25141cb46..d815a1dc4e5 100644
--- a/src/hotspot/share/gc/parallel/psFileBackedVirtualspace.hpp
+++ b/src/hotspot/share/gc/parallel/psFileBackedVirtualspace.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
*
*/
-#ifndef SHARE_VM_GC_PARALLEL_PSFILEBACKEDVIRTUALSPACE_HPP
-#define SHARE_VM_GC_PARALLEL_PSFILEBACKEDVIRTUALSPACE_HPP
+#ifndef SHARE_GC_PARALLEL_PSFILEBACKEDVIRTUALSPACE_HPP
+#define SHARE_GC_PARALLEL_PSFILEBACKEDVIRTUALSPACE_HPP
#include "gc/parallel/psVirtualspace.hpp"
@@ -42,5 +42,4 @@ public:
size_t expand_into(PSVirtualSpace* space, size_t bytes);
void release();
};
-#endif // SHARE_VM_GC_PARALLEL_PSFILEBACKEDVIRTUALSPACE_HPP
-
+#endif // SHARE_GC_PARALLEL_PSFILEBACKEDVIRTUALSPACE_HPP
diff --git a/src/hotspot/share/gc/parallel/psGCAdaptivePolicyCounters.hpp b/src/hotspot/share/gc/parallel/psGCAdaptivePolicyCounters.hpp
index 7a56f0c389c..749bf37e1d8 100644
--- a/src/hotspot/share/gc/parallel/psGCAdaptivePolicyCounters.hpp
+++ b/src/hotspot/share/gc/parallel/psGCAdaptivePolicyCounters.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2003, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
*
*/
-#ifndef SHARE_VM_GC_PARALLEL_PSGCADAPTIVEPOLICYCOUNTERS_HPP
-#define SHARE_VM_GC_PARALLEL_PSGCADAPTIVEPOLICYCOUNTERS_HPP
+#ifndef SHARE_GC_PARALLEL_PSGCADAPTIVEPOLICYCOUNTERS_HPP
+#define SHARE_GC_PARALLEL_PSGCADAPTIVEPOLICYCOUNTERS_HPP
#include "gc/parallel/gcAdaptivePolicyCounters.hpp"
#include "gc/parallel/psAdaptiveSizePolicy.hpp"
@@ -208,4 +208,4 @@ class PSGCAdaptivePolicyCounters : public GCAdaptivePolicyCounters {
}
};
-#endif // SHARE_VM_GC_PARALLEL_PSGCADAPTIVEPOLICYCOUNTERS_HPP
+#endif // SHARE_GC_PARALLEL_PSGCADAPTIVEPOLICYCOUNTERS_HPP
diff --git a/src/hotspot/share/gc/parallel/psGenerationCounters.hpp b/src/hotspot/share/gc/parallel/psGenerationCounters.hpp
index 67d506857f3..6631e609e65 100644
--- a/src/hotspot/share/gc/parallel/psGenerationCounters.hpp
+++ b/src/hotspot/share/gc/parallel/psGenerationCounters.hpp
@@ -1,6 +1,5 @@
-
/*
- * Copyright (c) 2004, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2004, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -23,8 +22,8 @@
*
*/
-#ifndef SHARE_VM_GC_PARALLEL_PSGENERATIONCOUNTERS_HPP
-#define SHARE_VM_GC_PARALLEL_PSGENERATIONCOUNTERS_HPP
+#ifndef SHARE_GC_PARALLEL_PSGENERATIONCOUNTERS_HPP
+#define SHARE_GC_PARALLEL_PSGENERATIONCOUNTERS_HPP
#include "gc/parallel/psVirtualspace.hpp"
#include "gc/shared/generationCounters.hpp"
@@ -49,4 +48,4 @@ class PSGenerationCounters: public GenerationCounters {
}
};
-#endif // SHARE_VM_GC_PARALLEL_PSGENERATIONCOUNTERS_HPP
+#endif // SHARE_GC_PARALLEL_PSGENERATIONCOUNTERS_HPP
diff --git a/src/hotspot/share/gc/parallel/psMarkSweep.hpp b/src/hotspot/share/gc/parallel/psMarkSweep.hpp
index f752a5c5eb5..de1ce72dbc5 100644
--- a/src/hotspot/share/gc/parallel/psMarkSweep.hpp
+++ b/src/hotspot/share/gc/parallel/psMarkSweep.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2001, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
*
*/
-#ifndef SHARE_VM_GC_PARALLEL_PSMARKSWEEP_HPP
-#define SHARE_VM_GC_PARALLEL_PSMARKSWEEP_HPP
+#ifndef SHARE_GC_PARALLEL_PSMARKSWEEP_HPP
+#define SHARE_GC_PARALLEL_PSMARKSWEEP_HPP
#include "gc/serial/markSweep.hpp"
#include "gc/shared/collectorCounters.hpp"
@@ -86,4 +86,4 @@ class PSMarkSweep : public MarkSweep {
static jlong millis_since_last_gc();
};
-#endif // SHARE_VM_GC_PARALLEL_PSMARKSWEEP_HPP
+#endif // SHARE_GC_PARALLEL_PSMARKSWEEP_HPP
diff --git a/src/hotspot/share/gc/parallel/psMarkSweepDecorator.hpp b/src/hotspot/share/gc/parallel/psMarkSweepDecorator.hpp
index 126f3d976af..ec21c287d39 100644
--- a/src/hotspot/share/gc/parallel/psMarkSweepDecorator.hpp
+++ b/src/hotspot/share/gc/parallel/psMarkSweepDecorator.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2001, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
*
*/
-#ifndef SHARE_VM_GC_PARALLEL_PSMARKSWEEPDECORATOR_HPP
-#define SHARE_VM_GC_PARALLEL_PSMARKSWEEPDECORATOR_HPP
+#ifndef SHARE_GC_PARALLEL_PSMARKSWEEPDECORATOR_HPP
+#define SHARE_GC_PARALLEL_PSMARKSWEEPDECORATOR_HPP
#include "gc/parallel/mutableSpace.hpp"
@@ -78,4 +78,4 @@ class PSMarkSweepDecorator: public CHeapObj {
void compact(bool mangle_free_space);
};
-#endif // SHARE_VM_GC_PARALLEL_PSMARKSWEEPDECORATOR_HPP
+#endif // SHARE_GC_PARALLEL_PSMARKSWEEPDECORATOR_HPP
diff --git a/src/hotspot/share/gc/parallel/psMemoryPool.hpp b/src/hotspot/share/gc/parallel/psMemoryPool.hpp
index 522799d8336..53731249797 100644
--- a/src/hotspot/share/gc/parallel/psMemoryPool.hpp
+++ b/src/hotspot/share/gc/parallel/psMemoryPool.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2007, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
*
*/
-#ifndef SHARE_VM_SERVICES_PSMEMORYPOOL_HPP
-#define SHARE_VM_SERVICES_PSMEMORYPOOL_HPP
+#ifndef SHARE_GC_PARALLEL_PSMEMORYPOOL_HPP
+#define SHARE_GC_PARALLEL_PSMEMORYPOOL_HPP
#include "gc/parallel/mutableSpace.hpp"
#include "gc/parallel/psOldGen.hpp"
@@ -86,4 +86,4 @@ public:
}
};
-#endif // SHARE_VM_SERVICES_PSMEMORYPOOL_HPP
+#endif // SHARE_GC_PARALLEL_PSMEMORYPOOL_HPP
diff --git a/src/hotspot/share/gc/parallel/psOldGen.hpp b/src/hotspot/share/gc/parallel/psOldGen.hpp
index fa27f5a0479..ca842f2ba26 100644
--- a/src/hotspot/share/gc/parallel/psOldGen.hpp
+++ b/src/hotspot/share/gc/parallel/psOldGen.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2001, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
*
*/
-#ifndef SHARE_VM_GC_PARALLEL_PSOLDGEN_HPP
-#define SHARE_VM_GC_PARALLEL_PSOLDGEN_HPP
+#ifndef SHARE_GC_PARALLEL_PSOLDGEN_HPP
+#define SHARE_GC_PARALLEL_PSOLDGEN_HPP
#include "gc/parallel/mutableSpace.hpp"
#include "gc/parallel/objectStartArray.hpp"
@@ -223,4 +223,4 @@ class PSOldGen : public CHeapObj {
void record_spaces_top() PRODUCT_RETURN;
};
-#endif // SHARE_VM_GC_PARALLEL_PSOLDGEN_HPP
+#endif // SHARE_GC_PARALLEL_PSOLDGEN_HPP
diff --git a/src/hotspot/share/gc/parallel/psParallelCompact.hpp b/src/hotspot/share/gc/parallel/psParallelCompact.hpp
index 6477c68983c..c474b6e78c5 100644
--- a/src/hotspot/share/gc/parallel/psParallelCompact.hpp
+++ b/src/hotspot/share/gc/parallel/psParallelCompact.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2005, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
*
*/
-#ifndef SHARE_VM_GC_PARALLEL_PSPARALLELCOMPACT_HPP
-#define SHARE_VM_GC_PARALLEL_PSPARALLELCOMPACT_HPP
+#ifndef SHARE_GC_PARALLEL_PSPARALLELCOMPACT_HPP
+#define SHARE_GC_PARALLEL_PSPARALLELCOMPACT_HPP
#include "gc/parallel/mutableSpace.hpp"
#include "gc/parallel/objectStartArray.hpp"
@@ -1301,4 +1301,4 @@ class FillClosure: public ParMarkBitMapClosure {
ObjectStartArray* const _start_array;
};
-#endif // SHARE_VM_GC_PARALLEL_PSPARALLELCOMPACT_HPP
+#endif // SHARE_GC_PARALLEL_PSPARALLELCOMPACT_HPP
diff --git a/src/hotspot/share/gc/parallel/psParallelCompact.inline.hpp b/src/hotspot/share/gc/parallel/psParallelCompact.inline.hpp
index c1949e2de0d..df4f1c41cda 100644
--- a/src/hotspot/share/gc/parallel/psParallelCompact.inline.hpp
+++ b/src/hotspot/share/gc/parallel/psParallelCompact.inline.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2016, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
*
*/
-#ifndef SHARE_VM_GC_PARALLEL_PSPARALLELCOMPACT_INLINE_HPP
-#define SHARE_VM_GC_PARALLEL_PSPARALLELCOMPACT_INLINE_HPP
+#ifndef SHARE_GC_PARALLEL_PSPARALLELCOMPACT_INLINE_HPP
+#define SHARE_GC_PARALLEL_PSPARALLELCOMPACT_INLINE_HPP
#include "gc/parallel/parallelScavengeHeap.hpp"
#include "gc/parallel/parMarkBitMap.inline.hpp"
@@ -141,4 +141,4 @@ private:
ParCompactionManager* _cm;
};
-#endif // SHARE_VM_GC_PARALLEL_PSPARALLELCOMPACT_INLINE_HPP
+#endif // SHARE_GC_PARALLEL_PSPARALLELCOMPACT_INLINE_HPP
diff --git a/src/hotspot/share/gc/parallel/psPromotionLAB.hpp b/src/hotspot/share/gc/parallel/psPromotionLAB.hpp
index 07fcddb1ec1..951b4b548dd 100644
--- a/src/hotspot/share/gc/parallel/psPromotionLAB.hpp
+++ b/src/hotspot/share/gc/parallel/psPromotionLAB.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2002, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
*
*/
-#ifndef SHARE_VM_GC_PARALLEL_PSPROMOTIONLAB_HPP
-#define SHARE_VM_GC_PARALLEL_PSPROMOTIONLAB_HPP
+#ifndef SHARE_GC_PARALLEL_PSPROMOTIONLAB_HPP
+#define SHARE_GC_PARALLEL_PSPROMOTIONLAB_HPP
#include "gc/parallel/objectStartArray.hpp"
#include "gc/shared/collectedHeap.hpp"
@@ -134,4 +134,4 @@ class PSOldPromotionLAB : public PSPromotionLAB {
debug_only(virtual bool lab_is_valid(MemRegion lab));
};
-#endif // SHARE_VM_GC_PARALLEL_PSPROMOTIONLAB_HPP
+#endif // SHARE_GC_PARALLEL_PSPROMOTIONLAB_HPP
diff --git a/src/hotspot/share/gc/parallel/psPromotionLAB.inline.hpp b/src/hotspot/share/gc/parallel/psPromotionLAB.inline.hpp
index 2a01a74aba3..1c883058310 100644
--- a/src/hotspot/share/gc/parallel/psPromotionLAB.inline.hpp
+++ b/src/hotspot/share/gc/parallel/psPromotionLAB.inline.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
*
*/
-#ifndef SHARE_VM_GC_PARALLEL_PSPROMOTIONLAB_INLINE_HPP
-#define SHARE_VM_GC_PARALLEL_PSPROMOTIONLAB_INLINE_HPP
+#ifndef SHARE_GC_PARALLEL_PSPROMOTIONLAB_INLINE_HPP
+#define SHARE_GC_PARALLEL_PSPROMOTIONLAB_INLINE_HPP
#include "gc/parallel/psPromotionLAB.hpp"
#include "gc/shared/collectedHeap.inline.hpp"
@@ -50,4 +50,4 @@ HeapWord* PSYoungPromotionLAB::allocate(size_t size) {
}
}
-#endif // SHARE_VM_GC_PARALLEL_PSPROMOTIONLAB_INLINE_HPP
+#endif // SHARE_GC_PARALLEL_PSPROMOTIONLAB_INLINE_HPP
diff --git a/src/hotspot/share/gc/parallel/psPromotionManager.hpp b/src/hotspot/share/gc/parallel/psPromotionManager.hpp
index bff20ac91d4..e9a4ba0479e 100644
--- a/src/hotspot/share/gc/parallel/psPromotionManager.hpp
+++ b/src/hotspot/share/gc/parallel/psPromotionManager.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2002, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
*
*/
-#ifndef SHARE_VM_GC_PARALLEL_PSPROMOTIONMANAGER_HPP
-#define SHARE_VM_GC_PARALLEL_PSPROMOTIONMANAGER_HPP
+#ifndef SHARE_GC_PARALLEL_PSPROMOTIONMANAGER_HPP
+#define SHARE_GC_PARALLEL_PSPROMOTIONMANAGER_HPP
#include "gc/parallel/psPromotionLAB.hpp"
#include "gc/shared/copyFailedInfo.hpp"
@@ -212,4 +212,4 @@ class PSPromotionManager {
void push_contents(oop obj);
};
-#endif // SHARE_VM_GC_PARALLEL_PSPROMOTIONMANAGER_HPP
+#endif // SHARE_GC_PARALLEL_PSPROMOTIONMANAGER_HPP
diff --git a/src/hotspot/share/gc/parallel/psPromotionManager.inline.hpp b/src/hotspot/share/gc/parallel/psPromotionManager.inline.hpp
index 91abae6de27..95488e4c8bb 100644
--- a/src/hotspot/share/gc/parallel/psPromotionManager.inline.hpp
+++ b/src/hotspot/share/gc/parallel/psPromotionManager.inline.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2002, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
*
*/
-#ifndef SHARE_VM_GC_PARALLEL_PSPROMOTIONMANAGER_INLINE_HPP
-#define SHARE_VM_GC_PARALLEL_PSPROMOTIONMANAGER_INLINE_HPP
+#ifndef SHARE_GC_PARALLEL_PSPROMOTIONMANAGER_INLINE_HPP
+#define SHARE_GC_PARALLEL_PSPROMOTIONMANAGER_INLINE_HPP
#include "gc/parallel/parallelScavengeHeap.hpp"
#include "gc/parallel/parMarkBitMap.inline.hpp"
@@ -375,4 +375,4 @@ void PSPromotionManager::record_steal(StarTask& p) {
}
#endif // TASKQUEUE_STATS
-#endif // SHARE_VM_GC_PARALLEL_PSPROMOTIONMANAGER_INLINE_HPP
+#endif // SHARE_GC_PARALLEL_PSPROMOTIONMANAGER_INLINE_HPP
diff --git a/src/hotspot/share/gc/parallel/psScavenge.hpp b/src/hotspot/share/gc/parallel/psScavenge.hpp
index c9cf19d4b98..888644e9dd8 100644
--- a/src/hotspot/share/gc/parallel/psScavenge.hpp
+++ b/src/hotspot/share/gc/parallel/psScavenge.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2002, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
*
*/
-#ifndef SHARE_VM_GC_PARALLEL_PSSCAVENGE_HPP
-#define SHARE_VM_GC_PARALLEL_PSSCAVENGE_HPP
+#ifndef SHARE_GC_PARALLEL_PSSCAVENGE_HPP
+#define SHARE_GC_PARALLEL_PSSCAVENGE_HPP
#include "gc/parallel/psCardTable.hpp"
#include "gc/parallel/psVirtualspace.hpp"
@@ -157,4 +157,4 @@ class PSScavenge: AllStatic {
}
};
-#endif // SHARE_VM_GC_PARALLEL_PSSCAVENGE_HPP
+#endif // SHARE_GC_PARALLEL_PSSCAVENGE_HPP
diff --git a/src/hotspot/share/gc/parallel/psScavenge.inline.hpp b/src/hotspot/share/gc/parallel/psScavenge.inline.hpp
index 40d51f6a770..34de2953a10 100644
--- a/src/hotspot/share/gc/parallel/psScavenge.inline.hpp
+++ b/src/hotspot/share/gc/parallel/psScavenge.inline.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2002, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
*
*/
-#ifndef SHARE_VM_GC_PARALLEL_PSSCAVENGE_INLINE_HPP
-#define SHARE_VM_GC_PARALLEL_PSSCAVENGE_INLINE_HPP
+#ifndef SHARE_GC_PARALLEL_PSSCAVENGE_INLINE_HPP
+#define SHARE_GC_PARALLEL_PSSCAVENGE_INLINE_HPP
#include "gc/parallel/parallelScavengeHeap.hpp"
#include "gc/parallel/psScavenge.hpp"
@@ -64,4 +64,4 @@ inline bool PSScavenge::should_scavenge(T* p, bool check_to_space) {
return should_scavenge(p);
}
-#endif // SHARE_VM_GC_PARALLEL_PSSCAVENGE_INLINE_HPP
+#endif // SHARE_GC_PARALLEL_PSSCAVENGE_INLINE_HPP
diff --git a/src/hotspot/share/gc/parallel/psTasks.hpp b/src/hotspot/share/gc/parallel/psTasks.hpp
index e4acf8fc8cb..13dae45759b 100644
--- a/src/hotspot/share/gc/parallel/psTasks.hpp
+++ b/src/hotspot/share/gc/parallel/psTasks.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2002, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
*
*/
-#ifndef SHARE_VM_GC_PARALLEL_PSTASKS_HPP
-#define SHARE_VM_GC_PARALLEL_PSTASKS_HPP
+#ifndef SHARE_GC_PARALLEL_PSTASKS_HPP
+#define SHARE_GC_PARALLEL_PSTASKS_HPP
#include "utilities/growableArray.hpp"
@@ -177,4 +177,4 @@ class OldToYoungRootsTask : public GCTask {
virtual void do_it(GCTaskManager* manager, uint which);
};
-#endif // SHARE_VM_GC_PARALLEL_PSTASKS_HPP
+#endif // SHARE_GC_PARALLEL_PSTASKS_HPP
diff --git a/src/hotspot/share/gc/parallel/psVMOperations.hpp b/src/hotspot/share/gc/parallel/psVMOperations.hpp
index 5a5decfce62..0cddac3d616 100644
--- a/src/hotspot/share/gc/parallel/psVMOperations.hpp
+++ b/src/hotspot/share/gc/parallel/psVMOperations.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2007, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
*
*/
-#ifndef SHARE_VM_GC_PARALLEL_PSVMOPERATIONS_HPP
-#define SHARE_VM_GC_PARALLEL_PSVMOPERATIONS_HPP
+#ifndef SHARE_GC_PARALLEL_PSVMOPERATIONS_HPP
+#define SHARE_GC_PARALLEL_PSVMOPERATIONS_HPP
#include "gc/parallel/parallelScavengeHeap.hpp"
#include "gc/shared/gcCause.hpp"
@@ -46,4 +46,4 @@ class VM_ParallelGCSystemGC: public VM_GC_Operation {
virtual void doit();
};
-#endif // SHARE_VM_GC_PARALLEL_PSVMOPERATIONS_HPP
+#endif // SHARE_GC_PARALLEL_PSVMOPERATIONS_HPP
diff --git a/src/hotspot/share/gc/parallel/psVirtualspace.hpp b/src/hotspot/share/gc/parallel/psVirtualspace.hpp
index e724b23e4ed..aa38a271aff 100644
--- a/src/hotspot/share/gc/parallel/psVirtualspace.hpp
+++ b/src/hotspot/share/gc/parallel/psVirtualspace.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2003, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
*
*/
-#ifndef SHARE_VM_GC_PARALLEL_PSVIRTUALSPACE_HPP
-#define SHARE_VM_GC_PARALLEL_PSVIRTUALSPACE_HPP
+#ifndef SHARE_GC_PARALLEL_PSVIRTUALSPACE_HPP
+#define SHARE_GC_PARALLEL_PSVIRTUALSPACE_HPP
#include "memory/allocation.hpp"
#include "memory/virtualspace.hpp"
@@ -179,4 +179,4 @@ inline void PSVirtualSpace::set_committed(char* low_addr, char* high_addr) {
_committed_high_addr = high_addr;
}
-#endif // SHARE_VM_GC_PARALLEL_PSVIRTUALSPACE_HPP
+#endif // SHARE_GC_PARALLEL_PSVIRTUALSPACE_HPP
diff --git a/src/hotspot/share/gc/parallel/psYoungGen.hpp b/src/hotspot/share/gc/parallel/psYoungGen.hpp
index 21d567534b6..2b1d656b98a 100644
--- a/src/hotspot/share/gc/parallel/psYoungGen.hpp
+++ b/src/hotspot/share/gc/parallel/psYoungGen.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2001, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
*
*/
-#ifndef SHARE_VM_GC_PARALLEL_PSYOUNGGEN_HPP
-#define SHARE_VM_GC_PARALLEL_PSYOUNGGEN_HPP
+#ifndef SHARE_GC_PARALLEL_PSYOUNGGEN_HPP
+#define SHARE_GC_PARALLEL_PSYOUNGGEN_HPP
#include "gc/parallel/mutableSpace.hpp"
#include "gc/parallel/objectStartArray.hpp"
@@ -197,4 +197,4 @@ class PSYoungGen : public CHeapObj {
void record_spaces_top() PRODUCT_RETURN;
};
-#endif // SHARE_VM_GC_PARALLEL_PSYOUNGGEN_HPP
+#endif // SHARE_GC_PARALLEL_PSYOUNGGEN_HPP
diff --git a/src/hotspot/share/gc/parallel/spaceCounters.hpp b/src/hotspot/share/gc/parallel/spaceCounters.hpp
index e2cf1621b3d..8017249995c 100644
--- a/src/hotspot/share/gc/parallel/spaceCounters.hpp
+++ b/src/hotspot/share/gc/parallel/spaceCounters.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2002, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
*
*/
-#ifndef SHARE_VM_GC_PARALLEL_SPACECOUNTERS_HPP
-#define SHARE_VM_GC_PARALLEL_SPACECOUNTERS_HPP
+#ifndef SHARE_GC_PARALLEL_SPACECOUNTERS_HPP
+#define SHARE_GC_PARALLEL_SPACECOUNTERS_HPP
#include "gc/parallel/immutableSpace.hpp"
#include "gc/parallel/mutableSpace.hpp"
@@ -83,4 +83,4 @@ class MutableSpaceUsedHelper: public PerfLongSampleHelper {
}
};
-#endif // SHARE_VM_GC_PARALLEL_SPACECOUNTERS_HPP
+#endif // SHARE_GC_PARALLEL_SPACECOUNTERS_HPP
diff --git a/src/hotspot/share/gc/parallel/vmStructs_parallelgc.hpp b/src/hotspot/share/gc/parallel/vmStructs_parallelgc.hpp
index 67d4ed20732..d3726177d20 100644
--- a/src/hotspot/share/gc/parallel/vmStructs_parallelgc.hpp
+++ b/src/hotspot/share/gc/parallel/vmStructs_parallelgc.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2007, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
*
*/
-#ifndef SHARE_VM_GC_PARALLEL_VMSTRUCTS_PARALLELGC_HPP
-#define SHARE_VM_GC_PARALLEL_VMSTRUCTS_PARALLELGC_HPP
+#ifndef SHARE_GC_PARALLEL_VMSTRUCTS_PARALLELGC_HPP
+#define SHARE_GC_PARALLEL_VMSTRUCTS_PARALLELGC_HPP
#include "gc/parallel/asPSOldGen.hpp"
#include "gc/parallel/asPSYoungGen.hpp"
@@ -108,4 +108,4 @@
#define VM_INT_CONSTANTS_PARALLELGC(declare_constant, \
declare_constant_with_value)
-#endif // SHARE_VM_GC_PARALLEL_VMSTRUCTS_PARALLELGC_HPP
+#endif // SHARE_GC_PARALLEL_VMSTRUCTS_PARALLELGC_HPP
diff --git a/src/hotspot/share/gc/serial/cSpaceCounters.hpp b/src/hotspot/share/gc/serial/cSpaceCounters.hpp
index da0c4cfbf31..4527fd8c905 100644
--- a/src/hotspot/share/gc/serial/cSpaceCounters.hpp
+++ b/src/hotspot/share/gc/serial/cSpaceCounters.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2002, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
*
*/
-#ifndef SHARE_VM_GC_SERIAL_CSPACECOUNTERS_HPP
-#define SHARE_VM_GC_SERIAL_CSPACECOUNTERS_HPP
+#ifndef SHARE_GC_SERIAL_CSPACECOUNTERS_HPP
+#define SHARE_GC_SERIAL_CSPACECOUNTERS_HPP
#include "gc/shared/generationCounters.hpp"
#include "gc/shared/space.hpp"
@@ -71,4 +71,4 @@ class ContiguousSpaceUsedHelper : public PerfLongSampleHelper {
jlong take_sample();
};
-#endif // SHARE_VM_GC_SERIAL_CSPACECOUNTERS_HPP
+#endif // SHARE_GC_SERIAL_CSPACECOUNTERS_HPP
diff --git a/src/hotspot/share/gc/serial/defNewGeneration.hpp b/src/hotspot/share/gc/serial/defNewGeneration.hpp
index 33e3d2b4ec9..6d88c145e75 100644
--- a/src/hotspot/share/gc/serial/defNewGeneration.hpp
+++ b/src/hotspot/share/gc/serial/defNewGeneration.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2001, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
*
*/
-#ifndef SHARE_VM_GC_SERIAL_DEFNEWGENERATION_HPP
-#define SHARE_VM_GC_SERIAL_DEFNEWGENERATION_HPP
+#ifndef SHARE_GC_SERIAL_DEFNEWGENERATION_HPP
+#define SHARE_GC_SERIAL_DEFNEWGENERATION_HPP
#include "gc/serial/cSpaceCounters.hpp"
#include "gc/shared/ageTable.hpp"
@@ -346,4 +346,4 @@ protected:
void swap_spaces();
};
-#endif // SHARE_VM_GC_SERIAL_DEFNEWGENERATION_HPP
+#endif // SHARE_GC_SERIAL_DEFNEWGENERATION_HPP
diff --git a/src/hotspot/share/gc/serial/defNewGeneration.inline.hpp b/src/hotspot/share/gc/serial/defNewGeneration.inline.hpp
index 72c6151c19b..5df27e13283 100644
--- a/src/hotspot/share/gc/serial/defNewGeneration.inline.hpp
+++ b/src/hotspot/share/gc/serial/defNewGeneration.inline.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2001, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
*
*/
-#ifndef SHARE_VM_GC_SERIAL_DEFNEWGENERATION_INLINE_HPP
-#define SHARE_VM_GC_SERIAL_DEFNEWGENERATION_INLINE_HPP
+#ifndef SHARE_GC_SERIAL_DEFNEWGENERATION_INLINE_HPP
+#define SHARE_GC_SERIAL_DEFNEWGENERATION_INLINE_HPP
#include "gc/serial/defNewGeneration.hpp"
#include "gc/shared/cardTableRS.hpp"
@@ -98,4 +98,4 @@ void DefNewGeneration::oop_since_save_marks_iterate(OopClosureType* cl) {
save_marks();
}
-#endif // SHARE_VM_GC_SERIAL_DEFNEWGENERATION_INLINE_HPP
+#endif // SHARE_GC_SERIAL_DEFNEWGENERATION_INLINE_HPP
diff --git a/src/hotspot/share/gc/serial/genMarkSweep.hpp b/src/hotspot/share/gc/serial/genMarkSweep.hpp
index efa4d19e649..4aaa93007b7 100644
--- a/src/hotspot/share/gc/serial/genMarkSweep.hpp
+++ b/src/hotspot/share/gc/serial/genMarkSweep.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2001, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
*
*/
-#ifndef SHARE_VM_GC_SERIAL_GENMARKSWEEP_HPP
-#define SHARE_VM_GC_SERIAL_GENMARKSWEEP_HPP
+#ifndef SHARE_GC_SERIAL_GENMARKSWEEP_HPP
+#define SHARE_GC_SERIAL_GENMARKSWEEP_HPP
#include "gc/serial/markSweep.hpp"
@@ -48,4 +48,4 @@ class GenMarkSweep : public MarkSweep {
static void deallocate_stacks();
};
-#endif // SHARE_VM_GC_SERIAL_GENMARKSWEEP_HPP
+#endif // SHARE_GC_SERIAL_GENMARKSWEEP_HPP
diff --git a/src/hotspot/share/gc/serial/markSweep.hpp b/src/hotspot/share/gc/serial/markSweep.hpp
index cf96ade0ef0..531faecc130 100644
--- a/src/hotspot/share/gc/serial/markSweep.hpp
+++ b/src/hotspot/share/gc/serial/markSweep.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
*
*/
-#ifndef SHARE_VM_GC_SERIAL_MARKSWEEP_HPP
-#define SHARE_VM_GC_SERIAL_MARKSWEEP_HPP
+#ifndef SHARE_GC_SERIAL_MARKSWEEP_HPP
+#define SHARE_GC_SERIAL_MARKSWEEP_HPP
#include "gc/shared/collectedHeap.hpp"
#include "gc/shared/genOopClosures.hpp"
@@ -211,4 +211,4 @@ public:
void restore();
};
-#endif // SHARE_VM_GC_SERIAL_MARKSWEEP_HPP
+#endif // SHARE_GC_SERIAL_MARKSWEEP_HPP
diff --git a/src/hotspot/share/gc/serial/markSweep.inline.hpp b/src/hotspot/share/gc/serial/markSweep.inline.hpp
index 73f6b991e16..204a3b4e6ef 100644
--- a/src/hotspot/share/gc/serial/markSweep.inline.hpp
+++ b/src/hotspot/share/gc/serial/markSweep.inline.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2000, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
*
*/
-#ifndef SHARE_VM_GC_SERIAL_MARKSWEEP_INLINE_HPP
-#define SHARE_VM_GC_SERIAL_MARKSWEEP_INLINE_HPP
+#ifndef SHARE_GC_SERIAL_MARKSWEEP_INLINE_HPP
+#define SHARE_GC_SERIAL_MARKSWEEP_INLINE_HPP
#include "classfile/classLoaderData.inline.hpp"
#include "gc/serial/markSweep.hpp"
@@ -104,4 +104,4 @@ inline int MarkSweep::adjust_pointers(oop obj) {
return obj->oop_iterate_size(&MarkSweep::adjust_pointer_closure);
}
-#endif // SHARE_VM_GC_SERIAL_MARKSWEEP_INLINE_HPP
+#endif // SHARE_GC_SERIAL_MARKSWEEP_INLINE_HPP
diff --git a/src/hotspot/share/gc/serial/serialHeap.hpp b/src/hotspot/share/gc/serial/serialHeap.hpp
index 820e00adc71..7a3ef05b698 100644
--- a/src/hotspot/share/gc/serial/serialHeap.hpp
+++ b/src/hotspot/share/gc/serial/serialHeap.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2017, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
*
*/
-#ifndef SHARE_VM_GC_SERIAL_SERIALHEAP_HPP
-#define SHARE_VM_GC_SERIAL_SERIALHEAP_HPP
+#ifndef SHARE_GC_SERIAL_SERIALHEAP_HPP
+#define SHARE_GC_SERIAL_SERIALHEAP_HPP
#include "gc/serial/defNewGeneration.hpp"
#include "gc/serial/tenuredGeneration.hpp"
@@ -83,4 +83,4 @@ public:
OopClosureType2* older);
};
-#endif // SHARE_VM_GC_CMS_CMSHEAP_HPP
+#endif // SHARE_GC_SERIAL_SERIALHEAP_HPP
diff --git a/src/hotspot/share/gc/serial/tenuredGeneration.hpp b/src/hotspot/share/gc/serial/tenuredGeneration.hpp
index 9bd0890c707..48107257be5 100644
--- a/src/hotspot/share/gc/serial/tenuredGeneration.hpp
+++ b/src/hotspot/share/gc/serial/tenuredGeneration.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2001, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
*
*/
-#ifndef SHARE_VM_GC_SERIAL_TENUREDGENERATION_HPP
-#define SHARE_VM_GC_SERIAL_TENUREDGENERATION_HPP
+#ifndef SHARE_GC_SERIAL_TENUREDGENERATION_HPP
+#define SHARE_GC_SERIAL_TENUREDGENERATION_HPP
#include "gc/serial/cSpaceCounters.hpp"
#include "gc/shared/cardGeneration.hpp"
@@ -121,4 +121,4 @@ class TenuredGeneration: public CardGeneration {
virtual void print_on(outputStream* st) const;
};
-#endif // SHARE_VM_GC_SERIAL_TENUREDGENERATION_HPP
+#endif // SHARE_GC_SERIAL_TENUREDGENERATION_HPP
diff --git a/src/hotspot/share/gc/serial/tenuredGeneration.inline.hpp b/src/hotspot/share/gc/serial/tenuredGeneration.inline.hpp
index 0e144820ece..9873b4ad99e 100644
--- a/src/hotspot/share/gc/serial/tenuredGeneration.inline.hpp
+++ b/src/hotspot/share/gc/serial/tenuredGeneration.inline.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2000, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
*
*/
-#ifndef SHARE_VM_GC_SERIAL_TENUREDGENERATION_INLINE_HPP
-#define SHARE_VM_GC_SERIAL_TENUREDGENERATION_INLINE_HPP
+#ifndef SHARE_GC_SERIAL_TENUREDGENERATION_INLINE_HPP
+#define SHARE_GC_SERIAL_TENUREDGENERATION_INLINE_HPP
#include "gc/serial/tenuredGeneration.hpp"
#include "gc/shared/space.inline.hpp"
@@ -61,4 +61,4 @@ void TenuredGeneration::oop_since_save_marks_iterate(OopClosureType* blk) {
save_marks();
}
-#endif // SHARE_VM_GC_SERIAL_TENUREDGENERATION_INLINE_HPP
+#endif // SHARE_GC_SERIAL_TENUREDGENERATION_INLINE_HPP
diff --git a/src/hotspot/share/gc/serial/vmStructs_serial.hpp b/src/hotspot/share/gc/serial/vmStructs_serial.hpp
index ca33d037cc8..39905458d4c 100644
--- a/src/hotspot/share/gc/serial/vmStructs_serial.hpp
+++ b/src/hotspot/share/gc/serial/vmStructs_serial.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2007, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
*
*/
-#ifndef SHARE_GC_SERIAL_VMSTRUCTS_HPP
-#define SHARE_GC_SERIAL_VMSTRUCTS_HPP
+#ifndef SHARE_GC_SERIAL_VMSTRUCTS_SERIAL_HPP
+#define SHARE_GC_SERIAL_VMSTRUCTS_SERIAL_HPP
#include "gc/serial/serialHeap.hpp"
#include "gc/serial/tenuredGeneration.hpp"
diff --git a/src/hotspot/share/gc/shared/accessBarrierSupport.hpp b/src/hotspot/share/gc/shared/accessBarrierSupport.hpp
index cbddc0fe7b9..58bc562d988 100644
--- a/src/hotspot/share/gc/shared/accessBarrierSupport.hpp
+++ b/src/hotspot/share/gc/shared/accessBarrierSupport.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
*
*/
-#ifndef SHARE_VM_GC_SHARED_ACCESSBARRIERSUPPORT_HPP
-#define SHARE_VM_GC_SHARED_ACCESSBARRIERSUPPORT_HPP
+#ifndef SHARE_GC_SHARED_ACCESSBARRIERSUPPORT_HPP
+#define SHARE_GC_SHARED_ACCESSBARRIERSUPPORT_HPP
#include "memory/allocation.hpp"
#include "oops/access.hpp"
@@ -41,4 +41,4 @@ public:
static DecoratorSet resolve_possibly_unknown_oop_ref_strength(oop base, ptrdiff_t offset);
};
-#endif // SHARE_VM_GC_SHARED_ACCESSBARRIERSUPPORT_HPP
+#endif // SHARE_GC_SHARED_ACCESSBARRIERSUPPORT_HPP
diff --git a/src/hotspot/share/gc/shared/accessBarrierSupport.inline.hpp b/src/hotspot/share/gc/shared/accessBarrierSupport.inline.hpp
index 98cc879a5ad..47e3b9de58f 100644
--- a/src/hotspot/share/gc/shared/accessBarrierSupport.inline.hpp
+++ b/src/hotspot/share/gc/shared/accessBarrierSupport.inline.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
*
*/
-#ifndef SHARE_VM_GC_SHARED_ACCESSBARRIERSUPPORT_INLINE_HPP
-#define SHARE_VM_GC_SHARED_ACCESSBARRIERSUPPORT_INLINE_HPP
+#ifndef SHARE_GC_SHARED_ACCESSBARRIERSUPPORT_INLINE_HPP
+#define SHARE_GC_SHARED_ACCESSBARRIERSUPPORT_INLINE_HPP
#include "gc/shared/accessBarrierSupport.hpp"
@@ -36,4 +36,4 @@ DecoratorSet AccessBarrierSupport::resolve_possibly_unknown_oop_ref_strength(oop
}
}
-#endif // SHARE_VM_GC_SHARED_ACCESSBARRIERSUPPORT_INLINE_HPP
+#endif // SHARE_GC_SHARED_ACCESSBARRIERSUPPORT_INLINE_HPP
diff --git a/src/hotspot/share/gc/shared/adaptiveSizePolicy.hpp b/src/hotspot/share/gc/shared/adaptiveSizePolicy.hpp
index ef1bc807ec3..4e44b6824db 100644
--- a/src/hotspot/share/gc/shared/adaptiveSizePolicy.hpp
+++ b/src/hotspot/share/gc/shared/adaptiveSizePolicy.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2004, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2004, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
*
*/
-#ifndef SHARE_VM_GC_SHARED_ADAPTIVESIZEPOLICY_HPP
-#define SHARE_VM_GC_SHARED_ADAPTIVESIZEPOLICY_HPP
+#ifndef SHARE_GC_SHARED_ADAPTIVESIZEPOLICY_HPP
+#define SHARE_GC_SHARED_ADAPTIVESIZEPOLICY_HPP
#include "gc/shared/gcCause.hpp"
#include "gc/shared/gcUtil.hpp"
@@ -473,4 +473,4 @@ class AdaptiveSizePolicy : public CHeapObj {
void print_tenuring_threshold(uint new_tenuring_threshold) const;
};
-#endif // SHARE_VM_GC_SHARED_ADAPTIVESIZEPOLICY_HPP
+#endif // SHARE_GC_SHARED_ADAPTIVESIZEPOLICY_HPP
diff --git a/src/hotspot/share/gc/shared/ageTable.hpp b/src/hotspot/share/gc/shared/ageTable.hpp
index 4d65fca5ad9..77d63f8cb81 100644
--- a/src/hotspot/share/gc/shared/ageTable.hpp
+++ b/src/hotspot/share/gc/shared/ageTable.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -22,14 +22,14 @@
*
*/
-#ifndef SHARE_VM_GC_SHARED_AGETABLE_HPP
-#define SHARE_VM_GC_SHARED_AGETABLE_HPP
+#ifndef SHARE_GC_SHARED_AGETABLE_HPP
+#define SHARE_GC_SHARED_AGETABLE_HPP
#include "oops/markOop.hpp"
#include "oops/oop.hpp"
#include "runtime/perfData.hpp"
-/* Copyright (c) 1992, 2018, Oracle and/or its affiliates, and Stanford University.
+/* Copyright (c) 1992, 2019, Oracle and/or its affiliates, and Stanford University.
See the LICENSE file for license information. */
// Age table for adaptive feedback-mediated tenuring (scavenging)
@@ -74,4 +74,4 @@ class AgeTable {
PerfVariable* _perf_sizes[table_size];
};
-#endif // SHARE_VM_GC_SHARED_AGETABLE_HPP
+#endif // SHARE_GC_SHARED_AGETABLE_HPP
diff --git a/src/hotspot/share/gc/shared/ageTable.inline.hpp b/src/hotspot/share/gc/shared/ageTable.inline.hpp
index aaa7470d927..c5a031595aa 100644
--- a/src/hotspot/share/gc/shared/ageTable.inline.hpp
+++ b/src/hotspot/share/gc/shared/ageTable.inline.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
*
*/
-#ifndef SHARE_VM_GC_SHARED_AGETABLE_INLINE_HPP
-#define SHARE_VM_GC_SHARED_AGETABLE_INLINE_HPP
+#ifndef SHARE_GC_SHARED_AGETABLE_INLINE_HPP
+#define SHARE_GC_SHARED_AGETABLE_INLINE_HPP
#include "gc/shared/ageTable.hpp"
#include "oops/oop.inline.hpp"
@@ -33,4 +33,4 @@ void AgeTable::add(oop p, size_t oop_size) {
add(p->age(), oop_size);
}
-#endif // SHARE_VM_GC_SHARED_AGETABLE_INLINE_HPP
+#endif // SHARE_GC_SHARED_AGETABLE_INLINE_HPP
diff --git a/src/hotspot/share/gc/shared/ageTableTracer.hpp b/src/hotspot/share/gc/shared/ageTableTracer.hpp
index fc21c65d363..cca3f125bfd 100644
--- a/src/hotspot/share/gc/shared/ageTableTracer.hpp
+++ b/src/hotspot/share/gc/shared/ageTableTracer.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
*
*/
-#ifndef SHARE_VM_GC_SHARED_AGETABLETRACER_HPP
-#define SHARE_VM_GC_SHARED_AGETABLETRACER_HPP
+#ifndef SHARE_GC_SHARED_AGETABLETRACER_HPP
+#define SHARE_GC_SHARED_AGETABLETRACER_HPP
#include "memory/allocation.hpp"
@@ -33,4 +33,4 @@ class AgeTableTracer : AllStatic {
static bool is_tenuring_distribution_event_enabled();
};
-#endif // SHARE_VM_GC_SHARED_AGETABLETRACER_HPP
+#endif // SHARE_GC_SHARED_AGETABLETRACER_HPP
diff --git a/src/hotspot/share/gc/shared/allocTracer.hpp b/src/hotspot/share/gc/shared/allocTracer.hpp
index 593d4538f86..ffa515826f8 100644
--- a/src/hotspot/share/gc/shared/allocTracer.hpp
+++ b/src/hotspot/share/gc/shared/allocTracer.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2013, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
*
*/
-#ifndef SHARE_VM_GC_SHARED_ALLOCTRACER_HPP
-#define SHARE_VM_GC_SHARED_ALLOCTRACER_HPP
+#ifndef SHARE_GC_SHARED_ALLOCTRACER_HPP
+#define SHARE_GC_SHARED_ALLOCTRACER_HPP
#include "memory/allocation.hpp"
#include "runtime/handles.hpp"
@@ -35,4 +35,4 @@ class AllocTracer : AllStatic {
static void send_allocation_requiring_gc_event(size_t size, uint gcId);
};
-#endif // SHARE_VM_GC_SHARED_ALLOCTRACER_HPP
+#endif // SHARE_GC_SHARED_ALLOCTRACER_HPP
diff --git a/src/hotspot/share/gc/shared/barrierSet.hpp b/src/hotspot/share/gc/shared/barrierSet.hpp
index 0d4eab6a529..48ef8258e1e 100644
--- a/src/hotspot/share/gc/shared/barrierSet.hpp
+++ b/src/hotspot/share/gc/shared/barrierSet.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2000, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
*
*/
-#ifndef SHARE_VM_GC_SHARED_BARRIERSET_HPP
-#define SHARE_VM_GC_SHARED_BARRIERSET_HPP
+#ifndef SHARE_GC_SHARED_BARRIERSET_HPP
+#define SHARE_GC_SHARED_BARRIERSET_HPP
#include "gc/shared/barrierSetConfig.hpp"
#include "memory/memRegion.hpp"
@@ -275,11 +275,7 @@ public:
template
static bool oop_arraycopy_in_heap(arrayOop src_obj, size_t src_offset_in_bytes, T* src_raw,
arrayOop dst_obj, size_t dst_offset_in_bytes, T* dst_raw,
- size_t length) {
- return Raw::oop_arraycopy(src_obj, src_offset_in_bytes, src_raw,
- dst_obj, dst_offset_in_bytes, dst_raw,
- length);
- }
+ size_t length);
// Off-heap oop accesses. These accessors get resolved when
// IN_HEAP is not set (e.g. when using the NativeAccess API), it is
@@ -325,4 +321,4 @@ inline T* barrier_set_cast(BarrierSet* bs) {
return static_cast(bs);
}
-#endif // SHARE_VM_GC_SHARED_BARRIERSET_HPP
+#endif // SHARE_GC_SHARED_BARRIERSET_HPP
diff --git a/src/hotspot/share/gc/shared/barrierSet.inline.hpp b/src/hotspot/share/gc/shared/barrierSet.inline.hpp
new file mode 100644
index 00000000000..924f3529fb4
--- /dev/null
+++ b/src/hotspot/share/gc/shared/barrierSet.inline.hpp
@@ -0,0 +1,60 @@
+/*
+ * Copyright (c) 2019, Red Hat, Inc. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+#ifndef SHARE_GC_SHARED_BARRIERSET_INLINE_HPP
+#define SHARE_GC_SHARED_BARRIERSET_INLINE_HPP
+
+#include "gc/shared/barrierSet.hpp"
+#include "oops/accessDecorators.hpp"
+#include "oops/arrayOop.hpp"
+#include "oops/compressedOops.inline.hpp"
+#include "oops/objArrayOop.inline.hpp"
+#include "oops/oop.hpp"
+
+template
+template
+inline bool BarrierSet::AccessBarrier::oop_arraycopy_in_heap(arrayOop src_obj, size_t src_offset_in_bytes, T* src_raw,
+ arrayOop dst_obj, size_t dst_offset_in_bytes, T* dst_raw,
+ size_t length) {
+ T* src = arrayOopDesc::obj_offset_to_raw(src_obj, src_offset_in_bytes, src_raw);
+ T* dst = arrayOopDesc::obj_offset_to_raw(dst_obj, dst_offset_in_bytes, dst_raw);
+
+ if (!HasDecorator::value) {
+ // Covariant, copy without checks
+ return Raw::oop_arraycopy(NULL, 0, src, NULL, 0, dst, length);
+ }
+
+ // Copy each element with checking casts
+ Klass* const dst_klass = objArrayOop(dst_obj)->element_klass();
+ for (const T* const end = src + length; src < end; src++, dst++) {
+ const T elem = *src;
+ if (!oopDesc::is_instanceof_or_null(CompressedOops::decode(elem), dst_klass)) {
+ return false;
+ }
+ *dst = elem;
+ }
+
+ return true;
+}
+
+#endif // SHARE_GC_SHARED_BARRIERSET_INLINE_HPP
diff --git a/src/hotspot/share/gc/shared/barrierSetConfig.hpp b/src/hotspot/share/gc/shared/barrierSetConfig.hpp
index dd66c39e369..8ede0fa990e 100644
--- a/src/hotspot/share/gc/shared/barrierSetConfig.hpp
+++ b/src/hotspot/share/gc/shared/barrierSetConfig.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2017, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
*
*/
-#ifndef SHARE_VM_GC_SHARED_BARRIERSETCONFIG_HPP
-#define SHARE_VM_GC_SHARED_BARRIERSETCONFIG_HPP
+#ifndef SHARE_GC_SHARED_BARRIERSETCONFIG_HPP
+#define SHARE_GC_SHARED_BARRIERSETCONFIG_HPP
#include "utilities/macros.hpp"
@@ -59,4 +59,4 @@
#define BT_BUILDTIME_DECORATORS (ACCESS_PRIMITIVE_SUPPORT | ACCESS_TO_SPACE_INVARIANT_SUPPORT)
-#endif // SHARE_VM_GC_SHARED_BARRIERSETCONFIG_HPP
+#endif // SHARE_GC_SHARED_BARRIERSETCONFIG_HPP
diff --git a/src/hotspot/share/gc/shared/barrierSetConfig.inline.hpp b/src/hotspot/share/gc/shared/barrierSetConfig.inline.hpp
index 30d4f26e3f4..27f36f1fee4 100644
--- a/src/hotspot/share/gc/shared/barrierSetConfig.inline.hpp
+++ b/src/hotspot/share/gc/shared/barrierSetConfig.inline.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2017, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
*
*/
-#ifndef SHARE_VM_GC_SHARED_BARRIERSETCONFIG_INLINE_HPP
-#define SHARE_VM_GC_SHARED_BARRIERSETCONFIG_INLINE_HPP
+#ifndef SHARE_GC_SHARED_BARRIERSETCONFIG_INLINE_HPP
+#define SHARE_GC_SHARED_BARRIERSETCONFIG_INLINE_HPP
#include "gc/shared/barrierSetConfig.hpp"
@@ -43,4 +43,4 @@
#include "gc/z/zBarrierSet.inline.hpp"
#endif
-#endif // SHARE_VM_GC_SHARED_BARRIERSETCONFIG_INLINE_HPP
+#endif // SHARE_GC_SHARED_BARRIERSETCONFIG_INLINE_HPP
diff --git a/src/hotspot/share/gc/shared/barrierSetNMethod.hpp b/src/hotspot/share/gc/shared/barrierSetNMethod.hpp
index d27a86d1045..6aca755e20f 100644
--- a/src/hotspot/share/gc/shared/barrierSetNMethod.hpp
+++ b/src/hotspot/share/gc/shared/barrierSetNMethod.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
*
*/
-#ifndef SHARE_CODE_NMETHOD_BARRIER_HPP
-#define SHARE_CODE_NMETHOD_BARRIER_HPP
+#ifndef SHARE_GC_SHARED_BARRIERSETNMETHOD_HPP
+#define SHARE_GC_SHARED_BARRIERSETNMETHOD_HPP
#include "memory/allocation.hpp"
#include "utilities/globalDefinitions.hpp"
@@ -49,4 +49,4 @@ public:
};
-#endif // SHARE_CODE_NMETHOD_BARRIER_HPP
+#endif // SHARE_GC_SHARED_BARRIERSETNMETHOD_HPP
diff --git a/src/hotspot/share/gc/shared/blockOffsetTable.hpp b/src/hotspot/share/gc/shared/blockOffsetTable.hpp
index 4fc307c8b43..9b3a1ed9dde 100644
--- a/src/hotspot/share/gc/shared/blockOffsetTable.hpp
+++ b/src/hotspot/share/gc/shared/blockOffsetTable.hpp
@@ -22,8 +22,8 @@
*
*/
-#ifndef SHARE_VM_GC_SHARED_BLOCKOFFSETTABLE_HPP
-#define SHARE_VM_GC_SHARED_BLOCKOFFSETTABLE_HPP
+#ifndef SHARE_GC_SHARED_BLOCKOFFSETTABLE_HPP
+#define SHARE_GC_SHARED_BLOCKOFFSETTABLE_HPP
#include "gc/shared/memset_with_concurrent_readers.hpp"
#include "memory/allocation.hpp"
@@ -545,4 +545,4 @@ class BlockOffsetArrayContigSpace: public BlockOffsetArray {
virtual size_t last_active_index() const;
};
-#endif // SHARE_VM_GC_SHARED_BLOCKOFFSETTABLE_HPP
+#endif // SHARE_GC_SHARED_BLOCKOFFSETTABLE_HPP
diff --git a/src/hotspot/share/gc/shared/blockOffsetTable.inline.hpp b/src/hotspot/share/gc/shared/blockOffsetTable.inline.hpp
index 4908c107d14..604df71de66 100644
--- a/src/hotspot/share/gc/shared/blockOffsetTable.inline.hpp
+++ b/src/hotspot/share/gc/shared/blockOffsetTable.inline.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2000, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
*
*/
-#ifndef SHARE_VM_GC_SHARED_BLOCKOFFSETTABLE_INLINE_HPP
-#define SHARE_VM_GC_SHARED_BLOCKOFFSETTABLE_INLINE_HPP
+#ifndef SHARE_GC_SHARED_BLOCKOFFSETTABLE_INLINE_HPP
+#define SHARE_GC_SHARED_BLOCKOFFSETTABLE_INLINE_HPP
#include "gc/shared/blockOffsetTable.hpp"
#include "gc/shared/space.hpp"
@@ -96,4 +96,4 @@ inline void BlockOffsetArrayNonContigSpace::freed(HeapWord* blk_start,
}
}
-#endif // SHARE_VM_GC_SHARED_BLOCKOFFSETTABLE_INLINE_HPP
+#endif // SHARE_GC_SHARED_BLOCKOFFSETTABLE_INLINE_HPP
diff --git a/src/hotspot/share/gc/shared/c1/barrierSetC1.cpp b/src/hotspot/share/gc/shared/c1/barrierSetC1.cpp
index 7c47549c8aa..21de5533f77 100644
--- a/src/hotspot/share/gc/shared/c1/barrierSetC1.cpp
+++ b/src/hotspot/share/gc/shared/c1/barrierSetC1.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -62,9 +62,13 @@ LIR_Opr BarrierSetC1::resolve_address(LIRAccess& access, bool resolve_in_registe
if (resolve_in_register) {
LIR_Opr resolved_addr = gen->new_pointer_register();
- __ leal(addr_opr, resolved_addr);
- resolved_addr = LIR_OprFact::address(new LIR_Address(resolved_addr, access.type()));
- return resolved_addr;
+ if (needs_patching) {
+ __ leal(addr_opr, resolved_addr, lir_patch_normal, access.patch_emit_info());
+ access.clear_decorators(C1_NEEDS_PATCHING);
+ } else {
+ __ leal(addr_opr, resolved_addr);
+ }
+ return LIR_OprFact::address(new LIR_Address(resolved_addr, access.type()));
} else {
return addr_opr;
}
diff --git a/src/hotspot/share/gc/shared/c1/barrierSetC1.hpp b/src/hotspot/share/gc/shared/c1/barrierSetC1.hpp
index 41e494cb61f..6e61ad8cb2f 100644
--- a/src/hotspot/share/gc/shared/c1/barrierSetC1.hpp
+++ b/src/hotspot/share/gc/shared/c1/barrierSetC1.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -92,17 +92,18 @@ public:
load_offset();
}
- LIRGenerator* gen() const { return _gen; }
- CodeEmitInfo*& patch_emit_info() { return _patch_emit_info; }
- CodeEmitInfo*& access_emit_info() { return _access_emit_info; }
- LIRAddressOpr& base() { return _base; }
- LIRAddressOpr& offset() { return _offset; }
- BasicType type() const { return _type; }
- LIR_Opr resolved_addr() const { return _resolved_addr; }
- void set_resolved_addr(LIR_Opr addr) { _resolved_addr = addr; }
- bool is_oop() const { return _type == T_ARRAY || _type == T_OBJECT; }
- DecoratorSet decorators() const { return _decorators; }
- bool is_raw() const { return (_decorators & AS_RAW) != 0; }
+ LIRGenerator* gen() const { return _gen; }
+ CodeEmitInfo*& patch_emit_info() { return _patch_emit_info; }
+ CodeEmitInfo*& access_emit_info() { return _access_emit_info; }
+ LIRAddressOpr& base() { return _base; }
+ LIRAddressOpr& offset() { return _offset; }
+ BasicType type() const { return _type; }
+ LIR_Opr resolved_addr() const { return _resolved_addr; }
+ void set_resolved_addr(LIR_Opr addr) { _resolved_addr = addr; }
+ bool is_oop() const { return _type == T_ARRAY || _type == T_OBJECT; }
+ DecoratorSet decorators() const { return _decorators; }
+ void clear_decorators(DecoratorSet ds) { _decorators &= ~ds; }
+ bool is_raw() const { return (_decorators & AS_RAW) != 0; }
};
// The BarrierSetC1 class is the main entry point for the GC backend of the Access API in C1.
diff --git a/src/hotspot/share/gc/shared/cardGeneration.hpp b/src/hotspot/share/gc/shared/cardGeneration.hpp
index 1b13b64fa35..9b6fc15a325 100644
--- a/src/hotspot/share/gc/shared/cardGeneration.hpp
+++ b/src/hotspot/share/gc/shared/cardGeneration.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
*
*/
-#ifndef SHARE_VM_GC_SHARED_CARDGENERATION_HPP
-#define SHARE_VM_GC_SHARED_CARDGENERATION_HPP
+#ifndef SHARE_GC_SHARED_CARDGENERATION_HPP
+#define SHARE_GC_SHARED_CARDGENERATION_HPP
// Class CardGeneration is a generation that is covered by a card table,
// and uses a card-size block-offset array to implement block_start.
@@ -96,4 +96,4 @@ class CardGeneration: public Generation {
CompactibleSpace* first_compaction_space() const;
};
-#endif // SHARE_VM_GC_SHARED_CARDGENERATION_HPP
+#endif // SHARE_GC_SHARED_CARDGENERATION_HPP
diff --git a/src/hotspot/share/gc/shared/cardGeneration.inline.hpp b/src/hotspot/share/gc/shared/cardGeneration.inline.hpp
index e24b340c630..d1885e7b0ed 100644
--- a/src/hotspot/share/gc/shared/cardGeneration.inline.hpp
+++ b/src/hotspot/share/gc/shared/cardGeneration.inline.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
*
*/
-#ifndef SHARE_VM_GC_SHARED_CARDGENERATION_INLINE_HPP
-#define SHARE_VM_GC_SHARED_CARDGENERATION_INLINE_HPP
+#ifndef SHARE_GC_SHARED_CARDGENERATION_INLINE_HPP
+#define SHARE_GC_SHARED_CARDGENERATION_INLINE_HPP
#include "gc/shared/cardGeneration.hpp"
#include "gc/shared/space.hpp"
@@ -52,4 +52,4 @@ inline CompactibleSpace* CardGeneration::first_compaction_space() const {
return space();
}
-#endif // SHARE_VM_GC_SHARED_CARDGENERATION_INLINE_HPP
+#endif // SHARE_GC_SHARED_CARDGENERATION_INLINE_HPP
diff --git a/src/hotspot/share/gc/shared/cardTable.hpp b/src/hotspot/share/gc/shared/cardTable.hpp
index 987b5940a05..e048b56aac6 100644
--- a/src/hotspot/share/gc/shared/cardTable.hpp
+++ b/src/hotspot/share/gc/shared/cardTable.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2000, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
*
*/
-#ifndef SHARE_VM_GC_SHARED_CARDTABLE_HPP
-#define SHARE_VM_GC_SHARED_CARDTABLE_HPP
+#ifndef SHARE_GC_SHARED_CARDTABLE_HPP
+#define SHARE_GC_SHARED_CARDTABLE_HPP
#include "memory/allocation.hpp"
#include "memory/memRegion.hpp"
@@ -263,4 +263,4 @@ public:
void verify_dirty_region(MemRegion mr) PRODUCT_RETURN;
};
-#endif // SHARE_VM_GC_SHARED_CARDTABLE_HPP
+#endif // SHARE_GC_SHARED_CARDTABLE_HPP
diff --git a/src/hotspot/share/gc/shared/cardTableBarrierSet.hpp b/src/hotspot/share/gc/shared/cardTableBarrierSet.hpp
index dfdbfc629b7..de22c579a73 100644
--- a/src/hotspot/share/gc/shared/cardTableBarrierSet.hpp
+++ b/src/hotspot/share/gc/shared/cardTableBarrierSet.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2000, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
*
*/
-#ifndef SHARE_VM_GC_SHARED_CARDTABLEBARRIERSET_HPP
-#define SHARE_VM_GC_SHARED_CARDTABLEBARRIERSET_HPP
+#ifndef SHARE_GC_SHARED_CARDTABLEBARRIERSET_HPP
+#define SHARE_GC_SHARED_CARDTABLEBARRIERSET_HPP
#include "gc/shared/modRefBarrierSet.hpp"
#include "utilities/align.hpp"
@@ -122,4 +122,4 @@ struct BarrierSet::GetType {
typedef ::CardTableBarrierSet type;
};
-#endif // SHARE_VM_GC_SHARED_CARDTABLEBARRIERSET_HPP
+#endif // SHARE_GC_SHARED_CARDTABLEBARRIERSET_HPP
diff --git a/src/hotspot/share/gc/shared/cardTableBarrierSet.inline.hpp b/src/hotspot/share/gc/shared/cardTableBarrierSet.inline.hpp
index b92f89399e3..8a3241d3ce6 100644
--- a/src/hotspot/share/gc/shared/cardTableBarrierSet.inline.hpp
+++ b/src/hotspot/share/gc/shared/cardTableBarrierSet.inline.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2000, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
*
*/
-#ifndef SHARE_VM_GC_SHARED_CARDTABLEBARRIERSET_INLINE_HPP
-#define SHARE_VM_GC_SHARED_CARDTABLEBARRIERSET_INLINE_HPP
+#ifndef SHARE_GC_SHARED_CARDTABLEBARRIERSET_INLINE_HPP
+#define SHARE_GC_SHARED_CARDTABLEBARRIERSET_INLINE_HPP
#include "gc/shared/cardTableBarrierSet.hpp"
#include "gc/shared/cardTable.hpp"
@@ -40,4 +40,4 @@ inline void CardTableBarrierSet::write_ref_field_post(T* field, oop newVal) {
}
}
-#endif // SHARE_VM_GC_SHARED_CARDTABLEBARRIERSET_INLINE_HPP
+#endif // SHARE_GC_SHARED_CARDTABLEBARRIERSET_INLINE_HPP
diff --git a/src/hotspot/share/gc/shared/cardTableRS.hpp b/src/hotspot/share/gc/shared/cardTableRS.hpp
index 62581b52be6..3a455a82c3d 100644
--- a/src/hotspot/share/gc/shared/cardTableRS.hpp
+++ b/src/hotspot/share/gc/shared/cardTableRS.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2001, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
*
*/
-#ifndef SHARE_VM_GC_SHARED_CARDTABLERS_HPP
-#define SHARE_VM_GC_SHARED_CARDTABLERS_HPP
+#ifndef SHARE_GC_SHARED_CARDTABLERS_HPP
+#define SHARE_GC_SHARED_CARDTABLERS_HPP
#include "gc/shared/cardTable.hpp"
#include "memory/memRegion.hpp"
@@ -214,4 +214,4 @@ public:
void do_MemRegion(MemRegion mr);
};
-#endif // SHARE_VM_GC_SHARED_CARDTABLERS_HPP
+#endif // SHARE_GC_SHARED_CARDTABLERS_HPP
diff --git a/src/hotspot/share/gc/shared/collectedHeap.cpp b/src/hotspot/share/gc/shared/collectedHeap.cpp
index cb77b7ff555..9d863842276 100644
--- a/src/hotspot/share/gc/shared/collectedHeap.cpp
+++ b/src/hotspot/share/gc/shared/collectedHeap.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2001, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -51,10 +51,6 @@
class ClassLoaderData;
-#ifdef ASSERT
-int CollectedHeap::_fire_out_of_memory_count = 0;
-#endif
-
size_t CollectedHeap::_filler_array_max_size = 0;
template <>
@@ -461,21 +457,6 @@ HeapWord* CollectedHeap::allocate_new_tlab(size_t min_size,
return NULL;
}
-oop CollectedHeap::obj_allocate(Klass* klass, int size, TRAPS) {
- ObjAllocator allocator(klass, size, THREAD);
- return allocator.allocate();
-}
-
-oop CollectedHeap::array_allocate(Klass* klass, int size, int length, bool do_zero, TRAPS) {
- ObjArrayAllocator allocator(klass, size, length, do_zero, THREAD);
- return allocator.allocate();
-}
-
-oop CollectedHeap::class_allocate(Klass* klass, int size, TRAPS) {
- ClassAllocator allocator(klass, size, THREAD);
- return allocator.allocate();
-}
-
void CollectedHeap::ensure_parsability(bool retire_tlabs) {
assert(SafepointSynchronize::is_at_safepoint() || !is_init_completed(),
"Should only be called at a safepoint or at start-up");
diff --git a/src/hotspot/share/gc/shared/collectedHeap.hpp b/src/hotspot/share/gc/shared/collectedHeap.hpp
index 7e39499eef1..faac84db4ca 100644
--- a/src/hotspot/share/gc/shared/collectedHeap.hpp
+++ b/src/hotspot/share/gc/shared/collectedHeap.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2001, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
*
*/
-#ifndef SHARE_VM_GC_SHARED_COLLECTEDHEAP_HPP
-#define SHARE_VM_GC_SHARED_COLLECTEDHEAP_HPP
+#ifndef SHARE_GC_SHARED_COLLECTEDHEAP_HPP
+#define SHARE_GC_SHARED_COLLECTEDHEAP_HPP
#include "gc/shared/gcCause.hpp"
#include "gc/shared/gcWhen.hpp"
@@ -100,10 +100,6 @@ class CollectedHeap : public CHeapObj {
friend class MemAllocator;
private:
-#ifdef ASSERT
- static int _fire_out_of_memory_count;
-#endif
-
GCHeapLog* _gc_heap_log;
MemRegion _reserved;
@@ -600,12 +596,6 @@ class CollectedHeap : public CHeapObj {
void reset_promotion_should_fail(volatile size_t* count);
void reset_promotion_should_fail();
#endif // #ifndef PRODUCT
-
-#ifdef ASSERT
- static int fired_fake_oom() {
- return (CIFireOOMAt > 1 && _fire_out_of_memory_count >= CIFireOOMAt);
- }
-#endif
};
// Class to set and reset the GC cause for a CollectedHeap.
@@ -625,4 +615,4 @@ class GCCauseSetter : StackObj {
}
};
-#endif // SHARE_VM_GC_SHARED_COLLECTEDHEAP_HPP
+#endif // SHARE_GC_SHARED_COLLECTEDHEAP_HPP
diff --git a/src/hotspot/share/gc/shared/collectedHeap.inline.hpp b/src/hotspot/share/gc/shared/collectedHeap.inline.hpp
index f34e4cf254d..2d03f7a36b4 100644
--- a/src/hotspot/share/gc/shared/collectedHeap.inline.hpp
+++ b/src/hotspot/share/gc/shared/collectedHeap.inline.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2001, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -22,10 +22,11 @@
*
*/
-#ifndef SHARE_VM_GC_SHARED_COLLECTEDHEAP_INLINE_HPP
-#define SHARE_VM_GC_SHARED_COLLECTEDHEAP_INLINE_HPP
+#ifndef SHARE_GC_SHARED_COLLECTEDHEAP_INLINE_HPP
+#define SHARE_GC_SHARED_COLLECTEDHEAP_INLINE_HPP
#include "gc/shared/collectedHeap.hpp"
+#include "gc/shared/memAllocator.hpp"
#include "oops/oop.inline.hpp"
#include "utilities/align.hpp"
@@ -66,4 +67,19 @@ inline HeapWord* CollectedHeap::align_allocation_or_fail(HeapWord* addr,
}
}
-#endif // SHARE_VM_GC_SHARED_COLLECTEDHEAP_INLINE_HPP
+inline oop CollectedHeap::obj_allocate(Klass* klass, int size, TRAPS) {
+ ObjAllocator allocator(klass, size, THREAD);
+ return allocator.allocate();
+}
+
+inline oop CollectedHeap::array_allocate(Klass* klass, int size, int length, bool do_zero, TRAPS) {
+ ObjArrayAllocator allocator(klass, size, length, do_zero, THREAD);
+ return allocator.allocate();
+}
+
+inline oop CollectedHeap::class_allocate(Klass* klass, int size, TRAPS) {
+ ClassAllocator allocator(klass, size, THREAD);
+ return allocator.allocate();
+}
+
+#endif // SHARE_GC_SHARED_COLLECTEDHEAP_INLINE_HPP
diff --git a/src/hotspot/share/gc/shared/collectorCounters.hpp b/src/hotspot/share/gc/shared/collectorCounters.hpp
index e9b272f03a9..64e59db86e4 100644
--- a/src/hotspot/share/gc/shared/collectorCounters.hpp
+++ b/src/hotspot/share/gc/shared/collectorCounters.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2002, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
*
*/
-#ifndef SHARE_VM_GC_SHARED_COLLECTORCOUNTERS_HPP
-#define SHARE_VM_GC_SHARED_COLLECTORCOUNTERS_HPP
+#ifndef SHARE_GC_SHARED_COLLECTORCOUNTERS_HPP
+#define SHARE_GC_SHARED_COLLECTORCOUNTERS_HPP
#include "runtime/perfData.hpp"
@@ -73,4 +73,4 @@ class TraceCollectorStats: public PerfTraceTimedEvent {
~TraceCollectorStats();
};
-#endif // SHARE_VM_GC_SHARED_COLLECTORCOUNTERS_HPP
+#endif // SHARE_GC_SHARED_COLLECTORCOUNTERS_HPP
diff --git a/src/hotspot/share/gc/shared/collectorPolicy.hpp b/src/hotspot/share/gc/shared/collectorPolicy.hpp
index 70efb11bec1..c8b8488090f 100644
--- a/src/hotspot/share/gc/shared/collectorPolicy.hpp
+++ b/src/hotspot/share/gc/shared/collectorPolicy.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2001, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
*
*/
-#ifndef SHARE_VM_GC_SHARED_COLLECTORPOLICY_HPP
-#define SHARE_VM_GC_SHARED_COLLECTORPOLICY_HPP
+#ifndef SHARE_GC_SHARED_COLLECTORPOLICY_HPP
+#define SHARE_GC_SHARED_COLLECTORPOLICY_HPP
#include "gc/shared/barrierSet.hpp"
#include "gc/shared/cardTableRS.hpp"
@@ -146,4 +146,4 @@ class MarkSweepPolicy : public GenCollectorPolicy {
MarkSweepPolicy() {}
};
-#endif // SHARE_VM_GC_SHARED_COLLECTORPOLICY_HPP
+#endif // SHARE_GC_SHARED_COLLECTORPOLICY_HPP
diff --git a/src/hotspot/share/gc/shared/concurrentGCPhaseManager.hpp b/src/hotspot/share/gc/shared/concurrentGCPhaseManager.hpp
index 681d972db1f..05bcf100de9 100644
--- a/src/hotspot/share/gc/shared/concurrentGCPhaseManager.hpp
+++ b/src/hotspot/share/gc/shared/concurrentGCPhaseManager.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2017, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
*
*/
-#ifndef SHARE_VM_GC_CONCURRENTGCPHASEMANAGER_HPP
-#define SHARE_VM_GC_CONCURRENTGCPHASEMANAGER_HPP
+#ifndef SHARE_GC_SHARED_CONCURRENTGCPHASEMANAGER_HPP
+#define SHARE_GC_SHARED_CONCURRENTGCPHASEMANAGER_HPP
#include "memory/allocation.hpp"
@@ -134,4 +134,4 @@ private:
bool wait_when_requested_impl() const;
};
-#endif // include guard
+#endif // SHARE_GC_SHARED_CONCURRENTGCPHASEMANAGER_HPP
diff --git a/src/hotspot/share/gc/shared/concurrentGCThread.hpp b/src/hotspot/share/gc/shared/concurrentGCThread.hpp
index 6b7b3d4298f..36d7371c7a8 100644
--- a/src/hotspot/share/gc/shared/concurrentGCThread.hpp
+++ b/src/hotspot/share/gc/shared/concurrentGCThread.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2001, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
*
*/
-#ifndef SHARE_VM_GC_SHARED_CONCURRENTGCTHREAD_HPP
-#define SHARE_VM_GC_SHARED_CONCURRENTGCTHREAD_HPP
+#ifndef SHARE_GC_SHARED_CONCURRENTGCTHREAD_HPP
+#define SHARE_GC_SHARED_CONCURRENTGCTHREAD_HPP
#include "runtime/thread.hpp"
#include "utilities/macros.hpp"
@@ -70,4 +70,4 @@ public:
bool has_terminated() { return _has_terminated; }
};
-#endif // SHARE_VM_GC_SHARED_CONCURRENTGCTHREAD_HPP
+#endif // SHARE_GC_SHARED_CONCURRENTGCTHREAD_HPP
diff --git a/src/hotspot/share/gc/shared/copyFailedInfo.hpp b/src/hotspot/share/gc/shared/copyFailedInfo.hpp
index 2b0854789b6..21ee95531bc 100644
--- a/src/hotspot/share/gc/shared/copyFailedInfo.hpp
+++ b/src/hotspot/share/gc/shared/copyFailedInfo.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
*
*/
-#ifndef SHARE_VM_GC_SHARED_COPYFAILEDINFO_HPP
-#define SHARE_VM_GC_SHARED_COPYFAILEDINFO_HPP
+#ifndef SHARE_GC_SHARED_COPYFAILEDINFO_HPP
+#define SHARE_GC_SHARED_COPYFAILEDINFO_HPP
#include "jfr/support/jfrThreadId.hpp"
#include "runtime/thread.hpp"
@@ -90,4 +90,4 @@ class PromotionFailedInfo : public CopyFailedInfo {
class EvacuationFailedInfo : public CopyFailedInfo {};
-#endif // SHARE_VM_GC_SHARED_COPYFAILEDINFO_HPP
+#endif // SHARE_GC_SHARED_COPYFAILEDINFO_HPP
diff --git a/src/hotspot/share/gc/shared/gcBehaviours.hpp b/src/hotspot/share/gc/shared/gcBehaviours.hpp
index 82bc7f6ce0a..e765faf825d 100644
--- a/src/hotspot/share/gc/shared/gcBehaviours.hpp
+++ b/src/hotspot/share/gc/shared/gcBehaviours.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
*
*/
-#ifndef SHARE_GC_SHARED_BEHAVIOURS_HPP
-#define SHARE_GC_SHARED_BEHAVIOURS_HPP
+#ifndef SHARE_GC_SHARED_GCBEHAVIOURS_HPP
+#define SHARE_GC_SHARED_GCBEHAVIOURS_HPP
#include "memory/iterator.hpp"
#include "oops/oopsHierarchy.hpp"
@@ -50,4 +50,4 @@ public:
virtual bool is_unloading(CompiledMethod* cm) const;
};
-#endif // SHARE_GC_SHARED_BEHAVIOURS_HPP
+#endif // SHARE_GC_SHARED_GCBEHAVIOURS_HPP
diff --git a/src/hotspot/share/gc/shared/gcCause.hpp b/src/hotspot/share/gc/shared/gcCause.hpp
index e3da356f82f..c788e4ca165 100644
--- a/src/hotspot/share/gc/shared/gcCause.hpp
+++ b/src/hotspot/share/gc/shared/gcCause.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2002, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
*
*/
-#ifndef SHARE_VM_GC_SHARED_GCCAUSE_HPP
-#define SHARE_VM_GC_SHARED_GCCAUSE_HPP
+#ifndef SHARE_GC_SHARED_GCCAUSE_HPP
+#define SHARE_GC_SHARED_GCCAUSE_HPP
#include "memory/allocation.hpp"
@@ -137,4 +137,4 @@ class GCCause : public AllStatic {
static const char* to_string(GCCause::Cause cause);
};
-#endif // SHARE_VM_GC_SHARED_GCCAUSE_HPP
+#endif // SHARE_GC_SHARED_GCCAUSE_HPP
diff --git a/src/hotspot/share/gc/shared/gcConfiguration.hpp b/src/hotspot/share/gc/shared/gcConfiguration.hpp
index 3360eeac2ce..b698f44b426 100644
--- a/src/hotspot/share/gc/shared/gcConfiguration.hpp
+++ b/src/hotspot/share/gc/shared/gcConfiguration.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
*
*/
-#ifndef SHARE_VM_GC_SHARED_GCCONFIGURATION_HPP
-#define SHARE_VM_GC_SHARED_GCCONFIGURATION_HPP
+#ifndef SHARE_GC_SHARED_GCCONFIGURATION_HPP
+#define SHARE_GC_SHARED_GCCONFIGURATION_HPP
#include "gc/shared/gcName.hpp"
#include "memory/universe.hpp"
@@ -77,4 +77,4 @@ class GCYoungGenerationConfiguration {
intx new_ratio() const;
};
-#endif // SHARE_VM_GC_SHARED_GCCONFIGURATION_HPP
+#endif // SHARE_GC_SHARED_GCCONFIGURATION_HPP
diff --git a/src/hotspot/share/gc/shared/gcHeapSummary.hpp b/src/hotspot/share/gc/shared/gcHeapSummary.hpp
index ec575339134..63f55eee2da 100644
--- a/src/hotspot/share/gc/shared/gcHeapSummary.hpp
+++ b/src/hotspot/share/gc/shared/gcHeapSummary.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
*
*/
-#ifndef SHARE_VM_GC_SHARED_GCHEAPSUMMARY_HPP
-#define SHARE_VM_GC_SHARED_GCHEAPSUMMARY_HPP
+#ifndef SHARE_GC_SHARED_GCHEAPSUMMARY_HPP
+#define SHARE_GC_SHARED_GCHEAPSUMMARY_HPP
#include "memory/allocation.hpp"
#include "memory/metaspaceChunkFreeListSummary.hpp"
@@ -231,4 +231,4 @@ public:
size_t failure_waste() const { return _failure_waste; }
};
-#endif // SHARE_VM_GC_SHARED_GCHEAPSUMMARY_HPP
+#endif // SHARE_GC_SHARED_GCHEAPSUMMARY_HPP
diff --git a/src/hotspot/share/gc/shared/gcId.hpp b/src/hotspot/share/gc/shared/gcId.hpp
index 648fae834e7..b5a0ccfb88e 100644
--- a/src/hotspot/share/gc/shared/gcId.hpp
+++ b/src/hotspot/share/gc/shared/gcId.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2014, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
*
*/
-#ifndef SHARE_VM_GC_SHARED_GCID_HPP
-#define SHARE_VM_GC_SHARED_GCID_HPP
+#ifndef SHARE_GC_SHARED_GCID_HPP
+#define SHARE_GC_SHARED_GCID_HPP
#include "memory/allocation.hpp"
@@ -56,4 +56,4 @@ public:
~GCIdMark();
};
-#endif // SHARE_VM_GC_SHARED_GCID_HPP
+#endif // SHARE_GC_SHARED_GCID_HPP
diff --git a/src/hotspot/share/gc/shared/gcLocker.hpp b/src/hotspot/share/gc/shared/gcLocker.hpp
index 578c2d35970..51989ff5ea8 100644
--- a/src/hotspot/share/gc/shared/gcLocker.hpp
+++ b/src/hotspot/share/gc/shared/gcLocker.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
*
*/
-#ifndef SHARE_VM_GC_SHARED_GCLOCKER_HPP
-#define SHARE_VM_GC_SHARED_GCLOCKER_HPP
+#ifndef SHARE_GC_SHARED_GCLOCKER_HPP
+#define SHARE_GC_SHARED_GCLOCKER_HPP
#include "memory/allocation.hpp"
#include "utilities/globalDefinitions.hpp"
@@ -145,4 +145,4 @@ class GCLocker: public AllStatic {
static address needs_gc_address() { return (address) &_needs_gc; }
};
-#endif // SHARE_VM_GC_SHARED_GCLOCKER_HPP
+#endif // SHARE_GC_SHARED_GCLOCKER_HPP
diff --git a/src/hotspot/share/gc/shared/gcLocker.inline.hpp b/src/hotspot/share/gc/shared/gcLocker.inline.hpp
index b6d8e16337f..b4d98957a51 100644
--- a/src/hotspot/share/gc/shared/gcLocker.inline.hpp
+++ b/src/hotspot/share/gc/shared/gcLocker.inline.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2000, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
*
*/
-#ifndef SHARE_VM_GC_SHARED_GCLOCKER_INLINE_HPP
-#define SHARE_VM_GC_SHARED_GCLOCKER_INLINE_HPP
+#ifndef SHARE_GC_SHARED_GCLOCKER_INLINE_HPP
+#define SHARE_GC_SHARED_GCLOCKER_INLINE_HPP
#include "gc/shared/gcLocker.hpp"
#include "runtime/thread.hpp"
@@ -54,4 +54,4 @@ void GCLocker::unlock_critical(JavaThread* thread) {
thread->exit_critical();
}
-#endif // SHARE_VM_GC_SHARED_GCLOCKER_INLINE_HPP
+#endif // SHARE_GC_SHARED_GCLOCKER_INLINE_HPP
diff --git a/src/hotspot/share/gc/shared/gcName.hpp b/src/hotspot/share/gc/shared/gcName.hpp
index 0fe1b5ce604..c88fbafe841 100644
--- a/src/hotspot/share/gc/shared/gcName.hpp
+++ b/src/hotspot/share/gc/shared/gcName.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2002, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
*
*/
-#ifndef SHARE_VM_GC_SHARED_GCNAME_HPP
-#define SHARE_VM_GC_SHARED_GCNAME_HPP
+#ifndef SHARE_GC_SHARED_GCNAME_HPP
+#define SHARE_GC_SHARED_GCNAME_HPP
#include "utilities/debug.hpp"
@@ -66,4 +66,4 @@ class GCNameHelper {
}
};
-#endif // SHARE_VM_GC_SHARED_GCNAME_HPP
+#endif // SHARE_GC_SHARED_GCNAME_HPP
diff --git a/src/hotspot/share/gc/shared/gcPolicyCounters.hpp b/src/hotspot/share/gc/shared/gcPolicyCounters.hpp
index 5345dca4abe..a5b8986249d 100644
--- a/src/hotspot/share/gc/shared/gcPolicyCounters.hpp
+++ b/src/hotspot/share/gc/shared/gcPolicyCounters.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2002, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
*
*/
-#ifndef SHARE_VM_GC_SHARED_GCPOLICYCOUNTERS_HPP
-#define SHARE_VM_GC_SHARED_GCPOLICYCOUNTERS_HPP
+#ifndef SHARE_GC_SHARED_GCPOLICYCOUNTERS_HPP
+#define SHARE_GC_SHARED_GCPOLICYCOUNTERS_HPP
#include "runtime/perfData.hpp"
@@ -33,46 +33,42 @@
class GCPolicyCounters: public CHeapObj {
friend class VMStructs;
- private:
+ // Constant PerfData types don't need to retain a reference.
+ // However, it's a good idea to document them here.
+ // PerfStringConstant* _name;
+ // PerfStringConstant* _collector_size;
+ // PerfStringConstant* _generation_size;
- // Constant PerfData types don't need to retain a reference.
- // However, it's a good idea to document them here.
- // PerfStringConstant* _name;
- // PerfStringConstant* _collector_size;
- // PerfStringConstant* _generation_size;
+ PerfVariable* _tenuring_threshold;
+ PerfVariable* _desired_survivor_size;
- PerfVariable* _tenuring_threshold;
- PerfVariable* _desired_survivor_size;
-
- const char* _name_space;
-
- public:
+ const char* _name_space;
+public:
enum Name {
NONE,
GCPolicyCountersKind,
GCAdaptivePolicyCountersKind,
- PSGCAdaptivePolicyCountersKind,
- CMSGCAdaptivePolicyCountersKind
+ PSGCAdaptivePolicyCountersKind
};
GCPolicyCounters(const char* name, int collectors, int generations);
- inline PerfVariable* tenuring_threshold() const {
- return _tenuring_threshold;
- }
+ inline PerfVariable* tenuring_threshold() const {
+ return _tenuring_threshold;
+ }
- inline PerfVariable* desired_survivor_size() const {
- return _desired_survivor_size;
- }
+ inline PerfVariable* desired_survivor_size() const {
+ return _desired_survivor_size;
+ }
- const char* name_space() const { return _name_space; }
+ const char* name_space() const { return _name_space; }
- virtual void update_counters() {}
+ virtual void update_counters() {}
- virtual GCPolicyCounters::Name kind() const {
- return GCPolicyCounters::GCPolicyCountersKind;
- }
+ virtual GCPolicyCounters::Name kind() const {
+ return GCPolicyCounters::GCPolicyCountersKind;
+ }
};
-#endif // SHARE_VM_GC_SHARED_GCPOLICYCOUNTERS_HPP
+#endif // SHARE_GC_SHARED_GCPOLICYCOUNTERS_HPP
diff --git a/src/hotspot/share/gc/shared/gcStats.hpp b/src/hotspot/share/gc/shared/gcStats.hpp
index 17a457679ee..040ff54203c 100644
--- a/src/hotspot/share/gc/shared/gcStats.hpp
+++ b/src/hotspot/share/gc/shared/gcStats.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2003, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
*
*/
-#ifndef SHARE_VM_GC_SHARED_GCSTATS_HPP
-#define SHARE_VM_GC_SHARED_GCSTATS_HPP
+#ifndef SHARE_GC_SHARED_GCSTATS_HPP
+#define SHARE_GC_SHARED_GCSTATS_HPP
#include "gc/shared/gcUtil.hpp"
@@ -58,4 +58,4 @@ class GCStats : public CHeapObj {
}
};
-#endif // SHARE_VM_GC_SHARED_GCSTATS_HPP
+#endif // SHARE_GC_SHARED_GCSTATS_HPP
diff --git a/src/hotspot/share/gc/shared/gcTimer.hpp b/src/hotspot/share/gc/shared/gcTimer.hpp
index 30507edfe34..3c7e6cb3c20 100644
--- a/src/hotspot/share/gc/shared/gcTimer.hpp
+++ b/src/hotspot/share/gc/shared/gcTimer.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
*
*/
-#ifndef SHARE_VM_GC_SHARED_GCTIMER_HPP
-#define SHARE_VM_GC_SHARED_GCTIMER_HPP
+#ifndef SHARE_GC_SHARED_GCTIMER_HPP
+#define SHARE_GC_SHARED_GCTIMER_HPP
#include "memory/allocation.hpp"
#include "utilities/macros.hpp"
@@ -183,4 +183,4 @@ class TimePartitionPhasesIterator {
virtual GCPhase* next();
};
-#endif // SHARE_VM_GC_SHARED_GCTIMER_HPP
+#endif // SHARE_GC_SHARED_GCTIMER_HPP
diff --git a/src/hotspot/share/gc/shared/gcTrace.cpp b/src/hotspot/share/gc/shared/gcTrace.cpp
index eea530760b7..9eb90c81a20 100644
--- a/src/hotspot/share/gc/shared/gcTrace.cpp
+++ b/src/hotspot/share/gc/shared/gcTrace.cpp
@@ -37,7 +37,7 @@
#include "utilities/macros.hpp"
#include "utilities/ticks.hpp"
#if INCLUDE_G1GC
-#include "gc/g1/evacuationInfo.hpp"
+#include "gc/g1/g1EvacuationInfo.hpp"
#endif
void GCTracer::report_gc_start_impl(GCCause::Cause cause, const Ticks& timestamp) {
@@ -200,7 +200,7 @@ void G1NewTracer::report_gc_end_impl(const Ticks& timestamp, TimePartitions* tim
send_g1_young_gc_event();
}
-void G1NewTracer::report_evacuation_info(EvacuationInfo* info) {
+void G1NewTracer::report_evacuation_info(G1EvacuationInfo* info) {
send_evacuation_info_event(info);
}
diff --git a/src/hotspot/share/gc/shared/gcTrace.hpp b/src/hotspot/share/gc/shared/gcTrace.hpp
index 54c61626f75..1747c7758ec 100644
--- a/src/hotspot/share/gc/shared/gcTrace.hpp
+++ b/src/hotspot/share/gc/shared/gcTrace.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
*
*/
-#ifndef SHARE_VM_GC_SHARED_GCTRACE_HPP
-#define SHARE_VM_GC_SHARED_GCTRACE_HPP
+#ifndef SHARE_GC_SHARED_GCTRACE_HPP
+#define SHARE_GC_SHARED_GCTRACE_HPP
#include "gc/shared/copyFailedInfo.hpp"
#include "gc/shared/gcCause.hpp"
@@ -38,7 +38,7 @@
#include "gc/g1/g1YCTypes.hpp"
#endif
-class EvacuationInfo;
+class G1EvacuationInfo;
class GCHeapSummary;
class MetaspaceChunkFreeListSummary;
class MetaspaceSummary;
@@ -248,7 +248,7 @@ class G1NewTracer : public YoungGCTracer {
void report_yc_type(G1YCType type);
void report_gc_end_impl(const Ticks& timestamp, TimePartitions* time_partitions);
- void report_evacuation_info(EvacuationInfo* info);
+ void report_evacuation_info(G1EvacuationInfo* info);
void report_evacuation_failed(EvacuationFailedInfo& ef_info);
void report_evacuation_statistics(const G1EvacSummary& young_summary, const G1EvacSummary& old_summary) const;
@@ -268,7 +268,7 @@ class G1NewTracer : public YoungGCTracer {
bool prediction_active);
private:
void send_g1_young_gc_event();
- void send_evacuation_info_event(EvacuationInfo* info);
+ void send_evacuation_info_event(G1EvacuationInfo* info);
void send_evacuation_failed_event(const EvacuationFailedInfo& ef_info) const;
void send_young_evacuation_statistics(const G1EvacSummary& summary) const;
@@ -309,4 +309,4 @@ class G1OldTracer : public OldGCTracer {
void set_gc_cause(GCCause::Cause cause);
};
-#endif // SHARE_VM_GC_SHARED_GCTRACE_HPP
+#endif // SHARE_GC_SHARED_GCTRACE_HPP
diff --git a/src/hotspot/share/gc/shared/gcTraceSend.cpp b/src/hotspot/share/gc/shared/gcTraceSend.cpp
index 191d6bf89fe..9ab5b177c07 100644
--- a/src/hotspot/share/gc/shared/gcTraceSend.cpp
+++ b/src/hotspot/share/gc/shared/gcTraceSend.cpp
@@ -32,7 +32,7 @@
#include "runtime/os.hpp"
#include "utilities/macros.hpp"
#if INCLUDE_G1GC
-#include "gc/g1/evacuationInfo.hpp"
+#include "gc/g1/g1EvacuationInfo.hpp"
#include "gc/g1/g1YCTypes.hpp"
#endif
@@ -209,7 +209,7 @@ void G1MMUTracer::send_g1_mmu_event(double time_slice_ms, double gc_time_ms, dou
}
}
-void G1NewTracer::send_evacuation_info_event(EvacuationInfo* info) {
+void G1NewTracer::send_evacuation_info_event(G1EvacuationInfo* info) {
EventEvacuationInformation e;
if (e.should_commit()) {
e.set_gcId(GCId::current());
diff --git a/src/hotspot/share/gc/shared/gcTraceTime.hpp b/src/hotspot/share/gc/shared/gcTraceTime.hpp
index b6692df9a20..1a59b351281 100644
--- a/src/hotspot/share/gc/shared/gcTraceTime.hpp
+++ b/src/hotspot/share/gc/shared/gcTraceTime.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
*
*/
-#ifndef SHARE_VM_GC_SHARED_GCTRACETIME_HPP
-#define SHARE_VM_GC_SHARED_GCTRACETIME_HPP
+#ifndef SHARE_GC_SHARED_GCTRACETIME_HPP
+#define SHARE_GC_SHARED_GCTRACETIME_HPP
#include "logging/log.hpp"
#include "logging/logHandle.hpp"
@@ -86,4 +86,4 @@ class GCTraceConcTimeImpl : public StackObj {
jlong start_time() { return _start_time; }
};
-#endif // SHARE_VM_GC_SHARED_GCTRACETIME_HPP
+#endif // SHARE_GC_SHARED_GCTRACETIME_HPP
diff --git a/src/hotspot/share/gc/shared/gcTraceTime.inline.hpp b/src/hotspot/share/gc/shared/gcTraceTime.inline.hpp
index 20253208d80..cc92abc462e 100644
--- a/src/hotspot/share/gc/shared/gcTraceTime.inline.hpp
+++ b/src/hotspot/share/gc/shared/gcTraceTime.inline.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
*
*/
-#ifndef SHARE_VM_GC_SHARED_GCTRACETIME_INLINE_HPP
-#define SHARE_VM_GC_SHARED_GCTRACETIME_INLINE_HPP
+#ifndef SHARE_GC_SHARED_GCTRACETIME_INLINE_HPP
+#define SHARE_GC_SHARED_GCTRACETIME_INLINE_HPP
#include "gc/shared/collectedHeap.hpp"
#include "gc/shared/gcTimer.hpp"
@@ -158,4 +158,4 @@ GCTraceTimeImplWrapper::~GCTraceTimeImplWra
#define GCTraceTime(Level, ...) GCTraceTimeImplWrapper
#define GCTraceConcTime(Level, ...) GCTraceConcTimeImpl
-#endif // SHARE_VM_GC_SHARED_GCTRACETIME_INLINE_HPP
+#endif // SHARE_GC_SHARED_GCTRACETIME_INLINE_HPP
diff --git a/src/hotspot/share/gc/shared/gcUtil.hpp b/src/hotspot/share/gc/shared/gcUtil.hpp
index 38e29cc58a0..ea7773b655b 100644
--- a/src/hotspot/share/gc/shared/gcUtil.hpp
+++ b/src/hotspot/share/gc/shared/gcUtil.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2002, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
*
*/
-#ifndef SHARE_VM_GC_SHARED_GCUTIL_HPP
-#define SHARE_VM_GC_SHARED_GCUTIL_HPP
+#ifndef SHARE_GC_SHARED_GCUTIL_HPP
+#define SHARE_GC_SHARED_GCUTIL_HPP
#include "memory/allocation.hpp"
#include "runtime/timer.hpp"
@@ -216,4 +216,4 @@ class LinearLeastSquareFit : public CHeapObj {
bool increment_will_decrease();
};
-#endif // SHARE_VM_GC_SHARED_GCUTIL_HPP
+#endif // SHARE_GC_SHARED_GCUTIL_HPP
diff --git a/src/hotspot/share/gc/shared/gcUtil.inline.hpp b/src/hotspot/share/gc/shared/gcUtil.inline.hpp
index f03480becde..99a799426a2 100644
--- a/src/hotspot/share/gc/shared/gcUtil.inline.hpp
+++ b/src/hotspot/share/gc/shared/gcUtil.inline.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2002, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
*
*/
-#ifndef SHARE_VM_GC_SHARED_GCUTIL_INLINE_HPP
-#define SHARE_VM_GC_SHARED_GCUTIL_INLINE_HPP
+#ifndef SHARE_GC_SHARED_GCUTIL_INLINE_HPP
+#define SHARE_GC_SHARED_GCUTIL_INLINE_HPP
#include "gc/shared/gcUtil.hpp"
#include "memory/allocation.inline.hpp"
@@ -32,4 +32,4 @@ inline void* AdaptivePaddedAverage::operator new(size_t size) throw() {
return CHeapObj::operator new(size);
}
-#endif // SHARE_VM_GC_SHARED_GCUTIL_INLINE_HPP
+#endif // SHARE_GC_SHARED_GCUTIL_INLINE_HPP
diff --git a/src/hotspot/share/gc/shared/gcVMOperations.hpp b/src/hotspot/share/gc/shared/gcVMOperations.hpp
index 070c238ae05..f7658fe06b3 100644
--- a/src/hotspot/share/gc/shared/gcVMOperations.hpp
+++ b/src/hotspot/share/gc/shared/gcVMOperations.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2005, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
*
*/
-#ifndef SHARE_VM_GC_SHARED_GCVMOPERATIONS_HPP
-#define SHARE_VM_GC_SHARED_GCVMOPERATIONS_HPP
+#ifndef SHARE_GC_SHARED_GCVMOPERATIONS_HPP
+#define SHARE_GC_SHARED_GCVMOPERATIONS_HPP
#include "gc/shared/collectedHeap.hpp"
#include "gc/shared/genCollectedHeap.hpp"
@@ -238,4 +238,4 @@ class SvcGCMarker : public StackObj {
}
};
-#endif // SHARE_VM_GC_SHARED_GCVMOPERATIONS_HPP
+#endif // SHARE_GC_SHARED_GCVMOPERATIONS_HPP
diff --git a/src/hotspot/share/gc/shared/gcWhen.hpp b/src/hotspot/share/gc/shared/gcWhen.hpp
index 84fbcac8da1..ff489226f65 100644
--- a/src/hotspot/share/gc/shared/gcWhen.hpp
+++ b/src/hotspot/share/gc/shared/gcWhen.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
*
*/
-#ifndef SHARE_VM_GC_SHARED_GCWHEN_HPP
-#define SHARE_VM_GC_SHARED_GCWHEN_HPP
+#ifndef SHARE_GC_SHARED_GCWHEN_HPP
+#define SHARE_GC_SHARED_GCWHEN_HPP
#include "memory/allocation.hpp"
#include "utilities/debug.hpp"
@@ -45,4 +45,4 @@ class GCWhen : AllStatic {
}
};
-#endif // SHARE_VM_GC_SHARED_GCWHEN_HPP
+#endif // SHARE_GC_SHARED_GCWHEN_HPP
diff --git a/src/hotspot/share/gc/shared/genCollectedHeap.hpp b/src/hotspot/share/gc/shared/genCollectedHeap.hpp
index b566b984d05..7b2e466e415 100644
--- a/src/hotspot/share/gc/shared/genCollectedHeap.hpp
+++ b/src/hotspot/share/gc/shared/genCollectedHeap.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2000, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
*
*/
-#ifndef SHARE_VM_GC_SHARED_GENCOLLECTEDHEAP_HPP
-#define SHARE_VM_GC_SHARED_GENCOLLECTEDHEAP_HPP
+#ifndef SHARE_GC_SHARED_GENCOLLECTEDHEAP_HPP
+#define SHARE_GC_SHARED_GENCOLLECTEDHEAP_HPP
#include "gc/shared/collectedHeap.hpp"
#include "gc/shared/collectorPolicy.hpp"
@@ -505,4 +505,4 @@ private:
void record_gen_tops_before_GC() PRODUCT_RETURN;
};
-#endif // SHARE_VM_GC_SHARED_GENCOLLECTEDHEAP_HPP
+#endif // SHARE_GC_SHARED_GENCOLLECTEDHEAP_HPP
diff --git a/src/hotspot/share/gc/shared/genMemoryPools.hpp b/src/hotspot/share/gc/shared/genMemoryPools.hpp
index 93ee91bf959..27ee5c97822 100644
--- a/src/hotspot/share/gc/shared/genMemoryPools.hpp
+++ b/src/hotspot/share/gc/shared/genMemoryPools.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
*
*/
-#ifndef SHARE_VM_GC_SHARED_GENMEMORYPOOLS_HPP
-#define SHARE_VM_GC_SHARED_GENMEMORYPOOLS_HPP
+#ifndef SHARE_GC_SHARED_GENMEMORYPOOLS_HPP
+#define SHARE_GC_SHARED_GENMEMORYPOOLS_HPP
#include "services/memoryPool.hpp"
@@ -72,4 +72,4 @@ public:
size_t used_in_bytes();
};
-#endif // SHARE_VM_GC_SHARED_GENMEMORYPOOLS_HPP
+#endif // SHARE_GC_SHARED_GENMEMORYPOOLS_HPP
diff --git a/src/hotspot/share/gc/shared/genOopClosures.hpp b/src/hotspot/share/gc/shared/genOopClosures.hpp
index 4a740e3d1ca..df0b7af6971 100644
--- a/src/hotspot/share/gc/shared/genOopClosures.hpp
+++ b/src/hotspot/share/gc/shared/genOopClosures.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2001, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
*
*/
-#ifndef SHARE_VM_GC_SHARED_GENOOPCLOSURES_HPP
-#define SHARE_VM_GC_SHARED_GENOOPCLOSURES_HPP
+#ifndef SHARE_GC_SHARED_GENOOPCLOSURES_HPP
+#define SHARE_GC_SHARED_GENOOPCLOSURES_HPP
#include "memory/iterator.hpp"
#include "oops/oop.hpp"
@@ -188,4 +188,4 @@ class ScanWeakRefClosure: public OopClosure {
#endif // INCLUDE_SERIALGC
-#endif // SHARE_VM_GC_SHARED_GENOOPCLOSURES_HPP
+#endif // SHARE_GC_SHARED_GENOOPCLOSURES_HPP
diff --git a/src/hotspot/share/gc/shared/genOopClosures.inline.hpp b/src/hotspot/share/gc/shared/genOopClosures.inline.hpp
index a787a69f9a3..14e1e74095c 100644
--- a/src/hotspot/share/gc/shared/genOopClosures.inline.hpp
+++ b/src/hotspot/share/gc/shared/genOopClosures.inline.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2001, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
*
*/
-#ifndef SHARE_VM_GC_SHARED_GENOOPCLOSURES_INLINE_HPP
-#define SHARE_VM_GC_SHARED_GENOOPCLOSURES_INLINE_HPP
+#ifndef SHARE_GC_SHARED_GENOOPCLOSURES_INLINE_HPP
+#define SHARE_GC_SHARED_GENOOPCLOSURES_INLINE_HPP
#include "gc/shared/cardTableRS.hpp"
#include "gc/shared/genCollectedHeap.hpp"
@@ -171,4 +171,4 @@ inline void ScanWeakRefClosure::do_oop(narrowOop* p) { ScanWeakRefClosure::do_oo
#endif // INCLUDE_SERIALGC
-#endif // SHARE_VM_GC_SHARED_GENOOPCLOSURES_INLINE_HPP
+#endif // SHARE_GC_SHARED_GENOOPCLOSURES_INLINE_HPP
diff --git a/src/hotspot/share/gc/shared/generation.hpp b/src/hotspot/share/gc/shared/generation.hpp
index c71b22806d1..7f495252eee 100644
--- a/src/hotspot/share/gc/shared/generation.hpp
+++ b/src/hotspot/share/gc/shared/generation.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
*
*/
-#ifndef SHARE_VM_GC_SHARED_GENERATION_HPP
-#define SHARE_VM_GC_SHARED_GENERATION_HPP
+#ifndef SHARE_GC_SHARED_GENERATION_HPP
+#define SHARE_GC_SHARED_GENERATION_HPP
#include "gc/shared/collectorCounters.hpp"
#include "gc/shared/referenceProcessor.hpp"
@@ -553,4 +553,4 @@ public:
};
-#endif // SHARE_VM_GC_SHARED_GENERATION_HPP
+#endif // SHARE_GC_SHARED_GENERATION_HPP
diff --git a/src/hotspot/share/gc/shared/generationCounters.hpp b/src/hotspot/share/gc/shared/generationCounters.hpp
index dbe4a647cc6..9f3db78af33 100644
--- a/src/hotspot/share/gc/shared/generationCounters.hpp
+++ b/src/hotspot/share/gc/shared/generationCounters.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2002, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
*
*/
-#ifndef SHARE_VM_GC_SHARED_GENERATIONCOUNTERS_HPP
-#define SHARE_VM_GC_SHARED_GENERATIONCOUNTERS_HPP
+#ifndef SHARE_GC_SHARED_GENERATIONCOUNTERS_HPP
+#define SHARE_GC_SHARED_GENERATIONCOUNTERS_HPP
#include "memory/virtualspace.hpp"
#include "runtime/perfData.hpp"
@@ -75,4 +75,4 @@ private:
const char* name_space() const { return _name_space; }
};
-#endif // SHARE_VM_GC_SHARED_GENERATIONCOUNTERS_HPP
+#endif // SHARE_GC_SHARED_GENERATIONCOUNTERS_HPP
diff --git a/src/hotspot/share/gc/shared/generationSpec.hpp b/src/hotspot/share/gc/shared/generationSpec.hpp
index d3584538702..8c657c05eca 100644
--- a/src/hotspot/share/gc/shared/generationSpec.hpp
+++ b/src/hotspot/share/gc/shared/generationSpec.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2001, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
*
*/
-#ifndef SHARE_VM_GC_SHARED_GENERATIONSPEC_HPP
-#define SHARE_VM_GC_SHARED_GENERATIONSPEC_HPP
+#ifndef SHARE_GC_SHARED_GENERATIONSPEC_HPP
+#define SHARE_GC_SHARED_GENERATIONSPEC_HPP
#include "gc/shared/generation.hpp"
#include "utilities/align.hpp"
@@ -58,4 +58,4 @@ public:
typedef GenerationSpec* GenerationSpecPtr;
-#endif // SHARE_VM_GC_SHARED_GENERATIONSPEC_HPP
+#endif // SHARE_GC_SHARED_GENERATIONSPEC_HPP
diff --git a/src/hotspot/share/gc/shared/hSpaceCounters.hpp b/src/hotspot/share/gc/shared/hSpaceCounters.hpp
index 36873fd8f70..63aabf1479b 100644
--- a/src/hotspot/share/gc/shared/hSpaceCounters.hpp
+++ b/src/hotspot/share/gc/shared/hSpaceCounters.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2011, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
*
*/
-#ifndef SHARE_VM_GC_SHARED_HSPACECOUNTERS_HPP
-#define SHARE_VM_GC_SHARED_HSPACECOUNTERS_HPP
+#ifndef SHARE_GC_SHARED_HSPACECOUNTERS_HPP
+#define SHARE_GC_SHARED_HSPACECOUNTERS_HPP
#include "memory/allocation.hpp"
#include "runtime/perfData.hpp"
@@ -65,4 +65,4 @@ class HSpaceCounters: public CHeapObj {
const char* name_space() const { return _name_space; }
};
-#endif // SHARE_VM_GC_SHARED_HSPACECOUNTERS_HPP
+#endif // SHARE_GC_SHARED_HSPACECOUNTERS_HPP
diff --git a/src/hotspot/share/gc/shared/isGCActiveMark.hpp b/src/hotspot/share/gc/shared/isGCActiveMark.hpp
index f358b04c6a8..192d7ab7e2c 100644
--- a/src/hotspot/share/gc/shared/isGCActiveMark.hpp
+++ b/src/hotspot/share/gc/shared/isGCActiveMark.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2002, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
*
*/
-#ifndef SHARE_VM_GC_SHARED_ISGCACTIVEMARK_HPP
-#define SHARE_VM_GC_SHARED_ISGCACTIVEMARK_HPP
+#ifndef SHARE_GC_SHARED_ISGCACTIVEMARK_HPP
+#define SHARE_GC_SHARED_ISGCACTIVEMARK_HPP
#include "gc/shared/collectedHeap.hpp"
#include "memory/allocation.hpp"
@@ -48,4 +48,4 @@ class IsGCActiveMark : public StackObj {
}
};
-#endif // SHARE_VM_GC_SHARED_ISGCACTIVEMARK_HPP
+#endif // SHARE_GC_SHARED_ISGCACTIVEMARK_HPP
diff --git a/src/hotspot/share/gc/shared/jvmFlagConstraintsGC.hpp b/src/hotspot/share/gc/shared/jvmFlagConstraintsGC.hpp
index 8969bfaa20b..e89499977db 100644
--- a/src/hotspot/share/gc/shared/jvmFlagConstraintsGC.hpp
+++ b/src/hotspot/share/gc/shared/jvmFlagConstraintsGC.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2015, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
*
*/
-#ifndef SHARE_GC_SHARED_COMMANDLINEFLAGCONSTRAINTSGC_HPP
-#define SHARE_GC_SHARED_COMMANDLINEFLAGCONSTRAINTSGC_HPP
+#ifndef SHARE_GC_SHARED_JVMFLAGCONSTRAINTSGC_HPP
+#define SHARE_GC_SHARED_JVMFLAGCONSTRAINTSGC_HPP
#include "utilities/globalDefinitions.hpp"
#include "utilities/macros.hpp"
@@ -74,4 +74,4 @@ JVMFlag::Error SurvivorAlignmentInBytesConstraintFunc(intx value, bool verbose);
// Internal
JVMFlag::Error MaxPLABSizeBounds(const char* name, size_t value, bool verbose);
-#endif // SHARE_GC_SHARED_COMMANDLINEFLAGCONSTRAINTSGC_HPP
+#endif // SHARE_GC_SHARED_JVMFLAGCONSTRAINTSGC_HPP
diff --git a/src/hotspot/share/gc/shared/markBitMap.hpp b/src/hotspot/share/gc/shared/markBitMap.hpp
index 184acf72601..faa58cc3a7d 100644
--- a/src/hotspot/share/gc/shared/markBitMap.hpp
+++ b/src/hotspot/share/gc/shared/markBitMap.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
*
*/
-#ifndef SHARE_VM_GC_SHARED_MARKBITMAP_HPP
-#define SHARE_VM_GC_SHARED_MARKBITMAP_HPP
+#ifndef SHARE_GC_SHARED_MARKBITMAP_HPP
+#define SHARE_GC_SHARED_MARKBITMAP_HPP
#include "memory/memRegion.hpp"
#include "oops/oopsHierarchy.hpp"
@@ -98,4 +98,4 @@ public:
void clear_range_large(MemRegion mr) { do_clear(mr, true); }
};
-#endif // SHARE_VM_GC_SHARED_MARKBITMAP_HPP
+#endif // SHARE_GC_SHARED_MARKBITMAP_HPP
diff --git a/src/hotspot/share/gc/shared/markBitMap.inline.hpp b/src/hotspot/share/gc/shared/markBitMap.inline.hpp
index f24310878bb..022c94507f7 100644
--- a/src/hotspot/share/gc/shared/markBitMap.inline.hpp
+++ b/src/hotspot/share/gc/shared/markBitMap.inline.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
*
*/
-#ifndef SHARE_VM_GC_SHARED_MARKBITMAP_INLINE_HPP
-#define SHARE_VM_GC_SHARED_MARKBITMAP_INLINE_HPP
+#ifndef SHARE_GC_SHARED_MARKBITMAP_INLINE_HPP
+#define SHARE_GC_SHARED_MARKBITMAP_INLINE_HPP
#include "gc/shared/collectedHeap.hpp"
#include "gc/shared/markBitMap.hpp"
@@ -69,4 +69,4 @@ inline void MarkBitMap::clear(oop obj) {
clear((HeapWord*) obj);
}
-#endif // SHARE_VM_GC_SHARED_MARKBITMAP_INLINE_HPP
+#endif // SHARE_GC_SHARED_MARKBITMAP_INLINE_HPP
diff --git a/src/hotspot/share/gc/shared/memAllocator.hpp b/src/hotspot/share/gc/shared/memAllocator.hpp
index 93617d1c845..281e44c2567 100644
--- a/src/hotspot/share/gc/shared/memAllocator.hpp
+++ b/src/hotspot/share/gc/shared/memAllocator.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
*
*/
-#ifndef SHARE_GC_SHARED_MEM_ALLOCATOR_HPP
-#define SHARE_GC_SHARED_MEM_ALLOCATOR_HPP
+#ifndef SHARE_GC_SHARED_MEMALLOCATOR_HPP
+#define SHARE_GC_SHARED_MEMALLOCATOR_HPP
#include "gc/shared/collectedHeap.hpp"
#include "memory/memRegion.hpp"
@@ -107,4 +107,4 @@ public:
virtual oop initialize(HeapWord* mem) const;
};
-#endif // SHARE_GC_SHARED_MEM_ALLOCATOR_HPP
+#endif // SHARE_GC_SHARED_MEMALLOCATOR_HPP
diff --git a/src/hotspot/share/gc/shared/memset_with_concurrent_readers.hpp b/src/hotspot/share/gc/shared/memset_with_concurrent_readers.hpp
index c50365e8b42..43271ee866a 100644
--- a/src/hotspot/share/gc/shared/memset_with_concurrent_readers.hpp
+++ b/src/hotspot/share/gc/shared/memset_with_concurrent_readers.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2015, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
*
*/
-#ifndef SRC_SHARE_VM_GC_SHARED_MEMSETWITHCONCURRENTREADERS_HPP
-#define SRC_SHARE_VM_GC_SHARED_MEMSETWITHCONCURRENTREADERS_HPP
+#ifndef SHARE_GC_SHARED_MEMSET_WITH_CONCURRENT_READERS_HPP
+#define SHARE_GC_SHARED_MEMSET_WITH_CONCURRENT_READERS_HPP
#include "utilities/macros.hpp"
@@ -47,4 +47,4 @@ inline void memset_with_concurrent_readers(void* to, int value, size_t size) {
#endif // End of target dispatch.
-#endif // SRC_SHARE_VM_GC_SHARED_MEMSETWITHCONCURRENTREADERS_HPP
+#endif // SHARE_GC_SHARED_MEMSET_WITH_CONCURRENT_READERS_HPP
diff --git a/src/hotspot/share/gc/shared/modRefBarrierSet.hpp b/src/hotspot/share/gc/shared/modRefBarrierSet.hpp
index 95b9aa01e5d..76f2e79098b 100644
--- a/src/hotspot/share/gc/shared/modRefBarrierSet.hpp
+++ b/src/hotspot/share/gc/shared/modRefBarrierSet.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2000, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
*
*/
-#ifndef SHARE_VM_GC_SHARED_MODREFBARRIERSET_HPP
-#define SHARE_VM_GC_SHARED_MODREFBARRIERSET_HPP
+#ifndef SHARE_GC_SHARED_MODREFBARRIERSET_HPP
+#define SHARE_GC_SHARED_MODREFBARRIERSET_HPP
#include "gc/shared/barrierSet.hpp"
#include "memory/memRegion.hpp"
@@ -109,4 +109,4 @@ struct BarrierSet::GetName {
static const BarrierSet::Name value = BarrierSet::ModRef;
};
-#endif // SHARE_VM_GC_SHARED_MODREFBARRIERSET_HPP
+#endif // SHARE_GC_SHARED_MODREFBARRIERSET_HPP
diff --git a/src/hotspot/share/gc/shared/modRefBarrierSet.inline.hpp b/src/hotspot/share/gc/shared/modRefBarrierSet.inline.hpp
index b0c78603a3f..37f45df5212 100644
--- a/src/hotspot/share/gc/shared/modRefBarrierSet.inline.hpp
+++ b/src/hotspot/share/gc/shared/modRefBarrierSet.inline.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2017, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
*
*/
-#ifndef SHARE_VM_GC_SHARED_MODREFBARRIERSET_INLINE_HPP
-#define SHARE_VM_GC_SHARED_MODREFBARRIERSET_INLINE_HPP
+#ifndef SHARE_GC_SHARED_MODREFBARRIERSET_INLINE_HPP
+#define SHARE_GC_SHARED_MODREFBARRIERSET_INLINE_HPP
#include "gc/shared/barrierSet.hpp"
#include "gc/shared/modRefBarrierSet.hpp"
@@ -138,4 +138,4 @@ clone_in_heap(oop src, oop dst, size_t size) {
bs->write_region(MemRegion((HeapWord*)(void*)dst, size));
}
-#endif // SHARE_VM_GC_SHARED_MODREFBARRIERSET_INLINE_HPP
+#endif // SHARE_GC_SHARED_MODREFBARRIERSET_INLINE_HPP
diff --git a/src/hotspot/share/gc/shared/objectCountEventSender.hpp b/src/hotspot/share/gc/shared/objectCountEventSender.hpp
index 29c8d975a15..58e6da016da 100644
--- a/src/hotspot/share/gc/shared/objectCountEventSender.hpp
+++ b/src/hotspot/share/gc/shared/objectCountEventSender.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2013, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
*
*/
-#ifndef SHARE_VM_GC_SHARED_OBJECTCOUNTEVENTSENDER_HPP
-#define SHARE_VM_GC_SHARED_OBJECTCOUNTEVENTSENDER_HPP
+#ifndef SHARE_GC_SHARED_OBJECTCOUNTEVENTSENDER_HPP
+#define SHARE_GC_SHARED_OBJECTCOUNTEVENTSENDER_HPP
#include "gc/shared/gcTrace.hpp"
#include "memory/allocation.hpp"
@@ -52,4 +52,4 @@ class ObjectCountEventSender : public AllStatic {
#endif // INCLUDE_SERVICES
-#endif // SHARE_VM_GC_SHARED_OBJECTCOUNTEVENTSENDER_HPP
+#endif // SHARE_GC_SHARED_OBJECTCOUNTEVENTSENDER_HPP
diff --git a/src/hotspot/share/gc/shared/oopStorage.hpp b/src/hotspot/share/gc/shared/oopStorage.hpp
index 90285789333..187f4ab70e5 100644
--- a/src/hotspot/share/gc/shared/oopStorage.hpp
+++ b/src/hotspot/share/gc/shared/oopStorage.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -275,4 +275,4 @@ AIX_ONLY(private:)
template static SkipNullFn skip_null_fn(F f);
};
-#endif // include guard
+#endif // SHARE_GC_SHARED_OOPSTORAGE_HPP
diff --git a/src/hotspot/share/gc/shared/oopStorage.inline.hpp b/src/hotspot/share/gc/shared/oopStorage.inline.hpp
index 602c595348a..be7933b23fc 100644
--- a/src/hotspot/share/gc/shared/oopStorage.inline.hpp
+++ b/src/hotspot/share/gc/shared/oopStorage.inline.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -403,4 +403,4 @@ inline void OopStorage::weak_oops_do(IsAliveClosure* is_alive, Closure* cl) {
iterate_safepoint(if_alive_fn(is_alive, oop_fn(cl)));
}
-#endif // include guard
+#endif // SHARE_GC_SHARED_OOPSTORAGE_INLINE_HPP
diff --git a/src/hotspot/share/gc/shared/owstTaskTerminator.hpp b/src/hotspot/share/gc/shared/owstTaskTerminator.hpp
index 9e6fe135a36..6069d3ebb20 100644
--- a/src/hotspot/share/gc/shared/owstTaskTerminator.hpp
+++ b/src/hotspot/share/gc/shared/owstTaskTerminator.hpp
@@ -20,8 +20,8 @@
* questions.
*
*/
-#ifndef SHARE_VM_GC_SHARED_OWSTTASKTERMINATOR_HPP
-#define SHARE_VM_GC_SHARED_OWSTTASKTERMINATOR_HPP
+#ifndef SHARE_GC_SHARED_OWSTTASKTERMINATOR_HPP
+#define SHARE_GC_SHARED_OWSTTASKTERMINATOR_HPP
#include "gc/shared/taskqueue.hpp"
#include "runtime/mutex.hpp"
@@ -76,4 +76,4 @@ private:
};
-#endif // SHARE_VM_GC_SHARED_OWSTTASKTERMINATOR_HPP
+#endif // SHARE_GC_SHARED_OWSTTASKTERMINATOR_HPP
diff --git a/src/hotspot/share/gc/shared/parallelCleaning.hpp b/src/hotspot/share/gc/shared/parallelCleaning.hpp
index 69b4df7e9de..5d6d3edfd20 100644
--- a/src/hotspot/share/gc/shared/parallelCleaning.hpp
+++ b/src/hotspot/share/gc/shared/parallelCleaning.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -22,10 +22,11 @@
*
*/
-#ifndef SHARE_VM_GC_SHARED_PARALLELCLEANING_HPP
-#define SHARE_VM_GC_SHARED_PARALLELCLEANING_HPP
+#ifndef SHARE_GC_SHARED_PARALLELCLEANING_HPP
+#define SHARE_GC_SHARED_PARALLELCLEANING_HPP
-#include "classfile/classLoaderDataGraph.inline.hpp"
+#include "classfile/classLoaderDataGraph.hpp"
+#include "code/codeCache.hpp"
#include "gc/shared/oopStorageParState.hpp"
#include "gc/shared/stringdedup/stringDedup.hpp"
#include "gc/shared/workgroup.hpp"
@@ -115,4 +116,4 @@ public:
void work(uint worker_id);
};
-#endif // SHARE_VM_GC_SHARED_PARALLELCLEANING_HPP
+#endif // SHARE_GC_SHARED_PARALLELCLEANING_HPP
diff --git a/src/hotspot/share/gc/shared/plab.hpp b/src/hotspot/share/gc/shared/plab.hpp
index 608dce56c20..e517e858a95 100644
--- a/src/hotspot/share/gc/shared/plab.hpp
+++ b/src/hotspot/share/gc/shared/plab.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2001, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
*
*/
-#ifndef SHARE_VM_GC_SHARED_PLAB_HPP
-#define SHARE_VM_GC_SHARED_PLAB_HPP
+#ifndef SHARE_GC_SHARED_PLAB_HPP
+#define SHARE_GC_SHARED_PLAB_HPP
#include "gc/shared/gcUtil.hpp"
#include "memory/allocation.hpp"
@@ -211,4 +211,4 @@ class PLABStats : public CHeapObj {
inline void add_undo_wasted(size_t v);
};
-#endif // SHARE_VM_GC_SHARED_PLAB_HPP
+#endif // SHARE_GC_SHARED_PLAB_HPP
diff --git a/src/hotspot/share/gc/shared/plab.inline.hpp b/src/hotspot/share/gc/shared/plab.inline.hpp
index b523956950d..648f1d46140 100644
--- a/src/hotspot/share/gc/shared/plab.inline.hpp
+++ b/src/hotspot/share/gc/shared/plab.inline.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2014, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
*
*/
-#ifndef SHARE_VM_GC_SHARED_PLAB_INLINE_HPP
-#define SHARE_VM_GC_SHARED_PLAB_INLINE_HPP
+#ifndef SHARE_GC_SHARED_PLAB_INLINE_HPP
+#define SHARE_GC_SHARED_PLAB_INLINE_HPP
#include "gc/shared/collectedHeap.inline.hpp"
#include "gc/shared/plab.hpp"
@@ -58,4 +58,4 @@ void PLABStats::add_undo_wasted(size_t v) {
Atomic::add(v, &_undo_wasted);
}
-#endif // SHARE_VM_GC_SHARED_PLAB_INLINE_HPP
+#endif // SHARE_GC_SHARED_PLAB_INLINE_HPP
diff --git a/src/hotspot/share/gc/shared/preservedMarks.hpp b/src/hotspot/share/gc/shared/preservedMarks.hpp
index 46f0551f063..c3787f5ed55 100644
--- a/src/hotspot/share/gc/shared/preservedMarks.hpp
+++ b/src/hotspot/share/gc/shared/preservedMarks.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2016, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
*
*/
-#ifndef SHARE_VM_GC_SHARED_PRESERVEDMARKS_HPP
-#define SHARE_VM_GC_SHARED_PRESERVEDMARKS_HPP
+#ifndef SHARE_GC_SHARED_PRESERVEDMARKS_HPP
+#define SHARE_GC_SHARED_PRESERVEDMARKS_HPP
#include "memory/allocation.hpp"
#include "memory/padded.hpp"
@@ -146,4 +146,4 @@ public:
}
};
-#endif // SHARE_VM_GC_SHARED_PRESERVEDMARKS_HPP
+#endif // SHARE_GC_SHARED_PRESERVEDMARKS_HPP
diff --git a/src/hotspot/share/gc/shared/preservedMarks.inline.hpp b/src/hotspot/share/gc/shared/preservedMarks.inline.hpp
index e246a8a5b17..6e48aa7a4ea 100644
--- a/src/hotspot/share/gc/shared/preservedMarks.inline.hpp
+++ b/src/hotspot/share/gc/shared/preservedMarks.inline.hpp
@@ -22,8 +22,8 @@
*
*/
-#ifndef SHARE_VM_GC_SHARED_PRESERVEDMARKS_INLINE_HPP
-#define SHARE_VM_GC_SHARED_PRESERVEDMARKS_INLINE_HPP
+#ifndef SHARE_GC_SHARED_PRESERVEDMARKS_INLINE_HPP
+#define SHARE_GC_SHARED_PRESERVEDMARKS_INLINE_HPP
#include "gc/shared/preservedMarks.hpp"
#include "logging/log.hpp"
@@ -83,4 +83,4 @@ void PreservedMarks::OopAndMarkOop::set_mark() const {
_o->set_mark_raw(_m);
}
-#endif // SHARE_VM_GC_SHARED_PRESERVEDMARKS_INLINE_HPP
+#endif // SHARE_GC_SHARED_PRESERVEDMARKS_INLINE_HPP
diff --git a/src/hotspot/share/gc/shared/ptrQueue.cpp b/src/hotspot/share/gc/shared/ptrQueue.cpp
index ae3a4f0dd24..25d6cc662c5 100644
--- a/src/hotspot/share/gc/shared/ptrQueue.cpp
+++ b/src/hotspot/share/gc/shared/ptrQueue.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2001, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -24,12 +24,15 @@
#include "precompiled.hpp"
#include "gc/shared/ptrQueue.hpp"
+#include "logging/log.hpp"
#include "memory/allocation.hpp"
#include "memory/allocation.inline.hpp"
#include "runtime/atomic.hpp"
#include "runtime/mutex.hpp"
#include "runtime/mutexLocker.hpp"
+#include "runtime/orderAccess.hpp"
#include "runtime/thread.inline.hpp"
+#include "utilities/globalCounter.inline.hpp"
#include
@@ -85,20 +88,29 @@ void BufferNode::deallocate(BufferNode* node) {
FREE_C_HEAP_ARRAY(char, node);
}
-BufferNode::Allocator::Allocator(size_t buffer_size, Mutex* lock) :
+BufferNode::Allocator::Allocator(const char* name, size_t buffer_size) :
_buffer_size(buffer_size),
- _lock(lock),
- _free_list(NULL),
- _free_count(0)
+ _pending_list(),
+ _free_list(),
+ _pending_count(0),
+ _free_count(0),
+ _transfer_lock(false)
{
- assert(lock != NULL, "precondition");
+ strncpy(_name, name, sizeof(_name));
+ _name[sizeof(_name) - 1] = '\0';
}
BufferNode::Allocator::~Allocator() {
- while (_free_list != NULL) {
- BufferNode* node = _free_list;
- _free_list = node->next();
- BufferNode::deallocate(node);
+ delete_list(_free_list.pop_all());
+ delete_list(_pending_list.pop_all());
+}
+
+void BufferNode::Allocator::delete_list(BufferNode* list) {
+ while (list != NULL) {
+ BufferNode* next = list->next();
+ DEBUG_ONLY(list->set_next(NULL);)
+ BufferNode::deallocate(list);
+ list = next;
}
}
@@ -107,55 +119,109 @@ size_t BufferNode::Allocator::free_count() const {
}
BufferNode* BufferNode::Allocator::allocate() {
- BufferNode* node = NULL;
+ BufferNode* node;
{
- MutexLockerEx ml(_lock, Mutex::_no_safepoint_check_flag);
- node = _free_list;
- if (node != NULL) {
- _free_list = node->next();
- --_free_count;
- node->set_next(NULL);
- node->set_index(0);
- return node;
- }
+ // Protect against ABA; see release().
+ GlobalCounter::CriticalSection cs(Thread::current());
+ node = _free_list.pop();
}
- return BufferNode::allocate(_buffer_size);
+ if (node == NULL) {
+ node = BufferNode::allocate(_buffer_size);
+ } else {
+ // Decrement count after getting buffer from free list. This, along
+ // with incrementing count before adding to free list, ensures count
+ // never underflows.
+ size_t count = Atomic::sub(1u, &_free_count);
+ assert((count + 1) != 0, "_free_count underflow");
+ }
+ return node;
}
+// To solve the ABA problem for lock-free stack pop, allocate does the
+// pop inside a critical section, and release synchronizes on the
+// critical sections before adding to the _free_list. But we don't
+// want to make every release have to do a synchronize. Instead, we
+// initially place released nodes on the _pending_list, and transfer
+// them to the _free_list in batches. Only one transfer at a time is
+// permitted, with a lock bit to control access to that phase. A
+// transfer takes all the nodes from the _pending_list, synchronizes on
+// the _free_list pops, and then adds the former pending nodes to the
+// _free_list. While that's happening, other threads might be adding
+// other nodes to the _pending_list, to be dealt with by some later
+// transfer.
void BufferNode::Allocator::release(BufferNode* node) {
- MutexLockerEx ml(_lock, Mutex::_no_safepoint_check_flag);
- node->set_next(_free_list);
- _free_list = node;
- ++_free_count;
+ assert(node != NULL, "precondition");
+ assert(node->next() == NULL, "precondition");
+
+ // Desired minimum transfer batch size. There is relatively little
+ // importance to the specific number. It shouldn't be too big, else
+ // we're wasting space when the release rate is low. If the release
+ // rate is high, we might accumulate more than this before being
+ // able to start a new transfer, but that's okay. Also note that
+ // the allocation rate and the release rate are going to be fairly
+ // similar, due to how the buffers are used.
+ const size_t trigger_transfer = 10;
+
+ // Add to pending list. Update count first so no underflow in transfer.
+ size_t pending_count = Atomic::add(1u, &_pending_count);
+ _pending_list.push(*node);
+ if (pending_count > trigger_transfer) {
+ try_transfer_pending();
+ }
}
-void BufferNode::Allocator::reduce_free_list() {
- BufferNode* head = NULL;
- {
- MutexLockerEx ml(_lock, Mutex::_no_safepoint_check_flag);
- // For now, delete half.
- size_t remove = _free_count / 2;
- if (remove > 0) {
- head = _free_list;
- BufferNode* tail = head;
- BufferNode* prev = NULL;
- for (size_t i = 0; i < remove; ++i) {
- assert(tail != NULL, "free list size is wrong");
- prev = tail;
- tail = tail->next();
- }
- assert(prev != NULL, "invariant");
- assert(prev->next() == tail, "invariant");
- prev->set_next(NULL);
- _free_list = tail;
- _free_count -= remove;
+// Try to transfer nodes from _pending_list to _free_list, with a
+// synchronization delay for any in-progress pops from the _free_list,
+// to solve ABA there. Return true if performed a (possibly empty)
+// transfer, false if blocked from doing so by some other thread's
+// in-progress transfer.
+bool BufferNode::Allocator::try_transfer_pending() {
+ // Attempt to claim the lock.
+ if (Atomic::load(&_transfer_lock) || // Skip CAS if likely to fail.
+ Atomic::cmpxchg(true, &_transfer_lock, false)) {
+ return false;
+ }
+ // Have the lock; perform the transfer.
+
+ // Claim all the pending nodes.
+ BufferNode* first = _pending_list.pop_all();
+ if (first != NULL) {
+ // Prepare to add the claimed nodes, and update _pending_count.
+ BufferNode* last = first;
+ size_t count = 1;
+ for (BufferNode* next = first->next(); next != NULL; next = next->next()) {
+ last = next;
+ ++count;
}
+ Atomic::sub(count, &_pending_count);
+
+ // Wait for any in-progress pops, to avoid ABA for them.
+ GlobalCounter::write_synchronize();
+
+ // Add synchronized nodes to _free_list.
+ // Update count first so no underflow in allocate().
+ Atomic::add(count, &_free_count);
+ _free_list.prepend(*first, *last);
+ log_trace(gc, ptrqueue, freelist)
+ ("Transferred %s pending to free: " SIZE_FORMAT, name(), count);
}
- while (head != NULL) {
- BufferNode* next = head->next();
- BufferNode::deallocate(head);
- head = next;
+ OrderAccess::release_store(&_transfer_lock, false);
+ return true;
+}
+
+size_t BufferNode::Allocator::reduce_free_list(size_t remove_goal) {
+ try_transfer_pending();
+ size_t removed = 0;
+ for ( ; removed < remove_goal; ++removed) {
+ BufferNode* node = _free_list.pop();
+ if (node == NULL) break;
+ BufferNode::deallocate(node);
}
+ size_t new_count = Atomic::sub(removed, &_free_count);
+ log_debug(gc, ptrqueue, freelist)
+ ("Reduced %s free list by " SIZE_FORMAT " to " SIZE_FORMAT,
+ name(), removed, new_count);
+ return removed;
}
PtrQueueSet::PtrQueueSet(bool notify_when_complete) :
diff --git a/src/hotspot/share/gc/shared/ptrQueue.hpp b/src/hotspot/share/gc/shared/ptrQueue.hpp
index ae454a39a43..06a20981a4b 100644
--- a/src/hotspot/share/gc/shared/ptrQueue.hpp
+++ b/src/hotspot/share/gc/shared/ptrQueue.hpp
@@ -25,7 +25,10 @@
#ifndef SHARE_GC_SHARED_PTRQUEUE_HPP
#define SHARE_GC_SHARED_PTRQUEUE_HPP
+#include "memory/padded.hpp"
#include "utilities/align.hpp"
+#include "utilities/debug.hpp"
+#include "utilities/lockFreeStack.hpp"
#include "utilities/sizes.hpp"
class Mutex;
@@ -215,7 +218,7 @@ protected:
class BufferNode {
size_t _index;
- BufferNode* _next;
+ BufferNode* volatile _next;
void* _buffer[1]; // Pseudo flexible array member.
BufferNode() : _index(0), _next(NULL) { }
@@ -225,6 +228,8 @@ class BufferNode {
return offset_of(BufferNode, _buffer);
}
+ static BufferNode* volatile* next_ptr(BufferNode& bn) { return &bn._next; }
+
AIX_ONLY(public:) // xlC 12 on AIX doesn't implement C++ DR45.
// Allocate a new BufferNode with the "buffer" having size elements.
static BufferNode* allocate(size_t size);
@@ -233,6 +238,8 @@ AIX_ONLY(public:) // xlC 12 on AIX doesn't implement C++ DR45.
static void deallocate(BufferNode* node);
public:
+ typedef LockFreeStack Stack;
+
BufferNode* next() const { return _next; }
void set_next(BufferNode* n) { _next = n; }
size_t index() const { return _index; }
@@ -254,23 +261,52 @@ public:
reinterpret_cast(node) + buffer_offset());
}
- // Free-list based allocator.
- class Allocator {
- size_t _buffer_size;
- Mutex* _lock;
- BufferNode* _free_list;
- volatile size_t _free_count;
+ class Allocator; // Free-list based allocator.
+ class TestSupport; // Unit test support.
+};
- public:
- Allocator(size_t buffer_size, Mutex* lock);
- ~Allocator();
+// Allocation is based on a lock-free free list of nodes, linked through
+// BufferNode::_next (see BufferNode::Stack). To solve the ABA problem,
+// popping a node from the free list is performed within a GlobalCounter
+// critical section, and pushing nodes onto the free list is done after
+// a GlobalCounter synchronization associated with the nodes to be pushed.
+// This is documented behavior so that other parts of the node life-cycle
+// can depend on and make use of it too.
+class BufferNode::Allocator {
+ friend class TestSupport;
- size_t buffer_size() const { return _buffer_size; }
- size_t free_count() const;
- BufferNode* allocate();
- void release(BufferNode* node);
- void reduce_free_list();
- };
+ // Since we don't expect many instances, and measured >15% speedup
+ // on stress gtest, padding seems like a good tradeoff here.
+#define DECLARE_PADDED_MEMBER(Id, Type, Name) \
+ Type Name; DEFINE_PAD_MINUS_SIZE(Id, DEFAULT_CACHE_LINE_SIZE, sizeof(Type))
+
+ const size_t _buffer_size;
+ char _name[DEFAULT_CACHE_LINE_SIZE - sizeof(size_t)]; // Use name as padding.
+ DECLARE_PADDED_MEMBER(1, Stack, _pending_list);
+ DECLARE_PADDED_MEMBER(2, Stack, _free_list);
+ DECLARE_PADDED_MEMBER(3, volatile size_t, _pending_count);
+ DECLARE_PADDED_MEMBER(4, volatile size_t, _free_count);
+ DECLARE_PADDED_MEMBER(5, volatile bool, _transfer_lock);
+
+#undef DECLARE_PADDED_MEMBER
+
+ void delete_list(BufferNode* list);
+ bool try_transfer_pending();
+
+public:
+ Allocator(const char* name, size_t buffer_size);
+ ~Allocator();
+
+ const char* name() const { return _name; }
+ size_t buffer_size() const { return _buffer_size; }
+ size_t free_count() const;
+ BufferNode* allocate();
+ void release(BufferNode* node);
+
+ // Deallocate some of the available buffers. remove_goal is the target
+ // number to remove. Returns the number actually deallocated, which may
+ // be less than the goal if there were fewer available.
+ size_t reduce_free_list(size_t remove_goal);
};
// A PtrQueueSet represents resources common to a set of pointer queues.
diff --git a/src/hotspot/share/gc/shared/referencePolicy.hpp b/src/hotspot/share/gc/shared/referencePolicy.hpp
index d59ce2a6c29..cf0382b036b 100644
--- a/src/hotspot/share/gc/shared/referencePolicy.hpp
+++ b/src/hotspot/share/gc/shared/referencePolicy.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2000, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
*
*/
-#ifndef SHARE_VM_GC_SHARED_REFERENCEPOLICY_HPP
-#define SHARE_VM_GC_SHARED_REFERENCEPOLICY_HPP
+#ifndef SHARE_GC_SHARED_REFERENCEPOLICY_HPP
+#define SHARE_GC_SHARED_REFERENCEPOLICY_HPP
#include "oops/oopsHierarchy.hpp"
@@ -80,4 +80,4 @@ class LRUMaxHeapPolicy : public ReferencePolicy {
virtual bool should_clear_reference(oop p, jlong timestamp_clock);
};
-#endif // SHARE_VM_GC_SHARED_REFERENCEPOLICY_HPP
+#endif // SHARE_GC_SHARED_REFERENCEPOLICY_HPP
diff --git a/src/hotspot/share/gc/shared/referenceProcessor.hpp b/src/hotspot/share/gc/shared/referenceProcessor.hpp
index 305cbd233dd..027da906c39 100644
--- a/src/hotspot/share/gc/shared/referenceProcessor.hpp
+++ b/src/hotspot/share/gc/shared/referenceProcessor.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2001, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
*
*/
-#ifndef SHARE_VM_GC_SHARED_REFERENCEPROCESSOR_HPP
-#define SHARE_VM_GC_SHARED_REFERENCEPROCESSOR_HPP
+#ifndef SHARE_GC_SHARED_REFERENCEPROCESSOR_HPP
+#define SHARE_GC_SHARED_REFERENCEPROCESSOR_HPP
#include "gc/shared/referenceDiscoverer.hpp"
#include "gc/shared/referencePolicy.hpp"
@@ -695,4 +695,4 @@ public:
~RefProcMTDegreeAdjuster();
};
-#endif // SHARE_VM_GC_SHARED_REFERENCEPROCESSOR_HPP
+#endif // SHARE_GC_SHARED_REFERENCEPROCESSOR_HPP
diff --git a/src/hotspot/share/gc/shared/referenceProcessor.inline.hpp b/src/hotspot/share/gc/shared/referenceProcessor.inline.hpp
index 970490ba4e9..72c043489d3 100644
--- a/src/hotspot/share/gc/shared/referenceProcessor.inline.hpp
+++ b/src/hotspot/share/gc/shared/referenceProcessor.inline.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2016, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
*
*/
-#ifndef SHARE_VM_GC_SHARED_REFERENCEPROCESSOR_INLINE_HPP
-#define SHARE_VM_GC_SHARED_REFERENCEPROCESSOR_INLINE_HPP
+#ifndef SHARE_GC_SHARED_REFERENCEPROCESSOR_INLINE_HPP
+#define SHARE_GC_SHARED_REFERENCEPROCESSOR_INLINE_HPP
#include "gc/shared/referenceProcessor.hpp"
#include "oops/compressedOops.inline.hpp"
@@ -72,4 +72,4 @@ DiscoveredListIterator::DiscoveredListIterator(DiscoveredList& refs_list,
_removed(0) {
}
-#endif // SHARE_VM_GC_SHARED_REFERENCEPROCESSOR_INLINE_HPP
+#endif // SHARE_GC_SHARED_REFERENCEPROCESSOR_INLINE_HPP
diff --git a/src/hotspot/share/gc/shared/referenceProcessorPhaseTimes.hpp b/src/hotspot/share/gc/shared/referenceProcessorPhaseTimes.hpp
index 6fb83cf0633..8a1907dc2a6 100644
--- a/src/hotspot/share/gc/shared/referenceProcessorPhaseTimes.hpp
+++ b/src/hotspot/share/gc/shared/referenceProcessorPhaseTimes.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2017, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
*
*/
-#ifndef SHARE_VM_GC_SHARED_REFERENCEPROCESSORPHASETIMES_HPP
-#define SHARE_VM_GC_SHARED_REFERENCEPROCESSORPHASETIMES_HPP
+#ifndef SHARE_GC_SHARED_REFERENCEPROCESSORPHASETIMES_HPP
+#define SHARE_GC_SHARED_REFERENCEPROCESSORPHASETIMES_HPP
#include "gc/shared/referenceProcessor.hpp"
#include "gc/shared/referenceProcessorStats.hpp"
@@ -168,4 +168,4 @@ public:
~RefProcTotalPhaseTimesTracker();
};
-#endif // SHARE_VM_GC_SHARED_REFERENCEPROCESSORPHASETIMES_HPP
+#endif // SHARE_GC_SHARED_REFERENCEPROCESSORPHASETIMES_HPP
diff --git a/src/hotspot/share/gc/shared/referenceProcessorStats.hpp b/src/hotspot/share/gc/shared/referenceProcessorStats.hpp
index 472430e818b..14fcfbc7f3c 100644
--- a/src/hotspot/share/gc/shared/referenceProcessorStats.hpp
+++ b/src/hotspot/share/gc/shared/referenceProcessorStats.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
*
*/
-#ifndef SHARE_VM_GC_SHARED_REFERENCEPROCESSORSTATS_HPP
-#define SHARE_VM_GC_SHARED_REFERENCEPROCESSORSTATS_HPP
+#ifndef SHARE_GC_SHARED_REFERENCEPROCESSORSTATS_HPP
+#define SHARE_GC_SHARED_REFERENCEPROCESSORSTATS_HPP
#include "utilities/globalDefinitions.hpp"
@@ -70,4 +70,4 @@ class ReferenceProcessorStats {
return _phantom_count;
}
};
-#endif
+#endif // SHARE_GC_SHARED_REFERENCEPROCESSORSTATS_HPP
diff --git a/src/hotspot/share/gc/shared/softRefGenPolicy.hpp b/src/hotspot/share/gc/shared/softRefGenPolicy.hpp
index 02492dde2bd..97246d1c222 100644
--- a/src/hotspot/share/gc/shared/softRefGenPolicy.hpp
+++ b/src/hotspot/share/gc/shared/softRefGenPolicy.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2001, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
*
*/
-#ifndef SHARE_VM_GC_SHARED_SOFTREFGENPOLICY_HPP
-#define SHARE_VM_GC_SHARED_SOFTREFGENPOLICY_HPP
+#ifndef SHARE_GC_SHARED_SOFTREFGENPOLICY_HPP
+#define SHARE_GC_SHARED_SOFTREFGENPOLICY_HPP
#include "gc/shared/softRefPolicy.hpp"
#include "utilities/globalDefinitions.hpp"
@@ -35,4 +35,4 @@ public:
virtual void cleared_all_soft_refs();
};
-#endif // SHARE_VM_GC_SHARED_SOFTREFGENPOLICY_HPP
+#endif // SHARE_GC_SHARED_SOFTREFGENPOLICY_HPP
diff --git a/src/hotspot/share/gc/shared/softRefPolicy.hpp b/src/hotspot/share/gc/shared/softRefPolicy.hpp
index 33fd73aff7b..b80ed9f9825 100644
--- a/src/hotspot/share/gc/shared/softRefPolicy.hpp
+++ b/src/hotspot/share/gc/shared/softRefPolicy.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2001, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
*
*/
-#ifndef SHARE_VM_GC_SHARED_SOFTREFPOLICY_HPP
-#define SHARE_VM_GC_SHARED_SOFTREFPOLICY_HPP
+#ifndef SHARE_GC_SHARED_SOFTREFPOLICY_HPP
+#define SHARE_GC_SHARED_SOFTREFPOLICY_HPP
#include "memory/allocation.hpp"
@@ -73,4 +73,4 @@ class ClearedAllSoftRefs : public StackObj {
bool should_clear() { return _clear_all_soft_refs; }
};
-#endif // SHARE_VM_GC_SHARED_SOFTREFPOLICY_HPP
+#endif // SHARE_GC_SHARED_SOFTREFPOLICY_HPP
diff --git a/src/hotspot/share/gc/shared/space.hpp b/src/hotspot/share/gc/shared/space.hpp
index b2409f6b126..8e227a1081a 100644
--- a/src/hotspot/share/gc/shared/space.hpp
+++ b/src/hotspot/share/gc/shared/space.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
*
*/
-#ifndef SHARE_VM_GC_SHARED_SPACE_HPP
-#define SHARE_VM_GC_SHARED_SPACE_HPP
+#ifndef SHARE_GC_SHARED_SPACE_HPP
+#define SHARE_GC_SHARED_SPACE_HPP
#include "gc/shared/blockOffsetTable.hpp"
#include "gc/shared/cardTable.hpp"
@@ -782,4 +782,4 @@ class TenuredSpace: public OffsetTableContigSpace {
MemRegion mr) :
OffsetTableContigSpace(sharedOffsetArray, mr) {}
};
-#endif // SHARE_VM_GC_SHARED_SPACE_HPP
+#endif // SHARE_GC_SHARED_SPACE_HPP
diff --git a/src/hotspot/share/gc/shared/space.inline.hpp b/src/hotspot/share/gc/shared/space.inline.hpp
index 4215ab3f5d6..e7fd1fc809d 100644
--- a/src/hotspot/share/gc/shared/space.inline.hpp
+++ b/src/hotspot/share/gc/shared/space.inline.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2000, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
*
*/
-#ifndef SHARE_VM_GC_SHARED_SPACE_INLINE_HPP
-#define SHARE_VM_GC_SHARED_SPACE_INLINE_HPP
+#ifndef SHARE_GC_SHARED_SPACE_INLINE_HPP
+#define SHARE_GC_SHARED_SPACE_INLINE_HPP
#include "gc/shared/blockOffsetTable.inline.hpp"
#include "gc/shared/collectedHeap.hpp"
@@ -388,4 +388,4 @@ void ContiguousSpace::par_oop_iterate(MemRegion mr, OopClosureType* blk) {
}
}
-#endif // SHARE_VM_GC_SHARED_SPACE_INLINE_HPP
+#endif // SHARE_GC_SHARED_SPACE_INLINE_HPP
diff --git a/src/hotspot/share/gc/shared/spaceDecorator.hpp b/src/hotspot/share/gc/shared/spaceDecorator.hpp
index 38ef84355f1..5cf4a349dcd 100644
--- a/src/hotspot/share/gc/shared/spaceDecorator.hpp
+++ b/src/hotspot/share/gc/shared/spaceDecorator.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2002, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
*
*/
-#ifndef SHARE_VM_GC_SHARED_SPACEDECORATOR_HPP
-#define SHARE_VM_GC_SHARED_SPACEDECORATOR_HPP
+#ifndef SHARE_GC_SHARED_SPACEDECORATOR_HPP
+#define SHARE_GC_SHARED_SPACEDECORATOR_HPP
#include "gc/parallel/mutableSpace.hpp"
#include "gc/shared/space.hpp"
@@ -147,4 +147,4 @@ class MutableSpaceMangler: public SpaceMangler {
MutableSpaceMangler(MutableSpace* sp) : SpaceMangler(), _sp(sp) {}
};
-#endif // SHARE_VM_GC_SHARED_SPACEDECORATOR_HPP
+#endif // SHARE_GC_SHARED_SPACEDECORATOR_HPP
diff --git a/src/hotspot/share/gc/shared/stringdedup/stringDedup.hpp b/src/hotspot/share/gc/shared/stringdedup/stringDedup.hpp
index de756c95aff..e7478ac1152 100644
--- a/src/hotspot/share/gc/shared/stringdedup/stringDedup.hpp
+++ b/src/hotspot/share/gc/shared/stringdedup/stringDedup.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2014, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
*
*/
-#ifndef SHARE_VM_GC_SHARED_STRINGDEDUP_STRINGDEDUP_HPP
-#define SHARE_VM_GC_SHARED_STRINGDEDUP_STRINGDEDUP_HPP
+#ifndef SHARE_GC_SHARED_STRINGDEDUP_STRINGDEDUP_HPP
+#define SHARE_GC_SHARED_STRINGDEDUP_STRINGDEDUP_HPP
//
// String Deduplication
@@ -139,4 +139,4 @@ public:
}
};
-#endif // SHARE_VM_GC_SHARED_STRINGDEDUP_STRINGDEDUP_HPP
+#endif // SHARE_GC_SHARED_STRINGDEDUP_STRINGDEDUP_HPP
diff --git a/src/hotspot/share/gc/shared/stringdedup/stringDedup.inline.hpp b/src/hotspot/share/gc/shared/stringdedup/stringDedup.inline.hpp
index 6db91d953e9..b1cceb4635c 100644
--- a/src/hotspot/share/gc/shared/stringdedup/stringDedup.inline.hpp
+++ b/src/hotspot/share/gc/shared/stringdedup/stringDedup.inline.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
*
*/
-#ifndef SHARE_VM_GC_SHARED_STRINGDEDUP_STRINGDEDUP_INLINE_HPP
-#define SHARE_VM_GC_SHARED_STRINGDEDUP_STRINGDEDUP_INLINE_HPP
+#ifndef SHARE_GC_SHARED_STRINGDEDUP_STRINGDEDUP_INLINE_HPP
+#define SHARE_GC_SHARED_STRINGDEDUP_STRINGDEDUP_INLINE_HPP
#include "gc/shared/stringdedup/stringDedup.hpp"
#include "gc/shared/stringdedup/stringDedupThread.inline.hpp"
@@ -38,4 +38,4 @@ void StringDedup::initialize_impl() {
}
}
-#endif // SHARE_VM_GC_SHARED_STRINGDEDUP_STRINGDEDUP_INLINE_HPP
+#endif // SHARE_GC_SHARED_STRINGDEDUP_STRINGDEDUP_INLINE_HPP
diff --git a/src/hotspot/share/gc/shared/stringdedup/stringDedupQueue.hpp b/src/hotspot/share/gc/shared/stringdedup/stringDedupQueue.hpp
index 02b05de7640..19b985147cf 100644
--- a/src/hotspot/share/gc/shared/stringdedup/stringDedupQueue.hpp
+++ b/src/hotspot/share/gc/shared/stringdedup/stringDedupQueue.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
*
*/
-#ifndef SHARE_VM_GC_SHARED_STRINGDEDUP_STRINGDEDUPQUEUE_HPP
-#define SHARE_VM_GC_SHARED_STRINGDEDUP_STRINGDEDUPQUEUE_HPP
+#ifndef SHARE_GC_SHARED_STRINGDEDUP_STRINGDEDUPQUEUE_HPP
+#define SHARE_GC_SHARED_STRINGDEDUP_STRINGDEDUPQUEUE_HPP
#include "memory/allocation.hpp"
#include "oops/oop.hpp"
@@ -109,4 +109,4 @@ protected:
static size_t claim();
};
-#endif // SHARE_VM_GC_SHARED_STRINGDEDUP_STRINGDEDUPQUEUE_HPP
+#endif // SHARE_GC_SHARED_STRINGDEDUP_STRINGDEDUPQUEUE_HPP
diff --git a/src/hotspot/share/gc/shared/stringdedup/stringDedupQueue.inline.hpp b/src/hotspot/share/gc/shared/stringdedup/stringDedupQueue.inline.hpp
index bfc3ebd820f..b133c30f06c 100644
--- a/src/hotspot/share/gc/shared/stringdedup/stringDedupQueue.inline.hpp
+++ b/src/hotspot/share/gc/shared/stringdedup/stringDedupQueue.inline.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
*
*/
-#ifndef SHARE_VM_GC_SHARED_STRINGDEDUP_STRINGDEDUPQUEUE_INLINE_HPP
-#define SHARE_VM_GC_SHARED_STRINGDEDUP_STRINGDEDUPQUEUE_INLINE_HPP
+#ifndef SHARE_GC_SHARED_STRINGDEDUP_STRINGDEDUPQUEUE_INLINE_HPP
+#define SHARE_GC_SHARED_STRINGDEDUP_STRINGDEDUPQUEUE_INLINE_HPP
#include "gc/shared/stringdedup/stringDedup.hpp"
#include "gc/shared/stringdedup/stringDedupQueue.hpp"
@@ -51,4 +51,4 @@ oop StringDedupQueue::pop() {
return queue()->pop_impl();
}
-#endif // SHARE_VM_GC_SHARED_STRINGDEDUP_STRINGDEDUPQUEUE_INLINE_HPP
+#endif // SHARE_GC_SHARED_STRINGDEDUP_STRINGDEDUPQUEUE_INLINE_HPP
diff --git a/src/hotspot/share/gc/shared/stringdedup/stringDedupStat.hpp b/src/hotspot/share/gc/shared/stringdedup/stringDedupStat.hpp
index 4cbb034314a..794772e8b3e 100644
--- a/src/hotspot/share/gc/shared/stringdedup/stringDedupStat.hpp
+++ b/src/hotspot/share/gc/shared/stringdedup/stringDedupStat.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2014, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
*
*/
-#ifndef SHARE_VM_GC_SHARED_STRINGDEDUP_STRINGDEDUPSTAT_HPP
-#define SHARE_VM_GC_SHARED_STRINGDEDUP_STRINGDEDUPSTAT_HPP
+#ifndef SHARE_GC_SHARED_STRINGDEDUP_STRINGDEDUPSTAT_HPP
+#define SHARE_GC_SHARED_STRINGDEDUP_STRINGDEDUPSTAT_HPP
#include "memory/allocation.hpp"
#include "runtime/os.hpp"
@@ -135,5 +135,4 @@ public:
static void print_end(const StringDedupStat* last_stat, const StringDedupStat* total_stat);
};
-#endif // SHARE_VM_GC_SHARED_STRINGDEDUP_STRINGDEDUPSTAT_HPP
-
+#endif // SHARE_GC_SHARED_STRINGDEDUP_STRINGDEDUPSTAT_HPP
diff --git a/src/hotspot/share/gc/shared/stringdedup/stringDedupTable.hpp b/src/hotspot/share/gc/shared/stringdedup/stringDedupTable.hpp
index 6a1db65fad5..bd5da33bba3 100644
--- a/src/hotspot/share/gc/shared/stringdedup/stringDedupTable.hpp
+++ b/src/hotspot/share/gc/shared/stringdedup/stringDedupTable.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2014, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
*
*/
-#ifndef SHARE_VM_GC_SHARED_STRINGDEDUP_STRINGDEDUPTABLE_HPP
-#define SHARE_VM_GC_SHARED_STRINGDEDUP_STRINGDEDUPTABLE_HPP
+#ifndef SHARE_GC_SHARED_STRINGDEDUP_STRINGDEDUPTABLE_HPP
+#define SHARE_GC_SHARED_STRINGDEDUP_STRINGDEDUPTABLE_HPP
#include "gc/shared/stringdedup/stringDedupStat.hpp"
#include "runtime/mutexLocker.hpp"
@@ -252,4 +252,4 @@ public:
static void gc_epilogue();
};
-#endif // SHARE_VM_GC_SHARED_STRINGDEDUP_STRINGDEDUPTABLE_HPP
+#endif // SHARE_GC_SHARED_STRINGDEDUP_STRINGDEDUPTABLE_HPP
diff --git a/src/hotspot/share/gc/shared/stringdedup/stringDedupThread.hpp b/src/hotspot/share/gc/shared/stringdedup/stringDedupThread.hpp
index a36cca60947..e6fc7c17739 100644
--- a/src/hotspot/share/gc/shared/stringdedup/stringDedupThread.hpp
+++ b/src/hotspot/share/gc/shared/stringdedup/stringDedupThread.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2014, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
*
*/
-#ifndef SHARE_VM_GC_SHARED_STRINGDEDUP_STRINGDEDUPTHREAD_HPP
-#define SHARE_VM_GC_SHARED_STRINGDEDUP_STRINGDEDUPTHREAD_HPP
+#ifndef SHARE_GC_SHARED_STRINGDEDUP_STRINGDEDUPTHREAD_HPP
+#define SHARE_GC_SHARED_STRINGDEDUP_STRINGDEDUPTHREAD_HPP
#include "gc/shared/concurrentGCThread.hpp"
#include "gc/shared/stringdedup/stringDedupStat.hpp"
@@ -69,4 +69,4 @@ public:
static void create();
};
-#endif // SHARE_VM_GC_SHARED_STRINGDEDUP_STRINGDEDUPTHREAD_HPP
+#endif // SHARE_GC_SHARED_STRINGDEDUP_STRINGDEDUPTHREAD_HPP
diff --git a/src/hotspot/share/gc/shared/stringdedup/stringDedupThread.inline.hpp b/src/hotspot/share/gc/shared/stringdedup/stringDedupThread.inline.hpp
index 74a53974cce..ee705334c6a 100644
--- a/src/hotspot/share/gc/shared/stringdedup/stringDedupThread.inline.hpp
+++ b/src/hotspot/share/gc/shared/stringdedup/stringDedupThread.inline.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
*
*/
-#ifndef SHARE_VM_GC_SHARED_STRINGDEDUP_STRINGDEDUPTHREAD_INLINE_HPP
-#define SHARE_VM_GC_SHARED_STRINGDEDUP_STRINGDEDUPTHREAD_INLINE_HPP
+#ifndef SHARE_GC_SHARED_STRINGDEDUP_STRINGDEDUPTHREAD_INLINE_HPP
+#define SHARE_GC_SHARED_STRINGDEDUP_STRINGDEDUPTHREAD_INLINE_HPP
#include "gc/shared/suspendibleThreadSet.hpp"
#include "gc/shared/stringdedup/stringDedupQueue.inline.hpp"
@@ -88,4 +88,4 @@ void StringDedupThreadImpl::create() {
_thread = new StringDedupThreadImpl();
}
-#endif // SHARE_VM_GC_SHARED_STRINGDEDUP_STRINGDEDUPTHREAD_INLINE_HPP
+#endif // SHARE_GC_SHARED_STRINGDEDUP_STRINGDEDUPTHREAD_INLINE_HPP
diff --git a/src/hotspot/share/gc/shared/strongRootsScope.hpp b/src/hotspot/share/gc/shared/strongRootsScope.hpp
index 2ed55c4cf12..f7b3afbd430 100644
--- a/src/hotspot/share/gc/shared/strongRootsScope.hpp
+++ b/src/hotspot/share/gc/shared/strongRootsScope.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
*
*/
-#ifndef SHARE_VM_GC_SHARED_STRONGROOTSSCOPE_HPP
-#define SHARE_VM_GC_SHARED_STRONGROOTSSCOPE_HPP
+#ifndef SHARE_GC_SHARED_STRONGROOTSSCOPE_HPP
+#define SHARE_GC_SHARED_STRONGROOTSSCOPE_HPP
#include "memory/allocation.hpp"
@@ -46,4 +46,4 @@ class StrongRootsScope : public MarkScope {
uint n_threads() const { return _n_threads; }
};
-#endif // SHARE_VM_GC_SHARED_STRONGROOTSSCOPE_HPP
+#endif // SHARE_GC_SHARED_STRONGROOTSSCOPE_HPP
diff --git a/src/hotspot/share/gc/shared/taskqueue.hpp b/src/hotspot/share/gc/shared/taskqueue.hpp
index 980de663229..2e0b55565f3 100644
--- a/src/hotspot/share/gc/shared/taskqueue.hpp
+++ b/src/hotspot/share/gc/shared/taskqueue.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2001, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
*
*/
-#ifndef SHARE_VM_GC_SHARED_TASKQUEUE_HPP
-#define SHARE_VM_GC_SHARED_TASKQUEUE_HPP
+#ifndef SHARE_GC_SHARED_TASKQUEUE_HPP
+#define SHARE_GC_SHARED_TASKQUEUE_HPP
#include "memory/allocation.hpp"
#include "memory/padded.hpp"
@@ -619,4 +619,4 @@ typedef GenericTaskQueueSet OopStarTaskQueueSet;
typedef OverflowTaskQueue RegionTaskQueue;
typedef GenericTaskQueueSet RegionTaskQueueSet;
-#endif // SHARE_VM_GC_SHARED_TASKQUEUE_HPP
+#endif // SHARE_GC_SHARED_TASKQUEUE_HPP
diff --git a/src/hotspot/share/gc/shared/taskqueue.inline.hpp b/src/hotspot/share/gc/shared/taskqueue.inline.hpp
index 6f8473f1854..4023987891a 100644
--- a/src/hotspot/share/gc/shared/taskqueue.inline.hpp
+++ b/src/hotspot/share/gc/shared/taskqueue.inline.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2015, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
*
*/
-#ifndef SHARE_VM_GC_SHARED_TASKQUEUE_INLINE_HPP
-#define SHARE_VM_GC_SHARED_TASKQUEUE_INLINE_HPP
+#ifndef SHARE_GC_SHARED_TASKQUEUE_INLINE_HPP
+#define SHARE_GC_SHARED_TASKQUEUE_INLINE_HPP
#include "gc/shared/taskqueue.hpp"
#include "memory/allocation.inline.hpp"
@@ -331,4 +331,4 @@ inline void GenericTaskQueue::iterate(Fn fn) {
}
-#endif // SHARE_VM_GC_SHARED_TASKQUEUE_INLINE_HPP
+#endif // SHARE_GC_SHARED_TASKQUEUE_INLINE_HPP
diff --git a/src/hotspot/share/gc/shared/threadLocalAllocBuffer.cpp b/src/hotspot/share/gc/shared/threadLocalAllocBuffer.cpp
index 408234f13fa..5b12c3f5fc7 100644
--- a/src/hotspot/share/gc/shared/threadLocalAllocBuffer.cpp
+++ b/src/hotspot/share/gc/shared/threadLocalAllocBuffer.cpp
@@ -91,7 +91,9 @@ void ThreadLocalAllocBuffer::accumulate_and_reset_statistics(ThreadLocalAllocSta
void ThreadLocalAllocBuffer::insert_filler() {
assert(end() != NULL, "Must not be retired");
- Universe::heap()->fill_with_dummy_object(top(), hard_end(), true);
+ if (top() < hard_end()) {
+ Universe::heap()->fill_with_dummy_object(top(), hard_end(), true);
+ }
}
void ThreadLocalAllocBuffer::make_parsable() {
diff --git a/src/hotspot/share/gc/shared/threadLocalAllocBuffer.hpp b/src/hotspot/share/gc/shared/threadLocalAllocBuffer.hpp
index c05c6f73255..5bc626ef416 100644
--- a/src/hotspot/share/gc/shared/threadLocalAllocBuffer.hpp
+++ b/src/hotspot/share/gc/shared/threadLocalAllocBuffer.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1999, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1999, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
*
*/
-#ifndef SHARE_VM_GC_SHARED_THREADLOCALALLOCBUFFER_HPP
-#define SHARE_VM_GC_SHARED_THREADLOCALALLOCBUFFER_HPP
+#ifndef SHARE_GC_SHARED_THREADLOCALALLOCBUFFER_HPP
+#define SHARE_GC_SHARED_THREADLOCALALLOCBUFFER_HPP
#include "gc/shared/gcUtil.hpp"
#include "runtime/perfData.hpp"
@@ -238,4 +238,4 @@ public:
void publish();
};
-#endif // SHARE_VM_GC_SHARED_THREADLOCALALLOCBUFFER_HPP
+#endif // SHARE_GC_SHARED_THREADLOCALALLOCBUFFER_HPP
diff --git a/src/hotspot/share/gc/shared/threadLocalAllocBuffer.inline.hpp b/src/hotspot/share/gc/shared/threadLocalAllocBuffer.inline.hpp
index a0bf20bda90..a882c313d68 100644
--- a/src/hotspot/share/gc/shared/threadLocalAllocBuffer.inline.hpp
+++ b/src/hotspot/share/gc/shared/threadLocalAllocBuffer.inline.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1999, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1999, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
*
*/
-#ifndef SHARE_VM_GC_SHARED_THREADLOCALALLOCBUFFER_INLINE_HPP
-#define SHARE_VM_GC_SHARED_THREADLOCALALLOCBUFFER_INLINE_HPP
+#ifndef SHARE_GC_SHARED_THREADLOCALALLOCBUFFER_INLINE_HPP
+#define SHARE_GC_SHARED_THREADLOCALALLOCBUFFER_INLINE_HPP
#include "gc/shared/collectedHeap.hpp"
#include "gc/shared/threadLocalAllocBuffer.hpp"
@@ -95,4 +95,4 @@ void ThreadLocalAllocBuffer::record_slow_allocation(size_t obj_size) {
obj_size, free(), refill_waste_limit());
}
-#endif // SHARE_VM_GC_SHARED_THREADLOCALALLOCBUFFER_INLINE_HPP
+#endif // SHARE_GC_SHARED_THREADLOCALALLOCBUFFER_INLINE_HPP
diff --git a/src/hotspot/share/gc/shared/weakProcessor.hpp b/src/hotspot/share/gc/shared/weakProcessor.hpp
index a61dd5ae7ec..9a296d4b59b 100644
--- a/src/hotspot/share/gc/shared/weakProcessor.hpp
+++ b/src/hotspot/share/gc/shared/weakProcessor.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
*
*/
-#ifndef SHARE_VM_GC_SHARED_WEAKPROCESSOR_HPP
-#define SHARE_VM_GC_SHARED_WEAKPROCESSOR_HPP
+#ifndef SHARE_GC_SHARED_WEAKPROCESSOR_HPP
+#define SHARE_GC_SHARED_WEAKPROCESSOR_HPP
#include "gc/shared/oopStorageParState.hpp"
#include "gc/shared/workgroup.hpp"
@@ -92,4 +92,4 @@ public:
void work(uint worker_id, IsAlive* is_alive, KeepAlive* keep_alive);
};
-#endif // SHARE_VM_GC_SHARED_WEAKPROCESSOR_HPP
+#endif // SHARE_GC_SHARED_WEAKPROCESSOR_HPP
diff --git a/src/hotspot/share/gc/shared/weakProcessor.inline.hpp b/src/hotspot/share/gc/shared/weakProcessor.inline.hpp
index f77255a8b63..6c0ca15a1ae 100644
--- a/src/hotspot/share/gc/shared/weakProcessor.inline.hpp
+++ b/src/hotspot/share/gc/shared/weakProcessor.inline.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
*
*/
-#ifndef SHARE_VM_GC_SHARED_WEAKPROCESSOR_INLINE_HPP
-#define SHARE_VM_GC_SHARED_WEAKPROCESSOR_INLINE_HPP
+#ifndef SHARE_GC_SHARED_WEAKPROCESSOR_INLINE_HPP
+#define SHARE_GC_SHARED_WEAKPROCESSOR_INLINE_HPP
#include "gc/shared/oopStorage.inline.hpp"
#include "gc/shared/oopStorageParState.inline.hpp"
@@ -116,4 +116,4 @@ void WeakProcessor::weak_oops_do(WorkGang* workers,
pt.log_print_phases(indent_log);
}
-#endif // SHARE_VM_GC_SHARED_WEAKPROCESSOR_INLINE_HPP
+#endif // SHARE_GC_SHARED_WEAKPROCESSOR_INLINE_HPP
diff --git a/src/hotspot/share/gc/shared/workerDataArray.hpp b/src/hotspot/share/gc/shared/workerDataArray.hpp
index 9ccf28369c9..955c805d3e4 100644
--- a/src/hotspot/share/gc/shared/workerDataArray.hpp
+++ b/src/hotspot/share/gc/shared/workerDataArray.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2015, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
*
*/
-#ifndef SHARE_VM_GC_SHARED_WORKERDATAARRAY_HPP
-#define SHARE_VM_GC_SHARED_WORKERDATAARRAY_HPP
+#ifndef SHARE_GC_SHARED_WORKERDATAARRAY_HPP
+#define SHARE_GC_SHARED_WORKERDATAARRAY_HPP
#include "memory/allocation.hpp"
#include "utilities/debug.hpp"
@@ -90,4 +90,4 @@ private:
void print_details_on(outputStream* out) const;
};
-#endif // SHARE_VM_GC_SHARED_WORKERDATAARRAY_HPP
+#endif // SHARE_GC_SHARED_WORKERDATAARRAY_HPP
diff --git a/src/hotspot/share/gc/shared/workerDataArray.inline.hpp b/src/hotspot/share/gc/shared/workerDataArray.inline.hpp
index f511f4f8762..92a57e325b2 100644
--- a/src/hotspot/share/gc/shared/workerDataArray.inline.hpp
+++ b/src/hotspot/share/gc/shared/workerDataArray.inline.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2015, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
*
*/
-#ifndef SHARE_VM_GC_SHARED_WORKERDATAARRAY_INLINE_HPP
-#define SHARE_VM_GC_SHARED_WORKERDATAARRAY_INLINE_HPP
+#ifndef SHARE_GC_SHARED_WORKERDATAARRAY_INLINE_HPP
+#define SHARE_GC_SHARED_WORKERDATAARRAY_INLINE_HPP
#include "gc/shared/workerDataArray.hpp"
#include "memory/allocation.inline.hpp"
@@ -177,4 +177,4 @@ void WorkerDataArray::reset() {
}
}
-#endif // SHARE_VM_GC_SHARED_WORKERDATAARRAY_INLINE_HPP
+#endif // SHARE_GC_SHARED_WORKERDATAARRAY_INLINE_HPP
diff --git a/src/hotspot/share/gc/shared/workerManager.hpp b/src/hotspot/share/gc/shared/workerManager.hpp
index 02cd50f158d..2502506387a 100644
--- a/src/hotspot/share/gc/shared/workerManager.hpp
+++ b/src/hotspot/share/gc/shared/workerManager.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2016, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -22,13 +22,13 @@
*
*/
-#ifndef SHARE_VM_GC_SHARED_WORKERMANAGER_HPP
-#define SHARE_VM_GC_SHARED_WORKERMANAGER_HPP
+#ifndef SHARE_GC_SHARED_WORKERMANAGER_HPP
+#define SHARE_GC_SHARED_WORKERMANAGER_HPP
#include "logging/log.hpp"
#include "memory/allocation.hpp"
-#include "runtime/os.inline.hpp"
-#include "runtime/thread.inline.hpp"
+#include "runtime/os.hpp"
+#include "runtime/thread.hpp"
#include "utilities/globalDefinitions.hpp"
class WorkerManager : public AllStatic {
@@ -115,4 +115,4 @@ void WorkerManager::log_worker_creation(WorkerType* holder,
}
}
-#endif // SHARE_VM_GC_SHARED_WORKERMANAGER_HPP
+#endif // SHARE_GC_SHARED_WORKERMANAGER_HPP
diff --git a/src/hotspot/share/gc/shared/workerPolicy.hpp b/src/hotspot/share/gc/shared/workerPolicy.hpp
index 407c5424568..b4d1a3efefd 100644
--- a/src/hotspot/share/gc/shared/workerPolicy.hpp
+++ b/src/hotspot/share/gc/shared/workerPolicy.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
*
*/
-#ifndef SHARE_VM_GC_SHARED_WORKERPOLICY_HPP
-#define SHARE_VM_GC_SHARED_WORKERPOLICY_HPP
+#ifndef SHARE_GC_SHARED_WORKERPOLICY_HPP
+#define SHARE_GC_SHARED_WORKERPOLICY_HPP
#include "memory/allocation.hpp"
#include "utilities/globalDefinitions.hpp"
@@ -78,4 +78,4 @@ public:
};
-#endif // SHARE_VM_GC_SHARED_WORKERPOLICY_HPP
+#endif // SHARE_GC_SHARED_WORKERPOLICY_HPP
diff --git a/src/hotspot/share/gc/shared/workgroup.hpp b/src/hotspot/share/gc/shared/workgroup.hpp
index 80dc5c5106c..fc85ba89775 100644
--- a/src/hotspot/share/gc/shared/workgroup.hpp
+++ b/src/hotspot/share/gc/shared/workgroup.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2002, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
*
*/
-#ifndef SHARE_VM_GC_SHARED_WORKGROUP_HPP
-#define SHARE_VM_GC_SHARED_WORKGROUP_HPP
+#ifndef SHARE_GC_SHARED_WORKGROUP_HPP
+#define SHARE_GC_SHARED_WORKGROUP_HPP
#include "memory/allocation.hpp"
#include "runtime/globals.hpp"
@@ -406,4 +406,4 @@ public:
bool all_tasks_completed();
};
-#endif // SHARE_VM_GC_SHARED_WORKGROUP_HPP
+#endif // SHARE_GC_SHARED_WORKGROUP_HPP
diff --git a/src/hotspot/share/gc/shenandoah/c1/shenandoahBarrierSetC1.hpp b/src/hotspot/share/gc/shenandoah/c1/shenandoahBarrierSetC1.hpp
index 986bbc94829..73e673466ae 100644
--- a/src/hotspot/share/gc/shenandoah/c1/shenandoahBarrierSetC1.hpp
+++ b/src/hotspot/share/gc/shenandoah/c1/shenandoahBarrierSetC1.hpp
@@ -21,8 +21,8 @@
*
*/
-#ifndef SHARE_VM_GC_SHENANDOAH_C1_SHENANDOAHBARRIERSETC1_HPP
-#define SHARE_VM_GC_SHENANDOAH_C1_SHENANDOAHBARRIERSETC1_HPP
+#ifndef SHARE_GC_SHENANDOAH_C1_SHENANDOAHBARRIERSETC1_HPP
+#define SHARE_GC_SHENANDOAH_C1_SHENANDOAHBARRIERSETC1_HPP
#include "c1/c1_CodeStubs.hpp"
#include "gc/shared/c1/barrierSetC1.hpp"
@@ -210,4 +210,4 @@ public:
virtual void generate_c1_runtime_stubs(BufferBlob* buffer_blob);
};
-#endif // SHARE_VM_GC_SHENANDOAH_C1_SHENANDOAHBARRIERSETC1_HPP
+#endif // SHARE_GC_SHENANDOAH_C1_SHENANDOAHBARRIERSETC1_HPP
diff --git a/src/hotspot/share/gc/shenandoah/c2/shenandoahBarrierSetC2.cpp b/src/hotspot/share/gc/shenandoah/c2/shenandoahBarrierSetC2.cpp
index 20f90f50e00..263f3972d1e 100644
--- a/src/hotspot/share/gc/shenandoah/c2/shenandoahBarrierSetC2.cpp
+++ b/src/hotspot/share/gc/shenandoah/c2/shenandoahBarrierSetC2.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, Red Hat, Inc. All rights reserved.
+ * Copyright (c) 2018, 2019, Red Hat, Inc. All rights reserved.
*
* This code is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License version 2 only, as
@@ -22,9 +22,11 @@
*/
#include "precompiled.hpp"
+#include "gc/shared/barrierSet.hpp"
#include "gc/shenandoah/shenandoahHeap.hpp"
#include "gc/shenandoah/shenandoahHeuristics.hpp"
#include "gc/shenandoah/shenandoahRuntime.hpp"
+#include "gc/shenandoah/shenandoahThreadLocalData.hpp"
#include "gc/shenandoah/c2/shenandoahBarrierSetC2.hpp"
#include "gc/shenandoah/c2/shenandoahSupport.hpp"
#include "opto/arraycopynode.hpp"
@@ -775,11 +777,19 @@ Node* ShenandoahBarrierSetC2::atomic_cmpxchg_val_at_resolved(C2AtomicParseAccess
if (adr->bottom_type()->is_ptr_to_narrowoop()) {
Node *newval_enc = kit->gvn().transform(new EncodePNode(new_val, new_val->bottom_type()->make_narrowoop()));
Node *oldval_enc = kit->gvn().transform(new EncodePNode(expected_val, expected_val->bottom_type()->make_narrowoop()));
- load_store = kit->gvn().transform(new ShenandoahCompareAndExchangeNNode(kit->control(), mem, adr, newval_enc, oldval_enc, adr_type, value_type->make_narrowoop(), mo));
+ if (ShenandoahCASBarrier) {
+ load_store = kit->gvn().transform(new ShenandoahCompareAndExchangeNNode(kit->control(), mem, adr, newval_enc, oldval_enc, adr_type, value_type->make_narrowoop(), mo));
+ } else {
+ load_store = kit->gvn().transform(new CompareAndExchangeNNode(kit->control(), mem, adr, newval_enc, oldval_enc, adr_type, value_type->make_narrowoop(), mo));
+ }
} else
#endif
{
- load_store = kit->gvn().transform(new ShenandoahCompareAndExchangePNode(kit->control(), mem, adr, new_val, expected_val, adr_type, value_type->is_oopptr(), mo));
+ if (ShenandoahCASBarrier) {
+ load_store = kit->gvn().transform(new ShenandoahCompareAndExchangePNode(kit->control(), mem, adr, new_val, expected_val, adr_type, value_type->is_oopptr(), mo));
+ } else {
+ load_store = kit->gvn().transform(new CompareAndExchangePNode(kit->control(), mem, adr, new_val, expected_val, adr_type, value_type->is_oopptr(), mo));
+ }
}
access.set_raw_access(load_store);
@@ -813,18 +823,34 @@ Node* ShenandoahBarrierSetC2::atomic_cmpxchg_bool_at_resolved(C2AtomicParseAcces
if (adr->bottom_type()->is_ptr_to_narrowoop()) {
Node *newval_enc = kit->gvn().transform(new EncodePNode(new_val, new_val->bottom_type()->make_narrowoop()));
Node *oldval_enc = kit->gvn().transform(new EncodePNode(expected_val, expected_val->bottom_type()->make_narrowoop()));
- if (is_weak_cas) {
- load_store = kit->gvn().transform(new ShenandoahWeakCompareAndSwapNNode(kit->control(), mem, adr, newval_enc, oldval_enc, mo));
+ if (ShenandoahCASBarrier) {
+ if (is_weak_cas) {
+ load_store = kit->gvn().transform(new ShenandoahWeakCompareAndSwapNNode(kit->control(), mem, adr, newval_enc, oldval_enc, mo));
+ } else {
+ load_store = kit->gvn().transform(new ShenandoahCompareAndSwapNNode(kit->control(), mem, adr, newval_enc, oldval_enc, mo));
+ }
} else {
- load_store = kit->gvn().transform(new ShenandoahCompareAndSwapNNode(kit->control(), mem, adr, newval_enc, oldval_enc, mo));
+ if (is_weak_cas) {
+ load_store = kit->gvn().transform(new WeakCompareAndSwapNNode(kit->control(), mem, adr, newval_enc, oldval_enc, mo));
+ } else {
+ load_store = kit->gvn().transform(new CompareAndSwapNNode(kit->control(), mem, adr, newval_enc, oldval_enc, mo));
+ }
}
} else
#endif
{
- if (is_weak_cas) {
- load_store = kit->gvn().transform(new ShenandoahWeakCompareAndSwapPNode(kit->control(), mem, adr, new_val, expected_val, mo));
+ if (ShenandoahCASBarrier) {
+ if (is_weak_cas) {
+ load_store = kit->gvn().transform(new ShenandoahWeakCompareAndSwapPNode(kit->control(), mem, adr, new_val, expected_val, mo));
+ } else {
+ load_store = kit->gvn().transform(new ShenandoahCompareAndSwapPNode(kit->control(), mem, adr, new_val, expected_val, mo));
+ }
} else {
- load_store = kit->gvn().transform(new ShenandoahCompareAndSwapPNode(kit->control(), mem, adr, new_val, expected_val, mo));
+ if (is_weak_cas) {
+ load_store = kit->gvn().transform(new WeakCompareAndSwapPNode(kit->control(), mem, adr, new_val, expected_val, mo));
+ } else {
+ load_store = kit->gvn().transform(new CompareAndSwapPNode(kit->control(), mem, adr, new_val, expected_val, mo));
+ }
}
}
access.set_raw_access(load_store);
@@ -983,7 +1009,7 @@ void ShenandoahBarrierSetC2::clone_barrier_at_expansion(ArrayCopyNode* ac, Node*
Node* c = new ProjNode(call,TypeFunc::Control);
c = igvn.transform(c);
Node* m = new ProjNode(call, TypeFunc::Memory);
- c = igvn.transform(m);
+ m = igvn.transform(m);
Node* dest = ac->in(ArrayCopyNode::Dest);
assert(dest->is_AddP(), "bad input");
diff --git a/src/hotspot/share/gc/shenandoah/c2/shenandoahBarrierSetC2.hpp b/src/hotspot/share/gc/shenandoah/c2/shenandoahBarrierSetC2.hpp
index 7631bc38b23..b2ed04dc43c 100644
--- a/src/hotspot/share/gc/shenandoah/c2/shenandoahBarrierSetC2.hpp
+++ b/src/hotspot/share/gc/shenandoah/c2/shenandoahBarrierSetC2.hpp
@@ -21,8 +21,8 @@
*
*/
-#ifndef SHARE_VM_GC_SHENANDOAH_C2_SHENANDOAHBARRIERSETC2_HPP
-#define SHARE_VM_GC_SHENANDOAH_C2_SHENANDOAHBARRIERSETC2_HPP
+#ifndef SHARE_GC_SHENANDOAH_C2_SHENANDOAHBARRIERSETC2_HPP
+#define SHARE_GC_SHENANDOAH_C2_SHENANDOAHBARRIERSETC2_HPP
#include "gc/shared/c2/barrierSetC2.hpp"
#include "gc/shenandoah/c2/shenandoahSupport.hpp"
@@ -171,4 +171,4 @@ public:
virtual bool sink_node(PhaseIdealLoop* phase, Node* n, Node* x, Node* x_ctrl, Node* n_ctrl) const;
};
-#endif // SHARE_VM_GC_SHENANDOAH_C2_SHENANDOAHBARRIERSETC2_HPP
+#endif // SHARE_GC_SHENANDOAH_C2_SHENANDOAHBARRIERSETC2_HPP
diff --git a/src/hotspot/share/gc/shenandoah/c2/shenandoahSupport.cpp b/src/hotspot/share/gc/shenandoah/c2/shenandoahSupport.cpp
index 637e5bd1200..bae90b6a0d4 100644
--- a/src/hotspot/share/gc/shenandoah/c2/shenandoahSupport.cpp
+++ b/src/hotspot/share/gc/shenandoah/c2/shenandoahSupport.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2015, 2018, Red Hat, Inc. All rights reserved.
+ * Copyright (c) 2015, 2019, Red Hat, Inc. All rights reserved.
*
* This code is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License version 2 only, as
@@ -30,6 +30,7 @@
#include "gc/shenandoah/shenandoahHeap.hpp"
#include "gc/shenandoah/shenandoahHeapRegion.hpp"
#include "gc/shenandoah/shenandoahRuntime.hpp"
+#include "gc/shenandoah/shenandoahThreadLocalData.hpp"
#include "opto/arraycopynode.hpp"
#include "opto/block.hpp"
#include "opto/callnode.hpp"
@@ -97,7 +98,7 @@ bool ShenandoahBarrierNode::needs_barrier_impl(PhaseGVN* phase, ShenandoahBarrie
return false;
}
- if (n->is_CallJava() || n->Opcode() == Op_CallLeafNoFP) {
+ if (n->is_Call()) {
return true;
}
@@ -1023,6 +1024,9 @@ void ShenandoahBarrierNode::verify(RootNode* root) {
"sha512_implCompressMB",
{ { TypeFunc::Parms, ShenandoahLoad }, { TypeFunc::Parms+1, ShenandoahStore }, { -1, ShenandoahNone },
{ -1, ShenandoahNone}, { -1, ShenandoahNone}, { -1, ShenandoahNone} },
+ "encodeBlock",
+ { { TypeFunc::Parms, ShenandoahLoad }, { TypeFunc::Parms+3, ShenandoahStore }, { -1, ShenandoahNone },
+ { -1, ShenandoahNone}, { -1, ShenandoahNone}, { -1, ShenandoahNone} },
};
if (call->is_call_to_arraycopystub()) {
@@ -2659,9 +2663,35 @@ void ShenandoahWriteBarrierNode::pin_and_expand(PhaseIdealLoop* phase) {
wb->pin_and_expand_helper(phase);
}
+ for (uint i = 0; i < enqueue_barriers.size(); i++) {
+ Node* barrier = enqueue_barriers.at(i);
+ Node* ctrl = phase->get_ctrl(barrier);
+ IdealLoopTree* loop = phase->get_loop(ctrl);
+ if (loop->_head->is_OuterStripMinedLoop()) {
+ // Expanding a barrier here will break loop strip mining
+ // verification. Transform the loop so the loop nest doesn't
+ // appear as strip mined.
+ OuterStripMinedLoopNode* outer = loop->_head->as_OuterStripMinedLoop();
+ hide_strip_mined_loop(outer, outer->unique_ctrl_out()->as_CountedLoop(), phase);
+ }
+ }
+
+ for (int i = ShenandoahBarrierSetC2::bsc2()->state()->shenandoah_barriers_count(); i > 0; i--) {
+ int cnt = ShenandoahBarrierSetC2::bsc2()->state()->shenandoah_barriers_count();
+ ShenandoahWriteBarrierNode* wb = ShenandoahBarrierSetC2::bsc2()->state()->shenandoah_barrier(i-1);
+ Node* ctrl = phase->get_ctrl(wb);
+ IdealLoopTree* loop = phase->get_loop(ctrl);
+ if (loop->_head->is_OuterStripMinedLoop()) {
+ // Expanding a barrier here will break loop strip mining
+ // verification. Transform the loop so the loop nest doesn't
+ // appear as strip mined.
+ OuterStripMinedLoopNode* outer = loop->_head->as_OuterStripMinedLoop();
+ hide_strip_mined_loop(outer, outer->unique_ctrl_out()->as_CountedLoop(), phase);
+ }
+ }
+
MemoryGraphFixer fixer(Compile::AliasIdxRaw, true, phase);
Unique_Node_List uses_to_ignore;
- Unique_Node_List outer_lsms;
for (uint i = 0; i < enqueue_barriers.size(); i++) {
Node* barrier = enqueue_barriers.at(i);
Node* pre_val = barrier->in(1);
@@ -2685,9 +2715,6 @@ void ShenandoahWriteBarrierNode::pin_and_expand(PhaseIdealLoop* phase) {
Node* init_ctrl = ctrl;
IdealLoopTree* loop = phase->get_loop(ctrl);
- if (loop->_head->is_OuterStripMinedLoop()) {
- outer_lsms.push(loop->_head);
- }
Node* raw_mem = fixer.find_mem(ctrl, barrier);
Node* init_raw_mem = raw_mem;
Node* raw_mem_for_ctrl = fixer.find_mem(ctrl, NULL);
@@ -2832,9 +2859,6 @@ void ShenandoahWriteBarrierNode::pin_and_expand(PhaseIdealLoop* phase) {
Node* val = wb->in(ValueIn);
Node* wbproj = wb->find_out_with(Op_ShenandoahWBMemProj);
IdealLoopTree *loop = phase->get_loop(ctrl);
- if (loop->_head->is_OuterStripMinedLoop()) {
- outer_lsms.push(loop->_head);
- }
assert(val->Opcode() != Op_ShenandoahWriteBarrier, "No chain of write barriers");
@@ -3019,14 +3043,6 @@ void ShenandoahWriteBarrierNode::pin_and_expand(PhaseIdealLoop* phase) {
}
assert(ShenandoahBarrierSetC2::bsc2()->state()->shenandoah_barriers_count() == 0, "all write barrier nodes should have been replaced");
-
- for (uint i = 0; i < outer_lsms.size(); i++) {
- // Expanding a barrier here will break loop strip mining
- // verification. Transform the loop so the loop nest doesn't
- // appear as strip mined.
- OuterStripMinedLoopNode* outer = outer_lsms.at(i)->as_OuterStripMinedLoop();
- hide_strip_mined_loop(outer, outer->unique_ctrl_out()->as_CountedLoop(), phase);
- }
}
void ShenandoahWriteBarrierNode::move_heap_stable_test_out_of_loop(IfNode* iff, PhaseIdealLoop* phase) {
@@ -4274,5 +4290,3 @@ void MemoryGraphFixer::remove(Node* n) {
_memory_nodes.map(c->_idx, mem->in(ShenandoahWBMemProjNode::WriteBarrier)->in(ShenandoahBarrierNode::Memory));
}
}
-
-
diff --git a/src/hotspot/share/gc/shenandoah/c2/shenandoahSupport.hpp b/src/hotspot/share/gc/shenandoah/c2/shenandoahSupport.hpp
index 39cd7855e2b..7ed9ab536e9 100644
--- a/src/hotspot/share/gc/shenandoah/c2/shenandoahSupport.hpp
+++ b/src/hotspot/share/gc/shenandoah/c2/shenandoahSupport.hpp
@@ -21,8 +21,8 @@
*
*/
-#ifndef SHARE_VM_GC_SHENANDOAH_C2_SHENANDOAH_SUPPORT_HPP
-#define SHARE_VM_GC_SHENANDOAH_C2_SHENANDOAH_SUPPORT_HPP
+#ifndef SHARE_GC_SHENANDOAH_C2_SHENANDOAHSUPPORT_HPP
+#define SHARE_GC_SHENANDOAH_C2_SHENANDOAHSUPPORT_HPP
#include "gc/shenandoah/shenandoahBrooksPointer.hpp"
#include "memory/allocation.hpp"
@@ -382,4 +382,4 @@ public:
virtual int Opcode() const;
};
-#endif // SHARE_VM_GC_SHENANDOAH_C2_SHENANDOAH_SUPPORT_HPP
+#endif // SHARE_GC_SHENANDOAH_C2_SHENANDOAHSUPPORT_HPP
diff --git a/src/hotspot/share/gc/shenandoah/heuristics/shenandoahAdaptiveHeuristics.hpp b/src/hotspot/share/gc/shenandoah/heuristics/shenandoahAdaptiveHeuristics.hpp
index 8a05958b4c2..b285b17a041 100644
--- a/src/hotspot/share/gc/shenandoah/heuristics/shenandoahAdaptiveHeuristics.hpp
+++ b/src/hotspot/share/gc/shenandoah/heuristics/shenandoahAdaptiveHeuristics.hpp
@@ -21,8 +21,8 @@
*
*/
-#ifndef SHARE_VM_GC_SHENANDOAH_HEURISTICS_SHENANDOAHADAPTIVEHEURISTICS_HPP
-#define SHARE_VM_GC_SHENANDOAH_HEURISTICS_SHENANDOAHADAPTIVEHEURISTICS_HPP
+#ifndef SHARE_GC_SHENANDOAH_HEURISTICS_SHENANDOAHADAPTIVEHEURISTICS_HPP
+#define SHARE_GC_SHENANDOAH_HEURISTICS_SHENANDOAHADAPTIVEHEURISTICS_HPP
#include "gc/shenandoah/shenandoahHeuristics.hpp"
#include "gc/shenandoah/shenandoahPhaseTimings.hpp"
@@ -58,4 +58,4 @@ public:
virtual bool is_experimental();
};
-#endif // SHARE_VM_GC_SHENANDOAH_HEURISTICS_SHENANDOAHADAPTIVEHEURISTICS_HPP
+#endif // SHARE_GC_SHENANDOAH_HEURISTICS_SHENANDOAHADAPTIVEHEURISTICS_HPP
diff --git a/src/hotspot/share/gc/shenandoah/heuristics/shenandoahAggressiveHeuristics.hpp b/src/hotspot/share/gc/shenandoah/heuristics/shenandoahAggressiveHeuristics.hpp
index f7c5658dd1a..cb2b9ef3558 100644
--- a/src/hotspot/share/gc/shenandoah/heuristics/shenandoahAggressiveHeuristics.hpp
+++ b/src/hotspot/share/gc/shenandoah/heuristics/shenandoahAggressiveHeuristics.hpp
@@ -21,8 +21,8 @@
*
*/
-#ifndef SHARE_VM_GC_SHENANDOAH_HEURISTICS_SHENANDOAHAGGRESSIVEHEURISTICS_HPP
-#define SHARE_VM_GC_SHENANDOAH_HEURISTICS_SHENANDOAHAGGRESSIVEHEURISTICS_HPP
+#ifndef SHARE_GC_SHENANDOAH_HEURISTICS_SHENANDOAHAGGRESSIVEHEURISTICS_HPP
+#define SHARE_GC_SHENANDOAH_HEURISTICS_SHENANDOAHAGGRESSIVEHEURISTICS_HPP
#include "gc/shenandoah/shenandoahHeuristics.hpp"
@@ -47,4 +47,4 @@ public:
virtual bool is_experimental();
};
-#endif // SHARE_VM_GC_SHENANDOAH_HEURISTICS_SHENANDOAHAGGRESSIVEHEURISTICS_HPP
+#endif // SHARE_GC_SHENANDOAH_HEURISTICS_SHENANDOAHAGGRESSIVEHEURISTICS_HPP
diff --git a/src/hotspot/share/gc/shenandoah/heuristics/shenandoahCompactHeuristics.hpp b/src/hotspot/share/gc/shenandoah/heuristics/shenandoahCompactHeuristics.hpp
index 28d3f705c24..94c0489f951 100644
--- a/src/hotspot/share/gc/shenandoah/heuristics/shenandoahCompactHeuristics.hpp
+++ b/src/hotspot/share/gc/shenandoah/heuristics/shenandoahCompactHeuristics.hpp
@@ -21,8 +21,8 @@
*
*/
-#ifndef SHARE_VM_GC_SHENANDOAH_HEURISTICS_SHENANDOAHCOMPACTHEURISTICS_HPP
-#define SHARE_VM_GC_SHENANDOAH_HEURISTICS_SHENANDOAHCOMPACTHEURISTICS_HPP
+#ifndef SHARE_GC_SHENANDOAH_HEURISTICS_SHENANDOAHCOMPACTHEURISTICS_HPP
+#define SHARE_GC_SHENANDOAH_HEURISTICS_SHENANDOAHCOMPACTHEURISTICS_HPP
#include "gc/shenandoah/shenandoahHeuristics.hpp"
@@ -43,4 +43,4 @@ public:
virtual bool is_experimental();
};
-#endif // SHARE_VM_GC_SHENANDOAH_HEURISTICS_SHENANDOAHCOMPACTHEURISTICS_HPP
+#endif // SHARE_GC_SHENANDOAH_HEURISTICS_SHENANDOAHCOMPACTHEURISTICS_HPP
diff --git a/src/hotspot/share/gc/shenandoah/heuristics/shenandoahPassiveHeuristics.hpp b/src/hotspot/share/gc/shenandoah/heuristics/shenandoahPassiveHeuristics.hpp
index 57191b04961..16d65a63449 100644
--- a/src/hotspot/share/gc/shenandoah/heuristics/shenandoahPassiveHeuristics.hpp
+++ b/src/hotspot/share/gc/shenandoah/heuristics/shenandoahPassiveHeuristics.hpp
@@ -21,8 +21,8 @@
*
*/
-#ifndef SHARE_VM_GC_SHENANDOAH_HEURISTICS_SHENANDOAHPASSIVEHEURISTICS_HPP
-#define SHARE_VM_GC_SHENANDOAH_HEURISTICS_SHENANDOAHPASSIVEHEURISTICS_HPP
+#ifndef SHARE_GC_SHENANDOAH_HEURISTICS_SHENANDOAHPASSIVEHEURISTICS_HPP
+#define SHARE_GC_SHENANDOAH_HEURISTICS_SHENANDOAHPASSIVEHEURISTICS_HPP
#include "gc/shenandoah/shenandoahHeuristics.hpp"
@@ -49,4 +49,4 @@ public:
virtual bool is_experimental();
};
-#endif // SHARE_VM_GC_SHENANDOAH_HEURISTICS_SHENANDOAHPASSIVEHEURISTICS_HPP
+#endif // SHARE_GC_SHENANDOAH_HEURISTICS_SHENANDOAHPASSIVEHEURISTICS_HPP
diff --git a/src/hotspot/share/gc/shenandoah/heuristics/shenandoahStaticHeuristics.hpp b/src/hotspot/share/gc/shenandoah/heuristics/shenandoahStaticHeuristics.hpp
index 5f20c86b971..f71193232d0 100644
--- a/src/hotspot/share/gc/shenandoah/heuristics/shenandoahStaticHeuristics.hpp
+++ b/src/hotspot/share/gc/shenandoah/heuristics/shenandoahStaticHeuristics.hpp
@@ -21,8 +21,8 @@
*
*/
-#ifndef SHARE_VM_GC_SHENANDOAH_HEURISTICS_SHENANDOAHSTATICHEURISTICS_HPP
-#define SHARE_VM_GC_SHENANDOAH_HEURISTICS_SHENANDOAHSTATICHEURISTICS_HPP
+#ifndef SHARE_GC_SHENANDOAH_HEURISTICS_SHENANDOAHSTATICHEURISTICS_HPP
+#define SHARE_GC_SHENANDOAH_HEURISTICS_SHENANDOAHSTATICHEURISTICS_HPP
#include "gc/shenandoah/shenandoahHeuristics.hpp"
@@ -45,4 +45,4 @@ public:
virtual bool is_experimental();
};
-#endif // SHARE_VM_GC_SHENANDOAH_HEURISTICS_SHENANDOAHSTATICHEURISTICS_HPP
+#endif // SHARE_GC_SHENANDOAH_HEURISTICS_SHENANDOAHSTATICHEURISTICS_HPP
diff --git a/src/hotspot/share/gc/shenandoah/heuristics/shenandoahTraversalHeuristics.cpp b/src/hotspot/share/gc/shenandoah/heuristics/shenandoahTraversalHeuristics.cpp
index 09fe79dfd78..c57002c0fda 100644
--- a/src/hotspot/share/gc/shenandoah/heuristics/shenandoahTraversalHeuristics.cpp
+++ b/src/hotspot/share/gc/shenandoah/heuristics/shenandoahTraversalHeuristics.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, Red Hat, Inc. All rights reserved.
+ * Copyright (c) 2018, 2019, Red Hat, Inc. All rights reserved.
*
* This code is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License version 2 only, as
@@ -24,7 +24,9 @@
#include "precompiled.hpp"
#include "gc/shenandoah/heuristics/shenandoahTraversalHeuristics.hpp"
+#include "gc/shenandoah/shenandoahCollectionSet.hpp"
#include "gc/shenandoah/shenandoahFreeSet.hpp"
+#include "gc/shenandoah/shenandoahHeap.inline.hpp"
#include "gc/shenandoah/shenandoahHeuristics.hpp"
#include "gc/shenandoah/shenandoahTraversalGC.hpp"
#include "logging/log.hpp"
diff --git a/src/hotspot/share/gc/shenandoah/heuristics/shenandoahTraversalHeuristics.hpp b/src/hotspot/share/gc/shenandoah/heuristics/shenandoahTraversalHeuristics.hpp
index dedabe34a96..32a945a74a5 100644
--- a/src/hotspot/share/gc/shenandoah/heuristics/shenandoahTraversalHeuristics.hpp
+++ b/src/hotspot/share/gc/shenandoah/heuristics/shenandoahTraversalHeuristics.hpp
@@ -21,8 +21,8 @@
*
*/
-#ifndef SHARE_VM_GC_SHENANDOAH_HEURISTICS_SHENANDOAHTRAVERSALHEURISTICS_HPP
-#define SHARE_VM_GC_SHENANDOAH_HEURISTICS_SHENANDOAHTRAVERSALHEURISTICS_HPP
+#ifndef SHARE_GC_SHENANDOAH_HEURISTICS_SHENANDOAHTRAVERSALHEURISTICS_HPP
+#define SHARE_GC_SHENANDOAH_HEURISTICS_SHENANDOAHTRAVERSALHEURISTICS_HPP
#include "gc/shenandoah/shenandoahHeuristics.hpp"
@@ -53,4 +53,4 @@ public:
virtual bool should_start_traversal_gc();
};
-#endif // SHARE_VM_GC_SHENANDOAH_HEURISTICS_SHENANDOAHTRAVERSALHEURISTICS_HPP
+#endif // SHARE_GC_SHENANDOAH_HEURISTICS_SHENANDOAHTRAVERSALHEURISTICS_HPP
diff --git a/src/hotspot/share/gc/shenandoah/shenandoahAllocRequest.hpp b/src/hotspot/share/gc/shenandoah/shenandoahAllocRequest.hpp
index ae9d4f3a733..16f7d0208e8 100644
--- a/src/hotspot/share/gc/shenandoah/shenandoahAllocRequest.hpp
+++ b/src/hotspot/share/gc/shenandoah/shenandoahAllocRequest.hpp
@@ -21,8 +21,8 @@
*
*/
-#ifndef SHARE_VM_GC_SHENANDOAH_SHENANDOAHALLOCREQUEST_HPP
-#define SHARE_VM_GC_SHENANDOAH_SHENANDOAHALLOCREQUEST_HPP
+#ifndef SHARE_GC_SHENANDOAH_SHENANDOAHALLOCREQUEST_HPP
+#define SHARE_GC_SHENANDOAH_SHENANDOAHALLOCREQUEST_HPP
#include "memory/allocation.hpp"
@@ -155,4 +155,4 @@ public:
}
};
-#endif // SHARE_VM_GC_SHENANDOAH_SHENANDOAHALLOCREQUEST_HPP
+#endif // SHARE_GC_SHENANDOAH_SHENANDOAHALLOCREQUEST_HPP
diff --git a/src/hotspot/share/gc/shenandoah/shenandoahAllocTracker.hpp b/src/hotspot/share/gc/shenandoah/shenandoahAllocTracker.hpp
index 56986c5a292..8aa3df7b058 100644
--- a/src/hotspot/share/gc/shenandoah/shenandoahAllocTracker.hpp
+++ b/src/hotspot/share/gc/shenandoah/shenandoahAllocTracker.hpp
@@ -21,8 +21,8 @@
*
*/
-#ifndef SHARE_VM_GC_SHENANDOAH_SHENANDOAHALLOCTRACKER_HPP
-#define SHARE_VM_GC_SHENANDOAH_SHENANDOAHALLOCTRACKER_HPP
+#ifndef SHARE_GC_SHENANDOAH_SHENANDOAHALLOCTRACKER_HPP
+#define SHARE_GC_SHENANDOAH_SHENANDOAHALLOCTRACKER_HPP
#include "gc/shenandoah/shenandoahAllocRequest.hpp"
#include "gc/shenandoah/shenandoahNumberSeq.hpp"
@@ -45,4 +45,4 @@ public:
void print_on(outputStream* out) const;
};
-#endif // SHARE_VM_GC_SHENANDOAH_SHENANDOAHALLOCTRACKER_HPP
+#endif // SHARE_GC_SHENANDOAH_SHENANDOAHALLOCTRACKER_HPP
diff --git a/src/hotspot/share/gc/shenandoah/shenandoahArguments.cpp b/src/hotspot/share/gc/shenandoah/shenandoahArguments.cpp
index 581e69acbab..907a91a58bb 100644
--- a/src/hotspot/share/gc/shenandoah/shenandoahArguments.cpp
+++ b/src/hotspot/share/gc/shenandoah/shenandoahArguments.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, Red Hat, Inc. All rights reserved.
+ * Copyright (c) 2018, 2019, Red Hat, Inc. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -27,7 +27,7 @@
#include "gc/shared/workerPolicy.hpp"
#include "gc/shenandoah/shenandoahArguments.hpp"
#include "gc/shenandoah/shenandoahCollectorPolicy.hpp"
-#include "gc/shenandoah/shenandoahHeap.hpp"
+#include "gc/shenandoah/shenandoahHeap.inline.hpp"
#include "gc/shenandoah/shenandoahHeapRegion.hpp"
#include "gc/shenandoah/shenandoahTaskqueue.hpp"
#include "utilities/defaultStream.hpp"
diff --git a/src/hotspot/share/gc/shenandoah/shenandoahAsserts.cpp b/src/hotspot/share/gc/shenandoah/shenandoahAsserts.cpp
index 8277d8094b1..7f31dcd973b 100644
--- a/src/hotspot/share/gc/shenandoah/shenandoahAsserts.cpp
+++ b/src/hotspot/share/gc/shenandoah/shenandoahAsserts.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, Red Hat, Inc. All rights reserved.
+ * Copyright (c) 2018, 2019, Red Hat, Inc. All rights reserved.
*
* This code is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License version 2 only, as
@@ -25,7 +25,6 @@
#include "gc/shenandoah/shenandoahAsserts.hpp"
#include "gc/shenandoah/shenandoahBrooksPointer.hpp"
-#include "gc/shenandoah/shenandoahHeap.hpp"
#include "gc/shenandoah/shenandoahHeap.inline.hpp"
#include "gc/shenandoah/shenandoahHeapRegionSet.inline.hpp"
#include "gc/shenandoah/shenandoahMarkingContext.inline.hpp"
diff --git a/src/hotspot/share/gc/shenandoah/shenandoahAsserts.hpp b/src/hotspot/share/gc/shenandoah/shenandoahAsserts.hpp
index ae014ddbdf1..212d51beb1b 100644
--- a/src/hotspot/share/gc/shenandoah/shenandoahAsserts.hpp
+++ b/src/hotspot/share/gc/shenandoah/shenandoahAsserts.hpp
@@ -21,8 +21,8 @@
*
*/
-#ifndef SHARE_VM_GC_SHENANDOAH_SHENANDOAHASSERTS_HPP
-#define SHARE_VM_GC_SHENANDOAH_SHENANDOAHASSERTS_HPP
+#ifndef SHARE_GC_SHENANDOAH_SHENANDOAHASSERTS_HPP
+#define SHARE_GC_SHENANDOAH_SHENANDOAHASSERTS_HPP
#include "memory/iterator.hpp"
#include "utilities/formatBuffer.hpp"
@@ -167,4 +167,4 @@ public:
};
-#endif //SHARE_VM_GC_SHENANDOAH_SHENANDOAHASSERTS_HPP
+#endif // SHARE_GC_SHENANDOAH_SHENANDOAHASSERTS_HPP
diff --git a/src/hotspot/share/gc/shenandoah/shenandoahBarrierSet.hpp b/src/hotspot/share/gc/shenandoah/shenandoahBarrierSet.hpp
index 4a07da645a0..b6cbb84a4fd 100644
--- a/src/hotspot/share/gc/shenandoah/shenandoahBarrierSet.hpp
+++ b/src/hotspot/share/gc/shenandoah/shenandoahBarrierSet.hpp
@@ -21,8 +21,8 @@
*
*/
-#ifndef SHARE_VM_GC_SHENANDOAH_SHENANDOAHBARRIERSET_HPP
-#define SHARE_VM_GC_SHENANDOAH_SHENANDOAHBARRIERSET_HPP
+#ifndef SHARE_GC_SHENANDOAH_SHENANDOAHBARRIERSET_HPP
+#define SHARE_GC_SHENANDOAH_SHENANDOAHBARRIERSET_HPP
#include "gc/shared/accessBarrierSupport.hpp"
#include "gc/shared/barrierSet.hpp"
@@ -293,4 +293,4 @@ struct BarrierSet::GetType {
typedef ::ShenandoahBarrierSet type;
};
-#endif //SHARE_VM_GC_SHENANDOAH_SHENANDOAHBARRIERSET_HPP
+#endif // SHARE_GC_SHENANDOAH_SHENANDOAHBARRIERSET_HPP
diff --git a/src/hotspot/share/gc/shenandoah/shenandoahBarrierSet.inline.hpp b/src/hotspot/share/gc/shenandoah/shenandoahBarrierSet.inline.hpp
index 1a3977c829d..284b2bc937e 100644
--- a/src/hotspot/share/gc/shenandoah/shenandoahBarrierSet.inline.hpp
+++ b/src/hotspot/share/gc/shenandoah/shenandoahBarrierSet.inline.hpp
@@ -21,8 +21,8 @@
*
*/
-#ifndef SHARE_VM_GC_SHENANDOAH_SHENANDOAHBARRIERSET_INLINE_HPP
-#define SHARE_VM_GC_SHENANDOAH_SHENANDOAHBARRIERSET_INLINE_HPP
+#ifndef SHARE_GC_SHENANDOAH_SHENANDOAHBARRIERSET_INLINE_HPP
+#define SHARE_GC_SHENANDOAH_SHENANDOAHBARRIERSET_INLINE_HPP
#include "gc/shared/barrierSet.hpp"
#include "gc/shenandoah/shenandoahBarrierSet.hpp"
@@ -279,4 +279,4 @@ bool ShenandoahBarrierSet::AccessBarrier::oop_arraycopy
return bs->arraycopy_loop_1(src_raw, dst_raw, length, bound, checkcast, satb, disjoint, storeval_mode);
}
-#endif //SHARE_VM_GC_SHENANDOAH_SHENANDOAHBARRIERSET_INLINE_HPP
+#endif // SHARE_GC_SHENANDOAH_SHENANDOAHBARRIERSET_INLINE_HPP
diff --git a/src/hotspot/share/gc/shenandoah/shenandoahBrooksPointer.hpp b/src/hotspot/share/gc/shenandoah/shenandoahBrooksPointer.hpp
index 8a2704bce53..4234047a5f8 100644
--- a/src/hotspot/share/gc/shenandoah/shenandoahBrooksPointer.hpp
+++ b/src/hotspot/share/gc/shenandoah/shenandoahBrooksPointer.hpp
@@ -21,8 +21,8 @@
*
*/
-#ifndef SHARE_VM_GC_SHENANDOAH_SHENANDOAHBROOKSPOINTER_HPP
-#define SHARE_VM_GC_SHENANDOAH_SHENANDOAHBROOKSPOINTER_HPP
+#ifndef SHARE_GC_SHENANDOAH_SHENANDOAHBROOKSPOINTER_HPP
+#define SHARE_GC_SHENANDOAH_SHENANDOAHBROOKSPOINTER_HPP
#include "oops/oop.hpp"
#include "utilities/globalDefinitions.hpp"
@@ -103,4 +103,4 @@ private:
static inline HeapWord** brooks_ptr_addr(oop obj);
};
-#endif // SHARE_VM_GC_SHENANDOAH_SHENANDOAHBROOKSPOINTER_HPP
+#endif // SHARE_GC_SHENANDOAH_SHENANDOAHBROOKSPOINTER_HPP
diff --git a/src/hotspot/share/gc/shenandoah/shenandoahBrooksPointer.inline.hpp b/src/hotspot/share/gc/shenandoah/shenandoahBrooksPointer.inline.hpp
index b63ab2022d3..7b6c7a5836b 100644
--- a/src/hotspot/share/gc/shenandoah/shenandoahBrooksPointer.inline.hpp
+++ b/src/hotspot/share/gc/shenandoah/shenandoahBrooksPointer.inline.hpp
@@ -21,8 +21,8 @@
*
*/
-#ifndef SHARE_VM_GC_SHENANDOAH_SHENANDOAHBROOKSPOINTER_INLINE_HPP
-#define SHARE_VM_GC_SHENANDOAH_SHENANDOAHBROOKSPOINTER_INLINE_HPP
+#ifndef SHARE_GC_SHENANDOAH_SHENANDOAHBROOKSPOINTER_INLINE_HPP
+#define SHARE_GC_SHENANDOAH_SHENANDOAHBROOKSPOINTER_INLINE_HPP
#include "gc/shenandoah/shenandoahAsserts.hpp"
#include "gc/shenandoah/shenandoahBrooksPointer.hpp"
@@ -62,4 +62,4 @@ inline oop ShenandoahBrooksPointer::try_update_forwardee(oop obj, oop update) {
return result;
}
-#endif // SHARE_VM_GC_SHENANDOAH_SHENANDOAHBROOKSPOINTER_INLINE_HPP
+#endif // SHARE_GC_SHENANDOAH_SHENANDOAHBROOKSPOINTER_INLINE_HPP
diff --git a/src/hotspot/share/gc/shenandoah/shenandoahCodeRoots.cpp b/src/hotspot/share/gc/shenandoah/shenandoahCodeRoots.cpp
index f91a1cc4de2..73f980d6142 100644
--- a/src/hotspot/share/gc/shenandoah/shenandoahCodeRoots.cpp
+++ b/src/hotspot/share/gc/shenandoah/shenandoahCodeRoots.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2017, 2018, Red Hat, Inc. All rights reserved.
+ * Copyright (c) 2017, 2019, Red Hat, Inc. All rights reserved.
*
* This code is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License version 2 only, as
@@ -24,7 +24,6 @@
#include "precompiled.hpp"
#include "code/codeCache.hpp"
#include "code/nmethod.hpp"
-#include "gc/shenandoah/shenandoahHeap.hpp"
#include "gc/shenandoah/shenandoahHeap.inline.hpp"
#include "gc/shenandoah/shenandoahCodeRoots.hpp"
#include "memory/resourceArea.hpp"
diff --git a/src/hotspot/share/gc/shenandoah/shenandoahCodeRoots.hpp b/src/hotspot/share/gc/shenandoah/shenandoahCodeRoots.hpp
index 60ad3f4d180..b6fd59304f9 100644
--- a/src/hotspot/share/gc/shenandoah/shenandoahCodeRoots.hpp
+++ b/src/hotspot/share/gc/shenandoah/shenandoahCodeRoots.hpp
@@ -21,8 +21,8 @@
*
*/
-#ifndef SHARE_VM_GC_SHENANDOAH_SHENANDOAHCODEROOTS_HPP
-#define SHARE_VM_GC_SHENANDOAH_SHENANDOAHCODEROOTS_HPP
+#ifndef SHARE_GC_SHENANDOAH_SHENANDOAHCODEROOTS_HPP
+#define SHARE_GC_SHENANDOAH_SHENANDOAHCODEROOTS_HPP
#include "code/codeCache.hpp"
#include "gc/shenandoah/shenandoahSharedVariables.hpp"
@@ -77,8 +77,8 @@ public:
bool has_cset_oops(ShenandoahHeap* heap);
- void assert_alive_and_correct() PRODUCT_RETURN;
- void assert_same_oops(GrowableArray* oops) PRODUCT_RETURN;
+ void assert_alive_and_correct() NOT_DEBUG_RETURN;
+ void assert_same_oops(GrowableArray* oops) NOT_DEBUG_RETURN;
static bool find_with_nmethod(void* nm, ShenandoahNMethod* other) {
return other->_nm == nm;
@@ -197,4 +197,4 @@ public:
}
};
-#endif //SHARE_VM_GC_SHENANDOAH_SHENANDOAHCODEROOTS_HPP
+#endif // SHARE_GC_SHENANDOAH_SHENANDOAHCODEROOTS_HPP
diff --git a/src/hotspot/share/gc/shenandoah/shenandoahCollectionSet.hpp b/src/hotspot/share/gc/shenandoah/shenandoahCollectionSet.hpp
index 3f4e5ab54e0..c6cb0b898d3 100644
--- a/src/hotspot/share/gc/shenandoah/shenandoahCollectionSet.hpp
+++ b/src/hotspot/share/gc/shenandoah/shenandoahCollectionSet.hpp
@@ -21,8 +21,8 @@
*
*/
-#ifndef SHARE_VM_GC_SHENANDOAH_SHENANDOAHCOLLECTIONSET_HPP
-#define SHARE_VM_GC_SHENANDOAH_SHENANDOAHCOLLECTIONSET_HPP
+#ifndef SHARE_GC_SHENANDOAH_SHENANDOAHCOLLECTIONSET_HPP
+#define SHARE_GC_SHENANDOAH_SHENANDOAHCOLLECTIONSET_HPP
#include "memory/allocation.hpp"
#include "gc/shenandoah/shenandoahHeap.hpp"
@@ -93,4 +93,4 @@ private:
}
};
-#endif //SHARE_VM_GC_SHENANDOAH_SHENANDOAHCOLLECTIONSET_HPP
+#endif // SHARE_GC_SHENANDOAH_SHENANDOAHCOLLECTIONSET_HPP
diff --git a/src/hotspot/share/gc/shenandoah/shenandoahCollectionSet.inline.hpp b/src/hotspot/share/gc/shenandoah/shenandoahCollectionSet.inline.hpp
index 09c0f1368f8..f78b2111f96 100644
--- a/src/hotspot/share/gc/shenandoah/shenandoahCollectionSet.inline.hpp
+++ b/src/hotspot/share/gc/shenandoah/shenandoahCollectionSet.inline.hpp
@@ -21,8 +21,8 @@
*
*/
-#ifndef SHARE_VM_GC_SHENANDOAH_SHENANDOAHCOLLECTIONSET_INLINE_HPP
-#define SHARE_VM_GC_SHENANDOAH_SHENANDOAHCOLLECTIONSET_INLINE_HPP
+#ifndef SHARE_GC_SHENANDOAH_SHENANDOAHCOLLECTIONSET_INLINE_HPP
+#define SHARE_GC_SHENANDOAH_SHENANDOAHCOLLECTIONSET_INLINE_HPP
#include "gc/shenandoah/shenandoahCollectionSet.hpp"
#include "gc/shenandoah/shenandoahHeap.hpp"
@@ -46,4 +46,4 @@ bool ShenandoahCollectionSet::is_in(HeapWord* p) const {
return _biased_cset_map[index] == 1;
}
-#endif // SHARE_VM_GC_SHENANDOAH_SHENANDOAHCOLLECTIONSET_INLINE_HPP
+#endif // SHARE_GC_SHENANDOAH_SHENANDOAHCOLLECTIONSET_INLINE_HPP
diff --git a/src/hotspot/share/gc/shenandoah/shenandoahCollectorPolicy.hpp b/src/hotspot/share/gc/shenandoah/shenandoahCollectorPolicy.hpp
index d54037e5098..d0034124a9f 100644
--- a/src/hotspot/share/gc/shenandoah/shenandoahCollectorPolicy.hpp
+++ b/src/hotspot/share/gc/shenandoah/shenandoahCollectorPolicy.hpp
@@ -21,8 +21,8 @@
*
*/
-#ifndef SHARE_VM_GC_SHENANDOAH_SHENANDOAHCOLLECTORPOLICY_HPP
-#define SHARE_VM_GC_SHENANDOAH_SHENANDOAHCOLLECTORPOLICY_HPP
+#ifndef SHARE_GC_SHENANDOAH_SHENANDOAHCOLLECTORPOLICY_HPP
+#define SHARE_GC_SHENANDOAH_SHENANDOAHCOLLECTORPOLICY_HPP
#include "gc/shared/collectorPolicy.hpp"
#include "gc/shenandoah/shenandoahHeap.hpp"
@@ -79,4 +79,4 @@ public:
void print_gc_stats(outputStream* out) const;
};
-#endif // SHARE_VM_GC_SHENANDOAH_SHENANDOAHCOLLECTORPOLICY_HPP
+#endif // SHARE_GC_SHENANDOAH_SHENANDOAHCOLLECTORPOLICY_HPP
diff --git a/src/hotspot/share/gc/shenandoah/shenandoahConcurrentMark.cpp b/src/hotspot/share/gc/shenandoah/shenandoahConcurrentMark.cpp
index 01ea1f00d87..7981be94c94 100644
--- a/src/hotspot/share/gc/shenandoah/shenandoahConcurrentMark.cpp
+++ b/src/hotspot/share/gc/shenandoah/shenandoahConcurrentMark.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2013, 2018, Red Hat, Inc. All rights reserved.
+ * Copyright (c) 2013, 2019, Red Hat, Inc. All rights reserved.
*
* This code is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License version 2 only, as
@@ -27,7 +27,6 @@
#include "classfile/systemDictionary.hpp"
#include "code/codeCache.hpp"
-#include "gc/shared/weakProcessor.hpp"
#include "gc/shared/weakProcessor.inline.hpp"
#include "gc/shared/gcTimer.hpp"
#include "gc/shared/referenceProcessor.hpp"
@@ -38,9 +37,7 @@
#include "gc/shenandoah/shenandoahMarkCompact.hpp"
#include "gc/shenandoah/shenandoahHeap.inline.hpp"
#include "gc/shenandoah/shenandoahRootProcessor.hpp"
-#include "gc/shenandoah/shenandoahOopClosures.hpp"
#include "gc/shenandoah/shenandoahOopClosures.inline.hpp"
-#include "gc/shenandoah/shenandoahTaskqueue.hpp"
#include "gc/shenandoah/shenandoahTaskqueue.inline.hpp"
#include "gc/shenandoah/shenandoahTimingTracker.hpp"
#include "gc/shenandoah/shenandoahUtils.hpp"
diff --git a/src/hotspot/share/gc/shenandoah/shenandoahConcurrentMark.hpp b/src/hotspot/share/gc/shenandoah/shenandoahConcurrentMark.hpp
index 1539d6eb6f6..4e25aa4fb70 100644
--- a/src/hotspot/share/gc/shenandoah/shenandoahConcurrentMark.hpp
+++ b/src/hotspot/share/gc/shenandoah/shenandoahConcurrentMark.hpp
@@ -21,8 +21,8 @@
*
*/
-#ifndef SHARE_VM_GC_SHENANDOAH_SHENANDOAHCONCURRENTMARK_HPP
-#define SHARE_VM_GC_SHENANDOAH_SHENANDOAHCONCURRENTMARK_HPP
+#ifndef SHARE_GC_SHENANDOAH_SHENANDOAHCONCURRENTMARK_HPP
+#define SHARE_GC_SHENANDOAH_SHENANDOAHCONCURRENTMARK_HPP
#include "gc/shared/taskqueue.hpp"
#include "gc/shenandoah/shenandoahOopClosures.hpp"
@@ -108,4 +108,4 @@ public:
};
-#endif // SHARE_VM_GC_SHENANDOAH_SHENANDOAHCONCURRENTMARK_HPP
+#endif // SHARE_GC_SHENANDOAH_SHENANDOAHCONCURRENTMARK_HPP
diff --git a/src/hotspot/share/gc/shenandoah/shenandoahConcurrentMark.inline.hpp b/src/hotspot/share/gc/shenandoah/shenandoahConcurrentMark.inline.hpp
index 41db1b0e742..ee282c16ed2 100644
--- a/src/hotspot/share/gc/shenandoah/shenandoahConcurrentMark.inline.hpp
+++ b/src/hotspot/share/gc/shenandoah/shenandoahConcurrentMark.inline.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2015, 2018, Red Hat, Inc. All rights reserved.
+ * Copyright (c) 2015, 2019, Red Hat, Inc. All rights reserved.
*
* This code is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License version 2 only, as
@@ -21,15 +21,15 @@
*
*/
-#ifndef SHARE_VM_GC_SHENANDOAH_SHENANDOAHCONCURRENTMARK_INLINE_HPP
-#define SHARE_VM_GC_SHENANDOAH_SHENANDOAHCONCURRENTMARK_INLINE_HPP
+#ifndef SHARE_GC_SHENANDOAH_SHENANDOAHCONCURRENTMARK_INLINE_HPP
+#define SHARE_GC_SHENANDOAH_SHENANDOAHCONCURRENTMARK_INLINE_HPP
#include "gc/shenandoah/shenandoahAsserts.hpp"
#include "gc/shenandoah/shenandoahBrooksPointer.hpp"
#include "gc/shenandoah/shenandoahBarrierSet.inline.hpp"
#include "gc/shenandoah/shenandoahConcurrentMark.hpp"
#include "gc/shenandoah/shenandoahMarkingContext.inline.hpp"
-#include "gc/shenandoah/shenandoahStringDedup.hpp"
+#include "gc/shenandoah/shenandoahStringDedup.inline.hpp"
#include "gc/shenandoah/shenandoahTaskqueue.inline.hpp"
#include "memory/iterator.inline.hpp"
#include "oops/oop.inline.hpp"
@@ -275,4 +275,4 @@ inline void ShenandoahConcurrentMark::mark_through_ref(T *p, ShenandoahHeap* hea
}
}
-#endif // SHARE_VM_GC_SHENANDOAH_SHENANDOAHCONCURRENTMARK_INLINE_HPP
+#endif // SHARE_GC_SHENANDOAH_SHENANDOAHCONCURRENTMARK_INLINE_HPP
diff --git a/src/hotspot/share/gc/shenandoah/shenandoahControlThread.cpp b/src/hotspot/share/gc/shenandoah/shenandoahControlThread.cpp
index b83e73bc3c0..7b13ccb6940 100644
--- a/src/hotspot/share/gc/shenandoah/shenandoahControlThread.cpp
+++ b/src/hotspot/share/gc/shenandoah/shenandoahControlThread.cpp
@@ -47,7 +47,7 @@ ShenandoahControlThread::ShenandoahControlThread() :
_degen_point(ShenandoahHeap::_degenerated_outside_cycle),
_allocs_seen(0) {
- create_and_start();
+ create_and_start(ShenandoahCriticalControlThreadPriority ? CriticalPriority : NearMaxPriority);
_periodic_task.enroll();
_periodic_satb_flush_task.enroll();
}
@@ -377,19 +377,19 @@ void ShenandoahControlThread::service_concurrent_normal_cycle(GCCause::Cause cau
// Complete marking under STW, and start evacuation
heap->vmop_entry_final_mark();
+ // Final mark might have reclaimed some immediate garbage, kick cleanup to reclaim
+ // the space. This would be the last action if there is nothing to evacuate.
+ heap->entry_cleanup();
+
+ {
+ ShenandoahHeapLocker locker(heap->lock());
+ heap->free_set()->log_status();
+ }
+
// Continue the cycle with evacuation and optional update-refs.
// This may be skipped if there is nothing to evacuate.
// If so, evac_in_progress would be unset by collection set preparation code.
if (heap->is_evacuation_in_progress()) {
- // Final mark had reclaimed some immediate garbage, kick cleanup to reclaim the space
- // for the rest of the cycle, and report current state of free set.
- heap->entry_cleanup();
-
- {
- ShenandoahHeapLocker locker(heap->lock());
- heap->free_set()->log_status();
- }
-
// Concurrently evacuate
heap->entry_evac();
if (check_cancellation_or_degen(ShenandoahHeap::_degenerated_evac)) return;
@@ -403,14 +403,15 @@ void ShenandoahControlThread::service_concurrent_normal_cycle(GCCause::Cause cau
if (check_cancellation_or_degen(ShenandoahHeap::_degenerated_updaterefs)) return;
heap->vmop_entry_final_updaterefs();
+
+ // Update references freed up collection set, kick the cleanup to reclaim the space.
+ heap->entry_cleanup();
+
} else {
heap->vmop_entry_final_evac();
}
}
- // Reclaim space after cycle
- heap->entry_cleanup();
-
// Cycle is complete
heap->heuristics()->record_success_concurrent();
heap->shenandoah_policy()->record_success_concurrent();
diff --git a/src/hotspot/share/gc/shenandoah/shenandoahControlThread.hpp b/src/hotspot/share/gc/shenandoah/shenandoahControlThread.hpp
index 38f79bfc6b5..0888108bbcd 100644
--- a/src/hotspot/share/gc/shenandoah/shenandoahControlThread.hpp
+++ b/src/hotspot/share/gc/shenandoah/shenandoahControlThread.hpp
@@ -21,8 +21,8 @@
*
*/
-#ifndef SHARE_VM_GC_SHENANDOAH_SHENANDOAHSCHEDULERTHREAD_HPP
-#define SHARE_VM_GC_SHENANDOAH_SHENANDOAHSCHEDULERTHREAD_HPP
+#ifndef SHARE_GC_SHENANDOAH_SHENANDOAHCONTROLTHREAD_HPP
+#define SHARE_GC_SHENANDOAH_SHENANDOAHCONTROLTHREAD_HPP
#include "gc/shared/gcCause.hpp"
#include "gc/shared/concurrentGCThread.hpp"
@@ -140,4 +140,4 @@ public:
void print() const;
};
-#endif // SHARE_VM_GC_SHENANDOAH_SHENANDOAHSCHEDULERTHREAD_HPP
+#endif // SHARE_GC_SHENANDOAH_SHENANDOAHCONTROLTHREAD_HPP
diff --git a/src/hotspot/share/gc/shenandoah/shenandoahEvacOOMHandler.hpp b/src/hotspot/share/gc/shenandoah/shenandoahEvacOOMHandler.hpp
index 230ca46ec7d..83071cf40d8 100644
--- a/src/hotspot/share/gc/shenandoah/shenandoahEvacOOMHandler.hpp
+++ b/src/hotspot/share/gc/shenandoah/shenandoahEvacOOMHandler.hpp
@@ -21,8 +21,8 @@
*
*/
-#ifndef SHARE_VM_GC_SHENANDOAH_SHENANDOAHEVACOOMHANDLER_HPP
-#define SHARE_VM_GC_SHENANDOAH_SHENANDOAHEVACOOMHANDLER_HPP
+#ifndef SHARE_GC_SHENANDOAH_SHENANDOAHEVACOOMHANDLER_HPP
+#define SHARE_GC_SHENANDOAH_SHENANDOAHEVACOOMHANDLER_HPP
#include "memory/allocation.hpp"
#include "utilities/globalDefinitions.hpp"
@@ -125,4 +125,4 @@ public:
~ShenandoahEvacOOMScopeLeaver();
};
-#endif // SHARE_VM_GC_SHENANDOAH_SHENANDOAHEVACOOMHANDLER_HPP
+#endif // SHARE_GC_SHENANDOAH_SHENANDOAHEVACOOMHANDLER_HPP
diff --git a/src/hotspot/share/gc/shenandoah/shenandoahFreeSet.hpp b/src/hotspot/share/gc/shenandoah/shenandoahFreeSet.hpp
index 823e07c10b6..546b46448d2 100644
--- a/src/hotspot/share/gc/shenandoah/shenandoahFreeSet.hpp
+++ b/src/hotspot/share/gc/shenandoah/shenandoahFreeSet.hpp
@@ -21,8 +21,8 @@
*
*/
-#ifndef SHARE_VM_GC_SHENANDOAH_SHENANDOAHFREESET_HPP
-#define SHARE_VM_GC_SHENANDOAH_SHENANDOAHFREESET_HPP
+#ifndef SHARE_GC_SHENANDOAH_SHENANDOAHFREESET_HPP
+#define SHARE_GC_SHENANDOAH_SHENANDOAHFREESET_HPP
#include "gc/shenandoah/shenandoahHeapRegionSet.hpp"
#include "gc/shenandoah/shenandoahHeap.hpp"
@@ -42,9 +42,9 @@ private:
size_t _capacity;
size_t _used;
- void assert_bounds() const PRODUCT_RETURN;
- void assert_heaplock_owned_by_current_thread() const PRODUCT_RETURN;
- void assert_heaplock_not_owned_by_current_thread() const PRODUCT_RETURN;
+ void assert_bounds() const NOT_DEBUG_RETURN;
+ void assert_heaplock_owned_by_current_thread() const NOT_DEBUG_RETURN;
+ void assert_heaplock_not_owned_by_current_thread() const NOT_DEBUG_RETURN;
bool is_mutator_free(size_t idx) const;
bool is_collector_free(size_t idx) const;
@@ -94,4 +94,4 @@ public:
void print_on(outputStream* out) const;
};
-#endif //SHARE_VM_GC_SHENANDOAH_SHENANDOAHFREESET_HPP
+#endif // SHARE_GC_SHENANDOAH_SHENANDOAHFREESET_HPP
diff --git a/src/hotspot/share/gc/shenandoah/shenandoahHeap.cpp b/src/hotspot/share/gc/shenandoah/shenandoahHeap.cpp
index d6980ab9f5a..539eb4dfb87 100644
--- a/src/hotspot/share/gc/shenandoah/shenandoahHeap.cpp
+++ b/src/hotspot/share/gc/shenandoah/shenandoahHeap.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2013, 2018, Red Hat, Inc. All rights reserved.
+ * Copyright (c) 2013, 2019, Red Hat, Inc. All rights reserved.
*
* This code is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License version 2 only, as
@@ -35,7 +35,6 @@
#include "gc/shenandoah/shenandoahBrooksPointer.hpp"
#include "gc/shenandoah/shenandoahCollectionSet.hpp"
#include "gc/shenandoah/shenandoahCollectorPolicy.hpp"
-#include "gc/shenandoah/shenandoahConcurrentMark.hpp"
#include "gc/shenandoah/shenandoahConcurrentMark.inline.hpp"
#include "gc/shenandoah/shenandoahControlThread.hpp"
#include "gc/shenandoah/shenandoahFreeSet.hpp"
@@ -49,7 +48,6 @@
#include "gc/shenandoah/shenandoahMetrics.hpp"
#include "gc/shenandoah/shenandoahMonitoringSupport.hpp"
#include "gc/shenandoah/shenandoahOopClosures.inline.hpp"
-#include "gc/shenandoah/shenandoahPacer.hpp"
#include "gc/shenandoah/shenandoahPacer.inline.hpp"
#include "gc/shenandoah/shenandoahRootProcessor.hpp"
#include "gc/shenandoah/shenandoahStringDedup.hpp"
@@ -1930,13 +1928,6 @@ void ShenandoahHeap::unload_classes_and_cleanup_tables(bool full_gc) {
_workers->run_task(&unlink_task);
}
- if (ShenandoahStringDedup::is_enabled()) {
- ShenandoahGCPhase phase(full_gc ?
- ShenandoahPhaseTimings::full_gc_purge_string_dedup :
- ShenandoahPhaseTimings::purge_string_dedup);
- ShenandoahStringDedup::parallel_cleanup();
- }
-
{
ShenandoahGCPhase phase(full_gc ?
ShenandoahPhaseTimings::full_gc_purge_cldg :
diff --git a/src/hotspot/share/gc/shenandoah/shenandoahHeap.hpp b/src/hotspot/share/gc/shenandoah/shenandoahHeap.hpp
index feef98f4834..caa430a4483 100644
--- a/src/hotspot/share/gc/shenandoah/shenandoahHeap.hpp
+++ b/src/hotspot/share/gc/shenandoah/shenandoahHeap.hpp
@@ -21,8 +21,8 @@
*
*/
-#ifndef SHARE_VM_GC_SHENANDOAH_SHENANDOAHHEAP_HPP
-#define SHARE_VM_GC_SHENANDOAH_SHENANDOAHHEAP_HPP
+#ifndef SHARE_GC_SHENANDOAH_SHENANDOAHHEAP_HPP
+#define SHARE_GC_SHENANDOAH_SHENANDOAHHEAP_HPP
#include "gc/shared/markBitMap.hpp"
#include "gc/shared/softRefPolicy.hpp"
@@ -163,9 +163,9 @@ public:
return &_lock;
}
- void assert_heaplock_owned_by_current_thread() PRODUCT_RETURN;
- void assert_heaplock_not_owned_by_current_thread() PRODUCT_RETURN;
- void assert_heaplock_or_safepoint() PRODUCT_RETURN;
+ void assert_heaplock_owned_by_current_thread() NOT_DEBUG_RETURN;
+ void assert_heaplock_not_owned_by_current_thread() NOT_DEBUG_RETURN;
+ void assert_heaplock_or_safepoint() NOT_DEBUG_RETURN;
// ---------- Initialization, termination, identification, printing routines
//
@@ -231,7 +231,7 @@ private:
public:
uint max_workers();
- void assert_gc_workers(uint nworker) PRODUCT_RETURN;
+ void assert_gc_workers(uint nworker) NOT_DEBUG_RETURN;
WorkGang* workers() const;
WorkGang* get_safepoint_workers();
@@ -754,4 +754,4 @@ private:
bool should_inject_alloc_failure();
};
-#endif // SHARE_VM_GC_SHENANDOAH_SHENANDOAHHEAP_HPP
+#endif // SHARE_GC_SHENANDOAH_SHENANDOAHHEAP_HPP
diff --git a/src/hotspot/share/gc/shenandoah/shenandoahHeap.inline.hpp b/src/hotspot/share/gc/shenandoah/shenandoahHeap.inline.hpp
index 9b87f073483..952c3a0a143 100644
--- a/src/hotspot/share/gc/shenandoah/shenandoahHeap.inline.hpp
+++ b/src/hotspot/share/gc/shenandoah/shenandoahHeap.inline.hpp
@@ -21,8 +21,8 @@
*
*/
-#ifndef SHARE_VM_GC_SHENANDOAH_SHENANDOAHHEAP_INLINE_HPP
-#define SHARE_VM_GC_SHENANDOAH_SHENANDOAHHEAP_INLINE_HPP
+#ifndef SHARE_GC_SHENANDOAH_SHENANDOAHHEAP_INLINE_HPP
+#define SHARE_GC_SHENANDOAH_SHENANDOAHHEAP_INLINE_HPP
#include "classfile/javaClasses.inline.hpp"
#include "gc/shared/markBitMap.inline.hpp"
@@ -549,4 +549,4 @@ inline ShenandoahMarkingContext* ShenandoahHeap::marking_context() const {
return _marking_context;
}
-#endif // SHARE_VM_GC_SHENANDOAH_SHENANDOAHHEAP_INLINE_HPP
+#endif // SHARE_GC_SHENANDOAH_SHENANDOAHHEAP_INLINE_HPP
diff --git a/src/hotspot/share/gc/shenandoah/shenandoahHeapLock.hpp b/src/hotspot/share/gc/shenandoah/shenandoahHeapLock.hpp
index 1cfec76626a..bd908c6c7ee 100644
--- a/src/hotspot/share/gc/shenandoah/shenandoahHeapLock.hpp
+++ b/src/hotspot/share/gc/shenandoah/shenandoahHeapLock.hpp
@@ -21,8 +21,8 @@
*
*/
-#ifndef SHARE_VM_GC_SHENANDOAH_SHENANDOAHHEAPLOCK_HPP
-#define SHARE_VM_GC_SHENANDOAH_SHENANDOAHHEAPLOCK_HPP
+#ifndef SHARE_GC_SHENANDOAH_SHENANDOAHHEAPLOCK_HPP
+#define SHARE_GC_SHENANDOAH_SHENANDOAHHEAPLOCK_HPP
#include "memory/allocation.hpp"
#include "runtime/thread.hpp"
@@ -90,4 +90,4 @@ public:
}
};
-#endif // SHARE_VM_GC_SHENANDOAH_SHENANDOAHHEAPLOCK_HPP
+#endif // SHARE_GC_SHENANDOAH_SHENANDOAHHEAPLOCK_HPP
diff --git a/src/hotspot/share/gc/shenandoah/shenandoahHeapRegion.cpp b/src/hotspot/share/gc/shenandoah/shenandoahHeapRegion.cpp
index 10102ba349f..2992a5cf5c2 100644
--- a/src/hotspot/share/gc/shenandoah/shenandoahHeapRegion.cpp
+++ b/src/hotspot/share/gc/shenandoah/shenandoahHeapRegion.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2013, 2018, Red Hat, Inc. All rights reserved.
+ * Copyright (c) 2013, 2019, Red Hat, Inc. All rights reserved.
*
* This code is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License version 2 only, as
@@ -25,7 +25,6 @@
#include "memory/allocation.hpp"
#include "gc/shenandoah/shenandoahBrooksPointer.hpp"
#include "gc/shenandoah/shenandoahHeapRegionSet.inline.hpp"
-#include "gc/shenandoah/shenandoahHeap.hpp"
#include "gc/shenandoah/shenandoahHeap.inline.hpp"
#include "gc/shenandoah/shenandoahHeapRegion.hpp"
#include "gc/shenandoah/shenandoahMarkingContext.inline.hpp"
diff --git a/src/hotspot/share/gc/shenandoah/shenandoahHeapRegion.hpp b/src/hotspot/share/gc/shenandoah/shenandoahHeapRegion.hpp
index 72ac1a14337..23480e2d5e3 100644
--- a/src/hotspot/share/gc/shenandoah/shenandoahHeapRegion.hpp
+++ b/src/hotspot/share/gc/shenandoah/shenandoahHeapRegion.hpp
@@ -21,8 +21,8 @@
*
*/
-#ifndef SHARE_VM_GC_SHENANDOAH_SHENANDOAHHEAPREGION_HPP
-#define SHARE_VM_GC_SHENANDOAH_SHENANDOAHHEAPREGION_HPP
+#ifndef SHARE_GC_SHENANDOAH_SHENANDOAHHEAPREGION_HPP
+#define SHARE_GC_SHENANDOAH_SHENANDOAHHEAPREGION_HPP
#include "gc/shared/space.hpp"
#include "gc/shenandoah/shenandoahAllocRequest.hpp"
@@ -428,4 +428,4 @@ private:
inline void internal_increase_live_data(size_t s);
};
-#endif // SHARE_VM_GC_SHENANDOAH_SHENANDOAHHEAPREGION_HPP
+#endif // SHARE_GC_SHENANDOAH_SHENANDOAHHEAPREGION_HPP
diff --git a/src/hotspot/share/gc/shenandoah/shenandoahHeapRegion.inline.hpp b/src/hotspot/share/gc/shenandoah/shenandoahHeapRegion.inline.hpp
index 38eef4e138c..16bac6c8e96 100644
--- a/src/hotspot/share/gc/shenandoah/shenandoahHeapRegion.inline.hpp
+++ b/src/hotspot/share/gc/shenandoah/shenandoahHeapRegion.inline.hpp
@@ -21,8 +21,8 @@
*
*/
-#ifndef SHARE_VM_GC_SHENANDOAH_SHENANDOAHHEAPREGION_INLINE_HPP
-#define SHARE_VM_GC_SHENANDOAH_SHENANDOAHHEAPREGION_INLINE_HPP
+#ifndef SHARE_GC_SHENANDOAH_SHENANDOAHHEAPREGION_INLINE_HPP
+#define SHARE_GC_SHENANDOAH_SHENANDOAHHEAPREGION_INLINE_HPP
#include "gc/shenandoah/shenandoahHeap.inline.hpp"
#include "gc/shenandoah/shenandoahHeapRegion.hpp"
@@ -108,4 +108,4 @@ inline void ShenandoahHeapRegion::internal_increase_live_data(size_t s) {
#endif
}
-#endif // SHARE_VM_GC_SHENANDOAH_SHENANDOAHHEAPREGION_INLINE_HPP
+#endif // SHARE_GC_SHENANDOAH_SHENANDOAHHEAPREGION_INLINE_HPP
diff --git a/src/hotspot/share/gc/shenandoah/shenandoahHeapRegionCounters.hpp b/src/hotspot/share/gc/shenandoah/shenandoahHeapRegionCounters.hpp
index cca9ddd3a44..a95218e838d 100644
--- a/src/hotspot/share/gc/shenandoah/shenandoahHeapRegionCounters.hpp
+++ b/src/hotspot/share/gc/shenandoah/shenandoahHeapRegionCounters.hpp
@@ -21,8 +21,8 @@
*
*/
-#ifndef SHARE_VM_GC_SHENANDOAH_SHENANDOAHHEAPREGIONCOUNTERS_HPP
-#define SHARE_VM_GC_SHENANDOAH_SHENANDOAHHEAPREGIONCOUNTERS_HPP
+#ifndef SHARE_GC_SHENANDOAH_SHENANDOAHHEAPREGIONCOUNTERS_HPP
+#define SHARE_GC_SHENANDOAH_SHENANDOAHHEAPREGIONCOUNTERS_HPP
#include "memory/allocation.hpp"
@@ -82,4 +82,4 @@ public:
void update();
};
-#endif // SHARE_VM_GC_SHENANDOAH_SHENANDOAHHEAPREGIONCOUNTERS_HPP
+#endif // SHARE_GC_SHENANDOAH_SHENANDOAHHEAPREGIONCOUNTERS_HPP
diff --git a/src/hotspot/share/gc/shenandoah/shenandoahHeapRegionSet.cpp b/src/hotspot/share/gc/shenandoah/shenandoahHeapRegionSet.cpp
index faac415d54a..62f85660806 100644
--- a/src/hotspot/share/gc/shenandoah/shenandoahHeapRegionSet.cpp
+++ b/src/hotspot/share/gc/shenandoah/shenandoahHeapRegionSet.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2013, 2018, Red Hat, Inc. All rights reserved.
+ * Copyright (c) 2013, 2019, Red Hat, Inc. All rights reserved.
*
* This code is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License version 2 only, as
@@ -22,9 +22,7 @@
*/
#include "precompiled.hpp"
-#include "gc/shenandoah/shenandoahHeapRegionSet.hpp"
#include "gc/shenandoah/shenandoahHeapRegionSet.inline.hpp"
-#include "gc/shenandoah/shenandoahHeap.hpp"
#include "gc/shenandoah/shenandoahHeap.inline.hpp"
#include "gc/shenandoah/shenandoahHeapRegion.hpp"
#include "gc/shenandoah/shenandoahUtils.hpp"
diff --git a/src/hotspot/share/gc/shenandoah/shenandoahHeapRegionSet.hpp b/src/hotspot/share/gc/shenandoah/shenandoahHeapRegionSet.hpp
index 067b925d5da..efec2af8bad 100644
--- a/src/hotspot/share/gc/shenandoah/shenandoahHeapRegionSet.hpp
+++ b/src/hotspot/share/gc/shenandoah/shenandoahHeapRegionSet.hpp
@@ -21,8 +21,8 @@
*
*/
-#ifndef SHARE_VM_GC_SHENANDOAH_SHENANDOAHHEAPREGIONSET_HPP
-#define SHARE_VM_GC_SHENANDOAH_SHENANDOAHHEAPREGIONSET_HPP
+#ifndef SHARE_GC_SHENANDOAH_SHENANDOAHHEAPREGIONSET_HPP
+#define SHARE_GC_SHENANDOAH_SHENANDOAHHEAPREGIONSET_HPP
#include "memory/allocation.hpp"
#include "gc/shenandoah/shenandoahHeap.hpp"
@@ -95,4 +95,4 @@ private:
}
};
-#endif //SHARE_VM_GC_SHENANDOAH_SHENANDOAHHEAPREGIONSET_HPP
+#endif // SHARE_GC_SHENANDOAH_SHENANDOAHHEAPREGIONSET_HPP
diff --git a/src/hotspot/share/gc/shenandoah/shenandoahHeapRegionSet.inline.hpp b/src/hotspot/share/gc/shenandoah/shenandoahHeapRegionSet.inline.hpp
index 0065420b766..d1f968bcbba 100644
--- a/src/hotspot/share/gc/shenandoah/shenandoahHeapRegionSet.inline.hpp
+++ b/src/hotspot/share/gc/shenandoah/shenandoahHeapRegionSet.inline.hpp
@@ -21,8 +21,8 @@
*
*/
-#ifndef SHARE_VM_GC_SHENANDOAH_SHENANDOAHHEAPREGIONSET_INLINE_HPP
-#define SHARE_VM_GC_SHENANDOAH_SHENANDOAHHEAPREGIONSET_INLINE_HPP
+#ifndef SHARE_GC_SHENANDOAH_SHENANDOAHHEAPREGIONSET_INLINE_HPP
+#define SHARE_GC_SHENANDOAH_SHENANDOAHHEAPREGIONSET_INLINE_HPP
#include "gc/shenandoah/shenandoahHeapRegionSet.hpp"
#include "gc/shenandoah/shenandoahHeap.hpp"
@@ -46,4 +46,4 @@ bool ShenandoahHeapRegionSet::is_in(HeapWord* p) const {
return _biased_set_map[index] == 1;
}
-#endif // SHARE_VM_GC_SHENANDOAH_SHENANDOAHHEAPREGIONSET_INLINE_HPP
+#endif // SHARE_GC_SHENANDOAH_SHENANDOAHHEAPREGIONSET_INLINE_HPP
diff --git a/src/hotspot/share/gc/shenandoah/shenandoahHeuristics.hpp b/src/hotspot/share/gc/shenandoah/shenandoahHeuristics.hpp
index 10e42abfe80..69f59ab0b6c 100644
--- a/src/hotspot/share/gc/shenandoah/shenandoahHeuristics.hpp
+++ b/src/hotspot/share/gc/shenandoah/shenandoahHeuristics.hpp
@@ -21,8 +21,8 @@
*
*/
-#ifndef SHARE_VM_GC_SHENANDOAH_SHENANDOAHHEURISTICS_HPP
-#define SHARE_VM_GC_SHENANDOAH_SHENANDOAHHEURISTICS_HPP
+#ifndef SHARE_GC_SHENANDOAH_SHENANDOAHHEURISTICS_HPP
+#define SHARE_GC_SHENANDOAH_SHENANDOAHHEURISTICS_HPP
#include "gc/shenandoah/shenandoahHeap.hpp"
#include "gc/shenandoah/shenandoahPhaseTimings.hpp"
@@ -164,4 +164,4 @@ public:
double time_since_last_gc() const;
};
-#endif // SHARE_VM_GC_SHENANDOAH_SHENANDOAHHEURISTICS_HPP
+#endif // SHARE_GC_SHENANDOAH_SHENANDOAHHEURISTICS_HPP
diff --git a/src/hotspot/share/gc/shenandoah/shenandoahMarkCompact.cpp b/src/hotspot/share/gc/shenandoah/shenandoahMarkCompact.cpp
index f807ba3b5d5..59d37b3e478 100644
--- a/src/hotspot/share/gc/shenandoah/shenandoahMarkCompact.cpp
+++ b/src/hotspot/share/gc/shenandoah/shenandoahMarkCompact.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2014, 2018, Red Hat, Inc. All rights reserved.
+ * Copyright (c) 2014, 2019, Red Hat, Inc. All rights reserved.
*
* This code is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License version 2 only, as
@@ -32,13 +32,11 @@
#include "gc/shenandoah/shenandoahPhaseTimings.hpp"
#include "gc/shenandoah/shenandoahMarkCompact.hpp"
#include "gc/shenandoah/shenandoahHeapRegionSet.hpp"
-#include "gc/shenandoah/shenandoahHeap.hpp"
#include "gc/shenandoah/shenandoahHeap.inline.hpp"
#include "gc/shenandoah/shenandoahHeuristics.hpp"
#include "gc/shenandoah/shenandoahMarkingContext.inline.hpp"
#include "gc/shenandoah/shenandoahRootProcessor.hpp"
#include "gc/shenandoah/shenandoahTraversalGC.hpp"
-#include "gc/shenandoah/shenandoahTaskqueue.hpp"
#include "gc/shenandoah/shenandoahTaskqueue.inline.hpp"
#include "gc/shenandoah/shenandoahUtils.hpp"
#include "gc/shenandoah/shenandoahVerifier.hpp"
diff --git a/src/hotspot/share/gc/shenandoah/shenandoahMarkCompact.hpp b/src/hotspot/share/gc/shenandoah/shenandoahMarkCompact.hpp
index 2d3f1394d82..d3bb4f7871b 100644
--- a/src/hotspot/share/gc/shenandoah/shenandoahMarkCompact.hpp
+++ b/src/hotspot/share/gc/shenandoah/shenandoahMarkCompact.hpp
@@ -21,8 +21,8 @@
*
*/
-#ifndef SHARE_VM_GC_SHENANDOAH_SHENANDOAHMARKCOMPACT_HPP
-#define SHARE_VM_GC_SHENANDOAH_SHENANDOAHMARKCOMPACT_HPP
+#ifndef SHARE_GC_SHENANDOAH_SHENANDOAHMARKCOMPACT_HPP
+#define SHARE_GC_SHENANDOAH_SHENANDOAHMARKCOMPACT_HPP
#include "gc/shared/gcTimer.hpp"
#include "gc/shenandoah/shenandoahHeap.hpp"
@@ -68,4 +68,4 @@ private:
};
-#endif // SHARE_VM_GC_SHENANDOAH_SHENANDOAHMARKCOMPACT_HPP
+#endif // SHARE_GC_SHENANDOAH_SHENANDOAHMARKCOMPACT_HPP
diff --git a/src/hotspot/share/gc/shenandoah/shenandoahMarkingContext.hpp b/src/hotspot/share/gc/shenandoah/shenandoahMarkingContext.hpp
index 19696e1f94f..c72229d0788 100644
--- a/src/hotspot/share/gc/shenandoah/shenandoahMarkingContext.hpp
+++ b/src/hotspot/share/gc/shenandoah/shenandoahMarkingContext.hpp
@@ -21,8 +21,8 @@
*
*/
-#ifndef SHARE_VM_GC_SHENANDOAH_SHENANDOAHMARKINGCONTEXT_HPP
-#define SHARE_VM_GC_SHENANDOAH_SHENANDOAHMARKINGCONTEXT_HPP
+#ifndef SHARE_GC_SHENANDOAH_SHENANDOAHMARKINGCONTEXT_HPP
+#define SHARE_GC_SHENANDOAH_SHENANDOAHMARKINGCONTEXT_HPP
#include "gc/shared/markBitMap.hpp"
#include "memory/allocation.hpp"
@@ -77,4 +77,4 @@ public:
};
-#endif // SHARE_VM_GC_SHENANDOAH_SHENANDOAHMARKINGCONTEXT_HPP
+#endif // SHARE_GC_SHENANDOAH_SHENANDOAHMARKINGCONTEXT_HPP
diff --git a/src/hotspot/share/gc/shenandoah/shenandoahMarkingContext.inline.hpp b/src/hotspot/share/gc/shenandoah/shenandoahMarkingContext.inline.hpp
index 1089ec0392b..83c85c656d2 100644
--- a/src/hotspot/share/gc/shenandoah/shenandoahMarkingContext.inline.hpp
+++ b/src/hotspot/share/gc/shenandoah/shenandoahMarkingContext.inline.hpp
@@ -21,8 +21,8 @@
*
*/
-#ifndef SHARE_VM_GC_SHENANDOAH_SHENANDOAHMARKINGCONTEXT_INLINE_HPP
-#define SHARE_VM_GC_SHENANDOAH_SHENANDOAHMARKINGCONTEXT_INLINE_HPP
+#ifndef SHARE_GC_SHENANDOAH_SHENANDOAHMARKINGCONTEXT_INLINE_HPP
+#define SHARE_GC_SHENANDOAH_SHENANDOAHMARKINGCONTEXT_INLINE_HPP
#include "gc/shenandoah/shenandoahMarkingContext.hpp"
@@ -48,4 +48,4 @@ inline bool ShenandoahMarkingContext::allocated_after_mark_start(HeapWord* addr)
return alloc_after_mark_start;
}
-#endif // SHARE_VM_GC_SHENANDOAH_SHENANDOAHMARKINGCONTEXT_INLINE_HPP
+#endif // SHARE_GC_SHENANDOAH_SHENANDOAHMARKINGCONTEXT_INLINE_HPP
diff --git a/src/hotspot/share/gc/shenandoah/shenandoahMemoryPool.hpp b/src/hotspot/share/gc/shenandoah/shenandoahMemoryPool.hpp
index 7f316f65fb1..61d22548b5b 100644
--- a/src/hotspot/share/gc/shenandoah/shenandoahMemoryPool.hpp
+++ b/src/hotspot/share/gc/shenandoah/shenandoahMemoryPool.hpp
@@ -21,8 +21,8 @@
*
*/
-#ifndef SHARE_VM_SERVICES_SHENANDOAHMEMORYPOOL_HPP
-#define SHARE_VM_SERVICES_SHENANDOAHMEMORYPOOL_HPP
+#ifndef SHARE_GC_SHENANDOAH_SHENANDOAHMEMORYPOOL_HPP
+#define SHARE_GC_SHENANDOAH_SHENANDOAHMEMORYPOOL_HPP
#ifndef SERIALGC
#include "gc/shenandoah/shenandoahHeap.hpp"
@@ -41,4 +41,4 @@ public:
size_t max_size() const { return _heap->max_capacity(); }
};
-#endif //SHARE_VM_SERVICES_SHENANDOAHMEMORYPOOL_HPP
+#endif // SHARE_GC_SHENANDOAH_SHENANDOAHMEMORYPOOL_HPP
diff --git a/src/hotspot/share/gc/shenandoah/shenandoahMetrics.cpp b/src/hotspot/share/gc/shenandoah/shenandoahMetrics.cpp
index 6f0d30cb69f..eaac54afa76 100644
--- a/src/hotspot/share/gc/shenandoah/shenandoahMetrics.cpp
+++ b/src/hotspot/share/gc/shenandoah/shenandoahMetrics.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2013, 2018, Red Hat, Inc. All rights reserved.
+ * Copyright (c) 2013, 2019, Red Hat, Inc. All rights reserved.
*
* This code is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License version 2 only, as
@@ -23,7 +23,6 @@
#include "precompiled.hpp"
#include "gc/shenandoah/shenandoahMetrics.hpp"
-#include "gc/shenandoah/shenandoahHeap.hpp"
#include "gc/shenandoah/shenandoahHeap.inline.hpp"
#include "gc/shenandoah/shenandoahHeapRegion.hpp"
#include "gc/shenandoah/shenandoahFreeSet.hpp"
diff --git a/src/hotspot/share/gc/shenandoah/shenandoahMetrics.hpp b/src/hotspot/share/gc/shenandoah/shenandoahMetrics.hpp
index 32771b11c1d..fd9a2e91f0e 100644
--- a/src/hotspot/share/gc/shenandoah/shenandoahMetrics.hpp
+++ b/src/hotspot/share/gc/shenandoah/shenandoahMetrics.hpp
@@ -21,8 +21,8 @@
*
*/
-#ifndef SHARE_VM_GC_SHENANDOAH_SHENANDOAHMETRICS_HPP
-#define SHARE_VM_GC_SHENANDOAH_SHENANDOAHMETRICS_HPP
+#ifndef SHARE_GC_SHENANDOAH_SHENANDOAHMETRICS_HPP
+#define SHARE_GC_SHENANDOAH_SHENANDOAHMETRICS_HPP
#include "gc/shenandoah/shenandoahHeap.hpp"
@@ -52,4 +52,4 @@ public:
bool is_good_progress(const char *label);
};
-#endif //SHARE_VM_GC_SHENANDOAH_SHENANDOAHMETRICS_HPP
+#endif // SHARE_GC_SHENANDOAH_SHENANDOAHMETRICS_HPP
diff --git a/src/hotspot/share/gc/shenandoah/shenandoahMonitoringSupport.hpp b/src/hotspot/share/gc/shenandoah/shenandoahMonitoringSupport.hpp
index 2fe7dca4e05..80fb61974b7 100644
--- a/src/hotspot/share/gc/shenandoah/shenandoahMonitoringSupport.hpp
+++ b/src/hotspot/share/gc/shenandoah/shenandoahMonitoringSupport.hpp
@@ -21,8 +21,8 @@
*
*/
-#ifndef SHARE_VM_GC_SHENANDOAH_SHENANDOAHMONITORINGSUPPORT_HPP
-#define SHARE_VM_GC_SHENANDOAH_SHENANDOAHMONITORINGSUPPORT_HPP
+#ifndef SHARE_GC_SHENANDOAH_SHENANDOAHMONITORINGSUPPORT_HPP
+#define SHARE_GC_SHENANDOAH_SHENANDOAHMONITORINGSUPPORT_HPP
#include "memory/allocation.hpp"
@@ -53,4 +53,4 @@ public:
void update_counters();
};
-#endif // SHARE_VM_GC_SHENANDOAH_SHENANDOAHMONITORINGSUPPORT_HPP
+#endif // SHARE_GC_SHENANDOAH_SHENANDOAHMONITORINGSUPPORT_HPP
diff --git a/src/hotspot/share/gc/shenandoah/shenandoahNumberSeq.hpp b/src/hotspot/share/gc/shenandoah/shenandoahNumberSeq.hpp
index 3a78117bb1a..5a241555bec 100644
--- a/src/hotspot/share/gc/shenandoah/shenandoahNumberSeq.hpp
+++ b/src/hotspot/share/gc/shenandoah/shenandoahNumberSeq.hpp
@@ -21,8 +21,8 @@
*
*/
-#ifndef SHARE_VM_GC_SHENANDOAH_SHENANDOAHNUMBERSEQ_HPP
-#define SHARE_VM_GC_SHENANDOAH_SHENANDOAHNUMBERSEQ_HPP
+#ifndef SHARE_GC_SHENANDOAH_SHENANDOAHNUMBERSEQ_HPP
+#define SHARE_GC_SHENANDOAH_SHENANDOAHNUMBERSEQ_HPP
#include "utilities/numberSeq.hpp"
@@ -71,4 +71,4 @@ public:
int max_level() const;
};
-#endif // SHARE_VM_GC_SHENANDOAH_SHENANDOAHNUMBERSEQ_HPP
+#endif // SHARE_GC_SHENANDOAH_SHENANDOAHNUMBERSEQ_HPP
diff --git a/src/hotspot/share/gc/shenandoah/shenandoahOopClosures.hpp b/src/hotspot/share/gc/shenandoah/shenandoahOopClosures.hpp
index 30edab30126..bd649b2f2f0 100644
--- a/src/hotspot/share/gc/shenandoah/shenandoahOopClosures.hpp
+++ b/src/hotspot/share/gc/shenandoah/shenandoahOopClosures.hpp
@@ -21,8 +21,8 @@
*
*/
-#ifndef SHARE_VM_GC_SHENANDOAH_SHENANDOAHOOPCLOSURES_HPP
-#define SHARE_VM_GC_SHENANDOAH_SHENANDOAHOOPCLOSURES_HPP
+#ifndef SHARE_GC_SHENANDOAH_SHENANDOAHOOPCLOSURES_HPP
+#define SHARE_GC_SHENANDOAH_SHENANDOAHOOPCLOSURES_HPP
#include "gc/shared/referenceProcessor.hpp"
#include "gc/shenandoah/shenandoahHeap.hpp"
@@ -347,4 +347,4 @@ public:
virtual bool do_metadata() { return true; }
};
-#endif // SHARE_VM_GC_SHENANDOAH_SHENANDOAHOOPCLOSURES_HPP
+#endif // SHARE_GC_SHENANDOAH_SHENANDOAHOOPCLOSURES_HPP
diff --git a/src/hotspot/share/gc/shenandoah/shenandoahOopClosures.inline.hpp b/src/hotspot/share/gc/shenandoah/shenandoahOopClosures.inline.hpp
index 3942a608c12..e827c86a229 100644
--- a/src/hotspot/share/gc/shenandoah/shenandoahOopClosures.inline.hpp
+++ b/src/hotspot/share/gc/shenandoah/shenandoahOopClosures.inline.hpp
@@ -21,8 +21,8 @@
*
*/
-#ifndef SHARE_VM_GC_SHENANDOAH_SHENANDOAHOOPCLOSURES_INLINE_HPP
-#define SHARE_VM_GC_SHENANDOAH_SHENANDOAHOOPCLOSURES_INLINE_HPP
+#ifndef SHARE_GC_SHENANDOAH_SHENANDOAHOOPCLOSURES_INLINE_HPP
+#define SHARE_GC_SHENANDOAH_SHENANDOAHOOPCLOSURES_INLINE_HPP
#include "gc/shenandoah/shenandoahHeap.inline.hpp"
#include "gc/shenandoah/shenandoahConcurrentMark.inline.hpp"
@@ -43,4 +43,4 @@ inline void ShenandoahTraversalSuperClosure::work(T* p) {
_traversal_gc->process_oop(p, _thread, _queue, _mark_context);
}
-#endif // SHARE_VM_GC_SHENANDOAH_SHENANDOAHOOPCLOSURES_INLINE_HPP
+#endif // SHARE_GC_SHENANDOAH_SHENANDOAHOOPCLOSURES_INLINE_HPP
diff --git a/src/hotspot/share/gc/shenandoah/shenandoahPacer.cpp b/src/hotspot/share/gc/shenandoah/shenandoahPacer.cpp
index 8d91b6123b7..08ecb1388d6 100644
--- a/src/hotspot/share/gc/shenandoah/shenandoahPacer.cpp
+++ b/src/hotspot/share/gc/shenandoah/shenandoahPacer.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, Red Hat, Inc. All rights reserved.
+ * Copyright (c) 2018, 2019, Red Hat, Inc. All rights reserved.
*
* This code is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License version 2 only, as
@@ -24,7 +24,6 @@
#include "precompiled.hpp"
#include "gc/shenandoah/shenandoahFreeSet.hpp"
-#include "gc/shenandoah/shenandoahHeap.hpp"
#include "gc/shenandoah/shenandoahHeap.inline.hpp"
#include "gc/shenandoah/shenandoahPacer.hpp"
diff --git a/src/hotspot/share/gc/shenandoah/shenandoahPacer.hpp b/src/hotspot/share/gc/shenandoah/shenandoahPacer.hpp
index 804f97c5a80..df9e48157c3 100644
--- a/src/hotspot/share/gc/shenandoah/shenandoahPacer.hpp
+++ b/src/hotspot/share/gc/shenandoah/shenandoahPacer.hpp
@@ -21,8 +21,8 @@
*
*/
-#ifndef SHARE_VM_GC_SHENANDOAH_SHENANDOAHPACER_HPP
-#define SHARE_VM_GC_SHENANDOAH_SHENANDOAHPACER_HPP
+#ifndef SHARE_GC_SHENANDOAH_SHENANDOAHPACER_HPP
+#define SHARE_GC_SHENANDOAH_SHENANDOAHPACER_HPP
#include "gc/shenandoah/shenandoahNumberSeq.hpp"
#include "memory/allocation.hpp"
@@ -96,4 +96,4 @@ private:
size_t update_and_get_progress_history();
};
-#endif //SHARE_VM_GC_SHENANDOAH_SHENANDOAHPACER_HPP
+#endif // SHARE_GC_SHENANDOAH_SHENANDOAHPACER_HPP
diff --git a/src/hotspot/share/gc/shenandoah/shenandoahPacer.inline.hpp b/src/hotspot/share/gc/shenandoah/shenandoahPacer.inline.hpp
index 6e59024d8ad..17c2ffca368 100644
--- a/src/hotspot/share/gc/shenandoah/shenandoahPacer.inline.hpp
+++ b/src/hotspot/share/gc/shenandoah/shenandoahPacer.inline.hpp
@@ -21,8 +21,8 @@
*
*/
-#ifndef SHARE_VM_GC_SHENANDOAH_SHENANDOAHPACER_INLINE_HPP
-#define SHARE_VM_GC_SHENANDOAH_SHENANDOAHPACER_INLINE_HPP
+#ifndef SHARE_GC_SHENANDOAH_SHENANDOAHPACER_INLINE_HPP
+#define SHARE_GC_SHENANDOAH_SHENANDOAHPACER_INLINE_HPP
#include "gc/shenandoah/shenandoahPacer.hpp"
#include "runtime/atomic.hpp"
@@ -56,4 +56,4 @@ inline void ShenandoahPacer::report_progress_internal(size_t words) {
Atomic::add((intptr_t)words, &_progress);
}
-#endif //SHARE_VM_GC_SHENANDOAH_SHENANDOAHPACER_INLINE_HPP
+#endif // SHARE_GC_SHENANDOAH_SHENANDOAHPACER_INLINE_HPP
diff --git a/src/hotspot/share/gc/shenandoah/shenandoahPhaseTimings.hpp b/src/hotspot/share/gc/shenandoah/shenandoahPhaseTimings.hpp
index d45fbc0b0b6..12de4306d3b 100644
--- a/src/hotspot/share/gc/shenandoah/shenandoahPhaseTimings.hpp
+++ b/src/hotspot/share/gc/shenandoah/shenandoahPhaseTimings.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2017, 2018, Red Hat, Inc. All rights reserved.
+ * Copyright (c) 2017, 2019, Red Hat, Inc. All rights reserved.
*
* This code is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License version 2 only, as
@@ -21,8 +21,8 @@
*
*/
-#ifndef SHARE_VM_GC_SHENANDOAH_SHENANDOAHPHASETIMEINGS_HPP
-#define SHARE_VM_GC_SHENANDOAH_SHENANDOAHPHASETIMEINGS_HPP
+#ifndef SHARE_GC_SHENANDOAH_SHENANDOAHPHASETIMINGS_HPP
+#define SHARE_GC_SHENANDOAH_SHENANDOAHPHASETIMINGS_HPP
#include "gc/shenandoah/shenandoahNumberSeq.hpp"
#include "gc/shared/workerDataArray.hpp"
@@ -89,7 +89,6 @@ class outputStream;
f(purge_class_unload, " Unload Classes") \
f(purge_par, " Parallel Cleanup") \
f(purge_cldg, " CLDG") \
- f(purge_string_dedup, " String Dedup") \
f(complete_liveness, " Complete Liveness") \
f(prepare_evac, " Prepare Evacuation") \
f(recycle_regions, " Recycle regions") \
@@ -255,7 +254,6 @@ class outputStream;
f(full_gc_purge_class_unload, " Unload Classes") \
f(full_gc_purge_par, " Parallel Cleanup") \
f(full_gc_purge_cldg, " CLDG") \
- f(full_gc_purge_string_dedup, " String Dedup") \
f(full_gc_calculate_addresses, " Calculate Addresses") \
f(full_gc_calculate_addresses_regular, " Regular Objects") \
f(full_gc_calculate_addresses_humong, " Humongous Objects") \
@@ -395,4 +393,4 @@ public:
void print() const;
};
-#endif // SHARE_VM_GC_SHENANDOAH_SHENANDOAHGCPHASETIMEINGS_HPP
+#endif // SHARE_GC_SHENANDOAH_SHENANDOAHPHASETIMINGS_HPP
diff --git a/src/hotspot/share/gc/shenandoah/shenandoahRootProcessor.hpp b/src/hotspot/share/gc/shenandoah/shenandoahRootProcessor.hpp
index 602e9751b61..55d26f586e4 100644
--- a/src/hotspot/share/gc/shenandoah/shenandoahRootProcessor.hpp
+++ b/src/hotspot/share/gc/shenandoah/shenandoahRootProcessor.hpp
@@ -21,8 +21,8 @@
*
*/
-#ifndef SHARE_VM_GC_SHENANDOAH_SHENANDOAHROOTPROCESSOR_HPP
-#define SHARE_VM_GC_SHENANDOAH_SHENANDOAHROOTPROCESSOR_HPP
+#ifndef SHARE_GC_SHENANDOAH_SHENANDOAHROOTPROCESSOR_HPP
+#define SHARE_GC_SHENANDOAH_SHENANDOAHROOTPROCESSOR_HPP
#include "code/codeCache.hpp"
#include "gc/shared/oopStorageParState.hpp"
@@ -123,4 +123,4 @@ public:
// Number of worker threads used by the root processor.
uint n_workers() const;
};
-#endif // SHARE_VM_GC_SHENANDOAH_SHENANDOAHROOTPROCESSOR_HPP
+#endif // SHARE_GC_SHENANDOAH_SHENANDOAHROOTPROCESSOR_HPP
diff --git a/src/hotspot/share/gc/shenandoah/shenandoahRuntime.hpp b/src/hotspot/share/gc/shenandoah/shenandoahRuntime.hpp
index 15cf5559fee..da788216739 100644
--- a/src/hotspot/share/gc/shenandoah/shenandoahRuntime.hpp
+++ b/src/hotspot/share/gc/shenandoah/shenandoahRuntime.hpp
@@ -21,8 +21,8 @@
*
*/
-#ifndef SHARE_VM_GC_SHENANDOAH_SHENANDOAHRUNTIME_HPP
-#define SHARE_VM_GC_SHENANDOAH_SHENANDOAHRUNTIME_HPP
+#ifndef SHARE_GC_SHENANDOAH_SHENANDOAHRUNTIME_HPP
+#define SHARE_GC_SHENANDOAH_SHENANDOAHRUNTIME_HPP
#include "memory/allocation.hpp"
#include "oops/oopsHierarchy.hpp"
@@ -43,4 +43,4 @@ public:
static void shenandoah_clone_barrier(oopDesc* obj);
};
-#endif // SHARE_VM_GC_SHENANDOAH_SHENANDOAHRUNTIME_HPP
+#endif // SHARE_GC_SHENANDOAH_SHENANDOAHRUNTIME_HPP
diff --git a/src/hotspot/share/gc/shenandoah/shenandoahSATBMarkQueueSet.cpp b/src/hotspot/share/gc/shenandoah/shenandoahSATBMarkQueueSet.cpp
index 61d74072f13..eb4fd1791c0 100644
--- a/src/hotspot/share/gc/shenandoah/shenandoahSATBMarkQueueSet.cpp
+++ b/src/hotspot/share/gc/shenandoah/shenandoahSATBMarkQueueSet.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, Red Hat, Inc. All rights reserved.
+ * Copyright (c) 2018, 2019, Red Hat, Inc. All rights reserved.
*
* This code is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License version 2 only, as
@@ -29,7 +29,7 @@
ShenandoahSATBMarkQueueSet::ShenandoahSATBMarkQueueSet() :
_heap(NULL),
- _satb_mark_queue_buffer_allocator(ShenandoahSATBBufferSize, SATB_Q_FL_lock)
+ _satb_mark_queue_buffer_allocator("SATB Buffer Allocator", ShenandoahSATBBufferSize)
{}
void ShenandoahSATBMarkQueueSet::initialize(ShenandoahHeap* const heap,
diff --git a/src/hotspot/share/gc/shenandoah/shenandoahSATBMarkQueueSet.hpp b/src/hotspot/share/gc/shenandoah/shenandoahSATBMarkQueueSet.hpp
index c272e6c43a1..30de37bbefc 100644
--- a/src/hotspot/share/gc/shenandoah/shenandoahSATBMarkQueueSet.hpp
+++ b/src/hotspot/share/gc/shenandoah/shenandoahSATBMarkQueueSet.hpp
@@ -21,8 +21,8 @@
*
*/
-#ifndef SHARE_VM_GC_SHENANDOAH_SHENANDOAHSATBMARKQUEUESET_HPP
-#define SHARE_VM_GC_SHENANDOAH_SHENANDOAHSATBMARKQUEUESET_HPP
+#ifndef SHARE_GC_SHENANDOAH_SHENANDOAHSATBMARKQUEUESET_HPP
+#define SHARE_GC_SHENANDOAH_SHENANDOAHSATBMARKQUEUESET_HPP
#include "gc/shared/satbMarkQueue.hpp"
#include "gc/shenandoah/shenandoahHeap.hpp"
@@ -52,4 +52,4 @@ public:
virtual void filter(SATBMarkQueue* queue);
};
-#endif
+#endif // SHARE_GC_SHENANDOAH_SHENANDOAHSATBMARKQUEUESET_HPP
diff --git a/src/hotspot/share/gc/shenandoah/shenandoahSharedVariables.hpp b/src/hotspot/share/gc/shenandoah/shenandoahSharedVariables.hpp
index 3e9521567f5..0a08236bf17 100644
--- a/src/hotspot/share/gc/shenandoah/shenandoahSharedVariables.hpp
+++ b/src/hotspot/share/gc/shenandoah/shenandoahSharedVariables.hpp
@@ -21,8 +21,8 @@
*
*/
-#ifndef SHARE_VM_GC_SHENANDOAH_SHENANDOAHSHAREDFLAG_HPP
-#define SHARE_VM_GC_SHENANDOAH_SHENANDOAHSHAREDFLAG_HPP
+#ifndef SHARE_GC_SHENANDOAH_SHENANDOAHSHAREDVARIABLES_HPP
+#define SHARE_GC_SHENANDOAH_SHENANDOAHSHAREDVARIABLES_HPP
#include "memory/allocation.hpp"
#include "runtime/orderAccess.hpp"
@@ -243,4 +243,4 @@ private:
};
-#endif // SHARE_VM_GC_SHENANDOAH_SHENANDOAHSHAREDFLAG_HPP
+#endif // SHARE_GC_SHENANDOAH_SHENANDOAHSHAREDVARIABLES_HPP
diff --git a/src/hotspot/share/gc/shenandoah/shenandoahStrDedupQueue.cpp b/src/hotspot/share/gc/shenandoah/shenandoahStrDedupQueue.cpp
index 515be11952a..9b9710fd451 100644
--- a/src/hotspot/share/gc/shenandoah/shenandoahStrDedupQueue.cpp
+++ b/src/hotspot/share/gc/shenandoah/shenandoahStrDedupQueue.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2017, 2018, Red Hat, Inc. All rights reserved.
+ * Copyright (c) 2017, 2019, Red Hat, Inc. All rights reserved.
*
* This code is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License version 2 only, as
@@ -26,9 +26,8 @@
#include "gc/shared/stringdedup/stringDedup.hpp"
#include "gc/shared/stringdedup/stringDedupThread.hpp"
#include "gc/shenandoah/shenandoahHeap.inline.hpp"
-#include "gc/shenandoah/shenandoahStrDedupQueue.hpp"
#include "gc/shenandoah/shenandoahStrDedupQueue.inline.hpp"
-#include "gc/shenandoah/shenandoahStringDedup.hpp"
+#include "gc/shenandoah/shenandoahStringDedup.inline.hpp"
#include "logging/log.hpp"
#include "runtime/mutex.hpp"
#include "runtime/mutexLocker.hpp"
diff --git a/src/hotspot/share/gc/shenandoah/shenandoahStrDedupQueue.hpp b/src/hotspot/share/gc/shenandoah/shenandoahStrDedupQueue.hpp
index f72039b1bb0..84ebe936857 100644
--- a/src/hotspot/share/gc/shenandoah/shenandoahStrDedupQueue.hpp
+++ b/src/hotspot/share/gc/shenandoah/shenandoahStrDedupQueue.hpp
@@ -21,8 +21,8 @@
*
*/
-#ifndef SHARE_VM_GC_SHENANDOAH_SHENANDOAHSTRINGDEDUPQUEUE_HPP
-#define SHARE_VM_GC_SHENANDOAH_SHENANDOAHSTRINGDEDUPQUEUE_HPP
+#ifndef SHARE_GC_SHENANDOAH_SHENANDOAHSTRDEDUPQUEUE_HPP
+#define SHARE_GC_SHENANDOAH_SHENANDOAHSTRDEDUPQUEUE_HPP
#include "gc/shared/stringdedup/stringDedup.hpp"
#include "gc/shenandoah/shenandoahHeap.hpp"
@@ -110,4 +110,4 @@ private:
void verify(ShenandoahQueueBuffer* head);
};
-#endif // SHARE_VM_GC_SHENANDOAH_SHENANDOAHSTRINGDEDUPQUEUE_HPP
+#endif // SHARE_GC_SHENANDOAH_SHENANDOAHSTRDEDUPQUEUE_HPP
diff --git a/src/hotspot/share/gc/shenandoah/shenandoahStrDedupQueue.inline.hpp b/src/hotspot/share/gc/shenandoah/shenandoahStrDedupQueue.inline.hpp
index 0cee6d4e7aa..8f0b4300d7d 100644
--- a/src/hotspot/share/gc/shenandoah/shenandoahStrDedupQueue.inline.hpp
+++ b/src/hotspot/share/gc/shenandoah/shenandoahStrDedupQueue.inline.hpp
@@ -21,8 +21,8 @@
*
*/
-#ifndef SHARE_VM_GC_SHENANDOAH_SHENANDOAHSTRINGDEDUPQUEUE_INLINE_HPP
-#define SHARE_VM_GC_SHENANDOAH_SHENANDOAHSTRINGDEDUPQUEUE_INLINE_HPP
+#ifndef SHARE_GC_SHENANDOAH_SHENANDOAHSTRDEDUPQUEUE_INLINE_HPP
+#define SHARE_GC_SHENANDOAH_SHENANDOAHSTRDEDUPQUEUE_INLINE_HPP
#include "gc/shenandoah/shenandoahStrDedupQueue.hpp"
@@ -95,4 +95,4 @@ void ShenandoahOopBuffer::oops_do(OopClosure* cl) {
}
}
-#endif // SHARE_VM_GC_SHENANDOAH_SHENANDOAHSTRINGDEDUPQUEUE_INLINE_HPP
+#endif // SHARE_GC_SHENANDOAH_SHENANDOAHSTRDEDUPQUEUE_INLINE_HPP
diff --git a/src/hotspot/share/gc/shenandoah/shenandoahStringDedup.cpp b/src/hotspot/share/gc/shenandoah/shenandoahStringDedup.cpp
index aafc7aa9d57..59e4196ba26 100644
--- a/src/hotspot/share/gc/shenandoah/shenandoahStringDedup.cpp
+++ b/src/hotspot/share/gc/shenandoah/shenandoahStringDedup.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2017, 2018, Red Hat, Inc. All rights reserved.
+ * Copyright (c) 2017, 2019, Red Hat, Inc. All rights reserved.
*
* This code is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License version 2 only, as
@@ -23,12 +23,9 @@
#include "precompiled.hpp"
-#include "gc/shared/stringdedup/stringDedup.hpp"
#include "gc/shared/stringdedup/stringDedup.inline.hpp"
#include "gc/shared/workgroup.hpp"
-#include "gc/shenandoah/shenandoahCollectionSet.hpp"
#include "gc/shenandoah/shenandoahCollectionSet.inline.hpp"
-#include "gc/shenandoah/shenandoahHeap.hpp"
#include "gc/shenandoah/shenandoahHeap.inline.hpp"
#include "gc/shenandoah/shenandoahMarkingContext.inline.hpp"
#include "gc/shenandoah/shenandoahStringDedup.hpp"
@@ -113,14 +110,6 @@ public:
}
};
-void ShenandoahStringDedup::parallel_cleanup() {
- assert(SafepointSynchronize::is_at_safepoint(), "Must be at a safepoint");
- log_debug(gc, stringdedup)("String dedup cleanup");
- ShenandoahIsMarkedNextClosure cl;
-
- unlink_or_oops_do(&cl, NULL, true);
-}
-
//
// Task for parallel unlink_or_oops_do() operation on the deduplication queue
// and table.
diff --git a/src/hotspot/share/gc/shenandoah/shenandoahStringDedup.hpp b/src/hotspot/share/gc/shenandoah/shenandoahStringDedup.hpp
index b872be25ba1..d35042c3506 100644
--- a/src/hotspot/share/gc/shenandoah/shenandoahStringDedup.hpp
+++ b/src/hotspot/share/gc/shenandoah/shenandoahStringDedup.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2017, 2018, Red Hat, Inc. All rights reserved.
+ * Copyright (c) 2017, 2019, Red Hat, Inc. All rights reserved.
*
* This code is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License version 2 only, as
@@ -21,10 +21,9 @@
*
*/
-#ifndef SHARE_VM_GC_SHENANDOAH_SHENANDOAHSTRINGDEDUP_HPP
-#define SHARE_VM_GC_SHENANDOAH_SHENANDOAHSTRINGDEDUP_HPP
+#ifndef SHARE_GC_SHENANDOAH_SHENANDOAHSTRINGDEDUP_HPP
+#define SHARE_GC_SHENANDOAH_SHENANDOAHSTRINGDEDUP_HPP
-#include "classfile/javaClasses.inline.hpp"
#include "gc/shared/stringdedup/stringDedup.hpp"
#include "memory/iterator.hpp"
@@ -42,13 +41,7 @@ public:
static void parallel_oops_do(OopClosure* cl, uint worker_id);
static void oops_do_slow(OopClosure* cl);
- // Parallel cleanup string dedup queues/table
- static void parallel_cleanup();
-
- static inline bool is_candidate(oop obj) {
- return java_lang_String::is_instance_inlined(obj) &&
- java_lang_String::value(obj) != NULL;
- }
+ static inline bool is_candidate(oop obj);
private:
static void unlink_or_oops_do(BoolObjectClosure* is_alive,
OopClosure* keep_alive,
@@ -56,4 +49,4 @@ private:
};
-#endif // SHARE_VM_GC_SHENANDOAH_SHENANDOAHSTRINGDEDUP_HPP
+#endif // SHARE_GC_SHENANDOAH_SHENANDOAHSTRINGDEDUP_HPP
diff --git a/src/hotspot/share/gc/shenandoah/shenandoahStringDedup.inline.hpp b/src/hotspot/share/gc/shenandoah/shenandoahStringDedup.inline.hpp
new file mode 100644
index 00000000000..6324092cc3f
--- /dev/null
+++ b/src/hotspot/share/gc/shenandoah/shenandoahStringDedup.inline.hpp
@@ -0,0 +1,35 @@
+/*
+ * Copyright (c) 2019, Red Hat, Inc. All rights reserved.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ *
+ */
+
+#ifndef SHARE_GC_SHENANDOAH_SHENANDOAHSTRINGDEDUP_INLINE_HPP
+#define SHARE_GC_SHENANDOAH_SHENANDOAHSTRINGDEDUP_INLINE_HPP
+
+#include "classfile/javaClasses.inline.hpp"
+#include "gc/shenandoah/shenandoahStringDedup.hpp"
+
+bool ShenandoahStringDedup::is_candidate(oop obj) {
+ return java_lang_String::is_instance_inlined(obj) &&
+ java_lang_String::value(obj) != NULL;
+}
+
+#endif // SHARE_GC_SHENANDOAH_SHENANDOAHSTRINGDEDUP_INLINE_HPP
diff --git a/src/hotspot/share/gc/shenandoah/shenandoahTaskqueue.cpp b/src/hotspot/share/gc/shenandoah/shenandoahTaskqueue.cpp
index aeaca5cfa4d..f67b94f3260 100644
--- a/src/hotspot/share/gc/shenandoah/shenandoahTaskqueue.cpp
+++ b/src/hotspot/share/gc/shenandoah/shenandoahTaskqueue.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2016, 2018, Red Hat, Inc. All rights reserved.
+ * Copyright (c) 2016, 2019, Red Hat, Inc. All rights reserved.
*
* This code is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License version 2 only, as
@@ -23,8 +23,8 @@
#include "precompiled.hpp"
-#include "gc/shenandoah/shenandoahHeap.hpp"
-#include "gc/shenandoah/shenandoahTaskqueue.hpp"
+#include "gc/shenandoah/shenandoahHeap.inline.hpp"
+#include "gc/shenandoah/shenandoahTaskqueue.inline.hpp"
#include "logging/log.hpp"
#include "logging/logStream.hpp"
diff --git a/src/hotspot/share/gc/shenandoah/shenandoahTaskqueue.hpp b/src/hotspot/share/gc/shenandoah/shenandoahTaskqueue.hpp
index 5dacaa957a3..19e13a1e89f 100644
--- a/src/hotspot/share/gc/shenandoah/shenandoahTaskqueue.hpp
+++ b/src/hotspot/share/gc/shenandoah/shenandoahTaskqueue.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2016, 2018, Red Hat, Inc. All rights reserved.
+ * Copyright (c) 2016, 2019, Red Hat, Inc. All rights reserved.
*
* This code is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License version 2 only, as
@@ -21,11 +21,10 @@
*
*/
-#ifndef SHARE_VM_GC_SHENANDOAH_SHENANDOAHTASKQUEUE_HPP
-#define SHARE_VM_GC_SHENANDOAH_SHENANDOAHTASKQUEUE_HPP
+#ifndef SHARE_GC_SHENANDOAH_SHENANDOAHTASKQUEUE_HPP
+#define SHARE_GC_SHENANDOAH_SHENANDOAHTASKQUEUE_HPP
#include "gc/shared/owstTaskTerminator.hpp"
#include "gc/shared/taskqueue.hpp"
-#include "gc/shared/taskqueue.inline.hpp"
#include "memory/allocation.hpp"
#include "runtime/mutex.hpp"
#include "runtime/thread.hpp"
@@ -46,11 +45,7 @@ public:
// Attempt to pop from the queue. Returns true on success.
inline bool pop(E &t);
- inline void clear() {
- _buf_empty = true;
- taskqueue_t::set_empty();
- taskqueue_t::overflow_stack()->clear();
- }
+ inline void clear();
inline bool is_empty() const {
return _buf_empty && taskqueue_t::is_empty();
@@ -329,4 +324,4 @@ public:
bool offer_termination() { return offer_termination((ShenandoahTerminatorTerminator*)NULL); }
};
-#endif // SHARE_VM_GC_SHENANDOAH_SHENANDOAHTASKQUEUE_HPP
+#endif // SHARE_GC_SHENANDOAH_SHENANDOAHTASKQUEUE_HPP
diff --git a/src/hotspot/share/gc/shenandoah/shenandoahTaskqueue.inline.hpp b/src/hotspot/share/gc/shenandoah/shenandoahTaskqueue.inline.hpp
index 139e214c192..bc6a1dfb115 100644
--- a/src/hotspot/share/gc/shenandoah/shenandoahTaskqueue.inline.hpp
+++ b/src/hotspot/share/gc/shenandoah/shenandoahTaskqueue.inline.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2016, 2018, Red Hat, Inc. All rights reserved.
+ * Copyright (c) 2016, 2019, Red Hat, Inc. All rights reserved.
*
* This code is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License version 2 only, as
@@ -21,14 +21,15 @@
*
*/
-#ifndef SHARE_VM_GC_SHENANDOAH_SHENANDOAHTASKQUEUE_INLINE_HPP
-#define SHARE_VM_GC_SHENANDOAH_SHENANDOAHTASKQUEUE_INLINE_HPP
+#ifndef SHARE_GC_SHENANDOAH_SHENANDOAHTASKQUEUE_INLINE_HPP
+#define SHARE_GC_SHENANDOAH_SHENANDOAHTASKQUEUE_INLINE_HPP
+#include "gc/shared/taskqueue.inline.hpp"
#include "gc/shenandoah/shenandoahTaskqueue.hpp"
+#include "utilities/stack.inline.hpp"
template
-bool BufferedOverflowTaskQueue::pop(E &t)
-{
+bool BufferedOverflowTaskQueue::pop(E &t) {
if (!_buf_empty) {
t = _elem;
_buf_empty = true;
@@ -43,8 +44,7 @@ bool BufferedOverflowTaskQueue::pop(E &t)
}
template
-inline bool BufferedOverflowTaskQueue::push(E t)
-{
+inline bool BufferedOverflowTaskQueue::push(E t) {
if (_buf_empty) {
_elem = t;
_buf_empty = false;
@@ -56,4 +56,12 @@ inline bool BufferedOverflowTaskQueue::push(E t)
return true;
}
-#endif // SHARE_VM_GC_SHENANDOAH_SHENANDOAHTASKQUEUE_INLINE_HPP
+template
+void BufferedOverflowTaskQueue::clear() {
+ _buf_empty = true;
+ taskqueue_t::set_empty();
+ taskqueue_t::overflow_stack()->clear();
+}
+
+
+#endif // SHARE_GC_SHENANDOAH_SHENANDOAHTASKQUEUE_INLINE_HPP
diff --git a/src/hotspot/share/gc/shenandoah/shenandoahTimingTracker.hpp b/src/hotspot/share/gc/shenandoah/shenandoahTimingTracker.hpp
index fc6147f2d24..80e8bc769e5 100644
--- a/src/hotspot/share/gc/shenandoah/shenandoahTimingTracker.hpp
+++ b/src/hotspot/share/gc/shenandoah/shenandoahTimingTracker.hpp
@@ -21,8 +21,8 @@
*
*/
-#ifndef SHARE_VM_GC_SHENANDOAH_SHENANDOAHTIMINGTRACKER_HPP
-#define SHARE_VM_GC_SHENANDOAH_SHENANDOAHTIMINGTRACKER_HPP
+#ifndef SHARE_GC_SHENANDOAH_SHENANDOAHTIMINGTRACKER_HPP
+#define SHARE_GC_SHENANDOAH_SHENANDOAHTIMINGTRACKER_HPP
#include "jfr/jfrEvents.hpp"
#include "gc/shenandoah/shenandoahPhaseTimings.hpp"
@@ -65,5 +65,4 @@ public:
static ShenandoahPhaseTimings::Phase current_termination_phase() { return _current_termination_phase; }
};
-#endif // SHARE_VM_GC_SHENANDOAH_SHENANDOAHTIMINGTRACKER_HPP
-
+#endif // SHARE_GC_SHENANDOAH_SHENANDOAHTIMINGTRACKER_HPP
diff --git a/src/hotspot/share/gc/shenandoah/shenandoahTracer.hpp b/src/hotspot/share/gc/shenandoah/shenandoahTracer.hpp
index e995825a025..48313a24d9f 100644
--- a/src/hotspot/share/gc/shenandoah/shenandoahTracer.hpp
+++ b/src/hotspot/share/gc/shenandoah/shenandoahTracer.hpp
@@ -21,8 +21,8 @@
*
*/
-#ifndef SHARE_VM_GC_SHENANDOAH_SHENANDOAHTRACER_HPP
-#define SHARE_VM_GC_SHENANDOAH_SHENANDOAHTRACER_HPP
+#ifndef SHARE_GC_SHENANDOAH_SHENANDOAHTRACER_HPP
+#define SHARE_GC_SHENANDOAH_SHENANDOAHTRACER_HPP
#include "gc/shared/gcTrace.hpp"
@@ -31,4 +31,4 @@ public:
ShenandoahTracer() : GCTracer(Shenandoah) {}
};
-#endif // SHARE_VM_GC_SHENANDOAH_SHENANDOAHTRACER_HPP
+#endif // SHARE_GC_SHENANDOAH_SHENANDOAHTRACER_HPP
diff --git a/src/hotspot/share/gc/shenandoah/shenandoahTraversalGC.cpp b/src/hotspot/share/gc/shenandoah/shenandoahTraversalGC.cpp
index ce4891f62f9..e070ba92ddb 100644
--- a/src/hotspot/share/gc/shenandoah/shenandoahTraversalGC.cpp
+++ b/src/hotspot/share/gc/shenandoah/shenandoahTraversalGC.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, Red Hat, Inc. All rights reserved.
+ * Copyright (c) 2018, 2019, Red Hat, Inc. All rights reserved.
*
* This code is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License version 2 only, as
@@ -28,7 +28,6 @@
#include "gc/shared/referenceProcessor.hpp"
#include "gc/shared/referenceProcessorPhaseTimes.hpp"
#include "gc/shared/workgroup.hpp"
-#include "gc/shared/weakProcessor.hpp"
#include "gc/shared/weakProcessor.inline.hpp"
#include "gc/shenandoah/shenandoahBarrierSet.hpp"
#include "gc/shenandoah/shenandoahCodeRoots.hpp"
@@ -36,16 +35,13 @@
#include "gc/shenandoah/shenandoahCollectorPolicy.hpp"
#include "gc/shenandoah/shenandoahFreeSet.hpp"
#include "gc/shenandoah/shenandoahPhaseTimings.hpp"
-#include "gc/shenandoah/shenandoahHeap.hpp"
#include "gc/shenandoah/shenandoahHeap.inline.hpp"
-#include "gc/shenandoah/shenandoahHeapRegionSet.hpp"
#include "gc/shenandoah/shenandoahHeapRegionSet.inline.hpp"
#include "gc/shenandoah/shenandoahHeuristics.hpp"
#include "gc/shenandoah/shenandoahMarkingContext.inline.hpp"
#include "gc/shenandoah/shenandoahOopClosures.inline.hpp"
#include "gc/shenandoah/shenandoahRootProcessor.hpp"
#include "gc/shenandoah/shenandoahStringDedup.hpp"
-#include "gc/shenandoah/shenandoahTaskqueue.hpp"
#include "gc/shenandoah/shenandoahTaskqueue.inline.hpp"
#include "gc/shenandoah/shenandoahTimingTracker.hpp"
#include "gc/shenandoah/shenandoahTraversalGC.hpp"
diff --git a/src/hotspot/share/gc/shenandoah/shenandoahTraversalGC.hpp b/src/hotspot/share/gc/shenandoah/shenandoahTraversalGC.hpp
index 022752fcc70..7b64107d750 100644
--- a/src/hotspot/share/gc/shenandoah/shenandoahTraversalGC.hpp
+++ b/src/hotspot/share/gc/shenandoah/shenandoahTraversalGC.hpp
@@ -21,8 +21,8 @@
*
*/
-#ifndef SHARE_VM_GC_SHENANDOAH_SHENANDOAHTRAVERSALGC_HPP
-#define SHARE_VM_GC_SHENANDOAH_SHENANDOAHTRAVERSALGC_HPP
+#ifndef SHARE_GC_SHENANDOAH_SHENANDOAHTRAVERSALGC_HPP
+#define SHARE_GC_SHENANDOAH_SHENANDOAHTRAVERSALGC_HPP
#include "memory/allocation.hpp"
#include "gc/shenandoah/shenandoahHeap.hpp"
@@ -70,4 +70,4 @@ private:
void fixup_roots();
};
-#endif // SHARE_VM_GC_SHENANDOAH_SHENANDOAHTRAVERSALGC_HPP
+#endif // SHARE_GC_SHENANDOAH_SHENANDOAHTRAVERSALGC_HPP
diff --git a/src/hotspot/share/gc/shenandoah/shenandoahTraversalGC.inline.hpp b/src/hotspot/share/gc/shenandoah/shenandoahTraversalGC.inline.hpp
index a37609451f7..d6f8d34ccb1 100644
--- a/src/hotspot/share/gc/shenandoah/shenandoahTraversalGC.inline.hpp
+++ b/src/hotspot/share/gc/shenandoah/shenandoahTraversalGC.inline.hpp
@@ -21,8 +21,8 @@
*
*/
-#ifndef SHARE_VM_GC_SHENANDOAH_SHENANDOAHTRAVERSALGC_INLINE_HPP
-#define SHARE_VM_GC_SHENANDOAH_SHENANDOAHTRAVERSALGC_INLINE_HPP
+#ifndef SHARE_GC_SHENANDOAH_SHENANDOAHTRAVERSALGC_INLINE_HPP
+#define SHARE_GC_SHENANDOAH_SHENANDOAHTRAVERSALGC_INLINE_HPP
#include "gc/shenandoah/shenandoahAsserts.hpp"
#include "gc/shenandoah/shenandoahBarrierSet.inline.hpp"
@@ -74,4 +74,4 @@ void ShenandoahTraversalGC::process_oop(T* p, Thread* thread, ShenandoahObjToSca
}
}
-#endif // SHARE_VM_GC_SHENANDOAH_SHENANDOAHTRAVERSALGC_INLINE_HPP
+#endif // SHARE_GC_SHENANDOAH_SHENANDOAHTRAVERSALGC_INLINE_HPP
diff --git a/src/hotspot/share/gc/shenandoah/shenandoahUtils.hpp b/src/hotspot/share/gc/shenandoah/shenandoahUtils.hpp
index 6d6373a78c2..2af8a554805 100644
--- a/src/hotspot/share/gc/shenandoah/shenandoahUtils.hpp
+++ b/src/hotspot/share/gc/shenandoah/shenandoahUtils.hpp
@@ -21,8 +21,8 @@
*
*/
-#ifndef SHARE_VM_GC_SHENANDOAHUTILS_HPP
-#define SHARE_VM_GC_SHENANDOAHUTILS_HPP
+#ifndef SHARE_GC_SHENANDOAH_SHENANDOAHUTILS_HPP
+#define SHARE_GC_SHENANDOAH_SHENANDOAHUTILS_HPP
#include "jfr/jfrEvents.hpp"
@@ -175,4 +175,4 @@ public:
}
};
-#endif // SHARE_VM_GC_SHENANDOAHUTILS_HPP
+#endif // SHARE_GC_SHENANDOAH_SHENANDOAHUTILS_HPP
diff --git a/src/hotspot/share/gc/shenandoah/shenandoahVMOperations.hpp b/src/hotspot/share/gc/shenandoah/shenandoahVMOperations.hpp
index dcaed4e0d5f..09037e415e3 100644
--- a/src/hotspot/share/gc/shenandoah/shenandoahVMOperations.hpp
+++ b/src/hotspot/share/gc/shenandoah/shenandoahVMOperations.hpp
@@ -21,8 +21,8 @@
*
*/
-#ifndef SHARE_VM_GC_SHENANDOAH_VM_OPERATIONS_SHENANDOAH_HPP
-#define SHARE_VM_GC_SHENANDOAH_VM_OPERATIONS_SHENANDOAH_HPP
+#ifndef SHARE_GC_SHENANDOAH_SHENANDOAHVMOPERATIONS_HPP
+#define SHARE_GC_SHENANDOAH_SHENANDOAHVMOPERATIONS_HPP
#include "gc/shared/gcVMOperations.hpp"
@@ -131,4 +131,4 @@ public:
virtual void doit();
};
-#endif //SHARE_VM_GC_SHENANDOAH_VM_OPERATIONS_SHENANDOAH_HPP
+#endif // SHARE_GC_SHENANDOAH_SHENANDOAHVMOPERATIONS_HPP
diff --git a/src/hotspot/share/gc/shenandoah/shenandoahVerifier.cpp b/src/hotspot/share/gc/shenandoah/shenandoahVerifier.cpp
index 88909fc7bfb..062aee68592 100644
--- a/src/hotspot/share/gc/shenandoah/shenandoahVerifier.cpp
+++ b/src/hotspot/share/gc/shenandoah/shenandoahVerifier.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2017, 2018, Red Hat, Inc. All rights reserved.
+ * Copyright (c) 2017, 2019, Red Hat, Inc. All rights reserved.
*
* This code is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License version 2 only, as
@@ -26,10 +26,9 @@
#include "gc/shenandoah/shenandoahAsserts.hpp"
#include "gc/shenandoah/shenandoahBrooksPointer.hpp"
#include "gc/shenandoah/shenandoahPhaseTimings.hpp"
-#include "gc/shenandoah/shenandoahHeap.hpp"
#include "gc/shenandoah/shenandoahHeap.inline.hpp"
#include "gc/shenandoah/shenandoahRootProcessor.hpp"
-#include "gc/shenandoah/shenandoahTaskqueue.hpp"
+#include "gc/shenandoah/shenandoahTaskqueue.inline.hpp"
#include "gc/shenandoah/shenandoahUtils.hpp"
#include "gc/shenandoah/shenandoahVerifier.hpp"
#include "memory/allocation.hpp"
diff --git a/src/hotspot/share/gc/shenandoah/shenandoahVerifier.hpp b/src/hotspot/share/gc/shenandoah/shenandoahVerifier.hpp
index a16169454cd..a7191eac1ec 100644
--- a/src/hotspot/share/gc/shenandoah/shenandoahVerifier.hpp
+++ b/src/hotspot/share/gc/shenandoah/shenandoahVerifier.hpp
@@ -21,8 +21,8 @@
*
*/
-#ifndef SHARE_VM_GC_SHENANDOAH_SHENANDOAHVERIFIER_HPP
-#define SHARE_VM_GC_SHENANDOAH_SHENANDOAHVERIFIER_HPP
+#ifndef SHARE_GC_SHENANDOAH_SHENANDOAHVERIFIER_HPP
+#define SHARE_GC_SHENANDOAH_SHENANDOAHVERIFIER_HPP
#include "gc/shared/markBitMap.hpp"
#include "memory/allocation.hpp"
@@ -184,4 +184,4 @@ public:
void verify_generic(VerifyOption option);
};
-#endif // SHARE_VM_GC_SHENANDOAH_SHENANDOAHVERIFIER_HPP
+#endif // SHARE_GC_SHENANDOAH_SHENANDOAHVERIFIER_HPP
diff --git a/src/hotspot/share/gc/shenandoah/shenandoahWorkGroup.hpp b/src/hotspot/share/gc/shenandoah/shenandoahWorkGroup.hpp
index abdc29a71f0..4140d779e32 100644
--- a/src/hotspot/share/gc/shenandoah/shenandoahWorkGroup.hpp
+++ b/src/hotspot/share/gc/shenandoah/shenandoahWorkGroup.hpp
@@ -21,8 +21,8 @@
*
*/
-#ifndef SHARE_VM_GC_SHENANDOAH_SHENANDOAHWORKGROUP_HPP
-#define SHARE_VM_GC_SHENANDOAH_SHENANDOAHWORKGROUP_HPP
+#ifndef SHARE_GC_SHENANDOAH_SHENANDOAHWORKGROUP_HPP
+#define SHARE_GC_SHENANDOAH_SHENANDOAHWORKGROUP_HPP
#include "gc/shared/workgroup.hpp"
#include "gc/shenandoah/shenandoahTaskqueue.hpp"
@@ -87,4 +87,4 @@ public:
void set_initialize_gclab() { assert(!_initialize_gclab, "Can only enable once"); _initialize_gclab = true; }
};
-#endif // SHARE_VM_GC_SHENANDOAH_SHENANDOAHWORKGROUP_HPP
+#endif // SHARE_GC_SHENANDOAH_SHENANDOAHWORKGROUP_HPP
diff --git a/src/hotspot/share/gc/shenandoah/shenandoahWorkerPolicy.hpp b/src/hotspot/share/gc/shenandoah/shenandoahWorkerPolicy.hpp
index d1d8fb62301..98de9b099e9 100644
--- a/src/hotspot/share/gc/shenandoah/shenandoahWorkerPolicy.hpp
+++ b/src/hotspot/share/gc/shenandoah/shenandoahWorkerPolicy.hpp
@@ -21,8 +21,8 @@
*
*/
-#ifndef SHARE_VM_GC_SHENANDOAH_SHENANDOAHWORKERPOLICY_HPP
-#define SHARE_VM_GC_SHENANDOAH_SHENANDOAHWORKERPOLICY_HPP
+#ifndef SHARE_GC_SHENANDOAH_SHENANDOAHWORKERPOLICY_HPP
+#define SHARE_GC_SHENANDOAH_SHENANDOAHWORKERPOLICY_HPP
#include "memory/allocation.hpp"
@@ -81,4 +81,4 @@ public:
static uint calc_workers_for_conc_reset();
};
-#endif // SHARE_VM_GC_SHENANDOAH_SHENANDOAHWORKERPOLICY_HPP
+#endif // SHARE_GC_SHENANDOAH_SHENANDOAHWORKERPOLICY_HPP
diff --git a/src/hotspot/share/gc/shenandoah/shenandoah_globals.hpp b/src/hotspot/share/gc/shenandoah/shenandoah_globals.hpp
index 1a6abede7ca..533b728dafd 100644
--- a/src/hotspot/share/gc/shenandoah/shenandoah_globals.hpp
+++ b/src/hotspot/share/gc/shenandoah/shenandoah_globals.hpp
@@ -21,8 +21,8 @@
*
*/
-#ifndef SHARE_VM_GC_SHENANDOAH_SHENANDOAH_GLOBALS_HPP
-#define SHARE_VM_GC_SHENANDOAH_SHENANDOAH_GLOBALS_HPP
+#ifndef SHARE_GC_SHENANDOAH_SHENANDOAH_GLOBALS_HPP
+#define SHARE_GC_SHENANDOAH_SHENANDOAH_GLOBALS_HPP
#define GC_SHENANDOAH_FLAGS(develop, \
develop_pd, \
@@ -185,6 +185,9 @@
"adjustment. Lower values make adjustments faster, at the " \
"expense of higher perf overhead. Time is in milliseconds.") \
\
+ experimental(bool, ShenandoahCriticalControlThreadPriority, false, \
+ "Shenandoah control thread runs at critical scheduling priority.")\
+ \
diagnostic(bool, ShenandoahVerify, false, \
"Verify the Shenandoah garbage collector") \
\
@@ -414,4 +417,4 @@
experimental(bool, ShenandoahLoopOptsAfterExpansion, true, \
"Attempt more loop opts after write barrier expansion") \
-#endif // SHARE_VM_GC_SHENANDOAH_SHENANDOAH_GLOBALS_HPP
+#endif // SHARE_GC_SHENANDOAH_SHENANDOAH_GLOBALS_HPP
diff --git a/src/hotspot/share/gc/shenandoah/vmStructs_shenandoah.hpp b/src/hotspot/share/gc/shenandoah/vmStructs_shenandoah.hpp
index 2051117239d..d277a4c23c3 100644
--- a/src/hotspot/share/gc/shenandoah/vmStructs_shenandoah.hpp
+++ b/src/hotspot/share/gc/shenandoah/vmStructs_shenandoah.hpp
@@ -20,8 +20,8 @@
* questions.
*
*/
-#ifndef SHARE_VM_GC_SHENANDOAH_VMSTRUCTS_SHENANDOAH_HPP
-#define SHARE_VM_GC_SHENANDOAH_VMSTRUCTS_SHENANDOAH_HPP
+#ifndef SHARE_GC_SHENANDOAH_VMSTRUCTS_SHENANDOAH_HPP
+#define SHARE_GC_SHENANDOAH_VMSTRUCTS_SHENANDOAH_HPP
#include "gc/shenandoah/shenandoahHeap.hpp"
#include "gc/shenandoah/shenandoahHeapRegion.hpp"
@@ -43,4 +43,4 @@
declare_toplevel_type(ShenandoahHeap*) \
declare_toplevel_type(ShenandoahHeapRegion*) \
-#endif // SHARE_VM_GC_SHENANDOAH_VMSTRUCTS_SHENANDOAH_HPP
+#endif // SHARE_GC_SHENANDOAH_VMSTRUCTS_SHENANDOAH_HPP
diff --git a/src/hotspot/share/gc/z/c1/zBarrierSetC1.cpp b/src/hotspot/share/gc/z/c1/zBarrierSetC1.cpp
index c627238882d..db695398cb5 100644
--- a/src/hotspot/share/gc/z/c1/zBarrierSetC1.cpp
+++ b/src/hotspot/share/gc/z/c1/zBarrierSetC1.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2015, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -36,7 +36,6 @@ ZLoadBarrierStubC1::ZLoadBarrierStubC1(LIRAccess& access, LIR_Opr ref, address r
_ref_addr(access.resolved_addr()),
_ref(ref),
_tmp(LIR_OprFact::illegalOpr),
- _patch_info(access.patch_emit_info()),
_runtime_stub(runtime_stub) {
// Allocate tmp register if needed
@@ -72,28 +71,14 @@ LIR_Opr ZLoadBarrierStubC1::tmp() const {
return _tmp;
}
-LIR_PatchCode ZLoadBarrierStubC1::patch_code() const {
- return (_decorators & C1_NEEDS_PATCHING) != 0 ? lir_patch_normal : lir_patch_none;
-}
-
-CodeEmitInfo*& ZLoadBarrierStubC1::patch_info() {
- return _patch_info;
-}
-
address ZLoadBarrierStubC1::runtime_stub() const {
return _runtime_stub;
}
void ZLoadBarrierStubC1::visit(LIR_OpVisitState* visitor) {
- if (_patch_info != NULL) {
- visitor->do_slow_case(_patch_info);
- } else {
- visitor->do_slow_case();
- }
-
+ visitor->do_slow_case();
visitor->do_input(_ref_addr);
visitor->do_output(_ref);
-
if (_tmp->is_valid()) {
visitor->do_temp(_tmp);
}
@@ -174,6 +159,14 @@ void ZBarrierSetC1::load_barrier(LIRAccess& access, LIR_Opr result) const {
__ branch_destination(stub->continuation());
}
+LIR_Opr ZBarrierSetC1::resolve_address(LIRAccess& access, bool resolve_in_register) {
+ // We must resolve in register when patching. This is to avoid
+ // having a patch area in the load barrier stub, since the call
+ // into the runtime to patch will not have the proper oop map.
+ const bool patch_before_barrier = barrier_needed(access) && (access.decorators() & C1_NEEDS_PATCHING) != 0;
+ return BarrierSetC1::resolve_address(access, resolve_in_register || patch_before_barrier);
+}
+
#undef __
void ZBarrierSetC1::load_at_resolved(LIRAccess& access, LIR_Opr result) {
diff --git a/src/hotspot/share/gc/z/c1/zBarrierSetC1.hpp b/src/hotspot/share/gc/z/c1/zBarrierSetC1.hpp
index 4f1514f988c..2eec7366c53 100644
--- a/src/hotspot/share/gc/z/c1/zBarrierSetC1.hpp
+++ b/src/hotspot/share/gc/z/c1/zBarrierSetC1.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2015, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -32,12 +32,11 @@
class ZLoadBarrierStubC1 : public CodeStub {
private:
- DecoratorSet _decorators;
- LIR_Opr _ref_addr;
- LIR_Opr _ref;
- LIR_Opr _tmp;
- CodeEmitInfo* _patch_info;
- address _runtime_stub;
+ DecoratorSet _decorators;
+ LIR_Opr _ref_addr;
+ LIR_Opr _ref;
+ LIR_Opr _tmp;
+ address _runtime_stub;
public:
ZLoadBarrierStubC1(LIRAccess& access, LIR_Opr ref, address runtime_stub);
@@ -46,8 +45,6 @@ public:
LIR_Opr ref() const;
LIR_Opr ref_addr() const;
LIR_Opr tmp() const;
- LIR_PatchCode patch_code() const;
- CodeEmitInfo*& patch_info();
address runtime_stub() const;
virtual void emit_code(LIR_Assembler* ce);
@@ -67,6 +64,7 @@ private:
void load_barrier(LIRAccess& access, LIR_Opr result) const;
protected:
+ virtual LIR_Opr resolve_address(LIRAccess& access, bool resolve_in_register);
virtual void load_at_resolved(LIRAccess& access, LIR_Opr result);
virtual LIR_Opr atomic_xchg_at_resolved(LIRAccess& access, LIRItem& value);
virtual LIR_Opr atomic_cmpxchg_at_resolved(LIRAccess& access, LIRItem& cmp_value, LIRItem& new_value);
diff --git a/src/hotspot/share/gc/z/c2/zBarrierSetC2.cpp b/src/hotspot/share/gc/z/c2/zBarrierSetC2.cpp
index f1d0d0e09f1..ceb309aae3e 100644
--- a/src/hotspot/share/gc/z/c2/zBarrierSetC2.cpp
+++ b/src/hotspot/share/gc/z/c2/zBarrierSetC2.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2015, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -32,12 +32,13 @@
#include "opto/node.hpp"
#include "opto/type.hpp"
#include "utilities/macros.hpp"
+#include "gc/z/zBarrierSet.hpp"
#include "gc/z/c2/zBarrierSetC2.hpp"
#include "gc/z/zThreadLocalData.hpp"
#include "gc/z/zBarrierSetRuntime.hpp"
-ZBarrierSetC2State::ZBarrierSetC2State(Arena* comp_arena)
- : _load_barrier_nodes(new (comp_arena) GrowableArray(comp_arena, 8, 0, NULL)) {}
+ZBarrierSetC2State::ZBarrierSetC2State(Arena* comp_arena) :
+ _load_barrier_nodes(new (comp_arena) GrowableArray(comp_arena, 8, 0, NULL)) {}
int ZBarrierSetC2State::load_barrier_count() const {
return _load_barrier_nodes->length();
@@ -122,7 +123,7 @@ void ZBarrierSetC2::enqueue_useful_gc_barrier(PhaseIterGVN* igvn, Node* node) co
void ZBarrierSetC2::find_dominating_barriers(PhaseIterGVN& igvn) {
// Look for dominating barriers on the same address only once all
- // other loop opts are over: loop opts may cause a safepoint to be
+ // other loop opts are over. Loop opts may cause a safepoint to be
// inserted between a barrier and its dominating barrier.
Compile* C = Compile::current();
ZBarrierSetC2* bs = (ZBarrierSetC2*)BarrierSet::barrier_set()->barrier_set_c2();
@@ -189,6 +190,15 @@ LoadBarrierNode::LoadBarrierNode(Compile* C,
bs->register_potential_barrier_node(this);
}
+uint LoadBarrierNode::size_of() const {
+ return sizeof(*this);
+}
+
+uint LoadBarrierNode::cmp(const Node& n) const {
+ ShouldNotReachHere();
+ return 0;
+}
+
const Type *LoadBarrierNode::bottom_type() const {
const Type** floadbarrier = (const Type **)(Compile::current()->type_arena()->Amalloc_4((Number_of_Outputs)*sizeof(Type*)));
Node* in_oop = in(Oop);
@@ -198,6 +208,11 @@ const Type *LoadBarrierNode::bottom_type() const {
return TypeTuple::make(Number_of_Outputs, floadbarrier);
}
+const TypePtr* LoadBarrierNode::adr_type() const {
+ ShouldNotReachHere();
+ return NULL;
+}
+
const Type *LoadBarrierNode::Value(PhaseGVN *phase) const {
const Type** floadbarrier = (const Type **)(phase->C->type_arena()->Amalloc_4((Number_of_Outputs)*sizeof(Type*)));
const Type* val_t = phase->type(in(Oop));
@@ -441,6 +456,11 @@ Node *LoadBarrierNode::Ideal(PhaseGVN *phase, bool can_reshape) {
return NULL;
}
+uint LoadBarrierNode::match_edge(uint idx) const {
+ ShouldNotReachHere();
+ return 0;
+}
+
void LoadBarrierNode::fix_similar_in_uses(PhaseIterGVN* igvn) {
Node* out_res = proj_out_or_null(Oop);
if (out_res == NULL) {
@@ -990,8 +1010,6 @@ void ZBarrierSetC2::expand_loadbarrier_optimized(PhaseMacroExpand* phase, LoadBa
assert(is_gc_barrier_node(result_phi), "sanity");
assert(step_over_gc_barrier(result_phi) == in_val, "sanity");
-
- return;
}
bool ZBarrierSetC2::expand_barriers(Compile* C, PhaseIterGVN& igvn) const {
@@ -1016,7 +1034,9 @@ bool ZBarrierSetC2::expand_barriers(Compile* C, PhaseIterGVN& igvn) const {
}
expand_loadbarrier_node(¯o, n);
assert(s->load_barrier_count() < load_barrier_count, "must have deleted a node from load barrier list");
- if (C->failing()) return true;
+ if (C->failing()) {
+ return true;
+ }
}
while (s->load_barrier_count() > 0) {
int load_barrier_count = s->load_barrier_count();
@@ -1025,12 +1045,17 @@ bool ZBarrierSetC2::expand_barriers(Compile* C, PhaseIterGVN& igvn) const {
assert(!n->can_be_eliminated(), "should have been processed already");
expand_loadbarrier_node(¯o, n);
assert(s->load_barrier_count() < load_barrier_count, "must have deleted a node from load barrier list");
- if (C->failing()) return true;
+ if (C->failing()) {
+ return true;
+ }
}
igvn.set_delay_transform(false);
igvn.optimize();
- if (C->failing()) return true;
+ if (C->failing()) {
+ return true;
+ }
}
+
return false;
}
@@ -1041,31 +1066,33 @@ static bool replace_with_dominating_barrier(PhaseIdealLoop* phase, LoadBarrierNo
Compile* C = Compile::current();
LoadBarrierNode* lb2 = lb->has_dominating_barrier(phase, false, last_round);
- if (lb2 != NULL) {
- if (lb->in(LoadBarrierNode::Oop) != lb2->in(LoadBarrierNode::Oop)) {
- assert(lb->in(LoadBarrierNode::Address) == lb2->in(LoadBarrierNode::Address), "");
- igvn.replace_input_of(lb, LoadBarrierNode::Similar, lb2->proj_out(LoadBarrierNode::Oop));
- C->set_major_progress();
- } else {
- // That transformation may cause the Similar edge on dominated load barriers to be invalid
- lb->fix_similar_in_uses(&igvn);
-
- Node* val = lb->proj_out(LoadBarrierNode::Oop);
- assert(lb2->has_true_uses(), "");
- assert(lb2->in(LoadBarrierNode::Oop) == lb->in(LoadBarrierNode::Oop), "");
-
- phase->lazy_update(lb, lb->in(LoadBarrierNode::Control));
- phase->lazy_replace(lb->proj_out(LoadBarrierNode::Control), lb->in(LoadBarrierNode::Control));
- igvn.replace_node(val, lb2->proj_out(LoadBarrierNode::Oop));
-
- return true;
- }
+ if (lb2 == NULL) {
+ return false;
}
- return false;
+
+ if (lb->in(LoadBarrierNode::Oop) != lb2->in(LoadBarrierNode::Oop)) {
+ assert(lb->in(LoadBarrierNode::Address) == lb2->in(LoadBarrierNode::Address), "Invalid address");
+ igvn.replace_input_of(lb, LoadBarrierNode::Similar, lb2->proj_out(LoadBarrierNode::Oop));
+ C->set_major_progress();
+ return false;
+ }
+
+ // That transformation may cause the Similar edge on dominated load barriers to be invalid
+ lb->fix_similar_in_uses(&igvn);
+
+ Node* val = lb->proj_out(LoadBarrierNode::Oop);
+ assert(lb2->has_true_uses(), "Invalid uses");
+ assert(lb2->in(LoadBarrierNode::Oop) == lb->in(LoadBarrierNode::Oop), "Invalid oop");
+ phase->lazy_update(lb, lb->in(LoadBarrierNode::Control));
+ phase->lazy_replace(lb->proj_out(LoadBarrierNode::Control), lb->in(LoadBarrierNode::Control));
+ igvn.replace_node(val, lb2->proj_out(LoadBarrierNode::Oop));
+
+ return true;
}
static Node* find_dominating_memory(PhaseIdealLoop* phase, Node* mem, Node* dom, int i) {
assert(dom->is_Region() || i == -1, "");
+
Node* m = mem;
while(phase->is_dominator(dom, phase->has_ctrl(m) ? phase->get_ctrl(m) : m->in(0))) {
if (m->is_Mem()) {
@@ -1091,6 +1118,7 @@ static Node* find_dominating_memory(PhaseIdealLoop* phase, Node* mem, Node* dom,
ShouldNotReachHere();
}
}
+
return m;
}
@@ -1151,7 +1179,7 @@ static bool split_barrier_thru_phi(PhaseIdealLoop* phase, LoadBarrierNode* lb) {
if (lb->in(LoadBarrierNode::Oop)->is_Phi()) {
Node* oop_phi = lb->in(LoadBarrierNode::Oop);
- if (oop_phi->in(2) == oop_phi) {
+ if ((oop_phi->req() != 3) || (oop_phi->in(2) == oop_phi)) {
// Ignore phis with only one input
return false;
}
@@ -1370,35 +1398,33 @@ static bool common_barriers(PhaseIdealLoop* phase, LoadBarrierNode* lb) {
return false;
}
-static void optimize_load_barrier(PhaseIdealLoop* phase, LoadBarrierNode* lb, bool last_round) {
- Compile* C = Compile::current();
-
- if (!C->directive()->ZOptimizeLoadBarriersOption) {
+void ZBarrierSetC2::loop_optimize_gc_barrier(PhaseIdealLoop* phase, Node* node, bool last_round) {
+ if (!Compile::current()->directive()->ZOptimizeLoadBarriersOption) {
return;
}
- if (lb->has_true_uses()) {
- if (replace_with_dominating_barrier(phase, lb, last_round)) {
- return;
- }
-
- if (split_barrier_thru_phi(phase, lb)) {
- return;
- }
-
- if (move_out_of_loop(phase, lb)) {
- return;
- }
-
- if (common_barriers(phase, lb)) {
- return;
- }
+ if (!node->is_LoadBarrier()) {
+ return;
}
-}
-void ZBarrierSetC2::loop_optimize_gc_barrier(PhaseIdealLoop* phase, Node* node, bool last_round) {
- if (node->is_LoadBarrier()) {
- optimize_load_barrier(phase, node->as_LoadBarrier(), last_round);
+ if (!node->as_LoadBarrier()->has_true_uses()) {
+ return;
+ }
+
+ if (replace_with_dominating_barrier(phase, node->as_LoadBarrier(), last_round)) {
+ return;
+ }
+
+ if (split_barrier_thru_phi(phase, node->as_LoadBarrier())) {
+ return;
+ }
+
+ if (move_out_of_loop(phase, node->as_LoadBarrier())) {
+ return;
+ }
+
+ if (common_barriers(phase, node->as_LoadBarrier())) {
+ return;
}
}
@@ -1433,26 +1459,23 @@ bool ZBarrierSetC2::array_copy_requires_gc_barriers(bool tightly_coupled_alloc,
}
bool ZBarrierSetC2::final_graph_reshaping(Compile* compile, Node* n, uint opcode) const {
- bool handled;
- switch (opcode) {
- case Op_LoadBarrierSlowReg:
- case Op_LoadBarrierWeakSlowReg:
-#ifdef ASSERT
- if (VerifyOptoOopOffsets) {
- MemNode* mem = n->as_Mem();
- // Check to see if address types have grounded out somehow.
- const TypeInstPtr* tp = mem->in(MemNode::Address)->bottom_type()->isa_instptr();
- ciInstanceKlass* k = tp->klass()->as_instance_klass();
- bool oop_offset_is_sane = k->contains_field_offset(tp->offset());
- assert(!tp || oop_offset_is_sane, "");
- }
-#endif
- handled = true;
- break;
- default:
- handled = false;
+ if (opcode != Op_LoadBarrierSlowReg &&
+ opcode != Op_LoadBarrierWeakSlowReg) {
+ return false;
}
- return handled;
+
+#ifdef ASSERT
+ if (VerifyOptoOopOffsets) {
+ MemNode* mem = n->as_Mem();
+ // Check to see if address types have grounded out somehow.
+ const TypeInstPtr* tp = mem->in(MemNode::Address)->bottom_type()->isa_instptr();
+ ciInstanceKlass* k = tp->klass()->as_instance_klass();
+ bool oop_offset_is_sane = k->contains_field_offset(tp->offset());
+ assert(!tp || oop_offset_is_sane, "");
+ }
+#endif
+
+ return true;
}
bool ZBarrierSetC2::matcher_find_shared_visit(Matcher* matcher, Matcher::MStack& mstack, Node* n, uint opcode, bool& mem_op, int& mem_addr_idx) const {
@@ -1463,6 +1486,7 @@ bool ZBarrierSetC2::matcher_find_shared_visit(Matcher* matcher, Matcher::MStack&
mem_addr_idx = TypeFunc::Parms + 1;
return true;
}
+
return false;
}
@@ -1586,37 +1610,35 @@ bool ZBarrierSetC2::escape_add_to_con_graph(ConnectionGraph* conn_graph, PhaseGV
case Op_LoadBarrierWeakSlowReg:
conn_graph->add_objload_to_connection_graph(n, delayed_worklist);
return true;
+
case Op_Proj:
- if (n->as_Proj()->_con == LoadBarrierNode::Oop && n->in(0)->is_LoadBarrier()) {
- conn_graph->add_local_var_and_edge(n, PointsToNode::NoEscape, n->in(0)->in(LoadBarrierNode::Oop),
- delayed_worklist);
- return true;
+ if (n->as_Proj()->_con != LoadBarrierNode::Oop || !n->in(0)->is_LoadBarrier()) {
+ return false;
}
- default:
- break;
+ conn_graph->add_local_var_and_edge(n, PointsToNode::NoEscape, n->in(0)->in(LoadBarrierNode::Oop), delayed_worklist);
+ return true;
}
+
return false;
}
bool ZBarrierSetC2::escape_add_final_edges(ConnectionGraph* conn_graph, PhaseGVN* gvn, Node* n, uint opcode) const {
switch (opcode) {
case Op_LoadBarrierSlowReg:
- case Op_LoadBarrierWeakSlowReg: {
- const Type *t = gvn->type(n);
- if (t->make_ptr() != NULL) {
- Node *adr = n->in(MemNode::Address);
- conn_graph->add_local_var_and_edge(n, PointsToNode::NoEscape, adr, NULL);
- return true;
+ case Op_LoadBarrierWeakSlowReg:
+ if (gvn->type(n)->make_ptr() == NULL) {
+ return false;
}
- }
- case Op_Proj: {
- if (n->as_Proj()->_con == LoadBarrierNode::Oop && n->in(0)->is_LoadBarrier()) {
- conn_graph->add_local_var_and_edge(n, PointsToNode::NoEscape, n->in(0)->in(LoadBarrierNode::Oop), NULL);
- return true;
+ conn_graph->add_local_var_and_edge(n, PointsToNode::NoEscape, n->in(MemNode::Address), NULL);
+ return true;
+
+ case Op_Proj:
+ if (n->as_Proj()->_con != LoadBarrierNode::Oop || !n->in(0)->is_LoadBarrier()) {
+ return false;
}
- }
- default:
- break;
+ conn_graph->add_local_var_and_edge(n, PointsToNode::NoEscape, n->in(0)->in(LoadBarrierNode::Oop), NULL);
+ return true;
}
+
return false;
}
diff --git a/src/hotspot/share/gc/z/c2/zBarrierSetC2.hpp b/src/hotspot/share/gc/z/c2/zBarrierSetC2.hpp
index 48ef8768e59..713e6d2ae29 100644
--- a/src/hotspot/share/gc/z/c2/zBarrierSetC2.hpp
+++ b/src/hotspot/share/gc/z/c2/zBarrierSetC2.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2015, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -31,7 +31,7 @@
class LoadBarrierNode : public MultiNode {
private:
- bool _weak;
+ bool _weak; // On strong or weak oop reference
bool _writeback; // Controls if the barrier writes the healed oop back to memory
// A swap on a memory location must never write back the healed oop
bool _oop_reload_allowed; // Controls if the barrier are allowed to reload the oop from memory
@@ -62,10 +62,14 @@ public:
bool oop_reload_allowed);
virtual int Opcode() const;
+ virtual uint size_of() const;
+ virtual uint cmp(const Node& n) const;
virtual const Type *bottom_type() const;
+ virtual const TypePtr* adr_type() const;
virtual const Type *Value(PhaseGVN *phase) const;
virtual Node *Identity(PhaseGVN *phase);
virtual Node *Ideal(PhaseGVN *phase, bool can_reshape);
+ virtual uint match_edge(uint idx) const;
LoadBarrierNode* has_dominating_barrier(PhaseIdealLoop* phase,
bool linear_only,
@@ -100,8 +104,8 @@ public:
const TypePtr *at,
const TypePtr* t,
MemOrd mo,
- ControlDependency control_dependency = DependsOnlyOnTest)
- : LoadPNode(c, mem, adr, at, t, mo, control_dependency) {
+ ControlDependency control_dependency = DependsOnlyOnTest) :
+ LoadPNode(c, mem, adr, at, t, mo, control_dependency) {
init_class_id(Class_LoadBarrierSlowReg);
}
@@ -124,8 +128,8 @@ public:
const TypePtr *at,
const TypePtr* t,
MemOrd mo,
- ControlDependency control_dependency = DependsOnlyOnTest)
- : LoadPNode(c, mem, adr, at, t, mo, control_dependency) {
+ ControlDependency control_dependency = DependsOnlyOnTest) :
+ LoadPNode(c, mem, adr, at, t, mo, control_dependency) {
init_class_id(Class_LoadBarrierWeakSlowReg);
}
@@ -217,7 +221,6 @@ public:
virtual bool escape_add_to_con_graph(ConnectionGraph* conn_graph, PhaseGVN* gvn, Unique_Node_List* delayed_worklist, Node* n, uint opcode) const;
virtual bool escape_add_final_edges(ConnectionGraph* conn_graph, PhaseGVN* gvn, Node* n, uint opcode) const;
-
};
#endif // SHARE_GC_Z_C2_ZBARRIERSETC2_HPP
diff --git a/src/hotspot/share/gc/z/vmStructs_z.hpp b/src/hotspot/share/gc/z/vmStructs_z.hpp
index 85145f317a9..498ff173969 100644
--- a/src/hotspot/share/gc/z/vmStructs_z.hpp
+++ b/src/hotspot/share/gc/z/vmStructs_z.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2017, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -21,8 +21,8 @@
* questions.
*/
-#ifndef SHARE_VM_GC_Z_VMSTRUCTS_Z_HPP
-#define SHARE_VM_GC_Z_VMSTRUCTS_Z_HPP
+#ifndef SHARE_GC_Z_VMSTRUCTS_Z_HPP
+#define SHARE_GC_Z_VMSTRUCTS_Z_HPP
#include "gc/z/zAddressRangeMap.hpp"
#include "gc/z/zCollectedHeap.hpp"
@@ -117,4 +117,4 @@ typedef ZAddressRangeMap ZAddressRangeMapFor
declare_toplevel_type(ZForwardingTableEntry) \
declare_toplevel_type(ZPhysicalMemoryManager)
-#endif // SHARE_VM_GC_Z_VMSTRUCTS_Z_HPP
+#endif // SHARE_GC_Z_VMSTRUCTS_Z_HPP
diff --git a/src/hotspot/share/gc/z/zBarrierSetNMethod.cpp b/src/hotspot/share/gc/z/zBarrierSetNMethod.cpp
index b31e311761d..9fb5b910514 100644
--- a/src/hotspot/share/gc/z/zBarrierSetNMethod.cpp
+++ b/src/hotspot/share/gc/z/zBarrierSetNMethod.cpp
@@ -42,6 +42,11 @@ bool ZBarrierSetNMethod::nmethod_entry_barrier(nmethod* nm) {
}
if (nm->is_unloading()) {
+ // We don't need to take the lock when unlinking nmethods from
+ // the Method, because it is only concurrently unlinked by
+ // the entry barrier, which acquires the per nmethod lock.
+ nm->unlink_from_method(false /* acquire_lock */);
+
// We can end up calling nmethods that are unloading
// since we clear compiled ICs lazily. Returning false
// will re-resovle the call and update the compiled IC.
diff --git a/src/hotspot/share/gc/z/zForwardingTable.hpp b/src/hotspot/share/gc/z/zForwardingTable.hpp
index 9a20ed4da5d..28bfbd9526d 100644
--- a/src/hotspot/share/gc/z/zForwardingTable.hpp
+++ b/src/hotspot/share/gc/z/zForwardingTable.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2015, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -21,8 +21,8 @@
* questions.
*/
-#ifndef SHARE_GC_Z_ZFORWARDING_HPP
-#define SHARE_GC_Z_ZFORWARDING_HPP
+#ifndef SHARE_GC_Z_ZFORWARDINGTABLE_HPP
+#define SHARE_GC_Z_ZFORWARDINGTABLE_HPP
#include "gc/z/zForwardingTableEntry.hpp"
#include "memory/allocation.hpp"
@@ -56,4 +56,4 @@ public:
void verify(size_t object_max_count, size_t live_objects) const;
};
-#endif // SHARE_GC_Z_ZFORWARDING_HPP
+#endif // SHARE_GC_Z_ZFORWARDINGTABLE_HPP
diff --git a/src/hotspot/share/gc/z/zForwardingTable.inline.hpp b/src/hotspot/share/gc/z/zForwardingTable.inline.hpp
index 2e1a13ca76d..9e107c5dff8 100644
--- a/src/hotspot/share/gc/z/zForwardingTable.inline.hpp
+++ b/src/hotspot/share/gc/z/zForwardingTable.inline.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2015, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -21,8 +21,8 @@
* questions.
*/
-#ifndef SHARE_GC_Z_ZFORWARDING_INLINE_HPP
-#define SHARE_GC_Z_ZFORWARDING_INLINE_HPP
+#ifndef SHARE_GC_Z_ZFORWARDINGTABLE_INLINE_HPP
+#define SHARE_GC_Z_ZFORWARDINGTABLE_INLINE_HPP
#include "gc/z/zForwardingTable.hpp"
#include "gc/z/zGlobals.hpp"
@@ -106,4 +106,4 @@ inline uintptr_t ZForwardingTable::insert(uintptr_t from_index, uintptr_t to_off
}
}
-#endif // SHARE_GC_Z_ZFORWARDING_INLINE_HPP
+#endif // SHARE_GC_Z_ZFORWARDINGTABLE_INLINE_HPP
diff --git a/src/hotspot/share/gc/z/zNMethodTable.cpp b/src/hotspot/share/gc/z/zNMethodTable.cpp
index 59719547ec9..78259813438 100644
--- a/src/hotspot/share/gc/z/zNMethodTable.cpp
+++ b/src/hotspot/share/gc/z/zNMethodTable.cpp
@@ -264,21 +264,17 @@ bool ZNMethodTable::register_entry(ZNMethodTableEntry* table, size_t size, ZNMet
}
}
-bool ZNMethodTable::unregister_entry(ZNMethodTableEntry* table, size_t size, nmethod* nm) {
+void ZNMethodTable::unregister_entry(ZNMethodTableEntry* table, size_t size, nmethod* nm) {
if (size == 0) {
// Table is empty
- return false;
+ return;
}
size_t index = first_index(nm, size);
for (;;) {
const ZNMethodTableEntry table_entry = table[index];
-
- if (!table_entry.registered() && !table_entry.unregistered()) {
- // Entry not found
- return false;
- }
+ assert(table_entry.registered() || table_entry.unregistered(), "Entry not found");
if (table_entry.registered() && table_entry.method() == nm) {
// Remove entry
@@ -287,7 +283,7 @@ bool ZNMethodTable::unregister_entry(ZNMethodTableEntry* table, size_t size, nme
// Destroy GC data
ZNMethodData::destroy(gc_data(nm));
set_gc_data(nm, NULL);
- return true;
+ return;
}
index = next_index(index, size);
@@ -451,8 +447,6 @@ void ZNMethodTable::sweeper_wait_for_iteration() {
return;
}
- assert(CodeCache_lock->owned_by_self(), "Lock must be held");
-
while (_iter_table != NULL) {
MutexUnlockerEx mu(CodeCache_lock, Mutex::_no_safepoint_check_flag);
os::naked_short_sleep(1);
@@ -460,6 +454,7 @@ void ZNMethodTable::sweeper_wait_for_iteration() {
}
void ZNMethodTable::unregister_nmethod(nmethod* nm) {
+ assert(CodeCache_lock->owned_by_self(), "Lock must be held");
ResourceMark rm;
sweeper_wait_for_iteration();
@@ -467,14 +462,9 @@ void ZNMethodTable::unregister_nmethod(nmethod* nm) {
log_unregister(nm);
// Remove entry
- if (unregister_entry(_table, _size, nm)) {
- // Entry was unregistered. When unregister_entry() instead returns
- // false the nmethod was not in the table (because it didn't have
- // any oops) so we do not want to decrease the number of registered
- // entries in that case.
- _nregistered--;
- _nunregistered++;
- }
+ unregister_entry(_table, _size, nm);
+ _nunregistered++;
+ _nregistered--;
}
void ZNMethodTable::disarm_nmethod(nmethod* nm) {
@@ -611,15 +601,20 @@ public:
return;
}
+ ZLocker locker(ZNMethodTable::lock_for_nmethod(nm));
+
if (nm->is_unloading()) {
// Unlinking of the dependencies must happen before the
// handshake separating unlink and purge.
nm->flush_dependencies(false /* delete_immediately */);
+
+ // We don't need to take the lock when unlinking nmethods from
+ // the Method, because it is only concurrently unlinked by
+ // the entry barrier, which acquires the per nmethod lock.
+ nm->unlink_from_method(false /* acquire_lock */);
return;
}
- ZLocker locker(ZNMethodTable::lock_for_nmethod(nm));
-
// Heal oops and disarm
ZNMethodOopClosure cl;
ZNMethodTable::entry_oops_do(entry, &cl);
diff --git a/src/hotspot/share/gc/z/zNMethodTable.hpp b/src/hotspot/share/gc/z/zNMethodTable.hpp
index 0ab2c180a7f..a16e09aad9c 100644
--- a/src/hotspot/share/gc/z/zNMethodTable.hpp
+++ b/src/hotspot/share/gc/z/zNMethodTable.hpp
@@ -57,7 +57,7 @@ private:
static void sweeper_wait_for_iteration();
static bool register_entry(ZNMethodTableEntry* table, size_t size, ZNMethodTableEntry entry);
- static bool unregister_entry(ZNMethodTableEntry* table, size_t size, nmethod* nm);
+ static void unregister_entry(ZNMethodTableEntry* table, size_t size, nmethod* nm);
static void rebuild(size_t new_size);
static void rebuild_if_needed();
diff --git a/src/hotspot/share/gc/z/zTracer.cpp b/src/hotspot/share/gc/z/zTracer.cpp
index c79a34a62b7..d8f4fcd198f 100644
--- a/src/hotspot/share/gc/z/zTracer.cpp
+++ b/src/hotspot/share/gc/z/zTracer.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -27,6 +27,7 @@
#include "gc/shared/gcId.hpp"
#include "gc/shared/gcLocker.hpp"
#include "jfr/jfrEvents.hpp"
+#include "runtime/safepoint.hpp"
#include "runtime/safepointVerifiers.hpp"
#if INCLUDE_JFR
#include "jfr/metadata/jfrSerializer.hpp"
diff --git a/src/hotspot/share/include/jvm.h b/src/hotspot/share/include/jvm.h
index d0ba86e0a33..d8606b2cc1f 100644
--- a/src/hotspot/share/include/jvm.h
+++ b/src/hotspot/share/include/jvm.h
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -63,7 +63,7 @@ extern "C" {
* class.
*/
-#define JVM_INTERFACE_VERSION 5
+#define JVM_INTERFACE_VERSION 6
JNIEXPORT jint JNICALL
JVM_GetInterfaceVersion(void);
@@ -450,7 +450,7 @@ JVM_AddReadsModule(JNIEnv *env, jobject from_module, jobject source_module);
*/
JNIEXPORT jstring JNICALL
-JVM_GetClassName(JNIEnv *env, jclass cls);
+JVM_InitClassName(JNIEnv *env, jclass cls);
JNIEXPORT jobjectArray JNICALL
JVM_GetClassInterfaces(JNIEnv *env, jclass cls);
diff --git a/src/hotspot/share/interpreter/abstractInterpreter.cpp b/src/hotspot/share/interpreter/abstractInterpreter.cpp
index 774f2f460b6..5d3fbbaee0f 100644
--- a/src/hotspot/share/interpreter/abstractInterpreter.cpp
+++ b/src/hotspot/share/interpreter/abstractInterpreter.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -60,7 +60,7 @@ void AbstractInterpreter::initialize() {
if (PrintBytecodeHistogram) BytecodeHistogram::reset();
if (PrintBytecodePairHistogram) BytecodePairHistogram::reset();
- InvocationCounter::reinitialize(DelayCompilationDuringStartup);
+ InvocationCounter::reinitialize();
}
diff --git a/src/hotspot/share/interpreter/abstractInterpreter.hpp b/src/hotspot/share/interpreter/abstractInterpreter.hpp
index 55d6ad5bebb..2e997ad8f67 100644
--- a/src/hotspot/share/interpreter/abstractInterpreter.hpp
+++ b/src/hotspot/share/interpreter/abstractInterpreter.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
*
*/
-#ifndef SHARE_VM_INTERPRETER_ABSTRACTINTERPRETER_HPP
-#define SHARE_VM_INTERPRETER_ABSTRACTINTERPRETER_HPP
+#ifndef SHARE_INTERPRETER_ABSTRACTINTERPRETER_HPP
+#define SHARE_INTERPRETER_ABSTRACTINTERPRETER_HPP
#include "asm/macroAssembler.hpp"
#include "code/stubs.hpp"
@@ -333,4 +333,4 @@ class AbstractInterpreterGenerator: public StackObj {
AbstractInterpreterGenerator(StubQueue* _code);
};
-#endif // SHARE_VM_INTERPRETER_ABSTRACTINTERPRETER_HPP
+#endif // SHARE_INTERPRETER_ABSTRACTINTERPRETER_HPP
diff --git a/src/hotspot/share/interpreter/bytecode.hpp b/src/hotspot/share/interpreter/bytecode.hpp
index befdd889d22..fd2731c899b 100644
--- a/src/hotspot/share/interpreter/bytecode.hpp
+++ b/src/hotspot/share/interpreter/bytecode.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
*
*/
-#ifndef SHARE_VM_INTERPRETER_BYTECODE_HPP
-#define SHARE_VM_INTERPRETER_BYTECODE_HPP
+#ifndef SHARE_INTERPRETER_BYTECODE_HPP
+#define SHARE_INTERPRETER_BYTECODE_HPP
#include "interpreter/bytecodes.hpp"
#include "memory/allocation.hpp"
@@ -342,4 +342,4 @@ class Bytecode_loadconstant: public Bytecode {
oop resolve_constant(TRAPS) const;
};
-#endif // SHARE_VM_INTERPRETER_BYTECODE_HPP
+#endif // SHARE_INTERPRETER_BYTECODE_HPP
diff --git a/src/hotspot/share/interpreter/bytecode.inline.hpp b/src/hotspot/share/interpreter/bytecode.inline.hpp
index 8a85c861350..291fb16b8c9 100644
--- a/src/hotspot/share/interpreter/bytecode.inline.hpp
+++ b/src/hotspot/share/interpreter/bytecode.inline.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -22,12 +22,12 @@
*
*/
-#ifndef SHARE_VM_INTERPRETER_BYTECODE_INLINE_HPP
-#define SHARE_VM_INTERPRETER_BYTECODE_INLINE_HPP
+#ifndef SHARE_INTERPRETER_BYTECODE_INLINE_HPP
+#define SHARE_INTERPRETER_BYTECODE_INLINE_HPP
#include "interpreter/bytecode.hpp"
#include "oops/cpCache.inline.hpp"
inline bool Bytecode_invoke::has_appendix() { return cpcache_entry()->has_appendix(); }
-#endif // SHARE_VM_INTERPRETER_BYTECODE_INLINE_HPP
+#endif // SHARE_INTERPRETER_BYTECODE_INLINE_HPP
diff --git a/src/hotspot/share/interpreter/bytecodeHistogram.hpp b/src/hotspot/share/interpreter/bytecodeHistogram.hpp
index 64582e9fae1..b919227702f 100644
--- a/src/hotspot/share/interpreter/bytecodeHistogram.hpp
+++ b/src/hotspot/share/interpreter/bytecodeHistogram.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
*
*/
-#ifndef SHARE_VM_INTERPRETER_BYTECODEHISTOGRAM_HPP
-#define SHARE_VM_INTERPRETER_BYTECODEHISTOGRAM_HPP
+#ifndef SHARE_INTERPRETER_BYTECODEHISTOGRAM_HPP
+#define SHARE_INTERPRETER_BYTECODEHISTOGRAM_HPP
#include "interpreter/bytecodes.hpp"
#include "memory/allocation.hpp"
@@ -95,4 +95,4 @@ class BytecodePairHistogram: AllStatic {
static void print(float cutoff = 0.01F) PRODUCT_RETURN; // cutoff in percent
};
-#endif // SHARE_VM_INTERPRETER_BYTECODEHISTOGRAM_HPP
+#endif // SHARE_INTERPRETER_BYTECODEHISTOGRAM_HPP
diff --git a/src/hotspot/share/interpreter/bytecodeInterpreter.hpp b/src/hotspot/share/interpreter/bytecodeInterpreter.hpp
index 93f22ccbfbb..d8547415074 100644
--- a/src/hotspot/share/interpreter/bytecodeInterpreter.hpp
+++ b/src/hotspot/share/interpreter/bytecodeInterpreter.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2002, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
*
*/
-#ifndef SHARE_VM_INTERPRETER_BYTECODEINTERPRETER_HPP
-#define SHARE_VM_INTERPRETER_BYTECODEINTERPRETER_HPP
+#ifndef SHARE_INTERPRETER_BYTECODEINTERPRETER_HPP
+#define SHARE_INTERPRETER_BYTECODEINTERPRETER_HPP
#include "memory/allocation.hpp"
#include "oops/methodData.hpp"
@@ -584,4 +584,4 @@ void print();
#endif // CC_INTERP
-#endif // SHARE_VM_INTERPRETER_BYTECODEINTERPRETER_HPP
+#endif // SHARE_INTERPRETER_BYTECODEINTERPRETER_HPP
diff --git a/src/hotspot/share/interpreter/bytecodeInterpreter.inline.hpp b/src/hotspot/share/interpreter/bytecodeInterpreter.inline.hpp
index c82fb236320..902987faddd 100644
--- a/src/hotspot/share/interpreter/bytecodeInterpreter.inline.hpp
+++ b/src/hotspot/share/interpreter/bytecodeInterpreter.inline.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2002, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
*
*/
-#ifndef SHARE_VM_INTERPRETER_BYTECODEINTERPRETER_INLINE_HPP
-#define SHARE_VM_INTERPRETER_BYTECODEINTERPRETER_INLINE_HPP
+#ifndef SHARE_INTERPRETER_BYTECODEINTERPRETER_INLINE_HPP
+#define SHARE_INTERPRETER_BYTECODEINTERPRETER_INLINE_HPP
#include "interpreter/bytecodeInterpreter.hpp"
#include "runtime/stubRoutines.hpp"
@@ -51,4 +51,4 @@
#endif // CC_INTERP
-#endif // SHARE_VM_INTERPRETER_BYTECODEINTERPRETER_INLINE_HPP
+#endif // SHARE_INTERPRETER_BYTECODEINTERPRETER_INLINE_HPP
diff --git a/src/hotspot/share/interpreter/bytecodeInterpreterProfiling.hpp b/src/hotspot/share/interpreter/bytecodeInterpreterProfiling.hpp
index 763e3daa56a..469a15096df 100644
--- a/src/hotspot/share/interpreter/bytecodeInterpreterProfiling.hpp
+++ b/src/hotspot/share/interpreter/bytecodeInterpreterProfiling.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2002, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2019, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2012, 2014 SAP SE. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
@@ -27,8 +27,8 @@
// for updating a method's methodData object.
-#ifndef SHARE_VM_INTERPRETER_BYTECODEINTERPRETERPROFILING_HPP
-#define SHARE_VM_INTERPRETER_BYTECODEINTERPRETERPROFILING_HPP
+#ifndef SHARE_INTERPRETER_BYTECODEINTERPRETERPROFILING_HPP
+#define SHARE_INTERPRETER_BYTECODEINTERPRETERPROFILING_HPP
#ifdef CC_INTERP
@@ -56,4 +56,4 @@
#endif // CC_INTERP
-#endif // SHARE_VM_INTERPRETER_BYTECODECINTERPRETERPROFILING_HPP
+#endif // SHARE_INTERPRETER_BYTECODEINTERPRETERPROFILING_HPP
diff --git a/src/hotspot/share/interpreter/bytecodeStream.hpp b/src/hotspot/share/interpreter/bytecodeStream.hpp
index ae1f86a50bd..b36c4621fee 100644
--- a/src/hotspot/share/interpreter/bytecodeStream.hpp
+++ b/src/hotspot/share/interpreter/bytecodeStream.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
*
*/
-#ifndef SHARE_VM_INTERPRETER_BYTECODESTREAM_HPP
-#define SHARE_VM_INTERPRETER_BYTECODESTREAM_HPP
+#ifndef SHARE_INTERPRETER_BYTECODESTREAM_HPP
+#define SHARE_INTERPRETER_BYTECODESTREAM_HPP
#include "interpreter/bytecode.hpp"
#include "memory/allocation.hpp"
@@ -227,4 +227,4 @@ class BytecodeStream: public BaseBytecodeStream {
bool has_index_u4() const { return bytecode().has_index_u4(raw_code()); }
};
-#endif // SHARE_VM_INTERPRETER_BYTECODESTREAM_HPP
+#endif // SHARE_INTERPRETER_BYTECODESTREAM_HPP
diff --git a/src/hotspot/share/interpreter/bytecodeTracer.hpp b/src/hotspot/share/interpreter/bytecodeTracer.hpp
index 2e719b5fc72..52e91a0e712 100644
--- a/src/hotspot/share/interpreter/bytecodeTracer.hpp
+++ b/src/hotspot/share/interpreter/bytecodeTracer.hpp
@@ -22,8 +22,8 @@
*
*/
-#ifndef SHARE_VM_INTERPRETER_BYTECODETRACER_HPP
-#define SHARE_VM_INTERPRETER_BYTECODETRACER_HPP
+#ifndef SHARE_INTERPRETER_BYTECODETRACER_HPP
+#define SHARE_INTERPRETER_BYTECODETRACER_HPP
#include "memory/allocation.hpp"
#include "utilities/ostream.hpp"
@@ -62,4 +62,4 @@ class BytecodeClosure {
virtual void trace(const methodHandle& method, address bcp, outputStream* st) = 0;
};
-#endif // SHARE_VM_INTERPRETER_BYTECODETRACER_HPP
+#endif // SHARE_INTERPRETER_BYTECODETRACER_HPP
diff --git a/src/hotspot/share/interpreter/bytecodes.hpp b/src/hotspot/share/interpreter/bytecodes.hpp
index 11290f2bf76..48a20bbed86 100644
--- a/src/hotspot/share/interpreter/bytecodes.hpp
+++ b/src/hotspot/share/interpreter/bytecodes.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
*
*/
-#ifndef SHARE_VM_INTERPRETER_BYTECODES_HPP
-#define SHARE_VM_INTERPRETER_BYTECODES_HPP
+#ifndef SHARE_INTERPRETER_BYTECODES_HPP
+#define SHARE_INTERPRETER_BYTECODES_HPP
#include "memory/allocation.hpp"
@@ -442,4 +442,4 @@ class Bytecodes: AllStatic {
static void initialize ();
};
-#endif // SHARE_VM_INTERPRETER_BYTECODES_HPP
+#endif // SHARE_INTERPRETER_BYTECODES_HPP
diff --git a/src/hotspot/share/interpreter/cppInterpreter.hpp b/src/hotspot/share/interpreter/cppInterpreter.hpp
index 98970b58bb3..9f71d1ac99a 100644
--- a/src/hotspot/share/interpreter/cppInterpreter.hpp
+++ b/src/hotspot/share/interpreter/cppInterpreter.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
*
*/
-#ifndef SHARE_VM_INTERPRETER_CPPINTERPRETER_HPP
-#define SHARE_VM_INTERPRETER_CPPINTERPRETER_HPP
+#ifndef SHARE_INTERPRETER_CPPINTERPRETER_HPP
+#define SHARE_INTERPRETER_CPPINTERPRETER_HPP
#include "interpreter/abstractInterpreter.hpp"
#include "utilities/macros.hpp"
@@ -70,4 +70,4 @@ class CppInterpreter: public AbstractInterpreter {
#endif // CC_INTERP
-#endif // SHARE_VM_INTERPRETER_CPPINTERPRETER_HPP
+#endif // SHARE_INTERPRETER_CPPINTERPRETER_HPP
diff --git a/src/hotspot/share/interpreter/cppInterpreterGenerator.hpp b/src/hotspot/share/interpreter/cppInterpreterGenerator.hpp
index c9fbd30fff0..558cf90a245 100644
--- a/src/hotspot/share/interpreter/cppInterpreterGenerator.hpp
+++ b/src/hotspot/share/interpreter/cppInterpreterGenerator.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
*
*/
-#ifndef SHARE_VM_INTERPRETER_CPPINTERPRETERGENERATOR_HPP
-#define SHARE_VM_INTERPRETER_CPPINTERPRETERGENERATOR_HPP
+#ifndef SHARE_INTERPRETER_CPPINTERPRETERGENERATOR_HPP
+#define SHARE_INTERPRETER_CPPINTERPRETERGENERATOR_HPP
// This file contains the platform-independent parts
// of the template interpreter generator.
@@ -75,4 +75,4 @@ class CppInterpreterGenerator: public AbstractInterpreterGenerator {
};
#endif // CC_INTERP
-#endif // SHARE_VM_INTERPRETER_CPPINTERPRETERGENERATOR_HPP
+#endif // SHARE_INTERPRETER_CPPINTERPRETERGENERATOR_HPP
diff --git a/src/hotspot/share/interpreter/interp_masm.hpp b/src/hotspot/share/interpreter/interp_masm.hpp
index 1705e348904..ce6fcb4c5d3 100644
--- a/src/hotspot/share/interpreter/interp_masm.hpp
+++ b/src/hotspot/share/interpreter/interp_masm.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2014, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -22,12 +22,12 @@
*
*/
-#ifndef SHARE_VM_INTERPRETER_INTERP_MASM_HPP
-#define SHARE_VM_INTERPRETER_INTERP_MASM_HPP
+#ifndef SHARE_INTERPRETER_INTERP_MASM_HPP
+#define SHARE_INTERPRETER_INTERP_MASM_HPP
#include "asm/macroAssembler.hpp"
#include "utilities/macros.hpp"
#include CPU_HEADER(interp_masm)
-#endif // SHARE_VM_INTERPRETER_INTERP_MASM_HPP
+#endif // SHARE_INTERPRETER_INTERP_MASM_HPP
diff --git a/src/hotspot/share/interpreter/interpreter.hpp b/src/hotspot/share/interpreter/interpreter.hpp
index fea37c5d88a..ea146dc66ff 100644
--- a/src/hotspot/share/interpreter/interpreter.hpp
+++ b/src/hotspot/share/interpreter/interpreter.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
*
*/
-#ifndef SHARE_VM_INTERPRETER_INTERPRETER_HPP
-#define SHARE_VM_INTERPRETER_INTERPRETER_HPP
+#ifndef SHARE_INTERPRETER_INTERPRETER_HPP
+#define SHARE_INTERPRETER_INTERPRETER_HPP
#include "code/stubs.hpp"
#include "interpreter/cppInterpreter.hpp"
@@ -119,4 +119,4 @@ class CodeletMark: ResourceMark {
typedef CC_INTERP_ONLY(CppInterpreter) NOT_CC_INTERP(TemplateInterpreter) Interpreter;
-#endif // SHARE_VM_INTERPRETER_INTERPRETER_HPP
+#endif // SHARE_INTERPRETER_INTERPRETER_HPP
diff --git a/src/hotspot/share/interpreter/interpreterRuntime.hpp b/src/hotspot/share/interpreter/interpreterRuntime.hpp
index 87e84c893f2..488d54e70b2 100644
--- a/src/hotspot/share/interpreter/interpreterRuntime.hpp
+++ b/src/hotspot/share/interpreter/interpreterRuntime.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
*
*/
-#ifndef SHARE_VM_INTERPRETER_INTERPRETERRUNTIME_HPP
-#define SHARE_VM_INTERPRETER_INTERPRETERRUNTIME_HPP
+#ifndef SHARE_INTERPRETER_INTERPRETERRUNTIME_HPP
+#define SHARE_INTERPRETER_INTERPRETERRUNTIME_HPP
#include "interpreter/bytecode.hpp"
#include "interpreter/linkResolver.hpp"
@@ -196,4 +196,4 @@ class SignatureHandlerLibrary: public AllStatic {
static void add(uint64_t fingerprint, address handler);
};
-#endif // SHARE_VM_INTERPRETER_INTERPRETERRUNTIME_HPP
+#endif // SHARE_INTERPRETER_INTERPRETERRUNTIME_HPP
diff --git a/src/hotspot/share/interpreter/invocationCounter.cpp b/src/hotspot/share/interpreter/invocationCounter.cpp
index 9bf6afb13da..05b90aa2f82 100644
--- a/src/hotspot/share/interpreter/invocationCounter.cpp
+++ b/src/hotspot/share/interpreter/invocationCounter.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -130,20 +130,11 @@ void InvocationCounter::def(State state, int init, Action action) {
_action[state] = action;
}
-address dummy_invocation_counter_overflow(const methodHandle& m, TRAPS) {
- ShouldNotReachHere();
- return NULL;
-}
-
-void InvocationCounter::reinitialize(bool delay_overflow) {
+void InvocationCounter::reinitialize() {
// define states
guarantee((int)number_of_states <= (int)state_limit, "adjust number_of_state_bits");
def(wait_for_nothing, 0, do_nothing);
- if (delay_overflow) {
- def(wait_for_compile, 0, do_decay);
- } else {
- def(wait_for_compile, 0, dummy_invocation_counter_overflow);
- }
+ def(wait_for_compile, 0, do_decay);
InterpreterInvocationLimit = CompileThreshold << number_of_noncount_bits;
InterpreterProfileLimit = ((CompileThreshold * InterpreterProfilePercentage) / 100)<< number_of_noncount_bits;
@@ -167,5 +158,5 @@ void InvocationCounter::reinitialize(bool delay_overflow) {
}
void invocationCounter_init() {
- InvocationCounter::reinitialize(DelayCompilationDuringStartup);
+ InvocationCounter::reinitialize();
}
diff --git a/src/hotspot/share/interpreter/invocationCounter.hpp b/src/hotspot/share/interpreter/invocationCounter.hpp
index e6a349097cb..952d6f41129 100644
--- a/src/hotspot/share/interpreter/invocationCounter.hpp
+++ b/src/hotspot/share/interpreter/invocationCounter.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
*
*/
-#ifndef SHARE_VM_INTERPRETER_INVOCATIONCOUNTER_HPP
-#define SHARE_VM_INTERPRETER_INVOCATIONCOUNTER_HPP
+#ifndef SHARE_INTERPRETER_INVOCATIONCOUNTER_HPP
+#define SHARE_INTERPRETER_INVOCATIONCOUNTER_HPP
#include "runtime/handles.hpp"
#include "utilities/exceptions.hpp"
@@ -127,7 +127,7 @@ class InvocationCounter {
// Miscellaneous
static ByteSize counter_offset() { return byte_offset_of(InvocationCounter, _counter); }
- static void reinitialize(bool delay_overflow);
+ static void reinitialize();
private:
static int _init [number_of_states]; // the counter limits
@@ -153,4 +153,4 @@ inline void InvocationCounter::decay() {
}
-#endif // SHARE_VM_INTERPRETER_INVOCATIONCOUNTER_HPP
+#endif // SHARE_INTERPRETER_INVOCATIONCOUNTER_HPP
diff --git a/src/hotspot/share/interpreter/linkResolver.cpp b/src/hotspot/share/interpreter/linkResolver.cpp
index 43c01b991f4..f50c86e395e 100644
--- a/src/hotspot/share/interpreter/linkResolver.cpp
+++ b/src/hotspot/share/interpreter/linkResolver.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -710,15 +710,16 @@ void LinkResolver::check_field_loader_constraints(Symbol* field, Symbol* sig,
stringStream ss;
const char* failed_type_name = failed_type_symbol->as_klass_external_name();
- ss.print("loader constraint violation: when resolving field"
- " \"%s\" of type %s, the class loader %s of the current class, "
- "%s, and the class loader %s for the field's defining "
- "type, %s, have different Class objects for type %s (%s; %s)",
+ ss.print("loader constraint violation: when resolving field \"%s\" of type %s, "
+ "the class loader %s of the current class, %s, "
+ "and the class loader %s for the field's defining %s, %s, "
+ "have different Class objects for type %s (%s; %s)",
field->as_C_string(),
failed_type_name,
current_klass->class_loader_data()->loader_name_and_id(),
current_klass->external_name(),
sel_klass->class_loader_data()->loader_name_and_id(),
+ sel_klass->external_kind(),
sel_klass->external_name(),
failed_type_name,
current_klass->class_in_module_of_loader(false, true),
diff --git a/src/hotspot/share/interpreter/linkResolver.hpp b/src/hotspot/share/interpreter/linkResolver.hpp
index c5d759ca88a..50747bf995a 100644
--- a/src/hotspot/share/interpreter/linkResolver.hpp
+++ b/src/hotspot/share/interpreter/linkResolver.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
*
*/
-#ifndef SHARE_VM_INTERPRETER_LINKRESOLVER_HPP
-#define SHARE_VM_INTERPRETER_LINKRESOLVER_HPP
+#ifndef SHARE_INTERPRETER_LINKRESOLVER_HPP
+#define SHARE_INTERPRETER_LINKRESOLVER_HPP
#include "oops/method.hpp"
@@ -362,4 +362,4 @@ class LinkResolver: AllStatic {
const methodHandle& selected_method,
Klass *recv_klass, TRAPS);
};
-#endif // SHARE_VM_INTERPRETER_LINKRESOLVER_HPP
+#endif // SHARE_INTERPRETER_LINKRESOLVER_HPP
diff --git a/src/hotspot/share/interpreter/oopMapCache.hpp b/src/hotspot/share/interpreter/oopMapCache.hpp
index 3da8963a752..6d12ab6ab38 100644
--- a/src/hotspot/share/interpreter/oopMapCache.hpp
+++ b/src/hotspot/share/interpreter/oopMapCache.hpp
@@ -22,8 +22,8 @@
*
*/
-#ifndef SHARE_VM_INTERPRETER_OOPMAPCACHE_HPP
-#define SHARE_VM_INTERPRETER_OOPMAPCACHE_HPP
+#ifndef SHARE_INTERPRETER_OOPMAPCACHE_HPP
+#define SHARE_INTERPRETER_OOPMAPCACHE_HPP
#include "oops/generateOopMap.hpp"
#include "runtime/mutex.hpp"
@@ -177,4 +177,4 @@ class OopMapCache : public CHeapObj {
static void cleanup_old_entries();
};
-#endif // SHARE_VM_INTERPRETER_OOPMAPCACHE_HPP
+#endif // SHARE_INTERPRETER_OOPMAPCACHE_HPP
diff --git a/src/hotspot/share/interpreter/rewriter.hpp b/src/hotspot/share/interpreter/rewriter.hpp
index 3f8ebbdf533..97d922f2f87 100644
--- a/src/hotspot/share/interpreter/rewriter.hpp
+++ b/src/hotspot/share/interpreter/rewriter.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
*
*/
-#ifndef SHARE_VM_INTERPRETER_REWRITER_HPP
-#define SHARE_VM_INTERPRETER_REWRITER_HPP
+#ifndef SHARE_INTERPRETER_REWRITER_HPP
+#define SHARE_INTERPRETER_REWRITER_HPP
#include "memory/allocation.hpp"
#include "utilities/growableArray.hpp"
@@ -213,4 +213,4 @@ class Rewriter: public StackObj {
static void rewrite(InstanceKlass* klass, TRAPS);
};
-#endif // SHARE_VM_INTERPRETER_REWRITER_HPP
+#endif // SHARE_INTERPRETER_REWRITER_HPP
diff --git a/src/hotspot/share/interpreter/templateInterpreter.hpp b/src/hotspot/share/interpreter/templateInterpreter.hpp
index 298c830a2ff..f41d9755ceb 100644
--- a/src/hotspot/share/interpreter/templateInterpreter.hpp
+++ b/src/hotspot/share/interpreter/templateInterpreter.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
*
*/
-#ifndef SHARE_VM_INTERPRETER_TEMPLATEINTERPRETER_HPP
-#define SHARE_VM_INTERPRETER_TEMPLATEINTERPRETER_HPP
+#ifndef SHARE_INTERPRETER_TEMPLATEINTERPRETER_HPP
+#define SHARE_INTERPRETER_TEMPLATEINTERPRETER_HPP
#include "interpreter/abstractInterpreter.hpp"
#include "interpreter/templateTable.hpp"
@@ -196,4 +196,4 @@ class TemplateInterpreter: public AbstractInterpreter {
#endif // !CC_INTERP
-#endif // SHARE_VM_INTERPRETER_TEMPLATEINTERPRETER_HPP
+#endif // SHARE_INTERPRETER_TEMPLATEINTERPRETER_HPP
diff --git a/src/hotspot/share/interpreter/templateInterpreterGenerator.hpp b/src/hotspot/share/interpreter/templateInterpreterGenerator.hpp
index 965f6b0d102..c1da52db209 100644
--- a/src/hotspot/share/interpreter/templateInterpreterGenerator.hpp
+++ b/src/hotspot/share/interpreter/templateInterpreterGenerator.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
*
*/
-#ifndef SHARE_VM_INTERPRETER_TEMPLATEINTERPRETERGENERATOR_HPP
-#define SHARE_VM_INTERPRETER_TEMPLATEINTERPRETERGENERATOR_HPP
+#ifndef SHARE_INTERPRETER_TEMPLATEINTERPRETERGENERATOR_HPP
+#define SHARE_INTERPRETER_TEMPLATEINTERPRETERGENERATOR_HPP
// This file contains the platform-independent parts
// of the template interpreter generator.
@@ -129,4 +129,4 @@ class TemplateInterpreterGenerator: public AbstractInterpreterGenerator {
#endif // !CC_INTERP
-#endif // SHARE_VM_INTERPRETER_TEMPLATEINTERPRETERGENERATOR_HPP
+#endif // SHARE_INTERPRETER_TEMPLATEINTERPRETERGENERATOR_HPP
diff --git a/src/hotspot/share/interpreter/templateTable.hpp b/src/hotspot/share/interpreter/templateTable.hpp
index dc23da6c17c..d21a8c7f51d 100644
--- a/src/hotspot/share/interpreter/templateTable.hpp
+++ b/src/hotspot/share/interpreter/templateTable.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
*
*/
-#ifndef SHARE_VM_INTERPRETER_TEMPLATETABLE_HPP
-#define SHARE_VM_INTERPRETER_TEMPLATETABLE_HPP
+#ifndef SHARE_INTERPRETER_TEMPLATETABLE_HPP
+#define SHARE_INTERPRETER_TEMPLATETABLE_HPP
#include "interpreter/bytecodes.hpp"
#include "memory/allocation.hpp"
@@ -357,4 +357,4 @@ class TemplateTable: AllStatic {
};
#endif /* !CC_INTERP */
-#endif // SHARE_VM_INTERPRETER_TEMPLATETABLE_HPP
+#endif // SHARE_INTERPRETER_TEMPLATETABLE_HPP
diff --git a/src/hotspot/share/jfr/dcmd/jfrDcmds.hpp b/src/hotspot/share/jfr/dcmd/jfrDcmds.hpp
index 15d8091a792..9281638f466 100644
--- a/src/hotspot/share/jfr/dcmd/jfrDcmds.hpp
+++ b/src/hotspot/share/jfr/dcmd/jfrDcmds.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
*
*/
-#ifndef SHARE_VM_JFR_JFRDCMDS_HPP
-#define SHARE_VM_JFR_JFRDCMDS_HPP
+#ifndef SHARE_JFR_DCMD_JFRDCMDS_HPP
+#define SHARE_JFR_DCMD_JFRDCMDS_HPP
#include "services/diagnosticCommand.hpp"
@@ -172,4 +172,4 @@ class JfrConfigureFlightRecorderDCmd : public DCmdWithParser {
bool register_jfr_dcmds();
-#endif // SHARE_VM_JFR_JFRDCMDS_HPP
+#endif // SHARE_JFR_DCMD_JFRDCMDS_HPP
diff --git a/src/hotspot/share/jfr/instrumentation/jfrEventClassTransformer.hpp b/src/hotspot/share/jfr/instrumentation/jfrEventClassTransformer.hpp
index 1b35fb183d3..d34a4e57a78 100644
--- a/src/hotspot/share/jfr/instrumentation/jfrEventClassTransformer.hpp
+++ b/src/hotspot/share/jfr/instrumentation/jfrEventClassTransformer.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2016, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
*
*/
-#ifndef SHARE_VM_JFR_INSTRUMENTATION_JFREVENTCLASSTRANSFORMER_HPP
-#define SHARE_VM_JFR_INSTRUMENTATION_JFREVENTCLASSTRANSFORMER_HPP
+#ifndef SHARE_JFR_INSTRUMENTATION_JFREVENTCLASSTRANSFORMER_HPP
+#define SHARE_JFR_INSTRUMENTATION_JFREVENTCLASSTRANSFORMER_HPP
#include "memory/allocation.hpp"
#include "utilities/exceptions.hpp"
@@ -42,4 +42,4 @@ class JfrEventClassTransformer : AllStatic {
static bool is_force_instrumentation();
};
-#endif // SHARE_VM_JFR_INSTRUMENTATION_JFREVENTCLASSTRANSFORMER_HPP
+#endif // SHARE_JFR_INSTRUMENTATION_JFREVENTCLASSTRANSFORMER_HPP
diff --git a/src/hotspot/share/jfr/instrumentation/jfrJvmtiAgent.hpp b/src/hotspot/share/jfr/instrumentation/jfrJvmtiAgent.hpp
index d4ad1fe6da7..bd11cdb54ed 100644
--- a/src/hotspot/share/jfr/instrumentation/jfrJvmtiAgent.hpp
+++ b/src/hotspot/share/jfr/instrumentation/jfrJvmtiAgent.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2016, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
*
*/
-#ifndef SHARE_VM_JFR_INSTRUMENTATION_JFRJVMTIAGENT_HPP
-#define SHARE_VM_JFR_INSTRUMENTATION_JFRJVMTIAGENT_HPP
+#ifndef SHARE_JFR_INSTRUMENTATION_JFRJVMTIAGENT_HPP
+#define SHARE_JFR_INSTRUMENTATION_JFRJVMTIAGENT_HPP
#include "jfr/utilities/jfrAllocation.hpp"
@@ -38,4 +38,4 @@ class JfrJvmtiAgent : public JfrCHeapObj {
static void retransform_classes(JNIEnv* env, jobjectArray classes, TRAPS);
};
-#endif // SHARE_VM_JFR_INSTRUMENTATION_JFRJVMTIAGENT_HPP
+#endif // SHARE_JFR_INSTRUMENTATION_JFRJVMTIAGENT_HPP
diff --git a/src/hotspot/share/jfr/jfr.hpp b/src/hotspot/share/jfr/jfr.hpp
index 34603b0a626..20664746f19 100644
--- a/src/hotspot/share/jfr/jfr.hpp
+++ b/src/hotspot/share/jfr/jfr.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
*
*/
-#ifndef SHARE_VM_JFR_JFR_HPP
-#define SHARE_VM_JFR_JFR_HPP
+#ifndef SHARE_JFR_JFR_HPP
+#define SHARE_JFR_JFR_HPP
#include "jni.h"
#include "memory/allocation.hpp"
@@ -55,4 +55,4 @@ class Jfr : AllStatic {
static void weak_oops_do(BoolObjectClosure* is_alive, OopClosure* f);
};
-#endif // SHARE_VM_JFR_JFR_HPP
+#endif // SHARE_JFR_JFR_HPP
diff --git a/src/hotspot/share/jfr/jfrEvents.hpp b/src/hotspot/share/jfr/jfrEvents.hpp
index d8ea0079c61..ba0d9f5b61e 100644
--- a/src/hotspot/share/jfr/jfrEvents.hpp
+++ b/src/hotspot/share/jfr/jfrEvents.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
*
*/
-#ifndef SHARE_VM_JFR_JFREVENTS_HPP
-#define SHARE_VM_JFR_JFREVENTS_HPP
+#ifndef SHARE_JFR_JFREVENTS_HPP
+#define SHARE_JFR_JFREVENTS_HPP
/*
* Declare your event in jfr/metadata/metadata.xml.
*
@@ -32,4 +32,4 @@
#include "jfrfiles/jfrEventClasses.hpp"
#include "jfrfiles/jfrEventIds.hpp"
-#endif // SHARE_VM_JFR_JFREVENTS_HPP
+#endif // SHARE_JFR_JFREVENTS_HPP
diff --git a/src/hotspot/share/jfr/jni/jfrGetAllEventClasses.hpp b/src/hotspot/share/jfr/jni/jfrGetAllEventClasses.hpp
index a94a0b0eb82..df1d47946f5 100644
--- a/src/hotspot/share/jfr/jni/jfrGetAllEventClasses.hpp
+++ b/src/hotspot/share/jfr/jni/jfrGetAllEventClasses.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2016, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -21,8 +21,8 @@
* questions.
*
*/
-#ifndef SHARE_VM_JFR_JNI_JFRGETALLEVENTCLASSES_HPP
-#define SHARE_VM_JFR_JNI_JFRGETALLEVENTCLASSES_HPP
+#ifndef SHARE_JFR_JNI_JFRGETALLEVENTCLASSES_HPP
+#define SHARE_JFR_JNI_JFRGETALLEVENTCLASSES_HPP
#include "jni.h"
#include "memory/allocation.hpp"
@@ -38,4 +38,4 @@ class JfrEventClasses : AllStatic {
static jobject get_all_event_classes(TRAPS);
};
-#endif // SHARE_VM_JFR_JNI_JFRGETALLEVENTCLASSES_HPP
+#endif // SHARE_JFR_JNI_JFRGETALLEVENTCLASSES_HPP
diff --git a/src/hotspot/share/jfr/jni/jfrJavaCall.hpp b/src/hotspot/share/jfr/jni/jfrJavaCall.hpp
index 89b2f7b98dd..b02b4e924b6 100644
--- a/src/hotspot/share/jfr/jni/jfrJavaCall.hpp
+++ b/src/hotspot/share/jfr/jni/jfrJavaCall.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2017, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
*
*/
-#ifndef SHARE_VM_JFR_JNI_JFRJAVACALL_HPP
-#define SHARE_VM_JFR_JNI_JFRJAVACALL_HPP
+#ifndef SHARE_JFR_JNI_JFRJAVACALL_HPP
+#define SHARE_JFR_JNI_JFRJAVACALL_HPP
#include "jni.h"
#include "jfr/utilities/jfrAllocation.hpp"
@@ -131,4 +131,4 @@ class JfrJavaCall : public AllStatic {
static void call_virtual(JfrJavaArguments* args, TRAPS);
};
-#endif // SHARE_VM_JFR_JNI_JFRJAVACALL_HPP
+#endif // SHARE_JFR_JNI_JFRJAVACALL_HPP
diff --git a/src/hotspot/share/jfr/jni/jfrJavaSupport.cpp b/src/hotspot/share/jfr/jni/jfrJavaSupport.cpp
index 26c65e26849..56d436c91e4 100644
--- a/src/hotspot/share/jfr/jni/jfrJavaSupport.cpp
+++ b/src/hotspot/share/jfr/jni/jfrJavaSupport.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2016, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -474,15 +474,16 @@ const char* JfrJavaSupport::c_str(jstring string, Thread* t) {
}
const char* temp = NULL;
const oop java_string = resolve_non_null(string);
- if (java_lang_String::value(java_string) != NULL) {
- const size_t length = java_lang_String::utf8_length(java_string);
+ const typeArrayOop value = java_lang_String::value(java_string);
+ if (value != NULL) {
+ const size_t length = java_lang_String::utf8_length(java_string, value);
temp = NEW_RESOURCE_ARRAY_IN_THREAD(t, const char, (length + 1));
if (temp == NULL) {
JfrJavaSupport::throw_out_of_memory_error("Unable to allocate thread local native memory", t);
return NULL;
}
assert(temp != NULL, "invariant");
- java_lang_String::as_utf8_string(java_string, const_cast(temp), (int) length + 1);
+ java_lang_String::as_utf8_string(java_string, value, const_cast(temp), (int) length + 1);
}
return temp;
}
diff --git a/src/hotspot/share/jfr/jni/jfrJavaSupport.hpp b/src/hotspot/share/jfr/jni/jfrJavaSupport.hpp
index dc71db5adac..04545555678 100644
--- a/src/hotspot/share/jfr/jni/jfrJavaSupport.hpp
+++ b/src/hotspot/share/jfr/jni/jfrJavaSupport.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2016, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
*
*/
-#ifndef SHARE_VM_JFR_JNI_JFRJAVASUPPORT_HPP
-#define SHARE_VM_JFR_JNI_JFRJAVASUPPORT_HPP
+#ifndef SHARE_JFR_JNI_JFRJAVASUPPORT_HPP
+#define SHARE_JFR_JNI_JFRJAVASUPPORT_HPP
#include "jfr/jni/jfrJavaCall.hpp"
#include "utilities/exceptions.hpp"
@@ -111,4 +111,4 @@ class JfrJavaSupport : public AllStatic {
static void set_cause(jthrowable throwable, Thread* t);
};
-#endif // SHARE_VM_JFR_JNI_JFRJAVASUPPORT_HPP
+#endif // SHARE_JFR_JNI_JFRJAVASUPPORT_HPP
diff --git a/src/hotspot/share/jfr/jni/jfrJniMethod.hpp b/src/hotspot/share/jfr/jni/jfrJniMethod.hpp
index 7b5394a2c58..522ac2bd902 100644
--- a/src/hotspot/share/jfr/jni/jfrJniMethod.hpp
+++ b/src/hotspot/share/jfr/jni/jfrJniMethod.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2014, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
*
*/
-#ifndef SHARE_VM_JFR_JNI_JFRJNIMETHOD_HPP
-#define SHARE_VM_JFR_JNI_JFRJNIMETHOD_HPP
+#ifndef SHARE_JFR_JNI_JFRJNIMETHOD_HPP
+#define SHARE_JFR_JNI_JFRJNIMETHOD_HPP
#include "jni.h"
@@ -136,4 +136,4 @@ jboolean JNICALL jfr_should_rotate_disk(JNIEnv* env, jobject jvm);
}
#endif
-#endif // SHARE_VM_JFR_JNI_JFRJNIMETHOD_HPP
+#endif // SHARE_JFR_JNI_JFRJNIMETHOD_HPP
diff --git a/src/hotspot/share/jfr/jni/jfrJniMethodRegistration.hpp b/src/hotspot/share/jfr/jni/jfrJniMethodRegistration.hpp
index f0a25f69ccf..8b46527bf2f 100644
--- a/src/hotspot/share/jfr/jni/jfrJniMethodRegistration.hpp
+++ b/src/hotspot/share/jfr/jni/jfrJniMethodRegistration.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2016, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
*
*/
-#ifndef SHARE_VM_JFR_JNI_JFRJNIMETHODREGISTRATION_HPP
-#define SHARE_VM_JFR_JNI_JFRJNIMETHODREGISTRATION_HPP
+#ifndef SHARE_JFR_JNI_JFRJNIMETHODREGISTRATION_HPP
+#define SHARE_JFR_JNI_JFRJNIMETHODREGISTRATION_HPP
#include "jni.h"
#include "memory/allocation.hpp"
@@ -36,4 +36,4 @@ class JfrJniMethodRegistration : public StackObj {
JfrJniMethodRegistration(JNIEnv* env);
};
-#endif // SHARE_VM_JFR_JNI_JFRJNIMETHODREGISTRATION_HPP
+#endif // SHARE_JFR_JNI_JFRJNIMETHODREGISTRATION_HPP
diff --git a/src/hotspot/share/jfr/jni/jfrUpcalls.hpp b/src/hotspot/share/jfr/jni/jfrUpcalls.hpp
index 1f1a910d680..0bfe7074b4c 100644
--- a/src/hotspot/share/jfr/jni/jfrUpcalls.hpp
+++ b/src/hotspot/share/jfr/jni/jfrUpcalls.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2016, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
*
*/
-#ifndef SHARE_VM_JFR_JNI_JFRUPCALLS_HPP
-#define SHARE_VM_JFR_JNI_JFRUPCALLS_HPP
+#ifndef SHARE_JFR_JNI_JFRUPCALLS_HPP
+#define SHARE_JFR_JNI_JFRUPCALLS_HPP
#include "jni.h"
#include "jfr/utilities/jfrAllocation.hpp"
@@ -55,4 +55,4 @@ class JfrUpcalls : AllStatic {
TRAPS);
};
-#endif // SHARE_VM_JFR_JNI_JFRUPCALLS_HPP
+#endif // SHARE_JFR_JNI_JFRUPCALLS_HPP
diff --git a/src/hotspot/share/jfr/leakprofiler/chains/bfsClosure.hpp b/src/hotspot/share/jfr/leakprofiler/chains/bfsClosure.hpp
index a6a1739c31f..7761e2ec4d7 100644
--- a/src/hotspot/share/jfr/leakprofiler/chains/bfsClosure.hpp
+++ b/src/hotspot/share/jfr/leakprofiler/chains/bfsClosure.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2014, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
*
*/
-#ifndef SHARE_VM_JFR_LEAKPROFILER_CHAINS_BFSCLOSURE_HPP
-#define SHARE_VM_JFR_LEAKPROFILER_CHAINS_BFSCLOSURE_HPP
+#ifndef SHARE_JFR_LEAKPROFILER_CHAINS_BFSCLOSURE_HPP
+#define SHARE_JFR_LEAKPROFILER_CHAINS_BFSCLOSURE_HPP
#include "memory/iterator.hpp"
#include "oops/oop.hpp"
@@ -70,4 +70,4 @@ class BFSClosure : public BasicOopIterateClosure {
virtual void do_oop(narrowOop* ref);
};
-#endif // SHARE_VM_JFR_LEAKPROFILER_CHAINS_BFSCLOSURE_HPP
+#endif // SHARE_JFR_LEAKPROFILER_CHAINS_BFSCLOSURE_HPP
diff --git a/src/hotspot/share/jfr/leakprofiler/chains/bitset.hpp b/src/hotspot/share/jfr/leakprofiler/chains/bitset.hpp
index 565b2d7e41a..d6971a01919 100644
--- a/src/hotspot/share/jfr/leakprofiler/chains/bitset.hpp
+++ b/src/hotspot/share/jfr/leakprofiler/chains/bitset.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2014, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
*
*/
-#ifndef SHARE_VM_JFR_LEAKPROFILER_CHAINS_BITSET_HPP
-#define SHARE_VM_JFR_LEAKPROFILER_CHAINS_BITSET_HPP
+#ifndef SHARE_JFR_LEAKPROFILER_CHAINS_BITSET_HPP
+#define SHARE_JFR_LEAKPROFILER_CHAINS_BITSET_HPP
#include "memory/allocation.hpp"
#include "oops/oopsHierarchy.hpp"
@@ -76,4 +76,4 @@ class BitSet : public CHeapObj {
}
};
-#endif // SHARE_VM_JFR_LEAKPROFILER_CHAINS_BITSET_HPP
+#endif // SHARE_JFR_LEAKPROFILER_CHAINS_BITSET_HPP
diff --git a/src/hotspot/share/jfr/leakprofiler/chains/dfsClosure.hpp b/src/hotspot/share/jfr/leakprofiler/chains/dfsClosure.hpp
index 367ca2eac6a..517365609d9 100644
--- a/src/hotspot/share/jfr/leakprofiler/chains/dfsClosure.hpp
+++ b/src/hotspot/share/jfr/leakprofiler/chains/dfsClosure.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2014, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
*
*/
-#ifndef SHARE_VM_JFR_LEAKPROFILER_CHAINS_DFSCLOSURE_HPP
-#define SHARE_VM_JFR_LEAKPROFILER_CHAINS_DFSCLOSURE_HPP
+#ifndef SHARE_JFR_LEAKPROFILER_CHAINS_DFSCLOSURE_HPP
+#define SHARE_JFR_LEAKPROFILER_CHAINS_DFSCLOSURE_HPP
#include "memory/iterator.hpp"
#include "oops/oop.hpp"
@@ -62,4 +62,4 @@ class DFSClosure: public BasicOopIterateClosure {
virtual void do_oop(narrowOop* ref);
};
-#endif // SHARE_VM_JFR_LEAKPROFILER_CHAINS_DFSCLOSURE_HPP
+#endif // SHARE_JFR_LEAKPROFILER_CHAINS_DFSCLOSURE_HPP
diff --git a/src/hotspot/share/jfr/leakprofiler/chains/edge.hpp b/src/hotspot/share/jfr/leakprofiler/chains/edge.hpp
index 1315abd1494..0abc66ea1d4 100644
--- a/src/hotspot/share/jfr/leakprofiler/chains/edge.hpp
+++ b/src/hotspot/share/jfr/leakprofiler/chains/edge.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2014, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
*
*/
-#ifndef SHARE_VM_JFR_LEAKPROFILER_CHAINS_EDGE_HPP
-#define SHARE_VM_JFR_LEAKPROFILER_CHAINS_EDGE_HPP
+#ifndef SHARE_JFR_LEAKPROFILER_CHAINS_EDGE_HPP
+#define SHARE_JFR_LEAKPROFILER_CHAINS_EDGE_HPP
#include "memory/allocation.hpp"
#include "oops/oopsHierarchy.hpp"
@@ -56,4 +56,4 @@ class Edge {
}
};
-#endif // SHARE_VM_JFR_LEAKPROFILER_CHAINS_EDGE_HPP
+#endif // SHARE_JFR_LEAKPROFILER_CHAINS_EDGE_HPP
diff --git a/src/hotspot/share/jfr/leakprofiler/chains/edgeQueue.hpp b/src/hotspot/share/jfr/leakprofiler/chains/edgeQueue.hpp
index 8211624616a..8c1318aeba9 100644
--- a/src/hotspot/share/jfr/leakprofiler/chains/edgeQueue.hpp
+++ b/src/hotspot/share/jfr/leakprofiler/chains/edgeQueue.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2014, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
*
*/
-#ifndef SHARE_VM_JFR_LEAKPROFILER_CHAINS_EDGEQUEUE_HPP
-#define SHARE_VM_JFR_LEAKPROFILER_CHAINS_EDGEQUEUE_HPP
+#ifndef SHARE_JFR_LEAKPROFILER_CHAINS_EDGEQUEUE_HPP
+#define SHARE_JFR_LEAKPROFILER_CHAINS_EDGEQUEUE_HPP
#include "memory/allocation.hpp"
#include "jfr/leakprofiler/chains/edge.hpp"
@@ -57,4 +57,4 @@ class EdgeQueue : public CHeapObj {
size_t sizeof_edge() const; // with alignments
};
-#endif // SHARE_VM_JFR_LEAKPROFILER_CHAINS_EDGEQUEUE_HPP
+#endif // SHARE_JFR_LEAKPROFILER_CHAINS_EDGEQUEUE_HPP
diff --git a/src/hotspot/share/jfr/leakprofiler/chains/edgeStore.hpp b/src/hotspot/share/jfr/leakprofiler/chains/edgeStore.hpp
index a504964cdd1..c4cddb22fe8 100644
--- a/src/hotspot/share/jfr/leakprofiler/chains/edgeStore.hpp
+++ b/src/hotspot/share/jfr/leakprofiler/chains/edgeStore.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2014, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
*
*/
-#ifndef SHARE_VM_LEAKPROFILER_CHAINS_EDGESTORE_HPP
-#define SHARE_VM_LEAKPROFILER_CHAINS_EDGESTORE_HPP
+#ifndef SHARE_JFR_LEAKPROFILER_CHAINS_EDGESTORE_HPP
+#define SHARE_JFR_LEAKPROFILER_CHAINS_EDGESTORE_HPP
#include "jfr/utilities/jfrHashtable.hpp"
#include "jfr/leakprofiler/chains/edge.hpp"
@@ -116,4 +116,4 @@ class EdgeStore : public CHeapObj {
void iterate_edges(T& functor) const { _edges->iterate_value(functor); }
};
-#endif // SHARE_VM_LEAKPROFILER_CHAINS_EDGESTORE_HPP
+#endif // SHARE_JFR_LEAKPROFILER_CHAINS_EDGESTORE_HPP
diff --git a/src/hotspot/share/jfr/leakprofiler/chains/edgeUtils.hpp b/src/hotspot/share/jfr/leakprofiler/chains/edgeUtils.hpp
index 730b2fdd4db..03fbdc584ff 100644
--- a/src/hotspot/share/jfr/leakprofiler/chains/edgeUtils.hpp
+++ b/src/hotspot/share/jfr/leakprofiler/chains/edgeUtils.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2014, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
*
*/
-#ifndef SHARE_VM_LEAKPROFILER_CHAINS_EDGEUTILS_HPP
-#define SHARE_VM_LEAKPROFILER_CHAINS_EDGEUTILS_HPP
+#ifndef SHARE_JFR_LEAKPROFILER_CHAINS_EDGEUTILS_HPP
+#define SHARE_JFR_LEAKPROFILER_CHAINS_EDGEUTILS_HPP
#include "memory/allocation.hpp"
@@ -48,4 +48,4 @@ class EdgeUtils : public AllStatic {
static void collapse_chain(const RoutableEdge& edge);
};
-#endif // SHARE_VM_LEAKPROFILER_CHAINS_EDGEUTILS_HPP
+#endif // SHARE_JFR_LEAKPROFILER_CHAINS_EDGEUTILS_HPP
diff --git a/src/hotspot/share/jfr/leakprofiler/chains/objectSampleMarker.hpp b/src/hotspot/share/jfr/leakprofiler/chains/objectSampleMarker.hpp
index 9a97a373fbc..d493af014ae 100644
--- a/src/hotspot/share/jfr/leakprofiler/chains/objectSampleMarker.hpp
+++ b/src/hotspot/share/jfr/leakprofiler/chains/objectSampleMarker.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2017, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
*
*/
-#ifndef SHARE_VM_JFR_LEAKPROFILER_CHAINS_OBJECTSAMPLEMARKER_HPP
-#define SHARE_VM_JFR_LEAKPROFILER_CHAINS_OBJECTSAMPLEMARKER_HPP
+#ifndef SHARE_JFR_LEAKPROFILER_CHAINS_OBJECTSAMPLEMARKER_HPP
+#define SHARE_JFR_LEAKPROFILER_CHAINS_OBJECTSAMPLEMARKER_HPP
#include "memory/allocation.hpp"
#include "oops/markOop.hpp"
@@ -78,4 +78,4 @@ class ObjectSampleMarker : public StackObj {
}
};
-#endif // SHARE_VM_JFR_LEAKPROFILER_CHAINS_OBJECTSAMPLEMARKER_HPP
+#endif // SHARE_JFR_LEAKPROFILER_CHAINS_OBJECTSAMPLEMARKER_HPP
diff --git a/src/hotspot/share/jfr/leakprofiler/chains/rootSetClosure.hpp b/src/hotspot/share/jfr/leakprofiler/chains/rootSetClosure.hpp
index 136ab91934a..8af5e2b059c 100644
--- a/src/hotspot/share/jfr/leakprofiler/chains/rootSetClosure.hpp
+++ b/src/hotspot/share/jfr/leakprofiler/chains/rootSetClosure.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2014, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
*
*/
-#ifndef SHARE_VM_JFR_LEAKPROFILER_CHAINS_ROOTSETCLOSURE_HPP
-#define SHARE_VM_JFR_LEAKPROFILER_CHAINS_ROOTSETCLOSURE_HPP
+#ifndef SHARE_JFR_LEAKPROFILER_CHAINS_ROOTSETCLOSURE_HPP
+#define SHARE_JFR_LEAKPROFILER_CHAINS_ROOTSETCLOSURE_HPP
#include "memory/iterator.hpp"
#include "oops/oop.hpp"
@@ -43,4 +43,4 @@ class RootSetClosure: public BasicOopIterateClosure {
virtual void do_oop(narrowOop* reference);
};
-#endif // SHARE_VM_JFR_LEAKPROFILER_CHAINS_ROOTSETCLOSURE_HPP
+#endif // SHARE_JFR_LEAKPROFILER_CHAINS_ROOTSETCLOSURE_HPP
diff --git a/src/hotspot/share/jfr/leakprofiler/checkpoint/objectSampleCheckpoint.hpp b/src/hotspot/share/jfr/leakprofiler/checkpoint/objectSampleCheckpoint.hpp
index 8735e3aae1c..6736b24042c 100644
--- a/src/hotspot/share/jfr/leakprofiler/checkpoint/objectSampleCheckpoint.hpp
+++ b/src/hotspot/share/jfr/leakprofiler/checkpoint/objectSampleCheckpoint.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2014, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
*
*/
-#ifndef SHARE_VM_LEAKPROFILER_CHECKPOINT_OBJECTSAMPLECHECKPOINT_HPP
-#define SHARE_VM_LEAKPROFILER_CHECKPOINT_OBJECTSAMPLECHECKPOINT_HPP
+#ifndef SHARE_JFR_LEAKPROFILER_CHECKPOINT_OBJECTSAMPLECHECKPOINT_HPP
+#define SHARE_JFR_LEAKPROFILER_CHECKPOINT_OBJECTSAMPLECHECKPOINT_HPP
#include "memory/allocation.hpp"
#include "utilities/exceptions.hpp"
@@ -48,4 +48,4 @@ class WriteObjectSampleStacktrace : public StackObj {
bool process();
};
-#endif // SHARE_VM_LEAKPROFILER_CHECKPOINT_OBJECTSAMPLECHECKPOINT_HPP
+#endif // SHARE_JFR_LEAKPROFILER_CHECKPOINT_OBJECTSAMPLECHECKPOINT_HPP
diff --git a/src/hotspot/share/jfr/leakprofiler/checkpoint/objectSampleDescription.hpp b/src/hotspot/share/jfr/leakprofiler/checkpoint/objectSampleDescription.hpp
index 691e2fe551e..ecfba127d0c 100644
--- a/src/hotspot/share/jfr/leakprofiler/checkpoint/objectSampleDescription.hpp
+++ b/src/hotspot/share/jfr/leakprofiler/checkpoint/objectSampleDescription.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2017, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
*
*/
-#ifndef SHARE_VM_LEAKPROFILER_CHECKPOINT_OBJECTSAMPLEDESCRIPTION_HPP
-#define SHARE_VM_LEAKPROFILER_CHECKPOINT_OBJECTSAMPLEDESCRIPTION_HPP
+#ifndef SHARE_JFR_LEAKPROFILER_CHECKPOINT_OBJECTSAMPLEDESCRIPTION_HPP
+#define SHARE_JFR_LEAKPROFILER_CHECKPOINT_OBJECTSAMPLEDESCRIPTION_HPP
#define OBJECT_SAMPLE_DESCRIPTION_BUFFER_SIZE 100
@@ -71,4 +71,4 @@ public:
const char* description();
};
-#endif // SHARE_VM_LEAKPROFILER_CHECKPOINT_OBJECTSAMPLEDESCRIPTION_HPP
+#endif // SHARE_JFR_LEAKPROFILER_CHECKPOINT_OBJECTSAMPLEDESCRIPTION_HPP
diff --git a/src/hotspot/share/jfr/leakprofiler/checkpoint/objectSampleWriter.hpp b/src/hotspot/share/jfr/leakprofiler/checkpoint/objectSampleWriter.hpp
index 92ccb0301e2..f97e7e6bc9e 100644
--- a/src/hotspot/share/jfr/leakprofiler/checkpoint/objectSampleWriter.hpp
+++ b/src/hotspot/share/jfr/leakprofiler/checkpoint/objectSampleWriter.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2014, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
*
*/
-#ifndef SHARE_VM_LEAKPROFILER_CHECKPOINT_OBJECTSAMPLEWRITER_HPP
-#define SHARE_VM_LEAKPROFILER_CHECKPOINT_OBJECTSAMPLEWRITER_HPP
+#ifndef SHARE_JFR_LEAKPROFILER_CHECKPOINT_OBJECTSAMPLEWRITER_HPP
+#define SHARE_JFR_LEAKPROFILER_CHECKPOINT_OBJECTSAMPLEWRITER_HPP
#include "memory/allocation.hpp"
@@ -47,4 +47,4 @@ class ObjectSampleWriter : public StackObj {
bool operator()(const RoutableEdge& edge);
};
-#endif // SHARE_VM_LEAKPROFILER_CHECKPOINT_OBJECTSAMPLEWRITER_HPP
+#endif // SHARE_JFR_LEAKPROFILER_CHECKPOINT_OBJECTSAMPLEWRITER_HPP
diff --git a/src/hotspot/share/jfr/leakprofiler/checkpoint/rootResolver.hpp b/src/hotspot/share/jfr/leakprofiler/checkpoint/rootResolver.hpp
index 395838faa25..0fcb42caf88 100644
--- a/src/hotspot/share/jfr/leakprofiler/checkpoint/rootResolver.hpp
+++ b/src/hotspot/share/jfr/leakprofiler/checkpoint/rootResolver.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2014, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
*
*/
-#ifndef SHARE_VM_JFR_LEAKPROFILER_CHECKPOINT_ROOTRESOLVER_HPP
-#define SHARE_VM_JFR_LEAKPROFILER_CHECKPOINT_ROOTRESOLVER_HPP
+#ifndef SHARE_JFR_LEAKPROFILER_CHECKPOINT_ROOTRESOLVER_HPP
+#define SHARE_JFR_LEAKPROFILER_CHECKPOINT_ROOTRESOLVER_HPP
#include "memory/allocation.hpp"
#include "jfr/leakprofiler/utilities/rootType.hpp"
@@ -49,4 +49,4 @@ class RootResolver : public AllStatic {
static void resolve(RootCallback& callback);
};
-#endif // SHARE_VM_JFR_LEAKPROFILER_CHECKPOINT_ROOTRESOLVER_HPP
+#endif // SHARE_JFR_LEAKPROFILER_CHECKPOINT_ROOTRESOLVER_HPP
diff --git a/src/hotspot/share/jfr/leakprofiler/emitEventOperation.hpp b/src/hotspot/share/jfr/leakprofiler/emitEventOperation.hpp
index c9610d180a9..29df708fe0f 100644
--- a/src/hotspot/share/jfr/leakprofiler/emitEventOperation.hpp
+++ b/src/hotspot/share/jfr/leakprofiler/emitEventOperation.hpp
@@ -22,8 +22,8 @@
*
*/
-#ifndef SHARE_VM_LEAKPROFILER_EMITEVENTOPERATION_HPP
-#define SHARE_VM_LEAKPROFILER_EMITEVENTOPERATION_HPP
+#ifndef SHARE_JFR_LEAKPROFILER_EMITEVENTOPERATION_HPP
+#define SHARE_JFR_LEAKPROFILER_EMITEVENTOPERATION_HPP
#include "runtime/vmOperations.hpp"
@@ -68,4 +68,4 @@ class EmitEventOperation : public VM_Operation {
virtual void doit();
};
-#endif // SHARE_VM_LEAKPROFILER_EMITEVENTOPERATION_HPP
+#endif // SHARE_JFR_LEAKPROFILER_EMITEVENTOPERATION_HPP
diff --git a/src/hotspot/share/jfr/leakprofiler/leakProfiler.hpp b/src/hotspot/share/jfr/leakprofiler/leakProfiler.hpp
index edef2ff00c6..837c660771d 100644
--- a/src/hotspot/share/jfr/leakprofiler/leakProfiler.hpp
+++ b/src/hotspot/share/jfr/leakprofiler/leakProfiler.hpp
@@ -22,8 +22,8 @@
*
*/
-#ifndef SHARE_VM_JFR_LEAKPROFILER_LEAKPROFILER_HPP
-#define SHARE_VM_JFR_LEAKPROFILER_LEAKPROFILER_HPP
+#ifndef SHARE_JFR_LEAKPROFILER_LEAKPROFILER_HPP
+#define SHARE_JFR_LEAKPROFILER_LEAKPROFILER_HPP
#include "memory/allocation.hpp"
@@ -64,4 +64,4 @@ class LeakProfiler : public AllStatic {
static void oops_do(BoolObjectClosure* is_alive, OopClosure* f);
};
-#endif // SHARE_VM_JFR_LEAKPROFILER_LEAKPROFILER_HPP
+#endif // SHARE_JFR_LEAKPROFILER_LEAKPROFILER_HPP
diff --git a/src/hotspot/share/jfr/leakprofiler/sampling/objectSample.hpp b/src/hotspot/share/jfr/leakprofiler/sampling/objectSample.hpp
index 48baea52dd4..05be32bf31c 100644
--- a/src/hotspot/share/jfr/leakprofiler/sampling/objectSample.hpp
+++ b/src/hotspot/share/jfr/leakprofiler/sampling/objectSample.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2014, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
*
*/
-#ifndef SHARE_VM_JFR_LEAKPROFILER_SAMPLING_OBJECTSAMPLE_HPP
-#define SHARE_VM_JFR_LEAKPROFILER_SAMPLING_OBJECTSAMPLE_HPP
+#ifndef SHARE_JFR_LEAKPROFILER_SAMPLING_OBJECTSAMPLE_HPP
+#define SHARE_JFR_LEAKPROFILER_SAMPLING_OBJECTSAMPLE_HPP
#include "jfr/recorder/checkpoint/jfrCheckpointBlob.hpp"
#include "jfr/utilities/jfrAllocation.hpp"
@@ -246,4 +246,4 @@ class ObjectSample : public JfrCHeapObj {
}
};
-#endif // SHARE_VM_JFR_LEAKPROFILER_SAMPLING_OBJECTSAMPLE_HPP
+#endif // SHARE_JFR_LEAKPROFILER_SAMPLING_OBJECTSAMPLE_HPP
diff --git a/src/hotspot/share/jfr/leakprofiler/sampling/objectSampler.hpp b/src/hotspot/share/jfr/leakprofiler/sampling/objectSampler.hpp
index 2bf13031f6a..8bc68d7f2f9 100644
--- a/src/hotspot/share/jfr/leakprofiler/sampling/objectSampler.hpp
+++ b/src/hotspot/share/jfr/leakprofiler/sampling/objectSampler.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2014, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
*
*/
-#ifndef SHARE_VM_LEAKPROFILER_SAMPLING_OBJECTSAMPLER_HPP
-#define SHARE_VM_LEAKPROFILER_SAMPLING_OBJECTSAMPLER_HPP
+#ifndef SHARE_JFR_LEAKPROFILER_SAMPLING_OBJECTSAMPLER_HPP
+#define SHARE_JFR_LEAKPROFILER_SAMPLING_OBJECTSAMPLER_HPP
#include "memory/allocation.hpp"
#include "jfr/utilities/jfrTime.hpp"
@@ -76,4 +76,4 @@ class ObjectSampler : public CHeapObj {
const JfrTicks& last_sweep() const;
};
-#endif // SHARE_VM_LEAKPROFILER_SAMPLING_OBJECTSAMPLER_HPP
+#endif // SHARE_JFR_LEAKPROFILER_SAMPLING_OBJECTSAMPLER_HPP
diff --git a/src/hotspot/share/jfr/leakprofiler/sampling/sampleList.hpp b/src/hotspot/share/jfr/leakprofiler/sampling/sampleList.hpp
index 6754ed3ba9f..cd9c7516e25 100644
--- a/src/hotspot/share/jfr/leakprofiler/sampling/sampleList.hpp
+++ b/src/hotspot/share/jfr/leakprofiler/sampling/sampleList.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2017, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
*
*/
-#ifndef SHARE_VM_JFR_LEAKPROFILER_SAMPLING_SAMPLELIST_HPP
-#define SHARE_VM_JFR_LEAKPROFILER_SAMPLING_SAMPLELIST_HPP
+#ifndef SHARE_JFR_LEAKPROFILER_SAMPLING_SAMPLELIST_HPP
+#define SHARE_JFR_LEAKPROFILER_SAMPLING_SAMPLELIST_HPP
#include "jfr/utilities/jfrAllocation.hpp"
#include "jfr/utilities/jfrDoublyLinkedList.hpp"
@@ -61,4 +61,4 @@ class SampleList : public JfrCHeapObj {
size_t count() const;
};
-#endif // SHARE_VM_JFR_LEAKPROFILER_SAMPLING_SAMPLELIST_HPP
+#endif // SHARE_JFR_LEAKPROFILER_SAMPLING_SAMPLELIST_HPP
diff --git a/src/hotspot/share/jfr/leakprofiler/sampling/samplePriorityQueue.hpp b/src/hotspot/share/jfr/leakprofiler/sampling/samplePriorityQueue.hpp
index 1189e6d7310..0e43a6b47fd 100644
--- a/src/hotspot/share/jfr/leakprofiler/sampling/samplePriorityQueue.hpp
+++ b/src/hotspot/share/jfr/leakprofiler/sampling/samplePriorityQueue.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2014, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
*
*/
-#ifndef SHARE_VM_JFR_LEAKPROFILER_SAMPLING_SAMPLEPRIORITYQUEUE_HPP
-#define SHARE_VM_JFR_LEAKPROFILER_SAMPLING_SAMPLEPRIORITYQUEUE_HPP
+#ifndef SHARE_JFR_LEAKPROFILER_SAMPLING_SAMPLEPRIORITYQUEUE_HPP
+#define SHARE_JFR_LEAKPROFILER_SAMPLING_SAMPLEPRIORITYQUEUE_HPP
#include "memory/allocation.hpp"
@@ -55,4 +55,4 @@ class SamplePriorityQueue : public CHeapObj {
int count() const;
};
-#endif // SHARE_VM_JFR_LEAKPROFILER_SAMPLING_SAMPLEPRIORITYQUEUE_HPP
+#endif // SHARE_JFR_LEAKPROFILER_SAMPLING_SAMPLEPRIORITYQUEUE_HPP
diff --git a/src/hotspot/share/jfr/leakprofiler/startOperation.hpp b/src/hotspot/share/jfr/leakprofiler/startOperation.hpp
index a9613f728f1..b9517c6f654 100644
--- a/src/hotspot/share/jfr/leakprofiler/startOperation.hpp
+++ b/src/hotspot/share/jfr/leakprofiler/startOperation.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2014, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
*
*/
-#ifndef SHARE_VM_LEAKPROFILER_STARTOPERATION_HPP
-#define SHARE_VM_LEAKPROFILER_STARTOPERATION_HPP
+#ifndef SHARE_JFR_LEAKPROFILER_STARTOPERATION_HPP
+#define SHARE_JFR_LEAKPROFILER_STARTOPERATION_HPP
#include "jfr/recorder/jfrRecorder.hpp"
#include "jfr/leakprofiler/leakProfiler.hpp"
@@ -57,4 +57,4 @@ class StartOperation : public VM_Operation {
}
};
-#endif // SHARE_VM_LEAKPROFILER_STARTOPERATION_HPP
+#endif // SHARE_JFR_LEAKPROFILER_STARTOPERATION_HPP
diff --git a/src/hotspot/share/jfr/leakprofiler/stopOperation.hpp b/src/hotspot/share/jfr/leakprofiler/stopOperation.hpp
index 85133f82678..a1c028e73e3 100644
--- a/src/hotspot/share/jfr/leakprofiler/stopOperation.hpp
+++ b/src/hotspot/share/jfr/leakprofiler/stopOperation.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2014, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
*
*/
-#ifndef SHARE_VM_LEAKPROFILER_STOPOPERATION_HPP
-#define SHARE_VM_LEAKPROFILER_STOPOPERATION_HPP
+#ifndef SHARE_JFR_LEAKPROFILER_STOPOPERATION_HPP
+#define SHARE_JFR_LEAKPROFILER_STOPOPERATION_HPP
#include "jfr/leakprofiler/leakProfiler.hpp"
#include "jfr/leakprofiler/sampling/objectSampler.hpp"
@@ -53,4 +53,4 @@ class StopOperation : public VM_Operation {
}
};
-#endif // SHARE_VM_LEAKPROFILER_STOPOPERATION_HPP
+#endif // SHARE_JFR_LEAKPROFILER_STOPOPERATION_HPP
diff --git a/src/hotspot/share/jfr/leakprofiler/utilities/granularTimer.hpp b/src/hotspot/share/jfr/leakprofiler/utilities/granularTimer.hpp
index aa046da4ec9..231c1b26df4 100644
--- a/src/hotspot/share/jfr/leakprofiler/utilities/granularTimer.hpp
+++ b/src/hotspot/share/jfr/leakprofiler/utilities/granularTimer.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2014, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
*
*/
-#ifndef SHARE_VM_LEAKPROFILER_UTILITIES_GRANULARTIMER_HPP
-#define SHARE_VM_LEAKPROFILER_UTILITIES_GRANULARTIMER_HPP
+#ifndef SHARE_JFR_LEAKPROFILER_UTILITIES_GRANULARTIMER_HPP
+#define SHARE_JFR_LEAKPROFILER_UTILITIES_GRANULARTIMER_HPP
#include "jfr/utilities/jfrTime.hpp"
#include "memory/allocation.hpp"
@@ -43,4 +43,4 @@ class GranularTimer : public AllStatic {
static bool is_finished();
};
-#endif // SHARE_VM_LEAKPROFILER_UTILITIES_GRANULARTIMER_HPP
+#endif // SHARE_JFR_LEAKPROFILER_UTILITIES_GRANULARTIMER_HPP
diff --git a/src/hotspot/share/jfr/leakprofiler/utilities/rootType.hpp b/src/hotspot/share/jfr/leakprofiler/utilities/rootType.hpp
index c8cd633293f..c000150d607 100644
--- a/src/hotspot/share/jfr/leakprofiler/utilities/rootType.hpp
+++ b/src/hotspot/share/jfr/leakprofiler/utilities/rootType.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2017, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
*
*/
-#ifndef SHARE_VM_LEAKPROFILER_UTILITIES_ROOTTYPE_HPP
-#define SHARE_VM_LEAKPROFILER_UTILITIES_ROOTTYPE_HPP
+#ifndef SHARE_JFR_LEAKPROFILER_UTILITIES_ROOTTYPE_HPP
+#define SHARE_JFR_LEAKPROFILER_UTILITIES_ROOTTYPE_HPP
#include "memory/allocation.hpp"
#include "utilities/debug.hpp"
@@ -106,4 +106,4 @@ class OldObjectRoot : public AllStatic {
}
};
-#endif // SHARE_VM_LEAKPROFILER_UTILITIES_ROOTTYPE_HPP
+#endif // SHARE_JFR_LEAKPROFILER_UTILITIES_ROOTTYPE_HPP
diff --git a/src/hotspot/share/jfr/leakprofiler/utilities/saveRestore.hpp b/src/hotspot/share/jfr/leakprofiler/utilities/saveRestore.hpp
index abc40dbd588..e5571582595 100644
--- a/src/hotspot/share/jfr/leakprofiler/utilities/saveRestore.hpp
+++ b/src/hotspot/share/jfr/leakprofiler/utilities/saveRestore.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2017, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
*
*/
-#ifndef SHARE_VM_JFR_LEAKPROFILER_UTILITIES_SAVERESTORE_HPP
-#define SHARE_VM_JFR_LEAKPROFILER_UTILITIES_SAVERESTORE_HPP
+#ifndef SHARE_JFR_LEAKPROFILER_UTILITIES_SAVERESTORE_HPP
+#define SHARE_JFR_LEAKPROFILER_UTILITIES_SAVERESTORE_HPP
#include "memory/allocation.hpp"
#include "memory/iterator.hpp"
@@ -125,4 +125,4 @@ class SaveRestoreCLDClaimBits : public StackObj {
~SaveRestoreCLDClaimBits();
};
-#endif // SHARE_VM_JFR_LEAKPROFILER_UTILITIES_SAVERESTORE_HPP
+#endif // SHARE_JFR_LEAKPROFILER_UTILITIES_SAVERESTORE_HPP
diff --git a/src/hotspot/share/jfr/leakprofiler/utilities/unifiedOop.hpp b/src/hotspot/share/jfr/leakprofiler/utilities/unifiedOop.hpp
index b92a182212e..56c9ac10750 100644
--- a/src/hotspot/share/jfr/leakprofiler/utilities/unifiedOop.hpp
+++ b/src/hotspot/share/jfr/leakprofiler/utilities/unifiedOop.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2017, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
*
*/
-#ifndef SHARE_VM_JFR_LEAKPROFILER_UTILITIES_UNIFIEDOOP_HPP
-#define SHARE_VM_JFR_LEAKPROFILER_UTILITIES_UNIFIEDOOP_HPP
+#ifndef SHARE_JFR_LEAKPROFILER_UTILITIES_UNIFIEDOOP_HPP
+#define SHARE_JFR_LEAKPROFILER_UTILITIES_UNIFIEDOOP_HPP
#include "oops/oop.inline.hpp"
@@ -53,4 +53,4 @@ class UnifiedOop : public AllStatic {
}
};
-#endif // SHARE_VM_JFR_LEAKPROFILER_UTILITIES_UNIFIEDOOP_HPP
+#endif // SHARE_JFR_LEAKPROFILER_UTILITIES_UNIFIEDOOP_HPP
diff --git a/src/hotspot/share/jfr/metadata/jfrSerializer.hpp b/src/hotspot/share/jfr/metadata/jfrSerializer.hpp
index f5a4d7d9f24..e13dc560c7e 100644
--- a/src/hotspot/share/jfr/metadata/jfrSerializer.hpp
+++ b/src/hotspot/share/jfr/metadata/jfrSerializer.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2016, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
*
*/
-#ifndef SHARE_VM_JFR_METADATA_JFRSERIALIZER_HPP
-#define SHARE_VM_JFR_METADATA_JFRSERIALIZER_HPP
+#ifndef SHARE_JFR_METADATA_JFRSERIALIZER_HPP
+#define SHARE_JFR_METADATA_JFRSERIALIZER_HPP
#include "memory/allocation.hpp"
#include "jfr/recorder/checkpoint/jfrCheckpointWriter.hpp"
@@ -97,4 +97,4 @@ class JfrSerializer : public CHeapObj {
* Please see jfr/recorder/checkpoint/types/jfrType.cpp for reference.
*/
-#endif // SHARE_VM_JFR_METADATA_JFRSERIALIZER_HPP
+#endif // SHARE_JFR_METADATA_JFRSERIALIZER_HPP
diff --git a/src/hotspot/share/jfr/periodic/jfrModuleEvent.hpp b/src/hotspot/share/jfr/periodic/jfrModuleEvent.hpp
index 42e9d3c6d4d..aec662be231 100644
--- a/src/hotspot/share/jfr/periodic/jfrModuleEvent.hpp
+++ b/src/hotspot/share/jfr/periodic/jfrModuleEvent.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2015, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
*
*/
-#ifndef SHARE_VM_JFR_EVENT_JFRMODULEEVENT_HPP
-#define SHARE_VM_JFR_EVENT_JFRMODULEEVENT_HPP
+#ifndef SHARE_JFR_PERIODIC_JFRMODULEEVENT_HPP
+#define SHARE_JFR_PERIODIC_JFRMODULEEVENT_HPP
#include "memory/allocation.hpp"
@@ -33,4 +33,4 @@ class JfrModuleEvent : AllStatic {
static void generate_module_export_events();
};
-#endif // SHARE_VM_JFR_EVENT_JFRMODULEEVENT_HPP
+#endif // SHARE_JFR_PERIODIC_JFRMODULEEVENT_HPP
diff --git a/src/hotspot/share/jfr/periodic/jfrNetworkUtilization.hpp b/src/hotspot/share/jfr/periodic/jfrNetworkUtilization.hpp
index 8d1b5959128..b7a78498a9f 100644
--- a/src/hotspot/share/jfr/periodic/jfrNetworkUtilization.hpp
+++ b/src/hotspot/share/jfr/periodic/jfrNetworkUtilization.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
*
*/
-#ifndef SHARE_VM_JFR_PERIODIC_JFRNETWORKUTILIZATION_HPP
-#define SHARE_VM_JFR_PERIODIC_JFRNETWORKUTILIZATION_HPP
+#ifndef SHARE_JFR_PERIODIC_JFRNETWORKUTILIZATION_HPP
+#define SHARE_JFR_PERIODIC_JFRNETWORKUTILIZATION_HPP
#include "memory/allocation.hpp"
@@ -35,4 +35,4 @@ public:
static void send_events();
};
-#endif // SHARE_VM_JFR_PERIODIC_JFRNETWORKUTILIZATION_HPP
+#endif // SHARE_JFR_PERIODIC_JFRNETWORKUTILIZATION_HPP
diff --git a/src/hotspot/share/jfr/periodic/jfrOSInterface.cpp b/src/hotspot/share/jfr/periodic/jfrOSInterface.cpp
index b7ba451f92f..331b249a735 100644
--- a/src/hotspot/share/jfr/periodic/jfrOSInterface.cpp
+++ b/src/hotspot/share/jfr/periodic/jfrOSInterface.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -70,9 +70,6 @@ class JfrOSInterface::JfrOSInterfaceImpl : public JfrCHeapObj {
SystemProcessInterface* _system_process_interface;
NetworkPerformanceInterface* _network_performance_interface;
- // stub helper
- void functionality_not_implemented(char** str) const;
-
JfrOSInterfaceImpl();
bool initialize();
~JfrOSInterfaceImpl();
@@ -178,15 +175,6 @@ int JfrOSInterface::JfrOSInterfaceImpl::os_version(char** os_version) const {
return OS_OK;
}
-void JfrOSInterface::JfrOSInterfaceImpl::functionality_not_implemented(char** str) const {
- assert(str != NULL, "address to string is NULL!");
- const char* not_impl = "Functionality_not_implemented";
- const size_t not_impl_len = strlen(not_impl);
- *str = NEW_C_HEAP_ARRAY(char, not_impl_len+1, mtTracing);
- strncpy(*str, not_impl, not_impl_len);
- (*str)[not_impl_len] = '\0';
-}
-
JfrOSInterface::JfrOSInterface() {
_impl = NULL;
}
diff --git a/src/hotspot/share/jfr/periodic/jfrOSInterface.hpp b/src/hotspot/share/jfr/periodic/jfrOSInterface.hpp
index aa31994ffdd..43e8a894a5c 100644
--- a/src/hotspot/share/jfr/periodic/jfrOSInterface.hpp
+++ b/src/hotspot/share/jfr/periodic/jfrOSInterface.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
*
*/
-#ifndef SHARE_VM_JFR_PERIODIC_JFROSINTERFACE_HPP
-#define SHARE_VM_JFR_PERIODIC_JFROSINTERFACE_HPP
+#ifndef SHARE_JFR_PERIODIC_JFROSINTERFACE_HPP
+#define SHARE_JFR_PERIODIC_JFROSINTERFACE_HPP
#include "jfr/utilities/jfrAllocation.hpp"
@@ -57,4 +57,4 @@ class JfrOSInterface: public JfrCHeapObj {
static int network_utilization(NetworkInterface** network_interfaces);
};
-#endif // SHARE_VM_JFR_PERIODIC_JFROSINTERFACE_HPP
+#endif // SHARE_JFR_PERIODIC_JFROSINTERFACE_HPP
diff --git a/src/hotspot/share/jfr/periodic/jfrThreadCPULoadEvent.hpp b/src/hotspot/share/jfr/periodic/jfrThreadCPULoadEvent.hpp
index 99b3fa7fe9b..84d3099e825 100644
--- a/src/hotspot/share/jfr/periodic/jfrThreadCPULoadEvent.hpp
+++ b/src/hotspot/share/jfr/periodic/jfrThreadCPULoadEvent.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2017, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
*
*/
-#ifndef SHARE_VM_JFR_PERIODIC_JFRTHREADCPULOAD_HPP
-#define SHARE_VM_JFR_PERIODIC_JFRTHREADCPULOAD_HPP
+#ifndef SHARE_JFR_PERIODIC_JFRTHREADCPULOADEVENT_HPP
+#define SHARE_JFR_PERIODIC_JFRTHREADCPULOADEVENT_HPP
#include "jni.h"
#include "memory/allocation.hpp"
@@ -41,5 +41,4 @@ class JfrThreadCPULoadEvent : public AllStatic {
static void send_event_for_thread(JavaThread* jt);
};
-#endif // SHARE_VM_JFR_PERIODIC_JFRTHREADCPULOAD_HPP
-
+#endif // SHARE_JFR_PERIODIC_JFRTHREADCPULOADEVENT_HPP
diff --git a/src/hotspot/share/jfr/periodic/jfrThreadDumpEvent.hpp b/src/hotspot/share/jfr/periodic/jfrThreadDumpEvent.hpp
index d1b90644ebe..23af6a3060b 100644
--- a/src/hotspot/share/jfr/periodic/jfrThreadDumpEvent.hpp
+++ b/src/hotspot/share/jfr/periodic/jfrThreadDumpEvent.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2015, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
*
*/
-#ifndef SHARE_VM_JFR_PERIODIC_JFRDCMDEVENT_HPP
-#define SHARE_VM_JFR_PERIODIC_JFRDCMDEVENT_HPP
+#ifndef SHARE_JFR_PERIODIC_JFRTHREADDUMPEVENT_HPP
+#define SHARE_JFR_PERIODIC_JFRTHREADDUMPEVENT_HPP
#include "memory/allocation.hpp"
@@ -36,4 +36,4 @@ class JfrDcmdEvent : public AllStatic {
static const char* thread_dump();
};
-#endif // SHARE_VM_JFR_PERIODIC_JFRDCMDEVENT_HPP
+#endif // SHARE_JFR_PERIODIC_JFRTHREADDUMPEVENT_HPP
diff --git a/src/hotspot/share/jfr/periodic/sampling/jfrCallTrace.hpp b/src/hotspot/share/jfr/periodic/sampling/jfrCallTrace.hpp
index 8145003b659..8a57160bd9e 100644
--- a/src/hotspot/share/jfr/periodic/sampling/jfrCallTrace.hpp
+++ b/src/hotspot/share/jfr/periodic/sampling/jfrCallTrace.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
*
*/
-#ifndef SHARE_VM_JFR_ENGINE_SAMPLING_JFRCALLTRACE_HPP
-#define SHARE_VM_JFR_ENGINE_SAMPLING_JFRCALLTRACE_HPP
+#ifndef SHARE_JFR_PERIODIC_SAMPLING_JFRCALLTRACE_HPP
+#define SHARE_JFR_PERIODIC_SAMPLING_JFRCALLTRACE_HPP
#include "memory/allocation.hpp"
@@ -42,4 +42,4 @@ class JfrGetCallTrace : public StackObj {
bool get_topframe(void* ucontext, frame& top);
};
-#endif // SHARE_VM_JFR_ENGINE_SAMPLING_JFRCALLTRACE_HPP
+#endif // SHARE_JFR_PERIODIC_SAMPLING_JFRCALLTRACE_HPP
diff --git a/src/hotspot/share/jfr/periodic/sampling/jfrThreadSampler.cpp b/src/hotspot/share/jfr/periodic/sampling/jfrThreadSampler.cpp
index 1771d6eb3b3..2d0bd583d0e 100644
--- a/src/hotspot/share/jfr/periodic/sampling/jfrThreadSampler.cpp
+++ b/src/hotspot/share/jfr/periodic/sampling/jfrThreadSampler.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -467,8 +467,17 @@ void JfrThreadSampler::run() {
jlong now_ms = get_monotonic_ms();
- jlong next_j = java_interval + last_java_ms - now_ms;
- jlong next_n = native_interval + last_native_ms - now_ms;
+ /*
+ * Let I be java_interval or native_interval.
+ * Let L be last_java_ms or last_native_ms.
+ * Let N be now_ms.
+ *
+ * Interval, I, might be max_jlong so the addition
+ * could potentially overflow without parenthesis (UB). Also note that
+ * L - N < 0. Avoid UB, by adding parenthesis.
+ */
+ jlong next_j = java_interval + (last_java_ms - now_ms);
+ jlong next_n = native_interval + (last_native_ms - now_ms);
jlong sleep_to_next = MIN2(next_j, next_n);
diff --git a/src/hotspot/share/jfr/periodic/sampling/jfrThreadSampler.hpp b/src/hotspot/share/jfr/periodic/sampling/jfrThreadSampler.hpp
index ffb7e2227db..a036be65aee 100644
--- a/src/hotspot/share/jfr/periodic/sampling/jfrThreadSampler.hpp
+++ b/src/hotspot/share/jfr/periodic/sampling/jfrThreadSampler.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
*
*/
-#ifndef SHARE_VM_JFR_PERIODIC_SAMPLING_JFRTHREADSAMPLER_HPP
-#define SHARE_VM_JFR_PERIODIC_SAMPLING_JFRTHREADSAMPLER_HPP
+#ifndef SHARE_JFR_PERIODIC_SAMPLING_JFRTHREADSAMPLER_HPP
+#define SHARE_JFR_PERIODIC_SAMPLING_JFRTHREADSAMPLER_HPP
#include "jfr/utilities/jfrAllocation.hpp"
@@ -52,4 +52,4 @@ class JfrThreadSampling : public JfrCHeapObj {
static void on_javathread_suspend(JavaThread* thread);
};
-#endif // SHARE_VM_JFR_PERIODIC_SAMPLING_JFRTHREADSAMPLER_HPP
+#endif // SHARE_JFR_PERIODIC_SAMPLING_JFRTHREADSAMPLER_HPP
diff --git a/src/hotspot/share/jfr/recorder/checkpoint/jfrCheckpointBlob.hpp b/src/hotspot/share/jfr/recorder/checkpoint/jfrCheckpointBlob.hpp
index 50617ecb684..9cc8ab91575 100644
--- a/src/hotspot/share/jfr/recorder/checkpoint/jfrCheckpointBlob.hpp
+++ b/src/hotspot/share/jfr/recorder/checkpoint/jfrCheckpointBlob.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2016, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
*
*/
-#ifndef SHARE_VM_JFR_RECORDER_CHECKPOINT_JFRCHECKPOINTBLOB_HPP
-#define SHARE_VM_JFR_RECORDER_CHECKPOINT_JFRCHECKPOINTBLOB_HPP
+#ifndef SHARE_JFR_RECORDER_CHECKPOINT_JFRCHECKPOINTBLOB_HPP
+#define SHARE_JFR_RECORDER_CHECKPOINT_JFRCHECKPOINTBLOB_HPP
#include "jfr/utilities/jfrAllocation.hpp"
#include "jfr/utilities/jfrRefCountPointer.hpp"
@@ -56,4 +56,4 @@ class JfrCheckpointBlob : public JfrCHeapObj {
static JfrCheckpointBlobHandle make(const u1* checkpoint, size_t size);
};
-#endif // SHARE_VM_JFR_RECORDER_CHECKPOINT_JFRCHECKPOINTBLOB_HPP
+#endif // SHARE_JFR_RECORDER_CHECKPOINT_JFRCHECKPOINTBLOB_HPP
diff --git a/src/hotspot/share/jfr/recorder/checkpoint/jfrCheckpointManager.hpp b/src/hotspot/share/jfr/recorder/checkpoint/jfrCheckpointManager.hpp
index a62af07fee7..51c87244ecb 100644
--- a/src/hotspot/share/jfr/recorder/checkpoint/jfrCheckpointManager.hpp
+++ b/src/hotspot/share/jfr/recorder/checkpoint/jfrCheckpointManager.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2016, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
*
*/
-#ifndef SHARE_VM_JFR_RECORDER_CHECKPOINT_JFRCHECKPOINTMANAGER_HPP
-#define SHARE_VM_JFR_RECORDER_CHECKPOINT_JFRCHECKPOINTMANAGER_HPP
+#ifndef SHARE_JFR_RECORDER_CHECKPOINT_JFRCHECKPOINTMANAGER_HPP
+#define SHARE_JFR_RECORDER_CHECKPOINT_JFRCHECKPOINTMANAGER_HPP
#include "jfr/recorder/storage/jfrBuffer.hpp"
#include "jfr/recorder/storage/jfrMemorySpace.hpp"
@@ -105,4 +105,4 @@ class JfrCheckpointManager : public JfrCHeapObj {
friend class JfrMemorySpace;
};
-#endif //SHARE_VM_JFR_RECORDER_CHECKPOINT_JFRCHECKPOINTMANAGER_HPP
+#endif // SHARE_JFR_RECORDER_CHECKPOINT_JFRCHECKPOINTMANAGER_HPP
diff --git a/src/hotspot/share/jfr/recorder/checkpoint/jfrCheckpointWriter.hpp b/src/hotspot/share/jfr/recorder/checkpoint/jfrCheckpointWriter.hpp
index bb01cb56e4d..431ce393ae0 100644
--- a/src/hotspot/share/jfr/recorder/checkpoint/jfrCheckpointWriter.hpp
+++ b/src/hotspot/share/jfr/recorder/checkpoint/jfrCheckpointWriter.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2016, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
*
*/
-#ifndef SHARE_VM_JFR_RECORDER_CHECKPOINT_JFRCHECKPOINTWRITER_HPP
-#define SHARE_VM_JFR_RECORDER_CHECKPOINT_JFRCHECKPOINTWRITER_HPP
+#ifndef SHARE_JFR_RECORDER_CHECKPOINT_JFRCHECKPOINTWRITER_HPP
+#define SHARE_JFR_RECORDER_CHECKPOINT_JFRCHECKPOINTWRITER_HPP
#include "jfr/recorder/checkpoint/jfrCheckpointBlob.hpp"
#include "jfr/recorder/storage/jfrBuffer.hpp"
@@ -85,4 +85,4 @@ class JfrCheckpointWriter : public JfrCheckpointWriterBase {
JfrCheckpointBlobHandle move(const JfrCheckpointContext* ctx = NULL);
};
-#endif // SHARE_VM_JFR_RECORDER_CHECKPOINT_JFRCHECKPOINTWRITER_HPP
+#endif // SHARE_JFR_RECORDER_CHECKPOINT_JFRCHECKPOINTWRITER_HPP
diff --git a/src/hotspot/share/jfr/recorder/checkpoint/jfrMetadataEvent.hpp b/src/hotspot/share/jfr/recorder/checkpoint/jfrMetadataEvent.hpp
index 09845069df6..4758f887952 100644
--- a/src/hotspot/share/jfr/recorder/checkpoint/jfrMetadataEvent.hpp
+++ b/src/hotspot/share/jfr/recorder/checkpoint/jfrMetadataEvent.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2016, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
*
*/
-#ifndef SHARE_VM_JFR_RECORDER_CHECKPOINT_JFRMETADATAEVENT_HPP
-#define SHARE_VM_JFR_RECORDER_CHECKPOINT_JFRMETADATAEVENT_HPP
+#ifndef SHARE_JFR_RECORDER_CHECKPOINT_JFRMETADATAEVENT_HPP
+#define SHARE_JFR_RECORDER_CHECKPOINT_JFRMETADATAEVENT_HPP
#include "jni.h"
#include "memory/allocation.hpp"
@@ -43,4 +43,4 @@ class JfrMetadataEvent : AllStatic {
static void update(jbyteArray metadata);
};
-#endif // SHARE_VM_JFR_RECORDER_CHECKPOINT_JFRMETADATAEVENT_HPP
+#endif // SHARE_JFR_RECORDER_CHECKPOINT_JFRMETADATAEVENT_HPP
diff --git a/src/hotspot/share/jfr/recorder/checkpoint/types/jfrThreadGroup.hpp b/src/hotspot/share/jfr/recorder/checkpoint/types/jfrThreadGroup.hpp
index e11dd75da41..99393ccbb85 100644
--- a/src/hotspot/share/jfr/recorder/checkpoint/types/jfrThreadGroup.hpp
+++ b/src/hotspot/share/jfr/recorder/checkpoint/types/jfrThreadGroup.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2016, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
*
*/
-#ifndef SHARE_VM_JFR_RECORDER_CHECKPOINT_TYPES_JFRTHREADGROUP_HPP
-#define SHARE_VM_JFR_RECORDER_CHECKPOINT_TYPES_JFRTHREADGROUP_HPP
+#ifndef SHARE_JFR_RECORDER_CHECKPOINT_TYPES_JFRTHREADGROUP_HPP
+#define SHARE_JFR_RECORDER_CHECKPOINT_TYPES_JFRTHREADGROUP_HPP
#include "jni.h"
#include "jfr/utilities/jfrAllocation.hpp"
@@ -62,4 +62,4 @@ class JfrThreadGroup : public JfrCHeapObj {
static traceid thread_group_id(const JavaThread* thread, Thread* current);
};
-#endif // SHARE_VM_JFR_RECORDER_CHECKPOINT_TYPES_JFRTHREADGROUP_HPP
+#endif // SHARE_JFR_RECORDER_CHECKPOINT_TYPES_JFRTHREADGROUP_HPP
diff --git a/src/hotspot/share/jfr/recorder/checkpoint/types/jfrThreadState.hpp b/src/hotspot/share/jfr/recorder/checkpoint/types/jfrThreadState.hpp
index bcedaa7949e..5a2b2905ea2 100644
--- a/src/hotspot/share/jfr/recorder/checkpoint/types/jfrThreadState.hpp
+++ b/src/hotspot/share/jfr/recorder/checkpoint/types/jfrThreadState.hpp
@@ -1,5 +1,5 @@
/*
-* Copyright (c) 2016, 2018, Oracle and/or its affiliates. All rights reserved.
+* Copyright (c) 2016, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
*
*/
-#ifndef SHARE_VM_JFR_RECORDER_CHECKPOINT_TYPES_JFRTHREADSTATE_HPP
-#define SHARE_VM_JFR_RECORDER_CHECKPOINT_TYPES_JFRTHREADSTATE_HPP
+#ifndef SHARE_JFR_RECORDER_CHECKPOINT_TYPES_JFRTHREADSTATE_HPP
+#define SHARE_JFR_RECORDER_CHECKPOINT_TYPES_JFRTHREADSTATE_HPP
#include "memory/allocation.hpp"
@@ -34,4 +34,4 @@ class JfrThreadState : public AllStatic {
static void serialize(JfrCheckpointWriter& writer);
};
-#endif // SHARE_VM_JFR_RECORDER_CHECKPOINT_TYPES_JFRTHREADSTATE_HPP
+#endif // SHARE_JFR_RECORDER_CHECKPOINT_TYPES_JFRTHREADSTATE_HPP
diff --git a/src/hotspot/share/jfr/recorder/checkpoint/types/jfrType.hpp b/src/hotspot/share/jfr/recorder/checkpoint/types/jfrType.hpp
index 5f91819b9e1..43bc35b717a 100644
--- a/src/hotspot/share/jfr/recorder/checkpoint/types/jfrType.hpp
+++ b/src/hotspot/share/jfr/recorder/checkpoint/types/jfrType.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2016, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
*
*/
-#ifndef SHARE_VM_JFR_CHECKPOINT_TYPES_JFRTYPE_HPP
-#define SHARE_VM_JFR_CHECKPOINT_TYPES_JFRTYPE_HPP
+#ifndef SHARE_JFR_RECORDER_CHECKPOINT_TYPES_JFRTYPE_HPP
+#define SHARE_JFR_RECORDER_CHECKPOINT_TYPES_JFRTYPE_HPP
#include "jfr/metadata/jfrSerializer.hpp"
@@ -135,4 +135,4 @@ class JfrThreadConstant : public JfrSerializer {
void serialize(JfrCheckpointWriter& writer);
};
-#endif // SHARE_VM_JFR_CHECKPOINT_CONSTANT_JFRCONSTANT_HPP
+#endif // SHARE_JFR_RECORDER_CHECKPOINT_TYPES_JFRTYPE_HPP
diff --git a/src/hotspot/share/jfr/recorder/checkpoint/types/jfrTypeManager.hpp b/src/hotspot/share/jfr/recorder/checkpoint/types/jfrTypeManager.hpp
index a37d54711a2..33d31d824b1 100644
--- a/src/hotspot/share/jfr/recorder/checkpoint/types/jfrTypeManager.hpp
+++ b/src/hotspot/share/jfr/recorder/checkpoint/types/jfrTypeManager.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2016, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -21,8 +21,8 @@
* questions.
*
*/
-#ifndef SHARE_VM_JFR_CHECKPOINT_TYPES_JFRTYPEMANAGER_HPP
-#define SHARE_VM_JFR_CHECKPOINT_TYPES_JFRTYPEMANAGER_HPP
+#ifndef SHARE_JFR_RECORDER_CHECKPOINT_TYPES_JFRTYPEMANAGER_HPP
+#define SHARE_JFR_RECORDER_CHECKPOINT_TYPES_JFRTYPEMANAGER_HPP
#include "jfr/utilities/jfrAllocation.hpp"
@@ -41,4 +41,4 @@ class JfrTypeManager : public AllStatic {
static void write_thread_checkpoint(JavaThread* jt);
};
-#endif // SHARE_VM_JFR_CHECKPOINT_TYPES_JFRTYPEMANAGER_HPP
+#endif // SHARE_JFR_RECORDER_CHECKPOINT_TYPES_JFRTYPEMANAGER_HPP
diff --git a/src/hotspot/share/jfr/recorder/checkpoint/types/jfrTypeSet.hpp b/src/hotspot/share/jfr/recorder/checkpoint/types/jfrTypeSet.hpp
index 79328e94ab3..ea1e877280b 100644
--- a/src/hotspot/share/jfr/recorder/checkpoint/types/jfrTypeSet.hpp
+++ b/src/hotspot/share/jfr/recorder/checkpoint/types/jfrTypeSet.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2016, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
*
*/
-#ifndef SHARE_VM_JFR_RECORDER_CHECKPOINT_TYPES_JFRTYPESET_HPP
-#define SHARE_VM_JFR_RECORDER_CHECKPOINT_TYPES_JFRTYPESET_HPP
+#ifndef SHARE_JFR_RECORDER_CHECKPOINT_TYPES_JFRTYPESET_HPP
+#define SHARE_JFR_RECORDER_CHECKPOINT_TYPES_JFRTYPESET_HPP
#include "jfr/utilities/jfrAllocation.hpp"
@@ -70,4 +70,4 @@ class JfrTypeSet : AllStatic {
static void serialize(JfrCheckpointWriter* writer, JfrCheckpointWriter* leakp_writer, bool class_unload);
};
-#endif // SHARE_VM_JFR_RECORDER_CHECKPOINT_TYPES_JFRTYPESET_HPP
+#endif // SHARE_JFR_RECORDER_CHECKPOINT_TYPES_JFRTYPESET_HPP
diff --git a/src/hotspot/share/jfr/recorder/checkpoint/types/jfrTypeSetUtils.hpp b/src/hotspot/share/jfr/recorder/checkpoint/types/jfrTypeSetUtils.hpp
index 00c72621950..83c2e8a02ca 100644
--- a/src/hotspot/share/jfr/recorder/checkpoint/types/jfrTypeSetUtils.hpp
+++ b/src/hotspot/share/jfr/recorder/checkpoint/types/jfrTypeSetUtils.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2017, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
*
*/
-#ifndef SHARE_VM_JFR_RECORDER_CHECKPOINT_TYPES_JFRTYPESETUTILS_HPP
-#define SHARE_VM_JFR_RECORDER_CHECKPOINT_TYPES_JFRTYPESETUTILS_HPP
+#ifndef SHARE_JFR_RECORDER_CHECKPOINT_TYPES_JFRTYPESETUTILS_HPP
+#define SHARE_JFR_RECORDER_CHECKPOINT_TYPES_JFRTYPESETUTILS_HPP
#include "jfr/recorder/checkpoint/types/traceid/jfrTraceId.inline.hpp"
#include "jfr/utilities/jfrAllocation.hpp"
@@ -373,4 +373,4 @@ class KlassArtifactRegistrator {
}
};
-#endif // SHARE_VM_JFR_RECORDER_CHECKPOINT_TYPES_JFRTYPESETUTILS_HPP
+#endif // SHARE_JFR_RECORDER_CHECKPOINT_TYPES_JFRTYPESETUTILS_HPP
diff --git a/src/hotspot/share/jfr/recorder/checkpoint/types/jfrTypeSetWriter.hpp b/src/hotspot/share/jfr/recorder/checkpoint/types/jfrTypeSetWriter.hpp
index e18a5675271..cebd439e58d 100644
--- a/src/hotspot/share/jfr/recorder/checkpoint/types/jfrTypeSetWriter.hpp
+++ b/src/hotspot/share/jfr/recorder/checkpoint/types/jfrTypeSetWriter.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2017, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
*
*/
-#ifndef SHARE_VM_JFR_CHECKPOINT_TYPES_JFRTYPESETWRITER_HPP
-#define SHARE_VM_JFR_CHECKPOINT_TYPES_JFRTYPESETWRITER_HPP
+#ifndef SHARE_JFR_RECORDER_CHECKPOINT_TYPES_JFRTYPESETWRITER_HPP
+#define SHARE_JFR_RECORDER_CHECKPOINT_TYPES_JFRTYPESETWRITER_HPP
#include "jfr/recorder/checkpoint/jfrCheckpointWriter.hpp"
#include "jfr/utilities/jfrTypes.hpp"
@@ -105,4 +105,4 @@ class JfrPredicatedArtifactWriterImplHost : public JfrArtifactWriterImplHosttrace_flags_addr()))
#define CLEAR_METHOD_FLAG_USED_PREV_EPOCH(m) (clear_bits_cas((jbyte)JfrTraceIdEpoch::in_use_prev_epoch_bit(), (m)->trace_flags_addr()))
-#endif // SHARE_VM_JFR_CHECKPOINT_TYPES_TRACEID_JFRTRACEIDMACROS_HPP
+#endif // SHARE_JFR_RECORDER_CHECKPOINT_TYPES_TRACEID_JFRTRACEIDMACROS_HPP
diff --git a/src/hotspot/share/jfr/recorder/jfrEventSetting.hpp b/src/hotspot/share/jfr/recorder/jfrEventSetting.hpp
index a8e507cace6..4590ced997c 100644
--- a/src/hotspot/share/jfr/recorder/jfrEventSetting.hpp
+++ b/src/hotspot/share/jfr/recorder/jfrEventSetting.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
*
*/
-#ifndef SHARE_VM_JFR_RECORDER_JFREVENTSETTING_HPP
-#define SHARE_VM_JFR_RECORDER_JFREVENTSETTING_HPP
+#ifndef SHARE_JFR_RECORDER_JFREVENTSETTING_HPP
+#define SHARE_JFR_RECORDER_JFREVENTSETTING_HPP
#include "jni.h"
#include "jfr/utilities/jfrAllocation.hpp"
@@ -49,4 +49,4 @@ class JfrEventSetting : AllStatic {
DEBUG_ONLY(static bool bounds_check_event(jlong id);)
};
-#endif // SHARE_VM_JFR_RECORDER_JFREVENTSETTING_HPP
+#endif // SHARE_JFR_RECORDER_JFREVENTSETTING_HPP
diff --git a/src/hotspot/share/jfr/recorder/jfrEventSetting.inline.hpp b/src/hotspot/share/jfr/recorder/jfrEventSetting.inline.hpp
index ab1142d0578..dda7ca65c17 100644
--- a/src/hotspot/share/jfr/recorder/jfrEventSetting.inline.hpp
+++ b/src/hotspot/share/jfr/recorder/jfrEventSetting.inline.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2016, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
*
*/
-#ifndef SHARE_VM_JFR_RECORDER_JFREVENTSETTING_INLINE_HPP
-#define SHARE_VM_JFR_RECORDER_JFREVENTSETTING_INLINE_HPP
+#ifndef SHARE_JFR_RECORDER_JFREVENTSETTING_INLINE_HPP
+#define SHARE_JFR_RECORDER_JFREVENTSETTING_INLINE_HPP
#include "jfr/recorder/jfrEventSetting.hpp"
@@ -47,5 +47,4 @@ inline jlong JfrEventSetting::cutoff(JfrEventId event_id) {
return setting(event_id).cutoff_ticks;
}
-#endif // SHARE_VM_JFR_RECORDER_JFREVENTSETTING_INLINE_HPP
-
+#endif // SHARE_JFR_RECORDER_JFREVENTSETTING_INLINE_HPP
diff --git a/src/hotspot/share/jfr/recorder/jfrRecorder.cpp b/src/hotspot/share/jfr/recorder/jfrRecorder.cpp
index 6653b5886d5..e31f4e2dae1 100644
--- a/src/hotspot/share/jfr/recorder/jfrRecorder.cpp
+++ b/src/hotspot/share/jfr/recorder/jfrRecorder.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -44,31 +44,22 @@
#include "logging/logStream.hpp"
#include "memory/resourceArea.inline.hpp"
#include "runtime/handles.inline.hpp"
-#include "runtime/flags/jvmFlag.hpp"
-#include "runtime/globals.hpp"
+#include "runtime/globals_extension.hpp"
#include "utilities/growableArray.hpp"
-static bool is_disabled_on_command_line() {
- static const size_t length = strlen("FlightRecorder");
- static JVMFlag* const flight_recorder_flag = JVMFlag::find_flag("FlightRecorder", length);
- assert(flight_recorder_flag != NULL, "invariant");
- return flight_recorder_flag->is_command_line() ? !FlightRecorder : false;
-}
-
bool JfrRecorder::is_disabled() {
- return is_disabled_on_command_line();
-}
-
-static bool set_flight_recorder_flag(bool flag_value) {
- JVMFlag::boolAtPut((char*)"FlightRecorder", &flag_value, JVMFlag::MANAGEMENT);
- return FlightRecorder;
+ // True if -XX:-FlightRecorder has been explicitly set on the
+ // command line
+ return FLAG_IS_CMDLINE(FlightRecorder) ? !FlightRecorder : false;
}
static bool _enabled = false;
static bool enable() {
assert(!_enabled, "invariant");
- _enabled = set_flight_recorder_flag(true);
+ FLAG_SET_MGMT(bool, FlightRecorder, true);
+ _enabled = FlightRecorder;
+ assert(_enabled, "invariant");
return _enabled;
}
diff --git a/src/hotspot/share/jfr/recorder/jfrRecorder.hpp b/src/hotspot/share/jfr/recorder/jfrRecorder.hpp
index ad1ff051869..11d6dedf200 100644
--- a/src/hotspot/share/jfr/recorder/jfrRecorder.hpp
+++ b/src/hotspot/share/jfr/recorder/jfrRecorder.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
*
*/
-#ifndef SHARE_VM_JFR_RECORDER_JFRRECORDER_HPP
-#define SHARE_VM_JFR_RECORDER_JFRRECORDER_HPP
+#ifndef SHARE_JFR_RECORDER_JFRRECORDER_HPP
+#define SHARE_JFR_RECORDER_JFRRECORDER_HPP
#include "jfr/utilities/jfrAllocation.hpp"
@@ -65,4 +65,4 @@ class JfrRecorder : public JfrCHeapObj {
static void stop_recording();
};
-#endif // SHARE_VM_JFR_RECORDER_JFRRECORDER_HPP
+#endif // SHARE_JFR_RECORDER_JFRRECORDER_HPP
diff --git a/src/hotspot/share/jfr/recorder/repository/jfrChunkRotation.hpp b/src/hotspot/share/jfr/recorder/repository/jfrChunkRotation.hpp
index b2b0c1a15be..ef3d423de9e 100644
--- a/src/hotspot/share/jfr/recorder/repository/jfrChunkRotation.hpp
+++ b/src/hotspot/share/jfr/recorder/repository/jfrChunkRotation.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
*
*/
-#ifndef SHARE_VM_JFR_RECORDER_REPOSITORY_JFRCHUNKROTATION_HPP
-#define SHARE_VM_JFR_RECORDER_REPOSITORY_JFRCHUNKROTATION_HPP
+#ifndef SHARE_JFR_RECORDER_REPOSITORY_JFRCHUNKROTATION_HPP
+#define SHARE_JFR_RECORDER_REPOSITORY_JFRCHUNKROTATION_HPP
#include "memory/allocation.hpp"
@@ -41,4 +41,4 @@ class JfrChunkRotation : AllStatic {
static void on_rotation();
};
-#endif // SHARE_VM_JFR_RECORDER_REPOSITORY_JFRCHUNKROTATION_HPP
+#endif // SHARE_JFR_RECORDER_REPOSITORY_JFRCHUNKROTATION_HPP
diff --git a/src/hotspot/share/jfr/recorder/repository/jfrChunkState.hpp b/src/hotspot/share/jfr/recorder/repository/jfrChunkState.hpp
index 6912e050008..2ee10d6c095 100644
--- a/src/hotspot/share/jfr/recorder/repository/jfrChunkState.hpp
+++ b/src/hotspot/share/jfr/recorder/repository/jfrChunkState.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
*
*/
-#ifndef SHARE_VM_JFR_RECORDER_REPOSITORY_JFRRCHUNKSTATE_HPP
-#define SHARE_VM_JFR_RECORDER_REPOSITORY_JFRRCHUNKSTATE_HPP
+#ifndef SHARE_JFR_RECORDER_REPOSITORY_JFRCHUNKSTATE_HPP
+#define SHARE_JFR_RECORDER_REPOSITORY_JFRCHUNKSTATE_HPP
#include "jni.h"
#include "jfr/utilities/jfrAllocation.hpp"
@@ -57,4 +57,4 @@ class JfrChunkState : public JfrCHeapObj {
const char* path() const;
};
-#endif // SHARE_VM_JFR_RECORDER_REPOSITORY_JFRRCHUNKSTATE_HPP
+#endif // SHARE_JFR_RECORDER_REPOSITORY_JFRCHUNKSTATE_HPP
diff --git a/src/hotspot/share/jfr/recorder/repository/jfrChunkWriter.hpp b/src/hotspot/share/jfr/recorder/repository/jfrChunkWriter.hpp
index 0669d453a70..2a304542530 100644
--- a/src/hotspot/share/jfr/recorder/repository/jfrChunkWriter.hpp
+++ b/src/hotspot/share/jfr/recorder/repository/jfrChunkWriter.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
*
*/
-#ifndef SHARE_VM_JFR_RECORDER_REPOSITORY_JFRCHUNKWRITER_HPP
-#define SHARE_VM_JFR_RECORDER_REPOSITORY_JFRCHUNKWRITER_HPP
+#ifndef SHARE_JFR_RECORDER_REPOSITORY_JFRCHUNKWRITER_HPP
+#define SHARE_JFR_RECORDER_REPOSITORY_JFRCHUNKWRITER_HPP
#include "jfr/writers/jfrStorageAdapter.hpp"
#include "jfr/writers/jfrStreamWriterHost.inline.hpp"
@@ -54,4 +54,4 @@ class JfrChunkWriter : public JfrChunkWriterBase {
void time_stamp_chunk_now();
};
-#endif // SHARE_VM_JFR_RECORDER_REPOSITORY_JFRCHUNKWRITER_HPP
+#endif // SHARE_JFR_RECORDER_REPOSITORY_JFRCHUNKWRITER_HPP
diff --git a/src/hotspot/share/jfr/recorder/repository/jfrEmergencyDump.hpp b/src/hotspot/share/jfr/recorder/repository/jfrEmergencyDump.hpp
index 8b18f42e784..41e69b5c8c4 100644
--- a/src/hotspot/share/jfr/recorder/repository/jfrEmergencyDump.hpp
+++ b/src/hotspot/share/jfr/recorder/repository/jfrEmergencyDump.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
*
*/
-#ifndef SHARE_VM_JFR_RECORDER_INTERNAL_JFREMERGENCY_HPP
-#define SHARE_VM_JFR_RECORDER_INTERNAL_JFREMERGENCY_HPP
+#ifndef SHARE_JFR_RECORDER_REPOSITORY_JFREMERGENCYDUMP_HPP
+#define SHARE_JFR_RECORDER_REPOSITORY_JFREMERGENCYDUMP_HPP
#include "memory/allocation.hpp"
@@ -35,6 +35,4 @@ class JfrEmergencyDump : AllStatic {
static void on_vm_shutdown(bool exception_handler);
};
-#endif // SHARE_VM_JFR_RECORDER_INTERNAL_JFREMERGENCY_HPP
-
-
+#endif // SHARE_JFR_RECORDER_REPOSITORY_JFREMERGENCYDUMP_HPP
diff --git a/src/hotspot/share/jfr/recorder/repository/jfrRepository.hpp b/src/hotspot/share/jfr/recorder/repository/jfrRepository.hpp
index 6b98df4f246..15c04a0e61f 100644
--- a/src/hotspot/share/jfr/recorder/repository/jfrRepository.hpp
+++ b/src/hotspot/share/jfr/recorder/repository/jfrRepository.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -21,8 +21,8 @@
* questions.
*
*/
-#ifndef SHARE_VM_JFR_RECORDER_REPOSITORY_JFRREPOSITORY_HPP
-#define SHARE_VM_JFR_RECORDER_REPOSITORY_JFRREPOSITORY_HPP
+#ifndef SHARE_JFR_RECORDER_REPOSITORY_JFRREPOSITORY_HPP
+#define SHARE_JFR_RECORDER_REPOSITORY_JFRREPOSITORY_HPP
#include "jni.h"
#include "jfr/utilities/jfrAllocation.hpp"
@@ -70,4 +70,4 @@ class JfrRepository : public JfrCHeapObj {
static void set_chunk_path(jstring path, JavaThread* jt);
};
-#endif // SHARE_VM_JFR_RECORDER_REPOSITORY_JFRREPOSITORY_HPP
+#endif // SHARE_JFR_RECORDER_REPOSITORY_JFRREPOSITORY_HPP
diff --git a/src/hotspot/share/jfr/recorder/service/jfrEvent.hpp b/src/hotspot/share/jfr/recorder/service/jfrEvent.hpp
index 080c8484bbc..21ae5b60b6e 100644
--- a/src/hotspot/share/jfr/recorder/service/jfrEvent.hpp
+++ b/src/hotspot/share/jfr/recorder/service/jfrEvent.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
*
*/
-#ifndef SHARE_VM_JFR_RECORDER_SERVICE_JFREVENT_HPP
-#define SHARE_VM_JFR_RECORDER_SERVICE_JFREVENT_HPP
+#ifndef SHARE_JFR_RECORDER_SERVICE_JFREVENT_HPP
+#define SHARE_JFR_RECORDER_SERVICE_JFREVENT_HPP
#include "jfr/recorder/jfrEventSetting.inline.hpp"
#include "jfr/recorder/stacktrace/jfrStackTraceRepository.hpp"
@@ -211,4 +211,4 @@ class JfrEvent {
#endif // ASSERT
};
-#endif // SHARE_VM_JFR_RECORDER_SERVICE_JFREVENT_HPP
+#endif // SHARE_JFR_RECORDER_SERVICE_JFREVENT_HPP
diff --git a/src/hotspot/share/jfr/recorder/service/jfrMemorySizer.hpp b/src/hotspot/share/jfr/recorder/service/jfrMemorySizer.hpp
index 847ce049337..2fcebe3fca8 100644
--- a/src/hotspot/share/jfr/recorder/service/jfrMemorySizer.hpp
+++ b/src/hotspot/share/jfr/recorder/service/jfrMemorySizer.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
*
*/
-#ifndef SHARE_VM_JFR_RECORDER_SERVICE_JFRMEMORYSIZER_HPP
-#define SHARE_VM_JFR_RECORDER_SERVICE_JFRMEMORYSIZER_HPP
+#ifndef SHARE_JFR_RECORDER_SERVICE_JFRMEMORYSIZER_HPP
+#define SHARE_JFR_RECORDER_SERVICE_JFRMEMORYSIZER_HPP
#include "memory/allocation.hpp"
#include "utilities/globalDefinitions.hpp"
@@ -53,4 +53,4 @@ class JfrMemorySizer : AllStatic {
static bool adjust_options(JfrMemoryOptions* options);
};
-#endif // SHARE_VM_JFR_RECORDER_SERVICE_JFRMEMORYSIZER_HPP
+#endif // SHARE_JFR_RECORDER_SERVICE_JFRMEMORYSIZER_HPP
diff --git a/src/hotspot/share/jfr/recorder/service/jfrOptionSet.hpp b/src/hotspot/share/jfr/recorder/service/jfrOptionSet.hpp
index d52c565a010..c9ed2e63ae7 100644
--- a/src/hotspot/share/jfr/recorder/service/jfrOptionSet.hpp
+++ b/src/hotspot/share/jfr/recorder/service/jfrOptionSet.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
*
*/
-#ifndef SHARE_VM_JFR_RECORDER_SERVICE_JFROPTIONSET_HPP
-#define SHARE_VM_JFR_RECORDER_SERVICE_JFROPTIONSET_HPP
+#ifndef SHARE_JFR_RECORDER_SERVICE_JFROPTIONSET_HPP
+#define SHARE_JFR_RECORDER_SERVICE_JFROPTIONSET_HPP
#include "jni.h"
#include "memory/allocation.hpp"
@@ -84,4 +84,4 @@ class JfrOptionSet : public AllStatic {
static void release_startup_recording_options();
};
-#endif // SHARE_VM_JFR_RECORDER_SERVICE_JFROPTIONSET_HPP
+#endif // SHARE_JFR_RECORDER_SERVICE_JFROPTIONSET_HPP
diff --git a/src/hotspot/share/jfr/recorder/service/jfrPostBox.hpp b/src/hotspot/share/jfr/recorder/service/jfrPostBox.hpp
index e17cd220465..40fd6c33207 100644
--- a/src/hotspot/share/jfr/recorder/service/jfrPostBox.hpp
+++ b/src/hotspot/share/jfr/recorder/service/jfrPostBox.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2013, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
*
*/
-#ifndef SHARE_VM_JFR_RECORDER_SERVICE_JFRPOSTBOX_HPP
-#define SHARE_VM_JFR_RECORDER_SERVICE_JFRPOSTBOX_HPP
+#ifndef SHARE_JFR_RECORDER_SERVICE_JFRPOSTBOX_HPP
+#define SHARE_JFR_RECORDER_SERVICE_JFRPOSTBOX_HPP
#include "jfr/utilities/jfrAllocation.hpp"
@@ -94,4 +94,4 @@ class JfrPostBox : public JfrCHeapObj {
void notify_collection_stop();
};
-#endif // SHARE_VM_JFR_RECORDER_SERVICE_JFRPOSTBOX_HPP
+#endif // SHARE_JFR_RECORDER_SERVICE_JFRPOSTBOX_HPP
diff --git a/src/hotspot/share/jfr/recorder/service/jfrRecorderService.hpp b/src/hotspot/share/jfr/recorder/service/jfrRecorderService.hpp
index 2cccf5b6f7d..742b9540e76 100644
--- a/src/hotspot/share/jfr/recorder/service/jfrRecorderService.hpp
+++ b/src/hotspot/share/jfr/recorder/service/jfrRecorderService.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2016, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
*
*/
-#ifndef SHARE_VM_JFR_RECORDER_SERVICE_JFRRECORDERSERVICE_HPP
-#define SHARE_VM_JFR_RECORDER_SERVICE_JFRRECORDERSERVICE_HPP
+#ifndef SHARE_JFR_RECORDER_SERVICE_JFRRECORDERSERVICE_HPP
+#define SHARE_JFR_RECORDER_SERVICE_JFRRECORDERSERVICE_HPP
#include "jfr/utilities/jfrAllocation.hpp"
@@ -74,4 +74,4 @@ class JfrRecorderService : public StackObj {
static bool is_recording();
};
-#endif // SHARE_VM_JFR_RECORDER_SERVICE_JFRRECORDERSERVICE_HPP
+#endif // SHARE_JFR_RECORDER_SERVICE_JFRRECORDERSERVICE_HPP
diff --git a/src/hotspot/share/jfr/recorder/service/jfrRecorderThread.hpp b/src/hotspot/share/jfr/recorder/service/jfrRecorderThread.hpp
index a09ecb37089..736cc350833 100644
--- a/src/hotspot/share/jfr/recorder/service/jfrRecorderThread.hpp
+++ b/src/hotspot/share/jfr/recorder/service/jfrRecorderThread.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2013, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
*
*/
-#ifndef SHARE_VM_JFR_RECORDER_SERVICE_JFRRECORDERTHREAD_HPP
-#define SHARE_VM_JFR_RECORDER_SERVICE_JFRRECORDERTHREAD_HPP
+#ifndef SHARE_JFR_RECORDER_SERVICE_JFRRECORDERTHREAD_HPP
+#define SHARE_JFR_RECORDER_SERVICE_JFRRECORDERTHREAD_HPP
#include "memory/allocation.hpp"
#include "utilities/debug.hpp"
@@ -42,4 +42,4 @@ class JfrRecorderThread : AllStatic {
static bool start(JfrCheckpointManager* cp_manager, JfrPostBox* post_box, TRAPS);
};
-#endif // SHARE_VM_JFR_RECORDER_SERVICE_JFRRECORDERTHREAD_HPP
+#endif // SHARE_JFR_RECORDER_SERVICE_JFRRECORDERTHREAD_HPP
diff --git a/src/hotspot/share/jfr/recorder/stacktrace/jfrStackTraceRepository.hpp b/src/hotspot/share/jfr/recorder/stacktrace/jfrStackTraceRepository.hpp
index a763548413e..7a404875974 100644
--- a/src/hotspot/share/jfr/recorder/stacktrace/jfrStackTraceRepository.hpp
+++ b/src/hotspot/share/jfr/recorder/stacktrace/jfrStackTraceRepository.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2011, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
*
*/
-#ifndef SHARE_VM_JFR_RECORDER_STACKTRACE_JFRSTACKTRACEREPOSITORY_HPP
-#define SHARE_VM_JFR_RECORDER_STACKTRACE_JFRSTACKTRACEREPOSITORY_HPP
+#ifndef SHARE_JFR_RECORDER_STACKTRACE_JFRSTACKTRACEREPOSITORY_HPP
+#define SHARE_JFR_RECORDER_STACKTRACE_JFRSTACKTRACEREPOSITORY_HPP
#include "jfr/utilities/jfrAllocation.hpp"
#include "jfr/utilities/jfrTypes.hpp"
@@ -150,4 +150,4 @@ class JfrStackTraceRepository : public JfrCHeapObj {
size_t clear();
};
-#endif // SHARE_VM_JFR_RECORDER_STACKTRACE_JFRSTACKTRACEREPOSITORY_HPP
+#endif // SHARE_JFR_RECORDER_STACKTRACE_JFRSTACKTRACEREPOSITORY_HPP
diff --git a/src/hotspot/share/jfr/recorder/storage/jfrBuffer.hpp b/src/hotspot/share/jfr/recorder/storage/jfrBuffer.hpp
index 5e28e23aabe..2665e7a7552 100644
--- a/src/hotspot/share/jfr/recorder/storage/jfrBuffer.hpp
+++ b/src/hotspot/share/jfr/recorder/storage/jfrBuffer.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
*
*/
-#ifndef SHARE_VM_JFR_RECORDER_STORAGE_JFRBUFFER_HPP
-#define SHARE_VM_JFR_RECORDER_STORAGE_JFRBUFFER_HPP
+#ifndef SHARE_JFR_RECORDER_STORAGE_JFRBUFFER_HPP
+#define SHARE_JFR_RECORDER_STORAGE_JFRBUFFER_HPP
#include "memory/allocation.hpp"
@@ -184,4 +184,4 @@ class JfrAgeNode : public JfrBuffer {
}
};
-#endif // SHARE_VM_JFR_RECORDER_STORAGE_JFRBUFFER_HPP
+#endif // SHARE_JFR_RECORDER_STORAGE_JFRBUFFER_HPP
diff --git a/src/hotspot/share/jfr/recorder/storage/jfrMemorySpace.hpp b/src/hotspot/share/jfr/recorder/storage/jfrMemorySpace.hpp
index 8e9508b0c1b..3709d34211d 100644
--- a/src/hotspot/share/jfr/recorder/storage/jfrMemorySpace.hpp
+++ b/src/hotspot/share/jfr/recorder/storage/jfrMemorySpace.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2016, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -21,8 +21,8 @@
* questions.
*
*/
-#ifndef SHARE_VM_JFR_RECORDER_STORAGE_JFRMEMORYSPACE_HPP
-#define SHARE_VM_JFR_RECORDER_STORAGE_JFRMEMORYSPACE_HPP
+#ifndef SHARE_JFR_RECORDER_STORAGE_JFRMEMORYSPACE_HPP
+#define SHARE_JFR_RECORDER_STORAGE_JFRMEMORYSPACE_HPP
#include "jfr/utilities/jfrAllocation.hpp"
#include "jfr/utilities/jfrDoublyLinkedList.hpp"
@@ -165,4 +165,4 @@ class ReleaseOp : public StackObj {
size_t processed() const { return 0; }
};
-#endif // SHARE_VM_JFR_RECORDER_STORAGE_JFRMEMORYSPACE_HPP
+#endif // SHARE_JFR_RECORDER_STORAGE_JFRMEMORYSPACE_HPP
diff --git a/src/hotspot/share/jfr/recorder/storage/jfrMemorySpace.inline.hpp b/src/hotspot/share/jfr/recorder/storage/jfrMemorySpace.inline.hpp
index c106e02a8b0..6d68315edc5 100644
--- a/src/hotspot/share/jfr/recorder/storage/jfrMemorySpace.inline.hpp
+++ b/src/hotspot/share/jfr/recorder/storage/jfrMemorySpace.inline.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2016, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
*
*/
-#ifndef SHARE_VM_JFR_RECORDER_STORAGE_JFRMEMORYSPACE_INLINE_HPP
-#define SHARE_VM_JFR_RECORDER_STORAGE_JFRMEMORYSPACE_INLINE_HPP
+#ifndef SHARE_JFR_RECORDER_STORAGE_JFRMEMORYSPACE_INLINE_HPP
+#define SHARE_JFR_RECORDER_STORAGE_JFRMEMORYSPACE_INLINE_HPP
#include "jfr/recorder/storage/jfrMemorySpace.hpp"
@@ -381,5 +381,4 @@ inline void migrate_outstanding_writes(const T* old, T* new_buffer, size_t used,
}
}
-#endif // SHARE_VM_JFR_RECORDER_STORAGE_JFRMEMORYSPACE_INLINE_HPP
-
+#endif // SHARE_JFR_RECORDER_STORAGE_JFRMEMORYSPACE_INLINE_HPP
diff --git a/src/hotspot/share/jfr/recorder/storage/jfrMemorySpaceRetrieval.hpp b/src/hotspot/share/jfr/recorder/storage/jfrMemorySpaceRetrieval.hpp
index 99f5b7e3fea..d4fab2293a6 100644
--- a/src/hotspot/share/jfr/recorder/storage/jfrMemorySpaceRetrieval.hpp
+++ b/src/hotspot/share/jfr/recorder/storage/jfrMemorySpaceRetrieval.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
*
*/
-#ifndef SHARE_VM_JFR_RECORDER_STORAGE_JFRMEMORYSPACERETRIEVAL_HPP
-#define SHARE_VM_JFR_RECORDER_STORAGE_JFRMEMORYSPACERETRIEVAL_HPP
+#ifndef SHARE_JFR_RECORDER_STORAGE_JFRMEMORYSPACERETRIEVAL_HPP
+#define SHARE_JFR_RECORDER_STORAGE_JFRMEMORYSPACERETRIEVAL_HPP
#include "memory/allocation.hpp"
#include "jfr/recorder/repository/jfrChunkWriter.hpp"
@@ -110,4 +110,4 @@ public:
}
};
-#endif // SHARE_VM_JFR_RECORDER_STORAGE_JFRMEMORYSPACERETRIEVAL_HPP
+#endif // SHARE_JFR_RECORDER_STORAGE_JFRMEMORYSPACERETRIEVAL_HPP
diff --git a/src/hotspot/share/jfr/recorder/storage/jfrStorage.hpp b/src/hotspot/share/jfr/recorder/storage/jfrStorage.hpp
index 90e0c90f65f..192eb9c60e8 100644
--- a/src/hotspot/share/jfr/recorder/storage/jfrStorage.hpp
+++ b/src/hotspot/share/jfr/recorder/storage/jfrStorage.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -21,8 +21,8 @@
* questions.
*
*/
-#ifndef SHARE_VM_JFR_RECORDER_STORAGE_JFRSTORAGE_HPP
-#define SHARE_VM_JFR_RECORDER_STORAGE_JFRSTORAGE_HPP
+#ifndef SHARE_JFR_RECORDER_STORAGE_JFRSTORAGE_HPP
+#define SHARE_JFR_RECORDER_STORAGE_JFRSTORAGE_HPP
#include "jfr/recorder/storage/jfrBuffer.hpp"
#include "jfr/recorder/storage/jfrMemorySpace.hpp"
@@ -95,4 +95,4 @@ class JfrStorage : public JfrCHeapObj {
friend class JfrMemorySpace;
};
-#endif // SHARE_VM_JFR_RECORDER_STORAGE_JFRSTORAGE_HPP
+#endif // SHARE_JFR_RECORDER_STORAGE_JFRSTORAGE_HPP
diff --git a/src/hotspot/share/jfr/recorder/storage/jfrStorageControl.hpp b/src/hotspot/share/jfr/recorder/storage/jfrStorageControl.hpp
index 55a1c79bd68..771633e7991 100644
--- a/src/hotspot/share/jfr/recorder/storage/jfrStorageControl.hpp
+++ b/src/hotspot/share/jfr/recorder/storage/jfrStorageControl.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
*
*/
-#ifndef SHARE_VM_JFR_RECORDER_STORAGE_JFRSTORAGECONTROL_HPP
-#define SHARE_VM_JFR_RECORDER_STORAGE_JFRSTORAGECONTROL_HPP
+#ifndef SHARE_JFR_RECORDER_STORAGE_JFRSTORAGECONTROL_HPP
+#define SHARE_JFR_RECORDER_STORAGE_JFRSTORAGECONTROL_HPP
#include "jfr/utilities/jfrAllocation.hpp"
@@ -65,4 +65,4 @@ class JfrStorageControl : public JfrCHeapObj {
bool should_scavenge() const;
};
-#endif // SHARE_VM_JFR_RECORDER_STORAGE_JFRSTORAGECONTROL_HPP
+#endif // SHARE_JFR_RECORDER_STORAGE_JFRSTORAGECONTROL_HPP
diff --git a/src/hotspot/share/jfr/recorder/storage/jfrStorageUtils.hpp b/src/hotspot/share/jfr/recorder/storage/jfrStorageUtils.hpp
index 5a54bd0e6c5..2be361e306a 100644
--- a/src/hotspot/share/jfr/recorder/storage/jfrStorageUtils.hpp
+++ b/src/hotspot/share/jfr/recorder/storage/jfrStorageUtils.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2016, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
*
*/
-#ifndef SHARE_VM_JFR_RECORDER_STORAGE_JFRSTORAGEUTILS_HPP
-#define SHARE_VM_JFR_RECORDER_STORAGE_JFRSTORAGEUTILS_HPP
+#ifndef SHARE_JFR_RECORDER_STORAGE_JFRSTORAGEUTILS_HPP
+#define SHARE_JFR_RECORDER_STORAGE_JFRSTORAGEUTILS_HPP
#include "jfr/recorder/storage/jfrBuffer.hpp"
#include "jfr/recorder/repository/jfrChunkWriter.hpp"
@@ -121,4 +121,4 @@ class DiscardOp {
size_t processed() const { return _operation.processed(); }
};
-#endif // SHARE_VM_JFR_RECORDER_STORAGE_JFRSTORAGEUTILS_HPP
+#endif // SHARE_JFR_RECORDER_STORAGE_JFRSTORAGEUTILS_HPP
diff --git a/src/hotspot/share/jfr/recorder/storage/jfrStorageUtils.inline.hpp b/src/hotspot/share/jfr/recorder/storage/jfrStorageUtils.inline.hpp
index f23b024f8dc..4c46a9db8d5 100644
--- a/src/hotspot/share/jfr/recorder/storage/jfrStorageUtils.inline.hpp
+++ b/src/hotspot/share/jfr/recorder/storage/jfrStorageUtils.inline.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2016, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
*
*/
-#ifndef SHARE_VM_JFR_RECORDER_STORAGE_JFRSTORAGEUTILS_INLINE_HPP
-#define SHARE_VM_JFR_RECORDER_STORAGE_JFRSTORAGEUTILS_INLINE_HPP
+#ifndef SHARE_JFR_RECORDER_STORAGE_JFRSTORAGEUTILS_INLINE_HPP
+#define SHARE_JFR_RECORDER_STORAGE_JFRSTORAGEUTILS_INLINE_HPP
#include "jfr/recorder/storage/jfrStorageUtils.hpp"
@@ -95,4 +95,4 @@ inline bool DiscardOp::process(typename Operation::Type* t) {
return result;
}
-#endif // SHARE_VM_JFR_RECORDER_STORAGE_JFRSTORAGEUTILS_INLINE_HPP
+#endif // SHARE_JFR_RECORDER_STORAGE_JFRSTORAGEUTILS_INLINE_HPP
diff --git a/src/hotspot/share/jfr/recorder/storage/jfrVirtualMemory.hpp b/src/hotspot/share/jfr/recorder/storage/jfrVirtualMemory.hpp
index e33b88b3048..fdb5e89bc14 100644
--- a/src/hotspot/share/jfr/recorder/storage/jfrVirtualMemory.hpp
+++ b/src/hotspot/share/jfr/recorder/storage/jfrVirtualMemory.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2017, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
*
*/
-#ifndef SHARE_VM_JFR_RECORDER_STORAGE_JFRVIRTUALMEMORY_HPP
-#define SHARE_VM_JFR_RECORDER_STORAGE_JFRVIRTUALMEMORY_HPP
+#ifndef SHARE_JFR_RECORDER_STORAGE_JFRVIRTUALMEMORY_HPP
+#define SHARE_JFR_RECORDER_STORAGE_JFRVIRTUALMEMORY_HPP
#include "jfr/utilities/jfrAllocation.hpp"
@@ -63,4 +63,4 @@ class JfrVirtualMemory : public JfrCHeapObj {
bool compact(size_t index);
};
-#endif // SHARE_VM_JFR_RECORDER_STORAGE_JFRVIRTUALMEMORY_HPP
+#endif // SHARE_JFR_RECORDER_STORAGE_JFRVIRTUALMEMORY_HPP
diff --git a/src/hotspot/share/jfr/recorder/stringpool/jfrStringPool.hpp b/src/hotspot/share/jfr/recorder/stringpool/jfrStringPool.hpp
index 84c522174ef..dd91cc2415d 100644
--- a/src/hotspot/share/jfr/recorder/stringpool/jfrStringPool.hpp
+++ b/src/hotspot/share/jfr/recorder/stringpool/jfrStringPool.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2016, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
*
*/
-#ifndef SHARE_VM_JFR_RECORDER_STRINGPOOL_JFRSTRINGPOOL_HPP
-#define SHARE_VM_JFR_RECORDER_STRINGPOOL_JFRSTRINGPOOL_HPP
+#ifndef SHARE_JFR_RECORDER_STRINGPOOL_JFRSTRINGPOOL_HPP
+#define SHARE_JFR_RECORDER_STRINGPOOL_JFRSTRINGPOOL_HPP
#include "jni.h"
#include "jfr/recorder/storage/jfrMemorySpace.hpp"
@@ -80,4 +80,4 @@ class JfrStringPool : public JfrCHeapObj {
friend class JfrMemorySpace;
};
-#endif // SHARE_VM_JFR_RECORDER_STRINGPOOL_JFRSTRINGPOOL_HPP
+#endif // SHARE_JFR_RECORDER_STRINGPOOL_JFRSTRINGPOOL_HPP
diff --git a/src/hotspot/share/jfr/recorder/stringpool/jfrStringPoolBuffer.hpp b/src/hotspot/share/jfr/recorder/stringpool/jfrStringPoolBuffer.hpp
index 0d9940db28e..e37ea8ef4e9 100644
--- a/src/hotspot/share/jfr/recorder/stringpool/jfrStringPoolBuffer.hpp
+++ b/src/hotspot/share/jfr/recorder/stringpool/jfrStringPoolBuffer.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2016, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
*
*/
-#ifndef SHARE_VM_JFR_RECORDER_STRINGPOOL_JFRSTRINGPOOLBUFFER_HPP
-#define SHARE_VM_JFR_RECORDER_STRINGPOOL_JFRSTRINGPOOLBUFFER_HPP
+#ifndef SHARE_JFR_RECORDER_STRINGPOOL_JFRSTRINGPOOLBUFFER_HPP
+#define SHARE_JFR_RECORDER_STRINGPOOL_JFRSTRINGPOOLBUFFER_HPP
#include "jfr/recorder/storage/jfrBuffer.hpp"
@@ -43,4 +43,4 @@ class JfrStringPoolBuffer : public JfrBuffer {
void set_string_top(uint64_t value);
};
-#endif // SHARE_VM_JFR_RECORDER_STRINGPOOL_JFRSTRINGPOOLBUFFER_HPP
+#endif // SHARE_JFR_RECORDER_STRINGPOOL_JFRSTRINGPOOLBUFFER_HPP
diff --git a/src/hotspot/share/jfr/recorder/stringpool/jfrStringPoolWriter.hpp b/src/hotspot/share/jfr/recorder/stringpool/jfrStringPoolWriter.hpp
index 9e7d2c236cc..c91b6e585ce 100644
--- a/src/hotspot/share/jfr/recorder/stringpool/jfrStringPoolWriter.hpp
+++ b/src/hotspot/share/jfr/recorder/stringpool/jfrStringPoolWriter.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2016, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
*
*/
-#ifndef SHARE_VM_JFR_RECORDER_STRINGPOOL_JFRSTRINGPOOLWRITER_HPP
-#define SHARE_VM_JFR_RECORDER_STRINGPOOL_JFRSTRINGPOOLWRITER_HPP
+#ifndef SHARE_JFR_RECORDER_STRINGPOOL_JFRSTRINGPOOLWRITER_HPP
+#define SHARE_JFR_RECORDER_STRINGPOOL_JFRSTRINGPOOLWRITER_HPP
#include "memory/allocation.hpp"
#include "jfr/recorder/stringpool/jfrStringPoolBuffer.hpp"
@@ -55,4 +55,4 @@ class JfrStringPoolWriter : public JfrStringPoolWriterBase {
void inc_nof_strings();
};
-#endif // SHARE_VM_JFR_RECORDER_STRINGPOOL_JFRSTRINGPOOLWRITER_HPP
+#endif // SHARE_JFR_RECORDER_STRINGPOOL_JFRSTRINGPOOLWRITER_HPP
diff --git a/src/hotspot/share/jfr/support/jfrAllocationTracer.hpp b/src/hotspot/share/jfr/support/jfrAllocationTracer.hpp
index a6feab14c2d..651bce8c9e7 100644
--- a/src/hotspot/share/jfr/support/jfrAllocationTracer.hpp
+++ b/src/hotspot/share/jfr/support/jfrAllocationTracer.hpp
@@ -1,5 +1,5 @@
/*
-* Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved.
+* Copyright (c) 2018, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
*
*/
-#ifndef SHARE_VM_JFR_SUPPORT_JFRALLOCATIONTRACER_HPP
-#define SHARE_VM_JFR_SUPPORT_JFRALLOCATIONTRACER_HPP
+#ifndef SHARE_JFR_SUPPORT_JFRALLOCATIONTRACER_HPP
+#define SHARE_JFR_SUPPORT_JFRALLOCATIONTRACER_HPP
#include "memory/allocation.hpp"
@@ -37,4 +37,4 @@ class JfrAllocationTracer : public StackObj {
~JfrAllocationTracer();
};
-#endif // SHARE_VM_JFR_SUPPORT_JFRALLOCATIONTRACER_HPP
+#endif // SHARE_JFR_SUPPORT_JFRALLOCATIONTRACER_HPP
diff --git a/src/hotspot/share/jfr/support/jfrEventClass.hpp b/src/hotspot/share/jfr/support/jfrEventClass.hpp
index c41064edce0..80895a751d2 100644
--- a/src/hotspot/share/jfr/support/jfrEventClass.hpp
+++ b/src/hotspot/share/jfr/support/jfrEventClass.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
*
*/
-#ifndef SHARE_VM_JFR_SUPPORT_JFREVENTCLASS_HPP
-#define SHARE_VM_JFR_SUPPORT_JFREVENTCLASS_HPP
+#ifndef SHARE_JFR_SUPPORT_JFREVENTCLASS_HPP
+#define SHARE_JFR_SUPPORT_JFREVENTCLASS_HPP
#include "jni.h"
#include "memory/allocation.hpp"
@@ -61,4 +61,4 @@ class JdkJfrEvent : AllStatic {
static bool is_visible(const jclass jc);
};
-#endif // SHARE_VM_JFR_SUPPORT_JFREVENTCLASS_HPP
+#endif // SHARE_JFR_SUPPORT_JFREVENTCLASS_HPP
diff --git a/src/hotspot/share/jfr/support/jfrFlush.hpp b/src/hotspot/share/jfr/support/jfrFlush.hpp
index f8ce8bec84b..679e1e1da57 100644
--- a/src/hotspot/share/jfr/support/jfrFlush.hpp
+++ b/src/hotspot/share/jfr/support/jfrFlush.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2016, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
*
*/
-#ifndef SHARE_VM_JFR_SUPPORT_JFRFLUSH_HPP
-#define SHARE_VM_JFR_SUPPORT_JFRFLUSH_HPP
+#ifndef SHARE_JFR_SUPPORT_JFRFLUSH_HPP
+#define SHARE_JFR_SUPPORT_JFRFLUSH_HPP
#include "jfr/recorder/storage/jfrBuffer.hpp"
#include "jfr/utilities/jfrTypes.hpp"
@@ -74,4 +74,4 @@ class JfrConditionalFlushWithStacktrace : public JfrConditionalFlush {
}
};
-#endif // SHARE_VM_JFR_SUPPORT_JFRFLUSH_HPP
+#endif // SHARE_JFR_SUPPORT_JFRFLUSH_HPP
diff --git a/src/hotspot/share/jfr/support/jfrIntrinsics.hpp b/src/hotspot/share/jfr/support/jfrIntrinsics.hpp
index e49eb44e9bc..c0ef22c2066 100644
--- a/src/hotspot/share/jfr/support/jfrIntrinsics.hpp
+++ b/src/hotspot/share/jfr/support/jfrIntrinsics.hpp
@@ -1,5 +1,5 @@
/*
-* Copyright (c) 2012, 2018, Oracle and/or its affiliates. All rights reserved.
+* Copyright (c) 2012, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
*
*/
-#ifndef SHARE_VM_JFR_SUPPORT_JFRINTRINSICS_HPP
-#define SHARE_VM_JFR_SUPPORT_JFRINTRINSICS_HPP
+#ifndef SHARE_JFR_SUPPORT_JFRINTRINSICS_HPP
+#define SHARE_JFR_SUPPORT_JFRINTRINSICS_HPP
#include "utilities/macros.hpp"
@@ -53,4 +53,4 @@
#define JFR_INTRINSICS(do_intrinsic, do_class, do_name, do_signature, do_alias)
#endif // INCLUDE_JFR
-#endif // SHARE_VM_JFR_SUPPORT_JFRINTRINSICS_HPP
+#endif // SHARE_JFR_SUPPORT_JFRINTRINSICS_HPP
diff --git a/src/hotspot/share/jfr/support/jfrKlassExtension.hpp b/src/hotspot/share/jfr/support/jfrKlassExtension.hpp
index aedfdbbe541..7a229f5486f 100644
--- a/src/hotspot/share/jfr/support/jfrKlassExtension.hpp
+++ b/src/hotspot/share/jfr/support/jfrKlassExtension.hpp
@@ -1,5 +1,5 @@
/*
-* Copyright (c) 2012, 2018, Oracle and/or its affiliates. All rights reserved.
+* Copyright (c) 2012, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
*
*/
-#ifndef SHARE_VM_JFR_SUPPORT_JFRKLASSEXTENSION_HPP
-#define SHARE_VM_JFR_SUPPORT_JFRKLASSEXTENSION_HPP
+#ifndef SHARE_JFR_SUPPORT_JFRKLASSEXTENSION_HPP
+#define SHARE_JFR_SUPPORT_JFRKLASSEXTENSION_HPP
#include "jfr/instrumentation/jfrEventClassTransformer.hpp"
#include "jfr/support/jfrTraceIdExtension.hpp"
@@ -39,4 +39,4 @@
#define IS_EVENT_KLASS(ptr) (((ptr)->trace_id() & (JDK_JFR_EVENT_KLASS | JDK_JFR_EVENT_SUBKLASS)) != 0)
#define ON_KLASS_CREATION(k, p, t) if (IS_EVENT_KLASS(k)) JfrEventClassTransformer::on_klass_creation(k, p, t)
-#endif // SHARE_VM_JFR_SUPPORT_JFRKLASSEXTENSION_HPP
+#endif // SHARE_JFR_SUPPORT_JFRKLASSEXTENSION_HPP
diff --git a/src/hotspot/share/jfr/support/jfrStackTraceMark.hpp b/src/hotspot/share/jfr/support/jfrStackTraceMark.hpp
index 28e7749979f..fb83467f8c4 100644
--- a/src/hotspot/share/jfr/support/jfrStackTraceMark.hpp
+++ b/src/hotspot/share/jfr/support/jfrStackTraceMark.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2016, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
*
*/
-#ifndef SHARE_VM_JFR_SUPPORT_JFRSTACKTRACEMARK_HPP
-#define SHARE_VM_JFR_SUPPORT_JFRSTACKTRACEMARK_HPP
+#ifndef SHARE_JFR_SUPPORT_JFRSTACKTRACEMARK_HPP
+#define SHARE_JFR_SUPPORT_JFRSTACKTRACEMARK_HPP
#include "memory/allocation.hpp"
#include "jfrfiles/jfrEventIds.hpp"
@@ -44,4 +44,4 @@ class JfrStackTraceMark {
~JfrStackTraceMark();
};
-#endif // SHARE_VM_JFR_SUPPORT_JFRSTACKTRACEMARK_HPP
+#endif // SHARE_JFR_SUPPORT_JFRSTACKTRACEMARK_HPP
diff --git a/src/hotspot/share/jfr/support/jfrThreadExtension.hpp b/src/hotspot/share/jfr/support/jfrThreadExtension.hpp
index 8216bfacb81..2ac303ac105 100644
--- a/src/hotspot/share/jfr/support/jfrThreadExtension.hpp
+++ b/src/hotspot/share/jfr/support/jfrThreadExtension.hpp
@@ -1,5 +1,5 @@
/*
-* Copyright (c) 2012, 2018, Oracle and/or its affiliates. All rights reserved.
+* Copyright (c) 2012, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
*
*/
-#ifndef SHARE_VM_JFR_SUPPORT_JFRTHREADEXTENSION_HPP
-#define SHARE_VM_JFR_SUPPORT_JFRTHREADEXTENSION_HPP
+#ifndef SHARE_JFR_SUPPORT_JFRTHREADEXTENSION_HPP
+#define SHARE_JFR_SUPPORT_JFRTHREADEXTENSION_HPP
#include "jfr/periodic/sampling/jfrThreadSampler.hpp"
#include "jfr/support/jfrThreadLocal.hpp"
@@ -48,4 +48,4 @@
#define SUSPEND_THREAD_CONDITIONAL(thread) if ((thread)->is_trace_suspend()) JfrThreadSampling::on_javathread_suspend(thread)
-#endif // SHARE_VM_JFR_SUPPORT_JFRTHREADEXTENSION_HPP
+#endif // SHARE_JFR_SUPPORT_JFRTHREADEXTENSION_HPP
diff --git a/src/hotspot/share/jfr/support/jfrThreadId.hpp b/src/hotspot/share/jfr/support/jfrThreadId.hpp
index b9fcc748b64..45552680b6d 100644
--- a/src/hotspot/share/jfr/support/jfrThreadId.hpp
+++ b/src/hotspot/share/jfr/support/jfrThreadId.hpp
@@ -1,5 +1,5 @@
/*
-* Copyright (c) 2012, 2018, Oracle and/or its affiliates. All rights reserved.
+* Copyright (c) 2012, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
*
*/
-#ifndef SHARE_VM_JFR_SUPPORT_JFRTHREADID_HPP
-#define SHARE_VM_JFR_SUPPORT_JFRTHREADID_HPP
+#ifndef SHARE_JFR_SUPPORT_JFRTHREADID_HPP
+#define SHARE_JFR_SUPPORT_JFRTHREADID_HPP
#include "utilities/macros.hpp"
#include "utilities/globalDefinitions.hpp"
@@ -37,5 +37,4 @@ typedef u8 traceid;
#define JFR_THREAD_ID(thread) ((traceid)(thread)->osthread()->thread_id())
#endif
-#endif // SHARE_VM_JFR_SUPPORT_JFRTHREADID_HPP
-
+#endif // SHARE_JFR_SUPPORT_JFRTHREADID_HPP
diff --git a/src/hotspot/share/jfr/support/jfrThreadLocal.hpp b/src/hotspot/share/jfr/support/jfrThreadLocal.hpp
index 0d981ad3323..58d35002433 100644
--- a/src/hotspot/share/jfr/support/jfrThreadLocal.hpp
+++ b/src/hotspot/share/jfr/support/jfrThreadLocal.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
*
*/
-#ifndef SHARE_VM_JFR_SUPPORT_JFRTHREADLOCAL_HPP
-#define SHARE_VM_JFR_SUPPORT_JFRTHREADLOCAL_HPP
+#ifndef SHARE_JFR_SUPPORT_JFRTHREADLOCAL_HPP
+#define SHARE_JFR_SUPPORT_JFRTHREADLOCAL_HPP
#include "jfr/recorder/checkpoint/jfrCheckpointBlob.hpp"
#include "jfr/utilities/jfrTypes.hpp"
@@ -221,4 +221,4 @@ class JfrThreadLocal {
static ByteSize java_event_writer_offset();
};
-#endif // SHARE_VM_JFR_SUPPORT_JFRTHREADLOCAL_HPP
+#endif // SHARE_JFR_SUPPORT_JFRTHREADLOCAL_HPP
diff --git a/src/hotspot/share/jfr/support/jfrTraceIdExtension.hpp b/src/hotspot/share/jfr/support/jfrTraceIdExtension.hpp
index e4d479f59fe..48aa3b7e2f5 100644
--- a/src/hotspot/share/jfr/support/jfrTraceIdExtension.hpp
+++ b/src/hotspot/share/jfr/support/jfrTraceIdExtension.hpp
@@ -1,5 +1,5 @@
/*
-* Copyright (c) 2012, 2018, Oracle and/or its affiliates. All rights reserved.
+* Copyright (c) 2012, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
*
*/
-#ifndef SHARE_VM_JFR_SUPPORT_JFRTRACEIDEXTENSION_HPP
-#define SHARE_VM_JFR_SUPPORT_JFRTRACEIDEXTENSION_HPP
+#ifndef SHARE_JFR_SUPPORT_JFRTRACEIDEXTENSION_HPP
+#define SHARE_JFR_SUPPORT_JFRTRACEIDEXTENSION_HPP
#include "jfr/recorder/checkpoint/types/traceid/jfrTraceId.hpp"
@@ -78,4 +78,4 @@ class JfrTraceFlag {
return _trace_flags.flags_addr(); \
}
-#endif // SHARE_VM_JFR_SUPPORT_JFRTRACEIDEXTENSION_HPP
+#endif // SHARE_JFR_SUPPORT_JFRTRACEIDEXTENSION_HPP
diff --git a/src/hotspot/share/jfr/utilities/jfrAllocation.hpp b/src/hotspot/share/jfr/utilities/jfrAllocation.hpp
index 92d61e84fb8..e91c1bd8b8d 100644
--- a/src/hotspot/share/jfr/utilities/jfrAllocation.hpp
+++ b/src/hotspot/share/jfr/utilities/jfrAllocation.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2014, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
*
*/
-#ifndef SHARE_VM_JFR_UTILITIES_JFRALLOCATION_HPP
-#define SHARE_VM_JFR_UTILITIES_JFRALLOCATION_HPP
+#ifndef SHARE_JFR_UTILITIES_JFRALLOCATION_HPP
+#define SHARE_JFR_UTILITIES_JFRALLOCATION_HPP
#include "memory/allocation.hpp"
#include "services/memTracker.hpp"
@@ -71,4 +71,4 @@ class JfrCHeapObj : public CHeapObj {
}
};
-#endif // SHARE_VM_JFR_UTILITIES_JFRALLOCATION_HPP
+#endif // SHARE_JFR_UTILITIES_JFRALLOCATION_HPP
diff --git a/src/hotspot/share/jfr/utilities/jfrBigEndian.hpp b/src/hotspot/share/jfr/utilities/jfrBigEndian.hpp
index e01a242a57e..d9fad34690c 100644
--- a/src/hotspot/share/jfr/utilities/jfrBigEndian.hpp
+++ b/src/hotspot/share/jfr/utilities/jfrBigEndian.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
*
*/
-#ifndef SHARE_VM_JFR_UTILITIES_JFRBIGENDIAN_HPP
-#define SHARE_VM_JFR_UTILITIES_JFRBIGENDIAN_HPP
+#ifndef SHARE_JFR_UTILITIES_JFRBIGENDIAN_HPP
+#define SHARE_JFR_UTILITIES_JFRBIGENDIAN_HPP
#include "memory/allocation.hpp"
#include "utilities/bytes.hpp"
@@ -133,4 +133,4 @@ inline T JfrBigEndian::read(const void* location) {
return read_unaligned((const address)location);
}
-#endif // SHARE_VM_JFR_UTILITIES_JFRBIGENDIAN_HPP
+#endif // SHARE_JFR_UTILITIES_JFRBIGENDIAN_HPP
diff --git a/src/hotspot/share/jfr/utilities/jfrDoublyLinkedList.hpp b/src/hotspot/share/jfr/utilities/jfrDoublyLinkedList.hpp
index 8ecc326ff76..463835dfe99 100644
--- a/src/hotspot/share/jfr/utilities/jfrDoublyLinkedList.hpp
+++ b/src/hotspot/share/jfr/utilities/jfrDoublyLinkedList.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2016, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
*
*/
-#ifndef SHARE_VM_JFR_UTILITIES_JFRDOUBLYLINKEDLIST_HPP
-#define SHARE_VM_JFR_UTILITIES_JFRDOUBLYLINKEDLIST_HPP
+#ifndef SHARE_JFR_UTILITIES_JFRDOUBLYLINKEDLIST_HPP
+#define SHARE_JFR_UTILITIES_JFRDOUBLYLINKEDLIST_HPP
#include "memory/allocation.hpp"
@@ -215,4 +215,4 @@ void JfrDoublyLinkedList::append_list(T* const head_node, T* const tail_node,
assert(in_list(head_node), "not in list error");
}
-#endif // SHARE_VM_JFR_UTILITIES_JFRDOUBLYLINKEDLIST_HPP
+#endif // SHARE_JFR_UTILITIES_JFRDOUBLYLINKEDLIST_HPP
diff --git a/src/hotspot/share/jfr/utilities/jfrHashtable.hpp b/src/hotspot/share/jfr/utilities/jfrHashtable.hpp
index ea025c2ced1..442bb73c72e 100644
--- a/src/hotspot/share/jfr/utilities/jfrHashtable.hpp
+++ b/src/hotspot/share/jfr/utilities/jfrHashtable.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2016, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
*
*/
-#ifndef SHARE_VM_JFR_UTILITIES_JFRHASHTABLE_HPP
-#define SHARE_VM_JFR_UTILITIES_JFRHASHTABLE_HPP
+#ifndef SHARE_JFR_UTILITIES_JFRHASHTABLE_HPP
+#define SHARE_JFR_UTILITIES_JFRHASHTABLE_HPP
#include "memory/allocation.inline.hpp"
#include "runtime/orderAccess.hpp"
@@ -280,4 +280,4 @@ Entry* HashTableHost::new_ent
return entry;
}
-#endif // SHARE_VM_JFR_UTILITIES_JFRHASHTABLE_HPP
+#endif // SHARE_JFR_UTILITIES_JFRHASHTABLE_HPP
diff --git a/src/hotspot/share/jfr/utilities/jfrIterator.hpp b/src/hotspot/share/jfr/utilities/jfrIterator.hpp
index b771003b06d..f06ca46e3f7 100644
--- a/src/hotspot/share/jfr/utilities/jfrIterator.hpp
+++ b/src/hotspot/share/jfr/utilities/jfrIterator.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2016, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
*
*/
-#ifndef SHARE_VM_JFR_UTILITIES_JFRLISTITERATOR_HPP
-#define SHARE_VM_JFR_UTILITIES_JFRLISTITERATOR_HPP
+#ifndef SHARE_JFR_UTILITIES_JFRITERATOR_HPP
+#define SHARE_JFR_UTILITIES_JFRITERATOR_HPP
#include "memory/allocation.hpp"
@@ -104,4 +104,4 @@ class StopOnNullIterator : public IteratorHost {
StopOnNullIterator(List& list, jfr_iter_direction direction = forward) : IteratorHost(list, direction) {}
};
-#endif // SHARE_VM_JFR_UTILITIES_JFRLISTITERATOR_HPP
+#endif // SHARE_JFR_UTILITIES_JFRITERATOR_HPP
diff --git a/src/hotspot/share/jfr/utilities/jfrJavaLog.hpp b/src/hotspot/share/jfr/utilities/jfrJavaLog.hpp
index ba472a4dbeb..e1e91d55f14 100644
--- a/src/hotspot/share/jfr/utilities/jfrJavaLog.hpp
+++ b/src/hotspot/share/jfr/utilities/jfrJavaLog.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2016, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
*
*/
-#ifndef SHARE_VM_JFR_UTILITIES_JFRJAVALOG_HPP
-#define SHARE_VM_JFR_UTILITIES_JFRJAVALOG_HPP
+#ifndef SHARE_JFR_UTILITIES_JFRJAVALOG_HPP
+#define SHARE_JFR_UTILITIES_JFRJAVALOG_HPP
#include "memory/allocation.hpp"
#include "utilities/exceptions.hpp"
@@ -45,4 +45,4 @@ class JfrJavaLog : public AllStatic {
static void log(jint tag_set, jint level, jstring message, TRAPS);
};
-#endif // SHARE_VM_JFR_UTILITIES_JFRJAVALOG_HPP
+#endif // SHARE_JFR_UTILITIES_JFRJAVALOG_HPP
diff --git a/src/hotspot/share/jfr/utilities/jfrLogTagSets.hpp b/src/hotspot/share/jfr/utilities/jfrLogTagSets.hpp
index 9b31e48ca31..8005c5869df 100644
--- a/src/hotspot/share/jfr/utilities/jfrLogTagSets.hpp
+++ b/src/hotspot/share/jfr/utilities/jfrLogTagSets.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2016, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
*
*/
-#ifndef SHARE_VM_JFR_UTILITIES_JFRLOGTAGSETS_HPP
-#define SHARE_VM_JFR_UTILITIES_JFRLOGTAGSETS_HPP
+#ifndef SHARE_JFR_UTILITIES_JFRLOGTAGSETS_HPP
+#define SHARE_JFR_UTILITIES_JFRLOGTAGSETS_HPP
#include "logging/logTag.hpp"
@@ -59,4 +59,4 @@
JFR_LOG_TAG(jfr, dcmd)
/* NEW TAGS, DONT FORGET TO UPDATE JAVA SIDE */
-#endif // SHARE_VM_JFR_UTILITIES_JFRLOGTAGSETS_HPP
+#endif // SHARE_JFR_UTILITIES_JFRLOGTAGSETS_HPP
diff --git a/src/hotspot/share/jfr/utilities/jfrRefCountPointer.hpp b/src/hotspot/share/jfr/utilities/jfrRefCountPointer.hpp
index 5a7daa3b059..0a75bcf86d0 100644
--- a/src/hotspot/share/jfr/utilities/jfrRefCountPointer.hpp
+++ b/src/hotspot/share/jfr/utilities/jfrRefCountPointer.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2017, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
*
*/
-#ifndef SHARE_VM_JFR_UTILITIES_JFRREFCOUNTPOINTER_HPP
-#define SHARE_VM_JFR_UTILITIES_JFRREFCOUNTPOINTER_HPP
+#ifndef SHARE_JFR_UTILITIES_JFRREFCOUNTPOINTER_HPP
+#define SHARE_JFR_UTILITIES_JFRREFCOUNTPOINTER_HPP
#include "jfr/utilities/jfrAllocation.hpp"
#include "runtime/atomic.hpp"
@@ -151,4 +151,4 @@ class RefCountPointer : public JfrCHeapObj {
}
};
-#endif // SHARE_VM_JFR_UTILITIES_JFRREFCOUNTPOINTER_HPP
+#endif // SHARE_JFR_UTILITIES_JFRREFCOUNTPOINTER_HPP
diff --git a/src/hotspot/share/jfr/utilities/jfrResourceManager.hpp b/src/hotspot/share/jfr/utilities/jfrResourceManager.hpp
index 6f9c886b4e1..70cd0ff401a 100644
--- a/src/hotspot/share/jfr/utilities/jfrResourceManager.hpp
+++ b/src/hotspot/share/jfr/utilities/jfrResourceManager.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2016, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
*
*/
-#ifndef SHARE_VM_JFR_UTILITIES_RESOURCEMANAGER_HPP
-#define SHARE_VM_JFR_UTILITIES_RESOURCEMANAGER_HPP
+#ifndef SHARE_JFR_UTILITIES_JFRRESOURCEMANAGER_HPP
+#define SHARE_JFR_UTILITIES_JFRRESOURCEMANAGER_HPP
#include "memory/allocation.hpp"
@@ -57,4 +57,4 @@ class ResourceArrayManager : public StackObj {
T* operator->() const { return _resource_array; }
};
-#endif // SHARE_VM_JFR_UTILITIES_RESOURCEMANAGER_HPP
+#endif // SHARE_JFR_UTILITIES_JFRRESOURCEMANAGER_HPP
diff --git a/src/hotspot/share/jfr/utilities/jfrSpinlockHelper.hpp b/src/hotspot/share/jfr/utilities/jfrSpinlockHelper.hpp
index 27e92d3a7d9..64de1f32c41 100644
--- a/src/hotspot/share/jfr/utilities/jfrSpinlockHelper.hpp
+++ b/src/hotspot/share/jfr/utilities/jfrSpinlockHelper.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2013, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
*
*/
-#ifndef SHARE_VM_JFR_UTILITIES_JFRSPINLOCKHELPER_HPP
-#define SHARE_VM_JFR_UTILITIES_JFRSPINLOCKHELPER_HPP
+#ifndef SHARE_JFR_UTILITIES_JFRSPINLOCKHELPER_HPP
+#define SHARE_JFR_UTILITIES_JFRSPINLOCKHELPER_HPP
#include "runtime/thread.hpp"
@@ -47,4 +47,4 @@ class JfrSpinlockHelper {
}
};
-#endif // SHARE_VM_JFR_UTILITIES_JFRSPINLOCKHELPER_HPP
+#endif // SHARE_JFR_UTILITIES_JFRSPINLOCKHELPER_HPP
diff --git a/src/hotspot/share/jfr/utilities/jfrTime.hpp b/src/hotspot/share/jfr/utilities/jfrTime.hpp
index 47633a320b1..3b919b38535 100644
--- a/src/hotspot/share/jfr/utilities/jfrTime.hpp
+++ b/src/hotspot/share/jfr/utilities/jfrTime.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
*
*/
-#ifndef SHARE_VM_JFR_UTILITIES_JFRTIME_HPP
-#define SHARE_VM_JFR_UTILITIES_JFRTIME_HPP
+#ifndef SHARE_JFR_UTILITIES_JFRTIME_HPP
+#define SHARE_JFR_UTILITIES_JFRTIME_HPP
#include "utilities/ticks.hpp"
@@ -41,4 +41,4 @@ class JfrTime {
static const void* time_function();
};
-#endif // SHARE_VM_JFR_UTILITIES_JFRTIME_HPP
+#endif // SHARE_JFR_UTILITIES_JFRTIME_HPP
diff --git a/src/hotspot/share/jfr/utilities/jfrTimeConverter.hpp b/src/hotspot/share/jfr/utilities/jfrTimeConverter.hpp
index 3c255901746..9ce2308a551 100644
--- a/src/hotspot/share/jfr/utilities/jfrTimeConverter.hpp
+++ b/src/hotspot/share/jfr/utilities/jfrTimeConverter.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2011, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
*
*/
-#ifndef SHARE_VM_JFR_UTILITIES_JFRTIMECONVERTER_HPP
-#define SHARE_VM_JFR_UTILITIES_JFRTIMECONVERTER_HPP
+#ifndef SHARE_JFR_UTILITIES_JFRTIMECONVERTER_HPP
+#define SHARE_JFR_UTILITIES_JFRTIMECONVERTER_HPP
#include "memory/allocation.hpp"
#include "utilities/globalDefinitions.hpp"
@@ -50,4 +50,4 @@ class JfrTimeConverter : AllStatic {
static jlong nanos_to_countertime(jlong c, bool as_os_time = false);
};
-#endif // SHARE_VM_JFR_UTILITIES_JFRTIMECONVERTER_HPP
+#endif // SHARE_JFR_UTILITIES_JFRTIMECONVERTER_HPP
diff --git a/src/hotspot/share/jfr/utilities/jfrTryLock.hpp b/src/hotspot/share/jfr/utilities/jfrTryLock.hpp
index 5e5de077e10..5218736a25c 100644
--- a/src/hotspot/share/jfr/utilities/jfrTryLock.hpp
+++ b/src/hotspot/share/jfr/utilities/jfrTryLock.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2014, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
*
*/
-#ifndef SHARE_VM_JFR_UTILITIES_JFRTRYLOCK_HPP
-#define SHARE_VM_JFR_UTILITIES_JFRTRYLOCK_HPP
+#ifndef SHARE_JFR_UTILITIES_JFRTRYLOCK_HPP
+#define SHARE_JFR_UTILITIES_JFRTRYLOCK_HPP
#include "runtime/atomic.hpp"
#include "runtime/orderAccess.hpp"
@@ -71,4 +71,4 @@ class JfrMonitorTryLock : public StackObj {
};
-#endif // SHARE_VM_JFR_UTILITIES_JFRTRYLOCK_HPP
+#endif // SHARE_JFR_UTILITIES_JFRTRYLOCK_HPP
diff --git a/src/hotspot/share/jfr/utilities/jfrTypes.hpp b/src/hotspot/share/jfr/utilities/jfrTypes.hpp
index 2c1e2dc35f8..460fc68458b 100644
--- a/src/hotspot/share/jfr/utilities/jfrTypes.hpp
+++ b/src/hotspot/share/jfr/utilities/jfrTypes.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2017, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
*
*/
-#ifndef SHARE_VM_JFR_UTILITIES_JFRTYPES_HPP
-#define SHARE_VM_JFR_UTILITIES_JFRTYPES_HPP
+#ifndef SHARE_JFR_UTILITIES_JFRTYPES_HPP
+#define SHARE_JFR_UTILITIES_JFRTYPES_HPP
#include "jfrfiles/jfrEventIds.hpp"
#include "memory/allocation.hpp"
@@ -39,4 +39,4 @@ enum EventStartTime {
TIMED
};
-#endif // SHARE_VM_JFR_UTILITIES_JFRTYPES_HPP
+#endif // SHARE_JFR_UTILITIES_JFRTYPES_HPP
diff --git a/src/hotspot/share/jfr/writers/jfrBigEndianWriter.hpp b/src/hotspot/share/jfr/writers/jfrBigEndianWriter.hpp
index 45dfe06a234..fe3d749c090 100644
--- a/src/hotspot/share/jfr/writers/jfrBigEndianWriter.hpp
+++ b/src/hotspot/share/jfr/writers/jfrBigEndianWriter.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2016, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
*
*/
-#ifndef SHARE_VM_JFR_WRITERS_JFRBIGENDIANWRITER_HPP
-#define SHARE_VM_JFR_WRITERS_JFRBIGENDIANWRITER_HPP
+#ifndef SHARE_JFR_WRITERS_JFRBIGENDIANWRITER_HPP
+#define SHARE_JFR_WRITERS_JFRBIGENDIANWRITER_HPP
#include "jfr/writers/jfrEncoding.hpp"
#include "jfr/writers/jfrMemoryWriterHost.inline.hpp"
@@ -39,4 +39,4 @@ class JfrBigEndianWriter : public BigEndianWriterBase {
JfrBigEndianWriter(StorageType* storage, size_t size) : BigEndianWriterBase(storage, size + size_safety_cushion) {}
};
-#endif // SHARE_VM_JFR_WRITERS_JFRBIGENDIANWRITER_HPP
+#endif // SHARE_JFR_WRITERS_JFRBIGENDIANWRITER_HPP
diff --git a/src/hotspot/share/jfr/writers/jfrEncoders.hpp b/src/hotspot/share/jfr/writers/jfrEncoders.hpp
index 0fe08840b35..262a61da81a 100644
--- a/src/hotspot/share/jfr/writers/jfrEncoders.hpp
+++ b/src/hotspot/share/jfr/writers/jfrEncoders.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2015, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
*
*/
-#ifndef SHARE_VM_JFR_WRITERS_JFRENCODERS_HPP
-#define SHARE_VM_JFR_WRITERS_JFRENCODERS_HPP
+#ifndef SHARE_JFR_WRITERS_JFRENCODERS_HPP
+#define SHARE_JFR_WRITERS_JFRENCODERS_HPP
#include "memory/allocation.hpp"
#include "utilities/bytes.hpp"
@@ -295,4 +295,4 @@ inline size_t Varint128EncoderImpl::encode_padded(const T* src, size_t len, u1*
return size;
}
-#endif // SHARE_VM_JFR_WRITERS_JFRENCODERS_HPP
+#endif // SHARE_JFR_WRITERS_JFRENCODERS_HPP
diff --git a/src/hotspot/share/jfr/writers/jfrEncoding.hpp b/src/hotspot/share/jfr/writers/jfrEncoding.hpp
index 37f0b8d4adc..4684cc4bc9d 100644
--- a/src/hotspot/share/jfr/writers/jfrEncoding.hpp
+++ b/src/hotspot/share/jfr/writers/jfrEncoding.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2016, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
*
*/
-#ifndef SHARE_VM_JFR_WRITERS_JFRENCODING_HPP
-#define SHARE_VM_JFR_WRITERS_JFRENCODING_HPP
+#ifndef SHARE_JFR_WRITERS_JFRENCODING_HPP
+#define SHARE_JFR_WRITERS_JFRENCODING_HPP
#include "jfr/writers/jfrEncoders.hpp"
#include "memory/allocation.hpp"
@@ -114,4 +114,4 @@ class EncoderHost : public AllStatic {
typedef EncoderHost BigEndianEncoder;
typedef EncoderHost CompressedIntegerEncoder;
-#endif // SHARE_VM_JFR_WRITERS_JFRENCODING_HPP
+#endif // SHARE_JFR_WRITERS_JFRENCODING_HPP
diff --git a/src/hotspot/share/jfr/writers/jfrEventWriterHost.hpp b/src/hotspot/share/jfr/writers/jfrEventWriterHost.hpp
index de07eb0cd9d..137a71f8f8b 100644
--- a/src/hotspot/share/jfr/writers/jfrEventWriterHost.hpp
+++ b/src/hotspot/share/jfr/writers/jfrEventWriterHost.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2016, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
*
*/
-#ifndef SHARE_VM_JFR_WRITERS_JFREVENTWRITERHOST_HPP
-#define SHARE_VM_JFR_WRITERS_JFREVENTWRITERHOST_HPP
+#ifndef SHARE_JFR_WRITERS_JFREVENTWRITERHOST_HPP
+#define SHARE_JFR_WRITERS_JFREVENTWRITERHOST_HPP
#include "jfr/writers/jfrWriterHost.inline.hpp"
@@ -48,4 +48,4 @@ class StackEventWriterHost : public EventWriterHost {
~StackEventWriterHost();
};
-#endif // SHARE_VM_JFR_WRITERS_JFREVENTWRITERHOST_HPP
+#endif // SHARE_JFR_WRITERS_JFREVENTWRITERHOST_HPP
diff --git a/src/hotspot/share/jfr/writers/jfrEventWriterHost.inline.hpp b/src/hotspot/share/jfr/writers/jfrEventWriterHost.inline.hpp
index 2cc9142ebb0..ac8b9b0c500 100644
--- a/src/hotspot/share/jfr/writers/jfrEventWriterHost.inline.hpp
+++ b/src/hotspot/share/jfr/writers/jfrEventWriterHost.inline.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2016, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
*
*/
-#ifndef SHARE_VM_JFR_WRITERS_JFREVENTWRITERHOST_INLINE_HPP
-#define SHARE_VM_JFR_WRITERS_JFREVENTWRITERHOST_INLINE_HPP
+#ifndef SHARE_JFR_WRITERS_JFREVENTWRITERHOST_INLINE_HPP
+#define SHARE_JFR_WRITERS_JFREVENTWRITERHOST_INLINE_HPP
#include "jfr/writers/jfrEventWriterHost.hpp"
@@ -94,4 +94,4 @@ inline StackEventWriterHost::~StackEventWriterHost() {
this->end_event_write();
}
-#endif // SHARE_VM_JFR_WRITERS_JFREVENTWRITERHOST_INLINE_HPP
+#endif // SHARE_JFR_WRITERS_JFREVENTWRITERHOST_INLINE_HPP
diff --git a/src/hotspot/share/jfr/writers/jfrJavaEventWriter.hpp b/src/hotspot/share/jfr/writers/jfrJavaEventWriter.hpp
index 13303823e20..152a9fd1d81 100644
--- a/src/hotspot/share/jfr/writers/jfrJavaEventWriter.hpp
+++ b/src/hotspot/share/jfr/writers/jfrJavaEventWriter.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2016, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
*
*/
-#ifndef SHARE_VM_JFR_WRITERS_JFRJAVAEVENTWRITER_HPP
-#define SHARE_VM_JFR_WRITERS_JFRJAVAEVENTWRITER_HPP
+#ifndef SHARE_JFR_WRITERS_JFRJAVAEVENTWRITER_HPP
+#define SHARE_JFR_WRITERS_JFRJAVAEVENTWRITER_HPP
#include "jni.h"
#include "memory/allocation.hpp"
@@ -46,4 +46,4 @@ class JfrJavaEventWriter : AllStatic {
static jboolean flush(jobject writer, jint used, jint requested, JavaThread* jt);
};
-#endif // SHARE_VM_JFR_WRITERS_JFRJAVAEVENTWRITER_HPP
+#endif // SHARE_JFR_WRITERS_JFRJAVAEVENTWRITER_HPP
diff --git a/src/hotspot/share/jfr/writers/jfrMemoryWriterHost.hpp b/src/hotspot/share/jfr/writers/jfrMemoryWriterHost.hpp
index a1cb11ecd5c..afaedb142fc 100644
--- a/src/hotspot/share/jfr/writers/jfrMemoryWriterHost.hpp
+++ b/src/hotspot/share/jfr/writers/jfrMemoryWriterHost.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2016, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
*
*/
-#ifndef SHARE_VM_JFR_WRITERS_JFRMEMORYWRITERHOST_HPP
-#define SHARE_VM_JFR_WRITERS_JFRMEMORYWRITERHOST_HPP
+#ifndef SHARE_JFR_WRITERS_JFRMEMORYWRITERHOST_HPP
+#define SHARE_JFR_WRITERS_JFRMEMORYWRITERHOST_HPP
#include "jfr/writers/jfrStorageHost.inline.hpp"
@@ -69,4 +69,4 @@ class AcquireReleaseMemoryWriterHost : public MemoryWriterHost {
~AcquireReleaseMemoryWriterHost();
};
-#endif // SHARE_VM_JFR_WRITERS_JFRMEMORYWRITERHOST_HPP
+#endif // SHARE_JFR_WRITERS_JFRMEMORYWRITERHOST_HPP
diff --git a/src/hotspot/share/jfr/writers/jfrMemoryWriterHost.inline.hpp b/src/hotspot/share/jfr/writers/jfrMemoryWriterHost.inline.hpp
index c609915c521..dc0d1733c27 100644
--- a/src/hotspot/share/jfr/writers/jfrMemoryWriterHost.inline.hpp
+++ b/src/hotspot/share/jfr/writers/jfrMemoryWriterHost.inline.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2016, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
*
*/
-#ifndef SHARE_VM_JFR_WRITERS_JFRMEMORYWRITERHOST_INLINE_HPP
-#define SHARE_VM_JFR_WRITERS_JFRMEMORYWRITERHOST_INLINE_HPP
+#ifndef SHARE_JFR_WRITERS_JFRMEMORYWRITERHOST_INLINE_HPP
+#define SHARE_JFR_WRITERS_JFRMEMORYWRITERHOST_INLINE_HPP
#include "jfr/writers/jfrMemoryWriterHost.hpp"
@@ -96,4 +96,4 @@ inline AcquireReleaseMemoryWriterHost::~AcquireReleaseMemoryWriterH
this->release();
}
-#endif // SHARE_VM_JFR_WRITERS_JFRMEMORYWRITERHOST_INLINE_HPP
+#endif // SHARE_JFR_WRITERS_JFRMEMORYWRITERHOST_INLINE_HPP
diff --git a/src/hotspot/share/jfr/writers/jfrNativeEventWriter.hpp b/src/hotspot/share/jfr/writers/jfrNativeEventWriter.hpp
index e47b106d253..8623f6c7685 100644
--- a/src/hotspot/share/jfr/writers/jfrNativeEventWriter.hpp
+++ b/src/hotspot/share/jfr/writers/jfrNativeEventWriter.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2016, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
*
*/
-#ifndef SHARE_VM_JFR_WRITERS_JFRNATIVEEVENTWRITER_HPP
-#define SHARE_VM_JFR_WRITERS_JFRNATIVEEVENTWRITER_HPP
+#ifndef SHARE_JFR_WRITERS_JFRNATIVEEVENTWRITER_HPP
+#define SHARE_JFR_WRITERS_JFRNATIVEEVENTWRITER_HPP
#include "jfr/support/jfrFlush.hpp"
#include "jfr/writers/jfrEncoding.hpp"
@@ -35,4 +35,4 @@ typedef Adapter JfrNativeEventAdapter;
typedef MemoryWriterHost JfrNativeEventWriterImpl;
typedef StackEventWriterHost JfrNativeEventWriter;
-#endif // SHARE_VM_JFR_WRITERS_JFRNATIVEEVENTWRITER_HPP
+#endif // SHARE_JFR_WRITERS_JFRNATIVEEVENTWRITER_HPP
diff --git a/src/hotspot/share/jfr/writers/jfrPosition.hpp b/src/hotspot/share/jfr/writers/jfrPosition.hpp
index ebf28b996f0..06ea76fe5ed 100644
--- a/src/hotspot/share/jfr/writers/jfrPosition.hpp
+++ b/src/hotspot/share/jfr/writers/jfrPosition.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2016, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
*
*/
-#ifndef SHARE_VM_JFR_WRITERS_JFRPOSITION_HPP
-#define SHARE_VM_JFR_WRITERS_JFRPOSITION_HPP
+#ifndef SHARE_JFR_WRITERS_JFRPOSITION_HPP
+#define SHARE_JFR_WRITERS_JFRPOSITION_HPP
#include "utilities/debug.hpp"
#include "utilities/globalDefinitions.hpp"
@@ -54,4 +54,4 @@ class Position : public AP {
void reset();
};
-#endif // SHARE_VM_JFR_WRITERS_JFRPOSITION_HPP
+#endif // SHARE_JFR_WRITERS_JFRPOSITION_HPP
diff --git a/src/hotspot/share/jfr/writers/jfrPosition.inline.hpp b/src/hotspot/share/jfr/writers/jfrPosition.inline.hpp
index d03f617cd6b..dede04666f4 100644
--- a/src/hotspot/share/jfr/writers/jfrPosition.inline.hpp
+++ b/src/hotspot/share/jfr/writers/jfrPosition.inline.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2016, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
*
*/
-#ifndef SHARE_VM_JFR_WRITERS_JFRPOSITION_INLINE_HPP
-#define SHARE_VM_JFR_WRITERS_JFRPOSITION_INLINE_HPP
+#ifndef SHARE_JFR_WRITERS_JFRPOSITION_INLINE_HPP
+#define SHARE_JFR_WRITERS_JFRPOSITION_INLINE_HPP
#include "jfr/writers/jfrPosition.hpp"
@@ -99,4 +99,4 @@ inline void Position::reset() {
set_current_pos(_start_pos);
}
-#endif // SHARE_VM_JFR_WRITERS_JFRPOSITION_INLINE_HPP
+#endif // SHARE_JFR_WRITERS_JFRPOSITION_INLINE_HPP
diff --git a/src/hotspot/share/jfr/writers/jfrStorageAdapter.hpp b/src/hotspot/share/jfr/writers/jfrStorageAdapter.hpp
index 1a47f5bb24b..c2b18948f0a 100644
--- a/src/hotspot/share/jfr/writers/jfrStorageAdapter.hpp
+++ b/src/hotspot/share/jfr/writers/jfrStorageAdapter.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2016, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
*
*/
-#ifndef SHARE_VM_JFR_WRITERS_JFRSTORAGEADAPTER_HPP
-#define SHARE_VM_JFR_WRITERS_JFRSTORAGEADAPTER_HPP
+#ifndef SHARE_JFR_WRITERS_JFRSTORAGEADAPTER_HPP
+#define SHARE_JFR_WRITERS_JFRSTORAGEADAPTER_HPP
#include "jfr/utilities/jfrAllocation.hpp"
@@ -240,4 +240,4 @@ class NoOwnershipAdapter {
}
};
-#endif // SHARE_VM_JFR_WRITERS_JFRSTORAGEADAPTER_HPP
+#endif // SHARE_JFR_WRITERS_JFRSTORAGEADAPTER_HPP
diff --git a/src/hotspot/share/jfr/writers/jfrStorageHost.hpp b/src/hotspot/share/jfr/writers/jfrStorageHost.hpp
index 38e69d2b01c..24dbadbe27b 100644
--- a/src/hotspot/share/jfr/writers/jfrStorageHost.hpp
+++ b/src/hotspot/share/jfr/writers/jfrStorageHost.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2016, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
*
*/
-#ifndef SHARE_VM_JFR_WRITERS_JFRSTORAGEHOST_HPP
-#define SHARE_VM_JFR_WRITERS_JFRSTORAGEHOST_HPP
+#ifndef SHARE_JFR_WRITERS_JFRSTORAGEHOST_HPP
+#define SHARE_JFR_WRITERS_JFRSTORAGEHOST_HPP
#include "jfr/writers/jfrPosition.inline.hpp"
@@ -55,5 +55,4 @@ class StorageHost : public Position {
void seek(intptr_t offset);
};
-#endif // SHARE_VM_JFR_WRITERS_JFRSTORAGEHOST_HPP
-
+#endif // SHARE_JFR_WRITERS_JFRSTORAGEHOST_HPP
diff --git a/src/hotspot/share/jfr/writers/jfrStorageHost.inline.hpp b/src/hotspot/share/jfr/writers/jfrStorageHost.inline.hpp
index 1da809752d6..ab8221d5309 100644
--- a/src/hotspot/share/jfr/writers/jfrStorageHost.inline.hpp
+++ b/src/hotspot/share/jfr/writers/jfrStorageHost.inline.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2016, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
*
*/
-#ifndef SHARE_VM_JFR_WRITERS_JFRSTORAGEHOST_INLINE_HPP
-#define SHARE_VM_JFR_WRITERS_JFRSTORAGEHOST_INLINE_HPP
+#ifndef SHARE_JFR_WRITERS_JFRSTORAGEHOST_INLINE_HPP
+#define SHARE_JFR_WRITERS_JFRSTORAGEHOST_INLINE_HPP
#include "jfr/writers/jfrStorageHost.hpp"
@@ -135,4 +135,4 @@ inline void StorageHost::seek(intptr_t offset) {
}
}
-#endif // SHARE_VM_JFR_WRITERS_JFRSTORAGEHOST_INLINE_HPP
+#endif // SHARE_JFR_WRITERS_JFRSTORAGEHOST_INLINE_HPP
diff --git a/src/hotspot/share/jfr/writers/jfrStreamWriterHost.hpp b/src/hotspot/share/jfr/writers/jfrStreamWriterHost.hpp
index 303f55f2122..e5f82183500 100644
--- a/src/hotspot/share/jfr/writers/jfrStreamWriterHost.hpp
+++ b/src/hotspot/share/jfr/writers/jfrStreamWriterHost.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2016, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
*
*/
-#ifndef SHARE_VM_JFR_WRITERS_JFRSTREAMWRITERHOST_HPP
-#define SHARE_VM_JFR_WRITERS_JFRSTREAMWRITERHOST_HPP
+#ifndef SHARE_JFR_WRITERS_JFRSTREAMWRITERHOST_HPP
+#define SHARE_JFR_WRITERS_JFRSTREAMWRITERHOST_HPP
#include "jfr/utilities/jfrTypes.hpp"
#include "jfr/writers/jfrMemoryWriterHost.inline.hpp"
@@ -56,5 +56,4 @@ class StreamWriterHost : public MemoryWriterHost {
void reset(fio_fd fd);
};
-#endif // SHARE_VM_JFR_WRITERS_JFRSTREAMWRITERHOST_HPP
-
+#endif // SHARE_JFR_WRITERS_JFRSTREAMWRITERHOST_HPP
diff --git a/src/hotspot/share/jfr/writers/jfrStreamWriterHost.inline.hpp b/src/hotspot/share/jfr/writers/jfrStreamWriterHost.inline.hpp
index 086c04cd02f..ca660641244 100644
--- a/src/hotspot/share/jfr/writers/jfrStreamWriterHost.inline.hpp
+++ b/src/hotspot/share/jfr/writers/jfrStreamWriterHost.inline.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2016, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
*
*/
-#ifndef SHARE_VM_JFR_WRITERS_JFRSTREAMWRITERHOST_INLINE_HPP
-#define SHARE_VM_JFR_WRITERS_JFRSTREAMWRITERHOST_INLINE_HPP
+#ifndef SHARE_JFR_WRITERS_JFRSTREAMWRITERHOST_INLINE_HPP
+#define SHARE_JFR_WRITERS_JFRSTREAMWRITERHOST_INLINE_HPP
#include "jfr/writers/jfrStreamWriterHost.hpp"
#include "runtime/os.hpp"
@@ -136,4 +136,4 @@ inline void StreamWriterHost::reset(fio_fd fd) {
this->hard_reset();
}
-#endif // SHARE_VM_JFR_WRITERS_JFRSTREAMWRITERHOST_INLINE_HPP
+#endif // SHARE_JFR_WRITERS_JFRSTREAMWRITERHOST_INLINE_HPP
diff --git a/src/hotspot/share/jfr/writers/jfrWriterHost.hpp b/src/hotspot/share/jfr/writers/jfrWriterHost.hpp
index d88a7b1fc57..e4ba4cd074a 100644
--- a/src/hotspot/share/jfr/writers/jfrWriterHost.hpp
+++ b/src/hotspot/share/jfr/writers/jfrWriterHost.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2016, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
*
*/
-#ifndef SHARE_VM_JFR_WRITERS_JFRWRITERHOST_HPP
-#define SHARE_VM_JFR_WRITERS_JFRWRITERHOST_HPP
+#ifndef SHARE_JFR_WRITERS_JFRWRITERHOST_HPP
+#define SHARE_JFR_WRITERS_JFRWRITERHOST_HPP
#include "jni.h"
#include "utilities/globalDefinitions.hpp"
@@ -99,4 +99,4 @@ class WriterHost : public WriterPolicyImpl {
intptr_t reserve(size_t size);
};
-#endif // SHARE_VM_JFR_WRITERS_JFRWRITERHOST_HPP
+#endif // SHARE_JFR_WRITERS_JFRWRITERHOST_HPP
diff --git a/src/hotspot/share/jfr/writers/jfrWriterHost.inline.hpp b/src/hotspot/share/jfr/writers/jfrWriterHost.inline.hpp
index 753d2037fc8..88ce3d06c7d 100644
--- a/src/hotspot/share/jfr/writers/jfrWriterHost.inline.hpp
+++ b/src/hotspot/share/jfr/writers/jfrWriterHost.inline.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2016, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
*
*/
-#ifndef SHARE_VM_JFR_WRITERS_JFRWRITERHOST_INLINE_HPP
-#define SHARE_VM_JFR_WRITERS_JFRWRITERHOST_INLINE_HPP
+#ifndef SHARE_JFR_WRITERS_JFRWRITERHOST_INLINE_HPP
+#define SHARE_JFR_WRITERS_JFRWRITERHOST_INLINE_HPP
#include "classfile/javaClasses.hpp"
#include "jfr/recorder/checkpoint/types/traceid/jfrTraceId.inline.hpp"
@@ -360,5 +360,4 @@ inline void WriterHost::write_be_at_offset(T value, in
}
}
-#endif // SHARE_VM_JFR_WRITERS_JFRWRITERHOST_INLINE_HPP
-
+#endif // SHARE_JFR_WRITERS_JFRWRITERHOST_INLINE_HPP
diff --git a/src/hotspot/share/jvmci/compilerRuntime.hpp b/src/hotspot/share/jvmci/compilerRuntime.hpp
index c9688a726a2..227bc815107 100644
--- a/src/hotspot/share/jvmci/compilerRuntime.hpp
+++ b/src/hotspot/share/jvmci/compilerRuntime.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -21,8 +21,8 @@
* questions.
*/
-#ifndef SHARE_VM_RUNTIME_COMPILERRUNTIME_HPP
-#define SHARE_VM_RUNTIME_COMPILERRUNTIME_HPP
+#ifndef SHARE_JVMCI_COMPILERRUNTIME_HPP
+#define SHARE_JVMCI_COMPILERRUNTIME_HPP
#include "memory/allocation.hpp"
#include "memory/resourceArea.hpp"
@@ -48,4 +48,4 @@ class CompilerRuntime : AllStatic {
static void backedge_event(JavaThread *thread, MethodCounters* counters, int branch_bci, int target_bci);
};
-#endif // SHARE_VM_RUNTIME_COMPILERRUNTIME_HPP
+#endif // SHARE_JVMCI_COMPILERRUNTIME_HPP
diff --git a/src/hotspot/share/jvmci/jvmciCodeInstaller.hpp b/src/hotspot/share/jvmci/jvmciCodeInstaller.hpp
index c37c8c7ce22..6ab0c72e049 100644
--- a/src/hotspot/share/jvmci/jvmciCodeInstaller.hpp
+++ b/src/hotspot/share/jvmci/jvmciCodeInstaller.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2011, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -21,8 +21,8 @@
* questions.
*/
-#ifndef SHARE_VM_JVMCI_JVMCI_CODE_INSTALLER_HPP
-#define SHARE_VM_JVMCI_JVMCI_CODE_INSTALLER_HPP
+#ifndef SHARE_JVMCI_JVMCICODEINSTALLER_HPP
+#define SHARE_JVMCI_JVMCICODEINSTALLER_HPP
#include "jvmci/jvmciCompiler.hpp"
#include "jvmci/jvmciEnv.hpp"
@@ -279,4 +279,4 @@ Method* getMethodFromHotSpotMethod(oop hotspot_method);
-#endif // SHARE_VM_JVMCI_JVMCI_CODE_INSTALLER_HPP
+#endif // SHARE_JVMCI_JVMCICODEINSTALLER_HPP
diff --git a/src/hotspot/share/jvmci/jvmciCompiler.cpp b/src/hotspot/share/jvmci/jvmciCompiler.cpp
index 2351601e296..22cbf108169 100644
--- a/src/hotspot/share/jvmci/jvmciCompiler.cpp
+++ b/src/hotspot/share/jvmci/jvmciCompiler.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2011, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -54,10 +54,6 @@ void JVMCICompiler::initialize() {
}
set_state(initialized);
-
- // JVMCI is considered as application code so we need to
- // stop the VM deferring compilation now.
- CompilationPolicy::completed_vm_startup();
}
void JVMCICompiler::bootstrap(TRAPS) {
@@ -126,6 +122,7 @@ void JVMCICompiler::compile_method(const methodHandle& method, int entry_bci, JV
if (_bootstrapping && is_osr) {
// no OSR compilations during bootstrap - the compiler is just too slow at this point,
// and we know that there are no endless loops
+ env->set_failure(true, "No OSR during boostrap");
return;
}
@@ -164,17 +161,21 @@ void JVMCICompiler::compile_method(const methodHandle& method, int entry_bci, JV
CLEAR_PENDING_EXCEPTION;
}
- env->set_failure("exception throw", false);
+ env->set_failure(false, "unexpected exception thrown");
} else {
oop result_object = (oop) result.get_jobject();
if (result_object != NULL) {
oop failure_message = HotSpotCompilationRequestResult::failureMessage(result_object);
if (failure_message != NULL) {
+ // Copy failure reason into resource memory first ...
const char* failure_reason = java_lang_String::as_utf8_string(failure_message);
- env->set_failure(failure_reason, HotSpotCompilationRequestResult::retry(result_object) != 0);
+ // ... and then into the C heap.
+ failure_reason = os::strdup(failure_reason, mtCompiler);
+ bool retryable = HotSpotCompilationRequestResult::retry(result_object) != 0;
+ env->set_failure(retryable, failure_reason, true);
} else {
if (env->task()->code() == NULL) {
- env->set_failure("no nmethod produced", true);
+ env->set_failure(true, "no nmethod produced");
} else {
env->task()->set_num_inlined_bytecodes(HotSpotCompilationRequestResult::inlinedBytecodes(result_object));
Atomic::inc(&_methods_compiled);
diff --git a/src/hotspot/share/jvmci/jvmciCompiler.hpp b/src/hotspot/share/jvmci/jvmciCompiler.hpp
index 588bc2727fb..eaa29cc8707 100644
--- a/src/hotspot/share/jvmci/jvmciCompiler.hpp
+++ b/src/hotspot/share/jvmci/jvmciCompiler.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2011, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -21,8 +21,8 @@
* questions.
*/
-#ifndef SHARE_VM_JVMCI_JVMCI_COMPILER_HPP
-#define SHARE_VM_JVMCI_JVMCI_COMPILER_HPP
+#ifndef SHARE_JVMCI_JVMCICOMPILER_HPP
+#define SHARE_JVMCI_JVMCICOMPILER_HPP
#include "compiler/abstractCompiler.hpp"
#include "jvmci/jvmciEnv.hpp"
@@ -107,4 +107,4 @@ public:
static elapsedTimer* codeInstallTimer() { return &_codeInstallTimer; }
};
-#endif // SHARE_VM_JVMCI_JVMCI_COMPILER_HPP
+#endif // SHARE_JVMCI_JVMCICOMPILER_HPP
diff --git a/src/hotspot/share/jvmci/jvmciCompilerToVM.cpp b/src/hotspot/share/jvmci/jvmciCompilerToVM.cpp
index 92ecf3cc8e8..b81c6c7f728 100644
--- a/src/hotspot/share/jvmci/jvmciCompilerToVM.cpp
+++ b/src/hotspot/share/jvmci/jvmciCompilerToVM.cpp
@@ -602,6 +602,17 @@ C2V_VMENTRY(jobject, resolveMethod, (JNIEnv *, jobject, jobject receiver_jvmci_t
return NULL;
}
+ if (method->name() == vmSymbols::clone_name() &&
+ resolved == SystemDictionary::Object_klass() &&
+ recv_klass->is_array_klass()) {
+ // Resolution of the clone method on arrays always returns Object.clone even though that method
+ // has protected access. There's some trickery in the access checking to make this all work out
+ // so it's necessary to pass in the array class as the resolved class to properly trigger this.
+ // Otherwise it's impossible to resolve the array clone methods through JVMCI. See
+ // LinkResolver::check_method_accessability for the matching logic.
+ resolved = recv_klass;
+ }
+
LinkInfo link_info(resolved, h_name, h_signature, caller_klass);
methodHandle m;
// Only do exact lookup if receiver klass has been linked. Otherwise,
diff --git a/src/hotspot/share/jvmci/jvmciCompilerToVM.hpp b/src/hotspot/share/jvmci/jvmciCompilerToVM.hpp
index 05c49df408f..c5254741887 100644
--- a/src/hotspot/share/jvmci/jvmciCompilerToVM.hpp
+++ b/src/hotspot/share/jvmci/jvmciCompilerToVM.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2011, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -21,8 +21,8 @@
* questions.
*/
-#ifndef SHARE_VM_JVMCI_JVMCI_COMPILER_TO_VM_HPP
-#define SHARE_VM_JVMCI_JVMCI_COMPILER_TO_VM_HPP
+#ifndef SHARE_JVMCI_JVMCICOMPILERTOVM_HPP
+#define SHARE_JVMCI_JVMCICOMPILERTOVM_HPP
#include "jni.h"
#include "runtime/javaCalls.hpp"
@@ -242,4 +242,4 @@ class JNIHandleMark : public StackObj {
static void pop_jni_handle_block();
};
-#endif // SHARE_VM_JVMCI_JVMCI_COMPILER_TO_VM_HPP
+#endif // SHARE_JVMCI_JVMCICOMPILERTOVM_HPP
diff --git a/src/hotspot/share/jvmci/jvmciEnv.cpp b/src/hotspot/share/jvmci/jvmciEnv.cpp
index 825aacad25e..fe155532174 100644
--- a/src/hotspot/share/jvmci/jvmciEnv.cpp
+++ b/src/hotspot/share/jvmci/jvmciEnv.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1999, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1999, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -57,14 +57,36 @@
JVMCIEnv::JVMCIEnv(CompileTask* task, int system_dictionary_modification_counter):
_task(task),
_system_dictionary_modification_counter(system_dictionary_modification_counter),
+ _retryable(true),
_failure_reason(NULL),
- _retryable(true)
+ _failure_reason_on_C_heap(false)
{
// Get Jvmti capabilities under lock to get consistent values.
MutexLocker mu(JvmtiThreadState_lock);
- _jvmti_can_hotswap_or_post_breakpoint = JvmtiExport::can_hotswap_or_post_breakpoint();
- _jvmti_can_access_local_variables = JvmtiExport::can_access_local_variables();
- _jvmti_can_post_on_exceptions = JvmtiExport::can_post_on_exceptions();
+ _jvmti_can_hotswap_or_post_breakpoint = JvmtiExport::can_hotswap_or_post_breakpoint() ? 1 : 0;
+ _jvmti_can_access_local_variables = JvmtiExport::can_access_local_variables() ? 1 : 0;
+ _jvmti_can_post_on_exceptions = JvmtiExport::can_post_on_exceptions() ? 1 : 0;
+ _jvmti_can_pop_frame = JvmtiExport::can_pop_frame() ? 1 : 0;
+}
+
+bool JVMCIEnv::jvmti_state_changed() const {
+ if (!jvmti_can_access_local_variables() &&
+ JvmtiExport::can_access_local_variables()) {
+ return true;
+ }
+ if (!jvmti_can_hotswap_or_post_breakpoint() &&
+ JvmtiExport::can_hotswap_or_post_breakpoint()) {
+ return true;
+ }
+ if (!jvmti_can_post_on_exceptions() &&
+ JvmtiExport::can_post_on_exceptions()) {
+ return true;
+ }
+ if (!jvmti_can_pop_frame() &&
+ JvmtiExport::can_pop_frame()) {
+ return true;
+ }
+ return false;
}
// ------------------------------------------------------------------
@@ -412,11 +434,9 @@ methodHandle JVMCIEnv::get_method_by_index(const constantPoolHandle& cpool,
JVMCIEnv::CodeInstallResult JVMCIEnv::validate_compile_task_dependencies(Dependencies* dependencies, Handle compiled_code,
JVMCIEnv* env, char** failure_detail) {
// If JVMTI capabilities were enabled during compile, the compilation is invalidated.
- if (env != NULL) {
- if (!env->_jvmti_can_hotswap_or_post_breakpoint && JvmtiExport::can_hotswap_or_post_breakpoint()) {
- *failure_detail = (char*) "Hotswapping or breakpointing was enabled during compilation";
- return JVMCIEnv::dependencies_failed;
- }
+ if (env != NULL && env->jvmti_state_changed()) {
+ *failure_detail = (char*) "Jvmti state change during compilation invalidated dependencies";
+ return JVMCIEnv::dependencies_failed;
}
// Dependencies must be checked when the system dictionary changes
diff --git a/src/hotspot/share/jvmci/jvmciEnv.hpp b/src/hotspot/share/jvmci/jvmciEnv.hpp
index 8a8c207535f..723a86d1732 100644
--- a/src/hotspot/share/jvmci/jvmciEnv.hpp
+++ b/src/hotspot/share/jvmci/jvmciEnv.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1999, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1999, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
*
*/
-#ifndef SHARE_VM_JVMCI_JVMCIENV_HPP
-#define SHARE_VM_JVMCI_JVMCIENV_HPP
+#ifndef SHARE_JVMCI_JVMCIENV_HPP
+#define SHARE_JVMCI_JVMCIENV_HPP
#include "classfile/systemDictionary.hpp"
#include "code/debugInfoRec.hpp"
@@ -99,13 +99,19 @@ private:
int _system_dictionary_modification_counter;
// Compilation result values
- const char* _failure_reason;
bool _retryable;
+ const char* _failure_reason;
- // Cache JVMTI state
- bool _jvmti_can_hotswap_or_post_breakpoint;
- bool _jvmti_can_access_local_variables;
- bool _jvmti_can_post_on_exceptions;
+ // Specifies if _failure_reason is on the C heap.
+ bool _failure_reason_on_C_heap;
+
+ // Cache JVMTI state. Defined as bytes so that reading them from Java
+ // via Unsafe is well defined (the C++ type for bool is implementation
+ // defined and may not be the same as a Java boolean).
+ jbyte _jvmti_can_hotswap_or_post_breakpoint;
+ jbyte _jvmti_can_access_local_variables;
+ jbyte _jvmti_can_post_on_exceptions;
+ jbyte _jvmti_can_pop_frame;
// Implementation methods for loading and constant pool access.
static Klass* get_klass_by_name_impl(Klass* accessing_klass,
@@ -144,11 +150,19 @@ private:
public:
CompileTask* task() { return _task; }
+ bool jvmti_state_changed() const;
+ bool jvmti_can_hotswap_or_post_breakpoint() const { return _jvmti_can_hotswap_or_post_breakpoint != 0; }
+ bool jvmti_can_access_local_variables() const { return _jvmti_can_access_local_variables != 0; }
+ bool jvmti_can_post_on_exceptions() const { return _jvmti_can_post_on_exceptions != 0; }
+ bool jvmti_can_pop_frame() const { return _jvmti_can_pop_frame != 0; }
+
const char* failure_reason() { return _failure_reason; }
+ bool failure_reason_on_C_heap() { return _failure_reason_on_C_heap; }
bool retryable() { return _retryable; }
- void set_failure(const char* reason, bool retryable) {
+ void set_failure(bool retryable, const char* reason, bool reason_on_C_heap = false) {
_failure_reason = reason;
+ _failure_reason_on_C_heap = reason_on_C_heap;
_retryable = retryable;
}
@@ -181,4 +195,4 @@ public:
static InstanceKlass* get_instance_klass_for_declared_method_holder(Klass* klass);
};
-#endif // SHARE_VM_JVMCI_JVMCIENV_HPP
+#endif // SHARE_JVMCI_JVMCIENV_HPP
diff --git a/src/hotspot/share/jvmci/jvmciJavaClasses.hpp b/src/hotspot/share/jvmci/jvmciJavaClasses.hpp
index e26d6508fab..4bff6ff170e 100644
--- a/src/hotspot/share/jvmci/jvmciJavaClasses.hpp
+++ b/src/hotspot/share/jvmci/jvmciJavaClasses.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2011, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -21,8 +21,8 @@
* questions.
*/
-#ifndef SHARE_VM_JVMCI_JVMCIJAVACLASSES_HPP
-#define SHARE_VM_JVMCI_JVMCIJAVACLASSES_HPP
+#ifndef SHARE_JVMCI_JVMCIJAVACLASSES_HPP
+#define SHARE_JVMCI_JVMCIJAVACLASSES_HPP
#include "classfile/systemDictionary.hpp"
#include "oops/access.hpp"
@@ -381,4 +381,4 @@ COMPILER_CLASSES_DO(START_CLASS, END_CLASS, CHAR_FIELD, INT_FIELD, BOOLEAN_FIELD
void compute_offset(int &dest_offset, Klass* klass, const char* name, const char* signature, bool static_field, TRAPS);
-#endif // SHARE_VM_JVMCI_JVMCIJAVACLASSES_HPP
+#endif // SHARE_JVMCI_JVMCIJAVACLASSES_HPP
diff --git a/src/hotspot/share/jvmci/jvmciRuntime.hpp b/src/hotspot/share/jvmci/jvmciRuntime.hpp
index e031e7d0a47..f2834e73a11 100644
--- a/src/hotspot/share/jvmci/jvmciRuntime.hpp
+++ b/src/hotspot/share/jvmci/jvmciRuntime.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -21,8 +21,8 @@
* questions.
*/
-#ifndef SHARE_VM_JVMCI_JVMCI_RUNTIME_HPP
-#define SHARE_VM_JVMCI_JVMCI_RUNTIME_HPP
+#ifndef SHARE_JVMCI_JVMCIRUNTIME_HPP
+#define SHARE_JVMCI_JVMCIRUNTIME_HPP
#include "interpreter/interpreter.hpp"
#include "memory/allocation.hpp"
@@ -200,4 +200,4 @@ class JVMCIRuntime: public AllStatic {
#define TRACE_jvmci_4 if (!(JVMCITraceLevel >= 4 && (tty->print(" JVMCITrace-4: "), true))) ; else tty->print_cr
#define TRACE_jvmci_5 if (!(JVMCITraceLevel >= 5 && (tty->print(" JVMCITrace-5: "), true))) ; else tty->print_cr
-#endif // SHARE_VM_JVMCI_JVMCI_RUNTIME_HPP
+#endif // SHARE_JVMCI_JVMCIRUNTIME_HPP
diff --git a/src/hotspot/share/jvmci/jvmci_globals.hpp b/src/hotspot/share/jvmci/jvmci_globals.hpp
index b3e3ff56f8b..90cfe548ec5 100644
--- a/src/hotspot/share/jvmci/jvmci_globals.hpp
+++ b/src/hotspot/share/jvmci/jvmci_globals.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2000, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
*
*/
-#ifndef SHARE_VM_JVMCI_JVMCIGLOBALS_HPP
-#define SHARE_VM_JVMCI_JVMCIGLOBALS_HPP
+#ifndef SHARE_JVMCI_JVMCI_GLOBALS_HPP
+#define SHARE_JVMCI_JVMCI_GLOBALS_HPP
#include "runtime/globals.hpp"
@@ -140,4 +140,4 @@ class JVMCIGlobals {
// Check and exit VM with error if selected GC is not supported by JVMCI.
static void check_jvmci_supported_gc();
};
-#endif // SHARE_VM_JVMCI_JVMCIGLOBALS_HPP
+#endif // SHARE_JVMCI_JVMCI_GLOBALS_HPP
diff --git a/src/hotspot/share/jvmci/systemDictionary_jvmci.hpp b/src/hotspot/share/jvmci/systemDictionary_jvmci.hpp
index 96708e802ba..69b7a067140 100644
--- a/src/hotspot/share/jvmci/systemDictionary_jvmci.hpp
+++ b/src/hotspot/share/jvmci/systemDictionary_jvmci.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -21,8 +21,8 @@
* questions.
*/
-#ifndef SHARE_VM_JVMCI_SYSTEMDICTIONARY_JVMCI_HPP
-#define SHARE_VM_JVMCI_SYSTEMDICTIONARY_JVMCI_HPP
+#ifndef SHARE_JVMCI_SYSTEMDICTIONARY_JVMCI_HPP
+#define SHARE_JVMCI_SYSTEMDICTIONARY_JVMCI_HPP
#if !INCLUDE_JVMCI
#define JVMCI_WK_KLASSES_DO(do_klass)
@@ -91,4 +91,4 @@
do_klass(Value_klass, jdk_vm_ci_meta_Value )
#endif
-#endif // SHARE_VM_JVMCI_SYSTEMDICTIONARY_JVMCI_HPP
+#endif // SHARE_JVMCI_SYSTEMDICTIONARY_JVMCI_HPP
diff --git a/src/hotspot/share/jvmci/vmStructs_compiler_runtime.hpp b/src/hotspot/share/jvmci/vmStructs_compiler_runtime.hpp
index 3cb5040030c..78cebb2ac48 100644
--- a/src/hotspot/share/jvmci/vmStructs_compiler_runtime.hpp
+++ b/src/hotspot/share/jvmci/vmStructs_compiler_runtime.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -21,8 +21,8 @@
* questions.
*/
-#ifndef SHARE_VM_JVMCI_VMSTRUCTS_COMPILER_RUNTIME_HPP
-#define SHARE_VM_JVMCI_VMSTRUCTS_COMPILER_RUNTIME_HPP
+#ifndef SHARE_JVMCI_VMSTRUCTS_COMPILER_RUNTIME_HPP
+#define SHARE_JVMCI_VMSTRUCTS_COMPILER_RUNTIME_HPP
#if INCLUDE_AOT
#include "jvmci/compilerRuntime.hpp"
@@ -42,4 +42,4 @@
#endif // INCLUDE_AOT
-#endif // SHARE_VM_AOT_VMSTRUCTS_COMPILER_RUNTIME_HPP
+#endif // SHARE_JVMCI_VMSTRUCTS_COMPILER_RUNTIME_HPP
diff --git a/src/hotspot/share/jvmci/vmStructs_jvmci.cpp b/src/hotspot/share/jvmci/vmStructs_jvmci.cpp
index 5f5136a55e2..376b7e6ab87 100644
--- a/src/hotspot/share/jvmci/vmStructs_jvmci.cpp
+++ b/src/hotspot/share/jvmci/vmStructs_jvmci.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2015, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -182,13 +182,17 @@
nonstatic_field(JavaThread, _pending_failed_speculation, long) \
nonstatic_field(JavaThread, _pending_transfer_to_interpreter, bool) \
nonstatic_field(JavaThread, _jvmci_counters, jlong*) \
+ nonstatic_field(JavaThread, _should_post_on_exceptions_flag, int) \
nonstatic_field(JavaThread, _reserved_stack_activation, address) \
\
static_field(java_lang_Class, _klass_offset, int) \
static_field(java_lang_Class, _array_klass_offset, int) \
\
nonstatic_field(JVMCIEnv, _task, CompileTask*) \
- nonstatic_field(JVMCIEnv, _jvmti_can_hotswap_or_post_breakpoint, bool) \
+ nonstatic_field(JVMCIEnv, _jvmti_can_hotswap_or_post_breakpoint, jbyte) \
+ nonstatic_field(JVMCIEnv, _jvmti_can_access_local_variables, jbyte) \
+ nonstatic_field(JVMCIEnv, _jvmti_can_post_on_exceptions, jbyte) \
+ nonstatic_field(JVMCIEnv, _jvmti_can_pop_frame, jbyte) \
\
nonstatic_field(InvocationCounter, _counter, unsigned int) \
\
diff --git a/src/hotspot/share/jvmci/vmStructs_jvmci.hpp b/src/hotspot/share/jvmci/vmStructs_jvmci.hpp
index bacfee0d984..d53beddebc5 100644
--- a/src/hotspot/share/jvmci/vmStructs_jvmci.hpp
+++ b/src/hotspot/share/jvmci/vmStructs_jvmci.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2013, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
*
*/
-#ifndef SHARE_VM_JVMCI_VMSTRUCTS_JVMCI_HPP
-#define SHARE_VM_JVMCI_VMSTRUCTS_JVMCI_HPP
+#ifndef SHARE_JVMCI_VMSTRUCTS_JVMCI_HPP
+#define SHARE_JVMCI_VMSTRUCTS_JVMCI_HPP
#include "runtime/vmStructs.hpp"
@@ -63,4 +63,4 @@ public:
static int localHotSpotVMAddresses_count();
};
-#endif // SHARE_VM_JVMCI_VMSTRUCTS_JVMCI_HPP
+#endif // SHARE_JVMCI_VMSTRUCTS_JVMCI_HPP
diff --git a/src/hotspot/share/jvmci/vmSymbols_jvmci.hpp b/src/hotspot/share/jvmci/vmSymbols_jvmci.hpp
index 32f3a108082..edb5eba4475 100644
--- a/src/hotspot/share/jvmci/vmSymbols_jvmci.hpp
+++ b/src/hotspot/share/jvmci/vmSymbols_jvmci.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -21,8 +21,8 @@
* questions.
*/
-#ifndef SHARE_VM_JVMCI_VMSYMBOLS_JVMCI_HPP
-#define SHARE_VM_JVMCI_VMSYMBOLS_JVMCI_HPP
+#ifndef SHARE_JVMCI_VMSYMBOLS_JVMCI_HPP
+#define SHARE_JVMCI_VMSYMBOLS_JVMCI_HPP
#if !INCLUDE_JVMCI
@@ -104,4 +104,4 @@
template(klass_fromMetaspace_signature, "(Ljava/lang/Class;)Ljdk/vm/ci/hotspot/HotSpotResolvedObjectTypeImpl;")
#endif
-#endif // SHARE_VM_JVMCI_VMSYMBOLS_JVMCI_HPP
+#endif // SHARE_JVMCI_VMSYMBOLS_JVMCI_HPP
diff --git a/src/hotspot/share/libadt/dict.hpp b/src/hotspot/share/libadt/dict.hpp
index 413f6827f89..4ef500ec2fd 100644
--- a/src/hotspot/share/libadt/dict.hpp
+++ b/src/hotspot/share/libadt/dict.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
*
*/
-#ifndef SHARE_VM_LIBADT_DICT_HPP
-#define SHARE_VM_LIBADT_DICT_HPP
+#ifndef SHARE_LIBADT_DICT_HPP
+#define SHARE_LIBADT_DICT_HPP
// Dictionaries - An Abstract Data Type
@@ -118,4 +118,4 @@ class DictI {
int test(void) { return _i<_d->_size;} // Test for end of iteration
};
-#endif // SHARE_VM_LIBADT_DICT_HPP
+#endif // SHARE_LIBADT_DICT_HPP
diff --git a/src/hotspot/share/libadt/set.hpp b/src/hotspot/share/libadt/set.hpp
index 4043cd714e8..b273764e0a0 100644
--- a/src/hotspot/share/libadt/set.hpp
+++ b/src/hotspot/share/libadt/set.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
*
*/
-#ifndef SHARE_VM_LIBADT_SET_HPP
-#define SHARE_VM_LIBADT_SET_HPP
+#ifndef SHARE_LIBADT_SET_HPP
+#define SHARE_LIBADT_SET_HPP
#include "memory/allocation.hpp"
@@ -244,4 +244,4 @@ public:
int test(void) { return impl->test(); }
};
-#endif // SHARE_VM_LIBADT_SET_HPP
+#endif // SHARE_LIBADT_SET_HPP
diff --git a/src/hotspot/share/libadt/vectset.hpp b/src/hotspot/share/libadt/vectset.hpp
index 887329de1ee..2d2a02ee472 100644
--- a/src/hotspot/share/libadt/vectset.hpp
+++ b/src/hotspot/share/libadt/vectset.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
*
*/
-#ifndef SHARE_VM_LIBADT_VECTSET_HPP
-#define SHARE_VM_LIBADT_VECTSET_HPP
+#ifndef SHARE_LIBADT_VECTSET_HPP
+#define SHARE_LIBADT_VECTSET_HPP
#include "libadt/set.hpp"
@@ -110,7 +110,6 @@ public:
// Expose internals for speed-critical fast iterators
uint word_size() const { return size; }
- uint32_t* EXPOSE() const { return data; }
// Fast inlined "test and set". Replaces the idiom:
// if( visited[idx] ) return;
@@ -184,4 +183,4 @@ public:
int test(void) { return i < s->size; }
};
-#endif // SHARE_VM_LIBADT_VECTSET_HPP
+#endif // SHARE_LIBADT_VECTSET_HPP
diff --git a/src/hotspot/share/logging/log.hpp b/src/hotspot/share/logging/log.hpp
index cfd1f94db85..36a6f63a7e9 100644
--- a/src/hotspot/share/logging/log.hpp
+++ b/src/hotspot/share/logging/log.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2015, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -21,8 +21,8 @@
* questions.
*
*/
-#ifndef SHARE_VM_LOGGING_LOG_HPP
-#define SHARE_VM_LOGGING_LOG_HPP
+#ifndef SHARE_LOGGING_LOG_HPP
+#define SHARE_LOGGING_LOG_HPP
#include "logging/logLevel.hpp"
#include "logging/logPrefix.hpp"
@@ -198,4 +198,4 @@ public:
};
-#endif // SHARE_VM_LOGGING_LOG_HPP
+#endif // SHARE_LOGGING_LOG_HPP
diff --git a/src/hotspot/share/logging/logConfiguration.hpp b/src/hotspot/share/logging/logConfiguration.hpp
index d66ad2e6fab..635a801312b 100644
--- a/src/hotspot/share/logging/logConfiguration.hpp
+++ b/src/hotspot/share/logging/logConfiguration.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2015, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -21,8 +21,8 @@
* questions.
*
*/
-#ifndef SHARE_VM_LOGGING_LOGCONFIGURATION_HPP
-#define SHARE_VM_LOGGING_LOGCONFIGURATION_HPP
+#ifndef SHARE_LOGGING_LOGCONFIGURATION_HPP
+#define SHARE_LOGGING_LOGCONFIGURATION_HPP
#include "logging/logLevel.hpp"
#include "memory/allocation.hpp"
@@ -125,4 +125,4 @@ class LogConfiguration : public AllStatic {
static void rotate_all_outputs();
};
-#endif // SHARE_VM_LOGGING_LOGCONFIGURATION_HPP
+#endif // SHARE_LOGGING_LOGCONFIGURATION_HPP
diff --git a/src/hotspot/share/logging/logDecorations.hpp b/src/hotspot/share/logging/logDecorations.hpp
index 6ad64d0ebbf..96ee29d565b 100644
--- a/src/hotspot/share/logging/logDecorations.hpp
+++ b/src/hotspot/share/logging/logDecorations.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2015, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -21,8 +21,8 @@
* questions.
*
*/
-#ifndef SHARE_VM_LOGGING_LOGDECORATIONS_HPP
-#define SHARE_VM_LOGGING_LOGDECORATIONS_HPP
+#ifndef SHARE_LOGGING_LOGDECORATIONS_HPP
+#define SHARE_LOGGING_LOGDECORATIONS_HPP
#include "logging/logDecorators.hpp"
#include "logging/logTagSet.hpp"
@@ -64,4 +64,4 @@ class LogDecorations {
}
};
-#endif // SHARE_VM_LOGGING_LOGDECORATIONS_HPP
+#endif // SHARE_LOGGING_LOGDECORATIONS_HPP
diff --git a/src/hotspot/share/logging/logDecorators.hpp b/src/hotspot/share/logging/logDecorators.hpp
index aa01cb34967..c6877b5867a 100644
--- a/src/hotspot/share/logging/logDecorators.hpp
+++ b/src/hotspot/share/logging/logDecorators.hpp
@@ -21,8 +21,8 @@
* questions.
*
*/
-#ifndef SHARE_VM_LOGGING_LOGDECORATORS_HPP
-#define SHARE_VM_LOGGING_LOGDECORATORS_HPP
+#ifndef SHARE_LOGGING_LOGDECORATORS_HPP
+#define SHARE_LOGGING_LOGDECORATORS_HPP
#include "utilities/globalDefinitions.hpp"
@@ -115,4 +115,4 @@ class LogDecorators {
bool parse(const char* decorator_args, outputStream* errstream = NULL);
};
-#endif // SHARE_VM_LOGGING_LOGDECORATORS_HPP
+#endif // SHARE_LOGGING_LOGDECORATORS_HPP
diff --git a/src/hotspot/share/logging/logDiagnosticCommand.hpp b/src/hotspot/share/logging/logDiagnosticCommand.hpp
index 518e221205e..dcc80611185 100644
--- a/src/hotspot/share/logging/logDiagnosticCommand.hpp
+++ b/src/hotspot/share/logging/logDiagnosticCommand.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -21,8 +21,8 @@
* questions.
*
*/
-#ifndef SHARE_VM_LOGGING_LOGDIAGNOSTICCOMMAND_HPP
-#define SHARE_VM_LOGGING_LOGDIAGNOSTICCOMMAND_HPP
+#ifndef SHARE_LOGGING_LOGDIAGNOSTICCOMMAND_HPP
+#define SHARE_LOGGING_LOGDIAGNOSTICCOMMAND_HPP
#include "services/diagnosticCommand.hpp"
@@ -66,4 +66,4 @@ class LogDiagnosticCommand : public DCmdWithParser {
}
};
-#endif // SHARE_VM_LOGGING_LOGDIAGNOSTICCOMMAND_HPP
+#endif // SHARE_LOGGING_LOGDIAGNOSTICCOMMAND_HPP
diff --git a/src/hotspot/share/logging/logFileOutput.cpp b/src/hotspot/share/logging/logFileOutput.cpp
index e2150d1f1aa..de3e4ddb93d 100644
--- a/src/hotspot/share/logging/logFileOutput.cpp
+++ b/src/hotspot/share/logging/logFileOutput.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2015, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -45,7 +45,7 @@ char LogFileOutput::_vm_start_time_str[StartTimeBufferSize];
LogFileOutput::LogFileOutput(const char* name)
: LogFileStreamOutput(NULL), _name(os::strdup_check_oom(name, mtLogging)),
_file_name(NULL), _archive_name(NULL), _current_file(0),
- _file_count(DefaultFileCount), _archive_name_len(0),
+ _file_count(DefaultFileCount), _is_default_file_count(true), _archive_name_len(0),
_rotate_size(DefaultFileSize), _current_size(0), _rotation_semaphore(1) {
assert(strstr(name, Prefix) == name, "invalid output name '%s': missing prefix: %s", name, Prefix);
_file_name = make_file_name(name + strlen(Prefix), _pid_str, _vm_start_time_str);
@@ -101,6 +101,15 @@ static bool is_regular_file(const char* filename) {
return (st.st_mode & S_IFMT) == S_IFREG;
}
+static bool is_fifo_file(const char* filename) {
+ struct stat st;
+ int ret = os::stat(filename, &st);
+ if (ret != 0) {
+ return false;
+ }
+ return S_ISFIFO(st.st_mode);
+}
+
// Try to find the next number that should be used for file rotation.
// Return UINT_MAX on error.
static uint next_file_number(const char* filename,
@@ -187,6 +196,7 @@ bool LogFileOutput::parse_options(const char* options, outputStream* errstream)
break;
}
_file_count = static_cast(value);
+ _is_default_file_count = false;
} else if (strcmp(FileSizeOptionKey, key) == 0) {
julong value;
success = Arguments::atojulong(value_str, &value);
@@ -214,6 +224,11 @@ bool LogFileOutput::initialize(const char* options, outputStream* errstream) {
return false;
}
+ bool file_exist = file_exists(_file_name);
+ if (file_exist && _is_default_file_count && is_fifo_file(_file_name)) {
+ _file_count = 0; // Prevent file rotation for fifo's such as named pipes.
+ }
+
if (_file_count > 0) {
// compute digits with filecount - 1 since numbers will start from 0
_file_count_max_digits = number_of_digits(_file_count - 1);
@@ -225,7 +240,7 @@ bool LogFileOutput::initialize(const char* options, outputStream* errstream) {
", filesize: " SIZE_FORMAT " KiB).",
_file_name, _file_count, _rotate_size / K);
- if (_file_count > 0 && file_exists(_file_name)) {
+ if (_file_count > 0 && file_exist) {
if (!is_regular_file(_file_name)) {
errstream->print_cr("Unable to log to file %s with log file rotation: "
"%s is not a regular file",
diff --git a/src/hotspot/share/logging/logFileOutput.hpp b/src/hotspot/share/logging/logFileOutput.hpp
index aca7026475e..b8d366cb288 100644
--- a/src/hotspot/share/logging/logFileOutput.hpp
+++ b/src/hotspot/share/logging/logFileOutput.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2015, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -21,8 +21,8 @@
* questions.
*
*/
-#ifndef SHARE_VM_LOGGING_LOGFILEOUTPUT_HPP
-#define SHARE_VM_LOGGING_LOGFILEOUTPUT_HPP
+#ifndef SHARE_LOGGING_LOGFILEOUTPUT_HPP
+#define SHARE_LOGGING_LOGFILEOUTPUT_HPP
#include "logging/logFileStreamOutput.hpp"
#include "runtime/semaphore.hpp"
@@ -54,6 +54,7 @@ class LogFileOutput : public LogFileStreamOutput {
uint _current_file;
uint _file_count;
uint _file_count_max_digits;
+ bool _is_default_file_count;
size_t _archive_name_len;
size_t _rotate_size;
@@ -95,4 +96,4 @@ class LogFileOutput : public LogFileStreamOutput {
static void set_file_name_parameters(jlong start_time);
};
-#endif // SHARE_VM_LOGGING_LOGFILEOUTPUT_HPP
+#endif // SHARE_LOGGING_LOGFILEOUTPUT_HPP
diff --git a/src/hotspot/share/logging/logFileStreamOutput.hpp b/src/hotspot/share/logging/logFileStreamOutput.hpp
index 7b535822fa0..a02c56f6d18 100644
--- a/src/hotspot/share/logging/logFileStreamOutput.hpp
+++ b/src/hotspot/share/logging/logFileStreamOutput.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -21,8 +21,8 @@
* questions.
*
*/
-#ifndef SHARE_VM_LOGGING_LOGFILESTREAMOUTPUT_HPP
-#define SHARE_VM_LOGGING_LOGFILESTREAMOUTPUT_HPP
+#ifndef SHARE_LOGGING_LOGFILESTREAMOUTPUT_HPP
+#define SHARE_LOGGING_LOGFILESTREAMOUTPUT_HPP
#include "logging/logDecorators.hpp"
#include "logging/logOutput.hpp"
@@ -90,4 +90,4 @@ class LogStderrOutput : public LogFileStreamOutput {
extern LogStderrOutput &StderrLog;
extern LogStdoutOutput &StdoutLog;
-#endif // SHARE_VM_LOGGING_LOGFILESTREAMOUTPUT_HPP
+#endif // SHARE_LOGGING_LOGFILESTREAMOUTPUT_HPP
diff --git a/src/hotspot/share/logging/logHandle.hpp b/src/hotspot/share/logging/logHandle.hpp
index 3bfc45463d4..3df30ac2900 100644
--- a/src/hotspot/share/logging/logHandle.hpp
+++ b/src/hotspot/share/logging/logHandle.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2016, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -21,8 +21,8 @@
* questions.
*
*/
-#ifndef SHARE_VM_LOGGING_LOGHANDLE_HPP
-#define SHARE_VM_LOGGING_LOGHANDLE_HPP
+#ifndef SHARE_LOGGING_LOGHANDLE_HPP
+#define SHARE_LOGGING_LOGHANDLE_HPP
#include "logging/log.hpp"
@@ -101,4 +101,4 @@ public:
};
-#endif // SHARE_VM_LOGGING_LOGHANDLE_HPP
+#endif // SHARE_LOGGING_LOGHANDLE_HPP
diff --git a/src/hotspot/share/logging/logLevel.hpp b/src/hotspot/share/logging/logLevel.hpp
index 2db0c34cfcd..7fe2d31f999 100644
--- a/src/hotspot/share/logging/logLevel.hpp
+++ b/src/hotspot/share/logging/logLevel.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2015, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -21,8 +21,8 @@
* questions.
*
*/
-#ifndef SHARE_VM_LOGGING_LOGLEVEL_HPP
-#define SHARE_VM_LOGGING_LOGLEVEL_HPP
+#ifndef SHARE_LOGGING_LOGLEVEL_HPP
+#define SHARE_LOGGING_LOGLEVEL_HPP
#include "memory/allocation.hpp"
#include "utilities/macros.hpp"
@@ -79,4 +79,4 @@ class LogLevel : public AllStatic {
typedef LogLevel::type LogLevelType;
-#endif // SHARE_VM_LOGGING_LOGLEVEL_HPP
+#endif // SHARE_LOGGING_LOGLEVEL_HPP
diff --git a/src/hotspot/share/logging/logMessage.hpp b/src/hotspot/share/logging/logMessage.hpp
index e8172d15062..f8b44aa38d6 100644
--- a/src/hotspot/share/logging/logMessage.hpp
+++ b/src/hotspot/share/logging/logMessage.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -21,8 +21,8 @@
* questions.
*
*/
-#ifndef SHARE_VM_LOGGING_LOGMESSAGE_HPP
-#define SHARE_VM_LOGGING_LOGMESSAGE_HPP
+#ifndef SHARE_LOGGING_LOGMESSAGE_HPP
+#define SHARE_LOGGING_LOGMESSAGE_HPP
#include "logging/log.hpp"
#include "logging/logMessageBuffer.hpp"
@@ -102,4 +102,4 @@ class LogMessageImpl : public LogMessageBuffer {
#undef LOG_LEVEL
};
-#endif // SHARE_VM_LOGGING_LOGMESSAGE_HPP
+#endif // SHARE_LOGGING_LOGMESSAGE_HPP
diff --git a/src/hotspot/share/logging/logMessageBuffer.hpp b/src/hotspot/share/logging/logMessageBuffer.hpp
index 86b95ed03c5..632f18b303b 100644
--- a/src/hotspot/share/logging/logMessageBuffer.hpp
+++ b/src/hotspot/share/logging/logMessageBuffer.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2016, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -21,8 +21,8 @@
* questions.
*
*/
-#ifndef SHARE_VM_LOGGING_LOGMESSAGEBUFFER_HPP
-#define SHARE_VM_LOGGING_LOGMESSAGEBUFFER_HPP
+#ifndef SHARE_LOGGING_LOGMESSAGEBUFFER_HPP
+#define SHARE_LOGGING_LOGMESSAGEBUFFER_HPP
#include "logging/logDecorations.hpp"
#include "logging/logLevel.hpp"
@@ -128,4 +128,4 @@ class LogMessageBuffer : public StackObj {
#undef LOG_LEVEL
};
-#endif // SHARE_VM_LOGGING_LOGMESSAGEBUFFER_HPP
+#endif // SHARE_LOGGING_LOGMESSAGEBUFFER_HPP
diff --git a/src/hotspot/share/logging/logOutput.hpp b/src/hotspot/share/logging/logOutput.hpp
index d857b8cc43b..e7b0e3542b5 100644
--- a/src/hotspot/share/logging/logOutput.hpp
+++ b/src/hotspot/share/logging/logOutput.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2015, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -21,8 +21,8 @@
* questions.
*
*/
-#ifndef SHARE_VM_LOGGING_LOGOUTPUT_HPP
-#define SHARE_VM_LOGGING_LOGOUTPUT_HPP
+#ifndef SHARE_LOGGING_LOGOUTPUT_HPP
+#define SHARE_LOGGING_LOGOUTPUT_HPP
#include "logging/logDecorators.hpp"
#include "logging/logLevel.hpp"
@@ -101,4 +101,4 @@ class LogOutput : public CHeapObj {
virtual int write(LogMessageBuffer::Iterator msg_iterator) = 0;
};
-#endif // SHARE_VM_LOGGING_LOGOUTPUT_HPP
+#endif // SHARE_LOGGING_LOGOUTPUT_HPP
diff --git a/src/hotspot/share/logging/logOutputList.hpp b/src/hotspot/share/logging/logOutputList.hpp
index 0160c151ed3..3cdd725c1b4 100644
--- a/src/hotspot/share/logging/logOutputList.hpp
+++ b/src/hotspot/share/logging/logOutputList.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2015, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -21,8 +21,8 @@
* questions.
*
*/
-#ifndef SHARE_VM_LOGGING_LOGOUTPUTLIST_HPP
-#define SHARE_VM_LOGGING_LOGOUTPUTLIST_HPP
+#ifndef SHARE_LOGGING_LOGOUTPUTLIST_HPP
+#define SHARE_LOGGING_LOGOUTPUTLIST_HPP
#include "logging/logLevel.hpp"
#include "memory/allocation.hpp"
@@ -128,4 +128,4 @@ class LogOutputList {
}
};
-#endif // SHARE_VM_LOGGING_LOGOUTPUTLIST_HPP
+#endif // SHARE_LOGGING_LOGOUTPUTLIST_HPP
diff --git a/src/hotspot/share/logging/logPrefix.hpp b/src/hotspot/share/logging/logPrefix.hpp
index 2869fd5deef..987f032389a 100644
--- a/src/hotspot/share/logging/logPrefix.hpp
+++ b/src/hotspot/share/logging/logPrefix.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2015, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -21,8 +21,8 @@
* questions.
*
*/
-#ifndef SHARE_VM_LOGGING_LOGPREFIX_HPP
-#define SHARE_VM_LOGGING_LOGPREFIX_HPP
+#ifndef SHARE_LOGGING_LOGPREFIX_HPP
+#define SHARE_LOGGING_LOGPREFIX_HPP
#include "gc/shared/gcId.hpp"
#include "logging/logTag.hpp"
@@ -117,4 +117,4 @@ template <> struct LogPrefix<__VA_ARGS__> { \
LOG_PREFIX_LIST
#undef LOG_PREFIX
-#endif // SHARE_VM_LOGGING_LOGPREFIX_HPP
+#endif // SHARE_LOGGING_LOGPREFIX_HPP
diff --git a/src/hotspot/share/logging/logSelection.hpp b/src/hotspot/share/logging/logSelection.hpp
index d70a019770f..719cfda12ec 100644
--- a/src/hotspot/share/logging/logSelection.hpp
+++ b/src/hotspot/share/logging/logSelection.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -21,8 +21,8 @@
* questions.
*
*/
-#ifndef SHARE_VM_LOGGING_LOGSELECTION_HPP
-#define SHARE_VM_LOGGING_LOGSELECTION_HPP
+#ifndef SHARE_LOGGING_LOGSELECTION_HPP
+#define SHARE_LOGGING_LOGSELECTION_HPP
#include "logging/logLevel.hpp"
#include "logging/logTag.hpp"
@@ -71,4 +71,4 @@ class LogSelection : public StackObj {
double similarity(const LogSelection& other) const;
};
-#endif // SHARE_VM_LOGGING_LOGSELECTION_HPP
+#endif // SHARE_LOGGING_LOGSELECTION_HPP
diff --git a/src/hotspot/share/logging/logSelectionList.hpp b/src/hotspot/share/logging/logSelectionList.hpp
index 22414fb4478..72bc1922e7f 100644
--- a/src/hotspot/share/logging/logSelectionList.hpp
+++ b/src/hotspot/share/logging/logSelectionList.hpp
@@ -21,8 +21,8 @@
* questions.
*
*/
-#ifndef SHARE_VM_LOGGING_LOGSELECTIONLIST_HPP
-#define SHARE_VM_LOGGING_LOGSELECTIONLIST_HPP
+#ifndef SHARE_LOGGING_LOGSELECTIONLIST_HPP
+#define SHARE_LOGGING_LOGSELECTIONLIST_HPP
#include "logging/logConfiguration.hpp"
#include "logging/logSelection.hpp"
@@ -62,4 +62,4 @@ class LogSelectionList : public StackObj {
bool verify_selections(outputStream* out = NULL) const;
};
-#endif // SHARE_VM_LOGGING_LOGSELECTIONLIST_HPP
+#endif // SHARE_LOGGING_LOGSELECTIONLIST_HPP
diff --git a/src/hotspot/share/logging/logStream.hpp b/src/hotspot/share/logging/logStream.hpp
index 82aa43ae80a..ea14f41cf85 100644
--- a/src/hotspot/share/logging/logStream.hpp
+++ b/src/hotspot/share/logging/logStream.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
*
*/
-#ifndef SHARE_VM_LOGGING_LOGSTREAM_HPP
-#define SHARE_VM_LOGGING_LOGSTREAM_HPP
+#ifndef SHARE_LOGGING_LOGSTREAM_HPP
+#define SHARE_LOGGING_LOGSTREAM_HPP
#include "logging/log.hpp"
#include "logging/logHandle.hpp"
@@ -105,4 +105,4 @@ public:
LogStreamTemplate() : LogStream((LogTargetImpl*)NULL) {}
};
-#endif // SHARE_VM_LOGGING_LOGSTREAM_HPP
+#endif // SHARE_LOGGING_LOGSTREAM_HPP
diff --git a/src/hotspot/share/logging/logTag.hpp b/src/hotspot/share/logging/logTag.hpp
index 393d0c95eca..81e94276efc 100644
--- a/src/hotspot/share/logging/logTag.hpp
+++ b/src/hotspot/share/logging/logTag.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2015, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -21,8 +21,8 @@
* questions.
*
*/
-#ifndef SHARE_VM_LOGGING_LOGTAG_HPP
-#define SHARE_VM_LOGGING_LOGTAG_HPP
+#ifndef SHARE_LOGGING_LOGTAG_HPP
+#define SHARE_LOGGING_LOGTAG_HPP
#include "logging/logTag_ext.hpp"
#include "memory/allocation.hpp"
@@ -133,6 +133,7 @@
LOG_TAG(reloc) \
LOG_TAG(remset) \
LOG_TAG(parser) \
+ LOG_TAG(ptrqueue) \
LOG_TAG(purge) \
LOG_TAG(resolve) \
LOG_TAG(safepoint) \
@@ -220,4 +221,4 @@ class LogTag : public AllStatic {
typedef LogTag::type LogTagType;
-#endif // SHARE_VM_LOGGING_LOGTAG_HPP
+#endif // SHARE_LOGGING_LOGTAG_HPP
diff --git a/src/hotspot/share/logging/logTagSet.hpp b/src/hotspot/share/logging/logTagSet.hpp
index 766e7a2a573..45c33c96c58 100644
--- a/src/hotspot/share/logging/logTagSet.hpp
+++ b/src/hotspot/share/logging/logTagSet.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2015, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -21,8 +21,8 @@
* questions.
*
*/
-#ifndef SHARE_VM_LOGGING_LOGTAGSET_HPP
-#define SHARE_VM_LOGGING_LOGTAGSET_HPP
+#ifndef SHARE_LOGGING_LOGTAGSET_HPP
+#define SHARE_LOGGING_LOGTAGSET_HPP
#include "logging/logDecorators.hpp"
#include "logging/logLevel.hpp"
@@ -156,4 +156,4 @@ public:
template
LogTagSet LogTagSetMapping::_tagset(&LogPrefix::prefix, T0, T1, T2, T3, T4);
-#endif // SHARE_VM_LOGGING_LOGTAGSET_HPP
+#endif // SHARE_LOGGING_LOGTAGSET_HPP
diff --git a/src/hotspot/share/logging/logTagSetDescriptions.hpp b/src/hotspot/share/logging/logTagSetDescriptions.hpp
index 60e3660354d..fbe2554d2a8 100644
--- a/src/hotspot/share/logging/logTagSetDescriptions.hpp
+++ b/src/hotspot/share/logging/logTagSetDescriptions.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -21,8 +21,8 @@
* questions.
*
*/
-#ifndef SHARE_VM_LOGGING_LOGTAGSETDESCRIPTIONS_HPP
-#define SHARE_VM_LOGGING_LOGTAGSETDESCRIPTIONS_HPP
+#ifndef SHARE_LOGGING_LOGTAGSETDESCRIPTIONS_HPP
+#define SHARE_LOGGING_LOGTAGSETDESCRIPTIONS_HPP
class LogTagSet;
@@ -33,4 +33,4 @@ struct LogTagSetDescription {
extern struct LogTagSetDescription tagset_descriptions[];
-#endif // SHARE_VM_LOGGING_LOGTAGSETDESCRIPTIONS_HPP
+#endif // SHARE_LOGGING_LOGTAGSETDESCRIPTIONS_HPP
diff --git a/src/hotspot/share/logging/logTag_ext.hpp b/src/hotspot/share/logging/logTag_ext.hpp
index 0300d311a2e..97e1b97feab 100644
--- a/src/hotspot/share/logging/logTag_ext.hpp
+++ b/src/hotspot/share/logging/logTag_ext.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -21,9 +21,9 @@
* questions.
*
*/
-#ifndef SHARE_VM_LOGGING_LOGTAG_EXT_HPP
-#define SHARE_VM_LOGGING_LOGTAG_EXT_HPP
+#ifndef SHARE_LOGGING_LOGTAG_EXT_HPP
+#define SHARE_LOGGING_LOGTAG_EXT_HPP
#define LOG_TAG_LIST_EXT
-#endif // SHARE_VM_LOGGING_LOGTAG_EXT_HPP
+#endif // SHARE_LOGGING_LOGTAG_EXT_HPP
diff --git a/src/hotspot/share/memory/allocation.hpp b/src/hotspot/share/memory/allocation.hpp
index d88690cdead..2906efce442 100644
--- a/src/hotspot/share/memory/allocation.hpp
+++ b/src/hotspot/share/memory/allocation.hpp
@@ -22,8 +22,8 @@
*
*/
-#ifndef SHARE_VM_MEMORY_ALLOCATION_HPP
-#define SHARE_VM_MEMORY_ALLOCATION_HPP
+#ifndef SHARE_MEMORY_ALLOCATION_HPP
+#define SHARE_MEMORY_ALLOCATION_HPP
#include "runtime/globals.hpp"
#include "utilities/globalDefinitions.hpp"
@@ -570,4 +570,4 @@ class MallocArrayAllocator : public AllStatic {
static void free(E* addr);
};
-#endif // SHARE_VM_MEMORY_ALLOCATION_HPP
+#endif // SHARE_MEMORY_ALLOCATION_HPP
diff --git a/src/hotspot/share/memory/allocation.inline.hpp b/src/hotspot/share/memory/allocation.inline.hpp
index b4eae3be0b4..117bda9bacd 100644
--- a/src/hotspot/share/memory/allocation.inline.hpp
+++ b/src/hotspot/share/memory/allocation.inline.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
*
*/
-#ifndef SHARE_VM_MEMORY_ALLOCATION_INLINE_HPP
-#define SHARE_VM_MEMORY_ALLOCATION_INLINE_HPP
+#ifndef SHARE_MEMORY_ALLOCATION_INLINE_HPP
+#define SHARE_MEMORY_ALLOCATION_INLINE_HPP
#include "runtime/atomic.hpp"
#include "runtime/os.hpp"
@@ -171,4 +171,4 @@ void ArrayAllocator::free(E* addr, size_t length) {
}
}
-#endif // SHARE_VM_MEMORY_ALLOCATION_INLINE_HPP
+#endif // SHARE_MEMORY_ALLOCATION_INLINE_HPP
diff --git a/src/hotspot/share/memory/arena.hpp b/src/hotspot/share/memory/arena.hpp
index 051b879c14f..5ed7d8a7c02 100644
--- a/src/hotspot/share/memory/arena.hpp
+++ b/src/hotspot/share/memory/arena.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2017, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
*
*/
-#ifndef SHARE_VM_ARENA_HPP
-#define SHARE_VM_ARENA_HPP
+#ifndef SHARE_MEMORY_ARENA_HPP
+#define SHARE_MEMORY_ARENA_HPP
#include "memory/allocation.hpp"
#include "runtime/globals.hpp"
@@ -256,4 +256,4 @@ private:
#define NEW_ARENA_OBJ(arena, type) \
NEW_ARENA_ARRAY(arena, type, 1)
-#endif // SHARE_VM_ARENA_HPP
+#endif // SHARE_MEMORY_ARENA_HPP
diff --git a/src/hotspot/share/memory/binaryTreeDictionary.hpp b/src/hotspot/share/memory/binaryTreeDictionary.hpp
index 3d3fd4bfd89..39017eedb30 100644
--- a/src/hotspot/share/memory/binaryTreeDictionary.hpp
+++ b/src/hotspot/share/memory/binaryTreeDictionary.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2001, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
*
*/
-#ifndef SHARE_VM_MEMORY_BINARYTREEDICTIONARY_HPP
-#define SHARE_VM_MEMORY_BINARYTREEDICTIONARY_HPP
+#ifndef SHARE_MEMORY_BINARYTREEDICTIONARY_HPP
+#define SHARE_MEMORY_BINARYTREEDICTIONARY_HPP
#include "memory/freeList.hpp"
#include "memory/memRegion.hpp"
@@ -392,4 +392,4 @@ class DescendTreeSearchClosure : public TreeSearchClosure {
}
};
-#endif // SHARE_VM_MEMORY_BINARYTREEDICTIONARY_HPP
+#endif // SHARE_MEMORY_BINARYTREEDICTIONARY_HPP
diff --git a/src/hotspot/share/memory/binaryTreeDictionary.inline.hpp b/src/hotspot/share/memory/binaryTreeDictionary.inline.hpp
index 4a2e87161dc..1755658ae32 100644
--- a/src/hotspot/share/memory/binaryTreeDictionary.inline.hpp
+++ b/src/hotspot/share/memory/binaryTreeDictionary.inline.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2001, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
*
*/
-#ifndef SHARE_VM_MEMORY_BINARYTREEDICTIONARY_INLINE_HPP
-#define SHARE_VM_MEMORY_BINARYTREEDICTIONARY_INLINE_HPP
+#ifndef SHARE_MEMORY_BINARYTREEDICTIONARY_INLINE_HPP
+#define SHARE_MEMORY_BINARYTREEDICTIONARY_INLINE_HPP
#include "gc/shared/spaceDecorator.hpp"
#include "logging/log.hpp"
@@ -1035,4 +1035,4 @@ size_t BinaryTreeDictionary::total_chunk_size(debug_only(co
return total_size();
}
-#endif // SHARE_VM_MEMORY_BINARYTREEDICTIONARY_INLINE_HPP
+#endif // SHARE_MEMORY_BINARYTREEDICTIONARY_INLINE_HPP
diff --git a/src/hotspot/share/memory/filemap.hpp b/src/hotspot/share/memory/filemap.hpp
index bc5dbf14cf8..ee28cd97c6e 100644
--- a/src/hotspot/share/memory/filemap.hpp
+++ b/src/hotspot/share/memory/filemap.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2003, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
*
*/
-#ifndef SHARE_VM_MEMORY_FILEMAP_HPP
-#define SHARE_VM_MEMORY_FILEMAP_HPP
+#ifndef SHARE_MEMORY_FILEMAP_HPP
+#define SHARE_MEMORY_FILEMAP_HPP
#include "classfile/classLoader.hpp"
#include "include/cds.h"
@@ -350,4 +350,4 @@ public:
address decode_start_address(CDSFileMapRegion* spc, bool with_current_oop_encoding_mode);
};
-#endif // SHARE_VM_MEMORY_FILEMAP_HPP
+#endif // SHARE_MEMORY_FILEMAP_HPP
diff --git a/src/hotspot/share/memory/freeList.hpp b/src/hotspot/share/memory/freeList.hpp
index c9390dcebc8..fa034899f65 100644
--- a/src/hotspot/share/memory/freeList.hpp
+++ b/src/hotspot/share/memory/freeList.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2001, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
*
*/
-#ifndef SHARE_VM_MEMORY_FREELIST_HPP
-#define SHARE_VM_MEMORY_FREELIST_HPP
+#ifndef SHARE_MEMORY_FREELIST_HPP
+#define SHARE_MEMORY_FREELIST_HPP
// A class for maintaining a free list of Chunk's. The FreeList
// maintains a the structure of the list (head, tail, etc.) plus
@@ -173,4 +173,4 @@ class FreeList {
void print_on(outputStream* st, const char* c = NULL) const;
};
-#endif // SHARE_VM_MEMORY_FREELIST_HPP
+#endif // SHARE_MEMORY_FREELIST_HPP
diff --git a/src/hotspot/share/memory/guardedMemory.hpp b/src/hotspot/share/memory/guardedMemory.hpp
index 2d32c77c938..917a8732233 100644
--- a/src/hotspot/share/memory/guardedMemory.hpp
+++ b/src/hotspot/share/memory/guardedMemory.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2014, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
*
*/
-#ifndef SHARE_VM_MEMORY_GUARDEDMEMORY_HPP
-#define SHARE_VM_MEMORY_GUARDEDMEMORY_HPP
+#ifndef SHARE_MEMORY_GUARDEDMEMORY_HPP
+#define SHARE_MEMORY_GUARDEDMEMORY_HPP
#include "memory/allocation.hpp"
#include "utilities/globalDefinitions.hpp"
@@ -320,4 +320,4 @@ protected:
}; // GuardedMemory
-#endif // SHARE_VM_MEMORY_GUARDEDMEMORY_HPP
+#endif // SHARE_MEMORY_GUARDEDMEMORY_HPP
diff --git a/src/hotspot/share/memory/heap.hpp b/src/hotspot/share/memory/heap.hpp
index dee3f0b8826..f96b9d66c80 100644
--- a/src/hotspot/share/memory/heap.hpp
+++ b/src/hotspot/share/memory/heap.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
*
*/
-#ifndef SHARE_VM_MEMORY_HEAP_HPP
-#define SHARE_VM_MEMORY_HEAP_HPP
+#ifndef SHARE_MEMORY_HEAP_HPP
+#define SHARE_MEMORY_HEAP_HPP
#include "code/codeBlob.hpp"
#include "memory/allocation.hpp"
@@ -223,4 +223,4 @@ public:
void print() PRODUCT_RETURN;
};
-#endif // SHARE_VM_MEMORY_HEAP_HPP
+#endif // SHARE_MEMORY_HEAP_HPP
diff --git a/src/hotspot/share/memory/heapInspection.hpp b/src/hotspot/share/memory/heapInspection.hpp
index dfeb73eee19..4d2d64c8455 100644
--- a/src/hotspot/share/memory/heapInspection.hpp
+++ b/src/hotspot/share/memory/heapInspection.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2002, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
*
*/
-#ifndef SHARE_VM_MEMORY_HEAPINSPECTION_HPP
-#define SHARE_VM_MEMORY_HEAPINSPECTION_HPP
+#ifndef SHARE_MEMORY_HEAPINSPECTION_HPP
+#define SHARE_MEMORY_HEAPINSPECTION_HPP
#include "memory/allocation.hpp"
#include "oops/objArrayOop.hpp"
@@ -365,4 +365,4 @@ class HeapInspection : public StackObj {
void iterate_over_heap(KlassInfoTable* cit, BoolObjectClosure* filter = NULL);
};
-#endif // SHARE_VM_MEMORY_HEAPINSPECTION_HPP
+#endif // SHARE_MEMORY_HEAPINSPECTION_HPP
diff --git a/src/hotspot/share/memory/heapShared.hpp b/src/hotspot/share/memory/heapShared.hpp
index a5e24589c50..49bf5c0a41c 100644
--- a/src/hotspot/share/memory/heapShared.hpp
+++ b/src/hotspot/share/memory/heapShared.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
*
*/
-#ifndef SHARE_VM_MEMORY_HEAPSHARED_HPP
-#define SHARE_VM_MEMORY_HEAPSHARED_HPP
+#ifndef SHARE_MEMORY_HEAPSHARED_HPP
+#define SHARE_MEMORY_HEAPSHARED_HPP
#include "classfile/compactHashtable.hpp"
#include "classfile/systemDictionary.hpp"
@@ -342,4 +342,4 @@ private:
static void write_subgraph_info_table() NOT_CDS_JAVA_HEAP_RETURN;
static void serialize_subgraph_info_table_header(SerializeClosure* soc) NOT_CDS_JAVA_HEAP_RETURN;
};
-#endif // SHARE_VM_MEMORY_HEAPSHARED_HPP
+#endif // SHARE_MEMORY_HEAPSHARED_HPP
diff --git a/src/hotspot/share/memory/heapShared.inline.hpp b/src/hotspot/share/memory/heapShared.inline.hpp
index 8a279b46e8c..6d96f9267e6 100644
--- a/src/hotspot/share/memory/heapShared.inline.hpp
+++ b/src/hotspot/share/memory/heapShared.inline.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
*
*/
-#ifndef SHARE_VM_MEMORY_HEAPSHARED_INLINE_HPP
-#define SHARE_VM_MEMORY_HEAPSHARED_INLINE_HPP
+#ifndef SHARE_MEMORY_HEAPSHARED_INLINE_HPP
+#define SHARE_MEMORY_HEAPSHARED_INLINE_HPP
#include "oops/compressedOops.inline.hpp"
#include "memory/heapShared.hpp"
@@ -46,4 +46,4 @@ inline oop HeapShared::decode_from_archive(narrowOop v) {
#endif
-#endif // SHARE_VM_MEMORY_HEAPSHARED_INLINE_HPP
+#endif // SHARE_MEMORY_HEAPSHARED_INLINE_HPP
diff --git a/src/hotspot/share/memory/iterator.hpp b/src/hotspot/share/memory/iterator.hpp
index 400a2837046..8f117954487 100644
--- a/src/hotspot/share/memory/iterator.hpp
+++ b/src/hotspot/share/memory/iterator.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
*
*/
-#ifndef SHARE_VM_MEMORY_ITERATOR_HPP
-#define SHARE_VM_MEMORY_ITERATOR_HPP
+#ifndef SHARE_MEMORY_ITERATOR_HPP
+#define SHARE_MEMORY_ITERATOR_HPP
#include "memory/allocation.hpp"
#include "memory/memRegion.hpp"
@@ -362,4 +362,4 @@ class OopIteratorClosureDispatch {
template static void oop_oop_iterate_backwards(OopClosureType* cl, oop obj, Klass* klass);
};
-#endif // SHARE_VM_MEMORY_ITERATOR_HPP
+#endif // SHARE_MEMORY_ITERATOR_HPP
diff --git a/src/hotspot/share/memory/iterator.inline.hpp b/src/hotspot/share/memory/iterator.inline.hpp
index e57e78c1a7c..d1a91f99b2f 100644
--- a/src/hotspot/share/memory/iterator.inline.hpp
+++ b/src/hotspot/share/memory/iterator.inline.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2014, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
*
*/
-#ifndef SHARE_VM_MEMORY_ITERATOR_INLINE_HPP
-#define SHARE_VM_MEMORY_ITERATOR_INLINE_HPP
+#ifndef SHARE_MEMORY_ITERATOR_INLINE_HPP
+#define SHARE_MEMORY_ITERATOR_INLINE_HPP
#include "classfile/classLoaderData.hpp"
#include "memory/iterator.hpp"
@@ -420,4 +420,4 @@ void OopIteratorClosureDispatch::oop_oop_iterate_backwards(OopClosureType* cl, o
OopOopIterateBackwardsDispatch::function(klass)(cl, obj, klass);
}
-#endif // SHARE_VM_MEMORY_ITERATOR_INLINE_HPP
+#endif // SHARE_MEMORY_ITERATOR_INLINE_HPP
diff --git a/src/hotspot/share/memory/memRegion.hpp b/src/hotspot/share/memory/memRegion.hpp
index 1c60d5d0d5d..f2e8f6b40f2 100644
--- a/src/hotspot/share/memory/memRegion.hpp
+++ b/src/hotspot/share/memory/memRegion.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2000, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
*
*/
-#ifndef SHARE_VM_MEMORY_MEMREGION_HPP
-#define SHARE_VM_MEMORY_MEMREGION_HPP
+#ifndef SHARE_MEMORY_MEMREGION_HPP
+#define SHARE_MEMORY_MEMREGION_HPP
#include "memory/allocation.hpp"
#include "utilities/debug.hpp"
@@ -124,4 +124,4 @@ public:
void operator delete(void* p) {} // nothing to do
};
-#endif // SHARE_VM_MEMORY_MEMREGION_HPP
+#endif // SHARE_MEMORY_MEMREGION_HPP
diff --git a/src/hotspot/share/memory/metadataFactory.hpp b/src/hotspot/share/memory/metadataFactory.hpp
index cb9c3a46982..36d3ab1dff7 100644
--- a/src/hotspot/share/memory/metadataFactory.hpp
+++ b/src/hotspot/share/memory/metadataFactory.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2010, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
*
*/
-#ifndef SHARE_VM_MEMORY_METADATAFACTORY_HPP
-#define SHARE_VM_MEMORY_METADATAFACTORY_HPP
+#ifndef SHARE_MEMORY_METADATAFACTORY_HPP
+#define SHARE_MEMORY_METADATAFACTORY_HPP
#include "classfile/classLoaderData.hpp"
#include "oops/array.hpp"
@@ -73,4 +73,4 @@ class MetadataFactory : AllStatic {
}
};
-#endif // SHARE_VM_MEMORY_METADATAFACTORY_HPP
+#endif // SHARE_MEMORY_METADATAFACTORY_HPP
diff --git a/src/hotspot/share/memory/metaspace.hpp b/src/hotspot/share/memory/metaspace.hpp
index a583084fc23..f3f3b3b1799 100644
--- a/src/hotspot/share/memory/metaspace.hpp
+++ b/src/hotspot/share/memory/metaspace.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2011, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -21,8 +21,8 @@
* questions.
*
*/
-#ifndef SHARE_VM_MEMORY_METASPACE_HPP
-#define SHARE_VM_MEMORY_METASPACE_HPP
+#ifndef SHARE_MEMORY_METASPACE_HPP
+#define SHARE_MEMORY_METASPACE_HPP
#include "memory/allocation.hpp"
#include "memory/memRegion.hpp"
@@ -484,4 +484,4 @@ class MetaspaceGC : AllStatic {
static void compute_new_size();
};
-#endif // SHARE_VM_MEMORY_METASPACE_HPP
+#endif // SHARE_MEMORY_METASPACE_HPP
diff --git a/src/hotspot/share/memory/metaspace/blockFreelist.hpp b/src/hotspot/share/memory/metaspace/blockFreelist.hpp
index 52706d720d3..db57b6d3a78 100644
--- a/src/hotspot/share/memory/metaspace/blockFreelist.hpp
+++ b/src/hotspot/share/memory/metaspace/blockFreelist.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -89,5 +89,4 @@ class BlockFreelist : public CHeapObj {
} // namespace metaspace
-#endif /* SHARE_MEMORY_METASPACE_BLOCKFREELIST_HPP */
-
+#endif // SHARE_MEMORY_METASPACE_BLOCKFREELIST_HPP
diff --git a/src/hotspot/share/memory/metaspace/chunkManager.hpp b/src/hotspot/share/memory/metaspace/chunkManager.hpp
index f5792fcac1a..89c9f582ab5 100644
--- a/src/hotspot/share/memory/metaspace/chunkManager.hpp
+++ b/src/hotspot/share/memory/metaspace/chunkManager.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -220,5 +220,4 @@ class ChunkManager : public CHeapObj {
} // namespace metaspace
-#endif /* SHARE_MEMORY_METASPACE_CHUNKMANAGER_HPP_ */
-
+#endif // SHARE_MEMORY_METASPACE_CHUNKMANAGER_HPP
diff --git a/src/hotspot/share/memory/metaspace/metaDebug.hpp b/src/hotspot/share/memory/metaspace/metaDebug.hpp
index 811c8f90ae3..3e67a284717 100644
--- a/src/hotspot/share/memory/metaspace/metaDebug.hpp
+++ b/src/hotspot/share/memory/metaspace/metaDebug.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -43,5 +43,4 @@ class Metadebug : AllStatic {
} // namespace metaspace
-#endif /* SHARE_MEMORY_METASPACE_METADEBUG_HPP */
-
+#endif // SHARE_MEMORY_METASPACE_METADEBUG_HPP
diff --git a/src/hotspot/share/memory/metaspace/metabase.hpp b/src/hotspot/share/memory/metaspace/metabase.hpp
index bba3561f72e..31d7c5deb0f 100644
--- a/src/hotspot/share/memory/metaspace/metabase.hpp
+++ b/src/hotspot/share/memory/metaspace/metabase.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -78,5 +78,4 @@ class Metabase {
} // namespace metaspace
-#endif /* SHARE_MEMORY_METASPACE_METABASE_HPP */
-
+#endif // SHARE_MEMORY_METASPACE_METABASE_HPP
diff --git a/src/hotspot/share/memory/metaspace/metablock.hpp b/src/hotspot/share/memory/metaspace/metablock.hpp
index a9b13874d15..033bf29590a 100644
--- a/src/hotspot/share/memory/metaspace/metablock.hpp
+++ b/src/hotspot/share/memory/metaspace/metablock.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -47,5 +47,4 @@ class Metablock : public Metabase {
} // namespace metaspace
-#endif /* SHARE_MEMORY_METASPACE_METABLOCK_HPP */
-
+#endif // SHARE_MEMORY_METASPACE_METABLOCK_HPP
diff --git a/src/hotspot/share/memory/metaspace/metachunk.hpp b/src/hotspot/share/memory/metaspace/metachunk.hpp
index 0d0cbcfffb5..c11ff7090fb 100644
--- a/src/hotspot/share/memory/metaspace/metachunk.hpp
+++ b/src/hotspot/share/memory/metaspace/metachunk.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -21,8 +21,8 @@
* questions.
*
*/
-#ifndef SHARE_VM_MEMORY_METACHUNK_HPP
-#define SHARE_VM_MEMORY_METACHUNK_HPP
+#ifndef SHARE_MEMORY_METASPACE_METACHUNK_HPP
+#define SHARE_MEMORY_METASPACE_METACHUNK_HPP
#include "memory/metaspace/metabase.hpp"
#include "memory/metaspace/metaspaceCommon.hpp"
@@ -170,4 +170,4 @@ void do_update_in_use_info_for_chunk(Metachunk* chunk, bool inuse);
} // namespace metaspace
-#endif // SHARE_VM_MEMORY_METACHUNK_HPP
+#endif // SHARE_MEMORY_METASPACE_METACHUNK_HPP
diff --git a/src/hotspot/share/memory/metaspace/metaspaceCommon.hpp b/src/hotspot/share/memory/metaspace/metaspaceCommon.hpp
index 811062bb08b..f51d8256651 100644
--- a/src/hotspot/share/memory/metaspace/metaspaceCommon.hpp
+++ b/src/hotspot/share/memory/metaspace/metaspaceCommon.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -123,5 +123,4 @@ inline bool is_valid_nonhumongous_chunktype(ChunkIndex index) {
} // namespace metaspace
-#endif /* SHARE_MEMORY_METASPACE_METASPACESTATISTICS_HPP */
-
+#endif // SHARE_MEMORY_METASPACE_METASPACECOMMON_HPP
diff --git a/src/hotspot/share/memory/metaspace/metaspaceDCmd.hpp b/src/hotspot/share/memory/metaspace/metaspaceDCmd.hpp
index ec37ffff654..90bcd76caa6 100644
--- a/src/hotspot/share/memory/metaspace/metaspaceDCmd.hpp
+++ b/src/hotspot/share/memory/metaspace/metaspaceDCmd.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2019, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2018, SAP and/or its affiliates.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
@@ -63,4 +63,4 @@ public:
} // namespace metaspace
-#endif /* SHARE_MEMORY_METASPACE_METASPACESTATISTICS_HPP */
+#endif // SHARE_MEMORY_METASPACE_METASPACEDCMD_HPP
diff --git a/src/hotspot/share/memory/metaspace/metaspaceStatistics.hpp b/src/hotspot/share/memory/metaspace/metaspaceStatistics.hpp
index 7f4a2fef256..3d62764ddb6 100644
--- a/src/hotspot/share/memory/metaspace/metaspaceStatistics.hpp
+++ b/src/hotspot/share/memory/metaspace/metaspaceStatistics.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2019, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2018 SAP SE. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
@@ -184,5 +184,4 @@ public:
} // namespace metaspace
-#endif /* SHARE_MEMORY_METASPACE_METASPACESTATISTICS_HPP */
-
+#endif // SHARE_MEMORY_METASPACE_METASPACESTATISTICS_HPP
diff --git a/src/hotspot/share/memory/metaspace/occupancyMap.hpp b/src/hotspot/share/memory/metaspace/occupancyMap.hpp
index 7438ac5bb28..4f52d3734d4 100644
--- a/src/hotspot/share/memory/metaspace/occupancyMap.hpp
+++ b/src/hotspot/share/memory/metaspace/occupancyMap.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2019, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2018 SAP SE. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
@@ -239,5 +239,4 @@ class OccupancyMap : public CHeapObj {
} // namespace metaspace
-#endif /* SHARE_MEMORY_METASPACE_OCCUPANCYMAP_HPP */
-
+#endif // SHARE_MEMORY_METASPACE_OCCUPANCYMAP_HPP
diff --git a/src/hotspot/share/memory/metaspace/printCLDMetaspaceInfoClosure.hpp b/src/hotspot/share/memory/metaspace/printCLDMetaspaceInfoClosure.hpp
index 40828bc2839..9c99d06f406 100644
--- a/src/hotspot/share/memory/metaspace/printCLDMetaspaceInfoClosure.hpp
+++ b/src/hotspot/share/memory/metaspace/printCLDMetaspaceInfoClosure.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -60,5 +60,4 @@ public:
} // namespace metaspace
-#endif /* SHARE_MEMORY_METASPACE_PRINTCLDMETASPACEINFOCLOSURE_HPP */
-
+#endif // SHARE_MEMORY_METASPACE_PRINTCLDMETASPACEINFOCLOSURE_HPP
diff --git a/src/hotspot/share/memory/metaspace/printMetaspaceInfoKlassClosure.hpp b/src/hotspot/share/memory/metaspace/printMetaspaceInfoKlassClosure.hpp
index 3bdb51e6df7..04cdca5d11f 100644
--- a/src/hotspot/share/memory/metaspace/printMetaspaceInfoKlassClosure.hpp
+++ b/src/hotspot/share/memory/metaspace/printMetaspaceInfoKlassClosure.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2019, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2018, SAP and/or its affiliates.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
@@ -23,8 +23,8 @@
*
*/
-#ifndef SHARE_MEMORY_METASPACE_PRINTMETASPACEINFOKLASSCLOSURE_HPP_
-#define SHARE_MEMORY_METASPACE_PRINTMETASPACEINFOKLASSCLOSURE_HPP_
+#ifndef SHARE_MEMORY_METASPACE_PRINTMETASPACEINFOKLASSCLOSURE_HPP
+#define SHARE_MEMORY_METASPACE_PRINTMETASPACEINFOKLASSCLOSURE_HPP
#include "memory/iterator.hpp"
#include "utilities/globalDefinitions.hpp"
@@ -55,4 +55,4 @@ public:
} // namespace metaspace
-#endif /* SHARE_MEMORY_METASPACE_PRINTMETASPACEINFOKLASSCLOSURE_HPP_ */
+#endif // SHARE_MEMORY_METASPACE_PRINTMETASPACEINFOKLASSCLOSURE_HPP
diff --git a/src/hotspot/share/memory/metaspace/smallBlocks.hpp b/src/hotspot/share/memory/metaspace/smallBlocks.hpp
index da241a5ab4c..35b6519f5c5 100644
--- a/src/hotspot/share/memory/metaspace/smallBlocks.hpp
+++ b/src/hotspot/share/memory/metaspace/smallBlocks.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -85,5 +85,4 @@ public:
} // namespace metaspace
-#endif /* SHARE_MEMORY_METASPACE_SMALLBLOCKS_HPP */
-
+#endif // SHARE_MEMORY_METASPACE_SMALLBLOCKS_HPP
diff --git a/src/hotspot/share/memory/metaspace/spaceManager.hpp b/src/hotspot/share/memory/metaspace/spaceManager.hpp
index 85a24edc3da..edf090d09c6 100644
--- a/src/hotspot/share/memory/metaspace/spaceManager.hpp
+++ b/src/hotspot/share/memory/metaspace/spaceManager.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -230,5 +230,4 @@ class SpaceManager : public CHeapObj {
} // namespace metaspace
-#endif /* SHARE_MEMORY_METASPACE_SPACEMANAGER_HPP */
-
+#endif // SHARE_MEMORY_METASPACE_SPACEMANAGER_HPP
diff --git a/src/hotspot/share/memory/metaspace/virtualSpaceList.hpp b/src/hotspot/share/memory/metaspace/virtualSpaceList.hpp
index 5879d033dbc..5c55eed4b2c 100644
--- a/src/hotspot/share/memory/metaspace/virtualSpaceList.hpp
+++ b/src/hotspot/share/memory/metaspace/virtualSpaceList.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -148,5 +148,4 @@ class VirtualSpaceList : public CHeapObj {
} // namespace metaspace
-#endif /* SHARE_MEMORY_METASPACE_VIRTUALSPACELIST_HPP */
-
+#endif // SHARE_MEMORY_METASPACE_VIRTUALSPACELIST_HPP
diff --git a/src/hotspot/share/memory/metaspace/virtualSpaceNode.hpp b/src/hotspot/share/memory/metaspace/virtualSpaceNode.hpp
index fc02f8e5759..8c15750d76f 100644
--- a/src/hotspot/share/memory/metaspace/virtualSpaceNode.hpp
+++ b/src/hotspot/share/memory/metaspace/virtualSpaceNode.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -162,4 +162,4 @@ class VirtualSpaceNode : public CHeapObj {
} // namespace metaspace
-#endif /* SHARE_MEMORY_METASPACE_VIRTUALSPACENODE_HPP */
+#endif // SHARE_MEMORY_METASPACE_VIRTUALSPACENODE_HPP
diff --git a/src/hotspot/share/memory/metaspaceChunkFreeListSummary.hpp b/src/hotspot/share/memory/metaspaceChunkFreeListSummary.hpp
index 28895f453da..e593886aed4 100644
--- a/src/hotspot/share/memory/metaspaceChunkFreeListSummary.hpp
+++ b/src/hotspot/share/memory/metaspaceChunkFreeListSummary.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2014, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
*
*/
-#ifndef SHARE_VM_MEMORY_METASPACECHUNKFREELISTSUMMARY_HPP
-#define SHARE_VM_MEMORY_METASPACECHUNKFREELISTSUMMARY_HPP
+#ifndef SHARE_MEMORY_METASPACECHUNKFREELISTSUMMARY_HPP
+#define SHARE_MEMORY_METASPACECHUNKFREELISTSUMMARY_HPP
class MetaspaceChunkFreeListSummary {
@@ -100,4 +100,4 @@ class MetaspaceChunkFreeListSummary {
}
};
-#endif // SHARE_VM_MEMORY_METASPACECHUNKFREELISTSUMMARY_HPP
+#endif // SHARE_MEMORY_METASPACECHUNKFREELISTSUMMARY_HPP
diff --git a/src/hotspot/share/memory/metaspaceClosure.hpp b/src/hotspot/share/memory/metaspaceClosure.hpp
index b3f4946449c..67ebd4c77eb 100644
--- a/src/hotspot/share/memory/metaspaceClosure.hpp
+++ b/src/hotspot/share/memory/metaspaceClosure.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2017, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
*
*/
-#ifndef SHARE_VM_MEMORY_METASPACE_ITERATOR_HPP
-#define SHARE_VM_MEMORY_METASPACE_ITERATOR_HPP
+#ifndef SHARE_MEMORY_METASPACECLOSURE_HPP
+#define SHARE_MEMORY_METASPACECLOSURE_HPP
#include "logging/log.hpp"
#include "memory/allocation.hpp"
@@ -273,4 +273,4 @@ private:
KVHashtable _has_been_visited;
};
-#endif // SHARE_VM_MEMORY_METASPACE_ITERATOR_HPP
+#endif // SHARE_MEMORY_METASPACECLOSURE_HPP
diff --git a/src/hotspot/share/memory/metaspaceCounters.hpp b/src/hotspot/share/memory/metaspaceCounters.hpp
index 4db551a1e34..8984fbc8717 100644
--- a/src/hotspot/share/memory/metaspaceCounters.hpp
+++ b/src/hotspot/share/memory/metaspaceCounters.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
*
*/
-#ifndef SHARE_VM_MEMORY_METASPACECOUNTERS_HPP
-#define SHARE_VM_MEMORY_METASPACECOUNTERS_HPP
+#ifndef SHARE_MEMORY_METASPACECOUNTERS_HPP
+#define SHARE_MEMORY_METASPACECOUNTERS_HPP
#include "memory/allocation.hpp"
@@ -51,4 +51,4 @@ class CompressedClassSpaceCounters: public AllStatic {
static void update_performance_counters();
};
-#endif // SHARE_VM_MEMORY_METASPACECOUNTERS_HPP
+#endif // SHARE_MEMORY_METASPACECOUNTERS_HPP
diff --git a/src/hotspot/share/memory/metaspaceGCThresholdUpdater.hpp b/src/hotspot/share/memory/metaspaceGCThresholdUpdater.hpp
index 9a38c9da242..f9f40181350 100644
--- a/src/hotspot/share/memory/metaspaceGCThresholdUpdater.hpp
+++ b/src/hotspot/share/memory/metaspaceGCThresholdUpdater.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
*
*/
-#ifndef SHARE_VM_MEMORY_METASPACEGCTHRESHOLDUPDATER_HPP
-#define SHARE_VM_MEMORY_METASPACEGCTHRESHOLDUPDATER_HPP
+#ifndef SHARE_MEMORY_METASPACEGCTHRESHOLDUPDATER_HPP
+#define SHARE_MEMORY_METASPACEGCTHRESHOLDUPDATER_HPP
#include "memory/allocation.hpp"
#include "utilities/debug.hpp"
@@ -49,4 +49,4 @@ class MetaspaceGCThresholdUpdater : public AllStatic {
}
};
-#endif // SHARE_VM_MEMORY_METASPACEGCTHRESHOLDUPDATER_HPP
+#endif // SHARE_MEMORY_METASPACEGCTHRESHOLDUPDATER_HPP
diff --git a/src/hotspot/share/memory/metaspaceShared.cpp b/src/hotspot/share/memory/metaspaceShared.cpp
index 1a998998d28..078e2668064 100644
--- a/src/hotspot/share/memory/metaspaceShared.cpp
+++ b/src/hotspot/share/memory/metaspaceShared.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -1659,7 +1659,6 @@ void MetaspaceShared::preload_and_dump(TRAPS) {
ResourceMark rm;
char class_list_path_str[JVM_MAXPATHLEN];
// Preload classes to be shared.
- // Should use some os:: method rather than fopen() here. aB.
const char* class_list_path;
if (SharedClassListFile == NULL) {
// Construct the path to the class list (in jre/lib)
diff --git a/src/hotspot/share/memory/metaspaceShared.hpp b/src/hotspot/share/memory/metaspaceShared.hpp
index 5d8de688753..6a513904be0 100644
--- a/src/hotspot/share/memory/metaspaceShared.hpp
+++ b/src/hotspot/share/memory/metaspaceShared.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
*
*/
-#ifndef SHARE_VM_MEMORY_METASPACESHARED_HPP
-#define SHARE_VM_MEMORY_METASPACESHARED_HPP
+#ifndef SHARE_MEMORY_METASPACESHARED_HPP
+#define SHARE_MEMORY_METASPACESHARED_HPP
#include "classfile/compactHashtable.hpp"
#include "memory/allocation.hpp"
@@ -203,4 +203,4 @@ class MetaspaceShared : AllStatic {
private:
static void read_extra_data(const char* filename, TRAPS) NOT_CDS_RETURN;
};
-#endif // SHARE_VM_MEMORY_METASPACESHARED_HPP
+#endif // SHARE_MEMORY_METASPACESHARED_HPP
diff --git a/src/hotspot/share/memory/metaspaceShared.inline.hpp b/src/hotspot/share/memory/metaspaceShared.inline.hpp
index e1a42fbe9a0..2f6f6bdc630 100644
--- a/src/hotspot/share/memory/metaspaceShared.inline.hpp
+++ b/src/hotspot/share/memory/metaspaceShared.inline.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
*
*/
-#ifndef SHARE_VM_MEMORY_METASPACESHARED_INLINE_HPP
-#define SHARE_VM_MEMORY_METASPACESHARED_INLINE_HPP
+#ifndef SHARE_MEMORY_METASPACESHARED_INLINE_HPP
+#define SHARE_MEMORY_METASPACESHARED_INLINE_HPP
#include "memory/metaspaceShared.hpp"
#if INCLUDE_G1GC
@@ -36,4 +36,4 @@ bool MetaspaceShared::is_archive_object(oop p) {
}
#endif
-#endif // SHARE_VM_MEMORY_METASPACESHARED_INLINE_HPP
+#endif // SHARE_MEMORY_METASPACESHARED_INLINE_HPP
diff --git a/src/hotspot/share/memory/metaspaceTracer.hpp b/src/hotspot/share/memory/metaspaceTracer.hpp
index 48289545791..adb7ae19789 100644
--- a/src/hotspot/share/memory/metaspaceTracer.hpp
+++ b/src/hotspot/share/memory/metaspaceTracer.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
*
*/
-#ifndef SHARE_VM_MEMORY_METASPACETRACER_HPP
-#define SHARE_VM_MEMORY_METASPACETRACER_HPP
+#ifndef SHARE_MEMORY_METASPACETRACER_HPP
+#define SHARE_MEMORY_METASPACETRACER_HPP
#include "memory/allocation.hpp"
#include "memory/metaspace.hpp"
@@ -52,4 +52,4 @@ class MetaspaceTracer : public CHeapObj {
};
-#endif // SHARE_VM_MEMORY_METASPACETRACER_HPP
+#endif // SHARE_MEMORY_METASPACETRACER_HPP
diff --git a/src/hotspot/share/memory/oopFactory.hpp b/src/hotspot/share/memory/oopFactory.hpp
index 2daa4cf7465..7e0802df7fc 100644
--- a/src/hotspot/share/memory/oopFactory.hpp
+++ b/src/hotspot/share/memory/oopFactory.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
*
*/
-#ifndef SHARE_VM_MEMORY_OOPFACTORY_HPP
-#define SHARE_VM_MEMORY_OOPFACTORY_HPP
+#ifndef SHARE_MEMORY_OOPFACTORY_HPP
+#define SHARE_MEMORY_OOPFACTORY_HPP
#include "classfile/symbolTable.hpp"
#include "classfile/systemDictionary.hpp"
@@ -72,4 +72,4 @@ class oopFactory: AllStatic {
static typeArrayHandle new_byteArray_handle(int length, TRAPS);
};
-#endif // SHARE_VM_MEMORY_OOPFACTORY_HPP
+#endif // SHARE_MEMORY_OOPFACTORY_HPP
diff --git a/src/hotspot/share/memory/padded.hpp b/src/hotspot/share/memory/padded.hpp
index 1dcb603685c..c51d1e7a63b 100644
--- a/src/hotspot/share/memory/padded.hpp
+++ b/src/hotspot/share/memory/padded.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2013, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -22,9 +22,10 @@
*
*/
-#ifndef SHARE_VM_MEMORY_PADDED_HPP
-#define SHARE_VM_MEMORY_PADDED_HPP
+#ifndef SHARE_MEMORY_PADDED_HPP
+#define SHARE_MEMORY_PADDED_HPP
+#include "memory/allocation.hpp"
#include "utilities/align.hpp"
#include "utilities/globalDefinitions.hpp"
@@ -117,4 +118,4 @@ class PaddedPrimitiveArray {
static T* create_unfreeable(size_t length);
};
-#endif // SHARE_VM_MEMORY_PADDED_HPP
+#endif // SHARE_MEMORY_PADDED_HPP
diff --git a/src/hotspot/share/memory/padded.inline.hpp b/src/hotspot/share/memory/padded.inline.hpp
index df2f23a2540..939bf7b69db 100644
--- a/src/hotspot/share/memory/padded.inline.hpp
+++ b/src/hotspot/share/memory/padded.inline.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2013, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
*
*/
-#ifndef SHARE_VM_MEMORY_PADDED_INLINE_HPP
-#define SHARE_VM_MEMORY_PADDED_INLINE_HPP
+#ifndef SHARE_MEMORY_PADDED_INLINE_HPP
+#define SHARE_MEMORY_PADDED_INLINE_HPP
#include "memory/allocation.inline.hpp"
#include "memory/padded.hpp"
@@ -90,4 +90,4 @@ T* PaddedPrimitiveArray::create_unfreeable(size_t length) {
return (T*)align_up(chunk, alignment);
}
-#endif // SHARE_VM_MEMORY_PADDED_INLINE_HPP
+#endif // SHARE_MEMORY_PADDED_INLINE_HPP
diff --git a/src/hotspot/share/memory/referenceType.hpp b/src/hotspot/share/memory/referenceType.hpp
index ea50b2c88f6..0865edb2a3e 100644
--- a/src/hotspot/share/memory/referenceType.hpp
+++ b/src/hotspot/share/memory/referenceType.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
*
*/
-#ifndef SHARE_VM_MEMORY_REFERENCETYPE_HPP
-#define SHARE_VM_MEMORY_REFERENCETYPE_HPP
+#ifndef SHARE_MEMORY_REFERENCETYPE_HPP
+#define SHARE_MEMORY_REFERENCETYPE_HPP
#include "utilities/debug.hpp"
@@ -38,4 +38,4 @@ enum ReferenceType {
REF_PHANTOM // Subclass of java/lang/ref/PhantomReference
};
-#endif // SHARE_VM_MEMORY_REFERENCETYPE_HPP
+#endif // SHARE_MEMORY_REFERENCETYPE_HPP
diff --git a/src/hotspot/share/memory/resourceArea.hpp b/src/hotspot/share/memory/resourceArea.hpp
index 32d57fd6e61..1c7998144f6 100644
--- a/src/hotspot/share/memory/resourceArea.hpp
+++ b/src/hotspot/share/memory/resourceArea.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
*
*/
-#ifndef SHARE_VM_MEMORY_RESOURCEAREA_HPP
-#define SHARE_VM_MEMORY_RESOURCEAREA_HPP
+#ifndef SHARE_MEMORY_RESOURCEAREA_HPP
+#define SHARE_MEMORY_RESOURCEAREA_HPP
#include "memory/allocation.hpp"
#include "runtime/thread.hpp"
@@ -261,4 +261,4 @@ protected:
size_t size_in_bytes() { return _size_in_bytes; };
};
-#endif // SHARE_VM_MEMORY_RESOURCEAREA_HPP
+#endif // SHARE_MEMORY_RESOURCEAREA_HPP
diff --git a/src/hotspot/share/memory/resourceArea.inline.hpp b/src/hotspot/share/memory/resourceArea.inline.hpp
index 895c0b71bbf..4babcbf7913 100644
--- a/src/hotspot/share/memory/resourceArea.inline.hpp
+++ b/src/hotspot/share/memory/resourceArea.inline.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
*
*/
-#ifndef SHARE_VM_MEMORY_RESOURCEAREA_INLINE_HPP
-#define SHARE_VM_MEMORY_RESOURCEAREA_INLINE_HPP
+#ifndef SHARE_MEMORY_RESOURCEAREA_INLINE_HPP
+#define SHARE_MEMORY_RESOURCEAREA_INLINE_HPP
#include "memory/resourceArea.hpp"
@@ -40,4 +40,4 @@ inline char* ResourceArea::allocate_bytes(size_t size, AllocFailType alloc_failm
return (char*)Amalloc(size, alloc_failmode);
}
-#endif // SHARE_VM_MEMORY_RESOURCEAREA_INLINE_HPP
+#endif // SHARE_MEMORY_RESOURCEAREA_INLINE_HPP
diff --git a/src/hotspot/share/memory/universe.hpp b/src/hotspot/share/memory/universe.hpp
index 4e5ec1f892b..be8eea629cb 100644
--- a/src/hotspot/share/memory/universe.hpp
+++ b/src/hotspot/share/memory/universe.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
*
*/
-#ifndef SHARE_VM_MEMORY_UNIVERSE_HPP
-#define SHARE_VM_MEMORY_UNIVERSE_HPP
+#ifndef SHARE_MEMORY_UNIVERSE_HPP
+#define SHARE_MEMORY_UNIVERSE_HPP
#include "oops/array.hpp"
#include "runtime/handles.hpp"
@@ -538,4 +538,4 @@ class DeferredObjAllocEvent : public CHeapObj {
oop get_oop() { return _oop; }
};
-#endif // SHARE_VM_MEMORY_UNIVERSE_HPP
+#endif // SHARE_MEMORY_UNIVERSE_HPP
diff --git a/src/hotspot/share/memory/virtualspace.hpp b/src/hotspot/share/memory/virtualspace.hpp
index b00a200274d..66bad5d10fe 100644
--- a/src/hotspot/share/memory/virtualspace.hpp
+++ b/src/hotspot/share/memory/virtualspace.hpp
@@ -22,8 +22,8 @@
*
*/
-#ifndef SHARE_VM_RUNTIME_VIRTUALSPACE_HPP
-#define SHARE_VM_RUNTIME_VIRTUALSPACE_HPP
+#ifndef SHARE_MEMORY_VIRTUALSPACE_HPP
+#define SHARE_MEMORY_VIRTUALSPACE_HPP
#include "utilities/globalDefinitions.hpp"
@@ -236,4 +236,4 @@ class VirtualSpace {
void print();
};
-#endif // SHARE_VM_RUNTIME_VIRTUALSPACE_HPP
+#endif // SHARE_MEMORY_VIRTUALSPACE_HPP
diff --git a/src/hotspot/share/metaprogramming/conditional.hpp b/src/hotspot/share/metaprogramming/conditional.hpp
index a60b0018d89..2d4fe1a86e8 100644
--- a/src/hotspot/share/metaprogramming/conditional.hpp
+++ b/src/hotspot/share/metaprogramming/conditional.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
*
*/
-#ifndef SHARE_VM_METAPROGRAMMING_CONDITIONAL_HPP
-#define SHARE_VM_METAPROGRAMMING_CONDITIONAL_HPP
+#ifndef SHARE_METAPROGRAMMING_CONDITIONAL_HPP
+#define SHARE_METAPROGRAMMING_CONDITIONAL_HPP
#include "memory/allocation.hpp"
@@ -40,4 +40,4 @@ struct Conditional: AllStatic {
typedef FalseType type;
};
-#endif // SHARE_VM_METAPROGRAMMING_CONDITIONAL_HPP
+#endif // SHARE_METAPROGRAMMING_CONDITIONAL_HPP
diff --git a/src/hotspot/share/metaprogramming/decay.hpp b/src/hotspot/share/metaprogramming/decay.hpp
index 32449c240a4..4dff0500f13 100644
--- a/src/hotspot/share/metaprogramming/decay.hpp
+++ b/src/hotspot/share/metaprogramming/decay.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
*
*/
-#ifndef SHARE_VM_METAPROGRAMMING_DECAY_HPP
-#define SHARE_VM_METAPROGRAMMING_DECAY_HPP
+#ifndef SHARE_METAPROGRAMMING_DECAY_HPP
+#define SHARE_METAPROGRAMMING_DECAY_HPP
#include "memory/allocation.hpp"
#include "metaprogramming/removeCV.hpp"
@@ -38,4 +38,4 @@ struct Decay: AllStatic {
typedef typename RemoveCV::type>::type type;
};
-#endif // SHARE_VM_METAPROGRAMMING_DECAY_HPP
+#endif // SHARE_METAPROGRAMMING_DECAY_HPP
diff --git a/src/hotspot/share/metaprogramming/enableIf.hpp b/src/hotspot/share/metaprogramming/enableIf.hpp
index 06e57a795c3..a3815312bfe 100644
--- a/src/hotspot/share/metaprogramming/enableIf.hpp
+++ b/src/hotspot/share/metaprogramming/enableIf.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
*
*/
-#ifndef SHARE_VM_METAPROGRAMMING_ENABLEIF_HPP
-#define SHARE_VM_METAPROGRAMMING_ENABLEIF_HPP
+#ifndef SHARE_METAPROGRAMMING_ENABLEIF_HPP
+#define SHARE_METAPROGRAMMING_ENABLEIF_HPP
#include "memory/allocation.hpp"
@@ -44,4 +44,4 @@ struct EnableIf: AllStatic {
typedef T type;
};
-#endif // SHARE_VM_METAPROGRAMMING_ENABLEIF_HPP
+#endif // SHARE_METAPROGRAMMING_ENABLEIF_HPP
diff --git a/src/hotspot/share/metaprogramming/integralConstant.hpp b/src/hotspot/share/metaprogramming/integralConstant.hpp
index 6aed62eadc8..ce22849e3be 100644
--- a/src/hotspot/share/metaprogramming/integralConstant.hpp
+++ b/src/hotspot/share/metaprogramming/integralConstant.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2017, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
*
*/
-#ifndef SHARE_VM_METAPROGRAMMING_INTEGRALCONSTANT_HPP
-#define SHARE_VM_METAPROGRAMMING_INTEGRALCONSTANT_HPP
+#ifndef SHARE_METAPROGRAMMING_INTEGRALCONSTANT_HPP
+#define SHARE_METAPROGRAMMING_INTEGRALCONSTANT_HPP
// An Integral Constant is a class providing a compile-time value of an
@@ -56,4 +56,4 @@ typedef IntegralConstant TrueType;
// A bool valued IntegralConstant whose value is false.
typedef IntegralConstant FalseType;
-#endif // SHARE_VM_METAPROGRAMMING_INTEGRALCONSTANT_HPP
+#endif // SHARE_METAPROGRAMMING_INTEGRALCONSTANT_HPP
diff --git a/src/hotspot/share/metaprogramming/isConst.hpp b/src/hotspot/share/metaprogramming/isConst.hpp
index 826ddb53787..744e9c665ec 100644
--- a/src/hotspot/share/metaprogramming/isConst.hpp
+++ b/src/hotspot/share/metaprogramming/isConst.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -22,12 +22,12 @@
*
*/
-#ifndef SHARE_VM_METAPROGRAMMING_ISCONST_HPP
-#define SHARE_VM_METAPROGRAMMING_ISCONST_HPP
+#ifndef SHARE_METAPROGRAMMING_ISCONST_HPP
+#define SHARE_METAPROGRAMMING_ISCONST_HPP
#include "metaprogramming/integralConstant.hpp"
template struct IsConst: public FalseType {};
template struct IsConst: public TrueType {};
-#endif // SHARE_VM_METAPROGRAMMING_ISCONST_HPP
+#endif // SHARE_METAPROGRAMMING_ISCONST_HPP
diff --git a/src/hotspot/share/metaprogramming/isFloatingPoint.hpp b/src/hotspot/share/metaprogramming/isFloatingPoint.hpp
index f2fb9f4586f..cbc2d838fe6 100644
--- a/src/hotspot/share/metaprogramming/isFloatingPoint.hpp
+++ b/src/hotspot/share/metaprogramming/isFloatingPoint.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
*
*/
-#ifndef SHARE_VM_METAPROGRAMMING_ISFLOATINGPOINT_HPP
-#define SHARE_VM_METAPROGRAMMING_ISFLOATINGPOINT_HPP
+#ifndef SHARE_METAPROGRAMMING_ISFLOATINGPOINT_HPP
+#define SHARE_METAPROGRAMMING_ISFLOATINGPOINT_HPP
#include "metaprogramming/integralConstant.hpp"
@@ -47,4 +47,4 @@ template <> struct IsFloatingPoint: public TrueType {};
template <> struct IsFloatingPoint: public TrueType {};
template <> struct IsFloatingPoint: public TrueType {};
-#endif // SHARE_VM_METAPROGRAMMING_ISFLOATINGPOINT_HPP
+#endif // SHARE_METAPROGRAMMING_ISFLOATINGPOINT_HPP
diff --git a/src/hotspot/share/metaprogramming/isIntegral.hpp b/src/hotspot/share/metaprogramming/isIntegral.hpp
index c556954949d..cbae6bd5efc 100644
--- a/src/hotspot/share/metaprogramming/isIntegral.hpp
+++ b/src/hotspot/share/metaprogramming/isIntegral.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2017, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -23,8 +23,8 @@
*/
-#ifndef SHARE_VM_METAPROGRAMMING_ISINTEGRAL_HPP
-#define SHARE_VM_METAPROGRAMMING_ISINTEGRAL_HPP
+#ifndef SHARE_METAPROGRAMMING_ISINTEGRAL_HPP
+#define SHARE_METAPROGRAMMING_ISINTEGRAL_HPP
#include "metaprogramming/integralConstant.hpp"
#include "metaprogramming/isSigned.hpp"
@@ -55,4 +55,4 @@ struct IsUnsignedIntegral
: public IntegralConstant::value && !IsSigned::value>
{};
-#endif // SHARE_VM_METAPROGRAMMING_ISINTEGRAL_HPP
+#endif // SHARE_METAPROGRAMMING_ISINTEGRAL_HPP
diff --git a/src/hotspot/share/metaprogramming/isPointer.hpp b/src/hotspot/share/metaprogramming/isPointer.hpp
index 08a9d533af1..aa1bdefa16b 100644
--- a/src/hotspot/share/metaprogramming/isPointer.hpp
+++ b/src/hotspot/share/metaprogramming/isPointer.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
*
*/
-#ifndef SHARE_VM_METAPROGRAMMING_ISPOINTER_HPP
-#define SHARE_VM_METAPROGRAMMING_ISPOINTER_HPP
+#ifndef SHARE_METAPROGRAMMING_ISPOINTER_HPP
+#define SHARE_METAPROGRAMMING_ISPOINTER_HPP
#include "metaprogramming/integralConstant.hpp"
@@ -37,4 +37,4 @@ template class IsPointer: public TrueType {};
template class IsPointer: public TrueType {};
template class IsPointer: public TrueType {};
-#endif // SHARE_VM_METAPROGRAMMING_ISPOINTER_HPP
+#endif // SHARE_METAPROGRAMMING_ISPOINTER_HPP
diff --git a/src/hotspot/share/metaprogramming/isRegisteredEnum.hpp b/src/hotspot/share/metaprogramming/isRegisteredEnum.hpp
index cca35e95f72..8df2a99abfc 100644
--- a/src/hotspot/share/metaprogramming/isRegisteredEnum.hpp
+++ b/src/hotspot/share/metaprogramming/isRegisteredEnum.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2017, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
*
*/
-#ifndef SHARE_VM_METAPROGRAMMING_ISREGISTEREDENUM_HPP
-#define SHARE_VM_METAPROGRAMMING_ISREGISTEREDENUM_HPP
+#ifndef SHARE_METAPROGRAMMING_ISREGISTEREDENUM_HPP
+#define SHARE_METAPROGRAMMING_ISREGISTEREDENUM_HPP
#include "metaprogramming/integralConstant.hpp"
@@ -37,5 +37,4 @@
template
struct IsRegisteredEnum : public FalseType {};
-#endif // SHARE_VM_METAPROGRAMMING_ISREGISTEREDENUM_HPP
-
+#endif // SHARE_METAPROGRAMMING_ISREGISTEREDENUM_HPP
diff --git a/src/hotspot/share/metaprogramming/isSame.hpp b/src/hotspot/share/metaprogramming/isSame.hpp
index 19b24dd8907..aaaa621d151 100644
--- a/src/hotspot/share/metaprogramming/isSame.hpp
+++ b/src/hotspot/share/metaprogramming/isSame.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
*
*/
-#ifndef SHARE_VM_METAPROGRAMMING_ISSAME_HPP
-#define SHARE_VM_METAPROGRAMMING_ISSAME_HPP
+#ifndef SHARE_METAPROGRAMMING_ISSAME_HPP
+#define SHARE_METAPROGRAMMING_ISSAME_HPP
#include "metaprogramming/integralConstant.hpp"
@@ -35,4 +35,4 @@ struct IsSame: public FalseType {};
template
struct IsSame: public TrueType {};
-#endif // SHARE_VM_METAPROGRAMMING_ISSAME_HPP
+#endif // SHARE_METAPROGRAMMING_ISSAME_HPP
diff --git a/src/hotspot/share/metaprogramming/isSigned.hpp b/src/hotspot/share/metaprogramming/isSigned.hpp
index 6e4db012583..f04065d2180 100644
--- a/src/hotspot/share/metaprogramming/isSigned.hpp
+++ b/src/hotspot/share/metaprogramming/isSigned.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2017, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
*
*/
-#ifndef SHARE_VM_METAPROGRAMMING_ISSIGNED_HPP
-#define SHARE_VM_METAPROGRAMMING_ISSIGNED_HPP
+#ifndef SHARE_METAPROGRAMMING_ISSIGNED_HPP
+#define SHARE_METAPROGRAMMING_ISSIGNED_HPP
#include "metaprogramming/integralConstant.hpp"
#include "metaprogramming/removeCV.hpp"
@@ -34,4 +34,4 @@ struct IsSigned
: public IntegralConstant::type>::is_signed>
{};
-#endif // SHARE_VM_METAPROGRAMMING_ISSIGNED_HPP
+#endif // SHARE_METAPROGRAMMING_ISSIGNED_HPP
diff --git a/src/hotspot/share/metaprogramming/isVolatile.hpp b/src/hotspot/share/metaprogramming/isVolatile.hpp
index 16561f2e80d..cd51e3b53e5 100644
--- a/src/hotspot/share/metaprogramming/isVolatile.hpp
+++ b/src/hotspot/share/metaprogramming/isVolatile.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -22,12 +22,12 @@
*
*/
-#ifndef SHARE_VM_METAPROGRAMMING_ISVOLATILE_HPP
-#define SHARE_VM_METAPROGRAMMING_ISVOLATILE_HPP
+#ifndef SHARE_METAPROGRAMMING_ISVOLATILE_HPP
+#define SHARE_METAPROGRAMMING_ISVOLATILE_HPP
#include "metaprogramming/integralConstant.hpp"
template struct IsVolatile: public FalseType {};
template struct IsVolatile: public TrueType {};
-#endif // SHARE_VM_METAPROGRAMMING_ISVOLATILE_HPP
+#endif // SHARE_METAPROGRAMMING_ISVOLATILE_HPP
diff --git a/src/hotspot/share/metaprogramming/primitiveConversions.hpp b/src/hotspot/share/metaprogramming/primitiveConversions.hpp
index dfa0a22bf80..9be43d16534 100644
--- a/src/hotspot/share/metaprogramming/primitiveConversions.hpp
+++ b/src/hotspot/share/metaprogramming/primitiveConversions.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2017, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
*
*/
-#ifndef SHARE_VM_METAPROGRAMMING_PRIMITIVECONVERSIONS_HPP
-#define SHARE_VM_METAPROGRAMMING_PRIMITIVECONVERSIONS_HPP
+#ifndef SHARE_METAPROGRAMMING_PRIMITIVECONVERSIONS_HPP
+#define SHARE_METAPROGRAMMING_PRIMITIVECONVERSIONS_HPP
#include "memory/allocation.hpp"
#include "metaprogramming/enableIf.hpp"
@@ -182,4 +182,4 @@ struct PrimitiveConversions::Translate : public TrueType {
static Value recover(Decayed x) { return PrimitiveConversions::cast(x); }
};
-#endif // SHARE_VM_METAPROGRAMMING_PRIMITIVECONVERSIONS_HPP
+#endif // SHARE_METAPROGRAMMING_PRIMITIVECONVERSIONS_HPP
diff --git a/src/hotspot/share/metaprogramming/removeCV.hpp b/src/hotspot/share/metaprogramming/removeCV.hpp
index e40232895a8..0c0b2f47fa7 100644
--- a/src/hotspot/share/metaprogramming/removeCV.hpp
+++ b/src/hotspot/share/metaprogramming/removeCV.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
*
*/
-#ifndef SHARE_VM_METAPROGRAMMING_REMOVECV_HPP
-#define SHARE_VM_METAPROGRAMMING_REMOVECV_HPP
+#ifndef SHARE_METAPROGRAMMING_REMOVECV_HPP
+#define SHARE_METAPROGRAMMING_REMOVECV_HPP
#include "memory/allocation.hpp"
@@ -47,4 +47,4 @@ struct RemoveCV: AllStatic {
typedef T type;
};
-#endif // SHARE_VM_METAPROGRAMMING_REMOVECV_HPP
+#endif // SHARE_METAPROGRAMMING_REMOVECV_HPP
diff --git a/src/hotspot/share/metaprogramming/removePointer.hpp b/src/hotspot/share/metaprogramming/removePointer.hpp
index c0d619cba1f..be0f5b6e6fb 100644
--- a/src/hotspot/share/metaprogramming/removePointer.hpp
+++ b/src/hotspot/share/metaprogramming/removePointer.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
*
*/
-#ifndef SHARE_VM_METAPROGRAMMING_REMOVEPOINTER_HPP
-#define SHARE_VM_METAPROGRAMMING_REMOVEPOINTER_HPP
+#ifndef SHARE_METAPROGRAMMING_REMOVEPOINTER_HPP
+#define SHARE_METAPROGRAMMING_REMOVEPOINTER_HPP
#include "memory/allocation.hpp"
@@ -38,4 +38,4 @@ template struct RemovePointer: AllStatic { typedef T type
template struct RemovePointer: AllStatic { typedef T type; };
template struct RemovePointer: AllStatic { typedef T type; };
-#endif // SHARE_VM_METAPROGRAMMING_REMOVEPOINTER_HPP
+#endif // SHARE_METAPROGRAMMING_REMOVEPOINTER_HPP
diff --git a/src/hotspot/share/metaprogramming/removeReference.hpp b/src/hotspot/share/metaprogramming/removeReference.hpp
index 3f80ffc346e..274c327a0ad 100644
--- a/src/hotspot/share/metaprogramming/removeReference.hpp
+++ b/src/hotspot/share/metaprogramming/removeReference.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
*
*/
-#ifndef SHARE_VM_METAPROGRAMMING_REMOVEREFERENCE_HPP
-#define SHARE_VM_METAPROGRAMMING_REMOVEREFERENCE_HPP
+#ifndef SHARE_METAPROGRAMMING_REMOVEREFERENCE_HPP
+#define SHARE_METAPROGRAMMING_REMOVEREFERENCE_HPP
#include "memory/allocation.hpp"
@@ -35,4 +35,4 @@ template struct RemoveReference: AllStatic { typedef T type; };
template struct RemoveReference: AllStatic { typedef T type; };
-#endif // SHARE_VM_METAPROGRAMMING_REMOVEREFERENCE_HPP
+#endif // SHARE_METAPROGRAMMING_REMOVEREFERENCE_HPP
diff --git a/src/hotspot/share/oops/access.inline.hpp b/src/hotspot/share/oops/access.inline.hpp
index 57f2a15e4d5..6bf89666c5d 100644
--- a/src/hotspot/share/oops/access.inline.hpp
+++ b/src/hotspot/share/oops/access.inline.hpp
@@ -25,6 +25,7 @@
#ifndef SHARE_OOPS_ACCESS_INLINE_HPP
#define SHARE_OOPS_ACCESS_INLINE_HPP
+#include "gc/shared/barrierSet.inline.hpp"
#include "gc/shared/barrierSetConfig.inline.hpp"
#include "oops/access.hpp"
#include "oops/accessBackend.inline.hpp"
diff --git a/src/hotspot/share/oops/accessBackend.inline.hpp b/src/hotspot/share/oops/accessBackend.inline.hpp
index 32de6c19177..10517ca10ac 100644
--- a/src/hotspot/share/oops/accessBackend.inline.hpp
+++ b/src/hotspot/share/oops/accessBackend.inline.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2017, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
*
*/
-#ifndef SHARE_VM_RUNTIME_ACCESSBACKEND_INLINE_HPP
-#define SHARE_VM_RUNTIME_ACCESSBACKEND_INLINE_HPP
+#ifndef SHARE_OOPS_ACCESSBACKEND_INLINE_HPP
+#define SHARE_OOPS_ACCESSBACKEND_INLINE_HPP
#include "oops/access.hpp"
#include "oops/accessBackend.hpp"
@@ -363,4 +363,4 @@ inline void RawAccessBarrier::clone(oop src, oop dst, size_t size) {
dst->init_mark_raw();
}
-#endif // SHARE_VM_RUNTIME_ACCESSBACKEND_INLINE_HPP
+#endif // SHARE_OOPS_ACCESSBACKEND_INLINE_HPP
diff --git a/src/hotspot/share/oops/annotations.hpp b/src/hotspot/share/oops/annotations.hpp
index 8b69325a929..8f63efb53e3 100644
--- a/src/hotspot/share/oops/annotations.hpp
+++ b/src/hotspot/share/oops/annotations.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
*
*/
-#ifndef SHARE_VM_OOPS_ANNOTATIONS_HPP
-#define SHARE_VM_OOPS_ANNOTATIONS_HPP
+#ifndef SHARE_OOPS_ANNOTATIONS_HPP
+#define SHARE_OOPS_ANNOTATIONS_HPP
#include "oops/array.hpp"
#include "oops/metadata.hpp"
@@ -106,4 +106,4 @@ class Annotations: public MetaspaceObj {
#endif
void print_value_on(outputStream* st) const;
};
-#endif // SHARE_VM_OOPS_ANNOTATIONS_HPP
+#endif // SHARE_OOPS_ANNOTATIONS_HPP
diff --git a/src/hotspot/share/oops/array.hpp b/src/hotspot/share/oops/array.hpp
index 04324b95d03..4e400e11810 100644
--- a/src/hotspot/share/oops/array.hpp
+++ b/src/hotspot/share/oops/array.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2000, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
*
*/
-#ifndef SHARE_VM_OOPS_ARRAY_HPP
-#define SHARE_VM_OOPS_ARRAY_HPP
+#ifndef SHARE_OOPS_ARRAY_HPP
+#define SHARE_OOPS_ARRAY_HPP
#include "memory/allocation.hpp"
#include "memory/metaspace.hpp"
@@ -156,4 +156,4 @@ protected:
};
-#endif // SHARE_VM_OOPS_ARRAY_HPP
+#endif // SHARE_OOPS_ARRAY_HPP
diff --git a/src/hotspot/share/oops/array.inline.hpp b/src/hotspot/share/oops/array.inline.hpp
index e13086adb23..2260b7496fa 100644
--- a/src/hotspot/share/oops/array.inline.hpp
+++ b/src/hotspot/share/oops/array.inline.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
*
*/
-#ifndef SHARE_VM_OOPS_ARRAY_INLINE_HPP
-#define SHARE_VM_OOPS_ARRAY_INLINE_HPP
+#ifndef SHARE_OOPS_ARRAY_INLINE_HPP
+#define SHARE_OOPS_ARRAY_INLINE_HPP
#include "oops/array.hpp"
#include "runtime/orderAccess.hpp"
@@ -34,4 +34,4 @@ inline T Array::at_acquire(const int which) { return OrderAccess::load_acquir
template
inline void Array::release_at_put(int which, T contents) { OrderAccess::release_store(adr_at(which), contents); }
-#endif // SHARE_VM_OOPS_ARRAY_INLINE_HPP
+#endif // SHARE_OOPS_ARRAY_INLINE_HPP
diff --git a/src/hotspot/share/oops/arrayKlass.hpp b/src/hotspot/share/oops/arrayKlass.hpp
index 0841b561497..654e40b6046 100644
--- a/src/hotspot/share/oops/arrayKlass.hpp
+++ b/src/hotspot/share/oops/arrayKlass.hpp
@@ -22,8 +22,8 @@
*
*/
-#ifndef SHARE_VM_OOPS_ARRAYKLASS_HPP
-#define SHARE_VM_OOPS_ARRAYKLASS_HPP
+#ifndef SHARE_OOPS_ARRAYKLASS_HPP
+#define SHARE_OOPS_ARRAYKLASS_HPP
#include "memory/universe.hpp"
#include "oops/klass.hpp"
@@ -144,4 +144,4 @@ class ArrayKlass: public Klass {
void oop_verify_on(oop obj, outputStream* st);
};
-#endif // SHARE_VM_OOPS_ARRAYKLASS_HPP
+#endif // SHARE_OOPS_ARRAYKLASS_HPP
diff --git a/src/hotspot/share/oops/arrayKlass.inline.hpp b/src/hotspot/share/oops/arrayKlass.inline.hpp
index 6caaae05de4..fcdc3cea746 100644
--- a/src/hotspot/share/oops/arrayKlass.inline.hpp
+++ b/src/hotspot/share/oops/arrayKlass.inline.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2016, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
*
*/
-#ifndef SHARE_VM_OOPS_ARRAYKLASS_INLINE_HPP
-#define SHARE_VM_OOPS_ARRAYKLASS_INLINE_HPP
+#ifndef SHARE_OOPS_ARRAYKLASS_INLINE_HPP
+#define SHARE_OOPS_ARRAYKLASS_INLINE_HPP
#include "runtime/orderAccess.hpp"
#include "oops/arrayKlass.hpp"
@@ -36,4 +36,4 @@ inline void ArrayKlass::release_set_higher_dimension(Klass* k) {
OrderAccess::release_store(&_higher_dimension, k);
}
-#endif // SHARE_VM_OOPS_ARRAYKLASS_INLINE_HPP
+#endif // SHARE_OOPS_ARRAYKLASS_INLINE_HPP
diff --git a/src/hotspot/share/oops/arrayOop.hpp b/src/hotspot/share/oops/arrayOop.hpp
index 4a6079a3e15..8a60872acee 100644
--- a/src/hotspot/share/oops/arrayOop.hpp
+++ b/src/hotspot/share/oops/arrayOop.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
*
*/
-#ifndef SHARE_VM_OOPS_ARRAYOOP_HPP
-#define SHARE_VM_OOPS_ARRAYOOP_HPP
+#ifndef SHARE_OOPS_ARRAYOOP_HPP
+#define SHARE_OOPS_ARRAYOOP_HPP
#include "memory/universe.hpp"
#include "oops/oop.hpp"
@@ -150,4 +150,4 @@ class arrayOopDesc : public oopDesc {
};
-#endif // SHARE_VM_OOPS_ARRAYOOP_HPP
+#endif // SHARE_OOPS_ARRAYOOP_HPP
diff --git a/src/hotspot/share/oops/compiledICHolder.hpp b/src/hotspot/share/oops/compiledICHolder.hpp
index b5b5199bb5b..56e4311ada5 100644
--- a/src/hotspot/share/oops/compiledICHolder.hpp
+++ b/src/hotspot/share/oops/compiledICHolder.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
*
*/
-#ifndef SHARE_VM_OOPS_COMPILEDICHOLDEROOP_HPP
-#define SHARE_VM_OOPS_COMPILEDICHOLDEROOP_HPP
+#ifndef SHARE_OOPS_COMPILEDICHOLDER_HPP
+#define SHARE_OOPS_COMPILEDICHOLDER_HPP
#include "oops/oop.hpp"
#include "utilities/macros.hpp"
@@ -97,4 +97,4 @@ class CompiledICHolder : public CHeapObj {
void claim() NOT_DEBUG_RETURN;
};
-#endif // SHARE_VM_OOPS_COMPILEDICHOLDEROOP_HPP
+#endif // SHARE_OOPS_COMPILEDICHOLDER_HPP
diff --git a/src/hotspot/share/oops/constMethod.hpp b/src/hotspot/share/oops/constMethod.hpp
index 64d12bc7711..e516309d74b 100644
--- a/src/hotspot/share/oops/constMethod.hpp
+++ b/src/hotspot/share/oops/constMethod.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2003, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
*
*/
-#ifndef SHARE_VM_OOPS_CONSTMETHODOOP_HPP
-#define SHARE_VM_OOPS_CONSTMETHODOOP_HPP
+#ifndef SHARE_OOPS_CONSTMETHOD_HPP
+#define SHARE_OOPS_CONSTMETHOD_HPP
#include "oops/oop.hpp"
#include "utilities/align.hpp"
@@ -561,4 +561,4 @@ private:
void verify_on(outputStream* st);
};
-#endif // SHARE_VM_OOPS_CONSTMETHODOOP_HPP
+#endif // SHARE_OOPS_CONSTMETHOD_HPP
diff --git a/src/hotspot/share/oops/constantPool.cpp b/src/hotspot/share/oops/constantPool.cpp
index bcce4d32e3c..9e87bf14daa 100644
--- a/src/hotspot/share/oops/constantPool.cpp
+++ b/src/hotspot/share/oops/constantPool.cpp
@@ -504,10 +504,6 @@ Klass* ConstantPool::klass_at_impl(const constantPoolHandle& this_cp, int which,
}
}
- // Make this class loader depend upon the class loader owning the class reference
- ClassLoaderData* this_key = this_cp->pool_holder()->class_loader_data();
- this_key->record_dependency(k);
-
// logging for class+resolve.
if (log_is_enabled(Debug, class, resolve)){
trace_class_resolution(this_cp, k);
diff --git a/src/hotspot/share/oops/constantPool.hpp b/src/hotspot/share/oops/constantPool.hpp
index dc74e287295..c1a181a8ba2 100644
--- a/src/hotspot/share/oops/constantPool.hpp
+++ b/src/hotspot/share/oops/constantPool.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
*
*/
-#ifndef SHARE_VM_OOPS_CONSTANTPOOLOOP_HPP
-#define SHARE_VM_OOPS_CONSTANTPOOLOOP_HPP
+#ifndef SHARE_OOPS_CONSTANTPOOL_HPP
+#define SHARE_OOPS_CONSTANTPOOL_HPP
#include "memory/allocation.hpp"
#include "oops/arrayOop.hpp"
@@ -1024,4 +1024,4 @@ class SymbolHashMap: public CHeapObj {
~SymbolHashMap();
}; // End SymbolHashMap class
-#endif // SHARE_VM_OOPS_CONSTANTPOOLOOP_HPP
+#endif // SHARE_OOPS_CONSTANTPOOL_HPP
diff --git a/src/hotspot/share/oops/constantPool.inline.hpp b/src/hotspot/share/oops/constantPool.inline.hpp
index 43aaa460c95..d8c7886bc54 100644
--- a/src/hotspot/share/oops/constantPool.inline.hpp
+++ b/src/hotspot/share/oops/constantPool.inline.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
*
*/
-#ifndef SHARE_VM_OOPS_CONSTANTPOOL_INLINE_HPP
-#define SHARE_VM_OOPS_CONSTANTPOOL_INLINE_HPP
+#ifndef SHARE_OOPS_CONSTANTPOOL_INLINE_HPP
+#define SHARE_OOPS_CONSTANTPOOL_INLINE_HPP
#include "oops/constantPool.hpp"
#include "oops/cpCache.inline.hpp"
@@ -67,4 +67,4 @@ inline oop ConstantPool::pseudo_string_at(int which) {
return s;
}
-#endif // SHARE_VM_OOPS_CONSTANTPOOL_INLINE_HPP
+#endif // SHARE_OOPS_CONSTANTPOOL_INLINE_HPP
diff --git a/src/hotspot/share/oops/cpCache.cpp b/src/hotspot/share/oops/cpCache.cpp
index 77c2305e445..b3f503b25e2 100644
--- a/src/hotspot/share/oops/cpCache.cpp
+++ b/src/hotspot/share/oops/cpCache.cpp
@@ -253,11 +253,21 @@ void ConstantPoolCacheEntry::set_direct_or_vtable_call(Bytecodes::Code invoke_co
if (byte_no == 1) {
assert(invoke_code != Bytecodes::_invokevirtual &&
invoke_code != Bytecodes::_invokeinterface, "");
+ bool do_resolve = true;
// Don't mark invokespecial to method as resolved if sender is an interface. The receiver
// has to be checked that it is a subclass of the current class every time this bytecode
// is executed.
- if (invoke_code != Bytecodes::_invokespecial || !sender_is_interface ||
- method->name() == vmSymbols::object_initializer_name()) {
+ if (invoke_code == Bytecodes::_invokespecial && sender_is_interface &&
+ method->name() != vmSymbols::object_initializer_name()) {
+ do_resolve = false;
+ }
+ // Don't mark invokestatic to method as resolved if the holder class has not yet completed
+ // initialization. An invokestatic must only proceed if the class is initialized, but if
+ // we resolve it before then that class initialization check is skipped.
+ if (invoke_code == Bytecodes::_invokestatic && !method->method_holder()->is_initialized()) {
+ do_resolve = false;
+ }
+ if (do_resolve) {
set_bytecode_1(invoke_code);
}
} else if (byte_no == 2) {
diff --git a/src/hotspot/share/oops/cpCache.hpp b/src/hotspot/share/oops/cpCache.hpp
index 2a93500b794..b2f49e0377b 100644
--- a/src/hotspot/share/oops/cpCache.hpp
+++ b/src/hotspot/share/oops/cpCache.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
*
*/
-#ifndef SHARE_VM_OOPS_CPCACHEOOP_HPP
-#define SHARE_VM_OOPS_CPCACHEOOP_HPP
+#ifndef SHARE_OOPS_CPCACHE_HPP
+#define SHARE_OOPS_CPCACHE_HPP
#include "interpreter/bytecodes.hpp"
#include "memory/allocation.hpp"
@@ -526,4 +526,4 @@ class ConstantPoolCache: public MetaspaceObj {
void verify_on(outputStream* st);
};
-#endif // SHARE_VM_OOPS_CPCACHEOOP_HPP
+#endif // SHARE_OOPS_CPCACHE_HPP
diff --git a/src/hotspot/share/oops/cpCache.inline.hpp b/src/hotspot/share/oops/cpCache.inline.hpp
index c876e669de3..6285dd9fa82 100644
--- a/src/hotspot/share/oops/cpCache.inline.hpp
+++ b/src/hotspot/share/oops/cpCache.inline.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
*
*/
-#ifndef SHARE_VM_OOPS_CPCACHEOOP_INLINE_HPP
-#define SHARE_VM_OOPS_CPCACHEOOP_INLINE_HPP
+#ifndef SHARE_OOPS_CPCACHE_INLINE_HPP
+#define SHARE_OOPS_CPCACHE_INLINE_HPP
#include "oops/cpCache.hpp"
#include "oops/oopHandle.inline.hpp"
@@ -99,4 +99,4 @@ inline ConstantPoolCache::ConstantPoolCache(int length,
inline oop ConstantPoolCache::resolved_references() { return _resolved_references.resolve(); }
-#endif // SHARE_VM_OOPS_CPCACHEOOP_INLINE_HPP
+#endif // SHARE_OOPS_CPCACHE_INLINE_HPP
diff --git a/src/hotspot/share/oops/fieldInfo.hpp b/src/hotspot/share/oops/fieldInfo.hpp
index 57a629d80bc..5612ed2b393 100644
--- a/src/hotspot/share/oops/fieldInfo.hpp
+++ b/src/hotspot/share/oops/fieldInfo.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2011, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
*
*/
-#ifndef SHARE_VM_OOPS_FIELDINFO_HPP
-#define SHARE_VM_OOPS_FIELDINFO_HPP
+#ifndef SHARE_OOPS_FIELDINFO_HPP
+#define SHARE_OOPS_FIELDINFO_HPP
#include "oops/constantPool.hpp"
#include "oops/typeArrayOop.hpp"
@@ -254,4 +254,4 @@ class FieldInfo {
}
};
-#endif // SHARE_VM_OOPS_FIELDINFO_HPP
+#endif // SHARE_OOPS_FIELDINFO_HPP
diff --git a/src/hotspot/share/oops/fieldStreams.hpp b/src/hotspot/share/oops/fieldStreams.hpp
index b9a44c93d77..4841612c553 100644
--- a/src/hotspot/share/oops/fieldStreams.hpp
+++ b/src/hotspot/share/oops/fieldStreams.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2011, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
*
*/
-#ifndef SHARE_VM_OOPS_FIELDSTREAMS_HPP
-#define SHARE_VM_OOPS_FIELDSTREAMS_HPP
+#ifndef SHARE_OOPS_FIELDSTREAMS_HPP
+#define SHARE_OOPS_FIELDSTREAMS_HPP
#include "oops/instanceKlass.hpp"
#include "oops/fieldInfo.hpp"
@@ -246,4 +246,4 @@ class AllFieldStream : public FieldStreamBase {
AllFieldStream(InstanceKlass* k): FieldStreamBase(k->fields(), k->constants()) {}
};
-#endif // SHARE_VM_OOPS_FIELDSTREAMS_HPP
+#endif // SHARE_OOPS_FIELDSTREAMS_HPP
diff --git a/src/hotspot/share/oops/generateOopMap.hpp b/src/hotspot/share/oops/generateOopMap.hpp
index b1cc01c730b..a00f63a8505 100644
--- a/src/hotspot/share/oops/generateOopMap.hpp
+++ b/src/hotspot/share/oops/generateOopMap.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
*
*/
-#ifndef SHARE_VM_OOPS_GENERATEOOPMAP_HPP
-#define SHARE_VM_OOPS_GENERATEOOPMAP_HPP
+#ifndef SHARE_OOPS_GENERATEOOPMAP_HPP
+#define SHARE_OOPS_GENERATEOOPMAP_HPP
#include "interpreter/bytecodeStream.hpp"
#include "memory/allocation.hpp"
@@ -563,4 +563,4 @@ class GeneratePairingInfo: public GenerateOopMap {
// Call compute_map(CHECK) to generate info.
};
-#endif // SHARE_VM_OOPS_GENERATEOOPMAP_HPP
+#endif // SHARE_OOPS_GENERATEOOPMAP_HPP
diff --git a/src/hotspot/share/oops/instanceClassLoaderKlass.hpp b/src/hotspot/share/oops/instanceClassLoaderKlass.hpp
index c8dac589d2d..79a08121997 100644
--- a/src/hotspot/share/oops/instanceClassLoaderKlass.hpp
+++ b/src/hotspot/share/oops/instanceClassLoaderKlass.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2011, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
*
*/
-#ifndef SHARE_VM_OOPS_INSTANCECLASSLOADERKLASS_HPP
-#define SHARE_VM_OOPS_INSTANCECLASSLOADERKLASS_HPP
+#ifndef SHARE_OOPS_INSTANCECLASSLOADERKLASS_HPP
+#define SHARE_OOPS_INSTANCECLASSLOADERKLASS_HPP
#include "oops/instanceKlass.hpp"
#include "utilities/macros.hpp"
@@ -68,4 +68,4 @@ public:
inline void oop_oop_iterate_bounded(oop obj, OopClosureType* closure, MemRegion mr);
};
-#endif // SHARE_VM_OOPS_INSTANCECLASSLOADERKLASS_HPP
+#endif // SHARE_OOPS_INSTANCECLASSLOADERKLASS_HPP
diff --git a/src/hotspot/share/oops/instanceClassLoaderKlass.inline.hpp b/src/hotspot/share/oops/instanceClassLoaderKlass.inline.hpp
index c0321d32469..681d3735cfb 100644
--- a/src/hotspot/share/oops/instanceClassLoaderKlass.inline.hpp
+++ b/src/hotspot/share/oops/instanceClassLoaderKlass.inline.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
*
*/
-#ifndef SHARE_VM_OOPS_INSTANCECLASSLOADERKLASS_INLINE_HPP
-#define SHARE_VM_OOPS_INSTANCECLASSLOADERKLASS_INLINE_HPP
+#ifndef SHARE_OOPS_INSTANCECLASSLOADERKLASS_INLINE_HPP
+#define SHARE_OOPS_INSTANCECLASSLOADERKLASS_INLINE_HPP
#include "classfile/javaClasses.hpp"
#include "memory/iterator.hpp"
@@ -70,4 +70,4 @@ inline void InstanceClassLoaderKlass::oop_oop_iterate_bounded(oop obj, OopClosur
}
}
-#endif // SHARE_VM_OOPS_INSTANCECLASSLOADERKLASS_INLINE_HPP
+#endif // SHARE_OOPS_INSTANCECLASSLOADERKLASS_INLINE_HPP
diff --git a/src/hotspot/share/oops/instanceKlass.cpp b/src/hotspot/share/oops/instanceKlass.cpp
index eb6e9d1e97e..fbb68541e4e 100644
--- a/src/hotspot/share/oops/instanceKlass.cpp
+++ b/src/hotspot/share/oops/instanceKlass.cpp
@@ -918,25 +918,28 @@ void InstanceKlass::initialize_impl(TRAPS) {
bool wait = false;
+ assert(THREAD->is_Java_thread(), "non-JavaThread in initialize_impl");
+ JavaThread* jt = (JavaThread*)THREAD;
+
// refer to the JVM book page 47 for description of steps
// Step 1
{
Handle h_init_lock(THREAD, init_lock());
ObjectLocker ol(h_init_lock, THREAD, h_init_lock() != NULL);
- Thread *self = THREAD; // it's passed the current thread
-
// Step 2
// If we were to use wait() instead of waitInterruptibly() then
// we might end up throwing IE from link/symbol resolution sites
// that aren't expected to throw. This would wreak havoc. See 6320309.
- while(is_being_initialized() && !is_reentrant_initialization(self)) {
- wait = true;
- ol.waitUninterruptibly(CHECK);
+ while (is_being_initialized() && !is_reentrant_initialization(jt)) {
+ wait = true;
+ jt->set_class_to_be_initialized(this);
+ ol.waitUninterruptibly(jt);
+ jt->set_class_to_be_initialized(NULL);
}
// Step 3
- if (is_being_initialized() && is_reentrant_initialization(self)) {
+ if (is_being_initialized() && is_reentrant_initialization(jt)) {
DTRACE_CLASSINIT_PROBE_WAIT(recursive, -1, wait);
return;
}
@@ -966,7 +969,7 @@ void InstanceKlass::initialize_impl(TRAPS) {
// Step 6
set_init_state(being_initialized);
- set_init_thread(self);
+ set_init_thread(jt);
}
// Step 7
@@ -1006,8 +1009,6 @@ void InstanceKlass::initialize_impl(TRAPS) {
// Step 8
{
- assert(THREAD->is_Java_thread(), "non-JavaThread in initialize_impl");
- JavaThread* jt = (JavaThread*)THREAD;
DTRACE_CLASSINIT_PROBE_WAIT(clinit, -1, wait);
// Timer includes any side effects of class initialization (resolution,
// etc), but not recursive entry into call_class_initializer().
@@ -1033,14 +1034,14 @@ void InstanceKlass::initialize_impl(TRAPS) {
CLEAR_PENDING_EXCEPTION;
// JVMTI has already reported the pending exception
// JVMTI internal flag reset is needed in order to report ExceptionInInitializerError
- JvmtiExport::clear_detected_exception((JavaThread*)THREAD);
+ JvmtiExport::clear_detected_exception(jt);
{
EXCEPTION_MARK;
set_initialization_state_and_notify(initialization_error, THREAD);
CLEAR_PENDING_EXCEPTION; // ignore any exception thrown, class initialization error is thrown below
// JVMTI has already reported the pending exception
// JVMTI internal flag reset is needed in order to report ExceptionInInitializerError
- JvmtiExport::clear_detected_exception((JavaThread*)THREAD);
+ JvmtiExport::clear_detected_exception(jt);
}
DTRACE_CLASSINIT_PROBE_WAIT(error, -1, wait);
if (e->is_a(SystemDictionary::Error_klass())) {
@@ -2178,6 +2179,7 @@ void InstanceKlass::clean_method_data() {
for (int m = 0; m < methods()->length(); m++) {
MethodData* mdo = methods()->at(m)->method_data();
if (mdo != NULL) {
+ MutexLockerEx ml(SafepointSynchronize::is_at_safepoint() ? NULL : mdo->extra_data_lock());
mdo->clean_method_data(/*always_clean*/false);
}
}
@@ -2372,9 +2374,8 @@ void InstanceKlass::restore_unshareable_info(ClassLoaderData* loader_data, Handl
Array* methods = this->methods();
int num_methods = methods->length();
- for (int index2 = 0; index2 < num_methods; ++index2) {
- methodHandle m(THREAD, methods->at(index2));
- m->restore_unshareable_info(CHECK);
+ for (int index = 0; index < num_methods; ++index) {
+ methods->at(index)->restore_unshareable_info(CHECK);
}
if (JvmtiExport::has_redefined_a_class()) {
// Reinitialize vtable because RedefineClasses may have changed some
@@ -3654,14 +3655,14 @@ void JNIid::verify(Klass* holder) {
}
}
-#ifdef ASSERT
void InstanceKlass::set_init_state(ClassState state) {
+#ifdef ASSERT
bool good_state = is_shared() ? (_init_state <= state)
: (_init_state < state);
assert(good_state || state == allocated, "illegal state transition");
+#endif
_init_state = (u1)state;
}
-#endif
#if INCLUDE_JVMTI
diff --git a/src/hotspot/share/oops/instanceKlass.hpp b/src/hotspot/share/oops/instanceKlass.hpp
index 5b8ebd763e5..3d4aafaf81f 100644
--- a/src/hotspot/share/oops/instanceKlass.hpp
+++ b/src/hotspot/share/oops/instanceKlass.hpp
@@ -22,8 +22,8 @@
*
*/
-#ifndef SHARE_VM_OOPS_INSTANCEKLASS_HPP
-#define SHARE_VM_OOPS_INSTANCEKLASS_HPP
+#ifndef SHARE_OOPS_INSTANCEKLASS_HPP
+#define SHARE_OOPS_INSTANCEKLASS_HPP
#include "classfile/classLoader.hpp"
#include "classfile/classLoaderData.hpp"
@@ -1243,11 +1243,7 @@ public:
private:
// initialization state
-#ifdef ASSERT
void set_init_state(ClassState state);
-#else
- void set_init_state(ClassState state) { _init_state = (u1)state; }
-#endif
void set_rewritten() { _misc_flags |= _misc_rewritten; }
void set_init_thread(Thread *thread) { _init_thread = thread; }
@@ -1474,4 +1470,4 @@ class InnerClassesIterator : public StackObj {
}
};
-#endif // SHARE_VM_OOPS_INSTANCEKLASS_HPP
+#endif // SHARE_OOPS_INSTANCEKLASS_HPP
diff --git a/src/hotspot/share/oops/instanceKlass.inline.hpp b/src/hotspot/share/oops/instanceKlass.inline.hpp
index 771ae9a9494..8735166ae1b 100644
--- a/src/hotspot/share/oops/instanceKlass.inline.hpp
+++ b/src/hotspot/share/oops/instanceKlass.inline.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2015, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
*
*/
-#ifndef SHARE_VM_OOPS_INSTANCEKLASS_INLINE_HPP
-#define SHARE_VM_OOPS_INSTANCEKLASS_INLINE_HPP
+#ifndef SHARE_OOPS_INSTANCEKLASS_INLINE_HPP
+#define SHARE_OOPS_INSTANCEKLASS_INLINE_HPP
#include "memory/iterator.hpp"
#include "oops/instanceKlass.hpp"
@@ -157,4 +157,4 @@ ALWAYSINLINE void InstanceKlass::oop_oop_iterate_bounded(oop obj, OopClosureType
oop_oop_iterate_oop_maps_bounded(obj, closure, mr);
}
-#endif // SHARE_VM_OOPS_INSTANCEKLASS_INLINE_HPP
+#endif // SHARE_OOPS_INSTANCEKLASS_INLINE_HPP
diff --git a/src/hotspot/share/oops/instanceMirrorKlass.cpp b/src/hotspot/share/oops/instanceMirrorKlass.cpp
index 8073eb30620..8c4c24cc27e 100644
--- a/src/hotspot/share/oops/instanceMirrorKlass.cpp
+++ b/src/hotspot/share/oops/instanceMirrorKlass.cpp
@@ -23,7 +23,7 @@
*/
#include "precompiled.hpp"
-#include "classfile/javaClasses.hpp"
+#include "classfile/javaClasses.inline.hpp"
#include "classfile/systemDictionary.hpp"
#include "gc/shared/collectedHeap.inline.hpp"
#include "memory/iterator.inline.hpp"
diff --git a/src/hotspot/share/oops/instanceMirrorKlass.hpp b/src/hotspot/share/oops/instanceMirrorKlass.hpp
index c2e905d6770..c3e1323ce9e 100644
--- a/src/hotspot/share/oops/instanceMirrorKlass.hpp
+++ b/src/hotspot/share/oops/instanceMirrorKlass.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2011, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
*
*/
-#ifndef SHARE_VM_OOPS_INSTANCEMIRRORKLASS_HPP
-#define SHARE_VM_OOPS_INSTANCEMIRRORKLASS_HPP
+#ifndef SHARE_OOPS_INSTANCEMIRRORKLASS_HPP
+#define SHARE_OOPS_INSTANCEMIRRORKLASS_HPP
#include "classfile/systemDictionary.hpp"
#include "oops/instanceKlass.hpp"
@@ -121,4 +121,4 @@ class InstanceMirrorKlass: public InstanceKlass {
inline void oop_oop_iterate_statics_bounded(oop obj, OopClosureType* closure, MemRegion mr);
};
-#endif // SHARE_VM_OOPS_INSTANCEMIRRORKLASS_HPP
+#endif // SHARE_OOPS_INSTANCEMIRRORKLASS_HPP
diff --git a/src/hotspot/share/oops/instanceMirrorKlass.inline.hpp b/src/hotspot/share/oops/instanceMirrorKlass.inline.hpp
index 5b650c1e77c..ee3679c70aa 100644
--- a/src/hotspot/share/oops/instanceMirrorKlass.inline.hpp
+++ b/src/hotspot/share/oops/instanceMirrorKlass.inline.hpp
@@ -1,4 +1,4 @@
-/* Copyright (c) 2015, 2018, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2015, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -21,8 +21,8 @@
*
*/
-#ifndef SHARE_VM_OOPS_INSTANCEMIRRORKLASS_INLINE_HPP
-#define SHARE_VM_OOPS_INSTANCEMIRRORKLASS_INLINE_HPP
+#ifndef SHARE_OOPS_INSTANCEMIRRORKLASS_INLINE_HPP
+#define SHARE_OOPS_INSTANCEMIRRORKLASS_INLINE_HPP
#include "classfile/javaClasses.hpp"
#include "oops/instanceKlass.inline.hpp"
@@ -127,4 +127,4 @@ void InstanceMirrorKlass::oop_oop_iterate_bounded(oop obj, OopClosureType* closu
oop_oop_iterate_statics_bounded(obj, closure, mr);
}
-#endif // SHARE_VM_OOPS_INSTANCEMIRRORKLASS_INLINE_HPP
+#endif // SHARE_OOPS_INSTANCEMIRRORKLASS_INLINE_HPP
diff --git a/src/hotspot/share/oops/instanceOop.hpp b/src/hotspot/share/oops/instanceOop.hpp
index 5186aa3b817..5a7d5fe05c3 100644
--- a/src/hotspot/share/oops/instanceOop.hpp
+++ b/src/hotspot/share/oops/instanceOop.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
*
*/
-#ifndef SHARE_VM_OOPS_INSTANCEOOP_HPP
-#define SHARE_VM_OOPS_INSTANCEOOP_HPP
+#ifndef SHARE_OOPS_INSTANCEOOP_HPP
+#define SHARE_OOPS_INSTANCEOOP_HPP
#include "oops/oop.hpp"
@@ -51,4 +51,4 @@ class instanceOopDesc : public oopDesc {
}
};
-#endif // SHARE_VM_OOPS_INSTANCEOOP_HPP
+#endif // SHARE_OOPS_INSTANCEOOP_HPP
diff --git a/src/hotspot/share/oops/instanceRefKlass.hpp b/src/hotspot/share/oops/instanceRefKlass.hpp
index 66086bc1248..eec9b8404e8 100644
--- a/src/hotspot/share/oops/instanceRefKlass.hpp
+++ b/src/hotspot/share/oops/instanceRefKlass.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
*
*/
-#ifndef SHARE_VM_OOPS_INSTANCEREFKLASS_HPP
-#define SHARE_VM_OOPS_INSTANCEREFKLASS_HPP
+#ifndef SHARE_OOPS_INSTANCEREFKLASS_HPP
+#define SHARE_OOPS_INSTANCEREFKLASS_HPP
#include "oops/instanceKlass.hpp"
#include "utilities/macros.hpp"
@@ -138,4 +138,4 @@ class InstanceRefKlass: public InstanceKlass {
void oop_verify_on(oop obj, outputStream* st);
};
-#endif // SHARE_VM_OOPS_INSTANCEREFKLASS_HPP
+#endif // SHARE_OOPS_INSTANCEREFKLASS_HPP
diff --git a/src/hotspot/share/oops/instanceRefKlass.inline.hpp b/src/hotspot/share/oops/instanceRefKlass.inline.hpp
index c9e72992fe8..4888381cc2c 100644
--- a/src/hotspot/share/oops/instanceRefKlass.inline.hpp
+++ b/src/hotspot/share/oops/instanceRefKlass.inline.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2015, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
*
*/
-#ifndef SHARE_VM_OOPS_INSTANCEREFKLASS_INLINE_HPP
-#define SHARE_VM_OOPS_INSTANCEREFKLASS_INLINE_HPP
+#ifndef SHARE_OOPS_INSTANCEREFKLASS_INLINE_HPP
+#define SHARE_OOPS_INSTANCEREFKLASS_INLINE_HPP
#include "classfile/javaClasses.inline.hpp"
#include "gc/shared/referenceProcessor.hpp"
@@ -197,4 +197,4 @@ void InstanceRefKlass::trace_reference_gc(const char *s, oop obj) {
}
#endif
-#endif // SHARE_VM_OOPS_INSTANCEREFKLASS_INLINE_HPP
+#endif // SHARE_OOPS_INSTANCEREFKLASS_INLINE_HPP
diff --git a/src/hotspot/share/oops/klass.hpp b/src/hotspot/share/oops/klass.hpp
index dd95ce233d0..2695772f08f 100644
--- a/src/hotspot/share/oops/klass.hpp
+++ b/src/hotspot/share/oops/klass.hpp
@@ -22,8 +22,8 @@
*
*/
-#ifndef SHARE_VM_OOPS_KLASS_HPP
-#define SHARE_VM_OOPS_KLASS_HPP
+#ifndef SHARE_OOPS_KLASS_HPP
+#define SHARE_OOPS_KLASS_HPP
#include "classfile/classLoaderData.hpp"
#include "memory/iterator.hpp"
@@ -706,4 +706,4 @@ protected:
static Klass* decode_klass(narrowKlass v);
};
-#endif // SHARE_VM_OOPS_KLASS_HPP
+#endif // SHARE_OOPS_KLASS_HPP
diff --git a/src/hotspot/share/oops/klass.inline.hpp b/src/hotspot/share/oops/klass.inline.hpp
index 5609980579f..3cd5190159a 100644
--- a/src/hotspot/share/oops/klass.inline.hpp
+++ b/src/hotspot/share/oops/klass.inline.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2005, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
*
*/
-#ifndef SHARE_VM_OOPS_KLASS_INLINE_HPP
-#define SHARE_VM_OOPS_KLASS_INLINE_HPP
+#ifndef SHARE_OOPS_KLASS_INLINE_HPP
+#define SHARE_OOPS_KLASS_INLINE_HPP
#include "memory/universe.hpp"
#include "oops/klass.hpp"
@@ -71,4 +71,4 @@ inline Klass* Klass::decode_klass(narrowKlass v) {
return is_null(v) ? (Klass*)NULL : decode_klass_not_null(v);
}
-#endif // SHARE_VM_OOPS_KLASS_INLINE_HPP
+#endif // SHARE_OOPS_KLASS_INLINE_HPP
diff --git a/src/hotspot/share/oops/klassVtable.hpp b/src/hotspot/share/oops/klassVtable.hpp
index 02be612a51b..08e35cd0b34 100644
--- a/src/hotspot/share/oops/klassVtable.hpp
+++ b/src/hotspot/share/oops/klassVtable.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
*
*/
-#ifndef SHARE_VM_OOPS_KLASSVTABLE_HPP
-#define SHARE_VM_OOPS_KLASSVTABLE_HPP
+#ifndef SHARE_OOPS_KLASSVTABLE_HPP
+#define SHARE_OOPS_KLASSVTABLE_HPP
#include "oops/oopsHierarchy.hpp"
#include "runtime/handles.hpp"
@@ -352,4 +352,4 @@ class klassItable {
static void update_stats(int size) PRODUCT_RETURN NOT_PRODUCT({ _total_classes++; _total_size += size; })
};
-#endif // SHARE_VM_OOPS_KLASSVTABLE_HPP
+#endif // SHARE_OOPS_KLASSVTABLE_HPP
diff --git a/src/hotspot/share/oops/markOop.hpp b/src/hotspot/share/oops/markOop.hpp
index d49beb33bfc..4873df39900 100644
--- a/src/hotspot/share/oops/markOop.hpp
+++ b/src/hotspot/share/oops/markOop.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
*
*/
-#ifndef SHARE_VM_OOPS_MARKOOP_HPP
-#define SHARE_VM_OOPS_MARKOOP_HPP
+#ifndef SHARE_OOPS_MARKOOP_HPP
+#define SHARE_OOPS_MARKOOP_HPP
#include "oops/oop.hpp"
@@ -403,4 +403,4 @@ class markOopDesc: public oopDesc {
#endif // _LP64
};
-#endif // SHARE_VM_OOPS_MARKOOP_HPP
+#endif // SHARE_OOPS_MARKOOP_HPP
diff --git a/src/hotspot/share/oops/markOop.inline.hpp b/src/hotspot/share/oops/markOop.inline.hpp
index 77d2fee0ebb..900d9da96f5 100644
--- a/src/hotspot/share/oops/markOop.inline.hpp
+++ b/src/hotspot/share/oops/markOop.inline.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2006, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2006, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
*
*/
-#ifndef SHARE_VM_OOPS_MARKOOP_INLINE_HPP
-#define SHARE_VM_OOPS_MARKOOP_INLINE_HPP
+#ifndef SHARE_OOPS_MARKOOP_INLINE_HPP
+#define SHARE_OOPS_MARKOOP_INLINE_HPP
#include "oops/klass.hpp"
#include "oops/markOop.hpp"
@@ -111,4 +111,4 @@ inline markOop markOopDesc::prototype_for_object(oop obj) {
return obj->klass()->prototype_header();
}
-#endif // SHARE_VM_OOPS_MARKOOP_INLINE_HPP
+#endif // SHARE_OOPS_MARKOOP_INLINE_HPP
diff --git a/src/hotspot/share/oops/metadata.hpp b/src/hotspot/share/oops/metadata.hpp
index 8acdd88c9ae..253c383d548 100644
--- a/src/hotspot/share/oops/metadata.hpp
+++ b/src/hotspot/share/oops/metadata.hpp
@@ -22,8 +22,8 @@
*
*/
-#ifndef SHARE_VM_OOPS_METADATA_HPP
-#define SHARE_VM_OOPS_METADATA_HPP
+#ifndef SHARE_OOPS_METADATA_HPP
+#define SHARE_OOPS_METADATA_HPP
#include "utilities/exceptions.hpp"
#include "utilities/globalDefinitions.hpp"
@@ -76,4 +76,4 @@ class Metadata : public MetaspaceObj {
static void mark_on_stack(Metadata* m) { m->set_on_stack(true); }
};
-#endif // SHARE_VM_OOPS_METADATA_HPP
+#endif // SHARE_OOPS_METADATA_HPP
diff --git a/src/hotspot/share/oops/method.cpp b/src/hotspot/share/oops/method.cpp
index ff14e566954..9a2961521ea 100644
--- a/src/hotspot/share/oops/method.cpp
+++ b/src/hotspot/share/oops/method.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -1604,12 +1604,12 @@ static int method_comparator(Method* a, Method* b) {
// This is only done during class loading, so it is OK to assume method_idnum matches the methods() array
// default_methods also uses this without the ordering for fast find_method
-void Method::sort_methods(Array* methods, bool idempotent, bool set_idnums) {
+void Method::sort_methods(Array* methods, bool set_idnums) {
int length = methods->length();
if (length > 1) {
{
NoSafepointVerifier nsv;
- QuickSort::sort(methods->data(), length, method_comparator, idempotent);
+ QuickSort::sort(methods->data(), length, method_comparator, /*idempotent=*/false);
}
// Reset method ordering
if (set_idnums) {
diff --git a/src/hotspot/share/oops/method.hpp b/src/hotspot/share/oops/method.hpp
index 9fa25712e94..d715d2e3b04 100644
--- a/src/hotspot/share/oops/method.hpp
+++ b/src/hotspot/share/oops/method.hpp
@@ -22,8 +22,8 @@
*
*/
-#ifndef SHARE_VM_OOPS_METHODOOP_HPP
-#define SHARE_VM_OOPS_METHODOOP_HPP
+#ifndef SHARE_OOPS_METHOD_HPP
+#define SHARE_OOPS_METHOD_HPP
#include "classfile/vmSymbols.hpp"
#include "code/compressedStream.hpp"
@@ -969,7 +969,7 @@ class Method : public Metadata {
#endif
// Helper routine used for method sorting
- static void sort_methods(Array