--- a/.hgtags Tue Mar 12 09:49:10 2019 +0000
+++ b/.hgtags Sat Mar 16 21:00:45 2019 +0000
@@ -548,3 +548,4 @@
b67884871b5fff79c5ef3eb8ac74dd48d71ea9b1 jdk-12+33
8e069f7b4fabfe05d9f500783e6d56cb0196d25c jdk-13+10
21ea4076a275a0f498afa517e9ee1b94a9cf0255 jdk-13+11
+1d7aec80147a6d92b101a76aef92f3ddc88bedf4 jdk-13+12
--- a/make/CompileJavaModules.gmk Tue Mar 12 09:49:10 2019 +0000
+++ b/make/CompileJavaModules.gmk Sat Mar 16 21:00:45 2019 +0000
@@ -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
@@ -38,7 +38,7 @@
################################################################################
# Module specific build settings
-java.base_ADD_JAVAC_FLAGS += -Xdoclint:all/protected,-reference '-Xdoclint/package:java.*,javax.*' -XDstringConcat=inline
+java.base_ADD_JAVAC_FLAGS += -Xdoclint:all/protected,-reference,-accessibility '-Xdoclint/package:java.*,javax.*' -XDstringConcat=inline
java.base_COPY += .icu .dat .spp content-types.properties hijrah-config-islamic-umalqura.properties
java.base_CLEAN += intrinsic.properties
@@ -79,7 +79,7 @@
################################################################################
-java.desktop_ADD_JAVAC_FLAGS += -Xdoclint:all/protected,-reference \
+java.desktop_ADD_JAVAC_FLAGS += -Xdoclint:all/protected,-reference,-accessibility \
'-Xdoclint/package:java.*,javax.*' -Xlint:exports \
--doclint-format html4
java.desktop_COPY += .gif .png .wav .txt .xml .css .pf
@@ -220,15 +220,15 @@
################################################################################
-java.instrument_ADD_JAVAC_FLAGS += -Xdoclint:all/protected '-Xdoclint/package:java.*,javax.*'
+java.instrument_ADD_JAVAC_FLAGS += -Xdoclint:all/protected,-accessibility '-Xdoclint/package:java.*,javax.*'
################################################################################
-java.logging_ADD_JAVAC_FLAGS += -Xdoclint:all/protected,-reference '-Xdoclint/package:java.*,javax.*'
+java.logging_ADD_JAVAC_FLAGS += -Xdoclint:all/protected,-reference,-accessibility '-Xdoclint/package:java.*,javax.*'
################################################################################
-java.management_ADD_JAVAC_FLAGS += -Xdoclint:all/protected,-reference '-Xdoclint/package:java.*,javax.*'
+java.management_ADD_JAVAC_FLAGS += -Xdoclint:all/protected,-reference,-accessibility '-Xdoclint/package:java.*,javax.*'
################################################################################
@@ -249,7 +249,7 @@
################################################################################
-java.sql.rowset_ADD_JAVAC_FLAGS += -Xdoclint:all/protected '-Xdoclint/package:java.*,javax.*'
+java.sql.rowset_ADD_JAVAC_FLAGS += -Xdoclint:all/protected,-accessibility '-Xdoclint/package:java.*,javax.*'
java.sql.rowset_CLEAN_FILES += $(wildcard \
$(TOPDIR)/src/java.sql.rowset/share/classes/com/sun/rowset/*.properties \
$(TOPDIR)/src/java.sql.rowset/share/classes/javax/sql/rowset/*.properties)
@@ -263,14 +263,14 @@
################################################################################
-java.xml_ADD_JAVAC_FLAGS += -Xdoclint:all/protected \
+java.xml_ADD_JAVAC_FLAGS += -Xdoclint:all/protected,-accessibility \
'-Xdoclint/package:$(call CommaList, javax.xml.catalog javax.xml.datatype \
javax.xml.transform javax.xml.validation javax.xml.xpath)'
java.xml_CLEAN += .properties
################################################################################
-java.naming_ADD_JAVAC_FLAGS += -Xdoclint:all/protected '-Xdoclint/package:java.*,javax.*' -Xlint:-exports
+java.naming_ADD_JAVAC_FLAGS += -Xdoclint:all/protected,-accessibility '-Xdoclint/package:java.*,javax.*' -Xlint:-exports
java.naming_CLEAN += jndiprovider.properties
################################################################################
@@ -279,7 +279,7 @@
################################################################################
-java.smartcardio_ADD_JAVAC_FLAGS += -Xdoclint:all/protected '-Xdoclint/package:java.*,javax.*'
+java.smartcardio_ADD_JAVAC_FLAGS += -Xdoclint:all/protected,-accessibility '-Xdoclint/package:java.*,javax.*'
################################################################################
@@ -461,6 +461,7 @@
org.graalvm.compiler.debug.test \
org.graalvm.compiler.graph.test \
org.graalvm.compiler.hotspot.amd64.test \
+ org.graalvm.compiler.hotspot.jdk9.test \
org.graalvm.compiler.hotspot.lir.test \
org.graalvm.compiler.hotspot.sparc.test \
org.graalvm.compiler.hotspot.test \
@@ -538,8 +539,13 @@
################################################################################
# If this is an imported module that has prebuilt classes, only compile
# module-info.java.
-ifneq ($(wildcard $(IMPORT_MODULES_CLASSES)/$(MODULE)), )
- $(MODULE)_INCLUDE_FILES := module-info.java
+ifneq ($(IMPORT_MODULES_CLASSES), )
+ IMPORT_MODULE_DIR := $(IMPORT_MODULES_CLASSES)/$(MODULE)
+ ifneq ($(wildcard $(IMPORT_MODULE_DIR)), )
+ $(MODULE)_INCLUDE_FILES := module-info.java
+ endif
+else
+ IMPORT_MODULE_DIR :=
endif
################################################################################
@@ -645,13 +651,13 @@
# If this is an imported module, copy the pre built classes and resources into
# the modules output dir
-ifneq ($(wildcard $(IMPORT_MODULES_CLASSES)/$(MODULE)), )
+ifneq ($(wildcard $(IMPORT_MODULE_DIR)), )
$(JDK_OUTPUTDIR)/modules/$(MODULE)/_imported.marker: \
- $(call CacheFind, $(IMPORT_MODULES_CLASSES)/$(MODULE))
+ $(call CacheFind, $(IMPORT_MODULE_DIR))
$(call MakeDir, $(@D))
# Do not delete marker and build meta data files
$(RM) -r $(filter-out $(@D)/_%, $(wildcard $(@D)/*))
- $(CP) -R $(IMPORT_MODULES_CLASSES)/$(MODULE)/* $(@D)/
+ $(CP) -R $(IMPORT_MODULE_DIR)/* $(@D)/
$(TOUCH) $@
TARGETS += $(JDK_OUTPUTDIR)/modules/$(MODULE)/_imported.marker
--- a/make/Images.gmk Tue Mar 12 09:49:10 2019 +0000
+++ b/make/Images.gmk Sat Mar 16 21:00:45 2019 +0000
@@ -112,7 +112,11 @@
JLINK_JRE_TARGETS := $(jlink_jre)
ifeq ($(BUILD_CDS_ARCHIVE), true)
- CDS_ARCHIVE := lib/server/classes.jsa
+ ifeq ($(OPENJDK_TARGET_OS), windows)
+ CDS_ARCHIVE := bin/server/classes.jsa
+ else
+ CDS_ARCHIVE := lib/server/classes.jsa
+ endif
$(eval $(call SetupExecute, gen_cds_archive_jdk, \
WARN := Creating CDS archive for jdk image, \
--- a/make/autoconf/toolchain.m4 Tue Mar 12 09:49:10 2019 +0000
+++ b/make/autoconf/toolchain.m4 Sat Mar 16 21:00:45 2019 +0000
@@ -643,14 +643,21 @@
[ LINKER_VERSION_NUMBER=`$ECHO $LINKER_VERSION_STRING | \
$SED -e 's/.* \([0-9][0-9]*\(\.[0-9][0-9]*\)*\).*/\1/'` ]
elif test "x$TOOLCHAIN_TYPE" = xgcc; then
- # gcc -Wl,-version output typically looks like
+ # gcc -Wl,-version output typically looks like:
# GNU ld (GNU Binutils for Ubuntu) 2.26.1
# Copyright (C) 2015 Free Software Foundation, Inc.
# This program is free software; [...]
- LINKER_VERSION_STRING=`$LD -Wl,-version 2>&1 | $HEAD -n 1`
+ # If using gold it will look like:
+ # GNU gold (GNU Binutils 2.30) 1.15
+ LINKER_VERSION_STRING=`$LD -Wl,--version 2> /dev/null | $HEAD -n 1`
# Extract version number
- [ LINKER_VERSION_NUMBER=`$ECHO $LINKER_VERSION_STRING | \
- $SED -e 's/.* \([0-9][0-9]*\(\.[0-9][0-9]*\)*\).*/\1/'` ]
+ if [ [[ "$LINKER_VERSION_STRING" == *gold* ]] ]; then
+ [ LINKER_VERSION_NUMBER=`$ECHO $LINKER_VERSION_STRING | \
+ $SED -e 's/.* \([0-9][0-9]*\(\.[0-9][0-9]*\)*\).*) .*/\1/'` ]
+ else
+ [ LINKER_VERSION_NUMBER=`$ECHO $LINKER_VERSION_STRING | \
+ $SED -e 's/.* \([0-9][0-9]*\(\.[0-9][0-9]*\)*\).*/\1/'` ]
+ fi
elif test "x$TOOLCHAIN_TYPE" = xclang; then
# clang -Wl,-v output typically looks like
# @(#)PROGRAM:ld PROJECT:ld64-305
--- a/make/common/NativeCompilation.gmk Tue Mar 12 09:49:10 2019 +0000
+++ b/make/common/NativeCompilation.gmk Sat Mar 16 21:00:45 2019 +0000
@@ -505,8 +505,9 @@
$$(foreach d, $$($1_SRC), $$(if $$(wildcard $$d), , \
$$(error SRC specified to SetupNativeCompilation $1 contains missing directory $$d)))
- # Find all files in the source trees. Preserve order.
- $1_SRCS := $$(foreach s, $$($1_SRC), $$(call CacheFind, $$(s)))
+ $1_SRCS_RAW = $$(call CacheFind, $$($1_SRC))
+ # Order src files according to the order of the src dirs
+ $1_SRCS := $$(foreach d, $$($1_SRC), $$(filter $$d%, $$($1_SRCS_RAW)))
$1_SRCS := $$(filter $$(NATIVE_SOURCE_EXTENSIONS), $$($1_SRCS))
# Extract the C/C++ files.
ifneq ($$($1_EXCLUDE_PATTERNS), )
@@ -970,10 +971,9 @@
$$(shell $(RM) $$($1_TARGET))
endif
$$($1_IMPORT_LIBRARY): $$($1_TARGET)
- $$(if $$(CORRECT_FUNCTION_IN_RECIPE_EVALUATION), \
- $$(if $$(wildcard $$@), , $$(error $$@ was not created for $$<)) \
- )
$(TOUCH) $$@
+
+ $1 += $$($1_IMPORT_LIBRARY)
endif
endif
--- a/make/common/ProcessMarkdown.gmk Tue Mar 12 09:49:10 2019 +0000
+++ b/make/common/ProcessMarkdown.gmk Sat Mar 16 21:00:45 2019 +0000
@@ -65,10 +65,13 @@
endif
endif
- $1_$2_OPTIONS := $$(shell $$(GREP) _pandoc-options_: $3/$2 | $$(CUT) -d : -f 2-)
+ # This does not need to be included in VARDEPS since it's from the actual
+ # source file. Only run the shell if the recipe gets executed below.
+ $1_$2_OPTIONS_FROM_SRC = \
+ $$(shell $$(GREP) _pandoc-options_: $3/$2 | $$(CUT) -d : -f 2-)
ifneq ($$($1_FILTER), )
- $1_$2_OPTIONS += --filter $$($1_FILTER)
+ $1_$2_OPTIONS := --filter $$($1_FILTER)
endif
$1_$2_VARDEPS := $$($1_OPTIONS) $$($1_$2_OPTIONS) $$($1_CSS) \
@@ -82,8 +85,8 @@
$$(call ExecuteWithLog, $$(SUPPORT_OUTPUTDIR)/markdown/$$($1_$2_MARKER), \
$$(PANDOC) $$($1_OPTIONS) -f $$(PANDOC_MARKDOWN_FLAG) \
-t $$($1_FORMAT) --standalone \
- $$($1_$2_CSS_OPTION) $$($1_$2_OPTIONS) '$$($1_$2_PANDOC_INPUT)' \
- -o '$$($1_$2_PANDOC_OUTPUT)')
+ $$($1_$2_CSS_OPTION) $$($1_$2_OPTIONS_FROM_SRC) $$($1_$2_OPTIONS) \
+ '$$($1_$2_PANDOC_INPUT)' -o '$$($1_$2_PANDOC_OUTPUT)')
ifneq ($$(findstring $$(LOG_LEVEL), debug trace),)
TOO_LONG_LINES=`$$(GREP) -E -e '^.{80}.+$$$$' $$<` || true ; \
if [ "x$$$$TOO_LONG_LINES" != x ]; then \
--- a/make/common/TestFilesCompilation.gmk Tue Mar 12 09:49:10 2019 +0000
+++ b/make/common/TestFilesCompilation.gmk Sat Mar 16 21:00:45 2019 +0000
@@ -90,8 +90,7 @@
$$(eval $$(call SetupNativeCompilation, BUILD_TEST_$$(name), \
NAME := $$(unprefixed_name), \
TYPE := $$($1_COMPILATION_TYPE), \
- SRC := $$(patsubst %/,%,$$(dir $$(file))), \
- INCLUDE_FILES := $$(notdir $$(file)), \
+ EXTRA_FILES := $$(file), \
OBJECT_DIR := $$($1_OUTPUT_DIR)/support/$$(name), \
OUTPUT_DIR := $$($1_OUTPUT_DIR)/$$($1_OUTPUT_SUBDIR), \
CFLAGS := $$($1_BASE_CFLAGS) $$($1_CFLAGS) $$($1_CFLAGS_$$(name)), \
--- a/make/conf/jib-profiles.js Tue Mar 12 09:49:10 2019 +0000
+++ b/make/conf/jib-profiles.js Sat Mar 16 21:00:45 2019 +0000
@@ -939,21 +939,26 @@
var getJibProfilesDependencies = function (input, common) {
var devkit_platform_revisions = {
- linux_x64: "gcc7.3.0-OEL6.4+1.2",
+ linux_x64: "gcc8.2.0-OL6.4+1.0",
macosx_x64: "Xcode10.1-MacOSX10.14+1.0",
solaris_x64: "SS12u4-Solaris11u1+1.0",
solaris_sparcv9: "SS12u6-Solaris11u3+1.0",
windows_x64: "VS2017-15.9.6+1.0",
- linux_aarch64: "gcc7.3.0-Fedora27+1.2",
- linux_arm: "gcc7.3.0-Fedora27+1.2",
- linux_ppc64le: "gcc7.3.0-Fedora27+1.0",
- linux_s390x: "gcc7.3.0-Fedora27+1.0"
+ linux_aarch64: "gcc8.2.0-Fedora27+1.0",
+ linux_arm: "gcc8.2.0-Fedora27+1.0",
+ linux_ppc64le: "gcc8.2.0-Fedora27+1.0",
+ linux_s390x: "gcc8.2.0-Fedora27+1.0"
};
var devkit_platform = (input.target_cpu == "x86"
? input.target_os + "_x64"
: input.target_platform);
+ var devkit_cross_prefix = "";
+ if (input.target_platform != input.build_platform) {
+ devkit_cross_prefix = input.build_platform + "-to-";
+ }
+
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")
@@ -984,7 +989,7 @@
devkit: {
organization: common.organization,
ext: "tar.gz",
- module: "devkit-" + devkit_platform,
+ module: "devkit-" + devkit_cross_prefix + devkit_platform,
revision: devkit_platform_revisions[devkit_platform],
environment: {
"DEVKIT_HOME": input.get("devkit", "home_path"),
--- a/make/data/charsetmapping/charsets Tue Mar 12 09:49:10 2019 +0000
+++ b/make/data/charsetmapping/charsets Sat Mar 16 21:00:45 2019 +0000
@@ -440,6 +440,8 @@
alias cp00858
alias 858
alias PC-Multilingual-850+euro
+ alias ibm858
+ alias ibm-858
charset IBM862 IBM862
package sun.nio.cs
@@ -1389,6 +1391,7 @@
alias cp833
alias ibm833
alias ibm-833
+ alias 833
charset x-IBM834 IBM834 # EBCDIC DBCS-only Korean
@@ -1590,6 +1593,8 @@
alias cp01140
alias 1140
alias ebcdic-us-037+euro
+ alias ibm1140
+ alias ibm-1140
charset IBM01141 IBM1141
package sun.nio.cs.ext
@@ -1601,6 +1606,8 @@
alias cp01141
alias 1141
alias ebcdic-de-273+euro
+ alias ibm1141
+ alias ibm-1141
charset IBM01142 IBM1142
package sun.nio.cs.ext
@@ -1613,6 +1620,8 @@
alias 1142
alias ebcdic-no-277+euro
alias ebcdic-dk-277+euro
+ alias ibm1142
+ alias ibm-1142
charset IBM01143 IBM1143
package sun.nio.cs.ext
@@ -1625,6 +1634,8 @@
alias 1143
alias ebcdic-fi-278+euro
alias ebcdic-se-278+euro
+ alias ibm1143
+ alias ibm-1143
charset IBM01144 IBM1144
package sun.nio.cs.ext
@@ -1636,6 +1647,8 @@
alias cp01144
alias 1144
alias ebcdic-it-280+euro
+ alias ibm1144
+ alias ibm-1144
charset IBM01145 IBM1145
package sun.nio.cs.ext
@@ -1647,6 +1660,8 @@
alias cp01145
alias 1145
alias ebcdic-es-284+euro
+ alias ibm1145
+ alias ibm-1145
charset IBM01146 IBM1146
package sun.nio.cs.ext
@@ -1658,6 +1673,8 @@
alias cp01146
alias 1146
alias ebcdic-gb-285+euro
+ alias ibm1146
+ alias ibm-1146
charset IBM01147 IBM1147
package sun.nio.cs.ext
@@ -1669,6 +1686,8 @@
alias cp01147
alias 1147
alias ebcdic-fr-277+euro
+ alias ibm1147
+ alias ibm-1147
charset IBM01148 IBM1148
package sun.nio.cs.ext
@@ -1680,6 +1699,8 @@
alias cp01148
alias 1148
alias ebcdic-international-500+euro
+ alias ibm1148
+ alias ibm-1148
charset IBM01149 IBM1149
package sun.nio.cs.ext
@@ -1691,6 +1712,8 @@
alias cp01149
alias 1149
alias ebcdic-s-871+euro
+ alias ibm1149
+ alias ibm-1149
charset IBM290 IBM290
package sun.nio.cs.ext
--- a/make/devkit/Makefile Tue Mar 12 09:49:10 2019 +0000
+++ b/make/devkit/Makefile Sat Mar 16 21:00:45 2019 +0000
@@ -29,14 +29,10 @@
# gcc based cross compilation, portable, self contained packages, capable
# of building OpenJDK.
#
-# In addition to the makefiles, access to Oracle Linux installation
-# media is required. This has been tested against Oracle Enterprise Linux
-# 6.4.
-#
# By default this Makefile will build a native toolchain for the current
# platform if called with something like this:
#
-# make tars BASE_OS=OEL6
+# make tars BASE_OS=OL
#
# To build the full set of crosstools for additional platforms, use a command
# line looking like this:
@@ -48,9 +44,19 @@
# to build several devkits for a specific OS version at once.
# You can find the final results under ../../build/devkit/result/<host>-to-<target>
#
+# You may want the native toolchain to be used when compiling the cross
+# compilation toolchains. To achieve this, first build the native toolchain,
+# then add the bin directory from this build to the path when invoking this
+# makefile again for cross compilation. Ex:
+#
+# PATH=$PWD/../../build/devkit/result/x86_64-linux-gnu-to-x86_64-linux-gnu/bin:$PATH \
+# make TARGETS="arm-linux-gnueabihf,ppc64-linux-gnu" BASE_OS=Fedora
+#
# This is the makefile which iterates over all host and target platforms.
#
+COMMA := ,
+
os := $(shell uname -o)
cpu := $(shell uname -p)
@@ -66,7 +72,7 @@
platforms := $(me)
host_platforms := $(platforms)
else
- platforms := $(TARGETS)
+ platforms := $(subst $(COMMA), , $(TARGETS))
host_platforms := $(me)
endif
target_platforms := $(platforms)
@@ -93,7 +99,7 @@
$(MAKE) -f Tools.gmk all $(submakevars) \
TARGET=$$p PREFIX=$(RESULT)/$@-to-$$p && \
$(MAKE) -f Tools.gmk ccache $(submakevars) \
- TARGET=$@ PREFIX=$(RESULT)/$@-to-$$p BUILDDIR=$(OUTPUT_ROOT)/$@/$$p || exit 1 ; \
+ TARGET=$@ PREFIX=$(RESULT)/$@-to-$$p || exit 1 ; \
done
@echo 'All done"'
@@ -103,7 +109,6 @@
$(1)-to-$(2)_tar = $$(RESULT)/sdk-$(1)-to-$(2)-$$(today).tar.gz
$$($(1)-to-$(2)_tar) : PLATFORM = $(1)-to-$(2)
TARFILES += $$($(1)-to-$(2)_tar)
- $$($(1)-to-$(2)_tar) : $$(shell find $$(RESULT)/$(1)-to-$(2) -type f)
endef
$(foreach p,$(host_platforms),$(foreach t,$(target_platforms),$(eval $(call Mktar,$(p),$(t)))))
@@ -111,9 +116,7 @@
tars : all $(TARFILES)
onlytars : $(TARFILES)
%.tar.gz :
- @echo 'Creating compiler package $@'
- cd $(RESULT) && tar -czf $@ $(PLATFORM)/*
- touch $@
+ $(MAKE) -r -f Tars.gmk SRC_DIR=$(RESULT)/$(PLATFORM) TAR_FILE=$@
clean :
rm -rf $(addprefix ../../build/devkit/, result $(host_platforms))
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/make/devkit/Tars.gmk Sat Mar 16 21:00:45 2019 +0000
@@ -0,0 +1,49 @@
+#
+# 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
+# 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.
+#
+
+# This makefile creates the tar files. It needs to be called with make -r
+# which is why it's separated out into its own file.
+
+# Input parameters
+# SRC_DIR
+# TAR_FILE
+
+ifeq ($(SRC_DIR), )
+ $(error SRC_DIR not set)
+endif
+ifeq ($(TAR_FILE), )
+ $(error TAR_FILE not set)
+endif
+
+default: tars
+
+tars : $(TAR_FILE)
+
+$(TAR_FILE): $(shell find $(SRC_DIR) -type f)
+ @echo 'Creating compiler package $@'
+ cd $(dir $(SRC_DIR)) && tar -czf $@ $(notdir $(SRC_DIR))/*
+ touch $@
+
+.PHONY: default tars
--- a/make/devkit/Tools.gmk Tue Mar 12 09:49:10 2019 +0000
+++ b/make/devkit/Tools.gmk Sat Mar 16 21:00:45 2019 +0000
@@ -51,9 +51,9 @@
$(info ARCH=$(ARCH))
-ifeq ($(BASE_OS), OEL6)
+ifeq ($(BASE_OS), OL)
BASE_URL := http://yum.oracle.com/repo/OracleLinux/OL6/4/base/$(ARCH)/
- LINUX_VERSION := OEL6.4
+ LINUX_VERSION := OL6.4
else ifeq ($(BASE_OS), Fedora)
DEFAULT_OS_VERSION := 27
ifeq ($(BASE_OS_VERSION), )
@@ -79,8 +79,17 @@
# Define external dependencies
# Latest that could be made to work.
-GCC_VER := 7.3.0
-ifeq ($(GCC_VER), 7.3.0)
+GCC_VER := 8.2.0
+ifeq ($(GCC_VER), 8.2.0)
+ gcc_ver := gcc-8.2.0
+ binutils_ver := binutils-2.30
+ ccache_ver := ccache-3.5.1a
+ CCACHE_DIRNAME := ccache-3.5.1
+ mpfr_ver := mpfr-3.1.5
+ gmp_ver := gmp-6.1.2
+ mpc_ver := mpc-1.0.3
+ gdb_ver := gdb-8.2.1
+else ifeq ($(GCC_VER), 7.3.0)
gcc_ver := gcc-7.3.0
binutils_ver := binutils-2.30
ccache_ver := ccache-3.3.6
@@ -174,14 +183,16 @@
# Generate downloading + unpacking of sources.
define Download
- $(1)_DIR = $(abspath $(SRCDIR)/$(basename $(basename $(notdir $($(1))))))
+ # Allow override
+ $(1)_DIRNAME ?= $(basename $(basename $(notdir $($(1)))))
+ $(1)_DIR = $(abspath $(SRCDIR)/$$($(1)_DIRNAME))
$(1)_CFG = $$($(1)_DIR)/configure
$(1)_FILE = $(DOWNLOAD)/$(notdir $($(1)))
$$($(1)_CFG) : $$($(1)_FILE)
mkdir -p $$(SRCDIR)
tar -C $$(SRCDIR) -xf $$<
- $$(foreach p,$$(abspath $$(wildcard $$(notdir $$($(1)_DIR)).patch)), \
+ $$(foreach p,$$(abspath $$(wildcard patches/$$(notdir $$($(1)_DIR)).patch)), \
echo PATCHING $$(p) ; \
patch -d $$($(1)_DIR) -p1 -i $$(p) ; \
)
@@ -370,7 +381,7 @@
--disable-nls \
--program-prefix=$(TARGET)- \
--enable-multilib \
- --enable-gold \
+ --enable-gold=default \
--enable-threads \
--enable-plugins \
) > $(@D)/log.config 2>&1
--- a/make/hotspot/ide/CreateVSProject.gmk Tue Mar 12 09:49:10 2019 +0000
+++ b/make/hotspot/ide/CreateVSProject.gmk Sat Mar 16 21:00:45 2019 +0000
@@ -30,6 +30,7 @@
include MakeBase.gmk
include JavaCompilation.gmk
include SetupJavaCompilers.gmk
+include Execute.gmk
ifeq ($(call isTargetOs, windows), true)
# The next part is a bit hacky. We include the CompileJvm.gmk to be
@@ -149,7 +150,7 @@
DEPS := $(BUILD_PROJECT_CREATOR) $(VCPROJ_VARDEPS_FILE), \
OUTPUT_FILE := $(VCPROJ_FILE), \
COMMAND := $(PROJECT_CREATOR_TOOL) $(PROJECT_CREATOR_CLASS) \
- $(PROJECT_CREATOR_ARGS) -projectFileName $(call FixPath, $(VCPROJ_FILE))) \
+ $(PROJECT_CREATOR_ARGS) -projectFileName $(call FixPath, $(VCPROJ_FILE)) \
$(LOG_INFO), \
))
--- a/make/hotspot/lib/CompileJvm.gmk Tue Mar 12 09:49:10 2019 +0000
+++ b/make/hotspot/lib/CompileJvm.gmk Sat Mar 16 21:00:45 2019 +0000
@@ -166,6 +166,9 @@
# default.
JVM_STRIPFLAGS ?= $(STRIPFLAGS)
+# This source set is reused so save in cache.
+$(eval $(call FillCacheFind, $(JVM_SRC_DIRS)))
+
################################################################################
# Now set up the actual compilation of the main hotspot native library
--- a/make/launcher/Launcher-java.base.gmk Tue Mar 12 09:49:10 2019 +0000
+++ b/make/launcher/Launcher-java.base.gmk Sat Mar 16 21:00:45 2019 +0000
@@ -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
@@ -27,6 +27,8 @@
$(eval $(call IncludeCustomExtension, launcher/Launcher-java.base.gmk))
+JAVA_VERSION_INFO_RESOURCE := $(TOPDIR)/src/java.base/windows/native/launcher/java.rc
+
JAVA_RC_FLAGS += -I$(TOPDIR)/src/java.base/windows/native/common
JAVA_RC_FLAGS += -I$(TOPDIR)/src/java.base/windows/native/launcher/icons
--- a/make/launcher/LauncherCommon.gmk Tue Mar 12 09:49:10 2019 +0000
+++ b/make/launcher/LauncherCommon.gmk Sat Mar 16 21:00:45 2019 +0000
@@ -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
@@ -51,7 +51,6 @@
-I$(TOPDIR)/src/java.base/$(OPENJDK_TARGET_OS)/native/libjli \
#
GLOBAL_VERSION_INFO_RESOURCE := $(TOPDIR)/src/java.base/windows/native/common/version.rc
-JAVA_VERSION_INFO_RESOURCE := $(TOPDIR)/src/java.base/windows/native/launcher/java.rc
MACOSX_PLIST_DIR := $(TOPDIR)/src/java.base/macosx/native/launcher
JAVA_MANIFEST := $(TOPDIR)/src/java.base/windows/native/launcher/java.manifest
--- a/make/lib/CoreLibraries.gmk Tue Mar 12 09:49:10 2019 +0000
+++ b/make/lib/CoreLibraries.gmk Sat Mar 16 21:00:45 2019 +0000
@@ -78,8 +78,6 @@
NAME := verify, \
OPTIMIZATION := $(LIBVERIFY_OPTIMIZATION), \
CFLAGS := $(CFLAGS_JDKLIB), \
- DISABLED_WARNINGS_gcc := implicit-fallthrough unused-function, \
- DISABLED_WARNINGS_microsoft := 4244 4267, \
LDFLAGS := $(LDFLAGS_JDKLIB) \
$(call SET_SHARED_LIBRARY_ORIGIN), \
LIBS_unix := -ljvm, \
--- a/make/test/JtregGraalUnit.gmk Tue Mar 12 09:49:10 2019 +0000
+++ b/make/test/JtregGraalUnit.gmk Sat Mar 16 21:00:45 2019 +0000
@@ -41,115 +41,124 @@
ifeq ($(INCLUDE_GRAAL), true)
ifneq ($(GRAALUNIT_LIB), )
+
SRC_DIR := $(TOPDIR)/src/jdk.internal.vm.compiler/share/classes
TEST_DIR := $(TOPDIR)/test/hotspot/jtreg/compiler/graalunit
COMPILE_OUTPUTDIR := $(SUPPORT_OUTPUTDIR)/test/graalunit
LIB_OUTPUTDIR := $(TEST_IMAGE_DIR)/hotspot/jtreg/graal
- TEST_COMPILE_CP := \
- $(JDK_OUTPUTDIR)/modules/jdk.internal.vm.compiler \
- $(JDK_OUTPUTDIR)/modules/jdk.internal.vm.ci \
- $(LIB_OUTPUTDIR)/junit-4.12.jar \
- $(LIB_OUTPUTDIR)/asm-5.0.4.jar \
- $(LIB_OUTPUTDIR)/asm-tree-5.0.4.jar \
- $(LIB_OUTPUTDIR)/java-allocation-instrumenter.jar \
- $(LIB_OUTPUTDIR)/hamcrest-core-1.3.jar
+ # This evaluation is expensive and should only be done if this target was
+ # explicitly called.
+ ifneq ($(filter build-test-hotspot-jtreg-graal, $(MAKECMDGOALS)), )
+
+ TEST_COMPILE_CP := \
+ $(JDK_OUTPUTDIR)/modules/jdk.internal.vm.compiler \
+ $(JDK_OUTPUTDIR)/modules/jdk.internal.vm.ci \
+ $(LIB_OUTPUTDIR)/junit-4.12.jar \
+ $(LIB_OUTPUTDIR)/asm-5.0.4.jar \
+ $(LIB_OUTPUTDIR)/asm-tree-5.0.4.jar \
+ $(LIB_OUTPUTDIR)/java-allocation-instrumenter.jar \
+ $(LIB_OUTPUTDIR)/hamcrest-core-1.3.jar
- TEST_JAVAC_FLAGS := \
- -Xlint:none \
- -processorpath $(BUILDTOOLS_OUTPUTDIR)/jdk.vm.compiler.replacements.verifier.jar \
- --add-exports jdk.unsupported/sun.misc=ALL-UNNAMED \
- --add-exports java.base/jdk.internal.misc=ALL-UNNAMED \
+ TEST_JAVAC_FLAGS := \
+ -Xlint:none \
+ -processorpath $(BUILDTOOLS_OUTPUTDIR)/jdk.vm.compiler.replacements.verifier.jar \
+ --add-exports jdk.unsupported/sun.misc=ALL-UNNAMED \
+ --add-exports java.base/jdk.internal.misc=ALL-UNNAMED \
- ### Copy 3rd party libs
- $(eval $(call SetupCopyFiles, COPY_GRAALUNIT_LIBS, \
- FILES := $(wildcard $(GRAALUNIT_LIB)/*.jar), \
- DEST := $(LIB_OUTPUTDIR), \
- ))
+ ### Copy 3rd party libs
+ $(eval $(call SetupCopyFiles, COPY_GRAALUNIT_LIBS, \
+ FILES := $(wildcard $(GRAALUNIT_LIB)/*.jar), \
+ DEST := $(LIB_OUTPUTDIR), \
+ ))
- TARGETS_EXTRA_LIB += $(COPY_GRAALUNIT_LIBS)
+ TARGETS_EXTRA_LIB += $(COPY_GRAALUNIT_LIBS)
- ### Compile graalunit tests
- $(eval $(call SetupJavaCompilation, BUILD_VM_COMPILER_TESTS, \
- SETUP := GENERATE_USINGJDKBYTECODE, \
- SRC := \
- $(SRC_DIR)/jdk.internal.vm.compiler.collections.test/src \
- $(SRC_DIR)/org.graalvm.compiler.api.directives.test/src \
- $(SRC_DIR)/org.graalvm.compiler.api.test/src \
- $(SRC_DIR)/org.graalvm.compiler.asm.aarch64.test/src \
- $(SRC_DIR)/org.graalvm.compiler.asm.amd64.test/src \
- $(SRC_DIR)/org.graalvm.compiler.asm.sparc.test/src \
- $(SRC_DIR)/org.graalvm.compiler.asm.test/src \
- $(SRC_DIR)/org.graalvm.compiler.core.aarch64.test/src \
- $(SRC_DIR)/org.graalvm.compiler.core.amd64.test/src \
- $(SRC_DIR)/org.graalvm.compiler.core.jdk9.test/src \
- $(SRC_DIR)/org.graalvm.compiler.core.test/src \
- $(SRC_DIR)/org.graalvm.compiler.debug.test/src \
- $(SRC_DIR)/org.graalvm.compiler.graph.test/src \
- $(SRC_DIR)/org.graalvm.compiler.hotspot.amd64.test/src \
- $(SRC_DIR)/org.graalvm.compiler.hotspot.lir.test/src \
- $(SRC_DIR)/org.graalvm.compiler.hotspot.sparc.test/src \
- $(SRC_DIR)/org.graalvm.compiler.hotspot.test/src \
- $(SRC_DIR)/org.graalvm.compiler.jtt/src \
- $(SRC_DIR)/org.graalvm.compiler.lir.jtt/src \
- $(SRC_DIR)/org.graalvm.compiler.lir.test/src \
- $(SRC_DIR)/org.graalvm.compiler.loop.test/src \
- $(SRC_DIR)/org.graalvm.compiler.nodes.test/src \
- $(SRC_DIR)/org.graalvm.compiler.options.test/src \
- $(SRC_DIR)/org.graalvm.compiler.phases.common.test/src \
- $(SRC_DIR)/org.graalvm.compiler.replacements.jdk12.test/src \
- $(SRC_DIR)/org.graalvm.compiler.replacements.jdk9.test/src \
- $(SRC_DIR)/org.graalvm.compiler.replacements.test/src \
- $(SRC_DIR)/org.graalvm.compiler.test/src \
- $(SRC_DIR)/org.graalvm.util.test/src \
- , \
- EXCLUDE_FILES := org/graalvm/compiler/core/test/VerifyDebugUsageTest.java, \
- BIN := $(COMPILE_OUTPUTDIR)/jdk.vm.compiler.tests, \
- CLASSPATH := $(TEST_COMPILE_CP), \
- ADD_JAVAC_FLAGS := $(TEST_JAVAC_FLAGS), \
- ))
+ ### Compile graalunit tests
+ $(eval $(call SetupJavaCompilation, BUILD_VM_COMPILER_TESTS, \
+ SETUP := GENERATE_USINGJDKBYTECODE, \
+ SRC := \
+ $(SRC_DIR)/jdk.internal.vm.compiler.collections.test/src \
+ $(SRC_DIR)/org.graalvm.compiler.api.directives.test/src \
+ $(SRC_DIR)/org.graalvm.compiler.api.test/src \
+ $(SRC_DIR)/org.graalvm.compiler.asm.aarch64.test/src \
+ $(SRC_DIR)/org.graalvm.compiler.asm.amd64.test/src \
+ $(SRC_DIR)/org.graalvm.compiler.asm.sparc.test/src \
+ $(SRC_DIR)/org.graalvm.compiler.asm.test/src \
+ $(SRC_DIR)/org.graalvm.compiler.core.aarch64.test/src \
+ $(SRC_DIR)/org.graalvm.compiler.core.amd64.test/src \
+ $(SRC_DIR)/org.graalvm.compiler.core.jdk9.test/src \
+ $(SRC_DIR)/org.graalvm.compiler.core.test/src \
+ $(SRC_DIR)/org.graalvm.compiler.debug.test/src \
+ $(SRC_DIR)/org.graalvm.compiler.graph.test/src \
+ $(SRC_DIR)/org.graalvm.compiler.hotspot.amd64.test/src \
+ $(SRC_DIR)/org.graalvm.compiler.hotspot.jdk9.test/src \
+ $(SRC_DIR)/org.graalvm.compiler.hotspot.lir.test/src \
+ $(SRC_DIR)/org.graalvm.compiler.hotspot.sparc.test/src \
+ $(SRC_DIR)/org.graalvm.compiler.hotspot.test/src \
+ $(SRC_DIR)/org.graalvm.compiler.jtt/src \
+ $(SRC_DIR)/org.graalvm.compiler.lir.jtt/src \
+ $(SRC_DIR)/org.graalvm.compiler.lir.test/src \
+ $(SRC_DIR)/org.graalvm.compiler.loop.test/src \
+ $(SRC_DIR)/org.graalvm.compiler.nodes.test/src \
+ $(SRC_DIR)/org.graalvm.compiler.options.test/src \
+ $(SRC_DIR)/org.graalvm.compiler.phases.common.test/src \
+ $(SRC_DIR)/org.graalvm.compiler.replacements.jdk12.test/src \
+ $(SRC_DIR)/org.graalvm.compiler.replacements.jdk9.test/src \
+ $(SRC_DIR)/org.graalvm.compiler.replacements.test/src \
+ $(SRC_DIR)/org.graalvm.compiler.test/src \
+ $(SRC_DIR)/org.graalvm.util.test/src \
+ , \
+ EXCLUDE_FILES := org/graalvm/compiler/core/test/VerifyDebugUsageTest.java, \
+ BIN := $(COMPILE_OUTPUTDIR)/jdk.vm.compiler.tests, \
+ CLASSPATH := $(TEST_COMPILE_CP), \
+ ADD_JAVAC_FLAGS := $(TEST_JAVAC_FLAGS), \
+ ))
+
+ TARGETS_BUILD += $(BUILD_VM_COMPILER_TESTS)
- TARGETS_BUILD += $(BUILD_VM_COMPILER_TESTS)
+ ### Compile graalunit tests which require -XDstringConcat=inline
+ $(eval $(call SetupJavaCompilation, BUILD_VM_COMPILER_TESTS_SET2, \
+ SETUP := GENERATE_USINGJDKBYTECODE, \
+ DEPENDS := $(BUILD_VM_COMPILER_TESTS), \
+ SRC := $(SRC_DIR)/org.graalvm.compiler.core.test/src, \
+ INCLUDE_FILES := org/graalvm/compiler/core/test/VerifyDebugUsageTest.java, \
+ BIN := $(COMPILE_OUTPUTDIR)/jdk.vm.compiler.tests, \
+ CLASSPATH := \
+ $(TEST_COMPILE_CP) \
+ $(COMPILE_OUTPUTDIR)/jdk.vm.compiler.tests \
+ , \
+ ADD_JAVAC_FLAGS := \
+ $(TEST_JAVAC_FLAGS) \
+ -XDstringConcat=inline \
+ , \
+ ))
- ### Compile graalunit tests which require -XDstringConcat=inline
- $(eval $(call SetupJavaCompilation, BUILD_VM_COMPILER_TESTS_SET2, \
- SETUP := GENERATE_USINGJDKBYTECODE, \
- DEPENDS := $(BUILD_VM_COMPILER_TESTS), \
- SRC := $(SRC_DIR)/org.graalvm.compiler.core.test/src, \
- INCLUDE_FILES := org/graalvm/compiler/core/test/VerifyDebugUsageTest.java, \
- BIN := $(COMPILE_OUTPUTDIR)/jdk.vm.compiler.tests, \
- CLASSPATH := \
- $(TEST_COMPILE_CP) \
- $(COMPILE_OUTPUTDIR)/jdk.vm.compiler.tests \
- , \
- ADD_JAVAC_FLAGS := \
- $(TEST_JAVAC_FLAGS) \
- -XDstringConcat=inline \
- , \
- ))
-
- TARGETS_BUILD += $(BUILD_VM_COMPILER_TESTS_SET2)
+ TARGETS_BUILD += $(BUILD_VM_COMPILER_TESTS_SET2)
- ### Generate jdk.vm.compiler.tests.jar
- $(eval $(call SetupJarArchive, BUILD_VM_COMPILER_TESTS_JAR, \
- DEPENDENCIES := $(BUILD_VM_COMPILER_TESTS) $(BUILD_VM_COMPILER_TESTS_SET2), \
- SRCS := $(COMPILE_OUTPUTDIR)/jdk.vm.compiler.tests, \
- JAR := $(COMPILE_OUTPUTDIR)/jdk.vm.compiler.tests.jar, \
- ))
+ ### Generate jdk.vm.compiler.tests.jar
+ $(eval $(call SetupJarArchive, BUILD_VM_COMPILER_TESTS_JAR, \
+ DEPENDENCIES := $(BUILD_VM_COMPILER_TESTS) $(BUILD_VM_COMPILER_TESTS_SET2), \
+ SRCS := $(COMPILE_OUTPUTDIR)/jdk.vm.compiler.tests, \
+ JAR := $(COMPILE_OUTPUTDIR)/jdk.vm.compiler.tests.jar, \
+ ))
- TARGETS_BUILD += $(BUILD_VM_COMPILER_TESTS_JAR)
+ TARGETS_BUILD += $(BUILD_VM_COMPILER_TESTS_JAR)
- ### Compile and build mxtool
- $(eval $(call SetupJavaCompilation, BUILD_MXTOOL, \
- SETUP := GENERATE_USINGJDKBYTECODE, \
- SRC := $(TEST_DIR)/com.oracle.mxtool.junit, \
- BIN := $(COMPILE_OUTPUTDIR)/com.oracle.mxtool.junit, \
- JAR := $(COMPILE_OUTPUTDIR)/com.oracle.mxtool.junit.jar, \
- CLASSPATH := $(LIB_OUTPUTDIR)/junit-4.12.jar, \
- ))
+ ### Compile and build mxtool
+ $(eval $(call SetupJavaCompilation, BUILD_MXTOOL, \
+ SETUP := GENERATE_USINGJDKBYTECODE, \
+ SRC := $(TEST_DIR)/com.oracle.mxtool.junit, \
+ BIN := $(COMPILE_OUTPUTDIR)/com.oracle.mxtool.junit, \
+ JAR := $(COMPILE_OUTPUTDIR)/com.oracle.mxtool.junit.jar, \
+ CLASSPATH := $(LIB_OUTPUTDIR)/junit-4.12.jar, \
+ ))
- TARGETS_BUILD += $(BUILD_MXTOOL)
+ TARGETS_BUILD += $(BUILD_MXTOOL)
+ $(TARGETS_BUILD): $(TARGETS_EXTRA_LIB)
+
+ endif # build-test-hotspot-jtreg-graal
################################################################################
# Targets for building test-image.
@@ -168,7 +177,6 @@
endif
endif
-$(TARGETS_BUILD): $(TARGETS_EXTRA_LIB)
build-test-hotspot-jtreg-graal: $(TARGETS_BUILD)
test-image-hotspot-jtreg-graal: $(TARGETS_IMAGE)
--- a/make/test/JtregNativeHotspot.gmk Tue Mar 12 09:49:10 2019 +0000
+++ b/make/test/JtregNativeHotspot.gmk Sat Mar 16 21:00:45 2019 +0000
@@ -1513,19 +1513,23 @@
BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libterminatedThread += -lpthread
endif
-$(eval $(call SetupTestFilesCompilation, BUILD_HOTSPOT_JTREG_LIBRARIES, \
- TYPE := LIBRARY, \
- SOURCE_DIRS := $(BUILD_HOTSPOT_JTREG_NATIVE_SRC), \
- OUTPUT_DIR := $(BUILD_HOTSPOT_JTREG_OUTPUT_DIR), \
- EXCLUDE := $(BUILD_HOTSPOT_JTREG_EXCLUDE), \
-))
+# This evaluation is expensive and should only be done if this target was
+# explicitly called.
+ifneq ($(filter build-test-hotspot-jtreg-native, $(MAKECMDGOALS)), )
+ $(eval $(call SetupTestFilesCompilation, BUILD_HOTSPOT_JTREG_LIBRARIES, \
+ TYPE := LIBRARY, \
+ SOURCE_DIRS := $(BUILD_HOTSPOT_JTREG_NATIVE_SRC), \
+ OUTPUT_DIR := $(BUILD_HOTSPOT_JTREG_OUTPUT_DIR), \
+ EXCLUDE := $(BUILD_HOTSPOT_JTREG_EXCLUDE), \
+ ))
-$(eval $(call SetupTestFilesCompilation, BUILD_HOTSPOT_JTREG_EXECUTABLES, \
- TYPE := PROGRAM, \
- SOURCE_DIRS := $(BUILD_HOTSPOT_JTREG_NATIVE_SRC), \
- OUTPUT_DIR := $(BUILD_HOTSPOT_JTREG_OUTPUT_DIR), \
- EXCLUDE := $(BUILD_HOTSPOT_JTREG_EXCLUDE), \
-))
+ $(eval $(call SetupTestFilesCompilation, BUILD_HOTSPOT_JTREG_EXECUTABLES, \
+ TYPE := PROGRAM, \
+ SOURCE_DIRS := $(BUILD_HOTSPOT_JTREG_NATIVE_SRC), \
+ OUTPUT_DIR := $(BUILD_HOTSPOT_JTREG_OUTPUT_DIR), \
+ EXCLUDE := $(BUILD_HOTSPOT_JTREG_EXCLUDE), \
+ ))
+endif
build-test-hotspot-jtreg-native: $(BUILD_HOTSPOT_JTREG_LIBRARIES) $(BUILD_HOTSPOT_JTREG_EXECUTABLES)
@@ -1537,8 +1541,9 @@
$(eval $(call SetupCopyFiles,COPY_HOTSPOT_JTREG_NATIVE, \
SRC := $(BUILD_HOTSPOT_JTREG_OUTPUT_DIR), \
DEST := $(TEST_IMAGE_DIR)/hotspot/jtreg/native, \
- FILES := $(BUILD_HOTSPOT_JTREG_LIBRARIES) $(BUILD_HOTSPOT_JTREG_EXECUTABLES), \
- FLATTEN := true))
+ FILES := $(wildcard $(addprefix $(BUILD_HOTSPOT_JTREG_OUTPUT_DIR), /bin/* /lib/*)), \
+ FLATTEN := true, \
+))
test-image-hotspot-jtreg-native: $(COPY_HOTSPOT_JTREG_NATIVE)
--- a/make/test/JtregNativeJdk.gmk Tue Mar 12 09:49:10 2019 +0000
+++ b/make/test/JtregNativeJdk.gmk Sat Mar 16 21:00:45 2019 +0000
@@ -82,19 +82,23 @@
BUILD_JDK_JTREG_EXCLUDE += exeJniInvocationTest.c
endif
-$(eval $(call SetupTestFilesCompilation, BUILD_JDK_JTREG_LIBRARIES, \
- TYPE := LIBRARY, \
- SOURCE_DIRS := $(BUILD_JDK_JTREG_NATIVE_SRC), \
- OUTPUT_DIR := $(BUILD_JDK_JTREG_OUTPUT_DIR), \
- EXCLUDE := $(BUILD_JDK_JTREG_EXCLUDE), \
-))
+# This evaluation is expensive and should only be done if this target was
+# explicitly called.
+ifneq ($(filter build-test-jdk-jtreg-native, $(MAKECMDGOALS)), )
+ $(eval $(call SetupTestFilesCompilation, BUILD_JDK_JTREG_LIBRARIES, \
+ TYPE := LIBRARY, \
+ SOURCE_DIRS := $(BUILD_JDK_JTREG_NATIVE_SRC), \
+ OUTPUT_DIR := $(BUILD_JDK_JTREG_OUTPUT_DIR), \
+ EXCLUDE := $(BUILD_JDK_JTREG_EXCLUDE), \
+ ))
-$(eval $(call SetupTestFilesCompilation, BUILD_JDK_JTREG_EXECUTABLES, \
- TYPE := PROGRAM, \
- SOURCE_DIRS := $(BUILD_JDK_JTREG_NATIVE_SRC), \
- OUTPUT_DIR := $(BUILD_JDK_JTREG_OUTPUT_DIR), \
- EXCLUDE := $(BUILD_JDK_JTREG_EXCLUDE), \
-))
+ $(eval $(call SetupTestFilesCompilation, BUILD_JDK_JTREG_EXECUTABLES, \
+ TYPE := PROGRAM, \
+ SOURCE_DIRS := $(BUILD_JDK_JTREG_NATIVE_SRC), \
+ OUTPUT_DIR := $(BUILD_JDK_JTREG_OUTPUT_DIR), \
+ EXCLUDE := $(BUILD_JDK_JTREG_EXCLUDE), \
+ ))
+endif
build-test-jdk-jtreg-native: $(BUILD_JDK_JTREG_LIBRARIES) $(BUILD_JDK_JTREG_EXECUTABLES)
@@ -106,8 +110,9 @@
$(eval $(call SetupCopyFiles,COPY_JDK_JTREG_NATIVE, \
SRC := $(BUILD_JDK_JTREG_OUTPUT_DIR), \
DEST := $(TEST_IMAGE_DIR)/jdk/jtreg/native, \
- FILES := $(BUILD_JDK_JTREG_LIBRARIES) $(BUILD_JDK_JTREG_EXECUTABLES), \
- FLATTEN := true))
+ FILES := $(wildcard $(addprefix $(BUILD_JDK_JTREG_OUTPUT_DIR), /bin/* /lib/*)), \
+ FLATTEN := true, \
+))
test-image-jdk-jtreg-native: $(COPY_JDK_JTREG_NATIVE)
--- a/src/hotspot/cpu/aarch64/aarch64.ad Tue Mar 12 09:49:10 2019 +0000
+++ b/src/hotspot/cpu/aarch64/aarch64.ad Sat Mar 16 21:00:45 2019 +0000
@@ -4246,7 +4246,7 @@
%{
// Get base of card map
predicate(BarrierSet::barrier_set()->is_a(BarrierSet::CardTableBarrierSet) &&
- (jbyte*)n->get_ptr() == ((CardTableBarrierSet*)(BarrierSet::barrier_set()))->card_table()->byte_map_base());
+ (CardTable::CardValue*)n->get_ptr() == ((CardTableBarrierSet*)(BarrierSet::barrier_set()))->card_table()->byte_map_base());
match(ConP);
op_cost(0);
@@ -15660,6 +15660,98 @@
ins_pipe(pipe_class_default);
%}
+instruct reduce_max2F(vRegF dst, vRegF src1, vecD src2, vecD tmp) %{
+ predicate(n->in(2)->bottom_type()->is_vect()->element_basic_type() == T_FLOAT);
+ match(Set dst (MaxReductionV src1 src2));
+ ins_cost(INSN_COST);
+ effect(TEMP_DEF dst, TEMP tmp);
+ format %{ "fmaxs $dst, $src1, $src2\n\t"
+ "ins $tmp, S, $src2, 0, 1\n\t"
+ "fmaxs $dst, $dst, $tmp\t max reduction2F" %}
+ ins_encode %{
+ __ fmaxs(as_FloatRegister($dst$$reg), as_FloatRegister($src1$$reg), as_FloatRegister($src2$$reg));
+ __ ins(as_FloatRegister($tmp$$reg), __ S, as_FloatRegister($src2$$reg), 0, 1);
+ __ fmaxs(as_FloatRegister($dst$$reg), as_FloatRegister($dst$$reg), as_FloatRegister($tmp$$reg));
+ %}
+ ins_pipe(pipe_class_default);
+%}
+
+instruct reduce_max4F(vRegF dst, vRegF src1, vecX src2) %{
+ predicate(n->in(2)->bottom_type()->is_vect()->element_basic_type() == T_FLOAT);
+ match(Set dst (MaxReductionV src1 src2));
+ ins_cost(INSN_COST);
+ effect(TEMP_DEF dst);
+ format %{ "fmaxv $dst, T4S, $src2\n\t"
+ "fmaxs $dst, $dst, $src1\t max reduction4F" %}
+ ins_encode %{
+ __ fmaxv(as_FloatRegister($dst$$reg), __ T4S, as_FloatRegister($src2$$reg));
+ __ fmaxs(as_FloatRegister($dst$$reg), as_FloatRegister($dst$$reg), as_FloatRegister($src1$$reg));
+ %}
+ ins_pipe(pipe_class_default);
+%}
+
+instruct reduce_max2D(vRegD dst, vRegD src1, vecX src2, vecX tmp) %{
+ predicate(n->in(2)->bottom_type()->is_vect()->element_basic_type() == T_DOUBLE);
+ match(Set dst (MaxReductionV src1 src2));
+ ins_cost(INSN_COST);
+ effect(TEMP_DEF dst, TEMP tmp);
+ format %{ "fmaxd $dst, $src1, $src2\n\t"
+ "ins $tmp, D, $src2, 0, 1\n\t"
+ "fmaxd $dst, $dst, $tmp\t max reduction2D" %}
+ ins_encode %{
+ __ fmaxd(as_FloatRegister($dst$$reg), as_FloatRegister($src1$$reg), as_FloatRegister($src2$$reg));
+ __ ins(as_FloatRegister($tmp$$reg), __ D, as_FloatRegister($src2$$reg), 0, 1);
+ __ fmaxd(as_FloatRegister($dst$$reg), as_FloatRegister($dst$$reg), as_FloatRegister($tmp$$reg));
+ %}
+ ins_pipe(pipe_class_default);
+%}
+
+instruct reduce_min2F(vRegF dst, vRegF src1, vecD src2, vecD tmp) %{
+ predicate(n->in(2)->bottom_type()->is_vect()->element_basic_type() == T_FLOAT);
+ match(Set dst (MinReductionV src1 src2));
+ ins_cost(INSN_COST);
+ effect(TEMP_DEF dst, TEMP tmp);
+ format %{ "fmins $dst, $src1, $src2\n\t"
+ "ins $tmp, S, $src2, 0, 1\n\t"
+ "fmins $dst, $dst, $tmp\t min reduction2F" %}
+ ins_encode %{
+ __ fmins(as_FloatRegister($dst$$reg), as_FloatRegister($src1$$reg), as_FloatRegister($src2$$reg));
+ __ ins(as_FloatRegister($tmp$$reg), __ S, as_FloatRegister($src2$$reg), 0, 1);
+ __ fmins(as_FloatRegister($dst$$reg), as_FloatRegister($dst$$reg), as_FloatRegister($tmp$$reg));
+ %}
+ ins_pipe(pipe_class_default);
+%}
+
+instruct reduce_min4F(vRegF dst, vRegF src1, vecX src2) %{
+ predicate(n->in(2)->bottom_type()->is_vect()->element_basic_type() == T_FLOAT);
+ match(Set dst (MinReductionV src1 src2));
+ ins_cost(INSN_COST);
+ effect(TEMP_DEF dst);
+ format %{ "fminv $dst, T4S, $src2\n\t"
+ "fmins $dst, $dst, $src1\t min reduction4F" %}
+ ins_encode %{
+ __ fminv(as_FloatRegister($dst$$reg), __ T4S, as_FloatRegister($src2$$reg));
+ __ fmins(as_FloatRegister($dst$$reg), as_FloatRegister($dst$$reg), as_FloatRegister($src1$$reg));
+ %}
+ ins_pipe(pipe_class_default);
+%}
+
+instruct reduce_min2D(vRegD dst, vRegD src1, vecX src2, vecX tmp) %{
+ predicate(n->in(2)->bottom_type()->is_vect()->element_basic_type() == T_DOUBLE);
+ match(Set dst (MinReductionV src1 src2));
+ ins_cost(INSN_COST);
+ effect(TEMP_DEF dst, TEMP tmp);
+ format %{ "fmind $dst, $src1, $src2\n\t"
+ "ins $tmp, D, $src2, 0, 1\n\t"
+ "fmind $dst, $dst, $tmp\t min reduction2D" %}
+ ins_encode %{
+ __ fmind(as_FloatRegister($dst$$reg), as_FloatRegister($src1$$reg), as_FloatRegister($src2$$reg));
+ __ ins(as_FloatRegister($tmp$$reg), __ D, as_FloatRegister($src2$$reg), 0, 1);
+ __ fmind(as_FloatRegister($dst$$reg), as_FloatRegister($dst$$reg), as_FloatRegister($tmp$$reg));
+ %}
+ ins_pipe(pipe_class_default);
+%}
+
// ====================VECTOR ARITHMETIC=======================================
// --------------------------------- ADD --------------------------------------
@@ -17198,6 +17290,90 @@
ins_pipe(vshift128_imm);
%}
+instruct vmax2F(vecD dst, vecD src1, vecD src2)
+%{
+ predicate(n->as_Vector()->length() == 2 && n->bottom_type()->is_vect()->element_basic_type() == T_FLOAT);
+ match(Set dst (MaxV src1 src2));
+ ins_cost(INSN_COST);
+ format %{ "fmax $dst,$src1,$src2\t# vector (2F)" %}
+ ins_encode %{
+ __ fmax(as_FloatRegister($dst$$reg), __ T2S,
+ as_FloatRegister($src1$$reg),
+ as_FloatRegister($src2$$reg));
+ %}
+ ins_pipe(vdop_fp64);
+%}
+
+instruct vmax4F(vecX dst, vecX src1, vecX src2)
+%{
+ predicate(n->as_Vector()->length() == 4 && n->bottom_type()->is_vect()->element_basic_type() == T_FLOAT);
+ match(Set dst (MaxV src1 src2));
+ ins_cost(INSN_COST);
+ format %{ "fmax $dst,$src1,$src2\t# vector (4S)" %}
+ ins_encode %{
+ __ fmax(as_FloatRegister($dst$$reg), __ T4S,
+ as_FloatRegister($src1$$reg),
+ as_FloatRegister($src2$$reg));
+ %}
+ ins_pipe(vdop_fp128);
+%}
+
+instruct vmax2D(vecX dst, vecX src1, vecX src2)
+%{
+ predicate(n->as_Vector()->length() == 2 && n->bottom_type()->is_vect()->element_basic_type() == T_DOUBLE);
+ match(Set dst (MaxV src1 src2));
+ ins_cost(INSN_COST);
+ format %{ "fmax $dst,$src1,$src2\t# vector (2D)" %}
+ ins_encode %{
+ __ fmax(as_FloatRegister($dst$$reg), __ T2D,
+ as_FloatRegister($src1$$reg),
+ as_FloatRegister($src2$$reg));
+ %}
+ ins_pipe(vdop_fp128);
+%}
+
+instruct vmin2F(vecD dst, vecD src1, vecD src2)
+%{
+ predicate(n->as_Vector()->length() == 2 && n->bottom_type()->is_vect()->element_basic_type() == T_FLOAT);
+ match(Set dst (MinV src1 src2));
+ ins_cost(INSN_COST);
+ format %{ "fmin $dst,$src1,$src2\t# vector (2F)" %}
+ ins_encode %{
+ __ fmin(as_FloatRegister($dst$$reg), __ T2S,
+ as_FloatRegister($src1$$reg),
+ as_FloatRegister($src2$$reg));
+ %}
+ ins_pipe(vdop_fp64);
+%}
+
+instruct vmin4F(vecX dst, vecX src1, vecX src2)
+%{
+ predicate(n->as_Vector()->length() == 4 && n->bottom_type()->is_vect()->element_basic_type() == T_FLOAT);
+ match(Set dst (MinV src1 src2));
+ ins_cost(INSN_COST);
+ format %{ "fmin $dst,$src1,$src2\t# vector (4S)" %}
+ ins_encode %{
+ __ fmin(as_FloatRegister($dst$$reg), __ T4S,
+ as_FloatRegister($src1$$reg),
+ as_FloatRegister($src2$$reg));
+ %}
+ ins_pipe(vdop_fp128);
+%}
+
+instruct vmin2D(vecX dst, vecX src1, vecX src2)
+%{
+ predicate(n->as_Vector()->length() == 2 && n->bottom_type()->is_vect()->element_basic_type() == T_DOUBLE);
+ match(Set dst (MinV src1 src2));
+ ins_cost(INSN_COST);
+ format %{ "fmin $dst,$src1,$src2\t# vector (2D)" %}
+ ins_encode %{
+ __ fmin(as_FloatRegister($dst$$reg), __ T2D,
+ as_FloatRegister($src1$$reg),
+ as_FloatRegister($src2$$reg));
+ %}
+ ins_pipe(vdop_fp128);
+%}
+
//----------PEEPHOLE RULES-----------------------------------------------------
// These must follow all instruction definitions as they use the names
// defined in the instructions definitions.
--- a/src/hotspot/cpu/aarch64/assembler_aarch64.hpp Tue Mar 12 09:49:10 2019 +0000
+++ b/src/hotspot/cpu/aarch64/assembler_aarch64.hpp Sat Mar 16 21:00:45 2019 +0000
@@ -2240,6 +2240,19 @@
#undef INSN
+#define INSN(NAME, opc) \
+ void NAME(FloatRegister Vd, SIMD_Arrangement T, FloatRegister Vn) { \
+ starti; \
+ assert(T == T4S, "arrangement must be T4S"); \
+ f(0, 31), f((int)T & 1, 30), f(0b101110, 29, 24), f(opc, 23), \
+ f(T == T4S ? 0 : 1, 22), f(0b110000111110, 21, 10); rf(Vn, 5), rf(Vd, 0); \
+ }
+
+ INSN(fmaxv, 0);
+ INSN(fminv, 1);
+
+#undef INSN
+
#define INSN(NAME, op0, cmode0) \
void NAME(FloatRegister Vd, SIMD_Arrangement T, unsigned imm8, unsigned lsl = 0) { \
unsigned cmode = cmode0; \
@@ -2281,6 +2294,8 @@
INSN(fsub, 0, 1, 0b110101);
INSN(fmla, 0, 0, 0b110011);
INSN(fmls, 0, 1, 0b110011);
+ INSN(fmax, 0, 0, 0b111101);
+ INSN(fmin, 0, 1, 0b111101);
#undef INSN
--- a/src/hotspot/cpu/aarch64/gc/g1/g1BarrierSetAssembler_aarch64.cpp Tue Mar 12 09:49:10 2019 +0000
+++ b/src/hotspot/cpu/aarch64/gc/g1/g1BarrierSetAssembler_aarch64.cpp Sat Mar 16 21:00:45 2019 +0000
@@ -193,7 +193,6 @@
BarrierSet* bs = BarrierSet::barrier_set();
CardTableBarrierSet* ctbs = barrier_set_cast<CardTableBarrierSet>(bs);
CardTable* ct = ctbs->card_table();
- assert(sizeof(*ct->byte_map_base()) == sizeof(jbyte), "adjust this code");
Label done;
Label runtime;
@@ -211,7 +210,6 @@
// storing region crossing non-NULL, is card already dirty?
ExternalAddress cardtable((address) ct->byte_map_base());
- assert(sizeof(*ct->byte_map_base()) == sizeof(jbyte), "adjust this code");
const Register card_addr = tmp;
__ lsr(card_addr, store_addr, CardTable::card_shift);
@@ -417,7 +415,6 @@
BarrierSet* bs = BarrierSet::barrier_set();
CardTableBarrierSet* ctbs = barrier_set_cast<CardTableBarrierSet>(bs);
CardTable* ct = ctbs->card_table();
- assert(sizeof(*ct->byte_map_base()) == sizeof(jbyte), "adjust this code");
Label done;
Label runtime;
--- a/src/hotspot/cpu/aarch64/gc/shared/cardTableBarrierSetAssembler_aarch64.cpp Tue Mar 12 09:49:10 2019 +0000
+++ b/src/hotspot/cpu/aarch64/gc/shared/cardTableBarrierSetAssembler_aarch64.cpp Sat Mar 16 21:00:45 2019 +0000
@@ -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
@@ -32,7 +32,6 @@
#define __ masm->
-
void CardTableBarrierSetAssembler::store_check(MacroAssembler* masm, Register obj, Address dst) {
BarrierSet* bs = BarrierSet::barrier_set();
@@ -40,7 +39,6 @@
CardTableBarrierSet* ctbs = barrier_set_cast<CardTableBarrierSet>(bs);
CardTable* ct = ctbs->card_table();
- assert(sizeof(*ct->byte_map_base()) == sizeof(jbyte), "adjust this code");
__ lsr(obj, obj, CardTable::card_shift);
@@ -68,7 +66,6 @@
BarrierSet* bs = BarrierSet::barrier_set();
CardTableBarrierSet* ctbs = barrier_set_cast<CardTableBarrierSet>(bs);
CardTable* ct = ctbs->card_table();
- assert(sizeof(*ct->byte_map_base()) == sizeof(jbyte), "adjust this code");
Label L_loop;
--- a/src/hotspot/cpu/aarch64/macroAssembler_aarch64.cpp Tue Mar 12 09:49:10 2019 +0000
+++ b/src/hotspot/cpu/aarch64/macroAssembler_aarch64.cpp Sat Mar 16 21:00:45 2019 +0000
@@ -4305,7 +4305,7 @@
}
void MacroAssembler::load_byte_map_base(Register reg) {
- jbyte *byte_map_base =
+ CardTable::CardValue* byte_map_base =
((CardTableBarrierSet*)(BarrierSet::barrier_set()))->card_table()->byte_map_base();
if (is_valid_AArch64_address((address)byte_map_base)) {
--- a/src/hotspot/cpu/aarch64/vm_version_aarch64.cpp Tue Mar 12 09:49:10 2019 +0000
+++ b/src/hotspot/cpu/aarch64/vm_version_aarch64.cpp Sat Mar 16 21:00:45 2019 +0000
@@ -194,6 +194,19 @@
// Enable vendor specific features
+ // Ampere eMAG
+ if (_cpu == CPU_AMCC && (_model == 0) && (_variant == 0x3)) {
+ if (FLAG_IS_DEFAULT(AvoidUnalignedAccesses)) {
+ FLAG_SET_DEFAULT(AvoidUnalignedAccesses, true);
+ }
+ if (FLAG_IS_DEFAULT(UseSIMDForMemoryOps)) {
+ FLAG_SET_DEFAULT(UseSIMDForMemoryOps, true);
+ }
+ if (FLAG_IS_DEFAULT(UseSIMDForArrayEquals)) {
+ FLAG_SET_DEFAULT(UseSIMDForArrayEquals, !(_revision == 1 || _revision == 2));
+ }
+ }
+
// ThunderX
if (_cpu == CPU_CAVIUM && (_model == 0xA1)) {
if (_variant == 0) _features |= CPU_DMB_ATOMICS;
--- a/src/hotspot/cpu/arm/gc/g1/g1BarrierSetAssembler_arm.cpp Tue Mar 12 09:49:10 2019 +0000
+++ b/src/hotspot/cpu/arm/gc/g1/g1BarrierSetAssembler_arm.cpp Sat Mar 16 21:00:45 2019 +0000
@@ -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
@@ -216,7 +216,6 @@
// storing region crossing non-NULL, is card already dirty?
const Register card_addr = tmp1;
- assert(sizeof(*ct->byte_map_base()) == sizeof(jbyte), "adjust this code");
__ mov_address(tmp2, (address)ct->byte_map_base());
__ add(card_addr, tmp2, AsmOperand(store_addr, lsr, CardTable::card_shift));
--- a/src/hotspot/cpu/arm/gc/shared/cardTableBarrierSetAssembler_arm.cpp Tue Mar 12 09:49:10 2019 +0000
+++ b/src/hotspot/cpu/arm/gc/shared/cardTableBarrierSetAssembler_arm.cpp Sat Mar 16 21:00:45 2019 +0000
@@ -47,7 +47,6 @@
BarrierSet* bs = BarrierSet::barrier_set();
CardTableBarrierSet* ctbs = barrier_set_cast<CardTableBarrierSet>(bs);
CardTable* ct = ctbs->card_table();
- assert(sizeof(*ct->byte_map_base()) == sizeof(jbyte), "adjust this code");
Label L_cardtable_loop, L_done;
@@ -102,7 +101,6 @@
CardTableBarrierSet* ctbs = barrier_set_cast<CardTableBarrierSet>(bs);
CardTable* ct = ctbs->card_table();
- assert(sizeof(*ct->byte_map_base()) == sizeof(jbyte), "Adjust store check code");
// Load card table base address.
@@ -132,7 +130,6 @@
CardTableBarrierSet* ctbs = barrier_set_cast<CardTableBarrierSet>(bs);
CardTable* ct = ctbs->card_table();
- assert(sizeof(*ct->byte_map_base()) == sizeof(jbyte), "Adjust store check code");
assert(CardTable::dirty_card_val() == 0, "Dirty card value must be 0 due to optimizations.");
Address card_table_addr(card_table_base, obj, lsr, CardTable::card_shift);
--- a/src/hotspot/cpu/ppc/gc/g1/g1BarrierSetAssembler_ppc.cpp Tue Mar 12 09:49:10 2019 +0000
+++ b/src/hotspot/cpu/ppc/gc/g1/g1BarrierSetAssembler_ppc.cpp Sat Mar 16 21:00:45 2019 +0000
@@ -213,7 +213,6 @@
assert_different_registers(store_addr, new_val, tmp1, tmp2);
CardTableBarrierSet* ct = barrier_set_cast<CardTableBarrierSet>(BarrierSet::barrier_set());
- assert(sizeof(*ct->card_table()->byte_map_base()) == sizeof(jbyte), "adjust this code");
// Does store cross heap regions?
__ xorr(tmp1, store_addr, new_val);
@@ -478,7 +477,7 @@
Register tmp = R0;
Register addr = R14;
Register tmp2 = R15;
- jbyte* byte_map_base = bs->card_table()->byte_map_base();
+ CardTable::CardValue* byte_map_base = bs->card_table()->byte_map_base();
Label restart, refill, ret;
--- a/src/hotspot/cpu/ppc/gc/shared/cardTableBarrierSetAssembler_ppc.cpp Tue Mar 12 09:49:10 2019 +0000
+++ b/src/hotspot/cpu/ppc/gc/shared/cardTableBarrierSetAssembler_ppc.cpp Sat Mar 16 21:00:45 2019 +0000
@@ -45,7 +45,6 @@
Register count, Register preserve) {
CardTableBarrierSet* ctbs = barrier_set_cast<CardTableBarrierSet>(BarrierSet::barrier_set());
CardTable* ct = ctbs->card_table();
- assert(sizeof(*ct->byte_map_base()) == sizeof(jbyte), "adjust this code");
assert_different_registers(addr, count, R0);
Label Lskip_loop, Lstore_loop;
@@ -73,7 +72,7 @@
}
void CardTableBarrierSetAssembler::card_table_write(MacroAssembler* masm,
- jbyte* byte_map_base,
+ CardTable::CardValue* byte_map_base,
Register tmp, Register obj) {
CardTableBarrierSet* ctbs = barrier_set_cast<CardTableBarrierSet>(BarrierSet::barrier_set());
CardTable* ct = ctbs->card_table();
--- a/src/hotspot/cpu/ppc/gc/shared/cardTableBarrierSetAssembler_ppc.hpp Tue Mar 12 09:49:10 2019 +0000
+++ b/src/hotspot/cpu/ppc/gc/shared/cardTableBarrierSetAssembler_ppc.hpp Sat Mar 16 21:00:45 2019 +0000
@@ -34,7 +34,7 @@
virtual void gen_write_ref_array_post_barrier(MacroAssembler* masm, DecoratorSet decorators,
Register addr, Register count, Register preserve);
- void card_table_write(MacroAssembler* masm, jbyte* byte_map_base, Register tmp, Register obj);
+ void card_table_write(MacroAssembler* masm, CardTable::CardValue* byte_map_base, Register tmp, Register obj);
void card_write_barrier_post(MacroAssembler* masm, Register store_addr, Register tmp);
--- a/src/hotspot/cpu/s390/gc/g1/g1BarrierSetAssembler_s390.cpp Tue Mar 12 09:49:10 2019 +0000
+++ b/src/hotspot/cpu/s390/gc/g1/g1BarrierSetAssembler_s390.cpp Sat Mar 16 21:00:45 2019 +0000
@@ -269,7 +269,6 @@
Label callRuntime, filtered;
CardTableBarrierSet* ct = barrier_set_cast<CardTableBarrierSet>(BarrierSet::barrier_set());
- assert(sizeof(*ct->card_table()->byte_map_base()) == sizeof(jbyte), "adjust this code");
BLOCK_COMMENT("g1_write_barrier_post {");
@@ -298,7 +297,6 @@
Rnew_val = noreg; // end of lifetime
// Storing region crossing non-NULL, is card already dirty?
- assert(sizeof(*ct->card_table()->byte_map_base()) == sizeof(jbyte), "adjust this code");
assert_different_registers(Rtmp1, Rtmp2, Rtmp3);
// Make sure not to use Z_R0 for any of these registers.
Register Rcard_addr = (Rtmp1 != Z_R0_scratch) ? Rtmp1 : Rtmp3;
@@ -311,14 +309,12 @@
Rbase = noreg; // end of lifetime
// Filter young.
- assert((unsigned int)G1CardTable::g1_young_card_val() <= 255, "otherwise check this code");
__ z_cli(0, Rcard_addr, G1CardTable::g1_young_card_val());
__ z_bre(filtered);
// Check the card value. If dirty, we're done.
// This also avoids false sharing of the (already dirty) card.
__ z_sync(); // Required to support concurrent cleaning.
- assert((unsigned int)G1CardTable::dirty_card_val() <= 255, "otherwise check this code");
__ z_cli(0, Rcard_addr, G1CardTable::dirty_card_val()); // Reload after membar.
__ z_bre(filtered);
@@ -542,7 +538,7 @@
Register cardtable = r1; // Must be non-volatile, because it is used to save addr_card.
CardTableBarrierSet* ctbs = barrier_set_cast<CardTableBarrierSet>(bs);
CardTable* ct = ctbs->card_table();
- jbyte* byte_map_base = ct->byte_map_base();
+ CardTable::CardValue* byte_map_base = ct->byte_map_base();
// Save registers used below (see assertion in G1PreBarrierStub::emit_code()).
__ z_stg(r1, 0*BytesPerWord + FrameMap::first_available_sp_in_frame, Z_SP);
--- a/src/hotspot/cpu/s390/gc/shared/cardTableBarrierSetAssembler_s390.cpp Tue Mar 12 09:49:10 2019 +0000
+++ b/src/hotspot/cpu/s390/gc/shared/cardTableBarrierSetAssembler_s390.cpp Sat Mar 16 21:00:45 2019 +0000
@@ -47,7 +47,6 @@
bool do_return) {
CardTableBarrierSet* ctbs = barrier_set_cast<CardTableBarrierSet>(BarrierSet::barrier_set());
CardTable* ct = ctbs->card_table();
- assert(sizeof(*ct->byte_map_base()) == sizeof(jbyte), "adjust this code");
NearLabel doXC, done;
assert_different_registers(Z_R0, Z_R1, addr, count);
@@ -144,7 +143,6 @@
// register obj is destroyed afterwards.
CardTableBarrierSet* ctbs = barrier_set_cast<CardTableBarrierSet>(BarrierSet::barrier_set());
CardTable* ct = ctbs->card_table();
- assert(sizeof(*ct->byte_map_base()) == sizeof(jbyte), "adjust this code");
assert_different_registers(store_addr, tmp);
--- a/src/hotspot/cpu/sparc/gc/g1/g1BarrierSetAssembler_sparc.cpp Tue Mar 12 09:49:10 2019 +0000
+++ b/src/hotspot/cpu/sparc/gc/g1/g1BarrierSetAssembler_sparc.cpp Sat Mar 16 21:00:45 2019 +0000
@@ -275,7 +275,7 @@
static u_char* dirty_card_log_enqueue_end = 0;
// This gets to assume that o0 contains the object address.
-static void generate_dirty_card_log_enqueue(jbyte* byte_map_base) {
+static void generate_dirty_card_log_enqueue(CardTable::CardValue* byte_map_base) {
BufferBlob* bb = BufferBlob::create("dirty_card_enqueue", EnqueueCodeSize*2);
CodeBuffer buf(bb);
MacroAssembler masm(&buf);
@@ -626,7 +626,7 @@
Register cardtable = G5;
Register tmp = G1_scratch;
Register tmp2 = G3_scratch;
- jbyte* byte_map_base = bs->card_table()->byte_map_base();
+ CardTable::CardValue* byte_map_base = bs->card_table()->byte_map_base();
Label not_already_dirty, restart, refill, young_card;
--- a/src/hotspot/cpu/sparc/gc/shared/cardTableBarrierSetAssembler_sparc.cpp Tue Mar 12 09:49:10 2019 +0000
+++ b/src/hotspot/cpu/sparc/gc/shared/cardTableBarrierSetAssembler_sparc.cpp Sat Mar 16 21:00:45 2019 +0000
@@ -44,7 +44,6 @@
Register addr, Register count, Register tmp) {
CardTableBarrierSet* ctbs = barrier_set_cast<CardTableBarrierSet>(BarrierSet::barrier_set());
CardTable* ct = ctbs->card_table();
- assert(sizeof(*ct->byte_map_base()) == sizeof(jbyte), "adjust this code");
assert_different_registers(addr, count, tmp);
Label L_loop, L_done;
@@ -70,7 +69,7 @@
}
void CardTableBarrierSetAssembler::card_table_write(MacroAssembler* masm,
- jbyte* byte_map_base,
+ CardTable::CardValue* byte_map_base,
Register tmp, Register obj) {
__ srlx(obj, CardTable::card_shift, obj);
assert(tmp != obj, "need separate temp reg");
--- a/src/hotspot/cpu/sparc/gc/shared/cardTableBarrierSetAssembler_sparc.hpp Tue Mar 12 09:49:10 2019 +0000
+++ b/src/hotspot/cpu/sparc/gc/shared/cardTableBarrierSetAssembler_sparc.hpp Sat Mar 16 21:00:45 2019 +0000
@@ -26,6 +26,7 @@
#define CPU_SPARC_GC_SHARED_CARDTABLEBARRIERSETASSEMBLER_SPARC_HPP
#include "asm/macroAssembler.hpp"
+#include "gc/shared/cardTable.hpp"
#include "gc/shared/modRefBarrierSetAssembler.hpp"
class CardTableBarrierSetAssembler: public ModRefBarrierSetAssembler {
@@ -33,7 +34,7 @@
virtual void gen_write_ref_array_post_barrier(MacroAssembler* masm, DecoratorSet decorators,
Register addr, Register count, Register tmp);
- void card_table_write(MacroAssembler* masm, jbyte* byte_map_base, Register tmp, Register obj);
+ void card_table_write(MacroAssembler* masm, CardTable::CardValue* byte_map_base, Register tmp, Register obj);
void card_write_barrier_post(MacroAssembler* masm, Register store_addr, Register new_val, Register tmp);
--- a/src/hotspot/cpu/x86/gc/g1/g1BarrierSetAssembler_x86.cpp Tue Mar 12 09:49:10 2019 +0000
+++ b/src/hotspot/cpu/x86/gc/g1/g1BarrierSetAssembler_x86.cpp Sat Mar 16 21:00:45 2019 +0000
@@ -273,7 +273,6 @@
CardTableBarrierSet* ct =
barrier_set_cast<CardTableBarrierSet>(BarrierSet::barrier_set());
- assert(sizeof(*ct->card_table()->byte_map_base()) == sizeof(jbyte), "adjust this code");
Label done;
Label runtime;
@@ -522,7 +521,6 @@
CardTableBarrierSet* ct =
barrier_set_cast<CardTableBarrierSet>(BarrierSet::barrier_set());
- assert(sizeof(*ct->card_table()->byte_map_base()) == sizeof(jbyte), "adjust this code");
Label done;
Label enqueued;
--- a/src/hotspot/cpu/x86/gc/shared/cardTableBarrierSetAssembler_x86.cpp Tue Mar 12 09:49:10 2019 +0000
+++ b/src/hotspot/cpu/x86/gc/shared/cardTableBarrierSetAssembler_x86.cpp Sat Mar 16 21:00:45 2019 +0000
@@ -46,7 +46,6 @@
BarrierSet *bs = BarrierSet::barrier_set();
CardTableBarrierSet* ctbs = barrier_set_cast<CardTableBarrierSet>(bs);
CardTable* ct = ctbs->card_table();
- assert(sizeof(*ct->byte_map_base()) == sizeof(jbyte), "adjust this code");
intptr_t disp = (intptr_t) ct->byte_map_base();
Label L_loop, L_done;
@@ -92,7 +91,6 @@
CardTableBarrierSet* ctbs = barrier_set_cast<CardTableBarrierSet>(bs);
CardTable* ct = ctbs->card_table();
- assert(sizeof(*ct->byte_map_base()) == sizeof(jbyte), "adjust this code");
__ shrptr(obj, CardTable::card_shift);
--- a/src/hotspot/cpu/x86/x86_32.ad Tue Mar 12 09:49:10 2019 +0000
+++ b/src/hotspot/cpu/x86/x86_32.ad Sat Mar 16 21:00:45 2019 +0000
@@ -391,7 +391,7 @@
int format) {
#ifdef ASSERT
if (rspec.reloc()->type() == relocInfo::oop_type && d32 != 0 && d32 != (int)Universe::non_oop_word()) {
- assert(oopDesc::is_oop(cast_to_oop(d32)) && (ScavengeRootsInCode || !Universe::heap()->is_scavengable(cast_to_oop(d32))), "cannot embed scavengable oops in code");
+ assert(oopDesc::is_oop(cast_to_oop(d32)), "cannot embed broken oops in code");
}
#endif
cbuf.relocate(cbuf.insts_mark(), rspec, format);
--- a/src/hotspot/cpu/x86/x86_64.ad Tue Mar 12 09:49:10 2019 +0000
+++ b/src/hotspot/cpu/x86/x86_64.ad Sat Mar 16 21:00:45 2019 +0000
@@ -547,7 +547,7 @@
if (rspec.reloc()->type() == relocInfo::oop_type &&
d32 != 0 && d32 != (intptr_t) Universe::non_oop_word()) {
assert(Universe::heap()->is_in_reserved((address)(intptr_t)d32), "should be real oop");
- assert(oopDesc::is_oop(cast_to_oop((intptr_t)d32)) && (ScavengeRootsInCode || !Universe::heap()->is_scavengable(cast_to_oop((intptr_t)d32))), "cannot embed scavengable oops in code");
+ assert(oopDesc::is_oop(cast_to_oop((intptr_t)d32)), "cannot embed broken oops in code");
}
#endif
cbuf.relocate(cbuf.insts_mark(), rspec, format);
@@ -574,8 +574,7 @@
if (rspec.reloc()->type() == relocInfo::oop_type &&
d64 != 0 && d64 != (int64_t) Universe::non_oop_word()) {
assert(Universe::heap()->is_in_reserved((address)d64), "should be real oop");
- assert(oopDesc::is_oop(cast_to_oop(d64)) && (ScavengeRootsInCode || !Universe::heap()->is_scavengable(cast_to_oop(d64))),
- "cannot embed scavengable oops in code");
+ assert(oopDesc::is_oop(cast_to_oop(d64)), "cannot embed broken oops in code");
}
#endif
cbuf.relocate(cbuf.insts_mark(), rspec, format);
--- a/src/hotspot/os/aix/os_aix.cpp Tue Mar 12 09:49:10 2019 +0000
+++ b/src/hotspot/os/aix/os_aix.cpp Sat Mar 16 21:00:45 2019 +0000
@@ -2996,8 +2996,6 @@
bool os::Aix::signal_handlers_are_installed = false;
// For signal-chaining
-struct sigaction sigact[NSIG];
-sigset_t sigs;
bool os::Aix::libjsig_is_loaded = false;
typedef struct sigaction *(*get_signal_t)(int);
get_signal_t os::Aix::get_signal_action = NULL;
@@ -3011,7 +3009,7 @@
}
if (actp == NULL) {
// Retrieve the preinstalled signal handler from jvm
- actp = get_preinstalled_handler(sig);
+ actp = os::Posix::get_preinstalled_handler(sig);
}
return actp;
@@ -3074,19 +3072,6 @@
return chained;
}
-struct sigaction* os::Aix::get_preinstalled_handler(int sig) {
- if (sigismember(&sigs, sig)) {
- return &sigact[sig];
- }
- return NULL;
-}
-
-void os::Aix::save_preinstalled_handler(int sig, struct sigaction& oldAct) {
- assert(sig > 0 && sig < NSIG, "vm signal out of expected range");
- sigact[sig] = oldAct;
- sigaddset(&sigs, sig);
-}
-
// for diagnostic
int sigflags[NSIG];
@@ -3118,7 +3103,7 @@
return;
} else if (UseSignalChaining) {
// save the old handler in jvm
- save_preinstalled_handler(sig, oldAct);
+ os::Posix::save_preinstalled_handler(sig, oldAct);
// libjsig also interposes the sigaction() call below and saves the
// old sigaction on it own.
} else {
@@ -3174,7 +3159,6 @@
(*begin_signal_setting)();
}
- ::sigemptyset(&sigs);
set_signal_handler(SIGSEGV, true);
set_signal_handler(SIGPIPE, true);
set_signal_handler(SIGBUS, true);
--- a/src/hotspot/os/aix/os_aix.hpp Tue Mar 12 09:49:10 2019 +0000
+++ b/src/hotspot/os/aix/os_aix.hpp Sat Mar 16 21:00:45 2019 +0000
@@ -37,8 +37,6 @@
static bool libjsig_is_loaded; // libjsig that interposes sigaction(),
// __sigaction(), signal() is loaded
static struct sigaction *(*get_signal_action)(int);
- static struct sigaction *get_preinstalled_handler(int);
- static void save_preinstalled_handler(int, struct sigaction&);
static void check_signal_handler(int sig);
--- a/src/hotspot/os/bsd/os_bsd.cpp Tue Mar 12 09:49:10 2019 +0000
+++ b/src/hotspot/os/bsd/os_bsd.cpp Sat Mar 16 21:00:45 2019 +0000
@@ -2658,11 +2658,6 @@
bool os::Bsd::signal_handlers_are_installed = false;
// For signal-chaining
-struct sigaction sigact[NSIG];
-uint32_t sigs = 0;
-#if (32 < NSIG-1)
-#error "Not all signals can be encoded in sigs. Adapt its type!"
-#endif
bool os::Bsd::libjsig_is_loaded = false;
typedef struct sigaction *(*get_signal_t)(int);
get_signal_t os::Bsd::get_signal_action = NULL;
@@ -2676,7 +2671,7 @@
}
if (actp == NULL) {
// Retrieve the preinstalled signal handler from jvm
- actp = get_preinstalled_handler(sig);
+ actp = os::Posix::get_preinstalled_handler(sig);
}
return actp;
@@ -2739,19 +2734,6 @@
return chained;
}
-struct sigaction* os::Bsd::get_preinstalled_handler(int sig) {
- if ((((uint32_t)1 << (sig-1)) & sigs) != 0) {
- return &sigact[sig];
- }
- return NULL;
-}
-
-void os::Bsd::save_preinstalled_handler(int sig, struct sigaction& oldAct) {
- assert(sig > 0 && sig < NSIG, "vm signal out of expected range");
- sigact[sig] = oldAct;
- sigs |= (uint32_t)1 << (sig-1);
-}
-
// for diagnostic
int sigflags[NSIG];
@@ -2783,7 +2765,7 @@
return;
} else if (UseSignalChaining) {
// save the old handler in jvm
- save_preinstalled_handler(sig, oldAct);
+ os::Posix::save_preinstalled_handler(sig, oldAct);
// libjsig also interposes the sigaction() call below and saves the
// old sigaction on it own.
} else {
--- a/src/hotspot/os/bsd/os_bsd.hpp Tue Mar 12 09:49:10 2019 +0000
+++ b/src/hotspot/os/bsd/os_bsd.hpp Sat Mar 16 21:00:45 2019 +0000
@@ -37,8 +37,6 @@
static bool libjsig_is_loaded; // libjsig that interposes sigaction(),
// __sigaction(), signal() is loaded
static struct sigaction *(*get_signal_action)(int);
- static struct sigaction *get_preinstalled_handler(int);
- static void save_preinstalled_handler(int, struct sigaction&);
static void check_signal_handler(int sig);
--- a/src/hotspot/os/linux/os_linux.cpp Tue Mar 12 09:49:10 2019 +0000
+++ b/src/hotspot/os/linux/os_linux.cpp Sat Mar 16 21:00:45 2019 +0000
@@ -4463,11 +4463,6 @@
bool os::Linux::signal_handlers_are_installed = false;
// For signal-chaining
-struct sigaction sigact[NSIG];
-uint64_t sigs = 0;
-#if (64 < NSIG-1)
-#error "Not all signals can be encoded in sigs. Adapt its type!"
-#endif
bool os::Linux::libjsig_is_loaded = false;
typedef struct sigaction *(*get_signal_t)(int);
get_signal_t os::Linux::get_signal_action = NULL;
@@ -4481,7 +4476,7 @@
}
if (actp == NULL) {
// Retrieve the preinstalled signal handler from jvm
- actp = get_preinstalled_handler(sig);
+ actp = os::Posix::get_preinstalled_handler(sig);
}
return actp;
@@ -4545,19 +4540,6 @@
return chained;
}
-struct sigaction* os::Linux::get_preinstalled_handler(int sig) {
- if ((((uint64_t)1 << (sig-1)) & sigs) != 0) {
- return &sigact[sig];
- }
- return NULL;
-}
-
-void os::Linux::save_preinstalled_handler(int sig, struct sigaction& oldAct) {
- assert(sig > 0 && sig < NSIG, "vm signal out of expected range");
- sigact[sig] = oldAct;
- sigs |= (uint64_t)1 << (sig-1);
-}
-
// for diagnostic
int sigflags[NSIG];
@@ -4589,7 +4571,7 @@
return;
} else if (UseSignalChaining) {
// save the old handler in jvm
- save_preinstalled_handler(sig, oldAct);
+ os::Posix::save_preinstalled_handler(sig, oldAct);
// libjsig also interposes the sigaction() call below and saves the
// old sigaction on it own.
} else {
--- a/src/hotspot/os/linux/os_linux.hpp Tue Mar 12 09:49:10 2019 +0000
+++ b/src/hotspot/os/linux/os_linux.hpp Sat Mar 16 21:00:45 2019 +0000
@@ -38,8 +38,6 @@
static bool libjsig_is_loaded; // libjsig that interposes sigaction(),
// __sigaction(), signal() is loaded
static struct sigaction *(*get_signal_action)(int);
- static struct sigaction *get_preinstalled_handler(int);
- static void save_preinstalled_handler(int, struct sigaction&);
static void check_signal_handler(int sig);
--- a/src/hotspot/os/posix/os_posix.cpp Tue Mar 12 09:49:10 2019 +0000
+++ b/src/hotspot/os/posix/os_posix.cpp Sat Mar 16 21:00:45 2019 +0000
@@ -1673,6 +1673,24 @@
}
}
+#ifndef SOLARIS
+sigset_t sigs;
+struct sigaction sigact[NSIG];
+
+struct sigaction* os::Posix::get_preinstalled_handler(int sig) {
+ if (sigismember(&sigs, sig)) {
+ return &sigact[sig];
+ }
+ return NULL;
+}
+
+void os::Posix::save_preinstalled_handler(int sig, struct sigaction& oldAct) {
+ assert(sig > 0 && sig < NSIG, "vm signal out of expected range");
+ sigact[sig] = oldAct;
+ sigaddset(&sigs, sig);
+}
+#endif
+
// Not all POSIX types and API's are available on all notionally "posix"
// platforms. If we have build-time support then we will check for actual
// runtime support via dlopen/dlsym lookup. This allows for running on an
@@ -1783,6 +1801,7 @@
(_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");
+ sigemptyset(&sigs);
#endif // !SOLARIS
}
@@ -1797,6 +1816,7 @@
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");
+ sigemptyset(&sigs);
#endif // !SOLARIS
}
--- a/src/hotspot/os/posix/os_posix.hpp Tue Mar 12 09:49:10 2019 +0000
+++ b/src/hotspot/os/posix/os_posix.hpp Sat Mar 16 21:00:45 2019 +0000
@@ -117,6 +117,9 @@
// effective gid, or if given uid is root.
static bool matches_effective_uid_and_gid_or_root(uid_t uid, gid_t gid);
+ static struct sigaction *get_preinstalled_handler(int);
+ static void save_preinstalled_handler(int, struct sigaction&);
+
static void print_umask(outputStream* st, mode_t umsk);
static void print_user_info(outputStream* st);
--- a/src/hotspot/os_cpu/aix_ppc/atomic_aix_ppc.hpp Tue Mar 12 09:49:10 2019 +0000
+++ b/src/hotspot/os_cpu/aix_ppc/atomic_aix_ppc.hpp Sat Mar 16 21:00:45 2019 +0000
@@ -1,6 +1,6 @@
/*
* Copyright (c) 1997, 2019, Oracle and/or its affiliates. All rights reserved.
- * Copyright (c) 2012, 2018 SAP SE. 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
@@ -70,22 +70,13 @@
// Store|Load
//
-#define strasm_sync "\n sync \n"
-#define strasm_lwsync "\n lwsync \n"
-#define strasm_isync "\n isync \n"
-#define strasm_release strasm_lwsync
-#define strasm_acquire strasm_lwsync
-#define strasm_fence strasm_sync
-#define strasm_nobarrier ""
-#define strasm_nobarrier_clobber_memory ""
-
inline void pre_membar(atomic_memory_order order) {
switch (order) {
case memory_order_relaxed:
case memory_order_acquire: break;
case memory_order_release:
- case memory_order_acq_rel: __asm__ __volatile__ (strasm_lwsync); break;
- default /*conservative*/ : __asm__ __volatile__ (strasm_sync); break;
+ case memory_order_acq_rel: __asm__ __volatile__ ("lwsync" : : : "memory"); break;
+ default /*conservative*/ : __asm__ __volatile__ ("sync" : : : "memory"); break;
}
}
@@ -94,8 +85,8 @@
case memory_order_relaxed:
case memory_order_release: break;
case memory_order_acquire:
- case memory_order_acq_rel: __asm__ __volatile__ (strasm_isync); break;
- default /*conservative*/ : __asm__ __volatile__ (strasm_sync); break;
+ case memory_order_acq_rel: __asm__ __volatile__ ("isync" : : : "memory"); break;
+ default /*conservative*/ : __asm__ __volatile__ ("sync" : : : "memory"); break;
}
}
@@ -408,13 +399,4 @@
return old_value;
}
-#undef strasm_sync
-#undef strasm_lwsync
-#undef strasm_isync
-#undef strasm_release
-#undef strasm_acquire
-#undef strasm_fence
-#undef strasm_nobarrier
-#undef strasm_nobarrier_clobber_memory
-
#endif // OS_CPU_AIX_PPC_ATOMIC_AIX_PPC_HPP
--- a/src/hotspot/os_cpu/linux_ppc/atomic_linux_ppc.hpp Tue Mar 12 09:49:10 2019 +0000
+++ b/src/hotspot/os_cpu/linux_ppc/atomic_linux_ppc.hpp Sat Mar 16 21:00:45 2019 +0000
@@ -1,6 +1,6 @@
/*
* Copyright (c) 1997, 2019, Oracle and/or its affiliates. All rights reserved.
- * Copyright (c) 2012, 2018 SAP SE. 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
@@ -30,6 +30,8 @@
#error "Atomic currently only implemented for PPC64"
#endif
+#include "utilities/debug.hpp"
+
// Implementation of class atomic
//
@@ -68,22 +70,13 @@
// Store|Load
//
-#define strasm_sync "\n sync \n"
-#define strasm_lwsync "\n lwsync \n"
-#define strasm_isync "\n isync \n"
-#define strasm_release strasm_lwsync
-#define strasm_acquire strasm_lwsync
-#define strasm_fence strasm_sync
-#define strasm_nobarrier ""
-#define strasm_nobarrier_clobber_memory ""
-
inline void pre_membar(atomic_memory_order order) {
switch (order) {
case memory_order_relaxed:
case memory_order_acquire: break;
case memory_order_release:
- case memory_order_acq_rel: __asm__ __volatile__ (strasm_lwsync); break;
- default /*conservative*/ : __asm__ __volatile__ (strasm_sync); break;
+ case memory_order_acq_rel: __asm__ __volatile__ ("lwsync" : : : "memory"); break;
+ default /*conservative*/ : __asm__ __volatile__ ("sync" : : : "memory"); break;
}
}
@@ -92,8 +85,8 @@
case memory_order_relaxed:
case memory_order_release: break;
case memory_order_acquire:
- case memory_order_acq_rel: __asm__ __volatile__ (strasm_isync); break;
- default /*conservative*/ : __asm__ __volatile__ (strasm_sync); break;
+ case memory_order_acq_rel: __asm__ __volatile__ ("isync" : : : "memory"); break;
+ default /*conservative*/ : __asm__ __volatile__ ("sync" : : : "memory"); break;
}
}
@@ -406,13 +399,4 @@
return old_value;
}
-#undef strasm_sync
-#undef strasm_lwsync
-#undef strasm_isync
-#undef strasm_release
-#undef strasm_acquire
-#undef strasm_fence
-#undef strasm_nobarrier
-#undef strasm_nobarrier_clobber_memory
-
#endif // OS_CPU_LINUX_PPC_ATOMIC_LINUX_PPC_HPP
--- a/src/hotspot/os_cpu/linux_x86/gc/z/zGlobals_linux_x86.hpp Tue Mar 12 09:49:10 2019 +0000
+++ b/src/hotspot/os_cpu/linux_x86/gc/z/zGlobals_linux_x86.hpp Sat Mar 16 21:00:45 2019 +0000
@@ -74,7 +74,7 @@
// * 63-47 Fixed (17-bits, always zero)
//
-const size_t ZPlatformPageSizeSmallShift = 21; // 2M
+const size_t ZPlatformGranuleSizeShift = 21; // 2M
const size_t ZPlatformAddressOffsetBits = 42; // 4TB
--- a/src/hotspot/os_cpu/linux_x86/gc/z/zPhysicalMemoryBacking_linux_x86.cpp Tue Mar 12 09:49:10 2019 +0000
+++ b/src/hotspot/os_cpu/linux_x86/gc/z/zPhysicalMemoryBacking_linux_x86.cpp Sat Mar 16 21:00:45 2019 +0000
@@ -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
@@ -25,6 +25,7 @@
#include "gc/z/zAddress.inline.hpp"
#include "gc/z/zBackingFile_linux_x86.hpp"
#include "gc/z/zErrno.hpp"
+#include "gc/z/zGlobals.hpp"
#include "gc/z/zLargePages.inline.hpp"
#include "gc/z/zMemory.hpp"
#include "gc/z/zNUMA.hpp"
@@ -47,23 +48,22 @@
// Proc file entry for max map mount
#define ZFILENAME_PROC_MAX_MAP_COUNT "/proc/sys/vm/max_map_count"
-ZPhysicalMemoryBacking::ZPhysicalMemoryBacking(size_t max_capacity, size_t granule_size) :
+ZPhysicalMemoryBacking::ZPhysicalMemoryBacking(size_t max_capacity) :
_manager(),
- _file(),
- _granule_size(granule_size) {
+ _file() {
if (!_file.is_initialized()) {
return;
}
// Check and warn if max map count is too low
- check_max_map_count(max_capacity, granule_size);
+ check_max_map_count(max_capacity);
// Check and warn if available space on filesystem is too low
check_available_space_on_filesystem(max_capacity);
}
-void ZPhysicalMemoryBacking::check_max_map_count(size_t max_capacity, size_t granule_size) const {
+void ZPhysicalMemoryBacking::check_max_map_count(size_t max_capacity) const {
const char* const filename = ZFILENAME_PROC_MAX_MAP_COUNT;
FILE* const file = fopen(filename, "r");
if (file == NULL) {
@@ -86,7 +86,7 @@
// However, ZGC tends to create the most mappings and dominate the total count.
// In the worst cases, ZGC will map each granule three times, i.e. once per heap view.
// We speculate that we need another 20% to allow for non-ZGC subsystems to map memory.
- const size_t required_max_map_count = (max_capacity / granule_size) * 3 * 1.2;
+ const size_t required_max_map_count = (max_capacity / ZGranuleSize) * 3 * 1.2;
if (actual_max_map_count < required_max_map_count) {
log_warning(gc, init)("***** WARNING! INCORRECT SYSTEM CONFIGURATION DETECTED! *****");
log_warning(gc, init)("The system limit on number of memory mappings per process might be too low "
@@ -135,7 +135,7 @@
size_t ZPhysicalMemoryBacking::try_expand(size_t old_capacity, size_t new_capacity) {
assert(old_capacity < new_capacity, "Invalid old/new capacity");
- const size_t capacity = _file.try_expand(old_capacity, new_capacity - old_capacity, _granule_size);
+ const size_t capacity = _file.try_expand(old_capacity, new_capacity - old_capacity, ZGranuleSize);
if (capacity > old_capacity) {
// Add expanded capacity to free list
_manager.free(old_capacity, capacity - old_capacity);
@@ -145,15 +145,15 @@
}
ZPhysicalMemory ZPhysicalMemoryBacking::alloc(size_t size) {
- assert(is_aligned(size, _granule_size), "Invalid size");
+ assert(is_aligned(size, ZGranuleSize), "Invalid size");
ZPhysicalMemory pmem;
// Allocate segments
- for (size_t allocated = 0; allocated < size; allocated += _granule_size) {
- const uintptr_t start = _manager.alloc_from_front(_granule_size);
+ for (size_t allocated = 0; allocated < size; allocated += ZGranuleSize) {
+ const uintptr_t start = _manager.alloc_from_front(ZGranuleSize);
assert(start != UINTPTR_MAX, "Allocation should never fail");
- pmem.add_segment(ZPhysicalMemorySegment(start, _granule_size));
+ pmem.add_segment(ZPhysicalMemorySegment(start, ZGranuleSize));
}
return pmem;
--- a/src/hotspot/os_cpu/linux_x86/gc/z/zPhysicalMemoryBacking_linux_x86.hpp Tue Mar 12 09:49:10 2019 +0000
+++ b/src/hotspot/os_cpu/linux_x86/gc/z/zPhysicalMemoryBacking_linux_x86.hpp Sat Mar 16 21:00:45 2019 +0000
@@ -34,9 +34,8 @@
private:
ZMemoryManager _manager;
ZBackingFile _file;
- const size_t _granule_size;
- void check_max_map_count(size_t max_capacity, size_t granule_size) const;
+ void check_max_map_count(size_t max_capacity) const;
void check_available_space_on_filesystem(size_t max_capacity) const;
void map_failed(ZErrno err) const;
@@ -46,7 +45,7 @@
void unmap_view(ZPhysicalMemory pmem, uintptr_t addr) const;
public:
- ZPhysicalMemoryBacking(size_t max_capacity, size_t granule_size);
+ ZPhysicalMemoryBacking(size_t max_capacity);
bool is_initialized() const;
--- a/src/hotspot/share/adlc/formssel.cpp Tue Mar 12 09:49:10 2019 +0000
+++ b/src/hotspot/share/adlc/formssel.cpp Sat Mar 16 21:00:45 2019 +0000
@@ -3802,6 +3802,7 @@
"AndI","AndL",
"AndV",
"MaxI","MinI","MaxF","MinF","MaxD","MinD",
+ "MaxV", "MinV",
"MulI","MulL","MulF","MulD",
"MulVS","MulVI","MulVL","MulVF","MulVD",
"OrI","OrL",
@@ -4177,6 +4178,7 @@
"NegVF","NegVD",
"SqrtVD","SqrtVF",
"AndV" ,"XorV" ,"OrV",
+ "MaxV", "MinV",
"AddReductionVI", "AddReductionVL",
"AddReductionVF", "AddReductionVD",
"MulReductionVI", "MulReductionVL",
@@ -4186,6 +4188,7 @@
"LShiftVB","LShiftVS","LShiftVI","LShiftVL",
"RShiftVB","RShiftVS","RShiftVI","RShiftVL",
"URShiftVB","URShiftVS","URShiftVI","URShiftVL",
+ "MaxReductionV", "MinReductionV",
"ReplicateB","ReplicateS","ReplicateI","ReplicateL","ReplicateF","ReplicateD",
"LoadVector","StoreVector",
"FmaVD", "FmaVF","PopCountVI",
--- a/src/hotspot/share/aot/aotCodeHeap.cpp Tue Mar 12 09:49:10 2019 +0000
+++ b/src/hotspot/share/aot/aotCodeHeap.cpp Sat Mar 16 21:00:45 2019 +0000
@@ -931,13 +931,13 @@
// Scan only klasses_got cells which should have only Klass*,
// metadata_got cells are scanned only for alive AOT methods
// by AOTCompiledMethod::metadata_do().
-void AOTCodeHeap::got_metadata_do(void f(Metadata*)) {
+void AOTCodeHeap::got_metadata_do(MetadataClosure* f) {
for (int i = 1; i < _klasses_got_size; i++) {
Metadata** p = &_klasses_got[i];
Metadata* md = *p;
if (md == NULL) continue; // skip non-oops
if (Metaspace::contains(md)) {
- f(md);
+ f->do_metadata(md);
} else {
intptr_t meta = (intptr_t)md;
fatal("Invalid value in _klasses_got[%d] = " INTPTR_FORMAT, i, meta);
@@ -969,7 +969,7 @@
}
#endif
-void AOTCodeHeap::metadata_do(void f(Metadata*)) {
+void AOTCodeHeap::metadata_do(MetadataClosure* f) {
for (int index = 0; index < _method_count; index++) {
if (_code_to_aot[index]._state != in_use) {
continue; // Skip uninitialized entries.
--- a/src/hotspot/share/aot/aotCodeHeap.hpp Tue Mar 12 09:49:10 2019 +0000
+++ b/src/hotspot/share/aot/aotCodeHeap.hpp Sat Mar 16 21:00:45 2019 +0000
@@ -252,8 +252,8 @@
void oops_do(OopClosure* f);
- void metadata_do(void f(Metadata*));
- void got_metadata_do(void f(Metadata*));
+ void metadata_do(MetadataClosure* f);
+ void got_metadata_do(MetadataClosure* f);
#ifdef ASSERT
bool got_contains(Metadata **p) {
--- a/src/hotspot/share/aot/aotCompiledMethod.cpp Tue Mar 12 09:49:10 2019 +0000
+++ b/src/hotspot/share/aot/aotCompiledMethod.cpp Sat Mar 16 21:00:45 2019 +0000
@@ -246,7 +246,7 @@
// Iterate over metadata calling this function. Used by RedefineClasses
// Copied from nmethod::metadata_do
-void AOTCompiledMethod::metadata_do(void f(Metadata*)) {
+void AOTCompiledMethod::metadata_do(MetadataClosure* f) {
address low_boundary = verified_entry_point();
{
// Visit all immediate references that are embedded in the instruction stream.
@@ -262,7 +262,7 @@
"metadata must be found in exactly one place");
if (r->metadata_is_immediate() && r->metadata_value() != NULL) {
Metadata* md = r->metadata_value();
- if (md != _method) f(md);
+ if (md != _method) f->do_metadata(md);
}
} else if (iter.type() == relocInfo::virtual_call_type) {
ResourceMark rm;
@@ -270,13 +270,13 @@
CompiledIC *ic = CompiledIC_at(&iter);
if (ic->is_icholder_call()) {
CompiledICHolder* cichk = ic->cached_icholder();
- f(cichk->holder_metadata());
- f(cichk->holder_klass());
+ f->do_metadata(cichk->holder_metadata());
+ f->do_metadata(cichk->holder_klass());
} else {
// Get Klass* or NULL (if value is -1) from GOT cell of virtual call PLT stub.
Metadata* ic_oop = ic->cached_metadata();
if (ic_oop != NULL) {
- f(ic_oop);
+ f->do_metadata(ic_oop);
}
}
} else if (iter.type() == relocInfo::static_call_type ||
@@ -284,7 +284,7 @@
// Check Method* in AOT c2i stub for other calls.
Metadata* meta = (Metadata*)nativeLoadGot_at(nativePltCall_at(iter.addr())->plt_c2i_stub())->data();
if (meta != NULL) {
- f(meta);
+ f->do_metadata(meta);
}
}
}
@@ -302,11 +302,11 @@
continue;
}
assert(Metaspace::contains(m), "");
- f(m);
+ f->do_metadata(m);
}
// Visit metadata not embedded in the other places.
- if (_method != NULL) f(_method);
+ if (_method != NULL) f->do_metadata(_method);
}
void AOTCompiledMethod::print() const {
--- a/src/hotspot/share/aot/aotCompiledMethod.hpp Tue Mar 12 09:49:10 2019 +0000
+++ b/src/hotspot/share/aot/aotCompiledMethod.hpp Sat Mar 16 21:00:45 2019 +0000
@@ -241,7 +241,7 @@
address get_original_pc(const frame* fr) { return *orig_pc_addr(fr); }
void set_original_pc(const frame* fr, address pc) { *orig_pc_addr(fr) = pc; }
- virtual void metadata_do(void f(Metadata*));
+ virtual void metadata_do(MetadataClosure* f);
bool metadata_got_contains(Metadata **p) {
return p >= &_metadata_got[0] && p < &_metadata_got[_metadata_size];
--- a/src/hotspot/share/aot/aotLoader.cpp Tue Mar 12 09:49:10 2019 +0000
+++ b/src/hotspot/share/aot/aotLoader.cpp Sat Mar 16 21:00:45 2019 +0000
@@ -78,7 +78,7 @@
}
}
-void AOTLoader::metadata_do(void f(Metadata*)) {
+void AOTLoader::metadata_do(MetadataClosure* f) {
if (UseAOT) {
FOR_ALL_AOT_HEAPS(heap) {
(*heap)->metadata_do(f);
--- a/src/hotspot/share/aot/aotLoader.hpp Tue Mar 12 09:49:10 2019 +0000
+++ b/src/hotspot/share/aot/aotLoader.hpp Sat Mar 16 21:00:45 2019 +0000
@@ -62,7 +62,7 @@
static void load_for_klass(InstanceKlass* ik, Thread* thread) NOT_AOT_RETURN;
static uint64_t get_saved_fingerprint(InstanceKlass* ik) NOT_AOT({ return 0; });
static void oops_do(OopClosure* f) NOT_AOT_RETURN;
- static void metadata_do(void f(Metadata*)) NOT_AOT_RETURN;
+ static void metadata_do(MetadataClosure* f) NOT_AOT_RETURN;
static void mark_evol_dependent_methods(InstanceKlass* dependee) NOT_AOT_RETURN;
NOT_PRODUCT( static void print_statistics() NOT_AOT_RETURN; )
--- a/src/hotspot/share/c1/c1_LIRGenerator.cpp Tue Mar 12 09:49:10 2019 +0000
+++ b/src/hotspot/share/c1/c1_LIRGenerator.cpp Sat Mar 16 21:00:45 2019 +0000
@@ -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
@@ -53,18 +53,13 @@
#define PATCHED_ADDR (max_jint)
#endif
-void PhiResolverState::reset(int max_vregs) {
- // Initialize array sizes
- _virtual_operands.at_put_grow(max_vregs - 1, NULL, NULL);
- _virtual_operands.trunc_to(0);
- _other_operands.at_put_grow(max_vregs - 1, NULL, NULL);
- _other_operands.trunc_to(0);
- _vreg_table.at_put_grow(max_vregs - 1, NULL, NULL);
- _vreg_table.trunc_to(0);
+void PhiResolverState::reset() {
+ _virtual_operands.clear();
+ _other_operands.clear();
+ _vreg_table.clear();
}
-
//--------------------------------------------------------------
// PhiResolver
@@ -78,13 +73,13 @@
// r2 := r3 becomes r1 := r2
// r1 := r2 r2 := r3
-PhiResolver::PhiResolver(LIRGenerator* gen, int max_vregs)
+PhiResolver::PhiResolver(LIRGenerator* gen)
: _gen(gen)
, _state(gen->resolver_state())
, _temp(LIR_OprFact::illegalOpr)
{
// reinitialize the shared state arrays
- _state.reset(max_vregs);
+ _state.reset();
}
@@ -1021,8 +1016,7 @@
// a block with only one predecessor never has phi functions
if (sux->number_of_preds() > 1) {
- int max_phis = cur_state->stack_size() + cur_state->locals_size();
- PhiResolver resolver(this, _virtual_register_number + max_phis * 2);
+ PhiResolver resolver(this);
ValueStack* sux_state = sux->state();
Value sux_value;
@@ -1653,7 +1647,7 @@
decorators |= ACCESS_READ;
decorators |= ACCESS_WRITE;
// Atomic operations are SEQ_CST by default
- decorators |= ((decorators & MO_DECORATOR_MASK) != 0) ? MO_SEQ_CST : 0;
+ decorators |= ((decorators & MO_DECORATOR_MASK) == 0) ? MO_SEQ_CST : 0;
LIRAccess access(this, decorators, base, offset, type);
if (access.is_raw()) {
return _barrier_set->BarrierSetC1::atomic_cmpxchg_at(access, cmp_value, new_value);
@@ -1667,7 +1661,7 @@
decorators |= ACCESS_READ;
decorators |= ACCESS_WRITE;
// Atomic operations are SEQ_CST by default
- decorators |= ((decorators & MO_DECORATOR_MASK) != 0) ? MO_SEQ_CST : 0;
+ decorators |= ((decorators & MO_DECORATOR_MASK) == 0) ? MO_SEQ_CST : 0;
LIRAccess access(this, decorators, base, offset, type);
if (access.is_raw()) {
return _barrier_set->BarrierSetC1::atomic_xchg_at(access, value);
@@ -1681,7 +1675,7 @@
decorators |= ACCESS_READ;
decorators |= ACCESS_WRITE;
// Atomic operations are SEQ_CST by default
- decorators |= ((decorators & MO_DECORATOR_MASK) != 0) ? MO_SEQ_CST : 0;
+ decorators |= ((decorators & MO_DECORATOR_MASK) == 0) ? MO_SEQ_CST : 0;
LIRAccess access(this, decorators, base, offset, type);
if (access.is_raw()) {
return _barrier_set->BarrierSetC1::atomic_add_at(access, value);
--- a/src/hotspot/share/c1/c1_LIRGenerator.hpp Tue Mar 12 09:49:10 2019 +0000
+++ b/src/hotspot/share/c1/c1_LIRGenerator.hpp Sat Mar 16 21:00:45 2019 +0000
@@ -102,7 +102,7 @@
// This is shared state to be used by the PhiResolver so the operand
-// arrays don't have to be reallocated for reach resolution.
+// arrays don't have to be reallocated for each resolution.
class PhiResolverState: public CompilationResourceObj {
friend class PhiResolver;
@@ -114,7 +114,7 @@
public:
PhiResolverState() {}
- void reset(int max_vregs);
+ void reset();
};
@@ -146,7 +146,7 @@
}
public:
- PhiResolver(LIRGenerator* _lir_gen, int max_vregs);
+ PhiResolver(LIRGenerator* _lir_gen);
~PhiResolver();
void move(LIR_Opr src, LIR_Opr dest);
--- a/src/hotspot/share/c1/c1_LinearScan.cpp Tue Mar 12 09:49:10 2019 +0000
+++ b/src/hotspot/share/c1/c1_LinearScan.cpp Sat Mar 16 21:00:45 2019 +0000
@@ -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
@@ -81,7 +81,7 @@
, _max_spills(0)
, _unused_spill_slot(-1)
, _intervals(0) // initialized later with correct length
- , _new_intervals_from_allocation(new IntervalList())
+ , _new_intervals_from_allocation(NULL)
, _sorted_intervals(NULL)
, _needs_full_resort(false)
, _lir_ops(0) // initialized later with correct length
@@ -287,7 +287,11 @@
void LinearScan::append_interval(Interval* it) {
it->set_reg_num(_intervals.length());
_intervals.append(it);
- _new_intervals_from_allocation->append(it);
+ IntervalList* new_intervals = _new_intervals_from_allocation;
+ if (new_intervals == NULL) {
+ new_intervals = _new_intervals_from_allocation = new IntervalList();
+ }
+ new_intervals->append(it);
}
// copy the vreg-flags if an interval is split
@@ -1283,7 +1287,7 @@
// temp ranges for fpu registers are only created when the method has
// virtual fpu operands. Otherwise no allocation for fpu registers is
- // perfomed and so the temp ranges would be useless
+ // performed and so the temp ranges would be useless
if (has_fpu_registers()) {
#ifdef X86
if (UseSSE < 2) {
@@ -1616,7 +1620,7 @@
IntervalArray* old_list = _sorted_intervals;
IntervalList* new_list = _new_intervals_from_allocation;
int old_len = old_list->length();
- int new_len = new_list->length();
+ int new_len = new_list == NULL ? 0 : new_list->length();
if (new_len == 0) {
// no intervals have been added during allocation, so sorted list is already up to date
@@ -1721,13 +1725,12 @@
void LinearScan::resolve_collect_mappings(BlockBegin* from_block, BlockBegin* to_block, MoveResolver &move_resolver) {
DEBUG_ONLY(move_resolver.check_empty());
- const int num_regs = num_virtual_regs();
const int size = live_set_size();
const ResourceBitMap live_at_edge = to_block->live_in();
// visit all registers where the live_at_edge bit is set
for (int r = (int)live_at_edge.get_next_one_offset(0, size); r < size; r = (int)live_at_edge.get_next_one_offset(r + 1, size)) {
- assert(r < num_regs, "live information set for not exisiting interval");
+ assert(r < num_virtual_regs(), "live information set for not exisiting interval");
assert(from_block->live_out().at(r) && to_block->live_in().at(r), "interval not live at this edge");
Interval* from_interval = interval_at_block_end(from_block, r);
@@ -4124,7 +4127,7 @@
_cached_to(-1),
_cached_opr(LIR_OprFact::illegalOpr),
_cached_vm_reg(VMRegImpl::Bad()),
- _split_children(0),
+ _split_children(NULL),
_canonical_spill_slot(-1),
_insert_move_when_activated(false),
_spill_state(noDefinitionFound),
@@ -4149,18 +4152,18 @@
#ifdef ASSERT
// consistency check of split-children
void Interval::check_split_children() {
- if (_split_children.length() > 0) {
+ if (_split_children != NULL && _split_children->length() > 0) {
assert(is_split_parent(), "only split parents can have children");
- for (int i = 0; i < _split_children.length(); i++) {
- Interval* i1 = _split_children.at(i);
+ for (int i = 0; i < _split_children->length(); i++) {
+ Interval* i1 = _split_children->at(i);
assert(i1->split_parent() == this, "not a split child of this interval");
assert(i1->type() == type(), "must be equal for all split children");
assert(i1->canonical_spill_slot() == canonical_spill_slot(), "must be equal for all split children");
- for (int j = i + 1; j < _split_children.length(); j++) {
- Interval* i2 = _split_children.at(j);
+ for (int j = i + 1; j < _split_children->length(); j++) {
+ Interval* i2 = _split_children->at(j);
assert(i1->reg_num() != i2->reg_num(), "same register number");
@@ -4187,11 +4190,11 @@
if (_register_hint->assigned_reg() >= 0 && _register_hint->assigned_reg() < LinearScan::nof_regs) {
return _register_hint;
- } else if (_register_hint->_split_children.length() > 0) {
+ } else if (_register_hint->_split_children != NULL && _register_hint->_split_children->length() > 0) {
// search the first split child that has a register assigned
- int len = _register_hint->_split_children.length();
+ int len = _register_hint->_split_children->length();
for (int i = 0; i < len; i++) {
- Interval* cur = _register_hint->_split_children.at(i);
+ Interval* cur = _register_hint->_split_children->at(i);
if (cur->assigned_reg() >= 0 && cur->assigned_reg() < LinearScan::nof_regs) {
return cur;
@@ -4210,23 +4213,23 @@
assert(op_id >= 0, "invalid op_id (method can not be called for spill moves)");
Interval* result;
- if (_split_children.length() == 0) {
+ if (_split_children == NULL || _split_children->length() == 0) {
result = this;
} else {
result = NULL;
- int len = _split_children.length();
+ int len = _split_children->length();
// in outputMode, the end of the interval (op_id == cur->to()) is not valid
int to_offset = (mode == LIR_OpVisitState::outputMode ? 0 : 1);
int i;
for (i = 0; i < len; i++) {
- Interval* cur = _split_children.at(i);
+ Interval* cur = _split_children->at(i);
if (cur->from() <= op_id && op_id < cur->to() + to_offset) {
if (i > 0) {
// exchange current split child to start of list (faster access for next call)
- _split_children.at_put(i, _split_children.at(0));
- _split_children.at_put(0, cur);
+ _split_children->at_put(i, _split_children->at(0));
+ _split_children->at_put(0, cur);
}
// interval found
@@ -4237,7 +4240,7 @@
#ifdef ASSERT
for (i = 0; i < len; i++) {
- Interval* tmp = _split_children.at(i);
+ Interval* tmp = _split_children->at(i);
if (tmp != result && tmp->from() <= op_id && op_id < tmp->to() + to_offset) {
tty->print_cr("two valid result intervals found for op_id %d: %d and %d", op_id, result->reg_num(), tmp->reg_num());
result->print();
@@ -4262,11 +4265,12 @@
Interval* parent = split_parent();
Interval* result = NULL;
- int len = parent->_split_children.length();
+ assert(parent->_split_children != NULL, "no split children available");
+ int len = parent->_split_children->length();
assert(len > 0, "no split children available");
for (int i = len - 1; i >= 0; i--) {
- Interval* cur = parent->_split_children.at(i);
+ Interval* cur = parent->_split_children->at(i);
if (cur->to() <= op_id && (result == NULL || result->to() < cur->to())) {
result = cur;
}
@@ -4277,29 +4281,6 @@
}
-// checks if op_id is covered by any split child
-bool Interval::split_child_covers(int op_id, LIR_OpVisitState::OprMode mode) {
- assert(is_split_parent(), "can only be called for split parents");
- assert(op_id >= 0, "invalid op_id (method can not be called for spill moves)");
-
- if (_split_children.length() == 0) {
- // simple case if interval was not split
- return covers(op_id, mode);
-
- } else {
- // extended case: check all split children
- int len = _split_children.length();
- for (int i = 0; i < len; i++) {
- Interval* cur = _split_children.at(i);
- if (cur->covers(op_id, mode)) {
- return true;
- }
- }
- return false;
- }
-}
-
-
// Note: use positions are sorted descending -> first use has highest index
int Interval::first_usage(IntervalUseKind min_use_kind) const {
assert(LinearScan::is_virtual_interval(this), "cannot access use positions for fixed intervals");
@@ -4404,13 +4385,13 @@
result->set_register_hint(parent);
// insert new interval in children-list of parent
- if (parent->_split_children.length() == 0) {
+ if (parent->_split_children == NULL) {
assert(is_split_parent(), "list must be initialized at first split");
- parent->_split_children = IntervalList(4);
- parent->_split_children.append(this);
- }
- parent->_split_children.append(result);
+ parent->_split_children = new IntervalList(4);
+ parent->_split_children->append(this);
+ }
+ parent->_split_children->append(result);
return result;
}
@@ -4655,12 +4636,6 @@
}
-// append interval at top of list
-void IntervalWalker::append_unsorted(Interval** list, Interval* interval) {
- interval->set_next(*list); *list = interval;
-}
-
-
// append interval in order of current range from()
void IntervalWalker::append_sorted(Interval** list, Interval* interval) {
Interval* prev = NULL;
@@ -4964,17 +4939,6 @@
}
}
-void LinearScanWalker::free_collect_unhandled(IntervalKind kind, Interval* cur) {
- Interval* list = unhandled_first(kind);
- while (list != Interval::end()) {
- set_use_pos(list, list->intersects_at(cur), true);
- if (kind == fixedKind && cur->to() <= list->from()) {
- set_use_pos(list, list->from(), true);
- }
- list = list->next();
- }
-}
-
void LinearScanWalker::spill_exclude_active_fixed() {
Interval* list = active_first(fixedKind);
while (list != Interval::end()) {
@@ -4983,14 +4947,6 @@
}
}
-void LinearScanWalker::spill_block_unhandled_fixed(Interval* cur) {
- Interval* list = unhandled_first(fixedKind);
- while (list != Interval::end()) {
- set_block_pos(list, list->intersects_at(cur));
- list = list->next();
- }
-}
-
void LinearScanWalker::spill_block_inactive_fixed(Interval* cur) {
Interval* list = inactive_first(fixedKind);
while (list != Interval::end()) {
@@ -5412,7 +5368,6 @@
free_exclude_active_any();
free_collect_inactive_fixed(cur);
free_collect_inactive_any(cur);
-// free_collect_unhandled(fixedKind, cur);
assert(unhandled_first(fixedKind) == Interval::end(), "must not have unhandled fixed intervals because all fixed intervals have a use at position 0");
// _use_pos contains the start of the next interval that has this register assigned
@@ -5445,8 +5400,8 @@
int interval_to = cur->to();
bool need_split = false;
- int split_pos = -1;
- int reg = any_reg;
+ int split_pos;
+ int reg;
int regHi = any_reg;
if (_adjacent_regs) {
@@ -5500,7 +5455,7 @@
}
-int LinearScanWalker::find_locked_reg(int reg_needed_until, int interval_to, int hint_reg, int ignore_reg, bool* need_split) {
+int LinearScanWalker::find_locked_reg(int reg_needed_until, int interval_to, int ignore_reg, bool* need_split) {
int max_reg = any_reg;
for (int i = _first_reg; i <= _last_reg; i++) {
@@ -5508,7 +5463,7 @@
// this register must be ignored
} else if (_use_pos[i] > reg_needed_until) {
- if (max_reg == any_reg || i == hint_reg || (_use_pos[i] > _use_pos[max_reg] && max_reg != hint_reg)) {
+ if (max_reg == any_reg || _use_pos[i] > _use_pos[max_reg]) {
max_reg = i;
}
}
@@ -5521,7 +5476,7 @@
return max_reg;
}
-int LinearScanWalker::find_locked_double_reg(int reg_needed_until, int interval_to, int hint_reg, bool* need_split) {
+int LinearScanWalker::find_locked_double_reg(int reg_needed_until, int interval_to, bool* need_split) {
assert((_last_reg - _first_reg + 1) % 2 == 0, "adjust algorithm");
int max_reg = any_reg;
@@ -5571,7 +5526,6 @@
// collect current usage of registers
init_use_lists(false);
spill_exclude_active_fixed();
-// spill_block_unhandled_fixed(cur);
assert(unhandled_first(fixedKind) == Interval::end(), "must not have unhandled fixed intervals because all fixed intervals have a use at position 0");
spill_block_inactive_fixed(cur);
spill_collect_active_any();
@@ -5601,7 +5555,7 @@
int reg, regHi;
if (_adjacent_regs) {
- reg = find_locked_double_reg(reg_needed_until, interval_to, any_reg, &need_split);
+ reg = find_locked_double_reg(reg_needed_until, interval_to, &need_split);
regHi = reg + 1;
if (reg != any_reg) {
@@ -5609,7 +5563,7 @@
split_pos = MIN2(_block_pos[reg], _block_pos[regHi]);
}
} else {
- reg = find_locked_reg(reg_needed_until, interval_to, any_reg, cur->assigned_reg(), &need_split);
+ reg = find_locked_reg(reg_needed_until, interval_to, cur->assigned_reg(), &need_split);
regHi = any_reg;
if (reg != any_reg) {
@@ -5621,7 +5575,7 @@
regHi = reg;
reg = cur->assigned_reg();
} else {
- regHi = find_locked_reg(reg_needed_until, interval_to, any_reg, reg, &need_split);
+ regHi = find_locked_reg(reg_needed_until, interval_to, reg, &need_split);
if (regHi != any_reg) {
use_pos = MIN2(use_pos, _use_pos[regHi]);
split_pos = MIN2(split_pos, _block_pos[regHi]);
--- a/src/hotspot/share/c1/c1_LinearScan.hpp Tue Mar 12 09:49:10 2019 +0000
+++ b/src/hotspot/share/c1/c1_LinearScan.hpp Sat Mar 16 21:00:45 2019 +0000
@@ -34,7 +34,6 @@
#include "utilities/align.hpp"
#include "utilities/macros.hpp"
-class DebugInfoCache;
class FpuStackAllocator;
class IRScopeDebugInfo;
class Interval;
@@ -190,15 +189,12 @@
int interval_count() const { return _intervals.length(); }
Interval* interval_at(int reg_num) const { return _intervals.at(reg_num); }
- IntervalList* new_intervals_from_allocation() const { return _new_intervals_from_allocation; }
-
// access to LIR_Ops and Blocks indexed by op_id
int max_lir_op_id() const { assert(_lir_ops.length() > 0, "no operations"); return (_lir_ops.length() - 1) << 1; }
LIR_Op* lir_op_with_id(int op_id) const { assert(op_id >= 0 && op_id <= max_lir_op_id() && op_id % 2 == 0, "op_id out of range or not even"); return _lir_ops.at(op_id >> 1); }
BlockBegin* block_of_op_with_id(int op_id) const { assert(_block_of_op.length() > 0 && op_id >= 0 && op_id <= max_lir_op_id() + 1, "op_id out of range"); return _block_of_op.at(op_id >> 1); }
bool is_block_begin(int op_id) { return op_id == 0 || block_of_op_with_id(op_id) != block_of_op_with_id(op_id - 1); }
- bool covers_block_begin(int op_id_1, int op_id_2) { return block_of_op_with_id(op_id_1) != block_of_op_with_id(op_id_2); }
bool has_call(int op_id) { assert(op_id % 2 == 0, "must be even"); return _has_call.at(op_id >> 1); }
bool has_info(int op_id) { assert(op_id % 2 == 0, "must be even"); return _has_info.at(op_id >> 1); }
@@ -523,7 +519,7 @@
VMReg _cached_vm_reg;
Interval* _split_parent; // the original interval where this interval is derived from
- IntervalList _split_children; // list of all intervals that are split off from this interval (only available for split parents)
+ IntervalList* _split_children; // list of all intervals that are split off from this interval (only available for split parents)
Interval* _current_split_child; // the current split child that has been active or inactive last (always stored in split parents)
int _canonical_spill_slot; // the stack slot where all split parts of this interval are spilled to (always stored in split parents)
@@ -549,7 +545,10 @@
Range* first() const { return _first; }
int from() const { return _first->from(); }
int to() { if (_cached_to == -1) _cached_to = calc_to(); assert(_cached_to == calc_to(), "invalid cached value"); return _cached_to; }
+
+#ifndef PRODUCT
int num_use_positions() const { return _use_pos_and_kinds.length() / 2; }
+#endif
Interval* next() const { return _next; }
Interval** next_addr() { return &_next; }
@@ -572,7 +571,6 @@
Interval* split_parent() const { assert(_split_parent->is_split_parent(), "must be"); return _split_parent; }
Interval* split_child_at_op_id(int op_id, LIR_OpVisitState::OprMode mode);
Interval* split_child_before_op_id(int op_id);
- bool split_child_covers(int op_id, LIR_OpVisitState::OprMode mode);
DEBUG_ONLY(void check_split_children();)
// information stored in split parent, but available for all children
@@ -658,7 +656,6 @@
Interval** active_first_addr(IntervalKind kind) { check_bounds(kind); return &_active_first[kind]; }
Interval** inactive_first_addr(IntervalKind kind) { check_bounds(kind); return &_inactive_first[kind]; }
- void append_unsorted(Interval** first, Interval* interval);
void append_sorted(Interval** first, Interval* interval);
void append_to_unhandled(Interval** list, Interval* interval);
@@ -733,9 +730,7 @@
void free_exclude_active_any();
void free_collect_inactive_fixed(Interval* cur);
void free_collect_inactive_any(Interval* cur);
- void free_collect_unhandled(IntervalKind kind, Interval* cur);
void spill_exclude_active_fixed();
- void spill_block_unhandled_fixed(Interval* cur);
void spill_block_inactive_fixed(Interval* cur);
void spill_collect_active_any();
void spill_collect_inactive_any(Interval* cur);
@@ -753,13 +748,12 @@
int find_free_double_reg(int reg_needed_until, int interval_to, int hint_reg, bool* need_split);
bool alloc_free_reg(Interval* cur);
- int find_locked_reg(int reg_needed_until, int interval_to, int hint_reg, int ignore_reg, bool* need_split);
- int find_locked_double_reg(int reg_needed_until, int interval_to, int hint_reg, bool* need_split);
+ int find_locked_reg(int reg_needed_until, int interval_to, int ignore_reg, bool* need_split);
+ int find_locked_double_reg(int reg_needed_until, int interval_to, bool* need_split);
void split_and_spill_intersecting_intervals(int reg, int regHi);
void alloc_locked_reg(Interval* cur);
bool no_allocation_possible(Interval* cur);
- void update_phys_reg_range(bool requires_cpu_register);
void init_vars_for_alloc(Interval* cur);
bool pd_init_regs_for_alloc(Interval* cur);
--- a/src/hotspot/share/c1/c1_Runtime1.cpp Tue Mar 12 09:49:10 2019 +0000
+++ b/src/hotspot/share/c1/c1_Runtime1.cpp Sat Mar 16 21:00:45 2019 +0000
@@ -1264,7 +1264,7 @@
// If we are patching in a non-perm oop, make sure the nmethod
// is on the right list.
- if (ScavengeRootsInCode) {
+ {
MutexLockerEx ml_code (CodeCache_lock, Mutex::_no_safepoint_check_flag);
nmethod* nm = CodeCache::find_nmethod(caller_frame.pc());
guarantee(nm != NULL, "only nmethods can contain non-perm oops");
--- a/src/hotspot/share/c1/c1_ValueStack.cpp Tue Mar 12 09:49:10 2019 +0000
+++ b/src/hotspot/share/c1/c1_ValueStack.cpp Sat Mar 16 21:00:45 2019 +0000
@@ -37,7 +37,7 @@
, _kind(Parsing)
, _locals(scope->method()->max_locals(), scope->method()->max_locals(), NULL)
, _stack(scope->method()->max_stack())
-, _locks()
+, _locks(NULL)
{
verify();
}
@@ -50,7 +50,7 @@
, _kind(kind)
, _locals()
, _stack()
- , _locks(copy_from->locks_size())
+ , _locks(copy_from->locks_size() == 0 ? NULL : new Values(copy_from->locks_size()))
{
assert(kind != EmptyExceptionState || !Compilation::current()->env()->should_retain_local_variables(), "need locals");
if (kind != EmptyExceptionState) {
@@ -70,7 +70,9 @@
_stack.appendAll(©_from->_stack);
}
- _locks.appendAll(©_from->_locks);
+ if (copy_from->locks_size() > 0) {
+ _locks->appendAll(copy_from->_locks);
+ }
verify();
}
@@ -90,8 +92,11 @@
for_each_stack_value(this, index, value) {
if (value->type()->tag() != s->stack_at(index)->type()->tag()) return false;
}
- for_each_lock_value(this, index, value) {
- if (value != s->lock_at(index)) return false;
+ for (int i = 0; i < locks_size(); i++) {
+ value = lock_at(i);
+ if (value != NULL && value != s->lock_at(i)) {
+ return false;
+ }
}
return true;
}
@@ -113,7 +118,7 @@
// apply function to all values of a list; factored out from values_do(f)
-void ValueStack::apply(Values list, ValueVisitor* f) {
+void ValueStack::apply(const Values& list, ValueVisitor* f) {
for (int i = 0; i < list.length(); i++) {
Value* va = list.adr_at(i);
Value v0 = *va;
@@ -135,7 +140,9 @@
for_each_state(state) {
apply(state->_locals, f);
apply(state->_stack, f);
- apply(state->_locks, f);
+ if (state->_locks != NULL) {
+ apply(*state->_locks, f);
+ }
}
}
@@ -160,7 +167,10 @@
}
int ValueStack::lock(Value obj) {
- _locks.push(obj);
+ if (_locks == NULL) {
+ _locks = new Values();
+ }
+ _locks->push(obj);
int num_locks = total_locks_size();
scope()->set_min_number_of_locks(num_locks);
return num_locks - 1;
@@ -168,7 +178,8 @@
int ValueStack::unlock() {
- _locks.pop();
+ assert(locks_size() > 0, "sanity");
+ _locks->pop();
return total_locks_size();
}
--- a/src/hotspot/share/c1/c1_ValueStack.hpp Tue Mar 12 09:49:10 2019 +0000
+++ b/src/hotspot/share/c1/c1_ValueStack.hpp Sat Mar 16 21:00:45 2019 +0000
@@ -47,7 +47,7 @@
Values _locals; // the locals
Values _stack; // the expression stack
- Values _locks; // the monitor stack (holding the locked values)
+ Values* _locks; // the monitor stack (holding the locked values)
Value check(ValueTag tag, Value t) {
assert(tag == t->type()->tag() || tag == objectTag && t->type()->tag() == addressTag, "types must correspond");
@@ -60,7 +60,7 @@
}
// helper routine
- static void apply(Values list, ValueVisitor* f);
+ static void apply(const Values& list, ValueVisitor* f);
// for simplified copying
ValueStack(ValueStack* copy_from, Kind kind, int bci);
@@ -90,9 +90,9 @@
int locals_size() const { return _locals.length(); }
int stack_size() const { return _stack.length(); }
- int locks_size() const { return _locks.length(); }
+ int locks_size() const { return _locks == NULL ? 0 : _locks->length(); }
bool stack_is_empty() const { return _stack.is_empty(); }
- bool no_active_locks() const { return _locks.is_empty(); }
+ bool no_active_locks() const { return _locks == NULL || _locks->is_empty(); }
int total_locks_size() const;
// locals access
@@ -201,7 +201,7 @@
// locks access
int lock (Value obj);
int unlock();
- Value lock_at(int i) const { return _locks.at(i); }
+ Value lock_at(int i) const { return _locks->at(i); }
// SSA form IR support
void setup_phi_for_stack(BlockBegin* b, int index);
--- a/src/hotspot/share/ci/bcEscapeAnalyzer.cpp Tue Mar 12 09:49:10 2019 +0000
+++ b/src/hotspot/share/ci/bcEscapeAnalyzer.cpp Sat Mar 16 21:00:45 2019 +0000
@@ -1197,38 +1197,36 @@
}
}
-bool BCEscapeAnalyzer::do_analysis() {
+void BCEscapeAnalyzer::do_analysis() {
Arena* arena = CURRENT_ENV->arena();
// identify basic blocks
_methodBlocks = _method->get_method_blocks();
iterate_blocks(arena);
- // TEMPORARY
- return true;
}
vmIntrinsics::ID BCEscapeAnalyzer::known_intrinsic() {
vmIntrinsics::ID iid = method()->intrinsic_id();
-
if (iid == vmIntrinsics::_getClass ||
- iid == vmIntrinsics::_hashCode)
+ iid == vmIntrinsics::_hashCode) {
return iid;
- else
+ } else {
return vmIntrinsics::_none;
+ }
}
-bool BCEscapeAnalyzer::compute_escape_for_intrinsic(vmIntrinsics::ID iid) {
+void BCEscapeAnalyzer::compute_escape_for_intrinsic(vmIntrinsics::ID iid) {
switch (iid) {
- case vmIntrinsics::_getClass:
- _return_local = false;
- break;
- case vmIntrinsics::_hashCode:
- // initialized state is correct
- break;
+ case vmIntrinsics::_getClass:
+ _return_local = false;
+ _return_allocated = false;
+ break;
+ case vmIntrinsics::_hashCode:
+ // initialized state is correct
+ break;
default:
assert(false, "unexpected intrinsic");
}
- return true;
}
void BCEscapeAnalyzer::initialize() {
@@ -1299,7 +1297,7 @@
vmIntrinsics::ID iid = known_intrinsic();
// check if method can be analyzed
- if (iid == vmIntrinsics::_none && (method()->is_abstract() || method()->is_native() || !method()->holder()->is_initialized()
+ if (iid == vmIntrinsics::_none && (method()->is_abstract() || method()->is_native() || !method()->holder()->is_initialized()
|| _level > MaxBCEAEstimateLevel
|| method()->code_size() > MaxBCEAEstimateSize)) {
if (BCEATraceLevel >= 1) {
@@ -1332,8 +1330,6 @@
tty->print_cr(" (%d bytes)", method()->code_size());
}
- bool success;
-
initialize();
// Do not scan method if it has no object parameters and
@@ -1349,9 +1345,9 @@
}
if (iid != vmIntrinsics::_none)
- success = compute_escape_for_intrinsic(iid);
+ compute_escape_for_intrinsic(iid);
else {
- success = do_analysis();
+ do_analysis();
}
// don't store interprocedural escape information if it introduces
--- a/src/hotspot/share/ci/bcEscapeAnalyzer.hpp Tue Mar 12 09:49:10 2019 +0000
+++ b/src/hotspot/share/ci/bcEscapeAnalyzer.hpp Sat Mar 16 21:00:45 2019 +0000
@@ -101,8 +101,8 @@
void clear_escape_info();
void compute_escape_info();
vmIntrinsics::ID known_intrinsic();
- bool compute_escape_for_intrinsic(vmIntrinsics::ID iid);
- bool do_analysis();
+ void compute_escape_for_intrinsic(vmIntrinsics::ID iid);
+ void do_analysis();
void read_escape_info();
--- a/src/hotspot/share/ci/ciBaseObject.cpp Tue Mar 12 09:49:10 2019 +0000
+++ b/src/hotspot/share/ci/ciBaseObject.cpp Sat Mar 16 21:00:45 2019 +0000
@@ -32,9 +32,8 @@
//
// Set the unique identity number of a ciBaseObject.
void ciBaseObject::set_ident(uint id) {
- assert((_ident >> FLAG_BITS) == 0, "must only initialize once");
- assert( id < ((uint)1 << (BitsPerInt-FLAG_BITS)), "id too big");
- _ident = _ident + (id << FLAG_BITS);
+ assert(_ident == 0, "must only initialize once");
+ _ident = id;
}
// ------------------------------------------------------------------
@@ -42,7 +41,6 @@
//
// Report the unique identity number of a ciBaseObject.
uint ciBaseObject::ident() {
- uint id = _ident >> FLAG_BITS;
- assert(id != 0, "must be initialized");
- return id;
+ assert(_ident != 0, "must be initialized");
+ return _ident;
}
--- a/src/hotspot/share/ci/ciBaseObject.hpp Tue Mar 12 09:49:10 2019 +0000
+++ b/src/hotspot/share/ci/ciBaseObject.hpp Sat Mar 16 21:00:45 2019 +0000
@@ -54,10 +54,6 @@
protected:
uint _ident;
- enum { FLAG_BITS = 1 };
- enum {
- SCAVENGABLE_FLAG = 1
- };
protected:
ciBaseObject(): _ident(0) {}
--- a/src/hotspot/share/ci/ciEnv.hpp Tue Mar 12 09:49:10 2019 +0000
+++ b/src/hotspot/share/ci/ciEnv.hpp Sat Mar 16 21:00:45 2019 +0000
@@ -465,7 +465,7 @@
void record_out_of_memory_failure();
// RedefineClasses support
- void metadata_do(void f(Metadata*)) { _factory->metadata_do(f); }
+ void metadata_do(MetadataClosure* f) { _factory->metadata_do(f); }
// Dump the compilation replay data for the ciEnv to the stream.
void dump_replay_data(int compile_id);
--- a/src/hotspot/share/ci/ciObject.cpp Tue Mar 12 09:49:10 2019 +0000
+++ b/src/hotspot/share/ci/ciObject.cpp Sat Mar 16 21:00:45 2019 +0000
@@ -59,7 +59,7 @@
_handle = JNIHandles::make_global(obj);
}
_klass = NULL;
- init_flags_from(o);
+ assert(oopDesc::is_oop_or_null(o), "Checking");
}
// ------------------------------------------------------------------
@@ -73,7 +73,7 @@
_handle = JNIHandles::make_global(h);
}
_klass = NULL;
- init_flags_from(h());
+ assert(oopDesc::is_oop_or_null(h()), "Checking");
}
// ------------------------------------------------------------------
@@ -165,18 +165,10 @@
// to discourage use of the JNI handle.
jobject ciObject::constant_encoding() {
assert(is_null_object() || handle() != NULL, "cannot embed null pointer");
- assert(can_be_constant(), "oop must be NULL or perm");
return handle();
}
// ------------------------------------------------------------------
-// ciObject::can_be_constant
-bool ciObject::can_be_constant() {
- if (ScavengeRootsInCode >= 1) return true; // now everybody can encode as a constant
- return handle() == NULL;
-}
-
-// ------------------------------------------------------------------
// ciObject::should_be_constant()
bool ciObject::should_be_constant() {
if (ScavengeRootsInCode >= 2) return true; // force everybody to be a constant
@@ -193,7 +185,6 @@
}
if (klass()->is_subclass_of(env->MethodHandle_klass()) ||
klass()->is_subclass_of(env->CallSite_klass())) {
- assert(ScavengeRootsInCode >= 1, "must be");
// We want to treat these aggressively.
return true;
}
@@ -202,18 +193,6 @@
}
// ------------------------------------------------------------------
-// ciObject::should_be_constant()
-void ciObject::init_flags_from(oop x) {
- int flags = 0;
- if (x != NULL) {
- assert(Universe::heap()->is_in_reserved(x), "must be");
- if (Universe::heap()->is_scavengable(x))
- flags |= SCAVENGABLE_FLAG;
- }
- _ident |= flags;
-}
-
-// ------------------------------------------------------------------
// ciObject::print
//
// Print debugging output about this ciObject.
@@ -223,9 +202,7 @@
void ciObject::print(outputStream* st) {
st->print("<%s", type_string());
GUARDED_VM_ENTRY(print_impl(st);)
- st->print(" ident=%d %s address=" INTPTR_FORMAT ">", ident(),
- is_scavengable() ? "SCAVENGABLE" : "",
- p2i((address)this));
+ st->print(" ident=%d address=" INTPTR_FORMAT ">", ident(), p2i(this));
}
// ------------------------------------------------------------------
--- a/src/hotspot/share/ci/ciObject.hpp Tue Mar 12 09:49:10 2019 +0000
+++ b/src/hotspot/share/ci/ciObject.hpp Sat Mar 16 21:00:45 2019 +0000
@@ -68,8 +68,6 @@
// Get the VM oop that this object holds.
oop get_oop() const;
- void init_flags_from(oop x);
-
// Virtual behavior of the print() method.
virtual void print_impl(outputStream* st) {}
@@ -85,22 +83,9 @@
// A hash value for the convenience of compilers.
int hash();
- // Tells if this oop has an encoding as a constant.
- // True if is_perm is true.
- // Also true if ScavengeRootsInCode is non-zero.
- // If it does not have an encoding, the compiler is responsible for
- // making other arrangements for dealing with the oop.
- // See ciEnv::make_array
- bool can_be_constant();
-
// Tells if this oop should be made a constant.
- // True if is_perm is true or ScavengeRootsInCode > 1.
bool should_be_constant();
- // Might this object possibly move during a scavenge operation?
- // If the answer is true and ScavengeRootsInCode==0, the oop cannot be embedded in code.
- bool is_scavengable() { return (_ident & SCAVENGABLE_FLAG) != 0; }
-
// The address which the compiler should embed into the
// generated code to represent this oop. This address
// is not the true address of the oop -- it will get patched
--- a/src/hotspot/share/ci/ciObjectFactory.cpp Tue Mar 12 09:49:10 2019 +0000
+++ b/src/hotspot/share/ci/ciObjectFactory.cpp Sat Mar 16 21:00:45 2019 +0000
@@ -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
@@ -689,11 +689,11 @@
// ------------------------------------------------------------------
// ciObjectFactory::metadata_do
-void ciObjectFactory::metadata_do(void f(Metadata*)) {
+void ciObjectFactory::metadata_do(MetadataClosure* f) {
if (_ci_metadata == NULL) return;
for (int j = 0; j< _ci_metadata->length(); j++) {
Metadata* o = _ci_metadata->at(j)->constant_encoding();
- f(o);
+ f->do_metadata(o);
}
}
--- a/src/hotspot/share/ci/ciObjectFactory.hpp Tue Mar 12 09:49:10 2019 +0000
+++ b/src/hotspot/share/ci/ciObjectFactory.hpp Sat Mar 16 21:00:45 2019 +0000
@@ -140,7 +140,7 @@
GrowableArray<ciMetadata*>* get_ci_metadata() const { return _ci_metadata; }
// RedefineClasses support
- void metadata_do(void f(Metadata*));
+ void metadata_do(MetadataClosure* f);
void print_contents();
void print();
--- a/src/hotspot/share/ci/ciUtilities.cpp Tue Mar 12 09:49:10 2019 +0000
+++ b/src/hotspot/share/ci/ciUtilities.cpp Sat Mar 16 21:00:45 2019 +0000
@@ -43,10 +43,9 @@
// ------------------------------------------------------------------
// card_table_base
-jbyte *ci_card_table_address() {
+CardTable::CardValue* ci_card_table_address() {
BarrierSet* bs = BarrierSet::barrier_set();
CardTableBarrierSet* ctbs = barrier_set_cast<CardTableBarrierSet>(bs);
CardTable* ct = ctbs->card_table();
- assert(sizeof(*ct->byte_map_base()) == sizeof(jbyte), "adjust users of this code");
return ct->byte_map_base();
}
--- a/src/hotspot/share/ci/ciUtilities.hpp Tue Mar 12 09:49:10 2019 +0000
+++ b/src/hotspot/share/ci/ciUtilities.hpp Sat Mar 16 21:00:45 2019 +0000
@@ -26,6 +26,7 @@
#define SHARE_CI_CIUTILITIES_HPP
#include "ci/ciEnv.hpp"
+#include "gc/shared/cardTable.hpp"
#include "utilities/globalDefinitions.hpp"
// The following routines and definitions are used internally in the
@@ -50,7 +51,7 @@
const char* basictype_to_str(BasicType t);
-jbyte *ci_card_table_address();
+CardTable::CardValue* ci_card_table_address();
template <typename T> T ci_card_table_address_as() {
return reinterpret_cast<T>(ci_card_table_address());
}
--- a/src/hotspot/share/classfile/javaClasses.cpp Tue Mar 12 09:49:10 2019 +0000
+++ b/src/hotspot/share/classfile/javaClasses.cpp Sat Mar 16 21:00:45 2019 +0000
@@ -578,7 +578,7 @@
}
int java_lang_String::utf8_length(oop java_string, typeArrayOop value) {
- assert(oopDesc::equals(value, java_lang_String::value(java_string)),
+ assert(value_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) {
@@ -610,7 +610,7 @@
}
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)),
+ assert(value_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);
@@ -642,7 +642,7 @@
}
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)),
+ assert(value_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);
@@ -686,24 +686,15 @@
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, 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, value2);
bool is_latin2 = java_lang_String::is_latin1(str2);
- if ((length1 != length2) || (is_latin1 != is_latin2)) {
- // Strings of different size or with different
- // coders are never equal.
+ if (is_latin1 != is_latin2) {
+ // Strings with different coders are never equal.
return false;
}
- int blength1 = value1->length();
- for (int i = 0; i < blength1; i++) {
- if (value1->byte_at(i) != value2->byte_at(i)) {
- return false;
- }
- }
- return true;
+ return value_equals(value1, value2);
}
void java_lang_String::print(oop java_string, outputStream* st) {
@@ -834,8 +825,8 @@
if (module.is_null()) {
// During startup, the module may be NULL only if java.base has not been defined yet.
// Put the class on the fixup_module_list to patch later when the java.lang.Module
- // for java.base is known.
- assert(!Universe::is_module_initialized(), "Incorrect java.lang.Module pre module system initialization");
+ // for java.base is known. But note that since we captured the NULL module another
+ // thread may have completed that initialization.
bool javabase_was_defined = false;
{
--- a/src/hotspot/share/classfile/javaClasses.hpp Tue Mar 12 09:49:10 2019 +0000
+++ b/src/hotspot/share/classfile/javaClasses.hpp Sat Mar 16 21:00:45 2019 +0000
@@ -194,6 +194,7 @@
static bool equals(oop java_string, const jchar* chars, int len);
static bool equals(oop str1, oop str2);
+ static inline bool value_equals(typeArrayOop str_value1, typeArrayOop str_value2);
// Conversion between '.' and '/' formats
static Handle externalize_classname(Handle java_string, TRAPS) { return char_converter(java_string, '/', '.', THREAD); }
--- a/src/hotspot/share/classfile/javaClasses.inline.hpp Tue Mar 12 09:49:10 2019 +0000
+++ b/src/hotspot/share/classfile/javaClasses.inline.hpp Sat Mar 16 21:00:45 2019 +0000
@@ -39,31 +39,44 @@
assert(initialized, "Must be initialized");
string->obj_field_put_raw(value_offset, buffer);
}
+
void java_lang_String::set_value(oop string, typeArrayOop buffer) {
assert(initialized && (value_offset > 0), "Must be initialized");
string->obj_field_put(value_offset, (oop)buffer);
}
+
void java_lang_String::set_hash(oop string, unsigned int hash) {
assert(initialized && (hash_offset > 0), "Must be initialized");
string->int_field_put(hash_offset, hash);
}
// Accessors
+bool java_lang_String::value_equals(typeArrayOop str_value1, typeArrayOop str_value2) {
+ return (oopDesc::equals(str_value1, str_value2) ||
+ (str_value1->length() == str_value2->length() &&
+ (!memcmp(str_value1->base(T_BYTE),
+ str_value2->base(T_BYTE),
+ str_value2->length() * sizeof(jbyte)))));
+}
+
typeArrayOop java_lang_String::value(oop java_string) {
assert(initialized && (value_offset > 0), "Must be initialized");
assert(is_instance(java_string), "must be java_string");
return (typeArrayOop) java_string->obj_field(value_offset);
}
+
typeArrayOop java_lang_String::value_no_keepalive(oop java_string) {
assert(initialized && (value_offset > 0), "Must be initialized");
assert(is_instance(java_string), "must be java_string");
return (typeArrayOop) java_string->obj_field_access<AS_NO_KEEPALIVE>(value_offset);
}
+
unsigned int java_lang_String::hash(oop java_string) {
assert(initialized && (hash_offset > 0), "Must be initialized");
assert(is_instance(java_string), "must be java_string");
return java_string->int_field(hash_offset);
}
+
bool java_lang_String::is_latin1(oop java_string) {
assert(initialized && (coder_offset > 0), "Must be initialized");
assert(is_instance(java_string), "must be java_string");
@@ -71,11 +84,12 @@
assert(CompactStrings || coder == CODER_UTF16, "Must be UTF16 without CompactStrings");
return coder == CODER_LATIN1;
}
+
int java_lang_String::length(oop java_string, typeArrayOop value) {
assert(initialized, "Must be initialized");
assert(is_instance(java_string), "must be java_string");
- assert(oopDesc::equals(value, java_lang_String::value(java_string)),
- "value must be same as java_lang_String::value(java_string)");
+ assert(value_equals(value, java_lang_String::value(java_string)),
+ "value must be equal to java_lang_String::value(java_string)");
if (value == NULL) {
return 0;
}
@@ -86,6 +100,7 @@
}
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");
@@ -101,42 +116,55 @@
oop java_lang_ref_Reference::referent(oop ref) {
return ref->obj_field(referent_offset);
}
+
void java_lang_ref_Reference::set_referent(oop ref, oop value) {
ref->obj_field_put(referent_offset, value);
}
+
void java_lang_ref_Reference::set_referent_raw(oop ref, oop value) {
ref->obj_field_put_raw(referent_offset, value);
}
+
HeapWord* java_lang_ref_Reference::referent_addr_raw(oop ref) {
return ref->obj_field_addr_raw<HeapWord>(referent_offset);
}
+
oop java_lang_ref_Reference::next(oop ref) {
return ref->obj_field(next_offset);
}
+
void java_lang_ref_Reference::set_next(oop ref, oop value) {
ref->obj_field_put(next_offset, value);
}
+
void java_lang_ref_Reference::set_next_raw(oop ref, oop value) {
ref->obj_field_put_raw(next_offset, value);
}
+
HeapWord* java_lang_ref_Reference::next_addr_raw(oop ref) {
return ref->obj_field_addr_raw<HeapWord>(next_offset);
}
+
oop java_lang_ref_Reference::discovered(oop ref) {
return ref->obj_field(discovered_offset);
}
+
void java_lang_ref_Reference::set_discovered(oop ref, oop value) {
ref->obj_field_put(discovered_offset, value);
}
+
void java_lang_ref_Reference::set_discovered_raw(oop ref, oop value) {
ref->obj_field_put_raw(discovered_offset, value);
}
+
HeapWord* java_lang_ref_Reference::discovered_addr_raw(oop ref) {
return ref->obj_field_addr_raw<HeapWord>(discovered_offset);
}
+
bool java_lang_ref_Reference::is_final(oop ref) {
return InstanceKlass::cast(ref->klass())->reference_type() == REF_FINAL;
}
+
bool java_lang_ref_Reference::is_phantom(oop ref) {
return InstanceKlass::cast(ref->klass())->reference_type() == REF_PHANTOM;
}
--- a/src/hotspot/share/classfile/metadataOnStackMark.cpp Tue Mar 12 09:49:10 2019 +0000
+++ b/src/hotspot/share/classfile/metadataOnStackMark.cpp Sat Mar 16 21:00:45 2019 +0000
@@ -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
@@ -42,6 +42,10 @@
MetadataOnStackBuffer* MetadataOnStackMark::_current_buffer = NULL;
NOT_PRODUCT(bool MetadataOnStackMark::_is_active = false;)
+class MetadataOnStackClosure : public MetadataClosure {
+ void do_metadata(Metadata* m) { Metadata::mark_on_stack(m); }
+};
+
// Walk metadata on the stack and mark it so that redefinition doesn't delete
// it. Class unloading only deletes in-error class files, methods created by
// the relocator and dummy constant pools. None of these appear anywhere except
@@ -55,8 +59,9 @@
Threads::metadata_handles_do(Metadata::mark_on_stack);
if (redefinition_walk) {
- Threads::metadata_do(Metadata::mark_on_stack);
- CodeCache::metadata_do(Metadata::mark_on_stack);
+ MetadataOnStackClosure md_on_stack;
+ Threads::metadata_do(&md_on_stack);
+ CodeCache::metadata_do(&md_on_stack);
CompileBroker::mark_on_stack();
JvmtiCurrentBreakpoints::metadata_do(Metadata::mark_on_stack);
ThreadService::metadata_do(Metadata::mark_on_stack);
--- a/src/hotspot/share/classfile/stackMapFrame.cpp Tue Mar 12 09:49:10 2019 +0000
+++ b/src/hotspot/share/classfile/stackMapFrame.cpp Sat Mar 16 21:00:45 2019 +0000
@@ -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
@@ -103,13 +103,16 @@
case T_ARRAY:
{
Symbol* sig = ss.as_symbol(CHECK_(VerificationType::bogus_type()));
- // Create another symbol to save as signature stream unreferences
- // this symbol.
- Symbol* sig_copy =
- verifier()->create_temporary_symbol(sig, 0, sig->utf8_length(),
- CHECK_(VerificationType::bogus_type()));
- assert(sig_copy == sig, "symbols don't match");
- return VerificationType::reference_type(sig_copy);
+ if (!sig->is_permanent()) {
+ // Create another symbol to save as signature stream unreferences
+ // this symbol.
+ Symbol *sig_copy =
+ verifier()->create_temporary_symbol(sig, 0, sig->utf8_length(),
+ CHECK_(VerificationType::bogus_type()));
+ assert(sig_copy == sig, "symbols don't match");
+ sig = sig_copy;
+ }
+ return VerificationType::reference_type(sig);
}
case T_INT: return VerificationType::integer_type();
case T_BYTE: return VerificationType::byte_type();
--- a/src/hotspot/share/classfile/symbolTable.cpp Tue Mar 12 09:49:10 2019 +0000
+++ b/src/hotspot/share/classfile/symbolTable.cpp Sat Mar 16 21:00:45 2019 +0000
@@ -487,8 +487,8 @@
if (sym == NULL) {
sym = SymbolTable::the_table()->do_add_if_needed(name, len, hash, false, CHECK_NULL);
}
- if (sym->refcount() != PERM_REFCOUNT) {
- sym->increment_refcount();
+ if (!sym->is_permanent()) {
+ sym->make_permanent();
log_trace_symboltable_helper(sym, "Asked for a permanent symbol, but got a regular one");
}
return sym;
--- a/src/hotspot/share/classfile/verifier.cpp Tue Mar 12 09:49:10 2019 +0000
+++ b/src/hotspot/share/classfile/verifier.cpp Sat Mar 16 21:00:45 2019 +0000
@@ -164,17 +164,15 @@
// If the class should be verified, first see if we can use the split
// verifier. If not, or if verification fails and FailOverToOldVerifier
// is set, then call the inference verifier.
-
Symbol* exception_name = NULL;
const size_t message_buffer_len = klass->name()->utf8_length() + 1024;
- char* message_buffer = NEW_RESOURCE_ARRAY(char, message_buffer_len);
- char* exception_message = message_buffer;
+ char* message_buffer = NULL;
+ char* exception_message = NULL;
- const char* klassName = klass->external_name();
bool can_failover = FailOverToOldVerifier &&
klass->major_version() < NOFAILOVER_MAJOR_VERSION;
- log_info(class, init)("Start class verification for: %s", klassName);
+ log_info(class, init)("Start class verification for: %s", klass->external_name());
if (klass->major_version() >= STACKMAP_ATTRIBUTE_MAJOR_VERSION) {
ClassVerifier split_verifier(klass, THREAD);
split_verifier.verify_class(THREAD);
@@ -182,8 +180,10 @@
if (can_failover && !HAS_PENDING_EXCEPTION &&
(exception_name == vmSymbols::java_lang_VerifyError() ||
exception_name == vmSymbols::java_lang_ClassFormatError())) {
- log_info(verification)("Fail over class verification to old verifier for: %s", klassName);
- log_info(class, init)("Fail over class verification to old verifier for: %s", klassName);
+ log_info(verification)("Fail over class verification to old verifier for: %s", klass->external_name());
+ log_info(class, init)("Fail over class verification to old verifier for: %s", klass->external_name());
+ message_buffer = NEW_RESOURCE_ARRAY(char, message_buffer_len);
+ exception_message = message_buffer;
exception_name = inference_verify(
klass, message_buffer, message_buffer_len, THREAD);
}
@@ -191,6 +191,8 @@
exception_message = split_verifier.exception_message();
}
} else {
+ message_buffer = NEW_RESOURCE_ARRAY(char, message_buffer_len);
+ exception_message = message_buffer;
exception_name = inference_verify(
klass, message_buffer, message_buffer_len, THREAD);
}
@@ -198,20 +200,19 @@
LogTarget(Info, class, init) lt1;
if (lt1.is_enabled()) {
LogStream ls(lt1);
- log_end_verification(&ls, klassName, exception_name, THREAD);
+ log_end_verification(&ls, klass->external_name(), exception_name, THREAD);
}
LogTarget(Info, verification) lt2;
if (lt2.is_enabled()) {
LogStream ls(lt2);
- log_end_verification(&ls, klassName, exception_name, THREAD);
+ log_end_verification(&ls, klass->external_name(), exception_name, THREAD);
}
if (HAS_PENDING_EXCEPTION) {
return false; // use the existing exception
} else if (exception_name == NULL) {
- return true; // verifcation succeeded
+ return true; // verification succeeded
} else { // VerifyError or ClassFormatError to be created and thrown
- ResourceMark rm(THREAD);
Klass* kls =
SystemDictionary::resolve_or_fail(exception_name, true, CHECK_false);
if (log_is_enabled(Debug, class, resolve)) {
@@ -228,7 +229,10 @@
}
kls = kls->super();
}
- message_buffer[message_buffer_len - 1] = '\0'; // just to be sure
+ if (message_buffer != NULL) {
+ message_buffer[message_buffer_len - 1] = '\0'; // just to be sure
+ }
+ assert(exception_message != NULL, "");
THROW_MSG_(exception_name, exception_message, false);
}
}
@@ -569,17 +573,18 @@
ClassVerifier::ClassVerifier(
InstanceKlass* klass, TRAPS)
- : _thread(THREAD), _exception_type(NULL), _message(NULL), _klass(klass) {
+ : _thread(THREAD), _previous_symbol(NULL), _symbols(NULL), _exception_type(NULL),
+ _message(NULL), _klass(klass) {
_this_type = VerificationType::reference_type(klass->name());
- // Create list to hold symbols in reference area.
- _symbols = new GrowableArray<Symbol*>(100, 0, NULL);
}
ClassVerifier::~ClassVerifier() {
// Decrement the reference count for any symbols created.
- for (int i = 0; i < _symbols->length(); i++) {
- Symbol* s = _symbols->at(i);
- s->decrement_refcount();
+ if (_symbols != NULL) {
+ for (int i = 0; i < _symbols->length(); i++) {
+ Symbol* s = _symbols->at(i);
+ s->decrement_refcount();
+ }
}
}
@@ -632,10 +637,9 @@
int32_t max_locals = m->max_locals();
constantPoolHandle cp(THREAD, m->constants());
- if (!SignatureVerifier::is_valid_method_signature(m->signature())) {
- class_format_error("Invalid method signature");
- return;
- }
+ // Method signature was checked in ClassFileParser.
+ assert(SignatureVerifier::is_valid_method_signature(m->signature()),
+ "Invalid method signature");
// Initial stack map frame: offset is 0, stack is initially empty.
StackMapFrame current_frame(max_locals, max_stack, this);
@@ -2110,12 +2114,9 @@
vmSymbols::java_lang_invoke_MethodType()), CHECK_VERIFY(this));
} else if (tag.is_dynamic_constant()) {
Symbol* constant_type = cp->uncached_signature_ref_at(index);
- if (!SignatureVerifier::is_valid_type_signature(constant_type)) {
- class_format_error(
- "Invalid type for dynamic constant in class %s referenced "
- "from constant pool index %d", _klass->external_name(), index);
- return;
- }
+ // Field signature was checked in ClassFileParser.
+ assert(SignatureVerifier::is_valid_type_signature(constant_type),
+ "Invalid type for dynamic constant");
assert(sizeof(VerificationType) == sizeof(uintptr_t),
"buffer type must match VerificationType size");
uintptr_t constant_type_buffer[2];
@@ -2235,12 +2236,9 @@
Symbol* field_name = cp->name_ref_at(index);
Symbol* field_sig = cp->signature_ref_at(index);
- if (!SignatureVerifier::is_valid_type_signature(field_sig)) {
- class_format_error(
- "Invalid signature for field in class %s referenced "
- "from constant pool index %d", _klass->external_name(), index);
- return;
- }
+ // Field signature was checked in ClassFileParser.
+ assert(SignatureVerifier::is_valid_type_signature(field_sig),
+ "Invalid field signature");
// Get referenced class type
VerificationType ref_class_type = cp_ref_index_to_type(
@@ -2719,12 +2717,9 @@
Symbol* method_name = cp->name_ref_at(index);
Symbol* method_sig = cp->signature_ref_at(index);
- if (!SignatureVerifier::is_valid_method_signature(method_sig)) {
- class_format_error(
- "Invalid method signature in class %s referenced "
- "from constant pool index %d", _klass->external_name(), index);
- return;
- }
+ // Method signature was checked in ClassFileParser.
+ assert(SignatureVerifier::is_valid_method_signature(method_sig),
+ "Invalid method signature");
// Get referenced class type
VerificationType ref_class_type;
@@ -3102,13 +3097,23 @@
// they can be reference counted.
Symbol* ClassVerifier::create_temporary_symbol(const Symbol *s, int begin,
int end, TRAPS) {
- Symbol* sym = SymbolTable::new_symbol(s, begin, end, CHECK_NULL);
- _symbols->push(sym);
- return sym;
+ const char* name = (const char*)s->base() + begin;
+ int length = end - begin;
+ return create_temporary_symbol(name, length, CHECK_NULL);
}
-Symbol* ClassVerifier::create_temporary_symbol(const char *s, int length, TRAPS) {
- Symbol* sym = SymbolTable::new_symbol(s, length, CHECK_NULL);
- _symbols->push(sym);
+Symbol* ClassVerifier::create_temporary_symbol(const char *name, int length, TRAPS) {
+ // Quick deduplication check
+ if (_previous_symbol != NULL && _previous_symbol->equals(name, length)) {
+ return _previous_symbol;
+ }
+ Symbol* sym = SymbolTable::new_symbol(name, length, CHECK_NULL);
+ if (!sym->is_permanent()) {
+ if (_symbols == NULL) {
+ _symbols = new GrowableArray<Symbol*>(50, 0, NULL);
+ }
+ _symbols->push(sym);
+ }
+ _previous_symbol = sym;
return sym;
}
--- a/src/hotspot/share/classfile/verifier.hpp Tue Mar 12 09:49:10 2019 +0000
+++ b/src/hotspot/share/classfile/verifier.hpp Sat Mar 16 21:00:45 2019 +0000
@@ -250,6 +250,8 @@
class ClassVerifier : public StackObj {
private:
Thread* _thread;
+
+ Symbol* _previous_symbol; // cache of the previously looked up symbol
GrowableArray<Symbol*>* _symbols; // keep a list of symbols created
Symbol* _exception_type;
@@ -411,12 +413,18 @@
// created, we can't use a TempNewSymbol.
Symbol* create_temporary_symbol(const Symbol* s, int begin, int end, TRAPS);
Symbol* create_temporary_symbol(const char *s, int length, TRAPS);
-
Symbol* create_temporary_symbol(Symbol* s) {
- // This version just updates the reference count and saves the symbol to be
- // dereferenced later.
- s->increment_refcount();
- _symbols->push(s);
+ if (s == _previous_symbol) {
+ return s;
+ }
+ if (!s->is_permanent()) {
+ s->increment_refcount();
+ if (_symbols == NULL) {
+ _symbols = new GrowableArray<Symbol*>(50, 0, NULL);
+ }
+ _symbols->push(s);
+ }
+ _previous_symbol = s;
return s;
}
--- a/src/hotspot/share/code/codeCache.cpp Tue Mar 12 09:49:10 2019 +0000
+++ b/src/hotspot/share/code/codeCache.cpp Sat Mar 16 21:00:45 2019 +0000
@@ -145,7 +145,6 @@
address CodeCache::_low_bound = 0;
address CodeCache::_high_bound = 0;
int CodeCache::_number_of_nmethods_with_dependencies = 0;
-nmethod* CodeCache::_scavenge_root_nmethods = NULL;
ExceptionCache* volatile CodeCache::_exception_cache_purge_list = NULL;
// Initialize arrays of CodeHeap subsets
@@ -668,7 +667,7 @@
}
}
-void CodeCache::metadata_do(void f(Metadata* m)) {
+void CodeCache::metadata_do(MetadataClosure* f) {
assert_locked_or_safepoint(CodeCache_lock);
NMethodIterator iter(NMethodIterator::only_alive_and_not_unloading);
while(iter.next()) {
@@ -711,167 +710,6 @@
}
}
-// Walk the list of methods which might contain oops to the java heap.
-void CodeCache::scavenge_root_nmethods_do(CodeBlobToOopClosure* f) {
- assert_locked_or_safepoint(CodeCache_lock);
-
- const bool fix_relocations = f->fix_relocations();
- debug_only(mark_scavenge_root_nmethods());
-
- nmethod* prev = NULL;
- nmethod* cur = scavenge_root_nmethods();
- while (cur != NULL) {
- debug_only(cur->clear_scavenge_root_marked());
- assert(cur->scavenge_root_not_marked(), "");
- assert(cur->on_scavenge_root_list(), "else shouldn't be on this list");
-
- bool is_live = (!cur->is_zombie() && !cur->is_unloaded());
- LogTarget(Trace, gc, nmethod) lt;
- if (lt.is_enabled()) {
- LogStream ls(lt);
- CompileTask::print(&ls, cur,
- is_live ? "scavenge root " : "dead scavenge root", /*short_form:*/ true);
- }
- if (is_live) {
- // Perform cur->oops_do(f), maybe just once per nmethod.
- f->do_code_blob(cur);
- }
- nmethod* const next = cur->scavenge_root_link();
- // The scavengable nmethod list must contain all methods with scavengable
- // oops. It is safe to include more nmethod on the list, but we do not
- // expect any live non-scavengable nmethods on the list.
- if (fix_relocations) {
- if (!is_live || !cur->detect_scavenge_root_oops()) {
- unlink_scavenge_root_nmethod(cur, prev);
- } else {
- prev = cur;
- }
- }
- cur = next;
- }
-
- // Check for stray marks.
- debug_only(verify_perm_nmethods(NULL));
-}
-
-void CodeCache::register_scavenge_root_nmethod(nmethod* nm) {
- assert_locked_or_safepoint(CodeCache_lock);
- if (!nm->on_scavenge_root_list() && nm->detect_scavenge_root_oops()) {
- add_scavenge_root_nmethod(nm);
- }
-}
-
-void CodeCache::verify_scavenge_root_nmethod(nmethod* nm) {
- nm->verify_scavenge_root_oops();
-}
-
-void CodeCache::add_scavenge_root_nmethod(nmethod* nm) {
- assert_locked_or_safepoint(CodeCache_lock);
-
- nm->set_on_scavenge_root_list();
- nm->set_scavenge_root_link(_scavenge_root_nmethods);
- set_scavenge_root_nmethods(nm);
- print_trace("add_scavenge_root", nm);
-}
-
-void CodeCache::unlink_scavenge_root_nmethod(nmethod* nm, nmethod* prev) {
- assert_locked_or_safepoint(CodeCache_lock);
-
- assert((prev == NULL && scavenge_root_nmethods() == nm) ||
- (prev != NULL && prev->scavenge_root_link() == nm), "precondition");
-
- print_trace("unlink_scavenge_root", nm);
- if (prev == NULL) {
- set_scavenge_root_nmethods(nm->scavenge_root_link());
- } else {
- prev->set_scavenge_root_link(nm->scavenge_root_link());
- }
- nm->set_scavenge_root_link(NULL);
- nm->clear_on_scavenge_root_list();
-}
-
-void CodeCache::drop_scavenge_root_nmethod(nmethod* nm) {
- assert_locked_or_safepoint(CodeCache_lock);
-
- print_trace("drop_scavenge_root", nm);
- nmethod* prev = NULL;
- for (nmethod* cur = scavenge_root_nmethods(); cur != NULL; cur = cur->scavenge_root_link()) {
- if (cur == nm) {
- unlink_scavenge_root_nmethod(cur, prev);
- return;
- }
- prev = cur;
- }
- assert(false, "should have been on list");
-}
-
-void CodeCache::prune_scavenge_root_nmethods() {
- assert_locked_or_safepoint(CodeCache_lock);
-
- debug_only(mark_scavenge_root_nmethods());
-
- nmethod* last = NULL;
- nmethod* cur = scavenge_root_nmethods();
- while (cur != NULL) {
- nmethod* next = cur->scavenge_root_link();
- debug_only(cur->clear_scavenge_root_marked());
- assert(cur->scavenge_root_not_marked(), "");
- assert(cur->on_scavenge_root_list(), "else shouldn't be on this list");
-
- if (!cur->is_zombie() && !cur->is_unloaded()
- && cur->detect_scavenge_root_oops()) {
- // Keep it. Advance 'last' to prevent deletion.
- last = cur;
- } else {
- // Prune it from the list, so we don't have to look at it any more.
- print_trace("prune_scavenge_root", cur);
- unlink_scavenge_root_nmethod(cur, last);
- }
- cur = next;
- }
-
- // Check for stray marks.
- debug_only(verify_perm_nmethods(NULL));
-}
-
-#ifndef PRODUCT
-void CodeCache::asserted_non_scavengable_nmethods_do(CodeBlobClosure* f) {
- // While we are here, verify the integrity of the list.
- mark_scavenge_root_nmethods();
- for (nmethod* cur = scavenge_root_nmethods(); cur != NULL; cur = cur->scavenge_root_link()) {
- assert(cur->on_scavenge_root_list(), "else shouldn't be on this list");
- cur->clear_scavenge_root_marked();
- }
- verify_perm_nmethods(f);
-}
-
-// Temporarily mark nmethods that are claimed to be on the scavenge list.
-void CodeCache::mark_scavenge_root_nmethods() {
- NMethodIterator iter(NMethodIterator::only_alive);
- while(iter.next()) {
- nmethod* nm = iter.method();
- assert(nm->scavenge_root_not_marked(), "clean state");
- if (nm->on_scavenge_root_list())
- nm->set_scavenge_root_marked();
- }
-}
-
-// If the closure is given, run it on the unlisted nmethods.
-// Also make sure that the effects of mark_scavenge_root_nmethods is gone.
-void CodeCache::verify_perm_nmethods(CodeBlobClosure* f_or_null) {
- NMethodIterator iter(NMethodIterator::only_alive);
- while(iter.next()) {
- nmethod* nm = iter.method();
- bool call_f = (f_or_null != NULL);
- assert(nm->scavenge_root_not_marked(), "must be already processed");
- if (nm->on_scavenge_root_list())
- call_f = false; // don't show this one to the client
- Universe::heap()->verify_nmethod(nm);
- if (call_f) f_or_null->do_code_blob(nm);
- }
-}
-#endif //PRODUCT
-
void CodeCache::verify_clean_inline_caches() {
#ifdef ASSERT
NMethodIterator iter(NMethodIterator::only_alive_and_not_unloading);
@@ -929,12 +767,6 @@
_exception_cache_purge_list = NULL;
}
-void CodeCache::gc_prologue() { }
-
-void CodeCache::gc_epilogue() {
- prune_scavenge_root_nmethods();
-}
-
uint8_t CodeCache::_unloading_cycle = 1;
void CodeCache::increment_unloading_cycle() {
@@ -1229,13 +1061,14 @@
// ...Already marked in the previous pass; count it here.
// Also counts AOT compiled methods, already marked.
number_of_marked_CodeBlobs++;
- } else if (nm->is_evol_dependent()) {
+ } else if (nm->has_evol_metadata()) {
ResourceMark rm;
nm->mark_for_deoptimization();
number_of_marked_CodeBlobs++;
- } else {
- // flush caches in case they refer to a redefined Method*
- nm->clear_inline_caches();
+ } else {
+ // Inline caches that refer to an nmethod are deoptimized already, because
+ // the Method* is walked in the metadata section of the nmethod.
+ assert(!nm->is_evol_dependent(), "should no longer be necessary");
}
}
--- a/src/hotspot/share/code/codeCache.hpp Tue Mar 12 09:49:10 2019 +0000
+++ b/src/hotspot/share/code/codeCache.hpp Sat Mar 16 21:00:45 2019 +0000
@@ -94,14 +94,10 @@
static address _low_bound; // Lower bound of CodeHeap addresses
static address _high_bound; // Upper bound of CodeHeap addresses
static int _number_of_nmethods_with_dependencies; // Total number of nmethods with dependencies
- static nmethod* _scavenge_root_nmethods; // linked via nm->scavenge_root_link()
static uint8_t _unloading_cycle; // Global state for recognizing old nmethods that need to be unloaded
static ExceptionCache* volatile _exception_cache_purge_list;
- static void mark_scavenge_root_nmethods() PRODUCT_RETURN;
- static void verify_perm_nmethods(CodeBlobClosure* f_or_null) PRODUCT_RETURN;
-
// CodeHeap management
static void initialize_heaps(); // Initializes the CodeHeaps
// Check the code heap sizes set by the user via command line
@@ -124,10 +120,6 @@
static int allocated_segments();
static size_t freelists_length();
- static void set_scavenge_root_nmethods(nmethod* nm) { _scavenge_root_nmethods = nm; }
- static void prune_scavenge_root_nmethods();
- static void unlink_scavenge_root_nmethod(nmethod* nm, nmethod* prev);
-
// Make private to prevent unsafe calls. Not all CodeBlob*'s are embedded in a CodeHeap.
static bool contains(CodeBlob *p) { fatal("don't call me!"); return false; }
@@ -155,7 +147,7 @@
static void blobs_do(void f(CodeBlob* cb)); // iterates over all CodeBlobs
static void blobs_do(CodeBlobClosure* f); // iterates over all CodeBlobs
static void nmethods_do(void f(nmethod* nm)); // iterates over all nmethods
- static void metadata_do(void f(Metadata* m)); // iterates over metadata in alive nmethods
+ static void metadata_do(MetadataClosure* f); // iterates over metadata in alive nmethods
// Lookup
static CodeBlob* find_blob(void* start); // Returns the CodeBlob containing the given address
@@ -171,8 +163,6 @@
static int nmethod_count(int code_blob_type);
// GC support
- static void gc_epilogue();
- static void gc_prologue();
static void verify_oops();
// If any oops are not marked this method unloads (i.e., breaks root links
// to) any unmarked codeBlobs in the cache. Sets "marked_for_unloading"
@@ -189,25 +179,9 @@
static void do_unloading(BoolObjectClosure* is_alive, bool unloading_occurred);
static uint8_t unloading_cycle() { return _unloading_cycle; }
static void increment_unloading_cycle();
- static void asserted_non_scavengable_nmethods_do(CodeBlobClosure* f = NULL) PRODUCT_RETURN;
static void release_exception_cache(ExceptionCache* entry);
static void purge_exception_caches();
- // Apply f to every live code blob in scavengable nmethods. Prune nmethods
- // from the list of scavengable nmethods if f->fix_relocations() and a nmethod
- // no longer has scavengable oops. If f->fix_relocations(), then f must copy
- // objects to their new location immediately to avoid fixing nmethods on the
- // basis of the old object locations.
- static void scavenge_root_nmethods_do(CodeBlobToOopClosure* f);
-
- static nmethod* scavenge_root_nmethods() { return _scavenge_root_nmethods; }
- // register_scavenge_root_nmethod() conditionally adds the nmethod to the list
- // if it is not already on the list and has a scavengeable root
- static void register_scavenge_root_nmethod(nmethod* nm);
- static void verify_scavenge_root_nmethod(nmethod* nm);
- static void add_scavenge_root_nmethod(nmethod* nm);
- static void drop_scavenge_root_nmethod(nmethod* nm);
-
// Printing/debugging
static void print(); // prints summary
static void print_internals();
--- a/src/hotspot/share/code/compiledMethod.cpp Tue Mar 12 09:49:10 2019 +0000
+++ b/src/hotspot/share/code/compiledMethod.cpp Sat Mar 16 21:00:45 2019 +0000
@@ -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
@@ -415,20 +415,22 @@
#ifdef ASSERT
// Check class_loader is alive for this bit of metadata.
-static void check_class(Metadata* md) {
- Klass* klass = NULL;
- if (md->is_klass()) {
- klass = ((Klass*)md);
- } else if (md->is_method()) {
- klass = ((Method*)md)->method_holder();
- } else if (md->is_methodData()) {
- klass = ((MethodData*)md)->method()->method_holder();
- } else {
- md->print();
- ShouldNotReachHere();
- }
- assert(klass->is_loader_alive(), "must be alive");
-}
+class CheckClass : public MetadataClosure {
+ void do_metadata(Metadata* md) {
+ Klass* klass = NULL;
+ if (md->is_klass()) {
+ klass = ((Klass*)md);
+ } else if (md->is_method()) {
+ klass = ((Method*)md)->method_holder();
+ } else if (md->is_methodData()) {
+ klass = ((MethodData*)md)->method()->method_holder();
+ } else {
+ md->print();
+ ShouldNotReachHere();
+ }
+ assert(klass->is_loader_alive(), "must be alive");
+ }
+};
#endif // ASSERT
@@ -550,8 +552,11 @@
// All static stubs need to be cleaned.
clean_ic_stubs();
+#ifdef ASSERT
// Check that the metadata embedded in the nmethod is alive
- DEBUG_ONLY(metadata_do(check_class));
+ CheckClass check_class;
+ metadata_do(&check_class);
+#endif
return true;
}
@@ -628,3 +633,35 @@
os::is_readable_pointer(method->constants()) &&
os::is_readable_pointer(method->signature());
}
+
+class HasEvolDependency : public MetadataClosure {
+ bool _has_evol_dependency;
+ public:
+ HasEvolDependency() : _has_evol_dependency(false) {}
+ void do_metadata(Metadata* md) {
+ if (md->is_method()) {
+ Method* method = (Method*)md;
+ if (method->is_old()) {
+ _has_evol_dependency = true;
+ }
+ }
+ }
+ bool has_evol_dependency() const { return _has_evol_dependency; }
+};
+
+bool CompiledMethod::has_evol_metadata() {
+ // Check the metadata in relocIter and CompiledIC and also deoptimize
+ // any nmethod that has reference to old methods.
+ HasEvolDependency check_evol;
+ metadata_do(&check_evol);
+ if (check_evol.has_evol_dependency() && log_is_enabled(Debug, redefine, class, nmethod)) {
+ ResourceMark rm;
+ log_debug(redefine, class, nmethod)
+ ("Found evol dependency of nmethod %s.%s(%s) compile_id=%d on in nmethod metadata",
+ _method->method_holder()->external_name(),
+ _method->name()->as_C_string(),
+ _method->signature()->as_C_string(),
+ compile_id());
+ }
+ return check_evol.has_evol_dependency();
+}
--- a/src/hotspot/share/code/compiledMethod.hpp Tue Mar 12 09:49:10 2019 +0000
+++ b/src/hotspot/share/code/compiledMethod.hpp Sat Mar 16 21:00:45 2019 +0000
@@ -38,6 +38,7 @@
class NativeCallWrapper;
class ScopeDesc;
class CompiledIC;
+class MetadataClosure;
// This class is used internally by nmethods, to cache
// exception/pc/handler information.
@@ -368,6 +369,8 @@
void verify_oop_relocations();
virtual bool is_evol_dependent() = 0;
+ bool has_evol_metadata();
+
// Fast breakpoint support. Tells if this compiled method is
// dependent on the given method. Returns true if this nmethod
// corresponds to the given method as well.
@@ -384,7 +387,7 @@
Method* attached_method(address call_pc);
Method* attached_method_before_pc(address pc);
- virtual void metadata_do(void f(Metadata*)) = 0;
+ virtual void metadata_do(MetadataClosure* f) = 0;
// GC support
protected:
@@ -408,10 +411,6 @@
PcDesc* find_pc_desc(address pc, bool approximate) {
return _pc_desc_container.find_pc_desc(pc, approximate, PcDescSearch(code_begin(), scopes_pcs_begin(), scopes_pcs_end()));
}
-
-protected:
- // Used by some GCs to chain nmethods.
- nmethod* _scavenge_root_link; // from CodeCache::scavenge_root_nmethods
};
#endif // SHARE_CODE_COMPILEDMETHOD_HPP
--- a/src/hotspot/share/code/nmethod.cpp Tue Mar 12 09:49:10 2019 +0000
+++ b/src/hotspot/share/code/nmethod.cpp Sat Mar 16 21:00:45 2019 +0000
@@ -423,8 +423,6 @@
_oops_do_mark_link = NULL;
_jmethod_id = NULL;
_osr_link = NULL;
- _scavenge_root_link = NULL;
- _scavenge_root_state = 0;
#if INCLUDE_RTM_OPT
_rtm_state = NoRTM;
#endif
@@ -611,10 +609,10 @@
code_buffer->copy_values_to(this);
clear_unloading_state();
- if (ScavengeRootsInCode) {
- Universe::heap()->register_nmethod(this);
- }
+
+ Universe::heap()->register_nmethod(this);
debug_only(Universe::heap()->verify_nmethod(this));
+
CodeCache::commit(this);
}
@@ -771,9 +769,8 @@
debug_info->copy_to(this);
dependencies->copy_to(this);
clear_unloading_state();
- if (ScavengeRootsInCode) {
- Universe::heap()->register_nmethod(this);
- }
+
+ Universe::heap()->register_nmethod(this);
debug_only(Universe::heap()->verify_nmethod(this));
CodeCache::commit(this);
@@ -1361,10 +1358,6 @@
ec = next;
}
- if (on_scavenge_root_list()) {
- CodeCache::drop_scavenge_root_nmethod(this);
- }
-
#if INCLUDE_JVMCI
assert(_jvmci_installed_code == NULL, "should have been nulled out when transitioned to zombie");
assert(_speculation_log == NULL, "should have been nulled out when transitioned to zombie");
@@ -1506,7 +1499,7 @@
}
// Iterate over metadata calling this function. Used by RedefineClasses
-void nmethod::metadata_do(void f(Metadata*)) {
+void nmethod::metadata_do(MetadataClosure* f) {
{
// Visit all immediate references that are embedded in the instruction stream.
RelocIterator iter(this, oops_reloc_begin());
@@ -1521,7 +1514,7 @@
"metadata must be found in exactly one place");
if (r->metadata_is_immediate() && r->metadata_value() != NULL) {
Metadata* md = r->metadata_value();
- if (md != _method) f(md);
+ if (md != _method) f->do_metadata(md);
}
} else if (iter.type() == relocInfo::virtual_call_type) {
// Check compiledIC holders associated with this nmethod
@@ -1529,12 +1522,12 @@
CompiledIC *ic = CompiledIC_at(&iter);
if (ic->is_icholder_call()) {
CompiledICHolder* cichk = ic->cached_icholder();
- f(cichk->holder_metadata());
- f(cichk->holder_klass());
+ f->do_metadata(cichk->holder_metadata());
+ f->do_metadata(cichk->holder_klass());
} else {
Metadata* ic_oop = ic->cached_metadata();
if (ic_oop != NULL) {
- f(ic_oop);
+ f->do_metadata(ic_oop);
}
}
}
@@ -1545,11 +1538,11 @@
for (Metadata** p = metadata_begin(); p < metadata_end(); p++) {
if (*p == Universe::non_oop_word() || *p == NULL) continue; // skip non-oops
Metadata* md = *p;
- f(md);
+ f->do_metadata(md);
}
// Visit metadata not embedded in the other places.
- if (_method != NULL) f(_method);
+ if (_method != NULL) f->do_metadata(_method);
}
// The _is_unloading_state encodes a tuple comprising the unloading cycle
@@ -1778,44 +1771,6 @@
log_trace(gc, nmethod)("oops_do_marking_epilogue");
}
-class DetectScavengeRoot: public OopClosure {
- bool _detected_scavenge_root;
- nmethod* _print_nm;
-public:
- DetectScavengeRoot(nmethod* nm) : _detected_scavenge_root(false), _print_nm(nm) {}
-
- bool detected_scavenge_root() { return _detected_scavenge_root; }
- virtual void do_oop(oop* p) {
- if ((*p) != NULL && Universe::heap()->is_scavengable(*p)) {
- NOT_PRODUCT(maybe_print(p));
- _detected_scavenge_root = true;
- }
- }
- virtual void do_oop(narrowOop* p) { ShouldNotReachHere(); }
-
-#ifndef PRODUCT
- void maybe_print(oop* p) {
- LogTarget(Trace, gc, nmethod) lt;
- if (lt.is_enabled()) {
- LogStream ls(lt);
- if (!_detected_scavenge_root) {
- CompileTask::print(&ls, _print_nm, "new scavenge root", /*short_form:*/ true);
- }
- ls.print("" PTR_FORMAT "[offset=%d] detected scavengable oop " PTR_FORMAT " (found at " PTR_FORMAT ") ",
- p2i(_print_nm), (int)((intptr_t)p - (intptr_t)_print_nm),
- p2i(*p), p2i(p));
- ls.cr();
- }
- }
-#endif //PRODUCT
-};
-
-bool nmethod::detect_scavenge_root_oops() {
- DetectScavengeRoot detect_scavenge_root(this);
- oops_do(&detect_scavenge_root);
- return detect_scavenge_root.detected_scavenge_root();
-}
-
inline bool includes(void* p, void* from, void* to) {
return from <= p && p < to;
}
@@ -2267,41 +2222,6 @@
// -----------------------------------------------------------------------------
-// Non-product code
-#ifndef PRODUCT
-
-class DebugScavengeRoot: public OopClosure {
- nmethod* _nm;
- bool _ok;
-public:
- DebugScavengeRoot(nmethod* nm) : _nm(nm), _ok(true) { }
- bool ok() { return _ok; }
- virtual void do_oop(oop* p) {
- if ((*p) == NULL || !Universe::heap()->is_scavengable(*p)) return;
- if (_ok) {
- _nm->print_nmethod(true);
- _ok = false;
- }
- tty->print_cr("*** scavengable oop " PTR_FORMAT " found at " PTR_FORMAT " (offset %d)",
- p2i(*p), p2i(p), (int)((intptr_t)p - (intptr_t)_nm));
- (*p)->print();
- }
- virtual void do_oop(narrowOop* p) { ShouldNotReachHere(); }
-};
-
-void nmethod::verify_scavenge_root_oops() {
- if (!on_scavenge_root_list()) {
- // Actually look inside, to verify the claim that it's clean.
- DebugScavengeRoot debug_scavenge_root(this);
- oops_do(&debug_scavenge_root);
- if (!debug_scavenge_root.ok())
- fatal("found an unadvertised bad scavengable oop in the code cache");
- }
- assert(scavenge_root_not_marked(), "");
-}
-
-#endif // PRODUCT
-
// Printing operations
void nmethod::print() const {
@@ -2327,7 +2247,6 @@
tty->print(" for method " INTPTR_FORMAT , p2i(method()));
tty->print(" { ");
tty->print_cr("%s ", state());
- if (on_scavenge_root_list()) tty->print("scavenge_root ");
tty->print_cr("}:");
}
if (size () > 0) tty->print_cr(" total in heap [" INTPTR_FORMAT "," INTPTR_FORMAT "] = %d",
--- a/src/hotspot/share/code/nmethod.hpp Tue Mar 12 09:49:10 2019 +0000
+++ b/src/hotspot/share/code/nmethod.hpp Sat Mar 16 21:00:45 2019 +0000
@@ -131,8 +131,6 @@
bool _oops_are_stale; // indicates that it's no longer safe to access oops section
#endif
- jbyte _scavenge_root_state;
-
#if INCLUDE_RTM_OPT
// RTM state at compile time. Used during deoptimization to decide
// whether to restart collecting RTM locking abort statistic again.
@@ -410,24 +408,6 @@
void fix_oop_relocations(address begin, address end) { fix_oop_relocations(begin, end, false); }
void fix_oop_relocations() { fix_oop_relocations(NULL, NULL, false); }
- // Scavengable oop support
- bool on_scavenge_root_list() const { return (_scavenge_root_state & 1) != 0; }
- protected:
- enum { sl_on_list = 0x01, sl_marked = 0x10 };
- void set_on_scavenge_root_list() { _scavenge_root_state = sl_on_list; }
- void clear_on_scavenge_root_list() { _scavenge_root_state = 0; }
- // assertion-checking and pruning logic uses the bits of _scavenge_root_state
-#ifndef PRODUCT
- void set_scavenge_root_marked() { _scavenge_root_state |= sl_marked; }
- void clear_scavenge_root_marked() { _scavenge_root_state &= ~sl_marked; }
- bool scavenge_root_not_marked() { return (_scavenge_root_state &~ sl_on_list) == 0; }
- // N.B. there is no positive marked query, and we only use the not_marked query for asserts.
-#endif //PRODUCT
- nmethod* scavenge_root_link() const { return _scavenge_root_link; }
- void set_scavenge_root_link(nmethod *n) { _scavenge_root_link = n; }
-
- public:
-
// Sweeper support
long stack_traversal_mark() { return _stack_traversal_mark; }
void set_stack_traversal_mark(long l) { _stack_traversal_mark = l; }
@@ -504,8 +484,6 @@
public:
void oops_do(OopClosure* f) { oops_do(f, false); }
void oops_do(OopClosure* f, bool allow_zombie);
- bool detect_scavenge_root_oops();
- void verify_scavenge_root_oops() PRODUCT_RETURN;
bool test_set_oops_do_mark();
static void oops_do_marking_prologue();
@@ -613,7 +591,7 @@
static int osr_entry_point_offset() { return offset_of(nmethod, _osr_entry_point); }
static int state_offset() { return offset_of(nmethod, _state); }
- virtual void metadata_do(void f(Metadata*));
+ virtual void metadata_do(MetadataClosure* f);
NativeCallWrapper* call_wrapper_at(address call) const;
NativeCallWrapper* call_wrapper_before(address return_pc) const;
--- a/src/hotspot/share/compiler/compileTask.cpp Tue Mar 12 09:49:10 2019 +0000
+++ b/src/hotspot/share/compiler/compileTask.cpp Sat Mar 16 21:00:45 2019 +0000
@@ -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
@@ -182,8 +182,10 @@
}
void CompileTask::mark_on_stack() {
+ if (is_unloaded()) {
+ return;
+ }
// Mark these methods as something redefine classes cannot remove.
- assert(!is_unloaded(), "unloaded method on the stack");
_method->set_on_stack(true);
if (_hot_method != NULL) {
_hot_method->set_on_stack(true);
@@ -195,13 +197,13 @@
}
// RedefineClasses support
-void CompileTask::metadata_do(void f(Metadata*)) {
+void CompileTask::metadata_do(MetadataClosure* f) {
if (is_unloaded()) {
return;
}
- f(method());
+ f->do_metadata(method());
if (hot_method() != NULL && hot_method() != method()) {
- f(hot_method());
+ f->do_metadata(hot_method());
}
}
--- a/src/hotspot/share/compiler/compileTask.hpp Tue Mar 12 09:49:10 2019 +0000
+++ b/src/hotspot/share/compiler/compileTask.hpp Sat Mar 16 21:00:45 2019 +0000
@@ -177,7 +177,7 @@
bool is_unloaded() const;
// RedefineClasses support
- void metadata_do(void f(Metadata*));
+ void metadata_do(MetadataClosure* f);
void mark_on_stack();
private:
--- a/src/hotspot/share/gc/cms/cmsCardTable.cpp Tue Mar 12 09:49:10 2019 +0000
+++ b/src/hotspot/share/gc/cms/cmsCardTable.cpp Sat Mar 16 21:00:45 2019 +0000
@@ -64,9 +64,9 @@
"n_threads: %u > ParallelGCThreads: %u", n_threads, ParallelGCThreads);
// Make sure the LNC array is valid for the space.
- jbyte** lowest_non_clean;
- uintptr_t lowest_non_clean_base_chunk_index;
- size_t lowest_non_clean_chunk_size;
+ CardValue** lowest_non_clean;
+ uintptr_t lowest_non_clean_base_chunk_index;
+ size_t lowest_non_clean_chunk_size;
get_LNC_array_for_space(sp, lowest_non_clean,
lowest_non_clean_base_chunk_index,
lowest_non_clean_chunk_size);
@@ -106,7 +106,7 @@
jint stride, int n_strides,
OopsInGenClosure* cl,
CardTableRS* ct,
- jbyte** lowest_non_clean,
+ CardValue** lowest_non_clean,
uintptr_t lowest_non_clean_base_chunk_index,
size_t lowest_non_clean_chunk_size) {
// We go from higher to lower addresses here; it wouldn't help that much
@@ -114,21 +114,19 @@
// Find the first card address of the first chunk in the stride that is
// at least "bottom" of the used region.
- jbyte* start_card = byte_for(used.start());
- jbyte* end_card = byte_after(used.last());
+ CardValue* start_card = byte_for(used.start());
+ CardValue* end_card = byte_after(used.last());
uintptr_t start_chunk = addr_to_chunk_index(used.start());
uintptr_t start_chunk_stride_num = start_chunk % n_strides;
- jbyte* chunk_card_start;
+ CardValue* chunk_card_start;
if ((uintptr_t)stride >= start_chunk_stride_num) {
- chunk_card_start = (jbyte*)(start_card +
- (stride - start_chunk_stride_num) *
- ParGCCardsPerStrideChunk);
+ chunk_card_start = (start_card +
+ (stride - start_chunk_stride_num) * ParGCCardsPerStrideChunk);
} else {
// Go ahead to the next chunk group boundary, then to the requested stride.
- chunk_card_start = (jbyte*)(start_card +
- (n_strides - start_chunk_stride_num + stride) *
- ParGCCardsPerStrideChunk);
+ chunk_card_start = (start_card +
+ (n_strides - start_chunk_stride_num + stride) * ParGCCardsPerStrideChunk);
}
while (chunk_card_start < end_card) {
@@ -139,11 +137,11 @@
// by suitably initializing the "min_done" field in process_chunk_boundaries()
// below, together with the dirty region extension accomplished in
// DirtyCardToOopClosure::do_MemRegion().
- jbyte* chunk_card_end = chunk_card_start + ParGCCardsPerStrideChunk;
+ CardValue* chunk_card_end = chunk_card_start + ParGCCardsPerStrideChunk;
// Invariant: chunk_mr should be fully contained within the "used" region.
- MemRegion chunk_mr = MemRegion(addr_for(chunk_card_start),
- chunk_card_end >= end_card ?
- used.end() : addr_for(chunk_card_end));
+ MemRegion chunk_mr = MemRegion(addr_for(chunk_card_start),
+ chunk_card_end >= end_card ?
+ used.end() : addr_for(chunk_card_end));
assert(chunk_mr.word_size() > 0, "[chunk_card_start > used_end)");
assert(used.contains(chunk_mr), "chunk_mr should be subset of used");
@@ -185,7 +183,7 @@
DirtyCardToOopClosure* dcto_cl,
MemRegion chunk_mr,
MemRegion used,
- jbyte** lowest_non_clean,
+ CardValue** lowest_non_clean,
uintptr_t lowest_non_clean_base_chunk_index,
size_t lowest_non_clean_chunk_size)
{
@@ -224,21 +222,20 @@
// does not scan an object straddling the mutual boundary
// too far to the right, and attempt to scan a portion of
// that object twice.
- jbyte* first_dirty_card = NULL;
- jbyte* last_card_of_first_obj =
+ CardValue* first_dirty_card = NULL;
+ CardValue* last_card_of_first_obj =
byte_for(first_block + sp->block_size(first_block) - 1);
- jbyte* first_card_of_cur_chunk = byte_for(chunk_mr.start());
- jbyte* last_card_of_cur_chunk = byte_for(chunk_mr.last());
- jbyte* last_card_to_check =
- (jbyte*) MIN2((intptr_t) last_card_of_cur_chunk,
- (intptr_t) last_card_of_first_obj);
+ CardValue* first_card_of_cur_chunk = byte_for(chunk_mr.start());
+ CardValue* last_card_of_cur_chunk = byte_for(chunk_mr.last());
+ CardValue* last_card_to_check = MIN2(last_card_of_cur_chunk, last_card_of_first_obj);
// Note that this does not need to go beyond our last card
// if our first object completely straddles this chunk.
- for (jbyte* cur = first_card_of_cur_chunk;
+ for (CardValue* cur = first_card_of_cur_chunk;
cur <= last_card_to_check; cur++) {
- jbyte val = *cur;
+ CardValue val = *cur;
if (card_will_be_scanned(val)) {
- first_dirty_card = cur; break;
+ first_dirty_card = cur;
+ break;
} else {
assert(!card_may_have_been_dirty(val), "Error");
}
@@ -253,7 +250,7 @@
// In this case we can help our neighbor by just asking them
// to stop at our first card (even though it may not be dirty).
assert(lowest_non_clean[cur_chunk_index] == NULL, "Write once : value should be stable hereafter");
- jbyte* first_card_of_cur_chunk = byte_for(chunk_mr.start());
+ CardValue* first_card_of_cur_chunk = byte_for(chunk_mr.start());
lowest_non_clean[cur_chunk_index] = first_card_of_cur_chunk;
}
@@ -278,8 +275,8 @@
// last_obj_card is the card corresponding to the start of the last object
// in the chunk. Note that the last object may not start in
// the chunk.
- jbyte* const last_obj_card = byte_for(last_block);
- const jbyte val = *last_obj_card;
+ CardValue* const last_obj_card = byte_for(last_block);
+ const CardValue val = *last_obj_card;
if (!card_will_be_scanned(val)) {
assert(!card_may_have_been_dirty(val), "Error");
// The card containing the head is not dirty. Any marks on
@@ -290,20 +287,20 @@
// The last object must be considered dirty, and extends onto the
// following chunk. Look for a dirty card in that chunk that will
// bound our processing.
- jbyte* limit_card = NULL;
+ CardValue* limit_card = NULL;
const size_t last_block_size = sp->block_size(last_block);
- jbyte* const last_card_of_last_obj =
+ CardValue* const last_card_of_last_obj =
byte_for(last_block + last_block_size - 1);
- jbyte* const first_card_of_next_chunk = byte_for(chunk_mr.end());
+ CardValue* const first_card_of_next_chunk = byte_for(chunk_mr.end());
// This search potentially goes a long distance looking
// for the next card that will be scanned, terminating
// at the end of the last_block, if no earlier dirty card
// is found.
assert(byte_for(chunk_mr.end()) - byte_for(chunk_mr.start()) == ParGCCardsPerStrideChunk,
"last card of next chunk may be wrong");
- for (jbyte* cur = first_card_of_next_chunk;
+ for (CardValue* cur = first_card_of_next_chunk;
cur <= last_card_of_last_obj; cur++) {
- const jbyte val = *cur;
+ const CardValue val = *cur;
if (card_will_be_scanned(val)) {
limit_card = cur; break;
} else {
@@ -359,7 +356,7 @@
for (uintptr_t lnc_index = cur_chunk_index + 1;
lnc_index <= last_chunk_index_to_check;
lnc_index++) {
- jbyte* lnc_card = lowest_non_clean[lnc_index];
+ CardValue* lnc_card = lowest_non_clean[lnc_index];
if (lnc_card != NULL) {
// we can stop at the first non-NULL entry we find
if (lnc_card <= limit_card) {
@@ -391,7 +388,7 @@
void
CMSCardTable::
get_LNC_array_for_space(Space* sp,
- jbyte**& lowest_non_clean,
+ CardValue**& lowest_non_clean,
uintptr_t& lowest_non_clean_base_chunk_index,
size_t& lowest_non_clean_chunk_size) {
--- a/src/hotspot/share/gc/cms/cmsCardTable.hpp Tue Mar 12 09:49:10 2019 +0000
+++ b/src/hotspot/share/gc/cms/cmsCardTable.hpp Sat Mar 16 21:00:45 2019 +0000
@@ -48,7 +48,7 @@
// Ensures that these arrays are of sufficient size, allocating if necessary.
// May be called by several threads concurrently.
void get_LNC_array_for_space(Space* sp,
- jbyte**& lowest_non_clean,
+ CardValue**& lowest_non_clean,
uintptr_t& lowest_non_clean_base_chunk_index,
size_t& lowest_non_clean_chunk_size);
@@ -59,7 +59,7 @@
jint stride, int n_strides,
OopsInGenClosure* cl,
CardTableRS* ct,
- jbyte** lowest_non_clean,
+ CardValue** lowest_non_clean,
uintptr_t lowest_non_clean_base_chunk_index,
size_t lowest_non_clean_chunk_size);
@@ -70,7 +70,7 @@
DirtyCardToOopClosure* dcto_cl,
MemRegion chunk_mr,
MemRegion used,
- jbyte** lowest_non_clean,
+ CardValue** lowest_non_clean,
uintptr_t lowest_non_clean_base_chunk_index,
size_t lowest_non_clean_chunk_size);
--- a/src/hotspot/share/gc/cms/concurrentMarkSweepGeneration.cpp Tue Mar 12 09:49:10 2019 +0000
+++ b/src/hotspot/share/gc/cms/concurrentMarkSweepGeneration.cpp Sat Mar 16 21:00:45 2019 +0000
@@ -1498,8 +1498,7 @@
// Has the GC time limit been exceeded?
size_t max_eden_size = _young_gen->max_eden_size();
GCCause::Cause gc_cause = heap->gc_cause();
- size_policy()->check_gc_overhead_limit(_young_gen->used(),
- _young_gen->eden()->used(),
+ size_policy()->check_gc_overhead_limit(_young_gen->eden()->used(),
_cmsGen->max_capacity(),
max_eden_size,
full,
@@ -4194,9 +4193,6 @@
CMSHeap* heap = CMSHeap::heap();
- if (should_unload_classes()) {
- CodeCache::gc_prologue();
- }
assert(haveFreelistLocks(), "must have free list locks");
assert_lock_strong(bitMapLock());
@@ -4252,7 +4248,7 @@
verify_overflow_empty();
if (should_unload_classes()) {
- CodeCache::gc_epilogue();
+ heap->prune_nmethods();
}
JvmtiExport::gc_epilogue();
--- a/src/hotspot/share/gc/epsilon/epsilonHeap.hpp Tue Mar 12 09:49:10 2019 +0000
+++ b/src/hotspot/share/gc/epsilon/epsilonHeap.hpp Sat Mar 16 21:00:45 2019 +0000
@@ -88,11 +88,6 @@
return _space->is_in(p);
}
- virtual bool is_scavengable(oop obj) {
- // No GC is going to happen, therefore no objects ever move.
- return false;
- }
-
virtual bool is_maximal_no_gc() const {
// No GC is going to happen. Return "we are at max", when we are about to fail.
return used() == capacity();
@@ -128,7 +123,6 @@
// No support for block parsing.
virtual HeapWord* block_start(const void* addr) const { return NULL; }
- virtual size_t block_size(const HeapWord* addr) const { return 0; }
virtual bool block_is_obj(const HeapWord* addr) const { return false; }
// No GC threads
--- a/src/hotspot/share/gc/g1/g1BarrierSet.cpp Tue Mar 12 09:49:10 2019 +0000
+++ b/src/hotspot/share/gc/g1/g1BarrierSet.cpp Sat Mar 16 21:00:45 2019 +0000
@@ -91,7 +91,7 @@
}
}
-void G1BarrierSet::write_ref_field_post_slow(volatile jbyte* byte) {
+void G1BarrierSet::write_ref_field_post_slow(volatile CardValue* byte) {
// In the slow path, we know a card is not young
assert(*byte != G1CardTable::g1_young_card_val(), "slow path invoked without filtering");
OrderAccess::storeload();
@@ -106,8 +106,8 @@
if (mr.is_empty()) {
return;
}
- volatile jbyte* byte = _card_table->byte_for(mr.start());
- jbyte* last_byte = _card_table->byte_for(mr.last());
+ volatile CardValue* byte = _card_table->byte_for(mr.start());
+ CardValue* last_byte = _card_table->byte_for(mr.last());
// skip initial young cards
for (; byte <= last_byte && *byte == G1CardTable::g1_young_card_val(); byte++);
@@ -117,7 +117,7 @@
Thread* thr = Thread::current();
G1DirtyCardQueue& queue = G1ThreadLocalData::dirty_card_queue(thr);
for (; byte <= last_byte; byte++) {
- jbyte bv = *byte;
+ CardValue bv = *byte;
if ((bv != G1CardTable::g1_young_card_val()) &&
(bv != G1CardTable::dirty_card_val())) {
*byte = G1CardTable::dirty_card_val();
--- a/src/hotspot/share/gc/g1/g1BarrierSet.hpp Tue Mar 12 09:49:10 2019 +0000
+++ b/src/hotspot/share/gc/g1/g1BarrierSet.hpp Sat Mar 16 21:00:45 2019 +0000
@@ -27,9 +27,9 @@
#include "gc/g1/g1DirtyCardQueue.hpp"
#include "gc/g1/g1SATBMarkQueueSet.hpp"
+#include "gc/shared/cardTable.hpp"
#include "gc/shared/cardTableBarrierSet.hpp"
-class CardTable;
class G1CardTable;
// This barrier is specialized to use a logging barrier to support
@@ -73,7 +73,7 @@
template <DecoratorSet decorators, typename T>
void write_ref_field_post(T* field, oop new_val);
- void write_ref_field_post_slow(volatile jbyte* byte);
+ void write_ref_field_post_slow(volatile CardValue* byte);
virtual void on_thread_create(Thread* thread);
virtual void on_thread_destroy(Thread* thread);
--- a/src/hotspot/share/gc/g1/g1BarrierSet.inline.hpp Tue Mar 12 09:49:10 2019 +0000
+++ b/src/hotspot/share/gc/g1/g1BarrierSet.inline.hpp Sat Mar 16 21:00:45 2019 +0000
@@ -47,7 +47,7 @@
template <DecoratorSet decorators, typename T>
inline void G1BarrierSet::write_ref_field_post(T* field, oop new_val) {
- volatile jbyte* byte = _card_table->byte_for(field);
+ volatile CardValue* byte = _card_table->byte_for(field);
if (*byte != G1CardTable::g1_young_card_val()) {
// Take a slow path for cards in old
write_ref_field_post_slow(byte);
--- a/src/hotspot/share/gc/g1/g1CardCounts.cpp Tue Mar 12 09:49:10 2019 +0000
+++ b/src/hotspot/share/gc/g1/g1CardCounts.cpp Sat Mar 16 21:00:45 2019 +0000
@@ -81,7 +81,7 @@
}
}
-uint G1CardCounts::add_card_count(jbyte* card_ptr) {
+uint G1CardCounts::add_card_count(CardValue* card_ptr) {
// Returns the number of times the card has been refined.
// If we failed to reserve/commit the counts table, return 0.
// If card_ptr is beyond the committed end of the counts table,
@@ -116,11 +116,11 @@
void G1CardCounts::clear_range(MemRegion mr) {
if (has_count_table()) {
- const jbyte* from_card_ptr = _ct->byte_for_const(mr.start());
+ const CardValue* from_card_ptr = _ct->byte_for_const(mr.start());
// We use the last address in the range as the range could represent the
// last region in the heap. In which case trying to find the card will be an
// OOB access to the card table.
- const jbyte* last_card_ptr = _ct->byte_for_const(mr.last());
+ const CardValue* last_card_ptr = _ct->byte_for_const(mr.last());
#ifdef ASSERT
HeapWord* start_addr = _ct->addr_for(from_card_ptr);
--- a/src/hotspot/share/gc/g1/g1CardCounts.hpp Tue Mar 12 09:49:10 2019 +0000
+++ b/src/hotspot/share/gc/g1/g1CardCounts.hpp Sat Mar 16 21:00:45 2019 +0000
@@ -54,19 +54,23 @@
// is 'drained' during the next evacuation pause.
class G1CardCounts: public CHeapObj<mtGC> {
+public:
+ typedef CardTable::CardValue CardValue;
+
+private:
G1CardCountsMappingChangedListener _listener;
G1CollectedHeap* _g1h;
G1CardTable* _ct;
// The table of counts
- jubyte* _card_counts;
+ uint8_t* _card_counts;
// Max capacity of the reserved space for the counts table
size_t _reserved_max_card_num;
// CardTable bottom.
- const jbyte* _ct_bot;
+ const CardValue* _ct_bot;
// Returns true if the card counts table has been reserved.
bool has_reserved_count_table() { return _card_counts != NULL; }
@@ -76,22 +80,22 @@
return has_reserved_count_table();
}
- size_t ptr_2_card_num(const jbyte* card_ptr) {
+ size_t ptr_2_card_num(const CardValue* card_ptr) {
assert(card_ptr >= _ct_bot,
"Invalid card pointer: "
"card_ptr: " PTR_FORMAT ", "
"_ct_bot: " PTR_FORMAT,
p2i(card_ptr), p2i(_ct_bot));
- size_t card_num = pointer_delta(card_ptr, _ct_bot, sizeof(jbyte));
+ size_t card_num = pointer_delta(card_ptr, _ct_bot, sizeof(CardValue));
assert(card_num < _reserved_max_card_num,
"card pointer out of range: " PTR_FORMAT, p2i(card_ptr));
return card_num;
}
- jbyte* card_num_2_ptr(size_t card_num) {
+ CardValue* card_num_2_ptr(size_t card_num) {
assert(card_num < _reserved_max_card_num,
"card num out of range: " SIZE_FORMAT, card_num);
- return (jbyte*) (_ct_bot + card_num);
+ return (CardValue*) (_ct_bot + card_num);
}
// Clear the counts table for the given (exclusive) index range.
@@ -112,7 +116,7 @@
// Increments the refinement count for the given card.
// Returns the pre-increment count value.
- uint add_card_count(jbyte* card_ptr);
+ uint add_card_count(CardValue* card_ptr);
// Returns true if the given count is high enough to be considered
// 'hot'; false otherwise.
--- a/src/hotspot/share/gc/g1/g1CardTable.cpp Tue Mar 12 09:49:10 2019 +0000
+++ b/src/hotspot/share/gc/g1/g1CardTable.cpp Sat Mar 16 21:00:45 2019 +0000
@@ -31,19 +31,19 @@
#include "runtime/orderAccess.hpp"
bool G1CardTable::mark_card_deferred(size_t card_index) {
- jbyte val = _byte_map[card_index];
+ CardValue val = _byte_map[card_index];
// It's already processed
if ((val & (clean_card_mask_val() | deferred_card_val())) == deferred_card_val()) {
return false;
}
// Cached bit can be installed either on a clean card or on a claimed card.
- jbyte new_val = val;
+ CardValue new_val = val;
if (val == clean_card_val()) {
- new_val = (jbyte)deferred_card_val();
+ new_val = deferred_card_val();
} else {
if (val & claimed_card_val()) {
- new_val = val | (jbyte)deferred_card_val();
+ new_val = val | deferred_card_val();
}
}
if (new_val != val) {
@@ -53,8 +53,8 @@
}
void G1CardTable::g1_mark_as_young(const MemRegion& mr) {
- jbyte *const first = byte_for(mr.start());
- jbyte *const last = byte_after(mr.last());
+ CardValue *const first = byte_for(mr.start());
+ CardValue *const last = byte_after(mr.last());
memset_with_concurrent_readers(first, g1_young_gen, last - first);
}
@@ -85,7 +85,7 @@
_cur_covered_regions = 1;
_covered[0] = _whole_heap;
- _byte_map = (jbyte*) mapper->reserved().start();
+ _byte_map = (CardValue*) mapper->reserved().start();
_byte_map_base = _byte_map - (uintptr_t(low_bound) >> card_shift);
assert(byte_for(low_bound) == &_byte_map[0], "Checking start of map");
assert(byte_for(high_bound-1) <= &_byte_map[_last_valid_index], "Checking end of map");
@@ -97,6 +97,6 @@
}
bool G1CardTable::is_in_young(oop obj) const {
- volatile jbyte* p = byte_for(obj);
+ volatile CardValue* p = byte_for(obj);
return *p == G1CardTable::g1_young_card_val();
}
--- a/src/hotspot/share/gc/g1/g1CardTable.hpp Tue Mar 12 09:49:10 2019 +0000
+++ b/src/hotspot/share/gc/g1/g1CardTable.hpp Sat Mar 16 21:00:45 2019 +0000
@@ -62,7 +62,7 @@
return _byte_map[card_index] == dirty_card_val();
}
- static jbyte g1_young_card_val() { return g1_young_gen; }
+ static CardValue g1_young_card_val() { return g1_young_gen; }
/*
Claimed and deferred bits are used together in G1 during the evacuation
@@ -78,7 +78,7 @@
*/
bool is_card_claimed(size_t card_index) {
- jbyte val = _byte_map[card_index];
+ CardValue val = _byte_map[card_index];
return (val & (clean_card_mask_val() | claimed_card_val())) == claimed_card_val();
}
@@ -90,7 +90,7 @@
bool mark_card_deferred(size_t card_index);
bool is_card_deferred(size_t card_index) {
- jbyte val = _byte_map[card_index];
+ CardValue val = _byte_map[card_index];
return (val & (clean_card_mask_val() | deferred_card_val())) == deferred_card_val();
}
--- a/src/hotspot/share/gc/g1/g1CollectedHeap.cpp Tue Mar 12 09:49:10 2019 +0000
+++ b/src/hotspot/share/gc/g1/g1CollectedHeap.cpp Sat Mar 16 21:00:45 2019 +0000
@@ -114,7 +114,7 @@
G1CollectedHeap* _g1h;
G1CardTable* _g1_ct;
- HeapRegion* region_for_card(jbyte* card_ptr) const {
+ HeapRegion* region_for_card(CardValue* card_ptr) const {
return _g1h->heap_region_containing(_g1_ct->addr_for(card_ptr));
}
@@ -128,7 +128,7 @@
RedirtyLoggedCardTableEntryClosure(G1CollectedHeap* g1h) : G1CardTableEntryClosure(),
_num_dirtied(0), _g1h(g1h), _g1_ct(g1h->card_table()) { }
- bool do_card_ptr(jbyte* card_ptr, uint worker_i) {
+ bool do_card_ptr(CardValue* card_ptr, uint worker_i) {
HeapRegion* hr = region_for_card(card_ptr);
// Should only dirty cards in regions that won't be freed.
@@ -2254,11 +2254,6 @@
return hr->block_start(addr);
}
-size_t G1CollectedHeap::block_size(const HeapWord* addr) const {
- HeapRegion* hr = heap_region_containing(addr);
- return hr->block_size(addr);
-}
-
bool G1CollectedHeap::block_is_obj(const HeapWord* addr) const {
HeapRegion* hr = heap_region_containing(addr);
return hr->block_is_obj(addr);
@@ -2731,7 +2726,7 @@
HeapRegionRemSetIterator hrrs(r->rem_set());
size_t card_index;
while (hrrs.has_next(card_index)) {
- jbyte* card_ptr = (jbyte*)ct->byte_for_index(card_index);
+ CardTable::CardValue* card_ptr = ct->byte_for_index(card_index);
// The remembered set might contain references to already freed
// regions. Filter out such entries to avoid failing card table
// verification.
@@ -4801,13 +4796,6 @@
void do_oop(narrowOop* p) { do_oop_work(p); }
};
-// Returns true if the reference points to an object that
-// can move in an incremental collection.
-bool G1CollectedHeap::is_scavengable(oop obj) {
- HeapRegion* hr = heap_region_containing(obj);
- return !hr->is_pinned();
-}
-
void G1CollectedHeap::register_nmethod(nmethod* nm) {
guarantee(nm != NULL, "sanity");
RegisterNMethodOopClosure reg_cl(this, nm);
@@ -4840,9 +4828,7 @@
return;
}
- if (ScavengeRootsInCode) {
- _g1h->register_nmethod(nm);
- }
+ _g1h->register_nmethod(nm);
}
};
--- a/src/hotspot/share/gc/g1/g1CollectedHeap.hpp Tue Mar 12 09:49:10 2019 +0000
+++ b/src/hotspot/share/gc/g1/g1CollectedHeap.hpp Sat Mar 16 21:00:45 2019 +0000
@@ -1191,11 +1191,6 @@
// non-object.
virtual HeapWord* block_start(const void* addr) const;
- // Requires "addr" to be the start of a chunk, and returns its size.
- // "addr + size" is required to be the start of a new chunk, or the end
- // of the active area of the heap.
- virtual size_t block_size(const HeapWord* addr) const;
-
// Requires "addr" to be the start of a block, and returns "TRUE" iff
// the block is an object.
virtual bool block_is_obj(const HeapWord* addr) const;
@@ -1312,9 +1307,6 @@
// Optimized nmethod scanning support routines
- // Is an oop scavengeable
- virtual bool is_scavengable(oop obj);
-
// Register the given nmethod with the G1 heap.
virtual void register_nmethod(nmethod* nm);
--- a/src/hotspot/share/gc/g1/g1DirtyCardQueue.cpp Tue Mar 12 09:49:10 2019 +0000
+++ b/src/hotspot/share/gc/g1/g1DirtyCardQueue.cpp Sat Mar 16 21:00:45 2019 +0000
@@ -44,7 +44,7 @@
// SuspendibleThreadSet after every card.
class G1RefineCardConcurrentlyClosure: public G1CardTableEntryClosure {
public:
- bool do_card_ptr(jbyte* card_ptr, uint worker_i) {
+ bool do_card_ptr(CardValue* card_ptr, uint worker_i) {
G1CollectedHeap::heap()->rem_set()->refine_card_concurrently(card_ptr, worker_i);
if (SuspendibleThreadSet::should_yield()) {
@@ -113,7 +113,7 @@
size_t i = node->index();
size_t limit = buffer_size();
for ( ; i < limit; ++i) {
- jbyte* card_ptr = static_cast<jbyte*>(buf[i]);
+ CardTable::CardValue* card_ptr = static_cast<CardTable::CardValue*>(buf[i]);
assert(card_ptr != NULL, "invariant");
if (!cl->do_card_ptr(card_ptr, worker_i)) {
result = false; // Incomplete processing.
--- a/src/hotspot/share/gc/g1/g1DirtyCardQueue.hpp Tue Mar 12 09:49:10 2019 +0000
+++ b/src/hotspot/share/gc/g1/g1DirtyCardQueue.hpp Sat Mar 16 21:00:45 2019 +0000
@@ -25,6 +25,7 @@
#ifndef SHARE_GC_G1_G1DIRTYCARDQUEUE_HPP
#define SHARE_GC_G1_G1DIRTYCARDQUEUE_HPP
+#include "gc/shared/cardTable.hpp"
#include "gc/shared/ptrQueue.hpp"
#include "memory/allocation.hpp"
@@ -37,9 +38,11 @@
// require these closure objects to be stack-allocated.
class G1CardTableEntryClosure: public CHeapObj<mtGC> {
public:
+ typedef CardTable::CardValue CardValue;
+
// Process the card whose card table entry is "card_ptr". If returns
// "false", terminate the iteration early.
- virtual bool do_card_ptr(jbyte* card_ptr, uint worker_i) = 0;
+ virtual bool do_card_ptr(CardValue* card_ptr, uint worker_i) = 0;
};
// A ptrQueue whose elements are "oops", pointers to object heads.
--- a/src/hotspot/share/gc/g1/g1EvacFailure.cpp Tue Mar 12 09:49:10 2019 +0000
+++ b/src/hotspot/share/gc/g1/g1EvacFailure.cpp Sat Mar 16 21:00:45 2019 +0000
@@ -64,7 +64,7 @@
}
size_t card_index = _ct->index_for(p);
if (_ct->mark_card_deferred(card_index)) {
- _dcq->enqueue((jbyte*)_ct->byte_for_index(card_index));
+ _dcq->enqueue(_ct->byte_for_index(card_index));
}
}
};
--- a/src/hotspot/share/gc/g1/g1FullCollector.cpp Tue Mar 12 09:49:10 2019 +0000
+++ b/src/hotspot/share/gc/g1/g1FullCollector.cpp Sat Mar 16 21:00:45 2019 +0000
@@ -152,10 +152,6 @@
reference_processor()->enable_discovery();
reference_processor()->setup_policy(scope()->should_clear_soft_refs());
- // When collecting the permanent generation Method*s may be moving,
- // so we either have to flush all bcp data or convert it into bci.
- CodeCache::gc_prologue();
-
// We should save the marks of the currently locked biased monitors.
// The marking doesn't preserve the marks of biased objects.
BiasedLocking::preserve_marks();
@@ -187,7 +183,6 @@
update_derived_pointers();
BiasedLocking::restore_marks();
- CodeCache::gc_epilogue();
JvmtiExport::gc_epilogue();
_heap->prepare_heap_for_mutators();
--- a/src/hotspot/share/gc/g1/g1HotCardCache.cpp Tue Mar 12 09:49:10 2019 +0000
+++ b/src/hotspot/share/gc/g1/g1HotCardCache.cpp Sat Mar 16 21:00:45 2019 +0000
@@ -39,7 +39,7 @@
_use_cache = true;
_hot_cache_size = (size_t)1 << G1ConcRSLogCacheSize;
- _hot_cache = ArrayAllocator<jbyte*>::allocate(_hot_cache_size, mtGC);
+ _hot_cache = ArrayAllocator<CardValue*>::allocate(_hot_cache_size, mtGC);
reset_hot_cache_internal();
@@ -54,12 +54,12 @@
G1HotCardCache::~G1HotCardCache() {
if (default_use_cache()) {
assert(_hot_cache != NULL, "Logic");
- ArrayAllocator<jbyte*>::free(_hot_cache, _hot_cache_size);
+ ArrayAllocator<CardValue*>::free(_hot_cache, _hot_cache_size);
_hot_cache = NULL;
}
}
-jbyte* G1HotCardCache::insert(jbyte* card_ptr) {
+CardTable::CardValue* G1HotCardCache::insert(CardValue* card_ptr) {
uint count = _card_counts.add_card_count(card_ptr);
if (!_card_counts.is_hot(count)) {
// The card is not hot so do not store it in the cache;
@@ -69,7 +69,7 @@
// Otherwise, the card is hot.
size_t index = Atomic::add(1u, &_hot_cache_idx) - 1;
size_t masked_index = index & (_hot_cache_size - 1);
- jbyte* current_ptr = _hot_cache[masked_index];
+ CardValue* current_ptr = _hot_cache[masked_index];
// Try to store the new card pointer into the cache. Compare-and-swap to guard
// against the unlikely event of a race resulting in another card pointer to
@@ -77,9 +77,9 @@
// card_ptr in favor of the other option, which would be starting over. This
// should be OK since card_ptr will likely be the older card already when/if
// this ever happens.
- jbyte* previous_ptr = Atomic::cmpxchg(card_ptr,
- &_hot_cache[masked_index],
- current_ptr);
+ CardValue* previous_ptr = Atomic::cmpxchg(card_ptr,
+ &_hot_cache[masked_index],
+ current_ptr);
return (previous_ptr == current_ptr) ? previous_ptr : card_ptr;
}
@@ -96,7 +96,7 @@
// The current worker has successfully claimed the chunk [start_idx..end_idx)
end_idx = MIN2(end_idx, _hot_cache_size);
for (size_t i = start_idx; i < end_idx; i++) {
- jbyte* card_ptr = _hot_cache[i];
+ CardValue* card_ptr = _hot_cache[i];
if (card_ptr != NULL) {
bool result = cl->do_card_ptr(card_ptr, worker_i);
assert(result, "Closure should always return true");
--- a/src/hotspot/share/gc/g1/g1HotCardCache.hpp Tue Mar 12 09:49:10 2019 +0000
+++ b/src/hotspot/share/gc/g1/g1HotCardCache.hpp Sat Mar 16 21:00:45 2019 +0000
@@ -53,7 +53,10 @@
// code, increasing throughput.
class G1HotCardCache: public CHeapObj<mtGC> {
+public:
+ typedef CardTable::CardValue CardValue;
+private:
G1CollectedHeap* _g1h;
bool _use_cache;
@@ -62,7 +65,7 @@
// The card cache table
- jbyte** _hot_cache;
+ CardValue** _hot_cache;
size_t _hot_cache_size;
@@ -107,7 +110,7 @@
// adding, NULL is returned and no further action in needed.
// If we evict a card from the cache to make room for the new card,
// the evicted card is then returned for refinement.
- jbyte* insert(jbyte* card_ptr);
+ CardValue* insert(CardValue* card_ptr);
// Refine the cards that have delayed as a result of
// being in the cache.
--- a/src/hotspot/share/gc/g1/g1ParScanThreadState.hpp Tue Mar 12 09:49:10 2019 +0000
+++ b/src/hotspot/share/gc/g1/g1ParScanThreadState.hpp Sat Mar 16 21:00:45 2019 +0000
@@ -120,7 +120,7 @@
size_t card_index = ct()->index_for(p);
// If the card hasn't been added to the buffer, do it.
if (ct()->mark_card_deferred(card_index)) {
- dirty_card_queue().enqueue((jbyte*)ct()->byte_for_index(card_index));
+ dirty_card_queue().enqueue(ct()->byte_for_index(card_index));
}
}
--- a/src/hotspot/share/gc/g1/g1RemSet.cpp Tue Mar 12 09:49:10 2019 +0000
+++ b/src/hotspot/share/gc/g1/g1RemSet.cpp Sat Mar 16 21:00:45 2019 +0000
@@ -114,12 +114,9 @@
// information. These are also called "dirty". Valid entries are from [0.._cur_dirty_region)
uint* _dirty_region_buffer;
- typedef jbyte IsDirtyRegionState;
- static const IsDirtyRegionState Clean = 0;
- static const IsDirtyRegionState Dirty = 1;
- // Holds a flag for every region whether it is in the _dirty_region_buffer already
- // to avoid duplicates. Uses jbyte since there are no atomic instructions for bools.
- IsDirtyRegionState* _in_dirty_region_buffer;
+ // Flag for every region whether it is in the _dirty_region_buffer already
+ // to avoid duplicates.
+ bool volatile* _in_dirty_region_buffer;
size_t _cur_dirty_region;
// Creates a snapshot of the current _top values at the start of collection to
@@ -169,7 +166,7 @@
FREE_C_HEAP_ARRAY(uint, _dirty_region_buffer);
}
if (_in_dirty_region_buffer != NULL) {
- FREE_C_HEAP_ARRAY(IsDirtyRegionState, _in_dirty_region_buffer);
+ FREE_C_HEAP_ARRAY(bool, _in_dirty_region_buffer);
}
if (_scan_top != NULL) {
FREE_C_HEAP_ARRAY(HeapWord*, _scan_top);
@@ -183,7 +180,7 @@
_iter_states = NEW_C_HEAP_ARRAY(G1RemsetIterState, max_regions, mtGC);
_iter_claims = NEW_C_HEAP_ARRAY(size_t, max_regions, mtGC);
_dirty_region_buffer = NEW_C_HEAP_ARRAY(uint, max_regions, mtGC);
- _in_dirty_region_buffer = NEW_C_HEAP_ARRAY(IsDirtyRegionState, max_regions, mtGC);
+ _in_dirty_region_buffer = NEW_C_HEAP_ARRAY(bool, max_regions, mtGC);
_scan_top = NEW_C_HEAP_ARRAY(HeapWord*, max_regions, mtGC);
}
@@ -197,7 +194,7 @@
G1CollectedHeap::heap()->heap_region_iterate(&cl);
memset((void*)_iter_claims, 0, _max_regions * sizeof(size_t));
- memset(_in_dirty_region_buffer, Clean, _max_regions * sizeof(IsDirtyRegionState));
+ memset((void*)_in_dirty_region_buffer, false, _max_regions * sizeof(bool));
_cur_dirty_region = 0;
}
@@ -241,12 +238,11 @@
}
void add_dirty_region(uint region) {
- if (_in_dirty_region_buffer[region] == Dirty) {
+ if (_in_dirty_region_buffer[region]) {
return;
}
- bool marked_as_dirty = Atomic::cmpxchg(Dirty, &_in_dirty_region_buffer[region], Clean) == Clean;
- if (marked_as_dirty) {
+ if (!Atomic::cmpxchg(true, &_in_dirty_region_buffer[region], false)) {
size_t allocated = Atomic::add(1u, &_cur_dirty_region) - 1;
_dirty_region_buffer[allocated] = region;
}
@@ -470,7 +466,7 @@
_g1rs(g1h->rem_set()), _update_rs_cl(update_rs_cl), _cards_scanned(0), _cards_skipped(0)
{}
- bool do_card_ptr(jbyte* card_ptr, uint worker_i) {
+ bool do_card_ptr(CardValue* card_ptr, uint worker_i) {
// The only time we care about recording cards that
// contain references that point into the collection set
// is during RSet updating within an evacuation pause.
@@ -538,7 +534,7 @@
phase_times->record_clear_ct_time((os::elapsedTime() - start) * 1000.0);
}
-inline void check_card_ptr(jbyte* card_ptr, G1CardTable* ct) {
+inline void check_card_ptr(CardTable::CardValue* card_ptr, G1CardTable* ct) {
#ifdef ASSERT
G1CollectedHeap* g1h = G1CollectedHeap::heap();
assert(g1h->is_in_exact(ct->addr_for(card_ptr)),
@@ -550,7 +546,7 @@
#endif
}
-void G1RemSet::refine_card_concurrently(jbyte* card_ptr,
+void G1RemSet::refine_card_concurrently(CardValue* card_ptr,
uint worker_i) {
assert(!_g1h->is_gc_active(), "Only call concurrently");
@@ -606,7 +602,7 @@
if (_hot_card_cache->use_cache()) {
assert(!SafepointSynchronize::is_at_safepoint(), "sanity");
- const jbyte* orig_card_ptr = card_ptr;
+ const CardValue* orig_card_ptr = card_ptr;
card_ptr = _hot_card_cache->insert(card_ptr);
if (card_ptr == NULL) {
// There was no eviction. Nothing to do.
@@ -647,7 +643,7 @@
// Okay to clean and process the card now. There are still some
// stale card cases that may be detected by iteration and dealt with
// as iteration failure.
- *const_cast<volatile jbyte*>(card_ptr) = G1CardTable::clean_card_val();
+ *const_cast<volatile CardValue*>(card_ptr) = G1CardTable::clean_card_val();
// This fence serves two purposes. First, the card must be cleaned
// before processing the contents. Second, we can't proceed with
@@ -689,7 +685,7 @@
}
}
-bool G1RemSet::refine_card_during_gc(jbyte* card_ptr,
+bool G1RemSet::refine_card_during_gc(CardValue* card_ptr,
G1ScanObjsDuringUpdateRSClosure* update_rs_cl) {
assert(_g1h->is_gc_active(), "Only call during GC");
--- a/src/hotspot/share/gc/g1/g1RemSet.hpp Tue Mar 12 09:49:10 2019 +0000
+++ b/src/hotspot/share/gc/g1/g1RemSet.hpp Sat Mar 16 21:00:45 2019 +0000
@@ -76,6 +76,8 @@
G1HotCardCache* _hot_card_cache;
public:
+
+ typedef CardTable::CardValue CardValue;
// Gives an approximation on how many threads can be expected to add records to
// a remembered set in parallel. This can be used for sizing data structures to
// decrease performance losses due to data structure sharing.
@@ -108,13 +110,13 @@
// Refine the card corresponding to "card_ptr". Safe to be called concurrently
// to the mutator.
- void refine_card_concurrently(jbyte* card_ptr,
+ void refine_card_concurrently(CardValue* card_ptr,
uint worker_i);
// Refine the card corresponding to "card_ptr", applying the given closure to
// all references found. Must only be called during gc.
// Returns whether the card has been scanned.
- bool refine_card_during_gc(jbyte* card_ptr, G1ScanObjsDuringUpdateRSClosure* update_rs_cl);
+ bool refine_card_during_gc(CardValue* card_ptr, G1ScanObjsDuringUpdateRSClosure* update_rs_cl);
// Print accumulated summary info from the start of the VM.
void print_summary_info();
--- a/src/hotspot/share/gc/parallel/parallelScavengeHeap.cpp Tue Mar 12 09:49:10 2019 +0000
+++ b/src/hotspot/share/gc/parallel/parallelScavengeHeap.cpp Sat Mar 16 21:00:45 2019 +0000
@@ -41,6 +41,7 @@
#include "gc/shared/gcHeapSummary.hpp"
#include "gc/shared/gcLocker.hpp"
#include "gc/shared/gcWhen.hpp"
+#include "gc/shared/scavengableNMethods.hpp"
#include "logging/log.hpp"
#include "memory/metaspaceCounters.hpp"
#include "oops/oop.inline.hpp"
@@ -150,6 +151,14 @@
}
+class PSIsScavengable : public BoolObjectClosure {
+ bool do_object_b(oop obj) {
+ return ParallelScavengeHeap::heap()->is_in_young(obj);
+ }
+};
+
+static PSIsScavengable _is_scavengable;
+
void ParallelScavengeHeap::post_initialize() {
CollectedHeap::post_initialize();
// Need to init the tenuring threshold
@@ -160,6 +169,8 @@
PSMarkSweepProxy::initialize();
}
PSPromotionManager::initialize();
+
+ ScavengableNMethods::initialize(&_is_scavengable);
}
void ParallelScavengeHeap::update_counters() {
@@ -532,10 +543,6 @@
return 0;
}
-size_t ParallelScavengeHeap::block_size(const HeapWord* addr) const {
- return oop(addr)->size();
-}
-
bool ParallelScavengeHeap::block_is_obj(const HeapWord* addr) const {
return block_start(addr) == addr;
}
@@ -697,16 +704,24 @@
}
#endif
-bool ParallelScavengeHeap::is_scavengable(oop obj) {
- return is_in_young(obj);
+void ParallelScavengeHeap::register_nmethod(nmethod* nm) {
+ ScavengableNMethods::register_nmethod(nm);
}
-void ParallelScavengeHeap::register_nmethod(nmethod* nm) {
- CodeCache::register_scavenge_root_nmethod(nm);
+void ParallelScavengeHeap::unregister_nmethod(nmethod* nm) {
+ ScavengableNMethods::unregister_nmethod(nm);
}
void ParallelScavengeHeap::verify_nmethod(nmethod* nm) {
- CodeCache::verify_scavenge_root_nmethod(nm);
+ ScavengableNMethods::verify_nmethod(nm);
+}
+
+void ParallelScavengeHeap::flush_nmethod(nmethod* nm) {
+ ScavengableNMethods::flush_nmethod(nm);
+}
+
+void ParallelScavengeHeap::prune_nmethods() {
+ ScavengableNMethods::prune_nmethods();
}
GrowableArray<GCMemoryManager*> ParallelScavengeHeap::memory_managers() {
--- a/src/hotspot/share/gc/parallel/parallelScavengeHeap.hpp Tue Mar 12 09:49:10 2019 +0000
+++ b/src/hotspot/share/gc/parallel/parallelScavengeHeap.hpp Sat Mar 16 21:00:45 2019 +0000
@@ -157,13 +157,12 @@
// collection.
virtual bool is_maximal_no_gc() const;
- // Return true if the reference points to an object that
- // can be moved in a partial collection. For currently implemented
- // generational collectors that means during a collection of
- // the young gen.
- virtual bool is_scavengable(oop obj);
virtual void register_nmethod(nmethod* nm);
- virtual void verify_nmethod(nmethod* nmethod);
+ virtual void unregister_nmethod(nmethod* nm);
+ virtual void verify_nmethod(nmethod* nm);
+ virtual void flush_nmethod(nmethod* nm);
+
+ void prune_nmethods();
size_t max_capacity() const;
@@ -220,7 +219,6 @@
void safe_object_iterate(ObjectClosure* cl) { object_iterate(cl); }
HeapWord* block_start(const void* addr) const;
- size_t block_size(const HeapWord* addr) const;
bool block_is_obj(const HeapWord* addr) const;
jlong millis_since_last_gc();
--- a/src/hotspot/share/gc/parallel/pcTasks.cpp Tue Mar 12 09:49:10 2019 +0000
+++ b/src/hotspot/share/gc/parallel/pcTasks.cpp Sat Mar 16 21:00:45 2019 +0000
@@ -117,7 +117,7 @@
case code_cache:
// Do not treat nmethods as strong roots for mark/sweep, since we can unload them.
- //CodeCache::scavenge_root_nmethods_do(CodeBlobToOopClosure(&mark_and_push_closure));
+ //ScavengableNMethods::scavengable_nmethods_do(CodeBlobToOopClosure(&mark_and_push_closure));
AOTLoader::oops_do(&mark_and_push_closure);
break;
--- a/src/hotspot/share/gc/parallel/psCardTable.cpp Tue Mar 12 09:49:10 2019 +0000
+++ b/src/hotspot/share/gc/parallel/psCardTable.cpp Sat Mar 16 21:00:45 2019 +0000
@@ -140,19 +140,19 @@
// It is a waste to get here if empty.
assert(sp->bottom() < sp->top(), "Should not be called if empty");
oop* sp_top = (oop*)space_top;
- jbyte* start_card = byte_for(sp->bottom());
- jbyte* end_card = byte_for(sp_top - 1) + 1;
+ CardValue* start_card = byte_for(sp->bottom());
+ CardValue* end_card = byte_for(sp_top - 1) + 1;
oop* last_scanned = NULL; // Prevent scanning objects more than once
// The width of the stripe ssize*stripe_total must be
// consistent with the number of stripes so that the complete slice
// is covered.
size_t slice_width = ssize * stripe_total;
- for (jbyte* slice = start_card; slice < end_card; slice += slice_width) {
- jbyte* worker_start_card = slice + stripe_number * ssize;
+ for (CardValue* slice = start_card; slice < end_card; slice += slice_width) {
+ CardValue* worker_start_card = slice + stripe_number * ssize;
if (worker_start_card >= end_card)
return; // We're done.
- jbyte* worker_end_card = worker_start_card + ssize;
+ CardValue* worker_end_card = worker_start_card + ssize;
if (worker_end_card > end_card)
worker_end_card = end_card;
@@ -209,13 +209,13 @@
assert(worker_start_card <= end_card, "worker start card beyond end card");
assert(worker_end_card <= end_card, "worker end card beyond end card");
- jbyte* current_card = worker_start_card;
+ CardValue* current_card = worker_start_card;
while (current_card < worker_end_card) {
// Find an unclean card.
while (current_card < worker_end_card && card_is_clean(*current_card)) {
current_card++;
}
- jbyte* first_unclean_card = current_card;
+ CardValue* first_unclean_card = current_card;
// Find the end of a run of contiguous unclean cards
while (current_card < worker_end_card && !card_is_clean(*current_card)) {
@@ -232,7 +232,7 @@
HeapWord* last_object_in_dirty_region = start_array->object_start(addr_for(current_card)-1);
size_t size_of_last_object = oop(last_object_in_dirty_region)->size();
HeapWord* end_of_last_object = last_object_in_dirty_region + size_of_last_object;
- jbyte* ending_card_of_last_object = byte_for(end_of_last_object);
+ CardValue* ending_card_of_last_object = byte_for(end_of_last_object);
assert(ending_card_of_last_object <= worker_end_card, "ending_card_of_last_object is greater than worker_end_card");
if (ending_card_of_last_object > current_card) {
// This means the object spans the next complete card.
@@ -241,7 +241,7 @@
}
}
}
- jbyte* following_clean_card = current_card;
+ CardValue* following_clean_card = current_card;
if (first_unclean_card < worker_end_card) {
oop* p = (oop*) start_array->object_start(addr_for(first_unclean_card));
@@ -342,8 +342,8 @@
}
void PSCardTable::verify_all_young_refs_precise_helper(MemRegion mr) {
- jbyte* bot = byte_for(mr.start());
- jbyte* top = byte_for(mr.end());
+ CardValue* bot = byte_for(mr.start());
+ CardValue* top = byte_for(mr.end());
while (bot <= top) {
assert(*bot == clean_card || *bot == verify_card, "Found unwanted or unknown card mark");
if (*bot == verify_card)
@@ -353,8 +353,8 @@
}
bool PSCardTable::addr_is_marked_imprecise(void *addr) {
- jbyte* p = byte_for(addr);
- jbyte val = *p;
+ CardValue* p = byte_for(addr);
+ CardValue val = *p;
if (card_is_dirty(val))
return true;
@@ -372,8 +372,8 @@
// Also includes verify_card
bool PSCardTable::addr_is_marked_precise(void *addr) {
- jbyte* p = byte_for(addr);
- jbyte val = *p;
+ CardValue* p = byte_for(addr);
+ CardValue val = *p;
if (card_is_newgen(val))
return true;
@@ -473,7 +473,7 @@
log_trace(gc, barrier)(" byte_for(start): " INTPTR_FORMAT " byte_for(last): " INTPTR_FORMAT,
p2i(byte_for(_covered[ind].start())), p2i(byte_for(_covered[ind].last())));
log_trace(gc, barrier)(" addr_for(start): " INTPTR_FORMAT " addr_for(last): " INTPTR_FORMAT,
- p2i(addr_for((jbyte*) _committed[ind].start())), p2i(addr_for((jbyte*) _committed[ind].last())));
+ p2i(addr_for((CardValue*) _committed[ind].start())), p2i(addr_for((CardValue*) _committed[ind].last())));
debug_only(verify_guard();)
}
@@ -503,7 +503,7 @@
"Starts should have proper alignment");
#endif
- jbyte* new_start = byte_for(new_region.start());
+ CardValue* new_start = byte_for(new_region.start());
// Round down because this is for the start address
HeapWord* new_start_aligned = align_down((HeapWord*)new_start, os::vm_page_size());
// The guard page is always committed and should not be committed over.
@@ -575,7 +575,7 @@
void PSCardTable::resize_update_committed_table(int changed_region,
MemRegion new_region) {
- jbyte* new_start = byte_for(new_region.start());
+ CardValue* new_start = byte_for(new_region.start());
// Set the new start of the committed region
HeapWord* new_start_aligned = align_down((HeapWord*)new_start, os::vm_page_size());
MemRegion new_committed = MemRegion(new_start_aligned,
@@ -590,13 +590,13 @@
MemRegion original_covered = _covered[changed_region];
// Initialize the card entries. Only consider the
// region covered by the card table (_whole_heap)
- jbyte* entry;
+ CardValue* entry;
if (new_region.start() < _whole_heap.start()) {
entry = byte_for(_whole_heap.start());
} else {
entry = byte_for(new_region.start());
}
- jbyte* end = byte_for(original_covered.start());
+ CardValue* end = byte_for(original_covered.start());
// If _whole_heap starts at the original covered regions start,
// this loop will not execute.
while (entry < end) { *entry++ = clean_card; }
--- a/src/hotspot/share/gc/parallel/psCardTable.hpp Tue Mar 12 09:49:10 2019 +0000
+++ b/src/hotspot/share/gc/parallel/psCardTable.hpp Sat Mar 16 21:00:45 2019 +0000
@@ -54,8 +54,8 @@
public:
PSCardTable(MemRegion whole_heap) : CardTable(whole_heap, /* scanned_concurrently */ false) {}
- static jbyte youngergen_card_val() { return youngergen_card; }
- static jbyte verify_card_val() { return verify_card; }
+ static CardValue youngergen_card_val() { return youngergen_card; }
+ static CardValue verify_card_val() { return verify_card; }
// Scavenge support
void scavenge_contents_parallel(ObjectStartArray* start_array,
@@ -68,7 +68,7 @@
bool addr_is_marked_imprecise(void *addr);
bool addr_is_marked_precise(void *addr);
- void set_card_newgen(void* addr) { jbyte* p = byte_for(addr); *p = verify_card; }
+ void set_card_newgen(void* addr) { CardValue* p = byte_for(addr); *p = verify_card; }
// Testers for entries
static bool card_is_dirty(int value) { return value == dirty_card; }
@@ -78,7 +78,7 @@
// Card marking
void inline_write_ref_field_gc(void* field, oop new_val) {
- jbyte* byte = byte_for(field);
+ CardValue* byte = byte_for(field);
*byte = youngergen_card;
}
@@ -99,7 +99,7 @@
HeapWord* lowest_prev_committed_start(int ind) const;
#ifdef ASSERT
- bool is_valid_card_address(jbyte* addr) {
+ bool is_valid_card_address(CardValue* addr) {
return (addr >= _byte_map) && (addr < _byte_map + _byte_map_size);
}
#endif // ASSERT
--- a/src/hotspot/share/gc/parallel/psGCAdaptivePolicyCounters.cpp Tue Mar 12 09:49:10 2019 +0000
+++ b/src/hotspot/share/gc/parallel/psGCAdaptivePolicyCounters.cpp Sat Mar 16 21:00:45 2019 +0000
@@ -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
@@ -118,11 +118,6 @@
_avg_base_footprint = PerfDataManager::create_variable(SUN_GC, cname,
PerfData::U_Bytes, (jlong) ps_size_policy()->avg_base_footprint()->average(), CHECK);
- cname = PerfDataManager::counter_name(name_space(), "gcTimeLimitExceeded");
- _gc_overhead_limit_exceeded_counter =
- PerfDataManager::create_variable(SUN_GC, cname,
- PerfData::U_Events, ps_size_policy()->gc_overhead_limit_exceeded(), CHECK);
-
cname = PerfDataManager::counter_name(name_space(), "liveAtLastFullGc");
_live_at_last_full_gc_counter =
PerfDataManager::create_variable(SUN_GC, cname,
--- a/src/hotspot/share/gc/parallel/psGCAdaptivePolicyCounters.hpp Tue Mar 12 09:49:10 2019 +0000
+++ b/src/hotspot/share/gc/parallel/psGCAdaptivePolicyCounters.hpp Sat Mar 16 21:00:45 2019 +0000
@@ -51,7 +51,6 @@
PerfVariable* _live_space;
PerfVariable* _free_space;
PerfVariable* _avg_base_footprint;
- PerfVariable* _gc_overhead_limit_exceeded_counter;
PerfVariable* _live_at_last_full_gc_counter;
PerfVariable* _old_capacity;
PerfVariable* _boundary_moved;
@@ -177,7 +176,7 @@
);
}
inline void update_gc_overhead_limit_exceeded_counter() {
- _gc_overhead_limit_exceeded_counter->set_value(
+ gc_overhead_limit_exceeded_counter()->set_value(
(jlong) ps_size_policy()->gc_overhead_limit_exceeded());
}
inline void update_live_at_last_full_gc_counter() {
--- a/src/hotspot/share/gc/parallel/psMarkSweep.cpp Tue Mar 12 09:49:10 2019 +0000
+++ b/src/hotspot/share/gc/parallel/psMarkSweep.cpp Sat Mar 16 21:00:45 2019 +0000
@@ -187,7 +187,6 @@
// Let the size policy know we're starting
size_policy->major_collection_begin();
- CodeCache::gc_prologue();
BiasedLocking::preserve_marks();
// Capture metadata size before collection for sizing.
@@ -255,7 +254,7 @@
MetaspaceUtils::verify_metrics();
BiasedLocking::restore_marks();
- CodeCache::gc_epilogue();
+ heap->prune_nmethods();
JvmtiExport::gc_epilogue();
#if COMPILER2_OR_JVMCI
@@ -316,8 +315,7 @@
max_eden_size,
true /* full gc*/);
- size_policy->check_gc_overhead_limit(young_live,
- eden_live,
+ size_policy->check_gc_overhead_limit(eden_live,
max_old_gen_size,
max_eden_size,
true /* full gc*/,
@@ -525,7 +523,7 @@
SystemDictionary::oops_do(mark_and_push_closure());
ClassLoaderDataGraph::always_strong_cld_do(follow_cld_closure());
// Do not treat nmethods as strong roots for mark/sweep, since we can unload them.
- //CodeCache::scavenge_root_nmethods_do(CodeBlobToOopClosure(mark_and_push_closure()));
+ //ScavengableNMethods::scavengable_nmethods_do(CodeBlobToOopClosure(mark_and_push_closure()));
AOTLoader::oops_do(mark_and_push_closure());
}
--- a/src/hotspot/share/gc/parallel/psParallelCompact.cpp Tue Mar 12 09:49:10 2019 +0000
+++ b/src/hotspot/share/gc/parallel/psParallelCompact.cpp Sat Mar 16 21:00:45 2019 +0000
@@ -1061,7 +1061,7 @@
ClassLoaderDataGraph::purge();
MetaspaceUtils::verify_metrics();
- CodeCache::gc_epilogue();
+ heap->prune_nmethods();
JvmtiExport::gc_epilogue();
#if COMPILER2_OR_JVMCI
@@ -1807,8 +1807,6 @@
// Let the size policy know we're starting
size_policy->major_collection_begin();
- CodeCache::gc_prologue();
-
#if COMPILER2_OR_JVMCI
DerivedPointerTable::clear();
#endif
@@ -1889,8 +1887,7 @@
max_eden_size,
true /* full gc*/);
- size_policy->check_gc_overhead_limit(young_live,
- eden_live,
+ size_policy->check_gc_overhead_limit(eden_live,
max_old_gen_size,
max_eden_size,
true /* full gc*/,
--- a/src/hotspot/share/gc/parallel/psScavenge.cpp Tue Mar 12 09:49:10 2019 +0000
+++ b/src/hotspot/share/gc/parallel/psScavenge.cpp Sat Mar 16 21:00:45 2019 +0000
@@ -537,8 +537,7 @@
max_eden_size,
false /* not full gc*/);
- size_policy->check_gc_overhead_limit(young_live,
- eden_live,
+ size_policy->check_gc_overhead_limit(eden_live,
max_old_gen_size,
max_eden_size,
false /* not full gc*/,
--- a/src/hotspot/share/gc/parallel/psTasks.cpp Tue Mar 12 09:49:10 2019 +0000
+++ b/src/hotspot/share/gc/parallel/psTasks.cpp Sat Mar 16 21:00:45 2019 +0000
@@ -28,12 +28,14 @@
#include "classfile/systemDictionary.hpp"
#include "code/codeCache.hpp"
#include "gc/parallel/gcTaskManager.hpp"
+#include "gc/parallel/parallelScavengeHeap.inline.hpp"
#include "gc/parallel/psCardTable.hpp"
#include "gc/parallel/psClosure.inline.hpp"
#include "gc/parallel/psPromotionManager.hpp"
#include "gc/parallel/psPromotionManager.inline.hpp"
#include "gc/parallel/psScavenge.inline.hpp"
#include "gc/parallel/psTasks.hpp"
+#include "gc/shared/scavengableNMethods.hpp"
#include "gc/shared/taskqueue.inline.hpp"
#include "memory/iterator.hpp"
#include "memory/resourceArea.hpp"
@@ -97,7 +99,7 @@
case code_cache:
{
MarkingCodeBlobClosure each_scavengable_code_blob(&roots_to_old_closure, CodeBlobToOopClosure::FixRelocations);
- CodeCache::scavenge_root_nmethods_do(&each_scavengable_code_blob);
+ ScavengableNMethods::scavengable_nmethods_do(&each_scavengable_code_blob);
AOTLoader::oops_do(&roots_closure);
}
break;
--- a/src/hotspot/share/gc/serial/genMarkSweep.cpp Tue Mar 12 09:49:10 2019 +0000
+++ b/src/hotspot/share/gc/serial/genMarkSweep.cpp Sat Mar 16 21:00:45 2019 +0000
@@ -75,10 +75,6 @@
gch->trace_heap_before_gc(_gc_tracer);
- // When collecting the permanent generation Method*s may be moving,
- // so we either have to flush all bcp data or convert it into bci.
- CodeCache::gc_prologue();
-
// Increment the invocation count
_total_invocations++;
@@ -128,7 +124,7 @@
rs->invalidate_or_clear(old_gen);
}
- CodeCache::gc_epilogue();
+ gch->prune_nmethods();
JvmtiExport::gc_epilogue();
// refs processing: clean slate
--- a/src/hotspot/share/gc/shared/adaptiveSizePolicy.cpp Tue Mar 12 09:49:10 2019 +0000
+++ b/src/hotspot/share/gc/shared/adaptiveSizePolicy.cpp Sat Mar 16 21:00:45 2019 +0000
@@ -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
@@ -26,7 +26,6 @@
#include "gc/shared/adaptiveSizePolicy.hpp"
#include "gc/shared/gcCause.hpp"
#include "gc/shared/gcUtil.inline.hpp"
-#include "gc/shared/softRefPolicy.hpp"
#include "logging/log.hpp"
#include "runtime/timer.hpp"
@@ -49,16 +48,11 @@
_eden_size(init_eden_size),
_promo_size(init_promo_size),
_survivor_size(init_survivor_size),
- _gc_overhead_limit_exceeded(false),
- _print_gc_overhead_limit_would_be_exceeded(false),
- _gc_overhead_limit_count(0),
_latest_minor_mutator_interval_seconds(0),
_threshold_tolerance_percent(1.0 + ThresholdTolerance/100.0),
_gc_pause_goal_sec(gc_pause_goal_sec),
_young_gen_change_for_minor_throughput(0),
_old_gen_change_for_major_throughput(0) {
- assert(AdaptiveSizePolicyGCTimeLimitThreshold > 0,
- "No opportunity to clear SoftReferences before GC overhead limit");
_avg_minor_pause =
new AdaptivePaddedAverage(AdaptiveTimeWeight, PausePadding);
_avg_minor_interval = new AdaptiveWeightedAverage(AdaptiveTimeWeight);
@@ -277,8 +271,90 @@
set_decide_at_full_gc(0);
}
+class AdaptiveSizePolicyTimeOverheadTester: public GCOverheadTester {
+ double _gc_cost;
+
+ public:
+ AdaptiveSizePolicyTimeOverheadTester(double gc_cost) : _gc_cost(gc_cost) {}
+
+ bool is_exceeded() {
+ return _gc_cost > (GCTimeLimit / 100.0);
+ }
+};
+
+class AdaptiveSizePolicySpaceOverheadTester: public GCOverheadTester {
+ size_t _eden_live;
+ size_t _max_old_gen_size;
+ size_t _max_eden_size;
+ size_t _promo_size;
+ double _avg_eden_live;
+ double _avg_old_live;
+
+ public:
+ AdaptiveSizePolicySpaceOverheadTester(size_t eden_live,
+ size_t max_old_gen_size,
+ size_t max_eden_size,
+ size_t promo_size,
+ double avg_eden_live,
+ double avg_old_live) :
+ _eden_live(eden_live),
+ _max_old_gen_size(max_old_gen_size),
+ _max_eden_size(max_eden_size),
+ _promo_size(promo_size),
+ _avg_eden_live(avg_eden_live),
+ _avg_old_live(avg_old_live) {}
+
+ bool is_exceeded() {
+ // _max_eden_size is the upper limit on the size of eden based on
+ // the maximum size of the young generation and the sizes
+ // of the survivor space.
+ // The question being asked is whether the space being recovered by
+ // a collection is low.
+ // free_in_eden is the free space in eden after a collection and
+ // free_in_old_gen is the free space in the old generation after
+ // a collection.
+ //
+ // Use the minimum of the current value of the live in eden
+ // or the average of the live in eden.
+ // If the current value drops quickly, that should be taken
+ // into account (i.e., don't trigger if the amount of free
+ // space has suddenly jumped up). If the current is much
+ // higher than the average, use the average since it represents
+ // the longer term behavior.
+ const size_t live_in_eden =
+ MIN2(_eden_live, (size_t)_avg_eden_live);
+ const size_t free_in_eden = _max_eden_size > live_in_eden ?
+ _max_eden_size - live_in_eden : 0;
+ const size_t free_in_old_gen = (size_t)(_max_old_gen_size - _avg_old_live);
+ const size_t total_free_limit = free_in_old_gen + free_in_eden;
+ const size_t total_mem = _max_old_gen_size + _max_eden_size;
+ const double free_limit_ratio = GCHeapFreeLimit / 100.0;
+ const double mem_free_limit = total_mem * free_limit_ratio;
+ const double mem_free_old_limit = _max_old_gen_size * free_limit_ratio;
+ const double mem_free_eden_limit = _max_eden_size * free_limit_ratio;
+ size_t promo_limit = (size_t)(_max_old_gen_size - _avg_old_live);
+ // But don't force a promo size below the current promo size. Otherwise,
+ // the promo size will shrink for no good reason.
+ promo_limit = MAX2(promo_limit, _promo_size);
+
+ log_trace(gc, ergo)(
+ "AdaptiveSizePolicySpaceOverheadTester::is_exceeded:"
+ " promo_limit: " SIZE_FORMAT
+ " max_eden_size: " SIZE_FORMAT
+ " total_free_limit: " SIZE_FORMAT
+ " max_old_gen_size: " SIZE_FORMAT
+ " max_eden_size: " SIZE_FORMAT
+ " mem_free_limit: " SIZE_FORMAT,
+ promo_limit, _max_eden_size, total_free_limit,
+ _max_old_gen_size, _max_eden_size,
+ (size_t)mem_free_limit);
+
+ return free_in_old_gen < (size_t)mem_free_old_limit &&
+ free_in_eden < (size_t)mem_free_eden_limit;
+ }
+};
+
void AdaptiveSizePolicy::check_gc_overhead_limit(
- size_t young_live,
size_t eden_live,
size_t max_old_gen_size,
size_t max_eden_size,
@@ -286,128 +362,18 @@
GCCause::Cause gc_cause,
SoftRefPolicy* soft_ref_policy) {
- // Ignore explicit GC's. Exiting here does not set the flag and
- // does not reset the count. Updating of the averages for system
- // GC's is still controlled by UseAdaptiveSizePolicyWithSystemGC.
- if (GCCause::is_user_requested_gc(gc_cause) ||
- GCCause::is_serviceability_requested_gc(gc_cause)) {
- return;
- }
- // eden_limit is the upper limit on the size of eden based on
- // the maximum size of the young generation and the sizes
- // of the survivor space.
- // The question being asked is whether the gc costs are high
- // and the space being recovered by a collection is low.
- // free_in_young_gen is the free space in the young generation
- // after a collection and promo_live is the free space in the old
- // generation after a collection.
- //
- // Use the minimum of the current value of the live in the
- // young gen or the average of the live in the young gen.
- // If the current value drops quickly, that should be taken
- // into account (i.e., don't trigger if the amount of free
- // space has suddenly jumped up). If the current is much
- // higher than the average, use the average since it represents
- // the longer term behavior.
- const size_t live_in_eden =
- MIN2(eden_live, (size_t) avg_eden_live()->average());
- const size_t free_in_eden = max_eden_size > live_in_eden ?
- max_eden_size - live_in_eden : 0;
- const size_t free_in_old_gen = (size_t)(max_old_gen_size - avg_old_live()->average());
- const size_t total_free_limit = free_in_old_gen + free_in_eden;
- const size_t total_mem = max_old_gen_size + max_eden_size;
- const double mem_free_limit = total_mem * (GCHeapFreeLimit/100.0);
- const double mem_free_old_limit = max_old_gen_size * (GCHeapFreeLimit/100.0);
- const double mem_free_eden_limit = max_eden_size * (GCHeapFreeLimit/100.0);
- const double gc_cost_limit = GCTimeLimit/100.0;
- size_t promo_limit = (size_t)(max_old_gen_size - avg_old_live()->average());
- // But don't force a promo size below the current promo size. Otherwise,
- // the promo size will shrink for no good reason.
- promo_limit = MAX2(promo_limit, _promo_size);
-
-
- log_trace(gc, ergo)(
- "PSAdaptiveSizePolicy::check_gc_overhead_limit:"
- " promo_limit: " SIZE_FORMAT
- " max_eden_size: " SIZE_FORMAT
- " total_free_limit: " SIZE_FORMAT
- " max_old_gen_size: " SIZE_FORMAT
- " max_eden_size: " SIZE_FORMAT
- " mem_free_limit: " SIZE_FORMAT,
- promo_limit, max_eden_size, total_free_limit,
- max_old_gen_size, max_eden_size,
- (size_t) mem_free_limit);
-
- bool print_gc_overhead_limit_would_be_exceeded = false;
- if (is_full_gc) {
- if (gc_cost() > gc_cost_limit &&
- free_in_old_gen < (size_t) mem_free_old_limit &&
- free_in_eden < (size_t) mem_free_eden_limit) {
- // Collections, on average, are taking too much time, and
- // gc_cost() > gc_cost_limit
- // we have too little space available after a full gc.
- // total_free_limit < mem_free_limit
- // where
- // total_free_limit is the free space available in
- // both generations
- // total_mem is the total space available for allocation
- // in both generations (survivor spaces are not included
- // just as they are not included in eden_limit).
- // mem_free_limit is a fraction of total_mem judged to be an
- // acceptable amount that is still unused.
- // The heap can ask for the value of this variable when deciding
- // whether to thrown an OutOfMemory error.
- // Note that the gc time limit test only works for the collections
- // of the young gen + tenured gen and not for collections of the
- // permanent gen. That is because the calculation of the space
- // freed by the collection is the free space in the young gen +
- // tenured gen.
- // At this point the GC overhead limit is being exceeded.
- inc_gc_overhead_limit_count();
- if (UseGCOverheadLimit) {
- if (gc_overhead_limit_count() >=
- AdaptiveSizePolicyGCTimeLimitThreshold){
- // All conditions have been met for throwing an out-of-memory
- set_gc_overhead_limit_exceeded(true);
- // Avoid consecutive OOM due to the gc time limit by resetting
- // the counter.
- reset_gc_overhead_limit_count();
- } else {
- // The required consecutive collections which exceed the
- // GC time limit may or may not have been reached. We
- // are approaching that condition and so as not to
- // throw an out-of-memory before all SoftRef's have been
- // cleared, set _should_clear_all_soft_refs in CollectorPolicy.
- // The clearing will be done on the next GC.
- bool near_limit = gc_overhead_limit_near();
- if (near_limit) {
- soft_ref_policy->set_should_clear_all_soft_refs(true);
- log_trace(gc, ergo)("Nearing GC overhead limit, will be clearing all SoftReference");
- }
- }
- }
- // Set this even when the overhead limit will not
- // cause an out-of-memory. Diagnostic message indicating
- // that the overhead limit is being exceeded is sometimes
- // printed.
- print_gc_overhead_limit_would_be_exceeded = true;
-
- } else {
- // Did not exceed overhead limits
- reset_gc_overhead_limit_count();
- }
- }
-
- if (UseGCOverheadLimit) {
- if (gc_overhead_limit_exceeded()) {
- log_trace(gc, ergo)("GC is exceeding overhead limit of " UINTX_FORMAT "%%", GCTimeLimit);
- reset_gc_overhead_limit_count();
- } else if (print_gc_overhead_limit_would_be_exceeded) {
- assert(gc_overhead_limit_count() > 0, "Should not be printing");
- log_trace(gc, ergo)("GC would exceed overhead limit of " UINTX_FORMAT "%% %d consecutive time(s)",
- GCTimeLimit, gc_overhead_limit_count());
- }
- }
+ AdaptiveSizePolicyTimeOverheadTester time_overhead(gc_cost());
+ AdaptiveSizePolicySpaceOverheadTester space_overhead(eden_live,
+ max_old_gen_size,
+ max_eden_size,
+ _promo_size,
+ avg_eden_live()->average(),
+ avg_old_live()->average());
+ _overhead_checker.check_gc_overhead_limit(&time_overhead,
+ &space_overhead,
+ is_full_gc,
+ gc_cause,
+ soft_ref_policy);
}
// Printing
--- a/src/hotspot/share/gc/shared/adaptiveSizePolicy.hpp Tue Mar 12 09:49:10 2019 +0000
+++ b/src/hotspot/share/gc/shared/adaptiveSizePolicy.hpp Sat Mar 16 21:00:45 2019 +0000
@@ -26,6 +26,7 @@
#define SHARE_GC_SHARED_ADAPTIVESIZEPOLICY_HPP
#include "gc/shared/gcCause.hpp"
+#include "gc/shared/gcOverheadChecker.hpp"
#include "gc/shared/gcUtil.hpp"
#include "memory/allocation.hpp"
@@ -34,7 +35,6 @@
// Forward decls
class elapsedTimer;
-class SoftRefPolicy;
class AdaptiveSizePolicy : public CHeapObj<mtGC> {
friend class GCAdaptivePolicyCounters;
@@ -81,18 +81,8 @@
size_t _survivor_size; // calculated survivor size in bytes
- // This is a hint for the heap: we've detected that GC times
- // are taking longer than GCTimeLimit allows.
- bool _gc_overhead_limit_exceeded;
- // Use for diagnostics only. If UseGCOverheadLimit is false,
- // this variable is still set.
- bool _print_gc_overhead_limit_would_be_exceeded;
- // Count of consecutive GC that have exceeded the
- // GC time limit criterion
- uint _gc_overhead_limit_count;
- // This flag signals that GCTimeLimit is being exceeded
- // but may not have done so for the required number of consecutive
- // collections
+ // Support for UseGCOverheadLimit
+ GCOverheadChecker _overhead_checker;
// Minor collection timers used to determine both
// pause and interval times for collections
@@ -412,26 +402,20 @@
return _survivor_size;
}
- // This is a hint for the heap: we've detected that gc times
- // are taking longer than GCTimeLimit allows.
- // Most heaps will choose to throw an OutOfMemoryError when
- // this occurs but it is up to the heap to request this information
- // of the policy
bool gc_overhead_limit_exceeded() {
- return _gc_overhead_limit_exceeded;
+ return _overhead_checker.gc_overhead_limit_exceeded();
}
void set_gc_overhead_limit_exceeded(bool v) {
- _gc_overhead_limit_exceeded = v;
+ _overhead_checker.set_gc_overhead_limit_exceeded(v);
}
- // Tests conditions indicate the GC overhead limit is being approached.
bool gc_overhead_limit_near() {
- return gc_overhead_limit_count() >=
- (AdaptiveSizePolicyGCTimeLimitThreshold - 1);
+ return _overhead_checker.gc_overhead_limit_near();
}
- uint gc_overhead_limit_count() { return _gc_overhead_limit_count; }
- void reset_gc_overhead_limit_count() { _gc_overhead_limit_count = 0; }
- void inc_gc_overhead_limit_count() { _gc_overhead_limit_count++; }
+
+ void reset_gc_overhead_limit_count() {
+ _overhead_checker.reset_gc_overhead_limit_count();
+ }
// accessors for flags recording the decisions to resize the
// generations to meet the pause goal.
@@ -448,8 +432,7 @@
// Check the conditions for an out-of-memory due to excessive GC time.
// Set _gc_overhead_limit_exceeded if all the conditions have been met.
- void check_gc_overhead_limit(size_t young_live,
- size_t eden_live,
+ void check_gc_overhead_limit(size_t eden_live,
size_t max_old_gen_size,
size_t max_eden_size,
bool is_full_gc,
--- a/src/hotspot/share/gc/shared/c1/cardTableBarrierSetC1.cpp Tue Mar 12 09:49:10 2019 +0000
+++ b/src/hotspot/share/gc/shared/c1/cardTableBarrierSetC1.cpp Sat Mar 16 21:00:45 2019 +0000
@@ -45,7 +45,6 @@
BarrierSet* bs = BarrierSet::barrier_set();
CardTableBarrierSet* ctbs = barrier_set_cast<CardTableBarrierSet>(bs);
CardTable* ct = ctbs->card_table();
- assert(sizeof(*(ct->byte_map_base())) == sizeof(jbyte), "adjust this code");
LIR_Const* card_table_base = new LIR_Const(ct->byte_map_base());
if (addr->is_address()) {
LIR_Address* address = addr->as_address_ptr();
--- a/src/hotspot/share/gc/shared/c2/barrierSetC2.hpp Tue Mar 12 09:49:10 2019 +0000
+++ b/src/hotspot/share/gc/shared/c2/barrierSetC2.hpp Sat Mar 16 21:00:45 2019 +0000
@@ -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
@@ -51,7 +51,7 @@
// This denotes that the access reads state.
const DecoratorSet C2_READ_ACCESS = DECORATOR_LAST << 8;
// A nearby allocation?
-const DecoratorSet C2_TIGHLY_COUPLED_ALLOC = DECORATOR_LAST << 9;
+const DecoratorSet C2_TIGHTLY_COUPLED_ALLOC = DECORATOR_LAST << 9;
// Loads and stores from an arraycopy being optimized
const DecoratorSet C2_ARRAY_COPY = DECORATOR_LAST << 10;
--- a/src/hotspot/share/gc/shared/c2/cardTableBarrierSetC2.cpp Tue Mar 12 09:49:10 2019 +0000
+++ b/src/hotspot/share/gc/shared/c2/cardTableBarrierSetC2.cpp Sat Mar 16 21:00:45 2019 +0000
@@ -37,7 +37,7 @@
Node* CardTableBarrierSetC2::byte_map_base_node(GraphKit* kit) const {
// Get base of card map
- jbyte* card_table_base = ci_card_table_address();
+ CardTable::CardValue* card_table_base = ci_card_table_address();
if (card_table_base != NULL) {
return kit->makecon(TypeRawPtr::make((address)card_table_base));
} else {
--- a/src/hotspot/share/gc/shared/c2/modRefBarrierSetC2.cpp Tue Mar 12 09:49:10 2019 +0000
+++ b/src/hotspot/share/gc/shared/c2/modRefBarrierSetC2.cpp Sat Mar 16 21:00:45 2019 +0000
@@ -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
@@ -40,9 +40,9 @@
bool anonymous = (decorators & ON_UNKNOWN_OOP_REF) != 0;
bool in_heap = (decorators & IN_HEAP) != 0;
bool use_precise = is_array || anonymous;
- bool tighly_coupled_alloc = (decorators & C2_TIGHLY_COUPLED_ALLOC) != 0;
+ bool tightly_coupled_alloc = (decorators & C2_TIGHTLY_COUPLED_ALLOC) != 0;
- if (!access.is_oop() || tighly_coupled_alloc || (!in_heap && !anonymous)) {
+ if (!access.is_oop() || tightly_coupled_alloc || (!in_heap && !anonymous)) {
return BarrierSetC2::store_at_resolved(access, val);
}
--- a/src/hotspot/share/gc/shared/cardTable.cpp Tue Mar 12 09:49:10 2019 +0000
+++ b/src/hotspot/share/gc/shared/cardTable.cpp Sat Mar 16 21:00:45 2019 +0000
@@ -109,12 +109,12 @@
// then add it to _byte_map_base, i.e.
//
// _byte_map = _byte_map_base + (uintptr_t(low_bound) >> card_shift)
- _byte_map = (jbyte*) heap_rs.base();
+ _byte_map = (CardValue*) heap_rs.base();
_byte_map_base = _byte_map - (uintptr_t(low_bound) >> card_shift);
assert(byte_for(low_bound) == &_byte_map[0], "Checking start of map");
assert(byte_for(high_bound-1) <= &_byte_map[_last_valid_index], "Checking end of map");
- jbyte* guard_card = &_byte_map[_guard_index];
+ CardValue* guard_card = &_byte_map[_guard_index];
HeapWord* guard_page = align_down((HeapWord*)guard_card, _page_size);
_guard_region = MemRegion(guard_page, _page_size);
os::commit_memory_or_exit((char*)guard_page, _page_size, _page_size,
@@ -145,7 +145,7 @@
_cur_covered_regions++;
_covered[res].set_start(base);
_covered[res].set_word_size(0);
- jbyte* ct_start = byte_for(base);
+ CardValue* ct_start = byte_for(base);
HeapWord* ct_start_aligned = align_down((HeapWord*)ct_start, _page_size);
_committed[res].set_start(ct_start_aligned);
_committed[res].set_word_size(0);
@@ -302,7 +302,7 @@
#endif
// The default of 0 is not necessarily clean cards.
- jbyte* entry;
+ CardValue* entry;
if (old_region.last() < _whole_heap.start()) {
entry = byte_for(_whole_heap.start());
} else {
@@ -312,8 +312,8 @@
"The guard card will be overwritten");
// This line commented out cleans the newly expanded region and
// not the aligned up expanded region.
- // jbyte* const end = byte_after(new_region.last());
- jbyte* const end = (jbyte*) new_end_for_commit;
+ // CardValue* const end = byte_after(new_region.last());
+ CardValue* const end = (CardValue*) new_end_for_commit;
assert((end >= byte_after(new_region.last())) || collided || guarded,
"Expect to be beyond new region unless impacting another region");
// do nothing if we resized downward.
@@ -330,7 +330,7 @@
}
#endif
if (entry < end) {
- memset(entry, clean_card, pointer_delta(end, entry, sizeof(jbyte)));
+ memset(entry, clean_card, pointer_delta(end, entry, sizeof(CardValue)));
}
}
// In any case, the covered size changes.
@@ -344,7 +344,7 @@
log_trace(gc, barrier)(" byte_for(start): " INTPTR_FORMAT " byte_for(last): " INTPTR_FORMAT,
p2i(byte_for(_covered[ind].start())), p2i(byte_for(_covered[ind].last())));
log_trace(gc, barrier)(" addr_for(start): " INTPTR_FORMAT " addr_for(last): " INTPTR_FORMAT,
- p2i(addr_for((jbyte*) _committed[ind].start())), p2i(addr_for((jbyte*) _committed[ind].last())));
+ p2i(addr_for((CardValue*) _committed[ind].start())), p2i(addr_for((CardValue*) _committed[ind].last())));
// Touch the last card of the covered region to show that it
// is committed (or SEGV).
@@ -357,8 +357,8 @@
void CardTable::dirty_MemRegion(MemRegion mr) {
assert(align_down(mr.start(), HeapWordSize) == mr.start(), "Unaligned start");
assert(align_up (mr.end(), HeapWordSize) == mr.end(), "Unaligned end" );
- jbyte* cur = byte_for(mr.start());
- jbyte* last = byte_after(mr.last());
+ CardValue* cur = byte_for(mr.start());
+ CardValue* last = byte_after(mr.last());
while (cur < last) {
*cur = dirty_card;
cur++;
@@ -368,15 +368,15 @@
void CardTable::clear_MemRegion(MemRegion mr) {
// Be conservative: only clean cards entirely contained within the
// region.
- jbyte* cur;
+ CardValue* cur;
if (mr.start() == _whole_heap.start()) {
cur = byte_for(mr.start());
} else {
assert(mr.start() > _whole_heap.start(), "mr is not covered.");
cur = byte_after(mr.start() - 1);
}
- jbyte* last = byte_after(mr.last());
- memset(cur, clean_card, pointer_delta(last, cur, sizeof(jbyte)));
+ CardValue* last = byte_after(mr.last());
+ memset(cur, clean_card, pointer_delta(last, cur, sizeof(CardValue)));
}
void CardTable::clear(MemRegion mr) {
@@ -387,8 +387,8 @@
}
void CardTable::dirty(MemRegion mr) {
- jbyte* first = byte_for(mr.start());
- jbyte* last = byte_after(mr.last());
+ CardValue* first = byte_for(mr.start());
+ CardValue* last = byte_after(mr.last());
memset(first, dirty_card, last-first);
}
@@ -398,7 +398,7 @@
for (int i = 0; i < _cur_covered_regions; i++) {
MemRegion mri = mr.intersection(_covered[i]);
if (!mri.is_empty()) {
- jbyte *cur_entry, *next_entry, *limit;
+ CardValue *cur_entry, *next_entry, *limit;
for (cur_entry = byte_for(mri.start()), limit = byte_for(mri.last());
cur_entry <= limit;
cur_entry = next_entry) {
@@ -424,7 +424,7 @@
for (int i = 0; i < _cur_covered_regions; i++) {
MemRegion mri = mr.intersection(_covered[i]);
if (!mri.is_empty()) {
- jbyte* cur_entry, *next_entry, *limit;
+ CardValue* cur_entry, *next_entry, *limit;
for (cur_entry = byte_for(mri.start()), limit = byte_for(mri.last());
cur_entry <= limit;
cur_entry = next_entry) {
@@ -474,13 +474,12 @@
}
#ifndef PRODUCT
-void CardTable::verify_region(MemRegion mr,
- jbyte val, bool val_equals) {
- jbyte* start = byte_for(mr.start());
- jbyte* end = byte_for(mr.last());
+void CardTable::verify_region(MemRegion mr, CardValue val, bool val_equals) {
+ CardValue* start = byte_for(mr.start());
+ CardValue* end = byte_for(mr.last());
bool failures = false;
- for (jbyte* curr = start; curr <= end; ++curr) {
- jbyte curr_val = *curr;
+ for (CardValue* curr = start; curr <= end; ++curr) {
+ CardValue curr_val = *curr;
bool failed = (val_equals) ? (curr_val != val) : (curr_val == val);
if (failed) {
if (!failures) {
--- a/src/hotspot/share/gc/shared/cardTable.hpp Tue Mar 12 09:49:10 2019 +0000
+++ b/src/hotspot/share/gc/shared/cardTable.hpp Sat Mar 16 21:00:45 2019 +0000
@@ -32,6 +32,14 @@
class CardTable: public CHeapObj<mtGC> {
friend class VMStructs;
+public:
+ typedef uint8_t CardValue;
+
+ // All code generators assume that the size of a card table entry is one byte.
+ // They need to be updated to reflect any change to this.
+ // This code can typically be found by searching for the byte_map_base() method.
+ STATIC_ASSERT(sizeof(CardValue) == 1);
+
protected:
// The declaration order of these const fields is important; see the
// constructor before changing.
@@ -43,8 +51,8 @@
size_t _last_valid_index; // index of the last valid element
const size_t _page_size; // page size used when mapping _byte_map
size_t _byte_map_size; // in bytes
- jbyte* _byte_map; // the card marking array
- jbyte* _byte_map_base;
+ CardValue* _byte_map; // the card marking array
+ CardValue* _byte_map_base;
int _cur_covered_regions;
@@ -94,7 +102,7 @@
static const int _max_covered_regions = 2;
enum CardValues {
- clean_card = -1,
+ clean_card = (CardValue)-1,
// The mask contains zeros in places for all other values.
clean_card_mask = clean_card - 31,
@@ -145,17 +153,17 @@
// Return true if "p" is at the start of a card.
bool is_card_aligned(HeapWord* p) {
- jbyte* pcard = byte_for(p);
+ CardValue* pcard = byte_for(p);
return (addr_for(pcard) == p);
}
// Mapping from address to card marking array entry
- jbyte* byte_for(const void* p) const {
+ CardValue* byte_for(const void* p) const {
assert(_whole_heap.contains(p),
"Attempt to access p = " PTR_FORMAT " out of bounds of "
" card marking array's _whole_heap = [" PTR_FORMAT "," PTR_FORMAT ")",
p2i(p), p2i(_whole_heap.start()), p2i(_whole_heap.end()));
- jbyte* result = &_byte_map_base[uintptr_t(p) >> card_shift];
+ CardValue* result = &_byte_map_base[uintptr_t(p) >> card_shift];
assert(result >= _byte_map && result < _byte_map + _byte_map_size,
"out of bounds accessor for card marking array");
return result;
@@ -164,7 +172,7 @@
// The card table byte one after the card marking array
// entry for argument address. Typically used for higher bounds
// for loops iterating through the card table.
- jbyte* byte_after(const void* p) const {
+ CardValue* byte_after(const void* p) const {
return byte_for(p) + 1;
}
@@ -173,20 +181,20 @@
void dirty(MemRegion mr);
// Provide read-only access to the card table array.
- const jbyte* byte_for_const(const void* p) const {
+ const CardValue* byte_for_const(const void* p) const {
return byte_for(p);
}
- const jbyte* byte_after_const(const void* p) const {
+ const CardValue* byte_after_const(const void* p) const {
return byte_after(p);
}
// Mapping from card marking array entry to address of first word
- HeapWord* addr_for(const jbyte* p) const {
+ HeapWord* addr_for(const CardValue* p) const {
assert(p >= _byte_map && p < _byte_map + _byte_map_size,
"out of bounds access to card marking array. p: " PTR_FORMAT
" _byte_map: " PTR_FORMAT " _byte_map + _byte_map_size: " PTR_FORMAT,
p2i(p), p2i(_byte_map), p2i(_byte_map + _byte_map_size));
- size_t delta = pointer_delta(p, _byte_map_base, sizeof(jbyte));
+ size_t delta = pointer_delta(p, _byte_map_base, sizeof(CardValue));
HeapWord* result = (HeapWord*) (delta << card_shift);
assert(_whole_heap.contains(result),
"Returning result = " PTR_FORMAT " out of bounds of "
@@ -204,7 +212,7 @@
return byte_for(p) - _byte_map;
}
- const jbyte* byte_for_index(const size_t card_index) const {
+ CardValue* byte_for_index(const size_t card_index) const {
return _byte_map + card_index;
}
@@ -233,19 +241,19 @@
card_size_in_words = card_size / sizeof(HeapWord)
};
- static jbyte clean_card_val() { return clean_card; }
- static jbyte clean_card_mask_val() { return clean_card_mask; }
- static jbyte dirty_card_val() { return dirty_card; }
- static jbyte claimed_card_val() { return claimed_card; }
- static jbyte precleaned_card_val() { return precleaned_card; }
- static jbyte deferred_card_val() { return deferred_card; }
+ static CardValue clean_card_val() { return clean_card; }
+ static CardValue clean_card_mask_val() { return clean_card_mask; }
+ static CardValue dirty_card_val() { return dirty_card; }
+ static CardValue claimed_card_val() { return claimed_card; }
+ static CardValue precleaned_card_val() { return precleaned_card; }
+ static CardValue deferred_card_val() { return deferred_card; }
static intptr_t clean_card_row_val() { return clean_card_row; }
// Card marking array base (adjusted for heap low boundary)
// This would be the 0th element of _byte_map, if the heap started at 0x0.
// But since the heap starts at some higher address, this points to somewhere
// before the beginning of the actual _byte_map.
- jbyte* byte_map_base() const { return _byte_map_base; }
+ CardValue* byte_map_base() const { return _byte_map_base; }
bool scanned_concurrently() const { return _scanned_concurrently; }
virtual bool is_in_young(oop obj) const = 0;
@@ -258,7 +266,7 @@
// val_equals -> it will check that all cards covered by mr equal val
// !val_equals -> it will check that all cards covered by mr do not equal val
- void verify_region(MemRegion mr, jbyte val, bool val_equals) PRODUCT_RETURN;
+ void verify_region(MemRegion mr, CardValue val, bool val_equals) PRODUCT_RETURN;
void verify_not_dirty_region(MemRegion mr) PRODUCT_RETURN;
void verify_dirty_region(MemRegion mr) PRODUCT_RETURN;
};
--- a/src/hotspot/share/gc/shared/cardTableBarrierSet.cpp Tue Mar 12 09:49:10 2019 +0000
+++ b/src/hotspot/share/gc/shared/cardTableBarrierSet.cpp Sat Mar 16 21:00:45 2019 +0000
@@ -23,6 +23,7 @@
*/
#include "precompiled.hpp"
+#include "gc/shared/cardTable.hpp"
#include "gc/shared/cardTableBarrierSetAssembler.hpp"
#include "gc/shared/cardTableBarrierSet.inline.hpp"
#include "gc/shared/collectedHeap.hpp"
--- a/src/hotspot/share/gc/shared/cardTableBarrierSet.hpp Tue Mar 12 09:49:10 2019 +0000
+++ b/src/hotspot/share/gc/shared/cardTableBarrierSet.hpp Sat Mar 16 21:00:45 2019 +0000
@@ -25,11 +25,10 @@
#ifndef SHARE_GC_SHARED_CARDTABLEBARRIERSET_HPP
#define SHARE_GC_SHARED_CARDTABLEBARRIERSET_HPP
+#include "gc/shared/cardTable.hpp"
#include "gc/shared/modRefBarrierSet.hpp"
#include "utilities/align.hpp"
-class CardTable;
-
// This kind of "BarrierSet" allows a "CollectedHeap" to detect and
// enumerate ref fields that have been modified (since the last
// enumeration.)
@@ -45,8 +44,11 @@
class CardTableBarrierSet: public ModRefBarrierSet {
// Some classes get to look at some private stuff.
friend class VMStructs;
- protected:
+
+public:
+ typedef CardTable::CardValue CardValue;
+protected:
// Used in support of ReduceInitialCardMarks; only consulted if COMPILER2
// or INCLUDE_JVMCI is being used
bool _defer_initial_card_mark;
--- a/src/hotspot/share/gc/shared/cardTableBarrierSet.inline.hpp Tue Mar 12 09:49:10 2019 +0000
+++ b/src/hotspot/share/gc/shared/cardTableBarrierSet.inline.hpp Sat Mar 16 21:00:45 2019 +0000
@@ -31,7 +31,7 @@
template <DecoratorSet decorators, typename T>
inline void CardTableBarrierSet::write_ref_field_post(T* field, oop newVal) {
- volatile jbyte* byte = _card_table->byte_for(field);
+ volatile CardValue* byte = _card_table->byte_for(field);
if (_card_table->scanned_concurrently()) {
// Perform a releasing store if the card table is scanned concurrently
OrderAccess::release_store(byte, CardTable::dirty_card_val());
--- a/src/hotspot/share/gc/shared/cardTableRS.cpp Tue Mar 12 09:49:10 2019 +0000
+++ b/src/hotspot/share/gc/shared/cardTableRS.cpp Sat Mar 16 21:00:45 2019 +0000
@@ -78,9 +78,8 @@
ClassLoaderDataGraph::cld_do(&closure);
}
-
-jbyte CardTableRS::find_unused_youngergenP_card_value() {
- for (jbyte v = youngergenP1_card;
+CardTable::CardValue CardTableRS::find_unused_youngergenP_card_value() {
+ for (CardValue v = youngergenP1_card;
v < cur_youngergen_and_prev_nonclean_card;
v++) {
bool seen = false;
@@ -122,7 +121,7 @@
g->younger_refs_iterate(blk, n_threads);
}
-inline bool ClearNoncleanCardWrapper::clear_card(jbyte* entry) {
+inline bool ClearNoncleanCardWrapper::clear_card(CardValue* entry) {
if (_is_par) {
return clear_card_parallel(entry);
} else {
@@ -130,16 +129,16 @@
}
}
-inline bool ClearNoncleanCardWrapper::clear_card_parallel(jbyte* entry) {
+inline bool ClearNoncleanCardWrapper::clear_card_parallel(CardValue* entry) {
while (true) {
// In the parallel case, we may have to do this several times.
- jbyte entry_val = *entry;
+ CardValue entry_val = *entry;
assert(entry_val != CardTableRS::clean_card_val(),
"We shouldn't be looking at clean cards, and this should "
"be the only place they get cleaned.");
if (CardTableRS::card_is_dirty_wrt_gen_iter(entry_val)
|| _ct->is_prev_youngergen_card_val(entry_val)) {
- jbyte res =
+ CardValue res =
Atomic::cmpxchg(CardTableRS::clean_card_val(), entry, entry_val);
if (res == entry_val) {
break;
@@ -167,8 +166,8 @@
}
-inline bool ClearNoncleanCardWrapper::clear_card_serial(jbyte* entry) {
- jbyte entry_val = *entry;
+inline bool ClearNoncleanCardWrapper::clear_card_serial(CardValue* entry) {
+ CardValue entry_val = *entry;
assert(entry_val != CardTableRS::clean_card_val(),
"We shouldn't be looking at clean cards, and this should "
"be the only place they get cleaned.");
@@ -183,7 +182,7 @@
_dirty_card_closure(dirty_card_closure), _ct(ct), _is_par(is_par) {
}
-bool ClearNoncleanCardWrapper::is_word_aligned(jbyte* entry) {
+bool ClearNoncleanCardWrapper::is_word_aligned(CardTable::CardValue* entry) {
return (((intptr_t)entry) & (BytesPerWord-1)) == 0;
}
@@ -195,8 +194,8 @@
assert(mr.word_size() > 0, "Error");
assert(_ct->is_aligned(mr.start()), "mr.start() should be card aligned");
// mr.end() may not necessarily be card aligned.
- jbyte* cur_entry = _ct->byte_for(mr.last());
- const jbyte* limit = _ct->byte_for(mr.start());
+ CardValue* cur_entry = _ct->byte_for(mr.last());
+ const CardValue* limit = _ct->byte_for(mr.start());
HeapWord* end_of_non_clean = mr.end();
HeapWord* start_of_non_clean = end_of_non_clean;
while (cur_entry >= limit) {
@@ -215,7 +214,7 @@
// fast forward through potential continuous whole-word range of clean cards beginning at a word-boundary
if (is_word_aligned(cur_entry)) {
- jbyte* cur_row = cur_entry - BytesPerWord;
+ CardValue* cur_row = cur_entry - BytesPerWord;
while (cur_row >= limit && *((intptr_t*)cur_row) == CardTableRS::clean_card_row_val()) {
cur_row -= BytesPerWord;
}
@@ -252,9 +251,9 @@
// cur-younger-gen ==> cur_younger_gen
// cur_youngergen_and_prev_nonclean_card ==> no change.
void CardTableRS::write_ref_field_gc_par(void* field, oop new_val) {
- volatile jbyte* entry = byte_for(field);
+ volatile CardValue* entry = byte_for(field);
do {
- jbyte entry_val = *entry;
+ CardValue entry_val = *entry;
// We put this first because it's probably the most common case.
if (entry_val == clean_card_val()) {
// No threat of contention with cleaning threads.
@@ -264,8 +263,8 @@
|| is_prev_youngergen_card_val(entry_val)) {
// Mark it as both cur and prev youngergen; card cleaning thread will
// eventually remove the previous stuff.
- jbyte new_val = cur_youngergen_and_prev_nonclean_card;
- jbyte res = Atomic::cmpxchg(new_val, entry, entry_val);
+ CardValue new_val = cur_youngergen_and_prev_nonclean_card;
+ CardValue res = Atomic::cmpxchg(new_val, entry, entry_val);
// Did the CAS succeed?
if (res == entry_val) return;
// Otherwise, retry, to see the new value.
@@ -395,11 +394,11 @@
if (s->end() <= gen_boundary) return;
MemRegion used = s->used_region();
- jbyte* cur_entry = byte_for(used.start());
- jbyte* limit = byte_after(used.last());
+ CardValue* cur_entry = byte_for(used.start());
+ CardValue* limit = byte_after(used.last());
while (cur_entry < limit) {
if (*cur_entry == clean_card_val()) {
- jbyte* first_dirty = cur_entry+1;
+ CardValue* first_dirty = cur_entry+1;
while (first_dirty < limit &&
*first_dirty == clean_card_val()) {
first_dirty++;
@@ -614,7 +613,7 @@
// max_gens is really GenCollectedHeap::heap()->gen_policy()->number_of_generations()
// (which is always 2, young & old), but GenCollectedHeap has not been initialized yet.
uint max_gens = 2;
- _last_cur_val_in_gen = NEW_C_HEAP_ARRAY3(jbyte, max_gens + 1,
+ _last_cur_val_in_gen = NEW_C_HEAP_ARRAY3(CardValue, max_gens + 1,
mtGC, CURRENT_PC, AllocFailStrategy::RETURN_NULL);
if (_last_cur_val_in_gen == NULL) {
vm_exit_during_initialization("Could not create last_cur_val_in_gen array.");
@@ -626,7 +625,7 @@
CardTableRS::~CardTableRS() {
if (_last_cur_val_in_gen) {
- FREE_C_HEAP_ARRAY(jbyte, _last_cur_val_in_gen);
+ FREE_C_HEAP_ARRAY(CardValue, _last_cur_val_in_gen);
_last_cur_val_in_gen = NULL;
}
if (_lowest_non_clean) {
@@ -669,11 +668,11 @@
}
}
-bool CardTableRS::card_will_be_scanned(jbyte cv) {
+bool CardTableRS::card_will_be_scanned(CardValue cv) {
return card_is_dirty_wrt_gen_iter(cv) || is_prev_nonclean_card_val(cv);
}
-bool CardTableRS::card_may_have_been_dirty(jbyte cv) {
+bool CardTableRS::card_may_have_been_dirty(CardValue cv) {
return
cv != clean_card &&
(card_is_dirty_wrt_gen_iter(cv) ||
--- a/src/hotspot/share/gc/shared/cardTableRS.hpp Tue Mar 12 09:49:10 2019 +0000
+++ b/src/hotspot/share/gc/shared/cardTableRS.hpp Sat Mar 16 21:00:45 2019 +0000
@@ -76,27 +76,27 @@
// used as the current value for a younger_refs_do iteration of that
// portion of the table. The perm gen is index 0. The young gen is index 1,
// but will always have the value "clean_card". The old gen is index 2.
- jbyte* _last_cur_val_in_gen;
+ CardValue* _last_cur_val_in_gen;
- jbyte _cur_youngergen_card_val;
+ CardValue _cur_youngergen_card_val;
// Number of generations, plus one for lingering PermGen issues in CardTableRS.
static const int _regions_to_iterate = 3;
- jbyte cur_youngergen_card_val() {
+ CardValue cur_youngergen_card_val() {
return _cur_youngergen_card_val;
}
- void set_cur_youngergen_card_val(jbyte v) {
+ void set_cur_youngergen_card_val(CardValue v) {
_cur_youngergen_card_val = v;
}
- bool is_prev_youngergen_card_val(jbyte v) {
+ bool is_prev_youngergen_card_val(CardValue v) {
return
youngergen_card <= v &&
v < cur_youngergen_and_prev_nonclean_card &&
v != _cur_youngergen_card_val;
}
// Return a youngergen_card_value that is not currently in use.
- jbyte find_unused_youngergenP_card_value();
+ CardValue find_unused_youngergenP_card_value();
public:
CardTableRS(MemRegion whole_heap, bool scanned_concurrently);
@@ -117,7 +117,7 @@
void younger_refs_iterate(Generation* g, OopsInGenClosure* blk, uint n_threads);
void inline_write_ref_field_gc(void* field, oop new_val) {
- jbyte* byte = byte_for(field);
+ CardValue* byte = byte_for(field);
*byte = youngergen_card;
}
void write_ref_field_gc_work(void* field, oop new_val) {
@@ -140,32 +140,32 @@
void invalidate_or_clear(Generation* old_gen);
- bool is_prev_nonclean_card_val(jbyte v) {
+ bool is_prev_nonclean_card_val(CardValue v) {
return
youngergen_card <= v &&
v <= cur_youngergen_and_prev_nonclean_card &&
v != _cur_youngergen_card_val;
}
- static bool youngergen_may_have_been_dirty(jbyte cv) {
+ static bool youngergen_may_have_been_dirty(CardValue cv) {
return cv == CardTableRS::cur_youngergen_and_prev_nonclean_card;
}
// *** Support for parallel card scanning.
// dirty and precleaned are equivalent wrt younger_refs_iter.
- static bool card_is_dirty_wrt_gen_iter(jbyte cv) {
+ static bool card_is_dirty_wrt_gen_iter(CardValue cv) {
return cv == dirty_card || cv == precleaned_card;
}
// Returns "true" iff the value "cv" will cause the card containing it
// to be scanned in the current traversal. May be overridden by
// subtypes.
- bool card_will_be_scanned(jbyte cv);
+ bool card_will_be_scanned(CardValue cv);
// Returns "true" iff the value "cv" may have represented a dirty card at
// some point.
- bool card_may_have_been_dirty(jbyte cv);
+ bool card_may_have_been_dirty(CardValue cv);
// Iterate over the portion of the card-table which covers the given
// region mr in the given space and apply cl to any dirty sub-regions
@@ -185,7 +185,7 @@
// covered region. Each entry of these arrays is the lowest non-clean
// card of the corresponding chunk containing part of an object from the
// previous chunk, or else NULL.
- typedef jbyte* CardPtr;
+ typedef CardValue* CardPtr;
typedef CardPtr* CardArr;
CardArr* _lowest_non_clean;
size_t* _lowest_non_clean_chunk_size;
@@ -199,15 +199,19 @@
DirtyCardToOopClosure* _dirty_card_closure;
CardTableRS* _ct;
bool _is_par;
+
+public:
+
+ typedef CardTable::CardValue CardValue;
private:
// Clears the given card, return true if the corresponding card should be
// processed.
- inline bool clear_card(jbyte* entry);
+ inline bool clear_card(CardValue* entry);
// Work methods called by the clear_card()
- inline bool clear_card_serial(jbyte* entry);
- inline bool clear_card_parallel(jbyte* entry);
+ inline bool clear_card_serial(CardValue* entry);
+ inline bool clear_card_parallel(CardValue* entry);
// check alignment of pointer
- bool is_word_aligned(jbyte* entry);
+ bool is_word_aligned(CardValue* entry);
public:
ClearNoncleanCardWrapper(DirtyCardToOopClosure* dirty_card_closure, CardTableRS* ct, bool is_par);
--- a/src/hotspot/share/gc/shared/collectedHeap.hpp Tue Mar 12 09:49:10 2019 +0000
+++ b/src/hotspot/share/gc/shared/collectedHeap.hpp Sat Mar 16 21:00:45 2019 +0000
@@ -450,11 +450,6 @@
// non-object.
virtual HeapWord* block_start(const void* addr) const = 0;
- // Requires "addr" to be the start of a chunk, and returns its size.
- // "addr + size" is required to be the start of a new chunk, or the end
- // of the active area of the heap.
- virtual size_t block_size(const HeapWord* addr) const = 0;
-
// Requires "addr" to be the start of a block, and returns "TRUE" iff
// the block is an object.
virtual bool block_is_obj(const HeapWord* addr) const = 0;
@@ -514,9 +509,6 @@
void print_heap_before_gc();
void print_heap_after_gc();
- // An object is scavengable if its location may move during a scavenge.
- // (A scavenge is a GC which is not a full GC.)
- virtual bool is_scavengable(oop obj) = 0;
// Registering and unregistering an nmethod (compiled code) with the heap.
// Override with specific mechanism for each specialized heap type.
virtual void register_nmethod(nmethod* nm) {}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/src/hotspot/share/gc/shared/gcOverheadChecker.cpp Sat Mar 16 21:00:45 2019 +0000
@@ -0,0 +1,102 @@
+/*
+ * Copyright (c) 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2019, Google and/or its affiliates. All rights reserved.
+ * 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/shared/gcOverheadChecker.hpp"
+#include "gc/shared/softRefPolicy.hpp"
+#include "logging/log.hpp"
+
+GCOverheadChecker::GCOverheadChecker() :
+ _gc_overhead_limit_exceeded(false),
+ _print_gc_overhead_limit_would_be_exceeded(false),
+ _gc_overhead_limit_count(0) {
+ assert(GCOverheadLimitThreshold > 0,
+ "No opportunity to clear SoftReferences before GC overhead limit");
+}
+
+void GCOverheadChecker::check_gc_overhead_limit(GCOverheadTester* time_overhead,
+ GCOverheadTester* space_overhead,
+ bool is_full_gc,
+ GCCause::Cause gc_cause,
+ SoftRefPolicy* soft_ref_policy) {
+
+ // Ignore explicit GC's. Exiting here does not set the flag and
+ // does not reset the count.
+ if (GCCause::is_user_requested_gc(gc_cause) ||
+ GCCause::is_serviceability_requested_gc(gc_cause)) {
+ return;
+ }
+
+ bool print_gc_overhead_limit_would_be_exceeded = false;
+ if (is_full_gc) {
+ if (time_overhead->is_exceeded() && space_overhead->is_exceeded()) {
+ // Collections, on average, are taking too much time, and
+ // we have too little space available after a full gc.
+ // At this point the GC overhead limit is being exceeded.
+ _gc_overhead_limit_count++;
+ if (UseGCOverheadLimit) {
+ if (_gc_overhead_limit_count >= GCOverheadLimitThreshold){
+ // All conditions have been met for throwing an out-of-memory
+ set_gc_overhead_limit_exceeded(true);
+ // Avoid consecutive OOM due to the gc time limit by resetting
+ // the counter.
+ reset_gc_overhead_limit_count();
+ } else {
+ // The required consecutive collections which exceed the
+ // GC time limit may or may not have been reached. We
+ // are approaching that condition and so as not to
+ // throw an out-of-memory before all SoftRef's have been
+ // cleared, set _should_clear_all_soft_refs in CollectorPolicy.
+ // The clearing will be done on the next GC.
+ bool near_limit = gc_overhead_limit_near();
+ if (near_limit) {
+ soft_ref_policy->set_should_clear_all_soft_refs(true);
+ log_trace(gc, ergo)("Nearing GC overhead limit, will be clearing all SoftReference");
+ }
+ }
+ }
+ // Set this even when the overhead limit will not
+ // cause an out-of-memory. Diagnostic message indicating
+ // that the overhead limit is being exceeded is sometimes
+ // printed.
+ print_gc_overhead_limit_would_be_exceeded = true;
+
+ } else {
+ // Did not exceed overhead limits
+ reset_gc_overhead_limit_count();
+ }
+ }
+
+ if (UseGCOverheadLimit) {
+ if (gc_overhead_limit_exceeded()) {
+ log_trace(gc, ergo)("GC is exceeding overhead limit of " UINTX_FORMAT "%%", GCTimeLimit);
+ reset_gc_overhead_limit_count();
+ } else if (print_gc_overhead_limit_would_be_exceeded) {
+ assert(_gc_overhead_limit_count > 0, "Should not be printing");
+ log_trace(gc, ergo)("GC would exceed overhead limit of " UINTX_FORMAT "%% %d consecutive time(s)",
+ GCTimeLimit, _gc_overhead_limit_count);
+ }
+ }
+}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/src/hotspot/share/gc/shared/gcOverheadChecker.hpp Sat Mar 16 21:00:45 2019 +0000
@@ -0,0 +1,85 @@
+/*
+ * Copyright (c) 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2019, Google and/or its affiliates. All rights reserved.
+ * 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_GCOVERHEADCHECKER_HPP
+#define SHARE_GC_SHARED_GCOVERHEADCHECKER_HPP
+
+#include "memory/allocation.hpp"
+#include "gc/shared/gcCause.hpp"
+
+class SoftRefPolicy;
+
+class GCOverheadTester: public StackObj {
+public:
+ virtual bool is_exceeded() = 0;
+};
+
+class GCOverheadChecker: public CHeapObj<mtGC> {
+ // This is a hint for the heap: we've detected that GC times
+ // are taking longer than GCTimeLimit allows.
+ bool _gc_overhead_limit_exceeded;
+ // Use for diagnostics only. If UseGCOverheadLimit is false,
+ // this variable is still set.
+ bool _print_gc_overhead_limit_would_be_exceeded;
+ // Count of consecutive GC that have exceeded the
+ // GC time limit criterion
+ uint _gc_overhead_limit_count;
+ // This flag signals that GCTimeLimit is being exceeded
+ // but may not have done so for the required number of consecutive
+ // collections
+
+public:
+ GCOverheadChecker();
+
+ // This is a hint for the heap: we've detected that gc times
+ // are taking longer than GCTimeLimit allows.
+ // Most heaps will choose to throw an OutOfMemoryError when
+ // this occurs but it is up to the heap to request this information
+ // of the policy
+ bool gc_overhead_limit_exceeded() {
+ return _gc_overhead_limit_exceeded;
+ }
+ void set_gc_overhead_limit_exceeded(bool v) {
+ _gc_overhead_limit_exceeded = v;
+ }
+
+ // Tests conditions indicate the GC overhead limit is being approached.
+ bool gc_overhead_limit_near() {
+ return _gc_overhead_limit_count >= (GCOverheadLimitThreshold - 1);
+ }
+ void reset_gc_overhead_limit_count() {
+ _gc_overhead_limit_count = 0;
+ }
+
+ // Check the conditions for an out-of-memory due to excessive GC time.
+ // Set _gc_overhead_limit_exceeded if all the conditions have been met.
+ void check_gc_overhead_limit(GCOverheadTester* time_overhead,
+ GCOverheadTester* space_overhead,
+ bool is_full_gc,
+ GCCause::Cause gc_cause,
+ SoftRefPolicy* soft_ref_policy);
+};
+
+#endif // SHARE_GC_SHARED_GCOVERHEADCHECKER_HPP
--- a/src/hotspot/share/gc/shared/gcPolicyCounters.cpp Tue Mar 12 09:49:10 2019 +0000
+++ b/src/hotspot/share/gc/shared/gcPolicyCounters.cpp Sat Mar 16 21:00:45 2019 +0000
@@ -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
@@ -59,5 +59,10 @@
_desired_survivor_size =
PerfDataManager::create_variable(SUN_GC, cname, PerfData::U_Bytes,
CHECK);
+
+ cname = PerfDataManager::counter_name(_name_space, "gcTimeLimitExceeded");
+ _gc_overhead_limit_exceeded_counter =
+ PerfDataManager::create_variable(SUN_GC, cname, PerfData::U_Events,
+ CHECK);
}
}
--- a/src/hotspot/share/gc/shared/gcPolicyCounters.hpp Tue Mar 12 09:49:10 2019 +0000
+++ b/src/hotspot/share/gc/shared/gcPolicyCounters.hpp Sat Mar 16 21:00:45 2019 +0000
@@ -41,6 +41,7 @@
PerfVariable* _tenuring_threshold;
PerfVariable* _desired_survivor_size;
+ PerfVariable* _gc_overhead_limit_exceeded_counter;
const char* _name_space;
@@ -62,6 +63,10 @@
return _desired_survivor_size;
}
+ inline PerfVariable* gc_overhead_limit_exceeded_counter() const {
+ return _gc_overhead_limit_exceeded_counter;
+ }
+
const char* name_space() const { return _name_space; }
virtual void update_counters() {}
--- a/src/hotspot/share/gc/shared/gc_globals.hpp Tue Mar 12 09:49:10 2019 +0000
+++ b/src/hotspot/share/gc/shared/gc_globals.hpp Sat Mar 16 21:00:45 2019 +0000
@@ -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
@@ -616,7 +616,7 @@
"OutOfMemoryError is thrown (used with GCTimeLimit)") \
range(0, 100) \
\
- develop(uintx, AdaptiveSizePolicyGCTimeLimitThreshold, 5, \
+ develop(uintx, GCOverheadLimitThreshold, 5, \
"Number of consecutive collections before gc time limit fires") \
range(1, max_uintx) \
\
--- a/src/hotspot/share/gc/shared/genCollectedHeap.cpp Tue Mar 12 09:49:10 2019 +0000
+++ b/src/hotspot/share/gc/shared/genCollectedHeap.cpp Sat Mar 16 21:00:45 2019 +0000
@@ -47,6 +47,7 @@
#include "gc/shared/genOopClosures.inline.hpp"
#include "gc/shared/generationSpec.hpp"
#include "gc/shared/oopStorageParState.inline.hpp"
+#include "gc/shared/scavengableNMethods.hpp"
#include "gc/shared/space.hpp"
#include "gc/shared/strongRootsScope.hpp"
#include "gc/shared/weakProcessor.hpp"
@@ -175,6 +176,15 @@
return heap_rs->base();
}
+class GenIsScavengable : public BoolObjectClosure {
+public:
+ bool do_object_b(oop obj) {
+ return GenCollectedHeap::heap()->is_in_young(obj);
+ }
+};
+
+static GenIsScavengable _is_scavengable;
+
void GenCollectedHeap::post_initialize() {
CollectedHeap::post_initialize();
ref_processing_init();
@@ -186,6 +196,8 @@
def_new_gen->from()->capacity());
MarkSweep::initialize();
+
+ ScavengableNMethods::initialize(&_is_scavengable);
}
void GenCollectedHeap::ref_processing_init() {
@@ -699,11 +711,23 @@
}
void GenCollectedHeap::register_nmethod(nmethod* nm) {
- CodeCache::register_scavenge_root_nmethod(nm);
+ ScavengableNMethods::register_nmethod(nm);
+}
+
+void GenCollectedHeap::unregister_nmethod(nmethod* nm) {
+ ScavengableNMethods::unregister_nmethod(nm);
}
void GenCollectedHeap::verify_nmethod(nmethod* nm) {
- CodeCache::verify_scavenge_root_nmethod(nm);
+ ScavengableNMethods::verify_nmethod(nm);
+}
+
+void GenCollectedHeap::flush_nmethod(nmethod* nm) {
+ ScavengableNMethods::flush_nmethod(nm);
+}
+
+void GenCollectedHeap::prune_nmethods() {
+ ScavengableNMethods::prune_nmethods();
}
HeapWord* GenCollectedHeap::satisfy_failed_allocation(size_t size, bool is_tlab) {
@@ -847,7 +871,7 @@
assert(code_roots != NULL, "must supply closure for code cache");
// We only visit parts of the CodeCache when scavenging.
- CodeCache::scavenge_root_nmethods_do(code_roots);
+ ScavengableNMethods::scavengable_nmethods_do(code_roots);
}
if (so & SO_AllCodeCache) {
assert(code_roots != NULL, "must supply closure for code cache");
@@ -859,7 +883,7 @@
// Verify that the code cache contents are not subject to
// movement by a scavenging collection.
DEBUG_ONLY(CodeBlobToOopClosure assert_code_is_non_scavengable(&assert_is_non_scavengable_closure, !CodeBlobToOopClosure::FixRelocations));
- DEBUG_ONLY(CodeCache::asserted_non_scavengable_nmethods_do(&assert_code_is_non_scavengable));
+ DEBUG_ONLY(ScavengableNMethods::asserted_non_scavengable_nmethods_do(&assert_code_is_non_scavengable));
}
}
@@ -1064,18 +1088,6 @@
return _old_gen->block_start(addr);
}
-size_t GenCollectedHeap::block_size(const HeapWord* addr) const {
- assert(is_in_reserved(addr), "block_size of address outside of heap");
- if (_young_gen->is_in_reserved(addr)) {
- assert(_young_gen->is_in(addr), "addr should be in allocated part of generation");
- return _young_gen->block_size(addr);
- }
-
- assert(_old_gen->is_in_reserved(addr), "Some generation should contain the address");
- assert(_old_gen->is_in(addr), "addr should be in allocated part of generation");
- return _old_gen->block_size(addr);
-}
-
bool GenCollectedHeap::block_is_obj(const HeapWord* addr) const {
assert(is_in_reserved(addr), "block_is_obj of address outside of heap");
assert(block_start(addr) == addr, "addr must be a block start");
--- a/src/hotspot/share/gc/shared/genCollectedHeap.hpp Tue Mar 12 09:49:10 2019 +0000
+++ b/src/hotspot/share/gc/shared/genCollectedHeap.hpp Sat Mar 16 21:00:45 2019 +0000
@@ -249,13 +249,13 @@
bool is_in_partial_collection(const void* p);
#endif
- virtual bool is_scavengable(oop obj) {
- return is_in_young(obj);
- }
-
// Optimized nmethod scanning support routines
virtual void register_nmethod(nmethod* nm);
- virtual void verify_nmethod(nmethod* nmethod);
+ virtual void unregister_nmethod(nmethod* nm);
+ virtual void verify_nmethod(nmethod* nm);
+ virtual void flush_nmethod(nmethod* nm);
+
+ void prune_nmethods();
// Iteration functions.
void oop_iterate(OopIterateClosure* cl);
@@ -278,13 +278,6 @@
// non-object.
virtual HeapWord* block_start(const void* addr) const;
- // Requires "addr" to be the start of a chunk, and returns its size.
- // "addr + size" is required to be the start of a new chunk, or the end
- // of the active area of the heap. Assumes (and verifies in non-product
- // builds) that addr is in the allocated part of the heap and is
- // the start of a chunk.
- virtual size_t block_size(const HeapWord* addr) const;
-
// Requires "addr" to be the start of a block, and returns "TRUE" iff
// the block is an object. Assumes (and verifies in non-product
// builds) that addr is in the allocated part of the heap and is
--- a/src/hotspot/share/gc/shared/parallelCleaning.cpp Tue Mar 12 09:49:10 2019 +0000
+++ b/src/hotspot/share/gc/shared/parallelCleaning.cpp Sat Mar 16 21:00:45 2019 +0000
@@ -70,9 +70,6 @@
CodeCacheUnloadingTask::~CodeCacheUnloadingTask() {
CodeCache::verify_clean_inline_caches();
-
- guarantee(CodeCache::scavenge_root_nmethods() == NULL, "Must be");
-
CodeCache::verify_icholder_relocations();
}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/src/hotspot/share/gc/shared/scavengableNMethods.cpp Sat Mar 16 21:00:45 2019 +0000
@@ -0,0 +1,304 @@
+/*
+ * 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 "code/codeCache.hpp"
+#include "code/nmethod.hpp"
+#include "compiler/compileTask.hpp"
+#include "gc/shared/collectedHeap.hpp"
+#include "gc/shared/scavengableNMethods.hpp"
+#include "gc/shared/scavengableNMethodsData.hpp"
+#include "logging/log.hpp"
+#include "logging/logStream.hpp"
+#include "memory/universe.hpp"
+#include "utilities/debug.hpp"
+
+static ScavengableNMethodsData gc_data(nmethod* nm) {
+ return ScavengableNMethodsData(nm);
+}
+
+nmethod* ScavengableNMethods::_head = NULL;
+BoolObjectClosure* ScavengableNMethods::_is_scavengable = NULL;
+
+void ScavengableNMethods::initialize(BoolObjectClosure* is_scavengable) {
+ _is_scavengable = is_scavengable;
+}
+
+// Conditionally adds the nmethod to the list if it is
+// not already on the list and has a scavengeable root.
+void ScavengableNMethods::register_nmethod(nmethod* nm) {
+ assert_locked_or_safepoint(CodeCache_lock);
+
+ ScavengableNMethodsData data = gc_data(nm);
+
+ if (data.on_list() || !has_scavengable_oops(nm)) {
+ return;
+ }
+
+ data.set_on_list();
+ data.set_next(_head);
+
+ _head = nm;
+
+ CodeCache::print_trace("register_nmethod", nm);
+}
+
+void ScavengableNMethods::unregister_nmethod(nmethod* nm) {
+ // Do nothing. Unlinking is currently delayed until the purge phase.
+}
+
+#ifndef PRODUCT
+
+class DebugScavengableOops: public OopClosure {
+ BoolObjectClosure* _is_scavengable;
+ nmethod* _nm;
+ bool _ok;
+public:
+ DebugScavengableOops(BoolObjectClosure* is_scavengable, nmethod* nm) :
+ _is_scavengable(is_scavengable),
+ _nm(nm),
+ _ok(true) { }
+
+ bool ok() { return _ok; }
+ virtual void do_oop(oop* p) {
+ if (*p == NULL || !_is_scavengable->do_object_b(*p)) {
+ return;
+ }
+
+ if (_ok) {
+ _nm->print_nmethod(true);
+ _ok = false;
+ }
+ tty->print_cr("*** scavengable oop " PTR_FORMAT " found at " PTR_FORMAT " (offset %d)",
+ p2i(*p), p2i(p), (int)((intptr_t)p - (intptr_t)_nm));
+ (*p)->print();
+ }
+ virtual void do_oop(narrowOop* p) { ShouldNotReachHere(); }
+};
+
+#endif // PRODUCT
+
+void ScavengableNMethods::verify_nmethod(nmethod* nm) {
+#ifndef PRODUCT
+ if (!gc_data(nm).on_list()) {
+ // Actually look inside, to verify the claim that it's clean.
+ DebugScavengableOops cl(_is_scavengable, nm);
+ nm->oops_do(&cl);
+ if (!cl.ok())
+ fatal("found an unadvertised bad scavengable oop in the code cache");
+ }
+ assert(gc_data(nm).not_marked(), "");
+#endif // PRODUCT
+}
+
+void ScavengableNMethods::flush_nmethod(nmethod* nm) {
+ assert_locked_or_safepoint(CodeCache_lock);
+
+ // TODO: Should be done in unregister_nmethod, during the "unlink" phase.
+ if (gc_data(nm).on_list()) {
+ CodeCache::print_trace("flush_nmethod", nm);
+ nmethod* prev = NULL;
+ for (nmethod* cur = _head; cur != NULL; cur = gc_data(cur).next()) {
+ if (cur == nm) {
+ unlist_nmethod(cur, prev);
+ return;
+ }
+ prev = cur;
+ }
+ }
+}
+
+class HasScavengableOops: public OopClosure {
+ BoolObjectClosure* _is_scavengable;
+ bool _found;
+ nmethod* _print_nm;
+public:
+ HasScavengableOops(BoolObjectClosure* is_scavengable, nmethod* nm) :
+ _is_scavengable(is_scavengable),
+ _found(false),
+ _print_nm(nm) {}
+
+ bool found() { return _found; }
+ virtual void do_oop(oop* p) {
+ if (*p != NULL && _is_scavengable->do_object_b(*p)) {
+ NOT_PRODUCT(maybe_print(p));
+ _found = true;
+ }
+ }
+ virtual void do_oop(narrowOop* p) { ShouldNotReachHere(); }
+
+#ifndef PRODUCT
+ void maybe_print(oop* p) {
+ LogTarget(Trace, gc, nmethod) lt;
+ if (lt.is_enabled()) {
+ LogStream ls(lt);
+ if (!_found) {
+ CompileTask::print(&ls, _print_nm, "new scavengable oop", /*short_form:*/ true);
+ }
+ ls.print("" PTR_FORMAT "[offset=%d] found scavengable oop " PTR_FORMAT " (found at " PTR_FORMAT ") ",
+ p2i(_print_nm), (int)((intptr_t)p - (intptr_t)_print_nm),
+ p2i(*p), p2i(p));
+ ls.cr();
+ }
+ }
+#endif //PRODUCT
+};
+
+bool ScavengableNMethods::has_scavengable_oops(nmethod* nm) {
+ HasScavengableOops cl(_is_scavengable, nm);
+ nm->oops_do(&cl);
+ return cl.found();
+}
+
+// Walk the list of methods which might contain oops to the java heap.
+void ScavengableNMethods::scavengable_nmethods_do(CodeBlobToOopClosure* f) {
+ assert_locked_or_safepoint(CodeCache_lock);
+
+ const bool fix_relocations = f->fix_relocations();
+ debug_only(mark_on_list_nmethods());
+
+ nmethod* prev = NULL;
+ nmethod* cur = _head;
+ while (cur != NULL) {
+ ScavengableNMethodsData data = gc_data(cur);
+ debug_only(data.clear_marked());
+ assert(data.not_marked(), "");
+ assert(data.on_list(), "else shouldn't be on this list");
+
+ bool is_live = (!cur->is_zombie() && !cur->is_unloaded());
+ LogTarget(Trace, gc, nmethod) lt;
+ if (lt.is_enabled()) {
+ LogStream ls(lt);
+ CompileTask::print(&ls, cur,
+ is_live ? "scavengable root " : "dead scavengable root", /*short_form:*/ true);
+ }
+ if (is_live) {
+ // Perform cur->oops_do(f), maybe just once per nmethod.
+ f->do_code_blob(cur);
+ }
+ nmethod* const next = data.next();
+ // The scavengable nmethod list must contain all methods with scavengable
+ // oops. It is safe to include more nmethod on the list, but we do not
+ // expect any live non-scavengable nmethods on the list.
+ if (fix_relocations) {
+ if (!is_live || !has_scavengable_oops(cur)) {
+ unlist_nmethod(cur, prev);
+ } else {
+ prev = cur;
+ }
+ }
+ cur = next;
+ }
+
+ // Check for stray marks.
+ debug_only(verify_unlisted_nmethods(NULL));
+}
+
+#ifndef PRODUCT
+void ScavengableNMethods::asserted_non_scavengable_nmethods_do(CodeBlobClosure* f) {
+ // While we are here, verify the integrity of the list.
+ mark_on_list_nmethods();
+ for (nmethod* cur = _head; cur != NULL; cur = gc_data(cur).next()) {
+ assert(gc_data(cur).on_list(), "else shouldn't be on this list");
+ gc_data(cur).clear_marked();
+ }
+ verify_unlisted_nmethods(f);
+}
+#endif // PRODUCT
+
+void ScavengableNMethods::unlist_nmethod(nmethod* nm, nmethod* prev) {
+ assert_locked_or_safepoint(CodeCache_lock);
+
+ assert((prev == NULL && _head == nm) ||
+ (prev != NULL && gc_data(prev).next() == nm), "precondition");
+
+ CodeCache::print_trace("unlist_nmethod", nm);
+
+ ScavengableNMethodsData data = gc_data(nm);
+
+ if (prev == NULL) {
+ _head = data.next();
+ } else {
+ gc_data(prev).set_next(data.next());
+ }
+ data.set_next(NULL);
+ data.clear_on_list();
+}
+
+void ScavengableNMethods::prune_nmethods() {
+ assert_locked_or_safepoint(CodeCache_lock);
+
+ debug_only(mark_on_list_nmethods());
+
+ nmethod* last = NULL;
+ nmethod* cur = _head;
+ while (cur != NULL) {
+ nmethod* next = gc_data(cur).next();
+ debug_only(gc_data(cur).clear_marked());
+ assert(gc_data(cur).on_list(), "else shouldn't be on this list");
+
+ if (!cur->is_zombie() && !cur->is_unloaded() && has_scavengable_oops(cur)) {
+ // Keep it. Advance 'last' to prevent deletion.
+ last = cur;
+ } else {
+ // Prune it from the list, so we don't have to look at it any more.
+ CodeCache::print_trace("prune_nmethods", cur);
+ unlist_nmethod(cur, last);
+ }
+ cur = next;
+ }
+
+ // Check for stray marks.
+ debug_only(verify_unlisted_nmethods(NULL));
+}
+
+#ifndef PRODUCT
+// Temporarily mark nmethods that are claimed to be on the scavenge list.
+void ScavengableNMethods::mark_on_list_nmethods() {
+ NMethodIterator iter(NMethodIterator::only_alive);
+ while(iter.next()) {
+ nmethod* nm = iter.method();
+ ScavengableNMethodsData data = gc_data(nm);
+ assert(data.not_marked(), "clean state");
+ if (data.on_list())
+ data.set_marked();
+ }
+}
+
+// If the closure is given, run it on the unlisted nmethods.
+// Also make sure that the effects of mark_on_list_nmethods is gone.
+void ScavengableNMethods::verify_unlisted_nmethods(CodeBlobClosure* f_or_null) {
+ NMethodIterator iter(NMethodIterator::only_alive);
+ while(iter.next()) {
+ nmethod* nm = iter.method();
+
+ verify_nmethod(nm);
+
+ if (f_or_null != NULL && !gc_data(nm).on_list()) {
+ f_or_null->do_code_blob(nm);
+ }
+ }
+}
+
+#endif //PRODUCT
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/src/hotspot/share/gc/shared/scavengableNMethods.hpp Sat Mar 16 21:00:45 2019 +0000
@@ -0,0 +1,70 @@
+/*
+ * 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_SHARED_SCAVENGABLENMETHODS_HPP
+#define SHARE_GC_SHARED_SCAVENGABLENMETHODS_HPP
+
+#include "memory/allocation.hpp"
+#include "utilities/macros.hpp"
+
+class BoolObjectClosure;
+class CodeBlobClosure;
+class CodeBlobToOopClosure;
+class nmethod;
+
+class ScavengableNMethods : public AllStatic {
+ friend class VMStructs;
+
+ static nmethod* _head;
+ static BoolObjectClosure* _is_scavengable;
+
+public:
+ static void initialize(BoolObjectClosure* is_scavengable);
+
+ static void register_nmethod(nmethod* nm);
+ static void unregister_nmethod(nmethod* nm);
+ static void verify_nmethod(nmethod* nm);
+ static void flush_nmethod(nmethod* nm);
+
+ static void prune_nmethods();
+
+ // Apply f to every live code blob in scavengable nmethods. Prune nmethods
+ // from the list of scavengable nmethods if f->fix_relocations() and a nmethod
+ // no longer has scavengable oops. If f->fix_relocations(), then f must copy
+ // objects to their new location immediately to avoid fixing nmethods on the
+ // basis of the old object locations.
+ static void scavengable_nmethods_do(CodeBlobToOopClosure* f);
+
+ static void asserted_non_scavengable_nmethods_do(CodeBlobClosure* f = NULL) PRODUCT_RETURN;
+
+private:
+ static void unlist_nmethod(nmethod* nm, nmethod* prev);
+
+ static bool has_scavengable_oops(nmethod* nm);
+
+ static void mark_on_list_nmethods() PRODUCT_RETURN;
+ static void verify_unlisted_nmethods(CodeBlobClosure* f_or_null) PRODUCT_RETURN;
+};
+
+#endif // SHARE_GC_SHARED_SCAVENGABLENMETHODS_HPP
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/src/hotspot/share/gc/shared/scavengableNMethodsData.hpp Sat Mar 16 21:00:45 2019 +0000
@@ -0,0 +1,74 @@
+/*
+ * 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_SHARED_SCAVENGABLENMETHODDATAS_HPP
+#define SHARE_GC_SHARED_SCAVENGABLENMETHODDATAS_HPP
+
+#include "memory/allocation.hpp"
+#include "utilities/globalDefinitions.hpp"
+
+class nmethod;
+
+class ScavengableNMethodsData : public CHeapObj<mtGC> {
+ // State bits put into the two lower alignment bits.
+ static const uintptr_t state_bits = 2;
+ static const uintptr_t state_mask = (1 << state_bits) - 1;
+ static const uintptr_t state_on_list = 0x1;
+ static const uintptr_t state_marked = 0x2;
+
+ // nmethod containing the GC data.
+ nmethod* const _nm;
+
+ // The data is stored as a bit pattern in a void* inside the nmethod.
+ uintptr_t data() const { return reinterpret_cast<uintptr_t>(_nm->gc_data<void>()); }
+ void set_data(uintptr_t data) const { _nm->set_gc_data(reinterpret_cast<void*>(data)); }
+
+ jbyte state() const { return data() & state_mask; }
+ void set_state(jbyte state) const { set_data((data() & ~state_mask) | state); }
+
+ uintptr_t from_nmethod(nmethod* nm) const { return reinterpret_cast<uintptr_t>(nm); }
+ nmethod* to_nmethod(uintptr_t data) const { return reinterpret_cast<nmethod*>(data); }
+
+public:
+ ScavengableNMethodsData(nmethod* nm) : _nm(nm) {
+ assert(is_aligned(nm, 4), "Must be aligned to fit state bits");
+ }
+
+ // Scavengable oop support
+ bool on_list() const { return (state() & state_on_list) != 0; }
+ void set_on_list() { set_state(state_on_list); }
+ void clear_on_list() { set_state(0); }
+
+#ifndef PRODUCT
+ void set_marked() { set_state(state() | state_marked); }
+ void clear_marked() { set_state(state() & ~state_marked); }
+ bool not_marked() { return (state() & ~state_on_list) == 0; }
+ // N.B. there is no positive marked query, and we only use the not_marked query for asserts.
+#endif //PRODUCT
+
+ nmethod* next() const { return to_nmethod(data() & ~state_mask); }
+ void set_next(nmethod *n) { set_data(from_nmethod(n) | state()); }
+};
+
+#endif // SHARE_GC_SHARED_SCAVENGABLENMETHODDATAS_HPP
--- a/src/hotspot/share/gc/shared/stringdedup/stringDedupTable.cpp Tue Mar 12 09:49:10 2019 +0000
+++ b/src/hotspot/share/gc/shared/stringdedup/stringDedupTable.cpp Sat Mar 16 21:00:45 2019 +0000
@@ -269,21 +269,13 @@
*list = entry;
}
-bool StringDedupTable::equals(typeArrayOop value1, typeArrayOop value2) {
- return (oopDesc::equals(value1, value2) ||
- (value1->length() == value2->length() &&
- (!memcmp(value1->base(T_BYTE),
- value2->base(T_BYTE),
- value1->length() * sizeof(jbyte)))));
-}
-
typeArrayOop StringDedupTable::lookup(typeArrayOop value, bool latin1, unsigned int hash,
StringDedupEntry** list, uintx &count) {
for (StringDedupEntry* entry = *list; entry != NULL; entry = entry->next()) {
if (entry->hash() == hash && entry->latin1() == latin1) {
oop* obj_addr = (oop*)entry->obj_addr();
oop obj = NativeAccess<ON_PHANTOM_OOP_REF | AS_NO_KEEPALIVE>::oop_load(obj_addr);
- if (equals(value, static_cast<typeArrayOop>(obj))) {
+ if (java_lang_String::value_equals(value, static_cast<typeArrayOop>(obj))) {
obj = NativeAccess<ON_PHANTOM_OOP_REF>::oop_load(obj_addr);
return static_cast<typeArrayOop>(obj);
}
@@ -633,7 +625,7 @@
while (*entry2 != NULL) {
typeArrayOop value2 = (*entry2)->obj();
bool latin1_2 = (*entry2)->latin1();
- guarantee(latin1_1 != latin1_2 || !equals(value1, value2), "Table entries must not have identical arrays");
+ guarantee(latin1_1 != latin1_2 || !java_lang_String::value_equals(value1, value2), "Table entries must not have identical arrays");
entry2 = (*entry2)->next_addr();
}
entry1 = (*entry1)->next_addr();
--- a/src/hotspot/share/gc/shared/stringdedup/stringDedupTable.hpp Tue Mar 12 09:49:10 2019 +0000
+++ b/src/hotspot/share/gc/shared/stringdedup/stringDedupTable.hpp Sat Mar 16 21:00:45 2019 +0000
@@ -199,8 +199,6 @@
return _table->_hash_seed == 0;
}
- static bool equals(typeArrayOop value1, typeArrayOop value2);
-
// Computes the hash code for the given character array, using the
// currently active hash function and hash seed.
static unsigned int hash_code(typeArrayOop value, bool latin1);
--- a/src/hotspot/share/gc/shared/vmStructs_gc.hpp Tue Mar 12 09:49:10 2019 +0000
+++ b/src/hotspot/share/gc/shared/vmStructs_gc.hpp Sat Mar 16 21:00:45 2019 +0000
@@ -27,6 +27,7 @@
#include "gc/shared/ageTable.hpp"
#include "gc/shared/cardGeneration.hpp"
+#include "gc/shared/cardTable.hpp"
#include "gc/shared/cardTableRS.hpp"
#include "gc/shared/collectedHeap.hpp"
#include "gc/shared/genCollectedHeap.hpp"
@@ -119,12 +120,12 @@
nonstatic_field(CardTable, _last_valid_index, const size_t) \
nonstatic_field(CardTable, _page_size, const size_t) \
nonstatic_field(CardTable, _byte_map_size, const size_t) \
- nonstatic_field(CardTable, _byte_map, jbyte*) \
+ nonstatic_field(CardTable, _byte_map, CardTable::CardValue*) \
nonstatic_field(CardTable, _cur_covered_regions, int) \
nonstatic_field(CardTable, _covered, MemRegion*) \
nonstatic_field(CardTable, _committed, MemRegion*) \
nonstatic_field(CardTable, _guard_region, MemRegion) \
- nonstatic_field(CardTable, _byte_map_base, jbyte*) \
+ nonstatic_field(CardTable, _byte_map_base, CardTable::CardValue*) \
nonstatic_field(CardTableBarrierSet, _defer_initial_card_mark, bool) \
nonstatic_field(CardTableBarrierSet, _card_table, CardTable*) \
\
@@ -217,6 +218,7 @@
/* Miscellaneous other GC types */ \
\
declare_toplevel_type(AgeTable) \
+ declare_toplevel_type(CardTable::CardValue) \
declare_toplevel_type(Generation::StatRecord) \
declare_toplevel_type(GenerationSpec) \
declare_toplevel_type(HeapWord) \
--- a/src/hotspot/share/gc/shenandoah/c2/shenandoahBarrierSetC2.cpp Tue Mar 12 09:49:10 2019 +0000
+++ b/src/hotspot/share/gc/shenandoah/c2/shenandoahBarrierSetC2.cpp Sat Mar 16 21:00:45 2019 +0000
@@ -657,7 +657,7 @@
static_cast<const TypeOopPtr*>(val.type()), NULL /* pre_val */, access.type());
} else {
assert(access.is_opt_access(), "only for optimization passes");
- assert(((decorators & C2_TIGHLY_COUPLED_ALLOC) != 0 || !ShenandoahSATBBarrier) && (decorators & C2_ARRAY_COPY) != 0, "unexpected caller of this code");
+ assert(((decorators & C2_TIGHTLY_COUPLED_ALLOC) != 0 || !ShenandoahSATBBarrier) && (decorators & C2_ARRAY_COPY) != 0, "unexpected caller of this code");
C2OptAccess& opt_access = static_cast<C2OptAccess&>(access);
PhaseGVN& gvn = opt_access.gvn();
MergeMemNode* mm = opt_access.mem();
--- a/src/hotspot/share/gc/shenandoah/shenandoahBarrierSet.cpp Tue Mar 12 09:49:10 2019 +0000
+++ b/src/hotspot/share/gc/shenandoah/shenandoahBarrierSet.cpp Sat Mar 16 21:00:45 2019 +0000
@@ -22,7 +22,6 @@
*/
#include "precompiled.hpp"
-#include "gc/g1/g1BarrierSet.hpp"
#include "gc/shenandoah/shenandoahAsserts.hpp"
#include "gc/shenandoah/shenandoahBarrierSet.hpp"
#include "gc/shenandoah/shenandoahBarrierSetAssembler.hpp"
--- a/src/hotspot/share/gc/shenandoah/shenandoahHeap.cpp Tue Mar 12 09:49:10 2019 +0000
+++ b/src/hotspot/share/gc/shenandoah/shenandoahHeap.cpp Sat Mar 16 21:00:45 2019 +0000
@@ -86,25 +86,40 @@
void ShenandoahAssertToSpaceClosure::do_oop(oop* p) { do_oop_work(p); }
#endif
-class ShenandoahPretouchTask : public AbstractGangTask {
+class ShenandoahPretouchHeapTask : public AbstractGangTask {
private:
ShenandoahRegionIterator _regions;
- const size_t _bitmap_size;
const size_t _page_size;
- char* _bitmap_base;
public:
- ShenandoahPretouchTask(char* bitmap_base, size_t bitmap_size, size_t page_size) :
- AbstractGangTask("Shenandoah PreTouch"),
- _bitmap_size(bitmap_size),
- _page_size(page_size),
- _bitmap_base(bitmap_base) {
- }
+ ShenandoahPretouchHeapTask(size_t page_size) :
+ AbstractGangTask("Shenandoah Pretouch Heap"),
+ _page_size(page_size) {}
virtual void work(uint worker_id) {
ShenandoahHeapRegion* r = _regions.next();
while (r != NULL) {
os::pretouch_memory(r->bottom(), r->end(), _page_size);
-
+ r = _regions.next();
+ }
+ }
+};
+
+class ShenandoahPretouchBitmapTask : public AbstractGangTask {
+private:
+ ShenandoahRegionIterator _regions;
+ char* _bitmap_base;
+ const size_t _bitmap_size;
+ const size_t _page_size;
+public:
+ ShenandoahPretouchBitmapTask(char* bitmap_base, size_t bitmap_size, size_t page_size) :
+ AbstractGangTask("Shenandoah Pretouch Bitmap"),
+ _bitmap_base(bitmap_base),
+ _bitmap_size(bitmap_size),
+ _page_size(page_size) {}
+
+ virtual void work(uint worker_id) {
+ ShenandoahHeapRegion* r = _regions.next();
+ while (r != NULL) {
size_t start = r->region_number() * ShenandoahHeapRegion::region_size_bytes() / MarkBitMap::heap_map_factor();
size_t end = (r->region_number() + 1) * ShenandoahHeapRegion::region_size_bytes() / MarkBitMap::heap_map_factor();
assert (end <= _bitmap_size, "end is sane: " SIZE_FORMAT " < " SIZE_FORMAT, end, _bitmap_size);
@@ -121,73 +136,60 @@
initialize_heuristics();
+ //
+ // Figure out heap sizing
+ //
+
size_t init_byte_size = collector_policy()->initial_heap_byte_size();
- size_t max_byte_size = collector_policy()->max_heap_byte_size();
+ size_t max_byte_size = collector_policy()->max_heap_byte_size();
size_t heap_alignment = collector_policy()->heap_alignment();
+ size_t reg_size_bytes = ShenandoahHeapRegion::region_size_bytes();
+
if (ShenandoahAlwaysPreTouch) {
// Enabled pre-touch means the entire heap is committed right away.
init_byte_size = max_byte_size;
}
- Universe::check_alignment(max_byte_size,
- ShenandoahHeapRegion::region_size_bytes(),
- "shenandoah heap");
- Universe::check_alignment(init_byte_size,
- ShenandoahHeapRegion::region_size_bytes(),
- "shenandoah heap");
-
- ReservedSpace heap_rs = Universe::reserve_heap(max_byte_size,
- heap_alignment);
- initialize_reserved_region((HeapWord*)heap_rs.base(), (HeapWord*) (heap_rs.base() + heap_rs.size()));
-
- ReservedSpace pgc_rs = heap_rs.first_part(max_byte_size);
+ Universe::check_alignment(max_byte_size, reg_size_bytes, "Shenandoah heap");
+ Universe::check_alignment(init_byte_size, reg_size_bytes, "Shenandoah heap");
_num_regions = ShenandoahHeapRegion::region_count();
- size_t num_committed_regions = init_byte_size / ShenandoahHeapRegion::region_size_bytes();
+ size_t num_committed_regions = init_byte_size / reg_size_bytes;
num_committed_regions = MIN2(num_committed_regions, _num_regions);
assert(num_committed_regions <= _num_regions, "sanity");
- _initial_size = num_committed_regions * ShenandoahHeapRegion::region_size_bytes();
+ _initial_size = num_committed_regions * reg_size_bytes;
_committed = _initial_size;
- log_info(gc, heap)("Initialize Shenandoah heap with initial size " SIZE_FORMAT "%s",
- byte_size_in_proper_unit(_initial_size), proper_unit_for_byte_size(_initial_size));
- if (!os::commit_memory(pgc_rs.base(), _initial_size, false)) {
- vm_exit_out_of_memory(_initial_size, OOM_MMAP_ERROR, "Shenandoah failed to initialize heap");
- }
-
- size_t reg_size_words = ShenandoahHeapRegion::region_size_words();
- size_t reg_size_bytes = ShenandoahHeapRegion::region_size_bytes();
-
- _regions = NEW_C_HEAP_ARRAY(ShenandoahHeapRegion*, _num_regions, mtGC);
- _free_set = new ShenandoahFreeSet(this, _num_regions);
-
- _collection_set = new ShenandoahCollectionSet(this, (HeapWord*)pgc_rs.base());
-
- if (ShenandoahPacing) {
- _pacer = new ShenandoahPacer(this);
- _pacer->setup_for_idle();
- } else {
- _pacer = NULL;
- }
+ size_t heap_page_size = UseLargePages ? (size_t)os::large_page_size() : (size_t)os::vm_page_size();
+ size_t bitmap_page_size = UseLargePages ? (size_t)os::large_page_size() : (size_t)os::vm_page_size();
+
+ //
+ // Reserve and commit memory for heap
+ //
+
+ ReservedSpace heap_rs = Universe::reserve_heap(max_byte_size, heap_alignment);
+ initialize_reserved_region((HeapWord*)heap_rs.base(), (HeapWord*) (heap_rs.base() + heap_rs.size()));
+ _heap_region = MemRegion((HeapWord*)heap_rs.base(), heap_rs.size() / HeapWordSize);
+ _heap_region_special = heap_rs.special();
assert((((size_t) base()) & ShenandoahHeapRegion::region_size_bytes_mask()) == 0,
- "misaligned heap: " PTR_FORMAT, p2i(base()));
-
- // The call below uses stuff (the SATB* things) that are in G1, but probably
- // belong into a shared location.
- ShenandoahBarrierSet::satb_mark_queue_set().initialize(this,
- SATB_Q_CBL_mon,
- 20 /* G1SATBProcessCompletedThreshold */,
- 60 /* G1SATBBufferEnqueueingThresholdPercent */);
-
- // Reserve space for prev and next bitmap.
- size_t bitmap_page_size = UseLargePages ? (size_t)os::large_page_size() : (size_t)os::vm_page_size();
+ "Misaligned heap: " PTR_FORMAT, p2i(base()));
+
+ ReservedSpace sh_rs = heap_rs.first_part(max_byte_size);
+ if (!_heap_region_special) {
+ os::commit_memory_or_exit(sh_rs.base(), _initial_size, heap_alignment, false,
+ "Cannot commit heap memory");
+ }
+
+ //
+ // Reserve and commit memory for bitmap(s)
+ //
+
_bitmap_size = MarkBitMap::compute_size(heap_rs.size());
_bitmap_size = align_up(_bitmap_size, bitmap_page_size);
- _heap_region = MemRegion((HeapWord*) heap_rs.base(), heap_rs.size() / HeapWordSize);
size_t bitmap_bytes_per_region = reg_size_bytes / MarkBitMap::heap_map_factor();
@@ -212,38 +214,57 @@
"Bitmap slices should be page-granular: bps = " SIZE_FORMAT ", page size = " SIZE_FORMAT,
_bitmap_bytes_per_slice, bitmap_page_size);
- ReservedSpace bitmap0(_bitmap_size, bitmap_page_size);
- MemTracker::record_virtual_memory_type(bitmap0.base(), mtGC);
- _bitmap_region = MemRegion((HeapWord*) bitmap0.base(), bitmap0.size() / HeapWordSize);
+ ReservedSpace bitmap(_bitmap_size, bitmap_page_size);
+ MemTracker::record_virtual_memory_type(bitmap.base(), mtGC);
+ _bitmap_region = MemRegion((HeapWord*) bitmap.base(), bitmap.size() / HeapWordSize);
+ _bitmap_region_special = bitmap.special();
size_t bitmap_init_commit = _bitmap_bytes_per_slice *
align_up(num_committed_regions, _bitmap_regions_per_slice) / _bitmap_regions_per_slice;
bitmap_init_commit = MIN2(_bitmap_size, bitmap_init_commit);
- os::commit_memory_or_exit((char *) (_bitmap_region.start()), bitmap_init_commit, false,
- "couldn't allocate initial bitmap");
-
- size_t page_size = UseLargePages ? (size_t)os::large_page_size() : (size_t)os::vm_page_size();
+ if (!_bitmap_region_special) {
+ os::commit_memory_or_exit((char *) _bitmap_region.start(), bitmap_init_commit, bitmap_page_size, false,
+ "Cannot commit bitmap memory");
+ }
+
+ _marking_context = new ShenandoahMarkingContext(_heap_region, _bitmap_region, _num_regions);
if (ShenandoahVerify) {
- ReservedSpace verify_bitmap(_bitmap_size, page_size);
- os::commit_memory_or_exit(verify_bitmap.base(), verify_bitmap.size(), false,
- "couldn't allocate verification bitmap");
+ ReservedSpace verify_bitmap(_bitmap_size, bitmap_page_size);
+ if (!verify_bitmap.special()) {
+ os::commit_memory_or_exit(verify_bitmap.base(), verify_bitmap.size(), bitmap_page_size, false,
+ "Cannot commit verification bitmap memory");
+ }
MemTracker::record_virtual_memory_type(verify_bitmap.base(), mtGC);
MemRegion verify_bitmap_region = MemRegion((HeapWord *) verify_bitmap.base(), verify_bitmap.size() / HeapWordSize);
_verification_bit_map.initialize(_heap_region, verify_bitmap_region);
_verifier = new ShenandoahVerifier(this, &_verification_bit_map);
}
- _marking_context = new ShenandoahMarkingContext(_heap_region, _bitmap_region, _num_regions);
+ // Reserve aux bitmap for use in object_iterate(). We don't commit it here.
+ ReservedSpace aux_bitmap(_bitmap_size, bitmap_page_size);
+ MemTracker::record_virtual_memory_type(aux_bitmap.base(), mtGC);
+ _aux_bitmap_region = MemRegion((HeapWord*) aux_bitmap.base(), aux_bitmap.size() / HeapWordSize);
+ _aux_bitmap_region_special = aux_bitmap.special();
+ _aux_bit_map.initialize(_heap_region, _aux_bitmap_region);
+
+ //
+ // Create regions and region sets
+ //
+
+ _regions = NEW_C_HEAP_ARRAY(ShenandoahHeapRegion*, _num_regions, mtGC);
+ _free_set = new ShenandoahFreeSet(this, _num_regions);
+ _collection_set = new ShenandoahCollectionSet(this, (HeapWord*)sh_rs.base());
{
ShenandoahHeapLocker locker(lock());
+
+ size_t size_words = ShenandoahHeapRegion::region_size_words();
+
for (size_t i = 0; i < _num_regions; i++) {
- ShenandoahHeapRegion* r = new ShenandoahHeapRegion(this,
- (HeapWord*) pgc_rs.base() + reg_size_words * i,
- reg_size_words,
- i,
- i < num_committed_regions);
+ HeapWord* start = (HeapWord*)sh_rs.base() + size_words * i;
+ bool is_committed = i < num_committed_regions;
+ ShenandoahHeapRegion* r = new ShenandoahHeapRegion(this, start, size_words, i, is_committed);
_marking_context->initialize_top_at_mark_start(r);
_regions[i] = r;
@@ -257,46 +278,43 @@
}
if (ShenandoahAlwaysPreTouch) {
- assert (!AlwaysPreTouch, "Should have been overridden");
+ assert(!AlwaysPreTouch, "Should have been overridden");
// For NUMA, it is important to pre-touch the storage under bitmaps with worker threads,
// before initialize() below zeroes it with initializing thread. For any given region,
// we touch the region and the corresponding bitmaps from the same thread.
ShenandoahPushWorkerScope scope(workers(), _max_workers, false);
- log_info(gc, heap)("Parallel pretouch " SIZE_FORMAT " regions with " SIZE_FORMAT " byte pages",
- _num_regions, page_size);
- ShenandoahPretouchTask cl(bitmap0.base(), _bitmap_size, page_size);
- _workers->run_task(&cl);
+ size_t pretouch_heap_page_size = heap_page_size;
+ size_t pretouch_bitmap_page_size = bitmap_page_size;
+
+#ifdef LINUX
+ // UseTransparentHugePages would madvise that backing memory can be coalesced into huge
+ // pages. But, the kernel needs to know that every small page is used, in order to coalesce
+ // them into huge one. Therefore, we need to pretouch with smaller pages.
+ if (UseTransparentHugePages) {
+ pretouch_heap_page_size = (size_t)os::vm_page_size();
+ pretouch_bitmap_page_size = (size_t)os::vm_page_size();
+ }
+#endif
+
+ // OS memory managers may want to coalesce back-to-back pages. Make their jobs
+ // simpler by pre-touching continuous spaces (heap and bitmap) separately.
+
+ log_info(gc, init)("Pretouch bitmap: " SIZE_FORMAT " regions, " SIZE_FORMAT " bytes page",
+ _num_regions, pretouch_bitmap_page_size);
+ ShenandoahPretouchBitmapTask bcl(bitmap.base(), _bitmap_size, pretouch_bitmap_page_size);
+ _workers->run_task(&bcl);
+
+ log_info(gc, init)("Pretouch heap: " SIZE_FORMAT " regions, " SIZE_FORMAT " bytes page",
+ _num_regions, pretouch_heap_page_size);
+ ShenandoahPretouchHeapTask hcl(pretouch_heap_page_size);
+ _workers->run_task(&hcl);
}
- // Reserve aux bitmap for use in object_iterate(). We don't commit it here.
- ReservedSpace aux_bitmap(_bitmap_size, bitmap_page_size);
- MemTracker::record_virtual_memory_type(aux_bitmap.base(), mtGC);
- _aux_bitmap_region = MemRegion((HeapWord*) aux_bitmap.base(), aux_bitmap.size() / HeapWordSize);
- _aux_bit_map.initialize(_heap_region, _aux_bitmap_region);
-
- _traversal_gc = heuristics()->can_do_traversal_gc() ?
- new ShenandoahTraversalGC(this, _num_regions) :
- NULL;
-
- _monitoring_support = new ShenandoahMonitoringSupport(this);
-
- _phase_timings = new ShenandoahPhaseTimings();
-
- if (ShenandoahAllocationTrace) {
- _alloc_tracker = new ShenandoahAllocTracker();
- }
-
- ShenandoahStringDedup::initialize();
-
- _control_thread = new ShenandoahControlThread();
-
- ShenandoahCodeRoots::initialize();
-
- log_info(gc, init)("Safepointing mechanism: %s",
- SafepointMechanism::uses_thread_local_poll() ? "thread-local poll" :
- (SafepointMechanism::uses_global_page_poll() ? "global-page poll" : "unknown"));
+ //
+ // Initialize the rest of GC subsystems
+ //
_liveness_cache = NEW_C_HEAP_ARRAY(jushort*, _max_workers, mtGC);
for (uint worker = 0; worker < _max_workers; worker++) {
@@ -304,6 +322,42 @@
Copy::fill_to_bytes(_liveness_cache[worker], _num_regions * sizeof(jushort));
}
+ // The call below uses stuff (the SATB* things) that are in G1, but probably
+ // belong into a shared location.
+ ShenandoahBarrierSet::satb_mark_queue_set().initialize(this,
+ SATB_Q_CBL_mon,
+ 20 /* G1SATBProcessCompletedThreshold */,
+ 60 /* G1SATBBufferEnqueueingThresholdPercent */);
+
+ _monitoring_support = new ShenandoahMonitoringSupport(this);
+ _phase_timings = new ShenandoahPhaseTimings();
+ ShenandoahStringDedup::initialize();
+ ShenandoahCodeRoots::initialize();
+
+ if (ShenandoahAllocationTrace) {
+ _alloc_tracker = new ShenandoahAllocTracker();
+ }
+
+ if (ShenandoahPacing) {
+ _pacer = new ShenandoahPacer(this);
+ _pacer->setup_for_idle();
+ } else {
+ _pacer = NULL;
+ }
+
+ _traversal_gc = heuristics()->can_do_traversal_gc() ?
+ new ShenandoahTraversalGC(this, _num_regions) :
+ NULL;
+
+ _control_thread = new ShenandoahControlThread();
+
+ log_info(gc, init)("Initialize Shenandoah heap with initial size " SIZE_FORMAT "%s",
+ byte_size_in_proper_unit(_initial_size), proper_unit_for_byte_size(_initial_size));
+
+ log_info(gc, init)("Safepointing mechanism: %s",
+ SafepointMechanism::uses_thread_local_poll() ? "thread-local poll" :
+ (SafepointMechanism::uses_global_page_poll() ? "global-page poll" : "unknown"));
+
return JNI_OK;
}
@@ -361,6 +415,7 @@
_max_workers(MAX2(ConcGCThreads, ParallelGCThreads)),
_workers(NULL),
_safepoint_workers(NULL),
+ _heap_region_special(false),
_num_regions(0),
_regions(NULL),
_update_refs_iterator(this),
@@ -383,6 +438,12 @@
_soft_ref_policy(),
_ref_processor(NULL),
_marking_context(NULL),
+ _bitmap_size(0),
+ _bitmap_regions_per_slice(0),
+ _bitmap_bytes_per_slice(0),
+ _bitmap_region_special(false),
+ _aux_bitmap_region_special(false),
+ _liveness_cache(NULL),
_collection_set(NULL)
{
log_info(gc, init)("GC threads: " UINT32_FORMAT " parallel, " UINT32_FORMAT " concurrent", ParallelGCThreads, ConcGCThreads);
@@ -1131,12 +1192,6 @@
return NULL;
}
-size_t ShenandoahHeap::block_size(const HeapWord* addr) const {
- Space* sp = heap_region_containing(addr);
- assert(sp != NULL, "block_size of address outside of heap");
- return sp->block_size(addr);
-}
-
bool ShenandoahHeap::block_is_obj(const HeapWord* addr) const {
Space* sp = heap_region_containing(addr);
return sp->block_is_obj(addr);
@@ -1267,7 +1322,7 @@
*/
void ShenandoahHeap::object_iterate(ObjectClosure* cl) {
assert(SafepointSynchronize::is_at_safepoint(), "safe iteration is only available during safepoints");
- if (!os::commit_memory((char*)_aux_bitmap_region.start(), _aux_bitmap_region.byte_size(), false)) {
+ if (!_aux_bitmap_region_special && !os::commit_memory((char*)_aux_bitmap_region.start(), _aux_bitmap_region.byte_size(), false)) {
log_warning(gc)("Could not commit native memory for auxiliary marking bitmap for heap iteration");
return;
}
@@ -1294,7 +1349,7 @@
assert(oop_stack.is_empty(), "should be empty");
- if (!os::uncommit_memory((char*)_aux_bitmap_region.start(), _aux_bitmap_region.byte_size())) {
+ if (!_aux_bitmap_region_special && !os::uncommit_memory((char*)_aux_bitmap_region.start(), _aux_bitmap_region.byte_size())) {
log_warning(gc)("Could not uncommit native memory for auxiliary marking bitmap for heap iteration");
}
}
@@ -2221,6 +2276,11 @@
bool ShenandoahHeap::commit_bitmap_slice(ShenandoahHeapRegion* r) {
assert_heaplock_owned_by_current_thread();
+ // Bitmaps in special regions do not need commits
+ if (_bitmap_region_special) {
+ return true;
+ }
+
if (is_bitmap_slice_committed(r, true)) {
// Some other region from the group is already committed, meaning the bitmap
// slice is already committed, we exit right away.
@@ -2240,6 +2300,11 @@
bool ShenandoahHeap::uncommit_bitmap_slice(ShenandoahHeapRegion *r) {
assert_heaplock_owned_by_current_thread();
+ // Bitmaps in special regions do not need uncommits
+ if (_bitmap_region_special) {
+ return true;
+ }
+
if (is_bitmap_slice_committed(r, true)) {
// Some other region from the group is still committed, meaning the bitmap
// slice is should stay committed, exit right away.
@@ -2768,6 +2833,7 @@
jushort* ShenandoahHeap::get_liveness_cache(uint worker_id) {
#ifdef ASSERT
+ assert(_liveness_cache != NULL, "sanity");
assert(worker_id < _max_workers, "sanity");
for (uint i = 0; i < num_regions(); i++) {
assert(_liveness_cache[worker_id][i] == 0, "liveness cache should be empty");
@@ -2778,6 +2844,7 @@
void ShenandoahHeap::flush_liveness_cache(uint worker_id) {
assert(worker_id < _max_workers, "sanity");
+ assert(_liveness_cache != NULL, "sanity");
jushort* ld = _liveness_cache[worker_id];
for (uint i = 0; i < num_regions(); i++) {
ShenandoahHeapRegion* r = get_region(i);
--- a/src/hotspot/share/gc/shenandoah/shenandoahHeap.hpp Tue Mar 12 09:49:10 2019 +0000
+++ b/src/hotspot/share/gc/shenandoah/shenandoahHeap.hpp Sat Mar 16 21:00:45 2019 +0000
@@ -242,12 +242,14 @@
//
private:
MemRegion _heap_region;
+ bool _heap_region_special;
size_t _num_regions;
ShenandoahHeapRegion** _regions;
ShenandoahRegionIterator _update_refs_iterator;
public:
inline size_t num_regions() const { return _num_regions; }
+ inline bool is_heap_region_special() { return _heap_region_special; }
inline ShenandoahHeapRegion* const heap_region_containing(const void* addr) const;
inline size_t heap_region_index_containing(const void* addr) const;
@@ -486,7 +488,7 @@
ShenandoahFreeSet* free_set() const { return _free_set; }
ShenandoahConcurrentMark* concurrent_mark() { return _scm; }
ShenandoahTraversalGC* traversal_gc() { return _traversal_gc; }
- ShenandoahPacer* pacer() const { return _pacer; }
+ ShenandoahPacer* pacer() const { return _pacer; }
ShenandoahPhaseTimings* phase_timings() const { return _phase_timings; }
ShenandoahAllocTracker* alloc_tracker() const { return _alloc_tracker; }
@@ -557,15 +559,11 @@
size_t obj_size(oop obj) const;
virtual ptrdiff_t cell_header_size() const;
- // All objects can potentially move
- bool is_scavengable(oop obj) { return true; };
-
void collect(GCCause::Cause cause);
void do_full_collection(bool clear_all_soft_refs);
// Used for parsing heap during error printing
HeapWord* block_start(const void* addr) const;
- size_t block_size(const HeapWord* addr) const;
bool block_is_obj(const HeapWord* addr) const;
// Used for native heap walkers: heap dumpers, mostly
@@ -649,6 +647,9 @@
size_t _bitmap_regions_per_slice;
size_t _bitmap_bytes_per_slice;
+ bool _bitmap_region_special;
+ bool _aux_bitmap_region_special;
+
// Used for buffering per-region liveness data.
// Needed since ShenandoahHeapRegion uses atomics to update liveness.
//
--- a/src/hotspot/share/gc/shenandoah/shenandoahHeapRegion.cpp Tue Mar 12 09:49:10 2019 +0000
+++ b/src/hotspot/share/gc/shenandoah/shenandoahHeapRegion.cpp Sat Mar 16 21:00:45 2019 +0000
@@ -56,7 +56,6 @@
ShenandoahHeapRegion::ShenandoahHeapRegion(ShenandoahHeap* heap, HeapWord* start,
size_t size_words, size_t index, bool committed) :
_heap(heap),
- _pacer(ShenandoahPacing ? heap->pacer() : NULL),
_reserved(MemRegion(start, size_words)),
_region_number(index),
_new_top(NULL),
@@ -660,7 +659,7 @@
}
void ShenandoahHeapRegion::do_commit() {
- if (!os::commit_memory((char *) _reserved.start(), _reserved.byte_size(), false)) {
+ if (!_heap->is_heap_region_special() && !os::commit_memory((char *) _reserved.start(), _reserved.byte_size(), false)) {
report_java_out_of_memory("Unable to commit region");
}
if (!_heap->commit_bitmap_slice(this)) {
@@ -670,7 +669,7 @@
}
void ShenandoahHeapRegion::do_uncommit() {
- if (!os::uncommit_memory((char *) _reserved.start(), _reserved.byte_size())) {
+ if (!_heap->is_heap_region_special() && !os::uncommit_memory((char *) _reserved.start(), _reserved.byte_size())) {
report_java_out_of_memory("Unable to uncommit region");
}
if (!_heap->uncommit_bitmap_slice(this)) {
--- a/src/hotspot/share/gc/shenandoah/shenandoahHeapRegion.hpp Tue Mar 12 09:49:10 2019 +0000
+++ b/src/hotspot/share/gc/shenandoah/shenandoahHeapRegion.hpp Sat Mar 16 21:00:45 2019 +0000
@@ -227,7 +227,6 @@
// Never updated fields
ShenandoahHeap* _heap;
- ShenandoahPacer* _pacer;
MemRegion _reserved;
size_t _region_number;
--- a/src/hotspot/share/gc/shenandoah/shenandoahHeapRegion.inline.hpp Tue Mar 12 09:49:10 2019 +0000
+++ b/src/hotspot/share/gc/shenandoah/shenandoahHeapRegion.inline.hpp Sat Mar 16 21:00:45 2019 +0000
@@ -94,7 +94,7 @@
inline void ShenandoahHeapRegion::increase_live_data_gc_words(size_t s) {
internal_increase_live_data(s);
if (ShenandoahPacing) {
- _pacer->report_mark(s);
+ _heap->pacer()->report_mark(s);
}
}
--- a/src/hotspot/share/gc/shenandoah/shenandoahMarkCompact.cpp Tue Mar 12 09:49:10 2019 +0000
+++ b/src/hotspot/share/gc/shenandoah/shenandoahMarkCompact.cpp Sat Mar 16 21:00:45 2019 +0000
@@ -123,8 +123,6 @@
heap->make_parsable(true);
- CodeCache::gc_prologue();
-
OrderAccess::fence();
phase1_mark_heap();
@@ -168,7 +166,6 @@
}
FREE_C_HEAP_ARRAY(ShenandoahHeapRegionSet*, worker_slices);
- CodeCache::gc_epilogue();
JvmtiExport::gc_epilogue();
heap->set_full_gc_move_in_progress(false);
--- a/src/hotspot/share/gc/shenandoah/shenandoahPhaseTimings.hpp Tue Mar 12 09:49:10 2019 +0000
+++ b/src/hotspot/share/gc/shenandoah/shenandoahPhaseTimings.hpp Sat Mar 16 21:00:45 2019 +0000
@@ -47,7 +47,11 @@
f(scan_code_roots, " S: Code Cache Roots") \
f(scan_universe_roots, " S: Universe Roots") \
f(scan_jni_roots, " S: JNI Roots") \
+ f(scan_jvmti_weak_roots, " S: JVMTI Weak Roots") \
+ f(scan_jfr_weak_roots, " S: JFR Weak Roots") \
f(scan_jni_weak_roots, " S: JNI Weak Roots") \
+ f(scan_stringtable_roots, " S: String Table Roots") \
+ f(scan_vm_weak_roots, " S: VM Weak Roots") \
f(scan_synchronizer_roots, " S: Synchronizer Roots") \
f(scan_management_roots, " S: Management Roots") \
f(scan_system_dictionary_roots, " S: System Dict Roots") \
@@ -68,7 +72,11 @@
f(update_code_roots, " U: Code Cache Roots") \
f(update_universe_roots, " U: Universe Roots") \
f(update_jni_roots, " U: JNI Roots") \
+ f(update_jvmti_weak_roots, " U: JVMTI Weak Roots") \
+ f(update_jfr_weak_roots, " U: JFR Weak Roots") \
f(update_jni_weak_roots, " U: JNI Weak Roots") \
+ f(update_stringtable_roots, " U: String Table Roots") \
+ f(update_vm_weak_roots, " U: VM Weak Roots") \
f(update_synchronizer_roots, " U: Synchronizer Roots") \
f(update_management_roots, " U: Management Roots") \
f(update_system_dictionary_roots, " U: System Dict Roots") \
@@ -97,7 +105,11 @@
f(evac_code_roots, " E: Code Cache Roots") \
f(evac_universe_roots, " E: Universe Roots") \
f(evac_jni_roots, " E: JNI Roots") \
+ f(evac_jvmti_weak_roots, " E: JVMTI Weak Roots") \
+ f(evac_jfr_weak_roots, " E: JFR Weak Roots") \
f(evac_jni_weak_roots, " E: JNI Weak Roots") \
+ f(evac_stringtable_roots, " E: String Table Roots") \
+ f(evac_vm_weak_roots, " E: VM Weak Roots") \
f(evac_synchronizer_roots, " E: Synchronizer Roots") \
f(evac_management_roots, " E: Management Roots") \
f(evac_system_dictionary_roots, " E: System Dict Roots") \
@@ -123,7 +135,11 @@
f(final_update_refs_code_roots, " UR: Code Cache Roots") \
f(final_update_refs_universe_roots, " UR: Universe Roots") \
f(final_update_refs_jni_roots, " UR: JNI Roots") \
- f(final_update_refs_jni_weak_roots, " UR: JNI Weak Roots") \
+ f(final_update_jvmti_weak_roots, " UR: JVMTI Weak Roots") \
+ f(final_update_jfr_weak_roots, " UR: JFR Weak Roots") \
+ f(final_update_jni_weak_roots, " UR: JNI Weak Roots") \
+ f(final_update_stringtable_roots, " UR: String Table Roots") \
+ f(final_update_vm_weak_roots, " UR: VM Weak Roots") \
f(final_update_refs_synchronizer_roots, " UR: Synchronizer Roots") \
f(final_update_refs_management_roots, " UR: Management Roots") \
f(final_update_refs_system_dict_roots, " UR: System Dict Roots") \
@@ -144,7 +160,11 @@
f(degen_gc_update_code_roots, " DU: Code Cache Roots") \
f(degen_gc_update_universe_roots, " DU: Universe Roots") \
f(degen_gc_update_jni_roots, " DU: JNI Roots") \
+ f(degen_gc_update_jvmti_weak_roots, " DU: JVMTI Weak Roots") \
+ f(degen_gc_update_jfr_weak_roots, " DU: JFR Weak Roots") \
f(degen_gc_update_jni_weak_roots, " DU: JNI Weak Roots") \
+ f(degen_gc_update_stringtable_roots, " DU: String Table Roots") \
+ f(degen_gc_update_vm_weak_roots, " DU: VM Weak Roots") \
f(degen_gc_update_synchronizer_roots, " DU: Synchronizer Roots") \
f(degen_gc_update_management_roots, " DU: Management Roots") \
f(degen_gc_update_system_dict_roots, " DU: System Dict Roots") \
@@ -166,7 +186,11 @@
f(init_traversal_gc_code_roots, " TI: Code Cache Roots") \
f(init_traversal_gc_universe_roots, " TI: Universe Roots") \
f(init_traversal_gc_jni_roots, " TI: JNI Roots") \
+ f(init_traversal_gc_jvmti_weak_roots, " TI: JVMTI Weak Roots") \
+ f(init_traversal_gc_jfr_weak_roots, " TI: JFR Weak Roots") \
f(init_traversal_gc_jni_weak_roots, " TI: JNI Weak Roots") \
+ f(init_traversal_gc_stringtable_roots, " TI: String Table Roots") \
+ f(init_traversal_gc_vm_weak_roots, " TI: VM Weak Roots") \
f(init_traversal_gc_synchronizer_roots, " TI: Synchronizer Roots") \
f(init_traversal_gc_management_roots, " TI: Management Roots") \
f(init_traversal_gc_system_dict_roots, " TI: System Dict Roots") \
@@ -185,7 +209,11 @@
f(final_traversal_gc_code_roots, " TF: Code Cache Roots") \
f(final_traversal_gc_universe_roots, " TF: Universe Roots") \
f(final_traversal_gc_jni_roots, " TF: JNI Roots") \
+ f(final_traversal_gc_jvmti_weak_roots, " TF: JVMTI Weak Roots") \
+ f(final_traversal_gc_jfr_weak_roots, " TF: JFR Weak Roots") \
f(final_traversal_gc_jni_weak_roots, " TF: JNI Weak Roots") \
+ f(final_traversal_gc_stringtable_roots, " TF: String Table Roots") \
+ f(final_traversal_gc_vm_weak_roots, " TF: VM Weak Roots") \
f(final_traversal_gc_synchronizer_roots, " TF: Synchronizer Roots") \
f(final_traversal_gc_management_roots, " TF: Management Roots") \
f(final_traversal_gc_system_dict_roots, " TF: System Dict Roots") \
@@ -202,7 +230,11 @@
f(final_traversal_update_code_roots, " TU: Code Cache Roots") \
f(final_traversal_update_universe_roots, " TU: Universe Roots") \
f(final_traversal_update_jni_roots, " TU: JNI Roots") \
+ f(final_traversal_update_jvmti_weak_roots, " TU: JVMTI Weak Roots") \
+ f(final_traversal_update_jfr_weak_roots, " TU: JFR Weak Roots") \
f(final_traversal_update_jni_weak_roots, " TU: JNI Weak Roots") \
+ f(final_traversal_update_stringtable_roots, " TU: String Table Roots") \
+ f(final_traversal_update_vm_weak_roots, " TU: VM Weak Roots") \
f(final_traversal_update_synchronizer_roots, " TU: Synchronizer Roots") \
f(final_traversal_update_management_roots, " TU: Management Roots") \
f(final_traversal_update_system_dict_roots, " TU: System Dict Roots") \
@@ -225,7 +257,11 @@
f(full_gc_code_roots, " F: Code Cache Roots") \
f(full_gc_universe_roots, " F: Universe Roots") \
f(full_gc_jni_roots, " F: JNI Roots") \
+ f(full_gc_jvmti_weak_roots, " F: JVMTI Weak Roots") \
+ f(full_gc_jfr_weak_roots, " F: JFR Weak Roots") \
f(full_gc_jni_weak_roots, " F: JNI Weak Roots") \
+ f(full_gc_stringtable_roots, " F: String Table Roots") \
+ f(full_gc_vm_weak_roots, " F: VM Weak Roots") \
f(full_gc_synchronizer_roots, " F: Synchronizer Roots") \
f(full_gc_management_roots, " F: Management Roots") \
f(full_gc_system_dictionary_roots, " F: System Dict Roots") \
@@ -279,7 +315,11 @@
f(CodeCacheRoots, "CodeCache Roots (ms):") \
f(UniverseRoots, "Universe Roots (ms):") \
f(JNIRoots, "JNI Handles Roots (ms):") \
+ f(JVMTIWeakRoots, "JVMTI Weak Roots (ms):") \
+ f(JFRWeakRoots, "JFR Weak Roots (ms):") \
f(JNIWeakRoots, "JNI Weak Roots (ms):") \
+ f(StringTableRoots, "StringTable Roots(ms):") \
+ f(VMWeakRoots, "VM Weak Roots(ms)") \
f(ObjectSynchronizerRoots, "ObjectSynchronizer Roots (ms):") \
f(ManagementRoots, "Management Roots (ms):") \
f(SystemDictionaryRoots, "SystemDictionary Roots (ms):") \
--- a/src/hotspot/share/gc/shenandoah/shenandoahRootProcessor.cpp Tue Mar 12 09:49:10 2019 +0000
+++ b/src/hotspot/share/gc/shenandoah/shenandoahRootProcessor.cpp Sat Mar 16 21:00:45 2019 +0000
@@ -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
@@ -34,21 +34,42 @@
#include "gc/shenandoah/shenandoahTimingTracker.hpp"
#include "gc/shenandoah/shenandoahUtils.hpp"
#include "gc/shenandoah/shenandoahVMOperations.hpp"
-#include "gc/shared/weakProcessor.hpp"
+#include "gc/shared/weakProcessor.inline.hpp"
#include "memory/allocation.inline.hpp"
#include "memory/iterator.hpp"
#include "memory/resourceArea.hpp"
#include "runtime/thread.hpp"
#include "services/management.hpp"
+struct PhaseMap {
+ WeakProcessorPhases::Phase _weak_processor_phase;
+ ShenandoahPhaseTimings::GCParPhases _shenandoah_phase;
+};
+
+static const struct PhaseMap phase_mapping[] = {
+#if INCLUDE_JVMTI
+ {WeakProcessorPhases::jvmti, ShenandoahPhaseTimings::JVMTIWeakRoots},
+#endif
+#if INCLUDE_JFR
+ {WeakProcessorPhases::jfr, ShenandoahPhaseTimings::JFRWeakRoots},
+#endif
+ {WeakProcessorPhases::jni, ShenandoahPhaseTimings::JNIWeakRoots},
+ {WeakProcessorPhases::stringtable, ShenandoahPhaseTimings::StringTableRoots},
+ {WeakProcessorPhases::vm, ShenandoahPhaseTimings::VMWeakRoots}
+};
+
+STATIC_ASSERT(sizeof(phase_mapping) / sizeof(PhaseMap) == WeakProcessorPhases::phase_count);
+
ShenandoahRootProcessor::ShenandoahRootProcessor(ShenandoahHeap* heap, uint n_workers,
ShenandoahPhaseTimings::Phase phase) :
_process_strong_tasks(new SubTasksDone(SHENANDOAH_RP_PS_NumElements)),
_srs(n_workers),
_par_state_string(StringTable::weak_storage()),
_phase(phase),
- _coderoots_all_iterator(ShenandoahCodeRoots::iterator())
-{
+ _coderoots_all_iterator(ShenandoahCodeRoots::iterator()),
+ _weak_processor_timings(n_workers),
+ _weak_processor_task(&_weak_processor_timings, n_workers),
+ _processed_weak_roots(false) {
heap->phase_timings()->record_workers_start(_phase);
if (ShenandoahStringDedup::is_enabled()) {
@@ -62,9 +83,32 @@
StringDedup::gc_epilogue();
}
+ ShenandoahWorkerTimings* worker_times = ShenandoahHeap::heap()->phase_timings()->worker_times();
+
+ if (_processed_weak_roots) {
+ assert(_weak_processor_timings.max_threads() == n_workers(), "Must match");
+ for (uint index = 0; index < WeakProcessorPhases::phase_count; index ++) {
+ weak_processor_timing_to_shenandoah_timing(phase_mapping[index]._weak_processor_phase,
+ phase_mapping[index]._shenandoah_phase,
+ worker_times);
+ }
+ }
+
ShenandoahHeap::heap()->phase_timings()->record_workers_end(_phase);
}
+void ShenandoahRootProcessor::weak_processor_timing_to_shenandoah_timing(const WeakProcessorPhases::Phase wpp,
+ const ShenandoahPhaseTimings::GCParPhases spp,
+ ShenandoahWorkerTimings* worker_times) const {
+ if (WeakProcessorPhases::is_serial(wpp)) {
+ worker_times->record_time_secs(spp, 0, _weak_processor_timings.phase_time_sec(wpp));
+ } else {
+ for (uint index = 0; index < _weak_processor_timings.max_threads(); index ++) {
+ worker_times->record_time_secs(spp, index, _weak_processor_timings.worker_time_sec(index, wpp));
+ }
+ }
+}
+
void ShenandoahRootProcessor::process_all_roots_slow(OopClosure* oops) {
CLDToOopClosure clds(oops, ClassLoaderData::_claim_strong);
CodeBlobToOopClosure blobs(oops, !CodeBlobToOopClosure::FixRelocations);
@@ -192,10 +236,9 @@
SystemDictionary::oops_do(strong_roots);
}
if (jni_weak_roots != NULL) {
- if (_process_strong_tasks->try_claim_task(SHENANDOAH_RP_PS_JNIHandles_weak_oops_do)) {
- ShenandoahWorkerTimingsTracker timer(worker_times, ShenandoahPhaseTimings::JNIWeakRoots, worker_id);
- WeakProcessor::oops_do(jni_weak_roots);
- }
+ AlwaysTrueClosure always_true;
+ _weak_processor_task.work<AlwaysTrueClosure, OopClosure>(worker_id, &always_true, jni_weak_roots);
+ _processed_weak_roots = true;
}
if (ShenandoahStringDedup::is_enabled() && weak_roots != NULL) {
--- a/src/hotspot/share/gc/shenandoah/shenandoahRootProcessor.hpp Tue Mar 12 09:49:10 2019 +0000
+++ b/src/hotspot/share/gc/shenandoah/shenandoahRootProcessor.hpp Sat Mar 16 21:00:45 2019 +0000
@@ -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,8 @@
#include "gc/shenandoah/shenandoahHeap.hpp"
#include "gc/shenandoah/shenandoahPhaseTimings.hpp"
#include "gc/shared/strongRootsScope.hpp"
+#include "gc/shared/weakProcessor.hpp"
+#include "gc/shared/weakProcessorPhaseTimes.hpp"
#include "gc/shared/workgroup.hpp"
#include "memory/allocation.hpp"
#include "memory/iterator.hpp"
@@ -43,7 +45,6 @@
enum Shenandoah_process_roots_tasks {
SHENANDOAH_RP_PS_Universe_oops_do,
SHENANDOAH_RP_PS_JNIHandles_oops_do,
- SHENANDOAH_RP_PS_JNIHandles_weak_oops_do,
SHENANDOAH_RP_PS_ObjectSynchronizer_oops_do,
SHENANDOAH_RP_PS_Management_oops_do,
SHENANDOAH_RP_PS_SystemDictionary_oops_do,
@@ -60,6 +61,9 @@
ParallelCLDRootIterator _cld_iterator;
ShenandoahAllCodeRootsIterator _coderoots_all_iterator;
CodeBlobClosure* _threads_nmethods_cl;
+ WeakProcessorPhaseTimes _weak_processor_timings;
+ WeakProcessor::Task _weak_processor_task;
+ bool _processed_weak_roots;
void process_java_roots(OopClosure* scan_non_heap_roots,
CLDClosure* scan_strong_clds,
@@ -73,6 +77,10 @@
OopClosure* weak_jni_roots,
uint worker_i);
+ void weak_processor_timing_to_shenandoah_timing(const WeakProcessorPhases::Phase wpp,
+ const ShenandoahPhaseTimings::GCParPhases spp,
+ ShenandoahWorkerTimings* worker_times) const;
+
public:
ShenandoahRootProcessor(ShenandoahHeap* heap, uint n_workers,
ShenandoahPhaseTimings::Phase phase);
--- a/src/hotspot/share/gc/z/vmStructs_z.hpp Tue Mar 12 09:49:10 2019 +0000
+++ b/src/hotspot/share/gc/z/vmStructs_z.hpp Sat Mar 16 21:00:45 2019 +0000
@@ -24,8 +24,8 @@
#ifndef SHARE_GC_Z_VMSTRUCTS_Z_HPP
#define SHARE_GC_Z_VMSTRUCTS_Z_HPP
-#include "gc/z/zAddressRangeMap.hpp"
#include "gc/z/zCollectedHeap.hpp"
+#include "gc/z/zGranuleMap.hpp"
#include "gc/z/zHeap.hpp"
#include "gc/z/zPageAllocator.hpp"
#include "gc/z/zPhysicalMemory.hpp"
@@ -52,7 +52,7 @@
const int* _ZObjectAlignmentSmall;
};
-typedef ZAddressRangeMap<ZPageTableEntry, ZPageSizeMinShift> ZAddressRangeMapForPageTable;
+typedef ZGranuleMap<ZPageTableEntry> ZGranuleMapForPageTable;
#define VM_STRUCTS_ZGC(nonstatic_field, volatile_nonstatic_field, static_field) \
static_field(ZGlobalsForVMStructs, _instance_p, ZGlobalsForVMStructs*) \
@@ -79,18 +79,18 @@
nonstatic_field(ZPageAllocator, _physical, ZPhysicalMemoryManager) \
nonstatic_field(ZPageAllocator, _used, size_t) \
\
- nonstatic_field(ZPageTable, _map, ZAddressRangeMapForPageTable) \
+ nonstatic_field(ZPageTable, _map, ZGranuleMapForPageTable) \
\
- nonstatic_field(ZAddressRangeMapForPageTable, _map, ZPageTableEntry* const) \
+ nonstatic_field(ZGranuleMapForPageTable, _map, ZPageTableEntry* const) \
\
- nonstatic_field(ZVirtualMemory, _start, uintptr_t) \
- nonstatic_field(ZVirtualMemory, _end, uintptr_t) \
+ nonstatic_field(ZVirtualMemory, _start, uintptr_t) \
+ nonstatic_field(ZVirtualMemory, _end, uintptr_t) \
\
- nonstatic_field(ZForwardingTable, _table, ZForwardingTableEntry*) \
- nonstatic_field(ZForwardingTable, _size, size_t) \
+ nonstatic_field(ZForwardingTable, _table, ZForwardingTableEntry*) \
+ nonstatic_field(ZForwardingTable, _size, size_t) \
\
- nonstatic_field(ZPhysicalMemoryManager, _max_capacity, const size_t) \
- nonstatic_field(ZPhysicalMemoryManager, _capacity, size_t)
+ nonstatic_field(ZPhysicalMemoryManager, _max_capacity, const size_t) \
+ nonstatic_field(ZPhysicalMemoryManager, _capacity, size_t)
#define VM_INT_CONSTANTS_ZGC(declare_constant, declare_constant_with_value) \
declare_constant(ZPhaseRelocate) \
@@ -101,9 +101,9 @@
declare_constant(ZObjectAlignmentLargeShift)
#define VM_LONG_CONSTANTS_ZGC(declare_constant) \
+ declare_constant(ZGranuleSizeShift) \
declare_constant(ZPageSizeSmallShift) \
declare_constant(ZPageSizeMediumShift) \
- declare_constant(ZPageSizeMinShift) \
declare_constant(ZAddressOffsetShift) \
declare_constant(ZAddressOffsetBits) \
declare_constant(ZAddressOffsetMask) \
@@ -118,7 +118,7 @@
declare_toplevel_type(ZPageAllocator) \
declare_toplevel_type(ZPageTable) \
declare_toplevel_type(ZPageTableEntry) \
- declare_toplevel_type(ZAddressRangeMapForPageTable) \
+ declare_toplevel_type(ZGranuleMapForPageTable) \
declare_toplevel_type(ZVirtualMemory) \
declare_toplevel_type(ZForwardingTable) \
declare_toplevel_type(ZForwardingTableEntry) \
--- a/src/hotspot/share/gc/z/zAddressRangeMap.hpp Tue Mar 12 09:49:10 2019 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,63 +0,0 @@
-/*
- * Copyright (c) 2017, 2018, Oracle and/or its affiliates. All rights reserved.
- * 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_Z_ZADDRESSRANGEMAP_HPP
-#define SHARE_GC_Z_ZADDRESSRANGEMAP_HPP
-
-#include "memory/allocation.hpp"
-
-template<typename T, size_t AddressRangeShift>
-class ZAddressRangeMapIterator;
-
-template <typename T, size_t AddressRangeShift>
-class ZAddressRangeMap {
- friend class VMStructs;
- friend class ZAddressRangeMapIterator<T, AddressRangeShift>;
-
-private:
- T* const _map;
-
- size_t index_for_addr(uintptr_t addr) const;
- size_t size() const;
-
-public:
- ZAddressRangeMap();
- ~ZAddressRangeMap();
-
- T get(uintptr_t addr) const;
- void put(uintptr_t addr, T value);
-};
-
-template <typename T, size_t AddressRangeShift>
-class ZAddressRangeMapIterator : public StackObj {
-public:
- const ZAddressRangeMap<T, AddressRangeShift>* const _map;
- size_t _next;
-
-public:
- ZAddressRangeMapIterator(const ZAddressRangeMap<T, AddressRangeShift>* map);
-
- bool next(T* value);
-};
-
-#endif // SHARE_GC_Z_ZADDRESSRANGEMAP_HPP
--- a/src/hotspot/share/gc/z/zAddressRangeMap.inline.hpp Tue Mar 12 09:49:10 2019 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,84 +0,0 @@
-/*
- * Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
- * 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_Z_ZADDRESSRANGEMAP_INLINE_HPP
-#define SHARE_GC_Z_ZADDRESSRANGEMAP_INLINE_HPP
-
-#include "gc/z/zAddress.inline.hpp"
-#include "gc/z/zAddressRangeMap.hpp"
-#include "gc/z/zGlobals.hpp"
-#include "memory/allocation.inline.hpp"
-
-template <typename T, size_t AddressRangeShift>
-ZAddressRangeMap<T, AddressRangeShift>::ZAddressRangeMap() :
- _map(MmapArrayAllocator<T>::allocate(size(), mtGC)) {}
-
-template <typename T, size_t AddressRangeShift>
-ZAddressRangeMap<T, AddressRangeShift>::~ZAddressRangeMap() {
- MmapArrayAllocator<T>::free(_map, size());
-}
-
-template <typename T, size_t AddressRangeShift>
-size_t ZAddressRangeMap<T, AddressRangeShift>::index_for_addr(uintptr_t addr) const {
- assert(!ZAddress::is_null(addr), "Invalid address");
-
- const size_t index = ZAddress::offset(addr) >> AddressRangeShift;
- assert(index < size(), "Invalid index");
-
- return index;
-}
-
-template <typename T, size_t AddressRangeShift>
-size_t ZAddressRangeMap<T, AddressRangeShift>::size() const {
- return ZAddressOffsetMax >> AddressRangeShift;
-}
-
-template <typename T, size_t AddressRangeShift>
-T ZAddressRangeMap<T, AddressRangeShift>::get(uintptr_t addr) const {
- const uintptr_t index = index_for_addr(addr);
- return _map[index];
-}
-
-template <typename T, size_t AddressRangeShift>
-void ZAddressRangeMap<T, AddressRangeShift>::put(uintptr_t addr, T value) {
- const uintptr_t index = index_for_addr(addr);
- _map[index] = value;
-}
-
-template <typename T, size_t AddressRangeShift>
-inline ZAddressRangeMapIterator<T, AddressRangeShift>::ZAddressRangeMapIterator(const ZAddressRangeMap<T, AddressRangeShift>* map) :
- _map(map),
- _next(0) {}
-
-template <typename T, size_t AddressRangeShift>
-inline bool ZAddressRangeMapIterator<T, AddressRangeShift>::next(T* value) {
- if (_next < _map->size()) {
- *value = _map->_map[_next++];
- return true;
- }
-
- // End of map
- return false;
-}
-
-#endif // SHARE_GC_Z_ZADDRESSRANGEMAP_INLINE_HPP
--- a/src/hotspot/share/gc/z/zCollectedHeap.cpp Tue Mar 12 09:49:10 2019 +0000
+++ b/src/hotspot/share/gc/z/zCollectedHeap.cpp Sat Mar 16 21:00:45 2019 +0000
@@ -106,10 +106,6 @@
return false;
}
-bool ZCollectedHeap::is_scavengable(oop obj) {
- return false;
-}
-
bool ZCollectedHeap::is_in(const void* p) const {
return is_in_reserved(p) && _heap.is_in((uintptr_t)p);
}
@@ -245,11 +241,6 @@
return (HeapWord*)_heap.block_start((uintptr_t)addr);
}
-size_t ZCollectedHeap::block_size(const HeapWord* addr) const {
- size_t size_in_bytes = _heap.block_size((uintptr_t)addr);
- return ZUtils::bytes_to_words(size_in_bytes);
-}
-
bool ZCollectedHeap::block_is_obj(const HeapWord* addr) const {
return _heap.block_is_obj((uintptr_t)addr);
}
--- a/src/hotspot/share/gc/z/zCollectedHeap.hpp Tue Mar 12 09:49:10 2019 +0000
+++ b/src/hotspot/share/gc/z/zCollectedHeap.hpp Sat Mar 16 21:00:45 2019 +0000
@@ -71,7 +71,6 @@
virtual size_t used() const;
virtual bool is_maximal_no_gc() const;
- virtual bool is_scavengable(oop obj);
virtual bool is_in(const void* p) const;
virtual bool is_in_closed_subset(const void* p) const;
@@ -100,7 +99,6 @@
virtual void safe_object_iterate(ObjectClosure* cl);
virtual HeapWord* block_start(const void* addr) const;
- virtual size_t block_size(const HeapWord* addr) const;
virtual bool block_is_obj(const HeapWord* addr) const;
virtual void register_nmethod(nmethod* nm);
--- a/src/hotspot/share/gc/z/zCollectorPolicy.cpp Tue Mar 12 09:49:10 2019 +0000
+++ b/src/hotspot/share/gc/z/zCollectorPolicy.cpp Sat Mar 16 21:00:45 2019 +0000
@@ -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
@@ -26,6 +26,6 @@
#include "gc/z/zGlobals.hpp"
void ZCollectorPolicy::initialize_alignments() {
- _space_alignment = ZPageSizeMin;
+ _space_alignment = ZGranuleSize;
_heap_alignment = _space_alignment;
}
--- a/src/hotspot/share/gc/z/zDebug.gdb Tue Mar 12 09:49:10 2019 +0000
+++ b/src/hotspot/share/gc/z/zDebug.gdb Sat Mar 16 21:00:45 2019 +0000
@@ -48,7 +48,7 @@
end
end
end
- printf "\t Page: %llu\n", ((uintptr_t)$obj & ZAddressOffsetMask) >> ZPageSizeMinShift
+ printf "\t Page: %llu\n", ((uintptr_t)$obj & ZAddressOffsetMask) >> ZGranuleSizeShift
x/16gx $obj
printf "Mark: 0x%016llx\tKlass: %s\n", (uintptr_t)$obj->_mark, (char*)$obj->_metadata->_klass->_name->_body
end
@@ -99,7 +99,7 @@
define zmarked
set $addr = $arg0
set $obj = ((uintptr_t)$addr & ZAddressOffsetMask)
- set $page_index = $obj >> ZPageSizeMinShift
+ set $page_index = $obj >> ZGranuleSizeShift
set $page_entry = (uintptr_t)ZHeap::_heap._pagetable._map._map[$page_index]
set $page = (ZPage*)($page_entry & ~1)
set $page_start = (uintptr_t)$page._virtual._start
--- a/src/hotspot/share/gc/z/zGlobals.hpp Tue Mar 12 09:49:10 2019 +0000
+++ b/src/hotspot/share/gc/z/zGlobals.hpp Sat Mar 16 21:00:45 2019 +0000
@@ -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
@@ -40,20 +40,22 @@
// Global sequence number
extern uint32_t ZGlobalSeqNum;
+// Granule shift/size
+const size_t ZGranuleSizeShift = ZPlatformGranuleSizeShift;
+const size_t ZGranuleSize = (size_t)1 << ZGranuleSizeShift;
+
// Page types
const uint8_t ZPageTypeSmall = 0;
const uint8_t ZPageTypeMedium = 1;
const uint8_t ZPageTypeLarge = 2;
// Page size shifts
-const size_t ZPageSizeSmallShift = ZPlatformPageSizeSmallShift;
+const size_t ZPageSizeSmallShift = ZGranuleSizeShift;
const size_t ZPageSizeMediumShift = ZPageSizeSmallShift + 4;
-const size_t ZPageSizeMinShift = ZPageSizeSmallShift;
// Page sizes
const size_t ZPageSizeSmall = (size_t)1 << ZPageSizeSmallShift;
const size_t ZPageSizeMedium = (size_t)1 << ZPageSizeMediumShift;
-const size_t ZPageSizeMin = (size_t)1 << ZPageSizeMinShift;
// Object size limits
const size_t ZObjectSizeLimitSmall = (ZPageSizeSmall / 8); // Allow 12.5% waste
@@ -133,7 +135,7 @@
const size_t ZMarkStackMagazineSlots = (ZMarkStackMagazineSize / ZMarkStackSize) - 1;
// Mark stripe size
-const size_t ZMarkStripeShift = ZPageSizeMinShift;
+const size_t ZMarkStripeShift = ZGranuleSizeShift;
// Max number of mark stripes
const size_t ZMarkStripesMax = 16; // Must be a power of two
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/src/hotspot/share/gc/z/zGranuleMap.hpp Sat Mar 16 21:00:45 2019 +0000
@@ -0,0 +1,63 @@
+/*
+ * 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
+ * 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_Z_ZGRANULEMAP_HPP
+#define SHARE_GC_Z_ZGRANULEMAP_HPP
+
+#include "memory/allocation.hpp"
+
+template<typename T>
+class ZGranuleMapIterator;
+
+template <typename T>
+class ZGranuleMap {
+ friend class VMStructs;
+ friend class ZGranuleMapIterator<T>;
+
+private:
+ T* const _map;
+
+ size_t index_for_addr(uintptr_t addr) const;
+ size_t size() const;
+
+public:
+ ZGranuleMap();
+ ~ZGranuleMap();
+
+ T get(uintptr_t addr) const;
+ void put(uintptr_t addr, T value);
+};
+
+template <typename T>
+class ZGranuleMapIterator : public StackObj {
+public:
+ const ZGranuleMap<T>* const _map;
+ size_t _next;
+
+public:
+ ZGranuleMapIterator(const ZGranuleMap<T>* map);
+
+ bool next(T* value);
+};
+
+#endif // SHARE_GC_Z_ZGRANULEMAP_HPP
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/src/hotspot/share/gc/z/zGranuleMap.inline.hpp Sat Mar 16 21:00:45 2019 +0000
@@ -0,0 +1,84 @@
+/*
+ * 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
+ * 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_Z_ZGRANULEMAP_INLINE_HPP
+#define SHARE_GC_Z_ZGRANULEMAP_INLINE_HPP
+
+#include "gc/z/zAddress.inline.hpp"
+#include "gc/z/zGlobals.hpp"
+#include "gc/z/zGranuleMap.hpp"
+#include "memory/allocation.inline.hpp"
+
+template <typename T>
+inline ZGranuleMap<T>::ZGranuleMap() :
+ _map(MmapArrayAllocator<T>::allocate(size(), mtGC)) {}
+
+template <typename T>
+inline ZGranuleMap<T>::~ZGranuleMap() {
+ MmapArrayAllocator<T>::free(_map, size());
+}
+
+template <typename T>
+inline size_t ZGranuleMap<T>::index_for_addr(uintptr_t addr) const {
+ assert(!ZAddress::is_null(addr), "Invalid address");
+
+ const size_t index = ZAddress::offset(addr) >> ZGranuleSizeShift;
+ assert(index < size(), "Invalid index");
+
+ return index;
+}
+
+template <typename T>
+inline size_t ZGranuleMap<T>::size() const {
+ return ZAddressOffsetMax >> ZGranuleSizeShift;
+}
+
+template <typename T>
+inline T ZGranuleMap<T>::get(uintptr_t addr) const {
+ const size_t index = index_for_addr(addr);
+ return _map[index];
+}
+
+template <typename T>
+inline void ZGranuleMap<T>::put(uintptr_t addr, T value) {
+ const size_t index = index_for_addr(addr);
+ _map[index] = value;
+}
+
+template <typename T>
+inline ZGranuleMapIterator<T>::ZGranuleMapIterator(const ZGranuleMap<T>* map) :
+ _map(map),
+ _next(0) {}
+
+template <typename T>
+inline bool ZGranuleMapIterator<T>::next(T* value) {
+ if (_next < _map->size()) {
+ *value = _map->_map[_next++];
+ return true;
+ }
+
+ // End of map
+ return false;
+}
+
+#endif // SHARE_GC_Z_ZGRANULEMAP_INLINE_HPP
--- a/src/hotspot/share/gc/z/zHeap.cpp Tue Mar 12 09:49:10 2019 +0000
+++ b/src/hotspot/share/gc/z/zHeap.cpp Sat Mar 16 21:00:45 2019 +0000
@@ -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
@@ -80,12 +80,12 @@
}
size_t ZHeap::heap_min_size() const {
- const size_t aligned_min_size = align_up(InitialHeapSize, ZPageSizeMin);
+ const size_t aligned_min_size = align_up(InitialHeapSize, ZGranuleSize);
return MIN2(aligned_min_size, heap_max_size());
}
size_t ZHeap::heap_max_size() const {
- const size_t aligned_max_size = align_up(MaxHeapSize, ZPageSizeMin);
+ const size_t aligned_max_size = align_up(MaxHeapSize, ZGranuleSize);
return MIN2(aligned_max_size, ZAddressOffsetMax);
}
@@ -185,11 +185,6 @@
return page->block_start(addr);
}
-size_t ZHeap::block_size(uintptr_t addr) const {
- const ZPage* const page = _pagetable.get(addr);
- return page->block_size(addr);
-}
-
bool ZHeap::block_is_obj(uintptr_t addr) const {
const ZPage* const page = _pagetable.get(addr);
return page->block_is_obj(addr);
--- a/src/hotspot/share/gc/z/zHeap.hpp Tue Mar 12 09:49:10 2019 +0000
+++ b/src/hotspot/share/gc/z/zHeap.hpp Sat Mar 16 21:00:45 2019 +0000
@@ -99,7 +99,6 @@
// Block
uintptr_t block_start(uintptr_t addr) const;
- size_t block_size(uintptr_t addr) const;
bool block_is_obj(uintptr_t addr) const;
// Workers
--- a/src/hotspot/share/gc/z/zHeapIterator.cpp Tue Mar 12 09:49:10 2019 +0000
+++ b/src/hotspot/share/gc/z/zHeapIterator.cpp Sat Mar 16 21:00:45 2019 +0000
@@ -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,9 +22,9 @@
*/
#include "precompiled.hpp"
-#include "gc/z/zAddressRangeMap.inline.hpp"
#include "gc/z/zBarrier.inline.hpp"
#include "gc/z/zGlobals.hpp"
+#include "gc/z/zGranuleMap.inline.hpp"
#include "gc/z/zHeapIterator.hpp"
#include "gc/z/zOop.inline.hpp"
#include "gc/z/zRootsIterator.hpp"
@@ -123,13 +123,13 @@
}
static size_t object_index_max() {
- return ZPageSizeMin >> ZObjectAlignmentSmallShift;
+ return ZGranuleSize >> ZObjectAlignmentSmallShift;
}
static size_t object_index(oop obj) {
const uintptr_t addr = ZOop::to_address(obj);
const uintptr_t offset = ZAddress::offset(addr);
- const uintptr_t mask = (1 << ZPageSizeMinShift) - 1;
+ const uintptr_t mask = ZGranuleSize - 1;
return (offset & mask) >> ZObjectAlignmentSmallShift;
}
--- a/src/hotspot/share/gc/z/zHeapIterator.hpp Tue Mar 12 09:49:10 2019 +0000
+++ b/src/hotspot/share/gc/z/zHeapIterator.hpp Sat Mar 16 21:00:45 2019 +0000
@@ -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
@@ -24,11 +24,11 @@
#ifndef SHARE_GC_Z_ZHEAPITERATOR_HPP
#define SHARE_GC_Z_ZHEAPITERATOR_HPP
-#include "gc/z/zAddressRangeMap.hpp"
-#include "gc/z/zGlobals.hpp"
+#include "gc/z/zGranuleMap.hpp"
#include "memory/allocation.hpp"
#include "utilities/stack.hpp"
+class ObjectClosure;
class ZHeapIteratorBitMap;
class ZHeapIterator : public StackObj {
@@ -36,9 +36,9 @@
friend class ZHeapIteratorOopClosure;
private:
- typedef ZAddressRangeMap<ZHeapIteratorBitMap*, ZPageSizeMinShift> ZVisitMap;
- typedef ZAddressRangeMapIterator<ZHeapIteratorBitMap*, ZPageSizeMinShift> ZVisitMapIterator;
- typedef Stack<oop, mtGC> ZVisitStack;
+ typedef ZGranuleMap<ZHeapIteratorBitMap*> ZVisitMap;
+ typedef ZGranuleMapIterator<ZHeapIteratorBitMap*> ZVisitMapIterator;
+ typedef Stack<oop, mtGC> ZVisitStack;
ZVisitStack _visit_stack;
ZVisitMap _visit_map;
--- a/src/hotspot/share/gc/z/zObjectAllocator.cpp Tue Mar 12 09:49:10 2019 +0000
+++ b/src/hotspot/share/gc/z/zObjectAllocator.cpp Sat Mar 16 21:00:45 2019 +0000
@@ -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
@@ -113,7 +113,7 @@
uintptr_t addr = 0;
// Allocate new large page
- const size_t page_size = align_up(size, ZPageSizeMin);
+ const size_t page_size = align_up(size, ZGranuleSize);
ZPage* const page = alloc_page(ZPageTypeLarge, page_size, flags);
if (page != NULL) {
// Allocate the object
--- a/src/hotspot/share/gc/z/zPage.cpp Tue Mar 12 09:49:10 2019 +0000
+++ b/src/hotspot/share/gc/z/zPage.cpp Sat Mar 16 21:00:45 2019 +0000
@@ -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
@@ -56,7 +56,7 @@
assert(!_virtual.is_null(), "Should not be null");
assert((type == ZPageTypeSmall && size() == ZPageSizeSmall) ||
(type == ZPageTypeMedium && size() == ZPageSizeMedium) ||
- (type == ZPageTypeLarge && is_aligned(size(), ZPageSizeMin)),
+ (type == ZPageTypeLarge && is_aligned(size(), ZGranuleSize)),
"Page type/size mismatch");
}
--- a/src/hotspot/share/gc/z/zPage.hpp Tue Mar 12 09:49:10 2019 +0000
+++ b/src/hotspot/share/gc/z/zPage.hpp Sat Mar 16 21:00:45 2019 +0000
@@ -85,7 +85,6 @@
bool is_in(uintptr_t addr) const;
uintptr_t block_start(uintptr_t addr) const;
- size_t block_size(uintptr_t addr) const;
bool block_is_obj(uintptr_t addr) const;
bool is_active() const;
--- a/src/hotspot/share/gc/z/zPage.inline.hpp Tue Mar 12 09:49:10 2019 +0000
+++ b/src/hotspot/share/gc/z/zPage.inline.hpp Sat Mar 16 21:00:45 2019 +0000
@@ -32,7 +32,6 @@
#include "gc/z/zNUMA.hpp"
#include "gc/z/zPage.hpp"
#include "gc/z/zPhysicalMemory.inline.hpp"
-#include "gc/z/zUtils.inline.hpp"
#include "gc/z/zVirtualMemory.inline.hpp"
#include "oops/oop.inline.hpp"
#include "runtime/atomic.hpp"
@@ -160,14 +159,6 @@
}
}
-inline size_t ZPage::block_size(uintptr_t addr) const {
- if (block_is_obj(addr)) {
- return ZUtils::object_size(addr);
- } else {
- return end() - top();
- }
-}
-
inline bool ZPage::block_is_obj(uintptr_t addr) const {
return ZAddress::offset(addr) < top();
}
--- a/src/hotspot/share/gc/z/zPageAllocator.cpp Tue Mar 12 09:49:10 2019 +0000
+++ b/src/hotspot/share/gc/z/zPageAllocator.cpp Sat Mar 16 21:00:45 2019 +0000
@@ -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
@@ -86,7 +86,7 @@
ZPageAllocator::ZPageAllocator(size_t min_capacity, size_t max_capacity, size_t max_reserve) :
_lock(),
_virtual(),
- _physical(max_capacity, ZPageSizeMin),
+ _physical(max_capacity),
_cache(),
_max_reserve(max_reserve),
_pre_mapped(_virtual, _physical, try_ensure_unused_for_pre_mapped(min_capacity)),
--- a/src/hotspot/share/gc/z/zPageTable.cpp Tue Mar 12 09:49:10 2019 +0000
+++ b/src/hotspot/share/gc/z/zPageTable.cpp Sat Mar 16 21:00:45 2019 +0000
@@ -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,6 +22,7 @@
*/
#include "precompiled.hpp"
+#include "gc/z/zAddress.inline.hpp"
#include "gc/z/zPage.inline.hpp"
#include "gc/z/zPageTable.inline.hpp"
#include "runtime/orderAccess.hpp"
@@ -42,7 +43,7 @@
const uintptr_t start = ZAddress::good(page->start());
const uintptr_t end = start + page->size();
- for (uintptr_t addr = start; addr < end; addr += ZPageSizeMin) {
+ for (uintptr_t addr = start; addr < end; addr += ZGranuleSize) {
_map.put(addr, entry);
}
}
--- a/src/hotspot/share/gc/z/zPageTable.hpp Tue Mar 12 09:49:10 2019 +0000
+++ b/src/hotspot/share/gc/z/zPageTable.hpp Sat Mar 16 21:00:45 2019 +0000
@@ -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
@@ -24,8 +24,7 @@
#ifndef SHARE_GC_Z_ZPAGETABLE_HPP
#define SHARE_GC_Z_ZPAGETABLE_HPP
-#include "gc/z/zAddressRangeMap.hpp"
-#include "gc/z/zGlobals.hpp"
+#include "gc/z/zGranuleMap.hpp"
#include "gc/z/zPageTableEntry.hpp"
#include "memory/allocation.hpp"
@@ -36,7 +35,7 @@
friend class ZPageTableIterator;
private:
- ZAddressRangeMap<ZPageTableEntry, ZPageSizeMinShift> _map;
+ ZGranuleMap<ZPageTableEntry> _map;
ZPageTableEntry get_entry(ZPage* page) const;
void put_entry(ZPage* page, ZPageTableEntry entry);
@@ -55,8 +54,8 @@
class ZPageTableIterator : public StackObj {
private:
- ZAddressRangeMapIterator<ZPageTableEntry, ZPageSizeMinShift> _iter;
- ZPage* _prev;
+ ZGranuleMapIterator<ZPageTableEntry> _iter;
+ ZPage* _prev;
public:
ZPageTableIterator(const ZPageTable* pagetable);
--- a/src/hotspot/share/gc/z/zPageTable.inline.hpp Tue Mar 12 09:49:10 2019 +0000
+++ b/src/hotspot/share/gc/z/zPageTable.inline.hpp Sat Mar 16 21:00:45 2019 +0000
@@ -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
@@ -25,7 +25,7 @@
#define SHARE_GC_Z_ZPAGETABLE_INLINE_HPP
#include "gc/z/zAddress.inline.hpp"
-#include "gc/z/zAddressRangeMap.inline.hpp"
+#include "gc/z/zGranuleMap.inline.hpp"
#include "gc/z/zPageTable.hpp"
inline ZPage* ZPageTable::get(uintptr_t addr) const {
--- a/src/hotspot/share/gc/z/zPhysicalMemory.cpp Tue Mar 12 09:49:10 2019 +0000
+++ b/src/hotspot/share/gc/z/zPhysicalMemory.cpp Sat Mar 16 21:00:45 2019 +0000
@@ -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
@@ -91,8 +91,8 @@
}
}
-ZPhysicalMemoryManager::ZPhysicalMemoryManager(size_t max_capacity, size_t granule_size) :
- _backing(max_capacity, granule_size),
+ZPhysicalMemoryManager::ZPhysicalMemoryManager(size_t max_capacity) :
+ _backing(max_capacity),
_max_capacity(max_capacity),
_current_max_capacity(max_capacity),
_capacity(0),
--- a/src/hotspot/share/gc/z/zPhysicalMemory.hpp Tue Mar 12 09:49:10 2019 +0000
+++ b/src/hotspot/share/gc/z/zPhysicalMemory.hpp Sat Mar 16 21:00:45 2019 +0000
@@ -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
@@ -78,7 +78,7 @@
void nmt_uncommit(ZPhysicalMemory pmem, uintptr_t offset);
public:
- ZPhysicalMemoryManager(size_t max_capacity, size_t granule_size);
+ ZPhysicalMemoryManager(size_t max_capacity);
bool is_initialized() const;
--- a/src/hotspot/share/gc/z/zStat.cpp Tue Mar 12 09:49:10 2019 +0000
+++ b/src/hotspot/share/gc/z/zStat.cpp Sat Mar 16 21:00:45 2019 +0000
@@ -404,7 +404,7 @@
// Stat sampler
//
ZStatSampler::ZStatSampler(const char* group, const char* name, ZStatUnitPrinter printer) :
- ZStatIterableValue(group, name, sizeof(ZStatSamplerData)),
+ ZStatIterableValue<ZStatSampler>(group, name, sizeof(ZStatSamplerData)),
_printer(printer) {}
ZStatSamplerData* ZStatSampler::get() const {
@@ -440,7 +440,7 @@
// Stat counter
//
ZStatCounter::ZStatCounter(const char* group, const char* name, ZStatUnitPrinter printer) :
- ZStatIterableValue(group, name, sizeof(ZStatCounterData)),
+ ZStatIterableValue<ZStatCounter>(group, name, sizeof(ZStatCounterData)),
_sampler(group, name, printer) {}
ZStatCounterData* ZStatCounter::get() const {
@@ -463,7 +463,7 @@
// Stat unsampled counter
//
ZStatUnsampledCounter::ZStatUnsampledCounter(const char* name) :
- ZStatIterableValue("Unsampled", name, sizeof(ZStatCounterData)) {}
+ ZStatIterableValue<ZStatUnsampledCounter>("Unsampled", name, sizeof(ZStatCounterData)) {}
ZStatCounterData* ZStatUnsampledCounter::get() const {
return get_cpu_local<ZStatCounterData>(ZCPU::id());
--- a/src/hotspot/share/jvmci/jvmciCompilerToVM.hpp Tue Mar 12 09:49:10 2019 +0000
+++ b/src/hotspot/share/jvmci/jvmciCompilerToVM.hpp Sat Mar 16 21:00:45 2019 +0000
@@ -93,7 +93,7 @@
static int _max_oop_map_stack_offset;
static int _fields_annotations_base_offset;
- static jbyte* cardtable_start_address;
+ static CardTable::CardValue* cardtable_start_address;
static int cardtable_shift;
static int vm_page_size;
--- a/src/hotspot/share/jvmci/jvmciCompilerToVMInit.cpp Tue Mar 12 09:49:10 2019 +0000
+++ b/src/hotspot/share/jvmci/jvmciCompilerToVMInit.cpp Sat Mar 16 21:00:45 2019 +0000
@@ -24,6 +24,7 @@
// no precompiled headers
#include "ci/ciUtilities.hpp"
#include "gc/shared/barrierSet.hpp"
+#include "gc/shared/cardTable.hpp"
#include "memory/oopFactory.hpp"
#include "oops/objArrayOop.inline.hpp"
#include "jvmci/jvmciRuntime.hpp"
@@ -63,7 +64,7 @@
int CompilerToVM::Data::_max_oop_map_stack_offset;
int CompilerToVM::Data::_fields_annotations_base_offset;
-jbyte* CompilerToVM::Data::cardtable_start_address;
+CardTable::CardValue* CompilerToVM::Data::cardtable_start_address;
int CompilerToVM::Data::cardtable_shift;
int CompilerToVM::Data::vm_page_size;
@@ -126,7 +127,7 @@
BarrierSet* bs = BarrierSet::barrier_set();
if (bs->is_a(BarrierSet::CardTableBarrierSet)) {
- jbyte* base = ci_card_table_address();
+ CardTable::CardValue* base = ci_card_table_address();
assert(base != NULL, "unexpected byte_map_base");
cardtable_start_address = base;
cardtable_shift = CardTable::card_shift;
--- a/src/hotspot/share/jvmci/vmStructs_jvmci.cpp Tue Mar 12 09:49:10 2019 +0000
+++ b/src/hotspot/share/jvmci/vmStructs_jvmci.cpp Sat Mar 16 21:00:45 2019 +0000
@@ -26,6 +26,7 @@
#include "code/codeBlob.hpp"
#include "compiler/abstractCompiler.hpp"
#include "compiler/compileBroker.hpp"
+#include "gc/shared/cardTable.hpp"
#include "gc/shared/collectedHeap.hpp"
#include "jvmci/jvmciCodeInstaller.hpp"
#include "jvmci/jvmciCompilerToVM.hpp"
--- a/src/hotspot/share/memory/iterator.hpp Tue Mar 12 09:49:10 2019 +0000
+++ b/src/hotspot/share/memory/iterator.hpp Sat Mar 16 21:00:45 2019 +0000
@@ -36,6 +36,7 @@
class KlassClosure;
class ClassLoaderData;
class Symbol;
+class Metadata;
// The following classes are C++ `closures` for iterating over objects, roots and spaces
@@ -124,6 +125,11 @@
virtual void do_cld(ClassLoaderData* cld) = 0;
};
+class MetadataClosure : public Closure {
+ public:
+ virtual void do_metadata(Metadata* md) = 0;
+};
+
class CLDToOopClosure : public CLDClosure {
OopClosure* _oop_closure;
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/src/hotspot/share/metaprogramming/isArray.hpp Sat Mar 16 21:00:45 2019 +0000
@@ -0,0 +1,35 @@
+/*
+ * 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_METAPROGRAMMING_ISARRAY_HPP
+#define SHARE_METAPROGRAMMING_ISARRAY_HPP
+
+#include "metaprogramming/integralConstant.hpp"
+
+template <typename T> struct IsArray: public FalseType {};
+
+template <typename T> struct IsArray<T[]>: public TrueType {};
+template <typename T, size_t S> struct IsArray<T[S]>: public TrueType {};
+
+#endif // SHARE_METAPROGRAMMING_ISARRAY_HPP
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/src/hotspot/share/metaprogramming/removeExtent.hpp Sat Mar 16 21:00:45 2019 +0000
@@ -0,0 +1,35 @@
+/*
+ * 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_METAPROGRAMMING_REMOVEEXTENT_HPP
+#define SHARE_METAPROGRAMMING_REMOVEEXTENT_HPP
+
+#include "memory/allocation.hpp"
+
+template <typename T> struct RemoveExtent: AllStatic { typedef T type; };
+
+template <typename T> struct RemoveExtent<T[]>: AllStatic { typedef T type; };
+template <typename T, size_t S> struct RemoveExtent<T[S]>: AllStatic { typedef T type; };
+
+#endif // SHARE_METAPROGRAMMING_REMOVEEXTENT_HPP
--- a/src/hotspot/share/oops/symbol.cpp Tue Mar 12 09:49:10 2019 +0000
+++ b/src/hotspot/share/oops/symbol.cpp Sat Mar 16 21:00:45 2019 +0000
@@ -264,6 +264,30 @@
}
}
+void Symbol::make_permanent() {
+ uint32_t found = _length_and_refcount;
+ while (true) {
+ uint32_t old_value = found;
+ int refc = extract_refcount(old_value);
+ if (refc == PERM_REFCOUNT) {
+ return; // refcount is permanent, permanent is sticky
+ } else if (refc == 0) {
+#ifdef ASSERT
+ print();
+ fatal("refcount underflow");
+#endif
+ return;
+ } else {
+ int len = extract_length(old_value);
+ found = Atomic::cmpxchg(pack_length_and_refcount(len, PERM_REFCOUNT), &_length_and_refcount, old_value);
+ if (found == old_value) {
+ return; // successfully updated.
+ }
+ // refcount changed, try again.
+ }
+ }
+}
+
void Symbol::metaspace_pointers_do(MetaspaceClosure* it) {
if (log_is_enabled(Trace, cds)) {
LogStream trace_stream(Log(cds)::trace());
--- a/src/hotspot/share/oops/symbol.hpp Tue Mar 12 09:49:10 2019 +0000
+++ b/src/hotspot/share/oops/symbol.hpp Sat Mar 16 21:00:45 2019 +0000
@@ -170,6 +170,7 @@
bool is_permanent() {
return (refcount() == PERM_REFCOUNT);
}
+ void make_permanent();
// Function char_at() returns the Symbol's selected u1 byte as a char type.
//
--- a/src/hotspot/share/opto/arraycopynode.cpp Tue Mar 12 09:49:10 2019 +0000
+++ b/src/hotspot/share/opto/arraycopynode.cpp Sat Mar 16 21:00:45 2019 +0000
@@ -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
@@ -160,7 +160,7 @@
void ArrayCopyNode::store(BarrierSetC2* bs, PhaseGVN *phase, Node*& ctl, MergeMemNode* mem, Node* adr, const TypePtr* adr_type, Node* val, const Type *type, BasicType bt) {
DecoratorSet decorators = C2_WRITE_ACCESS | IN_HEAP | C2_ARRAY_COPY;
if (is_alloc_tightly_coupled()) {
- decorators |= C2_TIGHLY_COUPLED_ALLOC;
+ decorators |= C2_TIGHTLY_COUPLED_ALLOC;
}
C2AccessValuePtr addr(adr, adr_type);
C2AccessValue value(val, type);
--- a/src/hotspot/share/opto/arraycopynode.hpp Tue Mar 12 09:49:10 2019 +0000
+++ b/src/hotspot/share/opto/arraycopynode.hpp Sat Mar 16 21:00:45 2019 +0000
@@ -47,7 +47,7 @@
static const char* _kind_names[CopyOfRange+1];
#endif
// Is the alloc obtained with
- // AllocateArrayNode::Ideal_array_allocation() tighly coupled
+ // AllocateArrayNode::Ideal_array_allocation() tightly coupled
// (arraycopy follows immediately the allocation)?
// We cache the result of LibraryCallKit::tightly_coupled_allocation
// here because it's much easier to find whether there's a tightly
--- a/src/hotspot/share/opto/classes.hpp Tue Mar 12 09:49:10 2019 +0000
+++ b/src/hotspot/share/opto/classes.hpp Sat Mar 16 21:00:45 2019 +0000
@@ -374,6 +374,10 @@
macro(AndV)
macro(OrV)
macro(XorV)
+macro(MinV)
+macro(MaxV)
+macro(MinReductionV)
+macro(MaxReductionV)
macro(LoadVector)
macro(StoreVector)
macro(Pack)
--- a/src/hotspot/share/opto/compile.cpp Tue Mar 12 09:49:10 2019 +0000
+++ b/src/hotspot/share/opto/compile.cpp Sat Mar 16 21:00:45 2019 +0000
@@ -3349,6 +3349,8 @@
case Op_MulReductionVL:
case Op_MulReductionVF:
case Op_MulReductionVD:
+ case Op_MinReductionV:
+ case Op_MaxReductionV:
break;
case Op_PackB:
--- a/src/hotspot/share/opto/library_call.cpp Tue Mar 12 09:49:10 2019 +0000
+++ b/src/hotspot/share/opto/library_call.cpp Sat Mar 16 21:00:45 2019 +0000
@@ -4461,7 +4461,7 @@
return true;
}
-// If we have a tighly coupled allocation, the arraycopy may take care
+// If we have a tightly coupled allocation, the arraycopy may take care
// of the array initialization. If one of the guards we insert between
// the allocation and the arraycopy causes a deoptimization, an
// unitialized array will escape the compiled method. To prevent that
--- a/src/hotspot/share/opto/loopnode.cpp Tue Mar 12 09:49:10 2019 +0000
+++ b/src/hotspot/share/opto/loopnode.cpp Sat Mar 16 21:00:45 2019 +0000
@@ -1593,12 +1593,17 @@
} else {
new_limit = igvn->transform(new SubINode(iv_phi, min));
}
- Node* cmp = inner_cle->cmp_node()->clone();
- igvn->replace_input_of(cmp, 2, new_limit);
- Node* bol = inner_cle->in(CountedLoopEndNode::TestValue)->clone();
- cmp->set_req(2, limit);
- bol->set_req(1, igvn->transform(cmp));
- igvn->replace_input_of(outer_loop_end(), 1, igvn->transform(bol));
+ Node* inner_cmp = inner_cle->cmp_node();
+ Node* inner_bol = inner_cle->in(CountedLoopEndNode::TestValue);
+ Node* outer_bol = inner_bol;
+ // cmp node for inner loop may be shared
+ inner_cmp = inner_cmp->clone();
+ inner_cmp->set_req(2, new_limit);
+ inner_bol = inner_bol->clone();
+ inner_bol->set_req(1, igvn->transform(inner_cmp));
+ igvn->replace_input_of(inner_cle, CountedLoopEndNode::TestValue, igvn->transform(inner_bol));
+ // Set the outer loop's exit condition too
+ igvn->replace_input_of(outer_loop_end(), 1, outer_bol);
} else {
assert(false, "should be able to adjust outer loop");
IfNode* outer_le = outer_loop_end();
--- a/src/hotspot/share/opto/memnode.cpp Tue Mar 12 09:49:10 2019 +0000
+++ b/src/hotspot/share/opto/memnode.cpp Sat Mar 16 21:00:45 2019 +0000
@@ -1394,6 +1394,14 @@
Node* in = mem->in(i);
Node* m = optimize_memory_chain(in, t_oop, this, phase);
if (m == mem) {
+ if (i == 1) {
+ // if the first edge was a loop, check second edge too.
+ // If both are replaceable - we are in an infinite loop
+ Node *n = optimize_memory_chain(mem->in(2), t_oop, this, phase);
+ if (n == mem) {
+ break;
+ }
+ }
set_req(Memory, mem->in(cnt - i));
return this; // made change
}
--- a/src/hotspot/share/opto/type.cpp Tue Mar 12 09:49:10 2019 +0000
+++ b/src/hotspot/share/opto/type.cpp Sat Mar 16 21:00:45 2019 +0000
@@ -244,10 +244,6 @@
case T_DOUBLE: return TypeD::make(constant.as_double());
case T_ARRAY:
case T_OBJECT: {
- // cases:
- // can_be_constant = (oop not scavengable || ScavengeRootsInCode != 0)
- // should_be_constant = (oop not scavengable || ScavengeRootsInCode >= 2)
- // An oop is not scavengable if it is in the perm gen.
const Type* con_type = NULL;
ciObject* oop_constant = constant.as_object();
if (oop_constant->is_null_object()) {
@@ -3228,15 +3224,17 @@
// Make a java pointer from an oop constant
const TypeOopPtr* TypeOopPtr::make_from_constant(ciObject* o, bool require_constant) {
assert(!o->is_null_object(), "null object not yet handled here.");
+
+ const bool make_constant = require_constant || o->should_be_constant();
+
ciKlass* klass = o->klass();
if (klass->is_instance_klass()) {
// Element is an instance
- if (require_constant) {
- if (!o->can_be_constant()) return NULL;
- } else if (!o->should_be_constant()) {
+ if (make_constant) {
+ return TypeInstPtr::make(o);
+ } else {
return TypeInstPtr::make(TypePtr::NotNull, klass, true, NULL, 0);
}
- return TypeInstPtr::make(o);
} else if (klass->is_obj_array_klass()) {
// Element is an object array. Recursively call ourself.
const TypeOopPtr *etype =
@@ -3245,13 +3243,11 @@
// We used to pass NotNull in here, asserting that the sub-arrays
// are all not-null. This is not true in generally, as code can
// slam NULLs down in the subarrays.
- if (require_constant) {
- if (!o->can_be_constant()) return NULL;
- } else if (!o->should_be_constant()) {
+ if (make_constant) {
+ return TypeAryPtr::make(TypePtr::Constant, o, arr0, klass, true, 0);
+ } else {
return TypeAryPtr::make(TypePtr::NotNull, arr0, klass, true, 0);
}
- const TypeAryPtr* arr = TypeAryPtr::make(TypePtr::Constant, o, arr0, klass, true, 0);
- return arr;
} else if (klass->is_type_array_klass()) {
// Element is an typeArray
const Type* etype =
@@ -3259,13 +3255,11 @@
const TypeAry* arr0 = TypeAry::make(etype, TypeInt::make(o->as_array()->length()));
// We used to pass NotNull in here, asserting that the array pointer
// is not-null. That was not true in general.
- if (require_constant) {
- if (!o->can_be_constant()) return NULL;
- } else if (!o->should_be_constant()) {
+ if (make_constant) {
+ return TypeAryPtr::make(TypePtr::Constant, o, arr0, klass, true, 0);
+ } else {
return TypeAryPtr::make(TypePtr::NotNull, arr0, klass, true, 0);
}
- const TypeAryPtr* arr = TypeAryPtr::make(TypePtr::Constant, o, arr0, klass, true, 0);
- return arr;
}
fatal("unhandled object type");
--- a/src/hotspot/share/opto/vectornode.cpp Tue Mar 12 09:49:10 2019 +0000
+++ b/src/hotspot/share/opto/vectornode.cpp Sat Mar 16 21:00:45 2019 +0000
@@ -178,6 +178,18 @@
case Op_XorI:
case Op_XorL:
return Op_XorV;
+ case Op_MinF:
+ assert(bt == T_FLOAT, "must be");
+ return Op_MinV;
+ case Op_MinD:
+ assert(bt == T_DOUBLE, "must be");
+ return Op_MinV;
+ case Op_MaxF:
+ assert(bt == T_FLOAT, "must be");
+ return Op_MaxV;
+ case Op_MaxD:
+ assert(bt == T_DOUBLE, "must be");
+ return Op_MaxV;
case Op_LoadB:
case Op_LoadUB:
@@ -377,6 +389,9 @@
case Op_OrV: return new OrVNode (n1, n2, vt);
case Op_XorV: return new XorVNode(n1, n2, vt);
+ case Op_MinV: return new MinVNode(n1, n2, vt);
+ case Op_MaxV: return new MaxVNode(n1, n2, vt);
+
case Op_MulAddVS2VI: return new MulAddVS2VINode(n1, n2, vt);
default:
fatal("Missed vector creation for '%s'", NodeClassNames[vopc]);
@@ -582,6 +597,22 @@
assert(bt == T_DOUBLE, "must be");
vopc = Op_MulReductionVD;
break;
+ case Op_MinF:
+ assert(bt == T_FLOAT, "must be");
+ vopc = Op_MinReductionV;
+ break;
+ case Op_MinD:
+ assert(bt == T_DOUBLE, "must be");
+ vopc = Op_MinReductionV;
+ break;
+ case Op_MaxF:
+ assert(bt == T_FLOAT, "must be");
+ vopc = Op_MaxReductionV;
+ break;
+ case Op_MaxD:
+ assert(bt == T_DOUBLE, "must be");
+ vopc = Op_MaxReductionV;
+ break;
// TODO: add MulL for targets that support it
default:
break;
@@ -606,6 +637,8 @@
case Op_MulReductionVL: return new MulReductionVLNode(ctrl, n1, n2);
case Op_MulReductionVF: return new MulReductionVFNode(ctrl, n1, n2);
case Op_MulReductionVD: return new MulReductionVDNode(ctrl, n1, n2);
+ case Op_MinReductionV: return new MinReductionVNode(ctrl, n1, n2);
+ case Op_MaxReductionV: return new MaxReductionVNode(ctrl, n1, n2);
default:
fatal("Missed vector creation for '%s'", NodeClassNames[vopc]);
return NULL;
--- a/src/hotspot/share/opto/vectornode.hpp Tue Mar 12 09:49:10 2019 +0000
+++ b/src/hotspot/share/opto/vectornode.hpp Sat Mar 16 21:00:45 2019 +0000
@@ -555,6 +555,78 @@
virtual int Opcode() const;
};
+//------------------------------MinVNode--------------------------------------
+// Vector min
+class MinVNode : public VectorNode {
+public:
+ MinVNode(Node* in1, Node* in2, const TypeVect* vt) : VectorNode(in1, in2, vt) {}
+ virtual int Opcode() const;
+};
+
+//------------------------------MaxVNode--------------------------------------
+// Vector max
+class MaxVNode : public VectorNode {
+public:
+ MaxVNode(Node* in1, Node* in2, const TypeVect* vt) : VectorNode(in1, in2, vt) {}
+ virtual int Opcode() const;
+};
+
+//------------------------------MinReductionVNode--------------------------------------
+// Vector min as a reduction
+class MinReductionVNode : public ReductionNode {
+public:
+ MinReductionVNode(Node *ctrl, Node* in1, Node* in2) : ReductionNode(ctrl, in1, in2) {}
+ virtual int Opcode() const;
+ virtual const Type* bottom_type() const {
+ BasicType bt = in(1)->bottom_type()->basic_type();
+ if (bt == T_FLOAT) {
+ return Type::FLOAT;
+ } else if (bt == T_DOUBLE) {
+ return Type::DOUBLE;
+ }
+ assert(false, "unsupported basic type");
+ return NULL;
+ }
+ virtual uint ideal_reg() const {
+ BasicType bt = in(1)->bottom_type()->basic_type();
+ if (bt == T_FLOAT) {
+ return Op_RegF;
+ } else if (bt == T_DOUBLE) {
+ return Op_RegD;
+ }
+ assert(false, "unsupported basic type");
+ return 0;
+ }
+};
+
+//------------------------------MaxReductionVNode--------------------------------------
+// Vector max as a reduction
+class MaxReductionVNode : public ReductionNode {
+public:
+ MaxReductionVNode(Node *ctrl, Node* in1, Node* in2) : ReductionNode(ctrl, in1, in2) {}
+ virtual int Opcode() const;
+ virtual const Type* bottom_type() const {
+ BasicType bt = in(1)->bottom_type()->basic_type();
+ if (bt == T_FLOAT) {
+ return Type::FLOAT;
+ } else {
+ return Type::DOUBLE;
+ }
+ assert(false, "unsupported basic type");
+ return NULL;
+ }
+ virtual uint ideal_reg() const {
+ BasicType bt = in(1)->bottom_type()->basic_type();
+ if (bt == T_FLOAT) {
+ return Op_RegF;
+ } else {
+ return Op_RegD;
+ }
+ assert(false, "unsupported basic type");
+ return 0;
+ }
+};
+
//================================= M E M O R Y ===============================
//------------------------------LoadVectorNode---------------------------------
--- a/src/hotspot/share/prims/jvmtiTagMap.cpp Tue Mar 12 09:49:10 2019 +0000
+++ b/src/hotspot/share/prims/jvmtiTagMap.cpp Sat Mar 16 21:00:45 2019 +0000
@@ -28,7 +28,6 @@
#include "classfile/symbolTable.hpp"
#include "classfile/systemDictionary.hpp"
#include "classfile/vmSymbols.hpp"
-#include "code/codeCache.hpp"
#include "jvmtifiles/jvmtiEnv.hpp"
#include "logging/log.hpp"
#include "memory/allocation.inline.hpp"
@@ -3044,11 +3043,6 @@
blk.set_kind(JVMTI_HEAP_REFERENCE_OTHER);
Universe::oops_do(&blk);
- // If there are any non-perm roots in the code cache, visit them.
- blk.set_kind(JVMTI_HEAP_REFERENCE_OTHER);
- CodeBlobToOopClosure look_in_blobs(&blk, !CodeBlobToOopClosure::FixRelocations);
- CodeCache::scavenge_root_nmethods_do(&look_in_blobs);
-
return true;
}
--- a/src/hotspot/share/runtime/arguments.cpp Tue Mar 12 09:49:10 2019 +0000
+++ b/src/hotspot/share/runtime/arguments.cpp Sat Mar 16 21:00:45 2019 +0000
@@ -3918,6 +3918,13 @@
warning("Setting CompressedClassSpaceSize has no effect when compressed class pointers are not used");
}
+ // Treat the odd case where local verification is enabled but remote
+ // verification is not as if both were enabled.
+ if (BytecodeVerificationLocal && !BytecodeVerificationRemote) {
+ log_info(verification)("Turning on remote verification because local verification is on");
+ FLAG_SET_DEFAULT(BytecodeVerificationRemote, true);
+ }
+
#ifndef PRODUCT
if (!LogVMOutput && FLAG_IS_DEFAULT(LogVMOutput)) {
if (use_vm_log()) {
--- a/src/hotspot/share/runtime/frame.cpp Tue Mar 12 09:49:10 2019 +0000
+++ b/src/hotspot/share/runtime/frame.cpp Sat Mar 16 21:00:45 2019 +0000
@@ -1115,13 +1115,13 @@
}
-// call f() on the interpreted Method*s in the stack.
-// Have to walk the entire code cache for the compiled frames Yuck.
-void frame::metadata_do(void f(Metadata*)) {
+// Call f closure on the interpreted Method*s in the stack.
+void frame::metadata_do(MetadataClosure* f) {
+ ResourceMark rm;
if (is_interpreted_frame()) {
Method* m = this->interpreter_frame_method();
assert(m != NULL, "expecting a method in this frame");
- f(m);
+ f->do_metadata(m);
}
}
--- a/src/hotspot/share/runtime/frame.hpp Tue Mar 12 09:49:10 2019 +0000
+++ b/src/hotspot/share/runtime/frame.hpp Sat Mar 16 21:00:45 2019 +0000
@@ -378,7 +378,7 @@
void nmethods_do(CodeBlobClosure* cf);
// RedefineClasses support for finding live interpreted methods on the stack
- void metadata_do(void f(Metadata*));
+ void metadata_do(MetadataClosure* f);
// Verification
void verify(const RegisterMap* map);
--- a/src/hotspot/share/runtime/signature.cpp Tue Mar 12 09:49:10 2019 +0000
+++ b/src/hotspot/share/runtime/signature.cpp Sat Mar 16 21:00:45 2019 +0000
@@ -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
@@ -123,15 +123,6 @@
}
-void SignatureIterator::dispatch_field() {
- // no '(', just one (field) type
- _index = 0;
- _parameter_index = 0;
- parse_type();
- check_signature_end();
-}
-
-
void SignatureIterator::iterate_parameters() {
// Parse parameters
_index = 0;
@@ -196,7 +187,6 @@
break;
case done_parm:
return;
- break;
default:
tty->print_cr("*** parameter is " UINT64_FORMAT, fingerprint & parameter_feature_mask);
tty->print_cr("*** fingerprint is " PTR64_FORMAT, saved_fingerprint);
@@ -205,7 +195,6 @@
}
fingerprint >>= parameter_feature_size;
}
- _parameter_index = 0;
}
@@ -239,10 +228,7 @@
break;
case '[':
{
- int begin = ++_index;
- while (sig->char_at(_index) == '[') {
- _index++;
- }
+ while (sig->char_at(++_index) == '[') ;
if (sig->char_at(_index) == 'L') {
while (sig->char_at(_index++) != ';') ;
} else {
@@ -281,16 +267,17 @@
// Implementation of SignatureStream
SignatureStream::SignatureStream(Symbol* signature, bool is_method) :
- _signature(signature), _at_return_type(false) {
+ _signature(signature), _at_return_type(false), _previous_name(NULL), _names(NULL) {
_begin = _end = (is_method ? 1 : 0); // skip first '(' in method signatures
- _names = new GrowableArray<Symbol*>(10);
next();
}
SignatureStream::~SignatureStream() {
// decrement refcount for names created during signature parsing
- for (int i = 0; i < _names->length(); i++) {
- _names->at(i)->decrement_refcount();
+ if (_names != NULL) {
+ for (int i = 0; i < _names->length(); i++) {
+ _names->at(i)->decrement_refcount();
+ }
}
}
@@ -359,10 +346,35 @@
end--;
}
+ const char* symbol_chars = (const char*)_signature->base() + begin;
+ int len = end - begin;
+
+ // Quick check for common symbols in signatures
+ assert((vmSymbols::java_lang_String()->utf8_length() == 16 && vmSymbols::java_lang_Object()->utf8_length() == 16), "sanity");
+ if (len == 16 &&
+ strncmp(symbol_chars, "java/lang/", 10) == 0) {
+ if (strncmp("String", symbol_chars + 10, 6) == 0) {
+ return vmSymbols::java_lang_String();
+ } else if (strncmp("Object", symbol_chars + 10, 6) == 0) {
+ return vmSymbols::java_lang_Object();
+ }
+ }
+
+ Symbol* name = _previous_name;
+ if (name != NULL && name->equals(symbol_chars, len)) {
+ return name;
+ }
+
// Save names for cleaning up reference count at the end of
// SignatureStream scope.
- Symbol* name = SymbolTable::new_symbol(_signature, begin, end, CHECK_NULL);
- _names->push(name); // save new symbol for decrementing later
+ name = SymbolTable::new_symbol(symbol_chars, len, CHECK_NULL);
+ if (!name->is_permanent()) {
+ if (_names == NULL) {
+ _names = new GrowableArray<Symbol*>(10);
+ }
+ _names->push(name); // save new symbol for decrementing later
+ }
+ _previous_name = name;
return name;
}
@@ -418,18 +430,7 @@
return args_count;
}
-bool SignatureVerifier::is_valid_signature(Symbol* sig) {
- const char* signature = (const char*)sig->bytes();
- ssize_t len = sig->utf8_length();
- if (signature == NULL || signature[0] == '\0' || len < 1) {
- return false;
- } else if (signature[0] == '(') {
- return is_valid_method_signature(sig);
- } else {
- return is_valid_type_signature(sig);
- }
-}
-
+#ifdef ASSERT
bool SignatureVerifier::is_valid_method_signature(Symbol* sig) {
const char* method_sig = (const char*)sig->bytes();
ssize_t len = sig->utf8_length();
@@ -478,11 +479,12 @@
case 'L':
for (index = index + 1; index < limit; ++index) {
char c = type[index];
- if (c == ';') {
- return index + 1;
- }
- if (invalid_name_char(c)) {
- return -1;
+ switch (c) {
+ case ';':
+ return index + 1;
+ case '\0': case '.': case '[':
+ return -1;
+ default: ; // fall through
}
}
// fall through
@@ -490,12 +492,4 @@
}
return -1;
}
-
-bool SignatureVerifier::invalid_name_char(char c) {
- switch (c) {
- case '\0': case '.': case ';': case '[':
- return true;
- default:
- return false;
- }
-}
+#endif // ASSERT
--- a/src/hotspot/share/runtime/signature.hpp Tue Mar 12 09:49:10 2019 +0000
+++ b/src/hotspot/share/runtime/signature.hpp Sat Mar 16 21:00:45 2019 +0000
@@ -90,7 +90,6 @@
SignatureIterator(Symbol* signature);
// Iteration
- void dispatch_field(); // dispatches once for field signatures
void iterate_parameters(); // iterates over parameters only
void iterate_parameters( uint64_t fingerprint );
void iterate_returntype(); // iterates over returntype only
@@ -363,8 +362,8 @@
int _end;
BasicType _type;
bool _at_return_type;
- GrowableArray<Symbol*>* _names; // symbols created while parsing signature
-
+ Symbol* _previous_name; // cache the previously looked up symbol to avoid lookups
+ GrowableArray<Symbol*>* _names; // symbols created while parsing that need to be dereferenced
public:
bool at_return_type() const { return _at_return_type; }
bool is_done() const;
@@ -402,7 +401,7 @@
bool is_array() const; // True if this argument is an array
BasicType type() const { return _type; }
Symbol* as_symbol(TRAPS);
- enum FailureMode { ReturnNull, CNFException, NCDFError };
+ enum FailureMode { ReturnNull, NCDFError };
Klass* as_klass(Handle class_loader, Handle protection_domain, FailureMode failure_mode, TRAPS);
oop as_java_mirror(Handle class_loader, Handle protection_domain, FailureMode failure_mode, TRAPS);
const u1* raw_bytes() { return _signature->bytes() + _begin; }
@@ -415,17 +414,13 @@
int reference_parameter_count();
};
+#ifdef ASSERT
class SignatureVerifier : public StackObj {
public:
- // Returns true if the symbol is valid method or type signature
- static bool is_valid_signature(Symbol* sig);
-
static bool is_valid_method_signature(Symbol* sig);
static bool is_valid_type_signature(Symbol* sig);
private:
-
static ssize_t is_valid_type(const char*, ssize_t);
- static bool invalid_name_char(char);
};
-
+#endif
#endif // SHARE_RUNTIME_SIGNATURE_HPP
--- a/src/hotspot/share/runtime/thread.cpp Tue Mar 12 09:49:10 2019 +0000
+++ b/src/hotspot/share/runtime/thread.cpp Sat Mar 16 21:00:45 2019 +0000
@@ -2960,7 +2960,7 @@
}
}
-void JavaThread::metadata_do(void f(Metadata*)) {
+void JavaThread::metadata_do(MetadataClosure* f) {
if (has_last_Java_frame()) {
// Traverse the execution stack to call f() on the methods in the stack
for (StackFrameStream fst(this); !fst.is_done(); fst.next()) {
@@ -4574,7 +4574,7 @@
}
}
-void Threads::metadata_do(void f(Metadata*)) {
+void Threads::metadata_do(MetadataClosure* f) {
ALL_JAVA_THREADS(p) {
p->metadata_do(f);
}
--- a/src/hotspot/share/runtime/thread.hpp Tue Mar 12 09:49:10 2019 +0000
+++ b/src/hotspot/share/runtime/thread.hpp Sat Mar 16 21:00:45 2019 +0000
@@ -1866,7 +1866,7 @@
virtual void nmethods_do(CodeBlobClosure* cf);
// RedefineClasses Support
- void metadata_do(void f(Metadata*));
+ void metadata_do(MetadataClosure* f);
// Misc. operations
char* name() const { return (char*)get_thread_name(); }
@@ -2281,7 +2281,7 @@
static void nmethods_do(CodeBlobClosure* cf);
// RedefineClasses support
- static void metadata_do(void f(Metadata*));
+ static void metadata_do(MetadataClosure* f);
static void metadata_handles_do(void f(Metadata*));
#ifdef ASSERT
--- a/src/hotspot/share/runtime/vmStructs.cpp Tue Mar 12 09:49:10 2019 +0000
+++ b/src/hotspot/share/runtime/vmStructs.cpp Sat Mar 16 21:00:45 2019 +0000
@@ -539,7 +539,6 @@
static_field(CodeCache, _heaps, GrowableArray<CodeHeap*>*) \
static_field(CodeCache, _low_bound, address) \
static_field(CodeCache, _high_bound, address) \
- static_field(CodeCache, _scavenge_root_nmethods, nmethod*) \
\
/*******************************/ \
/* CodeHeap (NOTE: incomplete) */ \
@@ -681,8 +680,6 @@
\
nonstatic_field(nmethod, _entry_bci, int) \
nonstatic_field(nmethod, _osr_link, nmethod*) \
- nonstatic_field(nmethod, _scavenge_root_link, nmethod*) \
- nonstatic_field(nmethod, _scavenge_root_state, jbyte) \
nonstatic_field(nmethod, _state, volatile signed char) \
nonstatic_field(nmethod, _exception_offset, int) \
nonstatic_field(nmethod, _orig_pc_offset, int) \
@@ -1808,6 +1805,10 @@
declare_c2_type(AndVNode, VectorNode) \
declare_c2_type(OrVNode, VectorNode) \
declare_c2_type(XorVNode, VectorNode) \
+ declare_c2_type(MaxVNode, VectorNode) \
+ declare_c2_type(MinVNode, VectorNode) \
+ declare_c2_type(MaxReductionVNode, ReductionNode) \
+ declare_c2_type(MinReductionVNode, ReductionNode) \
declare_c2_type(LoadVectorNode, LoadNode) \
declare_c2_type(StoreVectorNode, StoreNode) \
declare_c2_type(ReplicateBNode, VectorNode) \
--- a/src/hotspot/share/services/attachListener.cpp Tue Mar 12 09:49:10 2019 +0000
+++ b/src/hotspot/share/services/attachListener.cpp Sat Mar 16 21:00:45 2019 +0000
@@ -257,13 +257,22 @@
// See also: ClassHistogramDCmd class
//
// Input arguments :-
-// arg0: Name of the dump file or NULL
-// arg1: "-live" or "-all"
+// arg0: "-live" or "-all"
+// arg1: Name of the dump file or NULL
static jint heap_inspection(AttachOperation* op, outputStream* out) {
bool live_objects_only = true; // default is true to retain the behavior before this change is made
outputStream* os = out; // if path not specified or path is NULL, use out
fileStream* fs = NULL;
- const char* path = op->arg(0);
+ const char* arg0 = op->arg(0);
+ if (arg0 != NULL && (strlen(arg0) > 0)) {
+ if (strcmp(arg0, "-all") != 0 && strcmp(arg0, "-live") != 0) {
+ out->print_cr("Invalid argument to inspectheap operation: %s", arg0);
+ return JNI_ERR;
+ }
+ live_objects_only = strcmp(arg0, "-live") == 0;
+ }
+
+ const char* path = op->arg(1);
if (path != NULL) {
if (path[0] == '\0') {
out->print_cr("No dump file specified");
@@ -277,14 +286,7 @@
os = fs;
}
}
- const char* arg1 = op->arg(1);
- if (arg1 != NULL && (strlen(arg1) > 0)) {
- if (strcmp(arg1, "-all") != 0 && strcmp(arg1, "-live") != 0) {
- out->print_cr("Invalid argument to inspectheap operation: %s", arg1);
- return JNI_ERR;
- }
- live_objects_only = strcmp(arg1, "-live") == 0;
- }
+
VM_GC_HeapInspection heapop(os, live_objects_only /* request full gc */);
VMThread::execute(&heapop);
if (os != NULL && os != out) {
--- a/src/hotspot/share/services/attachListener.hpp Tue Mar 12 09:49:10 2019 +0000
+++ b/src/hotspot/share/services/attachListener.hpp Sat Mar 16 21:00:45 2019 +0000
@@ -106,7 +106,7 @@
enum {
name_length_max = 16, // maximum length of name
arg_length_max = 1024, // maximum length of argument
- arg_count_max = 4 // maximum number of arguments
+ arg_count_max = 3 // maximum number of arguments
};
// name of special operation that can be enqueued when all
--- a/src/java.base/share/classes/com/sun/security/cert/internal/x509/X509V1CertImpl.java Tue Mar 12 09:49:10 2019 +0000
+++ b/src/java.base/share/classes/com/sun/security/cert/internal/x509/X509V1CertImpl.java Sat Mar 16 21:00:45 2019 +0000
@@ -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
@@ -51,7 +51,8 @@
*
* @author Jeff Nisewanger
*/
-@Deprecated
+@SuppressWarnings("removal")
+@Deprecated(since="9", forRemoval=true)
public class X509V1CertImpl extends X509Certificate implements Serializable {
static final long serialVersionUID = -2048442350420423405L;
private java.security.cert.X509Certificate wrappedCert;
--- a/src/java.base/share/classes/java/lang/ProcessBuilder.java Tue Mar 12 09:49:10 2019 +0000
+++ b/src/java.base/share/classes/java/lang/ProcessBuilder.java Sat Mar 16 21:00:45 2019 +0000
@@ -89,7 +89,7 @@
* <li><a id="redirect-output">a destination for <i>standard output</i>
* and <i>standard error</i></a>. By default, the subprocess writes standard
* output and standard error to pipes. Java code can access these pipes
- * via the input streams returned by {@link Process#getOutputStream()} and
+ * via the input streams returned by {@link Process#getInputStream()} and
* {@link Process#getErrorStream()}. However, standard output and
* standard error may be redirected to other destinations using
* {@link #redirectOutput(Redirect) redirectOutput} and
--- a/src/java.base/share/classes/java/lang/ThreadGroup.java Tue Mar 12 09:49:10 2019 +0000
+++ b/src/java.base/share/classes/java/lang/ThreadGroup.java Sat Mar 16 21:00:45 2019 +0000
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1995, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1995, 2019, Oracle and/or its affiliates. All rights reserved.
* 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,6 @@
import java.io.PrintStream;
import java.util.Arrays;
-import jdk.internal.misc.VM;
/**
* A thread group represents a set of threads. In addition, a thread
@@ -425,7 +424,7 @@
ThreadGroup[] groupsSnapshot = null;
synchronized (this) {
if (destroyed) {
- return 0;
+ return n;
}
int nt = nthreads;
if (nt > list.length - n) {
@@ -559,7 +558,7 @@
ThreadGroup[] groupsSnapshot = null;
synchronized (this) {
if (destroyed) {
- return 0;
+ return n;
}
int ng = ngroups;
if (ng > list.length - n) {
--- a/src/java.base/share/classes/java/lang/Throwable.java Tue Mar 12 09:49:10 2019 +0000
+++ b/src/java.base/share/classes/java/lang/Throwable.java Sat Mar 16 21:00:45 2019 +0000
@@ -914,8 +914,7 @@
for (Throwable t : suppressedExceptions) {
// Enforce constraints on suppressed exceptions in
// case of corrupt or malicious stream.
- if (t == null)
- throw new NullPointerException(NULL_CAUSE_MESSAGE);
+ Objects.requireNonNull(t, NULL_CAUSE_MESSAGE);
if (t == this)
throw new IllegalArgumentException(SELF_SUPPRESSION_MESSAGE);
suppressed.add(t);
@@ -942,8 +941,7 @@
stackTrace = null;
} else { // Verify stack trace elements are non-null.
for(StackTraceElement ste : stackTrace) {
- if (ste == null)
- throw new NullPointerException("null StackTraceElement in serial stream. ");
+ Objects.requireNonNull(ste, "null StackTraceElement in serial stream.");
}
}
} else {
@@ -1034,8 +1032,7 @@
if (exception == this)
throw new IllegalArgumentException(SELF_SUPPRESSION_MESSAGE, exception);
- if (exception == null)
- throw new NullPointerException(NULL_CAUSE_MESSAGE);
+ Objects.requireNonNull(exception, NULL_CAUSE_MESSAGE);
if (suppressedExceptions == null) // Suppressed exceptions not recorded
return;
--- a/src/java.base/share/classes/java/net/AbstractPlainSocketImpl.java Tue Mar 12 09:49:10 2019 +0000
+++ b/src/java.base/share/classes/java/net/AbstractPlainSocketImpl.java Sat Mar 16 21:00:45 2019 +0000
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1995, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1995, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
--- a/src/java.base/share/classes/java/net/HttpConnectSocketImpl.java Tue Mar 12 09:49:10 2019 +0000
+++ b/src/java.base/share/classes/java/net/HttpConnectSocketImpl.java Sat Mar 16 21:00:45 2019 +0000
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2010, 2013, 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
--- a/src/java.base/share/classes/java/net/JarURLConnection.java Tue Mar 12 09:49:10 2019 +0000
+++ b/src/java.base/share/classes/java/net/JarURLConnection.java Sat Mar 16 21:00:45 2019 +0000
@@ -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
@@ -293,7 +293,7 @@
}
/**
- * Return the Certificate object for this connection if the URL
+ * Returns the Certificate objects for this connection if the URL
* for it points to a JAR file entry, null otherwise. This method
* can only be called once
* the connection has been completely verified by reading
--- a/src/java.base/share/classes/java/net/MulticastSocket.java Tue Mar 12 09:49:10 2019 +0000
+++ b/src/java.base/share/classes/java/net/MulticastSocket.java Sat Mar 16 21:00:45 2019 +0000
@@ -52,8 +52,9 @@
* InetAddress group = InetAddress.getByName("228.5.6.7");
* MulticastSocket s = new MulticastSocket(6789);
* s.joinGroup(group);
- * DatagramPacket hi = new DatagramPacket(msg.getBytes(), msg.length(),
- * group, 6789);
+ * byte[] msgBytes = msg.getBytes(StandardCharsets.UTF_8);
+ * DatagramPacket hi = new DatagramPacket(msgBytes, msgBytes.length,
+ * group, 6789);
* s.send(hi);
* // get their responses!
* byte[] buf = new byte[1000];
--- a/src/java.base/share/classes/java/net/SocksSocketImpl.java Tue Mar 12 09:49:10 2019 +0000
+++ b/src/java.base/share/classes/java/net/SocksSocketImpl.java Sat Mar 16 21:00:45 2019 +0000
@@ -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
--- a/src/java.base/share/classes/java/net/doc-files/net-properties.html Tue Mar 12 09:49:10 2019 +0000
+++ b/src/java.base/share/classes/java/net/doc-files/net-properties.html Sat Mar 16 21:00:45 2019 +0000
@@ -1,6 +1,6 @@
<!DOCTYPE HTML>
<!--
- 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
@@ -208,7 +208,7 @@
username. With this method existing applications that use the
authenticator class do not need to be modified, as long as users
are made aware that this notation must be used.</P>
- <LI><P>If a domain name is not specified as in method 2) and these
+ <LI><P>If a domain name is not specified as in method 2) and this
property is defined, then its value will be used a the domain
name.</P>
</OL>
--- a/src/java.base/share/classes/java/nio/Buffer.java Tue Mar 12 09:49:10 2019 +0000
+++ b/src/java.base/share/classes/java/nio/Buffer.java Sat Mar 16 21:00:45 2019 +0000
@@ -731,11 +731,6 @@
mark = -1;
}
- static void checkBounds(int off, int len, int size) { // package-private
- if ((off | len | (off + len) | (size - (off + len))) < 0)
- throw new IndexOutOfBoundsException();
- }
-
static {
// setup access to this package in SharedSecrets
SharedSecrets.setJavaNioAccess(
--- a/src/java.base/share/classes/java/nio/ByteBufferAs-X-Buffer.java.template Tue Mar 12 09:49:10 2019 +0000
+++ b/src/java.base/share/classes/java/nio/ByteBufferAs-X-Buffer.java.template Sat Mar 16 21:00:45 2019 +0000
@@ -87,8 +87,7 @@
@Override
public $Type$Buffer slice(int index, int length) {
- Objects.checkIndex(index, limit() + 1);
- Objects.checkIndex(length, limit() - index + 1);
+ Objects.checkFromIndexSize(index, length, limit());
return new ByteBufferAs$Type$Buffer$RW$$BO$(bb,
-1,
0,
@@ -207,8 +206,7 @@
#if[char]
public String toString(int start, int end) {
- if ((end > limit()) || (start > end))
- throw new IndexOutOfBoundsException();
+ Objects.checkFromToIndex(start, end, limit());
try {
int len = end - start;
char[] ca = new char[len];
@@ -233,8 +231,7 @@
pos = (pos <= lim ? pos : lim);
int len = lim - pos;
- if ((start < 0) || (end > len) || (start > end))
- throw new IndexOutOfBoundsException();
+ Objects.checkFromToIndex(start, end, len);
return new ByteBufferAsCharBuffer$RW$$BO$(bb,
-1,
pos + start,
--- a/src/java.base/share/classes/java/nio/Direct-X-Buffer.java.template Tue Mar 12 09:49:10 2019 +0000
+++ b/src/java.base/share/classes/java/nio/Direct-X-Buffer.java.template Sat Mar 16 21:00:45 2019 +0000
@@ -220,8 +220,7 @@
@Override
public $Type$Buffer slice(int index, int length) {
- Objects.checkIndex(index, limit() + 1);
- Objects.checkIndex(length, limit() - index + 1);
+ Objects.checkFromIndexSize(index, length, limit());
return new Direct$Type$Buffer$RW$$BO$(this,
-1,
0,
@@ -291,7 +290,7 @@
public $Type$Buffer get($type$[] dst, int offset, int length) {
#if[rw]
if (((long)length << $LG_BYTES_PER_VALUE$) > Bits.JNI_COPY_TO_ARRAY_THRESHOLD) {
- checkBounds(offset, length, dst.length);
+ Objects.checkFromIndexSize(offset, length, dst.length);
int pos = position();
int lim = limit();
assert (pos <= lim);
@@ -440,7 +439,7 @@
public $Type$Buffer put($type$[] src, int offset, int length) {
#if[rw]
if (((long)length << $LG_BYTES_PER_VALUE$) > Bits.JNI_COPY_FROM_ARRAY_THRESHOLD) {
- checkBounds(offset, length, src.length);
+ Objects.checkFromIndexSize(offset, length, src.length);
int pos = position();
int lim = limit();
assert (pos <= lim);
@@ -546,8 +545,7 @@
#if[char]
public String toString(int start, int end) {
- if ((end > limit()) || (start > end))
- throw new IndexOutOfBoundsException();
+ Objects.checkFromToIndex(start, end, limit());
try {
int len = end - start;
char[] ca = new char[len];
@@ -572,8 +570,7 @@
pos = (pos <= lim ? pos : lim);
int len = lim - pos;
- if ((start < 0) || (end > len) || (start > end))
- throw new IndexOutOfBoundsException();
+ Objects.checkFromToIndex(start, end, len);
return new DirectCharBuffer$RW$$BO$(this,
-1,
pos + start,
--- a/src/java.base/share/classes/java/nio/Heap-X-Buffer.java.template Tue Mar 12 09:49:10 2019 +0000
+++ b/src/java.base/share/classes/java/nio/Heap-X-Buffer.java.template Sat Mar 16 21:00:45 2019 +0000
@@ -104,18 +104,18 @@
}
public $Type$Buffer slice() {
+ int rem = this.remaining();
return new Heap$Type$Buffer$RW$(hb,
-1,
0,
- this.remaining(),
- this.remaining(),
+ rem,
+ rem,
this.position() + offset);
}
@Override
public $Type$Buffer slice(int index, int length) {
- Objects.checkIndex(index, limit() + 1);
- Objects.checkIndex(length, limit() - index + 1);
+ Objects.checkFromIndexSize(index, length, limit());
return new Heap$Type$Buffer$RW$(hb,
-1,
0,
@@ -173,11 +173,12 @@
#end[streamableType]
public $Type$Buffer get($type$[] dst, int offset, int length) {
- checkBounds(offset, length, dst.length);
- if (length > remaining())
+ Objects.checkFromIndexSize(offset, length, dst.length);
+ int pos = position();
+ if (length > limit() - pos)
throw new BufferUnderflowException();
- System.arraycopy(hb, ix(position()), dst, offset, length);
- position(position() + length);
+ System.arraycopy(hb, ix(pos), dst, offset, length);
+ position(pos + length);
return this;
}
@@ -218,11 +219,12 @@
public $Type$Buffer put($type$[] src, int offset, int length) {
#if[rw]
- checkBounds(offset, length, src.length);
- if (length > remaining())
+ Objects.checkFromIndexSize(offset, length, src.length);
+ int pos = position();
+ if (length > limit() - pos)
throw new BufferOverflowException();
- System.arraycopy(src, offset, hb, ix(position()), length);
- position(position() + length);
+ System.arraycopy(src, offset, hb, ix(pos), length);
+ position(pos + length);
return this;
#else[rw]
throw new ReadOnlyBufferException();
@@ -235,19 +237,22 @@
if (src == this)
throw createSameBufferException();
Heap$Type$Buffer sb = (Heap$Type$Buffer)src;
- int n = sb.remaining();
- if (n > remaining())
+ int pos = position();
+ int sbpos = sb.position();
+ int n = sb.limit() - sbpos;
+ if (n > limit() - pos)
throw new BufferOverflowException();
- System.arraycopy(sb.hb, sb.ix(sb.position()),
- hb, ix(position()), n);
- sb.position(sb.position() + n);
- position(position() + n);
+ System.arraycopy(sb.hb, sb.ix(sbpos),
+ hb, ix(pos), n);
+ sb.position(sbpos + n);
+ position(pos + n);
} else if (src.isDirect()) {
int n = src.remaining();
- if (n > remaining())
+ int pos = position();
+ if (n > limit() - pos)
throw new BufferOverflowException();
- src.get(hb, ix(position()), n);
- position(position() + n);
+ src.get(hb, ix(pos), n);
+ position(pos + n);
} else {
super.put(src);
}
@@ -272,7 +277,7 @@
public $Type$Buffer put(String src, int start, int end) {
int length = end - start;
- checkBounds(start, length, src.length());
+ Objects.checkFromIndexSize(start, length, src.length());
if (isReadOnly())
throw new ReadOnlyBufferException();
int pos = position();
@@ -289,8 +294,10 @@
public $Type$Buffer compact() {
#if[rw]
- System.arraycopy(hb, ix(position()), hb, ix(0), remaining());
- position(remaining());
+ int pos = position();
+ int rem = limit() - pos;
+ System.arraycopy(hb, ix(pos), hb, ix(0), rem);
+ position(rem);
limit(capacity());
discardMark();
return this;
@@ -348,8 +355,9 @@
}
public CharBuffer asCharBuffer() {
- int size = this.remaining() >> 1;
- long addr = address + position();
+ int pos = position();
+ int size = (limit() - pos) >> 1;
+ long addr = address + pos;
return (bigEndian
? (CharBuffer)(new ByteBufferAsCharBuffer$RW$B(this,
-1,
@@ -399,8 +407,9 @@
}
public ShortBuffer asShortBuffer() {
- int size = this.remaining() >> 1;
- long addr = address + position();
+ int pos = position();
+ int size = (limit() - pos) >> 1;
+ long addr = address + pos;
return (bigEndian
? (ShortBuffer)(new ByteBufferAsShortBuffer$RW$B(this,
-1,
@@ -450,8 +459,9 @@
}
public IntBuffer asIntBuffer() {
- int size = this.remaining() >> 2;
- long addr = address + position();
+ int pos = position();
+ int size = (limit() - pos) >> 2;
+ long addr = address + pos;
return (bigEndian
? (IntBuffer)(new ByteBufferAsIntBuffer$RW$B(this,
-1,
@@ -501,8 +511,9 @@
}
public LongBuffer asLongBuffer() {
- int size = this.remaining() >> 3;
- long addr = address + position();
+ int pos = position();
+ int size = (limit() - pos) >> 3;
+ long addr = address + pos;
return (bigEndian
? (LongBuffer)(new ByteBufferAsLongBuffer$RW$B(this,
-1,
@@ -556,8 +567,9 @@
}
public FloatBuffer asFloatBuffer() {
- int size = this.remaining() >> 2;
- long addr = address + position();
+ int pos = position();
+ int size = (limit() - pos) >> 2;
+ long addr = address + pos;
return (bigEndian
? (FloatBuffer)(new ByteBufferAsFloatBuffer$RW$B(this,
-1,
@@ -611,8 +623,9 @@
}
public DoubleBuffer asDoubleBuffer() {
- int size = this.remaining() >> 3;
- long addr = address + position();
+ int pos = position();
+ int size = (limit() - pos) >> 3;
+ long addr = address + pos;
return (bigEndian
? (DoubleBuffer)(new ByteBufferAsDoubleBuffer$RW$B(this,
-1,
@@ -646,11 +659,8 @@
// --- Methods to support CharSequence ---
public CharBuffer subSequence(int start, int end) {
- if ((start < 0)
- || (end > length())
- || (start > end))
- throw new IndexOutOfBoundsException();
int pos = position();
+ Objects.checkFromToIndex(start, end, limit() - pos);
return new HeapCharBuffer$RW$(hb,
-1,
pos + start,
--- a/src/java.base/share/classes/java/nio/StringCharBuffer.java Tue Mar 12 09:49:10 2019 +0000
+++ b/src/java.base/share/classes/java/nio/StringCharBuffer.java Sat Mar 16 21:00:45 2019 +0000
@@ -37,8 +37,7 @@
StringCharBuffer(CharSequence s, int start, int end) { // package-private
super(-1, start, end, s.length());
int n = s.length();
- if ((start < 0) || (start > n) || (end < start) || (end > n))
- throw new IndexOutOfBoundsException();
+ Objects.checkFromToIndex(start, end, n);
str = s;
this.isReadOnly = true;
}
@@ -54,8 +53,7 @@
@Override
public CharBuffer slice(int index, int length) {
- Objects.checkIndex(index, limit() + 1);
- Objects.checkIndex(length, limit() - index + 1);
+ Objects.checkFromIndexSize(index, length, limit());
return new StringCharBuffer(str,
-1,
0,
--- a/src/java.base/share/classes/java/nio/X-Buffer.java.template Tue Mar 12 09:49:10 2019 +0000
+++ b/src/java.base/share/classes/java/nio/X-Buffer.java.template Sat Mar 16 21:00:45 2019 +0000
@@ -772,7 +772,7 @@
* parameters do not hold
*/
public $Type$Buffer get($type$[] dst, int offset, int length) {
- checkBounds(offset, length, dst.length);
+ Objects.checkFromIndexSize(offset, length, dst.length);
if (length > remaining())
throw new BufferUnderflowException();
int end = offset + length;
@@ -996,7 +996,7 @@
* If this buffer is read-only
*/
public $Type$Buffer put($type$[] src, int offset, int length) {
- checkBounds(offset, length, src.length);
+ Objects.checkFromIndexSize(offset, length, src.length);
if (length > remaining())
throw new BufferOverflowException();
int end = offset + length;
@@ -1176,7 +1176,7 @@
* If this buffer is read-only
*/
public $Type$Buffer put(String src, int start, int end) {
- checkBounds(start, end - start, src.length());
+ Objects.checkFromIndexSize(start, end - start, src.length());
if (isReadOnly())
throw new ReadOnlyBufferException();
if (end - start > remaining())
--- a/src/java.base/share/classes/java/text/CompactNumberFormat.java Tue Mar 12 09:49:10 2019 +0000
+++ b/src/java.base/share/classes/java/text/CompactNumberFormat.java Sat Mar 16 21:00:45 2019 +0000
@@ -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
@@ -406,6 +406,11 @@
public final StringBuffer format(Object number,
StringBuffer toAppendTo,
FieldPosition fieldPosition) {
+
+ if (number == null) {
+ throw new IllegalArgumentException("Cannot format null as a number");
+ }
+
if (number instanceof Long || number instanceof Integer
|| number instanceof Short || number instanceof Byte
|| number instanceof AtomicInteger
@@ -1053,6 +1058,11 @@
*/
private void applyPattern(String pattern, int index) {
+ if (pattern == null) {
+ throw new IllegalArgumentException("A null compact pattern" +
+ " encountered at index: " + index);
+ }
+
int start = 0;
boolean gotNegative = false;
--- a/src/java.base/share/classes/javax/net/ssl/HandshakeCompletedEvent.java Tue Mar 12 09:49:10 2019 +0000
+++ b/src/java.base/share/classes/javax/net/ssl/HandshakeCompletedEvent.java Sat Mar 16 21:00:45 2019 +0000
@@ -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
@@ -162,7 +162,8 @@
* array of {@code java.security.cert.Certificate} should
* be used instead.
*/
- @Deprecated(since="9")
+ @SuppressWarnings("removal")
+ @Deprecated(since="9", forRemoval=true)
public javax.security.cert.X509Certificate [] getPeerCertificateChain()
throws SSLPeerUnverifiedException
{
--- a/src/java.base/share/classes/javax/net/ssl/SSLSession.java Tue Mar 12 09:49:10 2019 +0000
+++ b/src/java.base/share/classes/javax/net/ssl/SSLSession.java Sat Mar 16 21:00:45 2019 +0000
@@ -282,7 +282,8 @@
* array of {@code java.security.cert.Certificate} should
* be used instead.
*/
- @Deprecated(since="9")
+ @SuppressWarnings("removal")
+ @Deprecated(since="9", forRemoval=true)
public javax.security.cert.X509Certificate [] getPeerCertificateChain()
throws SSLPeerUnverifiedException;
--- a/src/java.base/share/classes/javax/security/cert/Certificate.java Tue Mar 12 09:49:10 2019 +0000
+++ b/src/java.base/share/classes/javax/security/cert/Certificate.java Sat Mar 16 21:00:45 2019 +0000
@@ -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
@@ -61,7 +61,8 @@
*
* @author Hemma Prafullchandra
*/
-@Deprecated(since="9")
+@SuppressWarnings("removal")
+@Deprecated(since="9", forRemoval=true)
public abstract class Certificate {
/**
--- a/src/java.base/share/classes/javax/security/cert/CertificateEncodingException.java Tue Mar 12 09:49:10 2019 +0000
+++ b/src/java.base/share/classes/javax/security/cert/CertificateEncodingException.java Sat Mar 16 21:00:45 2019 +0000
@@ -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
@@ -40,7 +40,8 @@
* @author Hemma Prafullchandra
* @deprecated Use the classes in {@code java.security.cert} instead.
*/
-@Deprecated(since="9")
+@SuppressWarnings("removal")
+@Deprecated(since="9", forRemoval=true)
public class CertificateEncodingException extends CertificateException {
private static final long serialVersionUID = -8187642723048403470L;
--- a/src/java.base/share/classes/javax/security/cert/CertificateException.java Tue Mar 12 09:49:10 2019 +0000
+++ b/src/java.base/share/classes/javax/security/cert/CertificateException.java Sat Mar 16 21:00:45 2019 +0000
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1996, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1996, 2019, Oracle and/or its affiliates. All rights reserved.
* 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,7 +40,7 @@
* @see Certificate
* @deprecated Use the classes in {@code java.security.cert} instead.
*/
-@Deprecated(since="9")
+@Deprecated(since="9", forRemoval=true)
public class CertificateException extends Exception {
private static final long serialVersionUID = -5757213374030785290L;
--- a/src/java.base/share/classes/javax/security/cert/CertificateExpiredException.java Tue Mar 12 09:49:10 2019 +0000
+++ b/src/java.base/share/classes/javax/security/cert/CertificateExpiredException.java Sat Mar 16 21:00:45 2019 +0000
@@ -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
@@ -42,7 +42,8 @@
* @author Hemma Prafullchandra
* @deprecated Use the classes in {@code java.security.cert} instead.
*/
-@Deprecated(since="9")
+@SuppressWarnings("removal")
+@Deprecated(since="9", forRemoval=true)
public class CertificateExpiredException extends CertificateException {
private static final long serialVersionUID = 5091601212177261883L;
--- a/src/java.base/share/classes/javax/security/cert/CertificateNotYetValidException.java Tue Mar 12 09:49:10 2019 +0000
+++ b/src/java.base/share/classes/javax/security/cert/CertificateNotYetValidException.java Sat Mar 16 21:00:45 2019 +0000
@@ -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
@@ -42,7 +42,8 @@
* @author Hemma Prafullchandra
* @deprecated Use the classes in {@code java.security.cert} instead.
*/
-@Deprecated(since="9")
+@SuppressWarnings("removal")
+@Deprecated(since="9", forRemoval=true)
public class CertificateNotYetValidException extends CertificateException {
private static final long serialVersionUID = -8976172474266822818L;
--- a/src/java.base/share/classes/javax/security/cert/CertificateParsingException.java Tue Mar 12 09:49:10 2019 +0000
+++ b/src/java.base/share/classes/javax/security/cert/CertificateParsingException.java Sat Mar 16 21:00:45 2019 +0000
@@ -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
@@ -41,7 +41,8 @@
* @author Hemma Prafullchandra
* @deprecated Use the classes in {@code java.security.cert} instead.
*/
-@Deprecated(since="9")
+@SuppressWarnings("removal")
+@Deprecated(since="9", forRemoval=true)
public class CertificateParsingException extends CertificateException {
private static final long serialVersionUID = -8449352422951136229L;
--- a/src/java.base/share/classes/javax/security/cert/X509Certificate.java Tue Mar 12 09:49:10 2019 +0000
+++ b/src/java.base/share/classes/javax/security/cert/X509Certificate.java Sat Mar 16 21:00:45 2019 +0000
@@ -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
@@ -126,7 +126,8 @@
* @see java.security.Security security properties
* @deprecated Use the classes in {@code java.security.cert} instead.
*/
-@Deprecated(since="9")
+@SuppressWarnings("removal")
+@Deprecated(since="9", forRemoval=true)
public abstract class X509Certificate extends Certificate {
/*
--- a/src/java.base/share/classes/jdk/internal/util/ArraysSupport.java Tue Mar 12 09:49:10 2019 +0000
+++ b/src/java.base/share/classes/jdk/internal/util/ArraysSupport.java Sat Mar 16 21:00:45 2019 +0000
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2015, 2017 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2017, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
--- a/src/java.base/share/classes/sun/net/spi/DefaultProxySelector.java Tue Mar 12 09:49:10 2019 +0000
+++ b/src/java.base/share/classes/sun/net/spi/DefaultProxySelector.java Sat Mar 16 21:00:45 2019 +0000
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2003, 2018 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2018, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
--- a/src/java.base/share/classes/sun/nio/ch/Net.java Tue Mar 12 09:49:10 2019 +0000
+++ b/src/java.base/share/classes/sun/nio/ch/Net.java Sat Mar 16 21:00:45 2019 +0000
@@ -492,6 +492,10 @@
int remotePort)
throws IOException;
+ public static native int accept(FileDescriptor fd,
+ FileDescriptor newfd,
+ InetSocketAddress[] isaa)
+ throws IOException;
public static final int SHUT_RD = 0;
public static final int SHUT_WR = 1;
--- a/src/java.base/share/classes/sun/nio/ch/NioSocketImpl.java Tue Mar 12 09:49:10 2019 +0000
+++ b/src/java.base/share/classes/sun/nio/ch/NioSocketImpl.java Sat Mar 16 21:00:45 2019 +0000
@@ -686,7 +686,7 @@
int n;
do {
park(fd, Net.POLLIN, remainingNanos);
- n = ServerSocketChannelImpl.accept0(fd, newfd, isaa);
+ n = Net.accept(fd, newfd, isaa);
if (n == IOStatus.UNAVAILABLE) {
remainingNanos = nanos - (System.nanoTime() - startNanos);
if (remainingNanos <= 0) {
@@ -715,7 +715,7 @@
try {
int timeout = this.timeout;
configureNonBlockingIfNeeded(fd, timeout);
- n = ServerSocketChannelImpl.accept0(fd, newfd, isaa);
+ n = Net.accept(fd, newfd, isaa);
if (IOStatus.okayToRetry(n) && isOpen()) {
if (timeout > 0) {
// accept with timeout
@@ -724,7 +724,7 @@
// accept, no timeout
do {
park(fd, Net.POLLIN);
- n = ServerSocketChannelImpl.accept0(fd, newfd, isaa);
+ n = Net.accept(fd, newfd, isaa);
} while (IOStatus.okayToRetry(n) && isOpen());
}
}
--- a/src/java.base/share/classes/sun/nio/ch/ServerSocketChannelImpl.java Tue Mar 12 09:49:10 2019 +0000
+++ b/src/java.base/share/classes/sun/nio/ch/ServerSocketChannelImpl.java Sat Mar 16 21:00:45 2019 +0000
@@ -58,7 +58,7 @@
implements SelChImpl
{
// Used to make native close and configure calls
- private static NativeDispatcher nd;
+ private static final NativeDispatcher nd = new SocketDispatcher();
// Our file descriptor
private final FileDescriptor fd;
@@ -97,7 +97,7 @@
ServerSocketChannelImpl(SelectorProvider sp) throws IOException {
super(sp);
- this.fd = Net.serverSocket(true);
+ this.fd = Net.serverSocket(true);
this.fdVal = IOUtil.fdVal(fd);
}
@@ -261,46 +261,44 @@
@Override
public SocketChannel accept() throws IOException {
+ int n = 0;
+ FileDescriptor newfd = new FileDescriptor();
+ InetSocketAddress[] isaa = new InetSocketAddress[1];
+
acceptLock.lock();
try {
- int n = 0;
- FileDescriptor newfd = new FileDescriptor();
- InetSocketAddress[] isaa = new InetSocketAddress[1];
-
boolean blocking = isBlocking();
try {
begin(blocking);
do {
- n = accept(this.fd, newfd, isaa);
+ n = Net.accept(this.fd, newfd, isaa);
} while (n == IOStatus.INTERRUPTED && isOpen());
} finally {
end(blocking, n > 0);
assert IOStatus.check(n);
}
- if (n < 1)
- return null;
+ } finally {
+ acceptLock.unlock();
+ }
+ if (n < 1)
+ return null;
+
+ InetSocketAddress isa = isaa[0];
+ try {
// newly accepted socket is initially in blocking mode
IOUtil.configureBlocking(newfd, true);
- InetSocketAddress isa = isaa[0];
- SocketChannel sc = new SocketChannelImpl(provider(), newfd, isa);
-
// check permitted to accept connections from the remote address
SecurityManager sm = System.getSecurityManager();
if (sm != null) {
- try {
- sm.checkAccept(isa.getAddress().getHostAddress(), isa.getPort());
- } catch (SecurityException x) {
- sc.close();
- throw x;
- }
+ sm.checkAccept(isa.getAddress().getHostAddress(), isa.getPort());
}
- return sc;
-
- } finally {
- acceptLock.unlock();
+ return new SocketChannelImpl(provider(), newfd, isa);
+ } catch (Exception e) {
+ nd.close(newfd);
+ throw e;
}
}
@@ -508,38 +506,4 @@
sb.append(']');
return sb.toString();
}
-
- /**
- * Accept a connection on a socket.
- *
- * @implNote Wrap native call to allow instrumentation.
- */
- private int accept(FileDescriptor ssfd,
- FileDescriptor newfd,
- InetSocketAddress[] isaa)
- throws IOException
- {
- return accept0(ssfd, newfd, isaa);
- }
-
- // -- Native methods --
-
- // Accepts a new connection, setting the given file descriptor to refer to
- // the new socket and setting isaa[0] to the socket's remote address.
- // Returns 1 on success, or IOStatus.UNAVAILABLE (if non-blocking and no
- // connections are pending) or IOStatus.INTERRUPTED.
- //
- static native int accept0(FileDescriptor ssfd,
- FileDescriptor newfd,
- InetSocketAddress[] isaa)
- throws IOException;
-
- private static native void initIDs();
-
- static {
- IOUtil.load();
- initIDs();
- nd = new SocketDispatcher();
- }
-
}
--- a/src/java.base/share/classes/sun/security/ssl/SSLSessionImpl.java Tue Mar 12 09:49:10 2019 +0000
+++ b/src/java.base/share/classes/sun/security/ssl/SSLSessionImpl.java Sat Mar 16 21:00:45 2019 +0000
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1996, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1996, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -597,7 +597,8 @@
* Use {@code getPeerCertificates()} instead.
*/
@Override
- @Deprecated
+ @SuppressWarnings("removal")
+ @Deprecated(since="9", forRemoval=true)
public javax.security.cert.X509Certificate[] getPeerCertificateChain()
throws SSLPeerUnverifiedException {
//
--- a/src/java.base/share/classes/sun/security/util/IOUtils.java Tue Mar 12 09:49:10 2019 +0000
+++ b/src/java.base/share/classes/sun/security/util/IOUtils.java Sat Mar 16 21:00:45 2019 +0000
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2009, 2017 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2009, 2017, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
--- a/src/java.base/share/classes/sun/text/normalizer/Norm2AllModes.java Tue Mar 12 09:49:10 2019 +0000
+++ b/src/java.base/share/classes/sun/text/normalizer/Norm2AllModes.java Sat Mar 16 21:00:45 2019 +0000
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2015, 2018 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2018, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
--- a/src/java.base/share/classes/sun/text/normalizer/Normalizer2.java Tue Mar 12 09:49:10 2019 +0000
+++ b/src/java.base/share/classes/sun/text/normalizer/Normalizer2.java Sat Mar 16 21:00:45 2019 +0000
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2015, 2018 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2018, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
--- a/src/java.base/share/native/libverify/check_code.c Tue Mar 12 09:49:10 2019 +0000
+++ b/src/java.base/share/native/libverify/check_code.c Sat Mar 16 21:00:45 2019 +0000
@@ -707,6 +707,7 @@
return *pID;
}
+#ifdef DEBUG
static const char *
ID_to_class_name(context_type *context, unsigned short ID)
{
@@ -714,6 +715,7 @@
hash_bucket_type *bucket = GET_BUCKET(class_hash, ID);
return bucket->name;
}
+#endif
static jclass
ID_to_class(context_type *context, unsigned short ID)
@@ -1390,7 +1392,7 @@
case JVM_OPC_invokedynamic:
CCerror(context,
"invokedynamic bytecode is not supported in this class file version");
-
+ break;
case JVM_OPC_instanceof:
case JVM_OPC_checkcast:
case JVM_OPC_new:
@@ -1699,7 +1701,9 @@
if ((index < 0) || (index > 65535)) {
return -1; /* illegal */
} else {
- return (unsigned char *)(&lpc[index + 4]) - iptr;
+ unsigned char *finish = (unsigned char *)(&lpc[index + 4]);
+ assert(finish >= iptr);
+ return (int)(finish - iptr);
}
}
@@ -1714,8 +1718,11 @@
*/
if (npairs < 0 || npairs >= 65536)
return -1;
- else
- return (unsigned char *)(&lpc[2 * (npairs + 1)]) - iptr;
+ else {
+ unsigned char *finish = (unsigned char *)(&lpc[2 * (npairs + 1)]);
+ assert(finish >= iptr);
+ return (int)(finish - iptr);
+ }
}
case JVM_OPC_wide:
@@ -3828,7 +3835,8 @@
result = 0;
break;
}
- length = finish - p;
+ assert(finish >= p);
+ length = (int)(finish - p);
if (length + 1 > (int)sizeof(buffer_space)) {
buffer = malloc(length + 1);
check_and_push(context, buffer, VM_MALLOC_BLK);
--- a/src/java.base/share/native/libverify/check_format.c Tue Mar 12 09:49:10 2019 +0000
+++ b/src/java.base/share/native/libverify/check_format.c Sat Mar 16 21:00:45 2019 +0000
@@ -23,6 +23,8 @@
* questions.
*/
+#include <assert.h>
+#include <limits.h>
#include <setjmp.h>
#include <stdlib.h>
#include <string.h>
@@ -232,7 +234,9 @@
JNIEXPORT jboolean
VerifyClassname(char *name, jboolean allowArrayClass)
{
- unsigned int length = strlen(name);
+ size_t s = strlen(name);
+ assert(s <= UINT_MAX);
+ unsigned int length = (unsigned int)s;
char *p;
if (length > 0 && name[0] == JVM_SIGNATURE_ARRAY) {
--- a/src/java.base/unix/classes/sun/nio/ch/UnixAsynchronousServerSocketChannelImpl.java Tue Mar 12 09:49:10 2019 +0000
+++ b/src/java.base/unix/classes/sun/nio/ch/UnixAsynchronousServerSocketChannelImpl.java Sat Mar 16 21:00:45 2019 +0000
@@ -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
@@ -141,7 +141,7 @@
Throwable exc = null;
try {
begin();
- int n = accept(this.fd, newfd, isaa);
+ int n = Net.accept(this.fd, newfd, isaa);
// spurious wakeup, is this possible?
if (n == IOStatus.UNAVAILABLE) {
@@ -221,7 +221,7 @@
SecurityManager sm = System.getSecurityManager();
if (sm != null) {
sm.checkAccept(remote.getAddress().getHostAddress(),
- remote.getPort());
+ remote.getPort());
}
return null;
}
@@ -230,7 +230,7 @@
SecurityManager sm = System.getSecurityManager();
if (sm != null) {
sm.checkAccept(remote.getAddress().getHostAddress(),
- remote.getPort());
+ remote.getPort());
}
}
} catch (SecurityException x) {
@@ -277,7 +277,7 @@
try {
begin();
- int n = accept(this.fd, newfd, isaa);
+ int n = Net.accept(this.fd, newfd, isaa);
if (n == IOStatus.UNAVAILABLE) {
// need calling context when there is security manager as
@@ -294,7 +294,7 @@
this.acceptAttachment = att;
}
this.acceptAcc = (System.getSecurityManager() == null) ?
- null : AccessController.getContext();
+ null : AccessController.getContext();
this.acceptPending = true;
}
@@ -331,33 +331,4 @@
return null;
}
}
-
- /**
- * Accept a connection on a socket.
- *
- * @implNote Wrap native call to allow instrumentation.
- */
- private int accept(FileDescriptor ssfd, FileDescriptor newfd,
- InetSocketAddress[] isaa)
- throws IOException
- {
- return accept0(ssfd, newfd, isaa);
- }
-
- // -- Native methods --
-
- private static native void initIDs();
-
- // Accepts a new connection, setting the given file descriptor to refer to
- // the new socket and setting isaa[0] to the socket's remote address.
- // Returns 1 on success, or IOStatus.UNAVAILABLE.
- //
- private native int accept0(FileDescriptor ssfd, FileDescriptor newfd,
- InetSocketAddress[] isaa)
- throws IOException;
-
- static {
- IOUtil.load();
- initIDs();
- }
}
--- a/src/java.base/unix/native/libnio/ch/IOUtil.c Tue Mar 12 09:49:10 2019 +0000
+++ b/src/java.base/unix/native/libnio/ch/IOUtil.c Sat Mar 16 21:00:45 2019 +0000
@@ -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
@@ -63,7 +63,7 @@
JNIEXPORT void JNICALL
Java_sun_nio_ch_IOUtil_setfdVal(JNIEnv *env, jclass clazz, jobject fdo, jint val)
{
- (*env)->SetIntField(env, fdo, fd_fdID, val);
+ setfdval(env, fdo, val);
}
static int
@@ -228,3 +228,10 @@
{
return (*env)->GetIntField(env, fdo, fd_fdID);
}
+
+void
+setfdval(JNIEnv *env, jobject fdo, jint val) {
+ (*env)->SetIntField(env, fdo, fd_fdID, val);
+}
+
+
--- a/src/java.base/unix/native/libnio/ch/Net.c Tue Mar 12 09:49:10 2019 +0000
+++ b/src/java.base/unix/native/libnio/ch/Net.c Sat Mar 16 21:00:45 2019 +0000
@@ -146,9 +146,22 @@
#endif /* _AIX */
+static jclass isa_class; /* java.net.InetSocketAddress */
+static jmethodID isa_ctorID; /* InetSocketAddress(InetAddress, int) */
+
JNIEXPORT void JNICALL
Java_sun_nio_ch_Net_initIDs(JNIEnv *env, jclass clazz)
{
+ jclass cls = (*env)->FindClass(env, "java/net/InetSocketAddress");
+ CHECK_NULL(cls);
+ isa_class = (*env)->NewGlobalRef(env, cls);
+ if (isa_class == NULL) {
+ JNU_ThrowOutOfMemoryError(env, NULL);
+ return;
+ }
+ isa_ctorID = (*env)->GetMethodID(env, cls, "<init>", "(Ljava/net/InetAddress;I)V");
+ CHECK_NULL(isa_ctorID);
+
initInetAddressIDs(env);
}
@@ -309,6 +322,51 @@
}
JNIEXPORT jint JNICALL
+Java_sun_nio_ch_Net_accept(JNIEnv *env, jclass clazz, jobject fdo, jobject newfdo,
+ jobjectArray isaa)
+{
+ jint fd = fdval(env, fdo);
+ jint newfd;
+ SOCKETADDRESS sa;
+ socklen_t sa_len = sizeof(SOCKETADDRESS);
+ jobject remote_ia;
+ jint remote_port = 0;
+ jobject isa;
+
+ /* accept connection but ignore ECONNABORTED */
+ for (;;) {
+ newfd = accept(fd, &sa.sa, &sa_len);
+ if (newfd >= 0) {
+ break;
+ }
+ if (errno != ECONNABORTED) {
+ break;
+ }
+ /* ECONNABORTED => restart accept */
+ }
+
+ if (newfd < 0) {
+ if (errno == EAGAIN || errno == EWOULDBLOCK)
+ return IOS_UNAVAILABLE;
+ if (errno == EINTR)
+ return IOS_INTERRUPTED;
+ JNU_ThrowIOExceptionWithLastError(env, "Accept failed");
+ return IOS_THROWN;
+ }
+
+ setfdval(env, newfdo, newfd);
+
+ remote_ia = NET_SockaddrToInetAddress(env, &sa, (int *)&remote_port);
+ CHECK_NULL_RETURN(remote_ia, IOS_THROWN);
+
+ isa = (*env)->NewObject(env, isa_class, isa_ctorID, remote_ia, remote_port);
+ CHECK_NULL_RETURN(isa, IOS_THROWN);
+ (*env)->SetObjectArrayElement(env, isaa, 0, isa);
+
+ return 1;
+}
+
+JNIEXPORT jint JNICALL
Java_sun_nio_ch_Net_localPort(JNIEnv *env, jclass clazz, jobject fdo)
{
SOCKETADDRESS sa;
@@ -374,6 +432,33 @@
}
JNIEXPORT jint JNICALL
+Java_sun_nio_ch_Net_remotePort(JNIEnv *env, jclass clazz, jobject fdo)
+{
+ SOCKETADDRESS sa;
+ socklen_t sa_len = sizeof(sa);
+
+ if (getpeername(fdval(env, fdo), &sa.sa, &sa_len) < 0) {
+ handleSocketError(env, errno);
+ return IOS_THROWN;
+ }
+ return NET_GetPortFromSockaddr(&sa);
+}
+
+JNIEXPORT jobject JNICALL
+Java_sun_nio_ch_Net_remoteInetAddress(JNIEnv *env, jclass clazz, jobject fdo)
+{
+ SOCKETADDRESS sa;
+ socklen_t sa_len = sizeof(sa);
+ int port;
+
+ if (getpeername(fdval(env, fdo), &sa.sa, &sa_len) < 0) {
+ handleSocketError(env, errno);
+ return NULL;
+ }
+ return NET_SockaddrToInetAddress(env, &sa, &port);
+}
+
+JNIEXPORT jint JNICALL
Java_sun_nio_ch_Net_getIntOption0(JNIEnv *env, jclass clazz, jobject fdo,
jboolean mayNeedConversion, jint level, jint opt)
{
--- a/src/java.base/unix/native/libnio/ch/ServerSocketChannelImpl.c Tue Mar 12 09:49:10 2019 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,121 +0,0 @@
-/*
- * Copyright (c) 2000, 2018, Oracle and/or its affiliates. All rights reserved.
- * 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.
- */
-
-#include <stdlib.h>
-#include <netdb.h>
-#include <sys/types.h>
-#include <sys/socket.h>
-
-#if __linux__
-#include <netinet/in.h>
-#endif
-
-#if defined(__solaris__) && !defined(_SOCKLEN_T)
-typedef size_t socklen_t; /* New in SunOS 5.7, so need this for 5.6 */
-#endif
-
-#include "jni.h"
-#include "jni_util.h"
-#include "net_util.h"
-#include "jvm.h"
-#include "jlong.h"
-#include "sun_nio_ch_ServerSocketChannelImpl.h"
-#include "nio.h"
-#include "nio_util.h"
-
-
-static jfieldID fd_fdID; /* java.io.FileDescriptor.fd */
-static jclass isa_class; /* java.net.InetSocketAddress */
-static jmethodID isa_ctorID; /* .InetSocketAddress(InetAddress, int) */
-
-
-JNIEXPORT void JNICALL
-Java_sun_nio_ch_ServerSocketChannelImpl_initIDs(JNIEnv *env, jclass c)
-{
- jclass cls;
-
- cls = (*env)->FindClass(env, "java/io/FileDescriptor");
- CHECK_NULL(cls);
- fd_fdID = (*env)->GetFieldID(env, cls, "fd", "I");
- CHECK_NULL(fd_fdID);
-
- cls = (*env)->FindClass(env, "java/net/InetSocketAddress");
- CHECK_NULL(cls);
- isa_class = (*env)->NewGlobalRef(env, cls);
- if (isa_class == NULL) {
- JNU_ThrowOutOfMemoryError(env, NULL);
- return;
- }
- isa_ctorID = (*env)->GetMethodID(env, cls, "<init>",
- "(Ljava/net/InetAddress;I)V");
- CHECK_NULL(isa_ctorID);
-}
-
-JNIEXPORT jint JNICALL
-Java_sun_nio_ch_ServerSocketChannelImpl_accept0(JNIEnv *env, jobject this,
- jobject ssfdo, jobject newfdo,
- jobjectArray isaa)
-{
- jint ssfd = (*env)->GetIntField(env, ssfdo, fd_fdID);
- jint newfd;
- SOCKETADDRESS sa;
- socklen_t sa_len = sizeof(SOCKETADDRESS);
- jobject remote_ia = 0;
- jobject isa;
- jint remote_port = 0;
-
- /*
- * accept connection but ignore ECONNABORTED indicating that
- * a connection was eagerly accepted but was reset before
- * accept() was called.
- */
- for (;;) {
- newfd = accept(ssfd, &sa.sa, &sa_len);
- if (newfd >= 0) {
- break;
- }
- if (errno != ECONNABORTED) {
- break;
- }
- /* ECONNABORTED => restart accept */
- }
-
- if (newfd < 0) {
- if (errno == EAGAIN || errno == EWOULDBLOCK)
- return IOS_UNAVAILABLE;
- if (errno == EINTR)
- return IOS_INTERRUPTED;
- JNU_ThrowIOExceptionWithLastError(env, "Accept failed");
- return IOS_THROWN;
- }
-
- (*env)->SetIntField(env, newfdo, fd_fdID, newfd);
- remote_ia = NET_SockaddrToInetAddress(env, &sa, (int *)&remote_port);
- CHECK_NULL_RETURN(remote_ia, IOS_THROWN);
- isa = (*env)->NewObject(env, isa_class, isa_ctorID, remote_ia, remote_port);
- CHECK_NULL_RETURN(isa, IOS_THROWN);
- (*env)->SetObjectArrayElement(env, isaa, 0, isa);
- return 1;
-}
--- a/src/java.base/unix/native/libnio/ch/UnixAsynchronousServerSocketChannelImpl.c Tue Mar 12 09:49:10 2019 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,47 +0,0 @@
-/*
- * Copyright (c) 2008, 2009, Oracle and/or its affiliates. All rights reserved.
- * 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.
- */
-
-#include "sun_nio_ch_UnixAsynchronousServerSocketChannelImpl.h"
-
-extern void Java_sun_nio_ch_ServerSocketChannelImpl_initIDs(JNIEnv* env,
- jclass c);
-
-extern jint Java_sun_nio_ch_ServerSocketChannelImpl_accept0(JNIEnv* env,
- jobject this, jobject ssfdo, jobject newfdo, jobjectArray isaa);
-
-JNIEXPORT void JNICALL
-Java_sun_nio_ch_UnixAsynchronousServerSocketChannelImpl_initIDs(JNIEnv* env,
- jclass c)
-{
- Java_sun_nio_ch_ServerSocketChannelImpl_initIDs(env, c);
-}
-
-JNIEXPORT jint JNICALL
-Java_sun_nio_ch_UnixAsynchronousServerSocketChannelImpl_accept0(JNIEnv* env,
- jobject this, jobject ssfdo, jobject newfdo, jobjectArray isaa)
-{
- return Java_sun_nio_ch_ServerSocketChannelImpl_accept0(env, this,
- ssfdo, newfdo, isaa);
-}
--- a/src/java.base/unix/native/libnio/ch/nio_util.h Tue Mar 12 09:49:10 2019 +0000
+++ b/src/java.base/unix/native/libnio/ch/nio_util.h Sat Mar 16 21:00:45 2019 +0000
@@ -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,6 +55,7 @@
/* Defined in IOUtil.c */
jint fdval(JNIEnv *env, jobject fdo);
+void setfdval(JNIEnv *env, jobject fdo, jint value);
jint convertReturnVal(JNIEnv *env, jint n, jboolean reading);
jlong convertLongReturnVal(JNIEnv *env, jlong n, jboolean reading);
--- a/src/java.base/windows/classes/sun/util/locale/provider/HostLocaleProviderAdapterImpl.java Tue Mar 12 09:49:10 2019 +0000
+++ b/src/java.base/windows/classes/sun/util/locale/provider/HostLocaleProviderAdapterImpl.java Sat Mar 16 21:00:45 2019 +0000
@@ -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
@@ -510,8 +510,15 @@
public String getDisplayCountry(String countryCode, Locale locale) {
// Retrieves the display country name by calling
// GetLocaleInfoEx(LOCALE_SLOCALIZEDCOUNTRYNAME).
- return getDisplayString(locale.toLanguageTag(),
- DN_LOCALE_REGION, nativeDisplayLanguage+"-"+countryCode);
+ String str = getDisplayString(locale.toLanguageTag(),
+ DN_LOCALE_REGION,
+ nativeDisplayLanguage+"-"+countryCode);
+ // Hack: Windows 10 returns translated "Unknown Region (XX)"
+ // for localized XX region name. Take that as not known.
+ if (str != null && str.endsWith("("+countryCode+")")) {
+ return null;
+ }
+ return str;
}
@Override
--- a/src/java.base/windows/native/libjava/HostLocaleProviderAdapter_md.c Tue Mar 12 09:49:10 2019 +0000
+++ b/src/java.base/windows/native/libjava/HostLocaleProviderAdapter_md.c Sat Mar 16 21:00:45 2019 +0000
@@ -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
@@ -168,11 +168,6 @@
}
};
-
-// Localized region name for unknown regions (Windows 10)
-#define UNKNOWN_REGION L"Unknown Region ("
-#define UNKNOWN_REGION_SIZE wcslen(UNKNOWN_REGION)
-
/*
* Class: sun_util_locale_provider_HostLocaleProviderAdapterImpl
* Method: initialize
@@ -755,15 +750,10 @@
(*env)->ReleaseStringChars(env, jStr, pjChar);
if (got) {
- // Hack: Windows 10 returns "Unknown Region (XX)" for localized XX region name.
- // Take that as not known.
- if (type != sun_util_locale_provider_HostLocaleProviderAdapterImpl_DN_LOCALE_REGION ||
- wcsncmp(UNKNOWN_REGION, buf, UNKNOWN_REGION_SIZE) != 0) {
- return (*env)->NewString(env, buf, (jsize)wcslen(buf));
- }
+ return (*env)->NewString(env, buf, (jsize)wcslen(buf));
+ } else {
+ return NULL;
}
-
- return NULL;
}
int getLocaleInfoWrapper(const jchar *langtag, LCTYPE type, LPWSTR data, int buflen) {
--- a/src/java.base/windows/native/libnio/ch/IOUtil.c Tue Mar 12 09:49:10 2019 +0000
+++ b/src/java.base/windows/native/libnio/ch/IOUtil.c Sat Mar 16 21:00:45 2019 +0000
@@ -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
@@ -119,7 +119,7 @@
JNIEXPORT void JNICALL
Java_sun_nio_ch_IOUtil_setfdVal(JNIEnv *env, jclass clazz, jobject fdo, jint val)
{
- (*env)->SetIntField(env, fdo, fd_fdID, val);
+ setfdval(env, fdo, val);
}
@@ -198,6 +198,12 @@
return (*env)->GetIntField(env, fdo, fd_fdID);
}
+void
+setfdval(JNIEnv *env, jobject fdo, jint val)
+{
+ (*env)->SetIntField(env, fdo, fd_fdID, val);
+}
+
jlong
handleval(JNIEnv *env, jobject fdo)
{
--- a/src/java.base/windows/native/libnio/ch/Net.c Tue Mar 12 09:49:10 2019 +0000
+++ b/src/java.base/windows/native/libnio/ch/Net.c Sat Mar 16 21:00:45 2019 +0000
@@ -83,10 +83,23 @@
return IOS_THROWN;
}
+static jclass isa_class; /* java.net.InetSocketAddress */
+static jmethodID isa_ctorID; /* InetSocketAddress(InetAddress, int) */
+
JNIEXPORT void JNICALL
Java_sun_nio_ch_Net_initIDs(JNIEnv *env, jclass clazz)
{
- initInetAddressIDs(env);
+ jclass cls = (*env)->FindClass(env, "java/net/InetSocketAddress");
+ CHECK_NULL(cls);
+ isa_class = (*env)->NewGlobalRef(env, cls);
+ if (isa_class == NULL) {
+ JNU_ThrowOutOfMemoryError(env, NULL);
+ return;
+ }
+ isa_ctorID = (*env)->GetMethodID(env, cls, "<init>", "(Ljava/net/InetAddress;I)V");
+ CHECK_NULL(isa_ctorID);
+
+ initInetAddressIDs(env);
}
JNIEXPORT jboolean JNICALL
@@ -192,7 +205,6 @@
}
}
-
JNIEXPORT jint JNICALL
Java_sun_nio_ch_Net_connect0(JNIEnv *env, jclass clazz, jboolean preferIPv6, jobject fdo,
jobject iao, jint port)
@@ -226,6 +238,42 @@
}
JNIEXPORT jint JNICALL
+Java_sun_nio_ch_Net_accept(JNIEnv *env, jclass clazz, jobject fdo, jobject newfdo,
+ jobjectArray isaa)
+{
+ jint fd = fdval(env,fdo);
+ jint newfd;
+ SOCKETADDRESS sa;
+ int addrlen = sizeof(sa);
+ jobject remote_ia;
+ jint remote_port = 0;
+ jobject isa;
+
+ memset((char *)&sa, 0, sizeof(sa));
+ newfd = (jint) accept(fd, &sa.sa, &addrlen);
+ if (newfd == INVALID_SOCKET) {
+ int theErr = (jint)WSAGetLastError();
+ if (theErr == WSAEWOULDBLOCK) {
+ return IOS_UNAVAILABLE;
+ }
+ JNU_ThrowIOExceptionWithLastError(env, "Accept failed");
+ return IOS_THROWN;
+ }
+
+ SetHandleInformation((HANDLE)(UINT_PTR)newfd, HANDLE_FLAG_INHERIT, 0);
+ setfdval(env, newfdo, newfd);
+
+ remote_ia = NET_SockaddrToInetAddress(env, &sa, (int *)&remote_port);
+ CHECK_NULL_RETURN(remote_ia, IOS_THROWN);
+
+ isa = (*env)->NewObject(env, isa_class, isa_ctorID, remote_ia, remote_port);
+ CHECK_NULL_RETURN(isa, IOS_THROWN);
+ (*env)->SetObjectArrayElement(env, isaa, 0, isa);
+
+ return 1;
+}
+
+JNIEXPORT jint JNICALL
Java_sun_nio_ch_Net_localPort(JNIEnv *env, jclass clazz, jobject fdo)
{
SOCKETADDRESS sa;
--- a/src/java.base/windows/native/libnio/ch/ServerSocketChannelImpl.c Tue Mar 12 09:49:10 2019 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,117 +0,0 @@
-/*
- * Copyright (c) 2000, 2010, Oracle and/or its affiliates. All rights reserved.
- * 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.
- */
-
-#include <windows.h>
-#include <winsock2.h>
-#include <ctype.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <malloc.h>
-#include <sys/types.h>
-
-#include "jni.h"
-#include "jni_util.h"
-#include "jvm.h"
-#include "jlong.h"
-
-#include "nio.h"
-#include "nio_util.h"
-#include "net_util.h"
-
-#include "sun_nio_ch_ServerSocketChannelImpl.h"
-
-
-static jfieldID fd_fdID; /* java.io.FileDescriptor.fd */
-static jclass isa_class; /* java.net.InetSocketAddress */
-static jmethodID isa_ctorID; /* InetSocketAddress(InetAddress, int) */
-
-
-/**************************************************************
- * static method to store field IDs in initializers
- */
-
-JNIEXPORT void JNICALL
-Java_sun_nio_ch_ServerSocketChannelImpl_initIDs(JNIEnv *env, jclass cls)
-{
- cls = (*env)->FindClass(env, "java/io/FileDescriptor");
- CHECK_NULL(cls);
- fd_fdID = (*env)->GetFieldID(env, cls, "fd", "I");
- CHECK_NULL(fd_fdID);
-
- cls = (*env)->FindClass(env, "java/net/InetSocketAddress");
- CHECK_NULL(cls);
- isa_class = (*env)->NewGlobalRef(env, cls);
- if (isa_class == NULL) {
- JNU_ThrowOutOfMemoryError(env, NULL);
- return;
- }
- isa_ctorID = (*env)->GetMethodID(env, cls, "<init>",
- "(Ljava/net/InetAddress;I)V");
- CHECK_NULL(isa_ctorID);
-}
-
-JNIEXPORT void JNICALL
-Java_sun_nio_ch_ServerSocketChannelImpl_listen(JNIEnv *env, jclass cl,
- jobject fdo, jint backlog)
-{
- if (listen(fdval(env,fdo), backlog) == SOCKET_ERROR) {
- NET_ThrowNew(env, WSAGetLastError(), "listen");
- }
-}
-
-JNIEXPORT jint JNICALL
-Java_sun_nio_ch_ServerSocketChannelImpl_accept0(JNIEnv *env, jobject this,
- jobject ssfdo, jobject newfdo,
- jobjectArray isaa)
-{
- jint ssfd = (*env)->GetIntField(env, ssfdo, fd_fdID);
- jint newfd;
- SOCKETADDRESS sa;
- jobject remote_ia;
- int remote_port;
- jobject isa;
- int addrlen = sizeof(sa);
-
- memset((char *)&sa, 0, sizeof(sa));
- newfd = (jint)accept(ssfd, &sa.sa, &addrlen);
- if (newfd == INVALID_SOCKET) {
- int theErr = (jint)WSAGetLastError();
- if (theErr == WSAEWOULDBLOCK) {
- return IOS_UNAVAILABLE;
- }
- JNU_ThrowIOExceptionWithLastError(env, "Accept failed");
- return IOS_THROWN;
- }
-
- SetHandleInformation((HANDLE)(UINT_PTR)newfd, HANDLE_FLAG_INHERIT, 0);
- (*env)->SetIntField(env, newfdo, fd_fdID, newfd);
- remote_ia = NET_SockaddrToInetAddress(env, &sa, (int *)&remote_port);
- CHECK_NULL_RETURN(remote_ia, IOS_THROWN);
-
- isa = (*env)->NewObject(env, isa_class, isa_ctorID, remote_ia, remote_port);
- CHECK_NULL_RETURN(isa, IOS_THROWN);
- (*env)->SetObjectArrayElement(env, isaa, 0, isa);
- return 1;
-}
--- a/src/java.base/windows/native/libnio/ch/nio_util.h Tue Mar 12 09:49:10 2019 +0000
+++ b/src/java.base/windows/native/libnio/ch/nio_util.h Sat Mar 16 21:00:45 2019 +0000
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2001, 2012, 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
@@ -36,6 +36,7 @@
#define MAX_BUFFER_SIZE ((128*1024)-1)
jint fdval(JNIEnv *env, jobject fdo);
+void setfdval(JNIEnv *env, jobject fdo, jint val);
jlong handleval(JNIEnv *env, jobject fdo);
jint convertReturnVal(JNIEnv *env, jint n, jboolean r);
jlong convertLongReturnVal(JNIEnv *env, jlong n, jboolean r);
--- a/src/java.compiler/share/classes/javax/annotation/processing/Generated.java Tue Mar 12 09:49:10 2019 +0000
+++ b/src/java.compiler/share/classes/javax/annotation/processing/Generated.java Sat Mar 16 21:00:45 2019 +0000
@@ -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
@@ -33,7 +33,7 @@
* It can also be used to differentiate user written code from generated code in
* a single file.
*
- * <h3>Examples:</h3>
+ * <h2>Examples:</h2>
* <pre>
* @Generated("com.example.Generator")
* </pre>
--- a/src/java.instrument/share/classes/java/lang/instrument/package-info.java Tue Mar 12 09:49:10 2019 +0000
+++ b/src/java.instrument/share/classes/java/lang/instrument/package-info.java Sat Mar 16 21:00:45 2019 +0000
@@ -1,11 +1,11 @@
/*
- * 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
* 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
+ * 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
@@ -52,7 +52,7 @@
* <p> Each of these ways to start an agent is described below.
*
*
- * <h3>Starting an Agent from the Command-Line Interface</h3>
+ * <h2>Starting an Agent from the Command-Line Interface</h2>
*
* <p> Where an implementation provides a means to start agents from the
* command-line interface, an agent is started by adding the following option
@@ -113,7 +113,7 @@
* threads, is legal from {@code premain}.
*
*
- * <h3>Starting an Agent After VM Startup</h3>
+ * <h2>Starting an Agent After VM Startup</h2>
*
* <p> An implementation may provide a mechanism to start agents sometime after
* the the VM has started. The details as to how this is initiated are
@@ -164,7 +164,7 @@
* by the JVM for troubleshooting purposes).
*
*
- * <h3>Including an Agent in an Executable JAR file</h3>
+ * <h2>Including an Agent in an Executable JAR file</h2>
*
* <p> The JAR File Specification defines manifest attributes for standalone
* applications that are packaged as <em>executable JAR files</em>. If an
@@ -194,8 +194,8 @@
* an uncaught exception or error, the JVM will abort.
*
*
- * <h3> Loading agent classes and the modules/classes available to the agent
- * class </h3>
+ * <h2> Loading agent classes and the modules/classes available to the agent
+ * class </h2>
*
* <p> Classes loaded from the agent JAR file are loaded by the
* {@linkplain ClassLoader#getSystemClassLoader() system class loader} and are
@@ -242,7 +242,7 @@
* In other words, a custom system class loader must support the mechanism to
* add an agent JAR file to the system class loader search.
*
- * <h3>Manifest Attributes</h3>
+ * <h2>Manifest Attributes</h2>
*
* <p> The following manifest attributes are defined for an agent JAR file:
*
@@ -311,7 +311,7 @@
* ignored).
*
*
- * <h3>Instrumenting code in modules</h3>
+ * <h2>Instrumenting code in modules</h2>
*
* <p> As an aid to agents that deploy supporting classes on the search path of
* the bootstrap class loader, or the search path of the class loader that loads
@@ -323,4 +323,4 @@
* @revised 9
*/
-package java.lang.instrument;
\ No newline at end of file
+package java.lang.instrument;
--- a/src/java.logging/share/classes/java/util/logging/LogManager.java Tue Mar 12 09:49:10 2019 +0000
+++ b/src/java.logging/share/classes/java/util/logging/LogManager.java Sat Mar 16 21:00:45 2019 +0000
@@ -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
@@ -64,7 +64,7 @@
* At startup the LogManager class is located using the
* java.util.logging.manager system property.
*
- * <h3>LogManager Configuration</h3>
+ * <h2>LogManager Configuration</h2>
*
* A LogManager initializes the logging configuration via
* the {@link #readConfiguration()} method during LogManager initialization.
--- a/src/java.naming/share/classes/com/sun/jndi/ldap/EventSupport.java Tue Mar 12 09:49:10 2019 +0000
+++ b/src/java.naming/share/classes/com/sun/jndi/ldap/EventSupport.java Sat Mar 16 21:00:45 2019 +0000
@@ -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
@@ -78,20 +78,20 @@
*When a context no longer needs this EventSupport, it should invoke
*cleanup() on it.
*<p>
- *<h4>Registration</h4>
+ *<h2>Registration</h2>
*When a registration request is made, this class attempts to find an
*existing notifier that's already working on the request. If one is
*found, the listener is added to the notifier's list. If one is not found,
*a new notifier is created for the listener.
*
- *<h4>Deregistration</h4>
+ *<h2>Deregistration</h2>
*When a deregistration request is made, this class attempts to find its
*corresponding notifier. If the notifier is found, the listener is removed
*from the notifier's list. If the listener is the last listener on the list,
*the notifier's thread is terminated and removed from this class's hashtable.
*Nothing happens if the notifier is not found.
*
- *<h4>Event Dispatching</h4>
+ *<h2>Event Dispatching</h2>
*The notifiers are responsible for gather information for generating events
*requested by their respective listeners. When a notifier gets sufficient
*information to generate an event, it creates invokes the
@@ -101,7 +101,7 @@
*This class maintains an event queue and a dispatching thread that dequeues
*events from the queue and dispatches them to the listeners.
*
- *<h4>Synchronization</h4>
+ *<h2>Synchronization</h2>
*This class is used by the main thread (LdapCtx) to add/remove listeners.
*It is also used asynchronously by NamingEventNotifiers threads and
*the context's Connection thread. It is used by the notifier threads to
--- a/src/java.naming/share/classes/javax/naming/CompositeName.java Tue Mar 12 09:49:10 2019 +0000
+++ b/src/java.naming/share/classes/javax/naming/CompositeName.java Sat Mar 16 21:00:45 2019 +0000
@@ -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
@@ -42,7 +42,7 @@
* The most significant component is at index 0.
* An empty composite name has no components.
*
- * <h1>JNDI Composite Name Syntax</h1>
+ * <h2>JNDI Composite Name Syntax</h2>
* JNDI defines a standard string representation for composite names. This
* representation is the concatenation of the components of a composite name
* from left to right using the component separator (a forward
@@ -73,7 +73,7 @@
* a separator) denotes a trailing empty component.
* Adjacent component separators denote an empty component.
*
- *<h1>Composite Name Examples</h1>
+ *<h2>Composite Name Examples</h2>
*This table shows examples of some composite names. Each row shows
*the string form of a composite name and its corresponding structural form
*({@code CompositeName}).
@@ -140,7 +140,7 @@
</tbody>
</table>
*
- *<h1>Composition Examples</h1>
+ *<h2>Composition Examples</h2>
* Here are some composition examples. The right column shows composing
* string composite names while the left column shows composing the
* corresponding {@code CompositeName}s. Notice that composing the
@@ -195,7 +195,7 @@
</tbody>
</table>
*
- *<h1>Multithreaded Access</h1>
+ *<h2>Multithreaded Access</h2>
* A {@code CompositeName} instance is not synchronized against concurrent
* multithreaded access. Multiple threads trying to access and modify a
* {@code CompositeName} should lock the object.
--- a/src/java.naming/share/classes/javax/naming/CompoundName.java Tue Mar 12 09:49:10 2019 +0000
+++ b/src/java.naming/share/classes/javax/naming/CompoundName.java Sat Mar 16 21:00:45 2019 +0000
@@ -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
@@ -39,7 +39,7 @@
* The most significant component is at index 0.
* An empty compound name has no components.
*
- * <h1>Compound Name Syntax</h1>
+ * <h2>Compound Name Syntax</h2>
* The syntax of a compound name is specified using a set of properties:
*<dl>
* <dt>jndi.syntax.direction
@@ -136,7 +136,7 @@
* so that when the same string is parsed, it will yield the same components
* of the original compound name.
*
- *<h1>Multithreaded Access</h1>
+ *<h2>Multithreaded Access</h2>
* A {@code CompoundName} instance is not synchronized against concurrent
* multithreaded access. Multiple threads trying to access and modify a
* {@code CompoundName} should lock the object.
--- a/src/java.naming/share/classes/javax/naming/Context.java Tue Mar 12 09:49:10 2019 +0000
+++ b/src/java.naming/share/classes/javax/naming/Context.java Sat Mar 16 21:00:45 2019 +0000
@@ -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
@@ -32,7 +32,7 @@
* consists of a set of name-to-object bindings.
* It contains methods for examining and updating these bindings.
*
- * <h1>Names</h1>
+ * <h2>Names</h2>
* Each name passed as an argument to a {@code Context} method is relative
* to that context. The empty name is used to name the context itself.
* A name parameter may never be null.
@@ -69,12 +69,12 @@
* names in a composite namespace, at the discretion of the service
* provider.
*
- *<h1>Exceptions</h1>
+ *<h2>Exceptions</h2>
* All the methods in this interface can throw a {@code NamingException} or
* any of its subclasses. See {@code NamingException} and their subclasses
* for details on each exception.
*
- *<h1>Concurrent Access</h1>
+ *<h2>Concurrent Access</h2>
* A Context instance is not guaranteed to be synchronized against
* concurrent access by multiple threads. Threads that need to access
* a single Context instance concurrently should synchronize amongst
@@ -91,7 +91,7 @@
* being followed.
*
*
- *<h1>Parameters</h1>
+ *<h2>Parameters</h2>
* A {@code Name} parameter passed to any method of the
* {@code Context} interface or one of its subinterfaces
* will not be modified by the service provider.
@@ -103,7 +103,7 @@
* The caller may subsequently modify it; the service provider may not.
*
*
- *<h1>Environment Properties</h1>
+ *<h2>Environment Properties</h2>
*<p>
* JNDI applications need a way to communicate various preferences
* and properties that define the environment in which naming and
@@ -138,7 +138,7 @@
*
*<p>
*<a id=RESOURCEFILES></a>
- *<h1>Resource Files</h1>
+ *<h2>Resource Files</h2>
*<p>
* To simplify the task of setting up the environment
* required by a JNDI application,
@@ -165,7 +165,7 @@
* There are two kinds of JNDI resource files:
* <em>provider</em> and <em>application</em>.
*
- * <h2>Provider Resource Files</h2>
+ * <h3>Provider Resource Files</h3>
*
* Each service provider has an optional resource that lists properties
* specific to that provider. The name of this resource is:
@@ -200,7 +200,7 @@
* The service provider's documentation should clearly state which
* properties are allowed; other properties in the file will be ignored.
*
- * <h2>Application Resource Files</h2>
+ * <h3>Application Resource Files</h3>
*
* When an application is deployed, it will generally have several
* codebase directories and JARs in its classpath. JNDI locates (using
@@ -228,7 +228,7 @@
* collects and uses all of these export lists when searching for factory
* classes.
*
- * <h2>Search Algorithm for Properties</h2>
+ * <h3>Search Algorithm for Properties</h3>
*
* When JNDI constructs an initial context, the context's environment
* is initialized with properties defined in the environment parameter
--- a/src/java.naming/share/classes/javax/naming/directory/DirContext.java Tue Mar 12 09:49:10 2019 +0000
+++ b/src/java.naming/share/classes/javax/naming/directory/DirContext.java Sat Mar 16 21:00:45 2019 +0000
@@ -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
@@ -32,7 +32,7 @@
* methods for examining and updating attributes
* associated with objects, and for searching the directory.
*
- * <h1>Names</h1>
+ * <h2>Names</h2>
* Each name passed as an argument to a {@code DirContext} method is relative
* to that context. The empty name is used to name the context itself.
* The name parameter may never be null.
@@ -51,7 +51,7 @@
* name argument to the {@code Context} methods. These same rules
* apply to the name argument to the {@code DirContext} methods.
*
- * <h1>Attribute Models</h1>
+ * <h2>Attribute Models</h2>
* There are two basic models of what attributes should be
* associated with. First, attributes may be directly associated with a
* DirContext object.
@@ -81,7 +81,7 @@
* whether an object's attributes are stored as part of the object, or stored
* within the parent object and associated with the object's name.
*
- * <h1>Attribute Type Names</h1>
+ * <h2>Attribute Type Names</h2>
* In the {@code getAttributes()} and {@code search()} methods,
* you can supply the attributes to return by supplying a list of
* attribute names (strings).
@@ -113,7 +113,7 @@
* </ul>
*
*
- *<h1>Operational Attributes</h1>
+ *<h2>Operational Attributes</h2>
*<p>
* Some directories have the notion of "operational attributes" which are
* attributes associated with a directory object for administrative
@@ -127,7 +127,7 @@
* In order to retrieve operational attributes, you must name them explicitly.
*
*
- * <h1>Named Context</h1>
+ * <h2>Named Context</h2>
* <p>
* There are certain methods in which the name must resolve to a context
* (for example, when searching a single level context). The documentation
@@ -138,7 +138,7 @@
* Aside from these methods, there is no requirement that the
* <em>named object</em> be a DirContext.
*
- *<h1>Parameters</h1>
+ *<h2>Parameters</h2>
*<p>
* An {@code Attributes}, {@code SearchControls}, or array object
* passed as a parameter to any method will not be modified by the
@@ -150,7 +150,7 @@
* the caller. The caller may subsequently modify it; the service
* provider will not.
*
- *<h1>Exceptions</h1>
+ *<h2>Exceptions</h2>
*<p>
* All the methods in this interface can throw a NamingException or
* any of its subclasses. See NamingException and their subclasses
--- a/src/java.naming/share/classes/javax/naming/event/EventContext.java Tue Mar 12 09:49:10 2019 +0000
+++ b/src/java.naming/share/classes/javax/naming/event/EventContext.java Sat Mar 16 21:00:45 2019 +0000
@@ -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
@@ -34,7 +34,7 @@
* Contains methods for registering/deregistering listeners to be notified of
* events fired when objects named in a context changes.
*
- *<h1>Target</h1>
+ *<h2>Target</h2>
* The name parameter in the {@code addNamingListener()} methods is referred
* to as the <em>target</em>. The target, along with the scope, identify
* the object(s) that the listener is interested in.
@@ -59,7 +59,7 @@
* whether an {@code EventContext} supports registration
* of nonexistent targets.
*
- *<h1>Event Source</h1>
+ *<h2>Event Source</h2>
* The {@code EventContext} instance on which you invoke the
* registration methods is the <em>event source</em> of the events that are
* (potentially) generated.
@@ -93,7 +93,7 @@
* it needs to keep a reference to the listener in order to remove it
* later). It cannot expect to do a {@code lookup()} and get another instance of
* an {@code EventContext} on which to perform the deregistration.
- *<h1>Lifetime of Registration</h1>
+ *<h2>Lifetime of Registration</h2>
* A registered listener becomes deregistered when:
*<ul>
*<li>It is removed using {@code removeNamingListener()}.
@@ -105,7 +105,7 @@
* Until that point, an {@code EventContext} instance that has outstanding
* listeners will continue to exist and be maintained by the service provider.
*
- *<h1>Listener Implementations</h1>
+ *<h2>Listener Implementations</h2>
* The registration/deregistration methods accept an instance of
* {@code NamingListener}. There are subinterfaces of {@code NamingListener}
* for different of event types of {@code NamingEvent}.
@@ -118,7 +118,7 @@
* of the listeners, this allows some service providers to optimize the
* registration.
*
- *<h1>Threading Issues</h1>
+ *<h2>Threading Issues</h2>
*
* Like {@code Context} instances in general, instances of
* {@code EventContext} are not guaranteed to be thread-safe.
--- a/src/java.naming/share/classes/javax/naming/ldap/LdapContext.java Tue Mar 12 09:49:10 2019 +0000
+++ b/src/java.naming/share/classes/javax/naming/ldap/LdapContext.java Sat Mar 16 21:00:45 2019 +0000
@@ -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
@@ -38,7 +38,7 @@
* operations, the more generic {@code javax.naming.directory.DirContext}
* should be used instead.
*
- * <h3>Usage Details About Controls</h3>
+ * <h2>Usage Details About Controls</h2>
*
* This interface provides support for LDAP v3 controls.
* At a high level, this support allows a user
@@ -50,7 +50,7 @@
* both the user program and service providers need to understand in order
* to correctly use request and response controls.
*
- * <h3>Request Controls</h3>
+ * <h2>Request Controls</h2>
* <p>
* There are two types of request controls:
* <ul>
@@ -75,7 +75,7 @@
*<p>Unless explicitly qualified, the term "request controls" refers to
* context request controls.
*
- * <h4>Context Request Controls</h4>
+ * <h3>Context Request Controls</h3>
* There are two ways in which a context instance gets its request controls:
* <ol>
* <li><code>ldapContext.newInstance(<strong>reqCtls</strong>)</code>
@@ -97,7 +97,7 @@
* A context instance's request controls are retrieved using
* the method {@code getRequestControls()}.
*
- * <h4>Connection Request Controls</h4>
+ * <h3>Connection Request Controls</h3>
* There are three ways in which connection request controls are set:
* <ol>
* <li><code>
@@ -133,7 +133,7 @@
* A context instance's connection request controls are retrieved using
* the method {@code getConnectControls()}.
*
- * <h4>Service Provider Requirements</h4>
+ * <h3>Service Provider Requirements</h3>
*
* A service provider supports connection and context request controls
* in the following ways. Context request controls must be associated on
@@ -143,7 +143,7 @@
* property "java.naming.ldap.control.connect" and pass this environment
* property on to context instances that it creates.
*
- * <h3>Response Controls</h3>
+ * <h2>Response Controls</h2>
*
* The method {@code LdapContext.getResponseControls()} is used to
* retrieve the response controls generated by LDAP operations executed
@@ -153,7 +153,7 @@
* To get only the reconnection response controls,
* use {@code reconnect()} followed by {@code getResponseControls()}.
*
- * <h3>Parameters</h3>
+ * <h2>Parameters</h2>
*
* A {@code Control[]} array
* passed as a parameter to any method is owned by the caller.
--- a/src/java.net.http/share/classes/java/net/http/HttpResponse.java Tue Mar 12 09:49:10 2019 +0000
+++ b/src/java.net.http/share/classes/java/net/http/HttpResponse.java Sat Mar 16 21:00:45 2019 +0000
@@ -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
@@ -828,7 +828,7 @@
/**
* A {@code BodySubscriber} consumes response body bytes and converts them
* into a higher-level Java type. The class {@link BodySubscribers
- * BodySubscriber} provides implementations of many common body subscribers.
+ * BodySubscribers} provides implementations of many common body subscribers.
*
* <p> The object acts as a {@link Flow.Subscriber}<{@link List}<{@link
* ByteBuffer}>> to the HTTP Client implementation, which publishes
--- a/src/java.net.http/share/classes/jdk/internal/net/http/common/ImmutableExtendedSSLSession.java Tue Mar 12 09:49:10 2019 +0000
+++ b/src/java.net.http/share/classes/jdk/internal/net/http/common/ImmutableExtendedSSLSession.java Sat Mar 16 21:00:45 2019 +0000
@@ -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,7 +92,8 @@
return delegate.getLocalCertificates();
}
- @Deprecated
+ @SuppressWarnings("removal")
+ @Deprecated(since="11", forRemoval=true)
public javax.security.cert.X509Certificate [] getPeerCertificateChain()
throws SSLPeerUnverifiedException {
return delegate.getPeerCertificateChain();
--- a/src/java.net.http/share/classes/jdk/internal/net/http/common/ImmutableSSLSession.java Tue Mar 12 09:49:10 2019 +0000
+++ b/src/java.net.http/share/classes/jdk/internal/net/http/common/ImmutableSSLSession.java Sat Mar 16 21:00:45 2019 +0000
@@ -91,7 +91,8 @@
return delegate.getLocalCertificates();
}
- @Deprecated
+ @SuppressWarnings("removal")
+ @Deprecated(since="11", forRemoval=true)
public javax.security.cert.X509Certificate [] getPeerCertificateChain()
throws SSLPeerUnverifiedException {
return delegate.getPeerCertificateChain();
--- a/src/java.security.sasl/share/classes/javax/security/sasl/package-info.java Tue Mar 12 09:49:10 2019 +0000
+++ b/src/java.security.sasl/share/classes/javax/security/sasl/package-info.java Sat Mar 16 21:00:45 2019 +0000
@@ -30,7 +30,7 @@
* It is used by developers to add authentication support for
* connection-based protocols that use SASL.
*
- * <h3>SASL Overview</h3>
+ * <h2>SASL Overview</h2>
*
* Simple Authentication and Security Layer (SASL) specifies a
* challenge-response protocol in which data is exchanged between the
@@ -74,7 +74,7 @@
* allow negotiation of the security layer. For External, the
* security layer is determined by the external protocol.
*
- * <h3>Usage</h3>
+ * <h2>Usage</h2>
*
* Users of this API are typically developers who produce
* client library implementations for connection-based protocols,
--- a/src/java.smartcardio/share/classes/javax/smartcardio/package-info.java Tue Mar 12 09:49:10 2019 +0000
+++ b/src/java.smartcardio/share/classes/javax/smartcardio/package-info.java Sat Mar 16 21:00:45 2019 +0000
@@ -69,7 +69,7 @@
* </dl>
*
*
- * <h3>API Example</h3>
+ * <h2>API Example</h2>
*
* A simple example of using the API is:
* <pre>
--- a/src/java.sql.rowset/share/classes/com/sun/rowset/package-info.java Tue Mar 12 09:49:10 2019 +0000
+++ b/src/java.sql.rowset/share/classes/com/sun/rowset/package-info.java Sat Mar 16 21:00:45 2019 +0000
@@ -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
@@ -30,7 +30,7 @@
* by the Test Compatibility Kit (TCK) as mandated by the Java Community Process.
* <br>
*
- * <h3>1.0 Available JDBC RowSet Reference Implementations </h3>
+ * <h2>1.0 Available JDBC RowSet Reference Implementations </h2>
* The following implementations are provided:<br>
*
* <blockquote><code><b>JdbcRowSetImpl</b></code> - The <code>javax.sql.rowset.JdbcRowSet</code>
@@ -53,7 +53,7 @@
* SPI and helper classes are provided in the interface definitions in the <code>javax.sql.rowset</code>
* package specification.<br>
*
- * <h3>2.0 Usage</h3>
+ * <h2>2.0 Usage</h2>
* The reference implementations represent robust implementations of the standard
* <code>RowSet</code> interfaces defined in the <code>javax.sql.rowset</code> package.
* All disconnected <code>RowSet</code> implementations, such as the <code>CachedRowSetImpl</code>
@@ -63,7 +63,7 @@
* to use these implementations and integrate them into their products just as they
* can with to other components of the Java platform.<br>
*
- * <h3>3.0 Extending the JDBC RowSet Implementations</h3>
+ * <h2>3.0 Extending the JDBC RowSet Implementations</h2>
*
* The JDBC <code>RowSet</code> reference implementations are provided as non-final
* classes so that any developer can extend them to provide additional features
--- a/src/java.sql.rowset/share/classes/com/sun/rowset/providers/RIOptimisticProvider.java Tue Mar 12 09:49:10 2019 +0000
+++ b/src/java.sql.rowset/share/classes/com/sun/rowset/providers/RIOptimisticProvider.java Sat Mar 16 21:00:45 2019 +0000
@@ -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
@@ -37,7 +37,7 @@
* providing optimistic synchronization with a relational datastore
* using any JDBC technology-enabled driver.
*
- * <h3>1.0 Backgroud</h3>
+ * <h2>1.0 Backgroud</h2>
* This synchronization provider is registered with the
* <code>SyncFactory</code> by default as the
* <code>com.sun.rowset.providers.RIOptimisticProvider</code>.
@@ -56,7 +56,7 @@
* <code>RIOptimisticProvider</code> will not write any of the changes to the data
* source and will throw a <code>SyncProviderException</code> object.
*
- * <h3>2.0 Usage</h3>
+ * <h2>2.0 Usage</h2>
* Standard disconnected <code>RowSet</code> implementations may opt to use this
* <code>SyncProvider</code> implementation in one of two ways:
* <OL>
--- a/src/java.sql.rowset/share/classes/com/sun/rowset/providers/RIXMLProvider.java Tue Mar 12 09:49:10 2019 +0000
+++ b/src/java.sql.rowset/share/classes/com/sun/rowset/providers/RIXMLProvider.java Sat Mar 16 21:00:45 2019 +0000
@@ -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
@@ -37,7 +37,7 @@
* with the ability to read and write rowsets in well formed XML using the
* standard WebRowSet schema.
*
- * <h3>1.0 Background</h3>
+ * <h2>1.0 Background</h2>
* This synchronization provider is registered with the
* <code>SyncFactory</code> by default as the
* <code>com.sun.rowset.providers.RIXMLProvider</code>.
@@ -51,7 +51,7 @@
* The <code>RIXMLProvider</code> implementation has a synchronization level of
* GRADE_NONE, which means that it does no checking at all for conflicts. It
* simply writes a <code>WebRowSet</code> object to a file.
- * <h3>2.0 Usage</h3>
+ * <h2>2.0 Usage</h2>
* A <code>WebRowSet</code> implementation is created with an <code>RIXMLProvider</code>
* by default.
* <pre>
--- a/src/java.sql.rowset/share/classes/com/sun/rowset/providers/package-info.java Tue Mar 12 09:49:10 2019 +0000
+++ b/src/java.sql.rowset/share/classes/com/sun/rowset/providers/package-info.java Sat Mar 16 21:00:45 2019 +0000
@@ -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
@@ -33,7 +33,7 @@
* the default <code>SyncProvider</code> implementations and are accessible via the
* <code>SyncProvider</code> SPI managed by the <code>SyncFactory</code>.
*
- * <h3>1.0 <code>SyncProvider</code> Reference Implementations</h3>
+ * <h2>1.0 <code>SyncProvider</code> Reference Implementations</h2>
* The main job of a <code>SyncProvider</code> implementation is to manage
* the reader and writer mechanisms.
* The <code>SyncProvider</code> SPI, as specified in the <code>javax.sql.rowset.spi</code>
@@ -106,7 +106,7 @@
* definition.<br>
* </UL>
*
- * <h3>2.0 Basics in RowSet Population & Synchronization</h3>
+ * <h2>2.0 Basics in RowSet Population & Synchronization</h2>
* A rowset's first task is to populate itself with rows of column values.
* Generally, these rows will come from a relational database, so a rowset
* has properties that supply what is necessary for making a connection to
@@ -147,7 +147,7 @@
* once again disconnects itself.<br>
* </p>
*
- * <h3> 3.0 Other Possible Implementations</h3>
+ * <h2> 3.0 Other Possible Implementations</h2>
* There are many other possible implementations of the <code>SyncProvider</code> abstract
* class. One possibility is to employ a more robust synchronization model, which
* would give a <code>RowSet</code> object increased trust in the provider's
--- a/src/java.sql.rowset/share/classes/javax/sql/rowset/BaseRowSet.java Tue Mar 12 09:49:10 2019 +0000
+++ b/src/java.sql.rowset/share/classes/javax/sql/rowset/BaseRowSet.java Sat Mar 16 21:00:45 2019 +0000
@@ -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
@@ -39,7 +39,7 @@
* The basic functions include having properties and sending event notifications,
* which all JavaBeans™ components must implement.
*
- * <h3>1.0 Overview</h3>
+ * <h2>1.0 Overview</h2>
* The <code>BaseRowSet</code> class provides the core functionality
* for all <code>RowSet</code> implementations,
* and all standard implementations <b>may</b> use this class in combination with
@@ -72,7 +72,7 @@
* </ul>
* </UL>
*
- * <h3>2.0 Setting Properties</h3>
+ * <h2>2.0 Setting Properties</h2>
* All rowsets maintain a set of properties, which will usually be set using
* a tool. The number and kinds of properties a rowset has will vary,
* depending on what the <code>RowSet</code> implementation does and how it gets
@@ -95,7 +95,7 @@
* Interface™ (JNDI) API. This registration
* is usually done by a person acting in the capacity of a system administrator.
*
- * <h3>3.0 Setting the Command and Its Parameters</h3>
+ * <h2>3.0 Setting the Command and Its Parameters</h2>
* When a rowset gets its data from a relational database, it executes a command (a query)
* that produces a <code>ResultSet</code> object. This query is the command that is set
* for the <code>RowSet</code> object's command property. The rowset populates itself with data by reading the
@@ -143,7 +143,7 @@
* <code>SerialArray</code>, <code>SerialClob</code>, <code>SerialBlob</code>
* and <code>SerialRef</code> objects respectively.
*
- * <h3>4.0 Handling of Parameters Behind the Scenes</h3>
+ * <h2>4.0 Handling of Parameters Behind the Scenes</h2>
*
* NOTE: The <code>BaseRowSet</code> class provides two kinds of setter methods,
* those that set properties and those that set placeholder parameters. The setter
@@ -227,7 +227,7 @@
* <code>RowSet</code> implementations extending this class; it is not normally called by an
* application programmer directly.
*
-* <h3>5.0 Event Notification</h3>
+* <h2>5.0 Event Notification</h2>
* The <code>BaseRowSet</code> class provides the event notification
* mechanism for rowsets. It contains the field
* <code>listeners</code>, methods for adding and removing listeners, and
@@ -255,7 +255,7 @@
* What the listener does with this information, which may be nothing, depends on how it was
* implemented.
*
-* <h3>6.0 Default Behavior</h3>
+* <h2>6.0 Default Behavior</h2>
* A default <code>BaseRowSet</code> object is initialized with many starting values.
*
* The following is true of a default <code>RowSet</code> instance that extends
--- a/src/java.sql.rowset/share/classes/javax/sql/rowset/CachedRowSet.java Tue Mar 12 09:49:10 2019 +0000
+++ b/src/java.sql.rowset/share/classes/javax/sql/rowset/CachedRowSet.java Sat Mar 16 21:00:45 2019 +0000
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2003, 2014, 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
@@ -68,7 +68,7 @@
* over the wire to a thin client such as a personal digital assistant (PDA).
*
*
- * <h3>1.0 Creating a <code>CachedRowSet</code> Object</h3>
+ * <h2>1.0 Creating a <code>CachedRowSet</code> Object</h2>
* The following line of code uses the default constructor for
* <code>CachedRowSet</code>
* supplied in the reference implementation (RI) to create a default
@@ -140,7 +140,7 @@
* more details.
*
*
- * <h3>2.0 Retrieving Data from a <code>CachedRowSet</code> Object</h3>
+ * <h2>2.0 Retrieving Data from a <code>CachedRowSet</code> Object</h2>
* Data is retrieved from a <code>CachedRowSet</code> object by using the
* getter methods inherited from the <code>ResultSet</code>
* interface. The following examples, in which <code>crs</code> is a
@@ -171,7 +171,7 @@
* System.out.println(name + " " + id + " " + comment + " " + dept);
* }
* </PRE>
- * <h4>2.1 Retrieving <code>RowSetMetaData</code></h4>
+ * <h3>2.1 Retrieving <code>RowSetMetaData</code></h3>
* An application can get information about the columns in a <code>CachedRowSet</code>
* object by calling <code>ResultSetMetaData</code> and <code>RowSetMetaData</code>
* methods on a <code>RowSetMetaData</code> object. The following code fragment,
@@ -207,7 +207,7 @@
* override the <code>getMetaData()</code> method defined in
* <code>java.sql.ResultSet</code> and return a <code>RowSetMetaData</code> object.
*
- * <h3>3.0 Updating a <code>CachedRowSet</code> Object</h3>
+ * <h2>3.0 Updating a <code>CachedRowSet</code> Object</h2>
* Updating a <code>CachedRowSet</code> object is similar to updating a
* <code>ResultSet</code> object, but because the rowset is not connected to
* its data source while it is being updated, it must take an additional step
@@ -261,7 +261,7 @@
* and <code>insertRow</code> have been made. If <code>acceptChanges</code>
* is called only once, only one connection needs to be established.
*
- * <h3>4.0 Updating the Underlying Data Source</h3>
+ * <h2>4.0 Updating the Underlying Data Source</h2>
* When the method <code>acceptChanges</code> is executed, the
* <code>CachedRowSet</code> object's writer, a <code>RowSetWriterImpl</code>
* object, is called behind the scenes to write the changes made to the
@@ -305,7 +305,7 @@
* Whether a writer checks for conflicts, what degree of checking it does, and how
* it handles conflicts all depend on how it is implemented.
*
- * <h3>5.0 Registering and Notifying Listeners</h3>
+ * <h2>5.0 Registering and Notifying Listeners</h2>
* Being JavaBeans components, all rowsets participate in the JavaBeans event
* model, inheriting methods for registering listeners and notifying them of
* changes from the <code>BaseRowSet</code> class. A listener for a
@@ -328,7 +328,7 @@
* <code>table</code> and <code>barGraph</code> will be notified when there is
* a change in <code>crs</code>.
*
- * <h3>6.0 Passing Data to Thin Clients</h3>
+ * <h2>6.0 Passing Data to Thin Clients</h2>
* One of the main reasons to use a <code>CachedRowSet</code> object is to
* pass data between different components of an application. Because it is
* serializable, a <code>CachedRowSet</code> object can be used, for example,
@@ -344,7 +344,7 @@
* Thus, a <code>CachedRowSet</code> object provides a means to "get rows in"
* without the need to implement the full JDBC API.
*
- * <h3>7.0 Scrolling and Updating</h3>
+ * <h2>7.0 Scrolling and Updating</h2>
* A second major use for <code>CachedRowSet</code> objects is to provide
* scrolling and updating for <code>ResultSet</code> objects that
* do not provide these capabilities themselves. In other words, a
@@ -378,7 +378,7 @@
* <code>CachedRowSet</code> object does have a limitation: It is limited in
* size by the amount of data it can store in memory at one time.
*
- * <h3>8.0 Getting Universal Data Access</h3>
+ * <h2>8.0 Getting Universal Data Access</h2>
* Another advantage of the <code>CachedRowSet</code> class is that it makes it
* possible to retrieve and store data from sources other than a relational
* database. The reader for a rowset can be implemented to read and populate
@@ -391,7 +391,7 @@
* <code>CachedRowSet</code> objects will contain data that was fetched
* from an SQL database using the JDBC API.
*
- * <h3>9.0 Setting Properties</h3>
+ * <h2>9.0 Setting Properties</h2>
* All rowsets maintain a set of properties, which will usually be set using
* a tool. The number and kinds of properties a rowset has will vary,
* depending on what the rowset does and how it gets its data. For example,
@@ -492,7 +492,7 @@
* crs.execute();
* }</PRE>
*
- * <h3>10.0 Paging Data</h3>
+ * <h2>10.0 Paging Data</h2>
* Because a <code>CachedRowSet</code> object stores data in memory,
* the amount of data that it can contain at any one
* time is determined by the amount of memory available. To get around this limitation,
--- a/src/java.sql.rowset/share/classes/javax/sql/rowset/FilteredRowSet.java Tue Mar 12 09:49:10 2019 +0000
+++ b/src/java.sql.rowset/share/classes/javax/sql/rowset/FilteredRowSet.java Sat Mar 16 21:00:45 2019 +0000
@@ -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.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -38,7 +38,7 @@
* Alternatively, a vendor is free to implement its own version
* by implementing this interface.
*
- * <h3>1.0 Background</h3>
+ * <h2>1.0 Background</h2>
*
* There are occasions when a <code>RowSet</code> object has a need to provide a degree
* of filtering to its contents. One possible solution is to provide
@@ -56,14 +56,14 @@
* methods, which a <code>FilteredRowSet</code> implementation can override
* to supply filtering support.
*
- * <h3>2.0 Predicate Sharing</h3>
+ * <h2>2.0 Predicate Sharing</h2>
*
* If a <code>FilteredRowSet</code> implementation is shared using the
* inherited <code>createShared</code> method in parent interfaces, the
* <code>Predicate</code> should be shared without modification by all
* <code>FilteredRowSet</code> instance clones.
*
- * <h3>3.0 Usage</h3>
+ * <h2>3.0 Usage</h2>
* <p>
* By implementing a <code>Predicate</code> (see example in <a href="Predicate.html">Predicate</a>
* class JavaDoc), a <code>FilteredRowSet</code> could then be used as described
@@ -92,7 +92,7 @@
* used in combination to achieved the required filtering result with
* out the need for query language processing.
*
- * <h3>4.0 Updating a <code>FilteredRowSet</code> Object</h3>
+ * <h2>4.0 Updating a <code>FilteredRowSet</code> Object</h2>
* The predicate set on a <code>FilteredRowSet</code> object
* applies a criterion on all rows in a
* <code>RowSet</code> object to manage a subset of rows in a <code>RowSet</code>
@@ -113,7 +113,7 @@
* <code>FilteredRowSet</code> object, and all subsequent views and updates will be
* subject to similar enforcement.
*
- * <h3>5.0 Behavior of Rows Outside the Filter</h3>
+ * <h2>5.0 Behavior of Rows Outside the Filter</h2>
* Rows that fall outside of the filter set on a <code>FilteredRowSet</code>
* object cannot be modified until the filter is removed or a
* new filter is applied.
--- a/src/java.sql.rowset/share/classes/javax/sql/rowset/JdbcRowSet.java Tue Mar 12 09:49:10 2019 +0000
+++ b/src/java.sql.rowset/share/classes/javax/sql/rowset/JdbcRowSet.java Sat Mar 16 21:00:45 2019 +0000
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2003, 2014, 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
@@ -36,7 +36,7 @@
* The standard interface that all standard implementations of
* <code>JdbcRowSet</code> must implement.
*
- * <h3>1.0 Overview</h3>
+ * <h2>1.0 Overview</h2>
* A wrapper around a <code>ResultSet</code> object that makes it possible
* to use the result set as a JavaBeans™
* component. Thus, a <code>JdbcRowSet</code> object can be one of the Beans that
@@ -60,7 +60,7 @@
* <code>JdbcRowSet</code> object as if it were the <code>ResultSet</code>
* object.
*
- * <h3>2.0 Creating a <code>JdbcRowSet</code> Object</h3>
+ * <h2>2.0 Creating a <code>JdbcRowSet</code> Object</h2>
* The reference implementation of the <code>JdbcRowSet</code> interface,
* <code>JdbcRowSetImpl</code>, provides an implementation of
* the default constructor. A new instance is initialized with
--- a/src/java.sql.rowset/share/classes/javax/sql/rowset/JoinRowSet.java Tue Mar 12 09:49:10 2019 +0000
+++ b/src/java.sql.rowset/share/classes/javax/sql/rowset/JoinRowSet.java Sat Mar 16 21:00:45 2019 +0000
@@ -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.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -48,7 +48,7 @@
* alternatively be set by supplying it to the appropriate version of the
* <code>JointRowSet</code> method <code>addRowSet</code>.
*
- * <h3>1.0 Overview</h3>
+ * <h2>1.0 Overview</h2>
* Disconnected <code>RowSet</code> objects (<code>CachedRowSet</code> objects
* and implementations extending the <code>CachedRowSet</code> interface)
* do not have a standard way to establish an SQL <code>JOIN</code> between
@@ -98,7 +98,7 @@
* <code>JoinRowSet</code> interface explain these <code>JOIN</code> types, which are
* standard SQL <code>JOIN</code> types.
*
- * <h3>2.0 Using a <code>JoinRowSet</code> Object for Creating a <code>JOIN</code></h3>
+ * <h2>2.0 Using a <code>JoinRowSet</code> Object for Creating a <code>JOIN</code></h2>
* When a <code>JoinRowSet</code> object is created, it is empty.
* The first <code>RowSet</code> object to be added becomes the basis for the
* <code>JOIN</code> relationship.
@@ -126,7 +126,7 @@
* These four methods set or reset the match column at the time a <code>RowSet</code>
* object is being added to a <code>JoinRowSet</code> object.
* </ul>
- * <h3>3.0 Sample Usage</h3>
+ * <h2>3.0 Sample Usage</h2>
* <p>
* The following code fragment adds two <code>CachedRowSet</code>
* objects to a <code>JoinRowSet</code> object. Note that in this example,
@@ -193,7 +193,7 @@
* <code>EMP_ID</code> column matches a value for the <code>EMP_ID</code> column
* in <i>jrs</i> has been added to <i>jrs</i>.
*
- * <h3>4.0 <code>JoinRowSet</code> Methods</h3>
+ * <h2>4.0 <code>JoinRowSet</code> Methods</h2>
* The <code>JoinRowSet</code> interface supplies several methods for adding
* <code>RowSet</code> objects and for getting information about the
* <code>JoinRowSet</code> object.
--- a/src/java.sql.rowset/share/classes/javax/sql/rowset/Joinable.java Tue Mar 12 09:49:10 2019 +0000
+++ b/src/java.sql.rowset/share/classes/javax/sql/rowset/Joinable.java Sat Mar 16 21:00:45 2019 +0000
@@ -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.
* 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,7 +28,7 @@
import java.sql.SQLException;
/**
- * <h3>1.0 Background</h3>
+ * <h2>1.0 Background</h2>
* The <code>Joinable</code> interface provides the methods for getting and
* setting a match column, which is the basis for forming the SQL <code>JOIN</code>
* formed by adding <code>RowSet</code> objects to a <code>JoinRowSet</code>
@@ -58,7 +58,7 @@
* }
* </pre>
*
- * <h3>2.0 Usage Guidelines</h3>
+ * <h2>2.0 Usage Guidelines</h2>
* <P>
* The methods in the <code>Joinable</code> interface allow a <code>RowSet</code> object
* to set a match column, retrieve a match column, or unset a match column, which is
@@ -98,7 +98,7 @@
* become part of an SQL <code>JOIN</code> directly without having to become part
* of a <code>JoinRowSet</code> object.
*
- * <h3>3.0 Managing Multiple Match Columns</h3>
+ * <h2>3.0 Managing Multiple Match Columns</h2>
* The index array passed into the <code>setMatchColumn</code> methods indicates
* how many match columns are being set (the length of the array) in addition to
* which columns will be used for the match. For example:
--- a/src/java.sql.rowset/share/classes/javax/sql/rowset/Predicate.java Tue Mar 12 09:49:10 2019 +0000
+++ b/src/java.sql.rowset/share/classes/javax/sql/rowset/Predicate.java Sat Mar 16 21:00:45 2019 +0000
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2003, 2014, 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
@@ -32,7 +32,7 @@
* The standard interface that provides the framework for all
* <code>FilteredRowSet</code> objects to describe their filters.
*
- * <h3>1.0 Background</h3>
+ * <h2>1.0 Background</h2>
* The <code>Predicate</code> interface is a standard interface that
* applications can implement to define the filter they wish to apply to a
* a <code>FilteredRowSet</code> object. A <code>FilteredRowSet</code>
@@ -43,7 +43,7 @@
* the constraints of the filter; and conversely, it inserts, modifies, or updates
* only rows that are within the constraints of the filter.
*
- * <h3>2.0 Implementation Guidelines</h3>
+ * <h2>2.0 Implementation Guidelines</h2>
* In order to supply a predicate for the <code>FilteredRowSet</code>.
* this interface must be implemented. At this time, the JDBC RowSet
* Implementations (JSR-114) does not specify any standard filters definitions.
@@ -101,7 +101,7 @@
*
*/
- // <h3>3.0 FilteredRowSet Internals</h3>
+ // <h2>3.0 FilteredRowSet Internals</h2>
// internalNext, First, Last. Discuss guidelines on how to approach this
// and cite examples in reference implementations.
public interface Predicate {
--- a/src/java.sql.rowset/share/classes/javax/sql/rowset/WebRowSet.java Tue Mar 12 09:49:10 2019 +0000
+++ b/src/java.sql.rowset/share/classes/javax/sql/rowset/WebRowSet.java Sat Mar 16 21:00:45 2019 +0000
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2003, 2014, 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
@@ -36,7 +36,7 @@
* The standard interface that all implementations of a {@code WebRowSet}
* must implement.
*
- * <h3>1.0 Overview</h3>
+ * <h2>1.0 Overview</h2>
* The {@code WebRowSetImpl} provides the standard
* reference implementation, which may be extended if required.
* <P>
@@ -78,12 +78,12 @@
* </li>
* </ul>
*
- * <h3>2.0 WebRowSet States</h3>
+ * <h2>2.0 WebRowSet States</h2>
* The following sections demonstrates how a {@code WebRowSet} implementation
* should use the XML Schema to describe update, insert, and delete operations
* and to describe the state of a {@code WebRowSet} object in XML.
*
- * <h4>2.1 State 1 - Outputting a {@code WebRowSet} Object to XML</h4>
+ * <h2>2.1 State 1 - Outputting a {@code WebRowSet} Object to XML</h2>
* In this example, a {@code WebRowSet} object is created and populated with a simple 2 column,
* 5 row table from a data source. Having the 5 rows in a {@code WebRowSet} object
* makes it possible to describe them in XML. The
@@ -216,7 +216,7 @@
* </currentRow>
* </data>
* }</PRE>
- * <h4>2.2 State 2 - Deleting a Row</h4>
+ * <h2>2.2 State 2 - Deleting a Row</h2>
* Deleting a row in a {@code WebRowSet} object involves simply moving to the row
* to be deleted and then calling the method {@code deleteRow}, as in any other
* {@code RowSet} object. The following
@@ -265,7 +265,7 @@
* </currentRow>
* </data>
*} </PRE>
- * <h4>2.3 State 3 - Inserting a Row</h4>
+ * <h2>2.3 State 3 - Inserting a Row</h2>
* A {@code WebRowSet} object can insert a new row by moving to the insert row,
* calling the appropriate updater methods for each column in the row, and then
* calling the method {@code insertRow}.
@@ -337,7 +337,7 @@
* </currentRow>
* </date>
*} </PRE>
- * <h4>2.4 State 4 - Modifying a Row</h4>
+ * <h2>2.4 State 4 - Modifying a Row</h2>
* Modifying a row produces specific XML that records both the new value and the
* value that was replaced. The value that was replaced becomes the original value,
* and the new value becomes the current value. The following
--- a/src/java.sql.rowset/share/classes/javax/sql/rowset/package-info.java Tue Mar 12 09:49:10 2019 +0000
+++ b/src/java.sql.rowset/share/classes/javax/sql/rowset/package-info.java Sat Mar 16 21:00:45 2019 +0000
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2017, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 2018, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
--- a/src/java.sql.rowset/share/classes/javax/sql/rowset/serial/SerialArray.java Tue Mar 12 09:49:10 2019 +0000
+++ b/src/java.sql.rowset/share/classes/javax/sql/rowset/serial/SerialArray.java Sat Mar 16 21:00:45 2019 +0000
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2003, 2014, 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
@@ -50,7 +50,7 @@
* if necessary. At this time, logical pointers to the data in the data source,
* such as locators, are not currently supported.
*
- * <h3> Thread safety </h3>
+ * <h2> Thread safety </h2>
*
* A SerialArray is not safe for use by multiple concurrent threads. If a
* SerialArray is to be used by more than one thread then access to the
--- a/src/java.sql.rowset/share/classes/javax/sql/rowset/serial/SerialBlob.java Tue Mar 12 09:49:10 2019 +0000
+++ b/src/java.sql.rowset/share/classes/javax/sql/rowset/serial/SerialBlob.java Sat Mar 16 21:00:45 2019 +0000
@@ -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
@@ -51,7 +51,7 @@
* <code>Blob</code> object within a <code>SerialBlob</code> object
* and to update or truncate a <code>Blob</code> object.
*
- * <h3> Thread safety </h3>
+ * <h2> Thread safety </h2>
*
* <p> A SerialBlob is not safe for use by multiple concurrent threads. If a
* SerialBlob is to be used by more than one thread then access to the SerialBlob
--- a/src/java.sql.rowset/share/classes/javax/sql/rowset/serial/SerialClob.java Tue Mar 12 09:49:10 2019 +0000
+++ b/src/java.sql.rowset/share/classes/javax/sql/rowset/serial/SerialClob.java Sat Mar 16 21:00:45 2019 +0000
@@ -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
@@ -44,7 +44,7 @@
* from a <code>SerialClob</code> object or to locate the start of
* a pattern of characters.
*
- * <h3> Thread safety </h3>
+ * <h2> Thread safety </h2>
*
* <p> A SerialClob is not safe for use by multiple concurrent threads. If a
* SerialClob is to be used by more than one thread then access to the SerialClob
--- a/src/java.sql.rowset/share/classes/javax/sql/rowset/serial/SerialDatalink.java Tue Mar 12 09:49:10 2019 +0000
+++ b/src/java.sql.rowset/share/classes/javax/sql/rowset/serial/SerialDatalink.java Sat Mar 16 21:00:45 2019 +0000
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2003, 2014, 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
@@ -43,7 +43,7 @@
* java.net.URL url = rowset.getURL(1);
* </pre>
*
- * <h3> Thread safety </h3>
+ * <h2> Thread safety </h2>
*
* A SerialDatalink is not safe for use by multiple concurrent threads. If a
* SerialDatalink is to be used by more than one thread then access to the
--- a/src/java.sql.rowset/share/classes/javax/sql/rowset/serial/SerialJavaObject.java Tue Mar 12 09:49:10 2019 +0000
+++ b/src/java.sql.rowset/share/classes/javax/sql/rowset/serial/SerialJavaObject.java Sat Mar 16 21:00:45 2019 +0000
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2003, 2014, 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
@@ -47,7 +47,7 @@
* Static or transient fields cannot be serialized; an attempt to serialize
* them will result in a <code>SerialException</code> object being thrown.
*
- * <h3> Thread safety </h3>
+ * <h2> Thread safety </h2>
*
* A SerialJavaObject is not safe for use by multiple concurrent threads. If a
* SerialJavaObject is to be used by more than one thread then access to the
--- a/src/java.sql.rowset/share/classes/javax/sql/rowset/serial/SerialRef.java Tue Mar 12 09:49:10 2019 +0000
+++ b/src/java.sql.rowset/share/classes/javax/sql/rowset/serial/SerialRef.java Sat Mar 16 21:00:45 2019 +0000
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2003, 2014, 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
@@ -37,7 +37,7 @@
* creating a <code>SerialRef</code> instance from a <code>Ref</code>
* object and provides methods for getting and setting the <code>Ref</code> object.
*
- * <h3> Thread safety </h3>
+ * <h2> Thread safety </h2>
*
* A SerialRef is not safe for use by multiple concurrent threads. If a
* SerialRef is to be used by more than one thread then access to the SerialRef
--- a/src/java.sql.rowset/share/classes/javax/sql/rowset/serial/SerialStruct.java Tue Mar 12 09:49:10 2019 +0000
+++ b/src/java.sql.rowset/share/classes/javax/sql/rowset/serial/SerialStruct.java Sat Mar 16 21:00:45 2019 +0000
@@ -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.
* 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,7 +51,7 @@
* the SQL type name of the SQL structured type in the database, and methods
* for retrieving its attribute values.
*
- * <h3> Thread safety </h3>
+ * <h2> Thread safety </h2>
*
* A SerialStruct is not safe for use by multiple concurrent threads. If a
* SerialStruct is to be used by more than one thread then access to the
--- a/src/java.sql.rowset/share/classes/javax/sql/rowset/serial/package-info.java Tue Mar 12 09:49:10 2019 +0000
+++ b/src/java.sql.rowset/share/classes/javax/sql/rowset/serial/package-info.java Sat Mar 16 21:00:45 2019 +0000
@@ -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
@@ -34,7 +34,7 @@
* a different VM or across layers within an application.<br>
* </p>
*
- * <h3>1.0 SerialArray</h3>
+ * <h2>1.0 SerialArray</h2>
* A serializable mapping in the Java programming language of an SQL ARRAY
* value. <br>
* <br>
@@ -43,7 +43,7 @@
* the SQL name for the base type, and methods for copying all or part of a
* <code>SerialArray</code> object. <br>
*
- * <h3>2.0 SerialBlob</h3>
+ * <h2>2.0 SerialBlob</h2>
* A serializable mapping in the Java programming language of an SQL BLOB
* value. <br>
* <br>
@@ -60,7 +60,7 @@
* to locate a given pattern of bytes or a <code>Blob</code> object within a <code>SerialBlob</code>
* object. <br>
*
- * <h3>3.0 SerialClob</h3>
+ * <h2>3.0 SerialClob</h2>
* A serializable mapping in the Java programming language of an SQL CLOB
* value. <br>
* <br>
@@ -74,7 +74,7 @@
* <code>SerialClob</code> object or to locate the start of a pattern of characters.
* <br>
*
- * <h3>5.0 SerialDatalink</h3>
+ * <h2>5.0 SerialDatalink</h2>
* A serializable mapping in the Java programming language of an SQL DATALINK
* value. A DATALINK value references a file outside of the underlying data source
* that the originating data source manages. <br>
@@ -85,7 +85,7 @@
* <br>
* <code> java.net.URL url = rowset.getURL(1);</code><br>
*
- * <h3>6.0 SerialJavaObject</h3>
+ * <h2>6.0 SerialJavaObject</h2>
* A serializable mapping in the Java programming language of an SQL JAVA_OBJECT
* value. Assuming the Java object instance implements the Serializable interface,
* this simply wraps the serialization process. <br>
@@ -96,7 +96,7 @@
* Static or transient fields cannot be serialized and attempting to do so
* will result in a <code>SerialException</code> being thrown. <br>
*
- * <h3>7.0 SerialRef</h3>
+ * <h2>7.0 SerialRef</h2>
* A serializable mapping between the SQL REF type and the Java programming
* language. <br>
* <br>
@@ -104,7 +104,7 @@
* instance from a <code>Ref</code> type and provides methods for getting
* and setting the <code>Ref</code> object type. <br>
*
- * <h3>8.0 SerialStruct</h3>
+ * <h2>8.0 SerialStruct</h2>
* A serializable mapping in the Java programming language of an SQL structured
* type. Each attribute that is not already serializable is mapped to a serializable
* form, and if an attribute is itself a structured type, each of its attributes
@@ -119,7 +119,7 @@
* type name of the SQL structured type in the database, and methods for retrieving
* its attribute values. <br>
*
- * <h3>9.0 SQLInputImpl</h3>
+ * <h2>9.0 SQLInputImpl</h2>
* An input stream used for custom mapping user-defined types (UDTs). An
* <code>SQLInputImpl</code> object is an input stream that contains a stream of
* values that are
@@ -142,7 +142,7 @@
* method <code>SQLData.readSQL</code>, which in turn calls the <code>SQLInputImpl</code>
* methods to read the attributes from the input stream. <br>
*
- * <h3>10.0 SQLOutputImpl</h3>
+ * <h2>10.0 SQLOutputImpl</h2>
* The output stream for writing the attributes of a custom mapped user-defined
* type (UDT) back to the database. The driver uses this interface internally,
* and its methods are never directly invoked by an application programmer.
@@ -160,7 +160,7 @@
* <code>SQLOutputImpl</code>
* output stream as the representation of an SQL user-defined type.
*
- * <h3>Custom Mapping</h3>
+ * <h2>Custom Mapping</h2>
* The JDBC API provides mechanisms for mapping an SQL structured type or DISTINCT
* type to the Java programming language. Typically, a structured type is mapped
* to a class, and its attributes are mapped to fields in the class.
--- a/src/java.sql.rowset/share/classes/javax/sql/rowset/spi/SyncFactory.java Tue Mar 12 09:49:10 2019 +0000
+++ b/src/java.sql.rowset/share/classes/javax/sql/rowset/spi/SyncFactory.java Sat Mar 16 21:00:45 2019 +0000
@@ -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.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -59,7 +59,7 @@
* <code>RowSet</code> implementation can obtain its <code>SyncProvider</code>
* implementation.
*
- * <h3>1.0 Overview</h3>
+ * <h2>1.0 Overview</h2>
* The <code>SyncFactory</code> class provides an internal registry of available
* synchronization provider implementations (<code>SyncProvider</code> objects).
* This registry may be queried to determine which
@@ -108,7 +108,7 @@
* <code>SyncProvider</code> implementations are available, the reference
* implementation providers are supplied.
* </ol>
- * <h3>2.0 Registering <code>SyncProvider</code> Implementations</h3>
+ * <h2>2.0 Registering <code>SyncProvider</code> Implementations</h2>
* <p>
* Both vendors and developers can register <code>SyncProvider</code>
* implementations using one of the following mechanisms.
--- a/src/java.sql.rowset/share/classes/javax/sql/rowset/spi/SyncProvider.java Tue Mar 12 09:49:10 2019 +0000
+++ b/src/java.sql.rowset/share/classes/javax/sql/rowset/spi/SyncProvider.java Sat Mar 16 21:00:45 2019 +0000
@@ -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.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -101,7 +101,7 @@
* providers for additional guidance on how to implement a new
* <code>SyncProvider</code> implementation.
*
- * <h3>2.0 How a <code>RowSet</code> Object Gets Its Provider</h3>
+ * <h2>2.0 How a <code>RowSet</code> Object Gets Its Provider</h2>
*
* A disconnected <code>Rowset</code> object may get access to a
* <code>SyncProvider</code> object in one of the following two ways:
@@ -130,7 +130,7 @@
* assigned the default provider in the reference implementation, which is
* <code>com.sun.rowset.providers.RIOptimisticProvider</code>.
*
- * <h3>3.0 Violations and Synchronization Issues</h3>
+ * <h2>3.0 Violations and Synchronization Issues</h2>
* If an update between a disconnected <code>RowSet</code> object
* and a data source violates
* the original query or the underlying data source constraints, this will
@@ -148,7 +148,7 @@
* all <code>SyncProvider</code>
* objects must throw a <code>SyncProviderException</code>.
*
- * <h3>4.0 Updatable SQL VIEWs</h3>
+ * <h2>4.0 Updatable SQL VIEWs</h2>
* It is possible for any disconnected or connected <code>RowSet</code> object to be populated
* from an SQL query that is formulated originally from an SQL <code>VIEW</code>.
* While in many cases it is possible for an update to be performed to an
@@ -168,7 +168,7 @@
* The default is for a <code>RowSet</code> object not to be updatable if it was
* populated with data from an SQL <code>VIEW</code>.
*
- * <h3>5.0 <code>SyncProvider</code> Constants</h3>
+ * <h2>5.0 <code>SyncProvider</code> Constants</h2>
* The <code>SyncProvider</code> class provides three sets of constants that
* are used as return values or parameters for <code>SyncProvider</code> methods.
* <code>SyncProvider</code> objects may be implemented to perform synchronization
--- a/src/java.sql.rowset/share/classes/javax/sql/rowset/spi/package-info.java Tue Mar 12 09:49:10 2019 +0000
+++ b/src/java.sql.rowset/share/classes/javax/sql/rowset/spi/package-info.java Sat Mar 16 21:00:45 2019 +0000
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2003, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2018, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
--- a/src/java.xml/share/classes/com/sun/org/apache/xml/internal/serializer/OutputPropertiesFactory.java Tue Mar 12 09:49:10 2019 +0000
+++ b/src/java.xml/share/classes/com/sun/org/apache/xml/internal/serializer/OutputPropertiesFactory.java Sat Mar 16 21:00:45 2019 +0000
@@ -70,7 +70,7 @@
* @see SerializerFactory
* @see Method
* @see Serializer
- * @LastModified: Feb 2019
+ * @LastModified: Mar 2019
*/
public final class OutputPropertiesFactory
{
@@ -231,7 +231,7 @@
private static final String[] PROP_HTML = {
"method",
"indent",
- "media",
+ "media-type",
"version",
"{http://xml.apache.org/xalan}indent-amount",
"{http://xml.apache.org/xalan}content-handler",
--- a/src/jdk.aot/share/classes/jdk.tools.jaotc/src/jdk/tools/jaotc/Linker.java Tue Mar 12 09:49:10 2019 +0000
+++ b/src/jdk.aot/share/classes/jdk.tools.jaotc/src/jdk/tools/jaotc/Linker.java Sat Mar 16 21:00:45 2019 +0000
@@ -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
@@ -29,6 +29,10 @@
import java.io.File;
import java.io.InputStream;
import java.io.InputStreamReader;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.nio.file.Paths;
+import java.util.List;
import java.util.stream.Stream;
final class Linker {
@@ -46,9 +50,12 @@
return libraryFileName;
}
+ private static Stream<String> getLines(InputStream stream) {
+ return new BufferedReader(new InputStreamReader(stream)).lines();
+ }
+
private static String getString(InputStream stream) {
- BufferedReader br = new BufferedReader(new InputStreamReader(stream));
- Stream<String> lines = br.lines();
+ Stream<String> lines = getLines(stream);
StringBuilder sb = new StringBuilder();
lines.iterator().forEachRemaining(e -> sb.append(e));
return sb.toString();
@@ -150,9 +157,18 @@
}
/**
- * Search for Visual Studio link.exe Search Order is: VS2013, VS2015, VS2012.
+ * Search for Visual Studio link.exe Search Order is: VS2017+, VS2013, VS2015, VS2012.
*/
- private static String getWindowsLinkPath() {
+ private static String getWindowsLinkPath() throws Exception {
+ try {
+ Path vc141NewerLinker = getVC141AndNewerLinker();
+ if (vc141NewerLinker != null) {
+ return vc141NewerLinker.toString();
+ }
+ } catch (Exception e) {
+ e.printStackTrace();
+ }
+
String link = "\\VC\\bin\\amd64\\link.exe";
/**
@@ -183,10 +199,46 @@
return null;
}
+ private static Path getVC141AndNewerLinker() throws Exception {
+ String programFilesX86 = System.getenv("ProgramFiles(x86)");
+ if (programFilesX86 == null) {
+ throw new InternalError("Could not read the ProgramFiles(x86) environment variable");
+ }
+ Path vswhere = Paths.get(programFilesX86 + "\\Microsoft Visual Studio\\Installer\\vswhere.exe");
+ if (!Files.exists(vswhere)) {
+ return null;
+ }
+
+ ProcessBuilder processBuilder = new ProcessBuilder(vswhere.toString(), "-requires",
+ "Microsoft.VisualStudio.Component.VC.Tools.x86.x64", "-property", "installationPath", "-latest");
+ processBuilder.redirectOutput(ProcessBuilder.Redirect.PIPE);
+ processBuilder.redirectError(ProcessBuilder.Redirect.PIPE);
+ Process process = processBuilder.start();
+ final int exitCode = process.waitFor();
+ if (exitCode != 0) {
+ String errorMessage = getString(process.getErrorStream());
+ if (errorMessage.isEmpty()) {
+ errorMessage = getString(process.getInputStream());
+ }
+ throw new InternalError(errorMessage);
+ }
+
+ String installationPath = getLines(process.getInputStream()).findFirst().orElseThrow(() -> new InternalError("Unexpected empty output from vswhere"));
+ Path vcToolsVersionFilePath = Paths.get(installationPath, "VC\\Auxiliary\\Build\\Microsoft.VCToolsVersion.default.txt");
+ List<String> vcToolsVersionFileLines = Files.readAllLines(vcToolsVersionFilePath);
+ if (vcToolsVersionFileLines.isEmpty()) {
+ throw new InternalError(vcToolsVersionFilePath.toString() + " is empty");
+ }
+ String vcToolsVersion = vcToolsVersionFileLines.get(0);
+ Path linkPath = Paths.get(installationPath, "VC\\Tools\\MSVC", vcToolsVersion, "bin\\Hostx64\\x64\\link.exe");
+ if (!Files.exists(linkPath)) {
+ throw new InternalError("Linker at path " + linkPath.toString() + " does not exist");
+ }
+
+ return linkPath;
+ }
+
// @formatter:off (workaround for Eclipse formatting bug)
- /**
- * Visual Studio supported versions Search Order is: VS2013, VS2015, VS2012.
- */
enum VSVERSIONS {
VS2013("VS120COMNTOOLS", "C:\\Program Files (x86)\\Microsoft Visual Studio 12.0\\VC\\bin\\amd64\\link.exe"),
VS2015("VS140COMNTOOLS", "C:\\Program Files (x86)\\Microsoft Visual Studio 14.0\\VC\\bin\\amd64\\link.exe"),
--- a/src/jdk.aot/share/classes/jdk.tools.jaotc/src/jdk/tools/jaotc/Main.java Tue Mar 12 09:49:10 2019 +0000
+++ b/src/jdk.aot/share/classes/jdk.tools.jaotc/src/jdk/tools/jaotc/Main.java Sat Mar 16 21:00:45 2019 +0000
@@ -166,7 +166,7 @@
printer.printInfo(classesToCompile.size() + " classes found");
}
- OptionValues graalOptions = HotSpotGraalOptionValues.HOTSPOT_OPTIONS;
+ OptionValues graalOptions = HotSpotGraalOptionValues.defaultOptions();
// Setting -Dgraal.TieredAOT overrides --compile-for-tiered
if (!TieredAOT.hasBeenSet(graalOptions)) {
graalOptions = new OptionValues(graalOptions, TieredAOT, options.tiered);
--- a/src/jdk.aot/share/classes/jdk.tools.jaotc/src/jdk/tools/jaotc/collect/ClassSearch.java Tue Mar 12 09:49:10 2019 +0000
+++ b/src/jdk.aot/share/classes/jdk.tools.jaotc/src/jdk/tools/jaotc/collect/ClassSearch.java Sat Mar 16 21:00:45 2019 +0000
@@ -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
@@ -30,6 +30,7 @@
import java.util.ArrayList;
import java.util.List;
import java.util.function.BiConsumer;
+import java.io.File;
public final class ClassSearch {
private final List<SourceProvider> providers = new ArrayList<>();
@@ -106,7 +107,7 @@
public static List<SearchFor> makeList(String type, String argument) {
List<SearchFor> list = new ArrayList<>();
- String[] elements = argument.split(":");
+ String[] elements = argument.split(File.pathSeparator);
for (String element : elements) {
list.add(new SearchFor(element, type));
}
--- a/src/jdk.attach/aix/classes/sun/tools/attach/VirtualMachineImpl.java Tue Mar 12 09:49:10 2019 +0000
+++ b/src/jdk.attach/aix/classes/sun/tools/attach/VirtualMachineImpl.java Sat Mar 16 21:00:45 2019 +0000
@@ -138,7 +138,7 @@
* Execute the given command in the target VM.
*/
InputStream execute(String cmd, Object ... args) throws AgentLoadException, IOException {
- assert args.length <= 4; // includes null
+ assert args.length <= 3; // includes null
// did we detach?
synchronized (this) {
@@ -166,7 +166,7 @@
writeString(s, PROTOCOL_VERSION);
writeString(s, cmd);
- for (int i = 0; i < 4; i++) {
+ for (int i = 0; i < 3; i++) {
if (i < args.length && args[i] != null) {
writeString(s, (String)args[i]);
} else {
--- a/src/jdk.attach/linux/classes/sun/tools/attach/VirtualMachineImpl.java Tue Mar 12 09:49:10 2019 +0000
+++ b/src/jdk.attach/linux/classes/sun/tools/attach/VirtualMachineImpl.java Sat Mar 16 21:00:45 2019 +0000
@@ -143,7 +143,7 @@
* Execute the given command in the target VM.
*/
InputStream execute(String cmd, Object ... args) throws AgentLoadException, IOException {
- assert args.length <= 4; // includes null
+ assert args.length <= 3; // includes null
// did we detach?
synchronized (this) {
@@ -171,7 +171,7 @@
writeString(s, PROTOCOL_VERSION);
writeString(s, cmd);
- for (int i = 0; i < 4; i++) {
+ for (int i = 0; i < 3; i++) {
if (i < args.length && args[i] != null) {
writeString(s, (String)args[i]);
} else {
--- a/src/jdk.attach/macosx/classes/sun/tools/attach/VirtualMachineImpl.java Tue Mar 12 09:49:10 2019 +0000
+++ b/src/jdk.attach/macosx/classes/sun/tools/attach/VirtualMachineImpl.java Sat Mar 16 21:00:45 2019 +0000
@@ -139,7 +139,7 @@
* Execute the given command in the target VM.
*/
InputStream execute(String cmd, Object ... args) throws AgentLoadException, IOException {
- assert args.length <= 4; // includes null
+ assert args.length <= 3; // includes null
// did we detach?
synchronized (this) {
@@ -167,7 +167,7 @@
writeString(s, PROTOCOL_VERSION);
writeString(s, cmd);
- for (int i = 0; i < 4; i++) {
+ for (int i = 0; i < 3; i++) {
if (i < args.length && args[i] != null) {
writeString(s, (String)args[i]);
} else {
--- a/src/jdk.attach/solaris/classes/sun/tools/attach/VirtualMachineImpl.java Tue Mar 12 09:49:10 2019 +0000
+++ b/src/jdk.attach/solaris/classes/sun/tools/attach/VirtualMachineImpl.java Sat Mar 16 21:00:45 2019 +0000
@@ -126,7 +126,7 @@
* Execute the given command in the target VM.
*/
InputStream execute(String cmd, Object ... args) throws AgentLoadException, IOException {
- assert args.length <= 4; // includes null
+ assert args.length <= 3; // includes null
// first check that we are still attached
int door;
--- a/src/jdk.attach/windows/classes/sun/tools/attach/VirtualMachineImpl.java Tue Mar 12 09:49:10 2019 +0000
+++ b/src/jdk.attach/windows/classes/sun/tools/attach/VirtualMachineImpl.java Sat Mar 16 21:00:45 2019 +0000
@@ -77,7 +77,7 @@
InputStream execute(String cmd, Object ... args)
throws AgentLoadException, IOException
{
- assert args.length <= 4; // includes null
+ assert args.length <= 3; // includes null
// create a pipe using a random name
Random rnd = new Random();
--- a/src/jdk.compiler/share/classes/com/sun/tools/doclint/Checker.java Tue Mar 12 09:49:10 2019 +0000
+++ b/src/jdk.compiler/share/classes/com/sun/tools/doclint/Checker.java Sat Mar 16 21:00:45 2019 +0000
@@ -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
@@ -61,7 +61,6 @@
import com.sun.source.doctree.IdentifierTree;
import com.sun.source.doctree.IndexTree;
import com.sun.source.doctree.InheritDocTree;
-import com.sun.source.doctree.InlineTagTree;
import com.sun.source.doctree.LinkTree;
import com.sun.source.doctree.LiteralTree;
import com.sun.source.doctree.ParamTree;
@@ -140,16 +139,15 @@
}
private final Deque<TagStackItem> tagStack; // TODO: maybe want to record starting tree as well
- private HtmlTag currHeaderTag;
+ private HtmlTag currHeadingTag;
- private final int implicitHeaderLevel;
+ private int implicitHeadingRank;
// <editor-fold defaultstate="collapsed" desc="Top level">
Checker(Env env) {
this.env = Assert.checkNonNull(env);
tagStack = new LinkedList<>();
- implicitHeaderLevel = env.implicitHeaderLevel;
}
public Void scan(DocCommentTree tree, TreePath p) {
@@ -188,7 +186,7 @@
}
tagStack.clear();
- currHeaderTag = null;
+ currHeadingTag = null;
foundParams.clear();
foundThrows.clear();
@@ -196,6 +194,37 @@
foundReturn = false;
hasNonWhitespaceText = false;
+ switch (p.getLeaf().getKind()) {
+ // the following are for declarations that have their own top-level page,
+ // and so the doc comment comes after the <h1> page title.
+ case MODULE:
+ case PACKAGE:
+ case CLASS:
+ case INTERFACE:
+ case ENUM:
+ case ANNOTATION_TYPE:
+ implicitHeadingRank = 1;
+ break;
+
+ // this is for html files
+ // ... if it is a legacy package.html, the doc comment comes after the <h1> page title
+ // ... otherwise, (e.g. overview file and doc-files/*.html files) no additional headings are inserted
+ case COMPILATION_UNIT:
+ implicitHeadingRank = fo.isNameCompatible("package", JavaFileObject.Kind.HTML) ? 1 : 0;
+ break;
+
+ // the following are for member declarations, which appear in the page
+ // for the enclosing type, and so appear after the <h2> "Members"
+ // aggregate heading and the specific <h3> "Member signature" heading.
+ case METHOD:
+ case VARIABLE:
+ implicitHeadingRank = 3;
+ break;
+
+ default:
+ Assert.error("unexpected tree kind: " + p.getLeaf().getKind() + " " + fo);
+ }
+
scan(new DocTreePath(p, tree), null);
if (!isOverridingMethod) {
@@ -328,9 +357,9 @@
// tag specific checks
switch (t) {
- // check for out of sequence headers, such as <h1>...</h1> <h3>...</h3>
+ // check for out of sequence headings, such as <h1>...</h1> <h3>...</h3>
case H1: case H2: case H3: case H4: case H5: case H6:
- checkHeader(tree, t);
+ checkHeading(tree, t);
break;
}
@@ -446,23 +475,27 @@
env.messages.error(HTML, tree, "dc.tag.not.allowed.here", treeName);
}
- private void checkHeader(StartElementTree tree, HtmlTag tag) {
+ private void checkHeading(StartElementTree tree, HtmlTag tag) {
// verify the new tag
- if (getHeaderLevel(tag) > getHeaderLevel(currHeaderTag) + 1) {
- if (currHeaderTag == null) {
- env.messages.error(ACCESSIBILITY, tree, "dc.tag.header.sequence.1", tag);
+ if (getHeadingRank(tag) > getHeadingRank(currHeadingTag) + 1) {
+ if (currHeadingTag == null) {
+ env.messages.error(ACCESSIBILITY, tree, "dc.tag.heading.sequence.1",
+ tag, implicitHeadingRank);
} else {
- env.messages.error(ACCESSIBILITY, tree, "dc.tag.header.sequence.2",
- tag, currHeaderTag);
+ env.messages.error(ACCESSIBILITY, tree, "dc.tag.heading.sequence.2",
+ tag, currHeadingTag);
}
+ } else if (getHeadingRank(tag) <= implicitHeadingRank) {
+ env.messages.error(ACCESSIBILITY, tree, "dc.tag.heading.sequence.3",
+ tag, implicitHeadingRank);
}
- currHeaderTag = tag;
+ currHeadingTag = tag;
}
- private int getHeaderLevel(HtmlTag tag) {
+ private int getHeadingRank(HtmlTag tag) {
if (tag == null)
- return implicitHeaderLevel;
+ return implicitHeadingRank;
switch (tag) {
case H1: return 1;
case H2: return 2;
@@ -666,11 +699,11 @@
break;
case OBSOLETE:
- env.messages.warning(ACCESSIBILITY, tree, "dc.attr.obsolete", name);
+ env.messages.warning(HTML, tree, "dc.attr.obsolete", name);
break;
case USE_CSS:
- env.messages.warning(ACCESSIBILITY, tree, "dc.attr.obsolete.use.css", name);
+ env.messages.warning(HTML, tree, "dc.attr.obsolete.use.css", name);
break;
case HTML5:
--- a/src/jdk.compiler/share/classes/com/sun/tools/doclint/DocLint.java Tue Mar 12 09:49:10 2019 +0000
+++ b/src/jdk.compiler/share/classes/com/sun/tools/doclint/DocLint.java Sat Mar 16 21:00:45 2019 +0000
@@ -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
@@ -80,7 +80,6 @@
public static final String XMSGS_OPTION = "-Xmsgs";
public static final String XMSGS_CUSTOM_PREFIX = "-Xmsgs:";
private static final String STATS = "-stats";
- public static final String XIMPLICIT_HEADERS = "-XimplicitHeaders:";
public static final String XCUSTOM_TAGS_PREFIX = "-XcustomTags:";
public static final String XHTML_VERSION_PREFIX = "-XhtmlVersion:";
public static final String XCHECK_PACKAGE = "-XcheckPackage:";
@@ -289,9 +288,6 @@
env.messages.setOptions(null);
} else if (arg.startsWith(XMSGS_CUSTOM_PREFIX)) {
env.messages.setOptions(arg.substring(arg.indexOf(":") + 1));
- } else if (arg.matches(XIMPLICIT_HEADERS + "[1-6]")) {
- char ch = arg.charAt(arg.length() - 1);
- env.setImplicitHeaders(Character.digit(ch, 10));
} else if (arg.startsWith(XCUSTOM_TAGS_PREFIX)) {
env.setCustomTags(arg.substring(arg.indexOf(":") + 1));
} else if (arg.startsWith(XHTML_VERSION_PREFIX)) {
--- a/src/jdk.compiler/share/classes/com/sun/tools/doclint/Env.java Tue Mar 12 09:49:10 2019 +0000
+++ b/src/jdk.compiler/share/classes/com/sun/tools/doclint/Env.java Sat Mar 16 21:00:45 2019 +0000
@@ -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
@@ -93,8 +93,6 @@
/** Message handler. */
final Messages messages;
- int implicitHeaderLevel = 0;
-
Set<String> customTags;
Set<Pattern> includePackages;
@@ -153,10 +151,6 @@
java_lang_Void = elements.getTypeElement("java.lang.Void").asType();
}
- void setImplicitHeaders(int n) {
- implicitHeaderLevel = n;
- }
-
void setCustomTags(String cTags) {
customTags = new LinkedHashSet<>();
for (String s : cTags.split(DocLint.SEPARATOR)) {
--- a/src/jdk.compiler/share/classes/com/sun/tools/doclint/resources/doclint.properties Tue Mar 12 09:49:10 2019 +0000
+++ b/src/jdk.compiler/share/classes/com/sun/tools/doclint/resources/doclint.properties Sat Mar 16 21:00:45 2019 +0000
@@ -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
@@ -63,8 +63,9 @@
dc.tag.a.within.a = {0} tag, which expands to <a>, within <a>
dc.tag.end.not.permitted = invalid end tag: </{0}>
dc.tag.end.unexpected = unexpected end tag: </{0}>
-dc.tag.header.sequence.1 = header used out of sequence: <{0}>
-dc.tag.header.sequence.2 = header used out of sequence: <{0}>
+dc.tag.heading.sequence.1 = heading used out of sequence: <{0}>, compared to implicit preceding heading: <H{1}>
+dc.tag.heading.sequence.2 = heading used out of sequence: <{0}>, compared to previous heading: <{1}>
+dc.tag.heading.sequence.3 = unexpected heading used: <{0}>, compared to implicit preceding heading: <H{1}>
dc.tag.nested.not.allowed=nested tag not allowed: <{0}>
dc.tag.not.allowed.here = tag not allowed here: <{0}>
dc.tag.not.allowed = element not allowed in documentation comments: <{0}>
--- a/src/jdk.compiler/share/classes/com/sun/tools/javac/file/PathFileObject.java Tue Mar 12 09:49:10 2019 +0000
+++ b/src/jdk.compiler/share/classes/com/sun/tools/javac/file/PathFileObject.java Sat Mar 16 21:00:45 2019 +0000
@@ -288,6 +288,11 @@
return userPath.toString();
}
+ @Override @DefinedBy(Api.COMPILER)
+ public String getShortName() {
+ return userPath.getFileName().toString();
+ }
+
@Override
public String inferBinaryName(Iterable<? extends Path> paths) {
Path absPath = path.toAbsolutePath();
--- a/src/jdk.compiler/share/classes/com/sun/tools/javac/main/Arguments.java Tue Mar 12 09:49:10 2019 +0000
+++ b/src/jdk.compiler/share/classes/com/sun/tools/javac/main/Arguments.java Sat Mar 16 21:00:45 2019 +0000
@@ -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
@@ -852,9 +852,6 @@
doclintOpts.add(DocLint.XHTML_VERSION_PREFIX + format);
}
- // standard doclet normally generates H1, H2,
- // so for now, allow user comments to assume that
- doclintOpts.add(DocLint.XIMPLICIT_HEADERS + "2");
return List.from(doclintOpts.toArray(new String[doclintOpts.size()]));
}
--- a/src/jdk.compiler/share/classes/com/sun/tools/javac/resources/compiler.properties Tue Mar 12 09:49:10 2019 +0000
+++ b/src/jdk.compiler/share/classes/com/sun/tools/javac/resources/compiler.properties Sat Mar 16 21:00:45 2019 +0000
@@ -231,7 +231,7 @@
compiler.err.cant.apply.symbol=\
{0} {1} in {4} {5} cannot be applied to given types;\n\
required: {2}\n\
- found: {3}\n\
+ found: {3}\n\
reason: {6}
# 0: symbol kind, 1: name, 2: list of type
@@ -242,7 +242,7 @@
compiler.misc.cant.apply.symbol=\
{0} {1} in {4} {5} cannot be applied to given types\n\
required: {2}\n\
- found: {3}\n\
+ found: {3}\n\
reason: {6}
# 0: symbol kind, 1: name, 2: list of type
@@ -1952,7 +1952,7 @@
compiler.warn.unchecked.meth.invocation.applied=\
unchecked method invocation: {0} {1} in {4} {5} is applied to given types\n\
required: {2}\n\
- found: {3}
+ found: {3}
# 0: type
compiler.warn.unchecked.generic.array.creation=\
@@ -2880,25 +2880,25 @@
compiler.err.incorrect.receiver.name=\
the receiver name does not match the enclosing class type\n\
required: {0}\n\
- found: {1}
+ found: {1}
# 0: type, 1: type
compiler.err.incorrect.receiver.type=\
the receiver type does not match the enclosing class type\n\
required: {0}\n\
- found: {1}
+ found: {1}
# 0: type, 1: type
compiler.err.incorrect.constructor.receiver.type=\
the receiver type does not match the enclosing outer class type\n\
required: {0}\n\
- found: {1}
+ found: {1}
# 0: type, 1: type
compiler.err.incorrect.constructor.receiver.name=\
the receiver name does not match the enclosing outer class type\n\
required: {0}\n\
- found: {1}
+ found: {1}
compiler.err.no.annotations.on.dot.class=\
no annotations are allowed in the type of a class literal
--- a/src/jdk.compiler/share/classes/com/sun/tools/javac/util/Names.java Tue Mar 12 09:49:10 2019 +0000
+++ b/src/jdk.compiler/share/classes/com/sun/tools/javac/util/Names.java Sat Mar 16 21:00:45 2019 +0000
@@ -53,14 +53,10 @@
public final Name empty;
public final Name hyphen;
public final Name one;
- public final Name period;
- public final Name semicolon;
public final Name slash;
- public final Name slashequals;
// keywords
public final Name _class;
- public final Name _default;
public final Name _super;
public final Name _this;
public final Name var;
@@ -83,24 +79,16 @@
public final Name clinit;
public final Name clone;
public final Name close;
- public final Name compareTo;
public final Name deserializeLambda;
public final Name desiredAssertionStatus;
public final Name equals;
public final Name error;
- public final Name family;
public final Name finalize;
- public final Name forName;
public final Name forRemoval;
public final Name getClass;
- public final Name getClassLoader;
- public final Name getComponentType;
- public final Name getDeclaringClass;
- public final Name getMessage;
public final Name hasNext;
public final Name hashCode;
public final Name init;
- public final Name initCause;
public final Name iterator;
public final Name length;
public final Name next;
@@ -114,12 +102,10 @@
// class names
public final Name java_io_Serializable;
- public final Name java_lang_AutoCloseable;
public final Name java_lang_Class;
public final Name java_lang_Cloneable;
public final Name java_lang_Enum;
public final Name java_lang_Object;
- public final Name java_lang_invoke_MethodHandle;
// names of builtin classes
public final Name Array;
@@ -189,7 +175,6 @@
// other identifiers
public final Name T;
- public final Name deprecated;
public final Name ex;
public final Name module_info;
public final Name package_info;
@@ -217,14 +202,10 @@
empty = fromString("");
hyphen = fromString("-");
one = fromString("1");
- period = fromString(".");
- semicolon = fromString(";");
slash = fromString("/");
- slashequals = fromString("/=");
// keywords
_class = fromString("class");
- _default = fromString("default");
_super = fromString("super");
_this = fromString("this");
var = fromString("var");
@@ -247,24 +228,16 @@
clinit = fromString("<clinit>");
clone = fromString("clone");
close = fromString("close");
- compareTo = fromString("compareTo");
deserializeLambda = fromString("$deserializeLambda$");
desiredAssertionStatus = fromString("desiredAssertionStatus");
equals = fromString("equals");
error = fromString("<error>");
- family = fromString("family");
finalize = fromString("finalize");
- forName = fromString("forName");
forRemoval = fromString("forRemoval");
getClass = fromString("getClass");
- getClassLoader = fromString("getClassLoader");
- getComponentType = fromString("getComponentType");
- getDeclaringClass = fromString("getDeclaringClass");
- getMessage = fromString("getMessage");
hasNext = fromString("hasNext");
hashCode = fromString("hashCode");
init = fromString("<init>");
- initCause = fromString("initCause");
iterator = fromString("iterator");
length = fromString("length");
next = fromString("next");
@@ -279,12 +252,10 @@
// class names
java_io_Serializable = fromString("java.io.Serializable");
- java_lang_AutoCloseable = fromString("java.lang.AutoCloseable");
java_lang_Class = fromString("java.lang.Class");
java_lang_Cloneable = fromString("java.lang.Cloneable");
java_lang_Enum = fromString("java.lang.Enum");
java_lang_Object = fromString("java.lang.Object");
- java_lang_invoke_MethodHandle = fromString("java.lang.invoke.MethodHandle");
// names of builtin classes
Array = fromString("Array");
@@ -354,7 +325,6 @@
// other identifiers
T = fromString("T");
- deprecated = fromString("deprecated");
ex = fromString("ex");
module_info = fromString("module-info");
package_info = fromString("package-info");
--- a/src/jdk.crypto.cryptoki/share/classes/sun/security/pkcs11/P11RSACipher.java Tue Mar 12 09:49:10 2019 +0000
+++ b/src/jdk.crypto.cryptoki/share/classes/sun/security/pkcs11/P11RSACipher.java Sat Mar 16 21:00:45 2019 +0000
@@ -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
@@ -550,13 +550,14 @@
try {
try {
s = token.getObjSession();
- long keyType = CKK_GENERIC_SECRET;
+ long p11KeyType =
+ P11SecretKeyFactory.getPKCS11KeyType(algorithm);
CK_ATTRIBUTE[] attributes = new CK_ATTRIBUTE[] {
new CK_ATTRIBUTE(CKA_CLASS, CKO_SECRET_KEY),
- new CK_ATTRIBUTE(CKA_KEY_TYPE, keyType),
+ new CK_ATTRIBUTE(CKA_KEY_TYPE, p11KeyType),
};
attributes = token.getAttributes(
- O_IMPORT, CKO_SECRET_KEY, keyType, attributes);
+ O_IMPORT, CKO_SECRET_KEY, p11KeyType, attributes);
long keyID = token.p11.C_UnwrapKey(s.id(),
new CK_MECHANISM(mechanism), p11KeyID,
--- a/src/jdk.crypto.cryptoki/share/classes/sun/security/pkcs11/P11SecretKeyFactory.java Tue Mar 12 09:49:10 2019 +0000
+++ b/src/jdk.crypto.cryptoki/share/classes/sun/security/pkcs11/P11SecretKeyFactory.java Sat Mar 16 21:00:45 2019 +0000
@@ -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
@@ -86,6 +86,17 @@
keyTypes.put(name.toUpperCase(Locale.ENGLISH), l);
}
+ // returns the PKCS11 key type of the specified algorithm
+ // no psuedo KeyTypes
+ static long getPKCS11KeyType(String algorithm) {
+ long kt = getKeyType(algorithm);
+ if (kt == -1 || kt > PCKK_ANY) {
+ kt = CKK_GENERIC_SECRET;
+ }
+ return kt;
+ }
+
+ // returns direct lookup result of keyTypes using algorithm
static long getKeyType(String algorithm) {
Long l = keyTypes.get(algorithm);
if (l == null) {
--- a/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/code/CodeCache.java Tue Mar 12 09:49:10 2019 +0000
+++ b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/code/CodeCache.java Sat Mar 16 21:00:45 2019 +0000
@@ -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
@@ -33,7 +33,6 @@
public class CodeCache {
private static GrowableArray<CodeHeap> heapArray;
- private static AddressField scavengeRootNMethodsField;
private static VirtualConstructor virtualConstructor;
static {
@@ -56,8 +55,6 @@
AddressField heapsField = type.getAddressField("_heaps");
heapArray = GrowableArray.create(heapsField.getValue(), heapConstructor);
- scavengeRootNMethodsField = type.getAddressField("_scavenge_root_nmethods");
-
virtualConstructor = new VirtualConstructor(db);
// Add mappings for all possible CodeBlob subclasses
virtualConstructor.addMapping("BufferBlob", BufferBlob.class);
@@ -73,10 +70,6 @@
}
}
- public NMethod scavengeRootMethods() {
- return (NMethod) VMObjectFactory.newObject(NMethod.class, scavengeRootNMethodsField.getValue());
- }
-
public boolean contains(Address p) {
for (int i = 0; i < heapArray.length(); ++i) {
if (heapArray.at(i).contains(p)) {
--- a/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/code/NMethod.java Tue Mar 12 09:49:10 2019 +0000
+++ b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/code/NMethod.java Sat Mar 16 21:00:45 2019 +0000
@@ -38,8 +38,6 @@
private static CIntegerField entryBCIField;
/** To support simple linked-list chaining of nmethods */
private static AddressField osrLinkField;
- private static AddressField scavengeRootLinkField;
- private static JByteField scavengeRootStateField;
/** Offsets for different nmethod parts */
private static CIntegerField exceptionOffsetField;
@@ -88,8 +86,6 @@
entryBCIField = type.getCIntegerField("_entry_bci");
osrLinkField = type.getAddressField("_osr_link");
- scavengeRootLinkField = type.getAddressField("_scavenge_root_link");
- scavengeRootStateField = type.getJByteField("_scavenge_root_state");
exceptionOffsetField = type.getCIntegerField("_exception_offset");
origPCOffsetField = type.getCIntegerField("_orig_pc_offset");
@@ -251,14 +247,6 @@
return (NMethod) VMObjectFactory.newObject(NMethod.class, osrLinkField.getValue(addr));
}
- public NMethod getScavengeRootLink() {
- return (NMethod) VMObjectFactory.newObject(NMethod.class, scavengeRootLinkField.getValue(addr));
- }
-
- public int getScavengeRootState() {
- return (int) scavengeRootStateField.getValue(addr);
- }
-
// MethodHandle
public boolean isMethodHandleReturn(Address returnPc) {
// Hard to read a bit fields from Java and it's only there for performance
--- a/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/gc/z/ZAddressRangeMapForPageTable.java Tue Mar 12 09:49:10 2019 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,91 +0,0 @@
-/*
- * 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
- * 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.
- *
- */
-
-package sun.jvm.hotspot.gc.z;
-
-import sun.jvm.hotspot.debugger.Address;
-import sun.jvm.hotspot.runtime.VM;
-import sun.jvm.hotspot.runtime.VMObject;
-import sun.jvm.hotspot.types.AddressField;
-import sun.jvm.hotspot.types.Type;
-import sun.jvm.hotspot.types.TypeDataBase;
-
-public class ZAddressRangeMapForPageTable extends VMObject {
- private static AddressField mapField;
-
- private static long AddressRangeShift = ZGlobals.ZPageSizeMinShift;
-
- static {
- VM.registerVMInitializedObserver((o, d) -> initialize(VM.getVM().getTypeDataBase()));
- }
-
- static private synchronized void initialize(TypeDataBase db) {
- Type type = db.lookupType("ZAddressRangeMapForPageTable");
-
- mapField = type.getAddressField("_map");
- }
-
- public ZAddressRangeMapForPageTable(Address addr) {
- super(addr);
- }
-
- private Address map() {
- return mapField.getValue(addr);
- }
-
- public long size() {
- return ZGlobals.ZAddressOffsetMax >> AddressRangeShift;
- }
-
- private long index_for_addr(Address addr) {
- long index = ZAddress.offset(addr) >> AddressRangeShift;
-
- return index;
- }
-
- Address at(long index) {
- return map().getAddressAt(index * VM.getVM().getBytesPerLong());
- }
-
- Address get(Address addr) {
- long index = index_for_addr(addr);
- return at(index);
- }
-
- public class Iterator {
- private long next = 0;
-
- boolean hasNext() {
- return next < size();
- }
-
- Address next() {
- if (next >= size()) {
- throw new RuntimeException("OOIBE");
- }
-
- return at(next++);
- }
- }
-}
--- a/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/gc/z/ZGlobals.java Tue Mar 12 09:49:10 2019 +0000
+++ b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/gc/z/ZGlobals.java Sat Mar 16 21:00:45 2019 +0000
@@ -39,10 +39,12 @@
public static byte ZPageTypeMedium;
public static byte ZPageTypeLarge;
+ // Granule size shift
+ public static long ZGranuleSizeShift;
+
// Page size shifts
public static long ZPageSizeSmallShift;
public static long ZPageSizeMediumShift;
- public static long ZPageSizeMinShift;
// Object alignment shifts
public static int ZObjectAlignmentMediumShift;
@@ -74,9 +76,10 @@
ZPageTypeMedium = db.lookupIntConstant("ZPageTypeMedium").byteValue();
ZPageTypeLarge = db.lookupIntConstant("ZPageTypeLarge").byteValue();
+ ZGranuleSizeShift = db.lookupLongConstant("ZGranuleSizeShift").longValue();
+
ZPageSizeSmallShift = db.lookupLongConstant("ZPageSizeSmallShift").longValue();
ZPageSizeMediumShift = db.lookupLongConstant("ZPageSizeMediumShift").longValue();
- ZPageSizeMinShift = db.lookupLongConstant("ZPageSizeMinShift").longValue();
ZObjectAlignmentMediumShift = db.lookupIntConstant("ZObjectAlignmentMediumShift").intValue();
ZObjectAlignmentLargeShift = db.lookupIntConstant("ZObjectAlignmentLargeShift").intValue();;
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/gc/z/ZGranuleMapForPageTable.java Sat Mar 16 21:00:45 2019 +0000
@@ -0,0 +1,89 @@
+/*
+ * 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
+ * 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.
+ *
+ */
+
+package sun.jvm.hotspot.gc.z;
+
+import sun.jvm.hotspot.debugger.Address;
+import sun.jvm.hotspot.runtime.VM;
+import sun.jvm.hotspot.runtime.VMObject;
+import sun.jvm.hotspot.types.AddressField;
+import sun.jvm.hotspot.types.Type;
+import sun.jvm.hotspot.types.TypeDataBase;
+
+public class ZGranuleMapForPageTable extends VMObject {
+ private static AddressField mapField;
+
+ static {
+ VM.registerVMInitializedObserver((o, d) -> initialize(VM.getVM().getTypeDataBase()));
+ }
+
+ static private synchronized void initialize(TypeDataBase db) {
+ Type type = db.lookupType("ZGranuleMapForPageTable");
+
+ mapField = type.getAddressField("_map");
+ }
+
+ public ZGranuleMapForPageTable(Address addr) {
+ super(addr);
+ }
+
+ private Address map() {
+ return mapField.getValue(addr);
+ }
+
+ public long size() {
+ return ZGlobals.ZAddressOffsetMax >> ZGlobals.ZGranuleSizeShift;
+ }
+
+ private long index_for_addr(Address addr) {
+ long index = ZAddress.offset(addr) >> ZGlobals.ZGranuleSizeShift;
+
+ return index;
+ }
+
+ Address at(long index) {
+ return map().getAddressAt(index * VM.getVM().getBytesPerLong());
+ }
+
+ Address get(Address addr) {
+ long index = index_for_addr(addr);
+ return at(index);
+ }
+
+ public class Iterator {
+ private long next = 0;
+
+ boolean hasNext() {
+ return next < size();
+ }
+
+ Address next() {
+ if (next >= size()) {
+ throw new RuntimeException("OOIBE");
+ }
+
+ return at(next++);
+ }
+ }
+}
--- a/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/gc/z/ZPageTable.java Tue Mar 12 09:49:10 2019 +0000
+++ b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/gc/z/ZPageTable.java Sat Mar 16 21:00:45 2019 +0000
@@ -50,8 +50,8 @@
super(addr);
}
- private ZAddressRangeMapForPageTable map() {
- return (ZAddressRangeMapForPageTable)VMObjectFactory.newObject(ZAddressRangeMapForPageTable.class, addr.addOffsetTo(mapFieldOffset));
+ private ZGranuleMapForPageTable map() {
+ return (ZGranuleMapForPageTable)VMObjectFactory.newObject(ZGranuleMapForPageTable.class, addr.addOffsetTo(mapFieldOffset));
}
private ZPageTableEntry getEntry(Address o) {
@@ -67,7 +67,7 @@
}
private class ZPagesIterator implements Iterator<ZPage> {
- private ZAddressRangeMapForPageTable.Iterator mapIter;
+ private ZGranuleMapForPageTable.Iterator mapIter;
private ZPage next;
ZPagesIterator() {
--- a/src/jdk.httpserver/share/classes/com/sun/net/httpserver/HttpExchange.java Tue Mar 12 09:49:10 2019 +0000
+++ b/src/jdk.httpserver/share/classes/com/sun/net/httpserver/HttpExchange.java Sat Mar 16 21:00:45 2019 +0000
@@ -43,7 +43,7 @@
* <ol><li>{@link #getRequestMethod()} to determine the command
* <li>{@link #getRequestHeaders()} to examine the request headers (if needed)
* <li>{@link #getRequestBody()} returns a {@link java.io.InputStream} for reading the request body.
- * After reading the request body, the stream is close.
+ * After reading the request body, the stream should be closed.
* <li>{@link #getResponseHeaders()} to set any response headers, except content-length
* <li>{@link #sendResponseHeaders(int,long)} to send the response headers. Must be called before
* next step.
--- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.asm.aarch64/src/org/graalvm/compiler/asm/aarch64/AArch64Assembler.java Tue Mar 12 09:49:10 2019 +0000
+++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.asm.aarch64/src/org/graalvm/compiler/asm/aarch64/AArch64Assembler.java Sat Mar 16 21:00:45 2019 +0000
@@ -880,15 +880,15 @@
protected void tbnz(Register reg, int uimm6, int imm16, int pos) {
assert reg.getRegisterCategory().equals(CPU);
assert NumUtil.isUnsignedNbit(6, uimm6);
- assert NumUtil.isSignedNbit(18, imm16);
- assert (imm16 & 3) == 0;
+ assert NumUtil.isSignedNbit(16, imm16) : String.format("Offset value must fit in 16 bits signed: 0x%x", imm16);
+ assert (imm16 & 3) == 0 : String.format("Lower two bits must be zero: 0x%x", imm16 & 3);
// size bit is overloaded as top bit of uimm6 bit index
int size = (((uimm6 >> 5) & 1) == 0 ? 32 : 64);
// remaining 5 bits are encoded lower down
- int uimm5 = uimm6 >> 1;
- int offset = (imm16 & NumUtil.getNbitNumberInt(16)) >> 2;
+ int uimm5 = uimm6 & 0x1F;
+ int imm14 = (imm16 & NumUtil.getNbitNumberInt(16)) >> 2;
InstructionType type = generalFromSize(size);
- int encoding = type.encoding | TBNZ.encoding | (uimm5 << 19) | (offset << 5) | rd(reg);
+ int encoding = type.encoding | TBNZ.encoding | (uimm5 << 19) | (imm14 << 5) | rd(reg);
if (pos == -1) {
emitInt(encoding);
} else {
@@ -907,15 +907,15 @@
protected void tbz(Register reg, int uimm6, int imm16, int pos) {
assert reg.getRegisterCategory().equals(CPU);
assert NumUtil.isUnsignedNbit(6, uimm6);
- assert NumUtil.isSignedNbit(18, imm16);
- assert (imm16 & 3) == 0;
+ assert NumUtil.isSignedNbit(16, imm16) : String.format("Offset value must fit in 16 bits signed: 0x%x", imm16);
+ assert (imm16 & 3) == 0 : String.format("Lower two bits must be zero: 0x%x", imm16 & 3);
// size bit is overloaded as top bit of uimm6 bit index
int size = (((uimm6 >> 5) & 1) == 0 ? 32 : 64);
// remaining 5 bits are encoded lower down
- int uimm5 = uimm6 >> 1;
- int offset = (imm16 & NumUtil.getNbitNumberInt(16)) >> 2;
+ int uimm5 = uimm6 & 0x1F;
+ int imm14 = (imm16 & NumUtil.getNbitNumberInt(16)) >> 2;
InstructionType type = generalFromSize(size);
- int encoding = type.encoding | TBZ.encoding | (uimm5 << 19) | (offset << 5) | rd(reg);
+ int encoding = type.encoding | TBZ.encoding | (uimm5 << 19) | (imm14 << 5) | rd(reg);
if (pos == -1) {
emitInt(encoding);
} else {
--- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.asm.aarch64/src/org/graalvm/compiler/asm/aarch64/AArch64MacroAssembler.java Tue Mar 12 09:49:10 2019 +0000
+++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.asm.aarch64/src/org/graalvm/compiler/asm/aarch64/AArch64MacroAssembler.java Sat Mar 16 21:00:45 2019 +0000
@@ -33,6 +33,9 @@
import static org.graalvm.compiler.asm.aarch64.AArch64MacroAssembler.AddressGenerationPlan.WorkPlan.ADD_TO_BASE;
import static org.graalvm.compiler.asm.aarch64.AArch64MacroAssembler.AddressGenerationPlan.WorkPlan.ADD_TO_INDEX;
import static org.graalvm.compiler.asm.aarch64.AArch64MacroAssembler.AddressGenerationPlan.WorkPlan.NO_WORK;
+
+import org.graalvm.compiler.asm.BranchTargetOutOfBoundsException;
+
import static jdk.vm.ci.aarch64.AArch64.CPU;
import static jdk.vm.ci.aarch64.AArch64.r8;
import static jdk.vm.ci.aarch64.AArch64.r9;
@@ -1452,7 +1455,7 @@
*
* @param cmp general purpose register. May not be null, zero-register or stackpointer.
* @param uimm6 Unsigned 6-bit bit index.
- * @param label Can only handle 21-bit word-aligned offsets for now. May be unbound. Non null.
+ * @param label Can only handle 16-bit word-aligned offsets for now. May be unbound. Non null.
*/
public void tbnz(Register cmp, int uimm6, Label label) {
assert NumUtil.isUnsignedNbit(6, uimm6);
@@ -1472,7 +1475,7 @@
*
* @param cmp general purpose register. May not be null, zero-register or stackpointer.
* @param uimm6 Unsigned 6-bit bit index.
- * @param label Can only handle 21-bit word-aligned offsets for now. May be unbound. Non null.
+ * @param label Can only handle 16-bit word-aligned offsets for now. May be unbound. Non null.
*/
public void tbz(Register cmp, int uimm6, Label label) {
assert NumUtil.isUnsignedNbit(6, uimm6);
@@ -1681,6 +1684,9 @@
int sizeEncoding = information & NumUtil.getNbitNumberInt(6);
int regEncoding = information >>> 6;
Register reg = AArch64.cpuRegisters.get(regEncoding);
+ if (!NumUtil.isSignedNbit(16, branchOffset)) {
+ throw new BranchTargetOutOfBoundsException(true, "Branch target %d out of bounds", branchOffset);
+ }
switch (type) {
case BRANCH_BIT_NONZERO:
super.tbnz(reg, sizeEncoding, branchOffset, branch);
--- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.asm.amd64/src/org/graalvm/compiler/asm/amd64/AMD64Assembler.java Tue Mar 12 09:49:10 2019 +0000
+++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.asm.amd64/src/org/graalvm/compiler/asm/amd64/AMD64Assembler.java Sat Mar 16 21:00:45 2019 +0000
@@ -683,7 +683,7 @@
emitImmediate(asm, size, imm);
int nextInsnPos = asm.position();
if (annotateImm && asm.codePatchingAnnotationConsumer != null) {
- asm.codePatchingAnnotationConsumer.accept(new ImmediateOperandAnnotation(insnPos, immPos, nextInsnPos - immPos, nextInsnPos));
+ asm.codePatchingAnnotationConsumer.accept(new OperandDataAnnotation(insnPos, immPos, nextInsnPos - immPos, nextInsnPos));
}
}
@@ -700,7 +700,7 @@
emitImmediate(asm, size, imm);
int nextInsnPos = asm.position();
if (annotateImm && asm.codePatchingAnnotationConsumer != null) {
- asm.codePatchingAnnotationConsumer.accept(new ImmediateOperandAnnotation(insnPos, immPos, nextInsnPos - immPos, nextInsnPos));
+ asm.codePatchingAnnotationConsumer.accept(new OperandDataAnnotation(insnPos, immPos, nextInsnPos - immPos, nextInsnPos));
}
}
}
@@ -2023,7 +2023,7 @@
emitInt(imm32);
int nextInsnPos = position();
if (annotateImm && codePatchingAnnotationConsumer != null) {
- codePatchingAnnotationConsumer.accept(new ImmediateOperandAnnotation(insnPos, immPos, nextInsnPos - immPos, nextInsnPos));
+ codePatchingAnnotationConsumer.accept(new OperandDataAnnotation(insnPos, immPos, nextInsnPos - immPos, nextInsnPos));
}
}
@@ -2201,10 +2201,11 @@
}
public final void movswl(Register dst, AMD64Address src) {
- prefix(src, dst);
- emitByte(0x0F);
- emitByte(0xBF);
- emitOperandHelper(dst, src, 0);
+ AMD64RMOp.MOVSX.emit(this, DWORD, dst, src);
+ }
+
+ public final void movswq(Register dst, AMD64Address src) {
+ AMD64RMOp.MOVSX.emit(this, QWORD, dst, src);
}
public final void movw(AMD64Address dst, int imm16) {
@@ -2222,6 +2223,13 @@
emitOperandHelper(src, dst, 0);
}
+ public final void movw(Register dst, AMD64Address src) {
+ emitByte(0x66);
+ prefix(src, dst);
+ emitByte(0x8B);
+ emitOperandHelper(dst, src, 0);
+ }
+
public final void movzbl(Register dst, AMD64Address src) {
prefix(src, dst);
emitByte(0x0F);
@@ -2237,11 +2245,16 @@
AMD64RMOp.MOVZXB.emit(this, QWORD, dst, src);
}
+ public final void movzbq(Register dst, AMD64Address src) {
+ AMD64RMOp.MOVZXB.emit(this, QWORD, dst, src);
+ }
+
public final void movzwl(Register dst, AMD64Address src) {
- prefix(src, dst);
- emitByte(0x0F);
- emitByte(0xB7);
- emitOperandHelper(dst, src, 0);
+ AMD64RMOp.MOVZX.emit(this, DWORD, dst, src);
+ }
+
+ public final void movzwq(Register dst, AMD64Address src) {
+ AMD64RMOp.MOVZX.emit(this, QWORD, dst, src);
}
public final void negl(Register dst) {
@@ -2557,16 +2570,63 @@
emitModRM(dst, src);
}
- // Insn: VPMOVZXBW xmm1, xmm2/m64
-
- public final void pmovzxbw(Register dst, AMD64Address src) {
+ private void pmovSZx(Register dst, AMD64Address src, int op) {
assert supports(CPUFeature.SSE4_1);
assert inRC(XMM, dst);
simdPrefix(dst, Register.None, src, PD, P_0F38, false);
- emitByte(0x30);
+ emitByte(op);
emitOperandHelper(dst, src, 0);
}
+ public final void pmovsxbw(Register dst, AMD64Address src) {
+ pmovSZx(dst, src, 0x20);
+ }
+
+ public final void pmovsxbd(Register dst, AMD64Address src) {
+ pmovSZx(dst, src, 0x21);
+ }
+
+ public final void pmovsxbq(Register dst, AMD64Address src) {
+ pmovSZx(dst, src, 0x22);
+ }
+
+ public final void pmovsxwd(Register dst, AMD64Address src) {
+ pmovSZx(dst, src, 0x23);
+ }
+
+ public final void pmovsxwq(Register dst, AMD64Address src) {
+ pmovSZx(dst, src, 0x24);
+ }
+
+ public final void pmovsxdq(Register dst, AMD64Address src) {
+ pmovSZx(dst, src, 0x25);
+ }
+
+ // Insn: VPMOVZXBW xmm1, xmm2/m64
+ public final void pmovzxbw(Register dst, AMD64Address src) {
+ pmovSZx(dst, src, 0x30);
+ }
+
+ public final void pmovzxbd(Register dst, AMD64Address src) {
+ pmovSZx(dst, src, 0x31);
+ }
+
+ public final void pmovzxbq(Register dst, AMD64Address src) {
+ pmovSZx(dst, src, 0x32);
+ }
+
+ public final void pmovzxwd(Register dst, AMD64Address src) {
+ pmovSZx(dst, src, 0x33);
+ }
+
+ public final void pmovzxwq(Register dst, AMD64Address src) {
+ pmovSZx(dst, src, 0x34);
+ }
+
+ public final void pmovzxdq(Register dst, AMD64Address src) {
+ pmovSZx(dst, src, 0x35);
+ }
+
public final void pmovzxbw(Register dst, Register src) {
assert supports(CPUFeature.SSE4_1);
assert inRC(XMM, dst) && inRC(XMM, src);
@@ -2881,6 +2941,10 @@
XOR.rmOp.emit(this, DWORD, dst, src);
}
+ public final void xorq(Register dst, Register src) {
+ XOR.rmOp.emit(this, QWORD, dst, src);
+ }
+
public final void xorpd(Register dst, Register src) {
SSEOp.XOR.emit(this, PD, dst, src);
}
@@ -3045,7 +3109,7 @@
emitLong(imm64);
int nextInsnPos = position();
if (annotateImm && codePatchingAnnotationConsumer != null) {
- codePatchingAnnotationConsumer.accept(new ImmediateOperandAnnotation(insnPos, immPos, nextInsnPos - immPos, nextInsnPos));
+ codePatchingAnnotationConsumer.accept(new OperandDataAnnotation(insnPos, immPos, nextInsnPos - immPos, nextInsnPos));
}
}
@@ -3189,6 +3253,19 @@
emitModRM(5, dst);
}
+ public final void sarq(Register dst, int imm8) {
+ assert isShiftCount(imm8 >> 1) : "illegal shift count";
+ prefixq(dst);
+ if (imm8 == 1) {
+ emitByte(0xD1);
+ emitModRM(7, dst);
+ } else {
+ emitByte(0xC1);
+ emitModRM(7, dst);
+ emitByte(imm8);
+ }
+ }
+
public final void sbbq(Register dst, Register src) {
SBB.rmOp.emit(this, QWORD, dst, src);
}
--- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.asm.amd64/src/org/graalvm/compiler/asm/amd64/AMD64BaseAssembler.java Tue Mar 12 09:49:10 2019 +0000
+++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.asm.amd64/src/org/graalvm/compiler/asm/amd64/AMD64BaseAssembler.java Sat Mar 16 21:00:45 2019 +0000
@@ -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
@@ -210,7 +210,7 @@
}
}
- public abstract static class OperandDataAnnotation extends CodeAnnotation {
+ public static class OperandDataAnnotation extends CodeAnnotation {
/**
* The position (bytes from the beginning of the method) of the operand.
*/
@@ -239,30 +239,10 @@
}
}
- /**
- * Annotation that stores additional information about the displacement of a
- * {@link Assembler#getPlaceholder placeholder address} that needs patching.
- */
- protected static class AddressDisplacementAnnotation extends OperandDataAnnotation {
- AddressDisplacementAnnotation(int instructionPosition, int operandPosition, int operandSize, int nextInstructionPosition) {
- super(instructionPosition, operandPosition, operandSize, nextInstructionPosition);
- }
- }
-
- /**
- * Annotation that stores additional information about the immediate operand, e.g., of a call
- * instruction, that needs patching.
- */
- protected static class ImmediateOperandAnnotation extends OperandDataAnnotation {
- ImmediateOperandAnnotation(int instructionPosition, int operandPosition, int operandSize, int nextInstructionPosition) {
- super(instructionPosition, operandPosition, operandSize, nextInstructionPosition);
- }
- }
-
protected void annotatePatchingImmediate(int operandOffset, int operandSize) {
if (codePatchingAnnotationConsumer != null) {
int pos = position();
- codePatchingAnnotationConsumer.accept(new ImmediateOperandAnnotation(pos, pos + operandOffset, operandSize, pos + operandOffset + operandSize));
+ codePatchingAnnotationConsumer.accept(new OperandDataAnnotation(pos, pos + operandOffset, operandSize, pos + operandOffset + operandSize));
}
}
@@ -581,7 +561,7 @@
assert index.equals(Register.None) : "cannot use RIP relative addressing with index register";
emitByte(0x05 | regenc);
if (codePatchingAnnotationConsumer != null && addr.instructionStartPosition >= 0) {
- codePatchingAnnotationConsumer.accept(new AddressDisplacementAnnotation(addr.instructionStartPosition, position(), 4, position() + 4 + additionalInstructionSize));
+ codePatchingAnnotationConsumer.accept(new OperandDataAnnotation(addr.instructionStartPosition, position(), 4, position() + 4 + additionalInstructionSize));
}
emitInt(disp);
} else if (base.isValid()) {
--- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.asm.sparc/src/org/graalvm/compiler/asm/sparc/SPARCAssembler.java Tue Mar 12 09:49:10 2019 +0000
+++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.asm.sparc/src/org/graalvm/compiler/asm/sparc/SPARCAssembler.java Sat Mar 16 21:00:45 2019 +0000
@@ -136,9 +136,9 @@
import java.util.Map;
import org.graalvm.compiler.asm.Assembler;
+import org.graalvm.compiler.asm.BranchTargetOutOfBoundsException;
import org.graalvm.compiler.asm.Label;
import org.graalvm.compiler.core.common.NumUtil;
-import org.graalvm.compiler.core.common.PermanentBailoutException;
import org.graalvm.compiler.debug.GraalError;
import jdk.vm.ci.code.Register;
@@ -1281,7 +1281,7 @@
public int setDisp(int inst, int d) {
assert this.match(inst);
if (!isValidDisp(d)) {
- throw new PermanentBailoutException("Too large displacement 0x%x in field %s in instruction %s", d, this.disp, this);
+ throw new BranchTargetOutOfBoundsException(true, "Too large displacement 0x%x in field %s in instruction %s", d, this.disp, this);
}
return this.disp.setBits(inst, d);
}
--- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.asm.test/src/org/graalvm/compiler/asm/test/AssemblerTest.java Tue Mar 12 09:49:10 2019 +0000
+++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.asm.test/src/org/graalvm/compiler/asm/test/AssemblerTest.java Sat Mar 16 21:00:45 2019 +0000
@@ -32,6 +32,7 @@
import org.graalvm.compiler.code.CompilationResult;
import org.graalvm.compiler.code.DisassemblerProvider;
import org.graalvm.compiler.core.common.CompilationIdentifier;
+import org.graalvm.compiler.core.gen.LIRGenerationProvider;
import org.graalvm.compiler.core.target.Backend;
import org.graalvm.compiler.debug.DebugContext;
import org.graalvm.compiler.nodes.StructuredGraph;
@@ -90,7 +91,7 @@
RegisterConfig registerConfig = codeCache.getRegisterConfig();
CompilationIdentifier compilationId = backend.getCompilationIdentifier(method);
StructuredGraph graph = new StructuredGraph.Builder(options, debug).method(method).compilationId(compilationId).build();
- CallingConvention cc = backend.newLIRGenerationResult(compilationId, null, null, graph, null).getCallingConvention();
+ CallingConvention cc = ((LIRGenerationProvider) backend).newLIRGenerationResult(compilationId, null, null, graph, null).getCallingConvention();
CompilationResult compResult = new CompilationResult(graph.compilationId());
byte[] targetCode = test.generateCode(compResult, codeCache.getTarget(), registerConfig, cc);
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.asm/src/org/graalvm/compiler/asm/BranchTargetOutOfBoundsException.java Sat Mar 16 21:00:45 2019 +0000
@@ -0,0 +1,44 @@
+/*
+ * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved.
+ * 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.
+ */
+
+
+package org.graalvm.compiler.asm;
+
+import org.graalvm.compiler.core.common.GraalBailoutException;
+
+@SuppressWarnings("serial")
+public class BranchTargetOutOfBoundsException extends GraalBailoutException {
+
+ public BranchTargetOutOfBoundsException(boolean permanent, String format, Object... args) {
+ super(permanent, format, args);
+ }
+
+ public BranchTargetOutOfBoundsException(String format, Object... args) {
+ super(format, args);
+ }
+
+ public BranchTargetOutOfBoundsException(Throwable cause, String format, Object... args) {
+ super(cause, format, args);
+ }
+
+}
--- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.code/src/org/graalvm/compiler/code/CompilationResult.java Tue Mar 12 09:49:10 2019 +0000
+++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.code/src/org/graalvm/compiler/code/CompilationResult.java Sat Mar 16 21:00:45 2019 +0000
@@ -55,6 +55,7 @@
import jdk.vm.ci.meta.InvokeTarget;
import jdk.vm.ci.meta.ResolvedJavaField;
import jdk.vm.ci.meta.ResolvedJavaMethod;
+import jdk.vm.ci.meta.SpeculationLog;
/**
* Represents the output from compiling a method, including the compiled machine code, associated
@@ -221,6 +222,11 @@
private ResolvedJavaMethod[] methods;
/**
+ * The {@link SpeculationLog} log used during compilation.
+ */
+ private SpeculationLog speculationLog;
+
+ /**
* The list of fields that were accessed from the bytecodes.
*/
private ResolvedJavaField[] fields;
@@ -373,6 +379,21 @@
}
/**
+ * Sets the {@link SpeculationLog} log used during compilation.
+ */
+ public void setSpeculationLog(SpeculationLog speculationLog) {
+ checkOpen();
+ this.speculationLog = speculationLog;
+ }
+
+ /**
+ * Gets the {@link SpeculationLog} log, if any, used during compilation.
+ */
+ public SpeculationLog getSpeculationLog() {
+ return speculationLog;
+ }
+
+ /**
* Sets the fields that were referenced from the bytecodes that were used as input to the
* compilation.
*
@@ -615,7 +636,7 @@
/**
* @return the code annotations or {@code null} if there are none
*/
- public List<CodeAnnotation> getAnnotations() {
+ public List<CodeAnnotation> getCodeAnnotations() {
if (annotations == null) {
return Collections.emptyList();
}
@@ -706,7 +727,8 @@
* Clears the information in this object pertaining to generating code. That is, the
* {@linkplain #getMarks() marks}, {@linkplain #getInfopoints() infopoints},
* {@linkplain #getExceptionHandlers() exception handlers}, {@linkplain #getDataPatches() data
- * patches} and {@linkplain #getAnnotations() annotations} recorded in this object are cleared.
+ * patches} and {@linkplain #getCodeAnnotations() annotations} recorded in this object are
+ * cleared.
*/
public void resetForEmittingCode() {
checkOpen();
@@ -721,6 +743,14 @@
}
}
+ public void clearInfopoints() {
+ infopoints.clear();
+ }
+
+ public void clearExceptionHandlers() {
+ exceptionHandlers.clear();
+ }
+
private void checkOpen() {
if (closed) {
throw new IllegalStateException();
--- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.code/src/org/graalvm/compiler/code/HexCodeFileDisassemblerProvider.java Tue Mar 12 09:49:10 2019 +0000
+++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.code/src/org/graalvm/compiler/code/HexCodeFileDisassemblerProvider.java Sat Mar 16 21:00:45 2019 +0000
@@ -78,7 +78,7 @@
long start = installedCode == null ? 0L : installedCode.getStart();
HexCodeFile hcf = new HexCodeFile(code, start, target.arch.getName(), target.wordSize * 8);
if (compResult != null) {
- HexCodeFile.addAnnotations(hcf, compResult.getAnnotations());
+ HexCodeFile.addAnnotations(hcf, compResult.getCodeAnnotations());
addExceptionHandlersComment(compResult, hcf);
Register fp = regConfig.getFrameRegister();
RefMapFormatter slotFormatter = new DefaultRefMapFormatter(target.wordSize, fp, 0);
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.aarch64.test/src/org/graalvm/compiler/core/aarch64/test/AArch64CbzTest.java Sat Mar 16 21:00:45 2019 +0000
@@ -0,0 +1,127 @@
+/*
+ * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, Arm Limited. All rights reserved.
+ * 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.
+ */
+
+
+
+package org.graalvm.compiler.core.aarch64.test;
+
+import org.graalvm.compiler.lir.LIRInstruction;
+import org.graalvm.compiler.lir.aarch64.AArch64ControlFlow;
+import org.junit.Test;
+
+import java.util.function.Predicate;
+
+public class AArch64CbzTest extends AArch64MatchRuleTest {
+ private static final Predicate<LIRInstruction> predicate = op -> (op instanceof AArch64ControlFlow.CompareBranchZeroOp);
+
+ public static int equalsTo(int x) {
+ if (x == 0) {
+ return 1;
+ } else {
+ return x - 1;
+ }
+ }
+
+ public static int notEqualsTo(int x) {
+ if (x != 0) {
+ return x + 2;
+ } else {
+ return 3;
+ }
+ }
+
+ public static String isNull(String s) {
+ if (s == null) {
+ return "abc";
+ } else {
+ return s + "abc";
+ }
+ }
+
+ public static String isNotNull(String s) {
+ if (s != null) {
+ return s + "abc";
+ } else {
+ return "abc";
+ }
+ }
+
+ public static String objectEqualsNull(String s1, String s2) {
+ if (s1.equals(null)) {
+ return s1 + "abc";
+ } else {
+ return s2 + "abd";
+ }
+ }
+
+ public static String objectEquals(String s1, String s2) {
+ if (s1.equals(s2)) {
+ return s1 + "abc";
+ } else {
+ return s2 + "abd";
+ }
+ }
+
+ @Test
+ public void testEqualsTo() {
+ test("equalsTo", 0);
+ test("equalsTo", 1);
+ checkLIR("equalsTo", predicate, 1);
+ }
+
+ @Test
+ public void testNotEqualsTo() {
+ test("notEqualsTo", 0);
+ test("notEqualsTo", 1);
+ checkLIR("notEqualsTo", predicate, 1);
+ }
+
+ @Test
+ public void testIsNull() {
+ test("isNull", new Object[]{null});
+ test("isNull", "abc");
+ checkLIR("isNull", predicate, 1);
+ }
+
+ @Test
+ public void testIsNotNull() {
+ test("isNotNull", new Object[]{null});
+ test("isNotNull", "abc");
+ checkLIR("isNotNull", predicate, 1);
+ }
+
+ @Test
+ public void testObjectEqualsNull() {
+ test("objectEqualsNull", "ab", "ac");
+ test("objectEqualsNull", "abc", "abc");
+ checkLIR("objectEqualsNull", predicate, 1);
+ }
+
+ @Test
+ public void testObjectEquals() {
+ test("objectEquals", "ab", "ac");
+ test("objectEquals", "abc", "abc");
+ checkLIR("objectEquals", predicate, 0);
+ }
+}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.aarch64.test/src/org/graalvm/compiler/core/aarch64/test/AArch64MembarOpTest.java Sat Mar 16 21:00:45 2019 +0000
@@ -0,0 +1,130 @@
+/*
+ * Copyright (c) 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2019, Arm Limited. All rights reserved.
+ * 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.
+ */
+
+
+package org.graalvm.compiler.core.aarch64.test;
+
+import static org.junit.Assert.assertArrayEquals;
+import static org.junit.Assume.assumeTrue;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import jdk.internal.vm.compiler.collections.Pair;
+import org.graalvm.compiler.asm.aarch64.AArch64Assembler.BarrierKind;
+import org.graalvm.compiler.asm.aarch64.AArch64MacroAssembler;
+import org.graalvm.compiler.code.CompilationResult;
+import org.graalvm.compiler.core.gen.LIRGenerationProvider;
+import org.graalvm.compiler.core.test.backend.BackendTest;
+import org.graalvm.compiler.lir.aarch64.AArch64Move.MembarOp;
+import org.graalvm.compiler.lir.asm.CompilationResultBuilder;
+import org.graalvm.compiler.lir.asm.CompilationResultBuilderFactory;
+import org.graalvm.compiler.lir.gen.LIRGenerationResult;
+import org.graalvm.compiler.nodes.StructuredGraph;
+import org.junit.Before;
+import org.junit.Test;
+
+import jdk.vm.ci.aarch64.AArch64;
+import jdk.vm.ci.code.MemoryBarriers;
+import jdk.vm.ci.runtime.JVMCI;
+import jdk.vm.ci.runtime.JVMCIBackend;
+
+public class AArch64MembarOpTest extends BackendTest {
+
+ private final JVMCIBackend providers;
+ private final CompilationResultBuilder crb;
+
+ public AArch64MembarOpTest() {
+ this.providers = JVMCI.getRuntime().getHostJVMCIBackend();
+
+ final StructuredGraph graph = parseEager("stub", StructuredGraph.AllowAssumptions.YES);
+ LIRGenerationResult lirGenRes = getLIRGenerationResult(graph);
+ CompilationResult compResult = new CompilationResult(graph.compilationId());
+ this.crb = ((LIRGenerationProvider) getBackend()).newCompilationResultBuilder(lirGenRes, lirGenRes.getFrameMap(), compResult, CompilationResultBuilderFactory.Default);
+ }
+
+ public void stub() {
+ }
+
+ @Before
+ public void checkAArch64() {
+ assumeTrue("skipping AArch64 specific test", JVMCI.getRuntime().getHostJVMCIBackend().getTarget().arch instanceof AArch64);
+ }
+
+ @Test
+ public void runNormalMembarTests() {
+ List<Pair<Integer, BarrierKind>> cases = new ArrayList<>();
+ cases.add(Pair.create(MemoryBarriers.LOAD_LOAD, BarrierKind.LOAD_LOAD));
+ cases.add(Pair.create(MemoryBarriers.LOAD_STORE, BarrierKind.LOAD_LOAD));
+ cases.add(Pair.create(MemoryBarriers.LOAD_LOAD | MemoryBarriers.LOAD_STORE, BarrierKind.LOAD_LOAD));
+ cases.add(Pair.create(MemoryBarriers.STORE_LOAD, BarrierKind.ANY_ANY));
+ cases.add(Pair.create(MemoryBarriers.STORE_LOAD | MemoryBarriers.LOAD_LOAD, BarrierKind.ANY_ANY));
+ cases.add(Pair.create(MemoryBarriers.STORE_LOAD | MemoryBarriers.LOAD_STORE, BarrierKind.ANY_ANY));
+ cases.add(Pair.create(MemoryBarriers.STORE_LOAD | MemoryBarriers.LOAD_LOAD | MemoryBarriers.LOAD_STORE, BarrierKind.ANY_ANY));
+ cases.add(Pair.create(MemoryBarriers.STORE_STORE, BarrierKind.STORE_STORE));
+ cases.add(Pair.create(MemoryBarriers.STORE_STORE | MemoryBarriers.LOAD_LOAD, BarrierKind.ANY_ANY));
+ cases.add(Pair.create(MemoryBarriers.STORE_STORE | MemoryBarriers.LOAD_STORE, BarrierKind.ANY_ANY));
+ cases.add(Pair.create(MemoryBarriers.STORE_STORE | MemoryBarriers.LOAD_LOAD | MemoryBarriers.LOAD_STORE, BarrierKind.ANY_ANY));
+ cases.add(Pair.create(MemoryBarriers.STORE_STORE | MemoryBarriers.STORE_LOAD, BarrierKind.ANY_ANY));
+ cases.add(Pair.create(MemoryBarriers.STORE_STORE | MemoryBarriers.STORE_LOAD | MemoryBarriers.LOAD_LOAD, BarrierKind.ANY_ANY));
+ cases.add(Pair.create(MemoryBarriers.STORE_STORE | MemoryBarriers.STORE_LOAD | MemoryBarriers.LOAD_STORE, BarrierKind.ANY_ANY));
+ cases.add(Pair.create(MemoryBarriers.STORE_STORE | MemoryBarriers.STORE_LOAD | MemoryBarriers.LOAD_STORE | MemoryBarriers.LOAD_LOAD, BarrierKind.ANY_ANY));
+
+ for (Pair<Integer, BarrierKind> c : cases) {
+ assertArrayEquals(new MembarOpActual(c.getLeft()).emit(new AArch64MacroAssembler(providers.getTarget())),
+ new MembarOpExpected(c.getRight()).emit(new AArch64MacroAssembler(providers.getTarget())));
+ }
+ }
+
+ @Test(expected = AssertionError.class)
+ public void runExceptionalTests() {
+ new MembarOpActual(16).emit(new AArch64MacroAssembler(providers.getTarget()));
+ }
+
+ private class MembarOpActual {
+ private MembarOp op;
+
+ MembarOpActual(int barriers) {
+ op = new MembarOp(barriers);
+ }
+
+ byte[] emit(AArch64MacroAssembler masm) {
+ op.emitCode(crb, masm);
+ return masm.close(false);
+ }
+ }
+
+ private class MembarOpExpected {
+ private BarrierKind barrierKind;
+
+ MembarOpExpected(BarrierKind barrierKind) {
+ this.barrierKind = barrierKind;
+ }
+
+ byte[] emit(AArch64MacroAssembler masm) {
+ masm.dmb(barrierKind);
+ return masm.close(false);
+ }
+ }
+}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.aarch64.test/src/org/graalvm/compiler/core/aarch64/test/AArch64TestBitAndBranchTest.java Sat Mar 16 21:00:45 2019 +0000
@@ -0,0 +1,190 @@
+/*
+ * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved.
+ * 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.
+ */
+
+
+package org.graalvm.compiler.core.aarch64.test;
+
+import static org.junit.Assume.assumeTrue;
+
+import java.util.function.Predicate;
+
+import org.graalvm.compiler.api.directives.GraalDirectives;
+import org.graalvm.compiler.asm.aarch64.AArch64MacroAssembler;
+import org.graalvm.compiler.lir.LIR;
+import org.graalvm.compiler.lir.LIRInstruction;
+import org.graalvm.compiler.lir.LIRInstructionClass;
+import org.graalvm.compiler.lir.aarch64.AArch64ControlFlow;
+import org.graalvm.compiler.lir.aarch64.AArch64LIRInstruction;
+import org.graalvm.compiler.lir.asm.CompilationResultBuilder;
+import org.graalvm.compiler.lir.gen.LIRGenerationResult;
+import org.graalvm.compiler.lir.gen.LIRGeneratorTool;
+import org.graalvm.compiler.lir.jtt.LIRTest;
+import org.graalvm.compiler.lir.jtt.LIRTestSpecification;
+import org.graalvm.compiler.lir.phases.LIRPhase;
+import org.graalvm.compiler.lir.phases.LIRSuites;
+import org.graalvm.compiler.lir.phases.PreAllocationOptimizationPhase.PreAllocationOptimizationContext;
+import org.graalvm.compiler.options.OptionValues;
+import org.junit.Assert;
+import org.junit.Before;
+import org.junit.Test;
+
+import jdk.vm.ci.aarch64.AArch64;
+import jdk.vm.ci.code.TargetDescription;
+import jdk.vm.ci.meta.Value;
+
+public class AArch64TestBitAndBranchTest extends LIRTest {
+ private static final Predicate<LIRInstruction> checkForBitTestAndBranchOp = op -> (op instanceof AArch64ControlFlow.BitTestAndBranchOp);
+ private LIR lir;
+
+ @Before
+ public void checkAArch64() {
+ assumeTrue("skipping AArch64 specific test", getTarget().arch instanceof AArch64);
+ }
+
+ public static long testBit42Snippet(long a, long b, long c) {
+ if ((a & (1 << 42)) == 0) {
+ return b;
+ } else {
+ return c;
+ }
+ }
+
+ @Test
+ public void testBit42() {
+ test("testBit42Snippet", 1L << 42L, Long.MAX_VALUE, Long.MIN_VALUE);
+ test("testBit42Snippet", ~(1L << 42L), Long.MAX_VALUE, Long.MIN_VALUE);
+ checkLIR("testBit42Snippet", checkForBitTestAndBranchOp, 1);
+ }
+
+ private static final LargeOpSpec largeOpSingleNop = new LargeOpSpec((1 << 14 - 2), 2);
+
+ /**
+ * Tests the graceful case, where the estimation for
+ * {@link CompilationResultBuilder#labelWithinRange(LIRInstruction, org.graalvm.compiler.asm.Label, int)}
+ * holds.
+ */
+ public static int testBitTestAndBranchSingleSnippet(int a) {
+ int res;
+ if (a % 2 == 0) {
+ res = fillOps(largeOpSingleNop, 1);
+ } else {
+ res = fillOps(largeOpSingleNop, 2);
+ }
+ return GraalDirectives.opaque(res);
+ }
+
+ @Test
+ public void testBitTestAndBranchSingle() {
+ runTest("testBitTestAndBranchSingleSnippet", 1);
+ checkLIR("testBitTestAndBranchSingleSnippet", checkForBitTestAndBranchOp, 1);
+ }
+
+ private static final LargeOpSpec largeOpFourNop = new LargeOpSpec((1 << 14 - 2), 8);
+
+ /**
+ * Tests the case, where the estimation for
+ * {@link CompilationResultBuilder#labelWithinRange(LIRInstruction, org.graalvm.compiler.asm.Label, int)}
+ * does not hold and the code generation must be redone with large branches.
+ */
+ public static int testBitTestAndBranchFourSnippet(int a) {
+ int res;
+ if (a % 2 == 0) {
+ res = fillOps(largeOpFourNop, 1);
+ } else {
+ res = fillOps(largeOpFourNop, 2);
+ }
+ return GraalDirectives.opaque(res);
+ }
+
+ @Test
+ public void testBitTestAndBranchFour() {
+ runTest("testBitTestAndBranchFourSnippet", 1);
+ checkLIR("testBitTestAndBranchFourSnippet", checkForBitTestAndBranchOp, 1);
+ }
+
+ private static class LargeOpSpec extends LIRTestSpecification {
+ private final int n;
+ private final int nopCount;
+
+ LargeOpSpec(int n, int nopCount) {
+ super();
+ this.n = n;
+ this.nopCount = nopCount;
+ }
+
+ @Override
+ public void generate(LIRGeneratorTool gen, Value a) {
+ for (int i = 0; i < n; i++) {
+ gen.append(new NoOp(nopCount));
+ }
+ setResult(a);
+ }
+ }
+
+ public static class NoOp extends AArch64LIRInstruction {
+ private static final LIRInstructionClass<NoOp> TYPE = LIRInstructionClass.create(NoOp.class);
+ private final int nopCount;
+
+ public NoOp(int nopCount) {
+ super(TYPE);
+ this.nopCount = nopCount;
+ }
+
+ @Override
+ protected void emitCode(CompilationResultBuilder crb, AArch64MacroAssembler masm) {
+ for (int i = 0; i < nopCount; i++) {
+ masm.nop();
+ }
+ }
+ }
+
+ @LIRIntrinsic
+ public static int fillOps(@SuppressWarnings("unused") LargeOpSpec s, int a) {
+ return a;
+ }
+
+ @Override
+ protected LIRSuites createLIRSuites(OptionValues options) {
+ LIRSuites suites = super.createLIRSuites(options);
+ suites.getPreAllocationOptimizationStage().appendPhase(new CheckPhase());
+ return suites;
+ }
+
+ public class CheckPhase extends LIRPhase<PreAllocationOptimizationContext> {
+ @Override
+ protected void run(TargetDescription target, LIRGenerationResult lirGenRes, PreAllocationOptimizationContext context) {
+ lir = lirGenRes.getLIR();
+ }
+ }
+
+ protected void checkLIR(String methodName, Predicate<LIRInstruction> predicate, int expected) {
+ compile(getResolvedJavaMethod(methodName), null);
+ int actualOpNum = 0;
+ for (LIRInstruction ins : lir.getLIRforBlock(lir.codeEmittingOrder()[0])) {
+ if (predicate.test(ins)) {
+ actualOpNum++;
+ }
+ }
+ Assert.assertEquals(expected, actualOpNum);
+ }
+}
--- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.aarch64/src/org/graalvm/compiler/core/aarch64/AArch64ArithmeticLIRGenerator.java Tue Mar 12 09:49:10 2019 +0000
+++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.aarch64/src/org/graalvm/compiler/core/aarch64/AArch64ArithmeticLIRGenerator.java Sat Mar 16 21:00:45 2019 +0000
@@ -485,26 +485,6 @@
}
@Override
- public Value emitMathLog(Value input, boolean base10) {
- throw GraalError.unimplemented();
- }
-
- @Override
- public Value emitMathCos(Value input) {
- throw GraalError.unimplemented();
- }
-
- @Override
- public Value emitMathSin(Value input) {
- throw GraalError.unimplemented();
- }
-
- @Override
- public Value emitMathTan(Value input) {
- throw GraalError.unimplemented();
- }
-
- @Override
public void emitCompareOp(AArch64Kind cmpKind, Variable left, Value right) {
throw GraalError.unimplemented();
}
--- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.aarch64/src/org/graalvm/compiler/core/aarch64/AArch64LIRGenerator.java Tue Mar 12 09:49:10 2019 +0000
+++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.aarch64/src/org/graalvm/compiler/core/aarch64/AArch64LIRGenerator.java Sat Mar 16 21:00:45 2019 +0000
@@ -52,6 +52,7 @@
import org.graalvm.compiler.lir.aarch64.AArch64Compare;
import org.graalvm.compiler.lir.aarch64.AArch64ControlFlow;
import org.graalvm.compiler.lir.aarch64.AArch64ControlFlow.BranchOp;
+import org.graalvm.compiler.lir.aarch64.AArch64ControlFlow.CompareBranchZeroOp;
import org.graalvm.compiler.lir.aarch64.AArch64ControlFlow.CondMoveOp;
import org.graalvm.compiler.lir.aarch64.AArch64ControlFlow.CondSetOp;
import org.graalvm.compiler.lir.aarch64.AArch64ControlFlow.StrategySwitchOp;
@@ -257,6 +258,27 @@
@Override
public void emitCompareBranch(PlatformKind cmpKind, Value left, Value right, Condition cond, boolean unorderedIsTrue, LabelRef trueDestination, LabelRef falseDestination,
double trueDestinationProbability) {
+ if (cond == Condition.EQ) {
+ // emit cbz instruction for IsNullNode.
+ assert !LIRValueUtil.isNullConstant(left) : "emitNullCheckBranch()'s null input should be in right.";
+ if (LIRValueUtil.isNullConstant(right)) {
+ append(new CompareBranchZeroOp(asAllocatable(left), trueDestination, falseDestination, trueDestinationProbability));
+ return;
+ }
+
+ // emit cbz instruction for IntegerEquals when any of the inputs is zero.
+ AArch64Kind kind = (AArch64Kind) cmpKind;
+ if (kind.isInteger()) {
+ if (isIntConstant(left, 0)) {
+ append(new CompareBranchZeroOp(asAllocatable(right), trueDestination, falseDestination, trueDestinationProbability));
+ return;
+ } else if (isIntConstant(right, 0)) {
+ append(new CompareBranchZeroOp(asAllocatable(left), trueDestination, falseDestination, trueDestinationProbability));
+ return;
+ }
+ }
+ }
+
boolean mirrored = emitCompare(cmpKind, left, right, cond, unorderedIsTrue);
Condition finalCondition = mirrored ? cond.mirror() : cond;
boolean finalUnorderedIsTrue = mirrored ? !unorderedIsTrue : unorderedIsTrue;
--- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.aarch64/src/org/graalvm/compiler/core/aarch64/AArch64NodeMatchRules.java Tue Mar 12 09:49:10 2019 +0000
+++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.aarch64/src/org/graalvm/compiler/core/aarch64/AArch64NodeMatchRules.java Sat Mar 16 21:00:45 2019 +0000
@@ -37,11 +37,14 @@
import org.graalvm.compiler.core.match.MatchRule;
import org.graalvm.compiler.graph.Node;
import org.graalvm.compiler.lir.LIRFrameState;
+import org.graalvm.compiler.lir.LabelRef;
import org.graalvm.compiler.lir.Variable;
import org.graalvm.compiler.lir.aarch64.AArch64ArithmeticOp;
+import org.graalvm.compiler.lir.aarch64.AArch64ControlFlow;
import org.graalvm.compiler.lir.gen.LIRGeneratorTool;
import org.graalvm.compiler.nodes.ConstantNode;
import org.graalvm.compiler.nodes.DeoptimizingNode;
+import org.graalvm.compiler.nodes.IfNode;
import org.graalvm.compiler.nodes.NodeView;
import org.graalvm.compiler.nodes.ValueNode;
import org.graalvm.compiler.nodes.calc.AddNode;
@@ -178,6 +181,28 @@
return builder -> getArithmeticLIRGenerator().emitMSub(operand(a), operand(b), operand(c));
}
+ /**
+ * ((x & (1 << n)) == 0) -> tbz/tbnz n label.
+ */
+ @MatchRule("(If (IntegerTest value Constant=a))")
+ public ComplexMatchResult testBitAndBranch(IfNode root, ValueNode value, ConstantNode a) {
+ if (value.getStackKind().isNumericInteger()) {
+ long constant = a.asJavaConstant().asLong();
+ if (Long.bitCount(constant) == 1) {
+ int bitToTest = Long.numberOfTrailingZeros(constant);
+ return builder -> {
+ LabelRef trueDestination = getLIRBlock(root.trueSuccessor());
+ LabelRef falseDestination = getLIRBlock(root.falseSuccessor());
+ AllocatableValue src = moveSp(gen.asAllocatable(operand(value)));
+ double trueDestinationProbability = root.getTrueSuccessorProbability();
+ gen.append(new AArch64ControlFlow.BitTestAndBranchOp(trueDestination, falseDestination, src, trueDestinationProbability, bitToTest));
+ return null;
+ };
+ }
+ }
+ return null;
+ }
+
@Override
public AArch64LIRGenerator getLIRGeneratorTool() {
return (AArch64LIRGenerator) gen;
--- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.amd64/src/org/graalvm/compiler/core/amd64/AMD64ArithmeticLIRGenerator.java Tue Mar 12 09:49:10 2019 +0000
+++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.amd64/src/org/graalvm/compiler/core/amd64/AMD64ArithmeticLIRGenerator.java Sat Mar 16 21:00:45 2019 +0000
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2009, 2018, 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
@@ -80,13 +80,6 @@
import static org.graalvm.compiler.lir.LIRValueUtil.isJavaConstant;
import static org.graalvm.compiler.lir.amd64.AMD64Arithmetic.DREM;
import static org.graalvm.compiler.lir.amd64.AMD64Arithmetic.FREM;
-import static org.graalvm.compiler.lir.amd64.AMD64MathIntrinsicBinaryOp.BinaryIntrinsicOpcode.POW;
-import static org.graalvm.compiler.lir.amd64.AMD64MathIntrinsicUnaryOp.UnaryIntrinsicOpcode.COS;
-import static org.graalvm.compiler.lir.amd64.AMD64MathIntrinsicUnaryOp.UnaryIntrinsicOpcode.EXP;
-import static org.graalvm.compiler.lir.amd64.AMD64MathIntrinsicUnaryOp.UnaryIntrinsicOpcode.LOG;
-import static org.graalvm.compiler.lir.amd64.AMD64MathIntrinsicUnaryOp.UnaryIntrinsicOpcode.LOG10;
-import static org.graalvm.compiler.lir.amd64.AMD64MathIntrinsicUnaryOp.UnaryIntrinsicOpcode.SIN;
-import static org.graalvm.compiler.lir.amd64.AMD64MathIntrinsicUnaryOp.UnaryIntrinsicOpcode.TAN;
import org.graalvm.compiler.asm.amd64.AMD64Assembler.AMD64BinaryArithmetic;
import org.graalvm.compiler.asm.amd64.AMD64Assembler.AMD64MIOp;
@@ -116,8 +109,13 @@
import org.graalvm.compiler.lir.amd64.AMD64Binary;
import org.graalvm.compiler.lir.amd64.AMD64BinaryConsumer;
import org.graalvm.compiler.lir.amd64.AMD64ClearRegisterOp;
-import org.graalvm.compiler.lir.amd64.AMD64MathIntrinsicBinaryOp;
-import org.graalvm.compiler.lir.amd64.AMD64MathIntrinsicUnaryOp;
+import org.graalvm.compiler.lir.amd64.AMD64MathCosOp;
+import org.graalvm.compiler.lir.amd64.AMD64MathExpOp;
+import org.graalvm.compiler.lir.amd64.AMD64MathLog10Op;
+import org.graalvm.compiler.lir.amd64.AMD64MathLogOp;
+import org.graalvm.compiler.lir.amd64.AMD64MathPowOp;
+import org.graalvm.compiler.lir.amd64.AMD64MathSinOp;
+import org.graalvm.compiler.lir.amd64.AMD64MathTanOp;
import org.graalvm.compiler.lir.amd64.AMD64Move;
import org.graalvm.compiler.lir.amd64.AMD64MulDivOp;
import org.graalvm.compiler.lir.amd64.AMD64ShiftOp;
@@ -127,7 +125,6 @@
import org.graalvm.compiler.lir.amd64.vector.AMD64VectorBinary.AVXBinaryOp;
import org.graalvm.compiler.lir.amd64.vector.AMD64VectorUnary;
import org.graalvm.compiler.lir.gen.ArithmeticLIRGenerator;
-import org.graalvm.compiler.lir.gen.LIRGenerator;
import jdk.vm.ci.amd64.AMD64;
import jdk.vm.ci.amd64.AMD64.CPUFeature;
@@ -152,41 +149,11 @@
private static final RegisterValue RCX_I = AMD64.rcx.asValue(LIRKind.value(AMD64Kind.DWORD));
- public AMD64ArithmeticLIRGenerator(AllocatableValue nullRegisterValue, Maths maths) {
+ public AMD64ArithmeticLIRGenerator(AllocatableValue nullRegisterValue) {
this.nullRegisterValue = nullRegisterValue;
- this.maths = maths == null ? new Maths() {
- } : maths;
}
private final AllocatableValue nullRegisterValue;
- private final Maths maths;
-
- /**
- * Interface for emitting LIR for selected {@link Math} routines. A {@code null} return value
- * for any method in this interface means the caller must emit the LIR itself.
- */
- public interface Maths {
-
- @SuppressWarnings("unused")
- default Variable emitLog(LIRGenerator gen, Value input, boolean base10) {
- return null;
- }
-
- @SuppressWarnings("unused")
- default Variable emitCos(LIRGenerator gen, Value input) {
- return null;
- }
-
- @SuppressWarnings("unused")
- default Variable emitSin(LIRGenerator gen, Value input) {
- return null;
- }
-
- @SuppressWarnings("unused")
- default Variable emitTan(LIRGenerator gen, Value input) {
- return null;
- }
- }
@Override
public Variable emitNegate(Value inputVal) {
@@ -781,6 +748,7 @@
}
}
+ @Override
public Variable emitRor(Value a, Value b) {
switch ((AMD64Kind) a.getPlatformKind()) {
case DWORD:
@@ -1103,65 +1071,36 @@
@Override
public Value emitMathLog(Value input, boolean base10) {
- LIRGenerator gen = getLIRGen();
- Variable result = maths.emitLog(gen, input, base10);
- if (result == null) {
- result = gen.newVariable(LIRKind.combine(input));
- AllocatableValue stackSlot = gen.getResult().getFrameMapBuilder().allocateSpillSlot(LIRKind.value(AMD64Kind.QWORD));
- gen.append(new AMD64MathIntrinsicUnaryOp(getAMD64LIRGen(), base10 ? LOG10 : LOG, result, asAllocatable(input), stackSlot));
+ if (base10) {
+ return new AMD64MathLog10Op().emitLIRWrapper(getLIRGen(), input);
+ } else {
+ return new AMD64MathLogOp().emitLIRWrapper(getLIRGen(), input);
}
- return result;
}
@Override
public Value emitMathCos(Value input) {
- LIRGenerator gen = getLIRGen();
- Variable result = maths.emitCos(gen, input);
- if (result == null) {
- result = gen.newVariable(LIRKind.combine(input));
- AllocatableValue stackSlot = gen.getResult().getFrameMapBuilder().allocateSpillSlot(LIRKind.value(AMD64Kind.QWORD));
- gen.append(new AMD64MathIntrinsicUnaryOp(getAMD64LIRGen(), COS, result, asAllocatable(input), stackSlot));
- }
- return result;
+ return new AMD64MathCosOp().emitLIRWrapper(getLIRGen(), input);
}
@Override
public Value emitMathSin(Value input) {
- LIRGenerator gen = getLIRGen();
- Variable result = maths.emitSin(gen, input);
- if (result == null) {
- result = gen.newVariable(LIRKind.combine(input));
- AllocatableValue stackSlot = gen.getResult().getFrameMapBuilder().allocateSpillSlot(LIRKind.value(AMD64Kind.QWORD));
- gen.append(new AMD64MathIntrinsicUnaryOp(getAMD64LIRGen(), SIN, result, asAllocatable(input), stackSlot));
- }
- return result;
+ return new AMD64MathSinOp().emitLIRWrapper(getLIRGen(), input);
}
@Override
public Value emitMathTan(Value input) {
- LIRGenerator gen = getLIRGen();
- Variable result = maths.emitTan(gen, input);
- if (result == null) {
- result = gen.newVariable(LIRKind.combine(input));
- AllocatableValue stackSlot = gen.getResult().getFrameMapBuilder().allocateSpillSlot(LIRKind.value(AMD64Kind.QWORD));
- gen.append(new AMD64MathIntrinsicUnaryOp(getAMD64LIRGen(), TAN, result, asAllocatable(input), stackSlot));
- }
- return result;
+ return new AMD64MathTanOp().emitLIRWrapper(getLIRGen(), input);
}
@Override
public Value emitMathExp(Value input) {
- Variable result = getLIRGen().newVariable(LIRKind.combine(input));
- AllocatableValue stackSlot = getLIRGen().getResult().getFrameMapBuilder().allocateSpillSlot(LIRKind.value(AMD64Kind.QWORD));
- getLIRGen().append(new AMD64MathIntrinsicUnaryOp(getAMD64LIRGen(), EXP, result, asAllocatable(input), stackSlot));
- return result;
+ return new AMD64MathExpOp().emitLIRWrapper(getLIRGen(), input);
}
@Override
- public Value emitMathPow(Value input1, Value input2) {
- Variable result = getLIRGen().newVariable(LIRKind.combine(input1));
- getLIRGen().append(new AMD64MathIntrinsicBinaryOp(getAMD64LIRGen(), POW, result, asAllocatable(input1), asAllocatable(input2)));
- return result;
+ public Value emitMathPow(Value x, Value y) {
+ return new AMD64MathPowOp().emitLIRWrapper(getLIRGen(), x, y);
}
protected AMD64LIRGenerator getAMD64LIRGen() {
--- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.amd64/src/org/graalvm/compiler/core/amd64/AMD64LIRGenerator.java Tue Mar 12 09:49:10 2019 +0000
+++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.amd64/src/org/graalvm/compiler/core/amd64/AMD64LIRGenerator.java Sat Mar 16 21:00:45 2019 +0000
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2009, 2018, 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
@@ -41,6 +41,8 @@
import static org.graalvm.compiler.lir.LIRValueUtil.isIntConstant;
import static org.graalvm.compiler.lir.LIRValueUtil.isJavaConstant;
+import java.util.Optional;
+
import org.graalvm.compiler.asm.amd64.AMD64Assembler.AMD64BinaryArithmetic;
import org.graalvm.compiler.asm.amd64.AMD64Assembler.AMD64MIOp;
import org.graalvm.compiler.asm.amd64.AMD64Assembler.AMD64RMOp;
@@ -81,6 +83,7 @@
import org.graalvm.compiler.lir.amd64.AMD64ControlFlow.ReturnOp;
import org.graalvm.compiler.lir.amd64.AMD64ControlFlow.StrategySwitchOp;
import org.graalvm.compiler.lir.amd64.AMD64ControlFlow.TableSwitchOp;
+import org.graalvm.compiler.lir.amd64.AMD64ControlFlow.HashTableSwitchOp;
import org.graalvm.compiler.lir.amd64.AMD64LFenceOp;
import org.graalvm.compiler.lir.amd64.AMD64Move;
import org.graalvm.compiler.lir.amd64.AMD64Move.CompareAndSwapOp;
@@ -93,6 +96,7 @@
import org.graalvm.compiler.lir.amd64.AMD64ZapStackOp;
import org.graalvm.compiler.lir.gen.LIRGenerationResult;
import org.graalvm.compiler.lir.gen.LIRGenerator;
+import org.graalvm.compiler.lir.hashing.Hasher;
import org.graalvm.compiler.phases.util.Providers;
import jdk.vm.ci.amd64.AMD64;
@@ -545,7 +549,14 @@
@Override
public Variable emitArrayEquals(JavaKind kind, Value array1, Value array2, Value length, int constantLength, boolean directPointers) {
Variable result = newVariable(LIRKind.value(AMD64Kind.DWORD));
- append(new AMD64ArrayEqualsOp(this, kind, result, array1, array2, asAllocatable(length), constantLength, directPointers, getMaxVectorSize()));
+ append(new AMD64ArrayEqualsOp(this, kind, kind, result, array1, array2, asAllocatable(length), constantLength, directPointers, getMaxVectorSize()));
+ return result;
+ }
+
+ @Override
+ public Variable emitArrayEquals(JavaKind kind1, JavaKind kind2, Value array1, Value array2, Value length, int constantLength, boolean directPointers) {
+ Variable result = newVariable(LIRKind.value(AMD64Kind.DWORD));
+ append(new AMD64ArrayEqualsOp(this, kind1, kind2, result, array1, array2, asAllocatable(length), constantLength, directPointers, getMaxVectorSize()));
return result;
}
@@ -635,6 +646,19 @@
}
@Override
+ protected Optional<Hasher> hasherFor(JavaConstant[] keyConstants, double minDensity) {
+ return Hasher.forKeys(keyConstants, minDensity);
+ }
+
+ @Override
+ protected void emitHashTableSwitch(Hasher hasher, JavaConstant[] keys, LabelRef defaultTarget, LabelRef[] targets, Value value) {
+ Value index = hasher.hash(value, arithmeticLIRGen);
+ Variable scratch = newVariable(LIRKind.value(target().arch.getWordKind()));
+ Variable entryScratch = newVariable(LIRKind.value(target().arch.getWordKind()));
+ append(new HashTableSwitchOp(keys, defaultTarget, targets, value, index, scratch, entryScratch));
+ }
+
+ @Override
public void emitPause() {
append(new AMD64PauseOp());
}
--- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.common/src/org/graalvm/compiler/core/common/GraalOptions.java Tue Mar 12 09:49:10 2019 +0000
+++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.common/src/org/graalvm/compiler/core/common/GraalOptions.java Sat Mar 16 21:00:45 2019 +0000
@@ -83,8 +83,8 @@
@Option(help = "", type = OptionType.Debug)
public static final OptionKey<String> EscapeAnalyzeOnly = new OptionKey<>(null);
- @Option(help = "", type = OptionType.Expert)
- public static final OptionKey<Integer> MaximumEscapeAnalysisArrayLength = new OptionKey<>(32);
+ @Option(help = "The maximum length of an array that will be escape analyzed.", type = OptionType.Expert)
+ public static final OptionKey<Integer> MaximumEscapeAnalysisArrayLength = new OptionKey<>(128);
@Option(help = "", type = OptionType.Debug)
public static final OptionKey<Boolean> PEAInliningHints = new OptionKey<>(false);
@@ -142,7 +142,7 @@
public static final OptionKey<Boolean> VerifyPhases = new OptionKey<>(false);
// Debug settings:
- @Option(help = "", type = OptionType.Debug)
+ @Option(help = "Start tracing compiled GC barriers after N garbage collections (disabled if N <= 0).", type = OptionType.Debug)
public static final OptionKey<Integer> GCDebugStartCycle = new OptionKey<>(-1);
@Option(help = "Perform platform dependent validation of the Java heap at returns", type = OptionType.Debug)
@@ -206,9 +206,6 @@
@Option(help = "Generate position independent code", type = OptionType.Expert)
public static final OptionKey<Boolean> GeneratePIC = new OptionKey<>(false);
- @Option(help = "", type = OptionType.Expert)
- public static final OptionKey<Boolean> CallArrayCopy = new OptionKey<>(true);
-
// Runtime settings
@Option(help = "", type = OptionType.Expert)
public static final OptionKey<Boolean> SupportJsrBytecodes = new OptionKey<>(true);
--- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.common/src/org/graalvm/compiler/core/common/SpeculativeExecutionAttacksMitigations.java Tue Mar 12 09:49:10 2019 +0000
+++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.common/src/org/graalvm/compiler/core/common/SpeculativeExecutionAttacksMitigations.java Sat Mar 16 21:00:45 2019 +0000
@@ -37,9 +37,9 @@
public static class Options {
// @formatter:off
- @Option(help = "Select a strategy to mitigate speculative execution attacks (e.g., SPECTRE)", type = OptionType.User)
+ @Option(help = "file:doc-files/MitigateSpeculativeExecutionAttacksHelp.txt")
public static final EnumOptionKey<SpeculativeExecutionAttacksMitigations> MitigateSpeculativeExecutionAttacks = new EnumOptionKey<>(None);
- @Option(help = "Use index masking after bounds check to mitigate speculative execution attacks", type = OptionType.User)
+ @Option(help = "Use index masking after bounds check to mitigate speculative execution attacks.", type = OptionType.User)
public static final OptionKey<Boolean> UseIndexMasking = new OptionKey<>(false);
// @formatter:on
}
--- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.common/src/org/graalvm/compiler/core/common/cfg/AbstractBlockBase.java Tue Mar 12 09:49:10 2019 +0000
+++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.common/src/org/graalvm/compiler/core/common/cfg/AbstractBlockBase.java Sat Mar 16 21:00:45 2019 +0000
@@ -24,6 +24,8 @@
package org.graalvm.compiler.core.common.cfg;
+import java.util.Comparator;
+
public abstract class AbstractBlockBase<T extends AbstractBlockBase<T>> {
protected int id;
@@ -171,4 +173,13 @@
public int hashCode() {
return id;
}
+
+ public static class BlockIdComparator implements Comparator<AbstractBlockBase<?>> {
+ @Override
+ public int compare(AbstractBlockBase<?> o1, AbstractBlockBase<?> o2) {
+ return Integer.compare(o1.getId(), o2.getId());
+ }
+ }
+
+ public static final BlockIdComparator BLOCK_ID_COMPARATOR = new BlockIdComparator();
}
--- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.common/src/org/graalvm/compiler/core/common/cfg/CFGVerifier.java Tue Mar 12 09:49:10 2019 +0000
+++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.common/src/org/graalvm/compiler/core/common/cfg/CFGVerifier.java Sat Mar 16 21:00:45 2019 +0000
@@ -121,7 +121,7 @@
}
}
- for (T block : loop.getExits()) {
+ for (T block : loop.getLoopExits()) {
assert block.getId() >= loop.getHeader().getId();
Loop<?> blockLoop = block.getLoop();
--- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.common/src/org/graalvm/compiler/core/common/cfg/Loop.java Tue Mar 12 09:49:10 2019 +0000
+++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.common/src/org/graalvm/compiler/core/common/cfg/Loop.java Sat Mar 16 21:00:45 2019 +0000
@@ -25,19 +25,28 @@
package org.graalvm.compiler.core.common.cfg;
+import static org.graalvm.compiler.core.common.cfg.AbstractBlockBase.BLOCK_ID_COMPARATOR;
+
import java.util.ArrayList;
+import java.util.Collections;
import java.util.List;
public abstract class Loop<T extends AbstractBlockBase<T>> {
private final Loop<T> parent;
- private final List<Loop<T>> children;
+ private final ArrayList<Loop<T>> children;
private final int depth;
private final int index;
private final T header;
- private final List<T> blocks;
- private final List<T> exits;
+ private final ArrayList<T> blocks;
+ private final ArrayList<T> exits;
+ /**
+ * Natural exits, ignoring LoopExitNodes.
+ *
+ * @see #getNaturalExits()
+ */
+ private final ArrayList<T> naturalExits;
protected Loop(Loop<T> parent, int index, T header) {
this.parent = parent;
@@ -51,6 +60,7 @@
this.blocks = new ArrayList<>();
this.children = new ArrayList<>();
this.exits = new ArrayList<>();
+ this.naturalExits = new ArrayList<>();
}
public abstract long numBackedges();
@@ -84,12 +94,87 @@
return blocks;
}
- public List<T> getExits() {
+ /**
+ * Returns the loop exits.
+ *
+ * This might be a conservative set: before framestate assignment it matches the LoopExitNodes
+ * even if earlier blocks could be considered as exits. After framestate assignments, this is
+ * the same as {@link #getNaturalExits()}.
+ *
+ * <p>
+ * LoopExitNodes are inserted in the control-flow during parsing and are natural exits: they are
+ * the earliest block at which we are guaranteed to have exited the loop. However, after some
+ * transformations of the graph, the natural exit might go up but the LoopExitNodes are not
+ * updated.
+ * </p>
+ *
+ * <p>
+ * For example in:
+ *
+ * <pre>
+ * for (int i = 0; i < N; i++) {
+ * if (c) {
+ * // Block 1
+ * if (dummy) {
+ * // ...
+ * } else {
+ * // ...
+ * }
+ * if (b) {
+ * continue;
+ * } else {
+ * // Block 2
+ * // LoopExitNode
+ * break;
+ * }
+ * }
+ * }
+ * </pre>
+ *
+ * After parsing, the natural exits match the LoopExitNode: Block 2 is a natural exit and has a
+ * LoopExitNode. If the {@code b} condition gets canonicalized to {@code false}, the natural
+ * exit moves to Block 1 while the LoopExitNode remains in Block 2. In such a scenario,
+ * {@code getLoopExits()} will contain block 2 while {@link #getNaturalExits()} will contain
+ * block 1.
+ *
+ *
+ * @see #getNaturalExits()
+ */
+ public List<T> getLoopExits() {
return exits;
}
- public void addExit(T t) {
- exits.add(t);
+ public boolean isLoopExit(T block) {
+ assert isSorted(exits);
+ return Collections.binarySearch(exits, block, BLOCK_ID_COMPARATOR) >= 0;
+ }
+
+ /**
+ * Returns the natural exit points: these are the earliest block that are guaranteed to never
+ * reach a back-edge.
+ *
+ * This can not be used in the context of preserving or using loop-closed form.
+ *
+ * @see #getLoopExits()
+ */
+ public ArrayList<T> getNaturalExits() {
+ return naturalExits;
+ }
+
+ public boolean isNaturalExit(T block) {
+ assert isSorted(naturalExits);
+ return Collections.binarySearch(naturalExits, block, BLOCK_ID_COMPARATOR) >= 0;
+ }
+
+ private static <T extends AbstractBlockBase<T>> boolean isSorted(List<T> list) {
+ int lastId = Integer.MIN_VALUE;
+ for (AbstractBlockBase<?> block : list) {
+ if (block.getId() < lastId) {
+ return false;
+ }
+ lastId = block.getId();
+ }
+ return true;
}
/**
@@ -115,4 +200,9 @@
public int hashCode() {
return index + depth * 31;
}
+
+ @Override
+ public boolean equals(Object obj) {
+ return super.equals(obj);
+ }
}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.common/src/org/graalvm/compiler/core/common/doc-files/MitigateSpeculativeExecutionAttacksHelp.txt Sat Mar 16 21:00:45 2019 +0000
@@ -0,0 +1,9 @@
+Select a strategy to mitigate speculative execution attacks (e.g., SPECTRE).
+The accepted values are:
+ None - No mitigations are used in JIT compiled code.
+ AllTargets - All branches are protected against speculative attacks.
+ This has a significant performance impact.
+ GuardTargets - Only branches that preserve Java memory safety are protected.
+ This has less performance impact than AllTargets.
+ NonDeoptGuardTargets - GuardTargets except that branches which deoptimize are not
+ protected since they can not be executed repeatedly.
--- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.common/src/org/graalvm/compiler/core/common/type/AbstractObjectStamp.java Tue Mar 12 09:49:10 2019 +0000
+++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.common/src/org/graalvm/compiler/core/common/type/AbstractObjectStamp.java Sat Mar 16 21:00:45 2019 +0000
@@ -48,6 +48,13 @@
this.exactType = exactType;
}
+ @Override
+ public void accept(Visitor v) {
+ super.accept(v);
+ v.visitObject(type);
+ v.visitBoolean(exactType);
+ }
+
protected abstract AbstractObjectStamp copyWith(ResolvedJavaType newType, boolean newExactType, boolean newNonNull, boolean newAlwaysNull);
@Override
--- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.common/src/org/graalvm/compiler/core/common/type/AbstractPointerStamp.java Tue Mar 12 09:49:10 2019 +0000
+++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.common/src/org/graalvm/compiler/core/common/type/AbstractPointerStamp.java Sat Mar 16 21:00:45 2019 +0000
@@ -36,6 +36,12 @@
private final boolean nonNull;
private final boolean alwaysNull;
+ @Override
+ public void accept(Visitor v) {
+ v.visitBoolean(nonNull);
+ v.visitBoolean(alwaysNull);
+ }
+
protected AbstractPointerStamp(boolean nonNull, boolean alwaysNull) {
this.nonNull = nonNull;
this.alwaysNull = alwaysNull;
--- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.common/src/org/graalvm/compiler/core/common/type/IllegalStamp.java Tue Mar 12 09:49:10 2019 +0000
+++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.common/src/org/graalvm/compiler/core/common/type/IllegalStamp.java Sat Mar 16 21:00:45 2019 +0000
@@ -46,6 +46,10 @@
}
@Override
+ public void accept(Visitor v) {
+ }
+
+ @Override
public JavaKind getStackKind() {
return JavaKind.Illegal;
}
--- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.common/src/org/graalvm/compiler/core/common/type/ObjectStamp.java Tue Mar 12 09:49:10 2019 +0000
+++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.common/src/org/graalvm/compiler/core/common/type/ObjectStamp.java Sat Mar 16 21:00:45 2019 +0000
@@ -31,6 +31,7 @@
import jdk.vm.ci.meta.JavaConstant;
import jdk.vm.ci.meta.MemoryAccessProvider;
import jdk.vm.ci.meta.ResolvedJavaType;
+import jdk.vm.ci.meta.UnresolvedJavaType;
public class ObjectStamp extends AbstractObjectStamp {
@@ -92,4 +93,48 @@
return null;
}
}
+
+ /**
+ * Convert an ObjectStamp into a representation that can be resolved symbolically into the
+ * original stamp.
+ */
+ @Override
+ public SymbolicJVMCIReference<ObjectStamp> makeSymbolic() {
+ if (type() == null) {
+ return null;
+ }
+ return new SymbolicObjectStamp(this);
+ }
+
+ static class SymbolicObjectStamp implements SymbolicJVMCIReference<ObjectStamp> {
+ UnresolvedJavaType type;
+ private boolean exactType;
+ private boolean nonNull;
+ private boolean alwaysNull;
+
+ SymbolicObjectStamp(ObjectStamp stamp) {
+ if (stamp.type() != null) {
+ type = UnresolvedJavaType.create(stamp.type().getName());
+ }
+ exactType = stamp.isExactType();
+ nonNull = stamp.nonNull();
+ alwaysNull = stamp.alwaysNull();
+ }
+
+ @Override
+ public ObjectStamp resolve(ResolvedJavaType accessingClass) {
+ return new ObjectStamp(type != null ? type.resolve(accessingClass) : null, exactType, nonNull, alwaysNull);
+ }
+
+ @Override
+ public String toString() {
+ return "SymbolicObjectStamp{" +
+ "declaringType=" + type +
+ ", exactType=" + exactType +
+ ", nonNull=" + nonNull +
+ ", alwaysNull=" + alwaysNull +
+ '}';
+ }
+ }
+
}
--- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.common/src/org/graalvm/compiler/core/common/type/PrimitiveStamp.java Tue Mar 12 09:49:10 2019 +0000
+++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.common/src/org/graalvm/compiler/core/common/type/PrimitiveStamp.java Sat Mar 16 21:00:45 2019 +0000
@@ -39,6 +39,11 @@
this.bits = bits;
}
+ @Override
+ public void accept(Visitor v) {
+ v.visitInt(bits);
+ }
+
/**
* The width in bits of the value described by this stamp.
*/
--- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.common/src/org/graalvm/compiler/core/common/type/Stamp.java Tue Mar 12 09:49:10 2019 +0000
+++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.common/src/org/graalvm/compiler/core/common/type/Stamp.java Sat Mar 16 21:00:45 2019 +0000
@@ -26,6 +26,7 @@
import org.graalvm.compiler.core.common.LIRKind;
import org.graalvm.compiler.core.common.spi.LIRKindTool;
+import org.graalvm.compiler.serviceprovider.SpeculationReasonGroup.SpeculationContextObject;
import jdk.vm.ci.meta.Constant;
import jdk.vm.ci.meta.JavaKind;
@@ -36,7 +37,7 @@
/**
* A stamp is the basis for a type system.
*/
-public abstract class Stamp {
+public abstract class Stamp implements SpeculationContextObject {
protected Stamp() {
}
@@ -185,4 +186,15 @@
}
return false;
}
+
+ /**
+ * Convert a Stamp into a representation that can be resolved symbolically into the original
+ * stamp. If this stamp contains no references to JVMCI types then simply return null.
+ */
+ public SymbolicJVMCIReference<? extends Stamp> makeSymbolic() {
+ return null;
+ }
+
+ @Override
+ public abstract String toString();
}
--- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.common/src/org/graalvm/compiler/core/common/type/StampPair.java Tue Mar 12 09:49:10 2019 +0000
+++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.common/src/org/graalvm/compiler/core/common/type/StampPair.java Sat Mar 16 21:00:45 2019 +0000
@@ -24,6 +24,8 @@
package org.graalvm.compiler.core.common.type;
+import java.util.Objects;
+
/**
* A pair of stamp with one being the stamp that can be trusted and the other one being a guess that
* needs a dynamic check to be used.
@@ -63,4 +65,22 @@
return trustedStamp + " (unchecked=" + uncheckedStamp + ")";
}
}
+
+ @Override
+ public int hashCode() {
+ return trustedStamp.hashCode() + 11 + (uncheckedStamp != null ? uncheckedStamp.hashCode() : 0);
+
+ }
+
+ @Override
+ public boolean equals(Object obj) {
+ if (obj == this) {
+ return true;
+ }
+ if (obj instanceof StampPair) {
+ StampPair other = (StampPair) obj;
+ return trustedStamp.equals(other.trustedStamp) && Objects.equals(uncheckedStamp, other.uncheckedStamp);
+ }
+ return false;
+ }
}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.common/src/org/graalvm/compiler/core/common/type/SymbolicJVMCIReference.java Sat Mar 16 21:00:45 2019 +0000
@@ -0,0 +1,36 @@
+/*
+ * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved.
+ * 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.
+ */
+
+
+package org.graalvm.compiler.core.common.type;
+
+import jdk.vm.ci.meta.ResolvedJavaType;
+
+/**
+ * This interface represents an object which contains a symbolic reference to a JVMCI type or method
+ * that can be converted back into the original object by looking up types relative to an
+ * {@code accessingClass}.
+ */
+public interface SymbolicJVMCIReference<T> {
+ T resolve(ResolvedJavaType accessingClass);
+}
--- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.common/src/org/graalvm/compiler/core/common/type/VoidStamp.java Tue Mar 12 09:49:10 2019 +0000
+++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.common/src/org/graalvm/compiler/core/common/type/VoidStamp.java Sat Mar 16 21:00:45 2019 +0000
@@ -43,6 +43,10 @@
}
@Override
+ public void accept(Visitor v) {
+ }
+
+ @Override
public Stamp unrestricted() {
return this;
}
--- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.common/src/org/graalvm/compiler/core/common/util/UnsignedLong.java Tue Mar 12 09:49:10 2019 +0000
+++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.common/src/org/graalvm/compiler/core/common/util/UnsignedLong.java Sat Mar 16 21:00:45 2019 +0000
@@ -43,6 +43,10 @@
return Long.compareUnsigned(value, unsignedValue) < 0;
}
+ public boolean isGreaterThan(long unsignedValue) {
+ return Long.compareUnsigned(value, unsignedValue) > 0;
+ }
+
public boolean isLessOrEqualTo(long unsignedValue) {
return Long.compareUnsigned(value, unsignedValue) <= 0;
}
--- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/CheckGraalInvariants.java Tue Mar 12 09:49:10 2019 +0000
+++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/CheckGraalInvariants.java Sat Mar 16 21:00:45 2019 +0000
@@ -157,6 +157,10 @@
if (className.equals("org.graalvm.compiler.serviceprovider.GraalServices$Lazy")) {
return false;
}
+ } else {
+ if (className.equals("jdk.vm.ci.services.JVMCIClassLoaderFactory")) {
+ return false;
+ }
}
return true;
}
--- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/ConditionalEliminationTestBase.java Tue Mar 12 09:49:10 2019 +0000
+++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/ConditionalEliminationTestBase.java Sat Mar 16 21:00:45 2019 +0000
@@ -33,7 +33,7 @@
import org.graalvm.compiler.phases.OptimisticOptimizations.Optimization;
import org.graalvm.compiler.phases.common.CanonicalizerPhase;
import org.graalvm.compiler.phases.common.ConditionalEliminationPhase;
-import org.graalvm.compiler.phases.common.ConvertDeoptimizeToGuardPhase;
+import org.graalvm.compiler.loop.phases.ConvertDeoptimizeToGuardPhase;
import org.graalvm.compiler.phases.common.IterativeConditionalEliminationPhase;
import org.graalvm.compiler.phases.common.LoweringPhase;
import org.graalvm.compiler.phases.schedule.SchedulePhase;
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/CountedLoopTest2.java Sat Mar 16 21:00:45 2019 +0000
@@ -0,0 +1,130 @@
+/*
+ * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved.
+ * 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.
+ */
+
+
+package org.graalvm.compiler.core.test;
+
+import org.graalvm.compiler.api.directives.GraalDirectives;
+import org.graalvm.compiler.graph.Node;
+import org.graalvm.compiler.graph.iterators.FilteredNodeIterable;
+import org.graalvm.compiler.loop.LoopEx;
+import org.graalvm.compiler.loop.LoopsData;
+import org.graalvm.compiler.nodes.DeoptimizingNode;
+import org.graalvm.compiler.nodes.StructuredGraph;
+import org.graalvm.compiler.nodes.StructuredGraph.AllowAssumptions;
+import org.junit.Assert;
+import org.junit.Test;
+
+public class CountedLoopTest2 extends GraalCompilerTest {
+ public static float countedDeoptLoop0(int n) {
+ float v = 0;
+ for (int i = 0; i < n; i++) {
+ v += 2.1f * i;
+ GraalDirectives.controlFlowAnchor();
+ }
+ GraalDirectives.deoptimizeAndInvalidate();
+ return v;
+ }
+
+ @Test
+ public void test0() {
+ test("countedDeoptLoop0");
+ }
+
+ public static float countedDeoptLoop1(int n) {
+ float v = 0;
+ for (int i = 0; i < n; i++) {
+ v += 2.1f * i;
+ GraalDirectives.controlFlowAnchor();
+ }
+ if (v > 0) {
+ if (v / 55 < 3) {
+ v -= 2;
+ GraalDirectives.controlFlowAnchor();
+ } else {
+ v += 6;
+ GraalDirectives.controlFlowAnchor();
+ }
+ } else {
+ v += 1;
+ GraalDirectives.controlFlowAnchor();
+ }
+ GraalDirectives.deoptimizeAndInvalidate();
+ return v;
+ }
+
+ @Test
+ public void test1() {
+ test("countedDeoptLoop1");
+ }
+
+ public static float countedDeoptLoop2(int n, float init) {
+ float v = init;
+ if (v > 0) {
+ if (v / 55 < 3) {
+ for (int i = 0; i < n; i++) {
+ v += 2.1f * i;
+ GraalDirectives.controlFlowAnchor();
+ }
+ } else {
+ for (int i = 0; i < n; i++) {
+ v += 1.1f * i;
+ GraalDirectives.controlFlowAnchor();
+ }
+ }
+ } else {
+ for (int i = 0; i < n; i++) {
+ v += -0.1f * i;
+ GraalDirectives.controlFlowAnchor();
+ }
+ }
+ GraalDirectives.deoptimizeAndInvalidate();
+ return v;
+ }
+
+ @Test
+ public void test2() {
+ test("countedDeoptLoop2", 3);
+ }
+
+ private void test(String methodName) {
+ test(methodName, 1);
+ }
+
+ private void test(String methodName, int nLoops) {
+ StructuredGraph graph = parseEager(methodName, AllowAssumptions.YES);
+ LoopsData loops = new LoopsData(graph);
+ Assert.assertEquals(nLoops, loops.loops().size());
+ for (LoopEx loop : loops.loops()) {
+ Assert.assertTrue(loop.detectCounted());
+ }
+
+ StructuredGraph finalGraph = getFinalGraph(methodName);
+ loops = new LoopsData(finalGraph);
+ Assert.assertEquals(nLoops, loops.loops().size());
+ FilteredNodeIterable<Node> nonStartDeopts = finalGraph.getNodes().filter(n -> {
+ return n instanceof DeoptimizingNode.DeoptBefore && ((DeoptimizingNode.DeoptBefore) n).stateBefore().bci > 0;
+ });
+ Assert.assertTrue(nonStartDeopts.isNotEmpty());
+ }
+}
--- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/DumpPathTest.java Tue Mar 12 09:49:10 2019 +0000
+++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/DumpPathTest.java Sat Mar 16 21:00:45 2019 +0000
@@ -31,6 +31,7 @@
import jdk.internal.vm.compiler.collections.EconomicMap;
import org.graalvm.compiler.debug.DebugOptions;
+import org.graalvm.compiler.debug.DebugOptions.PrintGraphTarget;
import org.graalvm.compiler.options.OptionKey;
import org.graalvm.compiler.options.OptionValues;
import org.junit.Test;
@@ -52,7 +53,7 @@
String[] extensions = new String[]{".cfg", ".bgv", ".graph-strings"};
EconomicMap<OptionKey<?>, Object> overrides = OptionValues.newOptionMap();
overrides.put(DebugOptions.DumpPath, dumpDirectoryPath.toString());
- overrides.put(DebugOptions.PrintGraphFile, true);
+ overrides.put(DebugOptions.PrintGraph, PrintGraphTarget.File);
overrides.put(DebugOptions.PrintCanonicalGraphStrings, true);
overrides.put(DebugOptions.Dump, "*");
--- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/GraalCompilerTest.java Tue Mar 12 09:49:10 2019 +0000
+++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/GraalCompilerTest.java Sat Mar 16 21:00:45 2019 +0000
@@ -111,7 +111,7 @@
import org.graalvm.compiler.phases.Phase;
import org.graalvm.compiler.phases.PhaseSuite;
import org.graalvm.compiler.phases.common.CanonicalizerPhase;
-import org.graalvm.compiler.phases.common.ConvertDeoptimizeToGuardPhase;
+import org.graalvm.compiler.loop.phases.ConvertDeoptimizeToGuardPhase;
import org.graalvm.compiler.phases.common.inlining.InliningPhase;
import org.graalvm.compiler.phases.common.inlining.info.InlineInfo;
import org.graalvm.compiler.phases.common.inlining.policy.GreedyInliningPolicy;
@@ -899,11 +899,21 @@
return actual;
}
+ private static final List<Class<?>> C2_OMIT_STACK_TRACE_IN_FAST_THROW_EXCEPTIONS = Arrays.asList(
+ ArithmeticException.class,
+ ArrayIndexOutOfBoundsException.class,
+ ArrayStoreException.class,
+ ClassCastException.class,
+ NullPointerException.class);
+
protected void assertEquals(Result expect, Result actual) {
if (expect.exception != null) {
Assert.assertTrue("expected " + expect.exception, actual.exception != null);
Assert.assertEquals("Exception class", expect.exception.getClass(), actual.exception.getClass());
- Assert.assertEquals("Exception message", expect.exception.getMessage(), actual.exception.getMessage());
+ // C2 can optimize out the stack trace and message in some cases
+ if (expect.exception.getMessage() != null || !C2_OMIT_STACK_TRACE_IN_FAST_THROW_EXCEPTIONS.contains(expect.exception.getClass())) {
+ Assert.assertEquals("Exception message", expect.exception.getMessage(), actual.exception.getMessage());
+ }
} else {
if (actual.exception != null) {
throw new AssertionError("expected " + expect.returnValue + " but got an exception", actual.exception);
--- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/GraphEncoderTest.java Tue Mar 12 09:49:10 2019 +0000
+++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/GraphEncoderTest.java Sat Mar 16 21:00:45 2019 +0000
@@ -30,16 +30,15 @@
import java.util.List;
import java.util.Map;
-import jdk.vm.ci.meta.ResolvedJavaMethod;
-
-import org.junit.Test;
-
import org.graalvm.compiler.nodes.EncodedGraph;
import org.graalvm.compiler.nodes.GraphEncoder;
import org.graalvm.compiler.nodes.StructuredGraph;
import org.graalvm.compiler.nodes.StructuredGraph.AllowAssumptions;
import org.graalvm.compiler.phases.common.CanonicalizerPhase;
import org.graalvm.compiler.phases.tiers.PhaseContext;
+import org.junit.Test;
+
+import jdk.vm.ci.meta.ResolvedJavaMethod;
public class GraphEncoderTest extends GraalCompilerTest {
@@ -80,7 +79,7 @@
for (StructuredGraph originalGraph : originalGraphs) {
EncodedGraph encodedGraph = new EncodedGraph(encoder.getEncoding(), startOffsets.get(originalGraph), encoder.getObjects(), encoder.getNodeClasses(), originalGraph);
- GraphEncoder.verifyEncoding(originalGraph, encodedGraph, getTarget().arch);
+ encoder.verifyEncoding(originalGraph, encodedGraph);
}
}
}
--- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/GuardPrioritiesTest.java Tue Mar 12 09:49:10 2019 +0000
+++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/GuardPrioritiesTest.java Sat Mar 16 21:00:45 2019 +0000
@@ -35,6 +35,7 @@
import org.graalvm.compiler.api.directives.GraalDirectives;
import org.graalvm.compiler.core.common.GraalOptions;
import org.graalvm.compiler.graph.iterators.NodeIterable;
+import org.graalvm.compiler.loop.phases.ConvertDeoptimizeToGuardPhase;
import org.graalvm.compiler.nodes.GuardNode;
import org.graalvm.compiler.nodes.ParameterNode;
import org.graalvm.compiler.nodes.StructuredGraph;
@@ -42,7 +43,6 @@
import org.graalvm.compiler.nodes.calc.IsNullNode;
import org.graalvm.compiler.nodes.spi.LoweringTool;
import org.graalvm.compiler.phases.common.CanonicalizerPhase;
-import org.graalvm.compiler.phases.common.ConvertDeoptimizeToGuardPhase;
import org.graalvm.compiler.phases.common.FloatingReadPhase;
import org.graalvm.compiler.phases.common.LoweringPhase;
import org.graalvm.compiler.phases.schedule.SchedulePhase;
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/IntegerDivRemConstantTest.java Sat Mar 16 21:00:45 2019 +0000
@@ -0,0 +1,293 @@
+/*
+ * Copyright (c) 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2019, Arm Limited and affiliates. All rights reserved.
+ * 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.
+ */
+
+
+
+package org.graalvm.compiler.core.test;
+
+import org.junit.Test;
+
+public class IntegerDivRemConstantTest extends GraalCompilerTest {
+ public static int intDivPositiveConstant(int val) {
+ return val / 5;
+ }
+
+ @Test
+ public void testIntDivPositiveConstant() {
+ test("intDivPositiveConstant", -10);
+ test("intDivPositiveConstant", 0);
+ test("intDivPositiveConstant", 4256);
+ test("intDivPositiveConstant", Integer.MAX_VALUE);
+ test("intDivPositiveConstant", Integer.MIN_VALUE);
+ }
+
+ public static int intDivIntegerMax(int val) {
+ return val / Integer.MAX_VALUE;
+ }
+
+ @Test
+ public void testIntDivIntegerMax() {
+ test("intDivIntegerMax", -10);
+ test("intDivIntegerMax", 0);
+ test("intDivIntegerMax", 4256);
+ test("intDivIntegerMax", Integer.MAX_VALUE);
+ test("intDivIntegerMax", Integer.MIN_VALUE);
+ }
+
+ public static int intDivNegativeConstant(int val) {
+ return val / -1234;
+ }
+
+ @Test
+ public void testIntDivNegativeConstant() {
+ test("intDivNegativeConstant", -123);
+ test("intDivNegativeConstant", 0);
+ test("intDivNegativeConstant", 123);
+ test("intDivNegativeConstant", Integer.MAX_VALUE);
+ test("intDivNegativeConstant", Integer.MIN_VALUE);
+ }
+
+ public static int intDivIntegerMinOdd(int val) {
+ return val / (Integer.MIN_VALUE + 1);
+ }
+
+ @Test
+ public void testIntDivIntegerMinOdd() {
+ test("intDivIntegerMinOdd", -123);
+ test("intDivIntegerMinOdd", 0);
+ test("intDivIntegerMinOdd", 123);
+ test("intDivIntegerMinOdd", Integer.MAX_VALUE);
+ test("intDivIntegerMinOdd", Integer.MIN_VALUE);
+ }
+
+ public static long longDivPositiveConstant(long val) {
+ return val / 35170432;
+ }
+
+ @Test
+ public void testLongDivPositiveConstant() {
+ test("longDivPositiveConstant", -1234L);
+ test("longDivPositiveConstant", 0L);
+ test("longDivPositiveConstant", 214423L);
+ test("longDivPositiveConstant", Long.MAX_VALUE);
+ test("longDivPositiveConstant", Long.MIN_VALUE);
+ }
+
+ public static long longDivLongMax(long val) {
+ return val / Long.MAX_VALUE;
+ }
+
+ @Test
+ public void testLongDivLongMax() {
+ test("longDivLongMax", -1234L);
+ test("longDivLongMax", 0L);
+ test("longDivLongMax", 214423L);
+ test("longDivLongMax", Long.MAX_VALUE);
+ test("longDivLongMax", Long.MIN_VALUE);
+ }
+
+ public static long longDivNegativeConstant(long val) {
+ return val / -413;
+ }
+
+ @Test
+ public void testLongDivNegativeConstant() {
+ test("longDivNegativeConstant", -43L);
+ test("longDivNegativeConstant", 0L);
+ test("longDivNegativeConstant", 147065L);
+ test("longDivNegativeConstant", Long.MAX_VALUE);
+ test("longDivNegativeConstant", Long.MIN_VALUE);
+ }
+
+ public static long longDivLongMinOdd(long val) {
+ return val / (Long.MIN_VALUE + 1);
+ }
+
+ @Test
+ public void testLongDivLongMinOdd() {
+ test("longDivLongMinOdd", -1234L);
+ test("longDivLongMinOdd", 0L);
+ test("longDivLongMinOdd", 214423L);
+ test("longDivLongMinOdd", Long.MAX_VALUE);
+ test("longDivLongMinOdd", Long.MIN_VALUE);
+ }
+
+ public static int intRemPositiveConstant(int val) {
+ return val % 139968;
+ }
+
+ @Test
+ public void testIntRemPositiveConstant() {
+ test("intRemPositiveConstant", -10);
+ test("intRemPositiveConstant", 0);
+ test("intRemPositiveConstant", 4256);
+ test("intRemPositiveConstant", Integer.MAX_VALUE);
+ test("intRemPositiveConstant", Integer.MIN_VALUE);
+ }
+
+ public static int intRemNegativeConstant(int val) {
+ return val % -139968;
+ }
+
+ @Test
+ public void testIntRemNegativeConstant() {
+ test("intRemNegativeConstant", -10);
+ test("intRemNegativeConstant", 0);
+ test("intRemNegativeConstant", 4256);
+ test("intRemNegativeConstant", Integer.MAX_VALUE);
+ test("intRemNegativeConstant", Integer.MIN_VALUE);
+ }
+
+ @SuppressWarnings("divzero")
+ public static int intRemZero(int val) {
+ return val % 0;
+ }
+
+ @Test
+ public void testIntRemZero() {
+ test("intRemZero", -10);
+ test("intRemZero", 0);
+ test("intRemZero", 4256);
+ test("intRemZero", Integer.MAX_VALUE);
+ test("intRemZero", Integer.MIN_VALUE);
+ }
+
+ public static int intRemMax(int val) {
+ return val % Integer.MAX_VALUE;
+ }
+
+ @Test
+ public void testIntRemMax() {
+ test("intRemMax", -10);
+ test("intRemMax", 0);
+ test("intRemMax", 4256);
+ test("intRemMax", Integer.MAX_VALUE);
+ test("intRemMax", Integer.MIN_VALUE);
+ }
+
+ public static int intRemMin(int val) {
+ return val % Integer.MIN_VALUE;
+ }
+
+ @Test
+ public void testIntRemMin() {
+ test("intRemMin", -10);
+ test("intRemMin", 0);
+ test("intRemMin", 4256);
+ test("intRemMin", Integer.MAX_VALUE);
+ test("intRemMin", Integer.MIN_VALUE);
+ }
+
+ public static long longRemPositiveConstant(long val) {
+ return val % 35170432;
+ }
+
+ public static int intRemPowerOf2(int val) {
+ return val % 4;
+ }
+
+ @Test
+ public void testIntRemPowerOf2() {
+ test("intRemPowerOf2", -10);
+ test("intRemPowerOf2", 0);
+ test("intRemPowerOf2", 4256);
+ test("intRemPowerOf2", Integer.MAX_VALUE);
+ test("intRemPowerOf2", Integer.MIN_VALUE);
+ }
+
+ @Test
+ public void testLongRemPositiveConstant() {
+ test("longRemPositiveConstant", -1234L);
+ test("longRemPositiveConstant", 0L);
+ test("longRemPositiveConstant", 214423L);
+ test("longRemPositiveConstant", Long.MAX_VALUE);
+ test("longRemPositiveConstant", Long.MIN_VALUE);
+ }
+
+ public static long longRemNegativeConstant(long val) {
+ return val % -413;
+ }
+
+ @Test
+ public void testLongRemNegativeConstant() {
+ test("longRemNegativeConstant", -43L);
+ test("longRemNegativeConstant", 0L);
+ test("longRemNegativeConstant", 147065L);
+ test("longRemNegativeConstant", Long.MAX_VALUE);
+ test("longRemNegativeConstant", Long.MIN_VALUE);
+ }
+
+ @SuppressWarnings("divzero")
+ public static long longRemZero(long val) {
+ return val % 0;
+ }
+
+ @Test
+ public void testLongRemZero() {
+ test("longRemZero", -43L);
+ test("longRemZero", 0L);
+ test("longRemZero", 147065L);
+ test("longRemZero", Long.MAX_VALUE);
+ test("longRemZero", Long.MIN_VALUE);
+ }
+
+ public static long longRemMax(long val) {
+ return val % Long.MAX_VALUE;
+ }
+
+ @Test
+ public void testLongRemMax() {
+ test("longRemMax", -43L);
+ test("longRemMax", 0L);
+ test("longRemMax", 147065L);
+ test("longRemMax", Long.MAX_VALUE);
+ test("longRemMax", Long.MIN_VALUE);
+ }
+
+ public static long longRemMin(long val) {
+ return val % Long.MIN_VALUE;
+ }
+
+ @Test
+ public void testLongRemMin() {
+ test("longRemMin", -43L);
+ test("longRemMin", 0L);
+ test("longRemMin", 147065L);
+ test("longRemMin", Long.MAX_VALUE);
+ test("longRemMin", Long.MIN_VALUE);
+ }
+
+ public static long longRemPowerOf2(long val) {
+ return val % 4L;
+ }
+
+ @Test
+ public void testLongRemPowerOf2() {
+ test("longRemPowerOf2", -43L);
+ test("longRemPowerOf2", 0L);
+ test("longRemPowerOf2", 147065L);
+ test("longRemPowerOf2", Long.MAX_VALUE);
+ test("longRemPowerOf2", Long.MIN_VALUE);
+ }
+}
--- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/MemoryScheduleTest.java Tue Mar 12 09:49:10 2019 +0000
+++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/MemoryScheduleTest.java Sat Mar 16 21:00:45 2019 +0000
@@ -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
--- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/NestedLoopTest.java Tue Mar 12 09:49:10 2019 +0000
+++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/NestedLoopTest.java Sat Mar 16 21:00:45 2019 +0000
@@ -161,9 +161,9 @@
Assert.assertTrue(containsDirect(innerMostLoop, d, cfg));
Assert.assertTrue(contains(rootLoop, d, cfg));
Assert.assertTrue(contains(nestedLoop, d, cfg));
- Assert.assertEquals(rootExits, rootLoop.getExits().size());
- Assert.assertEquals(nestedExits, nestedLoop.getExits().size());
- Assert.assertEquals(innerExits, innerMostLoop.getExits().size());
+ Assert.assertEquals(rootExits, rootLoop.getLoopExits().size());
+ Assert.assertEquals(nestedExits, nestedLoop.getLoopExits().size());
+ Assert.assertEquals(innerExits, innerMostLoop.getLoopExits().size());
debug.dump(DebugContext.BASIC_LEVEL, graph, "Graph");
}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/SwitchCanonicalizerTest.java Sat Mar 16 21:00:45 2019 +0000
@@ -0,0 +1,126 @@
+/*
+ * 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.
+ */
+
+
+package org.graalvm.compiler.core.test;
+
+import org.graalvm.compiler.nodes.StructuredGraph;
+import org.graalvm.compiler.nodes.extended.IntegerSwitchNode;
+import org.graalvm.compiler.phases.common.CanonicalizerPhase;
+import org.junit.Test;
+
+public class SwitchCanonicalizerTest extends GraalCompilerTest {
+
+ public int divByPowerOf2(int n) {
+ switch (n / 8) {
+ case Integer.MAX_VALUE / 8 + 1:
+ return hashCode();
+ default:
+ return 1;
+ }
+ }
+
+ @Test
+ public void testDivByPowerOf2() {
+ shouldFoldSwitch("divByPowerOf2");
+ }
+
+ public int divByNonPowerOf2(int n) {
+ switch (n / 7) {
+ case Integer.MAX_VALUE / 7 + 1:
+ return hashCode();
+ default:
+ return 1;
+ }
+ }
+
+ @Test
+ public void testDivByNonPowerOf2() {
+ shouldFoldSwitch("divByNonPowerOf2");
+ }
+
+ public int remByPowerOf2(int n) {
+ switch (n % 8) {
+ case 9:
+ return hashCode();
+ default:
+ return 1;
+ }
+ }
+
+ @Test
+ public void testRemByPowerOf2() {
+ shouldFoldSwitch("remByPowerOf2");
+ }
+
+ public int remByPowerOf2PositiveX(int n) {
+ int n0 = n > 0 ? 8 : 9;
+ switch (n0 % 8) {
+ case 9:
+ return hashCode();
+ default:
+ return 1;
+ }
+ }
+
+ @Test
+ public void testRemByPowerOf2PositiveX() {
+ shouldFoldSwitch("remByPowerOf2PositiveX");
+ }
+
+ public int remByPowerOf2NegativeX(int n) {
+ int n0 = n > 0 ? -8 : -9;
+ switch (n0 % 8) {
+ case 9:
+ return hashCode();
+ default:
+ return 1;
+ }
+ }
+
+ @Test
+ public void testRemByPowerOf2NegativeX() {
+ shouldFoldSwitch("remByPowerOf2NegativeX");
+ }
+
+ public int remByNonPowerOf2(int n) {
+ switch (n % 7) {
+ case 9:
+ return hashCode();
+ default:
+ return 1;
+ }
+ }
+
+ @Test
+ public void testRemByNonPowerOf2() {
+ shouldFoldSwitch("remByNonPowerOf2");
+ }
+
+ private void shouldFoldSwitch(String methodName) {
+ StructuredGraph graph = parseForCompile(getResolvedJavaMethod(methodName));
+ new CanonicalizerPhase().apply(graph, getDefaultHighTierContext());
+ assertFalse(graph.hasNode(IntegerSwitchNode.TYPE));
+ }
+
+}
--- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/VerifyCallerSensitiveMethods.java Tue Mar 12 09:49:10 2019 +0000
+++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/VerifyCallerSensitiveMethods.java Sat Mar 16 21:00:45 2019 +0000
@@ -24,7 +24,7 @@
package org.graalvm.compiler.core.test;
-import static org.graalvm.compiler.serviceprovider.GraalServices.Java8OrEarlier;
+import static org.graalvm.compiler.serviceprovider.JavaVersionUtil.Java8OrEarlier;
import java.lang.annotation.Annotation;
--- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/VerifyDebugUsage.java Tue Mar 12 09:49:10 2019 +0000
+++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/VerifyDebugUsage.java Sat Mar 16 21:00:45 2019 +0000
@@ -150,7 +150,8 @@
"org.graalvm.compiler.truffle.compiler.TruffleCompilerImpl.compilePEGraph",
"org.graalvm.compiler.core.test.VerifyDebugUsageTest$ValidDumpUsagePhase.run",
"org.graalvm.compiler.core.test.VerifyDebugUsageTest$InvalidConcatDumpUsagePhase.run",
- "org.graalvm.compiler.core.test.VerifyDebugUsageTest$InvalidDumpUsagePhase.run"));
+ "org.graalvm.compiler.core.test.VerifyDebugUsageTest$InvalidDumpUsagePhase.run",
+ "org.graalvm.compiler.hotspot.SymbolicSnippetEncoder.verifySnippetEncodeDecode"));
/**
* The set of methods allowed to call a {@code Debug.dump(...)} method with the {@code level}
@@ -165,7 +166,8 @@
"org.graalvm.compiler.core.GraalCompiler.emitFrontEnd",
"org.graalvm.compiler.phases.BasePhase.dumpAfter",
"org.graalvm.compiler.replacements.ReplacementsImpl$GraphMaker.makeGraph",
- "org.graalvm.compiler.replacements.SnippetTemplate.instantiate"));
+ "org.graalvm.compiler.replacements.SnippetTemplate.instantiate",
+ "org.graalvm.compiler.hotspot.SymbolicSnippetEncoder.verifySnippetEncodeDecode"));
private void verifyParameters(StructuredGraph callerGraph, MethodCallTargetNode debugCallTarget, List<? extends ValueNode> args, ResolvedJavaType stringType, int startArgIdx,
int varArgsIndex) {
--- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/backend/BackendTest.java Tue Mar 12 09:49:10 2019 +0000
+++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/backend/BackendTest.java Sat Mar 16 21:00:45 2019 +0000
@@ -25,6 +25,7 @@
package org.graalvm.compiler.core.test.backend;
import org.graalvm.compiler.core.GraalCompiler;
+import org.graalvm.compiler.core.gen.LIRCompilerBackend;
import org.graalvm.compiler.core.test.GraalCompilerTest;
import org.graalvm.compiler.debug.DebugContext;
import org.graalvm.compiler.lir.gen.LIRGenerationResult;
@@ -52,7 +53,7 @@
throw debug.handle(e);
}
- LIRGenerationResult lirGen = GraalCompiler.emitLIR(getBackend(), graph, null, null, createLIRSuites(graph.getOptions()));
+ LIRGenerationResult lirGen = LIRCompilerBackend.emitLIR(getBackend(), graph, null, null, createLIRSuites(graph.getOptions()));
return lirGen;
}
--- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/deopt/RethrowDeoptMaterializeTest.java Tue Mar 12 09:49:10 2019 +0000
+++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/deopt/RethrowDeoptMaterializeTest.java Sat Mar 16 21:00:45 2019 +0000
@@ -46,7 +46,7 @@
@SuppressWarnings("sync-override")
@Override
public final Throwable fillInStackTrace() {
- return null;
+ return this;
}
}
--- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/ea/EscapeAnalysisTest.java Tue Mar 12 09:49:10 2019 +0000
+++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/ea/EscapeAnalysisTest.java Sat Mar 16 21:00:45 2019 +0000
@@ -293,7 +293,7 @@
@SuppressWarnings("sync-override")
@Override
public final Throwable fillInStackTrace() {
- return null;
+ return this;
}
}
--- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core/src/org/graalvm/compiler/core/GraalCompiler.java Tue Mar 12 09:49:10 2019 +0000
+++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core/src/org/graalvm/compiler/core/GraalCompiler.java Sat Mar 16 21:00:45 2019 +0000
@@ -24,42 +24,18 @@
package org.graalvm.compiler.core;
-import java.util.Collection;
-import java.util.List;
-
-import jdk.internal.vm.compiler.collections.EconomicSet;
import org.graalvm.compiler.code.CompilationResult;
-import org.graalvm.compiler.core.LIRGenerationPhase.LIRGenerationContext;
-import org.graalvm.compiler.core.common.GraalOptions;
import org.graalvm.compiler.core.common.PermanentBailoutException;
import org.graalvm.compiler.core.common.RetryableBailoutException;
-import org.graalvm.compiler.core.common.alloc.ComputeBlockOrder;
-import org.graalvm.compiler.core.common.alloc.RegisterAllocationConfig;
-import org.graalvm.compiler.core.common.cfg.AbstractBlockBase;
import org.graalvm.compiler.core.common.util.CompilationAlarm;
import org.graalvm.compiler.core.target.Backend;
-import org.graalvm.compiler.debug.CounterKey;
import org.graalvm.compiler.debug.DebugCloseable;
import org.graalvm.compiler.debug.DebugContext;
-import org.graalvm.compiler.debug.GraalError;
import org.graalvm.compiler.debug.MethodFilter;
import org.graalvm.compiler.debug.TimerKey;
-import org.graalvm.compiler.lir.LIR;
-import org.graalvm.compiler.lir.alloc.OutOfRegistersException;
-import org.graalvm.compiler.lir.asm.CompilationResultBuilder;
import org.graalvm.compiler.lir.asm.CompilationResultBuilderFactory;
-import org.graalvm.compiler.lir.framemap.FrameMap;
-import org.graalvm.compiler.lir.framemap.FrameMapBuilder;
-import org.graalvm.compiler.lir.gen.LIRGenerationResult;
-import org.graalvm.compiler.lir.gen.LIRGeneratorTool;
-import org.graalvm.compiler.lir.phases.AllocationPhase.AllocationContext;
import org.graalvm.compiler.lir.phases.LIRSuites;
-import org.graalvm.compiler.lir.phases.PostAllocationOptimizationPhase.PostAllocationOptimizationContext;
-import org.graalvm.compiler.lir.phases.PreAllocationOptimizationPhase.PreAllocationOptimizationContext;
import org.graalvm.compiler.nodes.StructuredGraph;
-import org.graalvm.compiler.nodes.StructuredGraph.ScheduleResult;
-import org.graalvm.compiler.nodes.cfg.Block;
-import org.graalvm.compiler.nodes.spi.NodeLIRBuilderTool;
import org.graalvm.compiler.phases.OptimisticOptimizations;
import org.graalvm.compiler.phases.PhaseSuite;
import org.graalvm.compiler.phases.common.DeadCodeEliminationPhase;
@@ -70,17 +46,8 @@
import org.graalvm.compiler.phases.tiers.TargetProvider;
import org.graalvm.compiler.phases.util.Providers;
-import jdk.vm.ci.code.RegisterConfig;
-import jdk.vm.ci.code.TargetDescription;
-import jdk.vm.ci.code.site.ConstantReference;
-import jdk.vm.ci.code.site.DataPatch;
-import jdk.vm.ci.meta.Assumptions;
-import jdk.vm.ci.meta.JavaConstant;
-import jdk.vm.ci.meta.JavaKind;
import jdk.vm.ci.meta.ProfilingInfo;
-import jdk.vm.ci.meta.ResolvedJavaField;
import jdk.vm.ci.meta.ResolvedJavaMethod;
-import jdk.vm.ci.meta.VMConstant;
/**
* Static methods for orchestrating the compilation of a {@linkplain StructuredGraph graph}.
@@ -89,9 +56,6 @@
private static final TimerKey CompilerTimer = DebugContext.timer("GraalCompiler").doc("Time spent in compilation (excludes code installation).");
private static final TimerKey FrontEnd = DebugContext.timer("FrontEnd").doc("Time spent processing HIR.");
- private static final TimerKey EmitLIR = DebugContext.timer("EmitLIR").doc("Time spent generating LIR from HIR.");
- private static final TimerKey EmitCode = DebugContext.timer("EmitCode").doc("Time spent generating machine code from LIR.");
- private static final TimerKey BackEnd = DebugContext.timer("BackEnd").doc("Time spent in EmitLIR and EmitCode.");
/**
* Encapsulates all the inputs to a {@linkplain GraalCompiler#compile(Request) compilation}.
@@ -178,7 +142,7 @@
assert !r.graph.isFrozen();
try (DebugContext.Scope s0 = debug.scope("GraalCompiler", r.graph, r.providers.getCodeCache()); DebugCloseable a = CompilerTimer.start(debug)) {
emitFrontEnd(r.providers, r.backend, r.graph, r.graphBuilderSuite, r.optimisticOpts, r.profilingInfo, r.suites);
- emitBackEnd(r.graph, null, r.installedCodeOwner, r.backend, r.compilationResult, r.factory, null, r.lirSuites);
+ r.backend.emitBackEnd(r.graph, null, r.installedCodeOwner, r.compilationResult, r.factory, null, r.lirSuites);
if (r.verifySourcePositions) {
assert r.graph.verifySourcePositions(true);
}
@@ -275,85 +239,6 @@
}
}
- @SuppressWarnings("try")
- public static <T extends CompilationResult> void emitBackEnd(StructuredGraph graph, Object stub, ResolvedJavaMethod installedCodeOwner, Backend backend, T compilationResult,
- CompilationResultBuilderFactory factory, RegisterConfig registerConfig, LIRSuites lirSuites) {
- DebugContext debug = graph.getDebug();
- try (DebugContext.Scope s = debug.scope("BackEnd", graph.getLastSchedule()); DebugCloseable a = BackEnd.start(debug)) {
- LIRGenerationResult lirGen = null;
- lirGen = emitLIR(backend, graph, stub, registerConfig, lirSuites);
- try (DebugContext.Scope s2 = debug.scope("CodeGen", lirGen, lirGen.getLIR())) {
- int bytecodeSize = graph.method() == null ? 0 : graph.getBytecodeSize();
- compilationResult.setHasUnsafeAccess(graph.hasUnsafeAccess());
- emitCode(backend, graph.getAssumptions(), graph.method(), graph.getMethods(), graph.getFields(), bytecodeSize, lirGen, compilationResult, installedCodeOwner, factory);
- } catch (Throwable e) {
- throw debug.handle(e);
- }
- } catch (Throwable e) {
- throw debug.handle(e);
- } finally {
- graph.checkCancellation();
- }
- }
-
- @SuppressWarnings("try")
- public static LIRGenerationResult emitLIR(Backend backend, StructuredGraph graph, Object stub, RegisterConfig registerConfig, LIRSuites lirSuites) {
- String registerPressure = GraalOptions.RegisterPressure.getValue(graph.getOptions());
- String[] allocationRestrictedTo = registerPressure == null ? null : registerPressure.split(",");
- try {
- return emitLIR0(backend, graph, stub, registerConfig, lirSuites, allocationRestrictedTo);
- } catch (OutOfRegistersException e) {
- if (allocationRestrictedTo != null) {
- allocationRestrictedTo = null;
- return emitLIR0(backend, graph, stub, registerConfig, lirSuites, allocationRestrictedTo);
- }
- /* If the re-execution fails we convert the exception into a "hard" failure */
- throw new GraalError(e);
- } finally {
- graph.checkCancellation();
- }
- }
-
- @SuppressWarnings("try")
- private static LIRGenerationResult emitLIR0(Backend backend, StructuredGraph graph, Object stub, RegisterConfig registerConfig, LIRSuites lirSuites,
- String[] allocationRestrictedTo) {
- DebugContext debug = graph.getDebug();
- try (DebugContext.Scope ds = debug.scope("EmitLIR"); DebugCloseable a = EmitLIR.start(debug)) {
- assert !graph.hasValueProxies();
- ScheduleResult schedule = graph.getLastSchedule();
- Block[] blocks = schedule.getCFG().getBlocks();
- Block startBlock = schedule.getCFG().getStartBlock();
- assert startBlock != null;
- assert startBlock.getPredecessorCount() == 0;
-
- AbstractBlockBase<?>[] codeEmittingOrder = ComputeBlockOrder.computeCodeEmittingOrder(blocks.length, startBlock);
- AbstractBlockBase<?>[] linearScanOrder = ComputeBlockOrder.computeLinearScanOrder(blocks.length, startBlock);
- LIR lir = new LIR(schedule.getCFG(), linearScanOrder, codeEmittingOrder, graph.getOptions(), graph.getDebug());
-
- FrameMapBuilder frameMapBuilder = backend.newFrameMapBuilder(registerConfig);
- LIRGenerationResult lirGenRes = backend.newLIRGenerationResult(graph.compilationId(), lir, frameMapBuilder, graph, stub);
- LIRGeneratorTool lirGen = backend.newLIRGenerator(lirGenRes);
- NodeLIRBuilderTool nodeLirGen = backend.newNodeLIRBuilder(graph, lirGen);
-
- // LIR generation
- LIRGenerationContext context = new LIRGenerationContext(lirGen, nodeLirGen, graph, schedule);
- new LIRGenerationPhase().apply(backend.getTarget(), lirGenRes, context);
-
- try (DebugContext.Scope s = debug.scope("LIRStages", nodeLirGen, lirGenRes, lir)) {
- // Dump LIR along with HIR (the LIR is looked up from context)
- debug.dump(DebugContext.BASIC_LEVEL, graph.getLastSchedule(), "After LIR generation");
- LIRGenerationResult result = emitLowLevel(backend.getTarget(), lirGenRes, lirGen, lirSuites, backend.newRegisterAllocationConfig(registerConfig, allocationRestrictedTo));
- return result;
- } catch (Throwable e) {
- throw debug.handle(e);
- }
- } catch (Throwable e) {
- throw debug.handle(e);
- } finally {
- graph.checkCancellation();
- }
- }
-
protected static <T extends CompilationResult> String getCompilationUnitName(StructuredGraph graph, T compilationResult) {
if (compilationResult != null && compilationResult.getName() != null) {
return compilationResult.getName();
@@ -364,70 +249,4 @@
}
return method.format("%H.%n(%p)");
}
-
- public static LIRGenerationResult emitLowLevel(TargetDescription target, LIRGenerationResult lirGenRes, LIRGeneratorTool lirGen, LIRSuites lirSuites,
- RegisterAllocationConfig registerAllocationConfig) {
- DebugContext debug = lirGenRes.getLIR().getDebug();
- PreAllocationOptimizationContext preAllocOptContext = new PreAllocationOptimizationContext(lirGen);
- lirSuites.getPreAllocationOptimizationStage().apply(target, lirGenRes, preAllocOptContext);
- debug.dump(DebugContext.BASIC_LEVEL, lirGenRes.getLIR(), "After PreAllocationOptimizationStage");
-
- AllocationContext allocContext = new AllocationContext(lirGen.getSpillMoveFactory(), registerAllocationConfig);
- lirSuites.getAllocationStage().apply(target, lirGenRes, allocContext);
- debug.dump(DebugContext.BASIC_LEVEL, lirGenRes.getLIR(), "After AllocationStage");
-
- PostAllocationOptimizationContext postAllocOptContext = new PostAllocationOptimizationContext(lirGen);
- lirSuites.getPostAllocationOptimizationStage().apply(target, lirGenRes, postAllocOptContext);
- debug.dump(DebugContext.BASIC_LEVEL, lirGenRes.getLIR(), "After PostAllocationOptimizationStage");
-
- return lirGenRes;
- }
-
- @SuppressWarnings("try")
- public static void emitCode(Backend backend, Assumptions assumptions, ResolvedJavaMethod rootMethod, Collection<ResolvedJavaMethod> inlinedMethods, EconomicSet<ResolvedJavaField> accessedFields,
- int bytecodeSize, LIRGenerationResult lirGenRes,
- CompilationResult compilationResult, ResolvedJavaMethod installedCodeOwner, CompilationResultBuilderFactory factory) {
- DebugContext debug = lirGenRes.getLIR().getDebug();
- try (DebugCloseable a = EmitCode.start(debug)) {
- FrameMap frameMap = lirGenRes.getFrameMap();
- CompilationResultBuilder crb = backend.newCompilationResultBuilder(lirGenRes, frameMap, compilationResult, factory);
- backend.emitCode(crb, lirGenRes.getLIR(), installedCodeOwner);
- if (assumptions != null && !assumptions.isEmpty()) {
- compilationResult.setAssumptions(assumptions.toArray());
- }
- if (rootMethod != null) {
- compilationResult.setMethods(rootMethod, inlinedMethods);
- compilationResult.setFields(accessedFields);
- compilationResult.setBytecodeSize(bytecodeSize);
- }
- crb.finish();
- if (debug.isCountEnabled()) {
- List<DataPatch> ldp = compilationResult.getDataPatches();
- JavaKind[] kindValues = JavaKind.values();
- CounterKey[] dms = new CounterKey[kindValues.length];
- for (int i = 0; i < dms.length; i++) {
- dms[i] = DebugContext.counter("DataPatches-%s", kindValues[i]);
- }
-
- for (DataPatch dp : ldp) {
- JavaKind kind = JavaKind.Illegal;
- if (dp.reference instanceof ConstantReference) {
- VMConstant constant = ((ConstantReference) dp.reference).getConstant();
- if (constant instanceof JavaConstant) {
- kind = ((JavaConstant) constant).getJavaKind();
- }
- }
- dms[kind.ordinal()].add(debug, 1);
- }
-
- DebugContext.counter("CompilationResults").increment(debug);
- DebugContext.counter("CodeBytesEmitted").add(debug, compilationResult.getTargetCodeSize());
- DebugContext.counter("InfopointsEmitted").add(debug, compilationResult.getInfopoints().size());
- DebugContext.counter("DataPatches").add(debug, ldp.size());
- DebugContext.counter("ExceptionHandlersEmitted").add(debug, compilationResult.getExceptionHandlers().size());
- }
-
- debug.dump(DebugContext.BASIC_LEVEL, compilationResult, "After code generation");
- }
- }
}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core/src/org/graalvm/compiler/core/gen/LIRCompilerBackend.java Sat Mar 16 21:00:45 2019 +0000
@@ -0,0 +1,245 @@
+/*
+ * Copyright (c) 2017, 2018, Oracle and/or its affiliates. All rights reserved.
+ * 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.
+ */
+
+
+package org.graalvm.compiler.core.gen;
+
+import java.util.Collection;
+import java.util.List;
+
+import jdk.internal.vm.compiler.collections.EconomicSet;
+import org.graalvm.compiler.code.CompilationResult;
+import org.graalvm.compiler.core.LIRGenerationPhase;
+import org.graalvm.compiler.core.LIRGenerationPhase.LIRGenerationContext;
+import org.graalvm.compiler.core.common.GraalOptions;
+import org.graalvm.compiler.core.common.alloc.ComputeBlockOrder;
+import org.graalvm.compiler.core.common.alloc.RegisterAllocationConfig;
+import org.graalvm.compiler.core.common.cfg.AbstractBlockBase;
+import org.graalvm.compiler.core.target.Backend;
+import org.graalvm.compiler.debug.CounterKey;
+import org.graalvm.compiler.debug.DebugCloseable;
+import org.graalvm.compiler.debug.DebugContext;
+import org.graalvm.compiler.debug.GraalError;
+import org.graalvm.compiler.debug.TimerKey;
+import org.graalvm.compiler.lir.LIR;
+import org.graalvm.compiler.lir.alloc.OutOfRegistersException;
+import org.graalvm.compiler.lir.asm.CompilationResultBuilder;
+import org.graalvm.compiler.lir.asm.CompilationResultBuilderFactory;
+import org.graalvm.compiler.lir.framemap.FrameMap;
+import org.graalvm.compiler.lir.gen.LIRGenerationResult;
+import org.graalvm.compiler.lir.gen.LIRGeneratorTool;
+import org.graalvm.compiler.lir.phases.AllocationPhase.AllocationContext;
+import org.graalvm.compiler.lir.phases.LIRSuites;
+import org.graalvm.compiler.lir.phases.PostAllocationOptimizationPhase.PostAllocationOptimizationContext;
+import org.graalvm.compiler.lir.phases.PreAllocationOptimizationPhase.PreAllocationOptimizationContext;
+import org.graalvm.compiler.nodes.StructuredGraph;
+import org.graalvm.compiler.nodes.StructuredGraph.ScheduleResult;
+import org.graalvm.compiler.nodes.cfg.Block;
+import org.graalvm.compiler.nodes.spi.NodeLIRBuilderTool;
+
+import jdk.vm.ci.code.RegisterConfig;
+import jdk.vm.ci.code.TargetDescription;
+import jdk.vm.ci.code.site.ConstantReference;
+import jdk.vm.ci.code.site.DataPatch;
+import jdk.vm.ci.meta.Assumptions;
+import jdk.vm.ci.meta.JavaConstant;
+import jdk.vm.ci.meta.JavaKind;
+import jdk.vm.ci.meta.ResolvedJavaField;
+import jdk.vm.ci.meta.ResolvedJavaMethod;
+import jdk.vm.ci.meta.SpeculationLog;
+import jdk.vm.ci.meta.VMConstant;
+
+public class LIRCompilerBackend {
+ private static final TimerKey EmitLIR = DebugContext.timer("EmitLIR").doc("Time spent generating LIR from HIR.");
+ private static final TimerKey EmitCode = DebugContext.timer("EmitCode").doc("Time spent generating machine code from LIR.");
+ private static final TimerKey BackEnd = DebugContext.timer("BackEnd").doc("Time spent in EmitLIR and EmitCode.");
+
+ @SuppressWarnings("try")
+ public static <T extends CompilationResult> void emitBackEnd(StructuredGraph graph, Object stub, ResolvedJavaMethod installedCodeOwner, Backend backend, T compilationResult,
+ CompilationResultBuilderFactory factory, RegisterConfig registerConfig, LIRSuites lirSuites) {
+ DebugContext debug = graph.getDebug();
+ try (DebugContext.Scope s = debug.scope("BackEnd", graph.getLastSchedule()); DebugCloseable a = BackEnd.start(debug)) {
+ LIRGenerationResult lirGen = null;
+ lirGen = emitLIR(backend, graph, stub, registerConfig, lirSuites);
+ try (DebugContext.Scope s2 = debug.scope("CodeGen", lirGen, lirGen.getLIR())) {
+ int bytecodeSize = graph.method() == null ? 0 : graph.getBytecodeSize();
+ compilationResult.setHasUnsafeAccess(graph.hasUnsafeAccess());
+ emitCode(backend,
+ graph.getAssumptions(),
+ graph.method(),
+ graph.getMethods(),
+ graph.getFields(),
+ graph.getSpeculationLog(),
+ bytecodeSize,
+ lirGen,
+ compilationResult,
+ installedCodeOwner,
+ factory);
+ } catch (Throwable e) {
+ throw debug.handle(e);
+ }
+ } catch (Throwable e) {
+ throw debug.handle(e);
+ } finally {
+ graph.checkCancellation();
+ }
+ }
+
+ @SuppressWarnings("try")
+ public static LIRGenerationResult emitLIR(Backend backend, StructuredGraph graph, Object stub, RegisterConfig registerConfig, LIRSuites lirSuites) {
+ String registerPressure = GraalOptions.RegisterPressure.getValue(graph.getOptions());
+ String[] allocationRestrictedTo = registerPressure == null ? null : registerPressure.split(",");
+ try {
+ return emitLIR0(backend, graph, stub, registerConfig, lirSuites, allocationRestrictedTo);
+ } catch (OutOfRegistersException e) {
+ if (allocationRestrictedTo != null) {
+ allocationRestrictedTo = null;
+ return emitLIR0(backend, graph, stub, registerConfig, lirSuites, allocationRestrictedTo);
+ }
+ /* If the re-execution fails we convert the exception into a "hard" failure */
+ throw new GraalError(e);
+ } finally {
+ graph.checkCancellation();
+ }
+ }
+
+ @SuppressWarnings("try")
+ private static LIRGenerationResult emitLIR0(Backend backend, StructuredGraph graph, Object stub, RegisterConfig registerConfig, LIRSuites lirSuites,
+ String[] allocationRestrictedTo) {
+ DebugContext debug = graph.getDebug();
+ try (DebugContext.Scope ds = debug.scope("EmitLIR"); DebugCloseable a = EmitLIR.start(debug)) {
+ assert !graph.hasValueProxies();
+
+ ScheduleResult schedule = graph.getLastSchedule();
+ Block[] blocks = schedule.getCFG().getBlocks();
+ Block startBlock = schedule.getCFG().getStartBlock();
+ assert startBlock != null;
+ assert startBlock.getPredecessorCount() == 0;
+
+ AbstractBlockBase<?>[] codeEmittingOrder = ComputeBlockOrder.computeCodeEmittingOrder(blocks.length, startBlock);
+ AbstractBlockBase<?>[] linearScanOrder = ComputeBlockOrder.computeLinearScanOrder(blocks.length, startBlock);
+ LIR lir = new LIR(schedule.getCFG(), linearScanOrder, codeEmittingOrder, graph.getOptions(), graph.getDebug());
+
+ LIRGenerationProvider lirBackend = (LIRGenerationProvider) backend;
+ LIRGenerationResult lirGenRes = lirBackend.newLIRGenerationResult(graph.compilationId(), lir, registerConfig, graph, stub);
+ LIRGeneratorTool lirGen = lirBackend.newLIRGenerator(lirGenRes);
+ NodeLIRBuilderTool nodeLirGen = lirBackend.newNodeLIRBuilder(graph, lirGen);
+
+ // LIR generation
+ LIRGenerationContext context = new LIRGenerationContext(lirGen, nodeLirGen, graph, schedule);
+ new LIRGenerationPhase().apply(backend.getTarget(), lirGenRes, context);
+
+ try (DebugContext.Scope s = debug.scope("LIRStages", nodeLirGen, lirGenRes, lir)) {
+ // Dump LIR along with HIR (the LIR is looked up from context)
+ debug.dump(DebugContext.BASIC_LEVEL, graph.getLastSchedule(), "After LIR generation");
+ LIRGenerationResult result = emitLowLevel(backend.getTarget(), lirGenRes, lirGen, lirSuites, backend.newRegisterAllocationConfig(registerConfig, allocationRestrictedTo));
+ return result;
+ } catch (Throwable e) {
+ throw debug.handle(e);
+ }
+ } catch (Throwable e) {
+ throw debug.handle(e);
+ } finally {
+ graph.checkCancellation();
+ }
+ }
+
+ private static LIRGenerationResult emitLowLevel(TargetDescription target, LIRGenerationResult lirGenRes, LIRGeneratorTool lirGen, LIRSuites lirSuites,
+ RegisterAllocationConfig registerAllocationConfig) {
+ DebugContext debug = lirGenRes.getLIR().getDebug();
+ PreAllocationOptimizationContext preAllocOptContext = new PreAllocationOptimizationContext(lirGen);
+ lirSuites.getPreAllocationOptimizationStage().apply(target, lirGenRes, preAllocOptContext);
+ debug.dump(DebugContext.BASIC_LEVEL, lirGenRes.getLIR(), "After PreAllocationOptimizationStage");
+
+ AllocationContext allocContext = new AllocationContext(lirGen.getSpillMoveFactory(), registerAllocationConfig);
+ lirSuites.getAllocationStage().apply(target, lirGenRes, allocContext);
+ debug.dump(DebugContext.BASIC_LEVEL, lirGenRes.getLIR(), "After AllocationStage");
+
+ PostAllocationOptimizationContext postAllocOptContext = new PostAllocationOptimizationContext(lirGen);
+ lirSuites.getPostAllocationOptimizationStage().apply(target, lirGenRes, postAllocOptContext);
+ debug.dump(DebugContext.BASIC_LEVEL, lirGenRes.getLIR(), "After PostAllocationOptimizationStage");
+
+ return lirGenRes;
+ }
+
+ @SuppressWarnings("try")
+ public static void emitCode(Backend backend,
+ Assumptions assumptions,
+ ResolvedJavaMethod rootMethod,
+ Collection<ResolvedJavaMethod> inlinedMethods,
+ EconomicSet<ResolvedJavaField> accessedFields,
+ SpeculationLog speculationLog,
+ int bytecodeSize,
+ LIRGenerationResult lirGenRes,
+ CompilationResult compilationResult,
+ ResolvedJavaMethod installedCodeOwner,
+ CompilationResultBuilderFactory factory) {
+ DebugContext debug = lirGenRes.getLIR().getDebug();
+ try (DebugCloseable a = EmitCode.start(debug)) {
+ LIRGenerationProvider lirBackend = (LIRGenerationProvider) backend;
+
+ FrameMap frameMap = lirGenRes.getFrameMap();
+ CompilationResultBuilder crb = lirBackend.newCompilationResultBuilder(lirGenRes, frameMap, compilationResult, factory);
+ lirBackend.emitCode(crb, lirGenRes.getLIR(), installedCodeOwner);
+ if (assumptions != null && !assumptions.isEmpty()) {
+ compilationResult.setAssumptions(assumptions.toArray());
+ }
+ if (rootMethod != null) {
+ compilationResult.setMethods(rootMethod, inlinedMethods);
+ compilationResult.setFields(accessedFields);
+ compilationResult.setBytecodeSize(bytecodeSize);
+ }
+ if (speculationLog != null) {
+ compilationResult.setSpeculationLog(speculationLog);
+ }
+ crb.finish();
+ if (debug.isCountEnabled()) {
+ List<DataPatch> ldp = compilationResult.getDataPatches();
+ JavaKind[] kindValues = JavaKind.values();
+ CounterKey[] dms = new CounterKey[kindValues.length];
+ for (int i = 0; i < dms.length; i++) {
+ dms[i] = DebugContext.counter("DataPatches-%s", kindValues[i]);
+ }
+
+ for (DataPatch dp : ldp) {
+ JavaKind kind = JavaKind.Illegal;
+ if (dp.reference instanceof ConstantReference) {
+ VMConstant constant = ((ConstantReference) dp.reference).getConstant();
+ if (constant instanceof JavaConstant) {
+ kind = ((JavaConstant) constant).getJavaKind();
+ }
+ }
+ dms[kind.ordinal()].add(debug, 1);
+ }
+
+ DebugContext.counter("CompilationResults").increment(debug);
+ DebugContext.counter("CodeBytesEmitted").add(debug, compilationResult.getTargetCodeSize());
+ DebugContext.counter("InfopointsEmitted").add(debug, compilationResult.getInfopoints().size());
+ DebugContext.counter("DataPatches").add(debug, ldp.size());
+ DebugContext.counter("ExceptionHandlersEmitted").add(debug, compilationResult.getExceptionHandlers().size());
+ }
+
+ debug.dump(DebugContext.BASIC_LEVEL, compilationResult, "After code generation");
+ }
+ }
+}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core/src/org/graalvm/compiler/core/gen/LIRGenerationProvider.java Sat Mar 16 21:00:45 2019 +0000
@@ -0,0 +1,65 @@
+/*
+ * Copyright (c) 2017, 2018, Oracle and/or its affiliates. All rights reserved.
+ * 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.
+ */
+
+
+package org.graalvm.compiler.core.gen;
+
+import org.graalvm.compiler.code.CompilationResult;
+import org.graalvm.compiler.core.common.CompilationIdentifier;
+import org.graalvm.compiler.lir.LIR;
+import org.graalvm.compiler.lir.asm.CompilationResultBuilder;
+import org.graalvm.compiler.lir.asm.CompilationResultBuilderFactory;
+import org.graalvm.compiler.lir.framemap.FrameMap;
+import org.graalvm.compiler.lir.gen.LIRGenerationResult;
+import org.graalvm.compiler.lir.gen.LIRGeneratorTool;
+import org.graalvm.compiler.nodes.StructuredGraph;
+import org.graalvm.compiler.nodes.spi.NodeLIRBuilderTool;
+
+import jdk.vm.ci.code.RegisterConfig;
+import jdk.vm.ci.meta.ResolvedJavaMethod;
+
+/**
+ * Provides compiler backend-specific generation helpers for the {@link LIRCompilerBackend}.
+ */
+public interface LIRGenerationProvider {
+ LIRGeneratorTool newLIRGenerator(LIRGenerationResult lirGenRes);
+
+ LIRGenerationResult newLIRGenerationResult(CompilationIdentifier compilationId, LIR lir, RegisterConfig registerConfig, StructuredGraph graph,
+ Object stub);
+
+ NodeLIRBuilderTool newNodeLIRBuilder(StructuredGraph graph, LIRGeneratorTool lirGen);
+
+ /**
+ * Creates the object used to fill in the details of a given compilation result.
+ */
+ CompilationResultBuilder newCompilationResultBuilder(LIRGenerationResult lirGenResult, FrameMap frameMap, CompilationResult compilationResult,
+ CompilationResultBuilderFactory factory);
+
+ /**
+ * Emits the code for a given graph.
+ *
+ * @param installedCodeOwner the method the compiled code will be associated with once
+ * installed. This argument can be null.
+ */
+ void emitCode(CompilationResultBuilder crb, LIR lir, ResolvedJavaMethod installedCodeOwner);
+}
--- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core/src/org/graalvm/compiler/core/gen/NodeLIRBuilder.java Tue Mar 12 09:49:10 2019 +0000
+++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core/src/org/graalvm/compiler/core/gen/NodeLIRBuilder.java Sat Mar 16 21:00:45 2019 +0000
@@ -768,4 +768,13 @@
public LIRGeneratorTool getLIRGeneratorTool() {
return gen;
}
+
+ @Override
+ public void emitReadExceptionObject(ValueNode node) {
+ LIRGeneratorTool lirGenTool = getLIRGeneratorTool();
+ Value returnRegister = lirGenTool.getRegisterConfig().getReturnRegister(node.getStackKind()).asValue(
+ LIRKind.fromJavaKind(lirGenTool.target().arch, node.getStackKind()));
+ lirGenTool.emitIncomingValues(new Value[]{returnRegister});
+ setResult(node, lirGenTool.emitMove(returnRegister));
+ }
}
--- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core/src/org/graalvm/compiler/core/phases/HighTier.java Tue Mar 12 09:49:10 2019 +0000
+++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core/src/org/graalvm/compiler/core/phases/HighTier.java Sat Mar 16 21:00:45 2019 +0000
@@ -47,7 +47,7 @@
import org.graalvm.compiler.options.OptionValues;
import org.graalvm.compiler.phases.PhaseSuite;
import org.graalvm.compiler.phases.common.CanonicalizerPhase;
-import org.graalvm.compiler.phases.common.ConvertDeoptimizeToGuardPhase;
+import org.graalvm.compiler.loop.phases.ConvertDeoptimizeToGuardPhase;
import org.graalvm.compiler.phases.common.DeadCodeEliminationPhase;
import org.graalvm.compiler.phases.common.IncrementalCanonicalizerPhase;
import org.graalvm.compiler.phases.common.IterativeConditionalEliminationPhase;
--- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core/src/org/graalvm/compiler/core/phases/LowTier.java Tue Mar 12 09:49:10 2019 +0000
+++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core/src/org/graalvm/compiler/core/phases/LowTier.java Sat Mar 16 21:00:45 2019 +0000
@@ -39,6 +39,7 @@
import org.graalvm.compiler.phases.common.ExpandLogicPhase;
import org.graalvm.compiler.phases.common.FixReadsPhase;
import org.graalvm.compiler.phases.common.LoweringPhase;
+import org.graalvm.compiler.phases.common.OptimizeDivPhase;
import org.graalvm.compiler.phases.common.ProfileCompiledMethodsPhase;
import org.graalvm.compiler.phases.common.PropagateDeoptimizeProbabilityPhase;
import org.graalvm.compiler.phases.common.UseTrappingNullChecksPhase;
@@ -72,6 +73,8 @@
appendPhase(new LoweringPhase(canonicalizer, LoweringTool.StandardLoweringStage.LOW_TIER));
+ appendPhase(new OptimizeDivPhase());
+
appendPhase(new ExpandLogicPhase());
appendPhase(new FixReadsPhase(true, new SchedulePhase(GraalOptions.StressTestEarlyReads.getValue(options) ? SchedulingStrategy.EARLIEST : SchedulingStrategy.LATEST_OUT_OF_LOOPS)));
--- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core/src/org/graalvm/compiler/core/target/Backend.java Tue Mar 12 09:49:10 2019 +0000
+++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core/src/org/graalvm/compiler/core/target/Backend.java Sat Mar 16 21:00:45 2019 +0000
@@ -26,24 +26,17 @@
import java.util.ArrayList;
-import jdk.internal.vm.compiler.collections.EconomicSet;
-import org.graalvm.compiler.asm.Assembler;
import org.graalvm.compiler.code.CompilationResult;
import org.graalvm.compiler.core.common.CompilationIdentifier;
import org.graalvm.compiler.core.common.LIRKind;
import org.graalvm.compiler.core.common.alloc.RegisterAllocationConfig;
import org.graalvm.compiler.core.common.spi.ForeignCallDescriptor;
import org.graalvm.compiler.core.common.spi.ForeignCallsProvider;
+import org.graalvm.compiler.core.gen.LIRCompilerBackend;
import org.graalvm.compiler.debug.DebugContext;
-import org.graalvm.compiler.lir.LIR;
-import org.graalvm.compiler.lir.asm.CompilationResultBuilder;
import org.graalvm.compiler.lir.asm.CompilationResultBuilderFactory;
-import org.graalvm.compiler.lir.framemap.FrameMap;
-import org.graalvm.compiler.lir.framemap.FrameMapBuilder;
-import org.graalvm.compiler.lir.gen.LIRGenerationResult;
-import org.graalvm.compiler.lir.gen.LIRGeneratorTool;
+import org.graalvm.compiler.lir.phases.LIRSuites;
import org.graalvm.compiler.nodes.StructuredGraph;
-import org.graalvm.compiler.nodes.spi.NodeLIRBuilderTool;
import org.graalvm.compiler.options.OptionValues;
import org.graalvm.compiler.phases.tiers.SuitesProvider;
import org.graalvm.compiler.phases.tiers.TargetProvider;
@@ -54,7 +47,6 @@
import jdk.vm.ci.code.CompilationRequest;
import jdk.vm.ci.code.CompiledCode;
import jdk.vm.ci.code.InstalledCode;
-import jdk.vm.ci.code.Register;
import jdk.vm.ci.code.RegisterConfig;
import jdk.vm.ci.code.TargetDescription;
import jdk.vm.ci.code.ValueKindFactory;
@@ -62,7 +54,6 @@
import jdk.vm.ci.meta.JavaKind;
import jdk.vm.ci.meta.MetaAccessProvider;
import jdk.vm.ci.meta.ResolvedJavaMethod;
-import jdk.vm.ci.meta.SpeculationLog;
/**
* Represents a compiler backend for Graal.
@@ -117,12 +108,6 @@
}
/**
- * The given registerConfig is optional, in case null is passed the default RegisterConfig from
- * the CodeCacheProvider will be used.
- */
- public abstract FrameMapBuilder newFrameMapBuilder(RegisterConfig registerConfig);
-
- /**
* Creates a new configuration for register allocation.
*
* @param allocationRestrictedTo if not {@code null}, register allocation will be restricted to
@@ -130,26 +115,6 @@
*/
public abstract RegisterAllocationConfig newRegisterAllocationConfig(RegisterConfig registerConfig, String[] allocationRestrictedTo);
- public abstract FrameMap newFrameMap(RegisterConfig registerConfig);
-
- public abstract LIRGeneratorTool newLIRGenerator(LIRGenerationResult lirGenRes);
-
- public abstract LIRGenerationResult newLIRGenerationResult(CompilationIdentifier compilationId, LIR lir, FrameMapBuilder frameMapBuilder, StructuredGraph graph,
- Object stub);
-
- public abstract NodeLIRBuilderTool newNodeLIRBuilder(StructuredGraph graph, LIRGeneratorTool lirGen);
-
- /**
- * Creates the assembler used to emit the machine code.
- */
- protected abstract Assembler createAssembler(FrameMap frameMap);
-
- /**
- * Creates the object used to fill in the details of a given compilation result.
- */
- public abstract CompilationResultBuilder newCompilationResultBuilder(LIRGenerationResult lirGenResult, FrameMap frameMap, CompilationResult compilationResult,
- CompilationResultBuilderFactory factory);
-
/**
* Turns a Graal {@link CompilationResult} into a {@link CompiledCode} object that can be passed
* to the VM for code installation.
@@ -158,21 +123,28 @@
/**
* @see #createInstalledCode(DebugContext, ResolvedJavaMethod, CompilationRequest,
- * CompilationResult, SpeculationLog, InstalledCode, boolean, Object[])
+ * CompilationResult, InstalledCode, boolean, Object[])
*/
- public InstalledCode createInstalledCode(DebugContext debug, ResolvedJavaMethod method, CompilationResult compilationResult,
- SpeculationLog speculationLog, InstalledCode predefinedInstalledCode, boolean isDefault) {
- return createInstalledCode(debug, method, null, compilationResult, speculationLog, predefinedInstalledCode, isDefault, null);
+ public InstalledCode createInstalledCode(DebugContext debug,
+ ResolvedJavaMethod method,
+ CompilationResult compilationResult,
+ InstalledCode predefinedInstalledCode,
+ boolean isDefault) {
+ return createInstalledCode(debug, method, null, compilationResult, predefinedInstalledCode, isDefault, null);
}
/**
* @see #createInstalledCode(DebugContext, ResolvedJavaMethod, CompilationRequest,
- * CompilationResult, SpeculationLog, InstalledCode, boolean, Object[])
+ * CompilationResult, InstalledCode, boolean, Object[])
*/
@SuppressWarnings("try")
- public InstalledCode createInstalledCode(DebugContext debug, ResolvedJavaMethod method, CompilationRequest compilationRequest, CompilationResult compilationResult,
- SpeculationLog speculationLog, InstalledCode predefinedInstalledCode, boolean isDefault) {
- return createInstalledCode(debug, method, compilationRequest, compilationResult, speculationLog, predefinedInstalledCode, isDefault, null);
+ public InstalledCode createInstalledCode(DebugContext debug,
+ ResolvedJavaMethod method,
+ CompilationRequest compilationRequest,
+ CompilationResult compilationResult,
+ InstalledCode predefinedInstalledCode,
+ boolean isDefault) {
+ return createInstalledCode(debug, method, compilationRequest, compilationResult, predefinedInstalledCode, isDefault, null);
}
/**
@@ -185,7 +157,6 @@
* @param predefinedInstalledCode a pre-allocated {@link InstalledCode} object to use as a
* reference to the installed code. If {@code null}, a new {@link InstalledCode}
* object will be created.
- * @param speculationLog the speculation log to be used
* @param isDefault specifies if the installed code should be made the default implementation of
* {@code compRequest.getMethod()}. The default implementation for a method is the
* code executed for standard calls to the method. This argument is ignored if
@@ -198,8 +169,13 @@
* {@link InstalledCode} object
*/
@SuppressWarnings("try")
- public InstalledCode createInstalledCode(DebugContext debug, ResolvedJavaMethod method, CompilationRequest compilationRequest, CompilationResult compilationResult,
- SpeculationLog speculationLog, InstalledCode predefinedInstalledCode, boolean isDefault, Object[] context) {
+ public InstalledCode createInstalledCode(DebugContext debug,
+ ResolvedJavaMethod method,
+ CompilationRequest compilationRequest,
+ CompilationResult compilationResult,
+ InstalledCode predefinedInstalledCode,
+ boolean isDefault,
+ Object[] context) {
Object[] debugContext = context != null ? context : new Object[]{getProviders().getCodeCache(), method, compilationResult};
CodeInstallationTask[] tasks;
synchronized (this) {
@@ -215,7 +191,7 @@
try {
preCodeInstallationTasks(tasks, compilationResult);
CompiledCode compiledCode = createCompiledCode(method, compilationRequest, compilationResult, isDefault, debug.getOptions());
- installedCode = getProviders().getCodeCache().installCode(method, compiledCode, predefinedInstalledCode, speculationLog, isDefault);
+ installedCode = getProviders().getCodeCache().installCode(method, compiledCode, predefinedInstalledCode, compilationResult.getSpeculationLog(), isDefault);
assert predefinedInstalledCode == null || installedCode == predefinedInstalledCode;
} catch (Throwable t) {
failCodeInstallationTasks(tasks, t);
@@ -259,12 +235,15 @@
* @param method the method compiled to produce {@code compiledCode} or {@code null} if the
* input to {@code compResult} was not a {@link ResolvedJavaMethod}
* @param compilationRequest the request or {@code null}
- * @param compilationResult the code to be compiled
+ * @param compilationResult the compiled code
* @return a reference to the compiled and ready-to-run installed code
* @throws BailoutException if the code installation failed
*/
- public InstalledCode addInstalledCode(DebugContext debug, ResolvedJavaMethod method, CompilationRequest compilationRequest, CompilationResult compilationResult) {
- return createInstalledCode(debug, method, compilationRequest, compilationResult, null, null, false);
+ public InstalledCode addInstalledCode(DebugContext debug,
+ ResolvedJavaMethod method,
+ CompilationRequest compilationRequest,
+ CompilationResult compilationResult) {
+ return createInstalledCode(debug, method, compilationRequest, compilationResult, null, false);
}
/**
@@ -273,30 +252,16 @@
*
* @param method the method compiled to produce {@code compiledCode} or {@code null} if the
* input to {@code compResult} was not a {@link ResolvedJavaMethod}
- * @param compilationResult the code to be compiled
+ * @param compilationResult the compiled code
* @return a reference to the compiled and ready-to-run installed code
* @throws BailoutException if the code installation failed
*/
public InstalledCode createDefaultInstalledCode(DebugContext debug, ResolvedJavaMethod method, CompilationResult compilationResult) {
- return createInstalledCode(debug, method, compilationResult, null, null, true);
+ System.out.println(compilationResult.getSpeculationLog());
+ return createInstalledCode(debug, method, compilationResult, null, true);
}
/**
- * Emits the code for a given graph.
- *
- * @param installedCodeOwner the method the compiled code will be associated with once
- * installed. This argument can be null.
- */
- public abstract void emitCode(CompilationResultBuilder crb, LIR lir, ResolvedJavaMethod installedCodeOwner);
-
- /**
- * Translates a set of registers from the callee's perspective to the caller's perspective. This
- * is needed for architectures where input/output registers are renamed during a call (e.g.
- * register windows on SPARC). Registers which are not visible by the caller are removed.
- */
- public abstract EconomicSet<Register> translateToCallerRegisters(EconomicSet<Register> calleeRegisters);
-
- /**
* Gets the compilation id for a given {@link ResolvedJavaMethod}. Returns
* {@code CompilationIdentifier#INVALID_COMPILATION_ID} in case there is no such id.
*
@@ -306,6 +271,15 @@
return CompilationIdentifier.INVALID_COMPILATION_ID;
}
+ public void emitBackEnd(StructuredGraph graph,
+ Object stub,
+ ResolvedJavaMethod installedCodeOwner,
+ CompilationResult compilationResult,
+ CompilationResultBuilderFactory factory,
+ RegisterConfig config, LIRSuites lirSuites) {
+ LIRCompilerBackend.emitBackEnd(graph, stub, installedCodeOwner, this, compilationResult, factory, config, lirSuites);
+ }
+
/**
* Encapsulates custom tasks done before and after code installation.
*/
--- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.debug/src/org/graalvm/compiler/debug/DebugContext.java Tue Mar 12 09:49:10 2019 +0000
+++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.debug/src/org/graalvm/compiler/debug/DebugContext.java Sat Mar 16 21:00:45 2019 +0000
@@ -450,11 +450,11 @@
}
}
- public Path getDumpPath(String extension, boolean directory) {
+ public Path getDumpPath(String extension, boolean createMissingDirectory) {
try {
String id = description == null ? null : description.identifier;
String label = description == null ? null : description.getLabel();
- Path result = PathUtilities.createUnique(immutable.options, DumpPath, id, label, extension, directory);
+ Path result = PathUtilities.createUnique(immutable.options, DumpPath, id, label, extension, createMissingDirectory);
if (ShowDumpFiles.getValue(immutable.options)) {
TTY.println("Dumping debug output to %s", result.toAbsolutePath().toString());
}
@@ -807,8 +807,9 @@
return true;
}
return !currentScope.isTopLevel();
+ } else {
+ return false;
}
- return immutable.scopesEnabled && currentScope == null;
}
class DisabledScope implements DebugContext.Scope {
--- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.debug/src/org/graalvm/compiler/debug/DebugOptions.java Tue Mar 12 09:49:10 2019 +0000
+++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.debug/src/org/graalvm/compiler/debug/DebugOptions.java Sat Mar 16 21:00:45 2019 +0000
@@ -30,6 +30,7 @@
import java.nio.file.Paths;
import jdk.internal.vm.compiler.collections.EconomicMap;
+import org.graalvm.compiler.options.EnumOptionKey;
import org.graalvm.compiler.options.Option;
import org.graalvm.compiler.options.OptionKey;
import org.graalvm.compiler.options.OptionType;
@@ -40,20 +41,28 @@
* Options that configure a {@link DebugContext} and related functionality.
*/
public class DebugOptions {
- static class DeprecatedOptionKey<T> extends OptionKey<T> {
- private final OptionKey<T> replacement;
+
+ /**
+ * Values for the {@link DebugOptions#PrintGraph} option denoting where graphs dumped as a
+ * result of the {@link DebugOptions#Dump} option are sent.
+ */
+ public enum PrintGraphTarget {
+ /**
+ * Dump graphs to files.
+ */
+ File,
- DeprecatedOptionKey(OptionKey<T> replacement) {
- super(replacement.getDefaultValue());
- this.replacement = replacement;
- }
+ /**
+ * Dump graphs to the network. The network destination is specified by the
+ * {@link DebugOptions#PrintGraphHost} and {@link DebugOptions#PrintGraphPort} options. If a
+ * network connection cannot be opened, dumping falls back to {@link #File} dumping.
+ */
+ Network,
- @Override
- protected void onValueUpdate(EconomicMap<OptionKey<?>, Object> values, T oldValue, T newValue) {
- // Ideally we'd use TTY here but it may not yet be initialized.
- System.err.printf("Warning: the %s option is deprecated - use %s instead%n", getName(), replacement.getName());
- replacement.update(values, newValue);
- }
+ /**
+ * Do not dump graphs.
+ */
+ Disable;
}
// @formatter:off
@@ -118,7 +127,7 @@
public static final OptionKey<Boolean> LogVerbose = new OptionKey<>(false);
@Option(help = "The directory where various Graal dump files are written.")
- public static final OptionKey<String> DumpPath = new OptionKey<>("dumps");
+ public static final OptionKey<String> DumpPath = new OptionKey<>("graal_dumps");
@Option(help = "Print the name of each dump file path as it's created.")
public static final OptionKey<Boolean> ShowDumpFiles = new OptionKey<>(false);
@@ -127,15 +136,30 @@
@Option(help = "Enable dumping LIR, register allocation and code generation info to the C1Visualizer.", type = OptionType.Debug)
public static final OptionKey<Boolean> PrintBackendCFG = new OptionKey<>(true);
- @Option(help = "Enable dumping to the IdealGraphVisualizer.", type = OptionType.Debug)
- public static final OptionKey<Boolean> PrintGraph = new OptionKey<>(true);
- @Option(help = "Print graphs to files instead of sending them over the network.", type = OptionType.Debug)
- public static final OptionKey<Boolean> PrintGraphFile = new OptionKey<>(false);
+ @Option(help = "file:doc-files/PrintGraphHelp.txt", type = OptionType.Debug)
+ public static final EnumOptionKey<PrintGraphTarget> PrintGraph = new EnumOptionKey<>(PrintGraphTarget.File);
+
+ @Option(help = "Setting to true sets PrintGraph=file, setting to false sets PrintGraph=network", type = OptionType.Debug)
+ public static final OptionKey<Boolean> PrintGraphFile = new OptionKey<Boolean>(true) {
+ @Override
+ protected void onValueUpdate(EconomicMap<OptionKey<?>, Object> values, Boolean oldValue, Boolean newValue) {
+ PrintGraphTarget v = PrintGraph.getValueOrDefault(values);
+ if (newValue.booleanValue()) {
+ if (v != PrintGraphTarget.File) {
+ PrintGraph.update(values, PrintGraphTarget.File);
+ }
+ } else {
+ if (v != PrintGraphTarget.Network) {
+ PrintGraph.update(values, PrintGraphTarget.Network);
+ }
+ }
+ }
+ };
@Option(help = "Host part of the address to which graphs are dumped.", type = OptionType.Debug)
public static final OptionKey<String> PrintGraphHost = new OptionKey<>("127.0.0.1");
@Option(help = "Port part of the address to which graphs are dumped in binary format.", type = OptionType.Debug)
- public static final OptionKey<Integer> PrintBinaryGraphPort = new OptionKey<>(4445);
+ public static final OptionKey<Integer> PrintGraphPort = new OptionKey<>(4445);
@Option(help = "Schedule graphs as they are dumped.", type = OptionType.Debug)
public static final OptionKey<Boolean> PrintGraphWithSchedule = new OptionKey<>(false);
--- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.debug/src/org/graalvm/compiler/debug/IgvDumpChannel.java Tue Mar 12 09:49:10 2019 +0000
+++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.debug/src/org/graalvm/compiler/debug/IgvDumpChannel.java Sat Mar 16 21:00:45 2019 +0000
@@ -24,6 +24,10 @@
package org.graalvm.compiler.debug;
+import static org.graalvm.compiler.debug.DebugOptions.PrintGraphHost;
+import static org.graalvm.compiler.debug.DebugOptions.PrintGraphPort;
+
+import java.io.File;
import java.io.IOException;
import java.io.InterruptedIOException;
import java.net.InetSocketAddress;
@@ -35,10 +39,12 @@
import java.nio.file.Path;
import java.nio.file.StandardOpenOption;
import java.util.function.Supplier;
-import static org.graalvm.compiler.debug.DebugOptions.PrintBinaryGraphPort;
-import static org.graalvm.compiler.debug.DebugOptions.PrintGraphHost;
+
+import org.graalvm.compiler.debug.DebugOptions.PrintGraphTarget;
import org.graalvm.compiler.options.OptionValues;
+import jdk.vm.ci.common.NativeImageReinitialize;
+
final class IgvDumpChannel implements WritableByteChannel {
private final Supplier<Path> pathProvider;
private final OptionValues options;
@@ -52,7 +58,8 @@
@Override
public int write(ByteBuffer src) throws IOException {
- return channel().write(src);
+ WritableByteChannel channel = channel();
+ return channel == null ? 0 : channel.write(src);
}
@Override
@@ -77,10 +84,13 @@
throw new IOException();
}
if (sharedChannel == null) {
- if (DebugOptions.PrintGraphFile.getValue(options)) {
- sharedChannel = createFileChannel(pathProvider);
+ PrintGraphTarget target = DebugOptions.PrintGraph.getValue(options);
+ if (target == PrintGraphTarget.File) {
+ sharedChannel = createFileChannel(pathProvider, null);
+ } else if (target == PrintGraphTarget.Network) {
+ sharedChannel = createNetworkChannel(pathProvider, options);
} else {
- sharedChannel = createNetworkChannel(pathProvider, options);
+ TTY.println("WARNING: Graph dumping requested but value of %s option is %s", DebugOptions.PrintGraph.getName(), PrintGraphTarget.Disable);
}
}
return sharedChannel;
@@ -88,10 +98,11 @@
private static WritableByteChannel createNetworkChannel(Supplier<Path> pathProvider, OptionValues options) throws IOException {
String host = PrintGraphHost.getValue(options);
- int port = PrintBinaryGraphPort.getValue(options);
+ int port = PrintGraphPort.getValue(options);
try {
WritableByteChannel channel = SocketChannel.open(new InetSocketAddress(host, port));
- TTY.println("Connected to the IGV on %s:%d", host, port);
+ String targetAnnouncement = String.format("Connected to the IGV on %s:%d", host, port);
+ maybeAnnounceTarget(targetAnnouncement);
return channel;
} catch (ClosedByInterruptException | InterruptedIOException e) {
/*
@@ -101,18 +112,39 @@
*/
return null;
} catch (IOException e) {
- if (!DebugOptions.PrintGraphFile.hasBeenSet(options)) {
- return createFileChannel(pathProvider);
+ String networkFailure = String.format("Could not connect to the IGV on %s:%d", host, port);
+ if (pathProvider != null) {
+ return createFileChannel(pathProvider, networkFailure);
} else {
- throw new IOException(String.format("Could not connect to the IGV on %s:%d", host, port), e);
+ throw new IOException(networkFailure, e);
}
}
}
- private static WritableByteChannel createFileChannel(Supplier<Path> pathProvider) throws IOException {
+ @NativeImageReinitialize private static String lastTargetAnnouncement;
+
+ private static void maybeAnnounceTarget(String targetAnnouncement) {
+ if (!targetAnnouncement.equals(lastTargetAnnouncement)) {
+ // Ignore races - an extra announcement is ok
+ lastTargetAnnouncement = targetAnnouncement;
+ TTY.println(targetAnnouncement);
+ }
+ }
+
+ private static WritableByteChannel createFileChannel(Supplier<Path> pathProvider, String networkFailure) throws IOException {
Path path = pathProvider.get();
try {
- return FileChannel.open(path, StandardOpenOption.WRITE, StandardOpenOption.CREATE);
+ FileChannel channel = FileChannel.open(path, StandardOpenOption.WRITE, StandardOpenOption.CREATE);
+ File dir = path.toFile();
+ if (!dir.isDirectory()) {
+ dir = dir.getParentFile();
+ }
+ if (networkFailure == null) {
+ maybeAnnounceTarget("Dumping IGV graphs in " + dir);
+ } else {
+ maybeAnnounceTarget(networkFailure + ". Dumping IGV graphs in " + dir);
+ }
+ return channel;
} catch (IOException e) {
throw new IOException(String.format("Failed to open %s to dump IGV graphs", path), e);
}
--- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.debug/src/org/graalvm/compiler/debug/PathUtilities.java Tue Mar 12 09:49:10 2019 +0000
+++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.debug/src/org/graalvm/compiler/debug/PathUtilities.java Sat Mar 16 21:00:45 2019 +0000
@@ -84,7 +84,7 @@
private static final String ELLIPSIS = "...";
- static Path createUnique(OptionValues options, OptionKey<String> baseNameOption, String id, String label, String ext, boolean createDirectory) throws IOException {
+ static Path createUnique(OptionValues options, OptionKey<String> baseNameOption, String id, String label, String ext, boolean createMissingDirectory) throws IOException {
String uniqueTag = "";
int dumpCounter = 1;
String prefix;
@@ -118,7 +118,7 @@
Path dumpDir = DebugOptions.getDumpDirectory(options);
Path result = Paths.get(dumpDir.toString(), fileName);
try {
- if (createDirectory) {
+ if (createMissingDirectory) {
return Files.createDirectory(result);
} else {
try {
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.debug/src/org/graalvm/compiler/debug/doc-files/PrintGraphHelp.txt Sat Mar 16 21:00:45 2019 +0000
@@ -0,0 +1,6 @@
+Where IdealGraphVisualizer graph dumps triggered by Dump or DumpOnError should be written.
+The accepted values are:
+ File - Dump IGV graphs to the local file system (see DumpPath).
+ Network - Dump IGV graphs to the network destination specified by PrintGraphHost and PrintGraphPort.
+ If a network connection cannot be opened, dumping falls back to file dumping.
+ Disable - Do not dump IGV graphs.
\ No newline at end of file
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.graph.test/src/org/graalvm/compiler/graph/test/graphio/GraphOutputTest.java Sat Mar 16 21:00:45 2019 +0000
@@ -0,0 +1,284 @@
+/*
+ * 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.
+ */
+
+
+package org.graalvm.compiler.graph.test.graphio;
+
+import static org.junit.Assert.assertArrayEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
+
+import java.io.ByteArrayOutputStream;
+import java.io.IOException;
+import java.nio.ByteBuffer;
+import java.nio.channels.Channels;
+import java.nio.channels.WritableByteChannel;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.Map;
+import java.util.Objects;
+import org.graalvm.graphio.GraphOutput;
+import org.graalvm.graphio.GraphStructure;
+import org.junit.Test;
+
+public final class GraphOutputTest {
+
+ @Test
+ @SuppressWarnings("static-method")
+ public void testWritableByteChannel() throws IOException {
+ ByteArrayOutputStream out = new ByteArrayOutputStream();
+ WritableByteChannel channel = Channels.newChannel(out);
+ ByteBuffer data = generateData(1 << 17);
+ GraphOutput<?, ?> graphOutput = GraphOutput.newBuilder(new MockGraphStructure()).protocolVersion(6, 0).embedded(true).build(channel);
+ try (GraphOutput<?, ?> closable = graphOutput) {
+ assertTrue(closable.isOpen());
+ closable.write(data);
+ }
+ assertFalse(graphOutput.isOpen());
+ assertArrayEquals(data.array(), out.toByteArray());
+ }
+
+ @Test
+ @SuppressWarnings("static-method")
+ public void testWriteDuringPrint() throws IOException {
+ ByteArrayOutputStream out = new ByteArrayOutputStream();
+ WritableByteChannel channel = Channels.newChannel(out);
+ class Action implements Runnable {
+ GraphOutput<MockGraph, ?> out;
+
+ @Override
+ public void run() {
+ try {
+ ByteBuffer data = ByteBuffer.allocate(16);
+ data.limit(16);
+ out.write(data);
+ } catch (IOException ioe) {
+ throw new RuntimeException(ioe);
+ }
+ }
+ }
+ Action action = new Action();
+ try (GraphOutput<MockGraph, ?> graphOutput = GraphOutput.newBuilder(new MockGraphStructure(action)).protocolVersion(6, 0).build(channel)) {
+ action.out = graphOutput;
+ try {
+ graphOutput.print(new MockGraph(), Collections.emptyMap(), 0, "Mock Graph");
+ fail("Expected IllegalStateException");
+ } catch (IllegalStateException ise) {
+ // expected exception
+ }
+ }
+ }
+
+ @Test
+ @SuppressWarnings("static-method")
+ public void testEmbeddedWritableByteChannel() throws IOException {
+ ByteArrayOutputStream expected = new ByteArrayOutputStream();
+ WritableByteChannel expectedChannel = Channels.newChannel(expected);
+ Map<Object, Object> properties = Collections.singletonMap("version.id", 1);
+ try (GraphOutput<MockGraph, ?> graphOutput = GraphOutput.newBuilder(new MockGraphStructure()).protocolVersion(6, 0).build(expectedChannel)) {
+ graphOutput.print(new MockGraph(), properties, 1, "Graph 1");
+ graphOutput.write(ByteBuffer.allocate(0));
+ graphOutput.print(new MockGraph(), properties, 2, "Graph 1");
+ }
+ ByteArrayOutputStream embedded = new ByteArrayOutputStream();
+ SharedWritableByteChannel embeddChannel = new SharedWritableByteChannel(Channels.newChannel(embedded));
+ try {
+ try (GraphOutput<MockGraph, ?> baseOutput = GraphOutput.newBuilder(new MockGraphStructure()).protocolVersion(6, 0).build(embeddChannel)) {
+ try (GraphOutput<MockGraph, ?> embeddedOutput = GraphOutput.newBuilder(new MockGraphStructure()).protocolVersion(6, 0).embedded(true).build((WritableByteChannel) baseOutput)) {
+ embeddedOutput.print(new MockGraph(), properties, 1, "Graph 1");
+ baseOutput.print(new MockGraph(), properties, 2, "Graph 1");
+ }
+ }
+ } finally {
+ embeddChannel.realClose();
+ }
+ assertArrayEquals(expected.toByteArray(), embedded.toByteArray());
+ }
+
+ private static ByteBuffer generateData(int size) {
+ ByteBuffer buffer = ByteBuffer.allocate(size);
+ for (int i = 0; i < size; i++) {
+ buffer.put(i, (byte) i);
+ }
+ buffer.limit(size);
+ return buffer;
+ }
+
+ private static final class SharedWritableByteChannel implements WritableByteChannel {
+
+ private final WritableByteChannel delegate;
+
+ SharedWritableByteChannel(WritableByteChannel delegate) {
+ Objects.requireNonNull(delegate, "Delegate must be non null.");
+ this.delegate = delegate;
+ }
+
+ @Override
+ public int write(ByteBuffer bb) throws IOException {
+ return delegate.write(bb);
+ }
+
+ @Override
+ public boolean isOpen() {
+ return delegate.isOpen();
+ }
+
+ @Override
+ public void close() throws IOException {
+ }
+
+ void realClose() throws IOException {
+ delegate.close();
+ }
+ }
+
+ private static final class MockGraphStructure implements GraphStructure<MockGraph, Void, Void, Void> {
+
+ private final Runnable enterAction;
+
+ MockGraphStructure() {
+ this.enterAction = null;
+ }
+
+ MockGraphStructure(Runnable enterAction) {
+ this.enterAction = enterAction;
+ }
+
+ @Override
+ public MockGraph graph(MockGraph currentGraph, Object obj) {
+ onEnter();
+ return null;
+ }
+
+ @Override
+ public Iterable<? extends Void> nodes(MockGraph graph) {
+ onEnter();
+ return Collections.emptySet();
+ }
+
+ @Override
+ public int nodesCount(MockGraph graph) {
+ onEnter();
+ return 0;
+ }
+
+ @Override
+ public int nodeId(Void node) {
+ onEnter();
+ return 0;
+ }
+
+ @Override
+ public boolean nodeHasPredecessor(Void node) {
+ onEnter();
+ return false;
+ }
+
+ @Override
+ public void nodeProperties(MockGraph graph, Void node, Map<String, ? super Object> properties) {
+ onEnter();
+ }
+
+ @Override
+ public Void node(Object obj) {
+ onEnter();
+ return null;
+ }
+
+ @Override
+ public Void nodeClass(Object obj) {
+ onEnter();
+ return null;
+ }
+
+ @Override
+ public Void classForNode(Void node) {
+ onEnter();
+ return null;
+ }
+
+ @Override
+ public String nameTemplate(Void nodeClass) {
+ onEnter();
+ return null;
+ }
+
+ @Override
+ public Object nodeClassType(Void nodeClass) {
+ onEnter();
+ return null;
+ }
+
+ @Override
+ public Void portInputs(Void nodeClass) {
+ onEnter();
+ return null;
+ }
+
+ @Override
+ public Void portOutputs(Void nodeClass) {
+ onEnter();
+ return null;
+ }
+
+ @Override
+ public int portSize(Void port) {
+ onEnter();
+ return 0;
+ }
+
+ @Override
+ public boolean edgeDirect(Void port, int index) {
+ onEnter();
+ return false;
+ }
+
+ @Override
+ public String edgeName(Void port, int index) {
+ onEnter();
+ return null;
+ }
+
+ @Override
+ public Object edgeType(Void port, int index) {
+ onEnter();
+ return null;
+ }
+
+ @Override
+ public Collection<? extends Void> edgeNodes(MockGraph graph, Void node, Void port, int index) {
+ onEnter();
+ return null;
+ }
+
+ private void onEnter() {
+ if (enterAction != null) {
+ enterAction.run();
+ }
+ }
+ }
+
+ private static final class MockGraph {
+ }
+}
--- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.graph/src/org/graalvm/compiler/graph/NodeClass.java Tue Mar 12 09:49:10 2019 +0000
+++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.graph/src/org/graalvm/compiler/graph/NodeClass.java Sat Mar 16 21:00:45 2019 +0000
@@ -24,9 +24,7 @@
package org.graalvm.compiler.graph;
-import static org.graalvm.compiler.core.common.Fields.translateInto;
import static org.graalvm.compiler.debug.GraalError.shouldNotReachHere;
-import static org.graalvm.compiler.graph.Edges.translateInto;
import static org.graalvm.compiler.graph.Graph.isModificationCountsEnabled;
import static org.graalvm.compiler.graph.InputEdges.translateInto;
import static org.graalvm.compiler.graph.Node.WithAllEdges;
--- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot.aarch64/src/org/graalvm/compiler/hotspot/aarch64/AArch64HotSpotBackend.java Tue Mar 12 09:49:10 2019 +0000
+++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot.aarch64/src/org/graalvm/compiler/hotspot/aarch64/AArch64HotSpotBackend.java Sat Mar 16 21:00:45 2019 +0000
@@ -36,6 +36,7 @@
import jdk.internal.vm.compiler.collections.EconomicSet;
import org.graalvm.compiler.asm.Assembler;
+import org.graalvm.compiler.asm.BranchTargetOutOfBoundsException;
import org.graalvm.compiler.asm.Label;
import org.graalvm.compiler.asm.aarch64.AArch64Address;
import org.graalvm.compiler.asm.aarch64.AArch64Assembler;
@@ -47,6 +48,7 @@
import org.graalvm.compiler.core.common.LIRKind;
import org.graalvm.compiler.core.common.alloc.RegisterAllocationConfig;
import org.graalvm.compiler.core.common.spi.ForeignCallLinkage;
+import org.graalvm.compiler.core.gen.LIRGenerationProvider;
import org.graalvm.compiler.hotspot.GraalHotSpotVMConfig;
import org.graalvm.compiler.hotspot.HotSpotDataBuilder;
import org.graalvm.compiler.hotspot.HotSpotGraalRuntimeProvider;
@@ -86,21 +88,16 @@
/**
* HotSpot AArch64 specific backend.
*/
-public class AArch64HotSpotBackend extends HotSpotHostBackend {
+public class AArch64HotSpotBackend extends HotSpotHostBackend implements LIRGenerationProvider {
public AArch64HotSpotBackend(GraalHotSpotVMConfig config, HotSpotGraalRuntimeProvider runtime, HotSpotProviders providers) {
super(config, runtime, providers);
}
- @Override
- public FrameMapBuilder newFrameMapBuilder(RegisterConfig registerConfig) {
+ private FrameMapBuilder newFrameMapBuilder(RegisterConfig registerConfig) {
RegisterConfig registerConfigNonNull = registerConfig == null ? getCodeCache().getRegisterConfig() : registerConfig;
- return new AArch64FrameMapBuilder(newFrameMap(registerConfigNonNull), getCodeCache(), registerConfigNonNull);
- }
-
- @Override
- public FrameMap newFrameMap(RegisterConfig registerConfig) {
- return new AArch64FrameMap(getCodeCache(), registerConfig, this);
+ FrameMap frameMap = new AArch64FrameMap(getCodeCache(), registerConfigNonNull, this);
+ return new AArch64FrameMapBuilder(frameMap, getCodeCache(), registerConfigNonNull);
}
@Override
@@ -109,8 +106,9 @@
}
@Override
- public LIRGenerationResult newLIRGenerationResult(CompilationIdentifier compilationId, LIR lir, FrameMapBuilder frameMapBuilder, StructuredGraph graph, Object stub) {
- return new HotSpotLIRGenerationResult(compilationId, lir, frameMapBuilder, makeCallingConvention(graph, (Stub) stub), stub, config.requiresReservedStackCheck(graph.getMethods()));
+ public LIRGenerationResult newLIRGenerationResult(CompilationIdentifier compilationId, LIR lir, RegisterConfig registerConfig, StructuredGraph graph, Object stub) {
+ return new HotSpotLIRGenerationResult(compilationId, lir, newFrameMapBuilder(registerConfig), makeCallingConvention(graph, (Stub) stub), stub,
+ config.requiresReservedStackCheck(graph.getMethods()));
}
@Override
@@ -219,18 +217,13 @@
}
@Override
- protected Assembler createAssembler(FrameMap frameMap) {
- return new AArch64MacroAssembler(getTarget());
- }
-
- @Override
public CompilationResultBuilder newCompilationResultBuilder(LIRGenerationResult lirGenRen, FrameMap frameMap, CompilationResult compilationResult, CompilationResultBuilderFactory factory) {
HotSpotLIRGenerationResult gen = (HotSpotLIRGenerationResult) lirGenRen;
LIR lir = gen.getLIR();
assert gen.getDeoptimizationRescueSlot() == null || frameMap.frameNeedsAllocating() : "method that can deoptimize must have a frame";
Stub stub = gen.getStub();
- Assembler masm = createAssembler(frameMap);
+ Assembler masm = new AArch64MacroAssembler(getTarget());
HotSpotFrameContext frameContext = new HotSpotFrameContext(stub != null);
DataBuilder dataBuilder = new HotSpotDataBuilder(getCodeCache().getTarget());
@@ -252,11 +245,25 @@
@Override
public void emitCode(CompilationResultBuilder crb, LIR lir, ResolvedJavaMethod installedCodeOwner) {
+ Label verifiedStub = new Label();
+ crb.buildLabelOffsets(lir);
+ try {
+ emitCode(crb, lir, installedCodeOwner, verifiedStub);
+ } catch (BranchTargetOutOfBoundsException e) {
+ // A branch estimation was wrong, now retry with conservative label ranges, this
+ // should always work
+ crb.setConservativeLabelRanges();
+ crb.resetForEmittingCode();
+ lir.resetLabels();
+ verifiedStub.reset();
+ emitCode(crb, lir, installedCodeOwner, verifiedStub);
+ }
+ }
+
+ private void emitCode(CompilationResultBuilder crb, LIR lir, ResolvedJavaMethod installedCodeOwner, Label verifiedStub) {
AArch64MacroAssembler masm = (AArch64MacroAssembler) crb.asm;
FrameMap frameMap = crb.frameMap;
RegisterConfig regConfig = frameMap.getRegisterConfig();
- Label verifiedStub = new Label();
-
emitCodePrefix(crb, installedCodeOwner, masm, regConfig, verifiedStub);
emitCodeBody(crb, lir, masm);
emitCodeSuffix(crb, masm, frameMap);
--- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot.aarch64/src/org/graalvm/compiler/hotspot/aarch64/AArch64HotSpotJumpToExceptionHandlerInCallerOp.java Tue Mar 12 09:49:10 2019 +0000
+++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot.aarch64/src/org/graalvm/compiler/hotspot/aarch64/AArch64HotSpotJumpToExceptionHandlerInCallerOp.java Sat Mar 16 21:00:45 2019 +0000
@@ -37,7 +37,7 @@
import org.graalvm.compiler.lir.LIRInstructionClass;
import org.graalvm.compiler.lir.Opcode;
import org.graalvm.compiler.lir.asm.CompilationResultBuilder;
-import org.graalvm.compiler.serviceprovider.GraalServices;
+import org.graalvm.compiler.serviceprovider.JavaVersionUtil;
import jdk.vm.ci.code.Register;
import jdk.vm.ci.meta.AllocatableValue;
@@ -71,7 +71,7 @@
public void emitCode(CompilationResultBuilder crb, AArch64MacroAssembler masm) {
leaveFrame(crb, masm, /* emitSafepoint */false, false);
- if (GraalServices.JAVA_SPECIFICATION_VERSION < 8) {
+ if (JavaVersionUtil.JAVA_SPECIFICATION_VERSION < 8) {
// Restore sp from fp if the exception PC is a method handle call site.
try (ScratchRegister sc = masm.getScratchRegister()) {
Register scratch = sc.getRegister();
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot.amd64.test/src/org/graalvm/compiler/hotspot/amd64/test/BinaryMathStubTest.java Sat Mar 16 21:00:45 2019 +0000
@@ -0,0 +1,78 @@
+/*
+ * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved.
+ * 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.
+ */
+
+
+package org.graalvm.compiler.hotspot.amd64.test;
+
+import static org.junit.Assume.assumeTrue;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import org.graalvm.compiler.api.test.Graal;
+import org.graalvm.compiler.core.test.GraalCompilerTest;
+import org.graalvm.compiler.runtime.RuntimeProvider;
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.junit.runners.Parameterized;
+
+import jdk.vm.ci.amd64.AMD64;
+import jdk.vm.ci.code.Architecture;
+
+@RunWith(Parameterized.class)
+public class BinaryMathStubTest extends GraalCompilerTest {
+
+ @Parameterized.Parameters(name = "{0}")
+ public static List<Object[]> data() {
+ ArrayList<Object[]> ret = new ArrayList<>();
+ ret.add(new Object[]{"pow"});
+ return ret;
+ }
+
+ private static final double[] inputs = {0.0D, Math.PI / 2, Math.PI, -1.0D, Double.MAX_VALUE, Double.MIN_VALUE, Double.NaN, Double.POSITIVE_INFINITY, Double.NEGATIVE_INFINITY};
+ private final String stub;
+
+ public BinaryMathStubTest(String stub) {
+ this.stub = stub;
+ }
+
+ @Before
+ public void checkAMD64() {
+ Architecture arch = Graal.getRequiredCapability(RuntimeProvider.class).getHostBackend().getTarget().arch;
+ assumeTrue("skipping AMD64 specific test", arch instanceof AMD64);
+ }
+
+ public static double pow(double x, double y) {
+ return Math.pow(x, y);
+ }
+
+ @Test
+ public void testStub() {
+ for (double x : inputs) {
+ for (double y : inputs) {
+ test(stub, x, y);
+ }
+ }
+ }
+}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot.amd64.test/src/org/graalvm/compiler/hotspot/amd64/test/UnaryMathStubTest.java Sat Mar 16 21:00:45 2019 +0000
@@ -0,0 +1,101 @@
+/*
+ * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved.
+ * 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.
+ */
+
+
+package org.graalvm.compiler.hotspot.amd64.test;
+
+import static org.junit.Assume.assumeTrue;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import org.graalvm.compiler.api.test.Graal;
+import org.graalvm.compiler.core.test.GraalCompilerTest;
+import org.graalvm.compiler.runtime.RuntimeProvider;
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.junit.runners.Parameterized;
+
+import jdk.vm.ci.amd64.AMD64;
+import jdk.vm.ci.code.Architecture;
+
+@RunWith(Parameterized.class)
+public class UnaryMathStubTest extends GraalCompilerTest {
+
+ @Parameterized.Parameters(name = "{0}")
+ public static List<Object[]> data() {
+ ArrayList<Object[]> ret = new ArrayList<>();
+ ret.add(new Object[]{"sin"});
+ ret.add(new Object[]{"cos"});
+ ret.add(new Object[]{"tan"});
+ ret.add(new Object[]{"exp"});
+ ret.add(new Object[]{"log"});
+ ret.add(new Object[]{"log10"});
+ return ret;
+ }
+
+ private static final double[] inputs = {0.0D, Math.PI / 2, Math.PI, -1.0D, Double.MAX_VALUE, Double.MIN_VALUE, Double.NaN, Double.POSITIVE_INFINITY, Double.NEGATIVE_INFINITY};
+ private final String stub;
+
+ public UnaryMathStubTest(String stub) {
+ this.stub = stub;
+ }
+
+ @Before
+ public void checkAMD64() {
+ Architecture arch = Graal.getRequiredCapability(RuntimeProvider.class).getHostBackend().getTarget().arch;
+ assumeTrue("skipping AMD64 specific test", arch instanceof AMD64);
+ }
+
+ public static double sin(double value) {
+ return Math.sin(value);
+ }
+
+ public static double cos(double value) {
+ return Math.cos(value);
+ }
+
+ public static double tan(double value) {
+ return Math.tan(value);
+ }
+
+ public static double exp(double value) {
+ return Math.exp(value);
+ }
+
+ public static double log(double value) {
+ return Math.log(value);
+ }
+
+ public static double log10(double value) {
+ return Math.log10(value);
+ }
+
+ @Test
+ public void testStub() {
+ for (double input : inputs) {
+ test(stub, input);
+ }
+ }
+}
--- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot.amd64/src/org/graalvm/compiler/hotspot/amd64/AMD64HotSpotAddressLowering.java Tue Mar 12 09:49:10 2019 +0000
+++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot.amd64/src/org/graalvm/compiler/hotspot/amd64/AMD64HotSpotAddressLowering.java Sat Mar 16 21:00:45 2019 +0000
@@ -199,7 +199,7 @@
CountedLoopInfo countedLoopInfo = loop.counted();
IntegerStamp initStamp = (IntegerStamp) inductionVariable.initNode().stamp(NodeView.DEFAULT);
if (initStamp.isPositive()) {
- if (inductionVariable.isConstantExtremum()) {
+ if (inductionVariable.isConstantExtremum() && countedLoopInfo.counterNeverOverflows()) {
long init = inductionVariable.constantInit();
long stride = inductionVariable.constantStride();
long extremum = inductionVariable.constantExtremum();
@@ -211,7 +211,9 @@
}
}
}
- if (countedLoopInfo.getCounter() == inductionVariable && inductionVariable.direction() == InductionVariable.Direction.Up && countedLoopInfo.getOverFlowGuard() != null) {
+ if (countedLoopInfo.getCounter() == inductionVariable &&
+ inductionVariable.direction() == InductionVariable.Direction.Up &&
+ (countedLoopInfo.getOverFlowGuard() != null || countedLoopInfo.counterNeverOverflows())) {
return graph.unique(new ZeroExtendNode(input, INT_BITS, ADDRESS_BITS, true));
}
}
--- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot.amd64/src/org/graalvm/compiler/hotspot/amd64/AMD64HotSpotBackend.java Tue Mar 12 09:49:10 2019 +0000
+++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot.amd64/src/org/graalvm/compiler/hotspot/amd64/AMD64HotSpotBackend.java Sat Mar 16 21:00:45 2019 +0000
@@ -43,7 +43,7 @@
import org.graalvm.compiler.core.common.CompilationIdentifier;
import org.graalvm.compiler.core.common.LIRKind;
import org.graalvm.compiler.core.common.alloc.RegisterAllocationConfig;
-import org.graalvm.compiler.core.target.Backend;
+import org.graalvm.compiler.core.gen.LIRGenerationProvider;
import org.graalvm.compiler.debug.DebugContext;
import org.graalvm.compiler.hotspot.GraalHotSpotVMConfig;
import org.graalvm.compiler.hotspot.HotSpotDataBuilder;
@@ -85,21 +85,16 @@
/**
* HotSpot AMD64 specific backend.
*/
-public class AMD64HotSpotBackend extends HotSpotHostBackend {
+public class AMD64HotSpotBackend extends HotSpotHostBackend implements LIRGenerationProvider {
public AMD64HotSpotBackend(GraalHotSpotVMConfig config, HotSpotGraalRuntimeProvider runtime, HotSpotProviders providers) {
super(config, runtime, providers);
}
- @Override
- public FrameMapBuilder newFrameMapBuilder(RegisterConfig registerConfig) {
+ private FrameMapBuilder newFrameMapBuilder(RegisterConfig registerConfig) {
RegisterConfig registerConfigNonNull = registerConfig == null ? getCodeCache().getRegisterConfig() : registerConfig;
- return new AMD64FrameMapBuilder(newFrameMap(registerConfigNonNull), getCodeCache(), registerConfigNonNull);
- }
-
- @Override
- public FrameMap newFrameMap(RegisterConfig registerConfig) {
- return new AMD64FrameMap(getCodeCache(), registerConfig, this);
+ FrameMap frameMap = new AMD64FrameMap(getCodeCache(), registerConfigNonNull, this);
+ return new AMD64FrameMapBuilder(frameMap, getCodeCache(), registerConfigNonNull);
}
@Override
@@ -108,8 +103,9 @@
}
@Override
- public LIRGenerationResult newLIRGenerationResult(CompilationIdentifier compilationId, LIR lir, FrameMapBuilder frameMapBuilder, StructuredGraph graph, Object stub) {
- return new HotSpotLIRGenerationResult(compilationId, lir, frameMapBuilder, makeCallingConvention(graph, (Stub) stub), stub, config.requiresReservedStackCheck(graph.getMethods()));
+ public LIRGenerationResult newLIRGenerationResult(CompilationIdentifier compilationId, LIR lir, RegisterConfig registerConfig, StructuredGraph graph, Object stub) {
+ return new HotSpotLIRGenerationResult(compilationId, lir, newFrameMapBuilder(registerConfig), makeCallingConvention(graph, (Stub) stub), stub,
+ config.requiresReservedStackCheck(graph.getMethods()));
}
@Override
@@ -196,11 +192,6 @@
}
@Override
- protected Assembler createAssembler(FrameMap frameMap) {
- return new AMD64MacroAssembler(getTarget());
- }
-
- @Override
public CompilationResultBuilder newCompilationResultBuilder(LIRGenerationResult lirGenRen, FrameMap frameMap, CompilationResult compilationResult, CompilationResultBuilderFactory factory) {
// Omit the frame if the method:
// - has no spill slots or other slots allocated during register allocation
@@ -216,7 +207,7 @@
boolean omitFrame = CanOmitFrame.getValue(options) && !frameMap.frameNeedsAllocating() && !lir.hasArgInCallerFrame() && !gen.hasForeignCall();
Stub stub = gen.getStub();
- Assembler masm = createAssembler(frameMap);
+ Assembler masm = new AMD64MacroAssembler(getTarget());
HotSpotFrameContext frameContext = new HotSpotFrameContext(stub != null, omitFrame);
DataBuilder dataBuilder = new HotSpotDataBuilder(getCodeCache().getTarget());
CompilationResultBuilder crb = factory.createBuilder(getCodeCache(), getForeignCalls(), frameMap, masm, dataBuilder, frameContext, options, debug, compilationResult, Register.None);
@@ -258,7 +249,7 @@
/**
* Emits the code prior to the verified entry point.
*
- * @param installedCodeOwner see {@link Backend#emitCode}
+ * @param installedCodeOwner see {@link LIRGenerationProvider#emitCode}
*/
public void emitCodePrefix(ResolvedJavaMethod installedCodeOwner, CompilationResultBuilder crb, AMD64MacroAssembler asm, RegisterConfig regConfig, Label verifiedEntry) {
HotSpotProviders providers = getProviders();
@@ -309,14 +300,14 @@
/**
* Emits the code which starts at the verified entry point.
*
- * @param installedCodeOwner see {@link Backend#emitCode}
+ * @param installedCodeOwner see {@link LIRGenerationProvider#emitCode}
*/
public void emitCodeBody(ResolvedJavaMethod installedCodeOwner, CompilationResultBuilder crb, LIR lir) {
crb.emit(lir);
}
/**
- * @param installedCodeOwner see {@link Backend#emitCode}
+ * @param installedCodeOwner see {@link LIRGenerationProvider#emitCode}
*/
public void emitCodeSuffix(ResolvedJavaMethod installedCodeOwner, CompilationResultBuilder crb, AMD64MacroAssembler asm, FrameMap frameMap) {
HotSpotProviders providers = getProviders();
--- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot.amd64/src/org/graalvm/compiler/hotspot/amd64/AMD64HotSpotBackendFactory.java Tue Mar 12 09:49:10 2019 +0000
+++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot.amd64/src/org/graalvm/compiler/hotspot/amd64/AMD64HotSpotBackendFactory.java Sat Mar 16 21:00:45 2019 +0000
@@ -25,7 +25,6 @@
package org.graalvm.compiler.hotspot.amd64;
import static jdk.vm.ci.common.InitTimer.timer;
-import static org.graalvm.compiler.hotspot.HotSpotBackend.Options.GraalArithmeticStubs;
import java.util.ArrayList;
import java.util.List;
@@ -141,7 +140,7 @@
replacements = createReplacements(options, p, snippetReflection, bytecodeProvider);
}
try (InitTimer rt = timer("create GraphBuilderPhase plugins")) {
- plugins = createGraphBuilderPlugins(compilerConfiguration, config, options, target, constantReflection, foreignCalls, metaAccess, snippetReflection, replacements, wordTypes);
+ plugins = createGraphBuilderPlugins(compilerConfiguration, config, target, constantReflection, foreignCalls, metaAccess, snippetReflection, replacements, wordTypes);
replacements.setGraphBuilderPlugins(plugins);
}
try (InitTimer rt = timer("create Suites provider")) {
@@ -157,11 +156,11 @@
}
}
- protected Plugins createGraphBuilderPlugins(CompilerConfiguration compilerConfiguration, GraalHotSpotVMConfig config, OptionValues options, TargetDescription target,
+ protected Plugins createGraphBuilderPlugins(CompilerConfiguration compilerConfiguration, GraalHotSpotVMConfig config, TargetDescription target,
HotSpotConstantReflectionProvider constantReflection, HotSpotHostForeignCallsProvider foreignCalls, HotSpotMetaAccessProvider metaAccess,
HotSpotSnippetReflectionProvider snippetReflection, HotSpotReplacementsImpl replacements, HotSpotWordTypes wordTypes) {
Plugins plugins = HotSpotGraphBuilderPlugins.create(compilerConfiguration, config, wordTypes, metaAccess, constantReflection, snippetReflection, foreignCalls, replacements);
- AMD64GraphBuilderPlugins.register(plugins, replacements.getDefaultReplacementBytecodeProvider(), (AMD64) target.arch, GraalArithmeticStubs.getValue(options), false);
+ AMD64GraphBuilderPlugins.register(plugins, replacements.getDefaultReplacementBytecodeProvider(), (AMD64) target.arch, false);
return plugins;
}
--- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot.amd64/src/org/graalvm/compiler/hotspot/amd64/AMD64HotSpotForeignCallsProvider.java Tue Mar 12 09:49:10 2019 +0000
+++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot.amd64/src/org/graalvm/compiler/hotspot/amd64/AMD64HotSpotForeignCallsProvider.java Sat Mar 16 21:00:45 2019 +0000
@@ -30,6 +30,7 @@
import static jdk.vm.ci.meta.Value.ILLEGAL;
import static org.graalvm.compiler.hotspot.HotSpotBackend.EXCEPTION_HANDLER;
import static org.graalvm.compiler.hotspot.HotSpotBackend.EXCEPTION_HANDLER_IN_CALLER;
+import static org.graalvm.compiler.hotspot.HotSpotBackend.Options.GraalArithmeticStubs;
import static org.graalvm.compiler.hotspot.HotSpotForeignCallLinkage.JUMP_ADDRESS;
import static org.graalvm.compiler.hotspot.HotSpotForeignCallLinkage.Reexecutability.REEXECUTABLE;
import static org.graalvm.compiler.hotspot.HotSpotForeignCallLinkage.Reexecutability.REEXECUTABLE_ONLY_AFTER_EXCEPTION;
@@ -38,10 +39,16 @@
import static org.graalvm.compiler.hotspot.HotSpotForeignCallLinkage.Transition.LEAF_NOFP;
import static org.graalvm.compiler.hotspot.replacements.CRC32CSubstitutions.UPDATE_BYTES_CRC32C;
import static org.graalvm.compiler.hotspot.replacements.CRC32Substitutions.UPDATE_BYTES_CRC32;
+import static org.graalvm.compiler.replacements.nodes.BinaryMathIntrinsicNode.BinaryOperation.POW;
+import static org.graalvm.compiler.replacements.nodes.UnaryMathIntrinsicNode.UnaryOperation.COS;
+import static org.graalvm.compiler.replacements.nodes.UnaryMathIntrinsicNode.UnaryOperation.EXP;
+import static org.graalvm.compiler.replacements.nodes.UnaryMathIntrinsicNode.UnaryOperation.LOG;
+import static org.graalvm.compiler.replacements.nodes.UnaryMathIntrinsicNode.UnaryOperation.LOG10;
+import static org.graalvm.compiler.replacements.nodes.UnaryMathIntrinsicNode.UnaryOperation.SIN;
+import static org.graalvm.compiler.replacements.nodes.UnaryMathIntrinsicNode.UnaryOperation.TAN;
import static jdk.internal.vm.compiler.word.LocationIdentity.any;
import org.graalvm.compiler.core.common.LIRKind;
-import org.graalvm.compiler.core.common.spi.ForeignCallDescriptor;
import org.graalvm.compiler.hotspot.GraalHotSpotVMConfig;
import org.graalvm.compiler.hotspot.HotSpotForeignCallLinkageImpl;
import org.graalvm.compiler.hotspot.HotSpotGraalRuntimeProvider;
@@ -62,14 +69,6 @@
public class AMD64HotSpotForeignCallsProvider extends HotSpotHostForeignCallsProvider {
- public static final ForeignCallDescriptor ARITHMETIC_SIN_STUB = new ForeignCallDescriptor("arithmeticSinStub", double.class, double.class);
- public static final ForeignCallDescriptor ARITHMETIC_COS_STUB = new ForeignCallDescriptor("arithmeticCosStub", double.class, double.class);
- public static final ForeignCallDescriptor ARITHMETIC_TAN_STUB = new ForeignCallDescriptor("arithmeticTanStub", double.class, double.class);
- public static final ForeignCallDescriptor ARITHMETIC_EXP_STUB = new ForeignCallDescriptor("arithmeticExpStub", double.class, double.class);
- public static final ForeignCallDescriptor ARITHMETIC_POW_STUB = new ForeignCallDescriptor("arithmeticPowStub", double.class, double.class, double.class);
- public static final ForeignCallDescriptor ARITHMETIC_LOG_STUB = new ForeignCallDescriptor("arithmeticLogStub", double.class, double.class);
- public static final ForeignCallDescriptor ARITHMETIC_LOG10_STUB = new ForeignCallDescriptor("arithmeticLog10Stub", double.class, double.class);
-
private final Value[] nativeABICallerSaveRegisters;
public AMD64HotSpotForeignCallsProvider(HotSpotJVMCIRuntime jvmciRuntime, HotSpotGraalRuntimeProvider runtime, MetaAccessProvider metaAccess, CodeCacheProvider codeCache,
@@ -93,14 +92,6 @@
register(new HotSpotForeignCallLinkageImpl(EXCEPTION_HANDLER, 0L, PRESERVES_REGISTERS, LEAF_NOFP, REEXECUTABLE_ONLY_AFTER_EXCEPTION, exceptionCc, null, any()));
register(new HotSpotForeignCallLinkageImpl(EXCEPTION_HANDLER_IN_CALLER, JUMP_ADDRESS, PRESERVES_REGISTERS, LEAF_NOFP, REEXECUTABLE_ONLY_AFTER_EXCEPTION, exceptionCc, null, any()));
- link(new AMD64MathStub(ARITHMETIC_LOG_STUB, options, providers, registerStubCall(ARITHMETIC_LOG_STUB, LEAF, REEXECUTABLE, NO_LOCATIONS)));
- link(new AMD64MathStub(ARITHMETIC_LOG10_STUB, options, providers, registerStubCall(ARITHMETIC_LOG10_STUB, LEAF, REEXECUTABLE, NO_LOCATIONS)));
- link(new AMD64MathStub(ARITHMETIC_SIN_STUB, options, providers, registerStubCall(ARITHMETIC_SIN_STUB, LEAF, REEXECUTABLE, NO_LOCATIONS)));
- link(new AMD64MathStub(ARITHMETIC_COS_STUB, options, providers, registerStubCall(ARITHMETIC_COS_STUB, LEAF, REEXECUTABLE, NO_LOCATIONS)));
- link(new AMD64MathStub(ARITHMETIC_TAN_STUB, options, providers, registerStubCall(ARITHMETIC_TAN_STUB, LEAF, REEXECUTABLE, NO_LOCATIONS)));
- link(new AMD64MathStub(ARITHMETIC_EXP_STUB, options, providers, registerStubCall(ARITHMETIC_EXP_STUB, LEAF, REEXECUTABLE, NO_LOCATIONS)));
- link(new AMD64MathStub(ARITHMETIC_POW_STUB, options, providers, registerStubCall(ARITHMETIC_POW_STUB, LEAF, REEXECUTABLE, NO_LOCATIONS)));
-
if (config.useCRC32Intrinsics) {
// This stub does callee saving
registerForeignCall(UPDATE_BYTES_CRC32, config.updateBytesCRC32Stub, NativeCall, PRESERVES_REGISTERS, LEAF_NOFP, REEXECUTABLE_ONLY_AFTER_EXCEPTION, any());
@@ -138,4 +129,19 @@
return nativeABICallerSaveRegisters;
}
+ @Override
+ protected void registerMathStubs(GraalHotSpotVMConfig hotSpotVMConfig, HotSpotProviders providers, OptionValues options) {
+ if (GraalArithmeticStubs.getValue(options)) {
+ link(new AMD64MathStub(SIN, options, providers, registerStubCall(SIN.foreignCallDescriptor, LEAF, REEXECUTABLE, NO_LOCATIONS)));
+ link(new AMD64MathStub(COS, options, providers, registerStubCall(COS.foreignCallDescriptor, LEAF, REEXECUTABLE, NO_LOCATIONS)));
+ link(new AMD64MathStub(TAN, options, providers, registerStubCall(TAN.foreignCallDescriptor, LEAF, REEXECUTABLE, NO_LOCATIONS)));
+ link(new AMD64MathStub(EXP, options, providers, registerStubCall(EXP.foreignCallDescriptor, LEAF, REEXECUTABLE, NO_LOCATIONS)));
+ link(new AMD64MathStub(LOG, options, providers, registerStubCall(LOG.foreignCallDescriptor, LEAF, REEXECUTABLE, NO_LOCATIONS)));
+ link(new AMD64MathStub(LOG10, options, providers, registerStubCall(LOG10.foreignCallDescriptor, LEAF, REEXECUTABLE, NO_LOCATIONS)));
+ link(new AMD64MathStub(POW, options, providers, registerStubCall(POW.foreignCallDescriptor, LEAF, REEXECUTABLE, NO_LOCATIONS)));
+ } else {
+ super.registerMathStubs(hotSpotVMConfig, providers, options);
+ }
+ }
+
}
--- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot.amd64/src/org/graalvm/compiler/hotspot/amd64/AMD64HotSpotJumpToExceptionHandlerInCallerOp.java Tue Mar 12 09:49:10 2019 +0000
+++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot.amd64/src/org/graalvm/compiler/hotspot/amd64/AMD64HotSpotJumpToExceptionHandlerInCallerOp.java Sat Mar 16 21:00:45 2019 +0000
@@ -24,10 +24,10 @@
package org.graalvm.compiler.hotspot.amd64;
-import static org.graalvm.compiler.lir.LIRInstruction.OperandFlag.REG;
import static jdk.vm.ci.amd64.AMD64.rbp;
import static jdk.vm.ci.amd64.AMD64.rsp;
import static jdk.vm.ci.code.ValueUtil.asRegister;
+import static org.graalvm.compiler.lir.LIRInstruction.OperandFlag.REG;
import org.graalvm.compiler.asm.amd64.AMD64Address;
import org.graalvm.compiler.asm.amd64.AMD64Assembler.ConditionFlag;
@@ -35,7 +35,7 @@
import org.graalvm.compiler.lir.LIRInstructionClass;
import org.graalvm.compiler.lir.Opcode;
import org.graalvm.compiler.lir.asm.CompilationResultBuilder;
-import org.graalvm.compiler.serviceprovider.GraalServices;
+import org.graalvm.compiler.serviceprovider.JavaVersionUtil;
import jdk.vm.ci.code.Register;
import jdk.vm.ci.meta.AllocatableValue;
@@ -71,7 +71,7 @@
// Discard the return address, thus completing restoration of caller frame
masm.incrementq(rsp, 8);
- if (GraalServices.JAVA_SPECIFICATION_VERSION < 8) {
+ if (JavaVersionUtil.JAVA_SPECIFICATION_VERSION < 8) {
// Restore rsp from rbp if the exception PC is a method handle call site.
AMD64Address dst = new AMD64Address(thread, isMethodHandleReturnOffset);
masm.cmpl(dst, 0);
--- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot.amd64/src/org/graalvm/compiler/hotspot/amd64/AMD64HotSpotLIRGenerator.java Tue Mar 12 09:49:10 2019 +0000
+++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot.amd64/src/org/graalvm/compiler/hotspot/amd64/AMD64HotSpotLIRGenerator.java Sat Mar 16 21:00:45 2019 +0000
@@ -118,7 +118,7 @@
}
private AMD64HotSpotLIRGenerator(HotSpotProviders providers, GraalHotSpotVMConfig config, LIRGenerationResult lirGenRes, BackupSlotProvider backupSlotProvider) {
- this(new AMD64HotSpotLIRKindTool(), new AMD64ArithmeticLIRGenerator(null, new AMD64HotSpotMaths()), new AMD64HotSpotMoveFactory(backupSlotProvider), providers, config, lirGenRes);
+ this(new AMD64HotSpotLIRKindTool(), new AMD64ArithmeticLIRGenerator(null), new AMD64HotSpotMoveFactory(backupSlotProvider), providers, config, lirGenRes);
}
protected AMD64HotSpotLIRGenerator(LIRKindTool lirKindTool, AMD64ArithmeticLIRGenerator arithmeticLIRGen, MoveFactory moveFactory, HotSpotProviders providers, GraalHotSpotVMConfig config,
--- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot.amd64/src/org/graalvm/compiler/hotspot/amd64/AMD64HotSpotLoweringProvider.java Tue Mar 12 09:49:10 2019 +0000
+++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot.amd64/src/org/graalvm/compiler/hotspot/amd64/AMD64HotSpotLoweringProvider.java Sat Mar 16 21:00:45 2019 +0000
@@ -25,15 +25,8 @@
package org.graalvm.compiler.hotspot.amd64;
import static org.graalvm.compiler.hotspot.HotSpotBackend.Options.GraalArithmeticStubs;
-import static org.graalvm.compiler.hotspot.amd64.AMD64HotSpotForeignCallsProvider.ARITHMETIC_COS_STUB;
-import static org.graalvm.compiler.hotspot.amd64.AMD64HotSpotForeignCallsProvider.ARITHMETIC_EXP_STUB;
-import static org.graalvm.compiler.hotspot.amd64.AMD64HotSpotForeignCallsProvider.ARITHMETIC_LOG10_STUB;
-import static org.graalvm.compiler.hotspot.amd64.AMD64HotSpotForeignCallsProvider.ARITHMETIC_LOG_STUB;
-import static org.graalvm.compiler.hotspot.amd64.AMD64HotSpotForeignCallsProvider.ARITHMETIC_POW_STUB;
-import static org.graalvm.compiler.hotspot.amd64.AMD64HotSpotForeignCallsProvider.ARITHMETIC_SIN_STUB;
-import static org.graalvm.compiler.hotspot.amd64.AMD64HotSpotForeignCallsProvider.ARITHMETIC_TAN_STUB;
-import org.graalvm.compiler.core.common.spi.ForeignCallDescriptor;
+import org.graalvm.compiler.api.replacements.Snippet;
import org.graalvm.compiler.core.common.spi.ForeignCallsProvider;
import org.graalvm.compiler.debug.DebugHandlersFactory;
import org.graalvm.compiler.graph.Node;
@@ -44,21 +37,26 @@
import org.graalvm.compiler.hotspot.meta.HotSpotRegistersProvider;
import org.graalvm.compiler.hotspot.nodes.profiling.ProfileNode;
import org.graalvm.compiler.hotspot.replacements.profiling.ProbabilisticProfileSnippets;
+import org.graalvm.compiler.nodes.StructuredGraph;
import org.graalvm.compiler.nodes.calc.FloatConvertNode;
+import org.graalvm.compiler.nodes.extended.ForeignCallNode;
import org.graalvm.compiler.nodes.spi.LoweringTool;
import org.graalvm.compiler.options.OptionValues;
import org.graalvm.compiler.replacements.amd64.AMD64ConvertSnippets;
-import org.graalvm.compiler.replacements.nodes.BinaryMathIntrinsicNode.BinaryOperation;
+import org.graalvm.compiler.replacements.nodes.UnaryMathIntrinsicNode;
import org.graalvm.compiler.replacements.nodes.UnaryMathIntrinsicNode.UnaryOperation;
+import org.graalvm.compiler.serviceprovider.JavaVersionUtil;
import jdk.vm.ci.code.TargetDescription;
import jdk.vm.ci.hotspot.HotSpotConstantReflectionProvider;
import jdk.vm.ci.meta.MetaAccessProvider;
+import jdk.vm.ci.meta.ResolvedJavaMethod;
public class AMD64HotSpotLoweringProvider extends DefaultHotSpotLoweringProvider {
private AMD64ConvertSnippets.Templates convertSnippets;
private ProbabilisticProfileSnippets.Templates profileSnippets;
+ private AMD64X87MathSnippets.Templates mathSnippets;
public AMD64HotSpotLoweringProvider(HotSpotGraalRuntimeProvider runtime, MetaAccessProvider metaAccess, ForeignCallsProvider foreignCalls, HotSpotRegistersProvider registers,
HotSpotConstantReflectionProvider constantReflection, TargetDescription target) {
@@ -68,9 +66,10 @@
@Override
public void initialize(OptionValues options, Iterable<DebugHandlersFactory> factories, HotSpotProviders providers, GraalHotSpotVMConfig config) {
convertSnippets = new AMD64ConvertSnippets.Templates(options, factories, providers, providers.getSnippetReflection(), providers.getCodeCache().getTarget());
- profileSnippets = ProfileNode.Options.ProbabilisticProfiling.getValue(options)
+ profileSnippets = ProfileNode.Options.ProbabilisticProfiling.getValue(options) && !JavaVersionUtil.Java8OrEarlier
? new ProbabilisticProfileSnippets.Templates(options, factories, providers, providers.getCodeCache().getTarget())
: null;
+ mathSnippets = new AMD64X87MathSnippets.Templates(options, factories, providers, providers.getSnippetReflection(), providers.getCodeCache().getTarget());
super.initialize(options, factories, providers, config);
}
@@ -80,47 +79,49 @@
convertSnippets.lower((FloatConvertNode) n, tool);
} else if (profileSnippets != null && n instanceof ProfileNode) {
profileSnippets.lower((ProfileNode) n, tool);
+ } else if (n instanceof UnaryMathIntrinsicNode) {
+ lowerUnaryMath((UnaryMathIntrinsicNode) n, tool);
} else {
super.lower(n, tool);
}
}
- @Override
- protected ForeignCallDescriptor toForeignCall(UnaryOperation operation) {
- if (GraalArithmeticStubs.getValue(runtime.getOptions())) {
- switch (operation) {
- case LOG:
- return ARITHMETIC_LOG_STUB;
- case LOG10:
- return ARITHMETIC_LOG10_STUB;
- case SIN:
- return ARITHMETIC_SIN_STUB;
- case COS:
- return ARITHMETIC_COS_STUB;
- case TAN:
- return ARITHMETIC_TAN_STUB;
- case EXP:
- return ARITHMETIC_EXP_STUB;
+ private void lowerUnaryMath(UnaryMathIntrinsicNode math, LoweringTool tool) {
+ if (tool.getLoweringStage() == LoweringTool.StandardLoweringStage.HIGH_TIER) {
+ return;
+ }
+ StructuredGraph graph = math.graph();
+ ResolvedJavaMethod method = graph.method();
+ if (method != null) {
+ if (method.getAnnotation(Snippet.class) != null) {
+ // In the context of SnippetStub, i.e., Graal-generated stubs, use the LIR
+ // lowering to emit the stub assembly code instead of the Node lowering.
+ return;
}
- } else if (operation == UnaryOperation.EXP) {
- return operation.foreignCallDescriptor;
}
- // Lower only using LIRGenerator
- return null;
- }
+ if (!GraalArithmeticStubs.getValue(graph.getOptions())) {
+ switch (math.getOperation()) {
+ case SIN:
+ case COS:
+ case TAN:
+ // Math.sin(), .cos() and .tan() guarantee a value within 1 ULP of the exact
+ // result, but x87 trigonometric FPU instructions are only that accurate within
+ // [-pi/4, pi/4]. The snippets fall back to a foreign call to HotSpot stubs
+ // should the inputs outside of that interval.
+ mathSnippets.lower(math, tool);
+ return;
+ case LOG:
+ math.replaceAtUsages(graph.addOrUnique(new AMD64X87MathIntrinsicNode(math.getValue(), UnaryOperation.LOG)));
+ return;
+ case LOG10:
+ math.replaceAtUsages(graph.addOrUnique(new AMD64X87MathIntrinsicNode(math.getValue(), UnaryOperation.LOG10)));
+ return;
+ }
+ }
- @Override
- protected ForeignCallDescriptor toForeignCall(BinaryOperation operation) {
- if (GraalArithmeticStubs.getValue(runtime.getOptions())) {
- switch (operation) {
- case POW:
- return ARITHMETIC_POW_STUB;
- }
- } else if (operation == BinaryOperation.POW) {
- return operation.foreignCallDescriptor;
- }
- // Lower only using LIRGenerator
- return null;
+ ForeignCallNode call = graph.add(new ForeignCallNode(foreignCalls, math.getOperation().foreignCallDescriptor, math.getValue()));
+ graph.addAfterFixed(tool.lastFixedNode(), call);
+ math.replaceAtUsages(call);
}
@Override
--- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot.amd64/src/org/graalvm/compiler/hotspot/amd64/AMD64HotSpotMaths.java Tue Mar 12 09:49:10 2019 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,88 +0,0 @@
-/*
- * Copyright (c) 2016, 2018, Oracle and/or its affiliates. All rights reserved.
- * 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.
- */
-
-
-package org.graalvm.compiler.hotspot.amd64;
-
-import static org.graalvm.compiler.hotspot.HotSpotBackend.Options.GraalArithmeticStubs;
-import static org.graalvm.compiler.hotspot.amd64.AMD64HotSpotMathIntrinsicOp.IntrinsicOpcode.COS;
-import static org.graalvm.compiler.hotspot.amd64.AMD64HotSpotMathIntrinsicOp.IntrinsicOpcode.LOG;
-import static org.graalvm.compiler.hotspot.amd64.AMD64HotSpotMathIntrinsicOp.IntrinsicOpcode.LOG10;
-import static org.graalvm.compiler.hotspot.amd64.AMD64HotSpotMathIntrinsicOp.IntrinsicOpcode.SIN;
-import static org.graalvm.compiler.hotspot.amd64.AMD64HotSpotMathIntrinsicOp.IntrinsicOpcode.TAN;
-
-import org.graalvm.compiler.core.amd64.AMD64ArithmeticLIRGenerator;
-import org.graalvm.compiler.core.common.LIRKind;
-import org.graalvm.compiler.hotspot.HotSpotBackend.Options;
-import org.graalvm.compiler.lir.Variable;
-import org.graalvm.compiler.lir.gen.LIRGenerator;
-
-import jdk.vm.ci.meta.Value;
-
-/**
- * Lowering of selected {@link Math} routines that depends on the value of
- * {@link Options#GraalArithmeticStubs}.
- */
-public class AMD64HotSpotMaths implements AMD64ArithmeticLIRGenerator.Maths {
-
- @Override
- public Variable emitLog(LIRGenerator gen, Value input, boolean base10) {
- if (GraalArithmeticStubs.getValue(gen.getResult().getLIR().getOptions())) {
- return null;
- }
- Variable result = gen.newVariable(LIRKind.combine(input));
- gen.append(new AMD64HotSpotMathIntrinsicOp(base10 ? LOG10 : LOG, result, gen.asAllocatable(input)));
- return result;
- }
-
- @Override
- public Variable emitCos(LIRGenerator gen, Value input) {
- if (GraalArithmeticStubs.getValue(gen.getResult().getLIR().getOptions())) {
- return null;
- }
- Variable result = gen.newVariable(LIRKind.combine(input));
- gen.append(new AMD64HotSpotMathIntrinsicOp(COS, result, gen.asAllocatable(input)));
- return result;
- }
-
- @Override
- public Variable emitSin(LIRGenerator gen, Value input) {
- if (GraalArithmeticStubs.getValue(gen.getResult().getLIR().getOptions())) {
- return null;
- }
- Variable result = gen.newVariable(LIRKind.combine(input));
- gen.append(new AMD64HotSpotMathIntrinsicOp(SIN, result, gen.asAllocatable(input)));
- return result;
- }
-
- @Override
- public Variable emitTan(LIRGenerator gen, Value input) {
- if (GraalArithmeticStubs.getValue(gen.getResult().getLIR().getOptions())) {
- return null;
- }
- Variable result = gen.newVariable(LIRKind.combine(input));
- gen.append(new AMD64HotSpotMathIntrinsicOp(TAN, result, gen.asAllocatable(input)));
- return result;
- }
-
-}
--- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot.amd64/src/org/graalvm/compiler/hotspot/amd64/AMD64MathStub.java Tue Mar 12 09:49:10 2019 +0000
+++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot.amd64/src/org/graalvm/compiler/hotspot/amd64/AMD64MathStub.java Sat Mar 16 21:00:45 2019 +0000
@@ -24,16 +24,8 @@
package org.graalvm.compiler.hotspot.amd64;
-import static org.graalvm.compiler.hotspot.amd64.AMD64HotSpotForeignCallsProvider.ARITHMETIC_COS_STUB;
-import static org.graalvm.compiler.hotspot.amd64.AMD64HotSpotForeignCallsProvider.ARITHMETIC_EXP_STUB;
-import static org.graalvm.compiler.hotspot.amd64.AMD64HotSpotForeignCallsProvider.ARITHMETIC_LOG10_STUB;
-import static org.graalvm.compiler.hotspot.amd64.AMD64HotSpotForeignCallsProvider.ARITHMETIC_LOG_STUB;
-import static org.graalvm.compiler.hotspot.amd64.AMD64HotSpotForeignCallsProvider.ARITHMETIC_POW_STUB;
-import static org.graalvm.compiler.hotspot.amd64.AMD64HotSpotForeignCallsProvider.ARITHMETIC_SIN_STUB;
-import static org.graalvm.compiler.hotspot.amd64.AMD64HotSpotForeignCallsProvider.ARITHMETIC_TAN_STUB;
-
import org.graalvm.compiler.api.replacements.Snippet;
-import org.graalvm.compiler.core.common.spi.ForeignCallDescriptor;
+import org.graalvm.compiler.debug.GraalError;
import org.graalvm.compiler.hotspot.HotSpotForeignCallLinkage;
import org.graalvm.compiler.hotspot.meta.HotSpotProviders;
import org.graalvm.compiler.hotspot.stubs.SnippetStub;
@@ -48,33 +40,38 @@
*/
public class AMD64MathStub extends SnippetStub {
- public AMD64MathStub(ForeignCallDescriptor descriptor, OptionValues options, HotSpotProviders providers, HotSpotForeignCallLinkage linkage) {
- super(snippetName(descriptor), options, providers, linkage);
+ public AMD64MathStub(UnaryOperation operation, OptionValues options, HotSpotProviders providers, HotSpotForeignCallLinkage linkage) {
+ super(snippetName(operation), options, providers, linkage);
+ }
+
+ public AMD64MathStub(BinaryOperation operation, OptionValues options, HotSpotProviders providers, HotSpotForeignCallLinkage linkage) {
+ super(snippetName(operation), options, providers, linkage);
}
- private static String snippetName(ForeignCallDescriptor descriptor) {
- if (descriptor == ARITHMETIC_LOG_STUB) {
- return "log";
- }
- if (descriptor == ARITHMETIC_LOG10_STUB) {
- return "log10";
- }
- if (descriptor == ARITHMETIC_SIN_STUB) {
- return "sin";
+ private static String snippetName(UnaryOperation operation) {
+ switch (operation) {
+ case SIN:
+ return "sin";
+ case COS:
+ return "cos";
+ case TAN:
+ return "tan";
+ case EXP:
+ return "exp";
+ case LOG:
+ return "log";
+ case LOG10:
+ return "log10";
+ default:
+ throw GraalError.shouldNotReachHere("Unknown operation " + operation);
}
- if (descriptor == ARITHMETIC_COS_STUB) {
- return "cos";
- }
- if (descriptor == ARITHMETIC_TAN_STUB) {
- return "tan";
- }
- if (descriptor == ARITHMETIC_EXP_STUB) {
- return "exp";
- }
- if (descriptor == ARITHMETIC_POW_STUB) {
+ }
+
+ private static String snippetName(BinaryOperation operation) {
+ if (operation == BinaryOperation.POW) {
return "pow";
}
- throw new InternalError("Unknown operation " + descriptor);
+ throw GraalError.shouldNotReachHere("Unknown operation " + operation);
}
@Snippet
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot.amd64/src/org/graalvm/compiler/hotspot/amd64/AMD64X87MathIntrinsicNode.java Sat Mar 16 21:00:45 2019 +0000
@@ -0,0 +1,111 @@
+/*
+ * Copyright (c) 2012, 2015, Oracle and/or its affiliates. All rights reserved.
+ * 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.
+ */
+
+
+package org.graalvm.compiler.hotspot.amd64;
+
+import static org.graalvm.compiler.hotspot.amd64.AMD64HotSpotMathIntrinsicOp.IntrinsicOpcode.COS;
+import static org.graalvm.compiler.hotspot.amd64.AMD64HotSpotMathIntrinsicOp.IntrinsicOpcode.LOG;
+import static org.graalvm.compiler.hotspot.amd64.AMD64HotSpotMathIntrinsicOp.IntrinsicOpcode.LOG10;
+import static org.graalvm.compiler.hotspot.amd64.AMD64HotSpotMathIntrinsicOp.IntrinsicOpcode.SIN;
+import static org.graalvm.compiler.hotspot.amd64.AMD64HotSpotMathIntrinsicOp.IntrinsicOpcode.TAN;
+import static org.graalvm.compiler.nodeinfo.NodeCycles.CYCLES_64;
+import static org.graalvm.compiler.nodeinfo.NodeSize.SIZE_1;
+
+import org.graalvm.compiler.core.common.LIRKind;
+import org.graalvm.compiler.core.common.type.FloatStamp;
+import org.graalvm.compiler.core.common.type.PrimitiveStamp;
+import org.graalvm.compiler.core.common.type.Stamp;
+import org.graalvm.compiler.debug.GraalError;
+import org.graalvm.compiler.graph.NodeClass;
+import org.graalvm.compiler.graph.spi.CanonicalizerTool;
+import org.graalvm.compiler.lir.Variable;
+import org.graalvm.compiler.lir.gen.LIRGeneratorTool;
+import org.graalvm.compiler.nodeinfo.NodeInfo;
+import org.graalvm.compiler.nodes.ConstantNode;
+import org.graalvm.compiler.nodes.NodeView;
+import org.graalvm.compiler.nodes.ValueNode;
+import org.graalvm.compiler.nodes.calc.UnaryNode;
+import org.graalvm.compiler.nodes.spi.LIRLowerable;
+import org.graalvm.compiler.nodes.spi.NodeLIRBuilderTool;
+import org.graalvm.compiler.replacements.nodes.UnaryMathIntrinsicNode.UnaryOperation;
+
+import jdk.vm.ci.meta.Value;
+
+@NodeInfo(nameTemplate = "X87MathIntrinsic#{p#operation/s}", cycles = CYCLES_64, size = SIZE_1)
+public final class AMD64X87MathIntrinsicNode extends UnaryNode implements LIRLowerable {
+
+ public static final NodeClass<AMD64X87MathIntrinsicNode> TYPE = NodeClass.create(AMD64X87MathIntrinsicNode.class);
+ protected final UnaryOperation operation;
+
+ protected AMD64X87MathIntrinsicNode(ValueNode value, UnaryOperation op) {
+ super(TYPE, op.computeStamp(value.stamp(NodeView.DEFAULT)), value);
+ assert value.stamp(NodeView.DEFAULT) instanceof FloatStamp && PrimitiveStamp.getBits(value.stamp(NodeView.DEFAULT)) == 64;
+ this.operation = op;
+ }
+
+ @Override
+ public Stamp foldStamp(Stamp valueStamp) {
+ return operation.computeStamp(valueStamp);
+ }
+
+ @Override
+ public void generate(NodeLIRBuilderTool generator) {
+ LIRGeneratorTool gen = generator.getLIRGeneratorTool();
+ Value input = generator.operand(getValue());
+ Variable result = gen.newVariable(LIRKind.combine(input));
+
+ switch (operation) {
+ case SIN:
+ gen.append(new AMD64HotSpotMathIntrinsicOp(SIN, result, gen.asAllocatable(input)));
+ break;
+ case COS:
+ gen.append(new AMD64HotSpotMathIntrinsicOp(COS, result, gen.asAllocatable(input)));
+ break;
+ case TAN:
+ gen.append(new AMD64HotSpotMathIntrinsicOp(TAN, result, gen.asAllocatable(input)));
+ break;
+ case LOG:
+ gen.append(new AMD64HotSpotMathIntrinsicOp(LOG, result, gen.asAllocatable(input)));
+ break;
+ case LOG10:
+ gen.append(new AMD64HotSpotMathIntrinsicOp(LOG10, result, gen.asAllocatable(input)));
+ break;
+ default:
+ throw GraalError.shouldNotReachHere();
+ }
+ generator.setResult(this, result);
+ }
+
+ @Override
+ public ValueNode canonical(CanonicalizerTool tool, ValueNode forValue) {
+ if (forValue.isConstant()) {
+ return ConstantNode.forDouble(operation.compute(forValue.asJavaConstant().asDouble()));
+ }
+ return this;
+ }
+
+ @NodeIntrinsic
+ public static native double compute(double value, @ConstantNodeParameter UnaryOperation op);
+
+}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot.amd64/src/org/graalvm/compiler/hotspot/amd64/AMD64X87MathSnippets.java Sat Mar 16 21:00:45 2019 +0000
@@ -0,0 +1,117 @@
+/*
+ * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
+ * 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.
+ */
+
+
+package org.graalvm.compiler.hotspot.amd64;
+
+import static org.graalvm.compiler.replacements.SnippetTemplate.DEFAULT_REPLACER;
+
+import org.graalvm.compiler.api.replacements.Snippet;
+import org.graalvm.compiler.api.replacements.SnippetReflectionProvider;
+import org.graalvm.compiler.core.common.spi.ForeignCallDescriptor;
+import org.graalvm.compiler.debug.DebugHandlersFactory;
+import org.graalvm.compiler.debug.GraalError;
+import org.graalvm.compiler.graph.Node.ConstantNodeParameter;
+import org.graalvm.compiler.graph.Node.NodeIntrinsic;
+import org.graalvm.compiler.nodes.extended.ForeignCallNode;
+import org.graalvm.compiler.nodes.spi.LoweringTool;
+import org.graalvm.compiler.options.OptionValues;
+import org.graalvm.compiler.phases.util.Providers;
+import org.graalvm.compiler.replacements.SnippetTemplate.AbstractTemplates;
+import org.graalvm.compiler.replacements.SnippetTemplate.Arguments;
+import org.graalvm.compiler.replacements.SnippetTemplate.SnippetInfo;
+import org.graalvm.compiler.replacements.Snippets;
+import org.graalvm.compiler.replacements.nodes.UnaryMathIntrinsicNode;
+import org.graalvm.compiler.replacements.nodes.UnaryMathIntrinsicNode.UnaryOperation;
+
+import jdk.vm.ci.code.TargetDescription;
+
+public class AMD64X87MathSnippets implements Snippets {
+
+ private static final double PI_4 = Math.PI / 4;
+
+ @Snippet
+ public static double sin(double input) {
+ if (Math.abs(input) < PI_4) {
+ return AMD64X87MathIntrinsicNode.compute(input, UnaryOperation.SIN);
+ }
+ return callDouble1(UnaryOperation.SIN.foreignCallDescriptor, input);
+ }
+
+ @Snippet
+ public static double cos(double input) {
+ if (Math.abs(input) < PI_4) {
+ return AMD64X87MathIntrinsicNode.compute(input, UnaryOperation.COS);
+ }
+ return callDouble1(UnaryOperation.COS.foreignCallDescriptor, input);
+ }
+
+ @Snippet
+ public static double tan(double input) {
+ if (Math.abs(input) < PI_4) {
+ return AMD64X87MathIntrinsicNode.compute(input, UnaryOperation.TAN);
+ }
+ return callDouble1(UnaryOperation.TAN.foreignCallDescriptor, input);
+ }
+
+ @NodeIntrinsic(value = ForeignCallNode.class)
+ private static native double callDouble1(@ConstantNodeParameter ForeignCallDescriptor descriptor, double value);
+
+ public static class Templates extends AbstractTemplates {
+
+ private final SnippetInfo sin;
+ private final SnippetInfo cos;
+ private final SnippetInfo tan;
+
+ public Templates(OptionValues options, Iterable<DebugHandlersFactory> factories, Providers providers, SnippetReflectionProvider snippetReflection, TargetDescription target) {
+ super(options, factories, providers, snippetReflection, target);
+
+ sin = snippet(AMD64X87MathSnippets.class, "sin");
+ cos = snippet(AMD64X87MathSnippets.class, "cos");
+ tan = snippet(AMD64X87MathSnippets.class, "tan");
+ }
+
+ public void lower(UnaryMathIntrinsicNode mathIntrinsicNode, LoweringTool tool) {
+ SnippetInfo info;
+
+ switch (mathIntrinsicNode.getOperation()) {
+ case SIN:
+ info = sin;
+ break;
+ case COS:
+ info = cos;
+ break;
+ case TAN:
+ info = tan;
+ break;
+ default:
+ throw GraalError.shouldNotReachHere("Snippet not found for math intrinsic " + mathIntrinsicNode.getOperation().name());
+ }
+
+ Arguments args = new Arguments(info, mathIntrinsicNode.graph().getGuardsStage(), tool.getLoweringStage());
+ args.add("input", mathIntrinsicNode.getValue());
+ template(mathIntrinsicNode, args).instantiate(providers.getMetaAccess(), mathIntrinsicNode, DEFAULT_REPLACER, tool, args);
+ mathIntrinsicNode.safeDelete();
+ }
+ }
+}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot.jdk9.test/src/org/graalvm/compiler/hotspot/jdk9/test/StringUTF16ToBytesGetCharsTest.java Sat Mar 16 21:00:45 2019 +0000
@@ -0,0 +1,142 @@
+/*
+ * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved.
+ * 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.
+ */
+
+
+package org.graalvm.compiler.hotspot.jdk9.test;
+
+import static org.junit.Assume.assumeFalse;
+
+import jdk.vm.ci.code.InstalledCode;
+import jdk.vm.ci.meta.ResolvedJavaMethod;
+import org.graalvm.compiler.core.common.CompilationIdentifier;
+import org.graalvm.compiler.hotspot.replacements.StringUTF16Substitutions;
+import org.graalvm.compiler.nodes.StructuredGraph;
+import org.graalvm.compiler.nodes.java.NewArrayNode;
+import org.graalvm.compiler.replacements.arraycopy.ArrayCopyCallNode;
+import org.graalvm.compiler.replacements.test.MethodSubstitutionTest;
+import org.graalvm.compiler.test.AddExports;
+import org.junit.Before;
+import org.junit.Test;
+
+/**
+ * Test substitutions for (innate) methods StringUTF16.toBytes and StringUTF16.getChars provided by
+ * {@link StringUTF16Substitutions}.
+ */
+@AddExports({"java.base/java.lang"})
+public final class StringUTF16ToBytesGetCharsTest extends MethodSubstitutionTest {
+
+ private static final int N = 1000;
+ private static final int N_OVERFLOW = 10;
+
+ @Before
+ public void checkAMD64() {
+ assumeFalse(Java8OrEarlier);
+ }
+
+ @Test
+ public void testStringUTF16ToBytes() throws ClassNotFoundException {
+ Class<?> javaclass = Class.forName("java.lang.StringUTF16");
+
+ ResolvedJavaMethod caller = getResolvedJavaMethod(javaclass, "toBytes", char[].class, int.class, int.class);
+ StructuredGraph graph = getReplacements().getIntrinsicGraph(caller, CompilationIdentifier.INVALID_COMPILATION_ID, getDebugContext());
+ assertInGraph(graph, NewArrayNode.class);
+ assertInGraph(graph, ArrayCopyCallNode.class);
+
+ InstalledCode code = getCode(caller, graph);
+
+ for (int srcOffset = 0; srcOffset < 2; srcOffset++) {
+ for (int i = 0; i < N; i++) {
+ int length = i2sz(i);
+ char[] src = fillUTF16Chars(new char[length]);
+ int copiedLength = Math.max(0, length - srcOffset);
+ int srcDelta = Math.min(srcOffset, copiedLength);
+ byte[] dst = (byte[]) invokeSafe(caller, null, src, srcDelta, copiedLength);
+ assert dst.length == copiedLength * 2;
+ byte[] dst2 = (byte[]) executeVarargsSafe(code, src, srcDelta, copiedLength);
+ assertDeepEquals(dst, dst2);
+ }
+ }
+ for (int srcOff = 0; srcOff < N_OVERFLOW; ++srcOff) {
+ for (int len = 0; len < N_OVERFLOW; ++len) {
+ char[] src = fillUTF16Chars(new char[N_OVERFLOW]);
+ test(caller, null, src, srcOff, len);
+ }
+ }
+ }
+
+ @Test
+ public void testStringUTF16getChars() throws ClassNotFoundException {
+ Class<?> javaclass = Class.forName("java.lang.StringUTF16");
+
+ ResolvedJavaMethod caller = getResolvedJavaMethod(javaclass, "getChars", byte[].class, int.class, int.class, char[].class, int.class);
+ StructuredGraph graph = getReplacements().getIntrinsicGraph(caller, CompilationIdentifier.INVALID_COMPILATION_ID, getDebugContext());
+ assertInGraph(graph, ArrayCopyCallNode.class);
+
+ InstalledCode code = getCode(caller, graph);
+
+ for (int dstOffset = 0; dstOffset < 2; dstOffset++) {
+ for (int srcOffset = 0; srcOffset < 2; srcOffset++) {
+ for (int i = 0; i < N; i++) {
+ int length = i2sz(i);
+ byte[] src = fillUTF16Bytes(new byte[length * 2]);
+ char[] dst = new char[length];
+ int copiedLength = Math.max(0, length - Math.max(dstOffset, srcOffset));
+ int dstDelta = Math.min(dstOffset, copiedLength);
+ int srcDelta = Math.min(srcOffset, copiedLength);
+ invokeSafe(caller, null, src, srcDelta, srcDelta + copiedLength, dst, dstDelta);
+ char[] dst2 = new char[length];
+ executeVarargsSafe(code, src, srcDelta, srcDelta + copiedLength, dst2, dstDelta);
+ assertDeepEquals(dst, dst2);
+ }
+ }
+ }
+ for (int srcOff = 0; srcOff < N_OVERFLOW; ++srcOff) {
+ for (int dstOff = 0; dstOff < N_OVERFLOW; ++dstOff) {
+ for (int len = 0; len < N_OVERFLOW; ++len) {
+ byte[] src = fillUTF16Bytes(new byte[N_OVERFLOW]);
+ char[] dst = new char[N_OVERFLOW];
+ test(caller, null, src, srcOff, len, dst, dstOff);
+ }
+ }
+ }
+ }
+
+ private static char[] fillUTF16Chars(char[] v) {
+ for (int ch = 0, i = 0; i < v.length; i++, ch += 0x101) {
+ v[i] = (char) ch;
+ }
+ return v;
+ }
+
+ private static byte[] fillUTF16Bytes(byte[] v) {
+ for (int ch = 1, i = 0; i < v.length; i += 2, ch++) {
+ v[i] = (byte) (ch - 1);
+ v[i + 1] = (byte) ch;
+ }
+ return v;
+ }
+
+ private static int i2sz(int i) {
+ return i * 3;
+ }
+}
--- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot.lir.test/src/org/graalvm/compiler/hotspot/lir/test/BenchmarkCounterOverflowTest.java Tue Mar 12 09:49:10 2019 +0000
+++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot.lir.test/src/org/graalvm/compiler/hotspot/lir/test/BenchmarkCounterOverflowTest.java Sat Mar 16 21:00:45 2019 +0000
@@ -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
@@ -27,9 +27,12 @@
import static org.graalvm.compiler.test.SubprocessUtil.getVMCommandLine;
import static org.graalvm.compiler.test.SubprocessUtil.withoutDebuggerArguments;
+import java.io.File;
import java.util.ArrayList;
import java.util.Iterator;
import java.util.List;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
import org.graalvm.compiler.api.directives.GraalDirectives;
import org.graalvm.compiler.core.common.LIRKind;
@@ -121,6 +124,7 @@
Assert.assertNotEquals("Expected non-zero exit status", 0, proc.exitCode);
Iterator<String> it = proc.output.iterator();
+ boolean foundProblematicFrame = false;
while (it.hasNext()) {
String line = it.next();
if (line.contains("Problematic frame:")) {
@@ -130,11 +134,34 @@
}
line = it.next();
if (line.contains(BenchmarkCounterOverflowTest.class.getName() + ".test")) {
- return;
+ foundProblematicFrame = true;
+ break;
}
Assert.fail("Unexpected stack trace: " + line);
}
}
- Assert.fail(String.format("Could not find method in output:%n%s", proc));
+ // find and delete hserr file
+ while (it.hasNext()) {
+ String line = it.next();
+ if (line.contains("An error report file with more information is saved as:")) {
+ if (!it.hasNext()) {
+ // no more line
+ break;
+ }
+ line = it.next();
+ Pattern pattern = Pattern.compile("^# (.*hs_err_pid.*log)$");
+ Matcher matcher = pattern.matcher(line);
+ if (matcher.matches()) {
+ File hserrFile = new File(matcher.group(1));
+ if (hserrFile.exists()) {
+ if (VERBOSE) {
+ System.out.println("Deleting error report file:" + hserrFile.getAbsolutePath());
+ }
+ hserrFile.delete();
+ }
+ }
+ }
+ }
+ Assert.assertTrue(String.format("Could not find method in output:%n%s", proc), foundProblematicFrame);
}
}
--- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot.sparc/src/org/graalvm/compiler/hotspot/sparc/SPARCHotSpotBackend.java Tue Mar 12 09:49:10 2019 +0000
+++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot.sparc/src/org/graalvm/compiler/hotspot/sparc/SPARCHotSpotBackend.java Sat Mar 16 21:00:45 2019 +0000
@@ -63,6 +63,7 @@
import org.graalvm.compiler.core.common.CompilationIdentifier;
import org.graalvm.compiler.core.common.alloc.RegisterAllocationConfig;
import org.graalvm.compiler.core.common.cfg.AbstractBlockBase;
+import org.graalvm.compiler.core.gen.LIRGenerationProvider;
import org.graalvm.compiler.core.sparc.SPARCNodeMatchRules;
import org.graalvm.compiler.debug.CounterKey;
import org.graalvm.compiler.debug.DebugContext;
@@ -109,7 +110,7 @@
/**
* HotSpot SPARC specific backend.
*/
-public class SPARCHotSpotBackend extends HotSpotHostBackend {
+public class SPARCHotSpotBackend extends HotSpotHostBackend implements LIRGenerationProvider {
private static final SizeEstimateStatistics CONSTANT_ESTIMATED_STATS = new SizeEstimateStatistics("ESTIMATE");
private static final SizeEstimateStatistics CONSTANT_ACTUAL_STATS = new SizeEstimateStatistics("ACTUAL");
@@ -134,15 +135,10 @@
}
}
- @Override
- public FrameMapBuilder newFrameMapBuilder(RegisterConfig registerConfig) {
+ private FrameMapBuilder newFrameMapBuilder(RegisterConfig registerConfig) {
RegisterConfig registerConfigNonNull = registerConfig == null ? getCodeCache().getRegisterConfig() : registerConfig;
- return new SPARCFrameMapBuilder(newFrameMap(registerConfigNonNull), getCodeCache(), registerConfigNonNull);
- }
-
- @Override
- public FrameMap newFrameMap(RegisterConfig registerConfig) {
- return new SPARCFrameMap(getCodeCache(), registerConfig, this);
+ FrameMap frameMap = new SPARCFrameMap(getCodeCache(), registerConfigNonNull, this);
+ return new SPARCFrameMapBuilder(frameMap, getCodeCache(), registerConfigNonNull);
}
@Override
@@ -151,8 +147,9 @@
}
@Override
- public LIRGenerationResult newLIRGenerationResult(CompilationIdentifier compilationId, LIR lir, FrameMapBuilder frameMapBuilder, StructuredGraph graph, Object stub) {
- return new HotSpotLIRGenerationResult(compilationId, lir, frameMapBuilder, makeCallingConvention(graph, (Stub) stub), stub, config.requiresReservedStackCheck(graph.getMethods()));
+ public LIRGenerationResult newLIRGenerationResult(CompilationIdentifier compilationId, LIR lir, RegisterConfig registerConfig, StructuredGraph graph, Object stub) {
+ return new HotSpotLIRGenerationResult(compilationId, lir, newFrameMapBuilder(registerConfig), makeCallingConvention(graph, (Stub) stub), stub,
+ config.requiresReservedStackCheck(graph.getMethods()));
}
@Override
@@ -227,18 +224,13 @@
}
@Override
- protected Assembler createAssembler(FrameMap frameMap) {
- return new SPARCMacroAssembler(getTarget());
- }
-
- @Override
public CompilationResultBuilder newCompilationResultBuilder(LIRGenerationResult lirGenRes, FrameMap frameMap, CompilationResult compilationResult, CompilationResultBuilderFactory factory) {
HotSpotLIRGenerationResult gen = (HotSpotLIRGenerationResult) lirGenRes;
LIR lir = gen.getLIR();
assert gen.getDeoptimizationRescueSlot() == null || frameMap.frameNeedsAllocating() : "method that can deoptimize must have a frame";
Stub stub = gen.getStub();
- Assembler masm = createAssembler(frameMap);
+ Assembler masm = new SPARCMacroAssembler(getTarget());
// On SPARC we always use stack frames.
HotSpotFrameContext frameContext = new HotSpotFrameContext(stub != null);
DataBuilder dataBuilder = new HotSpotDataBuilder(getCodeCache().getTarget());
--- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot.sparc/src/org/graalvm/compiler/hotspot/sparc/SPARCHotSpotMove.java Tue Mar 12 09:49:10 2019 +0000
+++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot.sparc/src/org/graalvm/compiler/hotspot/sparc/SPARCHotSpotMove.java Sat Mar 16 21:00:45 2019 +0000
@@ -24,20 +24,21 @@
package org.graalvm.compiler.hotspot.sparc;
+import static jdk.vm.ci.code.ValueUtil.asRegister;
import static org.graalvm.compiler.asm.sparc.SPARCAssembler.BPR;
import static org.graalvm.compiler.asm.sparc.SPARCAssembler.Annul.ANNUL;
+import static org.graalvm.compiler.asm.sparc.SPARCAssembler.Annul.NOT_ANNUL;
+import static org.graalvm.compiler.asm.sparc.SPARCAssembler.BranchPredict.PREDICT_NOT_TAKEN;
import static org.graalvm.compiler.asm.sparc.SPARCAssembler.BranchPredict.PREDICT_TAKEN;
+import static org.graalvm.compiler.asm.sparc.SPARCAssembler.RCondition.Rc_nz;
import static org.graalvm.compiler.asm.sparc.SPARCAssembler.RCondition.Rc_z;
import static org.graalvm.compiler.lir.LIRInstruction.OperandFlag.ILLEGAL;
import static org.graalvm.compiler.lir.LIRInstruction.OperandFlag.REG;
import static org.graalvm.compiler.lir.LIRInstruction.OperandFlag.STACK;
import static org.graalvm.compiler.lir.sparc.SPARCMove.loadFromConstantTable;
-import static jdk.vm.ci.code.ValueUtil.asRegister;
import org.graalvm.compiler.asm.Label;
import org.graalvm.compiler.asm.sparc.SPARCAddress;
-import org.graalvm.compiler.asm.sparc.SPARCAssembler.CC;
-import org.graalvm.compiler.asm.sparc.SPARCAssembler.ConditionFlag;
import org.graalvm.compiler.asm.sparc.SPARCMacroAssembler;
import org.graalvm.compiler.asm.sparc.SPARCMacroAssembler.ScratchRegister;
import org.graalvm.compiler.core.common.CompressEncoding;
@@ -53,6 +54,7 @@
import jdk.vm.ci.hotspot.HotSpotConstant;
import jdk.vm.ci.meta.AllocatableValue;
import jdk.vm.ci.meta.Constant;
+import jdk.vm.ci.sparc.SPARC;
public class SPARCHotSpotMove {
@@ -150,17 +152,33 @@
if (encoding.hasBase()) {
Register baseReg = asRegister(baseRegister);
if (!nonNull) {
- masm.cmp(inputRegister, baseReg);
- masm.movcc(ConditionFlag.Equal, CC.Xcc, baseReg, resReg);
- masm.sub(resReg, baseReg, resReg);
+ Label done = new Label();
+ if (inputRegister.equals(resReg)) {
+ BPR.emit(masm, Rc_nz, ANNUL, PREDICT_TAKEN, inputRegister, done);
+ masm.sub(inputRegister, baseReg, resReg);
+ masm.bind(done);
+ if (encoding.getShift() != 0) {
+ masm.srlx(resReg, encoding.getShift(), resReg);
+ }
+ } else {
+ BPR.emit(masm, Rc_z, NOT_ANNUL, PREDICT_NOT_TAKEN, inputRegister, done);
+ masm.mov(SPARC.g0, resReg);
+ masm.sub(inputRegister, baseReg, resReg);
+ if (encoding.getShift() != 0) {
+ masm.srlx(resReg, encoding.getShift(), resReg);
+ }
+ masm.bind(done);
+ }
} else {
masm.sub(inputRegister, baseReg, resReg);
- }
- if (encoding.getShift() != 0) {
- masm.srlx(resReg, encoding.getShift(), resReg);
+ if (encoding.getShift() != 0) {
+ masm.srlx(resReg, encoding.getShift(), resReg);
+ }
}
} else {
- masm.srlx(inputRegister, encoding.getShift(), resReg);
+ if (encoding.getShift() != 0) {
+ masm.srlx(inputRegister, encoding.getShift(), resReg);
+ }
}
}
}
@@ -196,7 +214,7 @@
public static void emitUncompressCode(SPARCMacroAssembler masm, Register inputRegister, Register resReg, Register baseReg, int shift, boolean nonNull) {
Register secondaryInput;
if (shift != 0) {
- masm.sll(inputRegister, shift, resReg);
+ masm.sllx(inputRegister, shift, resReg);
secondaryInput = resReg;
} else {
secondaryInput = inputRegister;
@@ -207,7 +225,7 @@
masm.add(secondaryInput, baseReg, resReg);
} else {
Label done = new Label();
- BPR.emit(masm, Rc_z, ANNUL, PREDICT_TAKEN, secondaryInput, done);
+ BPR.emit(masm, Rc_nz, ANNUL, PREDICT_TAKEN, secondaryInput, done);
masm.add(baseReg, secondaryInput, resReg);
masm.bind(done);
}
--- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot.test/src/org/graalvm/compiler/hotspot/test/CheckGraalIntrinsics.java Tue Mar 12 09:49:10 2019 +0000
+++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot.test/src/org/graalvm/compiler/hotspot/test/CheckGraalIntrinsics.java Sat Mar 16 21:00:45 2019 +0000
@@ -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
@@ -47,7 +47,7 @@
import org.graalvm.compiler.nodes.graphbuilderconf.InvocationPlugins;
import org.graalvm.compiler.nodes.graphbuilderconf.InvocationPlugins.Binding;
import org.graalvm.compiler.runtime.RuntimeProvider;
-import org.graalvm.compiler.serviceprovider.GraalServices;
+import org.graalvm.compiler.serviceprovider.JavaVersionUtil;
import org.graalvm.compiler.test.GraalTest;
import org.junit.Test;
@@ -257,7 +257,8 @@
"java/lang/reflect/Array.newArray(Ljava/lang/Class;I)Ljava/lang/Object;",
// HotSpot MacroAssembler-based intrinsic
"sun/nio/cs/ISO_8859_1$Encoder.encodeISOArray([CI[BII)I",
- // Stub based intrinsics but implementation seems complex in C2
+ // We have implemented implCompressMultiBlock0 on JDK9+. Does it worth
+ // backporting as corresponding HotSpot stubs are only generated on SPARC?
"sun/security/provider/DigestBase.implCompressMultiBlock([BII)I");
// See JDK-8207146.
@@ -271,18 +272,12 @@
"jdk/jfr/internal/JVM.getClassId(Ljava/lang/Class;)J");
add(toBeInvestigated,
- // Some logic and a stub call
- "com/sun/crypto/provider/CounterMode.implCrypt([BII[BI)I",
- // Stub and very little logic
- "com/sun/crypto/provider/GHASH.processBlocks([BII[J[J)V",
// HotSpot MacroAssembler-based intrinsic
"java/lang/Math.fma(DDD)D",
// HotSpot MacroAssembler-based intrinsic
"java/lang/Math.fma(FFF)F",
// Just check if the argument is a compile time constant
"java/lang/invoke/MethodHandleImpl.isCompileConstant(Ljava/lang/Object;)Z",
- // Some logic and a runtime call
- "java/util/ArraysSupport.vectorizedMismatch(Ljava/lang/Object;JLjava/lang/Object;JII)I",
// Only used as a marker for vectorization?
"java/util/stream/Streams$RangeIntSpliterator.forEachRemaining(Ljava/util/function/IntConsumer;)V",
// Only implemented on non-AMD64 platforms (some logic and runtime call)
@@ -295,9 +290,7 @@
// Control flow, deopts, and a cast
"jdk/internal/util/Preconditions.checkIndex(IILjava/util/function/BiFunction;)I",
// HotSpot MacroAssembler-based intrinsic
- "sun/nio/cs/ISO_8859_1$Encoder.implEncodeISOArray([CI[BII)I",
- // Runtime call and some complex compiler logic
- "sun/security/provider/DigestBase.implCompressMultiBlock0([BII)I");
+ "sun/nio/cs/ISO_8859_1$Encoder.implEncodeISOArray([CI[BII)I");
/*
* Per default, all these operations are mapped to some generic method for which we
@@ -344,27 +337,45 @@
// Compact string support - HotSpot MacroAssembler-based intrinsic or complex C2 logic.
add(toBeInvestigated,
"java/lang/StringCoding.hasNegatives([BII)Z",
- "java/lang/StringCoding.implEncodeISOArray([BI[BII)I",
+ "java/lang/StringCoding.implEncodeISOArray([BI[BII)I");
+ add(ignore,
+ // handled through an intrinsic for String.equals itself
+ "java/lang/StringLatin1.equals([B[B)Z",
+
+ // handled by an intrinsic for StringLatin1.indexOf([BI[BII)I
"java/lang/StringLatin1.indexOf([B[B)I",
- "java/lang/StringUTF16.getChar([BI)C",
- "java/lang/StringUTF16.getChars([BII[CI)V",
+
+ // handled through an intrinsic for String.equals itself
+ "java/lang/StringUTF16.equals([B[B)Z",
+
+ // handled by an intrinsic for StringUTF16.indexOfUnsafe
"java/lang/StringUTF16.indexOf([BI[BII)I",
"java/lang/StringUTF16.indexOf([B[B)I",
+
+ // handled by an intrinsic for StringUTF16.indexOfCharUnsafe
"java/lang/StringUTF16.indexOfChar([BIII)I",
+
+ // handled by an intrinsic for StringUTF16.indexOfLatin1Unsafe
"java/lang/StringUTF16.indexOfLatin1([BI[BII)I",
- "java/lang/StringUTF16.indexOfLatin1([B[B)I",
- "java/lang/StringUTF16.putChar([BII)V",
- "java/lang/StringUTF16.toBytes([CII)[B");
- // These are handled through an intrinsic for String.equals itself
- add(ignore,
- "java/lang/StringLatin1.equals([B[B)Z",
- "java/lang/StringUTF16.equals([B[B)Z");
+ "java/lang/StringUTF16.indexOfLatin1([B[B)I");
+
+ if (!config.useAESCTRIntrinsics) {
+ add(ignore,
+ "com/sun/crypto/provider/CounterMode.implCrypt([BII[BI)I");
+ }
+ if (!config.useGHASHIntrinsics()) {
+ add(ignore,
+ "com/sun/crypto/provider/GHASH.processBlocks([BII[J[J)V");
+ }
+ if (!(config.useSHA1Intrinsics() || config.useSHA256Intrinsics() || config.useSHA512Intrinsics())) {
+ add(ignore,
+ "sun/security/provider/DigestBase.implCompressMultiBlock0([BII)I");
+ }
}
if (isJDK10OrHigher()) {
add(toBeInvestigated,
- "java/lang/Math.multiplyHigh(JJ)J",
- "jdk/internal/util/ArraysSupport.vectorizedMismatch(Ljava/lang/Object;JLjava/lang/Object;JII)I");
+ "java/lang/Math.multiplyHigh(JJ)J");
}
if (isJDK11OrHigher()) {
@@ -401,10 +412,16 @@
// Can we implement these on non-AMD64 platforms? C2 seems to.
add(toBeInvestigated,
"java/lang/String.compareTo(Ljava/lang/String;)I",
+ "java/lang/StringLatin1.indexOf([B[B)I",
"java/lang/StringLatin1.inflate([BI[BII)V",
"java/lang/StringLatin1.inflate([BI[CII)V",
"java/lang/StringUTF16.compress([BI[BII)I",
"java/lang/StringUTF16.compress([CI[BII)I",
+ "java/lang/StringUTF16.indexOf([BI[BII)I",
+ "java/lang/StringUTF16.indexOf([B[B)I",
+ "java/lang/StringUTF16.indexOfChar([BIII)I",
+ "java/lang/StringUTF16.indexOfLatin1([BI[BII)I",
+ "java/lang/StringUTF16.indexOfLatin1([B[B)I",
"jdk/internal/misc/Unsafe.compareAndExchangeByte(Ljava/lang/Object;JBB)B",
"jdk/internal/misc/Unsafe.compareAndExchangeShort(Ljava/lang/Object;JSS)S",
"jdk/internal/misc/Unsafe.compareAndSetByte(Ljava/lang/Object;JBB)Z",
@@ -433,7 +450,9 @@
"jdk/internal/misc/Unsafe.getAndSet" + oopName + "(Ljava/lang/Object;JLjava/lang/Object;)Ljava/lang/Object;");
}
add(toBeInvestigated,
+ "com/sun/crypto/provider/CounterMode.implCrypt([BII[BI)I",
"java/lang/Thread.onSpinWait()V",
+ "java/util/ArraysSupport.vectorizedMismatch(Ljava/lang/Object;JLjava/lang/Object;JII)I",
"jdk/internal/misc/Unsafe.getCharUnaligned(Ljava/lang/Object;J)C",
"jdk/internal/misc/Unsafe.getIntUnaligned(Ljava/lang/Object;J)I",
"jdk/internal/misc/Unsafe.getLongUnaligned(Ljava/lang/Object;J)J",
@@ -443,6 +462,10 @@
"jdk/internal/misc/Unsafe.putLongUnaligned(Ljava/lang/Object;JJ)V",
"jdk/internal/misc/Unsafe.putShortUnaligned(Ljava/lang/Object;JS)V");
}
+ if (isJDK10OrHigher()) {
+ add(toBeInvestigated,
+ "jdk/internal/util/ArraysSupport.vectorizedMismatch(Ljava/lang/Object;JLjava/lang/Object;JII)I");
+ }
}
/*
@@ -535,23 +558,23 @@
}
private static boolean isJDK9OrHigher() {
- return GraalServices.JAVA_SPECIFICATION_VERSION >= 9;
+ return JavaVersionUtil.JAVA_SPECIFICATION_VERSION >= 9;
}
private static boolean isJDK10OrHigher() {
- return GraalServices.JAVA_SPECIFICATION_VERSION >= 10;
+ return JavaVersionUtil.JAVA_SPECIFICATION_VERSION >= 10;
}
private static boolean isJDK11OrHigher() {
- return GraalServices.JAVA_SPECIFICATION_VERSION >= 11;
+ return JavaVersionUtil.JAVA_SPECIFICATION_VERSION >= 11;
}
private static boolean isJDK12OrHigher() {
- return GraalServices.JAVA_SPECIFICATION_VERSION >= 12;
+ return JavaVersionUtil.JAVA_SPECIFICATION_VERSION >= 12;
}
private static boolean isJDK13OrHigher() {
- return GraalServices.JAVA_SPECIFICATION_VERSION >= 13;
+ return JavaVersionUtil.JAVA_SPECIFICATION_VERSION >= 13;
}
public interface Refiner {
--- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot.test/src/org/graalvm/compiler/hotspot/test/CompileTheWorld.java Tue Mar 12 09:49:10 2019 +0000
+++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot.test/src/org/graalvm/compiler/hotspot/test/CompileTheWorld.java Sat Mar 16 21:00:45 2019 +0000
@@ -31,7 +31,7 @@
import static org.graalvm.compiler.core.test.ReflectionOptionDescriptors.extractEntries;
import static org.graalvm.compiler.debug.MemUseTrackerKey.getCurrentThreadAllocatedBytes;
import static org.graalvm.compiler.hotspot.test.CompileTheWorld.Options.DESCRIPTORS;
-import static org.graalvm.compiler.serviceprovider.GraalServices.Java8OrEarlier;
+import static org.graalvm.compiler.serviceprovider.JavaVersionUtil.Java8OrEarlier;
import java.io.Closeable;
import java.io.File;
@@ -90,7 +90,7 @@
import org.graalvm.compiler.options.OptionKey;
import org.graalvm.compiler.options.OptionValues;
import org.graalvm.compiler.options.OptionsParser;
-import org.graalvm.compiler.serviceprovider.GraalServices;
+import org.graalvm.compiler.serviceprovider.JavaVersionUtil;
import jdk.vm.ci.hotspot.HotSpotCodeCacheProvider;
import jdk.vm.ci.hotspot.HotSpotCompilationRequest;
@@ -110,7 +110,7 @@
/**
* Magic token to denote that JDK classes are to be compiled. If
- * {@link GraalServices#Java8OrEarlier}, then the classes in {@code rt.jar} are compiled.
+ * {@link JavaVersionUtil#Java8OrEarlier}, then the classes in {@code rt.jar} are compiled.
* Otherwise the classes in the Java runtime image are compiled.
*/
public static final String SUN_BOOT_CLASS_PATH = "sun.boot.class.path";
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot.test/src/org/graalvm/compiler/hotspot/test/EliminateRedundantInitializationPhaseTest.java Sat Mar 16 21:00:45 2019 +0000
@@ -0,0 +1,224 @@
+/*
+ * Copyright (c) 2017, 2018, Oracle and/or its affiliates. All rights reserved.
+ * 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.
+ */
+
+
+package org.graalvm.compiler.hotspot.test;
+
+import org.graalvm.compiler.core.test.GraalCompilerTest;
+import org.graalvm.compiler.hotspot.meta.HotSpotClassInitializationPlugin;
+import org.graalvm.compiler.hotspot.nodes.aot.InitializeKlassNode;
+import org.graalvm.compiler.hotspot.phases.aot.EliminateRedundantInitializationPhase;
+import org.graalvm.compiler.nodes.StructuredGraph;
+import org.graalvm.compiler.nodes.StructuredGraph.AllowAssumptions;
+import org.graalvm.compiler.nodes.graphbuilderconf.GraphBuilderConfiguration.Plugins;
+import org.graalvm.compiler.phases.tiers.HighTierContext;
+import org.junit.Assert;
+import org.junit.Test;
+
+public class EliminateRedundantInitializationPhaseTest extends GraalCompilerTest {
+ @Override
+ protected Plugins getDefaultGraphBuilderPlugins() {
+ Plugins plugins = super.getDefaultGraphBuilderPlugins();
+ plugins.setClassInitializationPlugin(new HotSpotClassInitializationPlugin());
+ return plugins;
+ }
+
+ public static class X {
+ public static int x;
+ public static int y;
+ public static int z;
+ }
+
+ public static class Y extends X {
+ public static int a;
+ public static int b;
+ }
+
+ public static void assignFields() {
+ X.x = 1;
+ X.y = 2;
+ X.z = 3;
+ }
+
+ public static void assignFieldsConditionally(boolean choice) {
+ X.x = 1;
+ if (choice) {
+ X.y = 2;
+ } else {
+ X.z = 3;
+ }
+ }
+
+ public static void assignFieldsSubclassDominates() {
+ Y.a = 1;
+ X.x = 2;
+ X.y = 3;
+ X.z = 4;
+ }
+
+ public static void assignFieldsConditionallySubclassDominates(boolean choice) {
+ Y.a = 1;
+ if (choice) {
+ X.x = 2;
+ } else {
+ X.y = 3;
+ }
+ Y.z = 4;
+ }
+
+ public static void assignFieldsSubclassPostdominates() {
+ X.x = 1;
+ Y.a = 2;
+ }
+
+ public static void assignFieldsConditionallySubclassPostdominates(boolean choice) {
+ X.x = 1;
+ if (choice) {
+ X.y = 2;
+ } else {
+ X.z = 3;
+ }
+ Y.a = 4;
+ }
+
+ public static void assignFieldsConditionallyMixed(boolean choice) {
+ X.x = 1;
+ if (choice) {
+ Y.a = 2;
+ } else {
+ X.z = 3;
+ }
+ Y.b = 4;
+ }
+
+ public static void assignFieldsInLoop() {
+ X.x = 1;
+ for (int i = 0; i < 10; i++) {
+ X.y += X.z;
+ }
+ }
+
+ public static void assignFieldsInBranches(boolean choice) {
+ if (choice) {
+ X.x = 1;
+ } else {
+ X.y = 2;
+ }
+ X.z = 3;
+ }
+
+ public static void assignFieldsInBranchesMixed(boolean choice) {
+ if (choice) {
+ X.x = 1;
+ } else {
+ Y.a = 2;
+ }
+ X.z = 3;
+ }
+
+ static class SomeClass {
+ @BytecodeParserNeverInline
+ static void method() {
+ }
+
+ @BytecodeParserForceInline
+ static void inlinedMethod() {
+ }
+ }
+
+ public static void invokestatic() {
+ SomeClass.method();
+ }
+
+ public static void invokestaticInlined() {
+ SomeClass.inlinedMethod();
+ }
+
+ private void test(String name, int initNodesAfterParse, int initNodesAfterOpt) {
+ StructuredGraph graph = parseEager(name, AllowAssumptions.NO);
+ Assert.assertEquals(initNodesAfterParse, graph.getNodes().filter(InitializeKlassNode.class).count());
+ HighTierContext highTierContext = getDefaultHighTierContext();
+ new EliminateRedundantInitializationPhase().apply(graph, highTierContext);
+ Assert.assertEquals(initNodesAfterOpt, graph.getNodes().filter(InitializeKlassNode.class).count());
+ }
+
+ @Test
+ public void test1() {
+ test("assignFields", 3, 1);
+ }
+
+ @Test
+ public void test2() {
+ test("assignFieldsConditionally", 3, 1);
+ }
+
+ @Test
+ public void test3() {
+ test("assignFieldsSubclassDominates", 4, 1);
+ }
+
+ @Test
+ public void test4() {
+ test("assignFieldsConditionallySubclassDominates", 4, 1);
+ }
+
+ @Test
+ public void test5() {
+ test("assignFieldsSubclassPostdominates", 2, 2);
+ }
+
+ @Test
+ public void test6() {
+ test("assignFieldsConditionallySubclassPostdominates", 4, 2);
+ }
+
+ @Test
+ public void test7() {
+ test("assignFieldsConditionallyMixed", 4, 3);
+ }
+
+ @Test
+ public void test8() {
+ test("assignFieldsInLoop", 4, 1);
+ }
+
+ @Test
+ public void test9() {
+ test("assignFieldsInBranches", 3, 2);
+ }
+
+ @Test
+ public void test10() {
+ test("assignFieldsInBranchesMixed", 3, 2);
+ }
+
+ @Test
+ public void test11() {
+ test("invokestatic", 1, 0);
+ }
+
+ @Test
+ public void test12() {
+ test("invokestaticInlined", 1, 1);
+ }
+}
--- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot.test/src/org/graalvm/compiler/hotspot/test/GraalOSRTest.java Tue Mar 12 09:49:10 2019 +0000
+++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot.test/src/org/graalvm/compiler/hotspot/test/GraalOSRTest.java Sat Mar 16 21:00:45 2019 +0000
@@ -53,6 +53,11 @@
testOSR(getInitialOptions(), "testNonReduceLoop");
}
+ @Test
+ public void testOSR04() {
+ testOSR(getInitialOptions(), "testDeoptAfterCountedLoop");
+ }
+
static int limit = 10000;
public static int sideEffect;
@@ -100,4 +105,14 @@
GraalDirectives.controlFlowAnchor();
return ret;
}
+
+ public static ReturnValue testDeoptAfterCountedLoop() {
+ long ret = 0;
+ for (int i = 0; GraalDirectives.injectBranchProbability(1, i < limit * limit); i++) {
+ GraalDirectives.blackhole(i);
+ ret = GraalDirectives.opaque(i);
+ }
+ GraalDirectives.controlFlowAnchor();
+ return ret + 1 == limit * limit ? ReturnValue.SUCCESS : ReturnValue.FAILURE;
+ }
}
--- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot.test/src/org/graalvm/compiler/hotspot/test/JVMCIInfopointErrorTest.java Tue Mar 12 09:49:10 2019 +0000
+++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot.test/src/org/graalvm/compiler/hotspot/test/JVMCIInfopointErrorTest.java Sat Mar 16 21:00:45 2019 +0000
@@ -24,6 +24,7 @@
package org.graalvm.compiler.hotspot.test;
+import static org.graalvm.compiler.debug.DebugOptions.DumpOnError;
import static org.graalvm.compiler.lir.LIRInstruction.OperandFlag.REG;
import static org.graalvm.compiler.lir.LIRInstruction.OperandFlag.STACK;
import static org.graalvm.compiler.nodeinfo.NodeCycles.CYCLES_IGNORED;
@@ -52,6 +53,7 @@
import org.graalvm.compiler.nodes.StructuredGraph;
import org.graalvm.compiler.nodes.spi.LIRLowerable;
import org.graalvm.compiler.nodes.spi.NodeLIRBuilderTool;
+import org.graalvm.compiler.options.OptionValues;
import org.junit.Test;
import jdk.vm.ci.code.BytecodeFrame;
@@ -139,6 +141,14 @@
test(getDebugContext(), spec);
}
+ /**
+ * Avoids dumping during tests which are expected to fail.
+ */
+ private void testNoDump(TestSpec spec) {
+ OptionValues options = new OptionValues(getInitialOptions(), DumpOnError, false);
+ test(getDebugContext(options, null, null), spec);
+ }
+
private void test(DebugContext debug, TestSpec spec) {
ResolvedJavaMethod method = getResolvedJavaMethod("testMethod");
@@ -154,7 +164,7 @@
@Test(expected = Error.class)
public void testInvalidShortOop() {
- test((tool, state, safepoint) -> {
+ testNoDump((tool, state, safepoint) -> {
PlatformKind kind = tool.target().arch.getPlatformKind(JavaKind.Short);
LIRKind lirKind = LIRKind.reference(kind);
@@ -167,7 +177,7 @@
@Test(expected = Error.class)
public void testInvalidShortDerivedOop() {
- test((tool, state, safepoint) -> {
+ testNoDump((tool, state, safepoint) -> {
Variable baseOop = tool.newVariable(LIRKind.fromJavaKind(tool.target().arch, JavaKind.Object));
tool.append(new ValueDef(baseOop));
--- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot.test/src/org/graalvm/compiler/hotspot/test/OptionsInFileTest.java Tue Mar 12 09:49:10 2019 +0000
+++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot.test/src/org/graalvm/compiler/hotspot/test/OptionsInFileTest.java Sat Mar 16 21:00:45 2019 +0000
@@ -37,6 +37,7 @@
import java.util.List;
import org.graalvm.compiler.core.test.GraalCompilerTest;
+import org.graalvm.compiler.debug.DebugOptions.PrintGraphTarget;
import org.graalvm.compiler.test.SubprocessUtil;
import org.graalvm.compiler.test.SubprocessUtil.Subprocess;
import org.junit.Assert;
@@ -54,12 +55,12 @@
try {
Assert.assertFalse(methodFilterValue.equals(MethodFilter.getDefaultValue()));
Assert.assertFalse(debugFilterValue.equals(Dump.getDefaultValue()));
- Assert.assertTrue(PrintGraph.getDefaultValue());
+ Assert.assertEquals(PrintGraphTarget.File, PrintGraph.getDefaultValue());
try (PrintStream out = new PrintStream(new FileOutputStream(optionsFile))) {
out.println(MethodFilter.getName() + "=" + methodFilterValue);
out.println(Dump.getName() + "=" + debugFilterValue);
- out.println(PrintGraph.getName() + " = false");
+ out.println(PrintGraph.getName() + " = Network");
}
List<String> vmArgs = withoutDebuggerArguments(getVMCommandLine());
@@ -70,7 +71,7 @@
String[] expected = {
"graal.MethodFilter := \"a very unlikely method name\"",
"graal.Dump := \"a very unlikely debug scope\"",
- "graal.PrintGraph := false"};
+ "graal.PrintGraph := Network"};
for (String line : proc.output) {
for (int i = 0; i < expected.length; i++) {
if (expected[i] != null && line.contains(expected[i])) {
--- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot.test/src/org/graalvm/compiler/hotspot/test/ReservedStackAccessTest.java Tue Mar 12 09:49:10 2019 +0000
+++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot.test/src/org/graalvm/compiler/hotspot/test/ReservedStackAccessTest.java Sat Mar 16 21:00:45 2019 +0000
@@ -73,6 +73,10 @@
vmArgs.add("-XX:+UseJVMCICompiler");
vmArgs.add("-Dgraal.Inline=false");
vmArgs.add("-XX:CompileCommand=exclude,java/util/concurrent/locks/AbstractOwnableSynchronizer.setExclusiveOwnerThread");
+
+ // Avoid SOE in HotSpotJVMCIRuntime.adjustCompilationLevel
+ vmArgs.add("-Dgraal.CompileGraalWithC1Only=false");
+
Subprocess proc = SubprocessUtil.java(vmArgs, ReservedStackAccessTest.class.getName());
boolean passed = false;
for (String line : proc.output) {
@@ -81,9 +85,7 @@
}
}
if (!passed) {
- for (String line : proc.output) {
- System.err.println("" + line);
- }
+ System.err.println(proc);
}
assertTrue(passed);
}
--- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot.test/src/org/graalvm/compiler/hotspot/test/WriteBarrierAdditionTest.java Tue Mar 12 09:49:10 2019 +0000
+++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot.test/src/org/graalvm/compiler/hotspot/test/WriteBarrierAdditionTest.java Sat Mar 16 21:00:45 2019 +0000
@@ -32,10 +32,10 @@
import org.graalvm.compiler.debug.DebugContext;
import org.graalvm.compiler.hotspot.GraalHotSpotVMConfig;
import org.graalvm.compiler.hotspot.GraalHotSpotVMConfigBase;
-import org.graalvm.compiler.hotspot.nodes.G1PostWriteBarrier;
-import org.graalvm.compiler.hotspot.nodes.G1PreWriteBarrier;
-import org.graalvm.compiler.hotspot.nodes.G1ReferentFieldReadBarrier;
-import org.graalvm.compiler.hotspot.nodes.SerialWriteBarrier;
+import org.graalvm.compiler.hotspot.gc.g1.G1PostWriteBarrier;
+import org.graalvm.compiler.hotspot.gc.g1.G1PreWriteBarrier;
+import org.graalvm.compiler.hotspot.gc.g1.G1ReferentFieldReadBarrier;
+import org.graalvm.compiler.hotspot.gc.shared.SerialWriteBarrier;
import org.graalvm.compiler.hotspot.phases.WriteBarrierAdditionPhase;
import org.graalvm.compiler.nodes.StructuredGraph;
import org.graalvm.compiler.nodes.StructuredGraph.AllowAssumptions;
--- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot.test/src/org/graalvm/compiler/hotspot/test/WriteBarrierVerificationTest.java Tue Mar 12 09:49:10 2019 +0000
+++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot.test/src/org/graalvm/compiler/hotspot/test/WriteBarrierVerificationTest.java Sat Mar 16 21:00:45 2019 +0000
@@ -32,12 +32,12 @@
import org.graalvm.compiler.debug.DebugContext.Scope;
import org.graalvm.compiler.debug.DebugDumpScope;
import org.graalvm.compiler.hotspot.GraalHotSpotVMConfig;
-import org.graalvm.compiler.hotspot.nodes.G1ArrayRangePostWriteBarrier;
-import org.graalvm.compiler.hotspot.nodes.G1ArrayRangePreWriteBarrier;
-import org.graalvm.compiler.hotspot.nodes.G1PostWriteBarrier;
-import org.graalvm.compiler.hotspot.nodes.G1PreWriteBarrier;
-import org.graalvm.compiler.hotspot.nodes.SerialArrayRangeWriteBarrier;
-import org.graalvm.compiler.hotspot.nodes.SerialWriteBarrier;
+import org.graalvm.compiler.hotspot.gc.g1.G1ArrayRangePostWriteBarrier;
+import org.graalvm.compiler.hotspot.gc.g1.G1ArrayRangePreWriteBarrier;
+import org.graalvm.compiler.hotspot.gc.g1.G1PostWriteBarrier;
+import org.graalvm.compiler.hotspot.gc.g1.G1PreWriteBarrier;
+import org.graalvm.compiler.hotspot.gc.shared.SerialArrayRangeWriteBarrier;
+import org.graalvm.compiler.hotspot.gc.shared.SerialWriteBarrier;
import org.graalvm.compiler.hotspot.phases.WriteBarrierAdditionPhase;
import org.graalvm.compiler.hotspot.phases.WriteBarrierVerificationPhase;
import org.graalvm.compiler.nodes.AbstractBeginNode;
--- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/CompilationTask.java Tue Mar 12 09:49:10 2019 +0000
+++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/CompilationTask.java Sat Mar 16 21:00:45 2019 +0000
@@ -368,8 +368,14 @@
installedCode = null;
Object[] context = {new DebugDumpScope(getIdString(), true), codeCache, getMethod(), compResult};
try (DebugContext.Scope s = debug.scope("CodeInstall", context)) {
- installedCode = (HotSpotInstalledCode) backend.createInstalledCode(debug, getRequest().getMethod(), getRequest(), compResult,
- getRequest().getMethod().getSpeculationLog(), null, installAsDefault, context);
+ HotSpotCompilationRequest request = getRequest();
+ installedCode = (HotSpotInstalledCode) backend.createInstalledCode(debug,
+ request.getMethod(),
+ request,
+ compResult,
+ null,
+ installAsDefault,
+ context);
} catch (Throwable e) {
throw debug.handle(e);
}
--- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/GraalHotSpotVMConfig.java Tue Mar 12 09:49:10 2019 +0000
+++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/GraalHotSpotVMConfig.java Sat Mar 16 21:00:45 2019 +0000
@@ -92,6 +92,7 @@
public final boolean useBiasedLocking = getFlag("UseBiasedLocking", Boolean.class);
public final boolean usePopCountInstruction = getFlag("UsePopCountInstruction", Boolean.class);
public final boolean useAESIntrinsics = getFlag("UseAESIntrinsics", Boolean.class);
+ public final boolean useAESCTRIntrinsics = getFlag("UseAESCTRIntrinsics", Boolean.class, false);
public final boolean useCRC32Intrinsics = getFlag("UseCRC32Intrinsics", Boolean.class);
public final boolean useCRC32CIntrinsics = versioned.useCRC32CIntrinsics;
public final boolean threadLocalHandshakes = getFlag("ThreadLocalHandshakes", Boolean.class, false);
@@ -100,10 +101,12 @@
private final boolean useSHA1Intrinsics = getFlag("UseSHA1Intrinsics", Boolean.class);
private final boolean useSHA256Intrinsics = getFlag("UseSHA256Intrinsics", Boolean.class);
private final boolean useSHA512Intrinsics = getFlag("UseSHA512Intrinsics", Boolean.class);
+ private final boolean useGHASHIntrinsics = getFlag("UseGHASHIntrinsics", Boolean.class, false);
private final boolean useMontgomeryMultiplyIntrinsic = getFlag("UseMontgomeryMultiplyIntrinsic", Boolean.class, false);
private final boolean useMontgomerySquareIntrinsic = getFlag("UseMontgomerySquareIntrinsic", Boolean.class, false);
private final boolean useMulAddIntrinsic = getFlag("UseMulAddIntrinsic", Boolean.class, false);
private final boolean useSquareToLenIntrinsic = getFlag("UseSquareToLenIntrinsic", Boolean.class, false);
+ public final boolean useVectorizedMismatchIntrinsic = getFlag("UseVectorizedMismatchIntrinsic", Boolean.class, false);
/*
* These are methods because in some JDKs the flags are visible but the stubs themselves haven't
@@ -114,15 +117,19 @@
}
public boolean useSHA1Intrinsics() {
- return useSHA1Intrinsics && sha1ImplCompress != 0;
+ return useSHA1Intrinsics && sha1ImplCompress != 0 && sha1ImplCompressMultiBlock != 0;
}
public boolean useSHA256Intrinsics() {
- return useSHA256Intrinsics && sha256ImplCompress != 0;
+ return useSHA256Intrinsics && sha256ImplCompress != 0 && sha256ImplCompressMultiBlock != 0;
}
public boolean useSHA512Intrinsics() {
- return useSHA512Intrinsics && sha512ImplCompress != 0;
+ return useSHA512Intrinsics && sha512ImplCompress != 0 && sha512ImplCompressMultiBlock != 0;
+ }
+
+ public boolean useGHASHIntrinsics() {
+ return useGHASHIntrinsics && ghashProcessBlocks != 0;
}
public boolean useMontgomeryMultiplyIntrinsic() {
@@ -309,7 +316,17 @@
public final int jvmAccWrittenFlags = getConstant("JVM_ACC_WRITTEN_FLAGS", Integer.class);
public final int jvmAccSynthetic = getConstant("JVM_ACC_SYNTHETIC", Integer.class);
- public final int jvmciCompileStateCanPostOnExceptionsOffset = getFieldOffset("JVMCIEnv::_jvmti_can_post_on_exceptions", Integer.class, "jbyte", Integer.MIN_VALUE);
+ public final int jvmciCompileStateCanPostOnExceptionsOffset = getJvmciCompileStateCanPostOnExceptionsOffset();
+
+ // Integer.MIN_VALUE if not available
+ private int getJvmciCompileStateCanPostOnExceptionsOffset() {
+ int offset = getFieldOffset("JVMCICompileState::_jvmti_can_post_on_exceptions", Integer.class, "jbyte", Integer.MIN_VALUE);
+ if (offset == Integer.MIN_VALUE) {
+ // JDK 12
+ offset = getFieldOffset("JVMCIEnv::_jvmti_can_post_on_exceptions", Integer.class, "jbyte", Integer.MIN_VALUE);
+ }
+ return offset;
+ }
public final int threadTlabOffset = getFieldOffset("Thread::_tlab", Integer.class, "ThreadLocalAllocBuffer");
public final int javaThreadAnchorOffset = getFieldOffset("JavaThread::_anchor", Integer.class, "JavaFrameAnchor");
@@ -372,12 +389,29 @@
public final int pendingExceptionOffset = getFieldOffset("ThreadShadow::_pending_exception", Integer.class, "oop");
public final int pendingDeoptimizationOffset = getFieldOffset("JavaThread::_pending_deoptimization", Integer.class, "int");
- public final int pendingFailedSpeculationOffset = getFieldOffset("JavaThread::_pending_failed_speculation", Integer.class, "long");
public final int pendingTransferToInterpreterOffset = getFieldOffset("JavaThread::_pending_transfer_to_interpreter", Integer.class, "bool");
private final int javaFrameAnchorLastJavaSpOffset = getFieldOffset("JavaFrameAnchor::_last_Java_sp", Integer.class, "intptr_t*");
private final int javaFrameAnchorLastJavaPcOffset = getFieldOffset("JavaFrameAnchor::_last_Java_pc", Integer.class, "address");
+ public final int pendingFailedSpeculationOffset;
+ {
+ String name = "JavaThread::_pending_failed_speculation";
+ int offset = -1;
+ try {
+ offset = getFieldOffset(name, Integer.class, "jlong");
+ } catch (JVMCIError e) {
+ try {
+ offset = getFieldOffset(name, Integer.class, "long");
+ } catch (JVMCIError e2) {
+ }
+ }
+ if (offset == -1) {
+ throw new JVMCIError("cannot get offset of field " + name + " with type long or jlong");
+ }
+ pendingFailedSpeculationOffset = offset;
+ }
+
public int threadLastJavaSpOffset() {
return javaThreadAnchorOffset + javaFrameAnchorLastJavaSpOffset;
}
@@ -602,11 +636,11 @@
public final long crcTableAddress = getFieldValue("StubRoutines::_crc_table_adr", Long.class, "address");
public final long sha1ImplCompress = getFieldValue("StubRoutines::_sha1_implCompress", Long.class, "address", 0L);
- public final long sha1ImplCompressMB = getFieldValue("StubRoutines::_sha1_implCompressMB", Long.class, "address", 0L);
+ public final long sha1ImplCompressMultiBlock = getFieldValue("StubRoutines::_sha1_implCompressMB", Long.class, "address", 0L);
public final long sha256ImplCompress = getFieldValue("StubRoutines::_sha256_implCompress", Long.class, "address", 0L);
- public final long sha256ImplCompressMB = getFieldValue("StubRoutines::_sha256_implCompressMB", Long.class, "address", 0L);
+ public final long sha256ImplCompressMultiBlock = getFieldValue("StubRoutines::_sha256_implCompressMB", Long.class, "address", 0L);
public final long sha512ImplCompress = getFieldValue("StubRoutines::_sha512_implCompress", Long.class, "address", 0L);
- public final long sha512ImplCompressMB = getFieldValue("StubRoutines::_sha512_implCompressMB", Long.class, "address", 0L);
+ public final long sha512ImplCompressMultiBlock = getFieldValue("StubRoutines::_sha512_implCompressMB", Long.class, "address", 0L);
public final long multiplyToLen = getFieldValue("StubRoutines::_multiplyToLen", Long.class, "address", longRequiredOnAMD64);
public final long counterModeAESCrypt = getFieldValue("StubRoutines::_counterMode_AESCrypt", Long.class, "address", 0L);
--- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/HotSpotBackend.java Tue Mar 12 09:49:10 2019 +0000
+++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/HotSpotBackend.java Sat Mar 16 21:00:45 2019 +0000
@@ -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
@@ -46,6 +46,7 @@
import org.graalvm.compiler.hotspot.replacements.AESCryptSubstitutions;
import org.graalvm.compiler.hotspot.replacements.BigIntegerSubstitutions;
import org.graalvm.compiler.hotspot.replacements.CipherBlockChainingSubstitutions;
+import org.graalvm.compiler.hotspot.replacements.DigestBaseSubstitutions;
import org.graalvm.compiler.hotspot.replacements.SHA2Substitutions;
import org.graalvm.compiler.hotspot.replacements.SHA5Substitutions;
import org.graalvm.compiler.hotspot.replacements.SHASubstitutions;
@@ -71,6 +72,7 @@
import org.graalvm.compiler.options.OptionType;
import org.graalvm.compiler.options.OptionValues;
import org.graalvm.compiler.phases.tiers.SuitesProvider;
+import org.graalvm.compiler.serviceprovider.JavaVersionUtil;
import org.graalvm.compiler.word.Word;
import jdk.internal.vm.compiler.word.Pointer;
@@ -95,7 +97,7 @@
public static class Options {
// @formatter:off
@Option(help = "Use Graal arithmetic stubs instead of HotSpot stubs where possible")
- public static final OptionKey<Boolean> GraalArithmeticStubs = new OptionKey<>(false); // GR-8276
+ public static final OptionKey<Boolean> GraalArithmeticStubs = new OptionKey<>(JavaVersionUtil.JAVA_SPECIFICATION_VERSION >= 9);
@Option(help = "Enables instruction profiling on assembler level. Valid values are a comma separated list of supported instructions." +
" Compare with subclasses of Assembler.InstructionCounter.", type = OptionType.Debug)
public static final OptionKey<String> ASMInstructionProfiling = new OptionKey<>(null);
@@ -261,6 +263,36 @@
@NodeIntrinsic(ForeignCallNode.class)
private static native void sha5ImplCompressStub(@ConstantNodeParameter ForeignCallDescriptor descriptor, Word bufAddr, Object state);
+ /**
+ * @see DigestBaseSubstitutions#implCompressMultiBlock0
+ */
+ public static final ForeignCallDescriptor SHA_IMPL_COMPRESS_MB = new ForeignCallDescriptor("shaImplCompressMB", int.class, Word.class, Object.class, int.class, int.class);
+
+ public static int shaImplCompressMBStub(Word bufAddr, Object stateAddr, int ofs, int limit) {
+ return shaImplCompressMBStub(HotSpotBackend.SHA_IMPL_COMPRESS_MB, bufAddr, stateAddr, ofs, limit);
+ }
+
+ @NodeIntrinsic(ForeignCallNode.class)
+ private static native int shaImplCompressMBStub(@ConstantNodeParameter ForeignCallDescriptor descriptor, Word bufAddr, Object state, int ofs, int limit);
+
+ public static final ForeignCallDescriptor SHA2_IMPL_COMPRESS_MB = new ForeignCallDescriptor("sha2ImplCompressMB", int.class, Word.class, Object.class, int.class, int.class);
+
+ public static int sha2ImplCompressMBStub(Word bufAddr, Object stateAddr, int ofs, int limit) {
+ return sha2ImplCompressMBStub(HotSpotBackend.SHA2_IMPL_COMPRESS_MB, bufAddr, stateAddr, ofs, limit);
+ }
+
+ @NodeIntrinsic(ForeignCallNode.class)
+ private static native int sha2ImplCompressMBStub(@ConstantNodeParameter ForeignCallDescriptor descriptor, Word bufAddr, Object state, int ofs, int limit);
+
+ public static final ForeignCallDescriptor SHA5_IMPL_COMPRESS_MB = new ForeignCallDescriptor("sha5ImplCompressMB", int.class, Word.class, Object.class, int.class, int.class);
+
+ public static int sha5ImplCompressMBStub(Word bufAddr, Object stateAddr, int ofs, int limit) {
+ return sha5ImplCompressMBStub(HotSpotBackend.SHA5_IMPL_COMPRESS_MB, bufAddr, stateAddr, ofs, limit);
+ }
+
+ @NodeIntrinsic(ForeignCallNode.class)
+ private static native int sha5ImplCompressMBStub(@ConstantNodeParameter ForeignCallDescriptor descriptor, Word bufAddr, Object state, int ofs, int limit);
+
public static void unsafeArraycopy(Word srcAddr, Word dstAddr, Word size) {
unsafeArraycopyStub(UNSAFE_ARRAYCOPY, srcAddr, dstAddr, size);
}
@@ -269,6 +301,37 @@
private static native void unsafeArraycopyStub(@ConstantNodeParameter ForeignCallDescriptor descriptor, Word srcAddr, Word dstAddr, Word size);
/**
+ * Descriptor for {@code StubRoutines::_ghash_processBlocks}.
+ */
+ public static final ForeignCallDescriptor GHASH_PROCESS_BLOCKS = new ForeignCallDescriptor("ghashProcessBlocks", void.class, Word.class, Word.class, Word.class, int.class);
+
+ /**
+ * Descriptor for {@code StubRoutines::_counterMode_AESCrypt}.
+ */
+ public static final ForeignCallDescriptor COUNTERMODE_IMPL_CRYPT = new ForeignCallDescriptor("counterModeAESCrypt", int.class, Word.class, Word.class, Word.class, Word.class, int.class,
+ Word.class, Word.class);
+
+ public static int counterModeAESCrypt(Word srcAddr, Word dstAddr, Word kPtr, Word cntPtr, int len, Word encCntPtr, Word used) {
+ return counterModeAESCrypt(COUNTERMODE_IMPL_CRYPT, srcAddr, dstAddr, kPtr, cntPtr, len, encCntPtr, used);
+ }
+
+ @NodeIntrinsic(ForeignCallNode.class)
+ private static native int counterModeAESCrypt(@ConstantNodeParameter ForeignCallDescriptor descriptor, Word srcAddr, Word dstAddr, Word kPtr, Word cntPtr, int len, Word encCntPtr,
+ Word used);
+
+ /**
+ * Descriptor for {@code StubRoutines::_vectorizedMismatch}.
+ */
+ public static final ForeignCallDescriptor VECTORIZED_MISMATCHED = new ForeignCallDescriptor("vectorizedMismatch", int.class, Word.class, Word.class, int.class, int.class);
+
+ public static int vectorizedMismatch(Word aAddr, Word bAddr, int length, int log2ArrayIndexScale) {
+ return vectorizedMismatchStub(VECTORIZED_MISMATCHED, aAddr, bAddr, length, log2ArrayIndexScale);
+ }
+
+ @NodeIntrinsic(ForeignCallNode.class)
+ private static native int vectorizedMismatchStub(@ConstantNodeParameter ForeignCallDescriptor descriptor, Word aAddr, Word bAddr, int length, int log2ArrayIndexScale);
+
+ /**
* @see VMErrorNode
*/
public static final ForeignCallDescriptor VM_ERROR = new ForeignCallDescriptor("vm_error", void.class, Object.class, Object.class, long.class);
@@ -389,6 +452,13 @@
}
/**
+ * Translates a set of registers from the callee's perspective to the caller's perspective. This
+ * is needed for architectures where input/output registers are renamed during a call (e.g.
+ * register windows on SPARC). Registers which are not visible by the caller are removed.
+ */
+ protected abstract EconomicSet<Register> translateToCallerRegisters(EconomicSet<Register> calleeRegisters);
+
+ /**
* Updates a given stub with respect to the registers it destroys.
* <p>
* Any entry in {@code calleeSaveInfo} that {@linkplain SaveRegistersOp#supportsRemove()
--- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/HotSpotCompiledCodeBuilder.java Tue Mar 12 09:49:10 2019 +0000
+++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/HotSpotCompiledCodeBuilder.java Sat Mar 16 21:00:45 2019 +0000
@@ -88,7 +88,7 @@
ResolvedJavaMethod[] methods = compResult.getMethods();
- List<CodeAnnotation> annotations = compResult.getAnnotations();
+ List<CodeAnnotation> annotations = compResult.getCodeAnnotations();
Comment[] comments = new Comment[annotations.size()];
if (!annotations.isEmpty()) {
for (int i = 0; i < comments.length; i++) {
@@ -129,16 +129,16 @@
boolean hasUnsafeAccess = compResult.hasUnsafeAccess();
int id;
- long jvmciEnv;
+ long jvmciCompileState;
if (compRequest != null) {
id = compRequest.getId();
- jvmciEnv = compRequest.getJvmciEnv();
+ jvmciCompileState = compRequest.getJvmciEnv();
} else {
id = hsMethod.allocateCompileId(entryBCI);
- jvmciEnv = 0L;
+ jvmciCompileState = 0L;
}
return new HotSpotCompiledNmethod(name, targetCode, targetCodeSize, sites, assumptions, methods, comments, dataSection, dataSectionAlignment, dataSectionPatches, isImmutablePIC,
- totalFrameSize, customStackArea, hsMethod, entryBCI, id, jvmciEnv, hasUnsafeAccess);
+ totalFrameSize, customStackArea, hsMethod, entryBCI, id, jvmciCompileState, hasUnsafeAccess);
} else {
return new HotSpotCompiledCode(name, targetCode, targetCodeSize, sites, assumptions, methods, comments, dataSection, dataSectionAlignment, dataSectionPatches, isImmutablePIC,
totalFrameSize, customStackArea);
--- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/HotSpotDataBuilder.java Tue Mar 12 09:49:10 2019 +0000
+++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/HotSpotDataBuilder.java Sat Mar 16 21:00:45 2019 +0000
@@ -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
@@ -51,12 +51,6 @@
}
@Override
- public boolean needDetailedPatchingInformation() {
- /* The HotSpot VM finds operands that need patching by decoding the instruction. */
- return false;
- }
-
- @Override
public Data createDataItem(Constant constant) {
if (JavaConstant.isNull(constant)) {
boolean compressed = COMPRESSED_NULL.equals(constant);
--- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/HotSpotGraalCompilerFactory.java Tue Mar 12 09:49:10 2019 +0000
+++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/HotSpotGraalCompilerFactory.java Sat Mar 16 21:00:45 2019 +0000
@@ -25,6 +25,7 @@
package org.graalvm.compiler.hotspot;
import static jdk.vm.ci.common.InitTimer.timer;
+import static jdk.vm.ci.services.Services.IS_BUILDING_NATIVE_IMAGE;
import static org.graalvm.compiler.hotspot.HotSpotGraalOptionValues.GRAAL_OPTION_PROPERTY_PREFIX;
import java.io.PrintStream;
@@ -71,7 +72,7 @@
public void onSelection() {
JVMCIVersionCheck.check(false);
assert options == null : "cannot select " + getClass() + " service more than once";
- options = HotSpotGraalOptionValues.HOTSPOT_OPTIONS;
+ options = HotSpotGraalOptionValues.defaultOptions();
initializeGraalCompilePolicyFields(options);
isGraalPredicate = compileGraalWithC1Only ? new IsGraalPredicate() : null;
/*
@@ -80,6 +81,10 @@
*/
adjustCompilationLevelInternal(Object.class, "hashCode", "()I", CompilationLevel.FullOptimization);
adjustCompilationLevelInternal(Object.class, "hashCode", "()I", CompilationLevel.Simple);
+ if (IS_BUILDING_NATIVE_IMAGE) {
+ // Triggers initialization of all option descriptors
+ Options.CompileGraalWithC1Only.getName();
+ }
}
private static void initializeGraalCompilePolicyFields(OptionValues options) {
--- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/HotSpotGraalJVMCIServiceLocator.java Tue Mar 12 09:49:10 2019 +0000
+++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/HotSpotGraalJVMCIServiceLocator.java Sat Mar 16 21:00:45 2019 +0000
@@ -26,6 +26,7 @@
import org.graalvm.compiler.serviceprovider.ServiceProvider;
+import jdk.vm.ci.common.NativeImageReinitialize;
import jdk.vm.ci.hotspot.HotSpotVMEventListener;
import jdk.vm.ci.runtime.JVMCICompilerFactory;
import jdk.vm.ci.services.JVMCIServiceLocator;
@@ -51,7 +52,7 @@
return null;
}
- private HotSpotGraalRuntime graalRuntime;
+ @NativeImageReinitialize private HotSpotGraalRuntime graalRuntime;
/**
* Notifies this object of the compiler created via {@link HotSpotGraalJVMCIServiceLocator}.
--- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/HotSpotGraalOptionValues.java Tue Mar 12 09:49:10 2019 +0000
+++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/HotSpotGraalOptionValues.java Sat Mar 16 21:00:45 2019 +0000
@@ -40,9 +40,10 @@
import org.graalvm.compiler.options.OptionsParser;
import jdk.vm.ci.common.InitTimer;
+import jdk.vm.ci.common.NativeImageReinitialize;
/**
- * The {@link #HOTSPOT_OPTIONS} value contains the options values initialized in a HotSpot VM. The
+ * The {@link #defaultOptions()} method returns the options values initialized in a HotSpot VM. The
* values are set via system properties with the {@value #GRAAL_OPTION_PROPERTY_PREFIX} prefix.
*/
public class HotSpotGraalOptionValues {
@@ -71,7 +72,21 @@
return GRAAL_OPTION_PROPERTY_PREFIX + value.getName() + "=" + value.getValue(options);
}
- public static final OptionValues HOTSPOT_OPTIONS = initializeOptions();
+ @NativeImageReinitialize private static volatile OptionValues hotspotOptions;
+
+ public static OptionValues defaultOptions() {
+ OptionValues res = hotspotOptions;
+ if (res == null) {
+ synchronized (HotSpotGraalOptionValues.class) {
+ res = hotspotOptions;
+ if (res == null) {
+ res = initializeOptions();
+ hotspotOptions = res;
+ }
+ }
+ }
+ return res;
+ }
/**
* Global options. The values for these options are initialized by parsing the file denoted by
--- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/HotSpotGraalRuntime.java Tue Mar 12 09:49:10 2019 +0000
+++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/HotSpotGraalRuntime.java Sat Mar 16 21:00:45 2019 +0000
@@ -95,6 +95,8 @@
*/
public final class HotSpotGraalRuntime implements HotSpotGraalRuntimeProvider {
+ private static final boolean IS_AOT = Boolean.getBoolean("com.oracle.graalvm.isaot");
+
private static boolean checkArrayIndexScaleInvariants(MetaAccessProvider metaAccess) {
assert metaAccess.getArrayIndexScale(JavaKind.Byte) == 1;
assert metaAccess.getArrayIndexScale(JavaKind.Boolean) == 1;
@@ -159,9 +161,13 @@
compilerConfigurationName = compilerConfigurationFactory.getName();
compiler = new HotSpotGraalCompiler(jvmciRuntime, this, options);
- management = GraalServices.loadSingle(HotSpotGraalManagementRegistration.class, false);
- if (management != null) {
- management.initialize(this);
+ if (IS_AOT) {
+ management = null;
+ } else {
+ management = GraalServices.loadSingle(HotSpotGraalManagementRegistration.class, false);
+ if (management != null) {
+ management.initialize(this);
+ }
}
BackendMap backendMap = compilerConfigurationFactory.createBackendMap();
@@ -571,7 +577,7 @@
EconomicMap<OptionKey<?>, Object> extra = EconomicMap.create();
extra.put(DebugOptions.Dump, filter);
extra.put(DebugOptions.PrintGraphHost, host);
- extra.put(DebugOptions.PrintBinaryGraphPort, port);
+ extra.put(DebugOptions.PrintGraphPort, port);
OptionValues compileOptions = new OptionValues(getOptions(), extra);
compiler.compileMethod(new HotSpotCompilationRequest(hotSpotMethod, -1, 0L), false, compileOptions);
}
--- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/HotSpotReplacementsImpl.java Tue Mar 12 09:49:10 2019 +0000
+++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/HotSpotReplacementsImpl.java Sat Mar 16 21:00:45 2019 +0000
@@ -24,17 +24,34 @@
package org.graalvm.compiler.hotspot;
+import static jdk.vm.ci.services.Services.IS_BUILDING_NATIVE_IMAGE;
+import static jdk.vm.ci.services.Services.IS_IN_NATIVE_IMAGE;
+import static org.graalvm.compiler.replacements.ReplacementsImpl.Options.UseEncodedSnippets;
+
+import java.util.Set;
+
+import jdk.internal.vm.compiler.collections.EconomicSet;
import org.graalvm.compiler.api.replacements.SnippetReflectionProvider;
import org.graalvm.compiler.bytecode.BytecodeProvider;
+import org.graalvm.compiler.core.common.CompilationIdentifier;
+import org.graalvm.compiler.debug.DebugContext;
+import org.graalvm.compiler.debug.GraalError;
+import org.graalvm.compiler.graph.NodeSourcePosition;
import org.graalvm.compiler.hotspot.meta.HotSpotWordOperationPlugin;
import org.graalvm.compiler.hotspot.word.HotSpotOperation;
+import org.graalvm.compiler.nodes.Invoke;
+import org.graalvm.compiler.nodes.StructuredGraph;
+import org.graalvm.compiler.nodes.graphbuilderconf.GraphBuilderContext;
import org.graalvm.compiler.nodes.graphbuilderconf.GraphBuilderPlugin;
+import org.graalvm.compiler.nodes.graphbuilderconf.InvocationPlugin;
+import org.graalvm.compiler.nodes.graphbuilderconf.MethodSubstitutionPlugin;
import org.graalvm.compiler.options.OptionValues;
import org.graalvm.compiler.phases.util.Providers;
import org.graalvm.compiler.printer.GraalDebugHandlersFactory;
import org.graalvm.compiler.replacements.ReplacementsImpl;
import jdk.vm.ci.code.TargetDescription;
+import jdk.vm.ci.common.NativeImageReinitialize;
import jdk.vm.ci.meta.ResolvedJavaMethod;
/**
@@ -46,21 +63,149 @@
super(options, new GraalDebugHandlersFactory(snippetReflection), providers, snippetReflection, bytecodeProvider, target);
}
+ protected HotSpotReplacementsImpl(HotSpotReplacementsImpl replacements, Providers providers) {
+ super(replacements.options, new GraalDebugHandlersFactory(replacements.snippetReflection), providers, replacements.snippetReflection,
+ replacements.getDefaultReplacementBytecodeProvider(), replacements.target);
+ }
+
@Override
public Class<? extends GraphBuilderPlugin> getIntrinsifyingPlugin(ResolvedJavaMethod method) {
return method.getAnnotation(HotSpotOperation.class) != null ? HotSpotWordOperationPlugin.class : super.getIntrinsifyingPlugin(method);
}
+ public void registerMethodSubstitution(ResolvedJavaMethod method, ResolvedJavaMethod original) {
+ if (!IS_IN_NATIVE_IMAGE) {
+ if (IS_BUILDING_NATIVE_IMAGE || UseEncodedSnippets.getValue(options)) {
+ synchronized (HotSpotReplacementsImpl.class) {
+ if (snippetEncoder == null) {
+ snippetEncoder = new SymbolicSnippetEncoder(this);
+ }
+ snippetEncoder.registerMethodSubstitution(method, original);
+ }
+ }
+ }
+ }
+
+ @Override
+ public StructuredGraph getIntrinsicGraph(ResolvedJavaMethod method, CompilationIdentifier compilationId, DebugContext debug) {
+ if (IS_IN_NATIVE_IMAGE) {
+ HotSpotReplacementsImpl replacements = (HotSpotReplacementsImpl) providers.getReplacements();
+ InvocationPlugin plugin = replacements.getGraphBuilderPlugins().getInvocationPlugins().lookupInvocation(method);
+ if (plugin instanceof MethodSubstitutionPlugin) {
+ MethodSubstitutionPlugin msp = (MethodSubstitutionPlugin) plugin;
+ return replacements.getMethodSubstitution(msp, method);
+ }
+ return null;
+ }
+ return super.getIntrinsicGraph(method, compilationId, debug);
+ }
+
+ @Override
+ public void notifyNotInlined(GraphBuilderContext b, ResolvedJavaMethod method, Invoke invoke) {
+ if (b.parsingIntrinsic() && snippetEncoder != null) {
+ if (getIntrinsifyingPlugin(method) != null) {
+ snippetEncoder.addDelayedInvocationPluginMethod(method);
+ return;
+ }
+ }
+ super.notifyNotInlined(b, method, invoke);
+ }
+
+ // When assertions are enabled, these fields are used to ensure all snippets are
+ // registered during Graal initialization which in turn ensures that native image
+ // building will not miss any snippets.
+ @NativeImageReinitialize private EconomicSet<ResolvedJavaMethod> registeredSnippets = EconomicSet.create();
private boolean snippetRegistrationClosed;
@Override
public void registerSnippet(ResolvedJavaMethod method, ResolvedJavaMethod original, Object receiver, boolean trackNodeSourcePosition) {
- assert !snippetRegistrationClosed;
- super.registerSnippet(method, original, receiver, trackNodeSourcePosition);
+ if (!IS_IN_NATIVE_IMAGE) {
+ assert !snippetRegistrationClosed : "Cannot register snippet after registration is closed: " + method.format("%H.%n(%p)");
+ assert registeredSnippets.add(method) : "Cannot register snippet twice: " + method.format("%H.%n(%p)");
+ if (IS_BUILDING_NATIVE_IMAGE || UseEncodedSnippets.getValue(options)) {
+ synchronized (HotSpotReplacementsImpl.class) {
+ if (snippetEncoder == null) {
+ snippetEncoder = new SymbolicSnippetEncoder(this);
+ }
+ snippetEncoder.registerSnippet(method, original, receiver, trackNodeSourcePosition);
+ }
+ }
+ }
}
@Override
public void closeSnippetRegistration() {
snippetRegistrationClosed = true;
}
+
+ static SymbolicSnippetEncoder.EncodedSnippets getEncodedSnippets() {
+ return encodedSnippets;
+ }
+
+ public Set<ResolvedJavaMethod> getSnippetMethods() {
+ if (snippetEncoder != null) {
+ return snippetEncoder.getSnippetMethods();
+ }
+ return null;
+ }
+
+ static void setEncodedSnippets(SymbolicSnippetEncoder.EncodedSnippets encodedSnippets) {
+ HotSpotReplacementsImpl.encodedSnippets = encodedSnippets;
+ }
+
+ public boolean encode() {
+ SymbolicSnippetEncoder encoder = HotSpotReplacementsImpl.snippetEncoder;
+ if (encoder != null) {
+ return encoder.encode();
+ }
+ return false;
+ }
+
+ private static volatile SymbolicSnippetEncoder.EncodedSnippets encodedSnippets;
+
+ @NativeImageReinitialize static SymbolicSnippetEncoder snippetEncoder;
+
+ @Override
+ public StructuredGraph getSnippet(ResolvedJavaMethod method, ResolvedJavaMethod recursiveEntry, Object[] args, boolean trackNodeSourcePosition, NodeSourcePosition replaceePosition) {
+ StructuredGraph graph = getEncodedSnippet(method, args);
+ if (graph != null) {
+ return graph;
+ }
+
+ assert !IS_IN_NATIVE_IMAGE : "should be using encoded snippets";
+ return super.getSnippet(method, recursiveEntry, args, trackNodeSourcePosition, replaceePosition);
+ }
+
+ public StructuredGraph getEncodedSnippet(ResolvedJavaMethod method, Object[] args) {
+ if (IS_IN_NATIVE_IMAGE || UseEncodedSnippets.getValue(options)) {
+ synchronized (HotSpotReplacementsImpl.class) {
+ if (!IS_IN_NATIVE_IMAGE && UseEncodedSnippets.getValue(options)) {
+ snippetEncoder.encode();
+ }
+
+ if (getEncodedSnippets() == null) {
+ throw GraalError.shouldNotReachHere("encoded snippets not found");
+ }
+ StructuredGraph graph = getEncodedSnippets().getEncodedSnippet(method, this, args);
+ if (graph == null) {
+ throw GraalError.shouldNotReachHere("snippet not found: " + method.format("%H.%n(%p)"));
+ }
+ return graph;
+ }
+ } else if (registeredSnippets != null) {
+ assert registeredSnippets.contains(method) : "Asking for snippet method that was never registered: " + method.format("%H.%n(%p)");
+ }
+ return null;
+ }
+
+ public StructuredGraph getMethodSubstitution(MethodSubstitutionPlugin plugin, ResolvedJavaMethod original) {
+ if (IS_IN_NATIVE_IMAGE || UseEncodedSnippets.getValue(options)) {
+ if (getEncodedSnippets() == null) {
+ throw GraalError.shouldNotReachHere("encoded snippets not found");
+ }
+ return getEncodedSnippets().getMethodSubstitutionGraph(plugin, original, this);
+ }
+ return null;
+ }
+
}
--- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/HotSpotTTYStreamProvider.java Tue Mar 12 09:49:10 2019 +0000
+++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/HotSpotTTYStreamProvider.java Sat Mar 16 21:00:45 2019 +0000
@@ -25,7 +25,7 @@
package org.graalvm.compiler.hotspot;
import static org.graalvm.compiler.hotspot.HotSpotGraalOptionValues.GRAAL_OPTION_PROPERTY_PREFIX;
-import static org.graalvm.compiler.hotspot.HotSpotGraalOptionValues.HOTSPOT_OPTIONS;
+import static org.graalvm.compiler.hotspot.HotSpotGraalOptionValues.defaultOptions;
import java.io.FileNotFoundException;
import java.io.FileOutputStream;
@@ -59,7 +59,7 @@
@Override
public PrintStream getStream() {
- return Options.LogFile.getStream(HOTSPOT_OPTIONS);
+ return Options.LogFile.getStream(defaultOptions());
}
/**
--- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/JVMCIVersionCheck.java Tue Mar 12 09:49:10 2019 +0000
+++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/JVMCIVersionCheck.java Sat Mar 16 21:00:45 2019 +0000
@@ -38,8 +38,9 @@
*/
class JVMCIVersionCheck {
+ // 0.55 introduces new HotSpotSpeculationLog API
private static final int JVMCI8_MIN_MAJOR_VERSION = 0;
- private static final int JVMCI8_MIN_MINOR_VERSION = 46;
+ private static final int JVMCI8_MIN_MINOR_VERSION = 55;
private static void failVersionCheck(boolean exit, String reason, Object... args) {
Formatter errorMessage = new Formatter().format(reason, args);
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/SymbolicSnippetEncoder.java Sat Mar 16 21:00:45 2019 +0000
@@ -0,0 +1,1034 @@
+/*
+ * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved.
+ * 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.
+ */
+
+
+package org.graalvm.compiler.hotspot;
+
+import static jdk.vm.ci.runtime.JVMCI.getRuntime;
+import static jdk.vm.ci.services.Services.IS_BUILDING_NATIVE_IMAGE;
+import static jdk.vm.ci.services.Services.IS_IN_NATIVE_IMAGE;
+import static org.graalvm.compiler.nodes.graphbuilderconf.InlineInvokePlugin.InlineInfo.createIntrinsicInlineInfo;
+import static org.graalvm.compiler.replacements.ReplacementsImpl.Options.UseEncodedSnippets;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Map;
+import java.util.Objects;
+import java.util.Set;
+import java.util.concurrent.ConcurrentHashMap;
+
+import org.graalvm.compiler.api.replacements.Fold;
+import org.graalvm.compiler.api.replacements.MethodSubstitution;
+import org.graalvm.compiler.api.replacements.Snippet;
+import org.graalvm.compiler.api.replacements.SnippetReflectionProvider;
+import org.graalvm.compiler.api.runtime.GraalJVMCICompiler;
+import org.graalvm.compiler.api.runtime.GraalRuntime;
+import org.graalvm.compiler.bytecode.BytecodeProvider;
+import org.graalvm.compiler.core.common.spi.ConstantFieldProvider;
+import org.graalvm.compiler.core.common.type.AbstractObjectStamp;
+import org.graalvm.compiler.core.common.type.Stamp;
+import org.graalvm.compiler.core.common.type.StampPair;
+import org.graalvm.compiler.core.common.type.SymbolicJVMCIReference;
+import org.graalvm.compiler.debug.DebugContext;
+import org.graalvm.compiler.debug.GraalError;
+import org.graalvm.compiler.graph.Node;
+import org.graalvm.compiler.graph.NodeClass;
+import org.graalvm.compiler.graph.NodeMap;
+import org.graalvm.compiler.graph.NodeSourcePosition;
+import org.graalvm.compiler.hotspot.meta.HotSpotForeignCallsProvider;
+import org.graalvm.compiler.hotspot.meta.HotSpotProviders;
+import org.graalvm.compiler.java.BytecodeParser;
+import org.graalvm.compiler.java.GraphBuilderPhase;
+import org.graalvm.compiler.nodeinfo.Verbosity;
+import org.graalvm.compiler.nodes.CallTargetNode;
+import org.graalvm.compiler.nodes.ConstantNode;
+import org.graalvm.compiler.nodes.EncodedGraph;
+import org.graalvm.compiler.nodes.FrameState;
+import org.graalvm.compiler.nodes.FullInfopointNode;
+import org.graalvm.compiler.nodes.GraphEncoder;
+import org.graalvm.compiler.nodes.ParameterNode;
+import org.graalvm.compiler.nodes.ProxyNode;
+import org.graalvm.compiler.nodes.StructuredGraph;
+import org.graalvm.compiler.nodes.ValueNode;
+import org.graalvm.compiler.nodes.cfg.Block;
+import org.graalvm.compiler.nodes.graphbuilderconf.GeneratedInvocationPlugin;
+import org.graalvm.compiler.nodes.graphbuilderconf.GraphBuilderConfiguration;
+import org.graalvm.compiler.nodes.graphbuilderconf.GraphBuilderContext;
+import org.graalvm.compiler.nodes.graphbuilderconf.InlineInvokePlugin;
+import org.graalvm.compiler.nodes.graphbuilderconf.IntrinsicContext;
+import org.graalvm.compiler.nodes.graphbuilderconf.InvocationPlugin;
+import org.graalvm.compiler.nodes.graphbuilderconf.InvocationPlugins;
+import org.graalvm.compiler.nodes.graphbuilderconf.MethodSubstitutionPlugin;
+import org.graalvm.compiler.nodes.graphbuilderconf.NodePlugin;
+import org.graalvm.compiler.nodes.graphbuilderconf.ParameterPlugin;
+import org.graalvm.compiler.nodes.java.AccessFieldNode;
+import org.graalvm.compiler.nodes.java.MethodCallTargetNode;
+import org.graalvm.compiler.nodes.spi.DelegatingReplacements;
+import org.graalvm.compiler.nodes.spi.StampProvider;
+import org.graalvm.compiler.nodes.virtual.VirtualObjectNode;
+import org.graalvm.compiler.options.OptionValues;
+import org.graalvm.compiler.phases.OptimisticOptimizations;
+import org.graalvm.compiler.phases.schedule.SchedulePhase;
+import org.graalvm.compiler.phases.util.Providers;
+import org.graalvm.compiler.replacements.ConstantBindingParameterPlugin;
+import org.graalvm.compiler.replacements.PEGraphDecoder;
+import org.graalvm.compiler.replacements.ReplacementsImpl;
+import org.graalvm.compiler.replacements.SnippetCounter;
+import org.graalvm.compiler.replacements.SnippetIntegerHistogram;
+
+import jdk.vm.ci.code.Architecture;
+import jdk.vm.ci.code.TargetDescription;
+import jdk.vm.ci.hotspot.HotSpotJVMCIRuntime;
+import jdk.vm.ci.hotspot.HotSpotResolvedJavaField;
+import jdk.vm.ci.hotspot.HotSpotResolvedJavaMethod;
+import jdk.vm.ci.hotspot.HotSpotResolvedJavaType;
+import jdk.vm.ci.meta.Constant;
+import jdk.vm.ci.meta.ConstantReflectionProvider;
+import jdk.vm.ci.meta.JavaConstant;
+import jdk.vm.ci.meta.JavaKind;
+import jdk.vm.ci.meta.JavaType;
+import jdk.vm.ci.meta.MemoryAccessProvider;
+import jdk.vm.ci.meta.MetaAccessProvider;
+import jdk.vm.ci.meta.MethodHandleAccessProvider;
+import jdk.vm.ci.meta.ResolvedJavaField;
+import jdk.vm.ci.meta.ResolvedJavaMethod;
+import jdk.vm.ci.meta.ResolvedJavaType;
+import jdk.vm.ci.meta.UnresolvedJavaField;
+import jdk.vm.ci.meta.UnresolvedJavaMethod;
+import jdk.vm.ci.meta.UnresolvedJavaType;
+
+/**
+ * This class performs graph encoding using {@link GraphEncoder} but also converts JVMCI type and
+ * method references into a symbolic form that can be resolved at graph decode time using
+ * {@link SymbolicJVMCIReference}.
+ */
+public class SymbolicSnippetEncoder extends DelegatingReplacements {
+
+ /**
+ * This is a customized HotSpotReplacementsImpl intended only for parsing snippets and method
+ * substitutions for graph encoding.
+ */
+ private final HotSpotSnippetReplacementsImpl replacements;
+
+ /**
+ * The set of all snippet methods that have been encoded.
+ */
+ private final Set<ResolvedJavaMethod> snippetMethods = Collections.synchronizedSet(new HashSet<>());
+
+ /**
+ * A mapping from the method substitution method to the original method name. The string key and
+ * values are produced using {@link #methodKey(ResolvedJavaMethod)}.
+ */
+ private final Map<String, String> originalMethods = new ConcurrentHashMap<>();
+
+ /**
+ * The current count of graphs encoded. Used to detect when new graphs have been enqueued for
+ * encoding.
+ */
+ int encodedGraphs = 0;
+
+ /**
+ * All the graphs parsed so far.
+ */
+ private Map<String, StructuredGraph> preparedSnippetGraphs = new HashMap<>();
+
+ /**
+ * The invocation plugins which were delayed during graph preparation.
+ */
+ private Set<ResolvedJavaMethod> delayedInvocationPluginMethods = new HashSet<>();
+
+ void addDelayedInvocationPluginMethod(ResolvedJavaMethod method) {
+ delayedInvocationPluginMethods.add(method);
+ }
+
+ Set<ResolvedJavaMethod> getSnippetMethods() {
+ return snippetMethods;
+ }
+
+ protected class SnippetInlineInvokePlugin implements InlineInvokePlugin {
+
+ @Override
+ public InlineInfo shouldInlineInvoke(GraphBuilderContext b, ResolvedJavaMethod method, ValueNode[] args) {
+ if (method.getAnnotation(Fold.class) != null) {
+ delayedInvocationPluginMethods.add(method);
+ return InlineInfo.DO_NOT_INLINE_NO_EXCEPTION;
+ }
+
+ if (getIntrinsifyingPlugin(method) != null) {
+ delayedInvocationPluginMethods.add(method);
+ return InlineInfo.DO_NOT_INLINE_NO_EXCEPTION;
+ }
+
+ // Force inlining when parsing replacements
+ return createIntrinsicInlineInfo(method, null, getDefaultReplacementBytecodeProvider());
+ }
+
+ @Override
+ public void notifyAfterInline(ResolvedJavaMethod methodToInline) {
+ assert methodToInline.getAnnotation(Fold.class) == null : methodToInline;
+ }
+ }
+
+ public static class SnippetInvocationPlugins extends InvocationPlugins {
+
+ SnippetInvocationPlugins(InvocationPlugins invocationPlugins) {
+ super(invocationPlugins);
+ }
+
+ @Override
+ public InvocationPlugin lookupInvocation(ResolvedJavaMethod method) {
+ if (method.getAnnotation(Fold.class) != null) {
+ return null;
+ }
+ return super.lookupInvocation(method);
+ }
+ }
+
+ /**
+ * This plugin disables the snippet counter machinery.
+ */
+ private class SnippetCounterPlugin implements NodePlugin {
+ String snippetCounterName = 'L' + SnippetCounter.class.getName().replace('.', '/') + ';';
+ String snippetIntegerHistogramName = 'L' + SnippetIntegerHistogram.class.getName().replace('.', '/') + ';';
+
+ @Override
+ public boolean handleLoadField(GraphBuilderContext b, ValueNode object, ResolvedJavaField field) {
+ if (field.getName().equals("group") && field.getDeclaringClass().getName().equals(snippetCounterName)) {
+ b.addPush(JavaKind.Object, ConstantNode.forConstant(JavaConstant.NULL_POINTER, b.getMetaAccess()));
+ return true;
+ }
+ if (field.getType().getName().equals(snippetCounterName)) {
+ b.addPush(JavaKind.Object, ConstantNode.forConstant(replacements.snippetReflection.forObject(SnippetCounter.DISABLED_COUNTER), b.getMetaAccess()));
+ return true;
+ }
+
+ if (field.getType().getName().equals(snippetIntegerHistogramName)) {
+ b.addPush(JavaKind.Object, ConstantNode.forConstant(replacements.snippetReflection.forObject(SnippetIntegerHistogram.DISABLED_COUNTER), b.getMetaAccess()));
+ return true;
+ }
+ return false;
+ }
+ }
+
+ /**
+ * Generate a String name for a method including all type information. Used as a symbolic key
+ * for lookup.
+ */
+ private static String methodKey(ResolvedJavaMethod method) {
+ return method.format("%f %H.%n(%P)");
+ }
+
+ SymbolicSnippetEncoder(HotSpotReplacementsImpl replacements) {
+ super(replacements);
+
+ GraphBuilderConfiguration.Plugins plugins = replacements.getGraphBuilderPlugins();
+ SnippetInvocationPlugins invocationPlugins = new SnippetInvocationPlugins(plugins.getInvocationPlugins());
+ GraphBuilderConfiguration.Plugins copy = new GraphBuilderConfiguration.Plugins(plugins, invocationPlugins);
+ copy.clearInlineInvokePlugins();
+ copy.appendInlineInvokePlugin(new SnippetInlineInvokePlugin());
+ copy.appendNodePlugin(new SnippetCounterPlugin());
+ HotSpotProviders providers = (HotSpotProviders) replacements.getProviders().copyWith(new HotSpotSubstrateConstantReflectionProvider(replacements.getProviders().getConstantReflection()));
+ this.replacements = new HotSpotSnippetReplacementsImpl(replacements, providers.copyWith(copy));
+ this.replacements.setGraphBuilderPlugins(copy);
+ }
+
+ @Override
+ public GraphBuilderConfiguration.Plugins getGraphBuilderPlugins() {
+ return replacements.getGraphBuilderPlugins();
+ }
+
+ /**
+ * Compiles the snippet and stores the graph.
+ */
+ public void registerMethodSubstitution(ResolvedJavaMethod method, ResolvedJavaMethod original) {
+ assert method.getAnnotation(MethodSubstitution.class) != null : "MethodSubstitution must be annotated with @" + MethodSubstitution.class.getSimpleName();
+ buildGraph(method, original, null, false, false);
+ snippetMethods.add(method);
+ }
+
+ static class EncodedSnippets {
+ private byte[] snippetEncoding;
+ private Object[] snippetObjects;
+ private NodeClass<?>[] snippetNodeClasses;
+ private Map<String, Integer> snippetStartOffsets;
+ private Map<String, String> originalMethods;
+
+ EncodedSnippets(byte[] snippetEncoding, Object[] snippetObjects, NodeClass<?>[] snippetNodeClasses, Map<String, Integer> snippetStartOffsets, Map<String, String> originalMethods) {
+ this.snippetEncoding = snippetEncoding;
+ this.snippetObjects = snippetObjects;
+ this.snippetNodeClasses = snippetNodeClasses;
+ this.snippetStartOffsets = snippetStartOffsets;
+ this.originalMethods = originalMethods;
+ }
+
+ public StructuredGraph getMethodSubstitutionGraph(MethodSubstitutionPlugin plugin, ResolvedJavaMethod original, ReplacementsImpl replacements) {
+ Integer startOffset = snippetStartOffsets.get(plugin.toString());
+ if (startOffset == null) {
+ throw GraalError.shouldNotReachHere("plugin graph not found: " + plugin);
+ }
+
+ return decodeGraph(original, null, startOffset, replacements);
+ }
+
+ @SuppressWarnings("try")
+ private StructuredGraph decodeGraph(ResolvedJavaMethod method, Object[] args, int startOffset, ReplacementsImpl replacements) {
+ OptionValues options = replacements.getOptions();
+ SnippetReflectionProvider snippetReflection = replacements.snippetReflection;
+ ParameterPlugin parameterPlugin = null;
+ Providers providers = replacements.getProviders();
+ if (args != null) {
+ parameterPlugin = new ConstantBindingParameterPlugin(args, providers.getMetaAccess(), snippetReflection);
+ }
+
+ EncodedGraph encodedGraph = new SymbolicEncodedGraph(snippetEncoding, startOffset, snippetObjects, snippetNodeClasses, method.getDeclaringClass(),
+ originalMethods.get(methodKey(method)));
+ try (DebugContext debug = replacements.openDebugContext("SVMSnippet_", method)) {
+ StructuredGraph result = new StructuredGraph.Builder(options, debug).method(method).setIsSubstitution(true).build();
+ PEGraphDecoder graphDecoder = new PEGraphDecoder(
+ providers.getCodeCache().getTarget().arch,
+ result,
+ providers.getMetaAccess(),
+ providers.getConstantReflection(),
+ providers.getConstantFieldProvider(),
+ providers.getStampProvider(),
+ null, // loopExplosionPlugin
+ replacements.getGraphBuilderPlugins().getInvocationPlugins(),
+ new InlineInvokePlugin[0],
+ parameterPlugin,
+ null, // nodePlugins
+ null, // callInlinedMethod
+ null // sourceLanguagePositionProvider
+ ) {
+ @Override
+ protected EncodedGraph lookupEncodedGraph(ResolvedJavaMethod lookupMethod,
+ ResolvedJavaMethod originalMethod,
+ BytecodeProvider intrinsicBytecodeProvider,
+ boolean isSubstitution,
+ boolean trackNodeSourcePosition) {
+ if (lookupMethod.equals(method)) {
+ return encodedGraph;
+ } else {
+ throw GraalError.shouldNotReachHere(method.format("%H.%n(%p)"));
+ }
+ }
+ };
+
+ graphDecoder.decode(method, result.isSubstitution(), encodedGraph.trackNodeSourcePosition());
+
+ assert result.verify();
+ return result;
+ }
+ }
+
+ StructuredGraph getEncodedSnippet(ResolvedJavaMethod method, ReplacementsImpl replacements, Object[] args) {
+ Integer startOffset = null;
+ if (snippetStartOffsets != null) {
+ startOffset = snippetStartOffsets.get(methodKey(method));
+ }
+ if (startOffset == null) {
+ if (IS_IN_NATIVE_IMAGE) {
+ throw GraalError.shouldNotReachHere("snippet not found: " + method.format("%H.%n(%p)"));
+ } else {
+ return null;
+ }
+ }
+
+ SymbolicEncodedGraph encodedGraph = new SymbolicEncodedGraph(snippetEncoding, startOffset, snippetObjects, snippetNodeClasses, method.getDeclaringClass(),
+ originalMethods.get(methodKey(method)));
+ return decodeSnippetGraph(encodedGraph, method, replacements, args, HotSpotJVMCIRuntime.runtime().getHostJVMCIBackend().getTarget().arch);
+ }
+
+ }
+
+ private StructuredGraph buildGraph(ResolvedJavaMethod method, ResolvedJavaMethod original, Object receiver, boolean requireInlining, boolean trackNodeSourcePosition) {
+ assert method.hasBytecodes() : "Snippet must not be abstract or native";
+ Object[] args = null;
+ if (receiver != null) {
+ args = new Object[method.getSignature().getParameterCount(true)];
+ args[0] = receiver;
+ }
+ try (DebugContext debug = openDebugContext("Snippet_", method)) {
+ StructuredGraph graph = replacements.makeGraph(debug, replacements.getDefaultReplacementBytecodeProvider(), method, args, original, trackNodeSourcePosition, null);
+
+ // Check if all methods which should be inlined are really inlined.
+ for (MethodCallTargetNode callTarget : graph.getNodes(MethodCallTargetNode.TYPE)) {
+ ResolvedJavaMethod callee = callTarget.targetMethod();
+ if (requireInlining && !delayedInvocationPluginMethods.contains(callee) && !Objects.equals(callee, original)) {
+ throw GraalError.shouldNotReachHere("method " + callee.format("%H.%n") + " not inlined in snippet " + method.getName() + " (maybe not final?)");
+ }
+ }
+ assert verifySnippetEncodeDecode(method, original, trackNodeSourcePosition, graph);
+ debug.dump(DebugContext.VERBOSE_LEVEL, graph, "After buildGraph");
+ return graph;
+ }
+ }
+
+ @SuppressWarnings("try")
+ static StructuredGraph decodeSnippetGraph(SymbolicEncodedGraph encodedGraph, ResolvedJavaMethod method, ReplacementsImpl replacements, Object[] args, Architecture architecture) {
+ Providers providers = replacements.getProviders();
+ ParameterPlugin parameterPlugin = null;
+ if (args != null) {
+ parameterPlugin = new ConstantBindingParameterPlugin(args, providers.getMetaAccess(), replacements.snippetReflection);
+ }
+
+ try (DebugContext debug = replacements.openDebugContext("SVMSnippet_", method)) {
+ // @formatter:off
+ StructuredGraph result = new StructuredGraph.Builder(replacements.getOptions(), debug)
+ .method(method)
+ .trackNodeSourcePosition(encodedGraph.trackNodeSourcePosition())
+ .setIsSubstitution(true)
+ .build();
+ // @formatter:on
+ try (DebugContext.Scope scope = debug.scope("DecodeSnippetGraph", result)) {
+ PEGraphDecoder graphDecoder = new PEGraphDecoder(
+ architecture,
+ result,
+ providers.getMetaAccess(),
+ providers.getConstantReflection(),
+ providers.getConstantFieldProvider(),
+ providers.getStampProvider(),
+ null,
+ replacements.getGraphBuilderPlugins().getInvocationPlugins(),
+ new InlineInvokePlugin[0],
+ parameterPlugin,
+ null,
+ null,
+ null) {
+ @Override
+ protected EncodedGraph lookupEncodedGraph(
+ ResolvedJavaMethod lookupMethod,
+ ResolvedJavaMethod originalMethod,
+ BytecodeProvider intrinsicBytecodeProvider,
+ boolean isSubstitution,
+ boolean track) {
+ if (lookupMethod.equals(method)) {
+ assert !track || encodedGraph.trackNodeSourcePosition();
+ return encodedGraph;
+ } else {
+ throw GraalError.shouldNotReachHere(method.format("%H.%n(%p)"));
+ }
+ }
+ };
+
+ graphDecoder.decode(method, result.isSubstitution(), encodedGraph.trackNodeSourcePosition());
+ debug.dump(DebugContext.VERBOSE_LEVEL, result, "After decoding");
+
+ assert result.verify();
+ return result;
+ } catch (Throwable t) {
+ throw debug.handle(t);
+ }
+ }
+ }
+
+ @SuppressWarnings("try")
+ private boolean verifySnippetEncodeDecode(ResolvedJavaMethod method, ResolvedJavaMethod original, boolean trackNodeSourcePosition, StructuredGraph structuredGraph) {
+ // Verify the encoding and decoding process
+ EncodedGraph encodedGraph = GraphEncoder.encodeSingleGraph(structuredGraph, HotSpotJVMCIRuntime.runtime().getHostJVMCIBackend().getTarget().arch);
+
+ Architecture arch = HotSpotJVMCIRuntime.runtime().getHostJVMCIBackend().getTarget().arch;
+
+ try (DebugContext debug = replacements.openDebugContext("VerifySnippetEncodeDecode_", method)) {
+ HotSpotProviders originalProvider = (HotSpotProviders) replacements.getProviders();
+
+ SnippetReflectionProvider snippetReflection = originalProvider.getSnippetReflection();
+ SymbolicSnippetEncoder.HotSpotSubstrateConstantReflectionProvider constantReflection = new SymbolicSnippetEncoder.HotSpotSubstrateConstantReflectionProvider(
+ originalProvider.getConstantReflection());
+ HotSpotProviders newProviders = new HotSpotProviders(originalProvider.getMetaAccess(), originalProvider.getCodeCache(), constantReflection,
+ originalProvider.getConstantFieldProvider(), originalProvider.getForeignCalls(), originalProvider.getLowerer(), null, originalProvider.getSuites(),
+ originalProvider.getRegisters(), snippetReflection, originalProvider.getWordTypes(), originalProvider.getGraphBuilderPlugins());
+ HotSpotSnippetReplacementsImpl filteringReplacements = new HotSpotSnippetReplacementsImpl(getOptions(), newProviders, snippetReflection,
+ originalProvider.getReplacements().getDefaultReplacementBytecodeProvider(),
+ originalProvider.getCodeCache().getTarget());
+ filteringReplacements.setGraphBuilderPlugins(originalProvider.getReplacements().getGraphBuilderPlugins());
+ try (DebugContext.Scope scaope = debug.scope("VerifySnippetEncodeDecode", structuredGraph)) {
+ for (int i = 0; i < encodedGraph.getNumObjects(); i++) {
+ filterSnippetObject(encodedGraph.getObject(i));
+ }
+ StructuredGraph snippet = filteringReplacements.makeGraph(debug, filteringReplacements.getDefaultReplacementBytecodeProvider(), method, null, original,
+ trackNodeSourcePosition, null);
+ SymbolicEncodedGraph symbolicGraph = new SymbolicEncodedGraph(encodedGraph, method.getDeclaringClass(), original != null ? methodKey(original) : null);
+ StructuredGraph decodedSnippet = decodeSnippetGraph(symbolicGraph, method, replacements, null, arch);
+ String snippetString = getCanonicalGraphString(snippet, true, false);
+ String decodedSnippetString = getCanonicalGraphString(decodedSnippet, true, false);
+ if (snippetString.equals(decodedSnippetString)) {
+ debug.log("Snippet decode for %s produces exactly same graph", method);
+ debug.dump(DebugContext.INFO_LEVEL, decodedSnippet, "Decoded snippet graph for %s", method);
+ } else {
+ debug.log("Snippet decode for %s produces different graph", method);
+ debug.log("%s", compareGraphStrings(snippet, snippetString, decodedSnippet, decodedSnippetString));
+ debug.dump(DebugContext.INFO_LEVEL, snippet, "Snippet graph for %s", method);
+ debug.dump(DebugContext.INFO_LEVEL, structuredGraph, "Encoded snippet graph for %s", method);
+ debug.dump(DebugContext.INFO_LEVEL, decodedSnippet, "Decoded snippet graph for %s", method);
+ }
+ } catch (Throwable t) {
+ throw debug.handle(t);
+ }
+ }
+ return true;
+ }
+
+ /**
+ * If there are new graphs waiting to be encoded, reencode all the graphs and return the result.
+ */
+ @SuppressWarnings("try")
+ synchronized EncodedSnippets maybeEncodeSnippets() {
+ Map<String, StructuredGraph> graphs = this.preparedSnippetGraphs;
+ if (encodedGraphs != graphs.size()) {
+ DebugContext debug = openDebugContext("SnippetEncoder", null);
+ try (DebugContext.Scope scope = debug.scope("SnippetSupportEncode")) {
+ encodedGraphs = graphs.size();
+ for (StructuredGraph graph : graphs.values()) {
+ for (Node node : graph.getNodes()) {
+ node.setNodeSourcePosition(null);
+ }
+ }
+ return encodeSnippets(debug);
+ }
+ }
+ return null;
+ }
+
+ @Override
+ public void registerSnippet(ResolvedJavaMethod method, ResolvedJavaMethod original, Object receiver, boolean trackNodeSourcePosition) {
+ if (IS_BUILDING_NATIVE_IMAGE || UseEncodedSnippets.getValue(getOptions())) {
+ assert method.getAnnotation(Snippet.class) != null : "Snippet must be annotated with @" + Snippet.class.getSimpleName();
+ String key = methodKey(method);
+ if (!preparedSnippetGraphs.containsKey(key)) {
+ if (original != null) {
+ originalMethods.put(key, methodKey(original));
+ }
+ StructuredGraph snippet = buildGraph(method, original, receiver, true, trackNodeSourcePosition);
+ snippetMethods.add(method);
+ preparedSnippetGraphs.put(key, snippet);
+ }
+ }
+ }
+
+ EncodedSnippets encodeSnippets(DebugContext debug) {
+ GraphEncoder encoder = new GraphEncoder(HotSpotJVMCIRuntime.runtime().getHostJVMCIBackend().getTarget().arch, debug);
+ for (StructuredGraph graph : preparedSnippetGraphs.values()) {
+ encoder.prepare(graph);
+ }
+ encoder.finishPrepare();
+
+ byte[] snippetEncoding;
+ Object[] snippetObjects;
+ NodeClass<?>[] snippetNodeClasses;
+ Map<String, Integer> snippetStartOffsets;
+
+ snippetStartOffsets = new HashMap<>();
+ for (Map.Entry<String, StructuredGraph> entry : preparedSnippetGraphs.entrySet()) {
+ snippetStartOffsets.put(entry.getKey(), encoder.encode(entry.getValue()));
+ }
+ snippetEncoding = encoder.getEncoding();
+ snippetObjects = encoder.getObjects();
+ snippetNodeClasses = encoder.getNodeClasses();
+ for (int i = 0; i < snippetObjects.length; i++) {
+ Object o = filterSnippetObject(snippetObjects[i]);
+ debug.log("snippetObjects[%d] = %s -> %s", i, o != null ? o.getClass().getSimpleName() : null, o);
+ snippetObjects[i] = o;
+ }
+ debug.log("Encoded %d snippet preparedSnippetGraphs using %d bytes with %d objects", snippetStartOffsets.size(), snippetEncoding.length, snippetObjects.length);
+ return new EncodedSnippets(snippetEncoding, snippetObjects, snippetNodeClasses, snippetStartOffsets, originalMethods);
+ }
+
+ /**
+ * Encode any outstanding graphs and return true if any work was done.
+ */
+ @SuppressWarnings("try")
+ public boolean encode() {
+ EncodedSnippets encodedSnippets = maybeEncodeSnippets();
+ if (encodedSnippets != null) {
+ HotSpotReplacementsImpl.setEncodedSnippets(encodedSnippets);
+ return true;
+ }
+ return false;
+ }
+
+ private DebugContext openDebugContext(String idPrefix, ResolvedJavaMethod method) {
+ return replacements.openDebugContext(idPrefix, method);
+ }
+
+ static class SymbolicEncodedGraph extends EncodedGraph {
+
+ private final ResolvedJavaType accessingClass;
+ private final String originalMethod;
+
+ SymbolicEncodedGraph(byte[] encoding, int startOffset, Object[] objects, NodeClass<?>[] types, ResolvedJavaType accessingClass, String originalMethod) {
+ super(encoding, startOffset, objects, types, null, null, null, false, false);
+ this.accessingClass = accessingClass;
+ this.originalMethod = originalMethod;
+ }
+
+ SymbolicEncodedGraph(EncodedGraph encodedGraph, ResolvedJavaType declaringClass, String originalMethod) {
+ this(encodedGraph.getEncoding(), encodedGraph.getStartOffset(), encodedGraph.getObjects(), encodedGraph.getNodeClasses(), declaringClass, originalMethod);
+ }
+
+ @Override
+ public Object getObject(int i) {
+ Object o = objects[i];
+ if (o instanceof SymbolicJVMCIReference) {
+ objects[i] = o = ((SymbolicJVMCIReference<?>) o).resolve(accessingClass);
+ } else if (o instanceof UnresolvedJavaType) {
+ objects[i] = o = ((UnresolvedJavaType) o).resolve(accessingClass);
+ } else if (o instanceof UnresolvedJavaMethod) {
+ throw new InternalError(o.toString());
+ } else if (o instanceof UnresolvedJavaField) {
+ objects[i] = o = ((UnresolvedJavaField) o).resolve(accessingClass);
+ } else if (o instanceof GraalCapability) {
+ objects[i] = o = ((GraalCapability) o).resolve(((GraalJVMCICompiler) getRuntime().getCompiler()).getGraalRuntime());
+ }
+ return o;
+ }
+
+ @Override
+ public boolean isCallToOriginal(ResolvedJavaMethod callTarget) {
+ if (originalMethod != null && originalMethod.equals(methodKey(callTarget))) {
+ return true;
+ }
+ return super.isCallToOriginal(callTarget);
+ }
+ }
+
+ /**
+ * Symbolic reference to an object which can be retrieved from
+ * {@link GraalRuntime#getCapability(Class)}.
+ */
+ static class GraalCapability {
+ final Class<?> capabilityClass;
+
+ GraalCapability(Class<?> capabilityClass) {
+ this.capabilityClass = capabilityClass;
+ }
+
+ public Object resolve(GraalRuntime runtime) {
+ Object capability = runtime.getCapability(this.capabilityClass);
+ if (capability != null) {
+ assert capability.getClass() == capabilityClass;
+ return capability;
+ }
+ throw new InternalError(this.capabilityClass.getName());
+ }
+ }
+
+ static class SymbolicResolvedJavaMethod implements SymbolicJVMCIReference<ResolvedJavaMethod> {
+ final UnresolvedJavaType type;
+ final String methodName;
+ final String signature;
+
+ SymbolicResolvedJavaMethod(HotSpotResolvedJavaMethod method) {
+ this.type = UnresolvedJavaType.create(method.getDeclaringClass().getName());
+ this.methodName = method.getName();
+ this.signature = method.getSignature().toMethodDescriptor();
+ }
+
+ @Override
+ public String toString() {
+ return "SymbolicResolvedJavaMethod{" +
+ "declaringType='" + type.getName() + '\'' +
+ ", methodName='" + methodName + '\'' +
+ ", signature='" + signature + '\'' +
+ '}';
+ }
+
+ @Override
+ public ResolvedJavaMethod resolve(ResolvedJavaType accessingClass) {
+ ResolvedJavaType resolvedType = type.resolve(accessingClass);
+ for (ResolvedJavaMethod method : methodName.equals("<init>") ? resolvedType.getDeclaredConstructors() : resolvedType.getDeclaredMethods()) {
+ if (method.getName().equals(methodName) && method.getSignature().toMethodDescriptor().equals(signature)) {
+ return method;
+ }
+ }
+ throw new InternalError("Could not resolve " + this + " in context of " + accessingClass.toJavaName());
+ }
+ }
+
+ static class SymbolicResolvedJavaField implements SymbolicJVMCIReference<ResolvedJavaField> {
+ final UnresolvedJavaType declaringType;
+ final String name;
+ final UnresolvedJavaType signature;
+ private final boolean isStatic;
+
+ SymbolicResolvedJavaField(HotSpotResolvedJavaField field) {
+ this.declaringType = UnresolvedJavaType.create(field.getDeclaringClass().getName());
+ this.name = field.getName();
+ this.signature = UnresolvedJavaType.create(field.getType().getName());
+ this.isStatic = field.isStatic();
+ }
+
+ @Override
+ public ResolvedJavaField resolve(ResolvedJavaType accessingClass) {
+ ResolvedJavaType resolvedType = declaringType.resolve(accessingClass);
+ ResolvedJavaType resolvedFieldType = signature.resolve(accessingClass);
+ ResolvedJavaField[] fields = isStatic ? resolvedType.getStaticFields() : resolvedType.getInstanceFields(true);
+ for (ResolvedJavaField field : fields) {
+ if (field.getName().equals(name)) {
+ if (field.getType().equals(resolvedFieldType)) {
+ return field;
+ }
+ }
+ }
+ throw new InternalError("Could not resolve " + this + " in context of " + accessingClass.toJavaName());
+ }
+
+ @Override
+ public String toString() {
+ return "SymbolicResolvedJavaField{" +
+ signature.getName() + ' ' +
+ declaringType.getName() + '.' +
+ name +
+ '}';
+ }
+ }
+
+ static class SymbolicStampPair implements SymbolicJVMCIReference<StampPair> {
+ Object trustedStamp;
+ Object uncheckdStamp;
+
+ SymbolicStampPair(StampPair stamp) {
+ this.trustedStamp = maybeMakeSymbolic(stamp.getTrustedStamp());
+ this.uncheckdStamp = maybeMakeSymbolic(stamp.getUncheckedStamp());
+ }
+
+ @Override
+ public StampPair resolve(ResolvedJavaType accessingClass) {
+ return StampPair.create(resolveStamp(accessingClass, trustedStamp), resolveStamp(accessingClass, uncheckdStamp));
+ }
+ }
+
+ private static Object maybeMakeSymbolic(Stamp trustedStamp) {
+ if (trustedStamp != null) {
+ SymbolicJVMCIReference<?> symbolicJVMCIReference = trustedStamp.makeSymbolic();
+ if (symbolicJVMCIReference != null) {
+ return symbolicJVMCIReference;
+ }
+ }
+ return trustedStamp;
+ }
+
+ private static Stamp resolveStamp(ResolvedJavaType accessingClass, Object stamp) {
+ if (stamp == null) {
+ return null;
+ }
+ if (stamp instanceof Stamp) {
+ return (Stamp) stamp;
+ }
+ return (Stamp) ((SymbolicJVMCIReference<?>) stamp).resolve(accessingClass);
+ }
+
+ public static class HotSpotSubstrateConstantReflectionProvider implements ConstantReflectionProvider {
+
+ private final ConstantReflectionProvider constantReflection;
+
+ HotSpotSubstrateConstantReflectionProvider(ConstantReflectionProvider constantReflection) {
+ this.constantReflection = constantReflection;
+ }
+
+ HashSet<JavaConstant> safeConstants = new HashSet<>();
+
+ @Override
+ public Boolean constantEquals(Constant x, Constant y) {
+ return constantReflection.constantEquals(x, y);
+ }
+
+ @Override
+ public Integer readArrayLength(JavaConstant array) {
+ return constantReflection.readArrayLength(array);
+ }
+
+ @Override
+ public JavaConstant readArrayElement(JavaConstant array, int index) {
+ return constantReflection.readArrayElement(array, index);
+ }
+
+ @Override
+ public JavaConstant readFieldValue(ResolvedJavaField field, JavaConstant receiver) {
+ JavaConstant javaConstant = constantReflection.readFieldValue(field, receiver);
+ if (!safeConstants.contains(receiver) && !field.getDeclaringClass().getName().contains("graalvm") && !field.getDeclaringClass().getName().contains("jdk/vm/ci/") &&
+ !field.getName().equals("TYPE")) {
+ // Only permit constant reflection on compiler classes. This is necessary primarily
+ // because of the boxing snippets which are compiled as snippets but are really just
+ // regular JDK java sources that are being compiled like a snippet. These shouldn't
+ // permit constant folding during graph preparation as that embeds constants from
+ // the runtime into a compiler graph.
+ return null;
+ }
+ if (javaConstant.getJavaKind() == JavaKind.Object) {
+ safeConstants.add(javaConstant);
+ }
+ return javaConstant;
+ }
+
+ @Override
+ public JavaConstant boxPrimitive(JavaConstant source) {
+ return constantReflection.boxPrimitive(source);
+ }
+
+ @Override
+ public JavaConstant unboxPrimitive(JavaConstant source) {
+ return constantReflection.unboxPrimitive(source);
+ }
+
+ @Override
+ public JavaConstant forString(String value) {
+ return constantReflection.forString(value);
+ }
+
+ @Override
+ public ResolvedJavaType asJavaType(Constant constant) {
+ return constantReflection.asJavaType(constant);
+ }
+
+ @Override
+ public MethodHandleAccessProvider getMethodHandleAccess() {
+ return constantReflection.getMethodHandleAccess();
+ }
+
+ @Override
+ public MemoryAccessProvider getMemoryAccessProvider() {
+ return constantReflection.getMemoryAccessProvider();
+ }
+
+ @Override
+ public JavaConstant asJavaClass(ResolvedJavaType type) {
+ return constantReflection.asJavaClass(type);
+ }
+
+ @Override
+ public Constant asObjectHub(ResolvedJavaType type) {
+ return constantReflection.asObjectHub(type);
+ }
+ }
+
+ /**
+ * Objects embedded in encoded graphs might need to converted into a symbolic form so convert
+ * the object or pass it through.
+ */
+ static Object filterSnippetObject(Object o) {
+ if (o instanceof HotSpotResolvedJavaMethod) {
+ return new SymbolicResolvedJavaMethod((HotSpotResolvedJavaMethod) o);
+ } else if (o instanceof HotSpotResolvedJavaField) {
+ return new SymbolicResolvedJavaField((HotSpotResolvedJavaField) o);
+ } else if (o instanceof HotSpotResolvedJavaType) {
+ return UnresolvedJavaType.create(((HotSpotResolvedJavaType) o).getName());
+ } else if (o instanceof NodeSourcePosition) {
+ // Filter these out for now. These can't easily be handled because these positions
+ // description snippet methods which might not be available in the runtime.
+ return null;
+ } else if (o instanceof HotSpotForeignCallsProvider || o instanceof GraalHotSpotVMConfig) {
+ return new GraalCapability(o.getClass());
+ } else if (o instanceof Stamp) {
+ SymbolicJVMCIReference<?> ref = ((Stamp) o).makeSymbolic();
+ if (ref != null) {
+ return ref;
+ }
+ return o;
+ } else if (o instanceof StampPair) {
+ if (((StampPair) o).getTrustedStamp() instanceof AbstractObjectStamp) {
+ return new SymbolicStampPair((StampPair) o);
+ }
+ }
+ return o;
+ }
+
+ static String compareGraphStrings(StructuredGraph expectedGraph, String expectedString, StructuredGraph actualGraph, String actualString) {
+ if (!expectedString.equals(actualString)) {
+ String[] expectedLines = expectedString.split("\n");
+ String[] actualLines = actualString.split("\n");
+ int diffIndex = -1;
+ int limit = Math.min(actualLines.length, expectedLines.length);
+ String marker = " <<<";
+ for (int i = 0; i < limit; i++) {
+ if (!expectedLines[i].equals(actualLines[i])) {
+ diffIndex = i;
+ break;
+ }
+ }
+ if (diffIndex == -1) {
+ // Prefix is the same so add some space after the prefix
+ diffIndex = limit;
+ if (actualLines.length == limit) {
+ actualLines = Arrays.copyOf(actualLines, limit + 1);
+ actualLines[diffIndex] = "";
+ } else {
+ assert expectedLines.length == limit;
+ expectedLines = Arrays.copyOf(expectedLines, limit + 1);
+ expectedLines[diffIndex] = "";
+ }
+ }
+ // Place a marker next to the first line that differs
+ expectedLines[diffIndex] = expectedLines[diffIndex] + marker;
+ actualLines[diffIndex] = actualLines[diffIndex] + marker;
+ String ediff = String.join("\n", expectedLines);
+ String adiff = String.join("\n", actualLines);
+ return "mismatch in preparedSnippetGraphs:\n========= expected (" + expectedGraph + ") =========\n" + ediff + "\n\n========= actual (" + actualGraph + ") =========\n" + adiff;
+ } else {
+ return "mismatch in preparedSnippetGraphs";
+ }
+ }
+
+ static String getCanonicalGraphString(StructuredGraph graph, boolean excludeVirtual, boolean checkConstants) {
+ SchedulePhase schedule = new SchedulePhase(SchedulePhase.SchedulingStrategy.EARLIEST);
+ schedule.apply(graph);
+ StructuredGraph.ScheduleResult scheduleResult = graph.getLastSchedule();
+
+ NodeMap<Integer> canonicalId = graph.createNodeMap();
+ int nextId = 0;
+
+ List<String> constantsLines = new ArrayList<>();
+
+ StringBuilder result = new StringBuilder();
+ for (Block block : scheduleResult.getCFG().getBlocks()) {
+ result.append("Block ").append(block).append(' ');
+ if (block == scheduleResult.getCFG().getStartBlock()) {
+ result.append("* ");
+ }
+ result.append("-> ");
+ for (Block succ : block.getSuccessors()) {
+ result.append(succ).append(' ');
+ }
+ result.append('\n');
+ for (Node node : scheduleResult.getBlockToNodesMap().get(block)) {
+ if (node instanceof ValueNode && node.isAlive()) {
+ if (!excludeVirtual || !(node instanceof VirtualObjectNode || node instanceof ProxyNode || node instanceof FullInfopointNode || node instanceof ParameterNode)) {
+ if (node instanceof ConstantNode) {
+ if (checkConstants) {
+ String name = node.toString(Verbosity.Name);
+ if (excludeVirtual) {
+ constantsLines.add(name);
+ } else {
+ constantsLines.add(name + " (" + filteredUsageCount(node) + ")");
+ }
+ }
+ } else {
+ int id;
+ if (canonicalId.get(node) != null) {
+ id = canonicalId.get(node);
+ } else {
+ id = nextId++;
+ canonicalId.set(node, id);
+ }
+ String name = node.getClass().getSimpleName();
+ result.append(" ").append(id).append('|').append(name);
+ if (node instanceof AccessFieldNode) {
+ result.append('#');
+ result.append(((AccessFieldNode) node).field());
+ }
+ if (!excludeVirtual) {
+ result.append(" (");
+ result.append(filteredUsageCount(node));
+ result.append(')');
+ }
+ result.append('\n');
+ }
+ }
+ }
+ }
+ }
+
+ StringBuilder constantsLinesResult = new StringBuilder();
+ if (checkConstants) {
+ constantsLinesResult.append(constantsLines.size()).append(" constants:\n");
+ }
+ Collections.sort(constantsLines);
+ for (String s : constantsLines) {
+ constantsLinesResult.append(s);
+ constantsLinesResult.append('\n');
+ }
+
+ return constantsLinesResult.toString() + result.toString();
+ }
+
+ private static int filteredUsageCount(Node node) {
+ return node.usages().filter(n -> !(n instanceof FrameState)).count();
+ }
+
+ /**
+ * This horror show of classes exists solely get {@link HotSpotSnippetBytecodeParser} to be used
+ * as the parser for these snippets.
+ */
+ static class HotSpotSnippetReplacementsImpl extends HotSpotReplacementsImpl {
+ HotSpotSnippetReplacementsImpl(HotSpotReplacementsImpl replacements, Providers providers) {
+ super(replacements, providers);
+ }
+
+ HotSpotSnippetReplacementsImpl(OptionValues options, Providers providers, SnippetReflectionProvider snippetReflection, BytecodeProvider bytecodeProvider, TargetDescription target) {
+ super(options, providers, snippetReflection, bytecodeProvider, target);
+ }
+
+ @Override
+ protected GraphMaker createGraphMaker(ResolvedJavaMethod substitute, ResolvedJavaMethod original) {
+ return new SnippetGraphMaker(this, substitute, original);
+ }
+ }
+
+ static class SnippetGraphMaker extends ReplacementsImpl.GraphMaker {
+ SnippetGraphMaker(ReplacementsImpl replacements, ResolvedJavaMethod substitute, ResolvedJavaMethod substitutedMethod) {
+ super(replacements, substitute, substitutedMethod);
+ }
+
+ @Override
+ protected GraphBuilderPhase.Instance createGraphBuilder(MetaAccessProvider metaAccess, StampProvider stampProvider, ConstantReflectionProvider constantReflection,
+ ConstantFieldProvider constantFieldProvider, GraphBuilderConfiguration graphBuilderConfig, OptimisticOptimizations optimisticOpts, IntrinsicContext initialIntrinsicContext) {
+ return new HotSpotSnippetGraphBuilderPhase(metaAccess, stampProvider, constantReflection, constantFieldProvider, graphBuilderConfig, optimisticOpts,
+ initialIntrinsicContext);
+ }
+ }
+
+ static class HotSpotSnippetGraphBuilderPhase extends GraphBuilderPhase.Instance {
+ HotSpotSnippetGraphBuilderPhase(MetaAccessProvider metaAccess, StampProvider stampProvider, ConstantReflectionProvider constantReflection, ConstantFieldProvider constantFieldProvider,
+ GraphBuilderConfiguration graphBuilderConfig, OptimisticOptimizations optimisticOpts, IntrinsicContext initialIntrinsicContext) {
+ super(metaAccess, stampProvider, constantReflection, constantFieldProvider, graphBuilderConfig, optimisticOpts, initialIntrinsicContext);
+ }
+
+ @Override
+ protected BytecodeParser createBytecodeParser(StructuredGraph graph, BytecodeParser parent, ResolvedJavaMethod method, int entryBCI, IntrinsicContext intrinsicContext) {
+ return new HotSpotSnippetBytecodeParser(this, graph, parent, method, entryBCI, intrinsicContext);
+ }
+ }
+
+ static class HotSpotSnippetBytecodeParser extends BytecodeParser {
+ HotSpotSnippetBytecodeParser(GraphBuilderPhase.Instance graphBuilderInstance, StructuredGraph graph, BytecodeParser parent, ResolvedJavaMethod method, int entryBCI,
+ IntrinsicContext intrinsicContext) {
+ super(graphBuilderInstance, graph, parent, method, entryBCI, intrinsicContext);
+ }
+
+ @Override
+ public boolean canDeferPlugin(GeneratedInvocationPlugin plugin) {
+ return plugin.getSource().equals(Fold.class) || plugin.getSource().equals(Node.NodeIntrinsic.class);
+ }
+
+ @Override
+ protected boolean tryInvocationPlugin(CallTargetNode.InvokeKind invokeKind, ValueNode[] args, ResolvedJavaMethod targetMethod, JavaKind resultType, JavaType returnType) {
+ if (intrinsicContext != null && intrinsicContext.isCallToOriginal(targetMethod)) {
+ return false;
+ }
+ return super.tryInvocationPlugin(invokeKind, args, targetMethod, resultType, returnType);
+ }
+ }
+}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/gc/g1/G1ArrayRangePostWriteBarrier.java Sat Mar 16 21:00:45 2019 +0000
@@ -0,0 +1,45 @@
+/*
+ * 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
+ * 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.
+ */
+
+
+
+package org.graalvm.compiler.hotspot.gc.g1;
+
+import static org.graalvm.compiler.nodeinfo.NodeCycles.CYCLES_64;
+import static org.graalvm.compiler.nodeinfo.NodeSize.SIZE_64;
+
+import org.graalvm.compiler.graph.NodeClass;
+import org.graalvm.compiler.hotspot.gc.shared.ArrayRangeWriteBarrier;
+import org.graalvm.compiler.nodeinfo.NodeInfo;
+import org.graalvm.compiler.nodes.ValueNode;
+import org.graalvm.compiler.nodes.memory.address.AddressNode;
+
+@NodeInfo(cycles = CYCLES_64, size = SIZE_64)
+public class G1ArrayRangePostWriteBarrier extends ArrayRangeWriteBarrier {
+ public static final NodeClass<G1ArrayRangePostWriteBarrier> TYPE = NodeClass.create(G1ArrayRangePostWriteBarrier.class);
+
+ public G1ArrayRangePostWriteBarrier(AddressNode address, ValueNode length, int elementStride) {
+ super(TYPE, address, length, elementStride);
+ }
+
+}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/gc/g1/G1ArrayRangePreWriteBarrier.java Sat Mar 16 21:00:45 2019 +0000
@@ -0,0 +1,45 @@
+/*
+ * 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
+ * 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.
+ */
+
+
+
+package org.graalvm.compiler.hotspot.gc.g1;
+
+import static org.graalvm.compiler.nodeinfo.NodeCycles.CYCLES_64;
+import static org.graalvm.compiler.nodeinfo.NodeSize.SIZE_64;
+
+import org.graalvm.compiler.graph.NodeClass;
+import org.graalvm.compiler.hotspot.gc.shared.ArrayRangeWriteBarrier;
+import org.graalvm.compiler.nodeinfo.NodeInfo;
+import org.graalvm.compiler.nodes.ValueNode;
+import org.graalvm.compiler.nodes.memory.address.AddressNode;
+
+@NodeInfo(cycles = CYCLES_64, size = SIZE_64)
+public final class G1ArrayRangePreWriteBarrier extends ArrayRangeWriteBarrier {
+ public static final NodeClass<G1ArrayRangePreWriteBarrier> TYPE = NodeClass.create(G1ArrayRangePreWriteBarrier.class);
+
+ public G1ArrayRangePreWriteBarrier(AddressNode address, ValueNode length, int elementStride) {
+ super(TYPE, address, length, elementStride);
+ }
+
+}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/gc/g1/G1BarrierSet.java Sat Mar 16 21:00:45 2019 +0000
@@ -0,0 +1,135 @@
+/*
+ * Copyright (c) 2019, Oracle and/or its affiliates. All rights reserved.
+ * 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.
+ */
+
+
+package org.graalvm.compiler.hotspot.gc.g1;
+
+import org.graalvm.compiler.debug.GraalError;
+import org.graalvm.compiler.hotspot.gc.shared.BarrierSet;
+import org.graalvm.compiler.nodes.StructuredGraph;
+import org.graalvm.compiler.nodes.ValueNode;
+import org.graalvm.compiler.nodes.extended.ArrayRangeWrite;
+import org.graalvm.compiler.nodes.java.AbstractCompareAndSwapNode;
+import org.graalvm.compiler.nodes.java.LoweredAtomicReadAndWriteNode;
+import org.graalvm.compiler.nodes.memory.FixedAccessNode;
+import org.graalvm.compiler.nodes.memory.HeapAccess;
+import org.graalvm.compiler.nodes.memory.ReadNode;
+import org.graalvm.compiler.nodes.memory.WriteNode;
+import org.graalvm.compiler.nodes.memory.address.AddressNode;
+import org.graalvm.compiler.nodes.type.StampTool;
+
+public class G1BarrierSet extends BarrierSet {
+
+ @Override
+ public void addReadNodeBarriers(ReadNode node, StructuredGraph graph) {
+ if (node.getBarrierType() != HeapAccess.BarrierType.NONE) {
+ assert (node.getBarrierType() == HeapAccess.BarrierType.PRECISE);
+ G1ReferentFieldReadBarrier barrier = graph.add(new G1ReferentFieldReadBarrier(node.getAddress(), node, false));
+ graph.addAfterFixed(node, barrier);
+ }
+ }
+
+ @Override
+ public void addWriteNodeBarriers(WriteNode node, StructuredGraph graph) {
+ HeapAccess.BarrierType barrierType = node.getBarrierType();
+ switch (barrierType) {
+ case NONE:
+ // nothing to do
+ break;
+ case IMPRECISE:
+ case PRECISE:
+ boolean precise = barrierType == HeapAccess.BarrierType.PRECISE;
+ if (!node.getLocationIdentity().isInit()) {
+ // The pre barrier does nothing if the value being read is null, so it can
+ // be explicitly skipped when this is an initializing store.
+ addG1PreWriteBarrier(node, node.getAddress(), null, true, node.getNullCheck(), graph);
+ }
+ addG1PostWriteBarrier(node, node.getAddress(), node.value(), precise, graph);
+ break;
+ default:
+ throw new GraalError("unexpected barrier type: " + barrierType);
+ }
+ }
+
+ @Override
+ public void addAtomicReadWriteNodeBarriers(LoweredAtomicReadAndWriteNode node, StructuredGraph graph) {
+ HeapAccess.BarrierType barrierType = node.getBarrierType();
+ switch (barrierType) {
+ case NONE:
+ // nothing to do
+ break;
+ case IMPRECISE:
+ case PRECISE:
+ boolean precise = barrierType == HeapAccess.BarrierType.PRECISE;
+ addG1PreWriteBarrier(node, node.getAddress(), null, true, node.getNullCheck(), graph);
+ addG1PostWriteBarrier(node, node.getAddress(), node.getNewValue(), precise, graph);
+ break;
+ default:
+ throw new GraalError("unexpected barrier type: " + barrierType);
+ }
+ }
+
+ @Override
+ public void addCASBarriers(AbstractCompareAndSwapNode node, StructuredGraph graph) {
+ HeapAccess.BarrierType barrierType = node.getBarrierType();
+ switch (barrierType) {
+ case NONE:
+ // nothing to do
+ break;
+ case IMPRECISE:
+ case PRECISE:
+ boolean precise = barrierType == HeapAccess.BarrierType.PRECISE;
+ addG1PreWriteBarrier(node, node.getAddress(), node.getExpectedValue(), false, false, graph);
+ addG1PostWriteBarrier(node, node.getAddress(), node.getNewValue(), precise, graph);
+ break;
+ default:
+ throw new GraalError("unexpected barrier type: " + barrierType);
+ }
+ }
+
+ @Override
+ public void addArrayRangeBarriers(ArrayRangeWrite write, StructuredGraph graph) {
+ if (!write.isInitialization()) {
+ // The pre barrier does nothing if the value being read is null, so it can
+ // be explicitly skipped when this is an initializing store.
+ G1ArrayRangePreWriteBarrier g1ArrayRangePreWriteBarrier = graph.add(new G1ArrayRangePreWriteBarrier(write.getAddress(), write.getLength(), write.getElementStride()));
+ graph.addBeforeFixed(write.asNode(), g1ArrayRangePreWriteBarrier);
+ }
+ G1ArrayRangePostWriteBarrier g1ArrayRangePostWriteBarrier = graph.add(new G1ArrayRangePostWriteBarrier(write.getAddress(), write.getLength(), write.getElementStride()));
+ graph.addAfterFixed(write.asNode(), g1ArrayRangePostWriteBarrier);
+ }
+
+ private static void addG1PreWriteBarrier(FixedAccessNode node, AddressNode address, ValueNode value, boolean doLoad, boolean nullCheck, StructuredGraph graph) {
+ G1PreWriteBarrier preBarrier = graph.add(new G1PreWriteBarrier(address, value, doLoad, nullCheck));
+ preBarrier.setStateBefore(node.stateBefore());
+ node.setNullCheck(false);
+ node.setStateBefore(null);
+ graph.addBeforeFixed(node, preBarrier);
+ }
+
+ private static void addG1PostWriteBarrier(FixedAccessNode node, AddressNode address, ValueNode value, boolean precise, StructuredGraph graph) {
+ final boolean alwaysNull = StampTool.isPointerAlwaysNull(value);
+ graph.addAfterFixed(node, graph.add(new G1PostWriteBarrier(address, value, precise, alwaysNull)));
+ }
+}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/gc/g1/G1PostWriteBarrier.java Sat Mar 16 21:00:45 2019 +0000
@@ -0,0 +1,54 @@
+/*
+ * 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
+ * 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.
+ */
+
+
+package org.graalvm.compiler.hotspot.gc.g1;
+
+import static org.graalvm.compiler.nodeinfo.NodeCycles.CYCLES_64;
+import static org.graalvm.compiler.nodeinfo.NodeSize.SIZE_64;
+
+import org.graalvm.compiler.graph.NodeClass;
+import org.graalvm.compiler.hotspot.gc.shared.ObjectWriteBarrier;
+import org.graalvm.compiler.nodeinfo.NodeInfo;
+import org.graalvm.compiler.nodes.ValueNode;
+import org.graalvm.compiler.nodes.memory.address.AddressNode;
+
+@NodeInfo(cycles = CYCLES_64, size = SIZE_64)
+public class G1PostWriteBarrier extends ObjectWriteBarrier {
+
+ public static final NodeClass<G1PostWriteBarrier> TYPE = NodeClass.create(G1PostWriteBarrier.class);
+ protected final boolean alwaysNull;
+
+ public G1PostWriteBarrier(AddressNode address, ValueNode value, boolean precise, boolean alwaysNull) {
+ this(TYPE, address, value, precise, alwaysNull);
+ }
+
+ private G1PostWriteBarrier(NodeClass<? extends G1PostWriteBarrier> c, AddressNode address, ValueNode value, boolean precise, boolean alwaysNull) {
+ super(c, address, value, precise);
+ this.alwaysNull = alwaysNull;
+ }
+
+ public boolean alwaysNull() {
+ return alwaysNull;
+ }
+}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/gc/g1/G1PreWriteBarrier.java Sat Mar 16 21:00:45 2019 +0000
@@ -0,0 +1,82 @@
+/*
+ * 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
+ * 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.
+ */
+
+
+
+package org.graalvm.compiler.hotspot.gc.g1;
+
+import static org.graalvm.compiler.nodeinfo.NodeCycles.CYCLES_64;
+import static org.graalvm.compiler.nodeinfo.NodeSize.SIZE_64;
+
+import org.graalvm.compiler.graph.NodeClass;
+import org.graalvm.compiler.hotspot.gc.shared.ObjectWriteBarrier;
+import org.graalvm.compiler.nodeinfo.InputType;
+import org.graalvm.compiler.nodeinfo.NodeInfo;
+import org.graalvm.compiler.nodes.DeoptimizingNode;
+import org.graalvm.compiler.nodes.FrameState;
+import org.graalvm.compiler.nodes.ValueNode;
+import org.graalvm.compiler.nodes.memory.address.AddressNode;
+
+@NodeInfo(cycles = CYCLES_64, size = SIZE_64)
+public final class G1PreWriteBarrier extends ObjectWriteBarrier implements DeoptimizingNode.DeoptBefore {
+
+ public static final NodeClass<G1PreWriteBarrier> TYPE = NodeClass.create(G1PreWriteBarrier.class);
+
+ @OptionalInput(InputType.State) private FrameState stateBefore;
+ private final boolean nullCheck;
+ private final boolean doLoad;
+
+ public G1PreWriteBarrier(AddressNode address, ValueNode expectedObject, boolean doLoad, boolean nullCheck) {
+ super(TYPE, address, expectedObject, true);
+ this.doLoad = doLoad;
+ this.nullCheck = nullCheck;
+ }
+
+ public ValueNode getExpectedObject() {
+ return getValue();
+ }
+
+ public boolean doLoad() {
+ return doLoad;
+ }
+
+ public boolean getNullCheck() {
+ return nullCheck;
+ }
+
+ @Override
+ public boolean canDeoptimize() {
+ return nullCheck;
+ }
+
+ @Override
+ public FrameState stateBefore() {
+ return stateBefore;
+ }
+
+ @Override
+ public void setStateBefore(FrameState state) {
+ updateUsages(stateBefore, state);
+ stateBefore = state;
+ }
+}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/gc/g1/G1ReferentFieldReadBarrier.java Sat Mar 16 21:00:45 2019 +0000
@@ -0,0 +1,60 @@
+/*
+ * 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
+ * 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.
+ */
+
+
+package org.graalvm.compiler.hotspot.gc.g1;
+
+import static org.graalvm.compiler.nodeinfo.NodeCycles.CYCLES_64;
+import static org.graalvm.compiler.nodeinfo.NodeSize.SIZE_64;
+
+import org.graalvm.compiler.graph.NodeClass;
+import org.graalvm.compiler.hotspot.gc.shared.ObjectWriteBarrier;
+import org.graalvm.compiler.nodeinfo.NodeInfo;
+import org.graalvm.compiler.nodes.ValueNode;
+import org.graalvm.compiler.nodes.memory.address.AddressNode;
+
+/**
+ * The {@code G1ReferentFieldReadBarrier} is added when a read access is performed to the referent
+ * field of a {@link java.lang.ref.Reference} object (through a {@code LoadFieldNode} or an
+ * {@code UnsafeLoadNode}). The return value of the read is passed to the snippet implementing the
+ * read barrier and consequently is added to the SATB queue if the concurrent marker is enabled.
+ */
+@NodeInfo(cycles = CYCLES_64, size = SIZE_64)
+public final class G1ReferentFieldReadBarrier extends ObjectWriteBarrier {
+ public static final NodeClass<G1ReferentFieldReadBarrier> TYPE = NodeClass.create(G1ReferentFieldReadBarrier.class);
+
+ private final boolean doLoad;
+
+ public G1ReferentFieldReadBarrier(AddressNode address, ValueNode expectedObject, boolean doLoad) {
+ super(TYPE, address, expectedObject, true);
+ this.doLoad = doLoad;
+ }
+
+ public ValueNode getExpectedObject() {
+ return getValue();
+ }
+
+ public boolean doLoad() {
+ return doLoad;
+ }
+}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/gc/shared/ArrayRangeWriteBarrier.java Sat Mar 16 21:00:45 2019 +0000
@@ -0,0 +1,62 @@
+/*
+ * 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
+ * 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.
+ */
+
+
+package org.graalvm.compiler.hotspot.gc.shared;
+
+import org.graalvm.compiler.graph.NodeClass;
+import org.graalvm.compiler.hotspot.nodes.WriteBarrier;
+import org.graalvm.compiler.nodeinfo.InputType;
+import org.graalvm.compiler.nodeinfo.NodeInfo;
+import org.graalvm.compiler.nodes.ValueNode;
+import org.graalvm.compiler.nodes.memory.address.AddressNode;
+import org.graalvm.compiler.nodes.spi.Lowerable;
+
+@NodeInfo
+public abstract class ArrayRangeWriteBarrier extends WriteBarrier implements Lowerable {
+
+ public static final NodeClass<ArrayRangeWriteBarrier> TYPE = NodeClass.create(ArrayRangeWriteBarrier.class);
+ @Input(InputType.Association) AddressNode address;
+ @Input ValueNode length;
+
+ private final int elementStride;
+
+ protected ArrayRangeWriteBarrier(NodeClass<? extends ArrayRangeWriteBarrier> c, AddressNode address, ValueNode length, int elementStride) {
+ super(c);
+ this.address = address;
+ this.length = length;
+ this.elementStride = elementStride;
+ }
+
+ public AddressNode getAddress() {
+ return address;
+ }
+
+ public ValueNode getLength() {
+ return length;
+ }
+
+ public int getElementStride() {
+ return elementStride;
+ }
+}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/gc/shared/BarrierSet.java Sat Mar 16 21:00:45 2019 +0000
@@ -0,0 +1,45 @@
+/*
+ * Copyright (c) 2019, Oracle and/or its affiliates. All rights reserved.
+ * 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.
+ */
+
+
+package org.graalvm.compiler.hotspot.gc.shared;
+
+import org.graalvm.compiler.nodes.StructuredGraph;
+import org.graalvm.compiler.nodes.extended.ArrayRangeWrite;
+import org.graalvm.compiler.nodes.java.AbstractCompareAndSwapNode;
+import org.graalvm.compiler.nodes.java.LoweredAtomicReadAndWriteNode;
+import org.graalvm.compiler.nodes.memory.ReadNode;
+import org.graalvm.compiler.nodes.memory.WriteNode;
+
+public abstract class BarrierSet {
+ public abstract void addReadNodeBarriers(ReadNode node, StructuredGraph graph);
+
+ public abstract void addWriteNodeBarriers(WriteNode node, StructuredGraph graph);
+
+ public abstract void addAtomicReadWriteNodeBarriers(LoweredAtomicReadAndWriteNode node, StructuredGraph graph);
+
+ public abstract void addCASBarriers(AbstractCompareAndSwapNode node, StructuredGraph graph);
+
+ public abstract void addArrayRangeBarriers(ArrayRangeWrite write, StructuredGraph graph);
+}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/gc/shared/CardTableBarrierSet.java Sat Mar 16 21:00:45 2019 +0000
@@ -0,0 +1,113 @@
+/*
+ * Copyright (c) 2019, Oracle and/or its affiliates. All rights reserved.
+ * 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.
+ */
+
+
+package org.graalvm.compiler.hotspot.gc.shared;
+
+import org.graalvm.compiler.debug.GraalError;
+import org.graalvm.compiler.nodes.StructuredGraph;
+import org.graalvm.compiler.nodes.ValueNode;
+import org.graalvm.compiler.nodes.extended.ArrayRangeWrite;
+import org.graalvm.compiler.nodes.java.AbstractCompareAndSwapNode;
+import org.graalvm.compiler.nodes.java.LoweredAtomicReadAndWriteNode;
+import org.graalvm.compiler.nodes.memory.FixedAccessNode;
+import org.graalvm.compiler.nodes.memory.HeapAccess;
+import org.graalvm.compiler.nodes.memory.ReadNode;
+import org.graalvm.compiler.nodes.memory.WriteNode;
+import org.graalvm.compiler.nodes.memory.address.AddressNode;
+import org.graalvm.compiler.nodes.type.StampTool;
+
+public class CardTableBarrierSet extends BarrierSet {
+
+ @Override
+ public void addReadNodeBarriers(ReadNode node, StructuredGraph graph) {
+ assert node.getBarrierType() == HeapAccess.BarrierType.NONE : "Non precise read barrier has been attached to read node.";
+ }
+
+ @Override
+ public void addWriteNodeBarriers(WriteNode node, StructuredGraph graph) {
+ HeapAccess.BarrierType barrierType = node.getBarrierType();
+ switch (barrierType) {
+ case NONE:
+ // nothing to do
+ break;
+ case IMPRECISE:
+ case PRECISE:
+ boolean precise = barrierType == HeapAccess.BarrierType.PRECISE;
+ addSerialPostWriteBarrier(node, node.getAddress(), node.value(), precise, graph);
+ break;
+ default:
+ throw new GraalError("unexpected barrier type: " + barrierType);
+ }
+ }
+
+ @Override
+ public void addAtomicReadWriteNodeBarriers(LoweredAtomicReadAndWriteNode node, StructuredGraph graph) {
+ HeapAccess.BarrierType barrierType = node.getBarrierType();
+ switch (barrierType) {
+ case NONE:
+ // nothing to do
+ break;
+ case IMPRECISE:
+ case PRECISE:
+ boolean precise = barrierType == HeapAccess.BarrierType.PRECISE;
+ addSerialPostWriteBarrier(node, node.getAddress(), node.getNewValue(), precise, graph);
+ break;
+ default:
+ throw new GraalError("unexpected barrier type: " + barrierType);
+ }
+ }
+
+ @Override
+ public void addCASBarriers(AbstractCompareAndSwapNode node, StructuredGraph graph) {
+ HeapAccess.BarrierType barrierType = node.getBarrierType();
+ switch (barrierType) {
+ case NONE:
+ // nothing to do
+ break;
+ case IMPRECISE:
+ case PRECISE:
+ boolean precise = barrierType == HeapAccess.BarrierType.PRECISE;
+ addSerialPostWriteBarrier(node, node.getAddress(), node.getNewValue(), precise, graph);
+ break;
+ default:
+ throw new GraalError("unexpected barrier type: " + barrierType);
+ }
+ }
+
+ @Override
+ public void addArrayRangeBarriers(ArrayRangeWrite write, StructuredGraph graph) {
+ SerialArrayRangeWriteBarrier serialArrayRangeWriteBarrier = graph.add(new SerialArrayRangeWriteBarrier(write.getAddress(), write.getLength(), write.getElementStride()));
+ graph.addAfterFixed(write.asNode(), serialArrayRangeWriteBarrier);
+ }
+
+ protected void addSerialPostWriteBarrier(FixedAccessNode node, AddressNode address, ValueNode value, boolean precise, StructuredGraph graph) {
+ final boolean alwaysNull = StampTool.isPointerAlwaysNull(value);
+ if (alwaysNull) {
+ // Serial barrier isn't needed for null value
+ return;
+ }
+ graph.addAfterFixed(node, graph.add(new SerialWriteBarrier(address, precise)));
+ }
+}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/gc/shared/ObjectWriteBarrier.java Sat Mar 16 21:00:45 2019 +0000
@@ -0,0 +1,60 @@
+/*
+ * Copyright (c) 2013, 2018, Oracle and/or its affiliates. All rights reserved.
+ * 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.
+ */
+
+
+package org.graalvm.compiler.hotspot.gc.shared;
+
+import org.graalvm.compiler.graph.NodeClass;
+import org.graalvm.compiler.hotspot.nodes.WriteBarrier;
+import org.graalvm.compiler.nodeinfo.InputType;
+import org.graalvm.compiler.nodeinfo.NodeInfo;
+import org.graalvm.compiler.nodes.ValueNode;
+import org.graalvm.compiler.nodes.memory.address.AddressNode;
+
+@NodeInfo
+public abstract class ObjectWriteBarrier extends WriteBarrier {
+
+ public static final NodeClass<ObjectWriteBarrier> TYPE = NodeClass.create(ObjectWriteBarrier.class);
+ @Input(InputType.Association) protected AddressNode address;
+ @OptionalInput protected ValueNode value;
+ protected final boolean precise;
+
+ protected ObjectWriteBarrier(NodeClass<? extends ObjectWriteBarrier> c, AddressNode address, ValueNode value, boolean precise) {
+ super(c);
+ this.address = address;
+ this.value = value;
+ this.precise = precise;
+ }
+
+ public ValueNode getValue() {
+ return value;
+ }
+
+ public AddressNode getAddress() {
+ return address;
+ }
+
+ public boolean usePrecise() {
+ return precise;
+ }
+}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/gc/shared/SerialArrayRangeWriteBarrier.java Sat Mar 16 21:00:45 2019 +0000
@@ -0,0 +1,43 @@
+/*
+ * Copyright (c) 2013, 2018, Oracle and/or its affiliates. All rights reserved.
+ * 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.
+ */
+
+
+package org.graalvm.compiler.hotspot.gc.shared;
+
+import static org.graalvm.compiler.nodeinfo.NodeCycles.CYCLES_8;
+import static org.graalvm.compiler.nodeinfo.NodeSize.SIZE_8;
+
+import org.graalvm.compiler.graph.NodeClass;
+import org.graalvm.compiler.nodeinfo.NodeInfo;
+import org.graalvm.compiler.nodes.ValueNode;
+import org.graalvm.compiler.nodes.memory.address.AddressNode;
+
+@NodeInfo(cycles = CYCLES_8, size = SIZE_8)
+public final class SerialArrayRangeWriteBarrier extends ArrayRangeWriteBarrier {
+ public static final NodeClass<SerialArrayRangeWriteBarrier> TYPE = NodeClass.create(SerialArrayRangeWriteBarrier.class);
+
+ public SerialArrayRangeWriteBarrier(AddressNode address, ValueNode length, int elementStride) {
+ super(TYPE, address, length, elementStride);
+ }
+
+}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/gc/shared/SerialWriteBarrier.java Sat Mar 16 21:00:45 2019 +0000
@@ -0,0 +1,46 @@
+/*
+ * Copyright (c) 2013, 2018, Oracle and/or its affiliates. All rights reserved.
+ * 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.
+ */
+
+
+package org.graalvm.compiler.hotspot.gc.shared;
+
+import static org.graalvm.compiler.nodeinfo.NodeCycles.CYCLES_8;
+import static org.graalvm.compiler.nodeinfo.NodeSize.SIZE_4;
+
+import org.graalvm.compiler.graph.NodeClass;
+import org.graalvm.compiler.nodeinfo.NodeInfo;
+import org.graalvm.compiler.nodes.memory.address.AddressNode;
+
+@NodeInfo(cycles = CYCLES_8, size = SIZE_4)
+public class SerialWriteBarrier extends ObjectWriteBarrier {
+
+ public static final NodeClass<SerialWriteBarrier> TYPE = NodeClass.create(SerialWriteBarrier.class);
+
+ public SerialWriteBarrier(AddressNode address, boolean precise) {
+ this(TYPE, address, precise);
+ }
+
+ protected SerialWriteBarrier(NodeClass<? extends SerialWriteBarrier> c, AddressNode address, boolean precise) {
+ super(c, address, null, precise);
+ }
+}
--- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/meta/DefaultHotSpotLoweringProvider.java Tue Mar 12 09:49:10 2019 +0000
+++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/meta/DefaultHotSpotLoweringProvider.java Sat Mar 16 21:00:45 2019 +0000
@@ -24,6 +24,7 @@
package org.graalvm.compiler.hotspot.meta;
+import static jdk.vm.ci.services.Services.IS_IN_NATIVE_IMAGE;
import static org.graalvm.compiler.core.common.GraalOptions.AlwaysInlineVTableStubs;
import static org.graalvm.compiler.core.common.GraalOptions.InlineVTableStubs;
import static org.graalvm.compiler.core.common.GraalOptions.OmitHotExceptionStacktrace;
@@ -58,17 +59,17 @@
import org.graalvm.compiler.graph.NodeInputList;
import org.graalvm.compiler.hotspot.GraalHotSpotVMConfig;
import org.graalvm.compiler.hotspot.HotSpotGraalRuntimeProvider;
+import org.graalvm.compiler.hotspot.gc.g1.G1ArrayRangePostWriteBarrier;
+import org.graalvm.compiler.hotspot.gc.g1.G1ArrayRangePreWriteBarrier;
+import org.graalvm.compiler.hotspot.gc.g1.G1PostWriteBarrier;
+import org.graalvm.compiler.hotspot.gc.g1.G1PreWriteBarrier;
+import org.graalvm.compiler.hotspot.gc.g1.G1ReferentFieldReadBarrier;
+import org.graalvm.compiler.hotspot.gc.shared.SerialArrayRangeWriteBarrier;
+import org.graalvm.compiler.hotspot.gc.shared.SerialWriteBarrier;
import org.graalvm.compiler.hotspot.nodes.BeginLockScopeNode;
-import org.graalvm.compiler.hotspot.nodes.G1ArrayRangePostWriteBarrier;
-import org.graalvm.compiler.hotspot.nodes.G1ArrayRangePreWriteBarrier;
-import org.graalvm.compiler.hotspot.nodes.G1PostWriteBarrier;
-import org.graalvm.compiler.hotspot.nodes.G1PreWriteBarrier;
-import org.graalvm.compiler.hotspot.nodes.G1ReferentFieldReadBarrier;
import org.graalvm.compiler.hotspot.nodes.HotSpotCompressionNode;
import org.graalvm.compiler.hotspot.nodes.HotSpotDirectCallTargetNode;
import org.graalvm.compiler.hotspot.nodes.HotSpotIndirectCallTargetNode;
-import org.graalvm.compiler.hotspot.nodes.SerialArrayRangeWriteBarrier;
-import org.graalvm.compiler.hotspot.nodes.SerialWriteBarrier;
import org.graalvm.compiler.hotspot.nodes.aot.InitializeKlassNode;
import org.graalvm.compiler.hotspot.nodes.aot.ResolveConstantNode;
import org.graalvm.compiler.hotspot.nodes.aot.ResolveDynamicConstantNode;
@@ -162,6 +163,7 @@
import org.graalvm.compiler.replacements.arraycopy.ArrayCopySnippets;
import org.graalvm.compiler.replacements.arraycopy.ArrayCopyWithSlowPathNode;
import org.graalvm.compiler.replacements.nodes.AssertionNode;
+import org.graalvm.compiler.serviceprovider.JavaVersionUtil;
import jdk.internal.vm.compiler.word.LocationIdentity;
import jdk.vm.ci.code.TargetDescription;
@@ -225,7 +227,9 @@
stringToBytesSnippets = new StringToBytesSnippets.Templates(options, factories, providers, target);
hashCodeSnippets = new HashCodeSnippets.Templates(options, factories, providers, target);
resolveConstantSnippets = new ResolveConstantSnippets.Templates(options, factories, providers, target);
- profileSnippets = new ProfileSnippets.Templates(options, factories, providers, target);
+ if (!JavaVersionUtil.Java8OrEarlier) {
+ profileSnippets = new ProfileSnippets.Templates(options, factories, providers, target);
+ }
objectCloneSnippets = new ObjectCloneSnippets.Templates(options, factories, providers, target);
foreignCallSnippets = new ForeignCallSnippets.Templates(options, factories, providers, target);
}
@@ -683,6 +687,9 @@
}
private void throwCachedException(BytecodeExceptionNode node) {
+ if (IS_IN_NATIVE_IMAGE) {
+ throw new InternalError("Can't throw exception from SVM object");
+ }
Throwable exception = Exceptions.cachedExceptions.get(node.getExceptionKind());
assert exception != null;
--- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/meta/HotSpotClassInitializationPlugin.java Tue Mar 12 09:49:10 2019 +0000
+++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/meta/HotSpotClassInitializationPlugin.java Sat Mar 16 21:00:45 2019 +0000
@@ -24,9 +24,7 @@
package org.graalvm.compiler.hotspot.meta;
-import java.lang.invoke.MethodHandle;
-import java.lang.invoke.MethodHandles;
-import java.lang.invoke.MethodType;
+import java.lang.reflect.Method;
import java.util.function.Supplier;
import org.graalvm.compiler.core.common.type.ObjectStamp;
@@ -88,15 +86,16 @@
}
private static final Class<? extends ConstantPool> hscp;
- private static final MethodHandle loadReferencedTypeIIZMH;
+ private static final Method loadReferencedTypeIIZMH;
static {
- MethodHandle m = null;
+ Method m = null;
Class<? extends ConstantPool> c = null;
try {
c = Class.forName("jdk.vm.ci.hotspot.HotSpotConstantPool").asSubclass(ConstantPool.class);
- m = MethodHandles.lookup().findVirtual(c, "loadReferencedType", MethodType.methodType(void.class, int.class, int.class, boolean.class));
+ m = c.getDeclaredMethod("loadReferencedType", int.class, int.class, boolean.class);
} catch (Exception e) {
+ throw GraalError.shouldNotReachHere(e);
}
loadReferencedTypeIIZMH = m;
hscp = c;
--- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/meta/HotSpotGraalConstantFieldProvider.java Tue Mar 12 09:49:10 2019 +0000
+++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/meta/HotSpotGraalConstantFieldProvider.java Sat Mar 16 21:00:45 2019 +0000
@@ -24,6 +24,8 @@
package org.graalvm.compiler.hotspot.meta;
+import static jdk.vm.ci.services.Services.IS_BUILDING_NATIVE_IMAGE;
+import static jdk.vm.ci.services.Services.IS_IN_NATIVE_IMAGE;
import static org.graalvm.compiler.core.common.GraalOptions.ImmutableCode;
import java.util.ArrayList;
@@ -63,7 +65,7 @@
private volatile List<ResolvedJavaField> nonEmbeddableFields;
protected boolean isEmbeddableField(ResolvedJavaField field) {
- if (nonEmbeddableFields == null) {
+ if (!IS_IN_NATIVE_IMAGE && (IS_BUILDING_NATIVE_IMAGE || nonEmbeddableFields == null)) {
synchronized (this) {
if (nonEmbeddableFields == null) {
List<ResolvedJavaField> fields = new ArrayList<>();
--- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/meta/HotSpotGraphBuilderPlugins.java Tue Mar 12 09:49:10 2019 +0000
+++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/meta/HotSpotGraphBuilderPlugins.java Sat Mar 16 21:00:45 2019 +0000
@@ -25,10 +25,11 @@
package org.graalvm.compiler.hotspot.meta;
import static org.graalvm.compiler.core.common.GraalOptions.GeneratePIC;
+import static org.graalvm.compiler.hotspot.HotSpotBackend.GHASH_PROCESS_BLOCKS;
import static org.graalvm.compiler.hotspot.meta.HotSpotAOTProfilingPlugin.Options.TieredAOT;
import static org.graalvm.compiler.hotspot.replacements.HotSpotReplacementsUtil.JAVA_THREAD_THREAD_OBJECT_LOCATION;
import static org.graalvm.compiler.java.BytecodeParserOptions.InlineDuringParsing;
-import static org.graalvm.compiler.serviceprovider.GraalServices.Java8OrEarlier;
+import static org.graalvm.compiler.serviceprovider.JavaVersionUtil.Java8OrEarlier;
import java.lang.invoke.ConstantCallSite;
import java.lang.invoke.MutableCallSite;
@@ -46,12 +47,15 @@
import org.graalvm.compiler.hotspot.GraalHotSpotVMConfig;
import org.graalvm.compiler.hotspot.nodes.CurrentJavaThreadNode;
import org.graalvm.compiler.hotspot.replacements.AESCryptSubstitutions;
+import org.graalvm.compiler.hotspot.replacements.ArraysSupportSubstitutions;
import org.graalvm.compiler.hotspot.replacements.BigIntegerSubstitutions;
import org.graalvm.compiler.hotspot.replacements.CRC32CSubstitutions;
import org.graalvm.compiler.hotspot.replacements.CRC32Substitutions;
import org.graalvm.compiler.hotspot.replacements.CallSiteTargetNode;
import org.graalvm.compiler.hotspot.replacements.CipherBlockChainingSubstitutions;
import org.graalvm.compiler.hotspot.replacements.ClassGetHubNode;
+import org.graalvm.compiler.hotspot.replacements.CounterModeSubstitutions;
+import org.graalvm.compiler.hotspot.replacements.DigestBaseSubstitutions;
import org.graalvm.compiler.hotspot.replacements.HotSpotArraySubstitutions;
import org.graalvm.compiler.hotspot.replacements.HotSpotClassSubstitutions;
import org.graalvm.compiler.hotspot.replacements.IdentityHashCodeNode;
@@ -62,8 +66,10 @@
import org.graalvm.compiler.hotspot.replacements.SHA2Substitutions;
import org.graalvm.compiler.hotspot.replacements.SHA5Substitutions;
import org.graalvm.compiler.hotspot.replacements.SHASubstitutions;
+import org.graalvm.compiler.hotspot.replacements.StringUTF16Substitutions;
import org.graalvm.compiler.hotspot.replacements.ThreadSubstitutions;
import org.graalvm.compiler.hotspot.word.HotSpotWordTypes;
+import org.graalvm.compiler.nodes.ComputeObjectAddressNode;
import org.graalvm.compiler.nodes.ConstantNode;
import org.graalvm.compiler.nodes.NamedLocationIdentity;
import org.graalvm.compiler.nodes.NodeView;
@@ -71,6 +77,7 @@
import org.graalvm.compiler.nodes.calc.AddNode;
import org.graalvm.compiler.nodes.calc.IntegerConvertNode;
import org.graalvm.compiler.nodes.calc.LeftShiftNode;
+import org.graalvm.compiler.nodes.extended.ForeignCallNode;
import org.graalvm.compiler.nodes.graphbuilderconf.ForeignCallPlugin;
import org.graalvm.compiler.nodes.graphbuilderconf.GraphBuilderConfiguration.Plugins;
import org.graalvm.compiler.nodes.graphbuilderconf.GraphBuilderContext;
@@ -163,9 +170,13 @@
registerCRC32CPlugins(invocationPlugins, config, replacementBytecodeProvider);
registerBigIntegerPlugins(invocationPlugins, config, replacementBytecodeProvider);
registerSHAPlugins(invocationPlugins, config, replacementBytecodeProvider);
+ registerGHASHPlugins(invocationPlugins, config, metaAccess, foreignCalls);
+ registerCounterModePlugins(invocationPlugins, config, replacementBytecodeProvider);
registerUnsafePlugins(invocationPlugins, replacementBytecodeProvider);
StandardGraphBuilderPlugins.registerInvocationPlugins(metaAccess, snippetReflection, invocationPlugins, replacementBytecodeProvider, true, false);
registerArrayPlugins(invocationPlugins, replacementBytecodeProvider);
+ registerStringPlugins(invocationPlugins, replacementBytecodeProvider);
+ registerArraysSupportPlugins(invocationPlugins, config, replacementBytecodeProvider);
for (NodeIntrinsicPluginFactory factory : GraalServices.load(NodeIntrinsicPluginFactory.class)) {
factory.registerPlugins(invocationPlugins, nodeIntrinsificationProvider);
@@ -388,6 +399,14 @@
r.registerMethodSubstitution(HotSpotArraySubstitutions.class, "newInstance", Class.class, int.class);
}
+ private static void registerStringPlugins(InvocationPlugins plugins, BytecodeProvider bytecodeProvider) {
+ if (!Java8OrEarlier) {
+ final Registration utf16r = new Registration(plugins, "java.lang.StringUTF16", bytecodeProvider);
+ utf16r.registerMethodSubstitution(StringUTF16Substitutions.class, "toBytes", char[].class, int.class, int.class);
+ utf16r.registerMethodSubstitution(StringUTF16Substitutions.class, "getChars", byte[].class, int.class, int.class, char[].class, int.class);
+ }
+ }
+
private static void registerThreadPlugins(InvocationPlugins plugins, MetaAccessProvider metaAccess, WordTypes wordTypes, GraalHotSpotVMConfig config, BytecodeProvider bytecodeProvider) {
Registration r = new Registration(plugins, Thread.class, bytecodeProvider);
r.register0("currentThread", new InvocationPlugin() {
@@ -477,23 +496,73 @@
}
private static void registerSHAPlugins(InvocationPlugins plugins, GraalHotSpotVMConfig config, BytecodeProvider bytecodeProvider) {
- if (config.useSHA1Intrinsics()) {
+ boolean useSha1 = config.useSHA1Intrinsics();
+ boolean useSha256 = config.useSHA256Intrinsics();
+ boolean useSha512 = config.useSHA512Intrinsics();
+
+ if (!Java8OrEarlier && (useSha1 || useSha256 || useSha512)) {
+ Registration r = new Registration(plugins, "sun.security.provider.DigestBase", bytecodeProvider);
+ r.registerMethodSubstitution(DigestBaseSubstitutions.class, "implCompressMultiBlock0", Receiver.class, byte[].class, int.class, int.class);
+ }
+
+ if (useSha1) {
assert config.sha1ImplCompress != 0L;
Registration r = new Registration(plugins, "sun.security.provider.SHA", bytecodeProvider);
r.registerMethodSubstitution(SHASubstitutions.class, SHASubstitutions.implCompressName, "implCompress0", Receiver.class, byte[].class, int.class);
}
- if (config.useSHA256Intrinsics()) {
+ if (useSha256) {
assert config.sha256ImplCompress != 0L;
Registration r = new Registration(plugins, "sun.security.provider.SHA2", bytecodeProvider);
r.registerMethodSubstitution(SHA2Substitutions.class, SHA2Substitutions.implCompressName, "implCompress0", Receiver.class, byte[].class, int.class);
}
- if (config.useSHA512Intrinsics()) {
+ if (useSha512) {
assert config.sha512ImplCompress != 0L;
Registration r = new Registration(plugins, "sun.security.provider.SHA5", bytecodeProvider);
r.registerMethodSubstitution(SHA5Substitutions.class, SHA5Substitutions.implCompressName, "implCompress0", Receiver.class, byte[].class, int.class);
}
}
+ private static void registerGHASHPlugins(InvocationPlugins plugins, GraalHotSpotVMConfig config, MetaAccessProvider metaAccess, ForeignCallsProvider foreignCalls) {
+ if (config.useGHASHIntrinsics()) {
+ assert config.ghashProcessBlocks != 0L;
+ Registration r = new Registration(plugins, "com.sun.crypto.provider.GHASH");
+ r.register5("processBlocks",
+ byte[].class,
+ int.class,
+ int.class,
+ long[].class,
+ long[].class,
+ new InvocationPlugin() {
+ @Override
+ public boolean apply(GraphBuilderContext b,
+ ResolvedJavaMethod targetMethod,
+ Receiver receiver,
+ ValueNode data,
+ ValueNode inOffset,
+ ValueNode blocks,
+ ValueNode state,
+ ValueNode hashSubkey) {
+ int longArrayBaseOffset = metaAccess.getArrayBaseOffset(JavaKind.Long);
+ int byteArrayBaseOffset = metaAccess.getArrayBaseOffset(JavaKind.Byte);
+ ValueNode dataOffset = AddNode.create(ConstantNode.forInt(byteArrayBaseOffset), inOffset, NodeView.DEFAULT);
+ ComputeObjectAddressNode dataAddress = b.add(new ComputeObjectAddressNode(data, dataOffset));
+ ComputeObjectAddressNode stateAddress = b.add(new ComputeObjectAddressNode(state, ConstantNode.forInt(longArrayBaseOffset)));
+ ComputeObjectAddressNode hashSubkeyAddress = b.add(new ComputeObjectAddressNode(hashSubkey, ConstantNode.forInt(longArrayBaseOffset)));
+ b.add(new ForeignCallNode(foreignCalls, GHASH_PROCESS_BLOCKS, stateAddress, hashSubkeyAddress, dataAddress, blocks));
+ return true;
+ }
+ });
+ }
+ }
+
+ private static void registerCounterModePlugins(InvocationPlugins plugins, GraalHotSpotVMConfig config, BytecodeProvider bytecodeProvider) {
+ if (config.useAESCTRIntrinsics) {
+ assert config.counterModeAESCrypt != 0L;
+ Registration r = new Registration(plugins, "com.sun.crypto.provider.CounterMode", bytecodeProvider);
+ r.registerMethodSubstitution(CounterModeSubstitutions.class, "implCrypt", Receiver.class, byte[].class, int.class, int.class, byte[].class, int.class);
+ }
+ }
+
private static void registerCRC32Plugins(InvocationPlugins plugins, GraalHotSpotVMConfig config, BytecodeProvider bytecodeProvider) {
if (config.useCRC32Intrinsics) {
Registration r = new Registration(plugins, CRC32.class, bytecodeProvider);
@@ -515,4 +584,11 @@
r.registerMethodSubstitution(CRC32CSubstitutions.class, "updateDirectByteBuffer", int.class, long.class, int.class, int.class);
}
}
+
+ private static void registerArraysSupportPlugins(InvocationPlugins plugins, GraalHotSpotVMConfig config, BytecodeProvider bytecodeProvider) {
+ if (config.useVectorizedMismatchIntrinsic) {
+ Registration r = new Registration(plugins, "jdk.internal.util.ArraysSupport", bytecodeProvider);
+ r.registerMethodSubstitution(ArraysSupportSubstitutions.class, "vectorizedMismatch", Object.class, long.class, Object.class, long.class, int.class, int.class);
+ }
+ }
}
--- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/meta/HotSpotHostForeignCallsProvider.java Tue Mar 12 09:49:10 2019 +0000
+++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/meta/HotSpotHostForeignCallsProvider.java Sat Mar 16 21:00:45 2019 +0000
@@ -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
@@ -29,6 +29,7 @@
import static org.graalvm.compiler.core.target.Backend.ARITHMETIC_DREM;
import static org.graalvm.compiler.core.target.Backend.ARITHMETIC_FREM;
import static org.graalvm.compiler.hotspot.HotSpotBackend.BACKEDGE_EVENT;
+import static org.graalvm.compiler.hotspot.HotSpotBackend.COUNTERMODE_IMPL_CRYPT;
import static org.graalvm.compiler.hotspot.HotSpotBackend.DECRYPT;
import static org.graalvm.compiler.hotspot.HotSpotBackend.DECRYPT_BLOCK;
import static org.graalvm.compiler.hotspot.HotSpotBackend.DECRYPT_BLOCK_WITH_ORIGINAL_KEY;
@@ -36,6 +37,7 @@
import static org.graalvm.compiler.hotspot.HotSpotBackend.ENCRYPT;
import static org.graalvm.compiler.hotspot.HotSpotBackend.ENCRYPT_BLOCK;
import static org.graalvm.compiler.hotspot.HotSpotBackend.EXCEPTION_HANDLER;
+import static org.graalvm.compiler.hotspot.HotSpotBackend.GHASH_PROCESS_BLOCKS;
import static org.graalvm.compiler.hotspot.HotSpotBackend.IC_MISS_HANDLER;
import static org.graalvm.compiler.hotspot.HotSpotBackend.INITIALIZE_KLASS_BY_SYMBOL;
import static org.graalvm.compiler.hotspot.HotSpotBackend.INVOCATION_EVENT;
@@ -54,10 +56,14 @@
import static org.graalvm.compiler.hotspot.HotSpotBackend.RESOLVE_METHOD_BY_SYMBOL_AND_LOAD_COUNTERS;
import static org.graalvm.compiler.hotspot.HotSpotBackend.RESOLVE_STRING_BY_SYMBOL;
import static org.graalvm.compiler.hotspot.HotSpotBackend.SHA2_IMPL_COMPRESS;
+import static org.graalvm.compiler.hotspot.HotSpotBackend.SHA2_IMPL_COMPRESS_MB;
import static org.graalvm.compiler.hotspot.HotSpotBackend.SHA5_IMPL_COMPRESS;
+import static org.graalvm.compiler.hotspot.HotSpotBackend.SHA5_IMPL_COMPRESS_MB;
import static org.graalvm.compiler.hotspot.HotSpotBackend.SHA_IMPL_COMPRESS;
+import static org.graalvm.compiler.hotspot.HotSpotBackend.SHA_IMPL_COMPRESS_MB;
import static org.graalvm.compiler.hotspot.HotSpotBackend.SQUARE_TO_LEN;
import static org.graalvm.compiler.hotspot.HotSpotBackend.UNWIND_EXCEPTION_TO_CALLER;
+import static org.graalvm.compiler.hotspot.HotSpotBackend.VECTORIZED_MISMATCHED;
import static org.graalvm.compiler.hotspot.HotSpotBackend.VM_ERROR;
import static org.graalvm.compiler.hotspot.HotSpotBackend.WRONG_METHOD_HANDLER;
import static org.graalvm.compiler.hotspot.HotSpotForeignCallLinkage.Reexecutability.NOT_REEXECUTABLE;
@@ -169,23 +175,23 @@
return uninitObjectArraycopyDescriptors[aligned ? 1 : 0][disjoint ? 1 : 0];
}
if (killAny) {
- assert kind == JavaKind.Object;
- return objectArraycopyDescriptorsKillAny[aligned ? 1 : 0][disjoint ? 1 : 0];
+ return arraycopyDescriptorsKillAny[aligned ? 1 : 0][disjoint ? 1 : 0].get(kind);
}
return arraycopyDescriptors[aligned ? 1 : 0][disjoint ? 1 : 0].get(kind);
}
- @SuppressWarnings({"unchecked"}) private static final EnumMap<JavaKind, ForeignCallDescriptor>[][] arraycopyDescriptors = (EnumMap<JavaKind, ForeignCallDescriptor>[][]) new EnumMap<?, ?>[2][2];
+ @SuppressWarnings("unchecked") private static final EnumMap<JavaKind, ForeignCallDescriptor>[][] arraycopyDescriptors = (EnumMap<JavaKind, ForeignCallDescriptor>[][]) new EnumMap<?, ?>[2][2];
+ @SuppressWarnings("unchecked") private static final EnumMap<JavaKind, ForeignCallDescriptor>[][] arraycopyDescriptorsKillAny = (EnumMap<JavaKind, ForeignCallDescriptor>[][]) new EnumMap<?, ?>[2][2];
private static final ForeignCallDescriptor[][] uninitObjectArraycopyDescriptors = new ForeignCallDescriptor[2][2];
private static final ForeignCallDescriptor[] checkcastArraycopyDescriptors = new ForeignCallDescriptor[2];
- private static ForeignCallDescriptor[][] objectArraycopyDescriptorsKillAny = new ForeignCallDescriptor[2][2];
static {
// Populate the EnumMap instances
for (int i = 0; i < arraycopyDescriptors.length; i++) {
for (int j = 0; j < arraycopyDescriptors[i].length; j++) {
arraycopyDescriptors[i][j] = new EnumMap<>(JavaKind.class);
+ arraycopyDescriptorsKillAny[i][j] = new EnumMap<>(JavaKind.class);
}
}
}
@@ -199,13 +205,15 @@
if (uninit) {
assert kind == JavaKind.Object;
uninitObjectArraycopyDescriptors[aligned ? 1 : 0][disjoint ? 1 : 0] = desc;
+ } else if (killAny) {
+ arraycopyDescriptorsKillAny[aligned ? 1 : 0][disjoint ? 1 : 0].put(kind, desc);
} else {
arraycopyDescriptors[aligned ? 1 : 0][disjoint ? 1 : 0].put(kind, desc);
}
}
private ForeignCallDescriptor buildDescriptor(JavaKind kind, boolean aligned, boolean disjoint, boolean uninit, boolean killAny, long routine) {
- assert !killAny || kind == JavaKind.Object;
+ assert !uninit || kind == JavaKind.Object;
String name = kind + (aligned ? "Aligned" : "") + (disjoint ? "Disjoint" : "") + (uninit ? "Uninit" : "") + "Arraycopy" + (killAny ? "KillAny" : "");
ForeignCallDescriptor desc = new ForeignCallDescriptor(name, void.class, Word.class, Word.class, Word.class);
LocationIdentity killed = killAny ? LocationIdentity.any() : NamedLocationIdentity.getArrayLocation(kind);
@@ -253,11 +261,12 @@
registerArraycopyDescriptor(descMap, kind, false, true, uninit, false, disjointRoutine);
registerArraycopyDescriptor(descMap, kind, true, true, uninit, false, alignedDisjointRoutine);
- if (kind == JavaKind.Object && !uninit) {
- objectArraycopyDescriptorsKillAny[0][0] = buildDescriptor(kind, false, false, uninit, true, routine);
- objectArraycopyDescriptorsKillAny[1][0] = buildDescriptor(kind, true, false, uninit, true, alignedRoutine);
- objectArraycopyDescriptorsKillAny[0][1] = buildDescriptor(kind, false, true, uninit, true, disjointRoutine);
- objectArraycopyDescriptorsKillAny[1][1] = buildDescriptor(kind, true, true, uninit, true, alignedDisjointRoutine);
+ if (!uninit) {
+ EconomicMap<Long, ForeignCallDescriptor> killAnyDescMap = EconomicMap.create();
+ registerArraycopyDescriptor(killAnyDescMap, kind, false, false, uninit, true, routine);
+ registerArraycopyDescriptor(killAnyDescMap, kind, true, false, uninit, true, alignedRoutine);
+ registerArraycopyDescriptor(killAnyDescMap, kind, false, true, uninit, true, disjointRoutine);
+ registerArraycopyDescriptor(killAnyDescMap, kind, true, true, uninit, true, alignedDisjointRoutine);
}
}
@@ -275,13 +284,9 @@
registerForeignCall(JAVA_TIME_MILLIS, c.javaTimeMillisAddress, NativeCall, DESTROYS_REGISTERS, LEAF_NOFP, REEXECUTABLE, NO_LOCATIONS);
registerForeignCall(JAVA_TIME_NANOS, c.javaTimeNanosAddress, NativeCall, DESTROYS_REGISTERS, LEAF_NOFP, REEXECUTABLE, NO_LOCATIONS);
- registerForeignCall(SIN.foreignCallDescriptor, c.arithmeticSinAddress, NativeCall, DESTROYS_REGISTERS, LEAF, REEXECUTABLE, NO_LOCATIONS);
- registerForeignCall(COS.foreignCallDescriptor, c.arithmeticCosAddress, NativeCall, DESTROYS_REGISTERS, LEAF, REEXECUTABLE, NO_LOCATIONS);
- registerForeignCall(TAN.foreignCallDescriptor, c.arithmeticTanAddress, NativeCall, DESTROYS_REGISTERS, LEAF, REEXECUTABLE, NO_LOCATIONS);
- registerForeignCall(EXP.foreignCallDescriptor, c.arithmeticExpAddress, NativeCall, DESTROYS_REGISTERS, LEAF, REEXECUTABLE, NO_LOCATIONS);
- registerForeignCall(LOG.foreignCallDescriptor, c.arithmeticLogAddress, NativeCall, DESTROYS_REGISTERS, LEAF, REEXECUTABLE, NO_LOCATIONS);
- registerForeignCall(LOG10.foreignCallDescriptor, c.arithmeticLog10Address, NativeCall, DESTROYS_REGISTERS, LEAF, REEXECUTABLE, NO_LOCATIONS);
- registerForeignCall(POW.foreignCallDescriptor, c.arithmeticPowAddress, NativeCall, DESTROYS_REGISTERS, LEAF, REEXECUTABLE, NO_LOCATIONS);
+
+ registerMathStubs(c, providers, options);
+
registerForeignCall(ARITHMETIC_FREM, c.fremAddress, NativeCall, DESTROYS_REGISTERS, LEAF, REEXECUTABLE, NO_LOCATIONS);
registerForeignCall(ARITHMETIC_DREM, c.dremAddress, NativeCall, DESTROYS_REGISTERS, LEAF, REEXECUTABLE, NO_LOCATIONS);
@@ -377,14 +382,21 @@
registerForeignCall(MULTIPLY_TO_LEN, c.multiplyToLen, NativeCall, DESTROYS_REGISTERS, LEAF_NOFP, REEXECUTABLE_ONLY_AFTER_EXCEPTION,
NamedLocationIdentity.getArrayLocation(JavaKind.Int));
}
+
if (c.useSHA1Intrinsics()) {
- registerForeignCall(SHA_IMPL_COMPRESS, c.sha1ImplCompress, NativeCall, DESTROYS_REGISTERS, LEAF_NOFP, REEXECUTABLE_ONLY_AFTER_EXCEPTION, NamedLocationIdentity.any());
+ registerForeignCall(SHA_IMPL_COMPRESS, c.sha1ImplCompress, NativeCall, DESTROYS_REGISTERS, LEAF, REEXECUTABLE_ONLY_AFTER_EXCEPTION, NamedLocationIdentity.any());
+ registerForeignCall(SHA_IMPL_COMPRESS_MB, c.sha1ImplCompressMultiBlock, NativeCall, DESTROYS_REGISTERS, LEAF, REEXECUTABLE_ONLY_AFTER_EXCEPTION, NamedLocationIdentity.any());
}
if (c.useSHA256Intrinsics()) {
- registerForeignCall(SHA2_IMPL_COMPRESS, c.sha256ImplCompress, NativeCall, DESTROYS_REGISTERS, LEAF_NOFP, REEXECUTABLE_ONLY_AFTER_EXCEPTION, NamedLocationIdentity.any());
+ registerForeignCall(SHA2_IMPL_COMPRESS, c.sha256ImplCompress, NativeCall, DESTROYS_REGISTERS, LEAF, REEXECUTABLE_ONLY_AFTER_EXCEPTION, NamedLocationIdentity.any());
+ registerForeignCall(SHA2_IMPL_COMPRESS_MB, c.sha256ImplCompressMultiBlock, NativeCall, DESTROYS_REGISTERS, LEAF, REEXECUTABLE_ONLY_AFTER_EXCEPTION, NamedLocationIdentity.any());
}
if (c.useSHA512Intrinsics()) {
- registerForeignCall(SHA5_IMPL_COMPRESS, c.sha512ImplCompress, NativeCall, DESTROYS_REGISTERS, LEAF_NOFP, REEXECUTABLE_ONLY_AFTER_EXCEPTION, NamedLocationIdentity.any());
+ registerForeignCall(SHA5_IMPL_COMPRESS, c.sha512ImplCompress, NativeCall, DESTROYS_REGISTERS, LEAF, REEXECUTABLE_ONLY_AFTER_EXCEPTION, NamedLocationIdentity.any());
+ registerForeignCall(SHA5_IMPL_COMPRESS_MB, c.sha512ImplCompressMultiBlock, NativeCall, DESTROYS_REGISTERS, LEAF, REEXECUTABLE_ONLY_AFTER_EXCEPTION, NamedLocationIdentity.any());
+ }
+ if (c.useGHASHIntrinsics()) {
+ registerForeignCall(GHASH_PROCESS_BLOCKS, c.ghashProcessBlocks, NativeCall, DESTROYS_REGISTERS, LEAF, REEXECUTABLE_ONLY_AFTER_EXCEPTION, NamedLocationIdentity.any());
}
if (c.useMulAddIntrinsic()) {
registerForeignCall(MUL_ADD, c.mulAdd, NativeCall, DESTROYS_REGISTERS, LEAF_NOFP, REEXECUTABLE_ONLY_AFTER_EXCEPTION, NamedLocationIdentity.getArrayLocation(JavaKind.Int));
@@ -409,11 +421,11 @@
*/
try {
// These stubs do callee saving
- registerForeignCall(ENCRYPT_BLOCK, c.aescryptEncryptBlockStub, NativeCall, PRESERVES_REGISTERS, LEAF_NOFP, REEXECUTABLE_ONLY_AFTER_EXCEPTION,
+ registerForeignCall(ENCRYPT_BLOCK, c.aescryptEncryptBlockStub, NativeCall, PRESERVES_REGISTERS, LEAF, REEXECUTABLE_ONLY_AFTER_EXCEPTION,
NamedLocationIdentity.getArrayLocation(JavaKind.Byte));
- registerForeignCall(DECRYPT_BLOCK, c.aescryptDecryptBlockStub, NativeCall, PRESERVES_REGISTERS, LEAF_NOFP, REEXECUTABLE_ONLY_AFTER_EXCEPTION,
+ registerForeignCall(DECRYPT_BLOCK, c.aescryptDecryptBlockStub, NativeCall, PRESERVES_REGISTERS, LEAF, REEXECUTABLE_ONLY_AFTER_EXCEPTION,
NamedLocationIdentity.getArrayLocation(JavaKind.Byte));
- registerForeignCall(DECRYPT_BLOCK_WITH_ORIGINAL_KEY, c.aescryptDecryptBlockStub, NativeCall, PRESERVES_REGISTERS, LEAF_NOFP, REEXECUTABLE_ONLY_AFTER_EXCEPTION,
+ registerForeignCall(DECRYPT_BLOCK_WITH_ORIGINAL_KEY, c.aescryptDecryptBlockStub, NativeCall, PRESERVES_REGISTERS, LEAF, REEXECUTABLE_ONLY_AFTER_EXCEPTION,
NamedLocationIdentity.getArrayLocation(JavaKind.Byte));
} catch (GraalError e) {
if (!(e.getCause() instanceof ClassNotFoundException)) {
@@ -422,11 +434,11 @@
}
try {
// These stubs do callee saving
- registerForeignCall(ENCRYPT, c.cipherBlockChainingEncryptAESCryptStub, NativeCall, PRESERVES_REGISTERS, LEAF_NOFP, REEXECUTABLE_ONLY_AFTER_EXCEPTION,
+ registerForeignCall(ENCRYPT, c.cipherBlockChainingEncryptAESCryptStub, NativeCall, PRESERVES_REGISTERS, LEAF, REEXECUTABLE_ONLY_AFTER_EXCEPTION,
NamedLocationIdentity.getArrayLocation(JavaKind.Byte));
- registerForeignCall(DECRYPT, c.cipherBlockChainingDecryptAESCryptStub, NativeCall, PRESERVES_REGISTERS, LEAF_NOFP, REEXECUTABLE_ONLY_AFTER_EXCEPTION,
+ registerForeignCall(DECRYPT, c.cipherBlockChainingDecryptAESCryptStub, NativeCall, PRESERVES_REGISTERS, LEAF, REEXECUTABLE_ONLY_AFTER_EXCEPTION,
NamedLocationIdentity.getArrayLocation(JavaKind.Byte));
- registerForeignCall(DECRYPT_WITH_ORIGINAL_KEY, c.cipherBlockChainingDecryptAESCryptStub, NativeCall, PRESERVES_REGISTERS, LEAF_NOFP, REEXECUTABLE_ONLY_AFTER_EXCEPTION,
+ registerForeignCall(DECRYPT_WITH_ORIGINAL_KEY, c.cipherBlockChainingDecryptAESCryptStub, NativeCall, PRESERVES_REGISTERS, LEAF, REEXECUTABLE_ONLY_AFTER_EXCEPTION,
NamedLocationIdentity.getArrayLocation(JavaKind.Byte));
} catch (GraalError e) {
if (!(e.getCause() instanceof ClassNotFoundException)) {
@@ -434,10 +446,34 @@
}
}
}
+
+ if (c.useAESCTRIntrinsics) {
+ assert (c.counterModeAESCrypt != 0L);
+ registerForeignCall(COUNTERMODE_IMPL_CRYPT, c.counterModeAESCrypt, NativeCall, PRESERVES_REGISTERS, LEAF, REEXECUTABLE_ONLY_AFTER_EXCEPTION,
+ NamedLocationIdentity.any());
+ }
+
+ if (c.useVectorizedMismatchIntrinsic) {
+ assert (c.vectorizedMismatch != 0L);
+ registerForeignCall(VECTORIZED_MISMATCHED, c.vectorizedMismatch, NativeCall, PRESERVES_REGISTERS, LEAF, REEXECUTABLE_ONLY_AFTER_EXCEPTION,
+ NamedLocationIdentity.any());
+
+ }
}
public HotSpotForeignCallLinkage getForeignCall(ForeignCallDescriptor descriptor) {
assert foreignCalls != null : descriptor;
return foreignCalls.get(descriptor);
}
+
+ @SuppressWarnings("unused")
+ protected void registerMathStubs(GraalHotSpotVMConfig hotSpotVMConfig, HotSpotProviders providers, OptionValues options) {
+ registerForeignCall(SIN.foreignCallDescriptor, hotSpotVMConfig.arithmeticSinAddress, NativeCall, DESTROYS_REGISTERS, LEAF, REEXECUTABLE, NO_LOCATIONS);
+ registerForeignCall(COS.foreignCallDescriptor, hotSpotVMConfig.arithmeticCosAddress, NativeCall, DESTROYS_REGISTERS, LEAF, REEXECUTABLE, NO_LOCATIONS);
+ registerForeignCall(TAN.foreignCallDescriptor, hotSpotVMConfig.arithmeticTanAddress, NativeCall, DESTROYS_REGISTERS, LEAF, REEXECUTABLE, NO_LOCATIONS);
+ registerForeignCall(EXP.foreignCallDescriptor, hotSpotVMConfig.arithmeticExpAddress, NativeCall, DESTROYS_REGISTERS, LEAF, REEXECUTABLE, NO_LOCATIONS);
+ registerForeignCall(LOG.foreignCallDescriptor, hotSpotVMConfig.arithmeticLogAddress, NativeCall, DESTROYS_REGISTERS, LEAF, REEXECUTABLE, NO_LOCATIONS);
+ registerForeignCall(LOG10.foreignCallDescriptor, hotSpotVMConfig.arithmeticLog10Address, NativeCall, DESTROYS_REGISTERS, LEAF, REEXECUTABLE, NO_LOCATIONS);
+ registerForeignCall(POW.foreignCallDescriptor, hotSpotVMConfig.arithmeticPowAddress, NativeCall, DESTROYS_REGISTERS, LEAF, REEXECUTABLE, NO_LOCATIONS);
+ }
}
--- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/meta/HotSpotNodePlugin.java Tue Mar 12 09:49:10 2019 +0000
+++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/meta/HotSpotNodePlugin.java Sat Mar 16 21:00:45 2019 +0000
@@ -28,6 +28,8 @@
import static jdk.vm.ci.meta.DeoptimizationReason.TransferToInterpreter;
import static org.graalvm.compiler.core.common.GraalOptions.ImmutableCode;
+import java.lang.reflect.Field;
+
import org.graalvm.compiler.core.common.CompilationIdentifier;
import org.graalvm.compiler.core.common.type.StampFactory;
import org.graalvm.compiler.core.common.type.StampPair;
@@ -66,8 +68,6 @@
import jdk.vm.ci.meta.ResolvedJavaField;
import jdk.vm.ci.meta.ResolvedJavaMethod;
import jdk.vm.ci.meta.ResolvedJavaType;
-
-import java.lang.reflect.Field;
import sun.misc.Unsafe;
/**
@@ -243,10 +243,9 @@
}
private static final LocationIdentity JAVA_THREAD_SHOULD_POST_ON_EXCEPTIONS_FLAG_LOCATION = NamedLocationIdentity.mutable("JavaThread::_should_post_on_exceptions_flag");
+ static final Unsafe UNSAFE = initUnsafe();
- private static final Unsafe UNSAFE = initUnsafe();
-
- private static Unsafe initUnsafe() {
+ static Unsafe initUnsafe() {
try {
// Fast path when we are trusted.
return Unsafe.getUnsafe();
--- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/meta/HotSpotUnsafeSubstitutions.java Tue Mar 12 09:49:10 2019 +0000
+++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/meta/HotSpotUnsafeSubstitutions.java Sat Mar 16 21:00:45 2019 +0000
@@ -24,7 +24,7 @@
package org.graalvm.compiler.hotspot.meta;
-import static org.graalvm.compiler.serviceprovider.GraalServices.Java8OrEarlier;
+import static org.graalvm.compiler.serviceprovider.JavaVersionUtil.Java8OrEarlier;
import org.graalvm.compiler.api.replacements.ClassSubstitution;
import org.graalvm.compiler.api.replacements.MethodSubstitution;
--- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/meta/HotSpotWordOperationPlugin.java Tue Mar 12 09:49:10 2019 +0000
+++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/meta/HotSpotWordOperationPlugin.java Sat Mar 16 21:00:45 2019 +0000
@@ -121,7 +121,7 @@
ValueNode pointer = args[0];
assert pointer.stamp(NodeView.DEFAULT) instanceof MetaspacePointerStamp;
- LogicNode isNull = b.addWithInputs(IsNullNode.create(pointer));
+ LogicNode isNull = b.add(IsNullNode.create(pointer));
b.addPush(returnKind, ConditionalNode.create(isNull, b.add(forBoolean(true)), b.add(forBoolean(false)), NodeView.DEFAULT));
break;
--- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/nodes/AllocaNode.java Tue Mar 12 09:49:10 2019 +0000
+++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/nodes/AllocaNode.java Sat Mar 16 21:00:45 2019 +0000
@@ -74,7 +74,7 @@
@Override
public void generate(NodeLIRBuilderTool gen) {
- VirtualStackSlot array = gen.getLIRGeneratorTool().getResult().getFrameMapBuilder().allocateStackSlots(slots, objects, null);
+ VirtualStackSlot array = gen.getLIRGeneratorTool().allocateStackSlots(slots, objects, null);
Value result = gen.getLIRGeneratorTool().emitAddress(array);
gen.setResult(this, result);
}
--- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/nodes/ArrayRangeWriteBarrier.java Tue Mar 12 09:49:10 2019 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,61 +0,0 @@
-/*
- * Copyright (c) 2013, 2018, Oracle and/or its affiliates. All rights reserved.
- * 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.
- */
-
-
-package org.graalvm.compiler.hotspot.nodes;
-
-import org.graalvm.compiler.graph.NodeClass;
-import org.graalvm.compiler.nodeinfo.InputType;
-import org.graalvm.compiler.nodeinfo.NodeInfo;
-import org.graalvm.compiler.nodes.ValueNode;
-import org.graalvm.compiler.nodes.memory.address.AddressNode;
-import org.graalvm.compiler.nodes.spi.Lowerable;
-
-@NodeInfo
-public abstract class ArrayRangeWriteBarrier extends WriteBarrier implements Lowerable {
-
- public static final NodeClass<ArrayRangeWriteBarrier> TYPE = NodeClass.create(ArrayRangeWriteBarrier.class);
- @Input(InputType.Association) AddressNode address;
- @Input ValueNode length;
-
- private final int elementStride;
-
- protected ArrayRangeWriteBarrier(NodeClass<? extends ArrayRangeWriteBarrier> c, AddressNode address, ValueNode length, int elementStride) {
- super(c);
- this.address = address;
- this.length = length;
- this.elementStride = elementStride;
- }
-
- public AddressNode getAddress() {
- return address;
- }
-
- public ValueNode getLength() {
- return length;
- }
-
- public int getElementStride() {
- return elementStride;
- }
-}
--- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/nodes/DimensionsNode.java Tue Mar 12 09:49:10 2019 +0000
+++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/nodes/DimensionsNode.java Sat Mar 16 21:00:45 2019 +0000
@@ -64,7 +64,7 @@
int size = rank * 4;
int wordSize = lirGen.target().wordSize;
int slots = roundUp(size, wordSize) / wordSize;
- VirtualStackSlot array = lirGen.getResult().getFrameMapBuilder().allocateStackSlots(slots, new BitSet(0), null);
+ VirtualStackSlot array = lirGen.allocateStackSlots(slots, new BitSet(0), null);
Value result = lirGen.emitAddress(array);
gen.setResult(this, result);
}
--- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/nodes/G1ArrayRangePostWriteBarrier.java Tue Mar 12 09:49:10 2019 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,43 +0,0 @@
-/*
- * Copyright (c) 2013, 2018, Oracle and/or its affiliates. All rights reserved.
- * 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.
- */
-
-
-package org.graalvm.compiler.hotspot.nodes;
-
-import static org.graalvm.compiler.nodeinfo.NodeCycles.CYCLES_64;
-import static org.graalvm.compiler.nodeinfo.NodeSize.SIZE_64;
-
-import org.graalvm.compiler.graph.NodeClass;
-import org.graalvm.compiler.nodeinfo.NodeInfo;
-import org.graalvm.compiler.nodes.ValueNode;
-import org.graalvm.compiler.nodes.memory.address.AddressNode;
-
-@NodeInfo(cycles = CYCLES_64, size = SIZE_64)
-public class G1ArrayRangePostWriteBarrier extends ArrayRangeWriteBarrier {
- public static final NodeClass<G1ArrayRangePostWriteBarrier> TYPE = NodeClass.create(G1ArrayRangePostWriteBarrier.class);
-
- public G1ArrayRangePostWriteBarrier(AddressNode address, ValueNode length, int elementStride) {
- super(TYPE, address, length, elementStride);
- }
-
-}
--- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/nodes/G1ArrayRangePreWriteBarrier.java Tue Mar 12 09:49:10 2019 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,43 +0,0 @@
-/*
- * Copyright (c) 2013, 2018, Oracle and/or its affiliates. All rights reserved.
- * 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.
- */
-
-
-package org.graalvm.compiler.hotspot.nodes;
-
-import static org.graalvm.compiler.nodeinfo.NodeCycles.CYCLES_64;
-import static org.graalvm.compiler.nodeinfo.NodeSize.SIZE_64;
-
-import org.graalvm.compiler.graph.NodeClass;
-import org.graalvm.compiler.nodeinfo.NodeInfo;
-import org.graalvm.compiler.nodes.ValueNode;
-import org.graalvm.compiler.nodes.memory.address.AddressNode;
-
-@NodeInfo(cycles = CYCLES_64, size = SIZE_64)
-public final class G1ArrayRangePreWriteBarrier extends ArrayRangeWriteBarrier {
- public static final NodeClass<G1ArrayRangePreWriteBarrier> TYPE = NodeClass.create(G1ArrayRangePreWriteBarrier.class);
-
- public G1ArrayRangePreWriteBarrier(AddressNode address, ValueNode length, int elementStride) {
- super(TYPE, address, length, elementStride);
- }
-
-}
--- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/nodes/G1PostWriteBarrier.java Tue Mar 12 09:49:10 2019 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,53 +0,0 @@
-/*
- * Copyright (c) 2013, 2018, Oracle and/or its affiliates. All rights reserved.
- * 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.
- */
-
-
-package org.graalvm.compiler.hotspot.nodes;
-
-import static org.graalvm.compiler.nodeinfo.NodeCycles.CYCLES_64;
-import static org.graalvm.compiler.nodeinfo.NodeSize.SIZE_64;
-
-import org.graalvm.compiler.graph.NodeClass;
-import org.graalvm.compiler.nodeinfo.NodeInfo;
-import org.graalvm.compiler.nodes.ValueNode;
-import org.graalvm.compiler.nodes.memory.address.AddressNode;
-
-@NodeInfo(cycles = CYCLES_64, size = SIZE_64)
-public class G1PostWriteBarrier extends ObjectWriteBarrier {
-
- public static final NodeClass<G1PostWriteBarrier> TYPE = NodeClass.create(G1PostWriteBarrier.class);
- protected final boolean alwaysNull;
-
- public G1PostWriteBarrier(AddressNode address, ValueNode value, boolean precise, boolean alwaysNull) {
- this(TYPE, address, value, precise, alwaysNull);
- }
-
- protected G1PostWriteBarrier(NodeClass<? extends G1PostWriteBarrier> c, AddressNode address, ValueNode value, boolean precise, boolean alwaysNull) {
- super(c, address, value, precise);
- this.alwaysNull = alwaysNull;
- }
-
- public boolean alwaysNull() {
- return alwaysNull;
- }
-}
--- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/nodes/G1PreWriteBarrier.java Tue Mar 12 09:49:10 2019 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,80 +0,0 @@
-/*
- * Copyright (c) 2013, 2018, Oracle and/or its affiliates. All rights reserved.
- * 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.
- */
-
-
-package org.graalvm.compiler.hotspot.nodes;
-
-import static org.graalvm.compiler.nodeinfo.NodeCycles.CYCLES_64;
-import static org.graalvm.compiler.nodeinfo.NodeSize.SIZE_64;
-
-import org.graalvm.compiler.graph.NodeClass;
-import org.graalvm.compiler.nodeinfo.InputType;
-import org.graalvm.compiler.nodeinfo.NodeInfo;
-import org.graalvm.compiler.nodes.DeoptimizingNode;
-import org.graalvm.compiler.nodes.FrameState;
-import org.graalvm.compiler.nodes.ValueNode;
-import org.graalvm.compiler.nodes.memory.address.AddressNode;
-
-@NodeInfo(cycles = CYCLES_64, size = SIZE_64)
-public final class G1PreWriteBarrier extends ObjectWriteBarrier implements DeoptimizingNode.DeoptBefore {
-
- public static final NodeClass<G1PreWriteBarrier> TYPE = NodeClass.create(G1PreWriteBarrier.class);
-
- @OptionalInput(InputType.State) FrameState stateBefore;
- protected final boolean nullCheck;
- protected final boolean doLoad;
-
- public G1PreWriteBarrier(AddressNode address, ValueNode expectedObject, boolean doLoad, boolean nullCheck) {
- super(TYPE, address, expectedObject, true);
- this.doLoad = doLoad;
- this.nullCheck = nullCheck;
- }
-
- public ValueNode getExpectedObject() {
- return getValue();
- }
-
- public boolean doLoad() {
- return doLoad;
- }
-
- public boolean getNullCheck() {
- return nullCheck;
- }
-
- @Override
- public boolean canDeoptimize() {
- return nullCheck;
- }
-
- @Override
- public FrameState stateBefore() {
- return stateBefore;
- }
-
- @Override
- public void setStateBefore(FrameState state) {
- updateUsages(stateBefore, state);
- stateBefore = state;
- }
-}
--- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/nodes/G1ReferentFieldReadBarrier.java Tue Mar 12 09:49:10 2019 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,59 +0,0 @@
-/*
- * Copyright (c) 2013, 2018, Oracle and/or its affiliates. All rights reserved.
- * 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.
- */
-
-
-package org.graalvm.compiler.hotspot.nodes;
-
-import static org.graalvm.compiler.nodeinfo.NodeCycles.CYCLES_64;
-import static org.graalvm.compiler.nodeinfo.NodeSize.SIZE_64;
-
-import org.graalvm.compiler.graph.NodeClass;
-import org.graalvm.compiler.nodeinfo.NodeInfo;
-import org.graalvm.compiler.nodes.ValueNode;
-import org.graalvm.compiler.nodes.memory.address.AddressNode;
-
-/**
- * The {@code G1ReferentFieldReadBarrier} is added when a read access is performed to the referent
- * field of a {@link java.lang.ref.Reference} object (through a {@code LoadFieldNode} or an
- * {@code UnsafeLoadNode}). The return value of the read is passed to the snippet implementing the
- * read barrier and consequently is added to the SATB queue if the concurrent marker is enabled.
- */
-@NodeInfo(cycles = CYCLES_64, size = SIZE_64)
-public final class G1ReferentFieldReadBarrier extends ObjectWriteBarrier {
- public static final NodeClass<G1ReferentFieldReadBarrier> TYPE = NodeClass.create(G1ReferentFieldReadBarrier.class);
-
- protected final boolean doLoad;
-
- public G1ReferentFieldReadBarrier(AddressNode address, ValueNode expectedObject, boolean doLoad) {
- super(TYPE, address, expectedObject, true);
- this.doLoad = doLoad;
- }
-
- public ValueNode getExpectedObject() {
- return getValue();
- }
-
- public boolean doLoad() {
- return doLoad;
- }
-}
--- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/nodes/ObjectWriteBarrier.java Tue Mar 12 09:49:10 2019 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,59 +0,0 @@
-/*
- * Copyright (c) 2013, 2018, Oracle and/or its affiliates. All rights reserved.
- * 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.
- */
-
-
-package org.graalvm.compiler.hotspot.nodes;
-
-import org.graalvm.compiler.graph.NodeClass;
-import org.graalvm.compiler.nodeinfo.InputType;
-import org.graalvm.compiler.nodeinfo.NodeInfo;
-import org.graalvm.compiler.nodes.ValueNode;
-import org.graalvm.compiler.nodes.memory.address.AddressNode;
-
-@NodeInfo
-public abstract class ObjectWriteBarrier extends WriteBarrier {
-
- public static final NodeClass<ObjectWriteBarrier> TYPE = NodeClass.create(ObjectWriteBarrier.class);
- @Input(InputType.Association) protected AddressNode address;
- @OptionalInput protected ValueNode value;
- protected final boolean precise;
-
- protected ObjectWriteBarrier(NodeClass<? extends ObjectWriteBarrier> c, AddressNode address, ValueNode value, boolean precise) {
- super(c);
- this.address = address;
- this.value = value;
- this.precise = precise;
- }
-
- public ValueNode getValue() {
- return value;
- }
-
- public AddressNode getAddress() {
- return address;
- }
-
- public boolean usePrecise() {
- return precise;
- }
-}
--- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/nodes/SerialArrayRangeWriteBarrier.java Tue Mar 12 09:49:10 2019 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,43 +0,0 @@
-/*
- * Copyright (c) 2013, 2018, Oracle and/or its affiliates. All rights reserved.
- * 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.
- */
-
-
-package org.graalvm.compiler.hotspot.nodes;
-
-import static org.graalvm.compiler.nodeinfo.NodeCycles.CYCLES_8;
-import static org.graalvm.compiler.nodeinfo.NodeSize.SIZE_8;
-
-import org.graalvm.compiler.graph.NodeClass;
-import org.graalvm.compiler.nodeinfo.NodeInfo;
-import org.graalvm.compiler.nodes.ValueNode;
-import org.graalvm.compiler.nodes.memory.address.AddressNode;
-
-@NodeInfo(cycles = CYCLES_8, size = SIZE_8)
-public final class SerialArrayRangeWriteBarrier extends ArrayRangeWriteBarrier {
- public static final NodeClass<SerialArrayRangeWriteBarrier> TYPE = NodeClass.create(SerialArrayRangeWriteBarrier.class);
-
- public SerialArrayRangeWriteBarrier(AddressNode address, ValueNode length, int elementStride) {
- super(TYPE, address, length, elementStride);
- }
-
-}
--- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/nodes/SerialWriteBarrier.java Tue Mar 12 09:49:10 2019 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,46 +0,0 @@
-/*
- * Copyright (c) 2013, 2018, Oracle and/or its affiliates. All rights reserved.
- * 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.
- */
-
-
-package org.graalvm.compiler.hotspot.nodes;
-
-import static org.graalvm.compiler.nodeinfo.NodeCycles.CYCLES_8;
-import static org.graalvm.compiler.nodeinfo.NodeSize.SIZE_4;
-
-import org.graalvm.compiler.graph.NodeClass;
-import org.graalvm.compiler.nodeinfo.NodeInfo;
-import org.graalvm.compiler.nodes.memory.address.AddressNode;
-
-@NodeInfo(cycles = CYCLES_8, size = SIZE_4)
-public class SerialWriteBarrier extends ObjectWriteBarrier {
-
- public static final NodeClass<SerialWriteBarrier> TYPE = NodeClass.create(SerialWriteBarrier.class);
-
- public SerialWriteBarrier(AddressNode address, boolean precise) {
- this(TYPE, address, precise);
- }
-
- protected SerialWriteBarrier(NodeClass<? extends SerialWriteBarrier> c, AddressNode address, boolean precise) {
- super(c, address, null, precise);
- }
-}
--- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/nodes/type/KlassPointerStamp.java Tue Mar 12 09:49:10 2019 +0000
+++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/nodes/type/KlassPointerStamp.java Sat Mar 16 21:00:45 2019 +0000
@@ -72,6 +72,13 @@
}
@Override
+ public void accept(Visitor v) {
+ super.accept(v);
+ v.visitLong(encoding.getBase());
+ v.visitInt(encoding.getShift());
+ }
+
+ @Override
protected AbstractPointerStamp copyWith(boolean newNonNull, boolean newAlwaysNull) {
return new KlassPointerStamp(newNonNull, newAlwaysNull, encoding);
}
--- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/phases/OnStackReplacementPhase.java Tue Mar 12 09:49:10 2019 +0000
+++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/phases/OnStackReplacementPhase.java Sat Mar 16 21:00:45 2019 +0000
@@ -36,6 +36,7 @@
import org.graalvm.compiler.debug.GraalError;
import org.graalvm.compiler.graph.Node;
import org.graalvm.compiler.graph.iterators.NodeIterable;
+import org.graalvm.compiler.loop.LoopEx;
import org.graalvm.compiler.loop.LoopsData;
import org.graalvm.compiler.loop.phases.LoopTransformations;
import org.graalvm.compiler.nodeinfo.InputType;
@@ -71,6 +72,7 @@
import org.graalvm.compiler.options.OptionValues;
import org.graalvm.compiler.phases.Phase;
import org.graalvm.compiler.phases.common.DeadCodeEliminationPhase;
+import org.graalvm.compiler.serviceprovider.SpeculationReasonGroup;
import jdk.vm.ci.meta.DeoptimizationAction;
import jdk.vm.ci.meta.DeoptimizationReason;
@@ -87,7 +89,7 @@
"if there is no mature profile available for the rest of the method.", type = OptionType.Debug)
public static final OptionKey<Boolean> DeoptAfterOSR = new OptionKey<>(true);
@Option(help = "Support OSR compilations with locks. If DeoptAfterOSR is true we can per definition not have " +
- "unbalaced enter/extis mappings. If DeoptAfterOSR is false insert artificial monitor enters after " +
+ "unbalanced enter/exits mappings. If DeoptAfterOSR is false insert artificial monitor enters after " +
"the OSRStart to have balanced enter/exits in the graph.", type = OptionType.Debug)
public static final OptionKey<Boolean> SupportOSRWithLocks = new OptionKey<>(true);
// @formatter:on
@@ -99,6 +101,8 @@
return Options.SupportOSRWithLocks.getValue(options);
}
+ private static final SpeculationReasonGroup OSR_LOCAL_SPECULATIONS = new SpeculationReasonGroup("OSRLocal", int.class, Stamp.class, int.class);
+
@Override
@SuppressWarnings("try")
protected void run(StructuredGraph graph) {
@@ -152,7 +156,9 @@
l = l.getParent();
}
- LoopTransformations.peel(loops.loop(l));
+ LoopEx loop = loops.loop(l);
+ loop.loopBegin().markOsrLoop();
+ LoopTransformations.peel(loop);
osr.replaceAtUsages(InputType.Guard, AbstractBeginNode.prevBegin((FixedNode) osr.predecessor()));
for (Node usage : osr.usages().snapshot()) {
EntryProxyNode proxy = (EntryProxyNode) usage;
@@ -179,7 +185,7 @@
final int locksSize = osrState.locksSize();
for (int i = 0; i < localsSize + locksSize; i++) {
- ValueNode value = null;
+ ValueNode value;
if (i >= localsSize) {
value = osrState.lockAt(i - localsSize);
} else {
@@ -201,7 +207,7 @@
osrLocal = graph.addOrUnique(new OSRLocalNode(i, unrestrictedStamp));
}
// Speculate on the OSRLocal stamps that could be more precise.
- OSRLocalSpeculationReason reason = new OSRLocalSpeculationReason(osrState.bci, narrowedStamp, i);
+ SpeculationReason reason = OSR_LOCAL_SPECULATIONS.createSpeculationReason(osrState.bci, narrowedStamp, i);
if (graph.getSpeculationLog().maySpeculate(reason) && osrLocal instanceof OSRLocalNode && value.getStackKind().equals(JavaKind.Object) && !narrowedStamp.isUnrestricted()) {
// Add guard.
LogicNode check = graph.addOrUniqueWithInputs(InstanceOfNode.createHelper((ObjectStamp) narrowedStamp, osrLocal, null, null));
@@ -305,30 +311,4 @@
public float codeSizeIncrease() {
return 5.0f;
}
-
- private static class OSRLocalSpeculationReason implements SpeculationReason {
- private int bci;
- private Stamp speculatedStamp;
- private int localIndex;
-
- OSRLocalSpeculationReason(int bci, Stamp speculatedStamp, int localIndex) {
- this.bci = bci;
- this.speculatedStamp = speculatedStamp;
- this.localIndex = localIndex;
- }
-
- @Override
- public boolean equals(Object obj) {
- if (obj instanceof OSRLocalSpeculationReason) {
- OSRLocalSpeculationReason that = (OSRLocalSpeculationReason) obj;
- return this.bci == that.bci && this.speculatedStamp.equals(that.speculatedStamp) && this.localIndex == that.localIndex;
- }
- return false;
- }
-
- @Override
- public int hashCode() {
- return (bci << 16) ^ speculatedStamp.hashCode() ^ localIndex;
- }
- }
}
--- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/phases/WriteBarrierAdditionPhase.java Tue Mar 12 09:49:10 2019 +0000
+++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/phases/WriteBarrierAdditionPhase.java Sat Mar 16 21:00:45 2019 +0000
@@ -25,35 +25,25 @@
package org.graalvm.compiler.hotspot.phases;
import org.graalvm.compiler.debug.DebugCloseable;
-import org.graalvm.compiler.debug.GraalError;
import org.graalvm.compiler.graph.Node;
import org.graalvm.compiler.hotspot.GraalHotSpotVMConfig;
-import org.graalvm.compiler.hotspot.nodes.G1ArrayRangePostWriteBarrier;
-import org.graalvm.compiler.hotspot.nodes.G1ArrayRangePreWriteBarrier;
-import org.graalvm.compiler.hotspot.nodes.G1PostWriteBarrier;
-import org.graalvm.compiler.hotspot.nodes.G1PreWriteBarrier;
-import org.graalvm.compiler.hotspot.nodes.G1ReferentFieldReadBarrier;
-import org.graalvm.compiler.hotspot.nodes.SerialArrayRangeWriteBarrier;
-import org.graalvm.compiler.hotspot.nodes.SerialWriteBarrier;
+import org.graalvm.compiler.hotspot.gc.g1.G1BarrierSet;
+import org.graalvm.compiler.hotspot.gc.shared.BarrierSet;
+import org.graalvm.compiler.hotspot.gc.shared.CardTableBarrierSet;
import org.graalvm.compiler.nodes.StructuredGraph;
-import org.graalvm.compiler.nodes.ValueNode;
import org.graalvm.compiler.nodes.extended.ArrayRangeWrite;
import org.graalvm.compiler.nodes.java.AbstractCompareAndSwapNode;
import org.graalvm.compiler.nodes.java.LoweredAtomicReadAndWriteNode;
-import org.graalvm.compiler.nodes.memory.FixedAccessNode;
-import org.graalvm.compiler.nodes.memory.HeapAccess.BarrierType;
import org.graalvm.compiler.nodes.memory.ReadNode;
import org.graalvm.compiler.nodes.memory.WriteNode;
-import org.graalvm.compiler.nodes.memory.address.AddressNode;
-import org.graalvm.compiler.nodes.type.StampTool;
import org.graalvm.compiler.phases.Phase;
public class WriteBarrierAdditionPhase extends Phase {
- private GraalHotSpotVMConfig config;
+ private BarrierSet barrierSet;
public WriteBarrierAdditionPhase(GraalHotSpotVMConfig config) {
- this.config = config;
+ this.barrierSet = createBarrierSet(config);
}
@SuppressWarnings("try")
@@ -62,141 +52,42 @@
for (Node n : graph.getNodes()) {
try (DebugCloseable scope = n.graph().withNodeSourcePosition(n)) {
if (n instanceof ReadNode) {
- addReadNodeBarriers((ReadNode) n, graph);
+ barrierSet.addReadNodeBarriers((ReadNode) n, graph);
} else if (n instanceof WriteNode) {
- addWriteNodeBarriers((WriteNode) n, graph);
+ barrierSet.addWriteNodeBarriers((WriteNode) n, graph);
} else if (n instanceof LoweredAtomicReadAndWriteNode) {
LoweredAtomicReadAndWriteNode loweredAtomicReadAndWriteNode = (LoweredAtomicReadAndWriteNode) n;
- addAtomicReadWriteNodeBarriers(loweredAtomicReadAndWriteNode, graph);
+ barrierSet.addAtomicReadWriteNodeBarriers(loweredAtomicReadAndWriteNode, graph);
} else if (n instanceof AbstractCompareAndSwapNode) {
- addCASBarriers((AbstractCompareAndSwapNode) n, graph);
+ barrierSet.addCASBarriers((AbstractCompareAndSwapNode) n, graph);
} else if (n instanceof ArrayRangeWrite) {
ArrayRangeWrite node = (ArrayRangeWrite) n;
if (node.writesObjectArray()) {
- addArrayRangeBarriers(node, graph);
+ barrierSet.addArrayRangeBarriers(node, graph);
}
}
}
}
}
- private void addReadNodeBarriers(ReadNode node, StructuredGraph graph) {
- if (node.getBarrierType() == BarrierType.PRECISE) {
- assert config.useG1GC;
- G1ReferentFieldReadBarrier barrier = graph.add(new G1ReferentFieldReadBarrier(node.getAddress(), node, false));
- graph.addAfterFixed(node, barrier);
- } else {
- assert node.getBarrierType() == BarrierType.NONE : "Non precise read barrier has been attached to read node.";
- }
- }
-
- protected static void addG1PreWriteBarrier(FixedAccessNode node, AddressNode address, ValueNode value, boolean doLoad, boolean nullCheck, StructuredGraph graph) {
- G1PreWriteBarrier preBarrier = graph.add(new G1PreWriteBarrier(address, value, doLoad, nullCheck));
- preBarrier.setStateBefore(node.stateBefore());
- node.setNullCheck(false);
- node.setStateBefore(null);
- graph.addBeforeFixed(node, preBarrier);
- }
-
- protected void addG1PostWriteBarrier(FixedAccessNode node, AddressNode address, ValueNode value, boolean precise, StructuredGraph graph) {
- final boolean alwaysNull = StampTool.isPointerAlwaysNull(value);
- graph.addAfterFixed(node, graph.add(new G1PostWriteBarrier(address, value, precise, alwaysNull)));
- }
-
- protected void addSerialPostWriteBarrier(FixedAccessNode node, AddressNode address, ValueNode value, boolean precise, StructuredGraph graph) {
- final boolean alwaysNull = StampTool.isPointerAlwaysNull(value);
- if (alwaysNull) {
- // Serial barrier isn't needed for null value
- return;
- }
- graph.addAfterFixed(node, graph.add(new SerialWriteBarrier(address, precise)));
- }
-
- private void addWriteNodeBarriers(WriteNode node, StructuredGraph graph) {
- BarrierType barrierType = node.getBarrierType();
- switch (barrierType) {
- case NONE:
- // nothing to do
- break;
- case IMPRECISE:
- case PRECISE:
- boolean precise = barrierType == BarrierType.PRECISE;
- if (config.useG1GC) {
- if (!node.getLocationIdentity().isInit()) {
- // The pre barrier does nothing if the value being read is null, so it can
- // be explicitly skipped when this is an initializing store.
- addG1PreWriteBarrier(node, node.getAddress(), null, true, node.getNullCheck(), graph);
- }
- addG1PostWriteBarrier(node, node.getAddress(), node.value(), precise, graph);
- } else {
- addSerialPostWriteBarrier(node, node.getAddress(), node.value(), precise, graph);
- }
- break;
- default:
- throw new GraalError("unexpected barrier type: " + barrierType);
- }
- }
-
- private void addAtomicReadWriteNodeBarriers(LoweredAtomicReadAndWriteNode node, StructuredGraph graph) {
- BarrierType barrierType = node.getBarrierType();
- switch (barrierType) {
- case NONE:
- // nothing to do
- break;
- case IMPRECISE:
- case PRECISE:
- boolean precise = barrierType == BarrierType.PRECISE;
- if (config.useG1GC) {
- addG1PreWriteBarrier(node, node.getAddress(), null, true, node.getNullCheck(), graph);
- addG1PostWriteBarrier(node, node.getAddress(), node.getNewValue(), precise, graph);
- } else {
- addSerialPostWriteBarrier(node, node.getAddress(), node.getNewValue(), precise, graph);
- }
- break;
- default:
- throw new GraalError("unexpected barrier type: " + barrierType);
- }
- }
-
- private void addCASBarriers(AbstractCompareAndSwapNode node, StructuredGraph graph) {
- BarrierType barrierType = node.getBarrierType();
- switch (barrierType) {
- case NONE:
- // nothing to do
- break;
- case IMPRECISE:
- case PRECISE:
- boolean precise = barrierType == BarrierType.PRECISE;
- if (config.useG1GC) {
- addG1PreWriteBarrier(node, node.getAddress(), node.getExpectedValue(), false, false, graph);
- addG1PostWriteBarrier(node, node.getAddress(), node.getNewValue(), precise, graph);
- } else {
- addSerialPostWriteBarrier(node, node.getAddress(), node.getNewValue(), precise, graph);
- }
- break;
- default:
- throw new GraalError("unexpected barrier type: " + barrierType);
- }
- }
-
- private void addArrayRangeBarriers(ArrayRangeWrite write, StructuredGraph graph) {
- if (config.useG1GC) {
- if (!write.isInitialization()) {
- // The pre barrier does nothing if the value being read is null, so it can
- // be explicitly skipped when this is an initializing store.
- G1ArrayRangePreWriteBarrier g1ArrayRangePreWriteBarrier = graph.add(new G1ArrayRangePreWriteBarrier(write.getAddress(), write.getLength(), write.getElementStride()));
- graph.addBeforeFixed(write.asNode(), g1ArrayRangePreWriteBarrier);
- }
- G1ArrayRangePostWriteBarrier g1ArrayRangePostWriteBarrier = graph.add(new G1ArrayRangePostWriteBarrier(write.getAddress(), write.getLength(), write.getElementStride()));
- graph.addAfterFixed(write.asNode(), g1ArrayRangePostWriteBarrier);
- } else {
- SerialArrayRangeWriteBarrier serialArrayRangeWriteBarrier = graph.add(new SerialArrayRangeWriteBarrier(write.getAddress(), write.getLength(), write.getElementStride()));
- graph.addAfterFixed(write.asNode(), serialArrayRangeWriteBarrier);
- }
- }
-
@Override
public boolean checkContract() {
return false;
}
+
+ private BarrierSet createBarrierSet(GraalHotSpotVMConfig config) {
+ if (config.useG1GC) {
+ return createG1BarrierSet();
+ } else {
+ return createCardTableBarrierSet();
+ }
+ }
+
+ protected BarrierSet createCardTableBarrierSet() {
+ return new CardTableBarrierSet();
+ }
+
+ protected BarrierSet createG1BarrierSet() {
+ return new G1BarrierSet();
+ }
}
--- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/phases/WriteBarrierVerificationPhase.java Tue Mar 12 09:49:10 2019 +0000
+++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/phases/WriteBarrierVerificationPhase.java Sat Mar 16 21:00:45 2019 +0000
@@ -31,10 +31,10 @@
import org.graalvm.compiler.graph.Node;
import org.graalvm.compiler.graph.NodeFlood;
import org.graalvm.compiler.hotspot.GraalHotSpotVMConfig;
-import org.graalvm.compiler.hotspot.nodes.ArrayRangeWriteBarrier;
-import org.graalvm.compiler.hotspot.nodes.G1PostWriteBarrier;
-import org.graalvm.compiler.hotspot.nodes.ObjectWriteBarrier;
-import org.graalvm.compiler.hotspot.nodes.SerialWriteBarrier;
+import org.graalvm.compiler.hotspot.gc.g1.G1PostWriteBarrier;
+import org.graalvm.compiler.hotspot.gc.shared.ArrayRangeWriteBarrier;
+import org.graalvm.compiler.hotspot.gc.shared.ObjectWriteBarrier;
+import org.graalvm.compiler.hotspot.gc.shared.SerialWriteBarrier;
import org.graalvm.compiler.nodeinfo.Verbosity;
import org.graalvm.compiler.nodes.DeoptimizingNode;
import org.graalvm.compiler.nodes.FixedWithNextNode;
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/replacements/ArraysSupportSubstitutions.java Sat Mar 16 21:00:45 2019 +0000
@@ -0,0 +1,47 @@
+/*
+ * Copyright (c) 2019, Oracle and/or its affiliates. All rights reserved.
+ * 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.
+ */
+
+
+
+package org.graalvm.compiler.hotspot.replacements;
+
+import org.graalvm.compiler.api.replacements.ClassSubstitution;
+import org.graalvm.compiler.api.replacements.MethodSubstitution;
+import org.graalvm.compiler.hotspot.HotSpotBackend;
+import org.graalvm.compiler.nodes.ComputeObjectAddressNode;
+import org.graalvm.compiler.word.Word;
+import jdk.internal.vm.compiler.word.WordFactory;
+
+@ClassSubstitution(className = "jdk.internal.util.ArraysSupport", optional = true)
+public class ArraysSupportSubstitutions {
+
+ @SuppressWarnings("unused")
+ @MethodSubstitution(isStatic = true)
+ static int vectorizedMismatch(Object a, long aOffset, Object b, long bOffset, int length, int log2ArrayIndexScale) {
+ Word aAddr = WordFactory.unsigned(ComputeObjectAddressNode.get(a, aOffset));
+ Word bAddr = WordFactory.unsigned(ComputeObjectAddressNode.get(b, bOffset));
+
+ return HotSpotBackend.vectorizedMismatch(aAddr, bAddr, length, log2ArrayIndexScale);
+ }
+}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/replacements/CounterModeSubstitutions.java Sat Mar 16 21:00:45 2019 +0000
@@ -0,0 +1,93 @@
+/*
+ * 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.
+ */
+
+
+package org.graalvm.compiler.hotspot.replacements;
+
+import static org.graalvm.compiler.hotspot.GraalHotSpotVMConfigBase.INJECTED_INTRINSIC_CONTEXT;
+import static org.graalvm.compiler.hotspot.GraalHotSpotVMConfigBase.INJECTED_METAACCESS;
+import static org.graalvm.compiler.hotspot.replacements.CipherBlockChainingSubstitutions.aesCryptType;
+import static org.graalvm.compiler.hotspot.replacements.CipherBlockChainingSubstitutions.embeddedCipherOffset;
+import static org.graalvm.compiler.nodes.PiNode.piCastNonNull;
+
+import org.graalvm.compiler.api.replacements.ClassSubstitution;
+import org.graalvm.compiler.api.replacements.Fold;
+import org.graalvm.compiler.api.replacements.Fold.InjectedParameter;
+import org.graalvm.compiler.api.replacements.MethodSubstitution;
+import org.graalvm.compiler.hotspot.HotSpotBackend;
+import org.graalvm.compiler.nodes.ComputeObjectAddressNode;
+import org.graalvm.compiler.nodes.extended.RawLoadNode;
+import org.graalvm.compiler.nodes.graphbuilderconf.IntrinsicContext;
+import org.graalvm.compiler.replacements.ReplacementsUtil;
+import org.graalvm.compiler.word.Word;
+import jdk.internal.vm.compiler.word.LocationIdentity;
+import jdk.internal.vm.compiler.word.WordFactory;
+
+import jdk.vm.ci.meta.JavaKind;
+import jdk.vm.ci.meta.ResolvedJavaType;
+
+@ClassSubstitution(className = "com.sun.crypto.provider.CounterMode", optional = true)
+public class CounterModeSubstitutions {
+
+ @MethodSubstitution(isStatic = false)
+ static int implCrypt(Object receiver, byte[] in, int inOff, int len, byte[] out, int outOff) {
+ Object realReceiver = piCastNonNull(receiver, HotSpotReplacementsUtil.methodHolderClass(INJECTED_INTRINSIC_CONTEXT));
+ Object embeddedCipher = RawLoadNode.load(realReceiver, embeddedCipherOffset(INJECTED_INTRINSIC_CONTEXT), JavaKind.Object, LocationIdentity.any());
+ Object aesCipher = piCastNonNull(embeddedCipher, aesCryptType(INJECTED_INTRINSIC_CONTEXT));
+
+ Word srcAddr = WordFactory.unsigned(ComputeObjectAddressNode.get(in, ReplacementsUtil.getArrayBaseOffset(INJECTED_METAACCESS, JavaKind.Byte) + inOff));
+ Word dstAddr = WordFactory.unsigned(ComputeObjectAddressNode.get(out, ReplacementsUtil.getArrayBaseOffset(INJECTED_METAACCESS, JavaKind.Byte) + outOff));
+ Word usedPtr = WordFactory.unsigned(ComputeObjectAddressNode.get(realReceiver, usedOffset(INJECTED_INTRINSIC_CONTEXT)));
+
+ int cntOffset = counterOffset(INJECTED_INTRINSIC_CONTEXT);
+ int encCntOffset = encCounterOffset(INJECTED_INTRINSIC_CONTEXT);
+ Object kObject = RawLoadNode.load(aesCipher, AESCryptSubstitutions.kOffset(INJECTED_INTRINSIC_CONTEXT), JavaKind.Object, LocationIdentity.any());
+ Object cntObj = RawLoadNode.load(realReceiver, cntOffset, JavaKind.Object, LocationIdentity.any());
+ Object encCntObj = RawLoadNode.load(realReceiver, encCntOffset, JavaKind.Object, LocationIdentity.any());
+
+ Word kPtr = Word.objectToTrackedPointer(kObject).add(ReplacementsUtil.getArrayBaseOffset(INJECTED_METAACCESS, JavaKind.Int));
+ Word cntPtr = Word.objectToTrackedPointer(cntObj).add(ReplacementsUtil.getArrayBaseOffset(INJECTED_METAACCESS, JavaKind.Byte));
+ Word encCntPtr = Word.objectToTrackedPointer(encCntObj).add(ReplacementsUtil.getArrayBaseOffset(INJECTED_METAACCESS, JavaKind.Byte));
+
+ return HotSpotBackend.counterModeAESCrypt(srcAddr, dstAddr, kPtr, cntPtr, len, encCntPtr, usedPtr);
+ }
+
+ static ResolvedJavaType counterModeType(IntrinsicContext context) {
+ return HotSpotReplacementsUtil.getType(context, "Lcom/sun/crypto/provider/CounterMode;");
+ }
+
+ @Fold
+ static int counterOffset(@InjectedParameter IntrinsicContext context) {
+ return HotSpotReplacementsUtil.getFieldOffset(counterModeType(context), "counter");
+ }
+
+ @Fold
+ static int encCounterOffset(@InjectedParameter IntrinsicContext context) {
+ return HotSpotReplacementsUtil.getFieldOffset(counterModeType(context), "encryptedCounter");
+ }
+
+ @Fold
+ static int usedOffset(@InjectedParameter IntrinsicContext context) {
+ return HotSpotReplacementsUtil.getFieldOffset(counterModeType(context), "used");
+ }
+}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/replacements/DigestBaseSubstitutions.java Sat Mar 16 21:00:45 2019 +0000
@@ -0,0 +1,93 @@
+/*
+ * 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.
+ */
+
+
+package org.graalvm.compiler.hotspot.replacements;
+
+import static org.graalvm.compiler.hotspot.GraalHotSpotVMConfig.INJECTED_METAACCESS;
+import static org.graalvm.compiler.hotspot.GraalHotSpotVMConfigBase.INJECTED_INTRINSIC_CONTEXT;
+import static org.graalvm.compiler.hotspot.GraalHotSpotVMConfigBase.INJECTED_VMCONFIG;
+import static org.graalvm.compiler.nodes.java.InstanceOfNode.doInstanceof;
+
+import org.graalvm.compiler.api.replacements.ClassSubstitution;
+import org.graalvm.compiler.api.replacements.Fold;
+import org.graalvm.compiler.api.replacements.MethodSubstitution;
+import org.graalvm.compiler.hotspot.GraalHotSpotVMConfig;
+import org.graalvm.compiler.hotspot.HotSpotBackend;
+import org.graalvm.compiler.nodes.ComputeObjectAddressNode;
+import org.graalvm.compiler.nodes.PiNode;
+import org.graalvm.compiler.nodes.extended.RawLoadNode;
+import org.graalvm.compiler.replacements.ReplacementsUtil;
+import org.graalvm.compiler.word.Word;
+import jdk.internal.vm.compiler.word.LocationIdentity;
+import jdk.internal.vm.compiler.word.WordFactory;
+
+import jdk.vm.ci.meta.JavaKind;
+import jdk.vm.ci.meta.ResolvedJavaType;
+
+@ClassSubstitution(className = "sun.security.provider.DigestBase", optional = true)
+public class DigestBaseSubstitutions {
+
+ @MethodSubstitution(isStatic = false)
+ static int implCompressMultiBlock0(Object receiver, byte[] buf, int ofs, int limit) {
+ Object realReceiver = PiNode.piCastNonNull(receiver, HotSpotReplacementsUtil.methodHolderClass(INJECTED_INTRINSIC_CONTEXT));
+ ResolvedJavaType sha1type = HotSpotReplacementsUtil.getType(INJECTED_INTRINSIC_CONTEXT, "Lsun/security/provider/SHA;");
+ ResolvedJavaType sha256type = HotSpotReplacementsUtil.getType(INJECTED_INTRINSIC_CONTEXT, "Lsun/security/provider/SHA2;");
+ ResolvedJavaType sha512type = HotSpotReplacementsUtil.getType(INJECTED_INTRINSIC_CONTEXT, "Lsun/security/provider/SHA5;");
+
+ Word bufAddr = WordFactory.unsigned(ComputeObjectAddressNode.get(buf, ReplacementsUtil.getArrayBaseOffset(INJECTED_METAACCESS, JavaKind.Byte) + ofs));
+ if (useSHA1Intrinsics(INJECTED_VMCONFIG) && doInstanceof(sha1type, realReceiver)) {
+ Object sha1obj = PiNode.piCastNonNull(realReceiver, sha1type);
+ Object state = RawLoadNode.load(sha1obj, HotSpotReplacementsUtil.getFieldOffset(sha1type, "state"), JavaKind.Object, LocationIdentity.any());
+ Word stateAddr = WordFactory.unsigned(ComputeObjectAddressNode.get(state, ReplacementsUtil.getArrayBaseOffset(INJECTED_METAACCESS, JavaKind.Int)));
+ return HotSpotBackend.shaImplCompressMBStub(bufAddr, stateAddr, ofs, limit);
+ } else if (useSHA256Intrinsics(INJECTED_VMCONFIG) && doInstanceof(sha256type, realReceiver)) {
+ Object sha256obj = PiNode.piCastNonNull(realReceiver, sha256type);
+ Object state = RawLoadNode.load(sha256obj, HotSpotReplacementsUtil.getFieldOffset(sha256type, "state"), JavaKind.Object, LocationIdentity.any());
+ Word stateAddr = WordFactory.unsigned(ComputeObjectAddressNode.get(state, ReplacementsUtil.getArrayBaseOffset(INJECTED_METAACCESS, JavaKind.Int)));
+ return HotSpotBackend.sha2ImplCompressMBStub(bufAddr, stateAddr, ofs, limit);
+ } else if (useSHA512Intrinsics(INJECTED_VMCONFIG) && doInstanceof(sha512type, realReceiver)) {
+ Object sha512obj = PiNode.piCastNonNull(realReceiver, sha512type);
+ Object state = RawLoadNode.load(sha512obj, HotSpotReplacementsUtil.getFieldOffset(sha512type, "state"), JavaKind.Object, LocationIdentity.any());
+ Word stateAddr = WordFactory.unsigned(ComputeObjectAddressNode.get(state, ReplacementsUtil.getArrayBaseOffset(INJECTED_METAACCESS, JavaKind.Int)));
+ return HotSpotBackend.sha5ImplCompressMBStub(bufAddr, stateAddr, ofs, limit);
+ } else {
+ return implCompressMultiBlock0(realReceiver, buf, ofs, limit);
+ }
+ }
+
+ @Fold
+ public static boolean useSHA1Intrinsics(@Fold.InjectedParameter GraalHotSpotVMConfig config) {
+ return config.useSHA1Intrinsics();
+ }
+
+ @Fold
+ public static boolean useSHA256Intrinsics(@Fold.InjectedParameter GraalHotSpotVMConfig config) {
+ return config.useSHA256Intrinsics();
+ }
+
+ @Fold
+ public static boolean useSHA512Intrinsics(@Fold.InjectedParameter GraalHotSpotVMConfig config) {
+ return config.useSHA512Intrinsics();
+ }
+}
--- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/replacements/HotSpotClassSubstitutions.java Tue Mar 12 09:49:10 2019 +0000
+++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/replacements/HotSpotClassSubstitutions.java Sat Mar 16 21:00:45 2019 +0000
@@ -25,6 +25,7 @@
package org.graalvm.compiler.hotspot.replacements;
import static org.graalvm.compiler.hotspot.GraalHotSpotVMConfig.INJECTED_VMCONFIG;
+import static org.graalvm.compiler.hotspot.GraalHotSpotVMConfigBase.INJECTED_METAACCESS;
import static org.graalvm.compiler.hotspot.replacements.HotSpotReplacementsUtil.ARRAY_KLASS_COMPONENT_MIRROR;
import static org.graalvm.compiler.hotspot.replacements.HotSpotReplacementsUtil.KLASS_ACCESS_FLAGS_LOCATION;
import static org.graalvm.compiler.hotspot.replacements.HotSpotReplacementsUtil.KLASS_MODIFIER_FLAGS_LOCATION;
@@ -38,11 +39,16 @@
import java.lang.reflect.Modifier;
import org.graalvm.compiler.api.replacements.ClassSubstitution;
+import org.graalvm.compiler.api.replacements.Fold;
import org.graalvm.compiler.api.replacements.MethodSubstitution;
import org.graalvm.compiler.hotspot.word.KlassPointer;
+import org.graalvm.compiler.nodes.ConstantNode;
import org.graalvm.compiler.nodes.PiNode;
import org.graalvm.compiler.nodes.SnippetAnchorNode;
+import jdk.vm.ci.meta.MetaAccessProvider;
+import jdk.vm.ci.meta.ResolvedJavaType;
+
// JaCoCo Exclude
/**
@@ -92,6 +98,11 @@
return klass.isNull();
}
+ @Fold
+ public static ResolvedJavaType getObjectType(@Fold.InjectedParameter MetaAccessProvider metaAccesss) {
+ return metaAccesss.lookupJavaType(Object.class);
+ }
+
@MethodSubstitution(isStatic = false)
public static Class<?> getSuperclass(final Class<?> thisObj) {
KlassPointer klass = ClassGetHubNode.readClass(thisObj);
@@ -100,7 +111,7 @@
int accessFlags = klassNonNull.readInt(klassAccessFlagsOffset(INJECTED_VMCONFIG), KLASS_ACCESS_FLAGS_LOCATION);
if ((accessFlags & Modifier.INTERFACE) == 0) {
if (klassIsArray(klassNonNull)) {
- return Object.class;
+ return ConstantNode.forClass(getObjectType(INJECTED_METAACCESS));
} else {
KlassPointer superKlass = klassNonNull.readKlassPointer(klassSuperKlassOffset(INJECTED_VMCONFIG), KLASS_SUPER_KLASS_LOCATION);
if (superKlass.isNull()) {
--- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/replacements/HotSpotReplacementsUtil.java Tue Mar 12 09:49:10 2019 +0000
+++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/replacements/HotSpotReplacementsUtil.java Sat Mar 16 21:00:45 2019 +0000
@@ -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
@@ -138,10 +138,12 @@
}
}
- public static ResolvedJavaType methodHolderClass(@Fold.InjectedParameter IntrinsicContext context) {
+ @Fold
+ public static ResolvedJavaType methodHolderClass(@InjectedParameter IntrinsicContext context) {
return context.getOriginalMethod().getDeclaringClass();
}
+ @Fold
static ResolvedJavaType getType(@Fold.InjectedParameter IntrinsicContext context, String typeName) {
try {
UnresolvedJavaType unresolved = UnresolvedJavaType.create(typeName);
@@ -151,6 +153,7 @@
}
}
+ @Fold
static int getFieldOffset(ResolvedJavaType type, String fieldName) {
for (ResolvedJavaField field : type.getInstanceFields(true)) {
if (field.getName().equals(fieldName)) {
@@ -584,7 +587,7 @@
* Calls {@link #arrayAllocationSize(int, int, int, int)} using an injected VM configuration
* object.
*/
- public static int arrayAllocationSize(int length, int headerSize, int log2ElementSize) {
+ public static long arrayAllocationSize(int length, int headerSize, int log2ElementSize) {
return arrayAllocationSize(length, headerSize, log2ElementSize, objectAlignment(INJECTED_VMCONFIG));
}
@@ -600,9 +603,9 @@
* requirement}
* @return the size of the memory chunk
*/
- public static int arrayAllocationSize(int length, int headerSize, int log2ElementSize, int alignment) {
- int size = (length << log2ElementSize) + headerSize + (alignment - 1);
- int mask = ~(alignment - 1);
+ public static long arrayAllocationSize(int length, int headerSize, int log2ElementSize, int alignment) {
+ long size = ((long) length << log2ElementSize) + headerSize + (alignment - 1);
+ long mask = ~(alignment - 1);
return size & mask;
}
@@ -730,7 +733,7 @@
}
public static KlassPointer loadKlassFromObject(Object object, int offset, LocationIdentity identity) {
- ReplacementsUtil.staticAssert(offset != hubOffset(INJECTED_VMCONFIG), "Use loadHubIntrinsic instead of loadWordFromObject");
+ ReplacementsUtil.staticAssert(offset != hubOffset(INJECTED_VMCONFIG), "Use loadHubIntrinsic instead of loadKlassFromObject");
return loadKlassFromObjectIntrinsic(object, offset, identity, getWordKind());
}
--- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/replacements/NewObjectSnippets.java Tue Mar 12 09:49:10 2019 +0000
+++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/replacements/NewObjectSnippets.java Sat Mar 16 21:00:45 2019 +0000
@@ -209,19 +209,19 @@
}
@Snippet
- public static Object allocateInstance(@ConstantParameter int size, KlassPointer hub, Word prototypeMarkWord, @ConstantParameter boolean fillContents,
+ public static Object allocateInstance(@ConstantParameter long size, KlassPointer hub, Word prototypeMarkWord, @ConstantParameter boolean fillContents,
@ConstantParameter Register threadRegister, @ConstantParameter boolean constantSize, @ConstantParameter String typeContext,
@ConstantParameter Counters counters) {
return piCastToSnippetReplaceeStamp(allocateInstanceHelper(size, hub, prototypeMarkWord, fillContents, threadRegister, constantSize, typeContext, counters));
}
- public static Object allocateInstanceHelper(int size, KlassPointer hub, Word prototypeMarkWord, boolean fillContents,
+ public static Object allocateInstanceHelper(long size, KlassPointer hub, Word prototypeMarkWord, boolean fillContents,
Register threadRegister, boolean constantSize, String typeContext, Counters counters) {
Object result;
Word thread = registerAsWord(threadRegister);
Word top = readTlabTop(thread);
Word end = readTlabEnd(thread);
- Word newTop = top.add(size);
+ Word newTop = top.add(WordFactory.unsigned(size));
if (useTLAB(INJECTED_VMCONFIG) && probability(FAST_PATH_PROBABILITY, newTop.belowOrEqual(end))) {
writeTlabTop(thread, newTop);
emitPrefetchAllocate(newTop, false);
@@ -252,7 +252,7 @@
private static native Object newInstanceOrNull(@ConstantNodeParameter ForeignCallDescriptor descriptor, KlassPointer hub);
@Snippet
- public static Object allocateInstancePIC(@ConstantParameter int size, KlassPointer hub, Word prototypeMarkWord, @ConstantParameter boolean fillContents,
+ public static Object allocateInstancePIC(@ConstantParameter long size, KlassPointer hub, Word prototypeMarkWord, @ConstantParameter boolean fillContents,
@ConstantParameter Register threadRegister, @ConstantParameter boolean constantSize, @ConstantParameter String typeContext,
@ConstantParameter Counters counters) {
// Klass must be initialized by the time the first instance is allocated, therefore we can
@@ -316,7 +316,7 @@
@ConstantParameter Counters counters) {
// Primitive array types are eagerly pre-resolved. We can use a floating load.
KlassPointer picHub = LoadConstantIndirectlyNode.loadKlass(hub);
- return allocateArrayImpl(picHub, length, prototypeMarkWord, headerSize, log2ElementSize, fillContents, threadRegister, maybeUnroll, typeContext, false, counters);
+ return allocateArrayImpl(picHub, length, prototypeMarkWord, headerSize, log2ElementSize, fillContents, threadRegister, maybeUnroll, typeContext, counters);
}
@Snippet
@@ -325,7 +325,7 @@
@ConstantParameter Counters counters) {
// Array type would be resolved by dominating resolution.
KlassPointer picHub = LoadConstantIndirectlyFixedNode.loadKlass(hub);
- return allocateArrayImpl(picHub, length, prototypeMarkWord, headerSize, log2ElementSize, fillContents, threadRegister, maybeUnroll, typeContext, false, counters);
+ return allocateArrayImpl(picHub, length, prototypeMarkWord, headerSize, log2ElementSize, fillContents, threadRegister, maybeUnroll, typeContext, counters);
}
@Snippet
@@ -348,7 +348,6 @@
threadRegister,
maybeUnroll,
typeContext,
- false,
counters);
return piArrayCastToSnippetReplaceeStamp(verifyOop(result), length);
@@ -364,14 +363,14 @@
}
private static Object allocateArrayImpl(KlassPointer hub, int length, Word prototypeMarkWord, int headerSize, int log2ElementSize, boolean fillContents, Register threadRegister,
- boolean maybeUnroll, String typeContext, boolean skipNegativeCheck, Counters counters) {
+ boolean maybeUnroll, String typeContext, Counters counters) {
Object result;
- int allocationSize = arrayAllocationSize(length, headerSize, log2ElementSize);
+ long allocationSize = arrayAllocationSize(length, headerSize, log2ElementSize);
Word thread = registerAsWord(threadRegister);
Word top = readTlabTop(thread);
Word end = readTlabEnd(thread);
- Word newTop = top.add(allocationSize);
- if (probability(FREQUENT_PROBABILITY, skipNegativeCheck || belowThan(length, MAX_ARRAY_FAST_PATH_ALLOCATION_LENGTH)) && useTLAB(INJECTED_VMCONFIG) &&
+ Word newTop = top.add(WordFactory.unsigned(allocationSize));
+ if (probability(FREQUENT_PROBABILITY, belowThan(length, MAX_ARRAY_FAST_PATH_ALLOCATION_LENGTH)) && useTLAB(INJECTED_VMCONFIG) &&
probability(FAST_PATH_PROBABILITY, newTop.belowOrEqual(end))) {
writeTlabTop(thread, newTop);
emitPrefetchAllocate(newTop, true);
@@ -486,7 +485,7 @@
int headerSize = (layoutHelper >> layoutHelperHeaderSizeShift(INJECTED_VMCONFIG)) & layoutHelperHeaderSizeMask(INJECTED_VMCONFIG);
int log2ElementSize = (layoutHelper >> layoutHelperLog2ElementSizeShift(INJECTED_VMCONFIG)) & layoutHelperLog2ElementSizeMask(INJECTED_VMCONFIG);
- Object result = allocateArrayImpl(nonNullKlass, length, prototypeMarkWord, headerSize, log2ElementSize, fillContents, threadRegister, false, "dynamic type", true, counters);
+ Object result = allocateArrayImpl(nonNullKlass, length, prototypeMarkWord, headerSize, log2ElementSize, fillContents, threadRegister, false, "dynamic type", counters);
return piArrayCastToSnippetReplaceeStamp(verifyOop(result), length);
}
@@ -540,11 +539,11 @@
* @param startOffset offset to begin zeroing. May not be word aligned.
* @param manualUnroll maximally unroll zeroing
*/
- private static void zeroMemory(int size, Word memory, boolean constantSize, int startOffset, boolean manualUnroll, Counters counters) {
+ private static void zeroMemory(long size, Word memory, boolean constantSize, int startOffset, boolean manualUnroll, Counters counters) {
fillMemory(0, size, memory, constantSize, startOffset, manualUnroll, counters);
}
- private static void fillMemory(long value, int size, Word memory, boolean constantSize, int startOffset, boolean manualUnroll, Counters counters) {
+ private static void fillMemory(long value, long size, Word memory, boolean constantSize, int startOffset, boolean manualUnroll, Counters counters) {
ReplacementsUtil.runtimeAssert((size & 0x7) == 0, "unaligned object size");
int offset = startOffset;
if ((offset & 0x7) != 0) {
@@ -598,14 +597,14 @@
* @param startOffset offset to begin zeroing. May not be word aligned.
* @param manualUnroll maximally unroll zeroing
*/
- private static void fillWithGarbage(int size, Word memory, boolean constantSize, int startOffset, boolean manualUnroll, Counters counters) {
+ private static void fillWithGarbage(long size, Word memory, boolean constantSize, int startOffset, boolean manualUnroll, Counters counters) {
fillMemory(0xfefefefefefefefeL, size, memory, constantSize, startOffset, manualUnroll, counters);
}
/**
* Formats some allocated memory with an object header and zeroes out the rest.
*/
- private static Object formatObject(KlassPointer hub, int size, Word memory, Word compileTimePrototypeMarkWord, boolean fillContents, boolean constantSize, Counters counters) {
+ private static Object formatObject(KlassPointer hub, long size, Word memory, Word compileTimePrototypeMarkWord, boolean fillContents, boolean constantSize, Counters counters) {
Word prototypeMarkWord = useBiasedLocking(INJECTED_VMCONFIG) ? hub.readWord(prototypeMarkWordOffset(INJECTED_VMCONFIG), PROTOTYPE_MARK_WORD_LOCATION) : compileTimePrototypeMarkWord;
initializeObjectHeader(memory, prototypeMarkWord, hub);
if (fillContents) {
@@ -632,7 +631,7 @@
/**
* Formats some allocated memory with an object header and zeroes out the rest.
*/
- private static Object formatArray(KlassPointer hub, int allocationSize, int length, int headerSize, Word memory, Word prototypeMarkWord, boolean fillContents, boolean maybeUnroll,
+ private static Object formatArray(KlassPointer hub, long allocationSize, int length, int headerSize, Word memory, Word prototypeMarkWord, boolean fillContents, boolean maybeUnroll,
Counters counters) {
memory.writeInt(arrayLengthOffset(INJECTED_VMCONFIG), length, LocationIdentity.init());
/*
@@ -699,7 +698,7 @@
HotSpotResolvedObjectType type = (HotSpotResolvedObjectType) newInstanceNode.instanceClass();
assert !type.isArray();
ConstantNode hub = ConstantNode.forConstant(KlassPointerStamp.klassNonNull(), type.klass(), providers.getMetaAccess(), graph);
- int size = instanceSize(type);
+ long size = instanceSize(type);
OptionValues localOptions = graph.getOptions();
SnippetInfo snippet = GeneratePIC.getValue(localOptions) ? allocateInstancePIC : allocateInstance;
@@ -824,8 +823,8 @@
template(newmultiarrayNode, args).instantiate(providers.getMetaAccess(), newmultiarrayNode, DEFAULT_REPLACER, args);
}
- private static int instanceSize(HotSpotResolvedObjectType type) {
- int size = type.instanceSize();
+ private static long instanceSize(HotSpotResolvedObjectType type) {
+ long size = type.instanceSize();
assert size >= 0;
return size;
}
--- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/replacements/SHA2Substitutions.java Tue Mar 12 09:49:10 2019 +0000
+++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/replacements/SHA2Substitutions.java Sat Mar 16 21:00:45 2019 +0000
@@ -26,7 +26,7 @@
import static org.graalvm.compiler.hotspot.GraalHotSpotVMConfig.INJECTED_METAACCESS;
import static org.graalvm.compiler.hotspot.GraalHotSpotVMConfigBase.INJECTED_INTRINSIC_CONTEXT;
-import static org.graalvm.compiler.serviceprovider.GraalServices.Java8OrEarlier;
+import static org.graalvm.compiler.serviceprovider.JavaVersionUtil.Java8OrEarlier;
import org.graalvm.compiler.api.replacements.ClassSubstitution;
import org.graalvm.compiler.api.replacements.Fold;
--- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/replacements/SHA5Substitutions.java Tue Mar 12 09:49:10 2019 +0000
+++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/replacements/SHA5Substitutions.java Sat Mar 16 21:00:45 2019 +0000
@@ -26,14 +26,17 @@
import static org.graalvm.compiler.hotspot.GraalHotSpotVMConfigBase.INJECTED_INTRINSIC_CONTEXT;
import static org.graalvm.compiler.hotspot.GraalHotSpotVMConfigBase.INJECTED_METAACCESS;
-import static org.graalvm.compiler.serviceprovider.GraalServices.Java8OrEarlier;
+import static org.graalvm.compiler.serviceprovider.JavaVersionUtil.Java8OrEarlier;
import org.graalvm.compiler.api.replacements.ClassSubstitution;
+import org.graalvm.compiler.api.replacements.Fold;
+import org.graalvm.compiler.api.replacements.Fold.InjectedParameter;
import org.graalvm.compiler.api.replacements.MethodSubstitution;
import org.graalvm.compiler.hotspot.HotSpotBackend;
import org.graalvm.compiler.nodes.ComputeObjectAddressNode;
import org.graalvm.compiler.nodes.PiNode;
import org.graalvm.compiler.nodes.extended.RawLoadNode;
+import org.graalvm.compiler.nodes.graphbuilderconf.IntrinsicContext;
import org.graalvm.compiler.replacements.ReplacementsUtil;
import org.graalvm.compiler.word.Word;
import jdk.internal.vm.compiler.word.LocationIdentity;
@@ -49,14 +52,15 @@
@MethodSubstitution(isStatic = false)
static void implCompress0(Object receiver, byte[] buf, int ofs) {
Object realReceiver = PiNode.piCastNonNull(receiver, HotSpotReplacementsUtil.methodHolderClass(INJECTED_INTRINSIC_CONTEXT));
- Object state = RawLoadNode.load(realReceiver, stateOffset(), JavaKind.Object, LocationIdentity.any());
+ Object state = RawLoadNode.load(realReceiver, stateOffset(INJECTED_INTRINSIC_CONTEXT), JavaKind.Object, LocationIdentity.any());
Word bufAddr = WordFactory.unsigned(ComputeObjectAddressNode.get(buf, ReplacementsUtil.getArrayBaseOffset(INJECTED_METAACCESS, JavaKind.Byte) + ofs));
Word stateAddr = WordFactory.unsigned(ComputeObjectAddressNode.get(state, ReplacementsUtil.getArrayBaseOffset(INJECTED_METAACCESS, JavaKind.Int)));
HotSpotBackend.sha5ImplCompressStub(bufAddr, stateAddr);
}
- static long stateOffset() {
- return HotSpotReplacementsUtil.getFieldOffset(HotSpotReplacementsUtil.methodHolderClass(INJECTED_INTRINSIC_CONTEXT), "state");
+ @Fold
+ static long stateOffset(@InjectedParameter IntrinsicContext context) {
+ return HotSpotReplacementsUtil.getFieldOffset(HotSpotReplacementsUtil.methodHolderClass(context), "state");
}
}
--- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/replacements/SHASubstitutions.java Tue Mar 12 09:49:10 2019 +0000
+++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/replacements/SHASubstitutions.java Sat Mar 16 21:00:45 2019 +0000
@@ -26,14 +26,17 @@
import static org.graalvm.compiler.hotspot.GraalHotSpotVMConfigBase.INJECTED_INTRINSIC_CONTEXT;
import static org.graalvm.compiler.hotspot.GraalHotSpotVMConfigBase.INJECTED_METAACCESS;
-import static org.graalvm.compiler.serviceprovider.GraalServices.Java8OrEarlier;
+import static org.graalvm.compiler.serviceprovider.JavaVersionUtil.Java8OrEarlier;
import org.graalvm.compiler.api.replacements.ClassSubstitution;
+import org.graalvm.compiler.api.replacements.Fold;
+import org.graalvm.compiler.api.replacements.Fold.InjectedParameter;
import org.graalvm.compiler.api.replacements.MethodSubstitution;
import org.graalvm.compiler.hotspot.HotSpotBackend;
import org.graalvm.compiler.nodes.ComputeObjectAddressNode;
import org.graalvm.compiler.nodes.PiNode;
import org.graalvm.compiler.nodes.extended.RawLoadNode;
+import org.graalvm.compiler.nodes.graphbuilderconf.IntrinsicContext;
import org.graalvm.compiler.replacements.ReplacementsUtil;
import org.graalvm.compiler.word.Word;
import jdk.internal.vm.compiler.word.LocationIdentity;
@@ -49,14 +52,15 @@
@MethodSubstitution(isStatic = false)
static void implCompress0(Object receiver, byte[] buf, int ofs) {
Object realReceiver = PiNode.piCastNonNull(receiver, HotSpotReplacementsUtil.methodHolderClass(INJECTED_INTRINSIC_CONTEXT));
- Object state = RawLoadNode.load(realReceiver, stateOffset(), JavaKind.Object, LocationIdentity.any());
+ Object state = RawLoadNode.load(realReceiver, stateOffset(INJECTED_INTRINSIC_CONTEXT), JavaKind.Object, LocationIdentity.any());
Word bufAddr = WordFactory.unsigned(ComputeObjectAddressNode.get(buf, ReplacementsUtil.getArrayBaseOffset(INJECTED_METAACCESS, JavaKind.Byte) + ofs));
Word stateAddr = WordFactory.unsigned(ComputeObjectAddressNode.get(state, ReplacementsUtil.getArrayBaseOffset(INJECTED_METAACCESS, JavaKind.Int)));
HotSpotBackend.shaImplCompressStub(bufAddr, stateAddr);
}
- static long stateOffset() {
- return HotSpotReplacementsUtil.getFieldOffset(HotSpotReplacementsUtil.methodHolderClass(INJECTED_INTRINSIC_CONTEXT), "state");
+ @Fold
+ static long stateOffset(@InjectedParameter IntrinsicContext context) {
+ return HotSpotReplacementsUtil.getFieldOffset(HotSpotReplacementsUtil.methodHolderClass(context), "state");
}
}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/replacements/StringUTF16Substitutions.java Sat Mar 16 21:00:45 2019 +0000
@@ -0,0 +1,78 @@
+/*
+ * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved.
+ * 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.
+ */
+
+
+package org.graalvm.compiler.hotspot.replacements;
+
+import static org.graalvm.compiler.hotspot.GraalHotSpotVMConfigBase.INJECTED_VMCONFIG;
+import static org.graalvm.compiler.nodes.extended.BranchProbabilityNode.SLOW_PATH_PROBABILITY;
+import static org.graalvm.compiler.nodes.extended.BranchProbabilityNode.probability;
+
+import jdk.vm.ci.meta.DeoptimizationAction;
+import jdk.vm.ci.meta.DeoptimizationReason;
+import jdk.vm.ci.meta.JavaKind;
+import org.graalvm.compiler.api.replacements.ClassSubstitution;
+import org.graalvm.compiler.api.replacements.MethodSubstitution;
+import org.graalvm.compiler.nodes.DeoptimizeNode;
+import org.graalvm.compiler.nodes.java.NewArrayNode;
+import org.graalvm.compiler.replacements.arraycopy.ArrayCopyCallNode;
+
+// JaCoCo Exclude
+
+/**
+ * Substitutions for {@code StringUTF16} methods for JDK9 and later.
+ */
+@ClassSubstitution(className = "java.lang.StringUTF16", optional = true)
+public class StringUTF16Substitutions {
+
+ private static final int MAX_LENGTH = Integer.MAX_VALUE >> 1;
+
+ @MethodSubstitution
+ public static byte[] toBytes(char[] value, int srcBegin, int length) {
+ if (probability(SLOW_PATH_PROBABILITY, srcBegin < 0) ||
+ probability(SLOW_PATH_PROBABILITY, length < 0) ||
+ probability(SLOW_PATH_PROBABILITY, length > MAX_LENGTH) ||
+ probability(SLOW_PATH_PROBABILITY, srcBegin > value.length - length)) {
+ DeoptimizeNode.deopt(DeoptimizationAction.None, DeoptimizationReason.BoundsCheckException);
+ }
+ byte[] val = (byte[]) NewArrayNode.newUninitializedArray(Byte.TYPE, length << 1);
+ // the intrinsic does not perform bounds/type checks, so it can be used here.
+ // Using KillsAny variant since we are reading and writing 2 different types.
+ ArrayCopyCallNode.disjointArraycopyKillsAny(value, srcBegin, val, 0, length, JavaKind.Char, HotSpotReplacementsUtil.getHeapWordSize(INJECTED_VMCONFIG));
+ return val;
+ }
+
+ @MethodSubstitution
+ public static void getChars(byte[] value, int srcBegin, int srcEnd, char[] dst, int dstBegin) {
+ int length = srcEnd - srcBegin;
+ if (probability(SLOW_PATH_PROBABILITY, srcBegin < 0) ||
+ probability(SLOW_PATH_PROBABILITY, length < 0) ||
+ probability(SLOW_PATH_PROBABILITY, srcBegin > (value.length >> 1) - length) ||
+ probability(SLOW_PATH_PROBABILITY, dstBegin > dst.length - length)) {
+ DeoptimizeNode.deopt(DeoptimizationAction.None, DeoptimizationReason.BoundsCheckException);
+ }
+ // The intrinsic does not perform bounds/type checks, so it can be used here.
+ // Using KillsAny variant since we are reading and writing 2 different types.
+ ArrayCopyCallNode.disjointArraycopyKillsAny(value, srcBegin, dst, dstBegin, length, JavaKind.Char, HotSpotReplacementsUtil.getHeapWordSize(INJECTED_VMCONFIG));
+ }
+}
--- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/replacements/WriteBarrierSnippets.java Tue Mar 12 09:49:10 2019 +0000
+++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/replacements/WriteBarrierSnippets.java Sat Mar 16 21:00:45 2019 +0000
@@ -54,17 +54,17 @@
import org.graalvm.compiler.graph.Node.ConstantNodeParameter;
import org.graalvm.compiler.graph.Node.NodeIntrinsic;
import org.graalvm.compiler.hotspot.GraalHotSpotVMConfig;
+import org.graalvm.compiler.hotspot.gc.g1.G1ArrayRangePostWriteBarrier;
+import org.graalvm.compiler.hotspot.gc.g1.G1ArrayRangePreWriteBarrier;
+import org.graalvm.compiler.hotspot.gc.g1.G1PostWriteBarrier;
+import org.graalvm.compiler.hotspot.gc.g1.G1PreWriteBarrier;
+import org.graalvm.compiler.hotspot.gc.g1.G1ReferentFieldReadBarrier;
+import org.graalvm.compiler.hotspot.gc.shared.SerialArrayRangeWriteBarrier;
+import org.graalvm.compiler.hotspot.gc.shared.SerialWriteBarrier;
import org.graalvm.compiler.hotspot.meta.HotSpotProviders;
import org.graalvm.compiler.hotspot.meta.HotSpotRegistersProvider;
-import org.graalvm.compiler.hotspot.nodes.G1ArrayRangePostWriteBarrier;
-import org.graalvm.compiler.hotspot.nodes.G1ArrayRangePreWriteBarrier;
-import org.graalvm.compiler.hotspot.nodes.G1PostWriteBarrier;
-import org.graalvm.compiler.hotspot.nodes.G1PreWriteBarrier;
-import org.graalvm.compiler.hotspot.nodes.G1ReferentFieldReadBarrier;
import org.graalvm.compiler.hotspot.nodes.GraalHotSpotVMConfigNode;
import org.graalvm.compiler.hotspot.nodes.HotSpotCompressionNode;
-import org.graalvm.compiler.hotspot.nodes.SerialArrayRangeWriteBarrier;
-import org.graalvm.compiler.hotspot.nodes.SerialWriteBarrier;
import org.graalvm.compiler.hotspot.nodes.VMErrorNode;
import org.graalvm.compiler.nodes.NamedLocationIdentity;
import org.graalvm.compiler.nodes.NodeView;
--- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/stubs/OutOfBoundsExceptionStub.java Tue Mar 12 09:49:10 2019 +0000
+++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/stubs/OutOfBoundsExceptionStub.java Sat Mar 16 21:00:45 2019 +0000
@@ -34,7 +34,7 @@
import org.graalvm.compiler.hotspot.meta.HotSpotProviders;
import org.graalvm.compiler.hotspot.nodes.AllocaNode;
import org.graalvm.compiler.options.OptionValues;
-import org.graalvm.compiler.serviceprovider.GraalServices;
+import org.graalvm.compiler.serviceprovider.JavaVersionUtil;
import org.graalvm.compiler.word.Word;
import jdk.vm.ci.code.Register;
@@ -48,7 +48,7 @@
}
// JDK-8201593: Print array length in ArrayIndexOutOfBoundsException.
- private static final boolean PRINT_LENGTH_IN_EXCEPTION = GraalServices.JAVA_SPECIFICATION_VERSION >= 11;
+ private static final boolean PRINT_LENGTH_IN_EXCEPTION = JavaVersionUtil.JAVA_SPECIFICATION_VERSION >= 11;
private static final int MAX_INT_STRING_SIZE = Integer.toString(Integer.MIN_VALUE).length();
private static final String STR_INDEX = "Index ";
private static final String STR_OUTOFBOUNDSFORLENGTH = " out of bounds for length ";
--- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/stubs/Stub.java Tue Mar 12 09:49:10 2019 +0000
+++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/stubs/Stub.java Sat Mar 16 21:00:45 2019 +0000
@@ -25,7 +25,6 @@
package org.graalvm.compiler.hotspot.stubs;
import static java.util.Collections.singletonList;
-import static org.graalvm.compiler.core.GraalCompiler.emitBackEnd;
import static org.graalvm.compiler.core.GraalCompiler.emitFrontEnd;
import static org.graalvm.compiler.core.common.GraalOptions.GeneratePIC;
import static org.graalvm.compiler.debug.DebugContext.DEFAULT_LOG_STREAM;
@@ -236,7 +235,7 @@
Suites suites = createSuites();
emitFrontEnd(providers, backend, graph, providers.getSuites().getDefaultGraphBuilderSuite(), OptimisticOptimizations.ALL, DefaultProfilingInfo.get(TriState.UNKNOWN), suites);
LIRSuites lirSuites = createLIRSuites();
- emitBackEnd(graph, Stub.this, getInstalledCodeOwner(), backend, compResult, CompilationResultBuilderFactory.Default, getRegisterConfig(), lirSuites);
+ backend.emitBackEnd(graph, Stub.this, getInstalledCodeOwner(), compResult, CompilationResultBuilderFactory.Default, getRegisterConfig(), lirSuites);
assert checkStubInvariants(compResult);
} catch (Throwable e) {
throw debug.handle(e);
--- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.java/src/org/graalvm/compiler/java/BytecodeParser.java Tue Mar 12 09:49:10 2019 +0000
+++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.java/src/org/graalvm/compiler/java/BytecodeParser.java Sat Mar 16 21:00:45 2019 +0000
@@ -38,6 +38,7 @@
import static jdk.vm.ci.meta.DeoptimizationReason.UnreachedCode;
import static jdk.vm.ci.meta.DeoptimizationReason.Unresolved;
import static jdk.vm.ci.runtime.JVMCICompiler.INVOCATION_ENTRY_BCI;
+import static jdk.vm.ci.services.Services.IS_BUILDING_NATIVE_IMAGE;
import static org.graalvm.compiler.bytecode.Bytecodes.AALOAD;
import static org.graalvm.compiler.bytecode.Bytecodes.AASTORE;
import static org.graalvm.compiler.bytecode.Bytecodes.ACONST_NULL;
@@ -270,6 +271,7 @@
import jdk.internal.vm.compiler.collections.EconomicMap;
import jdk.internal.vm.compiler.collections.Equivalence;
+import org.graalvm.compiler.api.replacements.Fold;
import org.graalvm.compiler.api.replacements.Snippet;
import org.graalvm.compiler.bytecode.Bytecode;
import org.graalvm.compiler.bytecode.BytecodeDisassembler;
@@ -424,7 +426,7 @@
import org.graalvm.compiler.options.OptionValues;
import org.graalvm.compiler.phases.OptimisticOptimizations;
import org.graalvm.compiler.phases.util.ValueMergeUtil;
-import org.graalvm.compiler.serviceprovider.GraalServices;
+import org.graalvm.compiler.serviceprovider.JavaVersionUtil;
import jdk.internal.vm.compiler.word.LocationIdentity;
import jdk.vm.ci.code.BailoutException;
@@ -1290,8 +1292,8 @@
return graph.addOrUniqueWithInputs(x);
}
- protected ValueNode genIfNode(LogicNode condition, FixedNode falseSuccessor, FixedNode trueSuccessor, double d) {
- return new IfNode(condition, falseSuccessor, trueSuccessor, d);
+ protected ValueNode genIfNode(LogicNode condition, FixedNode trueSuccessor, FixedNode falseSuccessor, double d) {
+ return new IfNode(condition, trueSuccessor, falseSuccessor, d);
}
protected void genThrow() {
@@ -1646,11 +1648,11 @@
private boolean forceInliningEverything;
@Override
- public void handleReplacedInvoke(InvokeKind invokeKind, ResolvedJavaMethod targetMethod, ValueNode[] args, boolean inlineEverything) {
+ public Invoke handleReplacedInvoke(InvokeKind invokeKind, ResolvedJavaMethod targetMethod, ValueNode[] args, boolean inlineEverything) {
boolean previous = forceInliningEverything;
forceInliningEverything = previous || inlineEverything;
try {
- appendInvoke(invokeKind, targetMethod, args);
+ return appendInvoke(invokeKind, targetMethod, args);
} finally {
forceInliningEverything = previous;
}
@@ -1720,7 +1722,6 @@
}
}
if (invokeKind.isDirect()) {
-
inlineInfo = tryInline(args, targetMethod);
if (inlineInfo == SUCCESSFULLY_INLINED) {
return null;
@@ -2320,7 +2321,7 @@
}
return false;
}
- if (canInlinePartialIntrinsicExit() && InlinePartialIntrinsicExitDuringParsing.getValue(options)) {
+ if (canInlinePartialIntrinsicExit() && InlinePartialIntrinsicExitDuringParsing.getValue(options) && !IS_BUILDING_NATIVE_IMAGE) {
// Otherwise inline the original method. Any frame state created
// during the inlining will exclude frame(s) in the
// intrinsic method (see FrameStateBuilder.create(int bci)).
@@ -2540,6 +2541,7 @@
protected void genReturn(ValueNode returnVal, JavaKind returnKind) {
if (parsingIntrinsic() && returnVal != null) {
+
if (returnVal instanceof StateSplit) {
StateSplit stateSplit = (StateSplit) returnVal;
FrameState stateAfter = stateSplit.stateAfter();
@@ -2548,7 +2550,20 @@
if (stateAfter.bci == BytecodeFrame.AFTER_BCI) {
assert stateAfter.usages().count() == 1;
assert stateAfter.usages().first() == stateSplit;
- stateAfter.replaceAtUsages(graph.add(new FrameState(BytecodeFrame.AFTER_BCI, returnVal)));
+ FrameState state;
+ if (returnVal.getStackKind() == JavaKind.Illegal) {
+ // This should only occur when Fold and NodeIntrinsic plugins are
+ // deferred. Their return value might not be a Java type and in that
+ // case this can't be the final AFTER_BCI so just create a FrameState
+ // without a return value on the top of stack.
+ assert stateSplit instanceof Invoke;
+ ResolvedJavaMethod targetMethod = ((Invoke) stateSplit).getTargetMethod();
+ assert targetMethod != null && (targetMethod.getAnnotation(Fold.class) != null || targetMethod.getAnnotation(Node.NodeIntrinsic.class) != null);
+ state = new FrameState(BytecodeFrame.AFTER_BCI);
+ } else {
+ state = new FrameState(BytecodeFrame.AFTER_BCI, returnVal);
+ }
+ stateAfter.replaceAtUsages(graph.add(state));
GraphUtil.killWithUnusedFloatingInputs(stateAfter);
} else {
/*
@@ -3395,26 +3410,44 @@
condition = genUnique(condition);
}
- NodeSourcePosition currentPosition = graph.currentNodeSourcePosition();
+ BciBlock deoptBlock = null;
+ BciBlock noDeoptBlock = null;
if (isNeverExecutedCode(probability)) {
- NodeSourcePosition survivingSuccessorPosition = graph.trackNodeSourcePosition()
- ? new NodeSourcePosition(currentPosition.getCaller(), currentPosition.getMethod(), falseBlock.startBci)
- : null;
- append(new FixedGuardNode(condition, UnreachedCode, InvalidateReprofile, true, survivingSuccessorPosition));
- if (profilingPlugin != null && profilingPlugin.shouldProfile(this, method)) {
- profilingPlugin.profileGoto(this, method, bci(), falseBlock.startBci, stateBefore);
+ deoptBlock = trueBlock;
+ noDeoptBlock = falseBlock;
+ } else if (isNeverExecutedCode(1 - probability)) {
+ deoptBlock = falseBlock;
+ noDeoptBlock = trueBlock;
+ }
+
+ if (deoptBlock != null) {
+ NodeSourcePosition currentPosition = graph.currentNodeSourcePosition();
+ NodeSourcePosition survivingSuccessorPosition = null;
+ if (graph.trackNodeSourcePosition()) {
+ survivingSuccessorPosition = new NodeSourcePosition(currentPosition.getCaller(), currentPosition.getMethod(), noDeoptBlock.startBci);
}
- appendGoto(falseBlock);
- return;
- } else if (isNeverExecutedCode(1 - probability)) {
- NodeSourcePosition survivingSuccessorPosition = graph.trackNodeSourcePosition()
- ? new NodeSourcePosition(currentPosition.getCaller(), currentPosition.getMethod(), trueBlock.startBci)
- : null;
- append(new FixedGuardNode(condition, UnreachedCode, InvalidateReprofile, false, survivingSuccessorPosition));
- if (profilingPlugin != null && profilingPlugin.shouldProfile(this, method)) {
- profilingPlugin.profileGoto(this, method, bci(), trueBlock.startBci, stateBefore);
+ boolean negated = deoptBlock == trueBlock;
+ if (!isPotentialCountedLoopExit(condition, deoptBlock)) {
+ if (profilingPlugin != null && profilingPlugin.shouldProfile(this, method)) {
+ profilingPlugin.profileGoto(this, method, bci(), noDeoptBlock.startBci, stateBefore);
+ }
+ append(new FixedGuardNode(condition, UnreachedCode, InvalidateReprofile, negated, survivingSuccessorPosition));
+ appendGoto(noDeoptBlock);
+ } else {
+ this.controlFlowSplit = true;
+ FixedNode noDeoptSuccessor = createTarget(noDeoptBlock, frameState, false, true);
+ DeoptimizeNode deopt = graph.add(new DeoptimizeNode(InvalidateReprofile, UnreachedCode));
+ /*
+ * We do not want to `checkLoopExit` here: otherwise the deopt will go to the
+ * deoptBlock's BCI, skipping the branch in the interpreter, and the profile
+ * will never see that the branch is taken. This can lead to deopt loops or OSR
+ * failure.
+ */
+ FixedNode deoptSuccessor = BeginNode.begin(deopt);
+ ValueNode ifNode = genIfNode(condition, negated ? deoptSuccessor : noDeoptSuccessor, negated ? noDeoptSuccessor : deoptSuccessor, negated ? 1 - probability : probability);
+ postProcessIfNode(ifNode);
+ append(ifNode);
}
- appendGoto(trueBlock);
return;
}
@@ -3442,6 +3475,16 @@
}
}
+ public boolean isPotentialCountedLoopExit(LogicNode condition, BciBlock target) {
+ if (currentBlock != null) {
+ long exits = currentBlock.loops & ~target.loops;
+ if (exits != 0) {
+ return condition instanceof CompareNode;
+ }
+ }
+ return false;
+ }
+
/**
* Hook for subclasses to decide whether the IfNode probability should be complemented during
* conversion to Graal IR.
@@ -3953,7 +3996,7 @@
private String unresolvedMethodAssertionMessage(JavaMethod result) {
String message = result.format("%H.%n(%P)%R");
- if (GraalServices.Java8OrEarlier) {
+ if (JavaVersionUtil.Java8OrEarlier) {
JavaType declaringClass = result.getDeclaringClass();
String className = declaringClass.getName();
switch (className) {
@@ -4214,13 +4257,10 @@
return;
}
- ResolvedJavaType[] skippedExceptionTypes = this.graphBuilderConfig.getSkippedExceptionTypes();
- if (skippedExceptionTypes != null) {
- for (ResolvedJavaType exceptionType : skippedExceptionTypes) {
- if (exceptionType.isAssignableFrom(resolvedType)) {
- append(new DeoptimizeNode(DeoptimizationAction.InvalidateRecompile, RuntimeConstraint));
- return;
- }
+ for (ResolvedJavaType exceptionType : this.graphBuilderConfig.getSkippedExceptionTypes()) {
+ if (exceptionType.isAssignableFrom(resolvedType)) {
+ append(new DeoptimizeNode(DeoptimizationAction.InvalidateRecompile, RuntimeConstraint));
+ return;
}
}
@@ -4513,9 +4553,13 @@
* Javac does not allow use of "$assertionsDisabled" for a field name but Eclipse does, in
* which case a suffix is added to the generated field.
*/
- if ((parsingIntrinsic() || graphBuilderConfig.omitAssertions()) && resolvedField.isSynthetic() && resolvedField.getName().startsWith("$assertionsDisabled")) {
- frameState.push(field.getJavaKind(), ConstantNode.forBoolean(true, graph));
- return;
+ if (resolvedField.isSynthetic() && resolvedField.getName().startsWith("$assertionsDisabled")) {
+ if (parsingIntrinsic()) {
+ throw new GraalError("Cannot use an assertion within the context of an intrinsic.");
+ } else if (graphBuilderConfig.omitAssertions()) {
+ frameState.push(field.getJavaKind(), ConstantNode.forBoolean(true, graph));
+ return;
+ }
}
ResolvedJavaType holder = resolvedField.getDeclaringClass();
--- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.java/src/org/graalvm/compiler/java/IntegerExactOpSpeculation.java Tue Mar 12 09:49:10 2019 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,62 +0,0 @@
-/*
- * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved.
- * 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.
- */
-
-
-package org.graalvm.compiler.java;
-
-import jdk.vm.ci.meta.ResolvedJavaMethod;
-import jdk.vm.ci.meta.SpeculationLog.SpeculationReason;
-
-public final class IntegerExactOpSpeculation implements SpeculationReason {
-
- public enum IntegerExactOp {
- INTEGER_ADD_EXACT,
- INTEGER_INCREMENT_EXACT,
- INTEGER_SUBTRACT_EXACT,
- INTEGER_DECREMENT_EXACT,
- INTEGER_MULTIPLY_EXACT
- }
-
- protected final String methodDescriptor;
- protected final IntegerExactOp op;
-
- public IntegerExactOpSpeculation(ResolvedJavaMethod method, IntegerExactOp op) {
- this.methodDescriptor = method.format("%H.%n(%p)%R");
- this.op = op;
- }
-
- @Override
- public int hashCode() {
- return methodDescriptor.hashCode() * 31 + op.ordinal();
- }
-
- @Override
- public boolean equals(Object obj) {
- if (obj instanceof IntegerExactOpSpeculation) {
- IntegerExactOpSpeculation other = (IntegerExactOpSpeculation) obj;
- return op.equals(other.op) && methodDescriptor.equals(other.methodDescriptor);
- }
- return false;
- }
-
-}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/optimize/IfNodeCanonicalizationsTest.java Sat Mar 16 21:00:45 2019 +0000
@@ -0,0 +1,366 @@
+/*
+ * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved.
+ * 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.
+ */
+
+
+package org.graalvm.compiler.jtt.optimize;
+
+import static org.junit.runners.Parameterized.Parameter;
+import static org.junit.runners.Parameterized.Parameters;
+
+import java.lang.reflect.Method;
+import java.lang.reflect.Modifier;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.List;
+
+import org.graalvm.compiler.jtt.JTTTest;
+import org.graalvm.compiler.nodes.ValueNode;
+import org.graalvm.compiler.nodes.graphbuilderconf.GraphBuilderContext;
+import org.graalvm.compiler.nodes.graphbuilderconf.InlineInvokePlugin;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.junit.runners.Parameterized;
+
+import jdk.vm.ci.meta.ResolvedJavaMethod;
+
+@RunWith(Parameterized.class)
+public class IfNodeCanonicalizationsTest extends JTTTest {
+
+ @Override
+ protected InlineInvokePlugin.InlineInfo bytecodeParserShouldInlineInvoke(GraphBuilderContext b, ResolvedJavaMethod method, ValueNode[] args) {
+ if (method.getDeclaringClass().getUnqualifiedName().equals(IfNodeCanonicalizationsTest.class.getSimpleName()) && method.getName().startsWith("compare")) {
+ return InlineInvokePlugin.InlineInfo.createStandardInlineInfo(method);
+ }
+ return super.bytecodeParserShouldInlineInvoke(b, method, args);
+ }
+
+ @Parameter(value = 0) public String testName;
+ @Parameter(value = 1) public int x;
+ @Parameter(value = 2) public int y;
+
+ public static int compare0(int a, int b) {
+ return (a < b) ? 1 : ((a < b) ? 2 : 3);
+ }
+
+ public static int compare1(int a, int b) {
+ return (a < b) ? ((a < b) ? 1 : 2) : 3;
+ }
+
+ public static int compare2(int a, int b) {
+ return (a < b) ? 1 : ((a > b) ? 2 : 3);
+ }
+
+ public static int compare3(int a, int b) {
+ return (a < b) ? ((a > b) ? 1 : 2) : 3;
+ }
+
+ public static int compare4(int a, int b) {
+ return (a < b) ? 1 : ((a <= b) ? 2 : 3);
+ }
+
+ public static int compare5(int a, int b) {
+ return (a < b) ? ((a <= b) ? 1 : 2) : 3;
+ }
+
+ public static int compare6(int a, int b) {
+ return (a < b) ? 1 : ((a >= b) ? 2 : 3);
+ }
+
+ public static int compare7(int a, int b) {
+ return (a < b) ? ((a >= b) ? 1 : 2) : 3;
+ }
+
+ public static int compare8(int a, int b) {
+ return (a < b) ? 1 : ((a == b) ? 2 : 3);
+ }
+
+ public static int compare9(int a, int b) {
+ return (a < b) ? ((a == b) ? 1 : 2) : 3;
+ }
+
+ public static int compare10(int a, int b) {
+ return (a < b) ? 1 : ((a != b) ? 2 : 3);
+ }
+
+ public static int compare11(int a, int b) {
+ return (a < b) ? ((a != b) ? 1 : 2) : 3;
+ }
+
+ public static int compare12(int a, int b) {
+ return (a > b) ? 1 : ((a < b) ? 2 : 3);
+ }
+
+ public static int compare13(int a, int b) {
+ return (a > b) ? ((a < b) ? 1 : 2) : 3;
+ }
+
+ public static int compare14(int a, int b) {
+ return (a > b) ? 1 : ((a > b) ? 2 : 3);
+ }
+
+ public static int compare15(int a, int b) {
+ return (a > b) ? ((a > b) ? 1 : 2) : 3;
+ }
+
+ public static int compare16(int a, int b) {
+ return (a > b) ? 1 : ((a <= b) ? 2 : 3);
+ }
+
+ public static int compare17(int a, int b) {
+ return (a > b) ? ((a <= b) ? 1 : 2) : 3;
+ }
+
+ public static int compare18(int a, int b) {
+ return (a > b) ? 1 : ((a >= b) ? 2 : 3);
+ }
+
+ public static int compare19(int a, int b) {
+ return (a > b) ? ((a >= b) ? 1 : 2) : 3;
+ }
+
+ public static int compare20(int a, int b) {
+ return (a > b) ? 1 : ((a == b) ? 2 : 3);
+ }
+
+ public static int compare21(int a, int b) {
+ return (a > b) ? ((a == b) ? 1 : 2) : 3;
+ }
+
+ public static int compare22(int a, int b) {
+ return (a > b) ? 1 : ((a != b) ? 2 : 3);
+ }
+
+ public static int compare23(int a, int b) {
+ return (a > b) ? ((a != b) ? 1 : 2) : 3;
+ }
+
+ public static int compare24(int a, int b) {
+ return (a <= b) ? 1 : ((a < b) ? 2 : 3);
+ }
+
+ public static int compare25(int a, int b) {
+ return (a <= b) ? ((a < b) ? 1 : 2) : 3;
+ }
+
+ public static int compare26(int a, int b) {
+ return (a <= b) ? 1 : ((a > b) ? 2 : 3);
+ }
+
+ public static int compare27(int a, int b) {
+ return (a <= b) ? ((a > b) ? 1 : 2) : 3;
+ }
+
+ public static int compare28(int a, int b) {
+ return (a <= b) ? 1 : ((a <= b) ? 2 : 3);
+ }
+
+ public static int compare29(int a, int b) {
+ return (a <= b) ? ((a <= b) ? 1 : 2) : 3;
+ }
+
+ public static int compare30(int a, int b) {
+ return (a <= b) ? 1 : ((a >= b) ? 2 : 3);
+ }
+
+ public static int compare31(int a, int b) {
+ return (a <= b) ? ((a >= b) ? 1 : 2) : 3;
+ }
+
+ public static int compare32(int a, int b) {
+ return (a <= b) ? 1 : ((a == b) ? 2 : 3);
+ }
+
+ public static int compare33(int a, int b) {
+ return (a <= b) ? ((a == b) ? 1 : 2) : 3;
+ }
+
+ public static int compare34(int a, int b) {
+ return (a <= b) ? 1 : ((a != b) ? 2 : 3);
+ }
+
+ public static int compare35(int a, int b) {
+ return (a <= b) ? ((a != b) ? 1 : 2) : 3;
+ }
+
+ public static int compare36(int a, int b) {
+ return (a >= b) ? 1 : ((a < b) ? 2 : 3);
+ }
+
+ public static int compare37(int a, int b) {
+ return (a >= b) ? ((a < b) ? 1 : 2) : 3;
+ }
+
+ public static int compare38(int a, int b) {
+ return (a >= b) ? 1 : ((a > b) ? 2 : 3);
+ }
+
+ public static int compare39(int a, int b) {
+ return (a >= b) ? ((a > b) ? 1 : 2) : 3;
+ }
+
+ public static int compare40(int a, int b) {
+ return (a >= b) ? 1 : ((a <= b) ? 2 : 3);
+ }
+
+ public static int compare41(int a, int b) {
+ return (a >= b) ? ((a <= b) ? 1 : 2) : 3;
+ }
+
+ public static int compare42(int a, int b) {
+ return (a >= b) ? 1 : ((a >= b) ? 2 : 3);
+ }
+
+ public static int compare43(int a, int b) {
+ return (a >= b) ? ((a >= b) ? 1 : 2) : 3;
+ }
+
+ public static int compare44(int a, int b) {
+ return (a >= b) ? 1 : ((a == b) ? 2 : 3);
+ }
+
+ public static int compare45(int a, int b) {
+ return (a >= b) ? ((a == b) ? 1 : 2) : 3;
+ }
+
+ public static int compare46(int a, int b) {
+ return (a >= b) ? 1 : ((a != b) ? 2 : 3);
+ }
+
+ public static int compare47(int a, int b) {
+ return (a >= b) ? ((a != b) ? 1 : 2) : 3;
+ }
+
+ public static int compare48(int a, int b) {
+ return (a == b) ? 1 : ((a < b) ? 2 : 3);
+ }
+
+ public static int compare49(int a, int b) {
+ return (a == b) ? ((a < b) ? 1 : 2) : 3;
+ }
+
+ public static int compare50(int a, int b) {
+ return (a == b) ? 1 : ((a > b) ? 2 : 3);
+ }
+
+ public static int compare51(int a, int b) {
+ return (a == b) ? ((a > b) ? 1 : 2) : 3;
+ }
+
+ public static int compare52(int a, int b) {
+ return (a == b) ? 1 : ((a <= b) ? 2 : 3);
+ }
+
+ public static int compare53(int a, int b) {
+ return (a == b) ? ((a <= b) ? 1 : 2) : 3;
+ }
+
+ public static int compare54(int a, int b) {
+ return (a == b) ? 1 : ((a >= b) ? 2 : 3);
+ }
+
+ public static int compare55(int a, int b) {
+ return (a == b) ? ((a >= b) ? 1 : 2) : 3;
+ }
+
+ public static int compare56(int a, int b) {
+ return (a == b) ? 1 : ((a == b) ? 2 : 3);
+ }
+
+ public static int compare57(int a, int b) {
+ return (a == b) ? ((a == b) ? 1 : 2) : 3;
+ }
+
+ public static int compare58(int a, int b) {
+ return (a == b) ? 1 : ((a != b) ? 2 : 3);
+ }
+
+ public static int compare59(int a, int b) {
+ return (a == b) ? ((a != b) ? 1 : 2) : 3;
+ }
+
+ public static int compare60(int a, int b) {
+ return (a != b) ? 1 : ((a < b) ? 2 : 3);
+ }
+
+ public static int compare61(int a, int b) {
+ return (a != b) ? ((a < b) ? 1 : 2) : 3;
+ }
+
+ public static int compare62(int a, int b) {
+ return (a != b) ? 1 : ((a > b) ? 2 : 3);
+ }
+
+ public static int compare63(int a, int b) {
+ return (a != b) ? ((a > b) ? 1 : 2) : 3;
+ }
+
+ public static int compare64(int a, int b) {
+ return (a != b) ? 1 : ((a <= b) ? 2 : 3);
+ }
+
+ public static int compare65(int a, int b) {
+ return (a != b) ? ((a <= b) ? 1 : 2) : 3;
+ }
+
+ public static int compare66(int a, int b) {
+ return (a != b) ? 1 : ((a >= b) ? 2 : 3);
+ }
+
+ public static int compare67(int a, int b) {
+ return (a != b) ? ((a >= b) ? 1 : 2) : 3;
+ }
+
+ public static int compare68(int a, int b) {
+ return (a != b) ? 1 : ((a == b) ? 2 : 3);
+ }
+
+ public static int compare69(int a, int b) {
+ return (a != b) ? ((a == b) ? 1 : 2) : 3;
+ }
+
+ public static int compare70(int a, int b) {
+ return (a != b) ? 1 : ((a != b) ? 2 : 3);
+ }
+
+ public static int compare71(int a, int b) {
+ return (a != b) ? ((a != b) ? 1 : 2) : 3;
+ }
+
+ @Test
+ public void runNamedTest() {
+ runTest(testName, x, y);
+ }
+
+ @Parameters(name = "{0}(a = {1}, b = {2})")
+ public static Collection<Object[]> data() {
+ List<Object[]> tests = new ArrayList<>();
+ for (Method m : IfNodeCanonicalizationsTest.class.getDeclaredMethods()) {
+ if (m.getName().startsWith("compare") && Modifier.isStatic(m.getModifiers())) {
+ tests.add(new Object[]{m.getName(), 0, 0});
+ tests.add(new Object[]{m.getName(), 0, 1});
+ tests.add(new Object[]{m.getName(), 1, 0});
+ }
+ }
+ return tests;
+ }
+}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/optimize/SwitchHashTableTest.java Sat Mar 16 21:00:45 2019 +0000
@@ -0,0 +1,635 @@
+/*
+ * 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.
+ */
+
+
+package org.graalvm.compiler.jtt.optimize;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Random;
+import java.util.Set;
+import java.util.stream.Collectors;
+
+import org.graalvm.compiler.jtt.JTTTest;
+import org.graalvm.compiler.lir.hashing.HashFunction;
+import org.graalvm.compiler.lir.hashing.Hasher;
+import org.junit.Test;
+
+import jdk.vm.ci.meta.JavaConstant;
+
+/*
+ * Tests optimization of hash table switches.
+ * Code generated by `SwitchHashTableTest.TestGenerator.main`
+ */
+public class SwitchHashTableTest extends JTTTest {
+ @Test
+ public void checkHashFunctionInstances() {
+ List<String> coveredByTestCases = Arrays.asList("val >> min", "val", "val >> (val & min)", "(val >> min) ^ val", "val - min", "rotateRight(val, prime)", "rotateRight(val, prime) ^ val",
+ "rotateRight(val, prime) + val", "(val >> min) * val", "(val * prime) >> min");
+ Set<String> functions = HashFunction.instances().stream().map(Object::toString).collect(Collectors.toSet());
+ functions.removeAll(coveredByTestCases);
+ assertTrue("The following hash functions are not covered by the `Switch03` test: " + functions +
+ ". Re-run the `Switch03.TestGenerator.main` and update the test class.", functions.isEmpty());
+ }
+
+ // Hasher[function=rotateRight(val, prime), effort=4, cardinality=16]
+ public static int test1(int arg) {
+ switch (arg) {
+ case 3080012:
+ return 3080012;
+ case 3080017:
+ return 3080017;
+ case 3080029:
+ return 3080029;
+ case 3080037:
+ return 3080037;
+ case 3080040:
+ return 3080040;
+ case 3080054:
+ return 3080054;
+ case 3080060:
+ return 3080060;
+ case 3080065:
+ return 3080065;
+ case 3080073:
+ return 3080073;
+ case 3080082:
+ return 3080082;
+ case 3080095:
+ return 3080095;
+ case 3080103:
+ return 3080103;
+ case 3080116:
+ return 3080116;
+ case 3080127:
+ return 3080127;
+ case 3080130:
+ return 3080130;
+ default:
+ return -1;
+ }
+ }
+
+ @Test
+ public void run1() throws Throwable {
+ runTest("test1", 0); // zero
+ runTest("test1", 3080011); // bellow
+ runTest("test1", 3080012); // first
+ runTest("test1", 3080065); // middle
+ runTest("test1", 3080130); // last
+ runTest("test1", 3080131); // above
+ runTest("test1", 3080013); // miss
+ }
+
+ // Hasher[function=rotateRight(val, prime) ^ val, effort=5, cardinality=28]
+ public static int test2(int arg) {
+ switch (arg) {
+ case 718707335:
+ return 718707335;
+ case 718707336:
+ return 718707336;
+ case 718707347:
+ return 718707347;
+ case 718707359:
+ return 718707359;
+ case 718707366:
+ return 718707366;
+ case 718707375:
+ return 718707375;
+ case 718707378:
+ return 718707378;
+ case 718707386:
+ return 718707386;
+ case 718707396:
+ return 718707396;
+ case 718707401:
+ return 718707401;
+ case 718707408:
+ return 718707408;
+ case 718707409:
+ return 718707409;
+ case 718707420:
+ return 718707420;
+ case 718707431:
+ return 718707431;
+ case 718707436:
+ return 718707436;
+ default:
+ return -1;
+ }
+ }
+
+ @Test
+ public void run2() throws Throwable {
+ runTest("test2", 0); // zero
+ runTest("test2", 718707334); // bellow
+ runTest("test2", 718707335); // first
+ runTest("test2", 718707386); // middle
+ runTest("test2", 718707436); // last
+ runTest("test2", 718707437); // above
+ runTest("test2", 718707337); // miss
+ }
+
+ // Hasher[function=(val * prime) >> min, effort=4, cardinality=16]
+ public static int test3(int arg) {
+ switch (arg) {
+ case 880488712:
+ return 880488712;
+ case 880488723:
+ return 880488723;
+ case 880488737:
+ return 880488737;
+ case 880488744:
+ return 880488744;
+ case 880488752:
+ return 880488752;
+ case 880488757:
+ return 880488757;
+ case 880488767:
+ return 880488767;
+ case 880488777:
+ return 880488777;
+ case 880488781:
+ return 880488781;
+ case 880488794:
+ return 880488794;
+ case 880488795:
+ return 880488795;
+ case 880488807:
+ return 880488807;
+ case 880488814:
+ return 880488814;
+ case 880488821:
+ return 880488821;
+ case 880488831:
+ return 880488831;
+ default:
+ return -1;
+ }
+ }
+
+ @Test
+ public void run3() throws Throwable {
+ runTest("test3", 0); // zero
+ runTest("test3", 880488711); // bellow
+ runTest("test3", 880488712); // first
+ runTest("test3", 880488777); // middle
+ runTest("test3", 880488831); // last
+ runTest("test3", 880488832); // above
+ runTest("test3", 880488713); // miss
+ }
+
+ // Hasher[function=rotateRight(val, prime) + val, effort=5, cardinality=28]
+ public static int test4(int arg) {
+ switch (arg) {
+ case 189404658:
+ return 189404658;
+ case 189404671:
+ return 189404671;
+ case 189404678:
+ return 189404678;
+ case 189404680:
+ return 189404680;
+ case 189404687:
+ return 189404687;
+ case 189404698:
+ return 189404698;
+ case 189404699:
+ return 189404699;
+ case 189404711:
+ return 189404711;
+ case 189404724:
+ return 189404724;
+ case 189404725:
+ return 189404725;
+ case 189404732:
+ return 189404732;
+ case 189404739:
+ return 189404739;
+ case 189404748:
+ return 189404748;
+ case 189404754:
+ return 189404754;
+ case 189404765:
+ return 189404765;
+ default:
+ return -1;
+ }
+ }
+
+ @Test
+ public void run4() throws Throwable {
+ runTest("test4", 0); // zero
+ runTest("test4", 189404657); // bellow
+ runTest("test4", 189404658); // first
+ runTest("test4", 189404711); // middle
+ runTest("test4", 189404765); // last
+ runTest("test4", 189404766); // above
+ runTest("test4", 189404659); // miss
+ }
+
+ // Hasher[function=val - min, effort=2, cardinality=24]
+ public static int test5(int arg) {
+ switch (arg) {
+ case 527674226:
+ return 527674226;
+ case 527674235:
+ return 527674235;
+ case 527674236:
+ return 527674236;
+ case 527674247:
+ return 527674247;
+ case 527674251:
+ return 527674251;
+ case 527674253:
+ return 527674253;
+ case 527674257:
+ return 527674257;
+ case 527674263:
+ return 527674263;
+ case 527674265:
+ return 527674265;
+ case 527674272:
+ return 527674272;
+ case 527674286:
+ return 527674286;
+ case 527674293:
+ return 527674293;
+ case 527674294:
+ return 527674294;
+ case 527674306:
+ return 527674306;
+ case 527674308:
+ return 527674308;
+ default:
+ return -1;
+ }
+ }
+
+ @Test
+ public void run5() throws Throwable {
+ runTest("test5", 0); // zero
+ runTest("test5", 527674225); // bellow
+ runTest("test5", 527674226); // first
+ runTest("test5", 527674263); // middle
+ runTest("test5", 527674308); // last
+ runTest("test5", 527674309); // above
+ runTest("test5", 527674227); // miss
+ }
+
+ // Hasher[function=val, effort=1, cardinality=24]
+ public static int test6(int arg) {
+ switch (arg) {
+ case 676979121:
+ return 676979121;
+ case 676979128:
+ return 676979128;
+ case 676979135:
+ return 676979135;
+ case 676979146:
+ return 676979146;
+ case 676979148:
+ return 676979148;
+ case 676979156:
+ return 676979156;
+ case 676979158:
+ return 676979158;
+ case 676979169:
+ return 676979169;
+ case 676979175:
+ return 676979175;
+ case 676979179:
+ return 676979179;
+ case 676979182:
+ return 676979182;
+ case 676979194:
+ return 676979194;
+ case 676979200:
+ return 676979200;
+ case 676979205:
+ return 676979205;
+ case 676979219:
+ return 676979219;
+ default:
+ return -1;
+ }
+ }
+
+ @Test
+ public void run6() throws Throwable {
+ runTest("test6", 0); // zero
+ runTest("test6", 676979120); // bellow
+ runTest("test6", 676979121); // first
+ runTest("test6", 676979169); // middle
+ runTest("test6", 676979219); // last
+ runTest("test6", 676979220); // above
+ runTest("test6", 676979122); // miss
+ }
+
+ // Hasher[function=(val >> min) ^ val, effort=3, cardinality=16]
+ public static int test7(int arg) {
+ switch (arg) {
+ case 634218696:
+ return 634218696;
+ case 634218710:
+ return 634218710;
+ case 634218715:
+ return 634218715;
+ case 634218720:
+ return 634218720;
+ case 634218724:
+ return 634218724;
+ case 634218732:
+ return 634218732;
+ case 634218737:
+ return 634218737;
+ case 634218749:
+ return 634218749;
+ case 634218751:
+ return 634218751;
+ case 634218758:
+ return 634218758;
+ case 634218767:
+ return 634218767;
+ case 634218772:
+ return 634218772;
+ case 634218786:
+ return 634218786;
+ case 634218792:
+ return 634218792;
+ case 634218795:
+ return 634218795;
+ default:
+ return -1;
+ }
+ }
+
+ @Test
+ public void run7() throws Throwable {
+ runTest("test7", 0); // zero
+ runTest("test7", 634218695); // bellow
+ runTest("test7", 634218696); // first
+ runTest("test7", 634218749); // middle
+ runTest("test7", 634218795); // last
+ runTest("test7", 634218796); // above
+ runTest("test7", 634218697); // miss
+ }
+
+ // Hasher[function=val >> min, effort=2, cardinality=16]
+ public static int test8(int arg) {
+ switch (arg) {
+ case 473982403:
+ return 473982403;
+ case 473982413:
+ return 473982413;
+ case 473982416:
+ return 473982416;
+ case 473982425:
+ return 473982425;
+ case 473982439:
+ return 473982439;
+ case 473982445:
+ return 473982445;
+ case 473982459:
+ return 473982459;
+ case 473982468:
+ return 473982468;
+ case 473982479:
+ return 473982479;
+ case 473982482:
+ return 473982482;
+ case 473982494:
+ return 473982494;
+ case 473982501:
+ return 473982501;
+ case 473982505:
+ return 473982505;
+ case 473982519:
+ return 473982519;
+ case 473982523:
+ return 473982523;
+ default:
+ return -1;
+ }
+ }
+
+ @Test
+ public void run8() throws Throwable {
+ runTest("test8", 0); // zero
+ runTest("test8", 473982402); // bellow
+ runTest("test8", 473982403); // first
+ runTest("test8", 473982468); // middle
+ runTest("test8", 473982523); // last
+ runTest("test8", 473982524); // above
+ runTest("test8", 473982404); // miss
+ }
+
+ // Hasher[function=val >> (val & min), effort=3, cardinality=16]
+ public static int test9(int arg) {
+ switch (arg) {
+ case 15745090:
+ return 15745090;
+ case 15745093:
+ return 15745093;
+ case 15745102:
+ return 15745102;
+ case 15745108:
+ return 15745108;
+ case 15745122:
+ return 15745122;
+ case 15745131:
+ return 15745131;
+ case 15745132:
+ return 15745132;
+ case 15745146:
+ return 15745146;
+ case 15745151:
+ return 15745151;
+ case 15745163:
+ return 15745163;
+ case 15745169:
+ return 15745169;
+ case 15745182:
+ return 15745182;
+ case 15745191:
+ return 15745191;
+ case 15745198:
+ return 15745198;
+ case 15745207:
+ return 15745207;
+ default:
+ return -1;
+ }
+ }
+
+ @Test
+ public void run9() throws Throwable {
+ runTest("test9", 0); // zero
+ runTest("test9", 15745089); // bellow
+ runTest("test9", 15745090); // first
+ runTest("test9", 15745146); // middle
+ runTest("test9", 15745207); // last
+ runTest("test9", 15745208); // above
+ runTest("test9", 15745091); // miss
+ }
+
+ // Hasher[function=(val >> min) * val, effort=4, cardinality=28]
+ public static int test10(int arg) {
+ switch (arg) {
+ case 989358996:
+ return 989358996;
+ case 989359010:
+ return 989359010;
+ case 989359022:
+ return 989359022;
+ case 989359030:
+ return 989359030;
+ case 989359038:
+ return 989359038;
+ case 989359047:
+ return 989359047;
+ case 989359053:
+ return 989359053;
+ case 989359059:
+ return 989359059;
+ case 989359061:
+ return 989359061;
+ case 989359072:
+ return 989359072;
+ case 989359073:
+ return 989359073;
+ case 989359087:
+ return 989359087;
+ case 989359097:
+ return 989359097;
+ case 989359099:
+ return 989359099;
+ case 989359108:
+ return 989359108;
+ default:
+ return -1;
+ }
+ }
+
+ @Test
+ public void run10() throws Throwable {
+ runTest("test10", 0); // zero
+ runTest("test10", 989358995); // bellow
+ runTest("test10", 989358996); // first
+ runTest("test10", 989359059); // middle
+ runTest("test10", 989359108); // last
+ runTest("test10", 989359109); // above
+ runTest("test10", 989358997); // miss
+ }
+
+ public static class TestGenerator {
+
+ private static int nextId = 0;
+ private static final int size = 15;
+ private static double minDensity = 0.5;
+
+ // test code generator
+ public static void main(String[] args) {
+
+ Random r = new Random(0);
+ Set<String> seen = new HashSet<>();
+ Set<String> all = HashFunction.instances().stream().map(Object::toString).collect(Collectors.toSet());
+
+ println("@Test");
+ println("public void checkHashFunctionInstances() {");
+ println(" List<String> coveredByTestCases = Arrays.asList(" + String.join(", ", all.stream().map(s -> "\"" + s + "\"").collect(Collectors.toSet())) + ");");
+ println(" Set<String> functions = HashFunction.instances().stream().map(Object::toString).collect(Collectors.toSet());");
+ println(" functions.removeAll(coveredByTestCases);");
+ println(" assertTrue(\"The following hash functions are not covered by the `Switch03` test: \" + functions +");
+ println(" \". Re-run the `Switch03.TestGenerator.main` and update the test class.\", functions.isEmpty());");
+ println("}");
+
+ while (seen.size() < all.size()) {
+ int v = r.nextInt(Integer.MAX_VALUE / 2);
+ List<Integer> keys = new ArrayList<>();
+ while (keys.size() < 15) {
+ keys.add(v);
+ v += r.nextInt(15);
+ }
+ keys.sort(Integer::compare);
+ double density = ((double) keys.size() + 1) / (keys.get(keys.size() - 1) - keys.get(0));
+ if (density < minDensity) {
+ Hasher.forKeys(toConstants(keys), minDensity).ifPresent(h -> {
+ String f = h.function().toString();
+ if (!seen.contains(f)) {
+ gen(keys, h);
+ seen.add(f);
+ }
+ });
+ }
+ }
+ }
+
+ private static void gen(List<Integer> keys, Hasher hasher) {
+ int id = ++nextId;
+
+ println("// " + hasher + "");
+ println("public static int test" + id + "(int arg) {");
+ println(" switch (arg) {");
+
+ for (Integer key : keys) {
+ println(" case " + key + ": return " + key + ";");
+ }
+
+ println(" default: return -1;");
+ println(" }");
+ println("}");
+
+ int miss = keys.get(0) + 1;
+ while (keys.contains(miss)) {
+ miss++;
+ }
+
+ println("@Test");
+ println("public void run" + id + "() throws Throwable {");
+ println(" runTest(\"test" + id + "\", 0); // zero ");
+ println(" runTest(\"test" + id + "\", " + (keys.get(0) - 1) + "); // bellow ");
+ println(" runTest(\"test" + id + "\", " + keys.get(0) + "); // first ");
+ println(" runTest(\"test" + id + "\", " + keys.get(size / 2) + "); // middle ");
+ println(" runTest(\"test" + id + "\", " + keys.get(size - 1) + "); // last ");
+ println(" runTest(\"test" + id + "\", " + (keys.get(size - 1) + 1) + "); // above ");
+ println(" runTest(\"test" + id + "\", " + miss + "); // miss ");
+ println("}");
+ }
+
+ private static void println(String s) {
+ System.out.println(s);
+ }
+
+ private static JavaConstant[] toConstants(List<Integer> keys) {
+ JavaConstant[] ckeys = new JavaConstant[keys.size()];
+
+ for (int i = 0; i < keys.size(); i++) {
+ ckeys[i] = JavaConstant.forInt(keys.get(i));
+ }
+ return ckeys;
+ }
+ }
+}
--- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir.aarch64/src/org/graalvm/compiler/lir/aarch64/AArch64Call.java Tue Mar 12 09:49:10 2019 +0000
+++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir.aarch64/src/org/graalvm/compiler/lir/aarch64/AArch64Call.java Sat Mar 16 21:00:45 2019 +0000
@@ -40,6 +40,7 @@
import org.graalvm.compiler.lir.LIRFrameState;
import org.graalvm.compiler.lir.LIRInstructionClass;
import org.graalvm.compiler.lir.Opcode;
+import org.graalvm.compiler.lir.StandardOp.LabelHoldingOp;
import org.graalvm.compiler.lir.asm.CompilationResultBuilder;
import jdk.vm.ci.code.Register;
@@ -126,7 +127,7 @@
}
}
- public abstract static class ForeignCallOp extends CallOp {
+ public abstract static class ForeignCallOp extends CallOp implements LabelHoldingOp {
protected final ForeignCallLinkage callTarget;
protected final Label label;
@@ -147,6 +148,11 @@
}
protected abstract void emitCall(CompilationResultBuilder crb, AArch64MacroAssembler masm);
+
+ @Override
+ public Label getLabel() {
+ return label;
+ }
}
@Opcode("NEAR_FOREIGN_CALL")
--- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir.aarch64/src/org/graalvm/compiler/lir/aarch64/AArch64ControlFlow.java Tue Mar 12 09:49:10 2019 +0000
+++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir.aarch64/src/org/graalvm/compiler/lir/aarch64/AArch64ControlFlow.java Sat Mar 16 21:00:45 2019 +0000
@@ -31,6 +31,7 @@
import java.util.function.Function;
+import jdk.vm.ci.meta.AllocatableValue;
import org.graalvm.compiler.asm.Label;
import org.graalvm.compiler.core.common.NumUtil;
import org.graalvm.compiler.asm.aarch64.AArch64Assembler;
@@ -59,53 +60,21 @@
public class AArch64ControlFlow {
- /**
- * Compares integer register to 0 and branches if condition is true. Condition may only be equal
- * or non-equal.
- */
- // TODO (das) where do we need this?
- // public static class CompareAndBranchOp extends AArch64LIRInstruction implements
- // StandardOp.BranchOp {
- // private final ConditionFlag condition;
- // private final LabelRef destination;
- // @Use({REG}) private Value x;
- //
- // public CompareAndBranchOp(Condition condition, LabelRef destination, Value x) {
- // assert condition == Condition.EQ || condition == Condition.NE;
- // assert ARMv8.isGpKind(x.getKind());
- // this.condition = condition == Condition.EQ ? ConditionFlag.EQ : ConditionFlag.NE;
- // this.destination = destination;
- // this.x = x;
- // }
- //
- // @Override
- // public void emitCode(CompilationResultBuilder crb, ARMv8MacroAssembler masm) {
- // int size = ARMv8.bitsize(x.getKind());
- // if (condition == ConditionFlag.EQ) {
- // masm.cbz(size, asRegister(x), destination.label());
- // } else {
- // masm.cbnz(size, asRegister(x), destination.label());
- // }
- // }
- // }
-
- public static class BranchOp extends AArch64BlockEndOp implements StandardOp.BranchOp {
- public static final LIRInstructionClass<BranchOp> TYPE = LIRInstructionClass.create(BranchOp.class);
-
- private final AArch64Assembler.ConditionFlag condition;
+ public abstract static class AbstractBranchOp extends AArch64BlockEndOp implements StandardOp.BranchOp {
private final LabelRef trueDestination;
private final LabelRef falseDestination;
private final double trueDestinationProbability;
- public BranchOp(AArch64Assembler.ConditionFlag condition, LabelRef trueDestination, LabelRef falseDestination, double trueDestinationProbability) {
- super(TYPE);
- this.condition = condition;
+ private AbstractBranchOp(LIRInstructionClass<? extends AbstractBranchOp> c, LabelRef trueDestination, LabelRef falseDestination, double trueDestinationProbability) {
+ super(c);
this.trueDestination = trueDestination;
this.falseDestination = falseDestination;
this.trueDestinationProbability = trueDestinationProbability;
}
+ protected abstract void emitBranch(CompilationResultBuilder crb, AArch64MacroAssembler masm, LabelRef target, boolean negate);
+
@Override
public void emitCode(CompilationResultBuilder crb, AArch64MacroAssembler masm) {
/*
@@ -115,18 +84,104 @@
* executing two instructions instead of one.
*/
if (crb.isSuccessorEdge(trueDestination)) {
- masm.branchConditionally(condition.negate(), falseDestination.label());
+ emitBranch(crb, masm, falseDestination, true);
} else if (crb.isSuccessorEdge(falseDestination)) {
- masm.branchConditionally(condition, trueDestination.label());
+ emitBranch(crb, masm, trueDestination, false);
} else if (trueDestinationProbability < 0.5) {
- masm.branchConditionally(condition.negate(), falseDestination.label());
+ emitBranch(crb, masm, falseDestination, true);
masm.jmp(trueDestination.label());
} else {
- masm.branchConditionally(condition, trueDestination.label());
+ emitBranch(crb, masm, trueDestination, false);
masm.jmp(falseDestination.label());
}
}
+ }
+ public static class BranchOp extends AbstractBranchOp implements StandardOp.BranchOp {
+ public static final LIRInstructionClass<BranchOp> TYPE = LIRInstructionClass.create(BranchOp.class);
+
+ private final AArch64Assembler.ConditionFlag condition;
+
+ public BranchOp(AArch64Assembler.ConditionFlag condition, LabelRef trueDestination, LabelRef falseDestination, double trueDestinationProbability) {
+ super(TYPE, trueDestination, falseDestination, trueDestinationProbability);
+ this.condition = condition;
+ }
+
+ @Override
+ protected void emitBranch(CompilationResultBuilder crb, AArch64MacroAssembler masm, LabelRef target, boolean negate) {
+ AArch64Assembler.ConditionFlag finalCond = negate ? condition.negate() : condition;
+ masm.branchConditionally(finalCond, target.label());
+ }
+ }
+
+ public static class CompareBranchZeroOp extends AbstractBranchOp implements StandardOp.BranchOp {
+ public static final LIRInstructionClass<CompareBranchZeroOp> TYPE = LIRInstructionClass.create(CompareBranchZeroOp.class);
+
+ @Use(REG) private AllocatableValue value;
+
+ public CompareBranchZeroOp(AllocatableValue value, LabelRef trueDestination, LabelRef falseDestination, double trueDestinationProbability) {
+ super(TYPE, trueDestination, falseDestination, trueDestinationProbability);
+ this.value = value;
+ }
+
+ @Override
+ protected void emitBranch(CompilationResultBuilder crb, AArch64MacroAssembler masm, LabelRef target, boolean negate) {
+ AArch64Kind kind = (AArch64Kind) this.value.getPlatformKind();
+ assert kind.isInteger();
+ int size = kind.getSizeInBytes() * Byte.SIZE;
+
+ if (negate) {
+ masm.cbnz(size, asRegister(this.value), target.label());
+ } else {
+ masm.cbz(size, asRegister(this.value), target.label());
+ }
+ }
+ }
+
+ public static class BitTestAndBranchOp extends AbstractBranchOp implements StandardOp.BranchOp {
+ public static final LIRInstructionClass<BitTestAndBranchOp> TYPE = LIRInstructionClass.create(BitTestAndBranchOp.class);
+
+ @Use protected AllocatableValue value;
+ private final int index;
+
+ public BitTestAndBranchOp(LabelRef trueDestination, LabelRef falseDestination, AllocatableValue value, double trueDestinationProbability, int index) {
+ super(TYPE, trueDestination, falseDestination, trueDestinationProbability);
+ this.value = value;
+ this.index = index;
+ }
+
+ @Override
+ protected void emitBranch(CompilationResultBuilder crb, AArch64MacroAssembler masm, LabelRef target, boolean negate) {
+ ConditionFlag cond = negate ? ConditionFlag.NE : ConditionFlag.EQ;
+ Label label = target.label();
+ boolean isFarBranch;
+
+ if (label.isBound()) {
+ isFarBranch = NumUtil.isSignedNbit(18, masm.position() - label.position());
+ } else {
+ // Max range of tbz is +-2^13 instructions. We estimate that each LIR instruction
+ // emits 2 AArch64 instructions on average. Thus we test for maximum 2^12 LIR
+ // instruction offset.
+ int maxLIRDistance = (1 << 12);
+ isFarBranch = !crb.labelWithinRange(this, label, maxLIRDistance);
+ }
+
+ if (isFarBranch) {
+ cond = cond.negate();
+ label = new Label();
+ }
+
+ if (cond == ConditionFlag.EQ) {
+ masm.tbz(asRegister(value), index, label);
+ } else {
+ masm.tbnz(asRegister(value), index, label);
+ }
+
+ if (isFarBranch) {
+ masm.jmp(target.label());
+ masm.bind(label);
+ }
+ }
}
@Opcode("CMOVE")
--- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir.aarch64/src/org/graalvm/compiler/lir/aarch64/AArch64Move.java Tue Mar 12 09:49:10 2019 +0000
+++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir.aarch64/src/org/graalvm/compiler/lir/aarch64/AArch64Move.java Sat Mar 16 21:00:45 2019 +0000
@@ -24,6 +24,13 @@
package org.graalvm.compiler.lir.aarch64;
+import static jdk.vm.ci.aarch64.AArch64.sp;
+import static jdk.vm.ci.aarch64.AArch64.zr;
+import static jdk.vm.ci.code.ValueUtil.asAllocatableValue;
+import static jdk.vm.ci.code.ValueUtil.asRegister;
+import static jdk.vm.ci.code.ValueUtil.asStackSlot;
+import static jdk.vm.ci.code.ValueUtil.isRegister;
+import static jdk.vm.ci.code.ValueUtil.isStackSlot;
import static org.graalvm.compiler.lir.LIRInstruction.OperandFlag.COMPOSITE;
import static org.graalvm.compiler.lir.LIRInstruction.OperandFlag.HINT;
import static org.graalvm.compiler.lir.LIRInstruction.OperandFlag.REG;
@@ -31,13 +38,6 @@
import static org.graalvm.compiler.lir.LIRInstruction.OperandFlag.UNINITIALIZED;
import static org.graalvm.compiler.lir.LIRValueUtil.asJavaConstant;
import static org.graalvm.compiler.lir.LIRValueUtil.isJavaConstant;
-import static jdk.vm.ci.aarch64.AArch64.sp;
-import static jdk.vm.ci.aarch64.AArch64.zr;
-import static jdk.vm.ci.code.ValueUtil.asAllocatableValue;
-import static jdk.vm.ci.code.ValueUtil.asRegister;
-import static jdk.vm.ci.code.ValueUtil.asStackSlot;
-import static jdk.vm.ci.code.ValueUtil.isRegister;
-import static jdk.vm.ci.code.ValueUtil.isStackSlot;
import org.graalvm.compiler.asm.aarch64.AArch64Address;
import org.graalvm.compiler.asm.aarch64.AArch64MacroAssembler;
@@ -56,6 +56,7 @@
import org.graalvm.compiler.lir.asm.CompilationResultBuilder;
import jdk.vm.ci.aarch64.AArch64Kind;
+import jdk.vm.ci.code.MemoryBarriers;
import jdk.vm.ci.code.Register;
import jdk.vm.ci.code.StackSlot;
import jdk.vm.ci.meta.AllocatableValue;
@@ -212,14 +213,20 @@
// a compiler bug which warns that crb is unused, and also
// warns that @SuppressWarnings("unused") is unnecessary.
public void emitCode(@SuppressWarnings("all") CompilationResultBuilder crb, AArch64MacroAssembler masm) {
- // As I understand it load acquire/store release have the same semantics as on IA64
- // and allow us to handle LoadStore, LoadLoad and StoreStore without an explicit
- // barrier.
- // But Graal support to figure out if a load/store is volatile is non-existant so for
- // now just use memory barriers everywhere.
- // if ((barrier & MemoryBarriers.STORE_LOAD) != 0) {
- masm.dmb(AArch64MacroAssembler.BarrierKind.ANY_ANY);
- // }
+ assert barriers >= MemoryBarriers.LOAD_LOAD && barriers <= (MemoryBarriers.STORE_STORE | MemoryBarriers.STORE_LOAD | MemoryBarriers.LOAD_STORE | MemoryBarriers.LOAD_LOAD);
+ switch (barriers) {
+ case MemoryBarriers.STORE_STORE:
+ masm.dmb(AArch64MacroAssembler.BarrierKind.STORE_STORE);
+ break;
+ case MemoryBarriers.LOAD_LOAD:
+ case MemoryBarriers.LOAD_STORE:
+ case MemoryBarriers.LOAD_LOAD | MemoryBarriers.LOAD_STORE:
+ masm.dmb(AArch64MacroAssembler.BarrierKind.LOAD_LOAD);
+ break;
+ default:
+ masm.dmb(AArch64MacroAssembler.BarrierKind.ANY_ANY);
+ break;
+ }
}
}
--- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir.amd64/src/org/graalvm/compiler/lir/amd64/AMD64ArrayEqualsOp.java Tue Mar 12 09:49:10 2019 +0000
+++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir.amd64/src/org/graalvm/compiler/lir/amd64/AMD64ArrayEqualsOp.java Sat Mar 16 21:00:45 2019 +0000
@@ -41,7 +41,7 @@
import org.graalvm.compiler.asm.amd64.AMD64MacroAssembler;
import org.graalvm.compiler.asm.amd64.AVXKind;
import org.graalvm.compiler.core.common.LIRKind;
-import org.graalvm.compiler.core.common.NumUtil;
+import org.graalvm.compiler.debug.GraalError;
import org.graalvm.compiler.lir.LIRInstructionClass;
import org.graalvm.compiler.lir.Opcode;
import org.graalvm.compiler.lir.asm.CompilationResultBuilder;
@@ -51,18 +51,29 @@
import static org.graalvm.compiler.lir.LIRInstruction.OperandFlag.ILLEGAL;
import static org.graalvm.compiler.lir.LIRInstruction.OperandFlag.REG;
+import java.util.Objects;
+
/**
* Emits code which compares two arrays of the same length. If the CPU supports any vector
* instructions specialized code is emitted to leverage these instructions.
+ *
+ * This op can also compare arrays of different integer types (e.g. {@code byte[]} and
+ * {@code char[]}) with on-the-fly sign- or zero-extension. If one of the given arrays is a
+ * {@code char[]} array, the smaller elements are zero-extended, otherwise they are sign-extended.
*/
@Opcode("ARRAY_EQUALS")
public final class AMD64ArrayEqualsOp extends AMD64LIRInstruction {
public static final LIRInstructionClass<AMD64ArrayEqualsOp> TYPE = LIRInstructionClass.create(AMD64ArrayEqualsOp.class);
- private final JavaKind kind;
- private final int arrayBaseOffset;
- private final int arrayIndexScale;
- private final int constantByteLength;
+ private final JavaKind kind1;
+ private final JavaKind kind2;
+ private final int arrayBaseOffset1;
+ private final int arrayBaseOffset2;
+ private final Scale arrayIndexScale1;
+ private final Scale arrayIndexScale2;
+ private final AVXKind.AVXSize vectorSize;
+ private final int constantLength;
+ private final boolean signExtend;
@Def({REG}) private Value resultValue;
@Alive({REG}) private Value array1Value;
@@ -81,20 +92,21 @@
@Temp({REG, ILLEGAL}) private Value vectorTemp3;
@Temp({REG, ILLEGAL}) private Value vectorTemp4;
- public AMD64ArrayEqualsOp(LIRGeneratorTool tool, JavaKind kind, Value result, Value array1, Value array2, Value length,
+ public AMD64ArrayEqualsOp(LIRGeneratorTool tool, JavaKind kind1, JavaKind kind2, Value result, Value array1, Value array2, Value length,
int constantLength, boolean directPointers, int maxVectorSize) {
super(TYPE);
- this.kind = kind;
+ this.kind1 = kind1;
+ this.kind2 = kind2;
+ this.signExtend = kind1 != JavaKind.Char && kind2 != JavaKind.Char;
- this.arrayBaseOffset = directPointers ? 0 : tool.getProviders().getMetaAccess().getArrayBaseOffset(kind);
- this.arrayIndexScale = tool.getProviders().getMetaAccess().getArrayIndexScale(kind);
+ assert kind1.isNumericInteger() && kind2.isNumericInteger() || kind1 == kind2;
- if (constantLength >= 0 && arrayIndexScale > 1) {
- // scale length
- this.constantByteLength = constantLength << NumUtil.log2Ceil(arrayIndexScale);
- } else {
- this.constantByteLength = constantLength;
- }
+ this.arrayBaseOffset1 = directPointers ? 0 : tool.getProviders().getMetaAccess().getArrayBaseOffset(kind1);
+ this.arrayBaseOffset2 = directPointers ? 0 : tool.getProviders().getMetaAccess().getArrayBaseOffset(kind2);
+ this.arrayIndexScale1 = Objects.requireNonNull(Scale.fromInt(tool.getProviders().getMetaAccess().getArrayIndexScale(kind1)));
+ this.arrayIndexScale2 = Objects.requireNonNull(Scale.fromInt(tool.getProviders().getMetaAccess().getArrayIndexScale(kind2)));
+ this.vectorSize = ((AMD64) tool.target().arch).getFeatures().contains(CPUFeature.AVX2) && (maxVectorSize < 0 || maxVectorSize >= 32) ? AVXKind.AVXSize.YMM : AVXKind.AVXSize.XMM;
+ this.constantLength = constantLength;
this.resultValue = result;
this.array1Value = array1;
@@ -107,10 +119,10 @@
this.temp3 = tool.newVariable(LIRKind.value(tool.target().arch.getWordKind()));
this.temp4 = tool.newVariable(LIRKind.value(tool.target().arch.getWordKind()));
- this.temp5 = kind.isNumericFloat() ? tool.newVariable(LIRKind.value(tool.target().arch.getWordKind())) : Value.ILLEGAL;
- if (kind == JavaKind.Float) {
+ this.temp5 = kind1.isNumericFloat() || kind1 != kind2 ? tool.newVariable(LIRKind.value(tool.target().arch.getWordKind())) : Value.ILLEGAL;
+ if (kind1 == JavaKind.Float) {
this.tempXMM = tool.newVariable(LIRKind.value(AMD64Kind.SINGLE));
- } else if (kind == JavaKind.Double) {
+ } else if (kind1 == JavaKind.Double) {
this.tempXMM = tool.newVariable(LIRKind.value(AMD64Kind.DOUBLE));
} else {
this.tempXMM = Value.ILLEGAL;
@@ -119,7 +131,7 @@
// We only need the vector temporaries if we generate SSE code.
if (supportsSSE41(tool.target())) {
if (canGenerateConstantLengthCompare(tool.target())) {
- LIRKind lirKind = LIRKind.value(supportsAVX2(tool.target()) && (maxVectorSize < 0 || maxVectorSize >= 32) ? AMD64Kind.V256_BYTE : AMD64Kind.V128_BYTE);
+ LIRKind lirKind = LIRKind.value(vectorSize == AVXKind.AVXSize.YMM ? AMD64Kind.V256_BYTE : AMD64Kind.V128_BYTE);
this.vectorTemp1 = tool.newVariable(lirKind);
this.vectorTemp2 = tool.newVariable(lirKind);
this.vectorTemp3 = tool.newVariable(lirKind);
@@ -139,7 +151,7 @@
}
private boolean canGenerateConstantLengthCompare(TargetDescription target) {
- return constantByteLength >= 0 && kind.isNumericInteger() && supportsSSE41(target);
+ return constantLength >= 0 && kind1.isNumericInteger() && (kind1 == kind2 || getElementsPerVector(AVXKind.AVXSize.XMM) <= constantLength) && supportsSSE41(target);
}
@Override
@@ -153,26 +165,19 @@
Label done = new Label();
// Load array base addresses.
- masm.leaq(array1, new AMD64Address(asRegister(array1Value), arrayBaseOffset));
- masm.leaq(array2, new AMD64Address(asRegister(array2Value), arrayBaseOffset));
+ masm.leaq(array1, new AMD64Address(asRegister(array1Value), arrayBaseOffset1));
+ masm.leaq(array2, new AMD64Address(asRegister(array2Value), arrayBaseOffset2));
if (canGenerateConstantLengthCompare(crb.target)) {
- emitConstantLengthArrayCompareBytes(masm, array1, array2, asRegister(temp3), asRegister(temp4),
- new Register[]{asRegister(vectorTemp1), asRegister(vectorTemp2), asRegister(vectorTemp3), asRegister(vectorTemp4)},
- falseLabel, constantByteLength, AVXKind.getRegisterSize(vectorTemp1).getBytes());
+ emitConstantLengthArrayCompareBytes(crb, masm, array1, array2, asRegister(temp3), asRegister(temp4),
+ new Register[]{asRegister(vectorTemp1), asRegister(vectorTemp2), asRegister(vectorTemp3), asRegister(vectorTemp4)}, falseLabel);
} else {
Register length = asRegister(temp3);
-
- // Get array length in bytes.
+ // Get array length.
masm.movl(length, asRegister(lengthValue));
-
- if (arrayIndexScale > 1) {
- masm.shll(length, NumUtil.log2Ceil(arrayIndexScale)); // scale length
- }
-
- masm.movl(result, length); // copy
-
- emitArrayCompare(crb, masm, kind, result, array1, array2, length, temp4, temp5, tempXMM, vectorTemp1, vectorTemp2, trueLabel, falseLabel);
+ // copy
+ masm.movl(result, length);
+ emitArrayCompare(crb, masm, result, array1, array2, length, trueLabel, falseLabel);
}
// Return true
@@ -188,19 +193,18 @@
masm.bind(done);
}
- private static void emitArrayCompare(CompilationResultBuilder crb, AMD64MacroAssembler masm, JavaKind kind,
+ private void emitArrayCompare(CompilationResultBuilder crb, AMD64MacroAssembler masm,
Register result, Register array1, Register array2, Register length,
- Value temp4, Value temp5, Value tempXMM, Value vectorTemp1, Value vectorTemp2,
Label trueLabel, Label falseLabel) {
- if (supportsAVX2(crb.target)) {
- emitAVXCompare(crb, masm, kind, result, array1, array2, length, temp4, temp5, tempXMM, vectorTemp1, vectorTemp2, trueLabel, falseLabel);
- } else if (supportsSSE41(crb.target)) {
- // this code is used for AVX as well because our backend correctly ensures that
- // VEX-prefixed instructions are emitted if AVX is supported
- emitSSE41Compare(crb, masm, kind, result, array1, array2, length, temp4, temp5, tempXMM, vectorTemp1, vectorTemp2, trueLabel, falseLabel);
+ if (supportsSSE41(crb.target)) {
+ emitVectorCompare(crb, masm, result, array1, array2, length, trueLabel, falseLabel);
}
- emit8ByteCompare(crb, masm, kind, result, array1, array2, length, temp4, tempXMM, trueLabel, falseLabel);
- emitTailCompares(masm, kind, result, array1, array2, length, temp4, tempXMM, trueLabel, falseLabel);
+ if (kind1 == kind2) {
+ emit8ByteCompare(crb, masm, result, array1, array2, length, trueLabel, falseLabel);
+ emitTailCompares(masm, result, array1, array2, length, trueLabel, falseLabel);
+ } else {
+ emitDifferentKindsElementWiseCompare(crb, masm, result, array1, array2, length, trueLabel, falseLabel);
+ }
}
/**
@@ -215,49 +219,44 @@
}
/**
- * Vector size used in {@link #emitSSE41Compare}.
+ * Emits code that uses SSE4.1/AVX1 128-bit (16-byte) or AVX2 256-bit (32-byte) vector compares.
*/
- private static final int SSE4_1_VECTOR_SIZE = 16;
-
- /**
- * Emits code that uses SSE4.1 128-bit (16-byte) vector compares.
- */
- private static void emitSSE41Compare(CompilationResultBuilder crb, AMD64MacroAssembler masm, JavaKind kind,
+ private void emitVectorCompare(CompilationResultBuilder crb, AMD64MacroAssembler masm,
Register result, Register array1, Register array2, Register length,
- Value temp4, Value temp5, Value tempXMM, Value vectorTemp1, Value vectorTemp2,
Label trueLabel, Label falseLabel) {
assert supportsSSE41(crb.target);
Register vector1 = asRegister(vectorTemp1);
Register vector2 = asRegister(vectorTemp2);
+ int elementsPerVector = getElementsPerVector(vectorSize);
+
Label loop = new Label();
Label compareTail = new Label();
- boolean requiresNaNCheck = kind.isNumericFloat();
+ boolean requiresNaNCheck = kind1.isNumericFloat();
Label loopCheck = new Label();
Label nanCheck = new Label();
// Compare 16-byte vectors
- masm.andl(result, SSE4_1_VECTOR_SIZE - 1); // tail count (in bytes)
- masm.andl(length, ~(SSE4_1_VECTOR_SIZE - 1)); // vector count (in bytes)
+ masm.andl(result, elementsPerVector - 1); // tail count
+ masm.andl(length, ~(elementsPerVector - 1)); // vector count
masm.jcc(ConditionFlag.Zero, compareTail);
- masm.leaq(array1, new AMD64Address(array1, length, Scale.Times1, 0));
- masm.leaq(array2, new AMD64Address(array2, length, Scale.Times1, 0));
+ masm.leaq(array1, new AMD64Address(array1, length, arrayIndexScale1, 0));
+ masm.leaq(array2, new AMD64Address(array2, length, arrayIndexScale2, 0));
masm.negq(length);
// Align the main loop
masm.align(crb.target.wordSize * 2);
masm.bind(loop);
- masm.movdqu(vector1, new AMD64Address(array1, length, Scale.Times1, 0));
- masm.movdqu(vector2, new AMD64Address(array2, length, Scale.Times1, 0));
- masm.pxor(vector1, vector2);
- masm.ptest(vector1, vector1);
+ emitVectorLoad1(masm, vector1, array1, length, 0, vectorSize);
+ emitVectorLoad2(masm, vector2, array2, length, 0, vectorSize);
+ emitVectorCmp(masm, vector1, vector2, vectorSize);
masm.jcc(ConditionFlag.NotZero, requiresNaNCheck ? nanCheck : falseLabel);
masm.bind(loopCheck);
- masm.addq(length, SSE4_1_VECTOR_SIZE);
+ masm.addq(length, elementsPerVector);
masm.jcc(ConditionFlag.NotZero, loop);
masm.testl(result, result);
@@ -267,7 +266,7 @@
Label unalignedCheck = new Label();
masm.jmpb(unalignedCheck);
masm.bind(nanCheck);
- emitFloatCompareWithinRange(crb, masm, kind, array1, array2, length, temp4, temp5, tempXMM, 0, falseLabel, SSE4_1_VECTOR_SIZE);
+ emitFloatCompareWithinRange(crb, masm, array1, array2, length, 0, falseLabel, elementsPerVector);
masm.jmpb(loopCheck);
masm.bind(unalignedCheck);
}
@@ -276,13 +275,12 @@
* Compare the remaining bytes with an unaligned memory load aligned to the end of the
* array.
*/
- masm.movdqu(vector1, new AMD64Address(array1, result, Scale.Times1, -SSE4_1_VECTOR_SIZE));
- masm.movdqu(vector2, new AMD64Address(array2, result, Scale.Times1, -SSE4_1_VECTOR_SIZE));
- masm.pxor(vector1, vector2);
- masm.ptest(vector1, vector1);
+ emitVectorLoad1(masm, vector1, array1, result, scaleDisplacement1(-vectorSize.getBytes()), vectorSize);
+ emitVectorLoad2(masm, vector2, array2, result, scaleDisplacement2(-vectorSize.getBytes()), vectorSize);
+ emitVectorCmp(masm, vector1, vector2, vectorSize);
if (requiresNaNCheck) {
masm.jcc(ConditionFlag.Zero, trueLabel);
- emitFloatCompareWithinRange(crb, masm, kind, array1, array2, result, temp4, temp5, tempXMM, -SSE4_1_VECTOR_SIZE, falseLabel, SSE4_1_VECTOR_SIZE);
+ emitFloatCompareWithinRange(crb, masm, array1, array2, result, -vectorSize.getBytes(), falseLabel, elementsPerVector);
} else {
masm.jcc(ConditionFlag.NotZero, falseLabel);
}
@@ -292,90 +290,159 @@
masm.movl(length, result);
}
- /**
- * Returns if the underlying AMD64 architecture supports AVX instructions.
- *
- * @param target target description of the underlying architecture
- * @return true if the underlying architecture supports AVX
- */
- private static boolean supportsAVX2(TargetDescription target) {
- AMD64 arch = (AMD64) target.arch;
- return arch.getFeatures().contains(CPUFeature.AVX2);
+ private int getElementsPerVector(AVXKind.AVXSize vSize) {
+ return vSize.getBytes() >> Math.max(arrayIndexScale1.log2, arrayIndexScale2.log2);
+ }
+
+ private void emitVectorLoad1(AMD64MacroAssembler asm, Register dst, Register src, int displacement, AVXKind.AVXSize size) {
+ emitVectorLoad1(asm, dst, src, Register.None, displacement, size);
+ }
+
+ private void emitVectorLoad2(AMD64MacroAssembler asm, Register dst, Register src, int displacement, AVXKind.AVXSize size) {
+ emitVectorLoad2(asm, dst, src, Register.None, displacement, size);
+ }
+
+ private void emitVectorLoad1(AMD64MacroAssembler asm, Register dst, Register src, Register index, int displacement, AVXKind.AVXSize size) {
+ emitVectorLoad(asm, dst, src, index, displacement, arrayIndexScale1, arrayIndexScale2, size);
+ }
+
+ private void emitVectorLoad2(AMD64MacroAssembler asm, Register dst, Register src, Register index, int displacement, AVXKind.AVXSize size) {
+ emitVectorLoad(asm, dst, src, index, displacement, arrayIndexScale2, arrayIndexScale1, size);
+ }
+
+ private void emitVectorLoad(AMD64MacroAssembler asm, Register dst, Register src, Register index, int displacement, Scale ownScale, Scale otherScale, AVXKind.AVXSize size) {
+ AMD64Address address = new AMD64Address(src, index, ownScale, displacement);
+ if (ownScale.value < otherScale.value) {
+ if (size == AVXKind.AVXSize.YMM) {
+ getAVX2LoadAndExtendOp(ownScale, otherScale, signExtend).emit(asm, size, dst, address);
+ } else {
+ loadAndExtendSSE(asm, dst, address, ownScale, otherScale, signExtend);
+ }
+ } else {
+ if (size == AVXKind.AVXSize.YMM) {
+ asm.vmovdqu(dst, address);
+ } else {
+ asm.movdqu(dst, address);
+ }
+ }
+ }
+
+ private int scaleDisplacement1(int displacement) {
+ return scaleDisplacement(displacement, arrayIndexScale1, arrayIndexScale2);
+ }
+
+ private int scaleDisplacement2(int displacement) {
+ return scaleDisplacement(displacement, arrayIndexScale2, arrayIndexScale1);
+ }
+
+ private static int scaleDisplacement(int displacement, Scale ownScale, Scale otherScale) {
+ if (ownScale.value < otherScale.value) {
+ return displacement >> (otherScale.log2 - ownScale.log2);
+ }
+ return displacement;
}
- /**
- * Vector size used in {@link #emitAVXCompare}.
- */
- private static final int AVX_VECTOR_SIZE = 32;
-
- private static void emitAVXCompare(CompilationResultBuilder crb, AMD64MacroAssembler masm, JavaKind kind, Register result,
- Register array1, Register array2, Register length,
- Value temp4, Value temp5, Value tempXMM, Value vectorTemp1, Value vectorTemp2,
- Label trueLabel, Label falseLabel) {
- assert supportsAVX2(crb.target);
-
- Register vector1 = asRegister(vectorTemp1);
- Register vector2 = asRegister(vectorTemp2);
-
- Label loop = new Label();
- Label compareTail = new Label();
-
- boolean requiresNaNCheck = kind.isNumericFloat();
- Label loopCheck = new Label();
- Label nanCheck = new Label();
-
- // Compare 32-byte vectors
- masm.andl(result, AVX_VECTOR_SIZE - 1); // tail count (in bytes)
- masm.andl(length, ~(AVX_VECTOR_SIZE - 1)); // vector count (in bytes)
- masm.jcc(ConditionFlag.Zero, compareTail);
-
- masm.leaq(array1, new AMD64Address(array1, length, Scale.Times1, 0));
- masm.leaq(array2, new AMD64Address(array2, length, Scale.Times1, 0));
- masm.negq(length);
+ private static AMD64Assembler.VexRMOp getAVX2LoadAndExtendOp(Scale ownScale, Scale otherScale, boolean signExtend) {
+ switch (ownScale) {
+ case Times1:
+ switch (otherScale) {
+ case Times2:
+ return signExtend ? AMD64Assembler.VexRMOp.VPMOVSXBW : AMD64Assembler.VexRMOp.VPMOVZXBW;
+ case Times4:
+ return signExtend ? AMD64Assembler.VexRMOp.VPMOVSXBD : AMD64Assembler.VexRMOp.VPMOVZXBD;
+ case Times8:
+ return signExtend ? AMD64Assembler.VexRMOp.VPMOVSXBQ : AMD64Assembler.VexRMOp.VPMOVZXBQ;
+ }
+ throw GraalError.shouldNotReachHere();
+ case Times2:
+ switch (otherScale) {
+ case Times4:
+ return signExtend ? AMD64Assembler.VexRMOp.VPMOVSXWD : AMD64Assembler.VexRMOp.VPMOVZXWD;
+ case Times8:
+ return signExtend ? AMD64Assembler.VexRMOp.VPMOVSXWQ : AMD64Assembler.VexRMOp.VPMOVZXWQ;
+ }
+ throw GraalError.shouldNotReachHere();
+ case Times4:
+ return signExtend ? AMD64Assembler.VexRMOp.VPMOVSXDQ : AMD64Assembler.VexRMOp.VPMOVZXDQ;
+ }
+ throw GraalError.shouldNotReachHere();
+ }
- // Align the main loop
- masm.align(crb.target.wordSize * 2);
- masm.bind(loop);
- masm.vmovdqu(vector1, new AMD64Address(array1, length, Scale.Times1, 0));
- masm.vmovdqu(vector2, new AMD64Address(array2, length, Scale.Times1, 0));
- masm.vpxor(vector1, vector1, vector2);
- masm.vptest(vector1, vector1);
- masm.jcc(ConditionFlag.NotZero, requiresNaNCheck ? nanCheck : falseLabel);
-
- masm.bind(loopCheck);
- masm.addq(length, AVX_VECTOR_SIZE);
- masm.jcc(ConditionFlag.NotZero, loop);
-
- masm.testl(result, result);
- masm.jcc(ConditionFlag.Zero, trueLabel);
+ private static void loadAndExtendSSE(AMD64MacroAssembler asm, Register dst, AMD64Address src, Scale ownScale, Scale otherScale, boolean signExtend) {
+ switch (ownScale) {
+ case Times1:
+ switch (otherScale) {
+ case Times2:
+ if (signExtend) {
+ asm.pmovsxbw(dst, src);
+ } else {
+ asm.pmovzxbw(dst, src);
+ }
+ return;
+ case Times4:
+ if (signExtend) {
+ asm.pmovsxbd(dst, src);
+ } else {
+ asm.pmovzxbd(dst, src);
+ }
+ return;
+ case Times8:
+ if (signExtend) {
+ asm.pmovsxbq(dst, src);
+ } else {
+ asm.pmovzxbq(dst, src);
+ }
+ return;
+ }
+ throw GraalError.shouldNotReachHere();
+ case Times2:
+ switch (otherScale) {
+ case Times4:
+ if (signExtend) {
+ asm.pmovsxwd(dst, src);
+ } else {
+ asm.pmovzxwd(dst, src);
+ }
+ return;
+ case Times8:
+ if (signExtend) {
+ asm.pmovsxwq(dst, src);
+ } else {
+ asm.pmovzxwq(dst, src);
+ }
+ return;
+ }
+ throw GraalError.shouldNotReachHere();
+ case Times4:
+ if (signExtend) {
+ asm.pmovsxdq(dst, src);
+ } else {
+ asm.pmovzxdq(dst, src);
+ }
+ return;
+ }
+ throw GraalError.shouldNotReachHere();
+ }
- if (requiresNaNCheck) {
- Label unalignedCheck = new Label();
- masm.jmpb(unalignedCheck);
- masm.bind(nanCheck);
- emitFloatCompareWithinRange(crb, masm, kind, array1, array2, length, temp4, temp5, tempXMM, 0, falseLabel, AVX_VECTOR_SIZE);
- masm.jmpb(loopCheck);
- masm.bind(unalignedCheck);
- }
+ private static void emitVectorCmp(AMD64MacroAssembler masm, Register vector1, Register vector2, AVXKind.AVXSize size) {
+ emitVectorXor(masm, vector1, vector2, size);
+ emitVectorTest(masm, vector1, size);
+ }
- /*
- * Compare the remaining bytes with an unaligned memory load aligned to the end of the
- * array.
- */
- masm.vmovdqu(vector1, new AMD64Address(array1, result, Scale.Times1, -AVX_VECTOR_SIZE));
- masm.vmovdqu(vector2, new AMD64Address(array2, result, Scale.Times1, -AVX_VECTOR_SIZE));
- masm.vpxor(vector1, vector1, vector2);
- masm.vptest(vector1, vector1);
- if (requiresNaNCheck) {
- masm.jcc(ConditionFlag.Zero, trueLabel);
- emitFloatCompareWithinRange(crb, masm, kind, array1, array2, result, temp4, temp5, tempXMM, -AVX_VECTOR_SIZE, falseLabel, AVX_VECTOR_SIZE);
+ private static void emitVectorXor(AMD64MacroAssembler masm, Register vector1, Register vector2, AVXKind.AVXSize size) {
+ if (size == AVXKind.AVXSize.YMM) {
+ masm.vpxor(vector1, vector1, vector2);
} else {
- masm.jcc(ConditionFlag.NotZero, falseLabel);
+ masm.pxor(vector1, vector2);
}
- masm.jmp(trueLabel);
+ }
- masm.bind(compareTail);
- masm.movl(length, result);
+ private static void emitVectorTest(AMD64MacroAssembler masm, Register vector1, AVXKind.AVXSize size) {
+ if (size == AVXKind.AVXSize.YMM) {
+ masm.vptest(vector1, vector1);
+ } else {
+ masm.ptest(vector1, vector1);
+ }
}
/**
@@ -386,34 +453,37 @@
/**
* Emits code that uses 8-byte vector compares.
*/
- private static void emit8ByteCompare(CompilationResultBuilder crb, AMD64MacroAssembler masm, JavaKind kind, Register result, Register array1, Register array2, Register length, Value temp4,
- Value tempXMM, Label trueLabel, Label falseLabel) {
+ private void emit8ByteCompare(CompilationResultBuilder crb, AMD64MacroAssembler masm,
+ Register result, Register array1, Register array2, Register length, Label trueLabel, Label falseLabel) {
+ assert kind1 == kind2;
Label loop = new Label();
Label compareTail = new Label();
- boolean requiresNaNCheck = kind.isNumericFloat();
+ int elementsPerVector = 8 >> arrayIndexScale1.log2;
+
+ boolean requiresNaNCheck = kind1.isNumericFloat();
Label loopCheck = new Label();
Label nanCheck = new Label();
Register temp = asRegister(temp4);
- masm.andl(result, VECTOR_SIZE - 1); // tail count (in bytes)
- masm.andl(length, ~(VECTOR_SIZE - 1)); // vector count (in bytes)
+ masm.andl(result, elementsPerVector - 1); // tail count
+ masm.andl(length, ~(elementsPerVector - 1)); // vector count
masm.jcc(ConditionFlag.Zero, compareTail);
- masm.leaq(array1, new AMD64Address(array1, length, Scale.Times1, 0));
- masm.leaq(array2, new AMD64Address(array2, length, Scale.Times1, 0));
+ masm.leaq(array1, new AMD64Address(array1, length, arrayIndexScale1, 0));
+ masm.leaq(array2, new AMD64Address(array2, length, arrayIndexScale2, 0));
masm.negq(length);
// Align the main loop
masm.align(crb.target.wordSize * 2);
masm.bind(loop);
- masm.movq(temp, new AMD64Address(array1, length, Scale.Times1, 0));
- masm.cmpq(temp, new AMD64Address(array2, length, Scale.Times1, 0));
+ masm.movq(temp, new AMD64Address(array1, length, arrayIndexScale1, 0));
+ masm.cmpq(temp, new AMD64Address(array2, length, arrayIndexScale2, 0));
masm.jcc(ConditionFlag.NotEqual, requiresNaNCheck ? nanCheck : falseLabel);
masm.bind(loopCheck);
- masm.addq(length, VECTOR_SIZE);
+ masm.addq(length, elementsPerVector);
masm.jccb(ConditionFlag.NotZero, loop);
masm.testl(result, result);
@@ -425,8 +495,8 @@
masm.jmpb(unalignedCheck);
masm.bind(nanCheck);
// At most two iterations, unroll in the emitted code.
- for (int offset = 0; offset < VECTOR_SIZE; offset += kind.getByteCount()) {
- emitFloatCompare(masm, kind, array1, array2, length, temp4, tempXMM, offset, falseLabel, kind.getByteCount() == VECTOR_SIZE);
+ for (int offset = 0; offset < VECTOR_SIZE; offset += kind1.getByteCount()) {
+ emitFloatCompare(masm, array1, array2, length, offset, falseLabel, kind1.getByteCount() == VECTOR_SIZE);
}
masm.jmpb(loopCheck);
masm.bind(unalignedCheck);
@@ -436,13 +506,13 @@
* Compare the remaining bytes with an unaligned memory load aligned to the end of the
* array.
*/
- masm.movq(temp, new AMD64Address(array1, result, Scale.Times1, -VECTOR_SIZE));
- masm.cmpq(temp, new AMD64Address(array2, result, Scale.Times1, -VECTOR_SIZE));
+ masm.movq(temp, new AMD64Address(array1, result, arrayIndexScale1, -VECTOR_SIZE));
+ masm.cmpq(temp, new AMD64Address(array2, result, arrayIndexScale2, -VECTOR_SIZE));
if (requiresNaNCheck) {
masm.jcc(ConditionFlag.Equal, trueLabel);
// At most two iterations, unroll in the emitted code.
- for (int offset = 0; offset < VECTOR_SIZE; offset += kind.getByteCount()) {
- emitFloatCompare(masm, kind, array1, array2, result, temp4, tempXMM, -VECTOR_SIZE + offset, falseLabel, kind.getByteCount() == VECTOR_SIZE);
+ for (int offset = 0; offset < VECTOR_SIZE; offset += kind1.getByteCount()) {
+ emitFloatCompare(masm, array1, array2, result, -VECTOR_SIZE + offset, falseLabel, kind1.getByteCount() == VECTOR_SIZE);
}
} else {
masm.jccb(ConditionFlag.NotEqual, falseLabel);
@@ -456,34 +526,35 @@
/**
* Emits code to compare the remaining 1 to 4 bytes.
*/
- private static void emitTailCompares(AMD64MacroAssembler masm, JavaKind kind, Register result, Register array1, Register array2, Register length, Value temp4, Value tempXMM,
- Label trueLabel, Label falseLabel) {
+ private void emitTailCompares(AMD64MacroAssembler masm,
+ Register result, Register array1, Register array2, Register length, Label trueLabel, Label falseLabel) {
+ assert kind1 == kind2;
Label compare2Bytes = new Label();
Label compare1Byte = new Label();
Register temp = asRegister(temp4);
- if (kind.getByteCount() <= 4) {
+ if (kind1.getByteCount() <= 4) {
// Compare trailing 4 bytes, if any.
- masm.testl(result, 4);
+ masm.testl(result, arrayIndexScale1.log2 == 0 ? 4 : 4 >> arrayIndexScale1.log2);
masm.jccb(ConditionFlag.Zero, compare2Bytes);
masm.movl(temp, new AMD64Address(array1, 0));
masm.cmpl(temp, new AMD64Address(array2, 0));
- if (kind == JavaKind.Float) {
+ if (kind1 == JavaKind.Float) {
masm.jccb(ConditionFlag.Equal, trueLabel);
- emitFloatCompare(masm, kind, array1, array2, Register.None, temp4, tempXMM, 0, falseLabel, true);
+ emitFloatCompare(masm, array1, array2, Register.None, 0, falseLabel, true);
masm.jmpb(trueLabel);
} else {
masm.jccb(ConditionFlag.NotEqual, falseLabel);
}
- if (kind.getByteCount() <= 2) {
+ if (kind1.getByteCount() <= 2) {
// Move array pointers forward.
masm.leaq(array1, new AMD64Address(array1, 4));
masm.leaq(array2, new AMD64Address(array2, 4));
// Compare trailing 2 bytes, if any.
masm.bind(compare2Bytes);
- masm.testl(result, 2);
+ masm.testl(result, arrayIndexScale1.log2 == 0 ? 2 : 2 >> arrayIndexScale1.log2);
masm.jccb(ConditionFlag.Zero, compare1Byte);
masm.movzwl(temp, new AMD64Address(array1, 0));
masm.movzwl(length, new AMD64Address(array2, 0));
@@ -491,7 +562,7 @@
masm.jccb(ConditionFlag.NotEqual, falseLabel);
// The one-byte tail compare is only required for boolean and byte arrays.
- if (kind.getByteCount() <= 1) {
+ if (kind1.getByteCount() <= 1) {
// Move array pointers forward before we compare the last trailing byte.
masm.leaq(array1, new AMD64Address(array1, 2));
masm.leaq(array2, new AMD64Address(array2, 2));
@@ -513,28 +584,82 @@
}
}
+ private void emitDifferentKindsElementWiseCompare(CompilationResultBuilder crb, AMD64MacroAssembler masm,
+ Register result, Register array1, Register array2, Register length, Label trueLabel, Label falseLabel) {
+ assert kind1 != kind2;
+ assert kind1.isNumericInteger() && kind2.isNumericInteger();
+ Label loop = new Label();
+ Label compareTail = new Label();
+
+ int elementsPerLoopIteration = 4;
+
+ Register tmp1 = asRegister(temp4);
+ Register tmp2 = asRegister(temp5);
+
+ masm.andl(result, elementsPerLoopIteration - 1); // tail count
+ masm.andl(length, ~(elementsPerLoopIteration - 1)); // bulk loop count
+ masm.jcc(ConditionFlag.Zero, compareTail);
+
+ masm.leaq(array1, new AMD64Address(array1, length, arrayIndexScale1, 0));
+ masm.leaq(array2, new AMD64Address(array2, length, arrayIndexScale2, 0));
+ masm.negq(length);
+
+ // clear comparison registers because of the missing movzlq instruction
+ masm.xorq(tmp1, tmp1);
+ masm.xorq(tmp2, tmp2);
+
+ // Align the main loop
+ masm.align(crb.target.wordSize * 2);
+ masm.bind(loop);
+ for (int i = 0; i < elementsPerLoopIteration; i++) {
+ emitMovBytes(masm, tmp1, new AMD64Address(array1, length, arrayIndexScale1, i << arrayIndexScale1.log2), kind1.getByteCount());
+ emitMovBytes(masm, tmp2, new AMD64Address(array2, length, arrayIndexScale2, i << arrayIndexScale2.log2), kind2.getByteCount());
+ masm.cmpq(tmp1, tmp2);
+ masm.jcc(ConditionFlag.NotEqual, falseLabel);
+ }
+ masm.addq(length, elementsPerLoopIteration);
+ masm.jccb(ConditionFlag.NotZero, loop);
+
+ masm.bind(compareTail);
+ masm.testl(result, result);
+ masm.jcc(ConditionFlag.Zero, trueLabel);
+ for (int i = 0; i < elementsPerLoopIteration - 1; i++) {
+ emitMovBytes(masm, tmp1, new AMD64Address(array1, length, arrayIndexScale1, 0), kind1.getByteCount());
+ emitMovBytes(masm, tmp2, new AMD64Address(array2, length, arrayIndexScale2, 0), kind2.getByteCount());
+ masm.cmpq(tmp1, tmp2);
+ masm.jcc(ConditionFlag.NotEqual, falseLabel);
+ if (i < elementsPerLoopIteration - 2) {
+ masm.incrementq(length, 1);
+ masm.decrementq(result, 1);
+ masm.jcc(ConditionFlag.Zero, trueLabel);
+ } else {
+ masm.jmpb(trueLabel);
+ }
+ }
+ }
+
/**
* Emits code to fall through if {@code src} is NaN, otherwise jump to {@code branchOrdered}.
*/
- private static void emitNaNCheck(AMD64MacroAssembler masm, JavaKind kind, Value tempXMM, AMD64Address src, Label branchIfNonNaN) {
- assert kind.isNumericFloat();
+ private void emitNaNCheck(AMD64MacroAssembler masm, AMD64Address src, Label branchIfNonNaN) {
+ assert kind1.isNumericFloat();
Register tempXMMReg = asRegister(tempXMM);
- if (kind == JavaKind.Float) {
+ if (kind1 == JavaKind.Float) {
masm.movflt(tempXMMReg, src);
} else {
masm.movdbl(tempXMMReg, src);
}
- SSEOp.UCOMIS.emit(masm, kind == JavaKind.Float ? OperandSize.PS : OperandSize.PD, tempXMMReg, tempXMMReg);
+ SSEOp.UCOMIS.emit(masm, kind1 == JavaKind.Float ? OperandSize.PS : OperandSize.PD, tempXMMReg, tempXMMReg);
masm.jcc(ConditionFlag.NoParity, branchIfNonNaN);
}
/**
* Emits code to compare if two floats are bitwise equal or both NaN.
*/
- private static void emitFloatCompare(AMD64MacroAssembler masm, JavaKind kind, Register base1, Register base2, Register index, Value temp4, Value tempXMM, int offset, Label falseLabel,
+ private void emitFloatCompare(AMD64MacroAssembler masm, Register base1, Register base2, Register index, int offset, Label falseLabel,
boolean skipBitwiseCompare) {
- AMD64Address address1 = new AMD64Address(base1, index, Scale.Times1, offset);
- AMD64Address address2 = new AMD64Address(base2, index, Scale.Times1, offset);
+ AMD64Address address1 = new AMD64Address(base1, index, arrayIndexScale1, offset);
+ AMD64Address address2 = new AMD64Address(base2, index, arrayIndexScale2, offset);
Label bitwiseEqual = new Label();
@@ -542,7 +667,7 @@
// Bitwise compare
Register temp = asRegister(temp4);
- if (kind == JavaKind.Float) {
+ if (kind1 == JavaKind.Float) {
masm.movl(temp, address1);
masm.cmpl(temp, address2);
} else {
@@ -552,8 +677,8 @@
masm.jccb(ConditionFlag.Equal, bitwiseEqual);
}
- emitNaNCheck(masm, kind, tempXMM, address1, falseLabel);
- emitNaNCheck(masm, kind, tempXMM, address2, falseLabel);
+ emitNaNCheck(masm, address1, falseLabel);
+ emitNaNCheck(masm, address2, falseLabel);
masm.bind(bitwiseEqual);
}
@@ -561,9 +686,9 @@
/**
* Emits code to compare float equality within a range.
*/
- private static void emitFloatCompareWithinRange(CompilationResultBuilder crb, AMD64MacroAssembler masm, JavaKind kind, Register base1, Register base2, Register index, Value temp4, Value temp5,
- Value tempXMM, int offset, Label falseLabel, int range) {
- assert kind.isNumericFloat();
+ private void emitFloatCompareWithinRange(CompilationResultBuilder crb, AMD64MacroAssembler masm,
+ Register base1, Register base2, Register index, int offset, Label falseLabel, int range) {
+ assert kind1.isNumericFloat();
Label loop = new Label();
Register i = asRegister(temp5);
@@ -572,9 +697,9 @@
// Align the main loop
masm.align(crb.target.wordSize * 2);
masm.bind(loop);
- emitFloatCompare(masm, kind, base1, base2, index, temp4, tempXMM, offset, falseLabel, kind.getByteCount() == range);
- masm.addq(index, kind.getByteCount());
- masm.addq(i, kind.getByteCount());
+ emitFloatCompare(masm, base1, base2, index, offset, falseLabel, range == 1);
+ masm.incrementq(index, 1);
+ masm.incrementq(i, 1);
masm.jccb(ConditionFlag.NotZero, loop);
// Floats within the range are equal, revert change to the register index
masm.subq(index, range);
@@ -585,189 +710,104 @@
* {@code arrayPtr1[0..nBytes]} and {@code arrayPtr2[0..nBytes]}. If they match, execution
* continues directly after the emitted code block, otherwise we jump to {@code noMatch}.
*/
- private static void emitConstantLengthArrayCompareBytes(
+ private void emitConstantLengthArrayCompareBytes(
+ CompilationResultBuilder crb,
AMD64MacroAssembler asm,
Register arrayPtr1,
Register arrayPtr2,
Register tmp1,
Register tmp2,
Register[] tmpVectors,
- Label noMatch,
- int nBytes,
- int bytesPerVector) {
- assert bytesPerVector >= 16;
- if (nBytes == 0) {
+ Label noMatch) {
+ if (constantLength == 0) {
// do nothing
return;
}
- if (nBytes < 16) {
+ AVXKind.AVXSize vSize = vectorSize;
+ if (constantLength < getElementsPerVector(vectorSize)) {
+ vSize = AVXKind.AVXSize.XMM;
+ }
+ int elementsPerVector = getElementsPerVector(vSize);
+ if (elementsPerVector > constantLength) {
+ assert kind1 == kind2;
+ int byteLength = constantLength << arrayIndexScale1.log2;
// array is shorter than any vector register, use regular CMP instructions
- int movSize = (nBytes < 2) ? 1 : ((nBytes < 4) ? 2 : ((nBytes < 8) ? 4 : 8));
+ int movSize = (byteLength < 2) ? 1 : ((byteLength < 4) ? 2 : ((byteLength < 8) ? 4 : 8));
emitMovBytes(asm, tmp1, new AMD64Address(arrayPtr1), movSize);
emitMovBytes(asm, tmp2, new AMD64Address(arrayPtr2), movSize);
emitCmpBytes(asm, tmp1, tmp2, movSize);
asm.jcc(AMD64Assembler.ConditionFlag.NotEqual, noMatch);
- if (nBytes > movSize) {
- emitMovBytes(asm, tmp1, new AMD64Address(arrayPtr1, nBytes - movSize), movSize);
- emitMovBytes(asm, tmp2, new AMD64Address(arrayPtr2, nBytes - movSize), movSize);
+ if (byteLength > movSize) {
+ emitMovBytes(asm, tmp1, new AMD64Address(arrayPtr1, byteLength - movSize), movSize);
+ emitMovBytes(asm, tmp2, new AMD64Address(arrayPtr2, byteLength - movSize), movSize);
emitCmpBytes(asm, tmp1, tmp2, movSize);
asm.jcc(AMD64Assembler.ConditionFlag.NotEqual, noMatch);
}
- } else if (nBytes < 32 && bytesPerVector >= 32) {
- // we could use YMM registers, but the array is too short, force XMM registers
- int bytesPerXMMVector = AVXKind.AVXSize.XMM.getBytes();
- AMD64Assembler.VexMoveOp.VMOVDQU.emit(asm, AVXKind.AVXSize.XMM, tmpVectors[0], new AMD64Address(arrayPtr1));
- AMD64Assembler.VexMoveOp.VMOVDQU.emit(asm, AVXKind.AVXSize.XMM, tmpVectors[1], new AMD64Address(arrayPtr2));
- AMD64Assembler.VexRVMOp.VPXOR.emit(asm, AVXKind.AVXSize.XMM, tmpVectors[0], tmpVectors[0], tmpVectors[1]);
- if (nBytes > bytesPerXMMVector) {
- AMD64Assembler.VexMoveOp.VMOVDQU.emit(asm, AVXKind.AVXSize.XMM, tmpVectors[2], new AMD64Address(arrayPtr1, nBytes - bytesPerXMMVector));
- AMD64Assembler.VexMoveOp.VMOVDQU.emit(asm, AVXKind.AVXSize.XMM, tmpVectors[3], new AMD64Address(arrayPtr2, nBytes - bytesPerXMMVector));
- AMD64Assembler.VexRVMOp.VPXOR.emit(asm, AVXKind.AVXSize.XMM, tmpVectors[2], tmpVectors[2], tmpVectors[3]);
- AMD64Assembler.VexRMOp.VPTEST.emit(asm, AVXKind.AVXSize.XMM, tmpVectors[2], tmpVectors[2]);
+ } else {
+ int elementsPerVectorLoop = 2 * elementsPerVector;
+ int tailCount = constantLength & (elementsPerVectorLoop - 1);
+ int vectorCount = constantLength & ~(elementsPerVectorLoop - 1);
+ int bytesPerVector = vSize.getBytes();
+ if (vectorCount > 0) {
+ Label loopBegin = new Label();
+ asm.leaq(arrayPtr1, new AMD64Address(arrayPtr1, vectorCount << arrayIndexScale1.log2));
+ asm.leaq(arrayPtr2, new AMD64Address(arrayPtr2, vectorCount << arrayIndexScale2.log2));
+ asm.movq(tmp1, -vectorCount);
+ asm.align(crb.target.wordSize * 2);
+ asm.bind(loopBegin);
+ emitVectorLoad1(asm, tmpVectors[0], arrayPtr1, tmp1, 0, vSize);
+ emitVectorLoad2(asm, tmpVectors[1], arrayPtr2, tmp1, 0, vSize);
+ emitVectorLoad1(asm, tmpVectors[2], arrayPtr1, tmp1, scaleDisplacement1(bytesPerVector), vSize);
+ emitVectorLoad2(asm, tmpVectors[3], arrayPtr2, tmp1, scaleDisplacement2(bytesPerVector), vSize);
+ emitVectorXor(asm, tmpVectors[0], tmpVectors[1], vSize);
+ emitVectorXor(asm, tmpVectors[2], tmpVectors[3], vSize);
+ emitVectorTest(asm, tmpVectors[0], vSize);
asm.jcc(AMD64Assembler.ConditionFlag.NotZero, noMatch);
+ emitVectorTest(asm, tmpVectors[2], vSize);
+ asm.jcc(AMD64Assembler.ConditionFlag.NotZero, noMatch);
+ asm.addq(tmp1, elementsPerVectorLoop);
+ asm.jcc(AMD64Assembler.ConditionFlag.NotZero, loopBegin);
}
- AMD64Assembler.VexRMOp.VPTEST.emit(asm, AVXKind.AVXSize.XMM, tmpVectors[0], tmpVectors[0]);
- asm.jcc(AMD64Assembler.ConditionFlag.NotZero, noMatch);
- } else if (bytesPerVector >= 32) {
- // AVX2 supported, use YMM vectors
- assert asm.supports(CPUFeature.AVX2);
- int loopCount = nBytes / (bytesPerVector * 2);
- int rest = nBytes % (bytesPerVector * 2);
- if (loopCount > 0) {
- if (0 < rest && rest < bytesPerVector) {
- loopCount--;
- }
- if (loopCount > 0) {
- if (loopCount > 1) {
- asm.movl(tmp1, loopCount);
- }
- Label loopBegin = new Label();
- asm.bind(loopBegin);
- asm.vmovdqu(tmpVectors[0], new AMD64Address(arrayPtr1));
- asm.vmovdqu(tmpVectors[1], new AMD64Address(arrayPtr2));
- asm.vmovdqu(tmpVectors[2], new AMD64Address(arrayPtr1, bytesPerVector));
- asm.vmovdqu(tmpVectors[3], new AMD64Address(arrayPtr2, bytesPerVector));
- asm.vpxor(tmpVectors[0], tmpVectors[0], tmpVectors[1]);
- asm.vpxor(tmpVectors[2], tmpVectors[2], tmpVectors[3]);
- asm.vptest(tmpVectors[0], tmpVectors[0]);
- asm.jcc(AMD64Assembler.ConditionFlag.NotZero, noMatch);
- asm.vptest(tmpVectors[2], tmpVectors[2]);
- asm.jcc(AMD64Assembler.ConditionFlag.NotZero, noMatch);
- asm.addq(arrayPtr1, bytesPerVector * 2);
- asm.addq(arrayPtr2, bytesPerVector * 2);
- if (loopCount > 1) {
- asm.decrementl(tmp1);
- asm.jcc(AMD64Assembler.ConditionFlag.NotZero, loopBegin);
- }
- }
- if (0 < rest && rest < bytesPerVector) {
- asm.vmovdqu(tmpVectors[0], new AMD64Address(arrayPtr1));
- asm.vmovdqu(tmpVectors[1], new AMD64Address(arrayPtr2));
- asm.vmovdqu(tmpVectors[2], new AMD64Address(arrayPtr1, bytesPerVector));
- asm.vmovdqu(tmpVectors[3], new AMD64Address(arrayPtr2, bytesPerVector));
- asm.vpxor(tmpVectors[0], tmpVectors[0], tmpVectors[1]);
- asm.vpxor(tmpVectors[2], tmpVectors[2], tmpVectors[3]);
- asm.vptest(tmpVectors[0], tmpVectors[0]);
- asm.jcc(AMD64Assembler.ConditionFlag.NotZero, noMatch);
- asm.vptest(tmpVectors[2], tmpVectors[2]);
- asm.jcc(AMD64Assembler.ConditionFlag.NotZero, noMatch);
- asm.vmovdqu(tmpVectors[0], new AMD64Address(arrayPtr1, bytesPerVector + rest));
- asm.vmovdqu(tmpVectors[1], new AMD64Address(arrayPtr2, bytesPerVector + rest));
- asm.vpxor(tmpVectors[0], tmpVectors[0], tmpVectors[1]);
- asm.vptest(tmpVectors[0], tmpVectors[0]);
+ if (tailCount > 0) {
+ emitVectorLoad1(asm, tmpVectors[0], arrayPtr1, (tailCount << arrayIndexScale1.log2) - scaleDisplacement1(bytesPerVector), vSize);
+ emitVectorLoad2(asm, tmpVectors[1], arrayPtr2, (tailCount << arrayIndexScale2.log2) - scaleDisplacement2(bytesPerVector), vSize);
+ emitVectorXor(asm, tmpVectors[0], tmpVectors[1], vSize);
+ if (tailCount > elementsPerVector) {
+ emitVectorLoad1(asm, tmpVectors[2], arrayPtr1, 0, vSize);
+ emitVectorLoad2(asm, tmpVectors[3], arrayPtr2, 0, vSize);
+ emitVectorXor(asm, tmpVectors[2], tmpVectors[3], vSize);
+ emitVectorTest(asm, tmpVectors[2], vSize);
asm.jcc(AMD64Assembler.ConditionFlag.NotZero, noMatch);
}
- }
- if (rest >= bytesPerVector) {
- asm.vmovdqu(tmpVectors[0], new AMD64Address(arrayPtr1));
- asm.vmovdqu(tmpVectors[1], new AMD64Address(arrayPtr2));
- asm.vpxor(tmpVectors[0], tmpVectors[0], tmpVectors[1]);
- if (rest > bytesPerVector) {
- asm.vmovdqu(tmpVectors[2], new AMD64Address(arrayPtr1, rest - bytesPerVector));
- asm.vmovdqu(tmpVectors[3], new AMD64Address(arrayPtr2, rest - bytesPerVector));
- asm.vpxor(tmpVectors[2], tmpVectors[2], tmpVectors[3]);
- asm.vptest(tmpVectors[2], tmpVectors[2]);
- asm.jcc(AMD64Assembler.ConditionFlag.NotZero, noMatch);
- }
- asm.vptest(tmpVectors[0], tmpVectors[0]);
- asm.jcc(AMD64Assembler.ConditionFlag.NotZero, noMatch);
- }
- } else {
- // on AVX or SSE, use XMM vectors
- int loopCount = nBytes / (bytesPerVector * 2);
- int rest = nBytes % (bytesPerVector * 2);
- if (loopCount > 0) {
- if (0 < rest && rest < bytesPerVector) {
- loopCount--;
- }
- if (loopCount > 0) {
- if (loopCount > 1) {
- asm.movl(tmp1, loopCount);
- }
- Label loopBegin = new Label();
- asm.bind(loopBegin);
- asm.movdqu(tmpVectors[0], new AMD64Address(arrayPtr1));
- asm.movdqu(tmpVectors[1], new AMD64Address(arrayPtr2));
- asm.movdqu(tmpVectors[2], new AMD64Address(arrayPtr1, bytesPerVector));
- asm.movdqu(tmpVectors[3], new AMD64Address(arrayPtr2, bytesPerVector));
- asm.pxor(tmpVectors[0], tmpVectors[1]);
- asm.pxor(tmpVectors[2], tmpVectors[3]);
- asm.ptest(tmpVectors[0], tmpVectors[0]);
- asm.jcc(AMD64Assembler.ConditionFlag.NotZero, noMatch);
- asm.ptest(tmpVectors[2], tmpVectors[2]);
- asm.jcc(AMD64Assembler.ConditionFlag.NotZero, noMatch);
- asm.addq(arrayPtr1, bytesPerVector * 2);
- asm.addq(arrayPtr2, bytesPerVector * 2);
- if (loopCount > 1) {
- asm.decrementl(tmp1);
- asm.jcc(AMD64Assembler.ConditionFlag.NotZero, loopBegin);
- }
- }
- if (0 < rest && rest < bytesPerVector) {
- asm.movdqu(tmpVectors[0], new AMD64Address(arrayPtr1));
- asm.movdqu(tmpVectors[1], new AMD64Address(arrayPtr2));
- asm.movdqu(tmpVectors[2], new AMD64Address(arrayPtr1, bytesPerVector));
- asm.movdqu(tmpVectors[3], new AMD64Address(arrayPtr2, bytesPerVector));
- asm.pxor(tmpVectors[0], tmpVectors[1]);
- asm.pxor(tmpVectors[2], tmpVectors[3]);
- asm.ptest(tmpVectors[0], tmpVectors[0]);
- asm.jcc(AMD64Assembler.ConditionFlag.NotZero, noMatch);
- asm.ptest(tmpVectors[2], tmpVectors[2]);
- asm.jcc(AMD64Assembler.ConditionFlag.NotZero, noMatch);
- asm.movdqu(tmpVectors[0], new AMD64Address(arrayPtr1, bytesPerVector + rest));
- asm.movdqu(tmpVectors[1], new AMD64Address(arrayPtr2, bytesPerVector + rest));
- asm.pxor(tmpVectors[0], tmpVectors[1]);
- asm.ptest(tmpVectors[0], tmpVectors[0]);
- asm.jcc(AMD64Assembler.ConditionFlag.NotZero, noMatch);
- }
- }
- if (rest >= bytesPerVector) {
- asm.movdqu(tmpVectors[0], new AMD64Address(arrayPtr1));
- asm.movdqu(tmpVectors[1], new AMD64Address(arrayPtr2));
- asm.pxor(tmpVectors[0], tmpVectors[1]);
- if (rest > bytesPerVector) {
- asm.movdqu(tmpVectors[2], new AMD64Address(arrayPtr1, rest - bytesPerVector));
- asm.movdqu(tmpVectors[3], new AMD64Address(arrayPtr2, rest - bytesPerVector));
- asm.pxor(tmpVectors[2], tmpVectors[3]);
- asm.ptest(tmpVectors[2], tmpVectors[2]);
- asm.jcc(AMD64Assembler.ConditionFlag.NotZero, noMatch);
- }
- asm.ptest(tmpVectors[0], tmpVectors[0]);
+ emitVectorTest(asm, tmpVectors[0], vSize);
asm.jcc(AMD64Assembler.ConditionFlag.NotZero, noMatch);
}
}
}
- private static void emitMovBytes(AMD64MacroAssembler asm, Register dst, AMD64Address src, int size) {
+ private void emitMovBytes(AMD64MacroAssembler asm, Register dst, AMD64Address src, int size) {
switch (size) {
case 1:
- asm.movzbl(dst, src);
+ if (signExtend) {
+ asm.movsbq(dst, src);
+ } else {
+ asm.movzbq(dst, src);
+ }
break;
case 2:
- asm.movzwl(dst, src);
+ if (signExtend) {
+ asm.movswq(dst, src);
+ } else {
+ asm.movzwq(dst, src);
+ }
break;
case 4:
- asm.movl(dst, src);
+ if (signExtend) {
+ asm.movslq(dst, src);
+ } else {
+ // there is no movzlq
+ asm.movl(dst, src);
+ }
break;
case 8:
asm.movq(dst, src);
--- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir.amd64/src/org/graalvm/compiler/lir/amd64/AMD64ControlFlow.java Tue Mar 12 09:49:10 2019 +0000
+++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir.amd64/src/org/graalvm/compiler/lir/amd64/AMD64ControlFlow.java Sat Mar 16 21:00:45 2019 +0000
@@ -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
@@ -283,12 +283,10 @@
masm.jmp(scratchReg);
// Inserting padding so that jump table address is 4-byte aligned
- if ((masm.position() & 0x3) != 0) {
- masm.nop(4 - (masm.position() & 0x3));
- }
+ masm.align(4);
// Patch LEA instruction above now that we know the position of the jump table
- // TODO this is ugly and should be done differently
+ // this is ugly but there is no better way to do this given the assembler API
final int jumpTablePos = masm.position();
final int leaDisplacementPosition = afterLea - 4;
masm.emitInt(jumpTablePos - afterLea, leaDisplacementPosition);
@@ -314,6 +312,99 @@
}
}
+ public static final class HashTableSwitchOp extends AMD64BlockEndOp {
+ public static final LIRInstructionClass<HashTableSwitchOp> TYPE = LIRInstructionClass.create(HashTableSwitchOp.class);
+ private final JavaConstant[] keys;
+ private final LabelRef defaultTarget;
+ private final LabelRef[] targets;
+ @Alive protected Value value;
+ @Alive protected Value hash;
+ @Temp({REG}) protected Value entryScratch;
+ @Temp({REG}) protected Value scratch;
+
+ public HashTableSwitchOp(final JavaConstant[] keys, final LabelRef defaultTarget, LabelRef[] targets, Value value, Value hash, Variable scratch, Variable entryScratch) {
+ super(TYPE);
+ this.keys = keys;
+ this.defaultTarget = defaultTarget;
+ this.targets = targets;
+ this.value = value;
+ this.hash = hash;
+ this.scratch = scratch;
+ this.entryScratch = entryScratch;
+ }
+
+ @Override
+ public void emitCode(CompilationResultBuilder crb, AMD64MacroAssembler masm) {
+ Register valueReg = asRegister(value, AMD64Kind.DWORD);
+ Register indexReg = asRegister(hash, AMD64Kind.DWORD);
+ Register scratchReg = asRegister(scratch, AMD64Kind.QWORD);
+ Register entryScratchReg = asRegister(entryScratch, AMD64Kind.QWORD);
+
+ // Set scratch to address of jump table
+ masm.leaq(scratchReg, new AMD64Address(AMD64.rip, 0));
+ final int afterLea = masm.position();
+
+ // When the default target is set, the jump table contains entries with two DWORDS:
+ // the original key before hashing and the label jump address
+ if (defaultTarget != null) {
+
+ // Move the table entry (two DWORDs) into a QWORD
+ masm.movq(entryScratchReg, new AMD64Address(scratchReg, indexReg, Scale.Times8, 0));
+
+ // Jump to the default target if the first DWORD (original key) doesn't match the
+ // current key. Accounts for hash collisions with unknown keys
+ masm.cmpl(entryScratchReg, valueReg);
+ masm.jcc(ConditionFlag.NotEqual, defaultTarget.label());
+
+ // Shift to the second DWORD
+ masm.sarq(entryScratchReg, 32);
+ } else {
+
+ // The jump table has a single DWORD with the label address if there's no
+ // default target
+ masm.movslq(entryScratchReg, new AMD64Address(scratchReg, indexReg, Scale.Times4, 0));
+ }
+ masm.addq(scratchReg, entryScratchReg);
+ masm.jmp(scratchReg);
+
+ // Inserting padding so that jump the table address is aligned
+ if (defaultTarget != null) {
+ masm.align(8);
+ } else {
+ masm.align(4);
+ }
+
+ // Patch LEA instruction above now that we know the position of the jump table
+ // this is ugly but there is no better way to do this given the assembler API
+ final int jumpTablePos = masm.position();
+ final int leaDisplacementPosition = afterLea - 4;
+ masm.emitInt(jumpTablePos - afterLea, leaDisplacementPosition);
+
+ // Emit jump table entries
+ for (int i = 0; i < targets.length; i++) {
+
+ Label label = targets[i].label();
+
+ if (defaultTarget != null) {
+ masm.emitInt(keys[i].asInt());
+ }
+ if (label.isBound()) {
+ int imm32 = label.position() - jumpTablePos;
+ masm.emitInt(imm32);
+ } else {
+ int offsetToJumpTableBase = masm.position() - jumpTablePos;
+ label.addPatchAt(masm.position());
+ masm.emitByte(0); // pseudo-opcode for jump table entry
+ masm.emitShort(offsetToJumpTableBase);
+ masm.emitByte(0); // padding to make jump table entry 4 bytes wide
+ }
+ }
+
+ JumpTable jt = new JumpTable(jumpTablePos, keys[0].asInt(), keys[keys.length - 1].asInt(), 4);
+ crb.compilationResult.addAnnotation(jt);
+ }
+ }
+
@Opcode("SETcc")
public static final class CondSetOp extends AMD64LIRInstruction {
public static final LIRInstructionClass<CondSetOp> TYPE = LIRInstructionClass.create(CondSetOp.class);
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir.amd64/src/org/graalvm/compiler/lir/amd64/AMD64HotSpotHelper.java Sat Mar 16 21:00:45 2019 +0000
@@ -0,0 +1,65 @@
+/*
+ * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved.
+ * 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.
+ */
+
+
+package org.graalvm.compiler.lir.amd64;
+
+import org.graalvm.compiler.asm.amd64.AMD64Address;
+import org.graalvm.compiler.core.common.LIRKind;
+import org.graalvm.compiler.debug.GraalError;
+import org.graalvm.compiler.lir.asm.ArrayDataPointerConstant;
+import org.graalvm.compiler.lir.asm.CompilationResultBuilder;
+
+import jdk.vm.ci.amd64.AMD64;
+import jdk.vm.ci.amd64.AMD64Kind;
+import jdk.vm.ci.code.Register;
+import jdk.vm.ci.meta.Value;
+
+public final class AMD64HotSpotHelper {
+
+ private AMD64HotSpotHelper() {
+ }
+
+ protected static Value[] registersToValues(Register[] registers) {
+ Value[] temps = new Value[registers.length];
+ for (int i = 0; i < registers.length; i++) {
+ Register register = registers[i];
+ if (AMD64.CPU.equals(register.getRegisterCategory())) {
+ temps[i] = register.asValue(LIRKind.value(AMD64Kind.QWORD));
+ } else if (AMD64.XMM.equals(register.getRegisterCategory())) {
+ temps[i] = register.asValue(LIRKind.value(AMD64Kind.DOUBLE));
+ } else {
+ throw GraalError.shouldNotReachHere("Unsupported register type in math stubs.");
+ }
+ }
+ return temps;
+ }
+
+ protected static AMD64Address recordExternalAddress(CompilationResultBuilder crb, ArrayDataPointerConstant ptr) {
+ return (AMD64Address) crb.recordDataReferenceInCode(ptr);
+ }
+
+ protected static ArrayDataPointerConstant pointerConstant(int alignment, int[] ints) {
+ return new ArrayDataPointerConstant(ints, alignment);
+ }
+}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir.amd64/src/org/graalvm/compiler/lir/amd64/AMD64MathCosOp.java Sat Mar 16 21:00:45 2019 +0000
@@ -0,0 +1,869 @@
+/*
+ * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, Intel Corporation. All rights reserved.
+ * Intel Math Library (LIBM) Source Code
+ * 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.
+ */
+
+
+package org.graalvm.compiler.lir.amd64;
+
+import static jdk.vm.ci.amd64.AMD64.r10;
+import static jdk.vm.ci.amd64.AMD64.r11;
+import static jdk.vm.ci.amd64.AMD64.r8;
+import static jdk.vm.ci.amd64.AMD64.r9;
+import static jdk.vm.ci.amd64.AMD64.rax;
+import static jdk.vm.ci.amd64.AMD64.rbx;
+import static jdk.vm.ci.amd64.AMD64.rcx;
+import static jdk.vm.ci.amd64.AMD64.rdi;
+import static jdk.vm.ci.amd64.AMD64.rdx;
+import static jdk.vm.ci.amd64.AMD64.rsi;
+import static jdk.vm.ci.amd64.AMD64.rsp;
+import static jdk.vm.ci.amd64.AMD64.xmm0;
+import static jdk.vm.ci.amd64.AMD64.xmm1;
+import static jdk.vm.ci.amd64.AMD64.xmm2;
+import static jdk.vm.ci.amd64.AMD64.xmm3;
+import static jdk.vm.ci.amd64.AMD64.xmm4;
+import static jdk.vm.ci.amd64.AMD64.xmm5;
+import static jdk.vm.ci.amd64.AMD64.xmm6;
+import static jdk.vm.ci.amd64.AMD64.xmm7;
+import static org.graalvm.compiler.lir.amd64.AMD64HotSpotHelper.pointerConstant;
+import static org.graalvm.compiler.lir.amd64.AMD64HotSpotHelper.recordExternalAddress;
+
+import org.graalvm.compiler.asm.Label;
+import org.graalvm.compiler.asm.amd64.AMD64Address;
+import org.graalvm.compiler.asm.amd64.AMD64Assembler.ConditionFlag;
+import org.graalvm.compiler.asm.amd64.AMD64MacroAssembler;
+import org.graalvm.compiler.lir.LIRInstructionClass;
+import org.graalvm.compiler.lir.asm.ArrayDataPointerConstant;
+import org.graalvm.compiler.lir.asm.CompilationResultBuilder;
+
+/**
+ * <pre>
+ * ALGORITHM DESCRIPTION - COS()
+ * ---------------------
+ *
+ * 1. RANGE REDUCTION
+ *
+ * We perform an initial range reduction from X to r with
+ *
+ * X =~= N * pi/32 + r
+ *
+ * so that |r| <= pi/64 + epsilon. We restrict inputs to those
+ * where |N| <= 932560. Beyond this, the range reduction is
+ * insufficiently accurate. For extremely small inputs,
+ * denormalization can occur internally, impacting performance.
+ * This means that the main path is actually only taken for
+ * 2^-252 <= |X| < 90112.
+ *
+ * To avoid branches, we perform the range reduction to full
+ * accuracy each time.
+ *
+ * X - N * (P_1 + P_2 + P_3)
+ *
+ * where P_1 and P_2 are 32-bit numbers (so multiplication by N
+ * is exact) and P_3 is a 53-bit number. Together, these
+ * approximate pi well enough for all cases in the restricted
+ * range.
+ *
+ * The main reduction sequence is:
+ *
+ * y = 32/pi * x
+ * N = integer(y)
+ * (computed by adding and subtracting off SHIFTER)
+ *
+ * m_1 = N * P_1
+ * m_2 = N * P_2
+ * r_1 = x - m_1
+ * r = r_1 - m_2
+ * (this r can be used for most of the calculation)
+ *
+ * c_1 = r_1 - r
+ * m_3 = N * P_3
+ * c_2 = c_1 - m_2
+ * c = c_2 - m_3
+ *
+ * 2. MAIN ALGORITHM
+ *
+ * The algorithm uses a table lookup based on B = M * pi / 32
+ * where M = N mod 64. The stored values are:
+ * sigma closest power of 2 to cos(B)
+ * C_hl 53-bit cos(B) - sigma
+ * S_hi + S_lo 2 * 53-bit sin(B)
+ *
+ * The computation is organized as follows:
+ *
+ * sin(B + r + c) = [sin(B) + sigma * r] +
+ * r * (cos(B) - sigma) +
+ * sin(B) * [cos(r + c) - 1] +
+ * cos(B) * [sin(r + c) - r]
+ *
+ * which is approximately:
+ *
+ * [S_hi + sigma * r] +
+ * C_hl * r +
+ * S_lo + S_hi * [(cos(r) - 1) - r * c] +
+ * (C_hl + sigma) * [(sin(r) - r) + c]
+ *
+ * and this is what is actually computed. We separate this sum
+ * into four parts:
+ *
+ * hi + med + pols + corr
+ *
+ * where
+ *
+ * hi = S_hi + sigma r
+ * med = C_hl * r
+ * pols = S_hi * (cos(r) - 1) + (C_hl + sigma) * (sin(r) - r)
+ * corr = S_lo + c * ((C_hl + sigma) - S_hi * r)
+ *
+ * 3. POLYNOMIAL
+ *
+ * The polynomial S_hi * (cos(r) - 1) + (C_hl + sigma) *
+ * (sin(r) - r) can be rearranged freely, since it is quite
+ * small, so we exploit parallelism to the fullest.
+ *
+ * psc4 = SC_4 * r_1
+ * msc4 = psc4 * r
+ * r2 = r * r
+ * msc2 = SC_2 * r2
+ * r4 = r2 * r2
+ * psc3 = SC_3 + msc4
+ * psc1 = SC_1 + msc2
+ * msc3 = r4 * psc3
+ * sincospols = psc1 + msc3
+ * pols = sincospols *
+ * <S_hi * r^2 | (C_hl + sigma) * r^3>
+ *
+ * 4. CORRECTION TERM
+ *
+ * This is where the "c" component of the range reduction is
+ * taken into account; recall that just "r" is used for most of
+ * the calculation.
+ *
+ * -c = m_3 - c_2
+ * -d = S_hi * r - (C_hl + sigma)
+ * corr = -c * -d + S_lo
+ *
+ * 5. COMPENSATED SUMMATIONS
+ *
+ * The two successive compensated summations add up the high
+ * and medium parts, leaving just the low parts to add up at
+ * the end.
+ *
+ * rs = sigma * r
+ * res_int = S_hi + rs
+ * k_0 = S_hi - res_int
+ * k_2 = k_0 + rs
+ * med = C_hl * r
+ * res_hi = res_int + med
+ * k_1 = res_int - res_hi
+ * k_3 = k_1 + med
+ *
+ * 6. FINAL SUMMATION
+ *
+ * We now add up all the small parts:
+ *
+ * res_lo = pols(hi) + pols(lo) + corr + k_1 + k_3
+ *
+ * Now the overall result is just:
+ *
+ * res_hi + res_lo
+ *
+ * 7. SMALL ARGUMENTS
+ *
+ * Inputs with |X| < 2^-252 are treated specially as
+ * 1 - |x|.
+ *
+ * Special cases:
+ * cos(NaN) = quiet NaN, and raise invalid exception
+ * cos(INF) = NaN and raise invalid exception
+ * cos(0) = 1
+ * </pre>
+ */
+public final class AMD64MathCosOp extends AMD64MathIntrinsicUnaryOp {
+
+ public static final LIRInstructionClass<AMD64MathCosOp> TYPE = LIRInstructionClass.create(AMD64MathCosOp.class);
+
+ public AMD64MathCosOp() {
+ super(TYPE, /* GPR */ rax, rcx, rdx, rbx, rsi, rdi, r8, r9, r10, r11,
+ /* XMM */ xmm1, xmm2, xmm3, xmm4, xmm5, xmm6, xmm7);
+ }
+
+ private ArrayDataPointerConstant onehalf = pointerConstant(16, new int[]{
+ // @formatter:off
+ 0x00000000, 0x3fe00000, 0x00000000, 0x3fe00000
+ // @formatter:on
+ });
+
+ private ArrayDataPointerConstant p2 = pointerConstant(16, new int[]{
+ // @formatter:off
+ 0x1a600000, 0x3d90b461, 0x1a600000, 0x3d90b461
+ // @formatter:on
+ });
+
+ private ArrayDataPointerConstant sc4 = pointerConstant(16, new int[]{
+ // @formatter:off
+ 0xa556c734, 0x3ec71de3, 0x1a01a01a, 0x3efa01a0
+ // @formatter:on
+ });
+
+ private ArrayDataPointerConstant ctable = pointerConstant(16, new int[]{
+ // @formatter:off
+ 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+ 0x00000000, 0x00000000, 0x3ff00000, 0x176d6d31, 0xbf73b92e,
+ 0xbc29b42c, 0x3fb917a6, 0xe0000000, 0xbc3e2718, 0x00000000,
+ 0x3ff00000, 0x011469fb, 0xbf93ad06, 0x3c69a60b, 0x3fc8f8b8,
+ 0xc0000000, 0xbc626d19, 0x00000000, 0x3ff00000, 0x939d225a,
+ 0xbfa60bea, 0x2ed59f06, 0x3fd29406, 0xa0000000, 0xbc75d28d,
+ 0x00000000, 0x3ff00000, 0x866b95cf, 0xbfb37ca1, 0xa6aea963,
+ 0x3fd87de2, 0xe0000000, 0xbc672ced, 0x00000000, 0x3ff00000,
+ 0x73fa1279, 0xbfbe3a68, 0x3806f63b, 0x3fde2b5d, 0x20000000,
+ 0x3c5e0d89, 0x00000000, 0x3ff00000, 0x5bc57974, 0xbfc59267,
+ 0x39ae68c8, 0x3fe1c73b, 0x20000000, 0x3c8b25dd, 0x00000000,
+ 0x3ff00000, 0x53aba2fd, 0xbfcd0dfe, 0x25091dd6, 0x3fe44cf3,
+ 0x20000000, 0x3c68076a, 0x00000000, 0x3ff00000, 0x99fcef32,
+ 0x3fca8279, 0x667f3bcd, 0x3fe6a09e, 0x20000000, 0xbc8bdd34,
+ 0x00000000, 0x3fe00000, 0x94247758, 0x3fc133cc, 0x6b151741,
+ 0x3fe8bc80, 0x20000000, 0xbc82c5e1, 0x00000000, 0x3fe00000,
+ 0x9ae68c87, 0x3fac73b3, 0x290ea1a3, 0x3fea9b66, 0xe0000000,
+ 0x3c39f630, 0x00000000, 0x3fe00000, 0x7f909c4e, 0xbf9d4a2c,
+ 0xf180bdb1, 0x3fec38b2, 0x80000000, 0xbc76e0b1, 0x00000000,
+ 0x3fe00000, 0x65455a75, 0xbfbe0875, 0xcf328d46, 0x3fed906b,
+ 0x20000000, 0x3c7457e6, 0x00000000, 0x3fe00000, 0x76acf82d,
+ 0x3fa4a031, 0x56c62dda, 0x3fee9f41, 0xe0000000, 0x3c8760b1,
+ 0x00000000, 0x3fd00000, 0x0e5967d5, 0xbfac1d1f, 0xcff75cb0,
+ 0x3fef6297, 0x20000000, 0x3c756217, 0x00000000, 0x3fd00000,
+ 0x0f592f50, 0xbf9ba165, 0xa3d12526, 0x3fefd88d, 0x40000000,
+ 0xbc887df6, 0x00000000, 0x3fc00000, 0x00000000, 0x00000000,
+ 0x00000000, 0x3ff00000, 0x00000000, 0x00000000, 0x00000000,
+ 0x00000000, 0x0f592f50, 0x3f9ba165, 0xa3d12526, 0x3fefd88d,
+ 0x40000000, 0xbc887df6, 0x00000000, 0xbfc00000, 0x0e5967d5,
+ 0x3fac1d1f, 0xcff75cb0, 0x3fef6297, 0x20000000, 0x3c756217,
+ 0x00000000, 0xbfd00000, 0x76acf82d, 0xbfa4a031, 0x56c62dda,
+ 0x3fee9f41, 0xe0000000, 0x3c8760b1, 0x00000000, 0xbfd00000,
+ 0x65455a75, 0x3fbe0875, 0xcf328d46, 0x3fed906b, 0x20000000,
+ 0x3c7457e6, 0x00000000, 0xbfe00000, 0x7f909c4e, 0x3f9d4a2c,
+ 0xf180bdb1, 0x3fec38b2, 0x80000000, 0xbc76e0b1, 0x00000000,
+ 0xbfe00000, 0x9ae68c87, 0xbfac73b3, 0x290ea1a3, 0x3fea9b66,
+ 0xe0000000, 0x3c39f630, 0x00000000, 0xbfe00000, 0x94247758,
+ 0xbfc133cc, 0x6b151741, 0x3fe8bc80, 0x20000000, 0xbc82c5e1,
+ 0x00000000, 0xbfe00000, 0x99fcef32, 0xbfca8279, 0x667f3bcd,
+ 0x3fe6a09e, 0x20000000, 0xbc8bdd34, 0x00000000, 0xbfe00000,
+ 0x53aba2fd, 0x3fcd0dfe, 0x25091dd6, 0x3fe44cf3, 0x20000000,
+ 0x3c68076a, 0x00000000, 0xbff00000, 0x5bc57974, 0x3fc59267,
+ 0x39ae68c8, 0x3fe1c73b, 0x20000000, 0x3c8b25dd, 0x00000000,
+ 0xbff00000, 0x73fa1279, 0x3fbe3a68, 0x3806f63b, 0x3fde2b5d,
+ 0x20000000, 0x3c5e0d89, 0x00000000, 0xbff00000, 0x866b95cf,
+ 0x3fb37ca1, 0xa6aea963, 0x3fd87de2, 0xe0000000, 0xbc672ced,
+ 0x00000000, 0xbff00000, 0x939d225a, 0x3fa60bea, 0x2ed59f06,
+ 0x3fd29406, 0xa0000000, 0xbc75d28d, 0x00000000, 0xbff00000,
+ 0x011469fb, 0x3f93ad06, 0x3c69a60b, 0x3fc8f8b8, 0xc0000000,
+ 0xbc626d19, 0x00000000, 0xbff00000, 0x176d6d31, 0x3f73b92e,
+ 0xbc29b42c, 0x3fb917a6, 0xe0000000, 0xbc3e2718, 0x00000000,
+ 0xbff00000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+ 0x00000000, 0x00000000, 0x00000000, 0xbff00000, 0x176d6d31,
+ 0x3f73b92e, 0xbc29b42c, 0xbfb917a6, 0xe0000000, 0x3c3e2718,
+ 0x00000000, 0xbff00000, 0x011469fb, 0x3f93ad06, 0x3c69a60b,
+ 0xbfc8f8b8, 0xc0000000, 0x3c626d19, 0x00000000, 0xbff00000,
+ 0x939d225a, 0x3fa60bea, 0x2ed59f06, 0xbfd29406, 0xa0000000,
+ 0x3c75d28d, 0x00000000, 0xbff00000, 0x866b95cf, 0x3fb37ca1,
+ 0xa6aea963, 0xbfd87de2, 0xe0000000, 0x3c672ced, 0x00000000,
+ 0xbff00000, 0x73fa1279, 0x3fbe3a68, 0x3806f63b, 0xbfde2b5d,
+ 0x20000000, 0xbc5e0d89, 0x00000000, 0xbff00000, 0x5bc57974,
+ 0x3fc59267, 0x39ae68c8, 0xbfe1c73b, 0x20000000, 0xbc8b25dd,
+ 0x00000000, 0xbff00000, 0x53aba2fd, 0x3fcd0dfe, 0x25091dd6,
+ 0xbfe44cf3, 0x20000000, 0xbc68076a, 0x00000000, 0xbff00000,
+ 0x99fcef32, 0xbfca8279, 0x667f3bcd, 0xbfe6a09e, 0x20000000,
+ 0x3c8bdd34, 0x00000000, 0xbfe00000, 0x94247758, 0xbfc133cc,
+ 0x6b151741, 0xbfe8bc80, 0x20000000, 0x3c82c5e1, 0x00000000,
+ 0xbfe00000, 0x9ae68c87, 0xbfac73b3, 0x290ea1a3, 0xbfea9b66,
+ 0xe0000000, 0xbc39f630, 0x00000000, 0xbfe00000, 0x7f909c4e,
+ 0x3f9d4a2c, 0xf180bdb1, 0xbfec38b2, 0x80000000, 0x3c76e0b1,
+ 0x00000000, 0xbfe00000, 0x65455a75, 0x3fbe0875, 0xcf328d46,
+ 0xbfed906b, 0x20000000, 0xbc7457e6, 0x00000000, 0xbfe00000,
+ 0x76acf82d, 0xbfa4a031, 0x56c62dda, 0xbfee9f41, 0xe0000000,
+ 0xbc8760b1, 0x00000000, 0xbfd00000, 0x0e5967d5, 0x3fac1d1f,
+ 0xcff75cb0, 0xbfef6297, 0x20000000, 0xbc756217, 0x00000000,
+ 0xbfd00000, 0x0f592f50, 0x3f9ba165, 0xa3d12526, 0xbfefd88d,
+ 0x40000000, 0x3c887df6, 0x00000000, 0xbfc00000, 0x00000000,
+ 0x00000000, 0x00000000, 0xbff00000, 0x00000000, 0x00000000,
+ 0x00000000, 0x00000000, 0x0f592f50, 0xbf9ba165, 0xa3d12526,
+ 0xbfefd88d, 0x40000000, 0x3c887df6, 0x00000000, 0x3fc00000,
+ 0x0e5967d5, 0xbfac1d1f, 0xcff75cb0, 0xbfef6297, 0x20000000,
+ 0xbc756217, 0x00000000, 0x3fd00000, 0x76acf82d, 0x3fa4a031,
+ 0x56c62dda, 0xbfee9f41, 0xe0000000, 0xbc8760b1, 0x00000000,
+ 0x3fd00000, 0x65455a75, 0xbfbe0875, 0xcf328d46, 0xbfed906b,
+ 0x20000000, 0xbc7457e6, 0x00000000, 0x3fe00000, 0x7f909c4e,
+ 0xbf9d4a2c, 0xf180bdb1, 0xbfec38b2, 0x80000000, 0x3c76e0b1,
+ 0x00000000, 0x3fe00000, 0x9ae68c87, 0x3fac73b3, 0x290ea1a3,
+ 0xbfea9b66, 0xe0000000, 0xbc39f630, 0x00000000, 0x3fe00000,
+ 0x94247758, 0x3fc133cc, 0x6b151741, 0xbfe8bc80, 0x20000000,
+ 0x3c82c5e1, 0x00000000, 0x3fe00000, 0x99fcef32, 0x3fca8279,
+ 0x667f3bcd, 0xbfe6a09e, 0x20000000, 0x3c8bdd34, 0x00000000,
+ 0x3fe00000, 0x53aba2fd, 0xbfcd0dfe, 0x25091dd6, 0xbfe44cf3,
+ 0x20000000, 0xbc68076a, 0x00000000, 0x3ff00000, 0x5bc57974,
+ 0xbfc59267, 0x39ae68c8, 0xbfe1c73b, 0x20000000, 0xbc8b25dd,
+ 0x00000000, 0x3ff00000, 0x73fa1279, 0xbfbe3a68, 0x3806f63b,
+ 0xbfde2b5d, 0x20000000, 0xbc5e0d89, 0x00000000, 0x3ff00000,
+ 0x866b95cf, 0xbfb37ca1, 0xa6aea963, 0xbfd87de2, 0xe0000000,
+ 0x3c672ced, 0x00000000, 0x3ff00000, 0x939d225a, 0xbfa60bea,
+ 0x2ed59f06, 0xbfd29406, 0xa0000000, 0x3c75d28d, 0x00000000,
+ 0x3ff00000, 0x011469fb, 0xbf93ad06, 0x3c69a60b, 0xbfc8f8b8,
+ 0xc0000000, 0x3c626d19, 0x00000000, 0x3ff00000, 0x176d6d31,
+ 0xbf73b92e, 0xbc29b42c, 0xbfb917a6, 0xe0000000, 0x3c3e2718,
+ 0x00000000, 0x3ff00000
+ // @formatter:on
+ });
+
+ private ArrayDataPointerConstant sc2 = pointerConstant(16, new int[]{
+ // @formatter:off
+ 0x11111111, 0x3f811111, 0x55555555, 0x3fa55555
+ // @formatter:on
+ });
+
+ private ArrayDataPointerConstant sc3 = pointerConstant(16, new int[]{
+ // @formatter:off
+ 0x1a01a01a, 0xbf2a01a0, 0x16c16c17, 0xbf56c16c
+ // @formatter:on
+ });
+
+ private ArrayDataPointerConstant sc1 = pointerConstant(16, new int[]{
+ // @formatter:off
+ 0x55555555, 0xbfc55555, 0x00000000, 0xbfe00000
+ // @formatter:on
+ });
+
+ private ArrayDataPointerConstant piInvTable = pointerConstant(16, new int[]{
+ // @formatter:off
+ 0x00000000, 0x00000000, 0xa2f9836e, 0x4e441529, 0xfc2757d1,
+ 0xf534ddc0, 0xdb629599, 0x3c439041, 0xfe5163ab, 0xdebbc561,
+ 0xb7246e3a, 0x424dd2e0, 0x06492eea, 0x09d1921c, 0xfe1deb1c,
+ 0xb129a73e, 0xe88235f5, 0x2ebb4484, 0xe99c7026, 0xb45f7e41,
+ 0x3991d639, 0x835339f4, 0x9c845f8b, 0xbdf9283b, 0x1ff897ff,
+ 0xde05980f, 0xef2f118b, 0x5a0a6d1f, 0x6d367ecf, 0x27cb09b7,
+ 0x4f463f66, 0x9e5fea2d, 0x7527bac7, 0xebe5f17b, 0x3d0739f7,
+ 0x8a5292ea, 0x6bfb5fb1, 0x1f8d5d08, 0x56033046, 0xfc7b6bab,
+ 0xf0cfbc21
+ // @formatter:on
+ });
+
+ private ArrayDataPointerConstant pi4 = pointerConstant(8, new int[]{
+ // @formatter:off
+ 0x40000000, 0x3fe921fb, 0x18469899, 0x3e64442d
+ // @formatter:on
+ });
+
+ private ArrayDataPointerConstant pi48 = pointerConstant(8, new int[]{
+ // @formatter:off
+ 0x18469899, 0x3e64442d
+ // @formatter:on
+ });
+
+ private ArrayDataPointerConstant pi32Inv = pointerConstant(8, new int[]{
+ // @formatter:off
+ 0x6dc9c883, 0x40245f30
+ // @formatter:on
+ });
+
+ private ArrayDataPointerConstant signMask = pointerConstant(8, new int[]{
+ // @formatter:off
+ 0x00000000, 0x80000000
+ // @formatter:on
+ });
+
+ private ArrayDataPointerConstant p3 = pointerConstant(8, new int[]{
+ // @formatter:off
+ 0x2e037073, 0x3b63198a
+ // @formatter:on
+ });
+
+ private ArrayDataPointerConstant p1 = pointerConstant(8, new int[]{
+ // @formatter:off
+ 0x54400000, 0x3fb921fb
+ // @formatter:on
+ });
+
+ private ArrayDataPointerConstant negZero = pointerConstant(8, new int[]{
+ // @formatter:off
+ 0x00000000, 0x80000000
+ // @formatter:on
+ });
+
+ // The 64 bit code is at most SSE2 compliant
+ private ArrayDataPointerConstant one = pointerConstant(8, new int[]{
+ // @formatter:off
+ 0x00000000, 0x3ff00000
+ // @formatter:on
+ });
+
+ @Override
+ public void emitCode(CompilationResultBuilder crb, AMD64MacroAssembler masm) {
+ Label block0 = new Label();
+ Label block1 = new Label();
+ Label block2 = new Label();
+ Label block3 = new Label();
+ Label block4 = new Label();
+ Label block5 = new Label();
+ Label block6 = new Label();
+ Label block7 = new Label();
+ Label block8 = new Label();
+ Label block9 = new Label();
+ Label block10 = new Label();
+ Label block11 = new Label();
+ Label block12 = new Label();
+ Label block13 = new Label();
+
+ masm.push(rbx);
+ masm.subq(rsp, 16);
+ masm.movsd(new AMD64Address(rsp, 8), xmm0);
+
+ masm.movl(rax, new AMD64Address(rsp, 12));
+ masm.movq(xmm1, recordExternalAddress(crb, pi32Inv)); // 0x6dc9c883, 0x40245f30
+ masm.andl(rax, 2147418112);
+ masm.subl(rax, 808452096);
+ masm.cmpl(rax, 281346048);
+ masm.jcc(ConditionFlag.Above, block0);
+ masm.mulsd(xmm1, xmm0);
+ masm.movdqu(xmm5, recordExternalAddress(crb, onehalf)); // 0x00000000, 0x3fe00000,
+ // 0x00000000, 0x3fe00000
+ masm.movq(xmm4, recordExternalAddress(crb, signMask)); // 0x00000000, 0x80000000
+ masm.pand(xmm4, xmm0);
+ masm.por(xmm5, xmm4);
+ masm.addpd(xmm1, xmm5);
+ masm.cvttsd2sil(rdx, xmm1);
+ masm.cvtsi2sdl(xmm1, rdx);
+ masm.movdqu(xmm2, recordExternalAddress(crb, p2)); // 0x1a600000, 0x3d90b461,
+ // 0x1a600000, 0x3d90b461
+ masm.movq(xmm3, recordExternalAddress(crb, p1)); // 0x54400000, 0x3fb921fb
+ masm.mulsd(xmm3, xmm1);
+ masm.unpcklpd(xmm1, xmm1);
+ masm.addq(rdx, 1865232);
+ masm.movdqu(xmm4, xmm0);
+ masm.andq(rdx, 63);
+ masm.movdqu(xmm5, recordExternalAddress(crb, sc4)); // 0xa556c734, 0x3ec71de3,
+ // 0x1a01a01a, 0x3efa01a0
+ masm.leaq(rax, recordExternalAddress(crb, ctable));
+ masm.shlq(rdx, 5);
+ masm.addq(rax, rdx);
+ masm.mulpd(xmm2, xmm1);
+ masm.subsd(xmm0, xmm3);
+ masm.mulsd(xmm1, recordExternalAddress(crb, p3)); // 0x2e037073, 0x3b63198a
+ masm.subsd(xmm4, xmm3);
+ masm.movq(xmm7, new AMD64Address(rax, 8));
+ masm.unpcklpd(xmm0, xmm0);
+ masm.movdqu(xmm3, xmm4);
+ masm.subsd(xmm4, xmm2);
+ masm.mulpd(xmm5, xmm0);
+ masm.subpd(xmm0, xmm2);
+ masm.movdqu(xmm6, recordExternalAddress(crb, sc2)); // 0x11111111, 0x3f811111,
+ // 0x55555555, 0x3fa55555
+ masm.mulsd(xmm7, xmm4);
+ masm.subsd(xmm3, xmm4);
+ masm.mulpd(xmm5, xmm0);
+ masm.mulpd(xmm0, xmm0);
+ masm.subsd(xmm3, xmm2);
+ masm.movdqu(xmm2, new AMD64Address(rax, 0));
+ masm.subsd(xmm1, xmm3);
+ masm.movq(xmm3, new AMD64Address(rax, 24));
+ masm.addsd(xmm2, xmm3);
+ masm.subsd(xmm7, xmm2);
+ masm.mulsd(xmm2, xmm4);
+ masm.mulpd(xmm6, xmm0);
+ masm.mulsd(xmm3, xmm4);
+ masm.mulpd(xmm2, xmm0);
+ masm.mulpd(xmm0, xmm0);
+ masm.addpd(xmm5, recordExternalAddress(crb, sc3)); // 0x1a01a01a, 0xbf2a01a0,
+ // 0x16c16c17, 0xbf56c16c
+ masm.mulsd(xmm4, new AMD64Address(rax, 0));
+ masm.addpd(xmm6, recordExternalAddress(crb, sc1)); // 0x55555555, 0xbfc55555,
+ // 0x00000000, 0xbfe00000
+ masm.mulpd(xmm5, xmm0);
+ masm.movdqu(xmm0, xmm3);
+ masm.addsd(xmm3, new AMD64Address(rax, 8));
+ masm.mulpd(xmm1, xmm7);
+ masm.movdqu(xmm7, xmm4);
+ masm.addsd(xmm4, xmm3);
+ masm.addpd(xmm6, xmm5);
+ masm.movq(xmm5, new AMD64Address(rax, 8));
+ masm.subsd(xmm5, xmm3);
+ masm.subsd(xmm3, xmm4);
+ masm.addsd(xmm1, new AMD64Address(rax, 16));
+ masm.mulpd(xmm6, xmm2);
+ masm.addsd(xmm0, xmm5);
+ masm.addsd(xmm3, xmm7);
+ masm.addsd(xmm0, xmm1);
+ masm.addsd(xmm0, xmm3);
+ masm.addsd(xmm0, xmm6);
+ masm.unpckhpd(xmm6, xmm6);
+ masm.addsd(xmm0, xmm6);
+ masm.addsd(xmm0, xmm4);
+ masm.jmp(block13);
+
+ masm.bind(block0);
+ masm.jcc(ConditionFlag.Greater, block1);
+ masm.pextrw(rax, xmm0, 3);
+ masm.andl(rax, 32767);
+ masm.pinsrw(xmm0, rax, 3);
+ masm.movq(xmm1, recordExternalAddress(crb, one)); // 0x00000000, 0x3ff00000
+ masm.subsd(xmm1, xmm0);
+ masm.movdqu(xmm0, xmm1);
+ masm.jmp(block13);
+
+ masm.bind(block1);
+ masm.pextrw(rax, xmm0, 3);
+ masm.andl(rax, 32752);
+ masm.cmpl(rax, 32752);
+ masm.jcc(ConditionFlag.Equal, block2);
+ masm.pextrw(rcx, xmm0, 3);
+ masm.andl(rcx, 32752);
+ masm.subl(rcx, 16224);
+ masm.shrl(rcx, 7);
+ masm.andl(rcx, 65532);
+ masm.leaq(r11, recordExternalAddress(crb, piInvTable));
+ masm.addq(rcx, r11);
+ masm.movdq(rax, xmm0);
+ masm.movl(r10, new AMD64Address(rcx, 20));
+ masm.movl(r8, new AMD64Address(rcx, 24));
+ masm.movl(rdx, rax);
+ masm.shrq(rax, 21);
+ masm.orl(rax, Integer.MIN_VALUE);
+ masm.shrl(rax, 11);
+ masm.movl(r9, r10);
+ masm.imulq(r10, rdx);
+ masm.imulq(r9, rax);
+ masm.imulq(r8, rax);
+ masm.movl(rsi, new AMD64Address(rcx, 16));
+ masm.movl(rdi, new AMD64Address(rcx, 12));
+ masm.movl(r11, r10);
+ masm.shrq(r10, 32);
+ masm.addq(r9, r10);
+ masm.addq(r11, r8);
+ masm.movl(r8, r11);
+ masm.shrq(r11, 32);
+ masm.addq(r9, r11);
+ masm.movl(r10, rsi);
+ masm.imulq(rsi, rdx);
+ masm.imulq(r10, rax);
+ masm.movl(r11, rdi);
+ masm.imulq(rdi, rdx);
+ masm.movl(rbx, rsi);
+ masm.shrq(rsi, 32);
+ masm.addq(r9, rbx);
+ masm.movl(rbx, r9);
+ masm.shrq(r9, 32);
+ masm.addq(r10, rsi);
+ masm.addq(r10, r9);
+ masm.shlq(rbx, 32);
+ masm.orq(r8, rbx);
+ masm.imulq(r11, rax);
+ masm.movl(r9, new AMD64Address(rcx, 8));
+ masm.movl(rsi, new AMD64Address(rcx, 4));
+ masm.movl(rbx, rdi);
+ masm.shrq(rdi, 32);
+ masm.addq(r10, rbx);
+ masm.movl(rbx, r10);
+ masm.shrq(r10, 32);
+ masm.addq(r11, rdi);
+ masm.addq(r11, r10);
+ masm.movq(rdi, r9);
+ masm.imulq(r9, rdx);
+ masm.imulq(rdi, rax);
+ masm.movl(r10, r9);
+ masm.shrq(r9, 32);
+ masm.addq(r11, r10);
+ masm.movl(r10, r11);
+ masm.shrq(r11, 32);
+ masm.addq(rdi, r9);
+ masm.addq(rdi, r11);
+ masm.movq(r9, rsi);
+ masm.imulq(rsi, rdx);
+ masm.imulq(r9, rax);
+ masm.shlq(r10, 32);
+ masm.orq(r10, rbx);
+ masm.movl(rax, new AMD64Address(rcx, 0));
+ masm.movl(r11, rsi);
+ masm.shrq(rsi, 32);
+ masm.addq(rdi, r11);
+ masm.movl(r11, rdi);
+ masm.shrq(rdi, 32);
+ masm.addq(r9, rsi);
+ masm.addq(r9, rdi);
+ masm.imulq(rdx, rax);
+ masm.pextrw(rbx, xmm0, 3);
+ masm.leaq(rdi, recordExternalAddress(crb, piInvTable));
+ masm.subq(rcx, rdi);
+ masm.addl(rcx, rcx);
+ masm.addl(rcx, rcx);
+ masm.addl(rcx, rcx);
+ masm.addl(rcx, 19);
+ masm.movl(rsi, 32768);
+ masm.andl(rsi, rbx);
+ masm.shrl(rbx, 4);
+ masm.andl(rbx, 2047);
+ masm.subl(rbx, 1023);
+ masm.subl(rcx, rbx);
+ masm.addq(r9, rdx);
+ masm.movl(rdx, rcx);
+ masm.addl(rdx, 32);
+ masm.cmpl(rcx, 1);
+ masm.jcc(ConditionFlag.Less, block3);
+ masm.negl(rcx);
+ masm.addl(rcx, 29);
+ masm.shll(r9);
+ masm.movl(rdi, r9);
+ masm.andl(r9, 536870911);
+ masm.testl(r9, 268435456);
+ masm.jcc(ConditionFlag.NotEqual, block4);
+ masm.shrl(r9);
+ masm.movl(rbx, 0);
+ masm.shlq(r9, 32);
+ masm.orq(r9, r11);
+
+ masm.bind(block5);
+
+ masm.bind(block6);
+ masm.cmpq(r9, 0);
+ masm.jcc(ConditionFlag.Equal, block7);
+
+ masm.bind(block8);
+ masm.bsrq(r11, r9);
+ masm.movl(rcx, 29);
+ masm.subl(rcx, r11);
+ masm.jcc(ConditionFlag.LessEqual, block9);
+ masm.shlq(r9);
+ masm.movq(rax, r10);
+ masm.shlq(r10);
+ masm.addl(rdx, rcx);
+ masm.negl(rcx);
+ masm.addl(rcx, 64);
+ masm.shrq(rax);
+ masm.shrq(r8);
+ masm.orq(r9, rax);
+ masm.orq(r10, r8);
+
+ masm.bind(block10);
+ masm.cvtsi2sdq(xmm0, r9);
+ masm.shrq(r10, 1);
+ masm.cvtsi2sdq(xmm3, r10);
+ masm.xorpd(xmm4, xmm4);
+ masm.shll(rdx, 4);
+ masm.negl(rdx);
+ masm.addl(rdx, 16368);
+ masm.orl(rdx, rsi);
+ masm.xorl(rdx, rbx);
+ masm.pinsrw(xmm4, rdx, 3);
+ masm.movq(xmm2, recordExternalAddress(crb, pi4)); // 0x40000000, 0x3fe921fb,
+ // 0x18469899, 0x3e64442d
+ masm.movq(xmm6, recordExternalAddress(crb, pi48)); // 0x3fe921fb, 0x18469899,
+ // 0x3e64442d
+ masm.xorpd(xmm5, xmm5);
+ masm.subl(rdx, 1008);
+ masm.pinsrw(xmm5, rdx, 3);
+ masm.mulsd(xmm0, xmm4);
+ masm.shll(rsi, 16);
+ masm.sarl(rsi, 31);
+ masm.mulsd(xmm3, xmm5);
+ masm.movdqu(xmm1, xmm0);
+ masm.mulsd(xmm0, xmm2);
+ masm.shrl(rdi, 29);
+ masm.addsd(xmm1, xmm3);
+ masm.mulsd(xmm3, xmm2);
+ masm.addl(rdi, rsi);
+ masm.xorl(rdi, rsi);
+ masm.mulsd(xmm6, xmm1);
+ masm.movl(rax, rdi);
+ masm.addsd(xmm6, xmm3);
+ masm.movdqu(xmm2, xmm0);
+ masm.addsd(xmm0, xmm6);
+ masm.subsd(xmm2, xmm0);
+ masm.addsd(xmm6, xmm2);
+
+ masm.bind(block11);
+ masm.movq(xmm1, recordExternalAddress(crb, pi32Inv)); // 0x6dc9c883, 0x40245f30
+ masm.mulsd(xmm1, xmm0);
+ masm.movq(xmm5, recordExternalAddress(crb, onehalf)); // 0x00000000, 0x3fe00000,
+ // 0x00000000, 0x3fe00000
+ masm.movq(xmm4, recordExternalAddress(crb, signMask)); // 0x00000000, 0x80000000
+ masm.pand(xmm4, xmm0);
+ masm.por(xmm5, xmm4);
+ masm.addpd(xmm1, xmm5);
+ masm.cvttsd2siq(rdx, xmm1);
+ masm.cvtsi2sdq(xmm1, rdx);
+ masm.movq(xmm3, recordExternalAddress(crb, p1)); // 0x54400000, 0x3fb921fb
+ masm.movdqu(xmm2, recordExternalAddress(crb, p2)); // 0x1a600000, 0x3d90b461,
+ // 0x1a600000, 0x3d90b461
+ masm.mulsd(xmm3, xmm1);
+ masm.unpcklpd(xmm1, xmm1);
+ masm.shll(rax, 3);
+ masm.addl(rdx, 1865232);
+ masm.movdqu(xmm4, xmm0);
+ masm.addl(rdx, rax);
+ masm.andl(rdx, 63);
+ masm.movdqu(xmm5, recordExternalAddress(crb, sc4)); // 0xa556c734, 0x3ec71de3,
+ // 0x1a01a01a, 0x3efa01a0
+ masm.leaq(rax, recordExternalAddress(crb, ctable));
+ masm.shll(rdx, 5);
+ masm.addq(rax, rdx);
+ masm.mulpd(xmm2, xmm1);
+ masm.subsd(xmm0, xmm3);
+ masm.mulsd(xmm1, recordExternalAddress(crb, p3)); // 0x2e037073, 0x3b63198a
+ masm.subsd(xmm4, xmm3);
+ masm.movq(xmm7, new AMD64Address(rax, 8));
+ masm.unpcklpd(xmm0, xmm0);
+ masm.movdqu(xmm3, xmm4);
+ masm.subsd(xmm4, xmm2);
+ masm.mulpd(xmm5, xmm0);
+ masm.subpd(xmm0, xmm2);
+ masm.mulsd(xmm7, xmm4);
+ masm.subsd(xmm3, xmm4);
+ masm.mulpd(xmm5, xmm0);
+ masm.mulpd(xmm0, xmm0);
+ masm.subsd(xmm3, xmm2);
+ masm.movdqu(xmm2, new AMD64Address(rax, 0));
+ masm.subsd(xmm1, xmm3);
+ masm.movq(xmm3, new AMD64Address(rax, 24));
+ masm.addsd(xmm2, xmm3);
+ masm.subsd(xmm7, xmm2);
+ masm.subsd(xmm1, xmm6);
+ masm.movdqu(xmm6, recordExternalAddress(crb, sc2)); // 0x11111111, 0x3f811111,
+ // 0x55555555, 0x3fa55555
+ masm.mulsd(xmm2, xmm4);
+ masm.mulpd(xmm6, xmm0);
+ masm.mulsd(xmm3, xmm4);
+ masm.mulpd(xmm2, xmm0);
+ masm.mulpd(xmm0, xmm0);
+ masm.addpd(xmm5, recordExternalAddress(crb, sc3)); // 0x1a01a01a, 0xbf2a01a0,
+ // 0x16c16c17, 0xbf56c16c
+ masm.mulsd(xmm4, new AMD64Address(rax, 0));
+ masm.addpd(xmm6, recordExternalAddress(crb, sc1)); // 0x55555555, 0xbfc55555,
+ // 0x00000000, 0xbfe00000
+ masm.mulpd(xmm5, xmm0);
+ masm.movdqu(xmm0, xmm3);
+ masm.addsd(xmm3, new AMD64Address(rax, 8));
+ masm.mulpd(xmm1, xmm7);
+ masm.movdqu(xmm7, xmm4);
+ masm.addsd(xmm4, xmm3);
+ masm.addpd(xmm6, xmm5);
+ masm.movq(xmm5, new AMD64Address(rax, 8));
+ masm.subsd(xmm5, xmm3);
+ masm.subsd(xmm3, xmm4);
+ masm.addsd(xmm1, new AMD64Address(rax, 16));
+ masm.mulpd(xmm6, xmm2);
+ masm.addsd(xmm5, xmm0);
+ masm.addsd(xmm3, xmm7);
+ masm.addsd(xmm1, xmm5);
+ masm.addsd(xmm1, xmm3);
+ masm.addsd(xmm1, xmm6);
+ masm.unpckhpd(xmm6, xmm6);
+ masm.movdqu(xmm0, xmm4);
+ masm.addsd(xmm1, xmm6);
+ masm.addsd(xmm0, xmm1);
+ masm.jmp(block13);
+
+ masm.bind(block7);
+ masm.addl(rdx, 64);
+ masm.movq(r9, r10);
+ masm.movq(r10, r8);
+ masm.movl(r8, 0);
+ masm.cmpq(r9, 0);
+ masm.jcc(ConditionFlag.NotEqual, block8);
+ masm.addl(rdx, 64);
+ masm.movq(r9, r10);
+ masm.movq(r10, r8);
+ masm.cmpq(r9, 0);
+ masm.jcc(ConditionFlag.NotEqual, block8);
+ masm.xorpd(xmm0, xmm0);
+ masm.xorpd(xmm6, xmm6);
+ masm.jmp(block11);
+
+ masm.bind(block9);
+ masm.jcc(ConditionFlag.Equal, block10);
+ masm.negl(rcx);
+ masm.shrq(r10);
+ masm.movq(rax, r9);
+ masm.shrq(r9);
+ masm.subl(rdx, rcx);
+ masm.negl(rcx);
+ masm.addl(rcx, 64);
+ masm.shlq(rax);
+ masm.orq(r10, rax);
+ masm.jmp(block10);
+ masm.bind(block3);
+ masm.negl(rcx);
+ masm.shlq(r9, 32);
+ masm.orq(r9, r11);
+ masm.shlq(r9);
+ masm.movq(rdi, r9);
+ masm.testl(r9, Integer.MIN_VALUE);
+ masm.jcc(ConditionFlag.NotEqual, block12);
+ masm.shrl(r9);
+ masm.movl(rbx, 0);
+ masm.shrq(rdi, 3);
+ masm.jmp(block6);
+
+ masm.bind(block4);
+ masm.shrl(r9);
+ masm.movl(rbx, 536870912);
+ masm.shrl(rbx);
+ masm.shlq(r9, 32);
+ masm.orq(r9, r11);
+ masm.shlq(rbx, 32);
+ masm.addl(rdi, 536870912);
+ masm.movl(rcx, 0);
+ masm.movl(r11, 0);
+ masm.subq(rcx, r8);
+ masm.sbbq(r11, r10);
+ masm.sbbq(rbx, r9);
+ masm.movq(r8, rcx);
+ masm.movq(r10, r11);
+ masm.movq(r9, rbx);
+ masm.movl(rbx, 32768);
+ masm.jmp(block5);
+
+ masm.bind(block12);
+ masm.shrl(r9);
+ masm.movq(rbx, 0x100000000L);
+ masm.shrq(rbx);
+ masm.movl(rcx, 0);
+ masm.movl(r11, 0);
+ masm.subq(rcx, r8);
+ masm.sbbq(r11, r10);
+ masm.sbbq(rbx, r9);
+ masm.movq(r8, rcx);
+ masm.movq(r10, r11);
+ masm.movq(r9, rbx);
+ masm.movl(rbx, 32768);
+ masm.shrq(rdi, 3);
+ masm.addl(rdi, 536870912);
+ masm.jmp(block6);
+
+ masm.bind(block2);
+ masm.movsd(xmm0, new AMD64Address(rsp, 8));
+ masm.mulsd(xmm0, recordExternalAddress(crb, negZero)); // 0x00000000, 0x80000000
+ masm.movq(new AMD64Address(rsp, 0), xmm0);
+
+ masm.bind(block13);
+ masm.addq(rsp, 16);
+ masm.pop(rbx);
+ }
+
+}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir.amd64/src/org/graalvm/compiler/lir/amd64/AMD64MathExpOp.java Sat Mar 16 21:00:45 2019 +0000
@@ -0,0 +1,459 @@
+/*
+ * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, Intel Corporation. All rights reserved.
+ * Intel Math Library (LIBM) Source Code
+ * 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.
+ */
+
+
+package org.graalvm.compiler.lir.amd64;
+
+import static jdk.vm.ci.amd64.AMD64.r11;
+import static jdk.vm.ci.amd64.AMD64.rax;
+import static jdk.vm.ci.amd64.AMD64.rcx;
+import static jdk.vm.ci.amd64.AMD64.rdx;
+import static jdk.vm.ci.amd64.AMD64.rsp;
+import static jdk.vm.ci.amd64.AMD64.xmm0;
+import static jdk.vm.ci.amd64.AMD64.xmm1;
+import static jdk.vm.ci.amd64.AMD64.xmm2;
+import static jdk.vm.ci.amd64.AMD64.xmm3;
+import static jdk.vm.ci.amd64.AMD64.xmm4;
+import static jdk.vm.ci.amd64.AMD64.xmm5;
+import static jdk.vm.ci.amd64.AMD64.xmm6;
+import static jdk.vm.ci.amd64.AMD64.xmm7;
+import static org.graalvm.compiler.lir.amd64.AMD64HotSpotHelper.pointerConstant;
+import static org.graalvm.compiler.lir.amd64.AMD64HotSpotHelper.recordExternalAddress;
+
+import org.graalvm.compiler.asm.Label;
+import org.graalvm.compiler.asm.amd64.AMD64Address;
+import org.graalvm.compiler.asm.amd64.AMD64Assembler.ConditionFlag;
+import org.graalvm.compiler.asm.amd64.AMD64MacroAssembler;
+import org.graalvm.compiler.lir.LIRInstructionClass;
+import org.graalvm.compiler.lir.asm.ArrayDataPointerConstant;
+import org.graalvm.compiler.lir.asm.CompilationResultBuilder;
+
+/**
+ * <pre>
+ * ALGORITHM DESCRIPTION - EXP()
+ * ---------------------
+ *
+ * Description:
+ * Let K = 64 (table size).
+ * x x/log(2) n
+ * e = 2 = 2 * T[j] * (1 + P(y))
+ * where
+ * x = m*log(2)/K + y, y in [-log(2)/K..log(2)/K]
+ * m = n*K + j, m,n,j - signed integer, j in [-K/2..K/2]
+ * j/K
+ * values of 2 are tabulated as T[j] = T_hi[j] ( 1 + T_lo[j]).
+ *
+ * P(y) is a minimax polynomial approximation of exp(x)-1
+ * on small interval [-log(2)/K..log(2)/K] (were calculated by Maple V).
+ *
+ * To avoid problems with arithmetic overflow and underflow,
+ * n n1 n2
+ * value of 2 is safely computed as 2 * 2 where n1 in [-BIAS/2..BIAS/2]
+ * where BIAS is a value of exponent bias.
+ *
+ * Special cases:
+ * exp(NaN) = NaN
+ * exp(+INF) = +INF
+ * exp(-INF) = 0
+ * exp(x) = 1 for subnormals
+ * for finite argument, only exp(0)=1 is exact
+ * For IEEE double
+ * if x > 709.782712893383973096 then exp(x) overflow
+ * if x < -745.133219101941108420 then exp(x) underflow
+ * </pre>
+ */
+public final class AMD64MathExpOp extends AMD64MathIntrinsicUnaryOp {
+
+ public static final LIRInstructionClass<AMD64MathExpOp> TYPE = LIRInstructionClass.create(AMD64MathExpOp.class);
+
+ public AMD64MathExpOp() {
+ super(TYPE, /* GPR */ rax, rcx, rdx, r11,
+ /* XMM */ xmm1, xmm2, xmm3, xmm4, xmm5, xmm6, xmm7);
+ }
+
+ private ArrayDataPointerConstant cv = pointerConstant(16, new int[]{
+ // @formatter:off
+ 0x652b82fe, 0x40571547, 0x652b82fe, 0x40571547,
+ });
+ private ArrayDataPointerConstant cv16 = pointerConstant(16, new int[]{
+ 0xfefa0000, 0x3f862e42, 0xfefa0000, 0x3f862e42,
+ });
+ private ArrayDataPointerConstant cv32 = pointerConstant(16, new int[]{
+ 0xbc9e3b3a, 0x3d1cf79a, 0xbc9e3b3a, 0x3d1cf79a,
+ });
+ private ArrayDataPointerConstant cv48 = pointerConstant(16, new int[]{
+ 0xfffffffe, 0x3fdfffff, 0xfffffffe, 0x3fdfffff,
+ });
+ private ArrayDataPointerConstant cv64 = pointerConstant(16, new int[]{
+ 0xe3289860, 0x3f56c15c, 0x555b9e25, 0x3fa55555,
+ });
+ private ArrayDataPointerConstant cv80 = pointerConstant(16, new int[]{
+ 0xc090cf0f, 0x3f811115, 0x55548ba1, 0x3fc55555
+ // @formatter:on
+ });
+
+ private ArrayDataPointerConstant shifter = pointerConstant(16, new int[]{
+ // @formatter:off
+ 0x00000000, 0x43380000, 0x00000000, 0x43380000
+ // @formatter:on
+ });
+
+ private ArrayDataPointerConstant mmask = pointerConstant(16, new int[]{
+ // @formatter:off
+ 0xffffffc0, 0x00000000, 0xffffffc0, 0x00000000
+ // @formatter:on
+ });
+
+ private ArrayDataPointerConstant bias = pointerConstant(16, new int[]{
+ // @formatter:off
+ 0x0000ffc0, 0x00000000, 0x0000ffc0, 0x00000000
+ // @formatter:on
+ });
+
+ private ArrayDataPointerConstant tblAddr = pointerConstant(16, new int[]{
+ // @formatter:off
+ 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x0e03754d,
+ 0x3cad7bbf, 0x3e778060, 0x00002c9a, 0x3567f613, 0x3c8cd252,
+ 0xd3158574, 0x000059b0, 0x61e6c861, 0x3c60f74e, 0x18759bc8,
+ 0x00008745, 0x5d837b6c, 0x3c979aa6, 0x6cf9890f, 0x0000b558,
+ 0x702f9cd1, 0x3c3ebe3d, 0x32d3d1a2, 0x0000e3ec, 0x1e63bcd8,
+ 0x3ca3516e, 0xd0125b50, 0x00011301, 0x26f0387b, 0x3ca4c554,
+ 0xaea92ddf, 0x0001429a, 0x62523fb6, 0x3ca95153, 0x3c7d517a,
+ 0x000172b8, 0x3f1353bf, 0x3c8b898c, 0xeb6fcb75, 0x0001a35b,
+ 0x3e3a2f5f, 0x3c9aecf7, 0x3168b9aa, 0x0001d487, 0x44a6c38d,
+ 0x3c8a6f41, 0x88628cd6, 0x0002063b, 0xe3a8a894, 0x3c968efd,
+ 0x6e756238, 0x0002387a, 0x981fe7f2, 0x3c80472b, 0x65e27cdd,
+ 0x00026b45, 0x6d09ab31, 0x3c82f7e1, 0xf51fdee1, 0x00029e9d,
+ 0x720c0ab3, 0x3c8b3782, 0xa6e4030b, 0x0002d285, 0x4db0abb6,
+ 0x3c834d75, 0x0a31b715, 0x000306fe, 0x5dd3f84a, 0x3c8fdd39,
+ 0xb26416ff, 0x00033c08, 0xcc187d29, 0x3ca12f8c, 0x373aa9ca,
+ 0x000371a7, 0x738b5e8b, 0x3ca7d229, 0x34e59ff6, 0x0003a7db,
+ 0xa72a4c6d, 0x3c859f48, 0x4c123422, 0x0003dea6, 0x259d9205,
+ 0x3ca8b846, 0x21f72e29, 0x0004160a, 0x60c2ac12, 0x3c4363ed,
+ 0x6061892d, 0x00044e08, 0xdaa10379, 0x3c6ecce1, 0xb5c13cd0,
+ 0x000486a2, 0xbb7aafb0, 0x3c7690ce, 0xd5362a27, 0x0004bfda,
+ 0x9b282a09, 0x3ca083cc, 0x769d2ca6, 0x0004f9b2, 0xc1aae707,
+ 0x3ca509b0, 0x569d4f81, 0x0005342b, 0x18fdd78e, 0x3c933505,
+ 0x36b527da, 0x00056f47, 0xe21c5409, 0x3c9063e1, 0xdd485429,
+ 0x0005ab07, 0x2b64c035, 0x3c9432e6, 0x15ad2148, 0x0005e76f,
+ 0x99f08c0a, 0x3ca01284, 0xb03a5584, 0x0006247e, 0x0073dc06,
+ 0x3c99f087, 0x82552224, 0x00066238, 0x0da05571, 0x3c998d4d,
+ 0x667f3bcc, 0x0006a09e, 0x86ce4786, 0x3ca52bb9, 0x3c651a2e,
+ 0x0006dfb2, 0x206f0dab, 0x3ca32092, 0xe8ec5f73, 0x00071f75,
+ 0x8e17a7a6, 0x3ca06122, 0x564267c8, 0x00075feb, 0x461e9f86,
+ 0x3ca244ac, 0x73eb0186, 0x0007a114, 0xabd66c55, 0x3c65ebe1,
+ 0x36cf4e62, 0x0007e2f3, 0xbbff67d0, 0x3c96fe9f, 0x994cce12,
+ 0x00082589, 0x14c801df, 0x3c951f14, 0x9b4492ec, 0x000868d9,
+ 0xc1f0eab4, 0x3c8db72f, 0x422aa0db, 0x0008ace5, 0x59f35f44,
+ 0x3c7bf683, 0x99157736, 0x0008f1ae, 0x9c06283c, 0x3ca360ba,
+ 0xb0cdc5e4, 0x00093737, 0x20f962aa, 0x3c95e8d1, 0x9fde4e4f,
+ 0x00097d82, 0x2b91ce27, 0x3c71affc, 0x82a3f090, 0x0009c491,
+ 0x589a2ebd, 0x3c9b6d34, 0x7b5de564, 0x000a0c66, 0x9ab89880,
+ 0x3c95277c, 0xb23e255c, 0x000a5503, 0x6e735ab3, 0x3c846984,
+ 0x5579fdbf, 0x000a9e6b, 0x92cb3387, 0x3c8c1a77, 0x995ad3ad,
+ 0x000ae89f, 0xdc2d1d96, 0x3ca22466, 0xb84f15fa, 0x000b33a2,
+ 0xb19505ae, 0x3ca1112e, 0xf2fb5e46, 0x000b7f76, 0x0a5fddcd,
+ 0x3c74ffd7, 0x904bc1d2, 0x000bcc1e, 0x30af0cb3, 0x3c736eae,
+ 0xdd85529c, 0x000c199b, 0xd10959ac, 0x3c84e08f, 0x2e57d14b,
+ 0x000c67f1, 0x6c921968, 0x3c676b2c, 0xdcef9069, 0x000cb720,
+ 0x36df99b3, 0x3c937009, 0x4a07897b, 0x000d072d, 0xa63d07a7,
+ 0x3c74a385, 0xdcfba487, 0x000d5818, 0xd5c192ac, 0x3c8e5a50,
+ 0x03db3285, 0x000da9e6, 0x1c4a9792, 0x3c98bb73, 0x337b9b5e,
+ 0x000dfc97, 0x603a88d3, 0x3c74b604, 0xe78b3ff6, 0x000e502e,
+ 0x92094926, 0x3c916f27, 0xa2a490d9, 0x000ea4af, 0x41aa2008,
+ 0x3c8ec3bc, 0xee615a27, 0x000efa1b, 0x31d185ee, 0x3c8a64a9,
+ 0x5b6e4540, 0x000f5076, 0x4d91cd9d, 0x3c77893b, 0x819e90d8,
+ 0x000fa7c1
+ // @formatter:on
+ });
+
+ private ArrayDataPointerConstant allones = pointerConstant(16, new int[]{
+ // @formatter:off
+ 0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff
+ // @formatter:on
+ });
+
+ private ArrayDataPointerConstant ebias = pointerConstant(16, new int[]{
+ // @formatter:off
+ 0x00000000, 0x3ff00000, 0x00000000, 0x3ff00000
+ // @formatter:on
+ });
+
+ private ArrayDataPointerConstant xmax = pointerConstant(4, new int[]{
+ // @formatter:off
+ 0xffffffff, 0x7fefffff
+ // @formatter:on
+ });
+
+ private ArrayDataPointerConstant xmin = pointerConstant(4, new int[]{
+ // @formatter:off
+ 0x00000000, 0x00100000
+ // @formatter:on
+ });
+
+ private ArrayDataPointerConstant inf = pointerConstant(4, new int[]{
+ // @formatter:off
+ 0x00000000, 0x7ff00000
+ // @formatter:on
+ });
+
+ private ArrayDataPointerConstant zero = pointerConstant(4, new int[]{
+ // @formatter:off
+ 0x00000000, 0x00000000
+ // @formatter:on
+ });
+
+ private ArrayDataPointerConstant oneVal = pointerConstant(4, new int[]{
+ // @formatter:off
+ 0x00000000, 0x3ff00000
+ // @formatter:on
+ });
+
+ @Override
+ public void emitCode(CompilationResultBuilder crb, AMD64MacroAssembler masm) {
+ // Registers:
+ // input: xmm0
+ // scratch: xmm1, xmm2, xmm3, xmm4, xmm5, xmm6, xmm7
+ // rax, rdx, rcx, tmp - r11
+
+ // Code generated by Intel C compiler for LIBM library
+ Label block0 = new Label();
+ Label block1 = new Label();
+ Label block2 = new Label();
+ Label block3 = new Label();
+ Label block4 = new Label();
+ Label block5 = new Label();
+ Label block6 = new Label();
+ Label block7 = new Label();
+ Label block8 = new Label();
+ Label block9 = new Label();
+ Label block10 = new Label();
+ Label block11 = new Label();
+ Label block12 = new Label();
+ Label block13 = new Label();
+
+ masm.subq(rsp, 24);
+ masm.movsd(new AMD64Address(rsp, 8), xmm0);
+ masm.unpcklpd(xmm0, xmm0);
+ masm.movdqu(xmm1, recordExternalAddress(crb, cv)); // 0x652b82fe, 0x40571547,
+ // 0x652b82fe, 0x40571547
+ masm.movdqu(xmm6, recordExternalAddress(crb, shifter)); // 0x00000000, 0x43380000,
+ // 0x00000000, 0x43380000
+ masm.movdqu(xmm2, recordExternalAddress(crb, cv16)); // 0xfefa0000, 0x3f862e42,
+ // 0xfefa0000, 0x3f862e42
+ masm.movdqu(xmm3, recordExternalAddress(crb, cv32)); // 0xbc9e3b3a, 0x3d1cf79a,
+ // 0xbc9e3b3a, 0x3d1cf79a
+ masm.pextrw(rax, xmm0, 3);
+ masm.andl(rax, 32767);
+ masm.movl(rdx, 16527);
+ masm.subl(rdx, rax);
+ masm.subl(rax, 15504);
+ masm.orl(rdx, rax);
+ masm.cmpl(rdx, Integer.MIN_VALUE);
+ masm.jcc(ConditionFlag.AboveEqual, block0);
+ masm.mulpd(xmm1, xmm0);
+ masm.addpd(xmm1, xmm6);
+ masm.movapd(xmm7, xmm1);
+ masm.subpd(xmm1, xmm6);
+ masm.mulpd(xmm2, xmm1);
+ masm.movdqu(xmm4, recordExternalAddress(crb, cv64)); // 0xe3289860, 0x3f56c15c,
+ // 0x555b9e25, 0x3fa55555
+ masm.mulpd(xmm3, xmm1);
+ masm.movdqu(xmm5, recordExternalAddress(crb, cv80)); // 0xc090cf0f, 0x3f811115,
+ // 0x55548ba1, 0x3fc55555
+ masm.subpd(xmm0, xmm2);
+ masm.movdl(rax, xmm7);
+ masm.movl(rcx, rax);
+ masm.andl(rcx, 63);
+ masm.shll(rcx, 4);
+ masm.sarl(rax, 6);
+ masm.movl(rdx, rax);
+ masm.movdqu(xmm6, recordExternalAddress(crb, mmask)); // 0xffffffc0, 0x00000000,
+ // 0xffffffc0, 0x00000000
+ masm.pand(xmm7, xmm6);
+ masm.movdqu(xmm6, recordExternalAddress(crb, bias)); // 0x0000ffc0, 0x00000000,
+ // 0x0000ffc0, 0x00000000
+ masm.paddq(xmm7, xmm6);
+ masm.psllq(xmm7, 46);
+ masm.subpd(xmm0, xmm3);
+ masm.leaq(r11, recordExternalAddress(crb, tblAddr));
+ masm.movdqu(xmm2, new AMD64Address(rcx, r11, AMD64Address.Scale.Times1));
+ masm.mulpd(xmm4, xmm0);
+ masm.movapd(xmm6, xmm0);
+ masm.movapd(xmm1, xmm0);
+ masm.mulpd(xmm6, xmm6);
+ masm.mulpd(xmm0, xmm6);
+ masm.addpd(xmm5, xmm4);
+ masm.mulsd(xmm0, xmm6);
+ masm.mulpd(xmm6, recordExternalAddress(crb, cv48)); // 0xfffffffe, 0x3fdfffff,
+ // 0xfffffffe, 0x3fdfffff
+ masm.addsd(xmm1, xmm2);
+ masm.unpckhpd(xmm2, xmm2);
+ masm.mulpd(xmm0, xmm5);
+ masm.addsd(xmm1, xmm0);
+ masm.por(xmm2, xmm7);
+ masm.unpckhpd(xmm0, xmm0);
+ masm.addsd(xmm0, xmm1);
+ masm.addsd(xmm0, xmm6);
+ masm.addl(rdx, 894);
+ masm.cmpl(rdx, 1916);
+ masm.jcc(ConditionFlag.Above, block1);
+ masm.mulsd(xmm0, xmm2);
+ masm.addsd(xmm0, xmm2);
+ masm.jmp(block13);
+
+ masm.bind(block1);
+ masm.xorpd(xmm3, xmm3);
+ masm.movdqu(xmm4, recordExternalAddress(crb, allones)); // 0xffffffff, 0xffffffff,
+ // 0xffffffff, 0xffffffff
+ masm.movl(rdx, -1022);
+ masm.subl(rdx, rax);
+ masm.movdl(xmm5, rdx);
+ masm.psllq(xmm4, xmm5);
+ masm.movl(rcx, rax);
+ masm.sarl(rax, 1);
+ masm.pinsrw(xmm3, rax, 3);
+ masm.movdqu(xmm6, recordExternalAddress(crb, ebias)); // 0x00000000, 0x3ff00000,
+ // 0x00000000, 0x3ff00000
+ masm.psllq(xmm3, 4);
+ masm.psubd(xmm2, xmm3);
+ masm.mulsd(xmm0, xmm2);
+ masm.cmpl(rdx, 52);
+ masm.jcc(ConditionFlag.Greater, block2);
+ masm.pand(xmm4, xmm2);
+ masm.paddd(xmm3, xmm6);
+ masm.subsd(xmm2, xmm4);
+ masm.addsd(xmm0, xmm2);
+ masm.cmpl(rcx, 1023);
+ masm.jcc(ConditionFlag.GreaterEqual, block3);
+ masm.pextrw(rcx, xmm0, 3);
+ masm.andl(rcx, 32768);
+ masm.orl(rdx, rcx);
+ masm.cmpl(rdx, 0);
+ masm.jcc(ConditionFlag.Equal, block4);
+ masm.movapd(xmm6, xmm0);
+ masm.addsd(xmm0, xmm4);
+ masm.mulsd(xmm0, xmm3);
+ masm.pextrw(rcx, xmm0, 3);
+ masm.andl(rcx, 32752);
+ masm.cmpl(rcx, 0);
+ masm.jcc(ConditionFlag.Equal, block5);
+ masm.jmp(block13);
+
+ masm.bind(block5);
+ masm.mulsd(xmm6, xmm3);
+ masm.mulsd(xmm4, xmm3);
+ masm.movdqu(xmm0, xmm6);
+ masm.pxor(xmm6, xmm4);
+ masm.psrad(xmm6, 31);
+ masm.pshufd(xmm6, xmm6, 85);
+ masm.psllq(xmm0, 1);
+ masm.psrlq(xmm0, 1);
+ masm.pxor(xmm0, xmm6);
+ masm.psrlq(xmm6, 63);
+ masm.paddq(xmm0, xmm6);
+ masm.paddq(xmm0, xmm4);
+ masm.movl(new AMD64Address(rsp, 0), 15);
+ masm.jmp(block6);
+
+ masm.bind(block4);
+ masm.addsd(xmm0, xmm4);
+ masm.mulsd(xmm0, xmm3);
+ masm.jmp(block13);
+
+ masm.bind(block3);
+ masm.addsd(xmm0, xmm4);
+ masm.mulsd(xmm0, xmm3);
+ masm.pextrw(rcx, xmm0, 3);
+ masm.andl(rcx, 32752);
+ masm.cmpl(rcx, 32752);
+ masm.jcc(ConditionFlag.AboveEqual, block7);
+ masm.jmp(block13);
+
+ masm.bind(block2);
+ masm.paddd(xmm3, xmm6);
+ masm.addpd(xmm0, xmm2);
+ masm.mulsd(xmm0, xmm3);
+ masm.movl(new AMD64Address(rsp, 0), 15);
+ masm.jmp(block6);
+
+ masm.bind(block8);
+ masm.cmpl(rax, 2146435072);
+ masm.jcc(ConditionFlag.AboveEqual, block9);
+ masm.movl(rax, new AMD64Address(rsp, 12));
+ masm.cmpl(rax, Integer.MIN_VALUE);
+ masm.jcc(ConditionFlag.AboveEqual, block10);
+ masm.movsd(xmm0, recordExternalAddress(crb, xmax)); // 0xffffffff, 0x7fefffff
+ masm.mulsd(xmm0, xmm0);
+
+ masm.bind(block7);
+ masm.movl(new AMD64Address(rsp, 0), 14);
+ masm.jmp(block6);
+
+ masm.bind(block10);
+ masm.movsd(xmm0, recordExternalAddress(crb, xmin)); // 0x00000000, 0x00100000
+ masm.mulsd(xmm0, xmm0);
+ masm.movl(new AMD64Address(rsp, 0), 15);
+ masm.jmp(block6);
+
+ masm.bind(block9);
+ masm.movl(rdx, new AMD64Address(rsp, 8));
+ masm.cmpl(rax, 2146435072);
+ masm.jcc(ConditionFlag.Above, block11);
+ masm.cmpl(rdx, 0);
+ masm.jcc(ConditionFlag.NotEqual, block11);
+ masm.movl(rax, new AMD64Address(rsp, 12));
+ masm.cmpl(rax, 2146435072);
+ masm.jcc(ConditionFlag.NotEqual, block12);
+ masm.movsd(xmm0, recordExternalAddress(crb, inf)); // 0x00000000, 0x7ff00000
+ masm.jmp(block13);
+
+ masm.bind(block12);
+ masm.movsd(xmm0, recordExternalAddress(crb, zero)); // 0x00000000, 0x00000000
+ masm.jmp(block13);
+
+ masm.bind(block11);
+ masm.movsd(xmm0, new AMD64Address(rsp, 8));
+ masm.addsd(xmm0, xmm0);
+ masm.jmp(block13);
+
+ masm.bind(block0);
+ masm.movl(rax, new AMD64Address(rsp, 12));
+ masm.andl(rax, 2147483647);
+ masm.cmpl(rax, 1083179008);
+ masm.jcc(ConditionFlag.AboveEqual, block8);
+ masm.movsd(new AMD64Address(rsp, 8), xmm0);
+ masm.addsd(xmm0, recordExternalAddress(crb, oneVal)); // 0x00000000, 0x3ff00000
+ masm.jmp(block13);
+
+ masm.bind(block6);
+ masm.movq(new AMD64Address(rsp, 16), xmm0);
+
+ masm.movq(xmm0, new AMD64Address(rsp, 16));
+
+ masm.bind(block13);
+ masm.addq(rsp, 24);
+ }
+}
--- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir.amd64/src/org/graalvm/compiler/lir/amd64/AMD64MathIntrinsicBinaryOp.java Tue Mar 12 09:49:10 2019 +0000
+++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir.amd64/src/org/graalvm/compiler/lir/amd64/AMD64MathIntrinsicBinaryOp.java Sat Mar 16 21:00:45 2019 +0000
@@ -24,2043 +24,52 @@
package org.graalvm.compiler.lir.amd64;
-import static org.graalvm.compiler.lir.LIRInstruction.OperandFlag.ILLEGAL;
-import static org.graalvm.compiler.lir.LIRInstruction.OperandFlag.REG;
-import static jdk.vm.ci.code.ValueUtil.asRegister;
+import static jdk.vm.ci.amd64.AMD64.xmm0;
+import static jdk.vm.ci.amd64.AMD64.xmm1;
+import static org.graalvm.compiler.lir.amd64.AMD64HotSpotHelper.registersToValues;
-import org.graalvm.compiler.asm.Label;
-import org.graalvm.compiler.asm.amd64.AMD64Address;
-import org.graalvm.compiler.asm.amd64.AMD64Address.Scale;
-import org.graalvm.compiler.asm.amd64.AMD64Assembler.ConditionFlag;
-import org.graalvm.compiler.asm.amd64.AMD64MacroAssembler;
import org.graalvm.compiler.core.common.LIRKind;
-import org.graalvm.compiler.debug.GraalError;
import org.graalvm.compiler.lir.LIRInstructionClass;
-import org.graalvm.compiler.lir.Opcode;
-import org.graalvm.compiler.lir.asm.ArrayDataPointerConstant;
-import org.graalvm.compiler.lir.asm.CompilationResultBuilder;
-import org.graalvm.compiler.lir.gen.LIRGeneratorTool;
+import org.graalvm.compiler.lir.Variable;
+import org.graalvm.compiler.lir.gen.LIRGenerator;
-import jdk.vm.ci.amd64.AMD64;
import jdk.vm.ci.amd64.AMD64Kind;
import jdk.vm.ci.code.Register;
-import jdk.vm.ci.meta.AllocatableValue;
+import jdk.vm.ci.code.RegisterValue;
import jdk.vm.ci.meta.Value;
-public final class AMD64MathIntrinsicBinaryOp extends AMD64LIRInstruction {
- public static final LIRInstructionClass<AMD64MathIntrinsicBinaryOp> TYPE = LIRInstructionClass.create(AMD64MathIntrinsicBinaryOp.class);
-
- public enum BinaryIntrinsicOpcode {
- POW
- }
-
- @Opcode private final BinaryIntrinsicOpcode opcode;
- @Def protected Value result;
- @Use protected Value input;
- @Use protected Value secondInput;
- @Temp({REG, ILLEGAL}) protected Value xmm1Temp = Value.ILLEGAL;
- @Temp({REG, ILLEGAL}) protected Value xmm2Temp = Value.ILLEGAL;
- @Temp({REG, ILLEGAL}) protected Value xmm3Temp = Value.ILLEGAL;
- @Temp({REG, ILLEGAL}) protected Value xmm4Temp = Value.ILLEGAL;
- @Temp({REG, ILLEGAL}) protected Value xmm5Temp = Value.ILLEGAL;
- @Temp({REG, ILLEGAL}) protected Value xmm6Temp = Value.ILLEGAL;
- @Temp({REG, ILLEGAL}) protected Value xmm7Temp = Value.ILLEGAL;
- @Temp({REG, ILLEGAL}) protected Value xmm8Temp = Value.ILLEGAL;
- @Temp({REG, ILLEGAL}) protected Value xmm9Temp = Value.ILLEGAL;
- @Temp({REG, ILLEGAL}) protected Value xmm10Temp = Value.ILLEGAL;
- @Temp({REG, ILLEGAL}) protected Value gpr1Temp = Value.ILLEGAL;
- @Temp({REG, ILLEGAL}) protected Value gpr2Temp = Value.ILLEGAL;
- @Temp protected AllocatableValue rcxTemp;
- @Temp({REG, ILLEGAL}) protected Value gpr4Temp = Value.ILLEGAL;
- @Temp({REG, ILLEGAL}) protected Value gpr5Temp = Value.ILLEGAL;
- @Temp({REG, ILLEGAL}) protected Value gpr6Temp = Value.ILLEGAL;
- @Temp({REG, ILLEGAL}) protected Value gpr7Temp = Value.ILLEGAL;
- @Temp({REG, ILLEGAL}) protected Value gpr8Temp = Value.ILLEGAL;
- @Temp({REG, ILLEGAL}) protected Value gpr9Temp = Value.ILLEGAL;
- @Temp({REG, ILLEGAL}) protected Value gpr10Temp = Value.ILLEGAL;
-
- CompilationResultBuilder internalCrb;
+/**
+ * AMD64MathIntrinsicBinaryOp assumes that the input values are stored in the xmm0 and xmm1
+ * registers, and it will emit the output value into the xmm0 register.
+ * {@link #emitLIRWrapper(LIRGenerator, Value, Value)} is provided for emitting necessary mov LIRs
+ * before and after this LIR instruction.
+ */
+public abstract class AMD64MathIntrinsicBinaryOp extends AMD64LIRInstruction {
- public AMD64MathIntrinsicBinaryOp(LIRGeneratorTool tool, BinaryIntrinsicOpcode opcode, Value result, Value input, Value alternateInput) {
- super(TYPE);
- this.opcode = opcode;
- this.result = result;
- this.input = input;
- this.secondInput = alternateInput;
- if (opcode == BinaryIntrinsicOpcode.POW) {
- this.gpr1Temp = tool.newVariable(LIRKind.value(AMD64Kind.QWORD));
- this.gpr2Temp = tool.newVariable(LIRKind.value(AMD64Kind.QWORD));
- this.rcxTemp = AMD64.rcx.asValue(LIRKind.value(AMD64Kind.QWORD));
- this.gpr4Temp = tool.newVariable(LIRKind.value(AMD64Kind.QWORD));
- this.gpr5Temp = tool.newVariable(LIRKind.value(AMD64Kind.QWORD));
- this.gpr6Temp = tool.newVariable(LIRKind.value(AMD64Kind.QWORD));
- this.gpr7Temp = tool.newVariable(LIRKind.value(AMD64Kind.QWORD));
- this.gpr8Temp = tool.newVariable(LIRKind.value(AMD64Kind.QWORD));
+ @Def protected Value output;
+ @Use protected Value input0;
+ @Use protected Value input1;
+ @Temp protected Value[] temps;
- this.xmm1Temp = tool.newVariable(LIRKind.value(AMD64Kind.DOUBLE));
- this.xmm2Temp = tool.newVariable(LIRKind.value(AMD64Kind.DOUBLE));
- this.xmm3Temp = tool.newVariable(LIRKind.value(AMD64Kind.DOUBLE));
- this.xmm4Temp = tool.newVariable(LIRKind.value(AMD64Kind.DOUBLE));
- this.xmm5Temp = tool.newVariable(LIRKind.value(AMD64Kind.DOUBLE));
- this.xmm6Temp = tool.newVariable(LIRKind.value(AMD64Kind.DOUBLE));
- this.xmm7Temp = tool.newVariable(LIRKind.value(AMD64Kind.DOUBLE));
- this.xmm8Temp = tool.newVariable(LIRKind.value(AMD64Kind.DOUBLE));
- this.xmm9Temp = tool.newVariable(LIRKind.value(AMD64Kind.DOUBLE));
- this.xmm10Temp = tool.newVariable(LIRKind.value(AMD64Kind.DOUBLE));
- }
- }
+ public AMD64MathIntrinsicBinaryOp(LIRInstructionClass<? extends AMD64MathIntrinsicBinaryOp> type, Register... registers) {
+ super(type);
- private void setCrb(CompilationResultBuilder crb) {
- internalCrb = crb;
- }
-
- private AMD64Address externalAddress(ArrayDataPointerConstant curPtr) {
- return (AMD64Address) internalCrb.recordDataReferenceInCode(curPtr);
- }
+ input0 = xmm0.asValue(LIRKind.value(AMD64Kind.DOUBLE));
+ input1 = xmm1.asValue(LIRKind.value(AMD64Kind.DOUBLE));
+ output = xmm0.asValue(LIRKind.value(AMD64Kind.DOUBLE));
- @Override
- public void emitCode(CompilationResultBuilder crb, AMD64MacroAssembler masm) {
- switch (opcode) {
- case POW:
- powIntrinsic(asRegister(result, AMD64Kind.DOUBLE), asRegister(input, AMD64Kind.DOUBLE), asRegister(secondInput, AMD64Kind.DOUBLE), crb, masm);
- break;
- default:
- throw GraalError.shouldNotReachHere();
- }
+ temps = registersToValues(registers);
}
- /*
- * Copyright (c) 2014, 2016, Intel Corporation. All rights reserved. Intel Math Library (LIBM)
- * Source Code
- *
- * ALGORITHM DESCRIPTION - POW() ---------------------
- *
- * Let x=2^k * mx, mx in [1,2)
- *
- * log2(x) calculation:
- *
- * Get B~1/mx based on the output of rcpps instruction (B0) B = int((B0*LH*2^9+0.5))/2^9 LH is a
- * short approximation for log2(e)
- *
- * Reduced argument, scaled by LH: r=B*mx-LH (computed accurately in high and low parts)
- *
- * log2(x) result: k - log2(B) + p(r) p(r) is a degree 8 polynomial -log2(B) read from data
- * table (high, low parts) log2(x) is formed from high and low parts For |x| in [1-1/32,
- * 1+1/16), a slower but more accurate computation based om the same table design is performed.
- *
- * Main path is taken if | floor(log2(|log2(|x|)|) + floor(log2|y|) | < 8, to filter out all
- * potential OF/UF cases. exp2(y*log2(x)) is computed using an 8-bit index table and a degree 5
- * polynomial
- *
- * Special cases: pow(-0,y) = -INF and raises the divide-by-zero exception for y an odd integer
- * < 0. pow(-0,y) = +INF and raises the divide-by-zero exception for y < 0 and not an odd
- * integer. pow(-0,y) = -0 for y an odd integer > 0. pow(-0,y) = +0 for y > 0 and not an odd
- * integer. pow(-1,-INF) = NaN. pow(+1,y) = NaN for any y, even a NaN. pow(x,-0) = 1 for any x,
- * even a NaN. pow(x,y) = a NaN and raises the invalid exception for finite x < 0 and finite
- * non-integer y. pow(x,-INF) = +INF for |x|<1. pow(x,-INF) = +0 for |x|>1. pow(x,+INF) = +0 for
- * |x|<1. pow(x,+INF) = +INF for |x|>1. pow(-INF,y) = -0 for y an odd integer < 0. pow(-INF,y) =
- * +0 for y < 0 and not an odd integer. pow(-INF,y) = -INF for y an odd integer > 0. pow(-INF,y)
- * = +INF for y > 0 and not an odd integer. pow(+INF,y) = +0 for y <0. pow(+INF,y) = +INF for y
- * >0.
- *
- */
-
- private static int[] highSigMask = {
- 0x00000000, 0xfffff800, 0x00000000, 0xfffff800
- };
-
- private static int[] logTwoE = {
- 0x00000000, 0x3ff72000, 0x161bb241, 0xbf5dabe1
- };
-
- private static int[] highmaskY = {
- 0x00000000, 0xfffffff8, 0x00000000, 0xffffffff
- };
-
- private static int[] tExp = {
- 0x00000000, 0x3ff00000, 0x00000000, 0x3b700000, 0xfa5abcbf,
- 0x3ff00b1a, 0xa7609f71, 0xbc84f6b2, 0xa9fb3335, 0x3ff0163d,
- 0x9ab8cdb7, 0x3c9b6129, 0x143b0281, 0x3ff02168, 0x0fc54eb6,
- 0xbc82bf31, 0x3e778061, 0x3ff02c9a, 0x535b085d, 0xbc719083,
- 0x2e11bbcc, 0x3ff037d4, 0xeeade11a, 0x3c656811, 0xe86e7f85,
- 0x3ff04315, 0x1977c96e, 0xbc90a31c, 0x72f654b1, 0x3ff04e5f,
- 0x3aa0d08c, 0x3c84c379, 0xd3158574, 0x3ff059b0, 0xa475b465,
- 0x3c8d73e2, 0x0e3c1f89, 0x3ff0650a, 0x5799c397, 0xbc95cb7b,
- 0x29ddf6de, 0x3ff0706b, 0xe2b13c27, 0xbc8c91df, 0x2b72a836,
- 0x3ff07bd4, 0x54458700, 0x3c832334, 0x18759bc8, 0x3ff08745,
- 0x4bb284ff, 0x3c6186be, 0xf66607e0, 0x3ff092bd, 0x800a3fd1,
- 0xbc968063, 0xcac6f383, 0x3ff09e3e, 0x18316136, 0x3c914878,
- 0x9b1f3919, 0x3ff0a9c7, 0x873d1d38, 0x3c85d16c, 0x6cf9890f,
- 0x3ff0b558, 0x4adc610b, 0x3c98a62e, 0x45e46c85, 0x3ff0c0f1,
- 0x06d21cef, 0x3c94f989, 0x2b7247f7, 0x3ff0cc92, 0x16e24f71,
- 0x3c901edc, 0x23395dec, 0x3ff0d83b, 0xe43f316a, 0xbc9bc14d,
- 0x32d3d1a2, 0x3ff0e3ec, 0x27c57b52, 0x3c403a17, 0x5fdfa9c5,
- 0x3ff0efa5, 0xbc54021b, 0xbc949db9, 0xaffed31b, 0x3ff0fb66,
- 0xc44ebd7b, 0xbc6b9bed, 0x28d7233e, 0x3ff10730, 0x1692fdd5,
- 0x3c8d46eb, 0xd0125b51, 0x3ff11301, 0x39449b3a, 0xbc96c510,
- 0xab5e2ab6, 0x3ff11edb, 0xf703fb72, 0xbc9ca454, 0xc06c31cc,
- 0x3ff12abd, 0xb36ca5c7, 0xbc51b514, 0x14f204ab, 0x3ff136a8,
- 0xba48dcf0, 0xbc67108f, 0xaea92de0, 0x3ff1429a, 0x9af1369e,
- 0xbc932fbf, 0x934f312e, 0x3ff14e95, 0x39bf44ab, 0xbc8b91e8,
- 0xc8a58e51, 0x3ff15a98, 0xb9eeab0a, 0x3c82406a, 0x5471c3c2,
- 0x3ff166a4, 0x82ea1a32, 0x3c58f23b, 0x3c7d517b, 0x3ff172b8,
- 0xb9d78a76, 0xbc819041, 0x8695bbc0, 0x3ff17ed4, 0xe2ac5a64,
- 0x3c709e3f, 0x388c8dea, 0x3ff18af9, 0xd1970f6c, 0xbc911023,
- 0x58375d2f, 0x3ff19726, 0x85f17e08, 0x3c94aadd, 0xeb6fcb75,
- 0x3ff1a35b, 0x7b4968e4, 0x3c8e5b4c, 0xf8138a1c, 0x3ff1af99,
- 0xa4b69280, 0x3c97bf85, 0x84045cd4, 0x3ff1bbe0, 0x352ef607,
- 0xbc995386, 0x95281c6b, 0x3ff1c82f, 0x8010f8c9, 0x3c900977,
- 0x3168b9aa, 0x3ff1d487, 0x00a2643c, 0x3c9e016e, 0x5eb44027,
- 0x3ff1e0e7, 0x088cb6de, 0xbc96fdd8, 0x22fcd91d, 0x3ff1ed50,
- 0x027bb78c, 0xbc91df98, 0x8438ce4d, 0x3ff1f9c1, 0xa097af5c,
- 0xbc9bf524, 0x88628cd6, 0x3ff2063b, 0x814a8495, 0x3c8dc775,
- 0x3578a819, 0x3ff212be, 0x2cfcaac9, 0x3c93592d, 0x917ddc96,
- 0x3ff21f49, 0x9494a5ee, 0x3c82a97e, 0xa27912d1, 0x3ff22bdd,
- 0x5577d69f, 0x3c8d34fb, 0x6e756238, 0x3ff2387a, 0xb6c70573,
- 0x3c99b07e, 0xfb82140a, 0x3ff2451f, 0x911ca996, 0x3c8acfcc,
- 0x4fb2a63f, 0x3ff251ce, 0xbef4f4a4, 0x3c8ac155, 0x711ece75,
- 0x3ff25e85, 0x4ac31b2c, 0x3c93e1a2, 0x65e27cdd, 0x3ff26b45,
- 0x9940e9d9, 0x3c82bd33, 0x341ddf29, 0x3ff2780e, 0x05f9e76c,
- 0x3c9e067c, 0xe1f56381, 0x3ff284df, 0x8c3f0d7e, 0xbc9a4c3a,
- 0x7591bb70, 0x3ff291ba, 0x28401cbd, 0xbc82cc72, 0xf51fdee1,
- 0x3ff29e9d, 0xafad1255, 0x3c8612e8, 0x66d10f13, 0x3ff2ab8a,
- 0x191690a7, 0xbc995743, 0xd0dad990, 0x3ff2b87f, 0xd6381aa4,
- 0xbc410adc, 0x39771b2f, 0x3ff2c57e, 0xa6eb5124, 0xbc950145,
- 0xa6e4030b, 0x3ff2d285, 0x54db41d5, 0x3c900247, 0x1f641589,
- 0x3ff2df96, 0xfbbce198, 0x3c9d16cf, 0xa93e2f56, 0x3ff2ecaf,
- 0x45d52383, 0x3c71ca0f, 0x4abd886b, 0x3ff2f9d2, 0x532bda93,
- 0xbc653c55, 0x0a31b715, 0x3ff306fe, 0xd23182e4, 0x3c86f46a,
- 0xedeeb2fd, 0x3ff31432, 0xf3f3fcd1, 0x3c8959a3, 0xfc4cd831,
- 0x3ff32170, 0x8e18047c, 0x3c8a9ce7, 0x3ba8ea32, 0x3ff32eb8,
- 0x3cb4f318, 0xbc9c45e8, 0xb26416ff, 0x3ff33c08, 0x843659a6,
- 0x3c932721, 0x66e3fa2d, 0x3ff34962, 0x930881a4, 0xbc835a75,
- 0x5f929ff1, 0x3ff356c5, 0x5c4e4628, 0xbc8b5cee, 0xa2de883b,
- 0x3ff36431, 0xa06cb85e, 0xbc8c3144, 0x373aa9cb, 0x3ff371a7,
- 0xbf42eae2, 0xbc963aea, 0x231e754a, 0x3ff37f26, 0x9eceb23c,
- 0xbc99f5ca, 0x6d05d866, 0x3ff38cae, 0x3c9904bd, 0xbc9e958d,
- 0x1b7140ef, 0x3ff39a40, 0xfc8e2934, 0xbc99a9a5, 0x34e59ff7,
- 0x3ff3a7db, 0xd661f5e3, 0xbc75e436, 0xbfec6cf4, 0x3ff3b57f,
- 0xe26fff18, 0x3c954c66, 0xc313a8e5, 0x3ff3c32d, 0x375d29c3,
- 0xbc9efff8, 0x44ede173, 0x3ff3d0e5, 0x8c284c71, 0x3c7fe8d0,
- 0x4c123422, 0x3ff3dea6, 0x11f09ebc, 0x3c8ada09, 0xdf1c5175,
- 0x3ff3ec70, 0x7b8c9bca, 0xbc8af663, 0x04ac801c, 0x3ff3fa45,
- 0xf956f9f3, 0xbc97d023, 0xc367a024, 0x3ff40822, 0xb6f4d048,
- 0x3c8bddf8, 0x21f72e2a, 0x3ff4160a, 0x1c309278, 0xbc5ef369,
- 0x2709468a, 0x3ff423fb, 0xc0b314dd, 0xbc98462d, 0xd950a897,
- 0x3ff431f5, 0xe35f7999, 0xbc81c7dd, 0x3f84b9d4, 0x3ff43ffa,
- 0x9704c003, 0x3c8880be, 0x6061892d, 0x3ff44e08, 0x04ef80d0,
- 0x3c489b7a, 0x42a7d232, 0x3ff45c20, 0x82fb1f8e, 0xbc686419,
- 0xed1d0057, 0x3ff46a41, 0xd1648a76, 0x3c9c944b, 0x668b3237,
- 0x3ff4786d, 0xed445733, 0xbc9c20f0, 0xb5c13cd0, 0x3ff486a2,
- 0xb69062f0, 0x3c73c1a3, 0xe192aed2, 0x3ff494e1, 0x5e499ea0,
- 0xbc83b289, 0xf0d7d3de, 0x3ff4a32a, 0xf3d1be56, 0x3c99cb62,
- 0xea6db7d7, 0x3ff4b17d, 0x7f2897f0, 0xbc8125b8, 0xd5362a27,
- 0x3ff4bfda, 0xafec42e2, 0x3c7d4397, 0xb817c114, 0x3ff4ce41,
- 0x690abd5d, 0x3c905e29, 0x99fddd0d, 0x3ff4dcb2, 0xbc6a7833,
- 0x3c98ecdb, 0x81d8abff, 0x3ff4eb2d, 0x2e5d7a52, 0xbc95257d,
- 0x769d2ca7, 0x3ff4f9b2, 0xd25957e3, 0xbc94b309, 0x7f4531ee,
- 0x3ff50841, 0x49b7465f, 0x3c7a249b, 0xa2cf6642, 0x3ff516da,
- 0x69bd93ef, 0xbc8f7685, 0xe83f4eef, 0x3ff5257d, 0x43efef71,
- 0xbc7c998d, 0x569d4f82, 0x3ff5342b, 0x1db13cad, 0xbc807abe,
- 0xf4f6ad27, 0x3ff542e2, 0x192d5f7e, 0x3c87926d, 0xca5d920f,
- 0x3ff551a4, 0xefede59b, 0xbc8d689c, 0xdde910d2, 0x3ff56070,
- 0x168eebf0, 0xbc90fb6e, 0x36b527da, 0x3ff56f47, 0x011d93ad,
- 0x3c99bb2c, 0xdbe2c4cf, 0x3ff57e27, 0x8a57b9c4, 0xbc90b98c,
- 0xd497c7fd, 0x3ff58d12, 0x5b9a1de8, 0x3c8295e1, 0x27ff07cc,
- 0x3ff59c08, 0xe467e60f, 0xbc97e2ce, 0xdd485429, 0x3ff5ab07,
- 0x054647ad, 0x3c96324c, 0xfba87a03, 0x3ff5ba11, 0x4c233e1a,
- 0xbc9b77a1, 0x8a5946b7, 0x3ff5c926, 0x816986a2, 0x3c3c4b1b,
- 0x90998b93, 0x3ff5d845, 0xa8b45643, 0xbc9cd6a7, 0x15ad2148,
- 0x3ff5e76f, 0x3080e65e, 0x3c9ba6f9, 0x20dceb71, 0x3ff5f6a3,
- 0xe3cdcf92, 0xbc89eadd, 0xb976dc09, 0x3ff605e1, 0x9b56de47,
- 0xbc93e242, 0xe6cdf6f4, 0x3ff6152a, 0x4ab84c27, 0x3c9e4b3e,
- 0xb03a5585, 0x3ff6247e, 0x7e40b497, 0xbc9383c1, 0x1d1929fd,
- 0x3ff633dd, 0xbeb964e5, 0x3c984710, 0x34ccc320, 0x3ff64346,
- 0x759d8933, 0xbc8c483c, 0xfebc8fb7, 0x3ff652b9, 0xc9a73e09,
- 0xbc9ae3d5, 0x82552225, 0x3ff66238, 0x87591c34, 0xbc9bb609,
- 0xc70833f6, 0x3ff671c1, 0x586c6134, 0xbc8e8732, 0xd44ca973,
- 0x3ff68155, 0x44f73e65, 0x3c6038ae, 0xb19e9538, 0x3ff690f4,
- 0x9aeb445d, 0x3c8804bd, 0x667f3bcd, 0x3ff6a09e, 0x13b26456,
- 0xbc9bdd34, 0xfa75173e, 0x3ff6b052, 0x2c9a9d0e, 0x3c7a38f5,
- 0x750bdabf, 0x3ff6c012, 0x67ff0b0d, 0xbc728956, 0xddd47645,
- 0x3ff6cfdc, 0xb6f17309, 0x3c9c7aa9, 0x3c651a2f, 0x3ff6dfb2,
- 0x683c88ab, 0xbc6bbe3a, 0x98593ae5, 0x3ff6ef92, 0x9e1ac8b2,
- 0xbc90b974, 0xf9519484, 0x3ff6ff7d, 0x25860ef6, 0xbc883c0f,
- 0x66f42e87, 0x3ff70f74, 0xd45aa65f, 0x3c59d644, 0xe8ec5f74,
- 0x3ff71f75, 0x86887a99, 0xbc816e47, 0x86ead08a, 0x3ff72f82,
- 0x2cd62c72, 0xbc920aa0, 0x48a58174, 0x3ff73f9a, 0x6c65d53c,
- 0xbc90a8d9, 0x35d7cbfd, 0x3ff74fbd, 0x618a6e1c, 0x3c9047fd,
- 0x564267c9, 0x3ff75feb, 0x57316dd3, 0xbc902459, 0xb1ab6e09,
- 0x3ff77024, 0x169147f8, 0x3c9b7877, 0x4fde5d3f, 0x3ff78069,
- 0x0a02162d, 0x3c9866b8, 0x38ac1cf6, 0x3ff790b9, 0x62aadd3e,
- 0x3c9349a8, 0x73eb0187, 0x3ff7a114, 0xee04992f, 0xbc841577,
- 0x0976cfdb, 0x3ff7b17b, 0x8468dc88, 0xbc9bebb5, 0x0130c132,
- 0x3ff7c1ed, 0xd1164dd6, 0x3c9f124c, 0x62ff86f0, 0x3ff7d26a,
- 0xfb72b8b4, 0x3c91bddb, 0x36cf4e62, 0x3ff7e2f3, 0xba15797e,
- 0x3c705d02, 0x8491c491, 0x3ff7f387, 0xcf9311ae, 0xbc807f11,
- 0x543e1a12, 0x3ff80427, 0x626d972b, 0xbc927c86, 0xadd106d9,
- 0x3ff814d2, 0x0d151d4d, 0x3c946437, 0x994cce13, 0x3ff82589,
- 0xd41532d8, 0xbc9d4c1d, 0x1eb941f7, 0x3ff8364c, 0x31df2bd5,
- 0x3c999b9a, 0x4623c7ad, 0x3ff8471a, 0xa341cdfb, 0xbc88d684,
- 0x179f5b21, 0x3ff857f4, 0xf8b216d0, 0xbc5ba748, 0x9b4492ed,
- 0x3ff868d9, 0x9bd4f6ba, 0xbc9fc6f8, 0xd931a436, 0x3ff879ca,
- 0xd2db47bd, 0x3c85d2d7, 0xd98a6699, 0x3ff88ac7, 0xf37cb53a,
- 0x3c9994c2, 0xa478580f, 0x3ff89bd0, 0x4475202a, 0x3c9d5395,
- 0x422aa0db, 0x3ff8ace5, 0x56864b27, 0x3c96e9f1, 0xbad61778,
- 0x3ff8be05, 0xfc43446e, 0x3c9ecb5e, 0x16b5448c, 0x3ff8cf32,
- 0x32e9e3aa, 0xbc70d55e, 0x5e0866d9, 0x3ff8e06a, 0x6fc9b2e6,
- 0xbc97114a, 0x99157736, 0x3ff8f1ae, 0xa2e3976c, 0x3c85cc13,
- 0xd0282c8a, 0x3ff902fe, 0x85fe3fd2, 0x3c9592ca, 0x0b91ffc6,
- 0x3ff9145b, 0x2e582524, 0xbc9dd679, 0x53aa2fe2, 0x3ff925c3,
- 0xa639db7f, 0xbc83455f, 0xb0cdc5e5, 0x3ff93737, 0x81b57ebc,
- 0xbc675fc7, 0x2b5f98e5, 0x3ff948b8, 0x797d2d99, 0xbc8dc3d6,
- 0xcbc8520f, 0x3ff95a44, 0x96a5f039, 0xbc764b7c, 0x9a7670b3,
- 0x3ff96bdd, 0x7f19c896, 0xbc5ba596, 0x9fde4e50, 0x3ff97d82,
- 0x7c1b85d1, 0xbc9d185b, 0xe47a22a2, 0x3ff98f33, 0xa24c78ec,
- 0x3c7cabda, 0x70ca07ba, 0x3ff9a0f1, 0x91cee632, 0xbc9173bd,
- 0x4d53fe0d, 0x3ff9b2bb, 0x4df6d518, 0xbc9dd84e, 0x82a3f090,
- 0x3ff9c491, 0xb071f2be, 0x3c7c7c46, 0x194bb8d5, 0x3ff9d674,
- 0xa3dd8233, 0xbc9516be, 0x19e32323, 0x3ff9e863, 0x78e64c6e,
- 0x3c7824ca, 0x8d07f29e, 0x3ff9fa5e, 0xaaf1face, 0xbc84a9ce,
- 0x7b5de565, 0x3ffa0c66, 0x5d1cd533, 0xbc935949, 0xed8eb8bb,
- 0x3ffa1e7a, 0xee8be70e, 0x3c9c6618, 0xec4a2d33, 0x3ffa309b,
- 0x7ddc36ab, 0x3c96305c, 0x80460ad8, 0x3ffa42c9, 0x589fb120,
- 0xbc9aa780, 0xb23e255d, 0x3ffa5503, 0xdb8d41e1, 0xbc9d2f6e,
- 0x8af46052, 0x3ffa674a, 0x30670366, 0x3c650f56, 0x1330b358,
- 0x3ffa799e, 0xcac563c7, 0x3c9bcb7e, 0x53c12e59, 0x3ffa8bfe,
- 0xb2ba15a9, 0xbc94f867, 0x5579fdbf, 0x3ffa9e6b, 0x0ef7fd31,
- 0x3c90fac9, 0x21356eba, 0x3ffab0e5, 0xdae94545, 0x3c889c31,
- 0xbfd3f37a, 0x3ffac36b, 0xcae76cd0, 0xbc8f9234, 0x3a3c2774,
- 0x3ffad5ff, 0xb6b1b8e5, 0x3c97ef3b, 0x995ad3ad, 0x3ffae89f,
- 0x345dcc81, 0x3c97a1cd, 0xe622f2ff, 0x3ffafb4c, 0x0f315ecd,
- 0xbc94b2fc, 0x298db666, 0x3ffb0e07, 0x4c80e425, 0xbc9bdef5,
- 0x6c9a8952, 0x3ffb20ce, 0x4a0756cc, 0x3c94dd02, 0xb84f15fb,
- 0x3ffb33a2, 0x3084d708, 0xbc62805e, 0x15b749b1, 0x3ffb4684,
- 0xe9df7c90, 0xbc7f763d, 0x8de5593a, 0x3ffb5972, 0xbbba6de3,
- 0xbc9c71df, 0x29f1c52a, 0x3ffb6c6e, 0x52883f6e, 0x3c92a8f3,
- 0xf2fb5e47, 0x3ffb7f76, 0x7e54ac3b, 0xbc75584f, 0xf22749e4,
- 0x3ffb928c, 0x54cb65c6, 0xbc9b7216, 0x30a1064a, 0x3ffba5b0,
- 0x0e54292e, 0xbc9efcd3, 0xb79a6f1f, 0x3ffbb8e0, 0xc9696205,
- 0xbc3f52d1, 0x904bc1d2, 0x3ffbcc1e, 0x7a2d9e84, 0x3c823dd0,
- 0xc3f3a207, 0x3ffbdf69, 0x60ea5b53, 0xbc3c2623, 0x5bd71e09,
- 0x3ffbf2c2, 0x3f6b9c73, 0xbc9efdca, 0x6141b33d, 0x3ffc0628,
- 0xa1fbca34, 0xbc8d8a5a, 0xdd85529c, 0x3ffc199b, 0x895048dd,
- 0x3c811065, 0xd9fa652c, 0x3ffc2d1c, 0x17c8a5d7, 0xbc96e516,
- 0x5fffd07a, 0x3ffc40ab, 0xe083c60a, 0x3c9b4537, 0x78fafb22,
- 0x3ffc5447, 0x2493b5af, 0x3c912f07, 0x2e57d14b, 0x3ffc67f1,
- 0xff483cad, 0x3c92884d, 0x8988c933, 0x3ffc7ba8, 0xbe255559,
- 0xbc8e76bb, 0x9406e7b5, 0x3ffc8f6d, 0x48805c44, 0x3c71acbc,
- 0x5751c4db, 0x3ffca340, 0xd10d08f5, 0xbc87f2be, 0xdcef9069,
- 0x3ffcb720, 0xd1e949db, 0x3c7503cb, 0x2e6d1675, 0x3ffccb0f,
- 0x86009092, 0xbc7d220f, 0x555dc3fa, 0x3ffcdf0b, 0x53829d72,
- 0xbc8dd83b, 0x5b5bab74, 0x3ffcf315, 0xb86dff57, 0xbc9a08e9,
- 0x4a07897c, 0x3ffd072d, 0x43797a9c, 0xbc9cbc37, 0x2b08c968,
- 0x3ffd1b53, 0x219a36ee, 0x3c955636, 0x080d89f2, 0x3ffd2f87,
- 0x719d8578, 0xbc9d487b, 0xeacaa1d6, 0x3ffd43c8, 0xbf5a1614,
- 0x3c93db53, 0xdcfba487, 0x3ffd5818, 0xd75b3707, 0x3c82ed02,
- 0xe862e6d3, 0x3ffd6c76, 0x4a8165a0, 0x3c5fe87a, 0x16c98398,
- 0x3ffd80e3, 0x8beddfe8, 0xbc911ec1, 0x71ff6075, 0x3ffd955d,
- 0xbb9af6be, 0x3c9a052d, 0x03db3285, 0x3ffda9e6, 0x696db532,
- 0x3c9c2300, 0xd63a8315, 0x3ffdbe7c, 0x926b8be4, 0xbc9b76f1,
- 0xf301b460, 0x3ffdd321, 0x78f018c3, 0x3c92da57, 0x641c0658,
- 0x3ffde7d5, 0x8e79ba8f, 0xbc9ca552, 0x337b9b5f, 0x3ffdfc97,
- 0x4f184b5c, 0xbc91a5cd, 0x6b197d17, 0x3ffe1167, 0xbd5c7f44,
- 0xbc72b529, 0x14f5a129, 0x3ffe2646, 0x817a1496, 0xbc97b627,
- 0x3b16ee12, 0x3ffe3b33, 0x31fdc68b, 0xbc99f4a4, 0xe78b3ff6,
- 0x3ffe502e, 0x80a9cc8f, 0x3c839e89, 0x24676d76, 0x3ffe6539,
- 0x7522b735, 0xbc863ff8, 0xfbc74c83, 0x3ffe7a51, 0xca0c8de2,
- 0x3c92d522, 0x77cdb740, 0x3ffe8f79, 0x80b054b1, 0xbc910894,
- 0xa2a490da, 0x3ffea4af, 0x179c2893, 0xbc9e9c23, 0x867cca6e,
- 0x3ffeb9f4, 0x2293e4f2, 0x3c94832f, 0x2d8e67f1, 0x3ffecf48,
- 0xb411ad8c, 0xbc9c93f3, 0xa2188510, 0x3ffee4aa, 0xa487568d,
- 0x3c91c68d, 0xee615a27, 0x3ffefa1b, 0x86a4b6b0, 0x3c9dc7f4,
- 0x1cb6412a, 0x3fff0f9c, 0x65181d45, 0xbc932200, 0x376bba97,
- 0x3fff252b, 0xbf0d8e43, 0x3c93a1a5, 0x48dd7274, 0x3fff3ac9,
- 0x3ed837de, 0xbc795a5a, 0x5b6e4540, 0x3fff5076, 0x2dd8a18b,
- 0x3c99d3e1, 0x798844f8, 0x3fff6632, 0x3539343e, 0x3c9fa37b,
- 0xad9cbe14, 0x3fff7bfd, 0xd006350a, 0xbc9dbb12, 0x02243c89,
- 0x3fff91d8, 0xa779f689, 0xbc612ea8, 0x819e90d8, 0x3fffa7c1,
- 0xf3a5931e, 0x3c874853, 0x3692d514, 0x3fffbdba, 0x15098eb6,
- 0xbc796773, 0x2b8f71f1, 0x3fffd3c2, 0x966579e7, 0x3c62eb74,
- 0x6b2a23d9, 0x3fffe9d9, 0x7442fde3, 0x3c74a603
- };
-
- private static int[] eCoeff = {
- 0xe78a6731, 0x3f55d87f, 0xd704a0c0, 0x3fac6b08, 0x6fba4e77,
- 0x3f83b2ab, 0xff82c58f, 0x3fcebfbd, 0xfefa39ef, 0x3fe62e42,
- 0x00000000, 0x00000000
- };
-
- private static int[] coeffH = {
- 0x00000000, 0xbfd61a00, 0x00000000, 0xbf5dabe1
- };
-
- private static int[] highmaskLogX = {
- 0xf8000000, 0xffffffff, 0x00000000, 0xfffff800
- };
-
- private static int[] halfmask = {
- 0xf8000000, 0xffffffff, 0xf8000000, 0xffffffff
- };
-
- private static int[] coeffPow = {
- 0x6dc96112, 0xbf836578, 0xee241472, 0xbf9b0301, 0x9f95985a,
- 0xbfb528db, 0xb3841d2a, 0xbfd619b6, 0x518775e3, 0x3f9004f2,
- 0xac8349bb, 0x3fa76c9b, 0x486ececc, 0x3fc4635e, 0x161bb241,
- 0xbf5dabe1, 0x9f95985a, 0xbfb528db, 0xf8b5787d, 0x3ef2531e,
- 0x486ececb, 0x3fc4635e, 0x412055cc, 0xbdd61bb2
- };
-
- private static int[] lTblPow = {
- 0x00000000, 0x3ff00000, 0x00000000, 0x00000000, 0x20000000,
- 0x3feff00a, 0x96621f95, 0x3e5b1856, 0xe0000000, 0x3fefe019,
- 0xe5916f9e, 0xbe325278, 0x00000000, 0x3fefd02f, 0x859a1062,
- 0x3e595fb7, 0xc0000000, 0x3fefc049, 0xb245f18f, 0xbe529c38,
- 0xe0000000, 0x3fefb069, 0xad2880a7, 0xbe501230, 0x60000000,
- 0x3fefa08f, 0xc8e72420, 0x3e597bd1, 0x80000000, 0x3fef90ba,
- 0xc30c4500, 0xbe5d6c75, 0xe0000000, 0x3fef80ea, 0x02c63f43,
- 0x3e2e1318, 0xc0000000, 0x3fef7120, 0xb3d4cccc, 0xbe44c52a,
- 0x00000000, 0x3fef615c, 0xdbd91397, 0xbe4e7d6c, 0xa0000000,
- 0x3fef519c, 0x65c5cd68, 0xbe522dc8, 0xa0000000, 0x3fef41e2,
- 0x46d1306c, 0xbe5a840e, 0xe0000000, 0x3fef322d, 0xd2980e94,
- 0x3e5071af, 0xa0000000, 0x3fef227e, 0x773abade, 0xbe5891e5,
- 0xa0000000, 0x3fef12d4, 0xdc6bf46b, 0xbe5cccbe, 0xe0000000,
- 0x3fef032f, 0xbc7247fa, 0xbe2bab83, 0x80000000, 0x3feef390,
- 0xbcaa1e46, 0xbe53bb3b, 0x60000000, 0x3feee3f6, 0x5f6c682d,
- 0xbe54c619, 0x80000000, 0x3feed461, 0x5141e368, 0xbe4b6d86,
- 0xe0000000, 0x3feec4d1, 0xec678f76, 0xbe369af6, 0x80000000,
- 0x3feeb547, 0x41301f55, 0xbe2d4312, 0x60000000, 0x3feea5c2,
- 0x676da6bd, 0xbe4d8dd0, 0x60000000, 0x3fee9642, 0x57a891c4,
- 0x3e51f991, 0xa0000000, 0x3fee86c7, 0xe4eb491e, 0x3e579bf9,
- 0x20000000, 0x3fee7752, 0xfddc4a2c, 0xbe3356e6, 0xc0000000,
- 0x3fee67e1, 0xd75b5bf1, 0xbe449531, 0x80000000, 0x3fee5876,
- 0xbd423b8e, 0x3df54fe4, 0x60000000, 0x3fee4910, 0x330e51b9,
- 0x3e54289c, 0x80000000, 0x3fee39af, 0x8651a95f, 0xbe55aad6,
- 0xa0000000, 0x3fee2a53, 0x5e98c708, 0xbe2fc4a9, 0xe0000000,
- 0x3fee1afc, 0x0989328d, 0x3e23958c, 0x40000000, 0x3fee0bab,
- 0xee642abd, 0xbe425dd8, 0xa0000000, 0x3fedfc5e, 0xc394d236,
- 0x3e526362, 0x20000000, 0x3feded17, 0xe104aa8e, 0x3e4ce247,
- 0xc0000000, 0x3fedddd4, 0x265a9be4, 0xbe5bb77a, 0x40000000,
- 0x3fedce97, 0x0ecac52f, 0x3e4a7cb1, 0xe0000000, 0x3fedbf5e,
- 0x124cb3b8, 0x3e257024, 0x80000000, 0x3fedb02b, 0xe6d4febe,
- 0xbe2033ee, 0x20000000, 0x3feda0fd, 0x39cca00e, 0xbe3ddabc,
- 0xc0000000, 0x3fed91d3, 0xef8a552a, 0xbe543390, 0x40000000,
- 0x3fed82af, 0xb8e85204, 0x3e513850, 0xe0000000, 0x3fed738f,
- 0x3d59fe08, 0xbe5db728, 0x40000000, 0x3fed6475, 0x3aa7ead1,
- 0x3e58804b, 0xc0000000, 0x3fed555f, 0xf8a35ba9, 0xbe5298b0,
- 0x00000000, 0x3fed464f, 0x9a88dd15, 0x3e5a8cdb, 0x40000000,
- 0x3fed3743, 0xb0b0a190, 0x3e598635, 0x80000000, 0x3fed283c,
- 0xe2113295, 0xbe5c1119, 0x80000000, 0x3fed193a, 0xafbf1728,
- 0xbe492e9c, 0x60000000, 0x3fed0a3d, 0xe4a4ccf3, 0x3e19b90e,
- 0x20000000, 0x3fecfb45, 0xba3cbeb8, 0x3e406b50, 0xc0000000,
- 0x3fecec51, 0x110f7ddd, 0x3e0d6806, 0x40000000, 0x3fecdd63,
- 0x7dd7d508, 0xbe5a8943, 0x80000000, 0x3fecce79, 0x9b60f271,
- 0xbe50676a, 0x80000000, 0x3fecbf94, 0x0b9ad660, 0x3e59174f,
- 0x60000000, 0x3fecb0b4, 0x00823d9c, 0x3e5bbf72, 0x20000000,
- 0x3feca1d9, 0x38a6ec89, 0xbe4d38f9, 0x80000000, 0x3fec9302,
- 0x3a0b7d8e, 0x3e53dbfd, 0xc0000000, 0x3fec8430, 0xc6826b34,
- 0xbe27c5c9, 0xc0000000, 0x3fec7563, 0x0c706381, 0xbe593653,
- 0x60000000, 0x3fec669b, 0x7df34ec7, 0x3e461ab5, 0xe0000000,
- 0x3fec57d7, 0x40e5e7e8, 0xbe5c3dae, 0x00000000, 0x3fec4919,
- 0x5602770f, 0xbe55219d, 0xc0000000, 0x3fec3a5e, 0xec7911eb,
- 0x3e5a5d25, 0x60000000, 0x3fec2ba9, 0xb39ea225, 0xbe53c00b,
- 0x80000000, 0x3fec1cf8, 0x967a212e, 0x3e5a8ddf, 0x60000000,
- 0x3fec0e4c, 0x580798bd, 0x3e5f53ab, 0x00000000, 0x3febffa5,
- 0xb8282df6, 0xbe46b874, 0x20000000, 0x3febf102, 0xe33a6729,
- 0x3e54963f, 0x00000000, 0x3febe264, 0x3b53e88a, 0xbe3adce1,
- 0x60000000, 0x3febd3ca, 0xc2585084, 0x3e5cde9f, 0x80000000,
- 0x3febc535, 0xa335c5ee, 0xbe39fd9c, 0x20000000, 0x3febb6a5,
- 0x7325b04d, 0x3e42ba15, 0x60000000, 0x3feba819, 0x1564540f,
- 0x3e3a9f35, 0x40000000, 0x3feb9992, 0x83fff592, 0xbe5465ce,
- 0xa0000000, 0x3feb8b0f, 0xb9da63d3, 0xbe4b1a0a, 0x80000000,
- 0x3feb7c91, 0x6d6f1ea4, 0x3e557657, 0x00000000, 0x3feb6e18,
- 0x5e80a1bf, 0x3e4ddbb6, 0x00000000, 0x3feb5fa3, 0x1c9eacb5,
- 0x3e592877, 0xa0000000, 0x3feb5132, 0x6d40beb3, 0xbe51858c,
- 0xa0000000, 0x3feb42c6, 0xd740c67b, 0x3e427ad2, 0x40000000,
- 0x3feb345f, 0xa3e0ccee, 0xbe5c2fc4, 0x40000000, 0x3feb25fc,
- 0x8e752b50, 0xbe3da3c2, 0xc0000000, 0x3feb179d, 0xa892e7de,
- 0x3e1fb481, 0xc0000000, 0x3feb0943, 0x21ed71e9, 0xbe365206,
- 0x20000000, 0x3feafaee, 0x0e1380a3, 0x3e5c5b7b, 0x20000000,
- 0x3feaec9d, 0x3c3d640e, 0xbe5dbbd0, 0x60000000, 0x3feade50,
- 0x8f97a715, 0x3e3a8ec5, 0x20000000, 0x3fead008, 0x23ab2839,
- 0x3e2fe98a, 0x40000000, 0x3feac1c4, 0xf4bbd50f, 0x3e54d8f6,
- 0xe0000000, 0x3feab384, 0x14757c4d, 0xbe48774c, 0xc0000000,
- 0x3feaa549, 0x7c7b0eea, 0x3e5b51bb, 0x20000000, 0x3fea9713,
- 0xf56f7013, 0x3e386200, 0xe0000000, 0x3fea88e0, 0xbe428ebe,
- 0xbe514af5, 0xe0000000, 0x3fea7ab2, 0x8d0e4496, 0x3e4f9165,
- 0x60000000, 0x3fea6c89, 0xdbacc5d5, 0xbe5c063b, 0x20000000,
- 0x3fea5e64, 0x3f19d970, 0xbe5a0c8c, 0x20000000, 0x3fea5043,
- 0x09ea3e6b, 0x3e5065dc, 0x80000000, 0x3fea4226, 0x78df246c,
- 0x3e5e05f6, 0x40000000, 0x3fea340e, 0x4057d4a0, 0x3e431b2b,
- 0x40000000, 0x3fea25fa, 0x82867bb5, 0x3e4b76be, 0xa0000000,
- 0x3fea17ea, 0x9436f40a, 0xbe5aad39, 0x20000000, 0x3fea09df,
- 0x4b5253b3, 0x3e46380b, 0x00000000, 0x3fe9fbd8, 0x8fc52466,
- 0xbe386f9b, 0x20000000, 0x3fe9edd5, 0x22d3f344, 0xbe538347,
- 0x60000000, 0x3fe9dfd6, 0x1ac33522, 0x3e5dbc53, 0x00000000,
- 0x3fe9d1dc, 0xeabdff1d, 0x3e40fc0c, 0xe0000000, 0x3fe9c3e5,
- 0xafd30e73, 0xbe585e63, 0xe0000000, 0x3fe9b5f3, 0xa52f226a,
- 0xbe43e8f9, 0x20000000, 0x3fe9a806, 0xecb8698d, 0xbe515b36,
- 0x80000000, 0x3fe99a1c, 0xf2b4e89d, 0x3e48b62b, 0x20000000,
- 0x3fe98c37, 0x7c9a88fb, 0x3e44414c, 0x00000000, 0x3fe97e56,
- 0xda015741, 0xbe5d13ba, 0xe0000000, 0x3fe97078, 0x5fdace06,
- 0x3e51b947, 0x00000000, 0x3fe962a0, 0x956ca094, 0x3e518785,
- 0x40000000, 0x3fe954cb, 0x01164c1d, 0x3e5d5b57, 0xc0000000,
- 0x3fe946fa, 0xe63b3767, 0xbe4f84e7, 0x40000000, 0x3fe9392e,
- 0xe57cc2a9, 0x3e34eda3, 0xe0000000, 0x3fe92b65, 0x8c75b544,
- 0x3e5766a0, 0xc0000000, 0x3fe91da1, 0x37d1d087, 0xbe5e2ab1,
- 0x80000000, 0x3fe90fe1, 0xa953dc20, 0x3e5fa1f3, 0x80000000,
- 0x3fe90225, 0xdbd3f369, 0x3e47d6db, 0xa0000000, 0x3fe8f46d,
- 0x1c9be989, 0xbe5e2b0a, 0xa0000000, 0x3fe8e6b9, 0x3c93d76a,
- 0x3e5c8618, 0xe0000000, 0x3fe8d909, 0x2182fc9a, 0xbe41aa9e,
- 0x20000000, 0x3fe8cb5e, 0xe6b3539d, 0xbe530d19, 0x60000000,
- 0x3fe8bdb6, 0x49e58cc3, 0xbe3bb374, 0xa0000000, 0x3fe8b012,
- 0xa7cfeb8f, 0x3e56c412, 0x00000000, 0x3fe8a273, 0x8d52bc19,
- 0x3e1429b8, 0x60000000, 0x3fe894d7, 0x4dc32c6c, 0xbe48604c,
- 0xc0000000, 0x3fe8873f, 0x0c868e56, 0xbe564ee5, 0x00000000,
- 0x3fe879ac, 0x56aee828, 0x3e5e2fd8, 0x60000000, 0x3fe86c1c,
- 0x7ceab8ec, 0x3e493365, 0xc0000000, 0x3fe85e90, 0x78d4dadc,
- 0xbe4f7f25, 0x00000000, 0x3fe85109, 0x0ccd8280, 0x3e31e7a2,
- 0x40000000, 0x3fe84385, 0x34ba4e15, 0x3e328077, 0x80000000,
- 0x3fe83605, 0xa670975a, 0xbe53eee5, 0xa0000000, 0x3fe82889,
- 0xf61b77b2, 0xbe43a20a, 0xa0000000, 0x3fe81b11, 0x13e6643b,
- 0x3e5e5fe5, 0xc0000000, 0x3fe80d9d, 0x82cc94e8, 0xbe5ff1f9,
- 0xa0000000, 0x3fe8002d, 0x8a0c9c5d, 0xbe42b0e7, 0x60000000,
- 0x3fe7f2c1, 0x22a16f01, 0x3e5d9ea0, 0x20000000, 0x3fe7e559,
- 0xc38cd451, 0x3e506963, 0xc0000000, 0x3fe7d7f4, 0x9902bc71,
- 0x3e4503d7, 0x40000000, 0x3fe7ca94, 0xdef2a3c0, 0x3e3d98ed,
- 0xa0000000, 0x3fe7bd37, 0xed49abb0, 0x3e24c1ff, 0xe0000000,
- 0x3fe7afde, 0xe3b0be70, 0xbe40c467, 0x00000000, 0x3fe7a28a,
- 0xaf9f193c, 0xbe5dff6c, 0xe0000000, 0x3fe79538, 0xb74cf6b6,
- 0xbe258ed0, 0xa0000000, 0x3fe787eb, 0x1d9127c7, 0x3e345fb0,
- 0x40000000, 0x3fe77aa2, 0x1028c21d, 0xbe4619bd, 0xa0000000,
- 0x3fe76d5c, 0x7cb0b5e4, 0x3e40f1a2, 0xe0000000, 0x3fe7601a,
- 0x2b1bc4ad, 0xbe32e8bb, 0xe0000000, 0x3fe752dc, 0x6839f64e,
- 0x3e41f57b, 0xc0000000, 0x3fe745a2, 0xc4121f7e, 0xbe52c40a,
- 0x60000000, 0x3fe7386c, 0xd6852d72, 0xbe5c4e6b, 0xc0000000,
- 0x3fe72b39, 0x91d690f7, 0xbe57f88f, 0xe0000000, 0x3fe71e0a,
- 0x627a2159, 0xbe4425d5, 0xc0000000, 0x3fe710df, 0x50a54033,
- 0x3e422b7e, 0x60000000, 0x3fe703b8, 0x3b0b5f91, 0x3e5d3857,
- 0xe0000000, 0x3fe6f694, 0x84d628a2, 0xbe51f090, 0x00000000,
- 0x3fe6e975, 0x306d8894, 0xbe414d83, 0xe0000000, 0x3fe6dc58,
- 0x30bf24aa, 0xbe4650ca, 0x80000000, 0x3fe6cf40, 0xd4628d69,
- 0xbe5db007, 0xc0000000, 0x3fe6c22b, 0xa2aae57b, 0xbe31d279,
- 0xc0000000, 0x3fe6b51a, 0x860edf7e, 0xbe2d4c4a, 0x80000000,
- 0x3fe6a80d, 0xf3559341, 0xbe5f7e98, 0xe0000000, 0x3fe69b03,
- 0xa885899e, 0xbe5c2011, 0xe0000000, 0x3fe68dfd, 0x2bdc6d37,
- 0x3e224a82, 0xa0000000, 0x3fe680fb, 0xc12ad1b9, 0xbe40cf56,
- 0x00000000, 0x3fe673fd, 0x1bcdf659, 0xbdf52f2d, 0x00000000,
- 0x3fe66702, 0x5df10408, 0x3e5663e0, 0xc0000000, 0x3fe65a0a,
- 0xa4070568, 0xbe40b12f, 0x00000000, 0x3fe64d17, 0x71c54c47,
- 0x3e5f5e8b, 0x00000000, 0x3fe64027, 0xbd4b7e83, 0x3e42ead6,
- 0xa0000000, 0x3fe6333a, 0x61598bd2, 0xbe4c48d4, 0xc0000000,
- 0x3fe62651, 0x6f538d61, 0x3e548401, 0xa0000000, 0x3fe6196c,
- 0x14344120, 0xbe529af6, 0x00000000, 0x3fe60c8b, 0x5982c587,
- 0xbe3e1e4f, 0x00000000, 0x3fe5ffad, 0xfe51d4ea, 0xbe4c897a,
- 0x80000000, 0x3fe5f2d2, 0xfd46ebe1, 0x3e552e00, 0xa0000000,
- 0x3fe5e5fb, 0xa4695699, 0x3e5ed471, 0x60000000, 0x3fe5d928,
- 0x80d118ae, 0x3e456b61, 0xa0000000, 0x3fe5cc58, 0x304c330b,
- 0x3e54dc29, 0x80000000, 0x3fe5bf8c, 0x0af2dedf, 0xbe3aa9bd,
- 0xe0000000, 0x3fe5b2c3, 0x15fc9258, 0xbe479a37, 0xc0000000,
- 0x3fe5a5fe, 0x9292c7ea, 0x3e188650, 0x20000000, 0x3fe5993d,
- 0x33b4d380, 0x3e5d6d93, 0x20000000, 0x3fe58c7f, 0x02fd16c7,
- 0x3e2fe961, 0xa0000000, 0x3fe57fc4, 0x4a05edb6, 0xbe4d55b4,
- 0xa0000000, 0x3fe5730d, 0x3d443abb, 0xbe5e6954, 0x00000000,
- 0x3fe5665a, 0x024acfea, 0x3e50e61b, 0x00000000, 0x3fe559aa,
- 0xcc9edd09, 0xbe325403, 0x60000000, 0x3fe54cfd, 0x1fe26950,
- 0x3e5d500e, 0x60000000, 0x3fe54054, 0x6c5ae164, 0xbe4a79b4,
- 0xc0000000, 0x3fe533ae, 0x154b0287, 0xbe401571, 0xa0000000,
- 0x3fe5270c, 0x0673f401, 0xbe56e56b, 0xe0000000, 0x3fe51a6d,
- 0x751b639c, 0x3e235269, 0xa0000000, 0x3fe50dd2, 0x7c7b2bed,
- 0x3ddec887, 0xc0000000, 0x3fe5013a, 0xafab4e17, 0x3e5e7575,
- 0x60000000, 0x3fe4f4a6, 0x2e308668, 0x3e59aed6, 0x80000000,
- 0x3fe4e815, 0xf33e2a76, 0xbe51f184, 0xe0000000, 0x3fe4db87,
- 0x839f3e3e, 0x3e57db01, 0xc0000000, 0x3fe4cefd, 0xa9eda7bb,
- 0x3e535e0f, 0x00000000, 0x3fe4c277, 0x2a8f66a5, 0x3e5ce451,
- 0xc0000000, 0x3fe4b5f3, 0x05192456, 0xbe4e8518, 0xc0000000,
- 0x3fe4a973, 0x4aa7cd1d, 0x3e46784a, 0x40000000, 0x3fe49cf7,
- 0x8e23025e, 0xbe5749f2, 0x00000000, 0x3fe4907e, 0x18d30215,
- 0x3e360f39, 0x20000000, 0x3fe48408, 0x63dcf2f3, 0x3e5e00fe,
- 0xc0000000, 0x3fe47795, 0x46182d09, 0xbe5173d9, 0xa0000000,
- 0x3fe46b26, 0x8f0e62aa, 0xbe48f281, 0xe0000000, 0x3fe45eba,
- 0x5775c40c, 0xbe56aad4, 0x60000000, 0x3fe45252, 0x0fe25f69,
- 0x3e48bd71, 0x40000000, 0x3fe445ed, 0xe9989ec5, 0x3e590d97,
- 0x80000000, 0x3fe4398b, 0xb3d9ffe3, 0x3e479dbc, 0x20000000,
- 0x3fe42d2d, 0x388e4d2e, 0xbe5eed80, 0xe0000000, 0x3fe420d1,
- 0x6f797c18, 0x3e554b4c, 0x20000000, 0x3fe4147a, 0x31048bb4,
- 0xbe5b1112, 0x80000000, 0x3fe40825, 0x2efba4f9, 0x3e48ebc7,
- 0x40000000, 0x3fe3fbd4, 0x50201119, 0x3e40b701, 0x40000000,
- 0x3fe3ef86, 0x0a4db32c, 0x3e551de8, 0xa0000000, 0x3fe3e33b,
- 0x0c9c148b, 0xbe50c1f6, 0x20000000, 0x3fe3d6f4, 0xc9129447,
- 0x3e533fa0, 0x00000000, 0x3fe3cab0, 0xaae5b5a0, 0xbe22b68e,
- 0x20000000, 0x3fe3be6f, 0x02305e8a, 0xbe54fc08, 0x60000000,
- 0x3fe3b231, 0x7f908258, 0x3e57dc05, 0x00000000, 0x3fe3a5f7,
- 0x1a09af78, 0x3e08038b, 0xe0000000, 0x3fe399bf, 0x490643c1,
- 0xbe5dbe42, 0xe0000000, 0x3fe38d8b, 0x5e8ad724, 0xbe3c2b72,
- 0x20000000, 0x3fe3815b, 0xc67196b6, 0x3e1713cf, 0xa0000000,
- 0x3fe3752d, 0x6182e429, 0xbe3ec14c, 0x40000000, 0x3fe36903,
- 0xab6eb1ae, 0x3e5a2cc5, 0x40000000, 0x3fe35cdc, 0xfe5dc064,
- 0xbe5c5878, 0x40000000, 0x3fe350b8, 0x0ba6b9e4, 0x3e51619b,
- 0x80000000, 0x3fe34497, 0x857761aa, 0x3e5fff53, 0x00000000,
- 0x3fe3387a, 0xf872d68c, 0x3e484f4d, 0xa0000000, 0x3fe32c5f,
- 0x087e97c2, 0x3e52842e, 0x80000000, 0x3fe32048, 0x73d6d0c0,
- 0xbe503edf, 0x80000000, 0x3fe31434, 0x0c1456a1, 0xbe5f72ad,
- 0xa0000000, 0x3fe30823, 0x83a1a4d5, 0xbe5e65cc, 0xe0000000,
- 0x3fe2fc15, 0x855a7390, 0xbe506438, 0x40000000, 0x3fe2f00b,
- 0xa2898287, 0x3e3d22a2, 0xe0000000, 0x3fe2e403, 0x8b56f66f,
- 0xbe5aa5fd, 0x80000000, 0x3fe2d7ff, 0x52db119a, 0x3e3a2e3d,
- 0x60000000, 0x3fe2cbfe, 0xe2ddd4c0, 0xbe586469, 0x40000000,
- 0x3fe2c000, 0x6b01bf10, 0x3e352b9d, 0x40000000, 0x3fe2b405,
- 0xb07a1cdf, 0x3e5c5cda, 0x80000000, 0x3fe2a80d, 0xc7b5f868,
- 0xbe5668b3, 0xc0000000, 0x3fe29c18, 0x185edf62, 0xbe563d66,
- 0x00000000, 0x3fe29027, 0xf729e1cc, 0x3e59a9a0, 0x80000000,
- 0x3fe28438, 0x6433c727, 0xbe43cc89, 0x00000000, 0x3fe2784d,
- 0x41782631, 0xbe30750c, 0xa0000000, 0x3fe26c64, 0x914911b7,
- 0xbe58290e, 0x40000000, 0x3fe2607f, 0x3dcc73e1, 0xbe4269cd,
- 0x00000000, 0x3fe2549d, 0x2751bf70, 0xbe5a6998, 0xc0000000,
- 0x3fe248bd, 0x4248b9fb, 0xbe4ddb00, 0x80000000, 0x3fe23ce1,
- 0xf35cf82f, 0x3e561b71, 0x60000000, 0x3fe23108, 0x8e481a2d,
- 0x3e518fb9, 0x60000000, 0x3fe22532, 0x5ab96edc, 0xbe5fafc5,
- 0x40000000, 0x3fe2195f, 0x80943911, 0xbe07f819, 0x40000000,
- 0x3fe20d8f, 0x386f2d6c, 0xbe54ba8b, 0x40000000, 0x3fe201c2,
- 0xf29664ac, 0xbe5eb815, 0x20000000, 0x3fe1f5f8, 0x64f03390,
- 0x3e5e320c, 0x20000000, 0x3fe1ea31, 0x747ff696, 0x3e5ef0a5,
- 0x40000000, 0x3fe1de6d, 0x3e9ceb51, 0xbe5f8d27, 0x20000000,
- 0x3fe1d2ac, 0x4ae0b55e, 0x3e5faa21, 0x20000000, 0x3fe1c6ee,
- 0x28569a5e, 0x3e598a4f, 0x20000000, 0x3fe1bb33, 0x54b33e07,
- 0x3e46130a, 0x20000000, 0x3fe1af7b, 0x024f1078, 0xbe4dbf93,
- 0x00000000, 0x3fe1a3c6, 0xb0783bfa, 0x3e419248, 0xe0000000,
- 0x3fe19813, 0x2f02b836, 0x3e4e02b7, 0xc0000000, 0x3fe18c64,
- 0x28dec9d4, 0x3e09064f, 0x80000000, 0x3fe180b8, 0x45cbf406,
- 0x3e5b1f46, 0x40000000, 0x3fe1750f, 0x03d9964c, 0x3e5b0a79,
- 0x00000000, 0x3fe16969, 0x8b5b882b, 0xbe238086, 0xa0000000,
- 0x3fe15dc5, 0x73bad6f8, 0xbdf1fca4, 0x20000000, 0x3fe15225,
- 0x5385769c, 0x3e5e8d76, 0xa0000000, 0x3fe14687, 0x1676dc6b,
- 0x3e571d08, 0x20000000, 0x3fe13aed, 0xa8c41c7f, 0xbe598a25,
- 0x60000000, 0x3fe12f55, 0xc4e1aaf0, 0x3e435277, 0xa0000000,
- 0x3fe123c0, 0x403638e1, 0xbe21aa7c, 0xc0000000, 0x3fe1182e,
- 0x557a092b, 0xbdd0116b, 0xc0000000, 0x3fe10c9f, 0x7d779f66,
- 0x3e4a61ba, 0xc0000000, 0x3fe10113, 0x2b09c645, 0xbe5d586e,
- 0x20000000, 0x3fe0ea04, 0xea2cad46, 0x3e5aa97c, 0x20000000,
- 0x3fe0d300, 0x23190e54, 0x3e50f1a7, 0xa0000000, 0x3fe0bc07,
- 0x1379a5a6, 0xbe51619d, 0x60000000, 0x3fe0a51a, 0x926a3d4a,
- 0x3e5cf019, 0xa0000000, 0x3fe08e38, 0xa8c24358, 0x3e35241e,
- 0x20000000, 0x3fe07762, 0x24317e7a, 0x3e512cfa, 0x00000000,
- 0x3fe06097, 0xfd9cf274, 0xbe55bef3, 0x00000000, 0x3fe049d7,
- 0x3689b49d, 0xbe36d26d, 0x40000000, 0x3fe03322, 0xf72ef6c4,
- 0xbe54cd08, 0xa0000000, 0x3fe01c78, 0x23702d2d, 0xbe5900bf,
- 0x00000000, 0x3fe005da, 0x3f59c14c, 0x3e57d80b, 0x40000000,
- 0x3fdfde8d, 0xad67766d, 0xbe57fad4, 0x40000000, 0x3fdfb17c,
- 0x644f4ae7, 0x3e1ee43b, 0x40000000, 0x3fdf8481, 0x903234d2,
- 0x3e501a86, 0x40000000, 0x3fdf579c, 0xafe9e509, 0xbe267c3e,
- 0x00000000, 0x3fdf2acd, 0xb7dfda0b, 0xbe48149b, 0x40000000,
- 0x3fdefe13, 0x3b94305e, 0x3e5f4ea7, 0x80000000, 0x3fded16f,
- 0x5d95da61, 0xbe55c198, 0x00000000, 0x3fdea4e1, 0x406960c9,
- 0xbdd99a19, 0x00000000, 0x3fde7868, 0xd22f3539, 0x3e470c78,
- 0x80000000, 0x3fde4c04, 0x83eec535, 0xbe3e1232, 0x40000000,
- 0x3fde1fb6, 0x3dfbffcb, 0xbe4b7d71, 0x40000000, 0x3fddf37d,
- 0x7e1be4e0, 0xbe5b8f8f, 0x40000000, 0x3fddc759, 0x46dae887,
- 0xbe350458, 0x80000000, 0x3fdd9b4a, 0xed6ecc49, 0xbe5f0045,
- 0x80000000, 0x3fdd6f50, 0x2e9e883c, 0x3e2915da, 0x80000000,
- 0x3fdd436b, 0xf0bccb32, 0x3e4a68c9, 0x80000000, 0x3fdd179b,
- 0x9bbfc779, 0xbe54a26a, 0x00000000, 0x3fdcebe0, 0x7cea33ab,
- 0x3e43c6b7, 0x40000000, 0x3fdcc039, 0xe740fd06, 0x3e5526c2,
- 0x40000000, 0x3fdc94a7, 0x9eadeb1a, 0xbe396d8d, 0xc0000000,
- 0x3fdc6929, 0xf0a8f95a, 0xbe5c0ab2, 0x80000000, 0x3fdc3dc0,
- 0x6ee2693b, 0x3e0992e6, 0xc0000000, 0x3fdc126b, 0x5ac6b581,
- 0xbe2834b6, 0x40000000, 0x3fdbe72b, 0x8cc226ff, 0x3e3596a6,
- 0x00000000, 0x3fdbbbff, 0xf92a74bb, 0x3e3c5813, 0x00000000,
- 0x3fdb90e7, 0x479664c0, 0xbe50d644, 0x00000000, 0x3fdb65e3,
- 0x5004975b, 0xbe55258f, 0x00000000, 0x3fdb3af3, 0xe4b23194,
- 0xbe588407, 0xc0000000, 0x3fdb1016, 0xe65d4d0a, 0x3e527c26,
- 0x80000000, 0x3fdae54e, 0x814fddd6, 0x3e5962a2, 0x40000000,
- 0x3fdaba9a, 0xe19d0913, 0xbe562f4e, 0x80000000, 0x3fda8ff9,
- 0x43cfd006, 0xbe4cfdeb, 0x40000000, 0x3fda656c, 0x686f0a4e,
- 0x3e5e47a8, 0xc0000000, 0x3fda3af2, 0x7200d410, 0x3e5e1199,
- 0xc0000000, 0x3fda108c, 0xabd2266e, 0x3e5ee4d1, 0x40000000,
- 0x3fd9e63a, 0x396f8f2c, 0x3e4dbffb, 0x00000000, 0x3fd9bbfb,
- 0xe32b25dd, 0x3e5c3a54, 0x40000000, 0x3fd991cf, 0x431e4035,
- 0xbe457925, 0x80000000, 0x3fd967b6, 0x7bed3dd3, 0x3e40c61d,
- 0x00000000, 0x3fd93db1, 0xd7449365, 0x3e306419, 0x80000000,
- 0x3fd913be, 0x1746e791, 0x3e56fcfc, 0x40000000, 0x3fd8e9df,
- 0xf3a9028b, 0xbe5041b9, 0xc0000000, 0x3fd8c012, 0x56840c50,
- 0xbe26e20a, 0x40000000, 0x3fd89659, 0x19763102, 0xbe51f466,
- 0x80000000, 0x3fd86cb2, 0x7032de7c, 0xbe4d298a, 0x80000000,
- 0x3fd8431e, 0xdeb39fab, 0xbe4361eb, 0x40000000, 0x3fd8199d,
- 0x5d01cbe0, 0xbe5425b3, 0x80000000, 0x3fd7f02e, 0x3ce99aa9,
- 0x3e146fa8, 0x80000000, 0x3fd7c6d2, 0xd1a262b9, 0xbe5a1a69,
- 0xc0000000, 0x3fd79d88, 0x8606c236, 0x3e423a08, 0x80000000,
- 0x3fd77451, 0x8fd1e1b7, 0x3e5a6a63, 0xc0000000, 0x3fd74b2c,
- 0xe491456a, 0x3e42c1ca, 0x40000000, 0x3fd7221a, 0x4499a6d7,
- 0x3e36a69a, 0x00000000, 0x3fd6f91a, 0x5237df94, 0xbe0f8f02,
- 0x00000000, 0x3fd6d02c, 0xb6482c6e, 0xbe5abcf7, 0x00000000,
- 0x3fd6a750, 0x1919fd61, 0xbe57ade2, 0x00000000, 0x3fd67e86,
- 0xaa7a994d, 0xbe3f3fbd, 0x00000000, 0x3fd655ce, 0x67db014c,
- 0x3e33c550, 0x00000000, 0x3fd62d28, 0xa82856b7, 0xbe1409d1,
- 0xc0000000, 0x3fd60493, 0x1e6a300d, 0x3e55d899, 0x80000000,
- 0x3fd5dc11, 0x1222bd5c, 0xbe35bfc0, 0xc0000000, 0x3fd5b3a0,
- 0x6e8dc2d3, 0x3e5d4d79, 0x00000000, 0x3fd58b42, 0xe0e4ace6,
- 0xbe517303, 0x80000000, 0x3fd562f4, 0xb306e0a8, 0x3e5edf0f,
- 0xc0000000, 0x3fd53ab8, 0x6574bc54, 0x3e5ee859, 0x80000000,
- 0x3fd5128e, 0xea902207, 0x3e5f6188, 0xc0000000, 0x3fd4ea75,
- 0x9f911d79, 0x3e511735, 0x80000000, 0x3fd4c26e, 0xf9c77397,
- 0xbe5b1643, 0x40000000, 0x3fd49a78, 0x15fc9258, 0x3e479a37,
- 0x80000000, 0x3fd47293, 0xd5a04dd9, 0xbe426e56, 0xc0000000,
- 0x3fd44abf, 0xe04042f5, 0x3e56f7c6, 0x40000000, 0x3fd422fd,
- 0x1d8bf2c8, 0x3e5d8810, 0x00000000, 0x3fd3fb4c, 0x88a8ddee,
- 0xbe311454, 0xc0000000, 0x3fd3d3ab, 0x3e3b5e47, 0xbe5d1b72,
- 0x40000000, 0x3fd3ac1c, 0xc2ab5d59, 0x3e31b02b, 0xc0000000,
- 0x3fd3849d, 0xd4e34b9e, 0x3e51cb2f, 0x40000000, 0x3fd35d30,
- 0x177204fb, 0xbe2b8cd7, 0x80000000, 0x3fd335d3, 0xfcd38c82,
- 0xbe4356e1, 0x80000000, 0x3fd30e87, 0x64f54acc, 0xbe4e6224,
- 0x00000000, 0x3fd2e74c, 0xaa7975d9, 0x3e5dc0fe, 0x80000000,
- 0x3fd2c021, 0x516dab3f, 0xbe50ffa3, 0x40000000, 0x3fd29907,
- 0x2bfb7313, 0x3e5674a2, 0xc0000000, 0x3fd271fd, 0x0549fc99,
- 0x3e385d29, 0xc0000000, 0x3fd24b04, 0x55b63073, 0xbe500c6d,
- 0x00000000, 0x3fd2241c, 0x3f91953a, 0x3e389977, 0xc0000000,
- 0x3fd1fd43, 0xa1543f71, 0xbe3487ab, 0xc0000000, 0x3fd1d67b,
- 0x4ec8867c, 0x3df6a2dc, 0x00000000, 0x3fd1afc4, 0x4328e3bb,
- 0x3e41d9c0, 0x80000000, 0x3fd1891c, 0x2e1cda84, 0x3e3bdd87,
- 0x40000000, 0x3fd16285, 0x4b5331ae, 0xbe53128e, 0x00000000,
- 0x3fd13bfe, 0xb9aec164, 0xbe52ac98, 0xc0000000, 0x3fd11586,
- 0xd91e1316, 0xbe350630, 0x80000000, 0x3fd0ef1f, 0x7cacc12c,
- 0x3e3f5219, 0x40000000, 0x3fd0c8c8, 0xbce277b7, 0x3e3d30c0,
- 0x00000000, 0x3fd0a281, 0x2a63447d, 0xbe541377, 0x80000000,
- 0x3fd07c49, 0xfac483b5, 0xbe5772ec, 0xc0000000, 0x3fd05621,
- 0x36b8a570, 0xbe4fd4bd, 0xc0000000, 0x3fd03009, 0xbae505f7,
- 0xbe450388, 0x80000000, 0x3fd00a01, 0x3e35aead, 0xbe5430fc,
- 0x80000000, 0x3fcfc811, 0x707475ac, 0x3e38806e, 0x80000000,
- 0x3fcf7c3f, 0xc91817fc, 0xbe40ccea, 0x80000000, 0x3fcf308c,
- 0xae05d5e9, 0xbe4919b8, 0x80000000, 0x3fcee4f8, 0xae6cc9e6,
- 0xbe530b94, 0x00000000, 0x3fce9983, 0x1efe3e8e, 0x3e57747e,
- 0x00000000, 0x3fce4e2d, 0xda78d9bf, 0xbe59a608, 0x00000000,
- 0x3fce02f5, 0x8abe2c2e, 0x3e4a35ad, 0x00000000, 0x3fcdb7dc,
- 0x1495450d, 0xbe0872cc, 0x80000000, 0x3fcd6ce1, 0x86ee0ba0,
- 0xbe4f59a0, 0x00000000, 0x3fcd2205, 0xe81ca888, 0x3e5402c3,
- 0x00000000, 0x3fccd747, 0x3b4424b9, 0x3e5dfdc3, 0x80000000,
- 0x3fcc8ca7, 0xd305b56c, 0x3e202da6, 0x00000000, 0x3fcc4226,
- 0x399a6910, 0xbe482a1c, 0x80000000, 0x3fcbf7c2, 0x747f7938,
- 0xbe587372, 0x80000000, 0x3fcbad7c, 0x6fc246a0, 0x3e50d83d,
- 0x00000000, 0x3fcb6355, 0xee9e9be5, 0xbe5c35bd, 0x80000000,
- 0x3fcb194a, 0x8416c0bc, 0x3e546d4f, 0x00000000, 0x3fcacf5e,
- 0x49f7f08f, 0x3e56da76, 0x00000000, 0x3fca858f, 0x5dc30de2,
- 0x3e5f390c, 0x00000000, 0x3fca3bde, 0x950583b6, 0xbe5e4169,
- 0x80000000, 0x3fc9f249, 0x33631553, 0x3e52aeb1, 0x00000000,
- 0x3fc9a8d3, 0xde8795a6, 0xbe59a504, 0x00000000, 0x3fc95f79,
- 0x076bf41e, 0x3e5122fe, 0x80000000, 0x3fc9163c, 0x2914c8e7,
- 0x3e3dd064, 0x00000000, 0x3fc8cd1d, 0x3a30eca3, 0xbe21b4aa,
- 0x80000000, 0x3fc8841a, 0xb2a96650, 0xbe575444, 0x80000000,
- 0x3fc83b34, 0x2376c0cb, 0xbe2a74c7, 0x80000000, 0x3fc7f26b,
- 0xd8a0b653, 0xbe5181b6, 0x00000000, 0x3fc7a9bf, 0x32257882,
- 0xbe4a78b4, 0x00000000, 0x3fc7612f, 0x1eee8bd9, 0xbe1bfe9d,
- 0x80000000, 0x3fc718bb, 0x0c603cc4, 0x3e36fdc9, 0x80000000,
- 0x3fc6d064, 0x3728b8cf, 0xbe1e542e, 0x80000000, 0x3fc68829,
- 0xc79a4067, 0x3e5c380f, 0x00000000, 0x3fc6400b, 0xf69eac69,
- 0x3e550a84, 0x80000000, 0x3fc5f808, 0xb7a780a4, 0x3e5d9224,
- 0x80000000, 0x3fc5b022, 0xad9dfb1e, 0xbe55242f, 0x00000000,
- 0x3fc56858, 0x659b18be, 0xbe4bfda3, 0x80000000, 0x3fc520a9,
- 0x66ee3631, 0xbe57d769, 0x80000000, 0x3fc4d916, 0x1ec62819,
- 0x3e2427f7, 0x80000000, 0x3fc4919f, 0xdec25369, 0xbe435431,
- 0x00000000, 0x3fc44a44, 0xa8acfc4b, 0xbe3c62e8, 0x00000000,
- 0x3fc40304, 0xcf1d3eab, 0xbdfba29f, 0x80000000, 0x3fc3bbdf,
- 0x79aba3ea, 0xbdf1b7c8, 0x80000000, 0x3fc374d6, 0xb8d186da,
- 0xbe5130cf, 0x80000000, 0x3fc32de8, 0x9d74f152, 0x3e2285b6,
- 0x00000000, 0x3fc2e716, 0x50ae7ca9, 0xbe503920, 0x80000000,
- 0x3fc2a05e, 0x6caed92e, 0xbe533924, 0x00000000, 0x3fc259c2,
- 0x9cb5034e, 0xbe510e31, 0x80000000, 0x3fc21340, 0x12c4d378,
- 0xbe540b43, 0x80000000, 0x3fc1ccd9, 0xcc418706, 0x3e59887a,
- 0x00000000, 0x3fc1868e, 0x921f4106, 0xbe528e67, 0x80000000,
- 0x3fc1405c, 0x3969441e, 0x3e5d8051, 0x00000000, 0x3fc0fa46,
- 0xd941ef5b, 0x3e5f9079, 0x80000000, 0x3fc0b44a, 0x5a3e81b2,
- 0xbe567691, 0x00000000, 0x3fc06e69, 0x9d66afe7, 0xbe4d43fb,
- 0x00000000, 0x3fc028a2, 0x0a92a162, 0xbe52f394, 0x00000000,
- 0x3fbfc5ea, 0x209897e5, 0x3e529e37, 0x00000000, 0x3fbf3ac5,
- 0x8458bd7b, 0x3e582831, 0x00000000, 0x3fbeafd5, 0xb8d8b4b8,
- 0xbe486b4a, 0x00000000, 0x3fbe2518, 0xe0a3b7b6, 0x3e5bafd2,
- 0x00000000, 0x3fbd9a90, 0x2bf2710e, 0x3e383b2b, 0x00000000,
- 0x3fbd103c, 0x73eb6ab7, 0xbe56d78d, 0x00000000, 0x3fbc861b,
- 0x32ceaff5, 0xbe32dc5a, 0x00000000, 0x3fbbfc2e, 0xbee04cb7,
- 0xbe4a71a4, 0x00000000, 0x3fbb7274, 0x35ae9577, 0x3e38142f,
- 0x00000000, 0x3fbae8ee, 0xcbaddab4, 0xbe5490f0, 0x00000000,
- 0x3fba5f9a, 0x95ce1114, 0x3e597c71, 0x00000000, 0x3fb9d67a,
- 0x6d7c0f78, 0x3e3abc2d, 0x00000000, 0x3fb94d8d, 0x2841a782,
- 0xbe566cbc, 0x00000000, 0x3fb8c4d2, 0x6ed429c6, 0xbe3cfff9,
- 0x00000000, 0x3fb83c4a, 0xe4a49fbb, 0xbe552964, 0x00000000,
- 0x3fb7b3f4, 0x2193d81e, 0xbe42fa72, 0x00000000, 0x3fb72bd0,
- 0xdd70c122, 0x3e527a8c, 0x00000000, 0x3fb6a3df, 0x03108a54,
- 0xbe450393, 0x00000000, 0x3fb61c1f, 0x30ff7954, 0x3e565840,
- 0x00000000, 0x3fb59492, 0xdedd460c, 0xbe5422b5, 0x00000000,
- 0x3fb50d36, 0x950f9f45, 0xbe5313f6, 0x00000000, 0x3fb4860b,
- 0x582cdcb1, 0x3e506d39, 0x00000000, 0x3fb3ff12, 0x7216d3a6,
- 0x3e4aa719, 0x00000000, 0x3fb3784a, 0x57a423fd, 0x3e5a9b9f,
- 0x00000000, 0x3fb2f1b4, 0x7a138b41, 0xbe50b418, 0x00000000,
- 0x3fb26b4e, 0x2fbfd7ea, 0x3e23a53e, 0x00000000, 0x3fb1e519,
- 0x18913ccb, 0x3e465fc1, 0x00000000, 0x3fb15f15, 0x7ea24e21,
- 0x3e042843, 0x00000000, 0x3fb0d941, 0x7c6d9c77, 0x3e59f61e,
- 0x00000000, 0x3fb0539e, 0x114efd44, 0x3e4ccab7, 0x00000000,
- 0x3faf9c56, 0x1777f657, 0x3e552f65, 0x00000000, 0x3fae91d2,
- 0xc317b86a, 0xbe5a61e0, 0x00000000, 0x3fad87ac, 0xb7664efb,
- 0xbe41f64e, 0x00000000, 0x3fac7de6, 0x5d3d03a9, 0x3e0807a0,
- 0x00000000, 0x3fab7480, 0x743c38eb, 0xbe3726e1, 0x00000000,
- 0x3faa6b78, 0x06a253f1, 0x3e5ad636, 0x00000000, 0x3fa962d0,
- 0xa35f541b, 0x3e5a187a, 0x00000000, 0x3fa85a88, 0x4b86e446,
- 0xbe508150, 0x00000000, 0x3fa7529c, 0x2589cacf, 0x3e52938a,
- 0x00000000, 0x3fa64b10, 0xaf6b11f2, 0xbe3454cd, 0x00000000,
- 0x3fa543e2, 0x97506fef, 0xbe5fdec5, 0x00000000, 0x3fa43d10,
- 0xe75f7dd9, 0xbe388dd3, 0x00000000, 0x3fa3369c, 0xa4139632,
- 0xbdea5177, 0x00000000, 0x3fa23086, 0x352d6f1e, 0xbe565ad6,
- 0x00000000, 0x3fa12acc, 0x77449eb7, 0xbe50d5c7, 0x00000000,
- 0x3fa0256e, 0x7478da78, 0x3e404724, 0x00000000, 0x3f9e40dc,
- 0xf59cef7f, 0xbe539d0a, 0x00000000, 0x3f9c3790, 0x1511d43c,
- 0x3e53c2c8, 0x00000000, 0x3f9a2f00, 0x9b8bff3c, 0xbe43b3e1,
- 0x00000000, 0x3f982724, 0xad1e22a5, 0x3e46f0bd, 0x00000000,
- 0x3f962000, 0x130d9356, 0x3e475ba0, 0x00000000, 0x3f941994,
- 0x8f86f883, 0xbe513d0b, 0x00000000, 0x3f9213dc, 0x914d0dc8,
- 0xbe534335, 0x00000000, 0x3f900ed8, 0x2d73e5e7, 0xbe22ba75,
- 0x00000000, 0x3f8c1510, 0xc5b7d70e, 0x3e599c5d, 0x00000000,
- 0x3f880de0, 0x8a27857e, 0xbe3d28c8, 0x00000000, 0x3f840810,
- 0xda767328, 0x3e531b3d, 0x00000000, 0x3f8003b0, 0x77bacaf3,
- 0xbe5f04e3, 0x00000000, 0x3f780150, 0xdf4b0720, 0x3e5a8bff,
- 0x00000000, 0x3f6ffc40, 0x34c48e71, 0xbe3fcd99, 0x00000000,
- 0x3f5ff6c0, 0x1ad218af, 0xbe4c78a7, 0x00000000, 0x00000000,
- 0x00000000, 0x80000000
- };
-
- private static int[] logTwoPow = {
- 0xfefa39ef, 0x3fe62e42, 0xfefa39ef, 0xbfe62e42
- };
-
- public void powIntrinsic(Register dest, Register value1, Register value2, CompilationResultBuilder crb, AMD64MacroAssembler masm) {
- ArrayDataPointerConstant highSigMaskPtr = new ArrayDataPointerConstant(highSigMask, 16);
- ArrayDataPointerConstant logTwoEPtr = new ArrayDataPointerConstant(logTwoE, 16);
- ArrayDataPointerConstant highmaskYPtr = new ArrayDataPointerConstant(highmaskY, 16);
- ArrayDataPointerConstant tExpPtr = new ArrayDataPointerConstant(tExp, 16);
- ArrayDataPointerConstant eCoeffPtr = new ArrayDataPointerConstant(eCoeff, 16);
- ArrayDataPointerConstant coeffHPtr = new ArrayDataPointerConstant(coeffH, 16);
- ArrayDataPointerConstant highmaskLogXPtr = new ArrayDataPointerConstant(highmaskLogX, 16);
- ArrayDataPointerConstant halfmaskPtr = new ArrayDataPointerConstant(halfmask, 8);
- ArrayDataPointerConstant coeffPowPtr = new ArrayDataPointerConstant(coeffPow, 16);
- ArrayDataPointerConstant lTblPowPtr = new ArrayDataPointerConstant(lTblPow, 16);
- ArrayDataPointerConstant logTwoPowPtr = new ArrayDataPointerConstant(logTwoPow, 8);
-
- Label bb0 = new Label();
- Label bb1 = new Label();
- Label bb2 = new Label();
- Label bb3 = new Label();
- Label bb4 = new Label();
- Label bb5 = new Label();
- Label bb6 = new Label();
- Label bb7 = new Label();
- Label bb8 = new Label();
- Label bb9 = new Label();
- Label bb10 = new Label();
- Label bb11 = new Label();
- Label bb12 = new Label();
- Label bb13 = new Label();
- Label bb14 = new Label();
- Label bb15 = new Label();
- Label bb16 = new Label();
- Label bb18 = new Label();
- Label bb19 = new Label();
- Label bb20 = new Label();
- Label bb21 = new Label();
- Label bb22 = new Label();
- Label bb23 = new Label();
- Label bb24 = new Label();
- Label bb25 = new Label();
- Label bb26 = new Label();
- Label bb27 = new Label();
- Label bb28 = new Label();
- Label bb29 = new Label();
- Label bb30 = new Label();
- Label bb31 = new Label();
- Label bb32 = new Label();
- Label bb33 = new Label();
- Label bb34 = new Label();
- Label bb35 = new Label();
- Label bb36 = new Label();
- Label bb37 = new Label();
- Label bb38 = new Label();
- Label bb39 = new Label();
- Label bb40 = new Label();
- Label bb41 = new Label();
- Label bb42 = new Label();
- Label bb43 = new Label();
- Label bb44 = new Label();
- Label bb45 = new Label();
- Label bb46 = new Label();
- Label bb47 = new Label();
- Label bb48 = new Label();
- Label bb49 = new Label();
- Label bb50 = new Label();
- Label bb51 = new Label();
- Label bb53 = new Label();
- Label bb54 = new Label();
- Label bb55 = new Label();
- Label bb56 = new Label();
-
- Register gpr1 = asRegister(gpr1Temp, AMD64Kind.QWORD);
- Register gpr2 = asRegister(gpr2Temp, AMD64Kind.QWORD);
- Register gpr3 = asRegister(rcxTemp, AMD64Kind.QWORD);
- Register gpr4 = asRegister(gpr4Temp, AMD64Kind.QWORD);
- Register gpr5 = asRegister(gpr5Temp, AMD64Kind.QWORD);
- Register gpr6 = asRegister(gpr6Temp, AMD64Kind.QWORD);
- Register gpr7 = asRegister(gpr7Temp, AMD64Kind.QWORD);
- Register gpr8 = asRegister(gpr8Temp, AMD64Kind.QWORD);
-
- Register temp1 = asRegister(xmm1Temp, AMD64Kind.DOUBLE);
- Register temp2 = asRegister(xmm2Temp, AMD64Kind.DOUBLE);
- Register temp3 = asRegister(xmm3Temp, AMD64Kind.DOUBLE);
- Register temp4 = asRegister(xmm4Temp, AMD64Kind.DOUBLE);
- Register temp5 = asRegister(xmm5Temp, AMD64Kind.DOUBLE);
- Register temp6 = asRegister(xmm6Temp, AMD64Kind.DOUBLE);
- Register temp7 = asRegister(xmm7Temp, AMD64Kind.DOUBLE);
- Register temp8 = asRegister(xmm8Temp, AMD64Kind.DOUBLE);
- Register temp9 = asRegister(xmm9Temp, AMD64Kind.DOUBLE);
- Register temp10 = asRegister(xmm10Temp, AMD64Kind.DOUBLE);
-
- setCrb(crb);
- masm.movdqu(temp10, value1);
- masm.movsd(temp8, value2);
- if (dest.encoding != value1.encoding) {
- masm.movdqu(dest, value1);
- }
-
- masm.movq(temp9, externalAddress(logTwoEPtr)); // 0x00000000,
- // 0x3ff72000
- masm.pextrw(gpr1, dest, 3);
- masm.xorpd(temp2, temp2);
- masm.movq(gpr2, 0x3ff0000000000000L);
- masm.movdq(temp2, gpr2);
- masm.movl(gpr5, 1069088768);
- masm.movdq(temp7, gpr5);
- masm.xorpd(temp1, temp1);
- masm.movq(gpr6, 0x77f0000000000000L);
- masm.movdq(temp1, gpr6);
- masm.movdqu(temp3, dest);
- masm.movl(gpr4, 32752);
- masm.andl(gpr4, gpr1);
- masm.subl(gpr4, 16368);
- masm.movl(gpr3, gpr4);
- masm.sarl(gpr4, 31);
- masm.addl(gpr3, gpr4);
- masm.xorl(gpr3, gpr4);
- masm.por(dest, temp2);
- masm.movdqu(temp6, externalAddress(highSigMaskPtr)); // 0x00000000,
- // 0xfffff800,
- // 0x00000000,
- // 0xfffff800
- masm.psrlq(dest, 27);
- masm.psrld(dest, 2);
- masm.addl(gpr3, 16);
- masm.bsrl(gpr3, gpr3);
- masm.rcpps(dest, dest);
- masm.psllq(temp3, 12);
- masm.movl(gpr7, 8192);
- masm.movdq(temp4, gpr7);
- masm.psrlq(temp3, 12);
- masm.subl(gpr1, 16);
- masm.cmpl(gpr1, 32736);
- masm.jcc(ConditionFlag.AboveEqual, bb0);
-
- masm.movl(gpr5, 0);
-
- masm.bind(bb1);
- masm.mulss(dest, temp7);
- masm.movl(gpr4, -1);
- masm.subl(gpr3, 4);
- masm.shll(gpr4);
- masm.shlq(gpr4, 32);
- masm.movdq(temp5, gpr4);
- masm.por(temp3, temp1);
- masm.subl(gpr1, 16351);
- masm.cmpl(gpr1, 1);
- masm.jcc(ConditionFlag.BelowEqual, bb2);
-
- masm.paddd(dest, temp4);
- masm.pand(temp5, temp3);
- masm.movdl(gpr4, dest);
- masm.psllq(dest, 29);
-
- masm.bind(bb3);
- masm.subsd(temp3, temp5);
- masm.pand(dest, temp6);
- masm.subl(gpr1, 1);
- masm.sarl(gpr1, 4);
- masm.cvtsi2sdl(temp7, gpr1);
- masm.mulpd(temp5, dest);
-
- masm.bind(bb4);
- masm.mulsd(temp3, dest);
- masm.leaq(gpr8, externalAddress(coeffPowPtr));
- masm.movdqu(temp1, new AMD64Address(gpr8, 0)); // 0x6dc96112,
- // 0xbf836578,
- // 0xee241472,
- // 0xbf9b0301
- masm.movdqu(temp4, new AMD64Address(gpr8, 16)); // 0x9f95985a,
- // 0xbfb528db,
- // 0xb3841d2a,
- // 0xbfd619b6
- masm.movdqu(temp6, new AMD64Address(gpr8, 32)); // 0x518775e3,
- // 0x3f9004f2,
- // 0xac8349bb,
- // 0x3fa76c9b
- masm.movdqu(dest, new AMD64Address(gpr8, 48)); // 0x486ececc,
- // 0x3fc4635e,
- // 0x161bb241,
- // 0xbf5dabe1
- masm.subsd(temp5, temp9);
- masm.movl(gpr3, gpr1);
- masm.sarl(gpr1, 31);
- masm.addl(gpr3, gpr1);
- masm.xorl(gpr1, gpr3);
- masm.addl(gpr1, 1);
- masm.bsrl(gpr1, gpr1);
- masm.unpcklpd(temp5, temp3);
- masm.addsd(temp3, temp5);
- masm.leaq(gpr7, externalAddress(lTblPowPtr));
- masm.andl(gpr4, 16760832);
- masm.shrl(gpr4, 10);
- masm.addpd(temp5, new AMD64Address(gpr7, gpr4, Scale.Times1, -3648));
- masm.pshufd(temp2, temp3, 0x44);
- masm.mulsd(temp3, temp3);
- masm.mulpd(temp1, temp2);
- masm.mulpd(temp4, temp2);
- masm.addsd(temp5, temp7);
- masm.mulsd(temp2, temp3);
- masm.addpd(temp6, temp1);
- masm.mulsd(temp3, temp3);
- masm.addpd(dest, temp4);
- masm.movdqu(temp1, temp8);
- masm.pextrw(gpr3, temp8, 3);
- masm.pshufd(temp7, temp5, 0xEE);
- masm.movq(temp4, externalAddress(highmaskYPtr)); // 0x00000000,
- // 0xfffffff8
- masm.mulpd(temp6, temp2);
- masm.pshufd(temp3, temp3, 0x44);
- masm.mulpd(dest, temp2);
- masm.shll(gpr1, 4);
- masm.subl(gpr1, 15872);
- masm.andl(gpr3, 32752);
- masm.addl(gpr1, gpr3);
- masm.mulpd(temp3, temp6);
- masm.cmpl(gpr1, 624);
- masm.jcc(ConditionFlag.AboveEqual, bb5);
-
- masm.xorpd(temp6, temp6);
- masm.movl(gpr4, 17080);
- masm.pinsrw(temp6, gpr4, 3);
- masm.movdqu(temp2, temp1);
- masm.pand(temp4, temp1);
- masm.subsd(temp1, temp4);
- masm.mulsd(temp4, temp5);
- masm.addsd(dest, temp7);
- masm.mulsd(temp1, temp5);
- masm.movdqu(temp7, temp6);
- masm.addsd(temp6, temp4);
- masm.leaq(gpr7, externalAddress(tExpPtr));
- masm.addpd(temp3, dest);
- masm.movdl(gpr4, temp6);
- masm.movl(gpr3, gpr4);
- masm.andl(gpr4, 255);
- masm.addl(gpr4, gpr4);
- masm.movdqu(temp5, new AMD64Address(gpr7, gpr4, Scale.Times8, 0));
- masm.subsd(temp6, temp7);
- masm.pshufd(dest, temp3, 0xEE);
- masm.subsd(temp4, temp6);
- masm.addsd(dest, temp3);
- masm.addsd(temp4, temp1);
- masm.mulsd(temp2, dest);
- masm.leaq(gpr8, externalAddress(eCoeffPtr));
- masm.movdqu(temp7, new AMD64Address(gpr8, 0)); // 0xe78a6731,
- // 0x3f55d87f,
- // 0xd704a0c0,
- // 0x3fac6b08
- masm.movdqu(temp3, new AMD64Address(gpr8, 16)); // 0x6fba4e77,
- // 0x3f83b2ab,
- // 0xff82c58f,
- // 0x3fcebfbd
- masm.shll(gpr3, 12);
- masm.xorl(gpr3, gpr5);
- masm.andl(gpr3, -1048576);
- masm.movdq(temp6, gpr3);
- masm.addsd(temp2, temp4);
- masm.movq(gpr2, 0x3fe62e42fefa39efL);
- masm.movdq(temp1, gpr2);
- masm.pshufd(dest, temp2, 0x44);
- masm.pshufd(temp4, temp2, 0x44);
- masm.mulsd(temp1, temp2);
- masm.pshufd(temp6, temp6, 0x11);
- masm.mulpd(dest, dest);
- masm.mulpd(temp7, temp4);
- masm.paddd(temp5, temp6);
- masm.mulsd(temp1, temp5);
- masm.pshufd(temp6, temp5, 0xEE);
- masm.mulsd(dest, dest);
- masm.addpd(temp3, temp7);
- masm.addsd(temp1, temp6);
- masm.mulpd(dest, temp3);
- masm.pshufd(temp3, dest, 0xEE);
- masm.mulsd(dest, temp5);
- masm.mulsd(temp3, temp5);
- masm.addsd(dest, temp1);
- masm.addsd(dest, temp3);
- masm.addsd(dest, temp5);
- masm.jmp(bb56);
-
- masm.bind(bb0);
- masm.addl(gpr1, 16);
- masm.movl(gpr4, 32752);
- masm.andl(gpr4, gpr1);
- masm.cmpl(gpr4, 32752);
- masm.jcc(ConditionFlag.Equal, bb6);
-
- masm.testl(gpr1, 32768);
- masm.jcc(ConditionFlag.NotEqual, bb7);
-
- masm.bind(bb8);
- masm.movdqu(dest, temp10);
- masm.movdqu(temp3, temp10);
- masm.movdl(gpr4, temp3);
- masm.psrlq(temp3, 32);
- masm.movdl(gpr3, temp3);
- masm.orl(gpr4, gpr3);
- masm.cmpl(gpr4, 0);
- masm.jcc(ConditionFlag.Equal, bb9);
-
- masm.xorpd(temp3, temp3);
- masm.movl(gpr1, 18416);
- masm.pinsrw(temp3, gpr1, 3);
- masm.mulsd(dest, temp3);
- masm.xorpd(temp2, temp2);
- masm.movl(gpr1, 16368);
- masm.pinsrw(temp2, gpr1, 3);
- masm.movdqu(temp3, dest);
- masm.pextrw(gpr1, dest, 3);
- masm.por(dest, temp2);
- masm.movl(gpr3, 18416);
- masm.psrlq(dest, 27);
- masm.psrld(dest, 2);
- masm.rcpps(dest, dest);
- masm.psllq(temp3, 12);
- masm.movdqu(temp6, externalAddress(highSigMaskPtr)); // 0x00000000,
- // 0xfffff800,
- // 0x00000000,
- // 0xfffff800
- masm.psrlq(temp3, 12);
- masm.mulss(dest, temp7);
- masm.movl(gpr4, -1024);
- masm.movdl(temp5, gpr4);
- masm.por(temp3, temp1);
- masm.paddd(dest, temp4);
- masm.psllq(temp5, 32);
- masm.movdl(gpr4, dest);
- masm.psllq(dest, 29);
- masm.pand(temp5, temp3);
- masm.movl(gpr5, 0);
- masm.pand(dest, temp6);
- masm.subsd(temp3, temp5);
- masm.andl(gpr1, 32752);
- masm.subl(gpr1, 18416);
- masm.sarl(gpr1, 4);
- masm.cvtsi2sdl(temp7, gpr1);
- masm.mulpd(temp5, dest);
- masm.jmp(bb4);
-
- masm.bind(bb10);
- masm.movdqu(dest, temp10);
- masm.movdqu(temp3, temp10);
- masm.movdl(gpr4, temp3);
- masm.psrlq(temp3, 32);
- masm.movdl(gpr3, temp3);
- masm.orl(gpr4, gpr3);
- masm.cmpl(gpr4, 0);
- masm.jcc(ConditionFlag.Equal, bb9);
-
- masm.xorpd(temp3, temp3);
- masm.movl(gpr1, 18416);
- masm.pinsrw(temp3, gpr1, 3);
- masm.mulsd(dest, temp3);
- masm.xorpd(temp2, temp2);
- masm.movl(gpr1, 16368);
- masm.pinsrw(temp2, gpr1, 3);
- masm.movdqu(temp3, dest);
- masm.pextrw(gpr1, dest, 3);
- masm.por(dest, temp2);
- masm.movl(gpr3, 18416);
- masm.psrlq(dest, 27);
- masm.psrld(dest, 2);
- masm.rcpps(dest, dest);
- masm.psllq(temp3, 12);
- masm.movdqu(temp6, externalAddress(highSigMaskPtr)); // 0x00000000,
- // 0xfffff800,
- // 0x00000000,
- // 0xfffff800
- masm.psrlq(temp3, 12);
- masm.mulss(dest, temp7);
- masm.movl(gpr4, -1024);
- masm.movdl(temp5, gpr4);
- masm.por(temp3, temp1);
- masm.paddd(dest, temp4);
- masm.psllq(temp5, 32);
- masm.movdl(gpr4, dest);
- masm.psllq(dest, 29);
- masm.pand(temp5, temp3);
- masm.movl(gpr5, Integer.MIN_VALUE);
- masm.pand(dest, temp6);
- masm.subsd(temp3, temp5);
- masm.andl(gpr1, 32752);
- masm.subl(gpr1, 18416);
- masm.sarl(gpr1, 4);
- masm.cvtsi2sdl(temp7, gpr1);
- masm.mulpd(temp5, dest);
- masm.jmp(bb4);
-
- masm.bind(bb5);
- masm.cmpl(gpr1, 0);
- masm.jcc(ConditionFlag.Less, bb11);
-
- masm.cmpl(gpr1, 752);
- masm.jcc(ConditionFlag.AboveEqual, bb12);
-
- masm.addsd(dest, temp7);
- masm.movq(temp4, externalAddress(halfmaskPtr)); // 0xf8000000,
- // 0xffffffff
- masm.addpd(temp3, dest);
- masm.xorpd(temp6, temp6);
- masm.movl(gpr1, 17080);
- masm.pinsrw(temp6, gpr1, 3);
- masm.pshufd(dest, temp3, 0xEE);
- masm.addsd(dest, temp3);
- masm.movdqu(temp3, temp5);
- masm.addsd(temp5, dest);
- masm.subsd(temp3, temp5);
- masm.movdqu(temp7, temp5);
- masm.pand(temp5, temp4);
- masm.movdqu(temp2, temp1);
- masm.pand(temp4, temp1);
- masm.subsd(temp7, temp5);
- masm.addsd(dest, temp3);
- masm.subsd(temp1, temp4);
- masm.mulsd(temp4, temp5);
- masm.addsd(dest, temp7);
- masm.mulsd(temp2, dest);
- masm.movdqu(temp7, temp6);
- masm.mulsd(temp1, temp5);
- masm.addsd(temp6, temp4);
- masm.movdl(gpr1, temp6);
- masm.subsd(temp6, temp7);
- masm.leaq(gpr7, externalAddress(tExpPtr));
- masm.movl(gpr3, gpr1);
- masm.andl(gpr1, 255);
- masm.addl(gpr1, gpr1);
- masm.movdqu(temp5, new AMD64Address(gpr7, gpr1, Scale.Times8, 0));
- masm.addsd(temp2, temp1);
- masm.leaq(gpr8, externalAddress(eCoeffPtr));
- masm.movdqu(temp7, new AMD64Address(gpr8, 0)); // 0xe78a6731,
- // 0x3f55d87f,
- // 0xd704a0c0,
- // 0x3fac6b08
- masm.movdqu(temp3, new AMD64Address(gpr8, 16)); // 0x6fba4e77,
- // 0x3f83b2ab,
- // 0xff82c58f,
- // 0x3fcebfbd
- masm.subsd(temp4, temp6);
- masm.pextrw(gpr4, temp6, 3);
- masm.addsd(temp2, temp4);
- masm.sarl(gpr3, 8);
- masm.movl(gpr1, gpr3);
- masm.sarl(gpr3, 1);
- masm.subl(gpr1, gpr3);
- masm.shll(gpr3, 20);
- masm.xorl(gpr3, gpr5);
- masm.movdl(temp6, gpr3);
- masm.movq(temp1, new AMD64Address(gpr8, 32)); // 0xfefa39ef,
- // 0x3fe62e42
- masm.andl(gpr4, 32767);
- masm.cmpl(gpr4, 16529);
- masm.jcc(ConditionFlag.Above, bb12);
-
- masm.pshufd(dest, temp2, 0x44);
- masm.pshufd(temp4, temp2, 0x44);
- masm.mulpd(dest, dest);
- masm.mulpd(temp7, temp4);
- masm.pshufd(temp6, temp6, 0x11);
- masm.mulsd(temp1, temp2);
- masm.mulsd(dest, dest);
- masm.paddd(temp5, temp6);
- masm.addpd(temp3, temp7);
- masm.mulsd(temp1, temp5);
- masm.pshufd(temp6, temp5, 0xEE);
- masm.mulpd(dest, temp3);
- masm.addsd(temp1, temp6);
- masm.pshufd(temp3, dest, 0xEE);
- masm.mulsd(dest, temp5);
- masm.mulsd(temp3, temp5);
- masm.shll(gpr1, 4);
- masm.xorpd(temp4, temp4);
- masm.addl(gpr1, 16368);
- masm.pinsrw(temp4, gpr1, 3);
- masm.addsd(dest, temp1);
- masm.addsd(dest, temp3);
- masm.movdqu(temp1, dest);
- masm.addsd(dest, temp5);
- masm.mulsd(dest, temp4);
- masm.pextrw(gpr1, dest, 3);
- masm.andl(gpr1, 32752);
- masm.jcc(ConditionFlag.Equal, bb13);
-
- masm.cmpl(gpr1, 32752);
- masm.jcc(ConditionFlag.Equal, bb14);
-
- masm.jmp(bb56);
-
- masm.bind(bb6);
- masm.movdqu(temp1, temp8);
- masm.movdqu(dest, temp10);
- masm.movdqu(temp2, dest);
- masm.movdl(gpr1, temp2);
- masm.psrlq(temp2, 20);
- masm.movdl(gpr4, temp2);
- masm.orl(gpr1, gpr4);
- masm.jcc(ConditionFlag.Equal, bb15);
-
- masm.movdl(gpr1, temp1);
- masm.psrlq(temp1, 32);
- masm.movdl(gpr4, temp1);
- masm.movl(gpr3, gpr4);
- masm.addl(gpr4, gpr4);
- masm.orl(gpr1, gpr4);
- masm.jcc(ConditionFlag.Equal, bb16);
-
- masm.addsd(dest, dest);
- masm.jmp(bb56);
-
- masm.bind(bb16);
- masm.xorpd(dest, dest);
- masm.movl(gpr1, 16368);
- masm.pinsrw(dest, gpr1, 3);
- masm.jmp(bb56);
-
- masm.bind(bb18);
- masm.addpd(dest, temp8);
- masm.jmp(bb56);
-
- masm.bind(bb15);
- masm.movdl(gpr1, temp1);
- masm.movdqu(temp2, temp1);
- masm.psrlq(temp1, 32);
- masm.movdl(gpr4, temp1);
- masm.movl(gpr3, gpr4);
- masm.addl(gpr4, gpr4);
- masm.orl(gpr1, gpr4);
- masm.jcc(ConditionFlag.Equal, bb19);
-
- masm.pextrw(gpr1, temp2, 3);
- masm.andl(gpr1, 32752);
- masm.cmpl(gpr1, 32752);
- masm.jcc(ConditionFlag.NotEqual, bb20);
-
- masm.movdl(gpr1, temp2);
- masm.psrlq(temp2, 20);
- masm.movdl(gpr4, temp2);
- masm.orl(gpr1, gpr4);
- masm.jcc(ConditionFlag.NotEqual, bb18);
-
- masm.bind(bb20);
- masm.pextrw(gpr1, dest, 3);
- masm.testl(gpr1, 32768);
- masm.jcc(ConditionFlag.NotEqual, bb21);
-
- masm.testl(gpr3, Integer.MIN_VALUE);
- masm.jcc(ConditionFlag.NotZero, bb22);
-
- masm.jmp(bb56);
-
- masm.bind(bb23);
- masm.movdl(gpr1, temp8);
- masm.testl(gpr1, 1);
- masm.jcc(ConditionFlag.NotEqual, bb24);
-
- masm.testl(gpr1, 2);
- masm.jcc(ConditionFlag.NotEqual, bb25);
-
- masm.jmp(bb24);
-
- masm.bind(bb21);
- masm.shrl(gpr3, 20);
- masm.andl(gpr3, 2047);
- masm.cmpl(gpr3, 1075);
- masm.jcc(ConditionFlag.Above, bb24);
-
- masm.jcc(ConditionFlag.Equal, bb26);
-
- masm.cmpl(gpr3, 1074);
- masm.jcc(ConditionFlag.Above, bb23);
-
- masm.cmpl(gpr3, 1023);
- masm.jcc(ConditionFlag.Below, bb24);
-
- masm.movdqu(temp1, temp8);
- masm.movl(gpr1, 17208);
- masm.xorpd(temp3, temp3);
- masm.pinsrw(temp3, gpr1, 3);
- masm.movdqu(temp4, temp3);
- masm.addsd(temp3, temp1);
- masm.subsd(temp4, temp3);
- masm.addsd(temp1, temp4);
- masm.pextrw(gpr1, temp1, 3);
- masm.andl(gpr1, 32752);
- masm.jcc(ConditionFlag.NotEqual, bb24);
-
- masm.movdl(gpr1, temp3);
- masm.andl(gpr1, 1);
- masm.jcc(ConditionFlag.Equal, bb24);
-
- masm.bind(bb25);
- masm.pextrw(gpr1, temp8, 3);
- masm.andl(gpr1, 32768);
- masm.jcc(ConditionFlag.NotEqual, bb27);
-
- masm.jmp(bb56);
-
- masm.bind(bb27);
- masm.xorpd(dest, dest);
- masm.movl(gpr1, 32768);
- masm.pinsrw(dest, gpr1, 3);
- masm.jmp(bb56);
-
- masm.bind(bb24);
- masm.pextrw(gpr1, temp8, 3);
- masm.andl(gpr1, 32768);
- masm.jcc(ConditionFlag.NotEqual, bb22);
-
- masm.xorpd(dest, dest);
- masm.movl(gpr1, 32752);
- masm.pinsrw(dest, gpr1, 3);
- masm.jmp(bb56);
-
- masm.bind(bb26);
- masm.movdl(gpr1, temp8);
- masm.andl(gpr1, 1);
- masm.jcc(ConditionFlag.Equal, bb24);
-
- masm.jmp(bb25);
-
- masm.bind(bb28);
- masm.movdl(gpr1, temp1);
- masm.psrlq(temp1, 20);
- masm.movdl(gpr4, temp1);
- masm.orl(gpr1, gpr4);
- masm.jcc(ConditionFlag.Equal, bb29);
-
- masm.addsd(dest, temp8);
- masm.jmp(bb56);
-
- masm.bind(bb29);
- masm.movdqu(dest, temp10);
- masm.pextrw(gpr1, dest, 3);
- masm.cmpl(gpr1, 49136);
- masm.jcc(ConditionFlag.NotEqual, bb30);
-
- masm.movdl(gpr3, dest);
- masm.psrlq(dest, 20);
- masm.movdl(gpr4, dest);
- masm.orl(gpr3, gpr4);
- masm.jcc(ConditionFlag.NotEqual, bb30);
-
- masm.xorpd(dest, dest);
- masm.movl(gpr1, 32760);
- masm.pinsrw(dest, gpr1, 3);
- masm.jmp(bb56);
-
- masm.bind(bb30);
- masm.andl(gpr1, 32752);
- masm.subl(gpr1, 16368);
- masm.pextrw(gpr4, temp8, 3);
- masm.xorpd(dest, dest);
- masm.xorl(gpr1, gpr4);
- masm.andl(gpr1, 32768);
- masm.jcc(ConditionFlag.Equal, bb31);
-
- masm.jmp(bb56);
-
- masm.bind(bb31);
- masm.movl(gpr3, 32752);
- masm.pinsrw(dest, gpr3, 3);
- masm.jmp(bb56);
-
- masm.bind(bb32);
- masm.movdl(gpr1, temp1);
- masm.cmpl(gpr4, 17184);
- masm.jcc(ConditionFlag.Above, bb33);
-
- masm.testl(gpr1, 1);
- masm.jcc(ConditionFlag.NotEqual, bb34);
-
- masm.testl(gpr1, 2);
- masm.jcc(ConditionFlag.Equal, bb35);
-
- masm.jmp(bb36);
-
- masm.bind(bb33);
- masm.testl(gpr1, 1);
- masm.jcc(ConditionFlag.Equal, bb35);
-
- masm.jmp(bb36);
-
- masm.bind(bb7);
- masm.movdqu(temp2, temp10);
- masm.movdl(gpr1, temp2);
- masm.psrlq(temp2, 31);
- masm.movdl(gpr3, temp2);
- masm.orl(gpr1, gpr3);
- masm.jcc(ConditionFlag.Equal, bb9);
-
- masm.pextrw(gpr4, temp8, 3);
- masm.movdl(gpr1, temp8);
- masm.movdqu(temp2, temp8);
- masm.psrlq(temp2, 32);
- masm.movdl(gpr3, temp2);
- masm.addl(gpr3, gpr3);
- masm.orl(gpr3, gpr1);
- masm.jcc(ConditionFlag.Equal, bb37);
-
- masm.andl(gpr4, 32752);
- masm.cmpl(gpr4, 32752);
- masm.jcc(ConditionFlag.Equal, bb28);
-
- masm.cmpl(gpr4, 17200);
- masm.jcc(ConditionFlag.Above, bb35);
-
- masm.cmpl(gpr4, 17184);
- masm.jcc(ConditionFlag.AboveEqual, bb32);
-
- masm.cmpl(gpr4, 16368);
- masm.jcc(ConditionFlag.Below, bb34);
-
- masm.movl(gpr1, 17208);
- masm.xorpd(temp2, temp2);
- masm.pinsrw(temp2, gpr1, 3);
- masm.movdqu(temp4, temp2);
- masm.addsd(temp2, temp1);
- masm.subsd(temp4, temp2);
- masm.addsd(temp1, temp4);
- masm.pextrw(gpr1, temp1, 3);
- masm.andl(gpr1, 32767);
- masm.jcc(ConditionFlag.NotEqual, bb34);
-
- masm.movdl(gpr1, temp2);
- masm.andl(gpr1, 1);
- masm.jcc(ConditionFlag.Equal, bb35);
-
- masm.bind(bb36);
- masm.xorpd(temp1, temp1);
- masm.movl(gpr4, 30704);
- masm.pinsrw(temp1, gpr4, 3);
- masm.pextrw(gpr1, temp10, 3);
- masm.movl(gpr4, 8192);
- masm.movdl(temp4, gpr4);
- masm.andl(gpr1, 32767);
- masm.subl(gpr1, 16);
- masm.jcc(ConditionFlag.Less, bb10);
-
- masm.movl(gpr4, gpr1);
- masm.andl(gpr4, 32752);
- masm.subl(gpr4, 16368);
- masm.movl(gpr3, gpr4);
- masm.sarl(gpr4, 31);
- masm.addl(gpr3, gpr4);
- masm.xorl(gpr3, gpr4);
- masm.addl(gpr3, 16);
- masm.bsrl(gpr3, gpr3);
- masm.movl(gpr5, Integer.MIN_VALUE);
- masm.jmp(bb1);
-
- masm.bind(bb34);
- masm.xorpd(temp1, temp1);
- masm.movl(gpr1, 32752);
- masm.pinsrw(temp1, gpr1, 3);
- masm.xorpd(dest, dest);
- masm.mulsd(dest, temp1);
- masm.jmp(bb56);
-
- masm.bind(bb35);
- masm.xorpd(temp1, temp1);
- masm.movl(gpr4, 30704);
- masm.pinsrw(temp1, gpr4, 3);
- masm.pextrw(gpr1, temp10, 3);
- masm.movl(gpr4, 8192);
- masm.movdl(temp4, gpr4);
- masm.andl(gpr1, 32767);
- masm.subl(gpr1, 16);
- masm.jcc(ConditionFlag.Less, bb8);
-
- masm.movl(gpr4, gpr1);
- masm.andl(gpr4, 32752);
- masm.subl(gpr4, 16368);
- masm.movl(gpr3, gpr4);
- masm.sarl(gpr4, 31);
- masm.addl(gpr3, gpr4);
- masm.xorl(gpr3, gpr4);
- masm.addl(gpr3, 16);
- masm.bsrl(gpr3, gpr3);
- masm.movl(gpr5, 0);
- masm.jmp(bb1);
-
- masm.bind(bb19);
- masm.xorpd(dest, dest);
- masm.movl(gpr1, 16368);
- masm.pinsrw(dest, gpr1, 3);
- masm.jmp(bb56);
-
- masm.bind(bb22);
- masm.xorpd(dest, dest);
- masm.jmp(bb56);
-
- masm.bind(bb11);
- masm.addl(gpr1, 384);
- masm.cmpl(gpr1, 0);
- masm.jcc(ConditionFlag.Less, bb38);
-
- masm.mulsd(temp5, temp1);
- masm.addsd(dest, temp7);
- masm.shrl(gpr5, 31);
- masm.addpd(temp3, dest);
- masm.pshufd(dest, temp3, 0xEE);
- masm.addsd(temp3, dest);
- masm.leaq(gpr7, externalAddress(logTwoPowPtr)); // 0xfefa39ef,
- // 0x3fe62e42,
- // 0xfefa39ef,
- // 0xbfe62e42
- masm.movq(temp4, new AMD64Address(gpr7, gpr5, Scale.Times8, 0));
- masm.mulsd(temp1, temp3);
- masm.xorpd(dest, dest);
- masm.movl(gpr1, 16368);
- masm.shll(gpr5, 15);
- masm.orl(gpr1, gpr5);
- masm.pinsrw(dest, gpr1, 3);
- masm.addsd(temp5, temp1);
- masm.mulsd(temp5, temp4);
- masm.addsd(dest, temp5);
- masm.jmp(bb56);
-
- masm.bind(bb38);
-
- masm.bind(bb37);
- masm.xorpd(dest, dest);
- masm.movl(gpr1, 16368);
- masm.pinsrw(dest, gpr1, 3);
- masm.jmp(bb56);
-
- masm.bind(bb39);
- masm.xorpd(dest, dest);
- masm.movl(gpr1, 16368);
- masm.pinsrw(dest, gpr1, 3);
- masm.jmp(bb56);
-
- masm.bind(bb9);
- masm.movdqu(temp2, temp8);
- masm.pextrw(gpr1, temp8, 3);
- masm.andl(gpr1, 32752);
- masm.cmpl(gpr1, 32752);
- masm.jcc(ConditionFlag.NotEqual, bb40);
-
- masm.movdl(gpr1, temp2);
- masm.psrlq(temp2, 20);
- masm.movdl(gpr4, temp2);
- masm.orl(gpr1, gpr4);
- masm.jcc(ConditionFlag.NotEqual, bb18);
-
- masm.bind(bb40);
- masm.movdl(gpr1, temp1);
- masm.psrlq(temp1, 32);
- masm.movdl(gpr4, temp1);
- masm.movl(gpr3, gpr4);
- masm.addl(gpr4, gpr4);
- masm.orl(gpr1, gpr4);
- masm.jcc(ConditionFlag.Equal, bb39);
-
- masm.shrl(gpr4, 21);
- masm.cmpl(gpr4, 1075);
- masm.jcc(ConditionFlag.Above, bb41);
-
- masm.jcc(ConditionFlag.Equal, bb42);
-
- masm.cmpl(gpr4, 1023);
- masm.jcc(ConditionFlag.Below, bb41);
-
- masm.movdqu(temp1, temp8);
- masm.movl(gpr1, 17208);
- masm.xorpd(temp3, temp3);
- masm.pinsrw(temp3, gpr1, 3);
- masm.movdqu(temp4, temp3);
- masm.addsd(temp3, temp1);
- masm.subsd(temp4, temp3);
- masm.addsd(temp1, temp4);
- masm.pextrw(gpr1, temp1, 3);
- masm.andl(gpr1, 32752);
- masm.jcc(ConditionFlag.NotEqual, bb41);
-
- masm.movdl(gpr1, temp3);
- masm.andl(gpr1, 1);
- masm.jcc(ConditionFlag.Equal, bb41);
-
- masm.bind(bb43);
- masm.movdqu(dest, temp10);
- masm.testl(gpr3, Integer.MIN_VALUE);
- masm.jcc(ConditionFlag.NotEqual, bb44);
-
- masm.jmp(bb56);
-
- masm.bind(bb42);
- masm.movdl(gpr1, temp8);
- masm.testl(gpr1, 1);
- masm.jcc(ConditionFlag.NotEqual, bb43);
-
- masm.bind(bb41);
- masm.testl(gpr3, Integer.MIN_VALUE);
- masm.jcc(ConditionFlag.Equal, bb22);
-
- masm.xorpd(dest, dest);
-
- masm.bind(bb44);
- masm.movl(gpr1, 16368);
- masm.xorpd(temp1, temp1);
- masm.pinsrw(temp1, gpr1, 3);
- masm.divsd(temp1, dest);
- masm.movdqu(dest, temp1);
- masm.jmp(bb56);
-
- masm.bind(bb12);
- masm.pextrw(gpr1, temp10, 3);
- masm.pextrw(gpr4, temp8, 3);
- masm.movl(gpr3, 32752);
- masm.andl(gpr3, gpr4);
- masm.cmpl(gpr3, 32752);
- masm.jcc(ConditionFlag.Equal, bb45);
-
- masm.andl(gpr1, 32752);
- masm.subl(gpr1, 16368);
- masm.xorl(gpr4, gpr1);
- masm.testl(gpr4, 32768);
- masm.jcc(ConditionFlag.NotEqual, bb46);
-
- masm.bind(bb47);
- masm.movl(gpr1, 32736);
- masm.pinsrw(dest, gpr1, 3);
- masm.shrl(gpr5, 16);
- masm.orl(gpr1, gpr5);
- masm.pinsrw(temp1, gpr1, 3);
- masm.mulsd(dest, temp1);
-
- masm.bind(bb14);
- masm.jmp(bb56);
-
- masm.bind(bb46);
- masm.movl(gpr1, 16);
- masm.pinsrw(dest, gpr1, 3);
- masm.mulsd(dest, dest);
- masm.testl(gpr3, Integer.MIN_VALUE);
- masm.jcc(ConditionFlag.Equal, bb48);
-
- masm.movq(gpr2, 0x8000000000000000L);
- masm.movdq(temp2, gpr2);
- masm.xorpd(dest, temp2);
-
- masm.bind(bb48);
- masm.jmp(bb56);
-
- masm.bind(bb13);
- masm.pextrw(gpr3, temp5, 3);
- masm.pextrw(gpr4, temp4, 3);
- masm.movl(gpr1, -1);
- masm.andl(gpr3, 32752);
- masm.subl(gpr3, 16368);
- masm.andl(gpr4, 32752);
- masm.addl(gpr4, gpr3);
- masm.movl(gpr3, -31);
- masm.sarl(gpr4, 4);
- masm.subl(gpr3, gpr4);
- masm.jcc(ConditionFlag.LessEqual, bb49);
-
- masm.cmpl(gpr3, 20);
- masm.jcc(ConditionFlag.Above, bb50);
-
- masm.shll(gpr1);
-
- masm.bind(bb49);
- masm.movdl(dest, gpr1);
- masm.psllq(dest, 32);
- masm.pand(dest, temp5);
- masm.subsd(temp5, dest);
- masm.addsd(temp5, temp1);
- masm.mulsd(dest, temp4);
- masm.mulsd(temp5, temp4);
- masm.addsd(dest, temp5);
-
- masm.bind(bb50);
- masm.jmp(bb48);
-
- masm.bind(bb2);
- masm.pextrw(gpr3, temp8, 3);
- masm.movl(gpr4, Integer.MIN_VALUE);
- masm.movdl(temp1, gpr4);
- masm.xorpd(temp7, temp7);
- masm.paddd(dest, temp4);
- masm.movdl(gpr4, dest);
- masm.psllq(dest, 29);
- masm.paddq(temp1, temp3);
- masm.pand(temp5, temp1);
- masm.andl(gpr3, 32752);
- masm.cmpl(gpr3, 16560);
- masm.jcc(ConditionFlag.Less, bb3);
-
- masm.leaq(gpr7, externalAddress(lTblPowPtr));
- masm.leaq(gpr8, externalAddress(coeffHPtr));
- masm.movdqu(temp4, new AMD64Address(gpr8, 0)); // 0x00000000,
- // 0xbfd61a00,
- // 0x00000000,
- // 0xbf5dabe1
- masm.pand(dest, temp6);
- masm.subsd(temp3, temp5);
- masm.addl(gpr1, 16351);
- masm.shrl(gpr1, 4);
- masm.subl(gpr1, 1022);
- masm.cvtsi2sdl(temp7, gpr1);
- masm.mulpd(temp5, dest);
- masm.mulsd(temp3, dest);
- masm.subsd(temp5, temp9);
- masm.pshufd(temp1, temp4, 0xE);
- masm.pshufd(temp2, temp3, 0x44);
- masm.unpcklpd(temp5, temp3);
- masm.addsd(temp3, temp5);
- masm.andl(gpr4, 16760832);
- masm.shrl(gpr4, 10);
- masm.addpd(temp7, new AMD64Address(gpr7, gpr4, Scale.Times1, -3648));
- masm.movdqu(temp6, temp4);
- masm.mulsd(temp4, temp5);
- masm.movdqu(dest, temp1);
- masm.mulsd(dest, temp5);
- masm.mulsd(temp6, temp2);
- masm.mulsd(temp1, temp2);
- masm.movdqu(temp2, temp5);
- masm.mulsd(temp4, temp5);
- masm.addsd(temp5, dest);
- masm.movdqu(dest, temp7);
- masm.addsd(temp2, temp3);
- masm.addsd(temp7, temp5);
- masm.mulsd(temp6, temp2);
- masm.subsd(dest, temp7);
- masm.movdqu(temp2, temp7);
- masm.addsd(temp7, temp4);
- masm.addsd(dest, temp5);
- masm.subsd(temp2, temp7);
- masm.addsd(temp4, temp2);
- masm.pshufd(temp2, temp5, 0xEE);
- masm.movdqu(temp5, temp7);
- masm.addsd(temp7, temp2);
- masm.addsd(temp4, dest);
- masm.leaq(gpr8, externalAddress(coeffPowPtr));
- masm.movdqu(dest, new AMD64Address(gpr8, 0)); // 0x6dc96112,
- // 0xbf836578,
- // 0xee241472,
- // 0xbf9b0301
- masm.subsd(temp5, temp7);
- masm.addsd(temp6, temp4);
- masm.movdqu(temp4, temp7);
- masm.addsd(temp5, temp2);
- masm.addsd(temp7, temp1);
- masm.movdqu(temp2, new AMD64Address(gpr8, 64)); // 0x486ececc,
- // 0x3fc4635e,
- // 0x161bb241,
- // 0xbf5dabe1
- masm.subsd(temp4, temp7);
- masm.addsd(temp6, temp5);
- masm.addsd(temp4, temp1);
- masm.pshufd(temp5, temp7, 0xEE);
- masm.movapd(temp1, temp7);
- masm.addsd(temp7, temp5);
- masm.subsd(temp1, temp7);
- masm.addsd(temp1, temp5);
- masm.movdqu(temp5, new AMD64Address(gpr8, 80)); // 0x9f95985a,
- // 0xbfb528db,
- // 0xf8b5787d,
- // 0x3ef2531e
- masm.pshufd(temp3, temp3, 0x44);
- masm.addsd(temp6, temp4);
- masm.addsd(temp6, temp1);
- masm.movdqu(temp1, new AMD64Address(gpr8, 32)); // 0x9f95985a,
- // 0xbfb528db,
- // 0xb3841d2a,
- // 0xbfd619b6
- masm.mulpd(dest, temp3);
- masm.mulpd(temp2, temp3);
- masm.pshufd(temp4, temp3, 0x44);
- masm.mulpd(temp3, temp3);
- masm.addpd(dest, temp1);
- masm.addpd(temp5, temp2);
- masm.mulsd(temp4, temp3);
- masm.movq(temp2, externalAddress(highmaskLogXPtr)); // 0xf8000000,
- // 0xffffffff
- masm.mulpd(temp3, temp3);
- masm.movdqu(temp1, temp8);
- masm.pextrw(gpr3, temp8, 3);
- masm.mulpd(dest, temp4);
- masm.pextrw(gpr1, temp7, 3);
- masm.mulpd(temp5, temp4);
- masm.mulpd(dest, temp3);
- masm.leaq(gpr8, externalAddress(highmaskYPtr));
- masm.movq(temp4, new AMD64Address(gpr8, 8)); // 0x00000000,
- // 0xffffffff
- masm.pand(temp2, temp7);
- masm.addsd(temp5, temp6);
- masm.subsd(temp7, temp2);
- masm.addpd(temp5, dest);
- masm.andl(gpr1, 32752);
- masm.subl(gpr1, 16368);
- masm.andl(gpr3, 32752);
- masm.cmpl(gpr3, 32752);
- masm.jcc(ConditionFlag.Equal, bb45);
-
- masm.addl(gpr3, gpr1);
- masm.cmpl(gpr3, 16576);
- masm.jcc(ConditionFlag.AboveEqual, bb51);
-
- masm.pshufd(dest, temp5, 0xEE);
- masm.pand(temp4, temp1);
- masm.movdqu(temp3, temp1);
- masm.addsd(temp5, dest);
- masm.subsd(temp1, temp4);
- masm.xorpd(temp6, temp6);
- masm.movl(gpr4, 17080);
- masm.pinsrw(temp6, gpr4, 3);
- masm.addsd(temp7, temp5);
- masm.mulsd(temp4, temp2);
- masm.mulsd(temp1, temp2);
- masm.movdqu(temp5, temp6);
- masm.mulsd(temp3, temp7);
- masm.addsd(temp6, temp4);
- masm.addsd(temp1, temp3);
- masm.leaq(gpr8, externalAddress(eCoeffPtr));
- masm.movdqu(temp7, new AMD64Address(gpr8, 0)); // 0xe78a6731,
- // 0x3f55d87f,
- // 0xd704a0c0,
- // 0x3fac6b08
- masm.movdl(gpr4, temp6);
- masm.subsd(temp6, temp5);
- masm.leaq(gpr7, externalAddress(tExpPtr));
- masm.movl(gpr3, gpr4);
- masm.andl(gpr4, 255);
- masm.addl(gpr4, gpr4);
- masm.movdqu(temp5, new AMD64Address(gpr7, gpr4, Scale.Times8, 0));
- masm.movdqu(temp3, new AMD64Address(gpr8, 16)); // 0x6fba4e77,
- // 0x3f83b2ab,
- // 0xff82c58f,
- // 0x3fcebfbd
- masm.movq(temp2, new AMD64Address(gpr8, 32)); // 0xfefa39ef,
- // 0x3fe62e42
- masm.subsd(temp4, temp6);
- masm.addsd(temp4, temp1);
- masm.pextrw(gpr4, temp6, 3);
- masm.shrl(gpr3, 8);
- masm.movl(gpr1, gpr3);
- masm.shrl(gpr3, 1);
- masm.subl(gpr1, gpr3);
- masm.shll(gpr3, 20);
- masm.movdl(temp6, gpr3);
- masm.pshufd(dest, temp4, 0x44);
- masm.pshufd(temp1, temp4, 0x44);
- masm.mulpd(dest, dest);
- masm.mulpd(temp7, temp1);
- masm.pshufd(temp6, temp6, 0x11);
- masm.mulsd(temp2, temp4);
- masm.andl(gpr4, 32767);
- masm.cmpl(gpr4, 16529);
- masm.jcc(ConditionFlag.Above, bb12);
-
- masm.mulsd(dest, dest);
- masm.paddd(temp5, temp6);
- masm.addpd(temp3, temp7);
- masm.mulsd(temp2, temp5);
- masm.pshufd(temp6, temp5, 0xEE);
- masm.mulpd(dest, temp3);
- masm.addsd(temp2, temp6);
- masm.pshufd(temp3, dest, 0xEE);
- masm.addl(gpr1, 1023);
- masm.shll(gpr1, 20);
- masm.orl(gpr1, gpr5);
- masm.movdl(temp4, gpr1);
- masm.mulsd(dest, temp5);
- masm.mulsd(temp3, temp5);
- masm.addsd(dest, temp2);
- masm.psllq(temp4, 32);
- masm.addsd(dest, temp3);
- masm.movdqu(temp1, dest);
- masm.addsd(dest, temp5);
- masm.mulsd(dest, temp4);
- masm.pextrw(gpr1, dest, 3);
- masm.andl(gpr1, 32752);
- masm.jcc(ConditionFlag.Equal, bb13);
-
- masm.cmpl(gpr1, 32752);
- masm.jcc(ConditionFlag.Equal, bb14);
-
- masm.jmp(bb56);
-
- masm.bind(bb45);
- masm.movdqu(dest, temp10);
- masm.xorpd(temp2, temp2);
- masm.movl(gpr1, 49136);
- masm.pinsrw(temp2, gpr1, 3);
- masm.addsd(temp2, dest);
- masm.pextrw(gpr1, temp2, 3);
- masm.cmpl(gpr1, 0);
- masm.jcc(ConditionFlag.NotEqual, bb53);
-
- masm.xorpd(dest, dest);
- masm.movl(gpr1, 32760);
- masm.pinsrw(dest, gpr1, 3);
- masm.jmp(bb56);
-
- masm.bind(bb53);
- masm.movdqu(temp1, temp8);
- masm.movdl(gpr4, temp1);
- masm.movdqu(temp3, temp1);
- masm.psrlq(temp3, 20);
- masm.movdl(gpr3, temp3);
- masm.orl(gpr3, gpr4);
- masm.jcc(ConditionFlag.Equal, bb54);
-
- masm.addsd(temp1, temp1);
- masm.movdqu(dest, temp1);
- masm.jmp(bb56);
-
- masm.bind(bb51);
- masm.pextrw(gpr1, temp1, 3);
- masm.pextrw(gpr3, temp2, 3);
- masm.xorl(gpr1, gpr3);
- masm.testl(gpr1, 32768);
- masm.jcc(ConditionFlag.Equal, bb47);
-
- masm.jmp(bb46);
-
- masm.bind(bb54);
- masm.pextrw(gpr1, dest, 3);
- masm.andl(gpr1, 32752);
- masm.pextrw(gpr4, temp1, 3);
- masm.xorpd(dest, dest);
- masm.subl(gpr1, 16368);
- masm.xorl(gpr1, gpr4);
- masm.testl(gpr1, 32768);
- masm.jcc(ConditionFlag.Equal, bb55);
-
- masm.jmp(bb56);
-
- masm.bind(bb55);
- masm.movl(gpr4, 32752);
- masm.pinsrw(dest, gpr4, 3);
- masm.jmp(bb56);
-
- masm.bind(bb56);
+ public final Variable emitLIRWrapper(LIRGenerator gen, Value x, Value y) {
+ LIRKind kind = LIRKind.combine(x, y);
+ RegisterValue xmm0Value = xmm0.asValue(kind);
+ gen.emitMove(xmm0Value, x);
+ RegisterValue xmm1Value = xmm1.asValue(kind);
+ gen.emitMove(xmm1Value, y);
+ gen.append(this);
+ Variable result = gen.newVariable(kind);
+ gen.emitMove(result, xmm0Value);
+ return result;
}
}
--- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir.amd64/src/org/graalvm/compiler/lir/amd64/AMD64MathIntrinsicUnaryOp.java Tue Mar 12 09:49:10 2019 +0000
+++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir.amd64/src/org/graalvm/compiler/lir/amd64/AMD64MathIntrinsicUnaryOp.java Sat Mar 16 21:00:45 2019 +0000
@@ -24,3822 +24,48 @@
package org.graalvm.compiler.lir.amd64;
-import static org.graalvm.compiler.lir.LIRInstruction.OperandFlag.ILLEGAL;
-import static org.graalvm.compiler.lir.LIRInstruction.OperandFlag.REG;
-import static org.graalvm.compiler.lir.LIRInstruction.OperandFlag.STACK;
-import static jdk.vm.ci.code.ValueUtil.asRegister;
+import static jdk.vm.ci.amd64.AMD64.xmm0;
+import static org.graalvm.compiler.lir.amd64.AMD64HotSpotHelper.registersToValues;
-import org.graalvm.compiler.asm.Label;
-import org.graalvm.compiler.asm.amd64.AMD64Address;
-import org.graalvm.compiler.asm.amd64.AMD64Address.Scale;
-import org.graalvm.compiler.asm.amd64.AMD64Assembler.ConditionFlag;
-import org.graalvm.compiler.asm.amd64.AMD64MacroAssembler;
import org.graalvm.compiler.core.common.LIRKind;
-import org.graalvm.compiler.debug.GraalError;
import org.graalvm.compiler.lir.LIRInstructionClass;
-import org.graalvm.compiler.lir.Opcode;
-import org.graalvm.compiler.lir.asm.ArrayDataPointerConstant;
-import org.graalvm.compiler.lir.asm.CompilationResultBuilder;
+import org.graalvm.compiler.lir.Variable;
import org.graalvm.compiler.lir.gen.LIRGeneratorTool;
-import jdk.vm.ci.amd64.AMD64;
-import jdk.vm.ci.amd64.AMD64.CPUFeature;
import jdk.vm.ci.amd64.AMD64Kind;
import jdk.vm.ci.code.Register;
-import jdk.vm.ci.meta.AllocatableValue;
+import jdk.vm.ci.code.RegisterValue;
import jdk.vm.ci.meta.Value;
-public final class AMD64MathIntrinsicUnaryOp extends AMD64LIRInstruction {
- public static final LIRInstructionClass<AMD64MathIntrinsicUnaryOp> TYPE = LIRInstructionClass.create(AMD64MathIntrinsicUnaryOp.class);
-
- public enum UnaryIntrinsicOpcode {
- LOG,
- LOG10,
- SIN,
- COS,
- TAN,
- EXP
- }
-
- @Opcode private final UnaryIntrinsicOpcode opcode;
- @Def protected Value result;
- @Use protected Value input;
- @Temp({REG, ILLEGAL}) protected Value xmm1Temp = Value.ILLEGAL;
- @Temp({REG, ILLEGAL}) protected Value xmm2Temp = Value.ILLEGAL;
- @Temp({REG, ILLEGAL}) protected Value xmm3Temp = Value.ILLEGAL;
- @Temp({REG, ILLEGAL}) protected Value xmm4Temp = Value.ILLEGAL;
- @Temp({REG, ILLEGAL}) protected Value xmm5Temp = Value.ILLEGAL;
- @Temp({REG, ILLEGAL}) protected Value xmm6Temp = Value.ILLEGAL;
- @Temp({REG, ILLEGAL}) protected Value xmm7Temp = Value.ILLEGAL;
- @Temp({REG, ILLEGAL}) protected Value xmm8Temp = Value.ILLEGAL;
- @Temp({REG, ILLEGAL}) protected Value xmm9Temp = Value.ILLEGAL;
- @Temp({REG, ILLEGAL}) protected Value xmm10Temp = Value.ILLEGAL;
- @Temp({REG, ILLEGAL}) protected Value gpr1Temp = Value.ILLEGAL;
- @Temp({REG, ILLEGAL}) protected Value gpr2Temp = Value.ILLEGAL;
- @Temp protected AllocatableValue rcxTemp;
- @Temp({REG, ILLEGAL}) protected Value gpr4Temp = Value.ILLEGAL;
- @Temp({REG, ILLEGAL}) protected Value gpr5Temp = Value.ILLEGAL;
- @Temp({REG, ILLEGAL}) protected Value gpr6Temp = Value.ILLEGAL;
- @Temp({REG, ILLEGAL}) protected Value gpr7Temp = Value.ILLEGAL;
- @Temp({REG, ILLEGAL}) protected Value gpr8Temp = Value.ILLEGAL;
- @Temp({REG, ILLEGAL}) protected Value gpr9Temp = Value.ILLEGAL;
- @Temp({REG, ILLEGAL}) protected Value gpr10Temp = Value.ILLEGAL;
- @Temp({STACK, ILLEGAL}) protected Value stackTemp = Value.ILLEGAL;
-
- CompilationResultBuilder internalCrb;
-
- public AMD64MathIntrinsicUnaryOp(LIRGeneratorTool tool, UnaryIntrinsicOpcode opcode, Value result, Value input, Value stackTemp) {
- super(TYPE);
- this.opcode = opcode;
- this.result = result;
- this.input = input;
- if (opcode == UnaryIntrinsicOpcode.LOG || opcode == UnaryIntrinsicOpcode.LOG10 ||
- opcode == UnaryIntrinsicOpcode.SIN || opcode == UnaryIntrinsicOpcode.COS ||
- opcode == UnaryIntrinsicOpcode.TAN || opcode == UnaryIntrinsicOpcode.EXP) {
- this.gpr1Temp = tool.newVariable(LIRKind.value(AMD64Kind.QWORD));
- this.gpr2Temp = tool.newVariable(LIRKind.value(AMD64Kind.QWORD));
- this.rcxTemp = AMD64.rcx.asValue(LIRKind.value(AMD64Kind.QWORD));
- this.gpr4Temp = tool.newVariable(LIRKind.value(AMD64Kind.QWORD));
- this.xmm1Temp = tool.newVariable(LIRKind.value(AMD64Kind.DOUBLE));
- this.xmm2Temp = tool.newVariable(LIRKind.value(AMD64Kind.DOUBLE));
- this.xmm3Temp = tool.newVariable(LIRKind.value(AMD64Kind.DOUBLE));
- this.xmm4Temp = tool.newVariable(LIRKind.value(AMD64Kind.DOUBLE));
- this.xmm5Temp = tool.newVariable(LIRKind.value(AMD64Kind.DOUBLE));
- this.xmm6Temp = tool.newVariable(LIRKind.value(AMD64Kind.DOUBLE));
- this.xmm7Temp = tool.newVariable(LIRKind.value(AMD64Kind.DOUBLE));
-
- if (opcode == UnaryIntrinsicOpcode.EXP) {
- this.gpr5Temp = tool.newVariable(LIRKind.value(AMD64Kind.QWORD));
- this.xmm8Temp = tool.newVariable(LIRKind.value(AMD64Kind.DOUBLE));
- this.xmm9Temp = tool.newVariable(LIRKind.value(AMD64Kind.DOUBLE));
- this.xmm10Temp = tool.newVariable(LIRKind.value(AMD64Kind.DOUBLE));
- }
-
- if (opcode == UnaryIntrinsicOpcode.TAN) {
- this.gpr5Temp = tool.newVariable(LIRKind.value(AMD64Kind.QWORD));
- this.gpr6Temp = tool.newVariable(LIRKind.value(AMD64Kind.QWORD));
- this.gpr7Temp = tool.newVariable(LIRKind.value(AMD64Kind.QWORD));
- this.gpr8Temp = tool.newVariable(LIRKind.value(AMD64Kind.QWORD));
- this.gpr9Temp = tool.newVariable(LIRKind.value(AMD64Kind.QWORD));
- this.gpr10Temp = tool.newVariable(LIRKind.value(AMD64Kind.QWORD));
- }
-
- if (opcode == UnaryIntrinsicOpcode.SIN || opcode == UnaryIntrinsicOpcode.COS) {
- this.gpr5Temp = tool.newVariable(LIRKind.value(AMD64Kind.QWORD));
- this.gpr6Temp = tool.newVariable(LIRKind.value(AMD64Kind.QWORD));
- this.gpr7Temp = tool.newVariable(LIRKind.value(AMD64Kind.QWORD));
- this.gpr8Temp = tool.newVariable(LIRKind.value(AMD64Kind.QWORD));
- this.gpr9Temp = tool.newVariable(LIRKind.value(AMD64Kind.QWORD));
- this.gpr10Temp = tool.newVariable(LIRKind.value(AMD64Kind.QWORD));
- this.xmm8Temp = tool.newVariable(LIRKind.value(AMD64Kind.DOUBLE));
- this.xmm9Temp = tool.newVariable(LIRKind.value(AMD64Kind.DOUBLE));
- }
-
- this.stackTemp = stackTemp;
- }
- }
-
- public AMD64MathIntrinsicUnaryOp(LIRGeneratorTool tool, UnaryIntrinsicOpcode opcode, Value result, Value input) {
- this(tool, opcode, result, input, Value.ILLEGAL);
- }
-
- private void setCrb(CompilationResultBuilder crb) {
- internalCrb = crb;
- }
-
- private AMD64Address externalAddress(ArrayDataPointerConstant curPtr) {
- return (AMD64Address) internalCrb.recordDataReferenceInCode(curPtr);
- }
-
- @Override
- public void emitCode(CompilationResultBuilder crb, AMD64MacroAssembler masm) {
- switch (opcode) {
- case LOG:
- logIntrinsic(asRegister(result, AMD64Kind.DOUBLE), asRegister(input, AMD64Kind.DOUBLE), crb, masm);
- break;
- case LOG10:
- log10Intrinsic(asRegister(result, AMD64Kind.DOUBLE), asRegister(input, AMD64Kind.DOUBLE), crb, masm);
- break;
- case SIN:
- sinIntrinsic(asRegister(result, AMD64Kind.DOUBLE), asRegister(input, AMD64Kind.DOUBLE), crb, masm);
- break;
- case COS:
- cosIntrinsic(asRegister(result, AMD64Kind.DOUBLE), asRegister(input, AMD64Kind.DOUBLE), crb, masm);
- break;
- case TAN:
- tanIntrinsic(asRegister(result, AMD64Kind.DOUBLE), asRegister(input, AMD64Kind.DOUBLE), crb, masm);
- break;
- case EXP:
- expIntrinsic(asRegister(result, AMD64Kind.DOUBLE), asRegister(input, AMD64Kind.DOUBLE), crb, masm);
- break;
- default:
- throw GraalError.shouldNotReachHere();
- }
- }
-
- private static int[] logTwoTable = {
- 0xfefa3800, 0x3fe62e42, 0x93c76730, 0x3d2ef357, 0xaa241800,
- 0x3fe5ee82, 0x0cda46be, 0x3d220238, 0x5c364800, 0x3fe5af40,
- 0xac10c9fb, 0x3d2dfa63, 0x26bb8c00, 0x3fe5707a, 0xff3303dd,
- 0x3d09980b, 0x26867800, 0x3fe5322e, 0x5d257531, 0x3d05ccc4,
- 0x835a5000, 0x3fe4f45a, 0x6d93b8fb, 0xbd2e6c51, 0x6f970c00,
- 0x3fe4b6fd, 0xed4c541c, 0x3cef7115, 0x27e8a400, 0x3fe47a15,
- 0xf94d60aa, 0xbd22cb6a, 0xf2f92400, 0x3fe43d9f, 0x481051f7,
- 0xbcfd984f, 0x2125cc00, 0x3fe4019c, 0x30f0c74c, 0xbd26ce79,
- 0x0c36c000, 0x3fe3c608, 0x7cfe13c2, 0xbd02b736, 0x17197800,
- 0x3fe38ae2, 0xbb5569a4, 0xbd218b7a, 0xad9d8c00, 0x3fe35028,
- 0x9527e6ac, 0x3d10b83f, 0x44340800, 0x3fe315da, 0xc5a0ed9c,
- 0xbd274e93, 0x57b0e000, 0x3fe2dbf5, 0x07b9dc11, 0xbd17a6e5,
- 0x6d0ec000, 0x3fe2a278, 0xe797882d, 0x3d206d2b, 0x1134dc00,
- 0x3fe26962, 0x05226250, 0xbd0b61f1, 0xd8bebc00, 0x3fe230b0,
- 0x6e48667b, 0x3d12fc06, 0x5fc61800, 0x3fe1f863, 0xc9fe81d3,
- 0xbd2a7242, 0x49ae6000, 0x3fe1c078, 0xed70e667, 0x3cccacde,
- 0x40f23c00, 0x3fe188ee, 0xf8ab4650, 0x3d14cc4e, 0xf6f29800,
- 0x3fe151c3, 0xa293ae49, 0xbd2edd97, 0x23c75c00, 0x3fe11af8,
- 0xbb9ddcb2, 0xbd258647, 0x8611cc00, 0x3fe0e489, 0x07801742,
- 0x3d1c2998, 0xe2d05400, 0x3fe0ae76, 0x887e7e27, 0x3d1f486b,
- 0x0533c400, 0x3fe078bf, 0x41edf5fd, 0x3d268122, 0xbe760400,
- 0x3fe04360, 0xe79539e0, 0xbd04c45f, 0xe5b20800, 0x3fe00e5a,
- 0xb1727b1c, 0xbd053ba3, 0xaf7a4800, 0x3fdfb358, 0x3c164935,
- 0x3d0085fa, 0xee031800, 0x3fdf4aa7, 0x6f014a8b, 0x3d12cde5,
- 0x56b41000, 0x3fdee2a1, 0x5a470251, 0x3d2f27f4, 0xc3ddb000,
- 0x3fde7b42, 0x5372bd08, 0xbd246550, 0x1a272800, 0x3fde148a,
- 0x07322938, 0xbd1326b2, 0x484c9800, 0x3fddae75, 0x60dc616a,
- 0xbd1ea42d, 0x46def800, 0x3fdd4902, 0xe9a767a8, 0x3d235baf,
- 0x18064800, 0x3fdce42f, 0x3ec7a6b0, 0xbd0797c3, 0xc7455800,
- 0x3fdc7ff9, 0xc15249ae, 0xbd29b6dd, 0x693fa000, 0x3fdc1c60,
- 0x7fe8e180, 0x3d2cec80, 0x1b80e000, 0x3fdbb961, 0xf40a666d,
- 0x3d27d85b, 0x04462800, 0x3fdb56fa, 0x2d841995, 0x3d109525,
- 0x5248d000, 0x3fdaf529, 0x52774458, 0xbd217cc5, 0x3c8ad800,
- 0x3fda93ed, 0xbea77a5d, 0x3d1e36f2, 0x0224f800, 0x3fda3344,
- 0x7f9d79f5, 0x3d23c645, 0xea15f000, 0x3fd9d32b, 0x10d0c0b0,
- 0xbd26279e, 0x43135800, 0x3fd973a3, 0xa502d9f0, 0xbd152313,
- 0x635bf800, 0x3fd914a8, 0x2ee6307d, 0xbd1766b5, 0xa88b3000,
- 0x3fd8b639, 0xe5e70470, 0xbd205ae1, 0x776dc800, 0x3fd85855,
- 0x3333778a, 0x3d2fd56f, 0x3bd81800, 0x3fd7fafa, 0xc812566a,
- 0xbd272090, 0x687cf800, 0x3fd79e26, 0x2efd1778, 0x3d29ec7d,
- 0x76c67800, 0x3fd741d8, 0x49dc60b3, 0x3d2d8b09, 0xe6af1800,
- 0x3fd6e60e, 0x7c222d87, 0x3d172165, 0x3e9c6800, 0x3fd68ac8,
- 0x2756eba0, 0x3d20a0d3, 0x0b3ab000, 0x3fd63003, 0xe731ae00,
- 0xbd2db623, 0xdf596000, 0x3fd5d5bd, 0x08a465dc, 0xbd0a0b2a,
- 0x53c8d000, 0x3fd57bf7, 0xee5d40ef, 0x3d1faded, 0x0738a000,
- 0x3fd522ae, 0x8164c759, 0x3d2ebe70, 0x9e173000, 0x3fd4c9e0,
- 0x1b0ad8a4, 0xbd2e2089, 0xc271c800, 0x3fd4718d, 0x0967d675,
- 0xbd2f27ce, 0x23d5e800, 0x3fd419b4, 0xec90e09d, 0x3d08e436,
- 0x77333000, 0x3fd3c252, 0xb606bd5c, 0x3d183b54, 0x76be1000,
- 0x3fd36b67, 0xb0f177c8, 0x3d116ecd, 0xe1d36000, 0x3fd314f1,
- 0xd3213cb8, 0xbd28e27a, 0x7cdc9000, 0x3fd2bef0, 0x4a5004f4,
- 0x3d2a9cfa, 0x1134d800, 0x3fd26962, 0xdf5bb3b6, 0x3d2c93c1,
- 0x6d0eb800, 0x3fd21445, 0xba46baea, 0x3d0a87de, 0x635a6800,
- 0x3fd1bf99, 0x5147bdb7, 0x3d2ca6ed, 0xcbacf800, 0x3fd16b5c,
- 0xf7a51681, 0x3d2b9acd, 0x8227e800, 0x3fd1178e, 0x63a5f01c,
- 0xbd2c210e, 0x67616000, 0x3fd0c42d, 0x163ceae9, 0x3d27188b,
- 0x604d5800, 0x3fd07138, 0x16ed4e91, 0x3cf89cdb, 0x5626c800,
- 0x3fd01eae, 0x1485e94a, 0xbd16f08c, 0x6cb3b000, 0x3fcf991c,
- 0xca0cdf30, 0x3d1bcbec, 0xe4dd0000, 0x3fcef5ad, 0x65bb8e11,
- 0xbcca2115, 0xffe71000, 0x3fce530e, 0x6041f430, 0x3cc21227,
- 0xb0d49000, 0x3fcdb13d, 0xf715b035, 0xbd2aff2a, 0xf2656000,
- 0x3fcd1037, 0x75b6f6e4, 0xbd084a7e, 0xc6f01000, 0x3fcc6ffb,
- 0xc5962bd2, 0xbcf1ec72, 0x383be000, 0x3fcbd087, 0x595412b6,
- 0xbd2d4bc4, 0x575bd000, 0x3fcb31d8, 0x4eace1aa, 0xbd0c358d,
- 0x3c8ae000, 0x3fca93ed, 0x50562169, 0xbd287243, 0x07089000,
- 0x3fc9f6c4, 0x6865817a, 0x3d29904d, 0xdcf70000, 0x3fc95a5a,
- 0x58a0ff6f, 0x3d07f228, 0xeb390000, 0x3fc8beaf, 0xaae92cd1,
- 0xbd073d54, 0x6551a000, 0x3fc823c1, 0x9a631e83, 0x3d1e0ddb,
- 0x85445000, 0x3fc7898d, 0x70914305, 0xbd1c6610, 0x8b757000,
- 0x3fc6f012, 0xe59c21e1, 0xbd25118d, 0xbe8c1000, 0x3fc6574e,
- 0x2c3c2e78, 0x3d19cf8b, 0x6b544000, 0x3fc5bf40, 0xeb68981c,
- 0xbd127023, 0xe4a1b000, 0x3fc527e5, 0xe5697dc7, 0x3d2633e8,
- 0x8333b000, 0x3fc4913d, 0x54fdb678, 0x3d258379, 0xa5993000,
- 0x3fc3fb45, 0x7e6a354d, 0xbd2cd1d8, 0xb0159000, 0x3fc365fc,
- 0x234b7289, 0x3cc62fa8, 0x0c868000, 0x3fc2d161, 0xcb81b4a1,
- 0x3d039d6c, 0x2a49c000, 0x3fc23d71, 0x8fd3df5c, 0x3d100d23,
- 0x7e23f000, 0x3fc1aa2b, 0x44389934, 0x3d2ca78e, 0x8227e000,
- 0x3fc1178e, 0xce2d07f2, 0x3d21ef78, 0xb59e4000, 0x3fc08598,
- 0x7009902c, 0xbd27e5dd, 0x39dbe000, 0x3fbfe891, 0x4fa10afd,
- 0xbd2534d6, 0x830a2000, 0x3fbec739, 0xafe645e0, 0xbd2dc068,
- 0x63844000, 0x3fbda727, 0x1fa71733, 0x3d1a8940, 0x01bc4000,
- 0x3fbc8858, 0xc65aacd3, 0x3d2646d1, 0x8dad6000, 0x3fbb6ac8,
- 0x2bf768e5, 0xbd139080, 0x40b1c000, 0x3fba4e76, 0xb94407c8,
- 0xbd0e42b6, 0x5d594000, 0x3fb9335e, 0x3abd47da, 0x3d23115c,
- 0x2f40e000, 0x3fb8197e, 0xf96ffdf7, 0x3d0f80dc, 0x0aeac000,
- 0x3fb700d3, 0xa99ded32, 0x3cec1e8d, 0x4d97a000, 0x3fb5e95a,
- 0x3c5d1d1e, 0xbd2c6906, 0x5d208000, 0x3fb4d311, 0x82f4e1ef,
- 0xbcf53a25, 0xa7d1e000, 0x3fb3bdf5, 0xa5db4ed7, 0x3d2cc85e,
- 0xa4472000, 0x3fb2aa04, 0xae9c697d, 0xbd20b6e8, 0xd1466000,
- 0x3fb1973b, 0x560d9e9b, 0xbd25325d, 0xb59e4000, 0x3fb08598,
- 0x7009902c, 0xbd17e5dd, 0xc006c000, 0x3faeea31, 0x4fc93b7b,
- 0xbd0e113e, 0xcdddc000, 0x3faccb73, 0x47d82807, 0xbd1a68f2,
- 0xd0fb0000, 0x3faaaef2, 0x353bb42e, 0x3d20fc1a, 0x149fc000,
- 0x3fa894aa, 0xd05a267d, 0xbd197995, 0xf2d4c000, 0x3fa67c94,
- 0xec19afa2, 0xbd029efb, 0xd42e0000, 0x3fa466ae, 0x75bdfd28,
- 0xbd2c1673, 0x2f8d0000, 0x3fa252f3, 0xe021b67b, 0x3d283e9a,
- 0x89e74000, 0x3fa0415d, 0x5cf1d753, 0x3d0111c0, 0xec148000,
- 0x3f9c63d2, 0x3f9eb2f3, 0x3d2578c6, 0x28c90000, 0x3f984925,
- 0x325a0c34, 0xbd2aa0ba, 0x25980000, 0x3f9432a9, 0x928637fe,
- 0x3d098139, 0x58938000, 0x3f902056, 0x06e2f7d2, 0xbd23dc5b,
- 0xa3890000, 0x3f882448, 0xda74f640, 0xbd275577, 0x75890000,
- 0x3f801015, 0x999d2be8, 0xbd10c76b, 0x59580000, 0x3f700805,
- 0xcb31c67b, 0x3d2166af, 0x00000000, 0x00000000, 0x00000000,
- 0x80000000
- };
-
- private static int[] logTwoData = {
- 0xfefa3800, 0x3fa62e42, 0x93c76730, 0x3ceef357
- };
-
- private static int[] coeffLogTwoData = {
- 0x92492492, 0x3fc24924, 0x00000000, 0xbfd00000, 0x3d6fb175,
- 0xbfc5555e, 0x55555555, 0x3fd55555, 0x9999999a, 0x3fc99999,
- 0x00000000, 0xbfe00000
- };
-
- /*
- * Copyright (c) 2014, 2016, Intel Corporation. All rights reserved. Intel Math Library (LIBM)
- * Source Code
- *
- * ALGORITHM DESCRIPTION - LOG() ---------------------
- *
- * x=2^k * mx, mx in [1,2)
- *
- * Get B~1/mx based on the output of rcpps instruction (B0) B = int((B0*2^7+0.5))/2^7
- *
- * Reduced argument: r=B*mx-1.0 (computed accurately in high and low parts)
- *
- * Result: k*log(2) - log(B) + p(r) if |x-1| >= small value (2^-6) and p(r) is a degree 7
- * polynomial -log(B) read from data table (high, low parts) Result is formed from high and low
- * parts.
- *
- * Special cases: log(NaN) = quiet NaN, and raise invalid exception log(+INF) = that INF log(0)
- * = -INF with divide-by-zero exception raised log(1) = +0 log(x) = NaN with invalid exception
- * raised if x < -0, including -INF
- *
- */
-
- public void logIntrinsic(Register dest, Register value, CompilationResultBuilder crb, AMD64MacroAssembler masm) {
- ArrayDataPointerConstant logTwoTablePtr = new ArrayDataPointerConstant(logTwoTable, 16);
- ArrayDataPointerConstant logTwoDataPtr = new ArrayDataPointerConstant(logTwoData, 16);
- ArrayDataPointerConstant coeffLogTwoDataPtr = new ArrayDataPointerConstant(coeffLogTwoData, 16);
-
- Label bb0 = new Label();
- Label bb1 = new Label();
- Label bb2 = new Label();
- Label bb3 = new Label();
- Label bb4 = new Label();
- Label bb5 = new Label();
- Label bb6 = new Label();
- Label bb7 = new Label();
- Label bb8 = new Label();
-
- Register gpr1 = asRegister(gpr1Temp, AMD64Kind.QWORD);
- Register gpr2 = asRegister(gpr2Temp, AMD64Kind.QWORD);
- Register gpr3 = asRegister(rcxTemp, AMD64Kind.QWORD);
- Register gpr4 = asRegister(gpr4Temp, AMD64Kind.QWORD);
-
- Register temp1 = asRegister(xmm1Temp, AMD64Kind.DOUBLE);
- Register temp2 = asRegister(xmm2Temp, AMD64Kind.DOUBLE);
- Register temp3 = asRegister(xmm3Temp, AMD64Kind.DOUBLE);
- Register temp4 = asRegister(xmm4Temp, AMD64Kind.DOUBLE);
- Register temp5 = asRegister(xmm5Temp, AMD64Kind.DOUBLE);
- Register temp6 = asRegister(xmm6Temp, AMD64Kind.DOUBLE);
- Register temp7 = asRegister(xmm7Temp, AMD64Kind.DOUBLE);
-
- AMD64Address stackSlot = (AMD64Address) crb.asAddress(stackTemp);
-
- setCrb(crb);
- masm.movdq(stackSlot, value);
- if (dest.encoding != value.encoding) {
- masm.movdqu(dest, value);
- }
- masm.movq(gpr1, 0x3ff0000000000000L);
- masm.movdq(temp2, gpr1);
- masm.movq(gpr3, 0x77f0000000000000L);
- masm.movdq(temp3, gpr3);
- masm.movl(gpr2, 32768);
- masm.movdl(temp4, gpr2);
- masm.movq(gpr2, 0xffffe00000000000L);
- masm.movdq(temp5, gpr2);
- masm.movdqu(temp1, value);
- masm.pextrw(gpr1, dest, 3);
- masm.por(dest, temp2);
- masm.movl(gpr2, 16352);
- masm.psrlq(dest, 27);
- masm.leaq(gpr4, externalAddress(logTwoTablePtr));
- masm.psrld(dest, 2);
- masm.rcpps(dest, dest);
- masm.psllq(temp1, 12);
- masm.pshufd(temp6, temp5, 0xE4);
- masm.psrlq(temp1, 12);
- masm.subl(gpr1, 16);
- masm.cmpl(gpr1, 32736);
- masm.jcc(ConditionFlag.AboveEqual, bb0);
-
- masm.bind(bb1);
- masm.paddd(dest, temp4);
- masm.por(temp1, temp3);
- masm.movdl(gpr3, dest);
- masm.psllq(dest, 29);
- masm.pand(temp5, temp1);
- masm.pand(dest, temp6);
- masm.subsd(temp1, temp5);
- masm.mulpd(temp5, dest);
- masm.andl(gpr1, 32752);
- masm.subl(gpr1, gpr2);
- masm.cvtsi2sdl(temp7, gpr1);
- masm.mulsd(temp1, dest);
- masm.movdq(temp6, externalAddress(logTwoDataPtr)); // 0xfefa3800,
- // 0x3fa62e42
- masm.movdqu(temp3, externalAddress(coeffLogTwoDataPtr)); // 0x92492492,
- // 0x3fc24924,
- // 0x00000000,
- // 0xbfd00000
- masm.subsd(temp5, temp2);
- masm.andl(gpr3, 16711680);
- masm.shrl(gpr3, 12);
- masm.movdqu(dest, new AMD64Address(gpr4, gpr3, Scale.Times1, 0));
- masm.leaq(gpr4, externalAddress(coeffLogTwoDataPtr));
- masm.movdqu(temp4, new AMD64Address(gpr4, 16)); // 0x3d6fb175,
- // 0xbfc5555e,
- // 0x55555555,
- // 0x3fd55555
- masm.addsd(temp1, temp5);
- masm.movdqu(temp2, new AMD64Address(gpr4, 32)); // 0x9999999a,
- // 0x3fc99999,
- // 0x00000000,
- // 0xbfe00000
- masm.mulsd(temp6, temp7);
- if (masm.supports(CPUFeature.SSE3)) {
- masm.movddup(temp5, temp1);
- } else {
- masm.movdqu(temp5, temp1);
- masm.movlhps(temp5, temp5);
- }
- masm.leaq(gpr4, externalAddress(logTwoDataPtr));
- masm.mulsd(temp7, new AMD64Address(gpr4, 8)); // 0x93c76730,
- // 0x3ceef357
- masm.mulsd(temp3, temp1);
- masm.addsd(dest, temp6);
- masm.mulpd(temp4, temp5);
- masm.mulpd(temp5, temp5);
- if (masm.supports(CPUFeature.SSE3)) {
- masm.movddup(temp6, dest);
- } else {
- masm.movdqu(temp6, dest);
- masm.movlhps(temp6, temp6);
- }
- masm.addsd(dest, temp1);
- masm.addpd(temp4, temp2);
- masm.mulpd(temp3, temp5);
- masm.subsd(temp6, dest);
- masm.mulsd(temp4, temp1);
- masm.pshufd(temp2, dest, 0xEE);
- masm.addsd(temp1, temp6);
- masm.mulsd(temp5, temp5);
- masm.addsd(temp7, temp2);
- masm.addpd(temp4, temp3);
- masm.addsd(temp1, temp7);
- masm.mulpd(temp4, temp5);
- masm.addsd(temp1, temp4);
- masm.pshufd(temp5, temp4, 0xEE);
- masm.addsd(temp1, temp5);
- masm.addsd(dest, temp1);
- masm.jmp(bb8);
-
- masm.bind(bb0);
- masm.movdq(dest, stackSlot);
- masm.movdq(temp1, stackSlot);
- masm.addl(gpr1, 16);
- masm.cmpl(gpr1, 32768);
- masm.jcc(ConditionFlag.AboveEqual, bb2);
-
- masm.cmpl(gpr1, 16);
- masm.jcc(ConditionFlag.Below, bb3);
-
- masm.bind(bb4);
- masm.addsd(dest, dest);
- masm.jmp(bb8);
-
- masm.bind(bb5);
- masm.jcc(ConditionFlag.Above, bb4);
-
- masm.cmpl(gpr3, 0);
- masm.jcc(ConditionFlag.Above, bb4);
-
- masm.jmp(bb6);
-
- masm.bind(bb3);
- masm.xorpd(temp1, temp1);
- masm.addsd(temp1, dest);
- masm.movdl(gpr3, temp1);
- masm.psrlq(temp1, 32);
- masm.movdl(gpr2, temp1);
- masm.orl(gpr3, gpr2);
- masm.cmpl(gpr3, 0);
- masm.jcc(ConditionFlag.Equal, bb7);
-
- masm.xorpd(temp1, temp1);
- masm.movl(gpr1, 18416);
- masm.pinsrw(temp1, gpr1, 3);
- masm.mulsd(dest, temp1);
- masm.movdqu(temp1, dest);
- masm.pextrw(gpr1, dest, 3);
- masm.por(dest, temp2);
- masm.psrlq(dest, 27);
- masm.movl(gpr2, 18416);
- masm.psrld(dest, 2);
- masm.rcpps(dest, dest);
- masm.psllq(temp1, 12);
- masm.pshufd(temp6, temp5, 0xE4);
- masm.psrlq(temp1, 12);
- masm.jmp(bb1);
-
- masm.bind(bb2);
- masm.movdl(gpr3, temp1);
- masm.psrlq(temp1, 32);
- masm.movdl(gpr2, temp1);
- masm.addl(gpr2, gpr2);
- masm.cmpl(gpr2, -2097152);
- masm.jcc(ConditionFlag.AboveEqual, bb5);
-
- masm.orl(gpr3, gpr2);
- masm.cmpl(gpr3, 0);
- masm.jcc(ConditionFlag.Equal, bb7);
-
- masm.bind(bb6);
- masm.xorpd(temp1, temp1);
- masm.xorpd(dest, dest);
- masm.movl(gpr1, 32752);
- masm.pinsrw(temp1, gpr1, 3);
- masm.mulsd(dest, temp1);
- masm.jmp(bb8);
-
- masm.bind(bb7);
- masm.xorpd(temp1, temp1);
- masm.xorpd(dest, dest);
- masm.movl(gpr1, 49136);
- masm.pinsrw(dest, gpr1, 3);
- masm.divsd(dest, temp1);
-
- masm.bind(bb8);
- }
-
- private static int[] highmaskLogTen = {
- 0xf8000000, 0xffffffff, 0x00000000, 0xffffe000
- };
-
- private static int[] logTenE = {
- 0x00000000, 0x3fdbc000, 0xbf2e4108, 0x3f5a7a6c
- };
-
- private static int[] logTenTable = {
- 0x509f7800, 0x3fd34413, 0x1f12b358, 0x3d1fef31, 0x80333400,
- 0x3fd32418, 0xc671d9d0, 0xbcf542bf, 0x51195000, 0x3fd30442,
- 0x78a4b0c3, 0x3d18216a, 0x6fc79400, 0x3fd2e490, 0x80fa389d,
- 0xbc902869, 0x89d04000, 0x3fd2c502, 0x75c2f564, 0x3d040754,
- 0x4ddd1c00, 0x3fd2a598, 0xd219b2c3, 0xbcfa1d84, 0x6baa7c00,
- 0x3fd28651, 0xfd9abec1, 0x3d1be6d3, 0x94028800, 0x3fd2672d,
- 0xe289a455, 0xbd1ede5e, 0x78b86400, 0x3fd2482c, 0x6734d179,
- 0x3d1fe79b, 0xcca3c800, 0x3fd2294d, 0x981a40b8, 0xbced34ea,
- 0x439c5000, 0x3fd20a91, 0xcc392737, 0xbd1a9cc3, 0x92752c00,
- 0x3fd1ebf6, 0x03c9afe7, 0x3d1e98f8, 0x6ef8dc00, 0x3fd1cd7d,
- 0x71dae7f4, 0x3d08a86c, 0x8fe4dc00, 0x3fd1af25, 0xee9185a1,
- 0xbcff3412, 0xace59400, 0x3fd190ee, 0xc2cab353, 0x3cf17ed9,
- 0x7e925000, 0x3fd172d8, 0x6952c1b2, 0x3cf1521c, 0xbe694400,
- 0x3fd154e2, 0xcacb79ca, 0xbd0bdc78, 0x26cbac00, 0x3fd1370d,
- 0xf71f4de1, 0xbd01f8be, 0x72fa0800, 0x3fd11957, 0x55bf910b,
- 0x3c946e2b, 0x5f106000, 0x3fd0fbc1, 0x39e639c1, 0x3d14a84b,
- 0xa802a800, 0x3fd0de4a, 0xd3f31d5d, 0xbd178385, 0x0b992000,
- 0x3fd0c0f3, 0x3843106f, 0xbd1f602f, 0x486ce800, 0x3fd0a3ba,
- 0x8819497c, 0x3cef987a, 0x1de49400, 0x3fd086a0, 0x1caa0467,
- 0x3d0faec7, 0x4c30cc00, 0x3fd069a4, 0xa4424372, 0xbd1618fc,
- 0x94490000, 0x3fd04cc6, 0x946517d2, 0xbd18384b, 0xb7e84000,
- 0x3fd03006, 0xe0109c37, 0xbd19a6ac, 0x798a0c00, 0x3fd01364,
- 0x5121e864, 0xbd164cf7, 0x38ce8000, 0x3fcfedbf, 0x46214d1a,
- 0xbcbbc402, 0xc8e62000, 0x3fcfb4ef, 0xdab93203, 0x3d1e0176,
- 0x2cb02800, 0x3fcf7c5a, 0x2a2ea8e4, 0xbcfec86a, 0xeeeaa000,
- 0x3fcf43fd, 0xc18e49a4, 0x3cf110a8, 0x9bb6e800, 0x3fcf0bda,
- 0x923cc9c0, 0xbd15ce99, 0xc093f000, 0x3fced3ef, 0x4d4b51e9,
- 0x3d1a04c7, 0xec58f800, 0x3fce9c3c, 0x163cad59, 0x3cac8260,
- 0x9a907000, 0x3fce2d7d, 0x3fa93646, 0x3ce4a1c0, 0x37311000,
- 0x3fcdbf99, 0x32abd1fd, 0x3d07ea9d, 0x6744b800, 0x3fcd528c,
- 0x4dcbdfd4, 0xbd1b08e2, 0xe36de800, 0x3fcce653, 0x0b7b7f7f,
- 0xbd1b8f03, 0x77506800, 0x3fcc7aec, 0xa821c9fb, 0x3d13c163,
- 0x00ff8800, 0x3fcc1053, 0x536bca76, 0xbd074ee5, 0x70719800,
- 0x3fcba684, 0xd7da9b6b, 0xbd1fbf16, 0xc6f8d800, 0x3fcb3d7d,
- 0xe2220bb3, 0x3d1a295d, 0x16c15800, 0x3fcad53c, 0xe724911e,
- 0xbcf55822, 0x82533800, 0x3fca6dbc, 0x6d982371, 0x3cac567c,
- 0x3c19e800, 0x3fca06fc, 0x84d17d80, 0x3d1da204, 0x85ef8000,
- 0x3fc9a0f8, 0x54466a6a, 0xbd002204, 0xb0ac2000, 0x3fc93bae,
- 0xd601fd65, 0x3d18840c, 0x1bb9b000, 0x3fc8d71c, 0x7bf58766,
- 0xbd14f897, 0x34aae800, 0x3fc8733e, 0x3af6ac24, 0xbd0f5c45,
- 0x76d68000, 0x3fc81012, 0x4303e1a1, 0xbd1f9a80, 0x6af57800,
- 0x3fc7ad96, 0x43fbcb46, 0x3cf4c33e, 0xa6c51000, 0x3fc74bc7,
- 0x70f0eac5, 0xbd192e3b, 0xccab9800, 0x3fc6eaa3, 0xc0093dfe,
- 0xbd0faf15, 0x8b60b800, 0x3fc68a28, 0xde78d5fd, 0xbc9ea4ee,
- 0x9d987000, 0x3fc62a53, 0x962bea6e, 0xbd194084, 0xc9b0e800,
- 0x3fc5cb22, 0x888dd999, 0x3d1fe201, 0xe1634800, 0x3fc56c93,
- 0x16ada7ad, 0x3d1b1188, 0xc176c000, 0x3fc50ea4, 0x4159b5b5,
- 0xbcf09c08, 0x51766000, 0x3fc4b153, 0x84393d23, 0xbcf6a89c,
- 0x83695000, 0x3fc4549d, 0x9f0b8bbb, 0x3d1c4b8c, 0x538d5800,
- 0x3fc3f881, 0xf49df747, 0x3cf89b99, 0xc8138000, 0x3fc39cfc,
- 0xd503b834, 0xbd13b99f, 0xf0df0800, 0x3fc3420d, 0xf011b386,
- 0xbd05d8be, 0xe7466800, 0x3fc2e7b2, 0xf39c7bc2, 0xbd1bb94e,
- 0xcdd62800, 0x3fc28de9, 0x05e6d69b, 0xbd10ed05, 0xd015d800,
- 0x3fc234b0, 0xe29b6c9d, 0xbd1ff967, 0x224ea800, 0x3fc1dc06,
- 0x727711fc, 0xbcffb30d, 0x01540000, 0x3fc183e8, 0x39786c5a,
- 0x3cc23f57, 0xb24d9800, 0x3fc12c54, 0xc905a342, 0x3d003a1d,
- 0x82835800, 0x3fc0d54a, 0x9b9920c0, 0x3d03b25a, 0xc72ac000,
- 0x3fc07ec7, 0x46f26a24, 0x3cf0fa41, 0xdd35d800, 0x3fc028ca,
- 0x41d9d6dc, 0x3d034a65, 0x52474000, 0x3fbfa6a4, 0x44f66449,
- 0x3d19cad3, 0x2da3d000, 0x3fbefcb8, 0x67832999, 0x3d18400f,
- 0x32a10000, 0x3fbe53ce, 0x9c0e3b1a, 0xbcff62fd, 0x556b7000,
- 0x3fbdabe3, 0x02976913, 0xbcf8243b, 0x97e88000, 0x3fbd04f4,
- 0xec793797, 0x3d1c0578, 0x09647000, 0x3fbc5eff, 0x05fc0565,
- 0xbd1d799e, 0xc6426000, 0x3fbbb9ff, 0x4625f5ed, 0x3d1f5723,
- 0xf7afd000, 0x3fbb15f3, 0xdd5aae61, 0xbd1a7e1e, 0xd358b000,
- 0x3fba72d8, 0x3314e4d3, 0x3d17bc91, 0x9b1f5000, 0x3fb9d0ab,
- 0x9a4d514b, 0x3cf18c9b, 0x9cd4e000, 0x3fb92f69, 0x7e4496ab,
- 0x3cf1f96d, 0x31f4f000, 0x3fb88f10, 0xf56479e7, 0x3d165818,
- 0xbf628000, 0x3fb7ef9c, 0x26bf486d, 0xbd1113a6, 0xb526b000,
- 0x3fb7510c, 0x1a1c3384, 0x3ca9898d, 0x8e31e000, 0x3fb6b35d,
- 0xb3875361, 0xbd0661ac, 0xd01de000, 0x3fb6168c, 0x2a7cacfa,
- 0xbd1bdf10, 0x0af23000, 0x3fb57a98, 0xff868816, 0x3cf046d0,
- 0xd8ea0000, 0x3fb4df7c, 0x1515fbe7, 0xbd1fd529, 0xde3b2000,
- 0x3fb44538, 0x6e59a132, 0x3d1faeee, 0xc8df9000, 0x3fb3abc9,
- 0xf1322361, 0xbd198807, 0x505f1000, 0x3fb3132d, 0x0888e6ab,
- 0x3d1e5380, 0x359bd000, 0x3fb27b61, 0xdfbcbb22, 0xbcfe2724,
- 0x429ee000, 0x3fb1e463, 0x6eb4c58c, 0xbcfe4dd6, 0x4a673000,
- 0x3fb14e31, 0x4ce1ac9b, 0x3d1ba691, 0x28b96000, 0x3fb0b8c9,
- 0x8c7813b8, 0xbd0b3872, 0xc1f08000, 0x3fb02428, 0xc2bc8c2c,
- 0x3cb5ea6b, 0x05a1a000, 0x3faf209c, 0x72e8f18e, 0xbce8df84,
- 0xc0b5e000, 0x3fadfa6d, 0x9fdef436, 0x3d087364, 0xaf416000,
- 0x3facd5c2, 0x1068c3a9, 0x3d0827e7, 0xdb356000, 0x3fabb296,
- 0x120a34d3, 0x3d101a9f, 0x5dfea000, 0x3faa90e6, 0xdaded264,
- 0xbd14c392, 0x6034c000, 0x3fa970ad, 0x1c9d06a9, 0xbd1b705e,
- 0x194c6000, 0x3fa851e8, 0x83996ad9, 0xbd0117bc, 0xcf4ac000,
- 0x3fa73492, 0xb1a94a62, 0xbca5ea42, 0xd67b4000, 0x3fa618a9,
- 0x75aed8ca, 0xbd07119b, 0x9126c000, 0x3fa4fe29, 0x5291d533,
- 0x3d12658f, 0x6f4d4000, 0x3fa3e50e, 0xcd2c5cd9, 0x3d1d5c70,
- 0xee608000, 0x3fa2cd54, 0xd1008489, 0x3d1a4802, 0x9900e000,
- 0x3fa1b6f9, 0x54fb5598, 0xbd16593f, 0x06bb6000, 0x3fa0a1f9,
- 0x64ef57b4, 0xbd17636b, 0xb7940000, 0x3f9f1c9f, 0xee6a4737,
- 0x3cb5d479, 0x91aa0000, 0x3f9cf7f5, 0x3a16373c, 0x3d087114,
- 0x156b8000, 0x3f9ad5ed, 0x836c554a, 0x3c6900b0, 0xd4764000,
- 0x3f98b67f, 0xed12f17b, 0xbcffc974, 0x77dec000, 0x3f9699a7,
- 0x232ce7ea, 0x3d1e35bb, 0xbfbf4000, 0x3f947f5d, 0xd84ffa6e,
- 0x3d0e0a49, 0x82c7c000, 0x3f92679c, 0x8d170e90, 0xbd14d9f2,
- 0xadd20000, 0x3f90525d, 0x86d9f88e, 0x3cdeb986, 0x86f10000,
- 0x3f8c7f36, 0xb9e0a517, 0x3ce29faa, 0xb75c8000, 0x3f885e9e,
- 0x542568cb, 0xbd1f7bdb, 0x46b30000, 0x3f8442e8, 0xb954e7d9,
- 0x3d1e5287, 0xb7e60000, 0x3f802c07, 0x22da0b17, 0xbd19fb27,
- 0x6c8b0000, 0x3f7833e3, 0x821271ef, 0xbd190f96, 0x29910000,
- 0x3f701936, 0xbc3491a5, 0xbd1bcf45, 0x354a0000, 0x3f600fe3,
- 0xc0ff520a, 0xbd19d71c, 0x00000000, 0x00000000, 0x00000000,
- 0x00000000
- };
-
- private static int[] logTwoLogTenData = {
- 0x509f7800, 0x3f934413, 0x1f12b358, 0x3cdfef31
- };
-
- private static int[] coeffLogTenData = {
- 0xc1a5f12e, 0x40358874, 0x64d4ef0d, 0xc0089309, 0x385593b1,
- 0xc025c917, 0xdc963467, 0x3ffc6a02, 0x7f9d3aa1, 0x4016ab9f,
- 0xdc77b115, 0xbff27af2
- };
-
- /*
- * Copyright (c) 2014, 2016, Intel Corporation. All rights reserved. Intel Math Library (LIBM)
- * Source Code
- *
- * ALGORITHM DESCRIPTION - LOG10() ---------------------
- *
- * Let x=2^k * mx, mx in [1,2)
- *
- * Get B~1/mx based on the output of rcpss instruction (B0) B = int((B0*LH*2^7+0.5))/2^7 LH is a
- * short approximation for log10(e)
- *
- * Reduced argument: r=B*mx-LH (computed accurately in high and low parts)
- *
- * Result: k*log10(2) - log(B) + p(r) p(r) is a degree 7 polynomial -log(B) read from data table
- * (high, low parts) Result is formed from high and low parts
- *
- * Special cases: log10(0) = -INF with divide-by-zero exception raised log10(1) = +0 log10(x) =
- * NaN with invalid exception raised if x < -0, including -INF log10(+INF) = +INF
- *
- */
-
- public void log10Intrinsic(Register dest, Register value, CompilationResultBuilder crb, AMD64MacroAssembler masm) {
- ArrayDataPointerConstant highmaskLogTenPtr = new ArrayDataPointerConstant(highmaskLogTen, 16);
- ArrayDataPointerConstant logTenEPtr = new ArrayDataPointerConstant(logTenE, 16);
- ArrayDataPointerConstant logTenTablePtr = new ArrayDataPointerConstant(logTenTable, 16);
- ArrayDataPointerConstant logTwoLogTenDataPtr = new ArrayDataPointerConstant(logTwoLogTenData, 16);
- ArrayDataPointerConstant coeffLogTenDataPtr = new ArrayDataPointerConstant(coeffLogTenData, 16);
-
- Label bb0 = new Label();
- Label bb1 = new Label();
- Label bb2 = new Label();
- Label bb3 = new Label();
- Label bb4 = new Label();
- Label bb5 = new Label();
- Label bb6 = new Label();
- Label bb7 = new Label();
- Label bb8 = new Label();
-
- Register gpr1 = asRegister(gpr1Temp, AMD64Kind.QWORD);
- Register gpr2 = asRegister(gpr2Temp, AMD64Kind.QWORD);
- Register gpr3 = asRegister(rcxTemp, AMD64Kind.QWORD);
- Register gpr4 = asRegister(gpr4Temp, AMD64Kind.QWORD);
-
- Register temp1 = asRegister(xmm1Temp, AMD64Kind.DOUBLE);
- Register temp2 = asRegister(xmm2Temp, AMD64Kind.DOUBLE);
- Register temp3 = asRegister(xmm3Temp, AMD64Kind.DOUBLE);
- Register temp4 = asRegister(xmm4Temp, AMD64Kind.DOUBLE);
- Register temp5 = asRegister(xmm5Temp, AMD64Kind.DOUBLE);
- Register temp6 = asRegister(xmm6Temp, AMD64Kind.DOUBLE);
- Register temp7 = asRegister(xmm7Temp, AMD64Kind.DOUBLE);
-
- AMD64Address stackSlot = (AMD64Address) crb.asAddress(stackTemp);
-
- setCrb(crb);
- masm.movdq(stackSlot, value);
- if (dest.encoding != value.encoding) {
- masm.movdqu(dest, value);
- }
- masm.movdqu(temp5, externalAddress(highmaskLogTenPtr)); // 0xf8000000,
- // 0xffffffff,
- // 0x00000000,
- // 0xffffe000
- masm.xorpd(temp2, temp2);
- masm.movl(gpr1, 16368);
- masm.pinsrw(temp2, gpr1, 3);
- masm.movl(gpr2, 1054736384);
- masm.movdl(temp7, gpr2);
- masm.xorpd(temp3, temp3);
- masm.movl(gpr3, 30704);
- masm.pinsrw(temp3, gpr3, 3);
- masm.movl(gpr3, 32768);
- masm.movdl(temp4, gpr3);
- masm.movdqu(temp1, value);
- masm.pextrw(gpr1, dest, 3);
- masm.por(dest, temp2);
- masm.movl(gpr2, 16352);
- masm.psrlq(dest, 27);
- masm.movdqu(temp2, externalAddress(logTenEPtr)); // 0x00000000,
- // 0x3fdbc000,
- // 0xbf2e4108,
- // 0x3f5a7a6c
- masm.psrld(dest, 2);
- masm.rcpps(dest, dest);
- masm.psllq(temp1, 12);
- masm.pshufd(temp6, temp5, 0x4E);
- masm.psrlq(temp1, 12);
- masm.subl(gpr1, 16);
- masm.cmpl(gpr1, 32736);
- masm.jcc(ConditionFlag.AboveEqual, bb0);
-
- masm.bind(bb1);
- masm.mulss(dest, temp7);
- masm.por(temp1, temp3);
- masm.andpd(temp5, temp1);
- masm.paddd(dest, temp4);
- masm.movdqu(temp3, externalAddress(coeffLogTenDataPtr)); // 0xc1a5f12e,
- // 0x40358874,
- // 0x64d4ef0d,
- // 0xc0089309
- masm.leaq(gpr4, externalAddress(coeffLogTenDataPtr));
- masm.movdqu(temp4, new AMD64Address(gpr4, 16)); // 0x385593b1,
- // 0xc025c917,
- // 0xdc963467,
- // 0x3ffc6a02
- masm.subsd(temp1, temp5);
- masm.movdl(gpr3, dest);
- masm.psllq(dest, 29);
- masm.andpd(dest, temp6);
- masm.movdq(temp6, externalAddress(logTwoLogTenDataPtr)); // 0x509f7800,
- // 0x3f934413
- masm.andl(gpr1, 32752);
- masm.subl(gpr1, gpr2);
- masm.cvtsi2sdl(temp7, gpr1);
- masm.mulpd(temp5, dest);
- masm.mulsd(temp1, dest);
- masm.subsd(temp5, temp2);
- masm.movdqu(temp2, new AMD64Address(gpr4, 32)); // 0x7f9d3aa1,
- // 0x4016ab9f,
- // 0xdc77b115,
- // 0xbff27af2
- masm.leaq(gpr4, externalAddress(logTenTablePtr));
- masm.andl(gpr3, 16711680);
- masm.shrl(gpr3, 12);
- masm.movdqu(dest, new AMD64Address(gpr4, gpr3, Scale.Times1, -1504));
- masm.addsd(temp1, temp5);
- masm.mulsd(temp6, temp7);
- masm.pshufd(temp5, temp1, 0x44);
- masm.leaq(gpr4, externalAddress(logTwoLogTenDataPtr));
- masm.mulsd(temp7, new AMD64Address(gpr4, 8)); // 0x1f12b358,
- // 0x3cdfef31
- masm.mulsd(temp3, temp1);
- masm.addsd(dest, temp6);
- masm.mulpd(temp4, temp5);
- masm.leaq(gpr4, externalAddress(logTenEPtr));
- masm.movdq(temp6, new AMD64Address(gpr4, 8)); // 0xbf2e4108,
- // 0x3f5a7a6c
- masm.mulpd(temp5, temp5);
- masm.addpd(temp4, temp2);
- masm.mulpd(temp3, temp5);
- masm.pshufd(temp2, dest, 0xE4);
- masm.addsd(dest, temp1);
- masm.mulsd(temp4, temp1);
- masm.subsd(temp2, dest);
- masm.mulsd(temp6, temp1);
- masm.addsd(temp1, temp2);
- masm.pshufd(temp2, dest, 0xEE);
- masm.mulsd(temp5, temp5);
- masm.addsd(temp7, temp2);
- masm.addsd(temp1, temp6);
- masm.addpd(temp4, temp3);
- masm.addsd(temp1, temp7);
- masm.mulpd(temp4, temp5);
- masm.addsd(temp1, temp4);
- masm.pshufd(temp5, temp4, 0xEE);
- masm.addsd(temp1, temp5);
- masm.addsd(dest, temp1);
- masm.jmp(bb8);
-
- masm.bind(bb0);
- masm.movdq(dest, stackSlot);
- masm.movdq(temp1, stackSlot);
- masm.addl(gpr1, 16);
- masm.cmpl(gpr1, 32768);
- masm.jcc(ConditionFlag.AboveEqual, bb2);
-
- masm.cmpl(gpr1, 16);
- masm.jcc(ConditionFlag.Below, bb3);
-
- masm.bind(bb4);
- masm.addsd(dest, dest);
- masm.jmp(bb8);
-
- masm.bind(bb5);
- masm.jcc(ConditionFlag.Above, bb4);
-
- masm.cmpl(gpr3, 0);
- masm.jcc(ConditionFlag.Above, bb4);
-
- masm.jmp(bb6);
-
- masm.bind(bb3);
- masm.xorpd(temp1, temp1);
- masm.addsd(temp1, dest);
- masm.movdl(gpr3, temp1);
- masm.psrlq(temp1, 32);
- masm.movdl(gpr2, temp1);
- masm.orl(gpr3, gpr2);
- masm.cmpl(gpr3, 0);
- masm.jcc(ConditionFlag.Equal, bb7);
-
- masm.xorpd(temp1, temp1);
- masm.xorpd(temp2, temp2);
- masm.movl(gpr1, 18416);
- masm.pinsrw(temp1, gpr1, 3);
- masm.mulsd(dest, temp1);
- masm.movl(gpr1, 16368);
- masm.pinsrw(temp2, gpr1, 3);
- masm.movdqu(temp1, dest);
- masm.pextrw(gpr1, dest, 3);
- masm.por(dest, temp2);
- masm.movl(gpr2, 18416);
- masm.psrlq(dest, 27);
- masm.movdqu(temp2, externalAddress(logTenEPtr)); // 0x00000000,
- // 0x3fdbc000,
- // 0xbf2e4108,
- // 0x3f5a7a6c
- masm.psrld(dest, 2);
- masm.rcpps(dest, dest);
- masm.psllq(temp1, 12);
- masm.pshufd(temp6, temp5, 0x4E);
- masm.psrlq(temp1, 12);
- masm.jmp(bb1);
-
- masm.bind(bb2);
- masm.movdl(gpr3, temp1);
- masm.psrlq(temp1, 32);
- masm.movdl(gpr2, temp1);
- masm.addl(gpr2, gpr2);
- masm.cmpl(gpr2, -2097152);
- masm.jcc(ConditionFlag.AboveEqual, bb5);
-
- masm.orl(gpr3, gpr2);
- masm.cmpl(gpr3, 0);
- masm.jcc(ConditionFlag.Equal, bb7);
-
- masm.bind(bb6);
- masm.xorpd(temp1, temp1);
- masm.xorpd(dest, dest);
- masm.movl(gpr1, 32752);
- masm.pinsrw(temp1, gpr1, 3);
- masm.mulsd(dest, temp1);
- masm.jmp(bb8);
+/**
+ * AMD64MathIntrinsicUnaryOp assumes that the input value is stored at the xmm0 register, and will
+ * emit the output value into the xmm0 register as well.
+ * {@link #emitLIRWrapper(LIRGeneratorTool, Value)} is provided for emitting necessary mov LIRs
+ * before and after this LIR instruction.
+ */
+public abstract class AMD64MathIntrinsicUnaryOp extends AMD64LIRInstruction {
- masm.bind(bb7);
- masm.xorpd(temp1, temp1);
- masm.xorpd(dest, dest);
- masm.movl(gpr1, 49136);
- masm.pinsrw(dest, gpr1, 3);
- masm.divsd(dest, temp1);
-
- masm.bind(bb8);
- }
-
- /*
- * Copyright (c) 2014, 2016, Intel Corporation. All rights reserved. Intel Math Library (LIBM)
- * Source Code
- *
- * ALGORITHM DESCRIPTION - SIN() ---------------------
- *
- * 1. RANGE REDUCTION
- *
- * We perform an initial range reduction from X to r with
- *
- * X =~= N * pi/32 + r
- *
- * so that |r| <= pi/64 + epsilon. We restrict inputs to those where |N| <= 932560. Beyond this,
- * the range reduction is insufficiently accurate. For extremely small inputs, denormalization
- * can occur internally, impacting performance. This means that the main path is actually only
- * taken for 2^-252 <= |X| < 90112.
- *
- * To avoid branches, we perform the range reduction to full accuracy each time.
- *
- * X - N * (P_1 + P_2 + P_3)
- *
- * where P_1 and P_2 are 32-bit numbers (so multiplication by N is exact) and P_3 is a 53-bit
- * number. Together, these approximate pi well enough for all cases in the restricted range.
- *
- * The main reduction sequence is:
- *
- * y = 32/pi * x N = integer(y) (computed by adding and subtracting off SHIFTER)
- *
- * m_1 = N * P_1 m_2 = N * P_2 r_1 = x - m_1 r = r_1 - m_2 (this r can be used for most of the
- * calculation)
- *
- * c_1 = r_1 - r m_3 = N * P_3 c_2 = c_1 - m_2 c = c_2 - m_3
- *
- * 2. MAIN ALGORITHM
- *
- * The algorithm uses a table lookup based on B = M * pi / 32 where M = N mod 64. The stored
- * values are: sigma closest power of 2 to cos(B) C_hl 53-bit cos(B) - sigma S_hi + S_lo 2 *
- * 53-bit sin(B)
- *
- * The computation is organized as follows:
- *
- * sin(B + r + c) = [sin(B) + sigma * r] + r * (cos(B) - sigma) + sin(B) * [cos(r + c) - 1] +
- * cos(B) * [sin(r + c) - r]
- *
- * which is approximately:
- *
- * [S_hi + sigma * r] + C_hl * r + S_lo + S_hi * [(cos(r) - 1) - r * c] + (C_hl + sigma) *
- * [(sin(r) - r) + c]
- *
- * and this is what is actually computed. We separate this sum into four parts:
- *
- * hi + med + pols + corr
- *
- * where
- *
- * hi = S_hi + sigma r med = C_hl * r pols = S_hi * (cos(r) - 1) + (C_hl + sigma) * (sin(r) - r)
- * corr = S_lo + c * ((C_hl + sigma) - S_hi * r)
- *
- * 3. POLYNOMIAL
- *
- * The polynomial S_hi * (cos(r) - 1) + (C_hl + sigma) * (sin(r) - r) can be rearranged freely,
- * since it is quite small, so we exploit parallelism to the fullest.
- *
- * psc4 = SC_4 * r_1 msc4 = psc4 * r r2 = r * r msc2 = SC_2 * r2 r4 = r2 * r2 psc3 = SC_3 + msc4
- * psc1 = SC_1 + msc2 msc3 = r4 * psc3 sincospols = psc1 + msc3 pols = sincospols * <S_hi * r^2
- * | (C_hl + sigma) * r^3>
- *
- * 4. CORRECTION TERM
- *
- * This is where the "c" component of the range reduction is taken into account; recall that
- * just "r" is used for most of the calculation.
- *
- * -c = m_3 - c_2 -d = S_hi * r - (C_hl + sigma) corr = -c * -d + S_lo
- *
- * 5. COMPENSATED SUMMATIONS
- *
- * The two successive compensated summations add up the high and medium parts, leaving just the
- * low parts to add up at the end.
- *
- * rs = sigma * r res_int = S_hi + rs k_0 = S_hi - res_int k_2 = k_0 + rs med = C_hl * r res_hi
- * = res_int + med k_1 = res_int - res_hi k_3 = k_1 + med
- *
- * 6. FINAL SUMMATION
- *
- * We now add up all the small parts:
- *
- * res_lo = pols(hi) + pols(lo) + corr + k_1 + k_3
- *
- * Now the overall result is just:
- *
- * res_hi + res_lo
- *
- * 7. SMALL ARGUMENTS
- *
- * If |x| < SNN (SNN meaning the smallest normal number), we simply perform 0.1111111 cdots 1111
- * * x. For SNN <= |x|, we do 2^-55 * (2^55 * x - x).
- *
- * Special cases: sin(NaN) = quiet NaN, and raise invalid exception sin(INF) = NaN and raise
- * invalid exception sin(+/-0) = +/-0
- *
- */
-
- public int[] oneHalf = {
- 0x00000000, 0x3fe00000, 0x00000000, 0x3fe00000
- };
-
- public int[] pTwo = {
- 0x1a600000, 0x3d90b461, 0x1a600000, 0x3d90b461
- };
-
- public int[] scFour = {
- 0xa556c734, 0x3ec71de3, 0x1a01a01a, 0x3efa01a0
- };
-
- public int[] cTable = {
- 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
- 0x00000000, 0x00000000, 0x3ff00000, 0x176d6d31, 0xbf73b92e,
- 0xbc29b42c, 0x3fb917a6, 0xe0000000, 0xbc3e2718, 0x00000000,
- 0x3ff00000, 0x011469fb, 0xbf93ad06, 0x3c69a60b, 0x3fc8f8b8,
- 0xc0000000, 0xbc626d19, 0x00000000, 0x3ff00000, 0x939d225a,
- 0xbfa60bea, 0x2ed59f06, 0x3fd29406, 0xa0000000, 0xbc75d28d,
- 0x00000000, 0x3ff00000, 0x866b95cf, 0xbfb37ca1, 0xa6aea963,
- 0x3fd87de2, 0xe0000000, 0xbc672ced, 0x00000000, 0x3ff00000,
- 0x73fa1279, 0xbfbe3a68, 0x3806f63b, 0x3fde2b5d, 0x20000000,
- 0x3c5e0d89, 0x00000000, 0x3ff00000, 0x5bc57974, 0xbfc59267,
- 0x39ae68c8, 0x3fe1c73b, 0x20000000, 0x3c8b25dd, 0x00000000,
- 0x3ff00000, 0x53aba2fd, 0xbfcd0dfe, 0x25091dd6, 0x3fe44cf3,
- 0x20000000, 0x3c68076a, 0x00000000, 0x3ff00000, 0x99fcef32,
- 0x3fca8279, 0x667f3bcd, 0x3fe6a09e, 0x20000000, 0xbc8bdd34,
- 0x00000000, 0x3fe00000, 0x94247758, 0x3fc133cc, 0x6b151741,
- 0x3fe8bc80, 0x20000000, 0xbc82c5e1, 0x00000000, 0x3fe00000,
- 0x9ae68c87, 0x3fac73b3, 0x290ea1a3, 0x3fea9b66, 0xe0000000,
- 0x3c39f630, 0x00000000, 0x3fe00000, 0x7f909c4e, 0xbf9d4a2c,
- 0xf180bdb1, 0x3fec38b2, 0x80000000, 0xbc76e0b1, 0x00000000,
- 0x3fe00000, 0x65455a75, 0xbfbe0875, 0xcf328d46, 0x3fed906b,
- 0x20000000, 0x3c7457e6, 0x00000000, 0x3fe00000, 0x76acf82d,
- 0x3fa4a031, 0x56c62dda, 0x3fee9f41, 0xe0000000, 0x3c8760b1,
- 0x00000000, 0x3fd00000, 0x0e5967d5, 0xbfac1d1f, 0xcff75cb0,
- 0x3fef6297, 0x20000000, 0x3c756217, 0x00000000, 0x3fd00000,
- 0x0f592f50, 0xbf9ba165, 0xa3d12526, 0x3fefd88d, 0x40000000,
- 0xbc887df6, 0x00000000, 0x3fc00000, 0x00000000, 0x00000000,
- 0x00000000, 0x3ff00000, 0x00000000, 0x00000000, 0x00000000,
- 0x00000000, 0x0f592f50, 0x3f9ba165, 0xa3d12526, 0x3fefd88d,
- 0x40000000, 0xbc887df6, 0x00000000, 0xbfc00000, 0x0e5967d5,
- 0x3fac1d1f, 0xcff75cb0, 0x3fef6297, 0x20000000, 0x3c756217,
- 0x00000000, 0xbfd00000, 0x76acf82d, 0xbfa4a031, 0x56c62dda,
- 0x3fee9f41, 0xe0000000, 0x3c8760b1, 0x00000000, 0xbfd00000,
- 0x65455a75, 0x3fbe0875, 0xcf328d46, 0x3fed906b, 0x20000000,
- 0x3c7457e6, 0x00000000, 0xbfe00000, 0x7f909c4e, 0x3f9d4a2c,
- 0xf180bdb1, 0x3fec38b2, 0x80000000, 0xbc76e0b1, 0x00000000,
- 0xbfe00000, 0x9ae68c87, 0xbfac73b3, 0x290ea1a3, 0x3fea9b66,
- 0xe0000000, 0x3c39f630, 0x00000000, 0xbfe00000, 0x94247758,
- 0xbfc133cc, 0x6b151741, 0x3fe8bc80, 0x20000000, 0xbc82c5e1,
- 0x00000000, 0xbfe00000, 0x99fcef32, 0xbfca8279, 0x667f3bcd,
- 0x3fe6a09e, 0x20000000, 0xbc8bdd34, 0x00000000, 0xbfe00000,
- 0x53aba2fd, 0x3fcd0dfe, 0x25091dd6, 0x3fe44cf3, 0x20000000,
- 0x3c68076a, 0x00000000, 0xbff00000, 0x5bc57974, 0x3fc59267,
- 0x39ae68c8, 0x3fe1c73b, 0x20000000, 0x3c8b25dd, 0x00000000,
- 0xbff00000, 0x73fa1279, 0x3fbe3a68, 0x3806f63b, 0x3fde2b5d,
- 0x20000000, 0x3c5e0d89, 0x00000000, 0xbff00000, 0x866b95cf,
- 0x3fb37ca1, 0xa6aea963, 0x3fd87de2, 0xe0000000, 0xbc672ced,
- 0x00000000, 0xbff00000, 0x939d225a, 0x3fa60bea, 0x2ed59f06,
- 0x3fd29406, 0xa0000000, 0xbc75d28d, 0x00000000, 0xbff00000,
- 0x011469fb, 0x3f93ad06, 0x3c69a60b, 0x3fc8f8b8, 0xc0000000,
- 0xbc626d19, 0x00000000, 0xbff00000, 0x176d6d31, 0x3f73b92e,
- 0xbc29b42c, 0x3fb917a6, 0xe0000000, 0xbc3e2718, 0x00000000,
- 0xbff00000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
- 0x00000000, 0x00000000, 0x00000000, 0xbff00000, 0x176d6d31,
- 0x3f73b92e, 0xbc29b42c, 0xbfb917a6, 0xe0000000, 0x3c3e2718,
- 0x00000000, 0xbff00000, 0x011469fb, 0x3f93ad06, 0x3c69a60b,
- 0xbfc8f8b8, 0xc0000000, 0x3c626d19, 0x00000000, 0xbff00000,
- 0x939d225a, 0x3fa60bea, 0x2ed59f06, 0xbfd29406, 0xa0000000,
- 0x3c75d28d, 0x00000000, 0xbff00000, 0x866b95cf, 0x3fb37ca1,
- 0xa6aea963, 0xbfd87de2, 0xe0000000, 0x3c672ced, 0x00000000,
- 0xbff00000, 0x73fa1279, 0x3fbe3a68, 0x3806f63b, 0xbfde2b5d,
- 0x20000000, 0xbc5e0d89, 0x00000000, 0xbff00000, 0x5bc57974,
- 0x3fc59267, 0x39ae68c8, 0xbfe1c73b, 0x20000000, 0xbc8b25dd,
- 0x00000000, 0xbff00000, 0x53aba2fd, 0x3fcd0dfe, 0x25091dd6,
- 0xbfe44cf3, 0x20000000, 0xbc68076a, 0x00000000, 0xbff00000,
- 0x99fcef32, 0xbfca8279, 0x667f3bcd, 0xbfe6a09e, 0x20000000,
- 0x3c8bdd34, 0x00000000, 0xbfe00000, 0x94247758, 0xbfc133cc,
- 0x6b151741, 0xbfe8bc80, 0x20000000, 0x3c82c5e1, 0x00000000,
- 0xbfe00000, 0x9ae68c87, 0xbfac73b3, 0x290ea1a3, 0xbfea9b66,
- 0xe0000000, 0xbc39f630, 0x00000000, 0xbfe00000, 0x7f909c4e,
- 0x3f9d4a2c, 0xf180bdb1, 0xbfec38b2, 0x80000000, 0x3c76e0b1,
- 0x00000000, 0xbfe00000, 0x65455a75, 0x3fbe0875, 0xcf328d46,
- 0xbfed906b, 0x20000000, 0xbc7457e6, 0x00000000, 0xbfe00000,
- 0x76acf82d, 0xbfa4a031, 0x56c62dda, 0xbfee9f41, 0xe0000000,
- 0xbc8760b1, 0x00000000, 0xbfd00000, 0x0e5967d5, 0x3fac1d1f,
- 0xcff75cb0, 0xbfef6297, 0x20000000, 0xbc756217, 0x00000000,
- 0xbfd00000, 0x0f592f50, 0x3f9ba165, 0xa3d12526, 0xbfefd88d,
- 0x40000000, 0x3c887df6, 0x00000000, 0xbfc00000, 0x00000000,
- 0x00000000, 0x00000000, 0xbff00000, 0x00000000, 0x00000000,
- 0x00000000, 0x00000000, 0x0f592f50, 0xbf9ba165, 0xa3d12526,
- 0xbfefd88d, 0x40000000, 0x3c887df6, 0x00000000, 0x3fc00000,
- 0x0e5967d5, 0xbfac1d1f, 0xcff75cb0, 0xbfef6297, 0x20000000,
- 0xbc756217, 0x00000000, 0x3fd00000, 0x76acf82d, 0x3fa4a031,
- 0x56c62dda, 0xbfee9f41, 0xe0000000, 0xbc8760b1, 0x00000000,
- 0x3fd00000, 0x65455a75, 0xbfbe0875, 0xcf328d46, 0xbfed906b,
- 0x20000000, 0xbc7457e6, 0x00000000, 0x3fe00000, 0x7f909c4e,
- 0xbf9d4a2c, 0xf180bdb1, 0xbfec38b2, 0x80000000, 0x3c76e0b1,
- 0x00000000, 0x3fe00000, 0x9ae68c87, 0x3fac73b3, 0x290ea1a3,
- 0xbfea9b66, 0xe0000000, 0xbc39f630, 0x00000000, 0x3fe00000,
- 0x94247758, 0x3fc133cc, 0x6b151741, 0xbfe8bc80, 0x20000000,
- 0x3c82c5e1, 0x00000000, 0x3fe00000, 0x99fcef32, 0x3fca8279,
- 0x667f3bcd, 0xbfe6a09e, 0x20000000, 0x3c8bdd34, 0x00000000,
- 0x3fe00000, 0x53aba2fd, 0xbfcd0dfe, 0x25091dd6, 0xbfe44cf3,
- 0x20000000, 0xbc68076a, 0x00000000, 0x3ff00000, 0x5bc57974,
- 0xbfc59267, 0x39ae68c8, 0xbfe1c73b, 0x20000000, 0xbc8b25dd,
- 0x00000000, 0x3ff00000, 0x73fa1279, 0xbfbe3a68, 0x3806f63b,
- 0xbfde2b5d, 0x20000000, 0xbc5e0d89, 0x00000000, 0x3ff00000,
- 0x866b95cf, 0xbfb37ca1, 0xa6aea963, 0xbfd87de2, 0xe0000000,
- 0x3c672ced, 0x00000000, 0x3ff00000, 0x939d225a, 0xbfa60bea,
- 0x2ed59f06, 0xbfd29406, 0xa0000000, 0x3c75d28d, 0x00000000,
- 0x3ff00000, 0x011469fb, 0xbf93ad06, 0x3c69a60b, 0xbfc8f8b8,
- 0xc0000000, 0x3c626d19, 0x00000000, 0x3ff00000, 0x176d6d31,
- 0xbf73b92e, 0xbc29b42c, 0xbfb917a6, 0xe0000000, 0x3c3e2718,
- 0x00000000, 0x3ff00000
- };
-
- public int[] scTwo = {
- 0x11111111, 0x3f811111, 0x55555555, 0x3fa55555
- };
-
- public int[] scThree = {
- 0x1a01a01a, 0xbf2a01a0, 0x16c16c17, 0xbf56c16c
- };
-
- public int[] scOne = {
- 0x55555555, 0xbfc55555, 0x00000000, 0xbfe00000
- };
-
- public int[] piInvTable = {
- 0x00000000, 0x00000000, 0xa2f9836e, 0x4e441529, 0xfc2757d1,
- 0xf534ddc0, 0xdb629599, 0x3c439041, 0xfe5163ab, 0xdebbc561,
- 0xb7246e3a, 0x424dd2e0, 0x06492eea, 0x09d1921c, 0xfe1deb1c,
- 0xb129a73e, 0xe88235f5, 0x2ebb4484, 0xe99c7026, 0xb45f7e41,
- 0x3991d639, 0x835339f4, 0x9c845f8b, 0xbdf9283b, 0x1ff897ff,
- 0xde05980f, 0xef2f118b, 0x5a0a6d1f, 0x6d367ecf, 0x27cb09b7,
- 0x4f463f66, 0x9e5fea2d, 0x7527bac7, 0xebe5f17b, 0x3d0739f7,
- 0x8a5292ea, 0x6bfb5fb1, 0x1f8d5d08, 0x56033046, 0xfc7b6bab,
- 0xf0cfbc21
- };
-
- public int[] piFour = {
- 0x40000000, 0x3fe921fb, 0x18469899, 0x3e64442d
- };
-
- public int[] piThirtyTwoInv = {
- 0x6dc9c883, 0x40245f30
- };
-
- public int[] shifter = {
- 0x00000000, 0x43380000
- };
-
- public int[] signMask = {
- 0x00000000, 0x80000000
- };
-
- public int[] pThree = {
- 0x2e037073, 0x3b63198a
- };
-
- public int[] allOnes = {
- 0xffffffff, 0x3fefffff
- };
-
- public int[] twoPowFiftyFive = {
- 0x00000000, 0x43600000
- };
-
- public int[] twoPowFiftyFiveM = {
- 0x00000000, 0x3c800000
- };
-
- public int[] pOne = {
- 0x54400000, 0x3fb921fb
- };
-
- public void sinIntrinsic(Register dest, Register value, CompilationResultBuilder crb, AMD64MacroAssembler masm) {
- ArrayDataPointerConstant oneHalfPtr = new ArrayDataPointerConstant(oneHalf, 16);
- ArrayDataPointerConstant pTwoPtr = new ArrayDataPointerConstant(pTwo, 16);
- ArrayDataPointerConstant scFourPtr = new ArrayDataPointerConstant(scFour, 16);
- ArrayDataPointerConstant cTablePtr = new ArrayDataPointerConstant(cTable, 16);
- ArrayDataPointerConstant scTwoPtr = new ArrayDataPointerConstant(scTwo, 16);
- ArrayDataPointerConstant scThreePtr = new ArrayDataPointerConstant(scThree, 16);
- ArrayDataPointerConstant scOnePtr = new ArrayDataPointerConstant(scOne, 16);
- ArrayDataPointerConstant piInvTablePtr = new ArrayDataPointerConstant(piInvTable, 16);
- ArrayDataPointerConstant piFourPtr = new ArrayDataPointerConstant(piFour, 16);
- ArrayDataPointerConstant piThirtyTwoInvPtr = new ArrayDataPointerConstant(piThirtyTwoInv, 8);
- ArrayDataPointerConstant shifterPtr = new ArrayDataPointerConstant(shifter, 8);
- ArrayDataPointerConstant signMaskPtr = new ArrayDataPointerConstant(signMask, 8);
- ArrayDataPointerConstant pThreePtr = new ArrayDataPointerConstant(pThree, 8);
- ArrayDataPointerConstant allOnesPtr = new ArrayDataPointerConstant(allOnes, 8);
- ArrayDataPointerConstant twoPowFiftyFivePtr = new ArrayDataPointerConstant(twoPowFiftyFive, 8);
- ArrayDataPointerConstant twoPowFiftyFiveMPtr = new ArrayDataPointerConstant(twoPowFiftyFiveM, 8);
- ArrayDataPointerConstant pOnePtr = new ArrayDataPointerConstant(pOne, 8);
-
- Label bb0 = new Label();
- Label bb1 = new Label();
- Label bb2 = new Label();
- Label bb4 = new Label();
- Label bb5 = new Label();
- Label bb6 = new Label();
- Label bb8 = new Label();
- Label bb9 = new Label();
- Label bb10 = new Label();
- Label bb11 = new Label();
- Label bb12 = new Label();
- Label bb13 = new Label();
- Label bb14 = new Label();
- Label bb15 = new Label();
-
- Register gpr1 = asRegister(gpr1Temp, AMD64Kind.QWORD);
- Register gpr2 = asRegister(gpr2Temp, AMD64Kind.QWORD);
- Register gpr3 = asRegister(rcxTemp, AMD64Kind.QWORD);
- Register gpr4 = asRegister(gpr4Temp, AMD64Kind.QWORD);
- Register gpr5 = asRegister(gpr5Temp, AMD64Kind.QWORD);
- Register gpr6 = asRegister(gpr6Temp, AMD64Kind.QWORD);
- Register gpr7 = asRegister(gpr7Temp, AMD64Kind.QWORD);
- Register gpr8 = asRegister(gpr8Temp, AMD64Kind.QWORD);
- Register gpr9 = asRegister(gpr9Temp, AMD64Kind.QWORD);
- Register gpr10 = asRegister(gpr10Temp, AMD64Kind.QWORD);
-
- Register temp1 = asRegister(xmm1Temp, AMD64Kind.DOUBLE);
- Register temp2 = asRegister(xmm2Temp, AMD64Kind.DOUBLE);
- Register temp3 = asRegister(xmm3Temp, AMD64Kind.DOUBLE);
- Register temp4 = asRegister(xmm4Temp, AMD64Kind.DOUBLE);
- Register temp5 = asRegister(xmm5Temp, AMD64Kind.DOUBLE);
- Register temp6 = asRegister(xmm6Temp, AMD64Kind.DOUBLE);
- Register temp7 = asRegister(xmm7Temp, AMD64Kind.DOUBLE);
- Register temp8 = asRegister(xmm8Temp, AMD64Kind.DOUBLE);
- Register temp9 = asRegister(xmm9Temp, AMD64Kind.DOUBLE);
-
- AMD64Address stackSlot = (AMD64Address) crb.asAddress(stackTemp);
-
- setCrb(crb);
- masm.movsd(stackSlot, value);
- if (dest.encoding != value.encoding) {
- masm.movdqu(dest, value);
- }
-
- masm.leaq(gpr1, stackSlot);
- masm.movl(gpr1, new AMD64Address(gpr1, 4));
- masm.movdq(temp1, externalAddress(piThirtyTwoInvPtr)); // 0x6dc9c883,
- // 0x40245f30
- masm.movdq(temp2, externalAddress(shifterPtr)); // 0x00000000,
- // 0x43380000
-
- masm.andl(gpr1, 2147418112);
- masm.subl(gpr1, 808452096);
- masm.cmpl(gpr1, 281346048);
- masm.jcc(ConditionFlag.Above, bb0);
+ @Def protected Value output;
+ @Use protected Value input;
+ @Temp protected Value[] temps;
- masm.mulsd(temp1, dest);
- masm.movdqu(temp5, externalAddress(oneHalfPtr)); // 0x00000000,
- // 0x3fe00000,
- // 0x00000000,
- // 0x3fe00000
- masm.movdq(temp4, externalAddress(signMaskPtr)); // 0x00000000,
- // 0x80000000
- masm.pand(temp4, dest);
- masm.por(temp5, temp4);
- masm.addpd(temp1, temp5);
- masm.cvttsd2sil(gpr4, temp1);
- masm.cvtsi2sdl(temp1, gpr4);
- masm.movdqu(temp6, externalAddress(pTwoPtr)); // 0x1a600000,
- // 0x3d90b461,
- // 0x1a600000,
- // 0x3d90b461
- masm.movq(gpr7, 0x3fb921fb54400000L);
- masm.movdq(temp3, gpr7);
- masm.movdqu(temp5, externalAddress(scFourPtr)); // 0xa556c734,
- // 0x3ec71de3,
- // 0x1a01a01a,
- // 0x3efa01a0
- masm.pshufd(temp4, dest, 0x44);
- masm.mulsd(temp3, temp1);
- if (masm.supports(CPUFeature.SSE3)) {
- masm.movddup(temp1, temp1);
- } else {
- masm.movlhps(temp1, temp1);
- }
- masm.andl(gpr4, 63);
- masm.shll(gpr4, 5);
- masm.leaq(gpr1, externalAddress(cTablePtr));
- masm.addq(gpr1, gpr4);
- masm.movdqu(temp8, new AMD64Address(gpr1, 0));
- masm.mulpd(temp6, temp1);
- masm.mulsd(temp1, externalAddress(pThreePtr)); // 0x2e037073,
- // 0x3b63198a
- masm.subsd(temp4, temp3);
- masm.subsd(dest, temp3);
- if (masm.supports(CPUFeature.SSE3)) {
- masm.movddup(temp3, temp4);
- } else {
- masm.movdqu(temp3, temp4);
- masm.movlhps(temp3, temp3);
- }
- masm.subsd(temp4, temp6);
- masm.pshufd(dest, dest, 0x44);
- masm.pshufd(temp7, temp8, 0xE);
- masm.movdqu(temp2, temp8);
- masm.movdqu(temp9, temp7);
- masm.mulpd(temp5, dest);
- masm.subpd(dest, temp6);
- masm.mulsd(temp7, temp4);
- masm.subsd(temp3, temp4);
- masm.mulpd(temp5, dest);
- masm.mulpd(dest, dest);
- masm.subsd(temp3, temp6);
- masm.movdqu(temp6, externalAddress(scTwoPtr)); // 0x11111111,
- // 0x3f811111,
- // 0x55555555,
- // 0x3fa55555
- masm.subsd(temp1, temp3);
- masm.movdq(temp3, new AMD64Address(gpr1, 24));
- masm.addsd(temp2, temp3);
- masm.subsd(temp7, temp2);
- masm.mulsd(temp2, temp4);
- masm.mulpd(temp6, dest);
- masm.mulsd(temp3, temp4);
- masm.mulpd(temp2, dest);
- masm.mulpd(dest, dest);
- masm.addpd(temp5, externalAddress(scThreePtr)); // 0x1a01a01a,
- // 0xbf2a01a0,
- // 0x16c16c17,
- // 0xbf56c16c
- masm.mulsd(temp4, temp8);
- masm.addpd(temp6, externalAddress(scOnePtr)); // 0x55555555,
- // 0xbfc55555,
- // 0x00000000,
- // 0xbfe00000
- masm.mulpd(temp5, dest);
- masm.movdqu(dest, temp3);
- masm.addsd(temp3, temp9);
- masm.mulpd(temp1, temp7);
- masm.movdqu(temp7, temp4);
- masm.addsd(temp4, temp3);
- masm.addpd(temp6, temp5);
- masm.subsd(temp9, temp3);
- masm.subsd(temp3, temp4);
- masm.addsd(temp1, new AMD64Address(gpr1, 16));
- masm.mulpd(temp6, temp2);
- masm.addsd(temp9, dest);
- masm.addsd(temp3, temp7);
- masm.addsd(temp1, temp9);
- masm.addsd(temp1, temp3);
- masm.addsd(temp1, temp6);
- masm.unpckhpd(temp6, temp6);
- masm.movdqu(dest, temp4);
- masm.addsd(temp1, temp6);
- masm.addsd(dest, temp1);
- masm.jmp(bb15);
-
- masm.bind(bb14);
- masm.xorpd(temp1, temp1);
- masm.xorpd(dest, dest);
- masm.divsd(dest, temp1);
- masm.jmp(bb15);
-
- masm.bind(bb0);
- masm.jcc(ConditionFlag.Greater, bb1);
-
- masm.shrl(gpr1, 20);
- masm.cmpl(gpr1, 3325);
- masm.jcc(ConditionFlag.NotEqual, bb2);
-
- masm.mulsd(dest, externalAddress(allOnesPtr)); // 0xffffffff,
- // 0x3fefffff
- masm.jmp(bb15);
-
- masm.bind(bb2);
- masm.movdq(temp3, externalAddress(twoPowFiftyFivePtr)); // 0x00000000,
- // 0x43600000
- masm.mulsd(temp3, dest);
- masm.subsd(temp3, dest);
- masm.mulsd(temp3, externalAddress(twoPowFiftyFiveMPtr)); // 0x00000000,
- // 0x3c800000
- masm.jmp(bb15);
-
- masm.bind(bb1);
- masm.pextrw(gpr3, dest, 3);
- masm.andl(gpr3, 32752);
- masm.cmpl(gpr3, 32752);
- masm.jcc(ConditionFlag.Equal, bb14);
-
- masm.subl(gpr3, 16224);
- masm.shrl(gpr3, 7);
- masm.andl(gpr3, 65532);
- masm.leaq(gpr10, externalAddress(piInvTablePtr));
- masm.addq(gpr3, gpr10);
- masm.movdq(gpr1, dest);
- masm.movl(gpr9, new AMD64Address(gpr3, 20));
- masm.movl(gpr7, new AMD64Address(gpr3, 24));
- masm.movl(gpr4, gpr1);
- masm.shrq(gpr1, 21);
- masm.orl(gpr1, Integer.MIN_VALUE);
- masm.shrl(gpr1, 11);
- masm.movl(gpr8, gpr9);
- masm.imulq(gpr9, gpr4);
- masm.imulq(gpr8, gpr1);
- masm.imulq(gpr7, gpr1);
- masm.movl(gpr5, new AMD64Address(gpr3, 16));
- masm.movl(gpr6, new AMD64Address(gpr3, 12));
- masm.movl(gpr10, gpr9);
- masm.shrq(gpr9, 32);
- masm.addq(gpr8, gpr9);
- masm.addq(gpr10, gpr7);
- masm.movl(gpr7, gpr10);
- masm.shrq(gpr10, 32);
- masm.addq(gpr8, gpr10);
- masm.movl(gpr9, gpr5);
- masm.imulq(gpr5, gpr4);
- masm.imulq(gpr9, gpr1);
- masm.movl(gpr10, gpr6);
- masm.imulq(gpr6, gpr4);
- masm.movl(gpr2, gpr5);
- masm.shrq(gpr5, 32);
- masm.addq(gpr8, gpr2);
- masm.movl(gpr2, gpr8);
- masm.shrq(gpr8, 32);
- masm.addq(gpr9, gpr5);
- masm.addq(gpr9, gpr8);
- masm.shlq(gpr2, 32);
- masm.orq(gpr7, gpr2);
- masm.imulq(gpr10, gpr1);
- masm.movl(gpr8, new AMD64Address(gpr3, 8));
- masm.movl(gpr5, new AMD64Address(gpr3, 4));
- masm.movl(gpr2, gpr6);
- masm.shrq(gpr6, 32);
- masm.addq(gpr9, gpr2);
- masm.movl(gpr2, gpr9);
- masm.shrq(gpr9, 32);
- masm.addq(gpr10, gpr6);
- masm.addq(gpr10, gpr9);
- masm.movq(gpr6, gpr8);
- masm.imulq(gpr8, gpr4);
- masm.imulq(gpr6, gpr1);
- masm.movl(gpr9, gpr8);
- masm.shrq(gpr8, 32);
- masm.addq(gpr10, gpr9);
- masm.movl(gpr9, gpr10);
- masm.shrq(gpr10, 32);
- masm.addq(gpr6, gpr8);
- masm.addq(gpr6, gpr10);
- masm.movq(gpr8, gpr5);
- masm.imulq(gpr5, gpr4);
- masm.imulq(gpr8, gpr1);
- masm.shlq(gpr9, 32);
- masm.orq(gpr9, gpr2);
- masm.movl(gpr1, new AMD64Address(gpr3, 0));
- masm.movl(gpr10, gpr5);
- masm.shrq(gpr5, 32);
- masm.addq(gpr6, gpr10);
- masm.movl(gpr10, gpr6);
- masm.shrq(gpr6, 32);
- masm.addq(gpr8, gpr5);
- masm.addq(gpr8, gpr6);
- masm.imulq(gpr4, gpr1);
- masm.pextrw(gpr2, dest, 3);
- masm.leaq(gpr6, externalAddress(piInvTablePtr));
- masm.subq(gpr3, gpr6);
- masm.addl(gpr3, gpr3);
- masm.addl(gpr3, gpr3);
- masm.addl(gpr3, gpr3);
- masm.addl(gpr3, 19);
- masm.movl(gpr5, 32768);
- masm.andl(gpr5, gpr2);
- masm.shrl(gpr2, 4);
- masm.andl(gpr2, 2047);
- masm.subl(gpr2, 1023);
- masm.subl(gpr3, gpr2);
- masm.addq(gpr8, gpr4);
- masm.movl(gpr4, gpr3);
- masm.addl(gpr4, 32);
- masm.cmpl(gpr3, 1);
- masm.jcc(ConditionFlag.Less, bb4);
-
- masm.negl(gpr3);
- masm.addl(gpr3, 29);
- masm.shll(gpr8);
- masm.movl(gpr6, gpr8);
- masm.andl(gpr8, 536870911);
- masm.testl(gpr8, 268435456);
- masm.jcc(ConditionFlag.NotEqual, bb5);
-
- masm.shrl(gpr8);
- masm.movl(gpr2, 0);
- masm.shlq(gpr8, 32);
- masm.orq(gpr8, gpr10);
-
- masm.bind(bb6);
+ public AMD64MathIntrinsicUnaryOp(LIRInstructionClass<? extends AMD64MathIntrinsicUnaryOp> type, Register... registers) {
+ super(type);
- masm.cmpq(gpr8, 0);
- masm.jcc(ConditionFlag.Equal, bb8);
-
- masm.bind(bb9);
- masm.bsrq(gpr10, gpr8);
- masm.movl(gpr3, 29);
- masm.subl(gpr3, gpr10);
- masm.jcc(ConditionFlag.LessEqual, bb10);
-
- masm.shlq(gpr8);
- masm.movq(gpr1, gpr9);
- masm.shlq(gpr9);
- masm.addl(gpr4, gpr3);
- masm.negl(gpr3);
- masm.addl(gpr3, 64);
- masm.shrq(gpr1);
- masm.shrq(gpr7);
- masm.orq(gpr8, gpr1);
- masm.orq(gpr9, gpr7);
-
- masm.bind(bb11);
- masm.cvtsi2sdq(dest, gpr8);
- masm.shrq(gpr9, 1);
- masm.cvtsi2sdq(temp3, gpr9);
- masm.xorpd(temp4, temp4);
- masm.shll(gpr4, 4);
- masm.negl(gpr4);
- masm.addl(gpr4, 16368);
- masm.orl(gpr4, gpr5);
- masm.xorl(gpr4, gpr2);
- masm.pinsrw(temp4, gpr4, 3);
- masm.leaq(gpr1, externalAddress(piFourPtr));
- masm.movdqu(temp2, new AMD64Address(gpr1, 0)); // 0x40000000,
- // 0x3fe921fb,
- // 0x18469899,
- // 0x3e64442d
- masm.xorpd(temp5, temp5);
- masm.subl(gpr4, 1008);
- masm.pinsrw(temp5, gpr4, 3);
- masm.mulsd(dest, temp4);
- masm.shll(gpr5, 16);
- masm.sarl(gpr5, 31);
- masm.mulsd(temp3, temp5);
- masm.movdqu(temp1, dest);
- masm.pshufd(temp6, temp2, 0xE);
- masm.mulsd(dest, temp2);
- masm.shrl(gpr6, 29);
- masm.addsd(temp1, temp3);
- masm.mulsd(temp3, temp2);
- masm.addl(gpr6, gpr5);
- masm.xorl(gpr6, gpr5);
- masm.mulsd(temp6, temp1);
- masm.movl(gpr1, gpr6);
- masm.addsd(temp6, temp3);
- masm.movdqu(temp2, dest);
- masm.addsd(dest, temp6);
- masm.subsd(temp2, dest);
- masm.addsd(temp6, temp2);
+ input = xmm0.asValue(LIRKind.value(AMD64Kind.DOUBLE));
+ output = xmm0.asValue(LIRKind.value(AMD64Kind.DOUBLE));
- masm.bind(bb12);
- masm.movdq(temp1, externalAddress(piThirtyTwoInvPtr)); // 0x6dc9c883,
- // 0x40245f30
- masm.mulsd(temp1, dest);
- masm.movdq(temp5, externalAddress(oneHalfPtr)); // 0x00000000,
- // 0x3fe00000,
- // 0x00000000,
- // 0x3fe00000
- masm.movdq(temp4, externalAddress(signMaskPtr)); // 0x00000000,
- // 0x80000000
- masm.pand(temp4, dest);
- masm.por(temp5, temp4);
- masm.addpd(temp1, temp5);
- masm.cvttsd2sil(gpr4, temp1);
- masm.cvtsi2sdl(temp1, gpr4);
- masm.movdq(temp3, externalAddress(pOnePtr)); // 0x54400000,
- // 0x3fb921fb
- masm.movdqu(temp2, externalAddress(pTwoPtr)); // 0x1a600000,
- // 0x3d90b461,
- // 0x1a600000,
- // 0x3d90b461
- masm.mulsd(temp3, temp1);
- masm.unpcklpd(temp1, temp1);
- masm.shll(gpr1, 3);
- masm.addl(gpr4, 1865216);
- masm.movdqu(temp4, dest);
- masm.addl(gpr4, gpr1);
- masm.andl(gpr4, 63);
- masm.movdqu(temp5, externalAddress(scFourPtr)); // 0x54400000,
- // 0x3fb921fb
- masm.leaq(gpr1, externalAddress(cTablePtr));
- masm.shll(gpr4, 5);
- masm.addq(gpr1, gpr4);
- masm.movdqu(temp8, new AMD64Address(gpr1, 0));
- masm.mulpd(temp2, temp1);
- masm.subsd(dest, temp3);
- masm.mulsd(temp1, externalAddress(pThreePtr)); // 0x2e037073,
- // 0x3b63198a
- masm.subsd(temp4, temp3);
- masm.unpcklpd(dest, dest);
- masm.movdqu(temp3, temp4);
- masm.subsd(temp4, temp2);
- masm.mulpd(temp5, dest);
- masm.subpd(dest, temp2);
- masm.pshufd(temp7, temp8, 0xE);
- masm.movdqu(temp9, temp7);
- masm.mulsd(temp7, temp4);
- masm.subsd(temp3, temp4);
- masm.mulpd(temp5, dest);
- masm.mulpd(dest, dest);
- masm.subsd(temp3, temp2);
- masm.movdqu(temp2, temp8);
- masm.subsd(temp1, temp3);
- masm.movdq(temp3, new AMD64Address(gpr1, 24));
- masm.addsd(temp2, temp3);
- masm.subsd(temp7, temp2);
- masm.subsd(temp1, temp6);
- masm.movdqu(temp6, externalAddress(scTwoPtr)); // 0x11111111,
- // 0x3f811111,
- // 0x55555555,
- // 0x3fa55555
- masm.mulsd(temp2, temp4);
- masm.mulpd(temp6, dest);
- masm.mulsd(temp3, temp4);
- masm.mulpd(temp2, dest);
- masm.mulpd(dest, dest);
- masm.addpd(temp5, externalAddress(scThreePtr)); // 0x1a01a01a,
- // 0xbf2a01a0,
- // 0x16c16c17,
- // 0xbf56c16c
- masm.mulsd(temp4, temp8);
- masm.addpd(temp6, externalAddress(scOnePtr)); // 0x55555555,
- // 0xbfc55555,
- // 0x00000000,
- // 0xbfe00000
- masm.mulpd(temp5, dest);
- masm.movdqu(dest, temp3);
- masm.addsd(temp3, temp9);
- masm.mulpd(temp1, temp7);
- masm.movdqu(temp7, temp4);
- masm.addsd(temp4, temp3);
- masm.addpd(temp6, temp5);
- masm.subsd(temp9, temp3);
- masm.subsd(temp3, temp4);
- masm.addsd(temp1, new AMD64Address(gpr1, 16));
- masm.mulpd(temp6, temp2);
- masm.addsd(temp9, dest);
- masm.addsd(temp3, temp7);
- masm.addsd(temp1, temp9);
- masm.addsd(temp1, temp3);
- masm.addsd(temp1, temp6);
- masm.unpckhpd(temp6, temp6);
- masm.movdqu(dest, temp4);
- masm.addsd(temp1, temp6);
- masm.addsd(dest, temp1);
- masm.jmp(bb15);
-
- masm.bind(bb8);
- masm.addl(gpr4, 64);
- masm.movq(gpr8, gpr9);
- masm.movq(gpr9, gpr7);
- masm.movl(gpr7, 0);
- masm.cmpq(gpr8, 0);
- masm.jcc(ConditionFlag.NotEqual, bb9);
-
- masm.addl(gpr4, 64);
- masm.movq(gpr8, gpr9);
- masm.movq(gpr9, gpr7);
- masm.cmpq(gpr8, 0);
- masm.jcc(ConditionFlag.NotEqual, bb9);
-
- masm.xorpd(dest, dest);
- masm.xorpd(temp6, temp6);
- masm.jmp(bb12);
-
- masm.bind(bb10);
- masm.jcc(ConditionFlag.Equal, bb11);
-
- masm.negl(gpr3);
- masm.shrq(gpr9);
- masm.movq(gpr1, gpr8);
- masm.shrq(gpr8);
- masm.subl(gpr4, gpr3);
- masm.negl(gpr3);
- masm.addl(gpr3, 64);
- masm.shlq(gpr1);
- masm.orq(gpr9, gpr1);
- masm.jmp(bb11);
-
- masm.bind(bb4);
- masm.negl(gpr3);
- masm.shlq(gpr8, 32);
- masm.orq(gpr8, gpr10);
- masm.shlq(gpr8);
- masm.movq(gpr6, gpr8);
- masm.testl(gpr8, Integer.MIN_VALUE);
- masm.jcc(ConditionFlag.NotEqual, bb13);
-
- masm.shrl(gpr8);
- masm.movl(gpr2, 0);
- masm.shrq(gpr6, 3);
- masm.jmp(bb6);
-
- masm.bind(bb5);
- masm.shrl(gpr8);
- masm.movl(gpr2, 536870912);
- masm.shrl(gpr2);
- masm.shlq(gpr8, 32);
- masm.orq(gpr8, gpr10);
- masm.shlq(gpr2, 32);
- masm.addl(gpr6, 536870912);
- masm.movl(gpr3, 0);
- masm.movl(gpr10, 0);
- masm.subq(gpr3, gpr7);
- masm.sbbq(gpr10, gpr9);
- masm.sbbq(gpr2, gpr8);
- masm.movq(gpr7, gpr3);
- masm.movq(gpr9, gpr10);
- masm.movq(gpr8, gpr2);
- masm.movl(gpr2, 32768);
- masm.jmp(bb6);
-
- masm.bind(bb13);
- masm.shrl(gpr8);
- masm.movq(gpr2, 0x100000000L);
- masm.shrq(gpr2);
- masm.movl(gpr3, 0);
- masm.movl(gpr10, 0);
- masm.subq(gpr3, gpr7);
- masm.sbbq(gpr10, gpr9);
- masm.sbbq(gpr2, gpr8);
- masm.movq(gpr7, gpr3);
- masm.movq(gpr9, gpr10);
- masm.movq(gpr8, gpr2);
- masm.movl(gpr2, 32768);
- masm.shrq(gpr6, 3);
- masm.addl(gpr6, 536870912);
- masm.jmp(bb6);
-
- masm.bind(bb15);
+ temps = registersToValues(registers);
}
- /*
- * Copyright (c) 2014, 2016, Intel Corporation. All rights reserved. Intel Math Library (LIBM)
- * Source Code
- *
- * ALGORITHM DESCRIPTION - COS() ---------------------
- *
- * 1. RANGE REDUCTION
- *
- * We perform an initial range reduction from X to r with
- *
- * X =~= N * pi/32 + r
- *
- * so that |r| <= pi/64 + epsilon. We restrict inputs to those where |N| <= 932560. Beyond this,
- * the range reduction is insufficiently accurate. For extremely small inputs, denormalization
- * can occur internally, impacting performance. This means that the main path is actually only
- * taken for 2^-252 <= |X| < 90112.
- *
- * To avoid branches, we perform the range reduction to full accuracy each time.
- *
- * X - N * (P_1 + P_2 + P_3)
- *
- * where P_1 and P_2 are 32-bit numbers (so multiplication by N is exact) and P_3 is a 53-bit
- * number. Together, these approximate pi well enough for all cases in the restricted range.
- *
- * The main reduction sequence is:
- *
- * y = 32/pi * x N = integer(y) (computed by adding and subtracting off SHIFTER)
- *
- * m_1 = N * P_1 m_2 = N * P_2 r_1 = x - m_1 r = r_1 - m_2 (this r can be used for most of the
- * calculation)
- *
- * c_1 = r_1 - r m_3 = N * P_3 c_2 = c_1 - m_2 c = c_2 - m_3
- *
- * 2. MAIN ALGORITHM
- *
- * The algorithm uses a table lookup based on B = M * pi / 32 where M = N mod 64. The stored
- * values are: sigma closest power of 2 to cos(B) C_hl 53-bit cos(B) - sigma S_hi + S_lo 2 *
- * 53-bit sin(B)
- *
- * The computation is organized as follows:
- *
- * sin(B + r + c) = [sin(B) + sigma * r] + r * (cos(B) - sigma) + sin(B) * [cos(r + c) - 1] +
- * cos(B) * [sin(r + c) - r]
- *
- * which is approximately:
- *
- * [S_hi + sigma * r] + C_hl * r + S_lo + S_hi * [(cos(r) - 1) - r * c] + (C_hl + sigma) *
- * [(sin(r) - r) + c]
- *
- * and this is what is actually computed. We separate this sum into four parts:
- *
- * hi + med + pols + corr
- *
- * where
- *
- * hi = S_hi + sigma r med = C_hl * r pols = S_hi * (cos(r) - 1) + (C_hl + sigma) * (sin(r) - r)
- * corr = S_lo + c * ((C_hl + sigma) - S_hi * r)
- *
- * 3. POLYNOMIAL
- *
- * The polynomial S_hi * (cos(r) - 1) + (C_hl + sigma) * (sin(r) - r) can be rearranged freely,
- * since it is quite small, so we exploit parallelism to the fullest.
- *
- * psc4 = SC_4 * r_1 msc4 = psc4 * r r2 = r * r msc2 = SC_2 * r2 r4 = r2 * r2 psc3 = SC_3 + msc4
- * psc1 = SC_1 + msc2 msc3 = r4 * psc3 sincospols = psc1 + msc3 pols = sincospols * <S_hi * r^2
- * | (C_hl + sigma) * r^3>
- *
- * 4. CORRECTION TERM
- *
- * This is where the "c" component of the range reduction is taken into account; recall that
- * just "r" is used for most of the calculation.
- *
- * -c = m_3 - c_2 -d = S_hi * r - (C_hl + sigma) corr = -c * -d + S_lo
- *
- * 5. COMPENSATED SUMMATIONS
- *
- * The two successive compensated summations add up the high and medium parts, leaving just the
- * low parts to add up at the end.
- *
- * rs = sigma * r res_int = S_hi + rs k_0 = S_hi - res_int k_2 = k_0 + rs med = C_hl * r res_hi
- * = res_int + med k_1 = res_int - res_hi k_3 = k_1 + med
- *
- * 6. FINAL SUMMATION
- *
- * We now add up all the small parts:
- *
- * res_lo = pols(hi) + pols(lo) + corr + k_1 + k_3
- *
- * Now the overall result is just:
- *
- * res_hi + res_lo
- *
- * 7. SMALL ARGUMENTS
- *
- * Inputs with |X| < 2^-252 are treated specially as 1 - |x|.
- *
- * Special cases: cos(NaN) = quiet NaN, and raise invalid exception cos(INF) = NaN and raise
- * invalid exception cos(0) = 1
- *
- */
-
- public int[] one = {
- 0x00000000, 0x3ff00000
- };
-
- public void cosIntrinsic(Register dest, Register value, CompilationResultBuilder crb, AMD64MacroAssembler masm) {
- ArrayDataPointerConstant oneHalfPtr = new ArrayDataPointerConstant(oneHalf, 16);
- ArrayDataPointerConstant pTwoPtr = new ArrayDataPointerConstant(pTwo, 16);
- ArrayDataPointerConstant scFourPtr = new ArrayDataPointerConstant(scFour, 16);
- ArrayDataPointerConstant cTablePtr = new ArrayDataPointerConstant(cTable, 16);
- ArrayDataPointerConstant scTwoPtr = new ArrayDataPointerConstant(scTwo, 16);
- ArrayDataPointerConstant scThreePtr = new ArrayDataPointerConstant(scThree, 16);
- ArrayDataPointerConstant scOnePtr = new ArrayDataPointerConstant(scOne, 16);
- ArrayDataPointerConstant piInvTablePtr = new ArrayDataPointerConstant(piInvTable, 16);
- ArrayDataPointerConstant piFourPtr = new ArrayDataPointerConstant(piFour, 16);
- ArrayDataPointerConstant piThirtyTwoInvPtr = new ArrayDataPointerConstant(piThirtyTwoInv, 8);
- ArrayDataPointerConstant signMaskPtr = new ArrayDataPointerConstant(signMask, 8);
- ArrayDataPointerConstant pThreePtr = new ArrayDataPointerConstant(pThree, 8);
- ArrayDataPointerConstant pOnePtr = new ArrayDataPointerConstant(pOne, 8);
- ArrayDataPointerConstant onePtr = new ArrayDataPointerConstant(one, 8);
-
- Label bb0 = new Label();
- Label bb1 = new Label();
- Label bb3 = new Label();
- Label bb4 = new Label();
- Label bb5 = new Label();
- Label bb6 = new Label();
- Label bb7 = new Label();
- Label bb8 = new Label();
- Label bb9 = new Label();
- Label bb10 = new Label();
- Label bb11 = new Label();
- Label bb12 = new Label();
- Label bb13 = new Label();
- Label bb14 = new Label();
-
- Register gpr1 = asRegister(gpr1Temp, AMD64Kind.QWORD);
- Register gpr2 = asRegister(gpr2Temp, AMD64Kind.QWORD);
- Register gpr3 = asRegister(rcxTemp, AMD64Kind.QWORD);
- Register gpr4 = asRegister(gpr4Temp, AMD64Kind.QWORD);
- Register gpr5 = asRegister(gpr5Temp, AMD64Kind.QWORD);
- Register gpr6 = asRegister(gpr6Temp, AMD64Kind.QWORD);
- Register gpr7 = asRegister(gpr7Temp, AMD64Kind.QWORD);
- Register gpr8 = asRegister(gpr8Temp, AMD64Kind.QWORD);
- Register gpr9 = asRegister(gpr9Temp, AMD64Kind.QWORD);
- Register gpr10 = asRegister(gpr10Temp, AMD64Kind.QWORD);
-
- Register temp1 = asRegister(xmm1Temp, AMD64Kind.DOUBLE);
- Register temp2 = asRegister(xmm2Temp, AMD64Kind.DOUBLE);
- Register temp3 = asRegister(xmm3Temp, AMD64Kind.DOUBLE);
- Register temp4 = asRegister(xmm4Temp, AMD64Kind.DOUBLE);
- Register temp5 = asRegister(xmm5Temp, AMD64Kind.DOUBLE);
- Register temp6 = asRegister(xmm6Temp, AMD64Kind.DOUBLE);
- Register temp7 = asRegister(xmm7Temp, AMD64Kind.DOUBLE);
- Register temp8 = asRegister(xmm8Temp, AMD64Kind.DOUBLE);
- Register temp9 = asRegister(xmm9Temp, AMD64Kind.DOUBLE);
-
- AMD64Address stackSlot = (AMD64Address) crb.asAddress(stackTemp);
-
- setCrb(crb);
- masm.movdq(stackSlot, value);
- if (dest.encoding != value.encoding) {
- masm.movdqu(dest, value);
- }
-
- masm.leaq(gpr1, stackSlot);
- masm.movl(gpr1, new AMD64Address(gpr1, 4));
- masm.movdq(temp1, externalAddress(piThirtyTwoInvPtr)); // 0x6dc9c883,
- // 0x40245f30
-
- masm.andl(gpr1, 2147418112);
- masm.subl(gpr1, 808452096);
- masm.cmpl(gpr1, 281346048);
- masm.jcc(ConditionFlag.Above, bb0);
-
- masm.mulsd(temp1, dest);
- masm.movdqu(temp5, externalAddress(oneHalfPtr)); // 0x00000000,
- // 0x3fe00000,
- // 0x00000000,
- // 0x3fe00000
- masm.movdq(temp4, externalAddress(signMaskPtr)); // 0x00000000,
- // 0x80000000
- masm.pand(temp4, dest);
- masm.por(temp5, temp4);
- masm.addpd(temp1, temp5);
- masm.cvttsd2sil(gpr4, temp1);
- masm.cvtsi2sdl(temp1, gpr4);
- masm.movdqu(temp2, externalAddress(pTwoPtr)); // 0x1a600000,
- // 0x3d90b461,
- // 0x1a600000,
- // 0x3d90b461
- masm.movdq(temp3, externalAddress(pOnePtr)); // 0x54400000,
- // 0x3fb921fb
- masm.mulsd(temp3, temp1);
- masm.unpcklpd(temp1, temp1);
- masm.addq(gpr4, 1865232);
- masm.movdqu(temp4, dest);
- masm.andq(gpr4, 63);
- masm.movdqu(temp5, externalAddress(scFourPtr)); // 0xa556c734,
- // 0x3ec71de3,
- // 0x1a01a01a,
- // 0x3efa01a0
- masm.leaq(gpr1, externalAddress(cTablePtr));
- masm.shlq(gpr4, 5);
- masm.addq(gpr1, gpr4);
- masm.movdqu(temp8, new AMD64Address(gpr1, 0));
- masm.mulpd(temp2, temp1);
- masm.subsd(dest, temp3);
- masm.mulsd(temp1, externalAddress(pThreePtr)); // 0x2e037073,
- // 0x3b63198a
- masm.subsd(temp4, temp3);
- masm.unpcklpd(dest, dest);
- masm.movdqu(temp3, temp4);
- masm.subsd(temp4, temp2);
- masm.mulpd(temp5, dest);
- masm.subpd(dest, temp2);
- masm.pshufd(temp7, temp8, 0xE);
- masm.movdqu(temp6, externalAddress(scTwoPtr)); // 0x11111111,
- // 0x3f811111,
- // 0x55555555,
- // 0x3fa55555
- masm.mulsd(temp7, temp4);
- masm.subsd(temp3, temp4);
- masm.mulpd(temp5, dest);
- masm.mulpd(dest, dest);
- masm.subsd(temp3, temp2);
- masm.movdqu(temp2, temp8);
- masm.subsd(temp1, temp3);
- masm.movdq(temp3, new AMD64Address(gpr1, 24));
- masm.addsd(temp2, temp3);
- masm.subsd(temp7, temp2);
- masm.mulsd(temp2, temp4);
- masm.mulpd(temp6, dest);
- masm.mulsd(temp3, temp4);
- masm.mulpd(temp2, dest);
- masm.mulpd(dest, dest);
- masm.addpd(temp5, externalAddress(scThreePtr)); // 0x1a01a01a,
- // 0xbf2a01a0,
- // 0x16c16c17,
- // 0xbf56c16c
- masm.mulsd(temp4, temp8);
- masm.pshufd(temp9, temp8, 0xE);
- masm.addpd(temp6, externalAddress(scOnePtr)); // 0x55555555,
- // 0xbfc55555,
- // 0x00000000,
- // 0xbfe00000
- masm.mulpd(temp5, dest);
- masm.movdqu(dest, temp3);
- masm.addsd(temp3, temp9);
- masm.mulpd(temp1, temp7);
- masm.movdqu(temp7, temp4);
- masm.addsd(temp4, temp3);
- masm.addpd(temp6, temp5);
- masm.subsd(temp9, temp3);
- masm.subsd(temp3, temp4);
- masm.addsd(temp1, new AMD64Address(gpr1, 16));
- masm.mulpd(temp6, temp2);
- masm.addsd(dest, temp9);
- masm.addsd(temp3, temp7);
- masm.addsd(dest, temp1);
- masm.addsd(dest, temp3);
- masm.addsd(dest, temp6);
- masm.unpckhpd(temp6, temp6);
- masm.addsd(dest, temp6);
- masm.addsd(dest, temp4);
- masm.jmp(bb13);
-
- masm.bind(bb14);
- masm.xorpd(temp1, temp1);
- masm.xorpd(dest, dest);
- masm.divsd(dest, temp1);
- masm.jmp(bb13);
-
- masm.bind(bb0);
- masm.jcc(ConditionFlag.Greater, bb1);
-
- masm.pextrw(gpr1, dest, 3);
- masm.andl(gpr1, 32767);
- masm.pinsrw(dest, gpr1, 3);
- masm.movdq(temp1, externalAddress(onePtr)); // 0x00000000,
- // 0x3ff00000
- masm.subsd(temp1, dest);
- masm.movdqu(dest, temp1);
- masm.jmp(bb13);
-
- masm.bind(bb1);
- masm.pextrw(gpr3, dest, 3);
- masm.andl(gpr3, 32752);
- masm.cmpl(gpr3, 32752);
- masm.jcc(ConditionFlag.Equal, bb14);
-
- masm.subl(gpr3, 16224);
- masm.shrl(gpr3, 7);
- masm.andl(gpr3, 65532);
- masm.leaq(gpr10, externalAddress(piInvTablePtr));
- masm.addq(gpr3, gpr10);
- masm.movdq(gpr1, dest);
- masm.movl(gpr9, new AMD64Address(gpr3, 20));
- masm.movl(gpr7, new AMD64Address(gpr3, 24));
- masm.movl(gpr4, gpr1);
- masm.shrq(gpr1, 21);
- masm.orl(gpr1, Integer.MIN_VALUE);
- masm.shrl(gpr1, 11);
- masm.movl(gpr8, gpr9);
- masm.imulq(gpr9, gpr4);
- masm.imulq(gpr8, gpr1);
- masm.imulq(gpr7, gpr1);
- masm.movl(gpr5, new AMD64Address(gpr3, 16));
- masm.movl(gpr6, new AMD64Address(gpr3, 12));
- masm.movl(gpr10, gpr9);
- masm.shrq(gpr9, 32);
- masm.addq(gpr8, gpr9);
- masm.addq(gpr10, gpr7);
- masm.movl(gpr7, gpr10);
- masm.shrq(gpr10, 32);
- masm.addq(gpr8, gpr10);
- masm.movl(gpr9, gpr5);
- masm.imulq(gpr5, gpr4);
- masm.imulq(gpr9, gpr1);
- masm.movl(gpr10, gpr6);
- masm.imulq(gpr6, gpr4);
- masm.movl(gpr2, gpr5);
- masm.shrq(gpr5, 32);
- masm.addq(gpr8, gpr2);
- masm.movl(gpr2, gpr8);
- masm.shrq(gpr8, 32);
- masm.addq(gpr9, gpr5);
- masm.addq(gpr9, gpr8);
- masm.shlq(gpr2, 32);
- masm.orq(gpr7, gpr2);
- masm.imulq(gpr10, gpr1);
- masm.movl(gpr8, new AMD64Address(gpr3, 8));
- masm.movl(gpr5, new AMD64Address(gpr3, 4));
- masm.movl(gpr2, gpr6);
- masm.shrq(gpr6, 32);
- masm.addq(gpr9, gpr2);
- masm.movl(gpr2, gpr9);
- masm.shrq(gpr9, 32);
- masm.addq(gpr10, gpr6);
- masm.addq(gpr10, gpr9);
- masm.movq(gpr6, gpr8);
- masm.imulq(gpr8, gpr4);
- masm.imulq(gpr6, gpr1);
- masm.movl(gpr9, gpr8);
- masm.shrq(gpr8, 32);
- masm.addq(gpr10, gpr9);
- masm.movl(gpr9, gpr10);
- masm.shrq(gpr10, 32);
- masm.addq(gpr6, gpr8);
- masm.addq(gpr6, gpr10);
- masm.movq(gpr8, gpr5);
- masm.imulq(gpr5, gpr4);
- masm.imulq(gpr8, gpr1);
- masm.shlq(gpr9, 32);
- masm.orq(gpr9, gpr2);
- masm.movl(gpr1, new AMD64Address(gpr3, 0));
- masm.movl(gpr10, gpr5);
- masm.shrq(gpr5, 32);
- masm.addq(gpr6, gpr10);
- masm.movl(gpr10, gpr6);
- masm.shrq(gpr6, 32);
- masm.addq(gpr8, gpr5);
- masm.addq(gpr8, gpr6);
- masm.imulq(gpr4, gpr1);
- masm.pextrw(gpr2, dest, 3);
- masm.leaq(gpr6, externalAddress(piInvTablePtr));
- masm.subq(gpr3, gpr6);
- masm.addl(gpr3, gpr3);
- masm.addl(gpr3, gpr3);
- masm.addl(gpr3, gpr3);
- masm.addl(gpr3, 19);
- masm.movl(gpr5, 32768);
- masm.andl(gpr5, gpr2);
- masm.shrl(gpr2, 4);
- masm.andl(gpr2, 2047);
- masm.subl(gpr2, 1023);
- masm.subl(gpr3, gpr2);
- masm.addq(gpr8, gpr4);
- masm.movl(gpr4, gpr3);
- masm.addl(gpr4, 32);
- masm.cmpl(gpr3, 1);
- masm.jcc(ConditionFlag.Less, bb3);
-
- masm.negl(gpr3);
- masm.addl(gpr3, 29);
- masm.shll(gpr8);
- masm.movl(gpr6, gpr8);
- masm.andl(gpr8, 536870911);
- masm.testl(gpr8, 268435456);
- masm.jcc(ConditionFlag.NotEqual, bb4);
-
- masm.shrl(gpr8);
- masm.movl(gpr2, 0);
- masm.shlq(gpr8, 32);
- masm.orq(gpr8, gpr10);
-
- masm.bind(bb5);
-
- masm.bind(bb6);
- masm.cmpq(gpr8, 0);
- masm.jcc(ConditionFlag.Equal, bb7);
-
- masm.bind(bb8);
- masm.bsrq(gpr10, gpr8);
- masm.movl(gpr3, 29);
- masm.subl(gpr3, gpr10);
- masm.jcc(ConditionFlag.LessEqual, bb9);
-
- masm.shlq(gpr8);
- masm.movq(gpr1, gpr9);
- masm.shlq(gpr9);
- masm.addl(gpr4, gpr3);
- masm.negl(gpr3);
- masm.addl(gpr3, 64);
- masm.shrq(gpr1);
- masm.shrq(gpr7);
- masm.orq(gpr8, gpr1);
- masm.orq(gpr9, gpr7);
-
- masm.bind(bb10);
- masm.cvtsi2sdq(dest, gpr8);
- masm.shrq(gpr9, 1);
- masm.cvtsi2sdq(temp3, gpr9);
- masm.xorpd(temp4, temp4);
- masm.shll(gpr4, 4);
- masm.negl(gpr4);
- masm.addl(gpr4, 16368);
- masm.orl(gpr4, gpr5);
- masm.xorl(gpr4, gpr2);
- masm.pinsrw(temp4, gpr4, 3);
- masm.leaq(gpr2, externalAddress(piFourPtr));
- masm.movdqu(temp2, new AMD64Address(gpr2, 0)); // 0x40000000,
- // 0x3fe921fb,
- // 0x18469899,
- // 0x3e64442d
- masm.xorpd(temp5, temp5);
- masm.subl(gpr4, 1008);
- masm.pinsrw(temp5, gpr4, 3);
- masm.mulsd(dest, temp4);
- masm.shll(gpr5, 16);
- masm.sarl(gpr5, 31);
- masm.mulsd(temp3, temp5);
- masm.movdqu(temp1, dest);
- masm.mulsd(dest, temp2);
- masm.pshufd(temp6, temp2, 0xE);
- masm.shrl(gpr6, 29);
- masm.addsd(temp1, temp3);
- masm.mulsd(temp3, temp2);
- masm.addl(gpr6, gpr5);
- masm.xorl(gpr6, gpr5);
- masm.mulsd(temp6, temp1);
- masm.movl(gpr1, gpr6);
- masm.addsd(temp6, temp3);
- masm.movdqu(temp2, dest);
- masm.addsd(dest, temp6);
- masm.subsd(temp2, dest);
- masm.addsd(temp6, temp2);
-
- masm.bind(bb11);
- masm.movq(temp1, externalAddress(piThirtyTwoInvPtr)); // 0x6dc9c883,
- // 0x40245f30
- masm.mulsd(temp1, dest);
- masm.movdq(temp5, externalAddress(oneHalfPtr)); // 0x00000000,
- // 0x3fe00000,
- // 0x00000000,
- // 0x3fe00000
- masm.movdq(temp4, externalAddress(signMaskPtr)); // 0x00000000,
- // 0x80000000
- masm.pand(temp4, dest);
- masm.por(temp5, temp4);
- masm.addpd(temp1, temp5);
- masm.cvttsd2siq(gpr4, temp1);
- masm.cvtsi2sdq(temp1, gpr4);
- masm.movdq(temp3, externalAddress(pOnePtr)); // 0x54400000,
- // 0x3fb921fb
- masm.movdqu(temp2, externalAddress(pTwoPtr)); // 0x1a600000,
- // 0x3d90b461,
- // 0x1a600000,
- // 0x3d90b461
- masm.mulsd(temp3, temp1);
- masm.unpcklpd(temp1, temp1);
- masm.shll(gpr1, 3);
- masm.addl(gpr4, 1865232);
- masm.movdqu(temp4, dest);
- masm.addl(gpr4, gpr1);
- masm.andl(gpr4, 63);
- masm.movdqu(temp5, externalAddress(scFourPtr)); // 0xa556c734,
- // 0x3ec71de3,
- // 0x1a01a01a,
- // 0x3efa01a0
- masm.leaq(gpr1, externalAddress(cTablePtr));
- masm.shll(gpr4, 5);
- masm.addq(gpr1, gpr4);
- masm.movdqu(temp8, new AMD64Address(gpr1, 0));
- masm.mulpd(temp2, temp1);
- masm.subsd(dest, temp3);
- masm.mulsd(temp1, externalAddress(pThreePtr)); // 0x2e037073,
- // 0x3b63198a
- masm.subsd(temp4, temp3);
- masm.unpcklpd(dest, dest);
- masm.movdqu(temp3, temp4);
- masm.subsd(temp4, temp2);
- masm.mulpd(temp5, dest);
- masm.pshufd(temp7, temp8, 0xE);
- masm.movdqu(temp9, temp7);
- masm.subpd(dest, temp2);
- masm.mulsd(temp7, temp4);
- masm.subsd(temp3, temp4);
- masm.mulpd(temp5, dest);
- masm.mulpd(dest, dest);
- masm.subsd(temp3, temp2);
- masm.movdqu(temp2, temp8);
- masm.subsd(temp1, temp3);
- masm.movdq(temp3, new AMD64Address(gpr1, 24));
- masm.addsd(temp2, temp3);
- masm.subsd(temp7, temp2);
- masm.subsd(temp1, temp6);
- masm.movdqu(temp6, externalAddress(scTwoPtr)); // 0x11111111,
- // 0x3f811111,
- // 0x55555555,
- // 0x3fa55555
- masm.mulsd(temp2, temp4);
- masm.mulpd(temp6, dest);
- masm.mulsd(temp3, temp4);
- masm.mulpd(temp2, dest);
- masm.mulpd(dest, dest);
- masm.addpd(temp5, externalAddress(scThreePtr)); // 0x1a01a01a,
- // 0xbf2a01a0,
- // 0x16c16c17,
- // 0xbf56c16c
- masm.mulsd(temp4, temp8);
- masm.addpd(temp6, externalAddress(scOnePtr)); // 0x55555555,
- // 0xbfc55555,
- // 0x00000000,
- // 0xbfe00000
- masm.mulpd(temp5, dest);
- masm.movdqu(dest, temp3);
- masm.addsd(temp3, temp9);
- masm.mulpd(temp1, temp7);
- masm.movdqu(temp7, temp4);
- masm.addsd(temp4, temp3);
- masm.addpd(temp6, temp5);
- masm.subsd(temp9, temp3);
- masm.subsd(temp3, temp4);
- masm.addsd(temp1, new AMD64Address(gpr1, 16));
- masm.mulpd(temp6, temp2);
- masm.addsd(temp9, dest);
- masm.addsd(temp3, temp7);
- masm.addsd(temp1, temp9);
- masm.addsd(temp1, temp3);
- masm.addsd(temp1, temp6);
- masm.unpckhpd(temp6, temp6);
- masm.movdqu(dest, temp4);
- masm.addsd(temp1, temp6);
- masm.addsd(dest, temp1);
- masm.jmp(bb13);
-
- masm.bind(bb7);
- masm.addl(gpr4, 64);
- masm.movq(gpr8, gpr9);
- masm.movq(gpr9, gpr7);
- masm.movl(gpr7, 0);
- masm.cmpq(gpr8, 0);
- masm.jcc(ConditionFlag.NotEqual, bb8);
-
- masm.addl(gpr4, 64);
- masm.movq(gpr8, gpr9);
- masm.movq(gpr9, gpr7);
- masm.cmpq(gpr8, 0);
- masm.jcc(ConditionFlag.NotEqual, bb8);
-
- masm.xorpd(dest, dest);
- masm.xorpd(temp6, temp6);
- masm.jmp(bb11);
-
- masm.bind(bb9);
- masm.jcc(ConditionFlag.Equal, bb10);
-
- masm.negl(gpr3);
- masm.shrq(gpr9);
- masm.movq(gpr1, gpr8);
- masm.shrq(gpr8);
- masm.subl(gpr4, gpr3);
- masm.negl(gpr3);
- masm.addl(gpr3, 64);
- masm.shlq(gpr1);
- masm.orq(gpr9, gpr1);
- masm.jmp(bb10);
-
- masm.bind(bb3);
- masm.negl(gpr3);
- masm.shlq(gpr8, 32);
- masm.orq(gpr8, gpr10);
- masm.shlq(gpr8);
- masm.movq(gpr6, gpr8);
- masm.testl(gpr8, Integer.MIN_VALUE);
- masm.jcc(ConditionFlag.NotEqual, bb12);
-
- masm.shrl(gpr8);
- masm.movl(gpr2, 0);
- masm.shrq(gpr6, 3);
- masm.jmp(bb6);
-
- masm.bind(bb4);
- masm.shrl(gpr8);
- masm.movl(gpr2, 536870912);
- masm.shrl(gpr2);
- masm.shlq(gpr8, 32);
- masm.orq(gpr8, gpr10);
- masm.shlq(gpr2, 32);
- masm.addl(gpr6, 536870912);
- masm.movl(gpr3, 0);
- masm.movl(gpr10, 0);
- masm.subq(gpr3, gpr7);
- masm.sbbq(gpr10, gpr9);
- masm.sbbq(gpr2, gpr8);
- masm.movq(gpr7, gpr3);
- masm.movq(gpr9, gpr10);
- masm.movq(gpr8, gpr2);
- masm.movl(gpr2, 32768);
- masm.jmp(bb5);
-
- masm.bind(bb12);
- masm.shrl(gpr8);
- masm.movq(gpr2, 0x100000000L);
- masm.shrq(gpr2);
- masm.movl(gpr3, 0);
- masm.movl(gpr10, 0);
- masm.subq(gpr3, gpr7);
- masm.sbbq(gpr10, gpr9);
- masm.sbbq(gpr2, gpr8);
- masm.movq(gpr7, gpr3);
- masm.movq(gpr9, gpr10);
- masm.movq(gpr8, gpr2);
- masm.movl(gpr2, 32768);
- masm.shrq(gpr6, 3);
- masm.addl(gpr6, 536870912);
- masm.jmp(bb6);
-
- masm.bind(bb13);
+ public final Variable emitLIRWrapper(LIRGeneratorTool gen, Value value) {
+ LIRKind kind = LIRKind.combine(value);
+ RegisterValue xmm0Value = xmm0.asValue(kind);
+ gen.emitMove(xmm0Value, value);
+ gen.append(this);
+ Variable result = gen.newVariable(kind);
+ gen.emitMove(result, xmm0Value);
+ return result;
}
- /*
- * Copyright (c) 2014, 2016, Intel Corporation. All rights reserved. Intel Math Library (LIBM)
- * Source Code
- *
- * ALGORITHM DESCRIPTION - TAN() ---------------------
- *
- * Polynomials coefficients and other constants.
- *
- * Note that in this algorithm, there is a different polynomial for each breakpoint, so there
- * are 32 sets of polynomial coefficients as well as 32 instances of the other constants.
- *
- * The polynomial coefficients and constants are offset from the start of the main block as
- * follows:
- *
- * 0: c8 | c0 16: c9 | c1 32: c10 | c2 48: c11 | c3 64: c12 | c4 80: c13 | c5 96: c14 | c6 112:
- * c15 | c7 128: T_hi 136: T_lo 144: Sigma 152: T_hl 160: Tau 168: Mask 176: (end of block)
- *
- * The total table size is therefore 5632 bytes.
- *
- * Note that c0 and c1 are always zero. We could try storing other constants here, and just
- * loading the low part of the SIMD register in these cases, after ensuring the high part is
- * zero.
- *
- * The higher terms of the polynomial are computed in the *low* part of the SIMD register. This
- * is so we can overlap the multiplication by r^8 and the unpacking of the other part.
- *
- * The constants are: T_hi + T_lo = accurate constant term in power series Sigma + T_hl =
- * accurate coefficient of r in power series (Sigma=1 bit) Tau = multiplier for the reciprocal,
- * always -1 or 0
- *
- * The basic reconstruction formula using these constants is:
- *
- * High = tau * recip_hi + t_hi Med = (sgn * r + t_hl * r)_hi Low = (sgn * r + t_hl * r)_lo +
- * tau * recip_lo + T_lo + (T_hl + sigma) * c + pol
- *
- * where pol = c0 + c1 * r + c2 * r^2 + ... + c15 * r^15
- *
- * (c0 = c1 = 0, but using them keeps SIMD regularity)
- *
- * We then do a compensated sum High + Med, add the low parts together and then do the final
- * sum.
- *
- * Here recip_hi + recip_lo is an accurate reciprocal of the remainder modulo pi/2
- *
- * Special cases: tan(NaN) = quiet NaN, and raise invalid exception tan(INF) = NaN and raise
- * invalid exception tan(+/-0) = +/-0
- *
- */
-
- private static int[] oneHalfTan = {
- 0x00000000, 0x3fe00000, 0x00000000, 0x3fe00000
- };
-
- private static int[] mulSixteen = {
- 0x00000000, 0x40300000, 0x00000000, 0x3ff00000
- };
-
- private static int[] signMaskTan = {
- 0x00000000, 0x80000000, 0x00000000, 0x80000000
- };
-
- private static int[] piThirtyTwoInvTan = {
- 0x6dc9c883, 0x3fe45f30, 0x6dc9c883, 0x40245f30
- };
-
- private static int[] pOneTan = {
- 0x54444000, 0x3fb921fb, 0x54440000, 0x3fb921fb
- };
-
- private static int[] pTwoTan = {
- 0x67674000, 0xbd32e7b9, 0x4c4c0000, 0x3d468c23
- };
-
- private static int[] pThreeTan = {
- 0x3707344a, 0x3aa8a2e0, 0x03707345, 0x3ae98a2e
- };
-
- private static int[] cTableTan = {
- 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x882c10fa,
- 0x3f9664f4, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
- 0x00000000, 0x00000000, 0x55e6c23d, 0x3f8226e3, 0x55555555,
- 0x3fd55555, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
- 0x0e157de0, 0x3f6d6d3d, 0x11111111, 0x3fc11111, 0x00000000,
- 0x00000000, 0x00000000, 0x00000000, 0x452b75e3, 0x3f57da36,
- 0x1ba1ba1c, 0x3faba1ba, 0x00000000, 0x00000000, 0x00000000,
- 0x00000000, 0x00000000, 0x3ff00000, 0x00000000, 0x00000000,
- 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x4e435f9b,
- 0x3f953f83, 0x00000000, 0x00000000, 0x3c6e8e46, 0x3f9b74ea,
- 0x00000000, 0x00000000, 0xda5b7511, 0x3f85ad63, 0xdc230b9b,
- 0x3fb97558, 0x26cb3788, 0x3f881308, 0x76fc4985, 0x3fd62ac9,
- 0x77bb08ba, 0x3f757c85, 0xb6247521, 0x3fb1381e, 0x5922170c,
- 0x3f754e95, 0x8746482d, 0x3fc27f83, 0x11055b30, 0x3f64e391,
- 0x3e666320, 0x3fa3e609, 0x0de9dae3, 0x3f6301df, 0x1f1dca06,
- 0x3fafa8ae, 0x8c5b2da2, 0x3fb936bb, 0x4e88f7a5, 0x3c587d05,
- 0x00000000, 0x3ff00000, 0xa8935dd9, 0x3f83dde2, 0x00000000,
- 0x00000000, 0x00000000, 0x00000000, 0x5a279ea3, 0x3faa3407,
- 0x00000000, 0x00000000, 0x432d65fa, 0x3fa70153, 0x00000000,
- 0x00000000, 0x891a4602, 0x3f9d03ef, 0xd62ca5f8, 0x3fca77d9,
- 0xb35f4628, 0x3f97a265, 0x433258fa, 0x3fd8cf51, 0xb58fd909,
- 0x3f8f88e3, 0x01771cea, 0x3fc2b154, 0xf3562f8e, 0x3f888f57,
- 0xc028a723, 0x3fc7370f, 0x20b7f9f0, 0x3f80f44c, 0x214368e9,
- 0x3fb6dfaa, 0x28891863, 0x3f79b4b6, 0x172dbbf0, 0x3fb6cb8e,
- 0xe0553158, 0x3fc975f5, 0x593fe814, 0x3c2ef5d3, 0x00000000,
- 0x3ff00000, 0x03dec550, 0x3fa44203, 0x00000000, 0x00000000,
- 0x00000000, 0x00000000, 0x9314533e, 0x3fbb8ec5, 0x00000000,
- 0x00000000, 0x09aa36d0, 0x3fb6d3f4, 0x00000000, 0x00000000,
- 0xdcb427fd, 0x3fb13950, 0xd87ab0bb, 0x3fd5335e, 0xce0ae8a5,
- 0x3fabb382, 0x79143126, 0x3fddba41, 0x5f2b28d4, 0x3fa552f1,
- 0x59f21a6d, 0x3fd015ab, 0x22c27d95, 0x3fa0e984, 0xe19fc6aa,
- 0x3fd0576c, 0x8f2c2950, 0x3f9a4898, 0xc0b3f22c, 0x3fc59462,
- 0x1883a4b8, 0x3f94b61c, 0x3f838640, 0x3fc30eb8, 0x355c63dc,
- 0x3fd36a08, 0x1dce993d, 0xbc6d704d, 0x00000000, 0x3ff00000,
- 0x2b82ab63, 0x3fb78e92, 0x00000000, 0x00000000, 0x00000000,
- 0x00000000, 0x56f37042, 0x3fccfc56, 0x00000000, 0x00000000,
- 0xaa563951, 0x3fc90125, 0x00000000, 0x00000000, 0x3d0e7c5d,
- 0x3fc50533, 0x9bed9b2e, 0x3fdf0ed9, 0x5fe7c47c, 0x3fc1f250,
- 0x96c125e5, 0x3fe2edd9, 0x5a02bbd8, 0x3fbe5c71, 0x86362c20,
- 0x3fda08b7, 0x4b4435ed, 0x3fb9d342, 0x4b494091, 0x3fd911bd,
- 0xb56658be, 0x3fb5e4c7, 0x93a2fd76, 0x3fd3c092, 0xda271794,
- 0x3fb29910, 0x3303df2b, 0x3fd189be, 0x99fcef32, 0x3fda8279,
- 0xb68c1467, 0x3c708b2f, 0x00000000, 0x3ff00000, 0x980c4337,
- 0x3fc5f619, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
- 0xcc03e501, 0x3fdff10f, 0x00000000, 0x00000000, 0x44a4e845,
- 0x3fddb63b, 0x00000000, 0x00000000, 0x3768ad9f, 0x3fdb72a4,
- 0x3dd01cca, 0x3fe5fdb9, 0xa61d2811, 0x3fd972b2, 0x5645ad0b,
- 0x3fe977f9, 0xd013b3ab, 0x3fd78ca3, 0xbf0bf914, 0x3fe4f192,
- 0x4d53e730, 0x3fd5d060, 0x3f8b9000, 0x3fe49933, 0xe2b82f08,
- 0x3fd4322a, 0x5936a835, 0x3fe27ae1, 0xb1c61c9b, 0x3fd2b3fb,
- 0xef478605, 0x3fe1659e, 0x190834ec, 0x3fe11ab7, 0xcdb625ea,
- 0xbc8e564b, 0x00000000, 0x3ff00000, 0xb07217e3, 0x3fd248f1,
- 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x2b2c49d0,
- 0x3ff2de9c, 0x00000000, 0x00000000, 0x2655bc98, 0x3ff33e58,
- 0x00000000, 0x00000000, 0xff691fa2, 0x3ff3972e, 0xe93463bd,
- 0x3feeed87, 0x070e10a0, 0x3ff3f5b2, 0xf4d790a4, 0x3ff20c10,
- 0xa04e8ea3, 0x3ff4541a, 0x386accd3, 0x3ff1369e, 0x222a66dd,
- 0x3ff4b521, 0x22a9777e, 0x3ff20817, 0x52a04a6e, 0x3ff5178f,
- 0xddaa0031, 0x3ff22137, 0x4447d47c, 0x3ff57c01, 0x1e9c7f1d,
- 0x3ff29311, 0x2ab7f990, 0x3fe561b8, 0x209c7df1, 0x3c87a8c5,
- 0x00000000, 0x3ff00000, 0x4170bcc6, 0x3fdc92d8, 0x00000000,
- 0x00000000, 0x00000000, 0x00000000, 0xc7ab4d5a, 0x40085e24,
- 0x00000000, 0x00000000, 0xe93ea75d, 0x400b963d, 0x00000000,
- 0x00000000, 0x94a7f25a, 0x400f37e2, 0x4b6261cb, 0x3ff5f984,
- 0x5a9dd812, 0x4011aab0, 0x74c30018, 0x3ffaf5a5, 0x7f2ce8e3,
- 0x4013fe8b, 0xfe8e54fa, 0x3ffd7334, 0x670d618d, 0x4016a10c,
- 0x4db97058, 0x4000e012, 0x24df44dd, 0x40199c5f, 0x697d6ece,
- 0x4003006e, 0x83298b82, 0x401cfc4d, 0x19d490d6, 0x40058c19,
- 0x2ae42850, 0x3fea4300, 0x118e20e6, 0xbc7a6db8, 0x00000000,
- 0x40000000, 0xe33345b8, 0xbfd4e526, 0x00000000, 0x00000000,
- 0x00000000, 0x00000000, 0x65965966, 0x40219659, 0x00000000,
- 0x00000000, 0x882c10fa, 0x402664f4, 0x00000000, 0x00000000,
- 0x83cd3723, 0x402c8342, 0x00000000, 0x40000000, 0x55e6c23d,
- 0x403226e3, 0x55555555, 0x40055555, 0x34451939, 0x40371c96,
- 0xaaaaaaab, 0x400aaaaa, 0x0e157de0, 0x403d6d3d, 0x11111111,
- 0x40111111, 0xa738201f, 0x4042bbce, 0x05b05b06, 0x4015b05b,
- 0x452b75e3, 0x4047da36, 0x1ba1ba1c, 0x401ba1ba, 0x00000000,
- 0x3ff00000, 0x00000000, 0x00000000, 0x00000000, 0x40000000,
- 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
- 0x00000000, 0x4f48b8d3, 0xbf33eaf9, 0x00000000, 0x00000000,
- 0x0cf7586f, 0x3f20b8ea, 0x00000000, 0x00000000, 0xd0258911,
- 0xbf0abaf3, 0x23e49fe9, 0xbfab5a8c, 0x2d53222e, 0x3ef60d15,
- 0x21169451, 0x3fa172b2, 0xbb254dbc, 0xbee1d3b5, 0xdbf93b8e,
- 0xbf84c7db, 0x05b4630b, 0x3ecd3364, 0xee9aada7, 0x3f743924,
- 0x794a8297, 0xbeb7b7b9, 0xe015f797, 0xbf5d41f5, 0xe41a4a56,
- 0x3ea35dfb, 0xe4c2a251, 0x3f49a2ab, 0x5af9e000, 0xbfce49ce,
- 0x8c743719, 0x3d1eb860, 0x00000000, 0x00000000, 0x1b4863cf,
- 0x3fd78294, 0x00000000, 0x3ff00000, 0x00000000, 0xfffffff8,
- 0x535ad890, 0xbf2b9320, 0x00000000, 0x00000000, 0x018fdf1f,
- 0x3f16d61d, 0x00000000, 0x00000000, 0x0359f1be, 0xbf0139e4,
- 0xa4317c6d, 0xbfa67e17, 0x82672d0f, 0x3eebb405, 0x2f1b621e,
- 0x3f9f455b, 0x51ccf238, 0xbed55317, 0xf437b9ac, 0xbf804bee,
- 0xc791a2b5, 0x3ec0e993, 0x919a1db2, 0x3f7080c2, 0x336a5b0e,
- 0xbeaa48a2, 0x0a268358, 0xbf55a443, 0xdfd978e4, 0x3e94b61f,
- 0xd7767a58, 0x3f431806, 0x2aea0000, 0xbfc9bbe8, 0x7723ea61,
- 0xbd3a2369, 0x00000000, 0x00000000, 0xdf7796ff, 0x3fd6e642,
- 0x00000000, 0x3ff00000, 0x00000000, 0xfffffff8, 0xb9ff07ce,
- 0xbf231c78, 0x00000000, 0x00000000, 0xa5517182, 0x3f0ff0e0,
- 0x00000000, 0x00000000, 0x790b4cbc, 0xbef66191, 0x848a46c6,
- 0xbfa21ac0, 0xb16435fa, 0x3ee1d3ec, 0x2a1aa832, 0x3f9c71ea,
- 0xfdd299ef, 0xbec9dd1a, 0x3f8dbaaf, 0xbf793363, 0x309fc6ea,
- 0x3eb415d6, 0xbee60471, 0x3f6b83ba, 0x94a0a697, 0xbe9dae11,
- 0x3e5c67b3, 0xbf4fd07b, 0x9a8f3e3e, 0x3e86bd75, 0xa4beb7a4,
- 0x3f3d1eb1, 0x29cfc000, 0xbfc549ce, 0xbf159358, 0xbd397b33,
- 0x00000000, 0x00000000, 0x871fee6c, 0x3fd666f0, 0x00000000,
- 0x3ff00000, 0x00000000, 0xfffffff8, 0x7d98a556, 0xbf1a3958,
- 0x00000000, 0x00000000, 0x9d88dc01, 0x3f0704c2, 0x00000000,
- 0x00000000, 0x73742a2b, 0xbeed054a, 0x58844587, 0xbf9c2a13,
- 0x55688a79, 0x3ed7a326, 0xee33f1d6, 0x3f9a48f4, 0xa8dc9888,
- 0xbebf8939, 0xaad4b5b8, 0xbf72f746, 0x9102efa1, 0x3ea88f82,
- 0xdabc29cf, 0x3f678228, 0x9289afb8, 0xbe90f456, 0x741fb4ed,
- 0xbf46f3a3, 0xa97f6663, 0x3e79b4bf, 0xca89ff3f, 0x3f36db70,
- 0xa8a2a000, 0xbfc0ee13, 0x3da24be1, 0xbd338b9f, 0x00000000,
- 0x00000000, 0x11cd6c69, 0x3fd601fd, 0x00000000, 0x3ff00000,
- 0x00000000, 0xfffffff8, 0x1a154b97, 0xbf116b01, 0x00000000,
- 0x00000000, 0x2d427630, 0x3f0147bf, 0x00000000, 0x00000000,
- 0xb93820c8, 0xbee264d4, 0xbb6cbb18, 0xbf94ab8c, 0x888d4d92,
- 0x3ed0568b, 0x60730f7c, 0x3f98b19b, 0xe4b1fb11, 0xbeb2f950,
- 0x22cf9f74, 0xbf6b21cd, 0x4a3ff0a6, 0x3e9f499e, 0xfd2b83ce,
- 0x3f64aad7, 0x637b73af, 0xbe83487c, 0xe522591a, 0xbf3fc092,
- 0xa158e8bc, 0x3e6e3aae, 0xe5e82ffa, 0x3f329d2f, 0xd636a000,
- 0xbfb9477f, 0xc2c2d2bc, 0xbd135ef9, 0x00000000, 0x00000000,
- 0xf2fdb123, 0x3fd5b566, 0x00000000, 0x3ff00000, 0x00000000,
- 0xfffffff8, 0xc41acb64, 0xbf05448d, 0x00000000, 0x00000000,
- 0xdbb03d6f, 0x3efb7ad2, 0x00000000, 0x00000000, 0x9e42962d,
- 0xbed5aea5, 0x2579f8ef, 0xbf8b2398, 0x288a1ed9, 0x3ec81441,
- 0xb0198dc5, 0x3f979a3a, 0x2fdfe253, 0xbea57cd3, 0x5766336f,
- 0xbf617caa, 0x600944c3, 0x3e954ed6, 0xa4e0aaf8, 0x3f62c646,
- 0x6b8fb29c, 0xbe74e3a3, 0xdc4c0409, 0xbf33f952, 0x9bffe365,
- 0x3e6301ec, 0xb8869e44, 0x3f2fc566, 0xe1e04000, 0xbfb0cc62,
- 0x016b907f, 0xbd119cbc, 0x00000000, 0x00000000, 0xe6b9d8fa,
- 0x3fd57fb3, 0x00000000, 0x3ff00000, 0x00000000, 0xfffffff8,
- 0x5daf22a6, 0xbef429d7, 0x00000000, 0x00000000, 0x06bca545,
- 0x3ef7a27d, 0x00000000, 0x00000000, 0x7211c19a, 0xbec41c3e,
- 0x956ed53e, 0xbf7ae3f4, 0xee750e72, 0x3ec3901b, 0x91d443f5,
- 0x3f96f713, 0x36661e6c, 0xbe936e09, 0x506f9381, 0xbf5122e8,
- 0xcb6dd43f, 0x3e9041b9, 0x6698b2ff, 0x3f61b0c7, 0x576bf12b,
- 0xbe625a8a, 0xe5a0e9dc, 0xbf23499d, 0x110384dd, 0x3e5b1c2c,
- 0x68d43db6, 0x3f2cb899, 0x6ecac000, 0xbfa0c414, 0xcd7dd58c,
- 0x3d13500f, 0x00000000, 0x00000000, 0x85a2c8fb, 0x3fd55fe0,
- 0x00000000, 0x3ff00000, 0x00000000, 0xfffffff8, 0x00000000,
- 0x00000000, 0x00000000, 0x00000000, 0x2bf70ebe, 0x3ef66a8f,
- 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
- 0x00000000, 0xd644267f, 0x3ec22805, 0x16c16c17, 0x3f96c16c,
- 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0xc4e09162,
- 0x3e8d6db2, 0xbc011567, 0x3f61566a, 0x00000000, 0x00000000,
- 0x00000000, 0x00000000, 0x1f79955c, 0x3e57da4e, 0x9334ef0b,
- 0x3f2bbd77, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
- 0x00000000, 0x00000000, 0x55555555, 0x3fd55555, 0x00000000,
- 0x3ff00000, 0x00000000, 0xfffffff8, 0x5daf22a6, 0x3ef429d7,
- 0x00000000, 0x00000000, 0x06bca545, 0x3ef7a27d, 0x00000000,
- 0x00000000, 0x7211c19a, 0x3ec41c3e, 0x956ed53e, 0x3f7ae3f4,
- 0xee750e72, 0x3ec3901b, 0x91d443f5, 0x3f96f713, 0x36661e6c,
- 0x3e936e09, 0x506f9381, 0x3f5122e8, 0xcb6dd43f, 0x3e9041b9,
- 0x6698b2ff, 0x3f61b0c7, 0x576bf12b, 0x3e625a8a, 0xe5a0e9dc,
- 0x3f23499d, 0x110384dd, 0x3e5b1c2c, 0x68d43db6, 0x3f2cb899,
- 0x6ecac000, 0x3fa0c414, 0xcd7dd58c, 0xbd13500f, 0x00000000,
- 0x00000000, 0x85a2c8fb, 0x3fd55fe0, 0x00000000, 0x3ff00000,
- 0x00000000, 0xfffffff8, 0xc41acb64, 0x3f05448d, 0x00000000,
- 0x00000000, 0xdbb03d6f, 0x3efb7ad2, 0x00000000, 0x00000000,
- 0x9e42962d, 0x3ed5aea5, 0x2579f8ef, 0x3f8b2398, 0x288a1ed9,
- 0x3ec81441, 0xb0198dc5, 0x3f979a3a, 0x2fdfe253, 0x3ea57cd3,
- 0x5766336f, 0x3f617caa, 0x600944c3, 0x3e954ed6, 0xa4e0aaf8,
- 0x3f62c646, 0x6b8fb29c, 0x3e74e3a3, 0xdc4c0409, 0x3f33f952,
- 0x9bffe365, 0x3e6301ec, 0xb8869e44, 0x3f2fc566, 0xe1e04000,
- 0x3fb0cc62, 0x016b907f, 0x3d119cbc, 0x00000000, 0x00000000,
- 0xe6b9d8fa, 0x3fd57fb3, 0x00000000, 0x3ff00000, 0x00000000,
- 0xfffffff8, 0x1a154b97, 0x3f116b01, 0x00000000, 0x00000000,
- 0x2d427630, 0x3f0147bf, 0x00000000, 0x00000000, 0xb93820c8,
- 0x3ee264d4, 0xbb6cbb18, 0x3f94ab8c, 0x888d4d92, 0x3ed0568b,
- 0x60730f7c, 0x3f98b19b, 0xe4b1fb11, 0x3eb2f950, 0x22cf9f74,
- 0x3f6b21cd, 0x4a3ff0a6, 0x3e9f499e, 0xfd2b83ce, 0x3f64aad7,
- 0x637b73af, 0x3e83487c, 0xe522591a, 0x3f3fc092, 0xa158e8bc,
- 0x3e6e3aae, 0xe5e82ffa, 0x3f329d2f, 0xd636a000, 0x3fb9477f,
- 0xc2c2d2bc, 0x3d135ef9, 0x00000000, 0x00000000, 0xf2fdb123,
- 0x3fd5b566, 0x00000000, 0x3ff00000, 0x00000000, 0xfffffff8,
- 0x7d98a556, 0x3f1a3958, 0x00000000, 0x00000000, 0x9d88dc01,
- 0x3f0704c2, 0x00000000, 0x00000000, 0x73742a2b, 0x3eed054a,
- 0x58844587, 0x3f9c2a13, 0x55688a79, 0x3ed7a326, 0xee33f1d6,
- 0x3f9a48f4, 0xa8dc9888, 0x3ebf8939, 0xaad4b5b8, 0x3f72f746,
- 0x9102efa1, 0x3ea88f82, 0xdabc29cf, 0x3f678228, 0x9289afb8,
- 0x3e90f456, 0x741fb4ed, 0x3f46f3a3, 0xa97f6663, 0x3e79b4bf,
- 0xca89ff3f, 0x3f36db70, 0xa8a2a000, 0x3fc0ee13, 0x3da24be1,
- 0x3d338b9f, 0x00000000, 0x00000000, 0x11cd6c69, 0x3fd601fd,
- 0x00000000, 0x3ff00000, 0x00000000, 0xfffffff8, 0xb9ff07ce,
- 0x3f231c78, 0x00000000, 0x00000000, 0xa5517182, 0x3f0ff0e0,
- 0x00000000, 0x00000000, 0x790b4cbc, 0x3ef66191, 0x848a46c6,
- 0x3fa21ac0, 0xb16435fa, 0x3ee1d3ec, 0x2a1aa832, 0x3f9c71ea,
- 0xfdd299ef, 0x3ec9dd1a, 0x3f8dbaaf, 0x3f793363, 0x309fc6ea,
- 0x3eb415d6, 0xbee60471, 0x3f6b83ba, 0x94a0a697, 0x3e9dae11,
- 0x3e5c67b3, 0x3f4fd07b, 0x9a8f3e3e, 0x3e86bd75, 0xa4beb7a4,
- 0x3f3d1eb1, 0x29cfc000, 0x3fc549ce, 0xbf159358, 0x3d397b33,
- 0x00000000, 0x00000000, 0x871fee6c, 0x3fd666f0, 0x00000000,
- 0x3ff00000, 0x00000000, 0xfffffff8, 0x535ad890, 0x3f2b9320,
- 0x00000000, 0x00000000, 0x018fdf1f, 0x3f16d61d, 0x00000000,
- 0x00000000, 0x0359f1be, 0x3f0139e4, 0xa4317c6d, 0x3fa67e17,
- 0x82672d0f, 0x3eebb405, 0x2f1b621e, 0x3f9f455b, 0x51ccf238,
- 0x3ed55317, 0xf437b9ac, 0x3f804bee, 0xc791a2b5, 0x3ec0e993,
- 0x919a1db2, 0x3f7080c2, 0x336a5b0e, 0x3eaa48a2, 0x0a268358,
- 0x3f55a443, 0xdfd978e4, 0x3e94b61f, 0xd7767a58, 0x3f431806,
- 0x2aea0000, 0x3fc9bbe8, 0x7723ea61, 0x3d3a2369, 0x00000000,
- 0x00000000, 0xdf7796ff, 0x3fd6e642, 0x00000000, 0x3ff00000,
- 0x00000000, 0xfffffff8, 0x4f48b8d3, 0x3f33eaf9, 0x00000000,
- 0x00000000, 0x0cf7586f, 0x3f20b8ea, 0x00000000, 0x00000000,
- 0xd0258911, 0x3f0abaf3, 0x23e49fe9, 0x3fab5a8c, 0x2d53222e,
- 0x3ef60d15, 0x21169451, 0x3fa172b2, 0xbb254dbc, 0x3ee1d3b5,
- 0xdbf93b8e, 0x3f84c7db, 0x05b4630b, 0x3ecd3364, 0xee9aada7,
- 0x3f743924, 0x794a8297, 0x3eb7b7b9, 0xe015f797, 0x3f5d41f5,
- 0xe41a4a56, 0x3ea35dfb, 0xe4c2a251, 0x3f49a2ab, 0x5af9e000,
- 0x3fce49ce, 0x8c743719, 0xbd1eb860, 0x00000000, 0x00000000,
- 0x1b4863cf, 0x3fd78294, 0x00000000, 0x3ff00000, 0x00000000,
- 0xfffffff8, 0x65965966, 0xc0219659, 0x00000000, 0x00000000,
- 0x882c10fa, 0x402664f4, 0x00000000, 0x00000000, 0x83cd3723,
- 0xc02c8342, 0x00000000, 0xc0000000, 0x55e6c23d, 0x403226e3,
- 0x55555555, 0x40055555, 0x34451939, 0xc0371c96, 0xaaaaaaab,
- 0xc00aaaaa, 0x0e157de0, 0x403d6d3d, 0x11111111, 0x40111111,
- 0xa738201f, 0xc042bbce, 0x05b05b06, 0xc015b05b, 0x452b75e3,
- 0x4047da36, 0x1ba1ba1c, 0x401ba1ba, 0x00000000, 0xbff00000,
- 0x00000000, 0x00000000, 0x00000000, 0x40000000, 0x00000000,
- 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
- 0xc7ab4d5a, 0xc0085e24, 0x00000000, 0x00000000, 0xe93ea75d,
- 0x400b963d, 0x00000000, 0x00000000, 0x94a7f25a, 0xc00f37e2,
- 0x4b6261cb, 0xbff5f984, 0x5a9dd812, 0x4011aab0, 0x74c30018,
- 0x3ffaf5a5, 0x7f2ce8e3, 0xc013fe8b, 0xfe8e54fa, 0xbffd7334,
- 0x670d618d, 0x4016a10c, 0x4db97058, 0x4000e012, 0x24df44dd,
- 0xc0199c5f, 0x697d6ece, 0xc003006e, 0x83298b82, 0x401cfc4d,
- 0x19d490d6, 0x40058c19, 0x2ae42850, 0xbfea4300, 0x118e20e6,
- 0x3c7a6db8, 0x00000000, 0x40000000, 0xe33345b8, 0xbfd4e526,
- 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x2b2c49d0,
- 0xbff2de9c, 0x00000000, 0x00000000, 0x2655bc98, 0x3ff33e58,
- 0x00000000, 0x00000000, 0xff691fa2, 0xbff3972e, 0xe93463bd,
- 0xbfeeed87, 0x070e10a0, 0x3ff3f5b2, 0xf4d790a4, 0x3ff20c10,
- 0xa04e8ea3, 0xbff4541a, 0x386accd3, 0xbff1369e, 0x222a66dd,
- 0x3ff4b521, 0x22a9777e, 0x3ff20817, 0x52a04a6e, 0xbff5178f,
- 0xddaa0031, 0xbff22137, 0x4447d47c, 0x3ff57c01, 0x1e9c7f1d,
- 0x3ff29311, 0x2ab7f990, 0xbfe561b8, 0x209c7df1, 0xbc87a8c5,
- 0x00000000, 0x3ff00000, 0x4170bcc6, 0x3fdc92d8, 0x00000000,
- 0x00000000, 0x00000000, 0x00000000, 0xcc03e501, 0xbfdff10f,
- 0x00000000, 0x00000000, 0x44a4e845, 0x3fddb63b, 0x00000000,
- 0x00000000, 0x3768ad9f, 0xbfdb72a4, 0x3dd01cca, 0xbfe5fdb9,
- 0xa61d2811, 0x3fd972b2, 0x5645ad0b, 0x3fe977f9, 0xd013b3ab,
- 0xbfd78ca3, 0xbf0bf914, 0xbfe4f192, 0x4d53e730, 0x3fd5d060,
- 0x3f8b9000, 0x3fe49933, 0xe2b82f08, 0xbfd4322a, 0x5936a835,
- 0xbfe27ae1, 0xb1c61c9b, 0x3fd2b3fb, 0xef478605, 0x3fe1659e,
- 0x190834ec, 0xbfe11ab7, 0xcdb625ea, 0x3c8e564b, 0x00000000,
- 0x3ff00000, 0xb07217e3, 0x3fd248f1, 0x00000000, 0x00000000,
- 0x00000000, 0x00000000, 0x56f37042, 0xbfccfc56, 0x00000000,
- 0x00000000, 0xaa563951, 0x3fc90125, 0x00000000, 0x00000000,
- 0x3d0e7c5d, 0xbfc50533, 0x9bed9b2e, 0xbfdf0ed9, 0x5fe7c47c,
- 0x3fc1f250, 0x96c125e5, 0x3fe2edd9, 0x5a02bbd8, 0xbfbe5c71,
- 0x86362c20, 0xbfda08b7, 0x4b4435ed, 0x3fb9d342, 0x4b494091,
- 0x3fd911bd, 0xb56658be, 0xbfb5e4c7, 0x93a2fd76, 0xbfd3c092,
- 0xda271794, 0x3fb29910, 0x3303df2b, 0x3fd189be, 0x99fcef32,
- 0xbfda8279, 0xb68c1467, 0xbc708b2f, 0x00000000, 0x3ff00000,
- 0x980c4337, 0x3fc5f619, 0x00000000, 0x00000000, 0x00000000,
- 0x00000000, 0x9314533e, 0xbfbb8ec5, 0x00000000, 0x00000000,
- 0x09aa36d0, 0x3fb6d3f4, 0x00000000, 0x00000000, 0xdcb427fd,
- 0xbfb13950, 0xd87ab0bb, 0xbfd5335e, 0xce0ae8a5, 0x3fabb382,
- 0x79143126, 0x3fddba41, 0x5f2b28d4, 0xbfa552f1, 0x59f21a6d,
- 0xbfd015ab, 0x22c27d95, 0x3fa0e984, 0xe19fc6aa, 0x3fd0576c,
- 0x8f2c2950, 0xbf9a4898, 0xc0b3f22c, 0xbfc59462, 0x1883a4b8,
- 0x3f94b61c, 0x3f838640, 0x3fc30eb8, 0x355c63dc, 0xbfd36a08,
- 0x1dce993d, 0x3c6d704d, 0x00000000, 0x3ff00000, 0x2b82ab63,
- 0x3fb78e92, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
- 0x5a279ea3, 0xbfaa3407, 0x00000000, 0x00000000, 0x432d65fa,
- 0x3fa70153, 0x00000000, 0x00000000, 0x891a4602, 0xbf9d03ef,
- 0xd62ca5f8, 0xbfca77d9, 0xb35f4628, 0x3f97a265, 0x433258fa,
- 0x3fd8cf51, 0xb58fd909, 0xbf8f88e3, 0x01771cea, 0xbfc2b154,
- 0xf3562f8e, 0x3f888f57, 0xc028a723, 0x3fc7370f, 0x20b7f9f0,
- 0xbf80f44c, 0x214368e9, 0xbfb6dfaa, 0x28891863, 0x3f79b4b6,
- 0x172dbbf0, 0x3fb6cb8e, 0xe0553158, 0xbfc975f5, 0x593fe814,
- 0xbc2ef5d3, 0x00000000, 0x3ff00000, 0x03dec550, 0x3fa44203,
- 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x4e435f9b,
- 0xbf953f83, 0x00000000, 0x00000000, 0x3c6e8e46, 0x3f9b74ea,
- 0x00000000, 0x00000000, 0xda5b7511, 0xbf85ad63, 0xdc230b9b,
- 0xbfb97558, 0x26cb3788, 0x3f881308, 0x76fc4985, 0x3fd62ac9,
- 0x77bb08ba, 0xbf757c85, 0xb6247521, 0xbfb1381e, 0x5922170c,
- 0x3f754e95, 0x8746482d, 0x3fc27f83, 0x11055b30, 0xbf64e391,
- 0x3e666320, 0xbfa3e609, 0x0de9dae3, 0x3f6301df, 0x1f1dca06,
- 0x3fafa8ae, 0x8c5b2da2, 0xbfb936bb, 0x4e88f7a5, 0xbc587d05,
- 0x00000000, 0x3ff00000, 0xa8935dd9, 0x3f83dde2, 0x00000000,
- 0x00000000, 0x00000000, 0x00000000
- };
-
- private static int[] maskThirtyFiveTan = {
- 0xfffc0000, 0xffffffff, 0x00000000, 0x00000000
- };
-
- private static int[] qElevenTan = {
- 0xb8fe4d77, 0x3f82609a
- };
-
- private static int[] qNineTan = {
- 0xbf847a43, 0x3f9664a0
- };
-
- private static int[] qSevenTan = {
- 0x52c4c8ab, 0x3faba1ba
- };
-
- private static int[] qFiveTan = {
- 0x11092746, 0x3fc11111
- };
-
- private static int[] qThreeTan = {
- 0x55555612, 0x3fd55555
- };
-
- private static int[] piInvTableTan = {
- 0x00000000, 0x00000000, 0xa2f9836e, 0x4e441529, 0xfc2757d1,
- 0xf534ddc0, 0xdb629599, 0x3c439041, 0xfe5163ab, 0xdebbc561,
- 0xb7246e3a, 0x424dd2e0, 0x06492eea, 0x09d1921c, 0xfe1deb1c,
- 0xb129a73e, 0xe88235f5, 0x2ebb4484, 0xe99c7026, 0xb45f7e41,
- 0x3991d639, 0x835339f4, 0x9c845f8b, 0xbdf9283b, 0x1ff897ff,
- 0xde05980f, 0xef2f118b, 0x5a0a6d1f, 0x6d367ecf, 0x27cb09b7,
- 0x4f463f66, 0x9e5fea2d, 0x7527bac7, 0xebe5f17b, 0x3d0739f7,
- 0x8a5292ea, 0x6bfb5fb1, 0x1f8d5d08, 0x56033046, 0xfc7b6bab,
- 0xf0cfbc21
- };
-
- private static int[] piFourTan = {
- 0x00000000, 0x3fe921fb, 0x4611a626, 0x3e85110b
- };
-
- private static int[] qqTwoTan = {
- 0x676733af, 0x3d32e7b9
- };
-
- private static int[] twoPowFiftyFiveTan = {
- 0x00000000, 0x43600000
- };
-
- private static int[] twoPowMFiftyFiveTan = {
- 0x00000000, 0x3c800000
- };
-
- public void tanIntrinsic(Register dest, Register value, CompilationResultBuilder crb, AMD64MacroAssembler masm) {
- ArrayDataPointerConstant oneHalfTanPtr = new ArrayDataPointerConstant(oneHalfTan, 16);
- ArrayDataPointerConstant mulSixteenPtr = new ArrayDataPointerConstant(mulSixteen, 16);
- ArrayDataPointerConstant signMaskTanPtr = new ArrayDataPointerConstant(signMaskTan, 16);
- ArrayDataPointerConstant piThirtyTwoInvTanPtr = new ArrayDataPointerConstant(piThirtyTwoInvTan, 16);
- ArrayDataPointerConstant pOneTanPtr = new ArrayDataPointerConstant(pOneTan, 16);
- ArrayDataPointerConstant pTwoTanPtr = new ArrayDataPointerConstant(pTwoTan, 16);
- ArrayDataPointerConstant pThreeTanPtr = new ArrayDataPointerConstant(pThreeTan, 16);
- ArrayDataPointerConstant cTableTanPtr = new ArrayDataPointerConstant(cTableTan, 16);
- ArrayDataPointerConstant maskThirtyFiveTanPtr = new ArrayDataPointerConstant(maskThirtyFiveTan, 16);
- ArrayDataPointerConstant qElevenTanPtr = new ArrayDataPointerConstant(qElevenTan, 16);
- ArrayDataPointerConstant qNineTanPtr = new ArrayDataPointerConstant(qNineTan, 16);
- ArrayDataPointerConstant qSevenTanPtr = new ArrayDataPointerConstant(qSevenTan, 8);
- ArrayDataPointerConstant qFiveTanPtr = new ArrayDataPointerConstant(qFiveTan, 16);
- ArrayDataPointerConstant qThreeTanPtr = new ArrayDataPointerConstant(qThreeTan, 16);
- ArrayDataPointerConstant piInvTableTanPtr = new ArrayDataPointerConstant(piInvTableTan, 16);
- ArrayDataPointerConstant piFourTanPtr = new ArrayDataPointerConstant(piFourTan, 8);
- ArrayDataPointerConstant qqTwoTanPtr = new ArrayDataPointerConstant(qqTwoTan, 8);
- ArrayDataPointerConstant onePtr = new ArrayDataPointerConstant(one, 8);
- ArrayDataPointerConstant twoPowFiftyFiveTanPtr = new ArrayDataPointerConstant(twoPowFiftyFiveTan, 8);
- ArrayDataPointerConstant twoPowMFiftyFiveTanPtr = new ArrayDataPointerConstant(twoPowMFiftyFiveTan, 8);
-
- Label bb0 = new Label();
- Label bb1 = new Label();
- Label bb2 = new Label();
- Label bb3 = new Label();
- Label bb5 = new Label();
- Label bb6 = new Label();
- Label bb8 = new Label();
- Label bb9 = new Label();
- Label bb10 = new Label();
- Label bb11 = new Label();
- Label bb12 = new Label();
- Label bb13 = new Label();
- Label bb14 = new Label();
- Label bb15 = new Label();
-
- Register gpr1 = asRegister(gpr1Temp, AMD64Kind.QWORD);
- Register gpr2 = asRegister(gpr2Temp, AMD64Kind.QWORD);
- Register gpr3 = asRegister(rcxTemp, AMD64Kind.QWORD);
- Register gpr4 = asRegister(gpr4Temp, AMD64Kind.QWORD);
- Register gpr5 = asRegister(gpr5Temp, AMD64Kind.QWORD);
- Register gpr6 = asRegister(gpr6Temp, AMD64Kind.QWORD);
- Register gpr7 = asRegister(gpr7Temp, AMD64Kind.QWORD);
- Register gpr8 = asRegister(gpr8Temp, AMD64Kind.QWORD);
- Register gpr9 = asRegister(gpr9Temp, AMD64Kind.QWORD);
- Register gpr10 = asRegister(gpr10Temp, AMD64Kind.QWORD);
-
- Register temp1 = asRegister(xmm1Temp, AMD64Kind.DOUBLE);
- Register temp2 = asRegister(xmm2Temp, AMD64Kind.DOUBLE);
- Register temp3 = asRegister(xmm3Temp, AMD64Kind.DOUBLE);
- Register temp4 = asRegister(xmm4Temp, AMD64Kind.DOUBLE);
- Register temp5 = asRegister(xmm5Temp, AMD64Kind.DOUBLE);
- Register temp6 = asRegister(xmm6Temp, AMD64Kind.DOUBLE);
- Register temp7 = asRegister(xmm7Temp, AMD64Kind.DOUBLE);
-
- setCrb(crb);
- if (dest.encoding != value.encoding) {
- masm.movdqu(dest, value);
- }
-
- masm.pextrw(gpr1, dest, 3);
- masm.andl(gpr1, 32767);
- masm.subl(gpr1, 16314);
- masm.cmpl(gpr1, 270);
- masm.jcc(ConditionFlag.Above, bb0);
-
- masm.movdqu(temp5, externalAddress(oneHalfTanPtr)); // 0x00000000,
- // 0x3fe00000,
- // 0x00000000,
- // 0x3fe00000
- masm.movdqu(temp6, externalAddress(mulSixteenPtr)); // 0x00000000,
- // 0x40300000,
- // 0x00000000,
- // 0x3ff00000
- masm.unpcklpd(dest, dest);
- masm.movdqu(temp4, externalAddress(signMaskTanPtr)); // 0x00000000,
- // 0x80000000,
- // 0x00000000,
- // 0x80000000
- masm.andpd(temp4, dest);
- masm.movdqu(temp1, externalAddress(piThirtyTwoInvTanPtr)); // 0x6dc9c883,
- // 0x3fe45f30,
- // 0x6dc9c883,
- // 0x40245f30
- masm.mulpd(temp1, dest);
- masm.por(temp5, temp4);
- masm.addpd(temp1, temp5);
- masm.movdqu(temp7, temp1);
- masm.unpckhpd(temp7, temp7);
- masm.cvttsd2sil(gpr4, temp7);
- masm.cvttpd2dq(temp1, temp1);
- masm.cvtdq2pd(temp1, temp1);
- masm.mulpd(temp1, temp6);
- masm.movdqu(temp3, externalAddress(pOneTanPtr)); // 0x54444000,
- // 0x3fb921fb,
- // 0x54440000,
- // 0x3fb921fb
- masm.movdq(temp5, externalAddress(qqTwoTanPtr)); // 0x676733af,
- // 0x3d32e7b9
- masm.addq(gpr4, 469248);
- masm.movdqu(temp4, externalAddress(pTwoTanPtr)); // 0x67674000,
- // 0xbd32e7b9,
- // 0x4c4c0000,
- // 0x3d468c23
- masm.mulpd(temp3, temp1);
- masm.andq(gpr4, 31);
- masm.mulsd(temp5, temp1);
- masm.movq(gpr3, gpr4);
- masm.mulpd(temp4, temp1);
- masm.shlq(gpr3, 1);
- masm.subpd(dest, temp3);
- masm.mulpd(temp1, externalAddress(pThreeTanPtr)); // 0x3707344a,
- // 0x3aa8a2e0,
- // 0x03707345,
- // 0x3ae98a2e
- masm.addq(gpr4, gpr3);
- masm.shlq(gpr3, 2);
- masm.addq(gpr4, gpr3);
- masm.addsd(temp5, dest);
- masm.movdqu(temp2, dest);
- masm.subpd(dest, temp4);
- masm.movdq(temp6, externalAddress(onePtr)); // 0x00000000,
- // 0x3ff00000
- masm.shlq(gpr4, 4);
- masm.leaq(gpr1, externalAddress(cTableTanPtr));
- masm.andpd(temp5, externalAddress(maskThirtyFiveTanPtr)); // 0xfffc0000,
- // 0xffffffff,
- // 0x00000000,
- // 0x00000000
- masm.movdqu(temp3, dest);
- masm.addq(gpr1, gpr4);
- masm.subpd(temp2, dest);
- masm.unpckhpd(dest, dest);
- masm.divsd(temp6, temp5);
- masm.subpd(temp2, temp4);
- masm.movdqu(temp7, new AMD64Address(gpr1, 16));
- masm.subsd(temp3, temp5);
- masm.mulpd(temp7, dest);
- masm.subpd(temp2, temp1);
- masm.movdqu(temp1, new AMD64Address(gpr1, 48));
- masm.mulpd(temp1, dest);
- masm.movdqu(temp4, new AMD64Address(gpr1, 96));
- masm.mulpd(temp4, dest);
- masm.addsd(temp2, temp3);
- masm.movdqu(temp3, dest);
- masm.mulpd(dest, dest);
- masm.addpd(temp7, new AMD64Address(gpr1, 0));
- masm.addpd(temp1, new AMD64Address(gpr1, 32));
- masm.mulpd(temp1, dest);
- masm.addpd(temp4, new AMD64Address(gpr1, 80));
- masm.addpd(temp7, temp1);
- masm.movdqu(temp1, new AMD64Address(gpr1, 112));
- masm.mulpd(temp1, dest);
- masm.mulpd(dest, dest);
- masm.addpd(temp4, temp1);
- masm.movdqu(temp1, new AMD64Address(gpr1, 64));
- masm.mulpd(temp1, dest);
- masm.addpd(temp7, temp1);
- masm.movdqu(temp1, temp3);
- masm.mulpd(temp3, dest);
- masm.mulsd(dest, dest);
- masm.mulpd(temp1, new AMD64Address(gpr1, 144));
- masm.mulpd(temp4, temp3);
- masm.movdqu(temp3, temp1);
- masm.addpd(temp7, temp4);
- masm.movdqu(temp4, temp1);
- masm.mulsd(dest, temp7);
- masm.unpckhpd(temp7, temp7);
- masm.addsd(dest, temp7);
- masm.unpckhpd(temp1, temp1);
- masm.addsd(temp3, temp1);
- masm.subsd(temp4, temp3);
- masm.addsd(temp1, temp4);
- masm.movdqu(temp4, temp2);
- masm.movdq(temp7, new AMD64Address(gpr1, 144));
- masm.unpckhpd(temp2, temp2);
- masm.addsd(temp7, new AMD64Address(gpr1, 152));
- masm.mulsd(temp7, temp2);
- masm.addsd(temp7, new AMD64Address(gpr1, 136));
- masm.addsd(temp7, temp1);
- masm.addsd(dest, temp7);
- masm.movdq(temp7, externalAddress(onePtr)); // 0x00000000,
- // 0x3ff00000
- masm.mulsd(temp4, temp6);
- masm.movdq(temp2, new AMD64Address(gpr1, 168));
- masm.andpd(temp2, temp6);
- masm.mulsd(temp5, temp2);
- masm.mulsd(temp6, new AMD64Address(gpr1, 160));
- masm.subsd(temp7, temp5);
- masm.subsd(temp2, new AMD64Address(gpr1, 128));
- masm.subsd(temp7, temp4);
- masm.mulsd(temp7, temp6);
- masm.movdqu(temp4, temp3);
- masm.subsd(temp3, temp2);
- masm.addsd(temp2, temp3);
- masm.subsd(temp4, temp2);
- masm.addsd(dest, temp4);
- masm.subsd(dest, temp7);
- masm.addsd(dest, temp3);
- masm.jmp(bb15);
-
- masm.bind(bb0);
- masm.jcc(ConditionFlag.Greater, bb1);
-
- masm.pextrw(gpr1, dest, 3);
- masm.movl(gpr4, gpr1);
- masm.andl(gpr1, 32752);
- masm.jcc(ConditionFlag.Equal, bb2);
-
- masm.andl(gpr4, 32767);
- masm.cmpl(gpr4, 15904);
- masm.jcc(ConditionFlag.Below, bb3);
-
- masm.movdqu(temp2, dest);
- masm.movdqu(temp3, dest);
- masm.movdq(temp1, externalAddress(qElevenTanPtr)); // 0xb8fe4d77,
- // 0x3f82609a
- masm.mulsd(temp2, dest);
- masm.mulsd(temp3, temp2);
- masm.mulsd(temp1, temp2);
- masm.addsd(temp1, externalAddress(qNineTanPtr)); // 0xbf847a43,
- // 0x3f9664a0
- masm.mulsd(temp1, temp2);
- masm.addsd(temp1, externalAddress(qSevenTanPtr)); // 0x52c4c8ab,
- // 0x3faba1ba
- masm.mulsd(temp1, temp2);
- masm.addsd(temp1, externalAddress(qFiveTanPtr)); // 0x11092746,
- // 0x3fc11111
- masm.mulsd(temp1, temp2);
- masm.addsd(temp1, externalAddress(qThreeTanPtr)); // 0x55555612,
- // 0x3fd55555
- masm.mulsd(temp1, temp3);
- masm.addsd(dest, temp1);
- masm.jmp(bb15);
-
- masm.bind(bb3);
- masm.movdq(temp3, externalAddress(twoPowFiftyFiveTanPtr)); // 0x00000000,
- // 0x43600000
- masm.mulsd(temp3, dest);
- masm.addsd(dest, temp3);
- masm.mulsd(dest, externalAddress(twoPowMFiftyFiveTanPtr)); // 0x00000000,
- // 0x3c800000
- masm.jmp(bb15);
-
- masm.bind(bb14);
- masm.xorpd(temp1, temp1);
- masm.xorpd(dest, dest);
- masm.divsd(dest, temp1);
- masm.jmp(bb15);
-
- masm.bind(bb2);
- masm.movdqu(temp1, dest);
- masm.mulsd(temp1, temp1);
- masm.jmp(bb15);
-
- masm.bind(bb1);
- masm.pextrw(gpr3, dest, 3);
- masm.andl(gpr3, 32752);
- masm.cmpl(gpr3, 32752);
- masm.jcc(ConditionFlag.Equal, bb14);
-
- masm.subl(gpr3, 16224);
- masm.shrl(gpr3, 7);
- masm.andl(gpr3, 65532);
- masm.leaq(gpr10, externalAddress(piInvTableTanPtr));
- masm.addq(gpr3, gpr10);
- masm.movdq(gpr1, dest);
- masm.movl(gpr9, new AMD64Address(gpr3, 20));
- masm.movl(gpr7, new AMD64Address(gpr3, 24));
- masm.movl(gpr4, gpr1);
- masm.shrq(gpr1, 21);
- masm.orl(gpr1, Integer.MIN_VALUE);
- masm.shrl(gpr1, 11);
- masm.movl(gpr8, gpr9);
- masm.imulq(gpr9, gpr4);
- masm.imulq(gpr8, gpr1);
- masm.imulq(gpr7, gpr1);
- masm.movl(gpr5, new AMD64Address(gpr3, 16));
- masm.movl(gpr6, new AMD64Address(gpr3, 12));
- masm.movl(gpr10, gpr9);
- masm.shrq(gpr9, 32);
- masm.addq(gpr8, gpr9);
- masm.addq(gpr10, gpr7);
- masm.movl(gpr7, gpr10);
- masm.shrq(gpr10, 32);
- masm.addq(gpr8, gpr10);
- masm.movl(gpr9, gpr5);
- masm.imulq(gpr5, gpr4);
- masm.imulq(gpr9, gpr1);
- masm.movl(gpr10, gpr6);
- masm.imulq(gpr6, gpr4);
- masm.movl(gpr2, gpr5);
- masm.shrq(gpr5, 32);
- masm.addq(gpr8, gpr2);
- masm.movl(gpr2, gpr8);
- masm.shrq(gpr8, 32);
- masm.addq(gpr9, gpr5);
- masm.addq(gpr9, gpr8);
- masm.shlq(gpr2, 32);
- masm.orq(gpr7, gpr2);
- masm.imulq(gpr10, gpr1);
- masm.movl(gpr8, new AMD64Address(gpr3, 8));
- masm.movl(gpr5, new AMD64Address(gpr3, 4));
- masm.movl(gpr2, gpr6);
- masm.shrq(gpr6, 32);
- masm.addq(gpr9, gpr2);
- masm.movl(gpr2, gpr9);
- masm.shrq(gpr9, 32);
- masm.addq(gpr10, gpr6);
- masm.addq(gpr10, gpr9);
- masm.movq(gpr6, gpr8);
- masm.imulq(gpr8, gpr4);
- masm.imulq(gpr6, gpr1);
- masm.movl(gpr9, gpr8);
- masm.shrq(gpr8, 32);
- masm.addq(gpr10, gpr9);
- masm.movl(gpr9, gpr10);
- masm.shrq(gpr10, 32);
- masm.addq(gpr6, gpr8);
- masm.addq(gpr6, gpr10);
- masm.movq(gpr8, gpr5);
- masm.imulq(gpr5, gpr4);
- masm.imulq(gpr8, gpr1);
- masm.shlq(gpr9, 32);
- masm.orq(gpr9, gpr2);
- masm.movl(gpr1, new AMD64Address(gpr3, 0));
- masm.movl(gpr10, gpr5);
- masm.shrq(gpr5, 32);
- masm.addq(gpr6, gpr10);
- masm.movl(gpr10, gpr6);
- masm.shrq(gpr6, 32);
- masm.addq(gpr8, gpr5);
- masm.addq(gpr8, gpr6);
- masm.imulq(gpr4, gpr1);
- masm.pextrw(gpr2, dest, 3);
- masm.leaq(gpr6, externalAddress(piInvTableTanPtr));
- masm.subq(gpr3, gpr6);
- masm.addl(gpr3, gpr3);
- masm.addl(gpr3, gpr3);
- masm.addl(gpr3, gpr3);
- masm.addl(gpr3, 19);
- masm.movl(gpr5, 32768);
- masm.andl(gpr5, gpr2);
- masm.shrl(gpr2, 4);
- masm.andl(gpr2, 2047);
- masm.subl(gpr2, 1023);
- masm.subl(gpr3, gpr2);
- masm.addq(gpr8, gpr4);
- masm.movl(gpr4, gpr3);
- masm.addl(gpr4, 32);
- masm.cmpl(gpr3, 0);
- masm.jcc(ConditionFlag.Less, bb5);
-
- masm.negl(gpr3);
- masm.addl(gpr3, 29);
- masm.shll(gpr8);
- masm.movl(gpr6, gpr8);
- masm.andl(gpr8, 1073741823);
- masm.testl(gpr8, 536870912);
- masm.jcc(ConditionFlag.NotEqual, bb6);
-
- masm.shrl(gpr8);
- masm.movl(gpr2, 0);
- masm.shlq(gpr8, 32);
- masm.orq(gpr8, gpr10);
-
- masm.bind(bb8);
- masm.cmpq(gpr8, 0);
- masm.jcc(ConditionFlag.Equal, bb9);
-
- masm.bind(bb10);
- masm.bsrq(gpr10, gpr8);
- masm.movl(gpr3, 29);
- masm.subl(gpr3, gpr10);
- masm.jcc(ConditionFlag.LessEqual, bb11);
-
- masm.shlq(gpr8);
- masm.movq(gpr1, gpr9);
- masm.shlq(gpr9);
- masm.addl(gpr4, gpr3);
- masm.negl(gpr3);
- masm.addl(gpr3, 64);
- masm.shrq(gpr1);
- masm.shrq(gpr7);
- masm.orq(gpr8, gpr1);
- masm.orq(gpr9, gpr7);
-
- masm.bind(bb12);
- masm.cvtsi2sdq(dest, gpr8);
- masm.shrq(gpr9, 1);
- masm.cvtsi2sdq(temp3, gpr9);
- masm.xorpd(temp4, temp4);
- masm.shll(gpr4, 4);
- masm.negl(gpr4);
- masm.addl(gpr4, 16368);
- masm.orl(gpr4, gpr5);
- masm.xorl(gpr4, gpr2);
- masm.pinsrw(temp4, gpr4, 3);
- masm.leaq(gpr1, externalAddress(piFourTanPtr));
- masm.movdq(temp2, new AMD64Address(gpr1, 0)); // 0x00000000,
- // 0x3fe921fb,
- masm.movdq(temp7, new AMD64Address(gpr1, 8)); // 0x4611a626,
- // 0x3e85110b
- masm.xorpd(temp5, temp5);
- masm.subl(gpr4, 1008);
- masm.pinsrw(temp5, gpr4, 3);
- masm.mulsd(dest, temp4);
- masm.shll(gpr5, 16);
- masm.sarl(gpr5, 31);
- masm.mulsd(temp3, temp5);
- masm.movdqu(temp1, dest);
- masm.mulsd(dest, temp2);
- masm.shrl(gpr6, 30);
- masm.addsd(temp1, temp3);
- masm.mulsd(temp3, temp2);
- masm.addl(gpr6, gpr5);
- masm.xorl(gpr6, gpr5);
- masm.mulsd(temp7, temp1);
- masm.movl(gpr1, gpr6);
- masm.addsd(temp7, temp3);
- masm.movdqu(temp2, dest);
- masm.addsd(dest, temp7);
- masm.subsd(temp2, dest);
- masm.addsd(temp7, temp2);
- masm.movdqu(temp1, externalAddress(piThirtyTwoInvTanPtr)); // 0x6dc9c883,
- // 0x3fe45f30,
- // 0x6dc9c883,
- // 0x40245f30
- if (masm.supports(CPUFeature.SSE3)) {
- masm.movddup(dest, dest);
- } else {
- masm.movlhps(dest, dest);
- }
- masm.movdqu(temp4, externalAddress(signMaskTanPtr)); // 0x00000000,
- // 0x80000000,
- // 0x00000000,
- // 0x80000000
- masm.andpd(temp4, dest);
- masm.mulpd(temp1, dest);
- if (masm.supports(CPUFeature.SSE3)) {
- masm.movddup(temp7, temp7);
- } else {
- masm.movlhps(temp7, temp7);
- }
- masm.movdqu(temp5, externalAddress(oneHalfTanPtr)); // 0x00000000,
- // 0x3fe00000,
- // 0x00000000,
- // 0x3fe00000
- masm.movdqu(temp6, externalAddress(mulSixteenPtr)); // 0x00000000,
- // 0x40300000,
- // 0x00000000,
- // 0x3ff00000
- masm.por(temp5, temp4);
- masm.addpd(temp1, temp5);
- masm.movdqu(temp5, temp1);
- masm.unpckhpd(temp5, temp5);
- masm.cvttsd2sil(gpr4, temp5);
- masm.cvttpd2dq(temp1, temp1);
- masm.cvtdq2pd(temp1, temp1);
- masm.mulpd(temp1, temp6);
- masm.movdqu(temp3, externalAddress(pOneTanPtr)); // 0x54444000,
- // 0x3fb921fb,
- // 0x54440000,
- // 0x3fb921fb
- masm.movdq(temp5, externalAddress(qqTwoTanPtr)); // 0x676733af,
- // 0x3d32e7b9
- masm.shll(gpr1, 4);
- masm.addl(gpr4, 469248);
- masm.movdqu(temp4, externalAddress(pTwoTanPtr)); // 0x67674000,
- // 0xbd32e7b9,
- // 0x4c4c0000,
- // 0x3d468c23
- masm.mulpd(temp3, temp1);
- masm.addl(gpr4, gpr1);
- masm.andl(gpr4, 31);
- masm.mulsd(temp5, temp1);
- masm.movl(gpr3, gpr4);
- masm.mulpd(temp4, temp1);
- masm.shll(gpr3, 1);
- masm.subpd(dest, temp3);
- masm.mulpd(temp1, externalAddress(pThreeTanPtr)); // 0x3707344a,
- // 0x3aa8a2e0,
- // 0x03707345,
- // 0x3ae98a2e
- masm.addl(gpr4, gpr3);
- masm.shll(gpr3, 2);
- masm.addl(gpr4, gpr3);
- masm.addsd(temp5, dest);
- masm.movdqu(temp2, dest);
- masm.subpd(dest, temp4);
- masm.movdq(temp6, externalAddress(onePtr)); // 0x00000000,
- // 0x3ff00000
- masm.shll(gpr4, 4);
- masm.leaq(gpr1, externalAddress(cTableTanPtr));
- masm.andpd(temp5, externalAddress(maskThirtyFiveTanPtr)); // 0xfffc0000,
- // 0xffffffff,
- // 0x00000000,
- // 0x00000000
- masm.movdqu(temp3, dest);
- masm.addq(gpr1, gpr4);
- masm.subpd(temp2, dest);
- masm.unpckhpd(dest, dest);
- masm.divsd(temp6, temp5);
- masm.subpd(temp2, temp4);
- masm.subsd(temp3, temp5);
- masm.subpd(temp2, temp1);
- masm.movdqu(temp1, new AMD64Address(gpr1, 48));
- masm.addpd(temp2, temp7);
- masm.movdqu(temp7, new AMD64Address(gpr1, 16));
- masm.mulpd(temp7, dest);
- masm.movdqu(temp4, new AMD64Address(gpr1, 96));
- masm.mulpd(temp1, dest);
- masm.mulpd(temp4, dest);
- masm.addsd(temp2, temp3);
- masm.movdqu(temp3, dest);
- masm.mulpd(dest, dest);
- masm.addpd(temp7, new AMD64Address(gpr1, 0));
- masm.addpd(temp1, new AMD64Address(gpr1, 32));
- masm.mulpd(temp1, dest);
- masm.addpd(temp4, new AMD64Address(gpr1, 80));
- masm.addpd(temp7, temp1);
- masm.movdqu(temp1, new AMD64Address(gpr1, 112));
- masm.mulpd(temp1, dest);
- masm.mulpd(dest, dest);
- masm.addpd(temp4, temp1);
- masm.movdqu(temp1, new AMD64Address(gpr1, 64));
- masm.mulpd(temp1, dest);
- masm.addpd(temp7, temp1);
- masm.movdqu(temp1, temp3);
- masm.mulpd(temp3, dest);
- masm.mulsd(dest, dest);
- masm.mulpd(temp1, new AMD64Address(gpr1, 144));
- masm.mulpd(temp4, temp3);
- masm.movdqu(temp3, temp1);
- masm.addpd(temp7, temp4);
- masm.movdqu(temp4, temp1);
- masm.mulsd(dest, temp7);
- masm.unpckhpd(temp7, temp7);
- masm.addsd(dest, temp7);
- masm.unpckhpd(temp1, temp1);
- masm.addsd(temp3, temp1);
- masm.subsd(temp4, temp3);
- masm.addsd(temp1, temp4);
- masm.movdqu(temp4, temp2);
- masm.movdq(temp7, new AMD64Address(gpr1, 144));
- masm.unpckhpd(temp2, temp2);
- masm.addsd(temp7, new AMD64Address(gpr1, 152));
- masm.mulsd(temp7, temp2);
- masm.addsd(temp7, new AMD64Address(gpr1, 136));
- masm.addsd(temp7, temp1);
- masm.addsd(dest, temp7);
- masm.movdq(temp7, externalAddress(onePtr)); // 0x00000000,
- // 0x3ff00000
- masm.mulsd(temp4, temp6);
- masm.movdq(temp2, new AMD64Address(gpr1, 168));
- masm.andpd(temp2, temp6);
- masm.mulsd(temp5, temp2);
- masm.mulsd(temp6, new AMD64Address(gpr1, 160));
- masm.subsd(temp7, temp5);
- masm.subsd(temp2, new AMD64Address(gpr1, 128));
- masm.subsd(temp7, temp4);
- masm.mulsd(temp7, temp6);
- masm.movdqu(temp4, temp3);
- masm.subsd(temp3, temp2);
- masm.addsd(temp2, temp3);
- masm.subsd(temp4, temp2);
- masm.addsd(dest, temp4);
- masm.subsd(dest, temp7);
- masm.addsd(dest, temp3);
- masm.jmp(bb15);
-
- masm.bind(bb9);
- masm.addl(gpr4, 64);
- masm.movq(gpr8, gpr9);
- masm.movq(gpr9, gpr7);
- masm.movl(gpr7, 0);
- masm.cmpq(gpr8, 0);
- masm.jcc(ConditionFlag.NotEqual, bb10);
-
- masm.addl(gpr4, 64);
- masm.movq(gpr8, gpr9);
- masm.movq(gpr9, gpr7);
- masm.cmpq(gpr8, 0);
- masm.jcc(ConditionFlag.NotEqual, bb10);
-
- masm.jmp(bb12);
-
- masm.bind(bb11);
- masm.jcc(ConditionFlag.Equal, bb12);
-
- masm.negl(gpr3);
- masm.shrq(gpr9);
- masm.movq(gpr1, gpr8);
- masm.shrq(gpr8);
- masm.subl(gpr4, gpr3);
- masm.negl(gpr3);
- masm.addl(gpr3, 64);
- masm.shlq(gpr1);
- masm.orq(gpr9, gpr1);
- masm.jmp(bb12);
-
- masm.bind(bb5);
- masm.notl(gpr3);
- masm.shlq(gpr8, 32);
- masm.orq(gpr8, gpr10);
- masm.shlq(gpr8);
- masm.movq(gpr6, gpr8);
- masm.testl(gpr8, Integer.MIN_VALUE);
- masm.jcc(ConditionFlag.NotEqual, bb13);
-
- masm.shrl(gpr8);
- masm.movl(gpr2, 0);
- masm.shrq(gpr6, 2);
- masm.jmp(bb8);
-
- masm.bind(bb6);
- masm.shrl(gpr8);
- masm.movl(gpr2, 1073741824);
- masm.shrl(gpr2);
- masm.shlq(gpr8, 32);
- masm.orq(gpr8, gpr10);
- masm.shlq(gpr2, 32);
- masm.addl(gpr6, 1073741824);
- masm.movl(gpr3, 0);
- masm.movl(gpr10, 0);
- masm.subq(gpr3, gpr7);
- masm.sbbq(gpr10, gpr9);
- masm.sbbq(gpr2, gpr8);
- masm.movq(gpr7, gpr3);
- masm.movq(gpr9, gpr10);
- masm.movq(gpr8, gpr2);
- masm.movl(gpr2, 32768);
- masm.jmp(bb8);
-
- masm.bind(bb13);
- masm.shrl(gpr8);
- masm.movq(gpr2, 0x100000000L);
- masm.shrq(gpr2);
- masm.movl(gpr3, 0);
- masm.movl(gpr10, 0);
- masm.subq(gpr3, gpr7);
- masm.sbbq(gpr10, gpr9);
- masm.sbbq(gpr2, gpr8);
- masm.movq(gpr7, gpr3);
- masm.movq(gpr9, gpr10);
- masm.movq(gpr8, gpr2);
- masm.movl(gpr2, 32768);
- masm.shrq(gpr6, 2);
- masm.addl(gpr6, 1073741824);
- masm.jmp(bb8);
-
- masm.bind(bb15);
- }
-
- /*
- * Copyright (c) 2014, 2016, Intel Corporation. All rights reserved. Intel Math Library (LIBM)
- * Source Code
- *
- * ALGORITHM DESCRIPTION - EXP() ---------------------
- *
- * Description: Let K = 64 (table size). x x/log(2) n e = 2 = 2 * T[j] * (1 + P(y)) where x =
- * m*log(2)/K + y, y in [-log(2)/K..log(2)/K] m = n*K + j, m,n,j - signed integer, j in
- * [-K/2..K/2] j/K values of 2 are tabulated as T[j] = T_hi[j] ( 1 + T_lo[j]).
- *
- * P(y) is a minimax polynomial approximation of exp(x)-1 on small interval
- * [-log(2)/K..log(2)/K] (were calculated by Maple V).
- *
- * To avoid problems with arithmetic overflow and underflow, n n1 n2 value of 2 is safely
- * computed as 2 * 2 where n1 in [-BIAS/2..BIAS/2] where BIAS is a value of exponent bias.
- *
- * Special cases: exp(NaN) = NaN exp(+INF) = +INF exp(-INF) = 0 exp(x) = 1 for subnormals for
- * finite argument, only exp(0)=1 is exact For IEEE double if x > 709.782712893383973096 then
- * exp(x) overflow if x < -745.133219101941108420 then exp(x) underflow
- *
- */
-
- private static int[] cvExp = {
- 0x652b82fe, 0x40571547, 0x652b82fe, 0x40571547, 0xfefa0000,
- 0x3f862e42, 0xfefa0000, 0x3f862e42, 0xbc9e3b3a, 0x3d1cf79a,
- 0xbc9e3b3a, 0x3d1cf79a, 0xfffffffe, 0x3fdfffff, 0xfffffffe,
- 0x3fdfffff, 0xe3289860, 0x3f56c15c, 0x555b9e25, 0x3fa55555,
- 0xc090cf0f, 0x3f811115, 0x55548ba1, 0x3fc55555
- };
-
- private static int[] shifterExp = {
- 0x00000000, 0x43380000, 0x00000000, 0x43380000
- };
-
- private static int[] mMaskExp = {
- 0xffffffc0, 0x00000000, 0xffffffc0, 0x00000000
- };
-
- private static int[] biasExp = {
- 0x0000ffc0, 0x00000000, 0x0000ffc0, 0x00000000
- };
-
- private static int[] tblAddrExp = {
- 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x0e03754d,
- 0x3cad7bbf, 0x3e778060, 0x00002c9a, 0x3567f613, 0x3c8cd252,
- 0xd3158574, 0x000059b0, 0x61e6c861, 0x3c60f74e, 0x18759bc8,
- 0x00008745, 0x5d837b6c, 0x3c979aa6, 0x6cf9890f, 0x0000b558,
- 0x702f9cd1, 0x3c3ebe3d, 0x32d3d1a2, 0x0000e3ec, 0x1e63bcd8,
- 0x3ca3516e, 0xd0125b50, 0x00011301, 0x26f0387b, 0x3ca4c554,
- 0xaea92ddf, 0x0001429a, 0x62523fb6, 0x3ca95153, 0x3c7d517a,
- 0x000172b8, 0x3f1353bf, 0x3c8b898c, 0xeb6fcb75, 0x0001a35b,
- 0x3e3a2f5f, 0x3c9aecf7, 0x3168b9aa, 0x0001d487, 0x44a6c38d,
- 0x3c8a6f41, 0x88628cd6, 0x0002063b, 0xe3a8a894, 0x3c968efd,
- 0x6e756238, 0x0002387a, 0x981fe7f2, 0x3c80472b, 0x65e27cdd,
- 0x00026b45, 0x6d09ab31, 0x3c82f7e1, 0xf51fdee1, 0x00029e9d,
- 0x720c0ab3, 0x3c8b3782, 0xa6e4030b, 0x0002d285, 0x4db0abb6,
- 0x3c834d75, 0x0a31b715, 0x000306fe, 0x5dd3f84a, 0x3c8fdd39,
- 0xb26416ff, 0x00033c08, 0xcc187d29, 0x3ca12f8c, 0x373aa9ca,
- 0x000371a7, 0x738b5e8b, 0x3ca7d229, 0x34e59ff6, 0x0003a7db,
- 0xa72a4c6d, 0x3c859f48, 0x4c123422, 0x0003dea6, 0x259d9205,
- 0x3ca8b846, 0x21f72e29, 0x0004160a, 0x60c2ac12, 0x3c4363ed,
- 0x6061892d, 0x00044e08, 0xdaa10379, 0x3c6ecce1, 0xb5c13cd0,
- 0x000486a2, 0xbb7aafb0, 0x3c7690ce, 0xd5362a27, 0x0004bfda,
- 0x9b282a09, 0x3ca083cc, 0x769d2ca6, 0x0004f9b2, 0xc1aae707,
- 0x3ca509b0, 0x569d4f81, 0x0005342b, 0x18fdd78e, 0x3c933505,
- 0x36b527da, 0x00056f47, 0xe21c5409, 0x3c9063e1, 0xdd485429,
- 0x0005ab07, 0x2b64c035, 0x3c9432e6, 0x15ad2148, 0x0005e76f,
- 0x99f08c0a, 0x3ca01284, 0xb03a5584, 0x0006247e, 0x0073dc06,
- 0x3c99f087, 0x82552224, 0x00066238, 0x0da05571, 0x3c998d4d,
- 0x667f3bcc, 0x0006a09e, 0x86ce4786, 0x3ca52bb9, 0x3c651a2e,
- 0x0006dfb2, 0x206f0dab, 0x3ca32092, 0xe8ec5f73, 0x00071f75,
- 0x8e17a7a6, 0x3ca06122, 0x564267c8, 0x00075feb, 0x461e9f86,
- 0x3ca244ac, 0x73eb0186, 0x0007a114, 0xabd66c55, 0x3c65ebe1,
- 0x36cf4e62, 0x0007e2f3, 0xbbff67d0, 0x3c96fe9f, 0x994cce12,
- 0x00082589, 0x14c801df, 0x3c951f14, 0x9b4492ec, 0x000868d9,
- 0xc1f0eab4, 0x3c8db72f, 0x422aa0db, 0x0008ace5, 0x59f35f44,
- 0x3c7bf683, 0x99157736, 0x0008f1ae, 0x9c06283c, 0x3ca360ba,
- 0xb0cdc5e4, 0x00093737, 0x20f962aa, 0x3c95e8d1, 0x9fde4e4f,
- 0x00097d82, 0x2b91ce27, 0x3c71affc, 0x82a3f090, 0x0009c491,
- 0x589a2ebd, 0x3c9b6d34, 0x7b5de564, 0x000a0c66, 0x9ab89880,
- 0x3c95277c, 0xb23e255c, 0x000a5503, 0x6e735ab3, 0x3c846984,
- 0x5579fdbf, 0x000a9e6b, 0x92cb3387, 0x3c8c1a77, 0x995ad3ad,
- 0x000ae89f, 0xdc2d1d96, 0x3ca22466, 0xb84f15fa, 0x000b33a2,
- 0xb19505ae, 0x3ca1112e, 0xf2fb5e46, 0x000b7f76, 0x0a5fddcd,
- 0x3c74ffd7, 0x904bc1d2, 0x000bcc1e, 0x30af0cb3, 0x3c736eae,
- 0xdd85529c, 0x000c199b, 0xd10959ac, 0x3c84e08f, 0x2e57d14b,
- 0x000c67f1, 0x6c921968, 0x3c676b2c, 0xdcef9069, 0x000cb720,
- 0x36df99b3, 0x3c937009, 0x4a07897b, 0x000d072d, 0xa63d07a7,
- 0x3c74a385, 0xdcfba487, 0x000d5818, 0xd5c192ac, 0x3c8e5a50,
- 0x03db3285, 0x000da9e6, 0x1c4a9792, 0x3c98bb73, 0x337b9b5e,
- 0x000dfc97, 0x603a88d3, 0x3c74b604, 0xe78b3ff6, 0x000e502e,
- 0x92094926, 0x3c916f27, 0xa2a490d9, 0x000ea4af, 0x41aa2008,
- 0x3c8ec3bc, 0xee615a27, 0x000efa1b, 0x31d185ee, 0x3c8a64a9,
- 0x5b6e4540, 0x000f5076, 0x4d91cd9d, 0x3c77893b, 0x819e90d8,
- 0x000fa7c1
- };
-
- private static int[] allOnesExp = {
- 0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff
- };
-
- private static int[] expBias = {
- 0x00000000, 0x3ff00000, 0x00000000, 0x3ff00000
- };
-
- private static int[] xMaxExp = {
- 0xffffffff, 0x7fefffff
- };
-
- private static int[] xMinExp = {
- 0x00000000, 0x00100000
- };
-
- private static int[] infExp = {
- 0x00000000, 0x7ff00000
- };
-
- private static int[] zeroExp = {
- 0x00000000, 0x00000000
- };
-
- public void expIntrinsic(Register dest, Register value, CompilationResultBuilder crb, AMD64MacroAssembler masm) {
- ArrayDataPointerConstant onePtr = new ArrayDataPointerConstant(one, 16);
- ArrayDataPointerConstant cvExpPtr = new ArrayDataPointerConstant(cvExp, 16);
- ArrayDataPointerConstant shifterExpPtr = new ArrayDataPointerConstant(shifterExp, 8);
- ArrayDataPointerConstant mMaskExpPtr = new ArrayDataPointerConstant(mMaskExp, 16);
- ArrayDataPointerConstant biasExpPtr = new ArrayDataPointerConstant(biasExp, 16);
- ArrayDataPointerConstant tblAddrExpPtr = new ArrayDataPointerConstant(tblAddrExp, 16);
- ArrayDataPointerConstant expBiasPtr = new ArrayDataPointerConstant(expBias, 8);
- ArrayDataPointerConstant xMaxExpPtr = new ArrayDataPointerConstant(xMaxExp, 8);
- ArrayDataPointerConstant xMinExpPtr = new ArrayDataPointerConstant(xMinExp, 8);
- ArrayDataPointerConstant infExpPtr = new ArrayDataPointerConstant(infExp, 8);
- ArrayDataPointerConstant zeroExpPtr = new ArrayDataPointerConstant(zeroExp, 8);
- ArrayDataPointerConstant allOnesExpPtr = new ArrayDataPointerConstant(allOnesExp, 8);
-
- Label bb0 = new Label();
- Label bb1 = new Label();
- Label bb2 = new Label();
- Label bb3 = new Label();
- Label bb4 = new Label();
- Label bb5 = new Label();
- Label bb7 = new Label();
- Label bb8 = new Label();
- Label bb9 = new Label();
- Label bb10 = new Label();
- Label bb11 = new Label();
- Label bb12 = new Label();
- Label bb14 = new Label();
-
- Register gpr1 = asRegister(gpr1Temp, AMD64Kind.QWORD);
- Register gpr2 = asRegister(gpr2Temp, AMD64Kind.QWORD);
- Register gpr3 = asRegister(rcxTemp, AMD64Kind.QWORD);
- Register gpr4 = asRegister(gpr4Temp, AMD64Kind.QWORD);
- Register gpr5 = asRegister(gpr5Temp, AMD64Kind.QWORD);
-
- Register temp1 = asRegister(xmm1Temp, AMD64Kind.DOUBLE);
- Register temp2 = asRegister(xmm2Temp, AMD64Kind.DOUBLE);
- Register temp3 = asRegister(xmm3Temp, AMD64Kind.DOUBLE);
- Register temp4 = asRegister(xmm4Temp, AMD64Kind.DOUBLE);
- Register temp5 = asRegister(xmm5Temp, AMD64Kind.DOUBLE);
- Register temp6 = asRegister(xmm6Temp, AMD64Kind.DOUBLE);
- Register temp7 = asRegister(xmm7Temp, AMD64Kind.DOUBLE);
- Register temp8 = asRegister(xmm8Temp, AMD64Kind.DOUBLE);
- Register temp9 = asRegister(xmm9Temp, AMD64Kind.DOUBLE);
- Register temp10 = asRegister(xmm10Temp, AMD64Kind.DOUBLE);
-
- AMD64Address stackSlot = (AMD64Address) crb.asAddress(stackTemp);
-
- setCrb(crb);
- masm.movsd(stackSlot, value);
- if (dest.encoding != value.encoding) {
- masm.movdqu(dest, value);
- }
-
- masm.movdqu(temp9, externalAddress(mMaskExpPtr)); // 0xffffffc0,
- // 0x00000000,
- // 0xffffffc0,
- // 0x00000000
- masm.movdqu(temp10, externalAddress(biasExpPtr)); // 0x0000ffc0,
- // 0x00000000,
- // 0x0000ffc0,
- // 0x00000000
- masm.unpcklpd(dest, dest);
- masm.leaq(gpr5, stackSlot);
- masm.leaq(gpr2, externalAddress(cvExpPtr));
- masm.movdqu(temp1, new AMD64Address(gpr2, 0)); // 0x652b82fe,
- // 0x40571547,
- // 0x652b82fe,
- // 0x40571547
- masm.movdqu(temp6, externalAddress(shifterExpPtr)); // 0x00000000,
- // 0x43380000,
- // 0x00000000,
- // 0x43380000
- masm.movdqu(temp2, new AMD64Address(gpr2, 16)); // 0xfefa0000,
- // 0x3f862e42,
- // 0xfefa0000,
- // 0x3f862e42
- masm.movdqu(temp3, new AMD64Address(gpr2, 32)); // 0xbc9e3b3a,
- // 0x3d1cf79a,
- // 0xbc9e3b3a,
- // 0x3d1cf79a
- masm.pextrw(gpr1, dest, 3);
- masm.andl(gpr1, 32767);
- masm.movl(gpr4, 16527);
- masm.subl(gpr4, gpr1);
- masm.subl(gpr1, 15504);
- masm.orl(gpr4, gpr1);
- masm.cmpl(gpr4, Integer.MIN_VALUE);
- masm.jcc(ConditionFlag.AboveEqual, bb0);
-
- masm.leaq(gpr4, externalAddress(tblAddrExpPtr));
- masm.movdqu(temp8, new AMD64Address(gpr2, 48)); // 0xfffffffe,
- // 0x3fdfffff,
- // 0xfffffffe,
- // 0x3fdfffff
- masm.movdqu(temp4, new AMD64Address(gpr2, 64)); // 0xe3289860,
- // 0x3f56c15c,
- // 0x555b9e25,
- // 0x3fa55555
- masm.movdqu(temp5, new AMD64Address(gpr2, 80)); // 0xc090cf0f,
- // 0x3f811115,
- // 0x55548ba1,
- // 0x3fc55555
- masm.mulpd(temp1, dest);
- masm.addpd(temp1, temp6);
- masm.movapd(temp7, temp1);
- masm.movdl(gpr1, temp1);
- masm.pand(temp7, temp9);
- masm.subpd(temp1, temp6);
- masm.mulpd(temp2, temp1);
- masm.mulpd(temp3, temp1);
- masm.paddq(temp7, temp10);
- masm.subpd(dest, temp2);
- masm.movl(gpr3, gpr1);
- masm.andl(gpr3, 63);
- masm.shll(gpr3, 4);
- masm.movdqu(temp2, new AMD64Address(gpr3, gpr4, Scale.Times1, 0));
- masm.sarl(gpr1, 6);
- masm.psllq(temp7, 46);
- masm.subpd(dest, temp3);
- masm.mulpd(temp4, dest);
- masm.movl(gpr4, gpr1);
- masm.movapd(temp6, dest);
- masm.movapd(temp1, dest);
- masm.mulpd(temp6, temp6);
- masm.mulpd(dest, temp6);
- masm.addpd(temp5, temp4);
- masm.mulsd(dest, temp6);
- masm.mulpd(temp6, temp8);
- masm.addsd(temp1, temp2);
- masm.unpckhpd(temp2, temp2);
- masm.mulpd(dest, temp5);
- masm.addsd(temp1, dest);
- masm.por(temp2, temp7);
- masm.unpckhpd(dest, dest);
- masm.addsd(dest, temp1);
- masm.addsd(dest, temp6);
- masm.addl(gpr4, 894);
- masm.cmpl(gpr4, 1916);
- masm.jcc(ConditionFlag.Above, bb1);
-
- masm.mulsd(dest, temp2);
- masm.addsd(dest, temp2);
- masm.jmp(bb14);
-
- masm.bind(bb1);
- masm.movdqu(temp6, externalAddress(expBiasPtr)); // 0x00000000,
- // 0x3ff00000,
- // 0x00000000,
- // 0x3ff00000
- masm.xorpd(temp3, temp3);
- masm.movdqu(temp4, externalAddress(allOnesExpPtr)); // 0xffffffff,
- // 0xffffffff,
- // 0xffffffff,
- // 0xffffffff
- masm.movl(gpr4, -1022);
- masm.subl(gpr4, gpr1);
- masm.movdl(temp5, gpr4);
- masm.psllq(temp4, temp5);
- masm.movl(gpr3, gpr1);
- masm.sarl(gpr1, 1);
- masm.pinsrw(temp3, gpr1, 3);
- masm.psllq(temp3, 4);
- masm.psubd(temp2, temp3);
- masm.mulsd(dest, temp2);
- masm.cmpl(gpr4, 52);
- masm.jcc(ConditionFlag.Greater, bb2);
-
- masm.pand(temp4, temp2);
- masm.paddd(temp3, temp6);
- masm.subsd(temp2, temp4);
- masm.addsd(dest, temp2);
- masm.cmpl(gpr3, 1023);
- masm.jcc(ConditionFlag.GreaterEqual, bb3);
-
- masm.pextrw(gpr3, dest, 3);
- masm.andl(gpr3, 32768);
- masm.orl(gpr4, gpr3);
- masm.cmpl(gpr4, 0);
- masm.jcc(ConditionFlag.Equal, bb4);
-
- masm.movapd(temp6, dest);
- masm.addsd(dest, temp4);
- masm.mulsd(dest, temp3);
- masm.pextrw(gpr3, dest, 3);
- masm.andl(gpr3, 32752);
- masm.cmpl(gpr3, 0);
- masm.jcc(ConditionFlag.Equal, bb5);
-
- masm.jmp(bb14);
-
- masm.bind(bb5);
- masm.mulsd(temp6, temp3);
- masm.mulsd(temp4, temp3);
- masm.movdqu(dest, temp6);
- masm.pxor(temp6, temp4);
- masm.psrad(temp6, 31);
- masm.pshufd(temp6, temp6, 85);
- masm.psllq(dest, 1);
- masm.psrlq(dest, 1);
- masm.pxor(dest, temp6);
- masm.psrlq(temp6, 63);
- masm.paddq(dest, temp6);
- masm.paddq(dest, temp4);
- masm.jmp(bb14);
-
- masm.bind(bb4);
- masm.addsd(dest, temp4);
- masm.mulsd(dest, temp3);
- masm.jmp(bb14);
-
- masm.bind(bb3);
- masm.addsd(dest, temp4);
- masm.mulsd(dest, temp3);
- masm.pextrw(gpr3, dest, 3);
- masm.andl(gpr3, 32752);
- masm.cmpl(gpr3, 32752);
- masm.jcc(ConditionFlag.AboveEqual, bb7);
-
- masm.jmp(bb14);
-
- masm.bind(bb2);
- masm.paddd(temp3, temp6);
- masm.addpd(dest, temp2);
- masm.mulsd(dest, temp3);
- masm.jmp(bb14);
-
- masm.bind(bb8);
- masm.movsd(dest, externalAddress(xMaxExpPtr)); // 0xffffffff,
- // 0x7fefffff
- masm.movsd(temp8, externalAddress(xMinExpPtr)); // 0x00000000,
- // 0x00100000
- masm.cmpl(gpr1, 2146435072);
- masm.jcc(ConditionFlag.AboveEqual, bb9);
-
- masm.movl(gpr1, new AMD64Address(gpr5, 4));
- masm.cmpl(gpr1, Integer.MIN_VALUE);
- masm.jcc(ConditionFlag.AboveEqual, bb10);
-
- masm.mulsd(dest, dest);
-
- masm.bind(bb7);
- masm.jmp(bb14);
-
- masm.bind(bb10);
- masm.mulsd(dest, temp8);
- masm.jmp(bb14);
-
- masm.bind(bb9);
- masm.movl(gpr4, stackSlot);
- masm.cmpl(gpr1, 2146435072);
- masm.jcc(ConditionFlag.Above, bb11);
-
- masm.cmpl(gpr4, 0);
- masm.jcc(ConditionFlag.NotEqual, bb11);
-
- masm.movl(gpr1, new AMD64Address(gpr5, 4));
- masm.cmpl(gpr1, 2146435072);
- masm.jcc(ConditionFlag.NotEqual, bb12);
-
- masm.movsd(dest, externalAddress(infExpPtr)); // 0x00000000,
- // 0x7ff00000
- masm.jmp(bb14);
-
- masm.bind(bb12);
- masm.movsd(dest, externalAddress(zeroExpPtr)); // 0x00000000,
- // 0x00000000
- masm.jmp(bb14);
-
- masm.bind(bb11);
- masm.movsd(dest, stackSlot);
- masm.addsd(dest, dest);
- masm.jmp(bb14);
-
- masm.bind(bb0);
- masm.movl(gpr1, new AMD64Address(gpr5, 4));
- masm.andl(gpr1, 2147483647);
- masm.cmpl(gpr1, 1083179008);
- masm.jcc(ConditionFlag.AboveEqual, bb8);
-
- masm.addsd(dest, externalAddress(onePtr)); // 0x00000000,
- // 0x3ff00000
- masm.bind(bb14);
- }
}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir.amd64/src/org/graalvm/compiler/lir/amd64/AMD64MathLog10Op.java Sat Mar 16 21:00:45 2019 +0000
@@ -0,0 +1,424 @@
+/*
+ * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, Intel Corporation. All rights reserved.
+ * Intel Math Library (LIBM) Source Code
+ * 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.
+ */
+
+
+package org.graalvm.compiler.lir.amd64;
+
+import static jdk.vm.ci.amd64.AMD64.r11;
+import static jdk.vm.ci.amd64.AMD64.r8;
+import static jdk.vm.ci.amd64.AMD64.rax;
+import static jdk.vm.ci.amd64.AMD64.rcx;
+import static jdk.vm.ci.amd64.AMD64.rdx;
+import static jdk.vm.ci.amd64.AMD64.rsp;
+import static jdk.vm.ci.amd64.AMD64.xmm0;
+import static jdk.vm.ci.amd64.AMD64.xmm1;
+import static jdk.vm.ci.amd64.AMD64.xmm2;
+import static jdk.vm.ci.amd64.AMD64.xmm3;
+import static jdk.vm.ci.amd64.AMD64.xmm4;
+import static jdk.vm.ci.amd64.AMD64.xmm5;
+import static jdk.vm.ci.amd64.AMD64.xmm6;
+import static jdk.vm.ci.amd64.AMD64.xmm7;
+import static org.graalvm.compiler.lir.amd64.AMD64HotSpotHelper.pointerConstant;
+import static org.graalvm.compiler.lir.amd64.AMD64HotSpotHelper.recordExternalAddress;
+
+import org.graalvm.compiler.asm.Label;
+import org.graalvm.compiler.asm.amd64.AMD64Address;
+import org.graalvm.compiler.asm.amd64.AMD64Assembler;
+import org.graalvm.compiler.asm.amd64.AMD64MacroAssembler;
+import org.graalvm.compiler.lir.LIRInstructionClass;
+import org.graalvm.compiler.lir.asm.ArrayDataPointerConstant;
+import org.graalvm.compiler.lir.asm.CompilationResultBuilder;
+
+/**
+ * <pre>
+ * ALGORITHM DESCRIPTION - LOG10()
+ * ---------------------
+ *
+ * Let x=2^k * mx, mx in [1,2)
+ *
+ * Get B~1/mx based on the output of rcpss instruction (B0)
+ * B = int((B0*LH*2^7+0.5))/2^7
+ * LH is a short approximation for log10(e)
+ *
+ * Reduced argument: r=B*mx-LH (computed accurately in high and low parts)
+ *
+ * Result: k*log10(2) - log(B) + p(r)
+ * p(r) is a degree 7 polynomial
+ * -log(B) read from data table (high, low parts)
+ * Result is formed from high and low parts.
+ *
+ * Special cases:
+ * log10(0) = -INF with divide-by-zero exception raised
+ * log10(1) = +0
+ * log10(x) = NaN with invalid exception raised if x < -0, including -INF
+ * log10(+INF) = +INF
+ * </pre>
+ */
+public final class AMD64MathLog10Op extends AMD64MathIntrinsicUnaryOp {
+
+ public static final LIRInstructionClass<AMD64MathLog10Op> TYPE = LIRInstructionClass.create(AMD64MathLog10Op.class);
+
+ public AMD64MathLog10Op() {
+ super(TYPE, /* GPR */ rax, rcx, rdx, r8, r11,
+ /* XMM */ xmm1, xmm2, xmm3, xmm4, xmm5, xmm6, xmm7);
+ }
+
+ private ArrayDataPointerConstant highsigmask = pointerConstant(16, new int[]{
+ // @formatter:off
+ 0xf8000000, 0xffffffff, 0x00000000, 0xffffe000
+ // @formatter:on
+ });
+
+ private ArrayDataPointerConstant log10E = pointerConstant(8, new int[]{
+ // @formatter:off
+ 0x00000000, 0x3fdbc000,
+ });
+ private ArrayDataPointerConstant log10E8 = pointerConstant(8, new int[]{
+ 0xbf2e4108, 0x3f5a7a6c
+ // @formatter:on
+ });
+
+ private ArrayDataPointerConstant lTbl = pointerConstant(16, new int[]{
+ // @formatter:off
+ 0x509f7800, 0x3fd34413, 0x1f12b358, 0x3d1fef31, 0x80333400,
+ 0x3fd32418, 0xc671d9d0, 0xbcf542bf, 0x51195000, 0x3fd30442,
+ 0x78a4b0c3, 0x3d18216a, 0x6fc79400, 0x3fd2e490, 0x80fa389d,
+ 0xbc902869, 0x89d04000, 0x3fd2c502, 0x75c2f564, 0x3d040754,
+ 0x4ddd1c00, 0x3fd2a598, 0xd219b2c3, 0xbcfa1d84, 0x6baa7c00,
+ 0x3fd28651, 0xfd9abec1, 0x3d1be6d3, 0x94028800, 0x3fd2672d,
+ 0xe289a455, 0xbd1ede5e, 0x78b86400, 0x3fd2482c, 0x6734d179,
+ 0x3d1fe79b, 0xcca3c800, 0x3fd2294d, 0x981a40b8, 0xbced34ea,
+ 0x439c5000, 0x3fd20a91, 0xcc392737, 0xbd1a9cc3, 0x92752c00,
+ 0x3fd1ebf6, 0x03c9afe7, 0x3d1e98f8, 0x6ef8dc00, 0x3fd1cd7d,
+ 0x71dae7f4, 0x3d08a86c, 0x8fe4dc00, 0x3fd1af25, 0xee9185a1,
+ 0xbcff3412, 0xace59400, 0x3fd190ee, 0xc2cab353, 0x3cf17ed9,
+ 0x7e925000, 0x3fd172d8, 0x6952c1b2, 0x3cf1521c, 0xbe694400,
+ 0x3fd154e2, 0xcacb79ca, 0xbd0bdc78, 0x26cbac00, 0x3fd1370d,
+ 0xf71f4de1, 0xbd01f8be, 0x72fa0800, 0x3fd11957, 0x55bf910b,
+ 0x3c946e2b, 0x5f106000, 0x3fd0fbc1, 0x39e639c1, 0x3d14a84b,
+ 0xa802a800, 0x3fd0de4a, 0xd3f31d5d, 0xbd178385, 0x0b992000,
+ 0x3fd0c0f3, 0x3843106f, 0xbd1f602f, 0x486ce800, 0x3fd0a3ba,
+ 0x8819497c, 0x3cef987a, 0x1de49400, 0x3fd086a0, 0x1caa0467,
+ 0x3d0faec7, 0x4c30cc00, 0x3fd069a4, 0xa4424372, 0xbd1618fc,
+ 0x94490000, 0x3fd04cc6, 0x946517d2, 0xbd18384b, 0xb7e84000,
+ 0x3fd03006, 0xe0109c37, 0xbd19a6ac, 0x798a0c00, 0x3fd01364,
+ 0x5121e864, 0xbd164cf7, 0x38ce8000, 0x3fcfedbf, 0x46214d1a,
+ 0xbcbbc402, 0xc8e62000, 0x3fcfb4ef, 0xdab93203, 0x3d1e0176,
+ 0x2cb02800, 0x3fcf7c5a, 0x2a2ea8e4, 0xbcfec86a, 0xeeeaa000,
+ 0x3fcf43fd, 0xc18e49a4, 0x3cf110a8, 0x9bb6e800, 0x3fcf0bda,
+ 0x923cc9c0, 0xbd15ce99, 0xc093f000, 0x3fced3ef, 0x4d4b51e9,
+ 0x3d1a04c7, 0xec58f800, 0x3fce9c3c, 0x163cad59, 0x3cac8260,
+ 0x9a907000, 0x3fce2d7d, 0x3fa93646, 0x3ce4a1c0, 0x37311000,
+ 0x3fcdbf99, 0x32abd1fd, 0x3d07ea9d, 0x6744b800, 0x3fcd528c,
+ 0x4dcbdfd4, 0xbd1b08e2, 0xe36de800, 0x3fcce653, 0x0b7b7f7f,
+ 0xbd1b8f03, 0x77506800, 0x3fcc7aec, 0xa821c9fb, 0x3d13c163,
+ 0x00ff8800, 0x3fcc1053, 0x536bca76, 0xbd074ee5, 0x70719800,
+ 0x3fcba684, 0xd7da9b6b, 0xbd1fbf16, 0xc6f8d800, 0x3fcb3d7d,
+ 0xe2220bb3, 0x3d1a295d, 0x16c15800, 0x3fcad53c, 0xe724911e,
+ 0xbcf55822, 0x82533800, 0x3fca6dbc, 0x6d982371, 0x3cac567c,
+ 0x3c19e800, 0x3fca06fc, 0x84d17d80, 0x3d1da204, 0x85ef8000,
+ 0x3fc9a0f8, 0x54466a6a, 0xbd002204, 0xb0ac2000, 0x3fc93bae,
+ 0xd601fd65, 0x3d18840c, 0x1bb9b000, 0x3fc8d71c, 0x7bf58766,
+ 0xbd14f897, 0x34aae800, 0x3fc8733e, 0x3af6ac24, 0xbd0f5c45,
+ 0x76d68000, 0x3fc81012, 0x4303e1a1, 0xbd1f9a80, 0x6af57800,
+ 0x3fc7ad96, 0x43fbcb46, 0x3cf4c33e, 0xa6c51000, 0x3fc74bc7,
+ 0x70f0eac5, 0xbd192e3b, 0xccab9800, 0x3fc6eaa3, 0xc0093dfe,
+ 0xbd0faf15, 0x8b60b800, 0x3fc68a28, 0xde78d5fd, 0xbc9ea4ee,
+ 0x9d987000, 0x3fc62a53, 0x962bea6e, 0xbd194084, 0xc9b0e800,
+ 0x3fc5cb22, 0x888dd999, 0x3d1fe201, 0xe1634800, 0x3fc56c93,
+ 0x16ada7ad, 0x3d1b1188, 0xc176c000, 0x3fc50ea4, 0x4159b5b5,
+ 0xbcf09c08, 0x51766000, 0x3fc4b153, 0x84393d23, 0xbcf6a89c,
+ 0x83695000, 0x3fc4549d, 0x9f0b8bbb, 0x3d1c4b8c, 0x538d5800,
+ 0x3fc3f881, 0xf49df747, 0x3cf89b99, 0xc8138000, 0x3fc39cfc,
+ 0xd503b834, 0xbd13b99f, 0xf0df0800, 0x3fc3420d, 0xf011b386,
+ 0xbd05d8be, 0xe7466800, 0x3fc2e7b2, 0xf39c7bc2, 0xbd1bb94e,
+ 0xcdd62800, 0x3fc28de9, 0x05e6d69b, 0xbd10ed05, 0xd015d800,
+ 0x3fc234b0, 0xe29b6c9d, 0xbd1ff967, 0x224ea800, 0x3fc1dc06,
+ 0x727711fc, 0xbcffb30d, 0x01540000, 0x3fc183e8, 0x39786c5a,
+ 0x3cc23f57, 0xb24d9800, 0x3fc12c54, 0xc905a342, 0x3d003a1d,
+ 0x82835800, 0x3fc0d54a, 0x9b9920c0, 0x3d03b25a, 0xc72ac000,
+ 0x3fc07ec7, 0x46f26a24, 0x3cf0fa41, 0xdd35d800, 0x3fc028ca,
+ 0x41d9d6dc, 0x3d034a65, 0x52474000, 0x3fbfa6a4, 0x44f66449,
+ 0x3d19cad3, 0x2da3d000, 0x3fbefcb8, 0x67832999, 0x3d18400f,
+ 0x32a10000, 0x3fbe53ce, 0x9c0e3b1a, 0xbcff62fd, 0x556b7000,
+ 0x3fbdabe3, 0x02976913, 0xbcf8243b, 0x97e88000, 0x3fbd04f4,
+ 0xec793797, 0x3d1c0578, 0x09647000, 0x3fbc5eff, 0x05fc0565,
+ 0xbd1d799e, 0xc6426000, 0x3fbbb9ff, 0x4625f5ed, 0x3d1f5723,
+ 0xf7afd000, 0x3fbb15f3, 0xdd5aae61, 0xbd1a7e1e, 0xd358b000,
+ 0x3fba72d8, 0x3314e4d3, 0x3d17bc91, 0x9b1f5000, 0x3fb9d0ab,
+ 0x9a4d514b, 0x3cf18c9b, 0x9cd4e000, 0x3fb92f69, 0x7e4496ab,
+ 0x3cf1f96d, 0x31f4f000, 0x3fb88f10, 0xf56479e7, 0x3d165818,
+ 0xbf628000, 0x3fb7ef9c, 0x26bf486d, 0xbd1113a6, 0xb526b000,
+ 0x3fb7510c, 0x1a1c3384, 0x3ca9898d, 0x8e31e000, 0x3fb6b35d,
+ 0xb3875361, 0xbd0661ac, 0xd01de000, 0x3fb6168c, 0x2a7cacfa,
+ 0xbd1bdf10, 0x0af23000, 0x3fb57a98, 0xff868816, 0x3cf046d0,
+ 0xd8ea0000, 0x3fb4df7c, 0x1515fbe7, 0xbd1fd529, 0xde3b2000,
+ 0x3fb44538, 0x6e59a132, 0x3d1faeee, 0xc8df9000, 0x3fb3abc9,
+ 0xf1322361, 0xbd198807, 0x505f1000, 0x3fb3132d, 0x0888e6ab,
+ 0x3d1e5380, 0x359bd000, 0x3fb27b61, 0xdfbcbb22, 0xbcfe2724,
+ 0x429ee000, 0x3fb1e463, 0x6eb4c58c, 0xbcfe4dd6, 0x4a673000,
+ 0x3fb14e31, 0x4ce1ac9b, 0x3d1ba691, 0x28b96000, 0x3fb0b8c9,
+ 0x8c7813b8, 0xbd0b3872, 0xc1f08000, 0x3fb02428, 0xc2bc8c2c,
+ 0x3cb5ea6b, 0x05a1a000, 0x3faf209c, 0x72e8f18e, 0xbce8df84,
+ 0xc0b5e000, 0x3fadfa6d, 0x9fdef436, 0x3d087364, 0xaf416000,
+ 0x3facd5c2, 0x1068c3a9, 0x3d0827e7, 0xdb356000, 0x3fabb296,
+ 0x120a34d3, 0x3d101a9f, 0x5dfea000, 0x3faa90e6, 0xdaded264,
+ 0xbd14c392, 0x6034c000, 0x3fa970ad, 0x1c9d06a9, 0xbd1b705e,
+ 0x194c6000, 0x3fa851e8, 0x83996ad9, 0xbd0117bc, 0xcf4ac000,
+ 0x3fa73492, 0xb1a94a62, 0xbca5ea42, 0xd67b4000, 0x3fa618a9,
+ 0x75aed8ca, 0xbd07119b, 0x9126c000, 0x3fa4fe29, 0x5291d533,
+ 0x3d12658f, 0x6f4d4000, 0x3fa3e50e, 0xcd2c5cd9, 0x3d1d5c70,
+ 0xee608000, 0x3fa2cd54, 0xd1008489, 0x3d1a4802, 0x9900e000,
+ 0x3fa1b6f9, 0x54fb5598, 0xbd16593f, 0x06bb6000, 0x3fa0a1f9,
+ 0x64ef57b4, 0xbd17636b, 0xb7940000, 0x3f9f1c9f, 0xee6a4737,
+ 0x3cb5d479, 0x91aa0000, 0x3f9cf7f5, 0x3a16373c, 0x3d087114,
+ 0x156b8000, 0x3f9ad5ed, 0x836c554a, 0x3c6900b0, 0xd4764000,
+ 0x3f98b67f, 0xed12f17b, 0xbcffc974, 0x77dec000, 0x3f9699a7,
+ 0x232ce7ea, 0x3d1e35bb, 0xbfbf4000, 0x3f947f5d, 0xd84ffa6e,
+ 0x3d0e0a49, 0x82c7c000, 0x3f92679c, 0x8d170e90, 0xbd14d9f2,
+ 0xadd20000, 0x3f90525d, 0x86d9f88e, 0x3cdeb986, 0x86f10000,
+ 0x3f8c7f36, 0xb9e0a517, 0x3ce29faa, 0xb75c8000, 0x3f885e9e,
+ 0x542568cb, 0xbd1f7bdb, 0x46b30000, 0x3f8442e8, 0xb954e7d9,
+ 0x3d1e5287, 0xb7e60000, 0x3f802c07, 0x22da0b17, 0xbd19fb27,
+ 0x6c8b0000, 0x3f7833e3, 0x821271ef, 0xbd190f96, 0x29910000,
+ 0x3f701936, 0xbc3491a5, 0xbd1bcf45, 0x354a0000, 0x3f600fe3,
+ 0xc0ff520a, 0xbd19d71c, 0x00000000, 0x00000000, 0x00000000,
+ 0x00000000
+ // @formatter:on
+ });
+
+ private ArrayDataPointerConstant log2 = pointerConstant(8, new int[]{
+ // @formatter:off
+ 0x509f7800, 0x3f934413,
+ });
+ private ArrayDataPointerConstant log28 = pointerConstant(8, new int[]{
+ 0x1f12b358, 0x3cdfef31
+ // @formatter:on
+ });
+
+ private ArrayDataPointerConstant coeff = pointerConstant(16, new int[]{
+ // @formatter:off
+ 0xc1a5f12e, 0x40358874, 0x64d4ef0d, 0xc0089309,
+ });
+ private ArrayDataPointerConstant coeff16 = pointerConstant(16, new int[]{
+ 0x385593b1, 0xc025c917, 0xdc963467, 0x3ffc6a02,
+ });
+ private ArrayDataPointerConstant coeff32 = pointerConstant(16, new int[]{
+ 0x7f9d3aa1, 0x4016ab9f, 0xdc77b115, 0xbff27af2
+ // @formatter:on
+ });
+
+ @Override
+ public void emitCode(CompilationResultBuilder crb, AMD64MacroAssembler masm) {
+ // Registers:
+ // input: xmm0
+ // scratch: xmm1, xmm2, xmm3, xmm4, xmm5, xmm6, xmm7
+ // rax, rdx, rcx, tmp - r11
+ // Code generated by Intel C compiler for LIBM library
+
+ Label block0 = new Label();
+ Label block1 = new Label();
+ Label block2 = new Label();
+ Label block3 = new Label();
+ Label block4 = new Label();
+ Label block5 = new Label();
+ Label block6 = new Label();
+ Label block7 = new Label();
+ Label block8 = new Label();
+ Label block9 = new Label();
+
+ masm.subq(rsp, 24);
+ masm.movsd(new AMD64Address(rsp, 0), xmm0);
+
+ masm.xorpd(xmm2, xmm2);
+ masm.movl(rax, 16368);
+ masm.pinsrw(xmm2, rax, 3);
+ masm.movl(rcx, 1054736384);
+ masm.movdl(xmm7, rcx);
+ masm.xorpd(xmm3, xmm3);
+ masm.movl(rdx, 30704);
+ masm.pinsrw(xmm3, rdx, 3);
+ masm.movdqu(xmm1, xmm0);
+ masm.movl(rdx, 32768);
+ masm.movdl(xmm4, rdx);
+ masm.movdqu(xmm5, recordExternalAddress(crb, highsigmask)); // 0xf8000000, 0xffffffff,
+ // 0x00000000, 0xffffe000
+ masm.pextrw(rax, xmm0, 3);
+ masm.por(xmm0, xmm2);
+ masm.movl(rcx, 16352);
+ masm.psrlq(xmm0, 27);
+ masm.movdqu(xmm2, recordExternalAddress(crb, log10E)); // 0x00000000, 0x3fdbc000,
+ // 0xbf2e4108, 0x3f5a7a6c
+ masm.psrld(xmm0, 2);
+ masm.rcpps(xmm0, xmm0);
+ masm.psllq(xmm1, 12);
+ masm.pshufd(xmm6, xmm5, 78);
+ masm.psrlq(xmm1, 12);
+ masm.subl(rax, 16);
+ masm.cmpl(rax, 32736);
+ masm.jcc(AMD64Assembler.ConditionFlag.AboveEqual, block0);
+
+ masm.bind(block1);
+ masm.mulss(xmm0, xmm7);
+ masm.por(xmm1, xmm3);
+ masm.leaq(r11, recordExternalAddress(crb, lTbl));
+ masm.andpd(xmm5, xmm1);
+ masm.paddd(xmm0, xmm4);
+ masm.subsd(xmm1, xmm5);
+ masm.movdl(rdx, xmm0);
+ masm.psllq(xmm0, 29);
+ masm.andpd(xmm0, xmm6);
+ masm.andl(rax, 32752);
+ masm.subl(rax, rcx);
+ masm.cvtsi2sdl(xmm7, rax);
+ masm.mulpd(xmm5, xmm0);
+ masm.mulsd(xmm1, xmm0);
+ masm.movq(xmm6, recordExternalAddress(crb, log2)); // 0x509f7800, 0x3f934413,
+ // 0x1f12b358, 0x3cdfef31
+ masm.movdqu(xmm3, recordExternalAddress(crb, coeff)); // 0xc1a5f12e, 0x40358874,
+ // 0x64d4ef0d, 0xc0089309
+ masm.subsd(xmm5, xmm2);
+ masm.andl(rdx, 16711680);
+ masm.shrl(rdx, 12);
+ masm.movdqu(xmm0, new AMD64Address(r11, rdx, AMD64Address.Scale.Times1, -1504));
+ masm.movdqu(xmm4, recordExternalAddress(crb, coeff16)); // 0x385593b1, 0xc025c917,
+ // 0xdc963467, 0x3ffc6a02
+ masm.addsd(xmm1, xmm5);
+ masm.movdqu(xmm2, recordExternalAddress(crb, coeff32)); // 0x7f9d3aa1, 0x4016ab9f,
+ // 0xdc77b115, 0xbff27af2
+ masm.mulsd(xmm6, xmm7);
+ masm.pshufd(xmm5, xmm1, 68);
+ masm.mulsd(xmm7, recordExternalAddress(crb, log28)); // 0x1f12b358, 0x3cdfef31
+ masm.mulsd(xmm3, xmm1);
+ masm.addsd(xmm0, xmm6);
+ masm.mulpd(xmm4, xmm5);
+ masm.movq(xmm6, recordExternalAddress(crb, log10E8)); // 0xbf2e4108, 0x3f5a7a6c
+ masm.mulpd(xmm5, xmm5);
+ masm.addpd(xmm4, xmm2);
+ masm.mulpd(xmm3, xmm5);
+ masm.pshufd(xmm2, xmm0, 228);
+ masm.addsd(xmm0, xmm1);
+ masm.mulsd(xmm4, xmm1);
+ masm.subsd(xmm2, xmm0);
+ masm.mulsd(xmm6, xmm1);
+ masm.addsd(xmm1, xmm2);
+ masm.pshufd(xmm2, xmm0, 238);
+ masm.mulsd(xmm5, xmm5);
+ masm.addsd(xmm7, xmm2);
+ masm.addsd(xmm1, xmm6);
+ masm.addpd(xmm4, xmm3);
+ masm.addsd(xmm1, xmm7);
+ masm.mulpd(xmm4, xmm5);
+ masm.addsd(xmm1, xmm4);
+ masm.pshufd(xmm5, xmm4, 238);
+ masm.addsd(xmm1, xmm5);
+ masm.addsd(xmm0, xmm1);
+ masm.jmp(block9);
+
+ masm.bind(block0);
+ masm.movq(xmm0, new AMD64Address(rsp, 0));
+ masm.movq(xmm1, new AMD64Address(rsp, 0));
+ masm.addl(rax, 16);
+ masm.cmpl(rax, 32768);
+ masm.jcc(AMD64Assembler.ConditionFlag.AboveEqual, block2);
+ masm.cmpl(rax, 16);
+ masm.jcc(AMD64Assembler.ConditionFlag.Below, block3);
+
+ masm.bind(block4);
+ masm.addsd(xmm0, xmm0);
+ masm.jmp(block9);
+
+ masm.bind(block5);
+ masm.jcc(AMD64Assembler.ConditionFlag.Above, block4);
+ masm.cmpl(rdx, 0);
+ masm.jcc(AMD64Assembler.ConditionFlag.Above, block4);
+ masm.jmp(block6);
+
+ masm.bind(block3);
+ masm.xorpd(xmm1, xmm1);
+ masm.addsd(xmm1, xmm0);
+ masm.movdl(rdx, xmm1);
+ masm.psrlq(xmm1, 32);
+ masm.movdl(rcx, xmm1);
+ masm.orl(rdx, rcx);
+ masm.cmpl(rdx, 0);
+ masm.jcc(AMD64Assembler.ConditionFlag.Equal, block7);
+ masm.xorpd(xmm1, xmm1);
+ masm.movl(rax, 18416);
+ masm.pinsrw(xmm1, rax, 3);
+ masm.mulsd(xmm0, xmm1);
+ masm.xorpd(xmm2, xmm2);
+ masm.movl(rax, 16368);
+ masm.pinsrw(xmm2, rax, 3);
+ masm.movdqu(xmm1, xmm0);
+ masm.pextrw(rax, xmm0, 3);
+ masm.por(xmm0, xmm2);
+ masm.movl(rcx, 18416);
+ masm.psrlq(xmm0, 27);
+ masm.movdqu(xmm2, recordExternalAddress(crb, log10E)); // 0x00000000, 0x3fdbc000,
+ // 0xbf2e4108, 0x3f5a7a6c
+ masm.psrld(xmm0, 2);
+ masm.rcpps(xmm0, xmm0);
+ masm.psllq(xmm1, 12);
+ masm.pshufd(xmm6, xmm5, 78);
+ masm.psrlq(xmm1, 12);
+ masm.jmp(block1);
+
+ masm.bind(block2);
+ masm.movdl(rdx, xmm1);
+ masm.psrlq(xmm1, 32);
+ masm.movdl(rcx, xmm1);
+ masm.addl(rcx, rcx);
+ masm.cmpl(rcx, -2097152);
+ masm.jcc(AMD64Assembler.ConditionFlag.AboveEqual, block5);
+ masm.orl(rdx, rcx);
+ masm.cmpl(rdx, 0);
+ masm.jcc(AMD64Assembler.ConditionFlag.Equal, block7);
+
+ masm.bind(block6);
+ masm.xorpd(xmm1, xmm1);
+ masm.xorpd(xmm0, xmm0);
+ masm.movl(rax, 32752);
+ masm.pinsrw(xmm1, rax, 3);
+ masm.mulsd(xmm0, xmm1);
+ masm.movl(new AMD64Address(rsp, 16), 9);
+ masm.jmp(block8);
+
+ masm.bind(block7);
+ masm.xorpd(xmm1, xmm1);
+ masm.xorpd(xmm0, xmm0);
+ masm.movl(rax, 49136);
+ masm.pinsrw(xmm0, rax, 3);
+ masm.divsd(xmm0, xmm1);
+ masm.movl(new AMD64Address(rsp, 16), 8);
+
+ masm.bind(block8);
+ masm.movq(new AMD64Address(rsp, 8), xmm0);
+ masm.movq(xmm0, new AMD64Address(rsp, 8));
+
+ masm.bind(block9);
+ masm.addq(rsp, 24);
+ }
+}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir.amd64/src/org/graalvm/compiler/lir/amd64/AMD64MathLogOp.java Sat Mar 16 21:00:45 2019 +0000
@@ -0,0 +1,402 @@
+/*
+ * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, Intel Corporation. All rights reserved.
+ * Intel Math Library (LIBM) Source Code
+ * 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.
+ */
+
+
+package org.graalvm.compiler.lir.amd64;
+
+import static jdk.vm.ci.amd64.AMD64.r11;
+import static jdk.vm.ci.amd64.AMD64.r8;
+import static jdk.vm.ci.amd64.AMD64.rax;
+import static jdk.vm.ci.amd64.AMD64.rcx;
+import static jdk.vm.ci.amd64.AMD64.rdx;
+import static jdk.vm.ci.amd64.AMD64.rsp;
+import static jdk.vm.ci.amd64.AMD64.xmm0;
+import static jdk.vm.ci.amd64.AMD64.xmm1;
+import static jdk.vm.ci.amd64.AMD64.xmm2;
+import static jdk.vm.ci.amd64.AMD64.xmm3;
+import static jdk.vm.ci.amd64.AMD64.xmm4;
+import static jdk.vm.ci.amd64.AMD64.xmm5;
+import static jdk.vm.ci.amd64.AMD64.xmm6;
+import static jdk.vm.ci.amd64.AMD64.xmm7;
+import static org.graalvm.compiler.lir.amd64.AMD64HotSpotHelper.pointerConstant;
+import static org.graalvm.compiler.lir.amd64.AMD64HotSpotHelper.recordExternalAddress;
+
+import org.graalvm.compiler.asm.Label;
+import org.graalvm.compiler.asm.amd64.AMD64Address;
+import org.graalvm.compiler.asm.amd64.AMD64Assembler;
+import org.graalvm.compiler.asm.amd64.AMD64MacroAssembler;
+import org.graalvm.compiler.lir.LIRInstructionClass;
+import org.graalvm.compiler.lir.asm.ArrayDataPointerConstant;
+import org.graalvm.compiler.lir.asm.CompilationResultBuilder;
+
+import jdk.vm.ci.amd64.AMD64;
+
+/**
+ * <pre>
+ * ALGORITHM DESCRIPTION - LOG()
+ * ---------------------
+ *
+ * x=2^k * mx, mx in [1,2)
+ *
+ * Get B~1/mx based on the output of rcpss instruction (B0)
+ * B = int((B0*2^7+0.5))/2^7
+ *
+ * Reduced argument: r=B*mx-1.0 (computed accurately in high and low parts)
+ *
+ * Result: k*log(2) - log(B) + p(r) if |x-1| >= small value (2^-6) and
+ * p(r) is a degree 7 polynomial
+ * -log(B) read from data table (high, low parts)
+ * Result is formed from high and low parts.
+ *
+ * Special cases:
+ * log(NaN) = quiet NaN, and raise invalid exception
+ * log(+INF) = that INF
+ * log(0) = -INF with divide-by-zero exception raised
+ * log(1) = +0
+ * log(x) = NaN with invalid exception raised if x < -0, including -INF
+ * </pre>
+ */
+public final class AMD64MathLogOp extends AMD64MathIntrinsicUnaryOp {
+
+ public static final LIRInstructionClass<AMD64MathLogOp> TYPE = LIRInstructionClass.create(AMD64MathLogOp.class);
+
+ public AMD64MathLogOp() {
+ super(TYPE, /* GPR */ rax, rcx, rdx, r8, r11,
+ /* XMM */ xmm1, xmm2, xmm3, xmm4, xmm5, xmm6, xmm7);
+ }
+
+ private ArrayDataPointerConstant lTbl = pointerConstant(16, new int[]{
+ // @formatter:off
+ 0xfefa3800, 0x3fe62e42, 0x93c76730, 0x3d2ef357, 0xaa241800,
+ 0x3fe5ee82, 0x0cda46be, 0x3d220238, 0x5c364800, 0x3fe5af40,
+ 0xac10c9fb, 0x3d2dfa63, 0x26bb8c00, 0x3fe5707a, 0xff3303dd,
+ 0x3d09980b, 0x26867800, 0x3fe5322e, 0x5d257531, 0x3d05ccc4,
+ 0x835a5000, 0x3fe4f45a, 0x6d93b8fb, 0xbd2e6c51, 0x6f970c00,
+ 0x3fe4b6fd, 0xed4c541c, 0x3cef7115, 0x27e8a400, 0x3fe47a15,
+ 0xf94d60aa, 0xbd22cb6a, 0xf2f92400, 0x3fe43d9f, 0x481051f7,
+ 0xbcfd984f, 0x2125cc00, 0x3fe4019c, 0x30f0c74c, 0xbd26ce79,
+ 0x0c36c000, 0x3fe3c608, 0x7cfe13c2, 0xbd02b736, 0x17197800,
+ 0x3fe38ae2, 0xbb5569a4, 0xbd218b7a, 0xad9d8c00, 0x3fe35028,
+ 0x9527e6ac, 0x3d10b83f, 0x44340800, 0x3fe315da, 0xc5a0ed9c,
+ 0xbd274e93, 0x57b0e000, 0x3fe2dbf5, 0x07b9dc11, 0xbd17a6e5,
+ 0x6d0ec000, 0x3fe2a278, 0xe797882d, 0x3d206d2b, 0x1134dc00,
+ 0x3fe26962, 0x05226250, 0xbd0b61f1, 0xd8bebc00, 0x3fe230b0,
+ 0x6e48667b, 0x3d12fc06, 0x5fc61800, 0x3fe1f863, 0xc9fe81d3,
+ 0xbd2a7242, 0x49ae6000, 0x3fe1c078, 0xed70e667, 0x3cccacde,
+ 0x40f23c00, 0x3fe188ee, 0xf8ab4650, 0x3d14cc4e, 0xf6f29800,
+ 0x3fe151c3, 0xa293ae49, 0xbd2edd97, 0x23c75c00, 0x3fe11af8,
+ 0xbb9ddcb2, 0xbd258647, 0x8611cc00, 0x3fe0e489, 0x07801742,
+ 0x3d1c2998, 0xe2d05400, 0x3fe0ae76, 0x887e7e27, 0x3d1f486b,
+ 0x0533c400, 0x3fe078bf, 0x41edf5fd, 0x3d268122, 0xbe760400,
+ 0x3fe04360, 0xe79539e0, 0xbd04c45f, 0xe5b20800, 0x3fe00e5a,
+ 0xb1727b1c, 0xbd053ba3, 0xaf7a4800, 0x3fdfb358, 0x3c164935,
+ 0x3d0085fa, 0xee031800, 0x3fdf4aa7, 0x6f014a8b, 0x3d12cde5,
+ 0x56b41000, 0x3fdee2a1, 0x5a470251, 0x3d2f27f4, 0xc3ddb000,
+ 0x3fde7b42, 0x5372bd08, 0xbd246550, 0x1a272800, 0x3fde148a,
+ 0x07322938, 0xbd1326b2, 0x484c9800, 0x3fddae75, 0x60dc616a,
+ 0xbd1ea42d, 0x46def800, 0x3fdd4902, 0xe9a767a8, 0x3d235baf,
+ 0x18064800, 0x3fdce42f, 0x3ec7a6b0, 0xbd0797c3, 0xc7455800,
+ 0x3fdc7ff9, 0xc15249ae, 0xbd29b6dd, 0x693fa000, 0x3fdc1c60,
+ 0x7fe8e180, 0x3d2cec80, 0x1b80e000, 0x3fdbb961, 0xf40a666d,
+ 0x3d27d85b, 0x04462800, 0x3fdb56fa, 0x2d841995, 0x3d109525,
+ 0x5248d000, 0x3fdaf529, 0x52774458, 0xbd217cc5, 0x3c8ad800,
+ 0x3fda93ed, 0xbea77a5d, 0x3d1e36f2, 0x0224f800, 0x3fda3344,
+ 0x7f9d79f5, 0x3d23c645, 0xea15f000, 0x3fd9d32b, 0x10d0c0b0,
+ 0xbd26279e, 0x43135800, 0x3fd973a3, 0xa502d9f0, 0xbd152313,
+ 0x635bf800, 0x3fd914a8, 0x2ee6307d, 0xbd1766b5, 0xa88b3000,
+ 0x3fd8b639, 0xe5e70470, 0xbd205ae1, 0x776dc800, 0x3fd85855,
+ 0x3333778a, 0x3d2fd56f, 0x3bd81800, 0x3fd7fafa, 0xc812566a,
+ 0xbd272090, 0x687cf800, 0x3fd79e26, 0x2efd1778, 0x3d29ec7d,
+ 0x76c67800, 0x3fd741d8, 0x49dc60b3, 0x3d2d8b09, 0xe6af1800,
+ 0x3fd6e60e, 0x7c222d87, 0x3d172165, 0x3e9c6800, 0x3fd68ac8,
+ 0x2756eba0, 0x3d20a0d3, 0x0b3ab000, 0x3fd63003, 0xe731ae00,
+ 0xbd2db623, 0xdf596000, 0x3fd5d5bd, 0x08a465dc, 0xbd0a0b2a,
+ 0x53c8d000, 0x3fd57bf7, 0xee5d40ef, 0x3d1faded, 0x0738a000,
+ 0x3fd522ae, 0x8164c759, 0x3d2ebe70, 0x9e173000, 0x3fd4c9e0,
+ 0x1b0ad8a4, 0xbd2e2089, 0xc271c800, 0x3fd4718d, 0x0967d675,
+ 0xbd2f27ce, 0x23d5e800, 0x3fd419b4, 0xec90e09d, 0x3d08e436,
+ 0x77333000, 0x3fd3c252, 0xb606bd5c, 0x3d183b54, 0x76be1000,
+ 0x3fd36b67, 0xb0f177c8, 0x3d116ecd, 0xe1d36000, 0x3fd314f1,
+ 0xd3213cb8, 0xbd28e27a, 0x7cdc9000, 0x3fd2bef0, 0x4a5004f4,
+ 0x3d2a9cfa, 0x1134d800, 0x3fd26962, 0xdf5bb3b6, 0x3d2c93c1,
+ 0x6d0eb800, 0x3fd21445, 0xba46baea, 0x3d0a87de, 0x635a6800,
+ 0x3fd1bf99, 0x5147bdb7, 0x3d2ca6ed, 0xcbacf800, 0x3fd16b5c,
+ 0xf7a51681, 0x3d2b9acd, 0x8227e800, 0x3fd1178e, 0x63a5f01c,
+ 0xbd2c210e, 0x67616000, 0x3fd0c42d, 0x163ceae9, 0x3d27188b,
+ 0x604d5800, 0x3fd07138, 0x16ed4e91, 0x3cf89cdb, 0x5626c800,
+ 0x3fd01eae, 0x1485e94a, 0xbd16f08c, 0x6cb3b000, 0x3fcf991c,
+ 0xca0cdf30, 0x3d1bcbec, 0xe4dd0000, 0x3fcef5ad, 0x65bb8e11,
+ 0xbcca2115, 0xffe71000, 0x3fce530e, 0x6041f430, 0x3cc21227,
+ 0xb0d49000, 0x3fcdb13d, 0xf715b035, 0xbd2aff2a, 0xf2656000,
+ 0x3fcd1037, 0x75b6f6e4, 0xbd084a7e, 0xc6f01000, 0x3fcc6ffb,
+ 0xc5962bd2, 0xbcf1ec72, 0x383be000, 0x3fcbd087, 0x595412b6,
+ 0xbd2d4bc4, 0x575bd000, 0x3fcb31d8, 0x4eace1aa, 0xbd0c358d,
+ 0x3c8ae000, 0x3fca93ed, 0x50562169, 0xbd287243, 0x07089000,
+ 0x3fc9f6c4, 0x6865817a, 0x3d29904d, 0xdcf70000, 0x3fc95a5a,
+ 0x58a0ff6f, 0x3d07f228, 0xeb390000, 0x3fc8beaf, 0xaae92cd1,
+ 0xbd073d54, 0x6551a000, 0x3fc823c1, 0x9a631e83, 0x3d1e0ddb,
+ 0x85445000, 0x3fc7898d, 0x70914305, 0xbd1c6610, 0x8b757000,
+ 0x3fc6f012, 0xe59c21e1, 0xbd25118d, 0xbe8c1000, 0x3fc6574e,
+ 0x2c3c2e78, 0x3d19cf8b, 0x6b544000, 0x3fc5bf40, 0xeb68981c,
+ 0xbd127023, 0xe4a1b000, 0x3fc527e5, 0xe5697dc7, 0x3d2633e8,
+ 0x8333b000, 0x3fc4913d, 0x54fdb678, 0x3d258379, 0xa5993000,
+ 0x3fc3fb45, 0x7e6a354d, 0xbd2cd1d8, 0xb0159000, 0x3fc365fc,
+ 0x234b7289, 0x3cc62fa8, 0x0c868000, 0x3fc2d161, 0xcb81b4a1,
+ 0x3d039d6c, 0x2a49c000, 0x3fc23d71, 0x8fd3df5c, 0x3d100d23,
+ 0x7e23f000, 0x3fc1aa2b, 0x44389934, 0x3d2ca78e, 0x8227e000,
+ 0x3fc1178e, 0xce2d07f2, 0x3d21ef78, 0xb59e4000, 0x3fc08598,
+ 0x7009902c, 0xbd27e5dd, 0x39dbe000, 0x3fbfe891, 0x4fa10afd,
+ 0xbd2534d6, 0x830a2000, 0x3fbec739, 0xafe645e0, 0xbd2dc068,
+ 0x63844000, 0x3fbda727, 0x1fa71733, 0x3d1a8940, 0x01bc4000,
+ 0x3fbc8858, 0xc65aacd3, 0x3d2646d1, 0x8dad6000, 0x3fbb6ac8,
+ 0x2bf768e5, 0xbd139080, 0x40b1c000, 0x3fba4e76, 0xb94407c8,
+ 0xbd0e42b6, 0x5d594000, 0x3fb9335e, 0x3abd47da, 0x3d23115c,
+ 0x2f40e000, 0x3fb8197e, 0xf96ffdf7, 0x3d0f80dc, 0x0aeac000,
+ 0x3fb700d3, 0xa99ded32, 0x3cec1e8d, 0x4d97a000, 0x3fb5e95a,
+ 0x3c5d1d1e, 0xbd2c6906, 0x5d208000, 0x3fb4d311, 0x82f4e1ef,
+ 0xbcf53a25, 0xa7d1e000, 0x3fb3bdf5, 0xa5db4ed7, 0x3d2cc85e,
+ 0xa4472000, 0x3fb2aa04, 0xae9c697d, 0xbd20b6e8, 0xd1466000,
+ 0x3fb1973b, 0x560d9e9b, 0xbd25325d, 0xb59e4000, 0x3fb08598,
+ 0x7009902c, 0xbd17e5dd, 0xc006c000, 0x3faeea31, 0x4fc93b7b,
+ 0xbd0e113e, 0xcdddc000, 0x3faccb73, 0x47d82807, 0xbd1a68f2,
+ 0xd0fb0000, 0x3faaaef2, 0x353bb42e, 0x3d20fc1a, 0x149fc000,
+ 0x3fa894aa, 0xd05a267d, 0xbd197995, 0xf2d4c000, 0x3fa67c94,
+ 0xec19afa2, 0xbd029efb, 0xd42e0000, 0x3fa466ae, 0x75bdfd28,
+ 0xbd2c1673, 0x2f8d0000, 0x3fa252f3, 0xe021b67b, 0x3d283e9a,
+ 0x89e74000, 0x3fa0415d, 0x5cf1d753, 0x3d0111c0, 0xec148000,
+ 0x3f9c63d2, 0x3f9eb2f3, 0x3d2578c6, 0x28c90000, 0x3f984925,
+ 0x325a0c34, 0xbd2aa0ba, 0x25980000, 0x3f9432a9, 0x928637fe,
+ 0x3d098139, 0x58938000, 0x3f902056, 0x06e2f7d2, 0xbd23dc5b,
+ 0xa3890000, 0x3f882448, 0xda74f640, 0xbd275577, 0x75890000,
+ 0x3f801015, 0x999d2be8, 0xbd10c76b, 0x59580000, 0x3f700805,
+ 0xcb31c67b, 0x3d2166af, 0x00000000, 0x00000000, 0x00000000,
+ 0x80000000
+ // @formatter:on
+ });
+
+ private ArrayDataPointerConstant log2 = pointerConstant(8, new int[]{
+ // @formatter:off
+ 0xfefa3800, 0x3fa62e42,
+ });
+ private ArrayDataPointerConstant log28 = pointerConstant(8, new int[]{
+ 0x93c76730, 0x3ceef357
+ // @formatter:on
+ });
+
+ private ArrayDataPointerConstant coeff = pointerConstant(16, new int[]{
+ // @formatter:off
+ 0x92492492, 0x3fc24924, 0x00000000, 0xbfd00000,
+ });
+ private ArrayDataPointerConstant coeff16 = pointerConstant(16, new int[]{
+ 0x3d6fb175, 0xbfc5555e, 0x55555555, 0x3fd55555,
+ });
+ private ArrayDataPointerConstant coeff32 = pointerConstant(16, new int[]{
+ 0x9999999a, 0x3fc99999, 0x00000000, 0xbfe00000
+ // @formatter:on
+ });
+
+ @Override
+ public void emitCode(CompilationResultBuilder crb, AMD64MacroAssembler masm) {
+ // registers,
+ // input: xmm0
+ // scratch: xmm1, xmm2, xmm3, xmm4, xmm5, xmm6, xmm7
+ // rax, rdx, rcx, r8, r11
+ Label block0 = new Label();
+ Label block1 = new Label();
+ Label block2 = new Label();
+ Label block3 = new Label();
+ Label block4 = new Label();
+ Label block5 = new Label();
+ Label block6 = new Label();
+ Label block7 = new Label();
+ Label block8 = new Label();
+ Label block9 = new Label();
+
+ masm.subq(rsp, 24);
+ masm.movsd(new AMD64Address(rsp, 0), xmm0);
+ masm.movq(rax, 0x3ff0000000000000L);
+ masm.movdq(xmm2, rax);
+ masm.movq(rdx, 0x77f0000000000000L);
+ masm.movdq(xmm3, rdx);
+ masm.movl(rcx, 32768);
+ masm.movdl(xmm4, rcx);
+ masm.movq(r8, 0xffffe00000000000L);
+ masm.movdq(xmm5, r8);
+ masm.movdqu(xmm1, xmm0);
+ masm.pextrw(rax, xmm0, 3);
+ masm.por(xmm0, xmm2);
+ masm.movl(rcx, 16352);
+ masm.psrlq(xmm0, 27);
+ masm.leaq(r11, recordExternalAddress(crb, lTbl));
+ masm.psrld(xmm0, 2);
+ masm.rcpps(xmm0, xmm0);
+ masm.psllq(xmm1, 12);
+ masm.pshufd(xmm6, xmm5, 228);
+ masm.psrlq(xmm1, 12);
+ masm.subl(rax, 16);
+ masm.cmpl(rax, 32736);
+ masm.jcc(AMD64Assembler.ConditionFlag.AboveEqual, block0);
+
+ masm.bind(block1);
+ masm.paddd(xmm0, xmm4);
+ masm.por(xmm1, xmm3);
+ masm.movdl(rdx, xmm0);
+ masm.psllq(xmm0, 29);
+ masm.pand(xmm5, xmm1);
+ masm.pand(xmm0, xmm6);
+ masm.subsd(xmm1, xmm5);
+ masm.mulpd(xmm5, xmm0);
+ masm.andl(rax, 32752);
+ masm.subl(rax, rcx);
+ masm.cvtsi2sdl(xmm7, rax);
+ masm.mulsd(xmm1, xmm0);
+ masm.movq(xmm6, recordExternalAddress(crb, log2)); // 0xfefa3800, 0x3fa62e42
+ masm.movdqu(xmm3, recordExternalAddress(crb, coeff)); // 0x92492492, 0x3fc24924,
+ // 0x00000000, 0xbfd00000
+ masm.subsd(xmm5, xmm2);
+ masm.andl(rdx, 16711680);
+ masm.shrl(rdx, 12);
+ masm.movdqu(xmm0, new AMD64Address(r11, rdx, AMD64Address.Scale.Times1));
+ masm.movdqu(xmm4, recordExternalAddress(crb, coeff16)); // 0x3d6fb175, 0xbfc5555e,
+ // 0x55555555, 0x3fd55555
+ masm.addsd(xmm1, xmm5);
+ masm.movdqu(xmm2, recordExternalAddress(crb, coeff32)); // 0x9999999a, 0x3fc99999,
+ // 0x00000000, 0xbfe00000
+ masm.mulsd(xmm6, xmm7);
+ if (masm.supports(AMD64.CPUFeature.SSE3)) {
+ masm.movddup(xmm5, xmm1);
+ } else {
+ masm.movdqu(xmm5, xmm1);
+ masm.movlhps(xmm5, xmm5);
+ }
+ masm.mulsd(xmm7, recordExternalAddress(crb, log28)); // 0x93c76730, 0x3ceef357
+ masm.mulsd(xmm3, xmm1);
+ masm.addsd(xmm0, xmm6);
+ masm.mulpd(xmm4, xmm5);
+ masm.mulpd(xmm5, xmm5);
+ if (masm.supports(AMD64.CPUFeature.SSE3)) {
+ masm.movddup(xmm6, xmm0);
+ } else {
+ masm.movdqu(xmm6, xmm0);
+ masm.movlhps(xmm6, xmm6);
+ }
+ masm.addsd(xmm0, xmm1);
+ masm.addpd(xmm4, xmm2);
+ masm.mulpd(xmm3, xmm5);
+ masm.subsd(xmm6, xmm0);
+ masm.mulsd(xmm4, xmm1);
+ masm.pshufd(xmm2, xmm0, 238);
+ masm.addsd(xmm1, xmm6);
+ masm.mulsd(xmm5, xmm5);
+ masm.addsd(xmm7, xmm2);
+ masm.addpd(xmm4, xmm3);
+ masm.addsd(xmm1, xmm7);
+ masm.mulpd(xmm4, xmm5);
+ masm.addsd(xmm1, xmm4);
+ masm.pshufd(xmm5, xmm4, 238);
+ masm.addsd(xmm1, xmm5);
+ masm.addsd(xmm0, xmm1);
+ masm.jmp(block9);
+
+ masm.bind(block0);
+ masm.movq(xmm0, new AMD64Address(rsp, 0));
+ masm.movq(xmm1, new AMD64Address(rsp, 0));
+ masm.addl(rax, 16);
+ masm.cmpl(rax, 32768);
+ masm.jcc(AMD64Assembler.ConditionFlag.AboveEqual, block2);
+ masm.cmpl(rax, 16);
+ masm.jcc(AMD64Assembler.ConditionFlag.Below, block3);
+
+ masm.bind(block4);
+ masm.addsd(xmm0, xmm0);
+ masm.jmp(block9);
+
+ masm.bind(block5);
+ masm.jcc(AMD64Assembler.ConditionFlag.Above, block4);
+ masm.cmpl(rdx, 0);
+ masm.jcc(AMD64Assembler.ConditionFlag.Above, block4);
+ masm.jmp(block6);
+
+ masm.bind(block3);
+ masm.xorpd(xmm1, xmm1);
+ masm.addsd(xmm1, xmm0);
+ masm.movdl(rdx, xmm1);
+ masm.psrlq(xmm1, 32);
+ masm.movdl(rcx, xmm1);
+ masm.orl(rdx, rcx);
+ masm.cmpl(rdx, 0);
+ masm.jcc(AMD64Assembler.ConditionFlag.Equal, block7);
+ masm.xorpd(xmm1, xmm1);
+ masm.movl(rax, 18416);
+ masm.pinsrw(xmm1, rax, 3);
+ masm.mulsd(xmm0, xmm1);
+ masm.movdqu(xmm1, xmm0);
+ masm.pextrw(rax, xmm0, 3);
+ masm.por(xmm0, xmm2);
+ masm.psrlq(xmm0, 27);
+ masm.movl(rcx, 18416);
+ masm.psrld(xmm0, 2);
+ masm.rcpps(xmm0, xmm0);
+ masm.psllq(xmm1, 12);
+ masm.pshufd(xmm6, xmm5, 228);
+ masm.psrlq(xmm1, 12);
+ masm.jmp(block1);
+
+ masm.bind(block2);
+ masm.movdl(rdx, xmm1);
+ masm.psrlq(xmm1, 32);
+ masm.movdl(rcx, xmm1);
+ masm.addl(rcx, rcx);
+ masm.cmpl(rcx, -2097152);
+ masm.jcc(AMD64Assembler.ConditionFlag.AboveEqual, block5);
+ masm.orl(rdx, rcx);
+ masm.cmpl(rdx, 0);
+ masm.jcc(AMD64Assembler.ConditionFlag.Equal, block7);
+
+ masm.bind(block6);
+ masm.xorpd(xmm1, xmm1);
+ masm.xorpd(xmm0, xmm0);
+ masm.movl(rax, 32752);
+ masm.pinsrw(xmm1, rax, 3);
+ masm.mulsd(xmm0, xmm1);
+ masm.movl(new AMD64Address(rsp, 16), 3);
+ masm.jmp(block8);
+ masm.bind(block7);
+ masm.xorpd(xmm1, xmm1);
+ masm.xorpd(xmm0, xmm0);
+ masm.movl(rax, 49136);
+ masm.pinsrw(xmm0, rax, 3);
+ masm.divsd(xmm0, xmm1);
+ masm.movl(new AMD64Address(rsp, 16), 2);
+
+ masm.bind(block8);
+ masm.movq(new AMD64Address(rsp, 8), xmm0);
+
+ masm.movq(xmm0, new AMD64Address(rsp, 8));
+
+ masm.bind(block9);
+ masm.addq(rsp, 24);
+ }
+}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir.amd64/src/org/graalvm/compiler/lir/amd64/AMD64MathPowOp.java Sat Mar 16 21:00:45 2019 +0000
@@ -0,0 +1,1979 @@
+/*
+ * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, Intel Corporation. All rights reserved.
+ * Intel Math Library (LIBM) Source Code
+ * 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.
+ */
+
+
+package org.graalvm.compiler.lir.amd64;
+
+import static jdk.vm.ci.amd64.AMD64.r10;
+import static jdk.vm.ci.amd64.AMD64.r11;
+import static jdk.vm.ci.amd64.AMD64.r8;
+import static jdk.vm.ci.amd64.AMD64.r9;
+import static jdk.vm.ci.amd64.AMD64.rax;
+import static jdk.vm.ci.amd64.AMD64.rcx;
+import static jdk.vm.ci.amd64.AMD64.rdx;
+import static jdk.vm.ci.amd64.AMD64.rsp;
+import static jdk.vm.ci.amd64.AMD64.xmm0;
+import static jdk.vm.ci.amd64.AMD64.xmm1;
+import static jdk.vm.ci.amd64.AMD64.xmm2;
+import static jdk.vm.ci.amd64.AMD64.xmm3;
+import static jdk.vm.ci.amd64.AMD64.xmm4;
+import static jdk.vm.ci.amd64.AMD64.xmm5;
+import static jdk.vm.ci.amd64.AMD64.xmm6;
+import static jdk.vm.ci.amd64.AMD64.xmm7;
+import static org.graalvm.compiler.lir.amd64.AMD64HotSpotHelper.pointerConstant;
+import static org.graalvm.compiler.lir.amd64.AMD64HotSpotHelper.recordExternalAddress;
+
+import org.graalvm.compiler.asm.Label;
+import org.graalvm.compiler.asm.amd64.AMD64Address;
+import org.graalvm.compiler.asm.amd64.AMD64Assembler;
+import org.graalvm.compiler.asm.amd64.AMD64MacroAssembler;
+import org.graalvm.compiler.lir.LIRInstructionClass;
+import org.graalvm.compiler.lir.asm.ArrayDataPointerConstant;
+import org.graalvm.compiler.lir.asm.CompilationResultBuilder;
+
+import jdk.vm.ci.code.Register;
+
+/**
+ * <pre>
+ * ALGORITHM DESCRIPTION - POW()
+ * ---------------------
+ *
+ * Let x=2^k * mx, mx in [1,2)
+ *
+ * log2(x) calculation:
+ *
+ * Get B~1/mx based on the output of rcpps instruction (B0)
+ * B = int((B0*LH*2^9+0.5))/2^9
+ * LH is a short approximation for log2(e)
+ *
+ * Reduced argument, scaled by LH:
+ * r=B*mx-LH (computed accurately in high and low parts)
+ *
+ * log2(x) result: k - log2(B) + p(r)
+ * p(r) is a degree 8 polynomial
+ * -log2(B) read from data table (high, low parts)
+ * log2(x) is formed from high and low parts
+ * For |x| in [1-1/32, 1+1/16), a slower but more accurate computation
+ * based om the same table design is performed.
+ *
+ * Main path is taken if | floor(log2(|log2(|x|)|) + floor(log2|y|) | < 8,
+ * to filter out all potential OF/UF cases.
+ * exp2(y*log2(x)) is computed using an 8-bit index table and a degree 5
+ * polynomial
+ *
+ * Special cases:
+ * pow(-0,y) = -INF and raises the divide-by-zero exception for y an odd
+ * integer < 0.
+ * pow(-0,y) = +INF and raises the divide-by-zero exception for y < 0 and
+ * not an odd integer.
+ * pow(-0,y) = -0 for y an odd integer > 0.
+ * pow(-0,y) = +0 for y > 0 and not an odd integer.
+ * pow(-1,-INF) = NaN.
+ * pow(+1,y) = NaN for any y, even a NaN.
+ * pow(x,-0) = 1 for any x, even a NaN.
+ * pow(x,y) = a NaN and raises the invalid exception for finite x < 0 and
+ * finite non-integer y.
+ * pow(x,-INF) = +INF for |x|<1.
+ * pow(x,-INF) = +0 for |x|>1.
+ * pow(x,+INF) = +0 for |x|<1.
+ * pow(x,+INF) = +INF for |x|>1.
+ * pow(-INF,y) = -0 for y an odd integer < 0.
+ * pow(-INF,y) = +0 for y < 0 and not an odd integer.
+ * pow(-INF,y) = -INF for y an odd integer > 0.
+ * pow(-INF,y) = +INF for y > 0 and not an odd integer.
+ * pow(+INF,y) = +0 for y <0.
+ * pow(+INF,y) = +INF for y >0.
+ * </pre>
+ */
+public final class AMD64MathPowOp extends AMD64MathIntrinsicBinaryOp {
+
+ public static final LIRInstructionClass<AMD64MathPowOp> TYPE = LIRInstructionClass.create(AMD64MathPowOp.class);
+
+ public AMD64MathPowOp() {
+ super(TYPE, /* GPR */ rax, rcx, rdx, r8, r9, r10, r11,
+ /* XMM */ xmm2, xmm3, xmm4, xmm5, xmm6, xmm7);
+ }
+
+ private ArrayDataPointerConstant highsigmask = pointerConstant(16, new int[]{
+ //@formatter:off
+ 0x00000000, 0xfffff800, 0x00000000, 0xfffff800
+ //@formatter:on
+ });
+
+ private ArrayDataPointerConstant log2E = pointerConstant(16, new int[]{
+ //@formatter:off
+ 0x00000000, 0x3ff72000, 0x161bb241, 0xbf5dabe1
+ //@formatter:on
+ });
+
+ private ArrayDataPointerConstant highmaskY = pointerConstant(8, new int[]{
+ //@formatter:off
+ 0x00000000, 0xfffffff8,
+ });
+ private ArrayDataPointerConstant highmaskY8 = pointerConstant(8, new int[]{
+ 0x00000000, 0xffffffff
+ //@formatter:on
+ });
+
+ private ArrayDataPointerConstant tExp = pointerConstant(16, new int[]{
+ //@formatter:off
+ 0x00000000, 0x3ff00000, 0x00000000, 0x3b700000, 0xfa5abcbf,
+ 0x3ff00b1a, 0xa7609f71, 0xbc84f6b2, 0xa9fb3335, 0x3ff0163d,
+ 0x9ab8cdb7, 0x3c9b6129, 0x143b0281, 0x3ff02168, 0x0fc54eb6,
+ 0xbc82bf31, 0x3e778061, 0x3ff02c9a, 0x535b085d, 0xbc719083,
+ 0x2e11bbcc, 0x3ff037d4, 0xeeade11a, 0x3c656811, 0xe86e7f85,
+ 0x3ff04315, 0x1977c96e, 0xbc90a31c, 0x72f654b1, 0x3ff04e5f,
+ 0x3aa0d08c, 0x3c84c379, 0xd3158574, 0x3ff059b0, 0xa475b465,
+ 0x3c8d73e2, 0x0e3c1f89, 0x3ff0650a, 0x5799c397, 0xbc95cb7b,
+ 0x29ddf6de, 0x3ff0706b, 0xe2b13c27, 0xbc8c91df, 0x2b72a836,
+ 0x3ff07bd4, 0x54458700, 0x3c832334, 0x18759bc8, 0x3ff08745,
+ 0x4bb284ff, 0x3c6186be, 0xf66607e0, 0x3ff092bd, 0x800a3fd1,
+ 0xbc968063, 0xcac6f383, 0x3ff09e3e, 0x18316136, 0x3c914878,
+ 0x9b1f3919, 0x3ff0a9c7, 0x873d1d38, 0x3c85d16c, 0x6cf9890f,
+ 0x3ff0b558, 0x4adc610b, 0x3c98a62e, 0x45e46c85, 0x3ff0c0f1,
+ 0x06d21cef, 0x3c94f989, 0x2b7247f7, 0x3ff0cc92, 0x16e24f71,
+ 0x3c901edc, 0x23395dec, 0x3ff0d83b, 0xe43f316a, 0xbc9bc14d,
+ 0x32d3d1a2, 0x3ff0e3ec, 0x27c57b52, 0x3c403a17, 0x5fdfa9c5,
+ 0x3ff0efa5, 0xbc54021b, 0xbc949db9, 0xaffed31b, 0x3ff0fb66,
+ 0xc44ebd7b, 0xbc6b9bed, 0x28d7233e, 0x3ff10730, 0x1692fdd5,
+ 0x3c8d46eb, 0xd0125b51, 0x3ff11301, 0x39449b3a, 0xbc96c510,
+ 0xab5e2ab6, 0x3ff11edb, 0xf703fb72, 0xbc9ca454, 0xc06c31cc,
+ 0x3ff12abd, 0xb36ca5c7, 0xbc51b514, 0x14f204ab, 0x3ff136a8,
+ 0xba48dcf0, 0xbc67108f, 0xaea92de0, 0x3ff1429a, 0x9af1369e,
+ 0xbc932fbf, 0x934f312e, 0x3ff14e95, 0x39bf44ab, 0xbc8b91e8,
+ 0xc8a58e51, 0x3ff15a98, 0xb9eeab0a, 0x3c82406a, 0x5471c3c2,
+ 0x3ff166a4, 0x82ea1a32, 0x3c58f23b, 0x3c7d517b, 0x3ff172b8,
+ 0xb9d78a76, 0xbc819041, 0x8695bbc0, 0x3ff17ed4, 0xe2ac5a64,
+ 0x3c709e3f, 0x388c8dea, 0x3ff18af9, 0xd1970f6c, 0xbc911023,
+ 0x58375d2f, 0x3ff19726, 0x85f17e08, 0x3c94aadd, 0xeb6fcb75,
+ 0x3ff1a35b, 0x7b4968e4, 0x3c8e5b4c, 0xf8138a1c, 0x3ff1af99,
+ 0xa4b69280, 0x3c97bf85, 0x84045cd4, 0x3ff1bbe0, 0x352ef607,
+ 0xbc995386, 0x95281c6b, 0x3ff1c82f, 0x8010f8c9, 0x3c900977,
+ 0x3168b9aa, 0x3ff1d487, 0x00a2643c, 0x3c9e016e, 0x5eb44027,
+ 0x3ff1e0e7, 0x088cb6de, 0xbc96fdd8, 0x22fcd91d, 0x3ff1ed50,
+ 0x027bb78c, 0xbc91df98, 0x8438ce4d, 0x3ff1f9c1, 0xa097af5c,
+ 0xbc9bf524, 0x88628cd6, 0x3ff2063b, 0x814a8495, 0x3c8dc775,
+ 0x3578a819, 0x3ff212be, 0x2cfcaac9, 0x3c93592d, 0x917ddc96,
+ 0x3ff21f49, 0x9494a5ee, 0x3c82a97e, 0xa27912d1, 0x3ff22bdd,
+ 0x5577d69f, 0x3c8d34fb, 0x6e756238, 0x3ff2387a, 0xb6c70573,
+ 0x3c99b07e, 0xfb82140a, 0x3ff2451f, 0x911ca996, 0x3c8acfcc,
+ 0x4fb2a63f, 0x3ff251ce, 0xbef4f4a4, 0x3c8ac155, 0x711ece75,
+ 0x3ff25e85, 0x4ac31b2c, 0x3c93e1a2, 0x65e27cdd, 0x3ff26b45,
+ 0x9940e9d9, 0x3c82bd33, 0x341ddf29, 0x3ff2780e, 0x05f9e76c,
+ 0x3c9e067c, 0xe1f56381, 0x3ff284df, 0x8c3f0d7e, 0xbc9a4c3a,
+ 0x7591bb70, 0x3ff291ba, 0x28401cbd, 0xbc82cc72, 0xf51fdee1,
+ 0x3ff29e9d, 0xafad1255, 0x3c8612e8, 0x66d10f13, 0x3ff2ab8a,
+ 0x191690a7, 0xbc995743, 0xd0dad990, 0x3ff2b87f, 0xd6381aa4,
+ 0xbc410adc, 0x39771b2f, 0x3ff2c57e, 0xa6eb5124, 0xbc950145,
+ 0xa6e4030b, 0x3ff2d285, 0x54db41d5, 0x3c900247, 0x1f641589,
+ 0x3ff2df96, 0xfbbce198, 0x3c9d16cf, 0xa93e2f56, 0x3ff2ecaf,
+ 0x45d52383, 0x3c71ca0f, 0x4abd886b, 0x3ff2f9d2, 0x532bda93,
+ 0xbc653c55, 0x0a31b715, 0x3ff306fe, 0xd23182e4, 0x3c86f46a,
+ 0xedeeb2fd, 0x3ff31432, 0xf3f3fcd1, 0x3c8959a3, 0xfc4cd831,
+ 0x3ff32170, 0x8e18047c, 0x3c8a9ce7, 0x3ba8ea32, 0x3ff32eb8,
+ 0x3cb4f318, 0xbc9c45e8, 0xb26416ff, 0x3ff33c08, 0x843659a6,
+ 0x3c932721, 0x66e3fa2d, 0x3ff34962, 0x930881a4, 0xbc835a75,
+ 0x5f929ff1, 0x3ff356c5, 0x5c4e4628, 0xbc8b5cee, 0xa2de883b,
+ 0x3ff36431, 0xa06cb85e, 0xbc8c3144, 0x373aa9cb, 0x3ff371a7,
+ 0xbf42eae2, 0xbc963aea, 0x231e754a, 0x3ff37f26, 0x9eceb23c,
+ 0xbc99f5ca, 0x6d05d866, 0x3ff38cae, 0x3c9904bd, 0xbc9e958d,
+ 0x1b7140ef, 0x3ff39a40, 0xfc8e2934, 0xbc99a9a5, 0x34e59ff7,
+ 0x3ff3a7db, 0xd661f5e3, 0xbc75e436, 0xbfec6cf4, 0x3ff3b57f,
+ 0xe26fff18, 0x3c954c66, 0xc313a8e5, 0x3ff3c32d, 0x375d29c3,
+ 0xbc9efff8, 0x44ede173, 0x3ff3d0e5, 0x8c284c71, 0x3c7fe8d0,
+ 0x4c123422, 0x3ff3dea6, 0x11f09ebc, 0x3c8ada09, 0xdf1c5175,
+ 0x3ff3ec70, 0x7b8c9bca, 0xbc8af663, 0x04ac801c, 0x3ff3fa45,
+ 0xf956f9f3, 0xbc97d023, 0xc367a024, 0x3ff40822, 0xb6f4d048,
+ 0x3c8bddf8, 0x21f72e2a, 0x3ff4160a, 0x1c309278, 0xbc5ef369,
+ 0x2709468a, 0x3ff423fb, 0xc0b314dd, 0xbc98462d, 0xd950a897,
+ 0x3ff431f5, 0xe35f7999, 0xbc81c7dd, 0x3f84b9d4, 0x3ff43ffa,
+ 0x9704c003, 0x3c8880be, 0x6061892d, 0x3ff44e08, 0x04ef80d0,
+ 0x3c489b7a, 0x42a7d232, 0x3ff45c20, 0x82fb1f8e, 0xbc686419,
+ 0xed1d0057, 0x3ff46a41, 0xd1648a76, 0x3c9c944b, 0x668b3237,
+ 0x3ff4786d, 0xed445733, 0xbc9c20f0, 0xb5c13cd0, 0x3ff486a2,
+ 0xb69062f0, 0x3c73c1a3, 0xe192aed2, 0x3ff494e1, 0x5e499ea0,
+ 0xbc83b289, 0xf0d7d3de, 0x3ff4a32a, 0xf3d1be56, 0x3c99cb62,
+ 0xea6db7d7, 0x3ff4b17d, 0x7f2897f0, 0xbc8125b8, 0xd5362a27,
+ 0x3ff4bfda, 0xafec42e2, 0x3c7d4397, 0xb817c114, 0x3ff4ce41,
+ 0x690abd5d, 0x3c905e29, 0x99fddd0d, 0x3ff4dcb2, 0xbc6a7833,
+ 0x3c98ecdb, 0x81d8abff, 0x3ff4eb2d, 0x2e5d7a52, 0xbc95257d,
+ 0x769d2ca7, 0x3ff4f9b2, 0xd25957e3, 0xbc94b309, 0x7f4531ee,
+ 0x3ff50841, 0x49b7465f, 0x3c7a249b, 0xa2cf6642, 0x3ff516da,
+ 0x69bd93ef, 0xbc8f7685, 0xe83f4eef, 0x3ff5257d, 0x43efef71,
+ 0xbc7c998d, 0x569d4f82, 0x3ff5342b, 0x1db13cad, 0xbc807abe,
+ 0xf4f6ad27, 0x3ff542e2, 0x192d5f7e, 0x3c87926d, 0xca5d920f,
+ 0x3ff551a4, 0xefede59b, 0xbc8d689c, 0xdde910d2, 0x3ff56070,
+ 0x168eebf0, 0xbc90fb6e, 0x36b527da, 0x3ff56f47, 0x011d93ad,
+ 0x3c99bb2c, 0xdbe2c4cf, 0x3ff57e27, 0x8a57b9c4, 0xbc90b98c,
+ 0xd497c7fd, 0x3ff58d12, 0x5b9a1de8, 0x3c8295e1, 0x27ff07cc,
+ 0x3ff59c08, 0xe467e60f, 0xbc97e2ce, 0xdd485429, 0x3ff5ab07,
+ 0x054647ad, 0x3c96324c, 0xfba87a03, 0x3ff5ba11, 0x4c233e1a,
+ 0xbc9b77a1, 0x8a5946b7, 0x3ff5c926, 0x816986a2, 0x3c3c4b1b,
+ 0x90998b93, 0x3ff5d845, 0xa8b45643, 0xbc9cd6a7, 0x15ad2148,
+ 0x3ff5e76f, 0x3080e65e, 0x3c9ba6f9, 0x20dceb71, 0x3ff5f6a3,
+ 0xe3cdcf92, 0xbc89eadd, 0xb976dc09, 0x3ff605e1, 0x9b56de47,
+ 0xbc93e242, 0xe6cdf6f4, 0x3ff6152a, 0x4ab84c27, 0x3c9e4b3e,
+ 0xb03a5585, 0x3ff6247e, 0x7e40b497, 0xbc9383c1, 0x1d1929fd,
+ 0x3ff633dd, 0xbeb964e5, 0x3c984710, 0x34ccc320, 0x3ff64346,
+ 0x759d8933, 0xbc8c483c, 0xfebc8fb7, 0x3ff652b9, 0xc9a73e09,
+ 0xbc9ae3d5, 0x82552225, 0x3ff66238, 0x87591c34, 0xbc9bb609,
+ 0xc70833f6, 0x3ff671c1, 0x586c6134, 0xbc8e8732, 0xd44ca973,
+ 0x3ff68155, 0x44f73e65, 0x3c6038ae, 0xb19e9538, 0x3ff690f4,
+ 0x9aeb445d, 0x3c8804bd, 0x667f3bcd, 0x3ff6a09e, 0x13b26456,
+ 0xbc9bdd34, 0xfa75173e, 0x3ff6b052, 0x2c9a9d0e, 0x3c7a38f5,
+ 0x750bdabf, 0x3ff6c012, 0x67ff0b0d, 0xbc728956, 0xddd47645,
+ 0x3ff6cfdc, 0xb6f17309, 0x3c9c7aa9, 0x3c651a2f, 0x3ff6dfb2,
+ 0x683c88ab, 0xbc6bbe3a, 0x98593ae5, 0x3ff6ef92, 0x9e1ac8b2,
+ 0xbc90b974, 0xf9519484, 0x3ff6ff7d, 0x25860ef6, 0xbc883c0f,
+ 0x66f42e87, 0x3ff70f74, 0xd45aa65f, 0x3c59d644, 0xe8ec5f74,
+ 0x3ff71f75, 0x86887a99, 0xbc816e47, 0x86ead08a, 0x3ff72f82,
+ 0x2cd62c72, 0xbc920aa0, 0x48a58174, 0x3ff73f9a, 0x6c65d53c,
+ 0xbc90a8d9, 0x35d7cbfd, 0x3ff74fbd, 0x618a6e1c, 0x3c9047fd,
+ 0x564267c9, 0x3ff75feb, 0x57316dd3, 0xbc902459, 0xb1ab6e09,
+ 0x3ff77024, 0x169147f8, 0x3c9b7877, 0x4fde5d3f, 0x3ff78069,
+ 0x0a02162d, 0x3c9866b8, 0x38ac1cf6, 0x3ff790b9, 0x62aadd3e,
+ 0x3c9349a8, 0x73eb0187, 0x3ff7a114, 0xee04992f, 0xbc841577,
+ 0x0976cfdb, 0x3ff7b17b, 0x8468dc88, 0xbc9bebb5, 0x0130c132,
+ 0x3ff7c1ed, 0xd1164dd6, 0x3c9f124c, 0x62ff86f0, 0x3ff7d26a,
+ 0xfb72b8b4, 0x3c91bddb, 0x36cf4e62, 0x3ff7e2f3, 0xba15797e,
+ 0x3c705d02, 0x8491c491, 0x3ff7f387, 0xcf9311ae, 0xbc807f11,
+ 0x543e1a12, 0x3ff80427, 0x626d972b, 0xbc927c86, 0xadd106d9,
+ 0x3ff814d2, 0x0d151d4d, 0x3c946437, 0x994cce13, 0x3ff82589,
+ 0xd41532d8, 0xbc9d4c1d, 0x1eb941f7, 0x3ff8364c, 0x31df2bd5,
+ 0x3c999b9a, 0x4623c7ad, 0x3ff8471a, 0xa341cdfb, 0xbc88d684,
+ 0x179f5b21, 0x3ff857f4, 0xf8b216d0, 0xbc5ba748, 0x9b4492ed,
+ 0x3ff868d9, 0x9bd4f6ba, 0xbc9fc6f8, 0xd931a436, 0x3ff879ca,
+ 0xd2db47bd, 0x3c85d2d7, 0xd98a6699, 0x3ff88ac7, 0xf37cb53a,
+ 0x3c9994c2, 0xa478580f, 0x3ff89bd0, 0x4475202a, 0x3c9d5395,
+ 0x422aa0db, 0x3ff8ace5, 0x56864b27, 0x3c96e9f1, 0xbad61778,
+ 0x3ff8be05, 0xfc43446e, 0x3c9ecb5e, 0x16b5448c, 0x3ff8cf32,
+ 0x32e9e3aa, 0xbc70d55e, 0x5e0866d9, 0x3ff8e06a, 0x6fc9b2e6,
+ 0xbc97114a, 0x99157736, 0x3ff8f1ae, 0xa2e3976c, 0x3c85cc13,
+ 0xd0282c8a, 0x3ff902fe, 0x85fe3fd2, 0x3c9592ca, 0x0b91ffc6,
+ 0x3ff9145b, 0x2e582524, 0xbc9dd679, 0x53aa2fe2, 0x3ff925c3,
+ 0xa639db7f, 0xbc83455f, 0xb0cdc5e5, 0x3ff93737, 0x81b57ebc,
+ 0xbc675fc7, 0x2b5f98e5, 0x3ff948b8, 0x797d2d99, 0xbc8dc3d6,
+ 0xcbc8520f, 0x3ff95a44, 0x96a5f039, 0xbc764b7c, 0x9a7670b3,
+ 0x3ff96bdd, 0x7f19c896, 0xbc5ba596, 0x9fde4e50, 0x3ff97d82,
+ 0x7c1b85d1, 0xbc9d185b, 0xe47a22a2, 0x3ff98f33, 0xa24c78ec,
+ 0x3c7cabda, 0x70ca07ba, 0x3ff9a0f1, 0x91cee632, 0xbc9173bd,
+ 0x4d53fe0d, 0x3ff9b2bb, 0x4df6d518, 0xbc9dd84e, 0x82a3f090,
+ 0x3ff9c491, 0xb071f2be, 0x3c7c7c46, 0x194bb8d5, 0x3ff9d674,
+ 0xa3dd8233, 0xbc9516be, 0x19e32323, 0x3ff9e863, 0x78e64c6e,
+ 0x3c7824ca, 0x8d07f29e, 0x3ff9fa5e, 0xaaf1face, 0xbc84a9ce,
+ 0x7b5de565, 0x3ffa0c66, 0x5d1cd533, 0xbc935949, 0xed8eb8bb,
+ 0x3ffa1e7a, 0xee8be70e, 0x3c9c6618, 0xec4a2d33, 0x3ffa309b,
+ 0x7ddc36ab, 0x3c96305c, 0x80460ad8, 0x3ffa42c9, 0x589fb120,
+ 0xbc9aa780, 0xb23e255d, 0x3ffa5503, 0xdb8d41e1, 0xbc9d2f6e,
+ 0x8af46052, 0x3ffa674a, 0x30670366, 0x3c650f56, 0x1330b358,
+ 0x3ffa799e, 0xcac563c7, 0x3c9bcb7e, 0x53c12e59, 0x3ffa8bfe,
+ 0xb2ba15a9, 0xbc94f867, 0x5579fdbf, 0x3ffa9e6b, 0x0ef7fd31,
+ 0x3c90fac9, 0x21356eba, 0x3ffab0e5, 0xdae94545, 0x3c889c31,
+ 0xbfd3f37a, 0x3ffac36b, 0xcae76cd0, 0xbc8f9234, 0x3a3c2774,
+ 0x3ffad5ff, 0xb6b1b8e5, 0x3c97ef3b, 0x995ad3ad, 0x3ffae89f,
+ 0x345dcc81, 0x3c97a1cd, 0xe622f2ff, 0x3ffafb4c, 0x0f315ecd,
+ 0xbc94b2fc, 0x298db666, 0x3ffb0e07, 0x4c80e425, 0xbc9bdef5,
+ 0x6c9a8952, 0x3ffb20ce, 0x4a0756cc, 0x3c94dd02, 0xb84f15fb,
+ 0x3ffb33a2, 0x3084d708, 0xbc62805e, 0x15b749b1, 0x3ffb4684,
+ 0xe9df7c90, 0xbc7f763d, 0x8de5593a, 0x3ffb5972, 0xbbba6de3,
+ 0xbc9c71df, 0x29f1c52a, 0x3ffb6c6e, 0x52883f6e, 0x3c92a8f3,
+ 0xf2fb5e47, 0x3ffb7f76, 0x7e54ac3b, 0xbc75584f, 0xf22749e4,
+ 0x3ffb928c, 0x54cb65c6, 0xbc9b7216, 0x30a1064a, 0x3ffba5b0,
+ 0x0e54292e, 0xbc9efcd3, 0xb79a6f1f, 0x3ffbb8e0, 0xc9696205,
+ 0xbc3f52d1, 0x904bc1d2, 0x3ffbcc1e, 0x7a2d9e84, 0x3c823dd0,
+ 0xc3f3a207, 0x3ffbdf69, 0x60ea5b53, 0xbc3c2623, 0x5bd71e09,
+ 0x3ffbf2c2, 0x3f6b9c73, 0xbc9efdca, 0x6141b33d, 0x3ffc0628,
+ 0xa1fbca34, 0xbc8d8a5a, 0xdd85529c, 0x3ffc199b, 0x895048dd,
+ 0x3c811065, 0xd9fa652c, 0x3ffc2d1c, 0x17c8a5d7, 0xbc96e516,
+ 0x5fffd07a, 0x3ffc40ab, 0xe083c60a, 0x3c9b4537, 0x78fafb22,
+ 0x3ffc5447, 0x2493b5af, 0x3c912f07, 0x2e57d14b, 0x3ffc67f1,
+ 0xff483cad, 0x3c92884d, 0x8988c933, 0x3ffc7ba8, 0xbe255559,
+ 0xbc8e76bb, 0x9406e7b5, 0x3ffc8f6d, 0x48805c44, 0x3c71acbc,
+ 0x5751c4db, 0x3ffca340, 0xd10d08f5, 0xbc87f2be, 0xdcef9069,
+ 0x3ffcb720, 0xd1e949db, 0x3c7503cb, 0x2e6d1675, 0x3ffccb0f,
+ 0x86009092, 0xbc7d220f, 0x555dc3fa, 0x3ffcdf0b, 0x53829d72,
+ 0xbc8dd83b, 0x5b5bab74, 0x3ffcf315, 0xb86dff57, 0xbc9a08e9,
+ 0x4a07897c, 0x3ffd072d, 0x43797a9c, 0xbc9cbc37, 0x2b08c968,
+ 0x3ffd1b53, 0x219a36ee, 0x3c955636, 0x080d89f2, 0x3ffd2f87,
+ 0x719d8578, 0xbc9d487b, 0xeacaa1d6, 0x3ffd43c8, 0xbf5a1614,
+ 0x3c93db53, 0xdcfba487, 0x3ffd5818, 0xd75b3707, 0x3c82ed02,
+ 0xe862e6d3, 0x3ffd6c76, 0x4a8165a0, 0x3c5fe87a, 0x16c98398,
+ 0x3ffd80e3, 0x8beddfe8, 0xbc911ec1, 0x71ff6075, 0x3ffd955d,
+ 0xbb9af6be, 0x3c9a052d, 0x03db3285, 0x3ffda9e6, 0x696db532,
+ 0x3c9c2300, 0xd63a8315, 0x3ffdbe7c, 0x926b8be4, 0xbc9b76f1,
+ 0xf301b460, 0x3ffdd321, 0x78f018c3, 0x3c92da57, 0x641c0658,
+ 0x3ffde7d5, 0x8e79ba8f, 0xbc9ca552, 0x337b9b5f, 0x3ffdfc97,
+ 0x4f184b5c, 0xbc91a5cd, 0x6b197d17, 0x3ffe1167, 0xbd5c7f44,
+ 0xbc72b529, 0x14f5a129, 0x3ffe2646, 0x817a1496, 0xbc97b627,
+ 0x3b16ee12, 0x3ffe3b33, 0x31fdc68b, 0xbc99f4a4, 0xe78b3ff6,
+ 0x3ffe502e, 0x80a9cc8f, 0x3c839e89, 0x24676d76, 0x3ffe6539,
+ 0x7522b735, 0xbc863ff8, 0xfbc74c83, 0x3ffe7a51, 0xca0c8de2,
+ 0x3c92d522, 0x77cdb740, 0x3ffe8f79, 0x80b054b1, 0xbc910894,
+ 0xa2a490da, 0x3ffea4af, 0x179c2893, 0xbc9e9c23, 0x867cca6e,
+ 0x3ffeb9f4, 0x2293e4f2, 0x3c94832f, 0x2d8e67f1, 0x3ffecf48,
+ 0xb411ad8c, 0xbc9c93f3, 0xa2188510, 0x3ffee4aa, 0xa487568d,
+ 0x3c91c68d, 0xee615a27, 0x3ffefa1b, 0x86a4b6b0, 0x3c9dc7f4,
+ 0x1cb6412a, 0x3fff0f9c, 0x65181d45, 0xbc932200, 0x376bba97,
+ 0x3fff252b, 0xbf0d8e43, 0x3c93a1a5, 0x48dd7274, 0x3fff3ac9,
+ 0x3ed837de, 0xbc795a5a, 0x5b6e4540, 0x3fff5076, 0x2dd8a18b,
+ 0x3c99d3e1, 0x798844f8, 0x3fff6632, 0x3539343e, 0x3c9fa37b,
+ 0xad9cbe14, 0x3fff7bfd, 0xd006350a, 0xbc9dbb12, 0x02243c89,
+ 0x3fff91d8, 0xa779f689, 0xbc612ea8, 0x819e90d8, 0x3fffa7c1,
+ 0xf3a5931e, 0x3c874853, 0x3692d514, 0x3fffbdba, 0x15098eb6,
+ 0xbc796773, 0x2b8f71f1, 0x3fffd3c2, 0x966579e7, 0x3c62eb74,
+ 0x6b2a23d9, 0x3fffe9d9, 0x7442fde3, 0x3c74a603
+ //@formatter:on
+ });
+
+ private ArrayDataPointerConstant eCoeff = pointerConstant(16, new int[]{
+ //@formatter:off
+ 0xe78a6731, 0x3f55d87f, 0xd704a0c0, 0x3fac6b08,
+ });
+ private ArrayDataPointerConstant eCoeff16 = pointerConstant(16, new int[]{
+ 0x6fba4e77, 0x3f83b2ab, 0xff82c58f, 0x3fcebfbd,
+ });
+ private ArrayDataPointerConstant eCoeff32 = pointerConstant(16, new int[]{
+ 0xfefa39ef, 0x3fe62e42, 0x00000000, 0x00000000
+ //@formatter:on
+ });
+
+ private ArrayDataPointerConstant coeffH = pointerConstant(8, new int[]{
+ //@formatter:off
+ 0x00000000, 0xbfd61a00,
+ });
+ private ArrayDataPointerConstant coeffH8 = pointerConstant(8, new int[]{
+ 0x00000000, 0xbf5dabe1
+ //@formatter:on
+ });
+
+ private ArrayDataPointerConstant highmaskLogX = pointerConstant(16, new int[]{
+ //@formatter:off
+ 0xf8000000, 0xffffffff, 0x00000000, 0xfffff800
+ //@formatter:on
+ });
+
+ private ArrayDataPointerConstant halfmask = pointerConstant(8, new int[]{
+ //@formatter:off
+ 0xf8000000, 0xffffffff, 0xf8000000, 0xffffffff
+ //@formatter:on
+ });
+
+ private ArrayDataPointerConstant coeff = pointerConstant(16, new int[]{
+ //@formatter:off
+ 0x6dc96112, 0xbf836578, 0xee241472, 0xbf9b0301,
+ });
+ private ArrayDataPointerConstant coeff16 = pointerConstant(16, new int[]{
+ 0x9f95985a, 0xbfb528db, 0xb3841d2a, 0xbfd619b6,
+ });
+ private ArrayDataPointerConstant coeff32 = pointerConstant(16, new int[]{
+ 0x518775e3, 0x3f9004f2, 0xac8349bb, 0x3fa76c9b,
+ });
+ private ArrayDataPointerConstant coeff48 = pointerConstant(16, new int[]{
+ 0x486ececc, 0x3fc4635e, 0x161bb241, 0xbf5dabe1,
+ });
+ private ArrayDataPointerConstant coeff64 = pointerConstant(16, new int[]{
+ 0x9f95985a, 0xbfb528db, 0xf8b5787d, 0x3ef2531e,
+ });
+ private ArrayDataPointerConstant coeff80 = pointerConstant(16, new int[]{
+ 0x486ececb, 0x3fc4635e, 0x412055cc, 0xbdd61bb2
+ //@formatter:on
+ });
+
+ private ArrayDataPointerConstant lTbl = pointerConstant(16, new int[]{
+ //@formatter:off
+ 0x00000000, 0x3ff00000, 0x00000000, 0x00000000, 0x20000000,
+ 0x3feff00a, 0x96621f95, 0x3e5b1856, 0xe0000000, 0x3fefe019,
+ 0xe5916f9e, 0xbe325278, 0x00000000, 0x3fefd02f, 0x859a1062,
+ 0x3e595fb7, 0xc0000000, 0x3fefc049, 0xb245f18f, 0xbe529c38,
+ 0xe0000000, 0x3fefb069, 0xad2880a7, 0xbe501230, 0x60000000,
+ 0x3fefa08f, 0xc8e72420, 0x3e597bd1, 0x80000000, 0x3fef90ba,
+ 0xc30c4500, 0xbe5d6c75, 0xe0000000, 0x3fef80ea, 0x02c63f43,
+ 0x3e2e1318, 0xc0000000, 0x3fef7120, 0xb3d4cccc, 0xbe44c52a,
+ 0x00000000, 0x3fef615c, 0xdbd91397, 0xbe4e7d6c, 0xa0000000,
+ 0x3fef519c, 0x65c5cd68, 0xbe522dc8, 0xa0000000, 0x3fef41e2,
+ 0x46d1306c, 0xbe5a840e, 0xe0000000, 0x3fef322d, 0xd2980e94,
+ 0x3e5071af, 0xa0000000, 0x3fef227e, 0x773abade, 0xbe5891e5,
+ 0xa0000000, 0x3fef12d4, 0xdc6bf46b, 0xbe5cccbe, 0xe0000000,
+ 0x3fef032f, 0xbc7247fa, 0xbe2bab83, 0x80000000, 0x3feef390,
+ 0xbcaa1e46, 0xbe53bb3b, 0x60000000, 0x3feee3f6, 0x5f6c682d,
+ 0xbe54c619, 0x80000000, 0x3feed461, 0x5141e368, 0xbe4b6d86,
+ 0xe0000000, 0x3feec4d1, 0xec678f76, 0xbe369af6, 0x80000000,
+ 0x3feeb547, 0x41301f55, 0xbe2d4312, 0x60000000, 0x3feea5c2,
+ 0x676da6bd, 0xbe4d8dd0, 0x60000000, 0x3fee9642, 0x57a891c4,
+ 0x3e51f991, 0xa0000000, 0x3fee86c7, 0xe4eb491e, 0x3e579bf9,
+ 0x20000000, 0x3fee7752, 0xfddc4a2c, 0xbe3356e6, 0xc0000000,
+ 0x3fee67e1, 0xd75b5bf1, 0xbe449531, 0x80000000, 0x3fee5876,
+ 0xbd423b8e, 0x3df54fe4, 0x60000000, 0x3fee4910, 0x330e51b9,
+ 0x3e54289c, 0x80000000, 0x3fee39af, 0x8651a95f, 0xbe55aad6,
+ 0xa0000000, 0x3fee2a53, 0x5e98c708, 0xbe2fc4a9, 0xe0000000,
+ 0x3fee1afc, 0x0989328d, 0x3e23958c, 0x40000000, 0x3fee0bab,
+ 0xee642abd, 0xbe425dd8, 0xa0000000, 0x3fedfc5e, 0xc394d236,
+ 0x3e526362, 0x20000000, 0x3feded17, 0xe104aa8e, 0x3e4ce247,
+ 0xc0000000, 0x3fedddd4, 0x265a9be4, 0xbe5bb77a, 0x40000000,
+ 0x3fedce97, 0x0ecac52f, 0x3e4a7cb1, 0xe0000000, 0x3fedbf5e,
+ 0x124cb3b8, 0x3e257024, 0x80000000, 0x3fedb02b, 0xe6d4febe,
+ 0xbe2033ee, 0x20000000, 0x3feda0fd, 0x39cca00e, 0xbe3ddabc,
+ 0xc0000000, 0x3fed91d3, 0xef8a552a, 0xbe543390, 0x40000000,
+ 0x3fed82af, 0xb8e85204, 0x3e513850, 0xe0000000, 0x3fed738f,
+ 0x3d59fe08, 0xbe5db728, 0x40000000, 0x3fed6475, 0x3aa7ead1,
+ 0x3e58804b, 0xc0000000, 0x3fed555f, 0xf8a35ba9, 0xbe5298b0,
+ 0x00000000, 0x3fed464f, 0x9a88dd15, 0x3e5a8cdb, 0x40000000,
+ 0x3fed3743, 0xb0b0a190, 0x3e598635, 0x80000000, 0x3fed283c,
+ 0xe2113295, 0xbe5c1119, 0x80000000, 0x3fed193a, 0xafbf1728,
+ 0xbe492e9c, 0x60000000, 0x3fed0a3d, 0xe4a4ccf3, 0x3e19b90e,
+ 0x20000000, 0x3fecfb45, 0xba3cbeb8, 0x3e406b50, 0xc0000000,
+ 0x3fecec51, 0x110f7ddd, 0x3e0d6806, 0x40000000, 0x3fecdd63,
+ 0x7dd7d508, 0xbe5a8943, 0x80000000, 0x3fecce79, 0x9b60f271,
+ 0xbe50676a, 0x80000000, 0x3fecbf94, 0x0b9ad660, 0x3e59174f,
+ 0x60000000, 0x3fecb0b4, 0x00823d9c, 0x3e5bbf72, 0x20000000,
+ 0x3feca1d9, 0x38a6ec89, 0xbe4d38f9, 0x80000000, 0x3fec9302,
+ 0x3a0b7d8e, 0x3e53dbfd, 0xc0000000, 0x3fec8430, 0xc6826b34,
+ 0xbe27c5c9, 0xc0000000, 0x3fec7563, 0x0c706381, 0xbe593653,
+ 0x60000000, 0x3fec669b, 0x7df34ec7, 0x3e461ab5, 0xe0000000,
+ 0x3fec57d7, 0x40e5e7e8, 0xbe5c3dae, 0x00000000, 0x3fec4919,
+ 0x5602770f, 0xbe55219d, 0xc0000000, 0x3fec3a5e, 0xec7911eb,
+ 0x3e5a5d25, 0x60000000, 0x3fec2ba9, 0xb39ea225, 0xbe53c00b,
+ 0x80000000, 0x3fec1cf8, 0x967a212e, 0x3e5a8ddf, 0x60000000,
+ 0x3fec0e4c, 0x580798bd, 0x3e5f53ab, 0x00000000, 0x3febffa5,
+ 0xb8282df6, 0xbe46b874, 0x20000000, 0x3febf102, 0xe33a6729,
+ 0x3e54963f, 0x00000000, 0x3febe264, 0x3b53e88a, 0xbe3adce1,
+ 0x60000000, 0x3febd3ca, 0xc2585084, 0x3e5cde9f, 0x80000000,
+ 0x3febc535, 0xa335c5ee, 0xbe39fd9c, 0x20000000, 0x3febb6a5,
+ 0x7325b04d, 0x3e42ba15, 0x60000000, 0x3feba819, 0x1564540f,
+ 0x3e3a9f35, 0x40000000, 0x3feb9992, 0x83fff592, 0xbe5465ce,
+ 0xa0000000, 0x3feb8b0f, 0xb9da63d3, 0xbe4b1a0a, 0x80000000,
+ 0x3feb7c91, 0x6d6f1ea4, 0x3e557657, 0x00000000, 0x3feb6e18,
+ 0x5e80a1bf, 0x3e4ddbb6, 0x00000000, 0x3feb5fa3, 0x1c9eacb5,
+ 0x3e592877, 0xa0000000, 0x3feb5132, 0x6d40beb3, 0xbe51858c,
+ 0xa0000000, 0x3feb42c6, 0xd740c67b, 0x3e427ad2, 0x40000000,
+ 0x3feb345f, 0xa3e0ccee, 0xbe5c2fc4, 0x40000000, 0x3feb25fc,
+ 0x8e752b50, 0xbe3da3c2, 0xc0000000, 0x3feb179d, 0xa892e7de,
+ 0x3e1fb481, 0xc0000000, 0x3feb0943, 0x21ed71e9, 0xbe365206,
+ 0x20000000, 0x3feafaee, 0x0e1380a3, 0x3e5c5b7b, 0x20000000,
+ 0x3feaec9d, 0x3c3d640e, 0xbe5dbbd0, 0x60000000, 0x3feade50,
+ 0x8f97a715, 0x3e3a8ec5, 0x20000000, 0x3fead008, 0x23ab2839,
+ 0x3e2fe98a, 0x40000000, 0x3feac1c4, 0xf4bbd50f, 0x3e54d8f6,
+ 0xe0000000, 0x3feab384, 0x14757c4d, 0xbe48774c, 0xc0000000,
+ 0x3feaa549, 0x7c7b0eea, 0x3e5b51bb, 0x20000000, 0x3fea9713,
+ 0xf56f7013, 0x3e386200, 0xe0000000, 0x3fea88e0, 0xbe428ebe,
+ 0xbe514af5, 0xe0000000, 0x3fea7ab2, 0x8d0e4496, 0x3e4f9165,
+ 0x60000000, 0x3fea6c89, 0xdbacc5d5, 0xbe5c063b, 0x20000000,
+ 0x3fea5e64, 0x3f19d970, 0xbe5a0c8c, 0x20000000, 0x3fea5043,
+ 0x09ea3e6b, 0x3e5065dc, 0x80000000, 0x3fea4226, 0x78df246c,
+ 0x3e5e05f6, 0x40000000, 0x3fea340e, 0x4057d4a0, 0x3e431b2b,
+ 0x40000000, 0x3fea25fa, 0x82867bb5, 0x3e4b76be, 0xa0000000,
+ 0x3fea17ea, 0x9436f40a, 0xbe5aad39, 0x20000000, 0x3fea09df,
+ 0x4b5253b3, 0x3e46380b, 0x00000000, 0x3fe9fbd8, 0x8fc52466,
+ 0xbe386f9b, 0x20000000, 0x3fe9edd5, 0x22d3f344, 0xbe538347,
+ 0x60000000, 0x3fe9dfd6, 0x1ac33522, 0x3e5dbc53, 0x00000000,
+ 0x3fe9d1dc, 0xeabdff1d, 0x3e40fc0c, 0xe0000000, 0x3fe9c3e5,
+ 0xafd30e73, 0xbe585e63, 0xe0000000, 0x3fe9b5f3, 0xa52f226a,
+ 0xbe43e8f9, 0x20000000, 0x3fe9a806, 0xecb8698d, 0xbe515b36,
+ 0x80000000, 0x3fe99a1c, 0xf2b4e89d, 0x3e48b62b, 0x20000000,
+ 0x3fe98c37, 0x7c9a88fb, 0x3e44414c, 0x00000000, 0x3fe97e56,
+ 0xda015741, 0xbe5d13ba, 0xe0000000, 0x3fe97078, 0x5fdace06,
+ 0x3e51b947, 0x00000000, 0x3fe962a0, 0x956ca094, 0x3e518785,
+ 0x40000000, 0x3fe954cb, 0x01164c1d, 0x3e5d5b57, 0xc0000000,
+ 0x3fe946fa, 0xe63b3767, 0xbe4f84e7, 0x40000000, 0x3fe9392e,
+ 0xe57cc2a9, 0x3e34eda3, 0xe0000000, 0x3fe92b65, 0x8c75b544,
+ 0x3e5766a0, 0xc0000000, 0x3fe91da1, 0x37d1d087, 0xbe5e2ab1,
+ 0x80000000, 0x3fe90fe1, 0xa953dc20, 0x3e5fa1f3, 0x80000000,
+ 0x3fe90225, 0xdbd3f369, 0x3e47d6db, 0xa0000000, 0x3fe8f46d,
+ 0x1c9be989, 0xbe5e2b0a, 0xa0000000, 0x3fe8e6b9, 0x3c93d76a,
+ 0x3e5c8618, 0xe0000000, 0x3fe8d909, 0x2182fc9a, 0xbe41aa9e,
+ 0x20000000, 0x3fe8cb5e, 0xe6b3539d, 0xbe530d19, 0x60000000,
+ 0x3fe8bdb6, 0x49e58cc3, 0xbe3bb374, 0xa0000000, 0x3fe8b012,
+ 0xa7cfeb8f, 0x3e56c412, 0x00000000, 0x3fe8a273, 0x8d52bc19,
+ 0x3e1429b8, 0x60000000, 0x3fe894d7, 0x4dc32c6c, 0xbe48604c,
+ 0xc0000000, 0x3fe8873f, 0x0c868e56, 0xbe564ee5, 0x00000000,
+ 0x3fe879ac, 0x56aee828, 0x3e5e2fd8, 0x60000000, 0x3fe86c1c,
+ 0x7ceab8ec, 0x3e493365, 0xc0000000, 0x3fe85e90, 0x78d4dadc,
+ 0xbe4f7f25, 0x00000000, 0x3fe85109, 0x0ccd8280, 0x3e31e7a2,
+ 0x40000000, 0x3fe84385, 0x34ba4e15, 0x3e328077, 0x80000000,
+ 0x3fe83605, 0xa670975a, 0xbe53eee5, 0xa0000000, 0x3fe82889,
+ 0xf61b77b2, 0xbe43a20a, 0xa0000000, 0x3fe81b11, 0x13e6643b,
+ 0x3e5e5fe5, 0xc0000000, 0x3fe80d9d, 0x82cc94e8, 0xbe5ff1f9,
+ 0xa0000000, 0x3fe8002d, 0x8a0c9c5d, 0xbe42b0e7, 0x60000000,
+ 0x3fe7f2c1, 0x22a16f01, 0x3e5d9ea0, 0x20000000, 0x3fe7e559,
+ 0xc38cd451, 0x3e506963, 0xc0000000, 0x3fe7d7f4, 0x9902bc71,
+ 0x3e4503d7, 0x40000000, 0x3fe7ca94, 0xdef2a3c0, 0x3e3d98ed,
+ 0xa0000000, 0x3fe7bd37, 0xed49abb0, 0x3e24c1ff, 0xe0000000,
+ 0x3fe7afde, 0xe3b0be70, 0xbe40c467, 0x00000000, 0x3fe7a28a,
+ 0xaf9f193c, 0xbe5dff6c, 0xe0000000, 0x3fe79538, 0xb74cf6b6,
+ 0xbe258ed0, 0xa0000000, 0x3fe787eb, 0x1d9127c7, 0x3e345fb0,
+ 0x40000000, 0x3fe77aa2, 0x1028c21d, 0xbe4619bd, 0xa0000000,
+ 0x3fe76d5c, 0x7cb0b5e4, 0x3e40f1a2, 0xe0000000, 0x3fe7601a,
+ 0x2b1bc4ad, 0xbe32e8bb, 0xe0000000, 0x3fe752dc, 0x6839f64e,
+ 0x3e41f57b, 0xc0000000, 0x3fe745a2, 0xc4121f7e, 0xbe52c40a,
+ 0x60000000, 0x3fe7386c, 0xd6852d72, 0xbe5c4e6b, 0xc0000000,
+ 0x3fe72b39, 0x91d690f7, 0xbe57f88f, 0xe0000000, 0x3fe71e0a,
+ 0x627a2159, 0xbe4425d5, 0xc0000000, 0x3fe710df, 0x50a54033,
+ 0x3e422b7e, 0x60000000, 0x3fe703b8, 0x3b0b5f91, 0x3e5d3857,
+ 0xe0000000, 0x3fe6f694, 0x84d628a2, 0xbe51f090, 0x00000000,
+ 0x3fe6e975, 0x306d8894, 0xbe414d83, 0xe0000000, 0x3fe6dc58,
+ 0x30bf24aa, 0xbe4650ca, 0x80000000, 0x3fe6cf40, 0xd4628d69,
+ 0xbe5db007, 0xc0000000, 0x3fe6c22b, 0xa2aae57b, 0xbe31d279,
+ 0xc0000000, 0x3fe6b51a, 0x860edf7e, 0xbe2d4c4a, 0x80000000,
+ 0x3fe6a80d, 0xf3559341, 0xbe5f7e98, 0xe0000000, 0x3fe69b03,
+ 0xa885899e, 0xbe5c2011, 0xe0000000, 0x3fe68dfd, 0x2bdc6d37,
+ 0x3e224a82, 0xa0000000, 0x3fe680fb, 0xc12ad1b9, 0xbe40cf56,
+ 0x00000000, 0x3fe673fd, 0x1bcdf659, 0xbdf52f2d, 0x00000000,
+ 0x3fe66702, 0x5df10408, 0x3e5663e0, 0xc0000000, 0x3fe65a0a,
+ 0xa4070568, 0xbe40b12f, 0x00000000, 0x3fe64d17, 0x71c54c47,
+ 0x3e5f5e8b, 0x00000000, 0x3fe64027, 0xbd4b7e83, 0x3e42ead6,
+ 0xa0000000, 0x3fe6333a, 0x61598bd2, 0xbe4c48d4, 0xc0000000,
+ 0x3fe62651, 0x6f538d61, 0x3e548401, 0xa0000000, 0x3fe6196c,
+ 0x14344120, 0xbe529af6, 0x00000000, 0x3fe60c8b, 0x5982c587,
+ 0xbe3e1e4f, 0x00000000, 0x3fe5ffad, 0xfe51d4ea, 0xbe4c897a,
+ 0x80000000, 0x3fe5f2d2, 0xfd46ebe1, 0x3e552e00, 0xa0000000,
+ 0x3fe5e5fb, 0xa4695699, 0x3e5ed471, 0x60000000, 0x3fe5d928,
+ 0x80d118ae, 0x3e456b61, 0xa0000000, 0x3fe5cc58, 0x304c330b,
+ 0x3e54dc29, 0x80000000, 0x3fe5bf8c, 0x0af2dedf, 0xbe3aa9bd,
+ 0xe0000000, 0x3fe5b2c3, 0x15fc9258, 0xbe479a37, 0xc0000000,
+ 0x3fe5a5fe, 0x9292c7ea, 0x3e188650, 0x20000000, 0x3fe5993d,
+ 0x33b4d380, 0x3e5d6d93, 0x20000000, 0x3fe58c7f, 0x02fd16c7,
+ 0x3e2fe961, 0xa0000000, 0x3fe57fc4, 0x4a05edb6, 0xbe4d55b4,
+ 0xa0000000, 0x3fe5730d, 0x3d443abb, 0xbe5e6954, 0x00000000,
+ 0x3fe5665a, 0x024acfea, 0x3e50e61b, 0x00000000, 0x3fe559aa,
+ 0xcc9edd09, 0xbe325403, 0x60000000, 0x3fe54cfd, 0x1fe26950,
+ 0x3e5d500e, 0x60000000, 0x3fe54054, 0x6c5ae164, 0xbe4a79b4,
+ 0xc0000000, 0x3fe533ae, 0x154b0287, 0xbe401571, 0xa0000000,
+ 0x3fe5270c, 0x0673f401, 0xbe56e56b, 0xe0000000, 0x3fe51a6d,
+ 0x751b639c, 0x3e235269, 0xa0000000, 0x3fe50dd2, 0x7c7b2bed,
+ 0x3ddec887, 0xc0000000, 0x3fe5013a, 0xafab4e17, 0x3e5e7575,
+ 0x60000000, 0x3fe4f4a6, 0x2e308668, 0x3e59aed6, 0x80000000,
+ 0x3fe4e815, 0xf33e2a76, 0xbe51f184, 0xe0000000, 0x3fe4db87,
+ 0x839f3e3e, 0x3e57db01, 0xc0000000, 0x3fe4cefd, 0xa9eda7bb,
+ 0x3e535e0f, 0x00000000, 0x3fe4c277, 0x2a8f66a5, 0x3e5ce451,
+ 0xc0000000, 0x3fe4b5f3, 0x05192456, 0xbe4e8518, 0xc0000000,
+ 0x3fe4a973, 0x4aa7cd1d, 0x3e46784a, 0x40000000, 0x3fe49cf7,
+ 0x8e23025e, 0xbe5749f2, 0x00000000, 0x3fe4907e, 0x18d30215,
+ 0x3e360f39, 0x20000000, 0x3fe48408, 0x63dcf2f3, 0x3e5e00fe,
+ 0xc0000000, 0x3fe47795, 0x46182d09, 0xbe5173d9, 0xa0000000,
+ 0x3fe46b26, 0x8f0e62aa, 0xbe48f281, 0xe0000000, 0x3fe45eba,
+ 0x5775c40c, 0xbe56aad4, 0x60000000, 0x3fe45252, 0x0fe25f69,
+ 0x3e48bd71, 0x40000000, 0x3fe445ed, 0xe9989ec5, 0x3e590d97,
+ 0x80000000, 0x3fe4398b, 0xb3d9ffe3, 0x3e479dbc, 0x20000000,
+ 0x3fe42d2d, 0x388e4d2e, 0xbe5eed80, 0xe0000000, 0x3fe420d1,
+ 0x6f797c18, 0x3e554b4c, 0x20000000, 0x3fe4147a, 0x31048bb4,
+ 0xbe5b1112, 0x80000000, 0x3fe40825, 0x2efba4f9, 0x3e48ebc7,
+ 0x40000000, 0x3fe3fbd4, 0x50201119, 0x3e40b701, 0x40000000,
+ 0x3fe3ef86, 0x0a4db32c, 0x3e551de8, 0xa0000000, 0x3fe3e33b,
+ 0x0c9c148b, 0xbe50c1f6, 0x20000000, 0x3fe3d6f4, 0xc9129447,
+ 0x3e533fa0, 0x00000000, 0x3fe3cab0, 0xaae5b5a0, 0xbe22b68e,
+ 0x20000000, 0x3fe3be6f, 0x02305e8a, 0xbe54fc08, 0x60000000,
+ 0x3fe3b231, 0x7f908258, 0x3e57dc05, 0x00000000, 0x3fe3a5f7,
+ 0x1a09af78, 0x3e08038b, 0xe0000000, 0x3fe399bf, 0x490643c1,
+ 0xbe5dbe42, 0xe0000000, 0x3fe38d8b, 0x5e8ad724, 0xbe3c2b72,
+ 0x20000000, 0x3fe3815b, 0xc67196b6, 0x3e1713cf, 0xa0000000,
+ 0x3fe3752d, 0x6182e429, 0xbe3ec14c, 0x40000000, 0x3fe36903,
+ 0xab6eb1ae, 0x3e5a2cc5, 0x40000000, 0x3fe35cdc, 0xfe5dc064,
+ 0xbe5c5878, 0x40000000, 0x3fe350b8, 0x0ba6b9e4, 0x3e51619b,
+ 0x80000000, 0x3fe34497, 0x857761aa, 0x3e5fff53, 0x00000000,
+ 0x3fe3387a, 0xf872d68c, 0x3e484f4d, 0xa0000000, 0x3fe32c5f,
+ 0x087e97c2, 0x3e52842e, 0x80000000, 0x3fe32048, 0x73d6d0c0,
+ 0xbe503edf, 0x80000000, 0x3fe31434, 0x0c1456a1, 0xbe5f72ad,
+ 0xa0000000, 0x3fe30823, 0x83a1a4d5, 0xbe5e65cc, 0xe0000000,
+ 0x3fe2fc15, 0x855a7390, 0xbe506438, 0x40000000, 0x3fe2f00b,
+ 0xa2898287, 0x3e3d22a2, 0xe0000000, 0x3fe2e403, 0x8b56f66f,
+ 0xbe5aa5fd, 0x80000000, 0x3fe2d7ff, 0x52db119a, 0x3e3a2e3d,
+ 0x60000000, 0x3fe2cbfe, 0xe2ddd4c0, 0xbe586469, 0x40000000,
+ 0x3fe2c000, 0x6b01bf10, 0x3e352b9d, 0x40000000, 0x3fe2b405,
+ 0xb07a1cdf, 0x3e5c5cda, 0x80000000, 0x3fe2a80d, 0xc7b5f868,
+ 0xbe5668b3, 0xc0000000, 0x3fe29c18, 0x185edf62, 0xbe563d66,
+ 0x00000000, 0x3fe29027, 0xf729e1cc, 0x3e59a9a0, 0x80000000,
+ 0x3fe28438, 0x6433c727, 0xbe43cc89, 0x00000000, 0x3fe2784d,
+ 0x41782631, 0xbe30750c, 0xa0000000, 0x3fe26c64, 0x914911b7,
+ 0xbe58290e, 0x40000000, 0x3fe2607f, 0x3dcc73e1, 0xbe4269cd,
+ 0x00000000, 0x3fe2549d, 0x2751bf70, 0xbe5a6998, 0xc0000000,
+ 0x3fe248bd, 0x4248b9fb, 0xbe4ddb00, 0x80000000, 0x3fe23ce1,
+ 0xf35cf82f, 0x3e561b71, 0x60000000, 0x3fe23108, 0x8e481a2d,
+ 0x3e518fb9, 0x60000000, 0x3fe22532, 0x5ab96edc, 0xbe5fafc5,
+ 0x40000000, 0x3fe2195f, 0x80943911, 0xbe07f819, 0x40000000,
+ 0x3fe20d8f, 0x386f2d6c, 0xbe54ba8b, 0x40000000, 0x3fe201c2,
+ 0xf29664ac, 0xbe5eb815, 0x20000000, 0x3fe1f5f8, 0x64f03390,
+ 0x3e5e320c, 0x20000000, 0x3fe1ea31, 0x747ff696, 0x3e5ef0a5,
+ 0x40000000, 0x3fe1de6d, 0x3e9ceb51, 0xbe5f8d27, 0x20000000,
+ 0x3fe1d2ac, 0x4ae0b55e, 0x3e5faa21, 0x20000000, 0x3fe1c6ee,
+ 0x28569a5e, 0x3e598a4f, 0x20000000, 0x3fe1bb33, 0x54b33e07,
+ 0x3e46130a, 0x20000000, 0x3fe1af7b, 0x024f1078, 0xbe4dbf93,
+ 0x00000000, 0x3fe1a3c6, 0xb0783bfa, 0x3e419248, 0xe0000000,
+ 0x3fe19813, 0x2f02b836, 0x3e4e02b7, 0xc0000000, 0x3fe18c64,
+ 0x28dec9d4, 0x3e09064f, 0x80000000, 0x3fe180b8, 0x45cbf406,
+ 0x3e5b1f46, 0x40000000, 0x3fe1750f, 0x03d9964c, 0x3e5b0a79,
+ 0x00000000, 0x3fe16969, 0x8b5b882b, 0xbe238086, 0xa0000000,
+ 0x3fe15dc5, 0x73bad6f8, 0xbdf1fca4, 0x20000000, 0x3fe15225,
+ 0x5385769c, 0x3e5e8d76, 0xa0000000, 0x3fe14687, 0x1676dc6b,
+ 0x3e571d08, 0x20000000, 0x3fe13aed, 0xa8c41c7f, 0xbe598a25,
+ 0x60000000, 0x3fe12f55, 0xc4e1aaf0, 0x3e435277, 0xa0000000,
+ 0x3fe123c0, 0x403638e1, 0xbe21aa7c, 0xc0000000, 0x3fe1182e,
+ 0x557a092b, 0xbdd0116b, 0xc0000000, 0x3fe10c9f, 0x7d779f66,
+ 0x3e4a61ba, 0xc0000000, 0x3fe10113, 0x2b09c645, 0xbe5d586e,
+ 0x20000000, 0x3fe0ea04, 0xea2cad46, 0x3e5aa97c, 0x20000000,
+ 0x3fe0d300, 0x23190e54, 0x3e50f1a7, 0xa0000000, 0x3fe0bc07,
+ 0x1379a5a6, 0xbe51619d, 0x60000000, 0x3fe0a51a, 0x926a3d4a,
+ 0x3e5cf019, 0xa0000000, 0x3fe08e38, 0xa8c24358, 0x3e35241e,
+ 0x20000000, 0x3fe07762, 0x24317e7a, 0x3e512cfa, 0x00000000,
+ 0x3fe06097, 0xfd9cf274, 0xbe55bef3, 0x00000000, 0x3fe049d7,
+ 0x3689b49d, 0xbe36d26d, 0x40000000, 0x3fe03322, 0xf72ef6c4,
+ 0xbe54cd08, 0xa0000000, 0x3fe01c78, 0x23702d2d, 0xbe5900bf,
+ 0x00000000, 0x3fe005da, 0x3f59c14c, 0x3e57d80b, 0x40000000,
+ 0x3fdfde8d, 0xad67766d, 0xbe57fad4, 0x40000000, 0x3fdfb17c,
+ 0x644f4ae7, 0x3e1ee43b, 0x40000000, 0x3fdf8481, 0x903234d2,
+ 0x3e501a86, 0x40000000, 0x3fdf579c, 0xafe9e509, 0xbe267c3e,
+ 0x00000000, 0x3fdf2acd, 0xb7dfda0b, 0xbe48149b, 0x40000000,
+ 0x3fdefe13, 0x3b94305e, 0x3e5f4ea7, 0x80000000, 0x3fded16f,
+ 0x5d95da61, 0xbe55c198, 0x00000000, 0x3fdea4e1, 0x406960c9,
+ 0xbdd99a19, 0x00000000, 0x3fde7868, 0xd22f3539, 0x3e470c78,
+ 0x80000000, 0x3fde4c04, 0x83eec535, 0xbe3e1232, 0x40000000,
+ 0x3fde1fb6, 0x3dfbffcb, 0xbe4b7d71, 0x40000000, 0x3fddf37d,
+ 0x7e1be4e0, 0xbe5b8f8f, 0x40000000, 0x3fddc759, 0x46dae887,
+ 0xbe350458, 0x80000000, 0x3fdd9b4a, 0xed6ecc49, 0xbe5f0045,
+ 0x80000000, 0x3fdd6f50, 0x2e9e883c, 0x3e2915da, 0x80000000,
+ 0x3fdd436b, 0xf0bccb32, 0x3e4a68c9, 0x80000000, 0x3fdd179b,
+ 0x9bbfc779, 0xbe54a26a, 0x00000000, 0x3fdcebe0, 0x7cea33ab,
+ 0x3e43c6b7, 0x40000000, 0x3fdcc039, 0xe740fd06, 0x3e5526c2,
+ 0x40000000, 0x3fdc94a7, 0x9eadeb1a, 0xbe396d8d, 0xc0000000,
+ 0x3fdc6929, 0xf0a8f95a, 0xbe5c0ab2, 0x80000000, 0x3fdc3dc0,
+ 0x6ee2693b, 0x3e0992e6, 0xc0000000, 0x3fdc126b, 0x5ac6b581,
+ 0xbe2834b6, 0x40000000, 0x3fdbe72b, 0x8cc226ff, 0x3e3596a6,
+ 0x00000000, 0x3fdbbbff, 0xf92a74bb, 0x3e3c5813, 0x00000000,
+ 0x3fdb90e7, 0x479664c0, 0xbe50d644, 0x00000000, 0x3fdb65e3,
+ 0x5004975b, 0xbe55258f, 0x00000000, 0x3fdb3af3, 0xe4b23194,
+ 0xbe588407, 0xc0000000, 0x3fdb1016, 0xe65d4d0a, 0x3e527c26,
+ 0x80000000, 0x3fdae54e, 0x814fddd6, 0x3e5962a2, 0x40000000,
+ 0x3fdaba9a, 0xe19d0913, 0xbe562f4e, 0x80000000, 0x3fda8ff9,
+ 0x43cfd006, 0xbe4cfdeb, 0x40000000, 0x3fda656c, 0x686f0a4e,
+ 0x3e5e47a8, 0xc0000000, 0x3fda3af2, 0x7200d410, 0x3e5e1199,
+ 0xc0000000, 0x3fda108c, 0xabd2266e, 0x3e5ee4d1, 0x40000000,
+ 0x3fd9e63a, 0x396f8f2c, 0x3e4dbffb, 0x00000000, 0x3fd9bbfb,
+ 0xe32b25dd, 0x3e5c3a54, 0x40000000, 0x3fd991cf, 0x431e4035,
+ 0xbe457925, 0x80000000, 0x3fd967b6, 0x7bed3dd3, 0x3e40c61d,
+ 0x00000000, 0x3fd93db1, 0xd7449365, 0x3e306419, 0x80000000,
+ 0x3fd913be, 0x1746e791, 0x3e56fcfc, 0x40000000, 0x3fd8e9df,
+ 0xf3a9028b, 0xbe5041b9, 0xc0000000, 0x3fd8c012, 0x56840c50,
+ 0xbe26e20a, 0x40000000, 0x3fd89659, 0x19763102, 0xbe51f466,
+ 0x80000000, 0x3fd86cb2, 0x7032de7c, 0xbe4d298a, 0x80000000,
+ 0x3fd8431e, 0xdeb39fab, 0xbe4361eb, 0x40000000, 0x3fd8199d,
+ 0x5d01cbe0, 0xbe5425b3, 0x80000000, 0x3fd7f02e, 0x3ce99aa9,
+ 0x3e146fa8, 0x80000000, 0x3fd7c6d2, 0xd1a262b9, 0xbe5a1a69,
+ 0xc0000000, 0x3fd79d88, 0x8606c236, 0x3e423a08, 0x80000000,
+ 0x3fd77451, 0x8fd1e1b7, 0x3e5a6a63, 0xc0000000, 0x3fd74b2c,
+ 0xe491456a, 0x3e42c1ca, 0x40000000, 0x3fd7221a, 0x4499a6d7,
+ 0x3e36a69a, 0x00000000, 0x3fd6f91a, 0x5237df94, 0xbe0f8f02,
+ 0x00000000, 0x3fd6d02c, 0xb6482c6e, 0xbe5abcf7, 0x00000000,
+ 0x3fd6a750, 0x1919fd61, 0xbe57ade2, 0x00000000, 0x3fd67e86,
+ 0xaa7a994d, 0xbe3f3fbd, 0x00000000, 0x3fd655ce, 0x67db014c,
+ 0x3e33c550, 0x00000000, 0x3fd62d28, 0xa82856b7, 0xbe1409d1,
+ 0xc0000000, 0x3fd60493, 0x1e6a300d, 0x3e55d899, 0x80000000,
+ 0x3fd5dc11, 0x1222bd5c, 0xbe35bfc0, 0xc0000000, 0x3fd5b3a0,
+ 0x6e8dc2d3, 0x3e5d4d79, 0x00000000, 0x3fd58b42, 0xe0e4ace6,
+ 0xbe517303, 0x80000000, 0x3fd562f4, 0xb306e0a8, 0x3e5edf0f,
+ 0xc0000000, 0x3fd53ab8, 0x6574bc54, 0x3e5ee859, 0x80000000,
+ 0x3fd5128e, 0xea902207, 0x3e5f6188, 0xc0000000, 0x3fd4ea75,
+ 0x9f911d79, 0x3e511735, 0x80000000, 0x3fd4c26e, 0xf9c77397,
+ 0xbe5b1643, 0x40000000, 0x3fd49a78, 0x15fc9258, 0x3e479a37,
+ 0x80000000, 0x3fd47293, 0xd5a04dd9, 0xbe426e56, 0xc0000000,
+ 0x3fd44abf, 0xe04042f5, 0x3e56f7c6, 0x40000000, 0x3fd422fd,
+ 0x1d8bf2c8, 0x3e5d8810, 0x00000000, 0x3fd3fb4c, 0x88a8ddee,
+ 0xbe311454, 0xc0000000, 0x3fd3d3ab, 0x3e3b5e47, 0xbe5d1b72,
+ 0x40000000, 0x3fd3ac1c, 0xc2ab5d59, 0x3e31b02b, 0xc0000000,
+ 0x3fd3849d, 0xd4e34b9e, 0x3e51cb2f, 0x40000000, 0x3fd35d30,
+ 0x177204fb, 0xbe2b8cd7, 0x80000000, 0x3fd335d3, 0xfcd38c82,
+ 0xbe4356e1, 0x80000000, 0x3fd30e87, 0x64f54acc, 0xbe4e6224,
+ 0x00000000, 0x3fd2e74c, 0xaa7975d9, 0x3e5dc0fe, 0x80000000,
+ 0x3fd2c021, 0x516dab3f, 0xbe50ffa3, 0x40000000, 0x3fd29907,
+ 0x2bfb7313, 0x3e5674a2, 0xc0000000, 0x3fd271fd, 0x0549fc99,
+ 0x3e385d29, 0xc0000000, 0x3fd24b04, 0x55b63073, 0xbe500c6d,
+ 0x00000000, 0x3fd2241c, 0x3f91953a, 0x3e389977, 0xc0000000,
+ 0x3fd1fd43, 0xa1543f71, 0xbe3487ab, 0xc0000000, 0x3fd1d67b,
+ 0x4ec8867c, 0x3df6a2dc, 0x00000000, 0x3fd1afc4, 0x4328e3bb,
+ 0x3e41d9c0, 0x80000000, 0x3fd1891c, 0x2e1cda84, 0x3e3bdd87,
+ 0x40000000, 0x3fd16285, 0x4b5331ae, 0xbe53128e, 0x00000000,
+ 0x3fd13bfe, 0xb9aec164, 0xbe52ac98, 0xc0000000, 0x3fd11586,
+ 0xd91e1316, 0xbe350630, 0x80000000, 0x3fd0ef1f, 0x7cacc12c,
+ 0x3e3f5219, 0x40000000, 0x3fd0c8c8, 0xbce277b7, 0x3e3d30c0,
+ 0x00000000, 0x3fd0a281, 0x2a63447d, 0xbe541377, 0x80000000,
+ 0x3fd07c49, 0xfac483b5, 0xbe5772ec, 0xc0000000, 0x3fd05621,
+ 0x36b8a570, 0xbe4fd4bd, 0xc0000000, 0x3fd03009, 0xbae505f7,
+ 0xbe450388, 0x80000000, 0x3fd00a01, 0x3e35aead, 0xbe5430fc,
+ 0x80000000, 0x3fcfc811, 0x707475ac, 0x3e38806e, 0x80000000,
+ 0x3fcf7c3f, 0xc91817fc, 0xbe40ccea, 0x80000000, 0x3fcf308c,
+ 0xae05d5e9, 0xbe4919b8, 0x80000000, 0x3fcee4f8, 0xae6cc9e6,
+ 0xbe530b94, 0x00000000, 0x3fce9983, 0x1efe3e8e, 0x3e57747e,
+ 0x00000000, 0x3fce4e2d, 0xda78d9bf, 0xbe59a608, 0x00000000,
+ 0x3fce02f5, 0x8abe2c2e, 0x3e4a35ad, 0x00000000, 0x3fcdb7dc,
+ 0x1495450d, 0xbe0872cc, 0x80000000, 0x3fcd6ce1, 0x86ee0ba0,
+ 0xbe4f59a0, 0x00000000, 0x3fcd2205, 0xe81ca888, 0x3e5402c3,
+ 0x00000000, 0x3fccd747, 0x3b4424b9, 0x3e5dfdc3, 0x80000000,
+ 0x3fcc8ca7, 0xd305b56c, 0x3e202da6, 0x00000000, 0x3fcc4226,
+ 0x399a6910, 0xbe482a1c, 0x80000000, 0x3fcbf7c2, 0x747f7938,
+ 0xbe587372, 0x80000000, 0x3fcbad7c, 0x6fc246a0, 0x3e50d83d,
+ 0x00000000, 0x3fcb6355, 0xee9e9be5, 0xbe5c35bd, 0x80000000,
+ 0x3fcb194a, 0x8416c0bc, 0x3e546d4f, 0x00000000, 0x3fcacf5e,
+ 0x49f7f08f, 0x3e56da76, 0x00000000, 0x3fca858f, 0x5dc30de2,
+ 0x3e5f390c, 0x00000000, 0x3fca3bde, 0x950583b6, 0xbe5e4169,
+ 0x80000000, 0x3fc9f249, 0x33631553, 0x3e52aeb1, 0x00000000,
+ 0x3fc9a8d3, 0xde8795a6, 0xbe59a504, 0x00000000, 0x3fc95f79,
+ 0x076bf41e, 0x3e5122fe, 0x80000000, 0x3fc9163c, 0x2914c8e7,
+ 0x3e3dd064, 0x00000000, 0x3fc8cd1d, 0x3a30eca3, 0xbe21b4aa,
+ 0x80000000, 0x3fc8841a, 0xb2a96650, 0xbe575444, 0x80000000,
+ 0x3fc83b34, 0x2376c0cb, 0xbe2a74c7, 0x80000000, 0x3fc7f26b,
+ 0xd8a0b653, 0xbe5181b6, 0x00000000, 0x3fc7a9bf, 0x32257882,
+ 0xbe4a78b4, 0x00000000, 0x3fc7612f, 0x1eee8bd9, 0xbe1bfe9d,
+ 0x80000000, 0x3fc718bb, 0x0c603cc4, 0x3e36fdc9, 0x80000000,
+ 0x3fc6d064, 0x3728b8cf, 0xbe1e542e, 0x80000000, 0x3fc68829,
+ 0xc79a4067, 0x3e5c380f, 0x00000000, 0x3fc6400b, 0xf69eac69,
+ 0x3e550a84, 0x80000000, 0x3fc5f808, 0xb7a780a4, 0x3e5d9224,
+ 0x80000000, 0x3fc5b022, 0xad9dfb1e, 0xbe55242f, 0x00000000,
+ 0x3fc56858, 0x659b18be, 0xbe4bfda3, 0x80000000, 0x3fc520a9,
+ 0x66ee3631, 0xbe57d769, 0x80000000, 0x3fc4d916, 0x1ec62819,
+ 0x3e2427f7, 0x80000000, 0x3fc4919f, 0xdec25369, 0xbe435431,
+ 0x00000000, 0x3fc44a44, 0xa8acfc4b, 0xbe3c62e8, 0x00000000,
+ 0x3fc40304, 0xcf1d3eab, 0xbdfba29f, 0x80000000, 0x3fc3bbdf,
+ 0x79aba3ea, 0xbdf1b7c8, 0x80000000, 0x3fc374d6, 0xb8d186da,
+ 0xbe5130cf, 0x80000000, 0x3fc32de8, 0x9d74f152, 0x3e2285b6,
+ 0x00000000, 0x3fc2e716, 0x50ae7ca9, 0xbe503920, 0x80000000,
+ 0x3fc2a05e, 0x6caed92e, 0xbe533924, 0x00000000, 0x3fc259c2,
+ 0x9cb5034e, 0xbe510e31, 0x80000000, 0x3fc21340, 0x12c4d378,
+ 0xbe540b43, 0x80000000, 0x3fc1ccd9, 0xcc418706, 0x3e59887a,
+ 0x00000000, 0x3fc1868e, 0x921f4106, 0xbe528e67, 0x80000000,
+ 0x3fc1405c, 0x3969441e, 0x3e5d8051, 0x00000000, 0x3fc0fa46,
+ 0xd941ef5b, 0x3e5f9079, 0x80000000, 0x3fc0b44a, 0x5a3e81b2,
+ 0xbe567691, 0x00000000, 0x3fc06e69, 0x9d66afe7, 0xbe4d43fb,
+ 0x00000000, 0x3fc028a2, 0x0a92a162, 0xbe52f394, 0x00000000,
+ 0x3fbfc5ea, 0x209897e5, 0x3e529e37, 0x00000000, 0x3fbf3ac5,
+ 0x8458bd7b, 0x3e582831, 0x00000000, 0x3fbeafd5, 0xb8d8b4b8,
+ 0xbe486b4a, 0x00000000, 0x3fbe2518, 0xe0a3b7b6, 0x3e5bafd2,
+ 0x00000000, 0x3fbd9a90, 0x2bf2710e, 0x3e383b2b, 0x00000000,
+ 0x3fbd103c, 0x73eb6ab7, 0xbe56d78d, 0x00000000, 0x3fbc861b,
+ 0x32ceaff5, 0xbe32dc5a, 0x00000000, 0x3fbbfc2e, 0xbee04cb7,
+ 0xbe4a71a4, 0x00000000, 0x3fbb7274, 0x35ae9577, 0x3e38142f,
+ 0x00000000, 0x3fbae8ee, 0xcbaddab4, 0xbe5490f0, 0x00000000,
+ 0x3fba5f9a, 0x95ce1114, 0x3e597c71, 0x00000000, 0x3fb9d67a,
+ 0x6d7c0f78, 0x3e3abc2d, 0x00000000, 0x3fb94d8d, 0x2841a782,
+ 0xbe566cbc, 0x00000000, 0x3fb8c4d2, 0x6ed429c6, 0xbe3cfff9,
+ 0x00000000, 0x3fb83c4a, 0xe4a49fbb, 0xbe552964, 0x00000000,
+ 0x3fb7b3f4, 0x2193d81e, 0xbe42fa72, 0x00000000, 0x3fb72bd0,
+ 0xdd70c122, 0x3e527a8c, 0x00000000, 0x3fb6a3df, 0x03108a54,
+ 0xbe450393, 0x00000000, 0x3fb61c1f, 0x30ff7954, 0x3e565840,
+ 0x00000000, 0x3fb59492, 0xdedd460c, 0xbe5422b5, 0x00000000,
+ 0x3fb50d36, 0x950f9f45, 0xbe5313f6, 0x00000000, 0x3fb4860b,
+ 0x582cdcb1, 0x3e506d39, 0x00000000, 0x3fb3ff12, 0x7216d3a6,
+ 0x3e4aa719, 0x00000000, 0x3fb3784a, 0x57a423fd, 0x3e5a9b9f,
+ 0x00000000, 0x3fb2f1b4, 0x7a138b41, 0xbe50b418, 0x00000000,
+ 0x3fb26b4e, 0x2fbfd7ea, 0x3e23a53e, 0x00000000, 0x3fb1e519,
+ 0x18913ccb, 0x3e465fc1, 0x00000000, 0x3fb15f15, 0x7ea24e21,
+ 0x3e042843, 0x00000000, 0x3fb0d941, 0x7c6d9c77, 0x3e59f61e,
+ 0x00000000, 0x3fb0539e, 0x114efd44, 0x3e4ccab7, 0x00000000,
+ 0x3faf9c56, 0x1777f657, 0x3e552f65, 0x00000000, 0x3fae91d2,
+ 0xc317b86a, 0xbe5a61e0, 0x00000000, 0x3fad87ac, 0xb7664efb,
+ 0xbe41f64e, 0x00000000, 0x3fac7de6, 0x5d3d03a9, 0x3e0807a0,
+ 0x00000000, 0x3fab7480, 0x743c38eb, 0xbe3726e1, 0x00000000,
+ 0x3faa6b78, 0x06a253f1, 0x3e5ad636, 0x00000000, 0x3fa962d0,
+ 0xa35f541b, 0x3e5a187a, 0x00000000, 0x3fa85a88, 0x4b86e446,
+ 0xbe508150, 0x00000000, 0x3fa7529c, 0x2589cacf, 0x3e52938a,
+ 0x00000000, 0x3fa64b10, 0xaf6b11f2, 0xbe3454cd, 0x00000000,
+ 0x3fa543e2, 0x97506fef, 0xbe5fdec5, 0x00000000, 0x3fa43d10,
+ 0xe75f7dd9, 0xbe388dd3, 0x00000000, 0x3fa3369c, 0xa4139632,
+ 0xbdea5177, 0x00000000, 0x3fa23086, 0x352d6f1e, 0xbe565ad6,
+ 0x00000000, 0x3fa12acc, 0x77449eb7, 0xbe50d5c7, 0x00000000,
+ 0x3fa0256e, 0x7478da78, 0x3e404724, 0x00000000, 0x3f9e40dc,
+ 0xf59cef7f, 0xbe539d0a, 0x00000000, 0x3f9c3790, 0x1511d43c,
+ 0x3e53c2c8, 0x00000000, 0x3f9a2f00, 0x9b8bff3c, 0xbe43b3e1,
+ 0x00000000, 0x3f982724, 0xad1e22a5, 0x3e46f0bd, 0x00000000,
+ 0x3f962000, 0x130d9356, 0x3e475ba0, 0x00000000, 0x3f941994,
+ 0x8f86f883, 0xbe513d0b, 0x00000000, 0x3f9213dc, 0x914d0dc8,
+ 0xbe534335, 0x00000000, 0x3f900ed8, 0x2d73e5e7, 0xbe22ba75,
+ 0x00000000, 0x3f8c1510, 0xc5b7d70e, 0x3e599c5d, 0x00000000,
+ 0x3f880de0, 0x8a27857e, 0xbe3d28c8, 0x00000000, 0x3f840810,
+ 0xda767328, 0x3e531b3d, 0x00000000, 0x3f8003b0, 0x77bacaf3,
+ 0xbe5f04e3, 0x00000000, 0x3f780150, 0xdf4b0720, 0x3e5a8bff,
+ 0x00000000, 0x3f6ffc40, 0x34c48e71, 0xbe3fcd99, 0x00000000,
+ 0x3f5ff6c0, 0x1ad218af, 0xbe4c78a7, 0x00000000, 0x00000000,
+ 0x00000000, 0x80000000
+ //@formatter:on
+ });
+
+ private ArrayDataPointerConstant log2 = pointerConstant(8, new int[]{
+ //@formatter:off
+ 0xfefa39ef, 0x3fe62e42, 0xfefa39ef, 0xbfe62e42
+ //@formatter:on
+ });
+
+ private ArrayDataPointerConstant double2 = pointerConstant(8, new int[]{
+ //@formatter:off
+ 0x00000000, 0x40000000
+ //@formatter:on
+ });
+
+ @Override
+ public void emitCode(CompilationResultBuilder crb, AMD64MacroAssembler masm) {
+ // registers,
+ // input: xmm0, xmm1
+ // scratch: xmm1, xmm2, xmm3, xmm4, xmm5, xmm6, xmm7
+ // rax, rdx, rcx, r8, r11
+
+ // Code generated by Intel C compiler for LIBM library
+ Label block0 = new Label();
+ Label block1 = new Label();
+ Label block2 = new Label();
+ Label block3 = new Label();
+ Label block4 = new Label();
+ Label block5 = new Label();
+ Label block6 = new Label();
+ Label block7 = new Label();
+ Label block8 = new Label();
+ Label block9 = new Label();
+ Label block10 = new Label();
+ Label block11 = new Label();
+ Label block12 = new Label();
+ Label block13 = new Label();
+ Label block14 = new Label();
+ Label block15 = new Label();
+ Label block16 = new Label();
+ Label block17 = new Label();
+ Label block18 = new Label();
+ Label block19 = new Label();
+ Label block20 = new Label();
+ Label block21 = new Label();
+ Label block22 = new Label();
+ Label block23 = new Label();
+ Label block24 = new Label();
+ Label block25 = new Label();
+ Label block26 = new Label();
+ Label block27 = new Label();
+ Label block28 = new Label();
+ Label block29 = new Label();
+ Label block30 = new Label();
+ Label block31 = new Label();
+ Label block32 = new Label();
+ Label block33 = new Label();
+ Label block34 = new Label();
+ Label block35 = new Label();
+ Label block36 = new Label();
+ Label block37 = new Label();
+ Label block38 = new Label();
+ Label block39 = new Label();
+ Label block40 = new Label();
+ Label block41 = new Label();
+ Label block42 = new Label();
+ Label block43 = new Label();
+ Label block44 = new Label();
+ Label block45 = new Label();
+ Label block46 = new Label();
+ Label block47 = new Label();
+ Label block48 = new Label();
+ Label block49 = new Label();
+ Label block50 = new Label();
+ Label block51 = new Label();
+ Label block52 = new Label();
+ Label block53 = new Label();
+ Label block54 = new Label();
+ Label block55 = new Label();
+ Label block56 = new Label();
+ Label block57 = new Label();
+
+ Register tmp1 = r8;
+ Register tmp2 = r9;
+ Register tmp3 = r10;
+ Register tmp4 = r11;
+
+ masm.subq(rsp, 40);
+ masm.movsd(new AMD64Address(rsp, 8), xmm0);
+ masm.movsd(new AMD64Address(rsp, 16), xmm1);
+
+ // Special case: pow(x, 2.0) => x * x
+ masm.movdq(tmp1, xmm1);
+ masm.cmpq(tmp1, recordExternalAddress(crb, double2));
+ masm.jccb(AMD64Assembler.ConditionFlag.NotEqual, block57);
+ masm.mulsd(xmm0, xmm0);
+ masm.jmp(block56);
+
+ masm.bind(block57);
+ masm.pextrw(rax, xmm0, 3);
+ masm.xorpd(xmm2, xmm2);
+ masm.movq(tmp2, 0x3ff0000000000000L);
+ masm.movdq(xmm2, tmp2);
+ masm.movl(tmp1, 1069088768);
+ masm.movdq(xmm7, tmp1);
+ masm.xorpd(xmm1, xmm1);
+ masm.movq(tmp3, 0x77f0000000000000L);
+ masm.movdq(xmm1, tmp3);
+ masm.movdqu(xmm3, xmm0);
+ masm.movl(rdx, 32752);
+ masm.andl(rdx, rax);
+ masm.subl(rdx, 16368);
+ masm.movl(rcx, rdx);
+ masm.sarl(rdx, 31);
+ masm.addl(rcx, rdx);
+ masm.xorl(rcx, rdx);
+ masm.por(xmm0, xmm2);
+ masm.movdqu(xmm6, recordExternalAddress(crb, highsigmask)); // 0x00000000, 0xfffff800,
+ // 0x00000000, 0xfffff800
+ masm.psrlq(xmm0, 27);
+ masm.movq(xmm2, recordExternalAddress(crb, log2E)); // 0x00000000, 0x3ff72000,
+ // 0x161bb241, 0xbf5dabe1
+ masm.psrld(xmm0, 2);
+ masm.addl(rcx, 16);
+ masm.bsrl(rcx, rcx);
+ masm.rcpps(xmm0, xmm0);
+ masm.psllq(xmm3, 12);
+ masm.movl(tmp4, 8192);
+ masm.movdq(xmm4, tmp4);
+ masm.psrlq(xmm3, 12);
+ masm.subl(rax, 16);
+ masm.cmpl(rax, 32736);
+ masm.jcc(AMD64Assembler.ConditionFlag.AboveEqual, block0);
+ masm.movl(tmp1, 0);
+
+ masm.bind(block1);
+ masm.mulss(xmm0, xmm7);
+ masm.movl(rdx, -1);
+ masm.subl(rcx, 4);
+ masm.shll(rdx);
+ masm.shlq(rdx, 32);
+ masm.movdq(xmm5, rdx);
+ masm.por(xmm3, xmm1);
+ masm.subl(rax, 16351);
+ masm.cmpl(rax, 1);
+ masm.jcc(AMD64Assembler.ConditionFlag.BelowEqual, block2);
+ masm.paddd(xmm0, xmm4);
+ masm.pand(xmm5, xmm3);
+ masm.movdl(rdx, xmm0);
+ masm.psllq(xmm0, 29);
+
+ masm.bind(block3);
+ masm.subsd(xmm3, xmm5);
+ masm.pand(xmm0, xmm6);
+ masm.subl(rax, 1);
+ masm.sarl(rax, 4);
+ masm.cvtsi2sdl(xmm7, rax);
+ masm.mulpd(xmm5, xmm0);
+
+ masm.bind(block4);
+ masm.mulsd(xmm3, xmm0);
+ masm.movdqu(xmm1, recordExternalAddress(crb, coeff)); // 0x6dc96112, 0xbf836578,
+ // 0xee241472, 0xbf9b0301
+ masm.leaq(tmp4, recordExternalAddress(crb, lTbl));
+ masm.subsd(xmm5, xmm2);
+ masm.movdqu(xmm4, recordExternalAddress(crb, coeff16)); // 0x9f95985a, 0xbfb528db,
+ // 0xb3841d2a, 0xbfd619b6
+ masm.movl(rcx, rax);
+ masm.sarl(rax, 31);
+ masm.addl(rcx, rax);
+ masm.xorl(rax, rcx);
+ masm.addl(rax, 1);
+ masm.bsrl(rax, rax);
+ masm.unpcklpd(xmm5, xmm3);
+ masm.movdqu(xmm6, recordExternalAddress(crb, coeff32)); // 0x518775e3, 0x3f9004f2,
+ // 0xac8349bb, 0x3fa76c9b
+ masm.addsd(xmm3, xmm5);
+ masm.andl(rdx, 16760832);
+ masm.shrl(rdx, 10);
+ masm.addpd(xmm5, new AMD64Address(tmp4, rdx, AMD64Address.Scale.Times1, -3648));
+ masm.movdqu(xmm0, recordExternalAddress(crb, coeff48)); // 0x486ececc, 0x3fc4635e,
+ // 0x161bb241, 0xbf5dabe1
+ masm.pshufd(xmm2, xmm3, 68);
+ masm.mulsd(xmm3, xmm3);
+ masm.mulpd(xmm1, xmm2);
+ masm.mulpd(xmm4, xmm2);
+ masm.addsd(xmm5, xmm7);
+ masm.mulsd(xmm2, xmm3);
+ masm.addpd(xmm6, xmm1);
+ masm.mulsd(xmm3, xmm3);
+ masm.addpd(xmm0, xmm4);
+ masm.movq(xmm1, new AMD64Address(rsp, 16));
+ masm.movw(rcx, new AMD64Address(rsp, 22));
+ masm.pshufd(xmm7, xmm5, 238);
+ masm.movq(xmm4, recordExternalAddress(crb, highmaskY)); // 0x00000000, 0xfffffff8,
+ // 0x00000000, 0xffffffff
+ masm.mulpd(xmm6, xmm2);
+ masm.pshufd(xmm3, xmm3, 68);
+ masm.mulpd(xmm0, xmm2);
+ masm.shll(rax, 4);
+ masm.subl(rax, 15872);
+ masm.andl(rcx, 32752);
+ masm.addl(rax, rcx);
+ masm.mulpd(xmm3, xmm6);
+ masm.cmpl(rax, 624);
+ masm.jcc(AMD64Assembler.ConditionFlag.AboveEqual, block5);
+ masm.xorpd(xmm6, xmm6);
+ masm.movl(rdx, 17080);
+ masm.pinsrw(xmm6, rdx, 3);
+ masm.movdqu(xmm2, xmm1);
+ masm.pand(xmm4, xmm1);
+ masm.subsd(xmm1, xmm4);
+ masm.mulsd(xmm4, xmm5);
+ masm.addsd(xmm0, xmm7);
+ masm.mulsd(xmm1, xmm5);
+ masm.movdqu(xmm7, xmm6);
+ masm.addsd(xmm6, xmm4);
+ masm.leaq(tmp4, recordExternalAddress(crb, tExp));
+ masm.addpd(xmm3, xmm0);
+ masm.movdl(rdx, xmm6);
+ masm.subsd(xmm6, xmm7);
+ masm.pshufd(xmm0, xmm3, 238);
+ masm.subsd(xmm4, xmm6);
+ masm.addsd(xmm0, xmm3);
+ masm.movl(rcx, rdx);
+ masm.andl(rdx, 255);
+ masm.addl(rdx, rdx);
+ masm.movdqu(xmm5, new AMD64Address(tmp4, rdx, AMD64Address.Scale.Times8, 0));
+ masm.addsd(xmm4, xmm1);
+ masm.mulsd(xmm2, xmm0);
+ masm.movdqu(xmm7, recordExternalAddress(crb, eCoeff)); // 0xe78a6731, 0x3f55d87f,
+ // 0xd704a0c0, 0x3fac6b08
+ masm.movdqu(xmm3, recordExternalAddress(crb, eCoeff16)); // 0x6fba4e77, 0x3f83b2ab,
+ // 0xff82c58f, 0x3fcebfbd
+ masm.shll(rcx, 12);
+ masm.xorl(rcx, tmp1);
+ masm.andl(rcx, -1048576);
+ masm.movdq(xmm6, rcx);
+ masm.addsd(xmm2, xmm4);
+ masm.movq(tmp2, 0x3fe62e42fefa39efL);
+ masm.movdq(xmm1, tmp2);
+ masm.pshufd(xmm0, xmm2, 68);
+ masm.pshufd(xmm4, xmm2, 68);
+ masm.mulsd(xmm1, xmm2);
+ masm.pshufd(xmm6, xmm6, 17);
+ masm.mulpd(xmm0, xmm0);
+ masm.mulpd(xmm7, xmm4);
+ masm.paddd(xmm5, xmm6);
+ masm.mulsd(xmm1, xmm5);
+ masm.pshufd(xmm6, xmm5, 238);
+ masm.mulsd(xmm0, xmm0);
+ masm.addpd(xmm3, xmm7);
+ masm.addsd(xmm1, xmm6);
+ masm.mulpd(xmm0, xmm3);
+ masm.pshufd(xmm3, xmm0, 238);
+ masm.mulsd(xmm0, xmm5);
+ masm.mulsd(xmm3, xmm5);
+ masm.addsd(xmm0, xmm1);
+ masm.addsd(xmm0, xmm3);
+ masm.addsd(xmm0, xmm5);
+ masm.jmp(block56);
+
+ masm.bind(block0);
+ masm.addl(rax, 16);
+ masm.movl(rdx, 32752);
+ masm.andl(rdx, rax);
+ masm.cmpl(rdx, 32752);
+ masm.jcc(AMD64Assembler.ConditionFlag.Equal, block6);
+ masm.testl(rax, 32768);
+ masm.jcc(AMD64Assembler.ConditionFlag.NotEqual, block7);
+
+ masm.bind(block8);
+ masm.movq(xmm0, new AMD64Address(rsp, 8));
+ masm.movq(xmm3, new AMD64Address(rsp, 8));
+ masm.movdl(rdx, xmm3);
+ masm.psrlq(xmm3, 32);
+ masm.movdl(rcx, xmm3);
+ masm.orl(rdx, rcx);
+ masm.cmpl(rdx, 0);
+ masm.jcc(AMD64Assembler.ConditionFlag.Equal, block9);
+ masm.xorpd(xmm3, xmm3);
+ masm.movl(rax, 18416);
+ masm.pinsrw(xmm3, rax, 3);
+ masm.mulsd(xmm0, xmm3);
+ masm.xorpd(xmm2, xmm2);
+ masm.movl(rax, 16368);
+ masm.pinsrw(xmm2, rax, 3);
+ masm.movdqu(xmm3, xmm0);
+ masm.pextrw(rax, xmm0, 3);
+ masm.por(xmm0, xmm2);
+ masm.movl(rcx, 18416);
+ masm.psrlq(xmm0, 27);
+ masm.movq(xmm2, recordExternalAddress(crb, log2E)); // 0x00000000, 0x3ff72000,
+ // 0x161bb241, 0xbf5dabe1
+ masm.psrld(xmm0, 2);
+ masm.rcpps(xmm0, xmm0);
+ masm.psllq(xmm3, 12);
+ masm.movdqu(xmm6, recordExternalAddress(crb, highsigmask)); // 0x00000000, 0xfffff800,
+ // 0x00000000, 0xfffff800
+ masm.psrlq(xmm3, 12);
+ masm.mulss(xmm0, xmm7);
+ masm.movl(rdx, -1024);
+ masm.movdl(xmm5, rdx);
+ masm.por(xmm3, xmm1);
+ masm.paddd(xmm0, xmm4);
+ masm.psllq(xmm5, 32);
+ masm.movdl(rdx, xmm0);
+ masm.psllq(xmm0, 29);
+ masm.pand(xmm5, xmm3);
+ masm.movl(tmp1, 0);
+ masm.pand(xmm0, xmm6);
+ masm.subsd(xmm3, xmm5);
+ masm.andl(rax, 32752);
+ masm.subl(rax, 18416);
+ masm.sarl(rax, 4);
+ masm.cvtsi2sdl(xmm7, rax);
+ masm.mulpd(xmm5, xmm0);
+ masm.jmp(block4);
+
+ masm.bind(block10);
+ masm.movq(xmm0, new AMD64Address(rsp, 8));
+ masm.movq(xmm3, new AMD64Address(rsp, 8));
+ masm.movdl(rdx, xmm3);
+ masm.psrlq(xmm3, 32);
+ masm.movdl(rcx, xmm3);
+ masm.orl(rdx, rcx);
+ masm.cmpl(rdx, 0);
+ masm.jcc(AMD64Assembler.ConditionFlag.Equal, block9);
+ masm.xorpd(xmm3, xmm3);
+ masm.movl(rax, 18416);
+ masm.pinsrw(xmm3, rax, 3);
+ masm.mulsd(xmm0, xmm3);
+ masm.xorpd(xmm2, xmm2);
+ masm.movl(rax, 16368);
+ masm.pinsrw(xmm2, rax, 3);
+ masm.movdqu(xmm3, xmm0);
+ masm.pextrw(rax, xmm0, 3);
+ masm.por(xmm0, xmm2);
+ masm.movl(rcx, 18416);
+ masm.psrlq(xmm0, 27);
+ masm.movq(xmm2, recordExternalAddress(crb, log2E)); // 0x00000000, 0x3ff72000,
+ // 0x161bb241, 0xbf5dabe1
+ masm.psrld(xmm0, 2);
+ masm.rcpps(xmm0, xmm0);
+ masm.psllq(xmm3, 12);
+ masm.movdqu(xmm6, recordExternalAddress(crb, highsigmask)); // 0x00000000, 0xfffff800,
+ // 0x00000000, 0xfffff800
+ masm.psrlq(xmm3, 12);
+ masm.mulss(xmm0, xmm7);
+ masm.movl(rdx, -1024);
+ masm.movdl(xmm5, rdx);
+ masm.por(xmm3, xmm1);
+ masm.paddd(xmm0, xmm4);
+ masm.psllq(xmm5, 32);
+ masm.movdl(rdx, xmm0);
+ masm.psllq(xmm0, 29);
+ masm.pand(xmm5, xmm3);
+ masm.movl(tmp1, Integer.MIN_VALUE);
+ masm.pand(xmm0, xmm6);
+ masm.subsd(xmm3, xmm5);
+ masm.andl(rax, 32752);
+ masm.subl(rax, 18416);
+ masm.sarl(rax, 4);
+ masm.cvtsi2sdl(xmm7, rax);
+ masm.mulpd(xmm5, xmm0);
+ masm.jmp(block4);
+
+ masm.bind(block5);
+ masm.cmpl(rax, 0);
+ masm.jcc(AMD64Assembler.ConditionFlag.Less, block11);
+ masm.cmpl(rax, 752);
+ masm.jcc(AMD64Assembler.ConditionFlag.AboveEqual, block12);
+ masm.addsd(xmm0, xmm7);
+ masm.movq(xmm2, recordExternalAddress(crb, halfmask)); // 0xf8000000, 0xffffffff,
+ // 0xf8000000, 0xffffffff
+ masm.addpd(xmm3, xmm0);
+ masm.xorpd(xmm6, xmm6);
+ masm.movl(rax, 17080);
+ masm.pinsrw(xmm6, rax, 3);
+ masm.pshufd(xmm0, xmm3, 238);
+ masm.addsd(xmm0, xmm3);
+ masm.movdqu(xmm3, xmm5);
+ masm.addsd(xmm5, xmm0);
+ masm.movdqu(xmm4, xmm2);
+ masm.subsd(xmm3, xmm5);
+ masm.movdqu(xmm7, xmm5);
+ masm.pand(xmm5, xmm2);
+ masm.movdqu(xmm2, xmm1);
+ masm.pand(xmm4, xmm1);
+ masm.subsd(xmm7, xmm5);
+ masm.addsd(xmm0, xmm3);
+ masm.subsd(xmm1, xmm4);
+ masm.mulsd(xmm4, xmm5);
+ masm.addsd(xmm0, xmm7);
+ masm.mulsd(xmm2, xmm0);
+ masm.movdqu(xmm7, xmm6);
+ masm.mulsd(xmm1, xmm5);
+ masm.addsd(xmm6, xmm4);
+ masm.movdl(rax, xmm6);
+ masm.subsd(xmm6, xmm7);
+ masm.leaq(tmp4, recordExternalAddress(crb, tExp));
+ masm.addsd(xmm2, xmm1);
+ masm.movdqu(xmm7, recordExternalAddress(crb, eCoeff)); // 0xe78a6731, 0x3f55d87f,
+ // 0xd704a0c0, 0x3fac6b08
+ masm.movdqu(xmm3, recordExternalAddress(crb, eCoeff16)); // 0x6fba4e77, 0x3f83b2ab,
+ // 0xff82c58f, 0x3fcebfbd
+ masm.subsd(xmm4, xmm6);
+ masm.pextrw(rdx, xmm6, 3);
+ masm.movl(rcx, rax);
+ masm.andl(rax, 255);
+ masm.addl(rax, rax);
+ masm.movdqu(xmm5, new AMD64Address(tmp4, rax, AMD64Address.Scale.Times8, 0));
+ masm.addsd(xmm2, xmm4);
+ masm.sarl(rcx, 8);
+ masm.movl(rax, rcx);
+ masm.sarl(rcx, 1);
+ masm.subl(rax, rcx);
+ masm.shll(rcx, 20);
+ masm.xorl(rcx, tmp1);
+ masm.movdl(xmm6, rcx);
+ masm.movq(xmm1, recordExternalAddress(crb, eCoeff32)); // 0xfefa39ef, 0x3fe62e42,
+ // 0x00000000, 0x00000000
+ masm.andl(rdx, 32767);
+ masm.cmpl(rdx, 16529);
+ masm.jcc(AMD64Assembler.ConditionFlag.Above, block12);
+ masm.pshufd(xmm0, xmm2, 68);
+ masm.pshufd(xmm4, xmm2, 68);
+ masm.mulpd(xmm0, xmm0);
+ masm.mulpd(xmm7, xmm4);
+ masm.pshufd(xmm6, xmm6, 17);
+ masm.mulsd(xmm1, xmm2);
+ masm.mulsd(xmm0, xmm0);
+ masm.paddd(xmm5, xmm6);
+ masm.addpd(xmm3, xmm7);
+ masm.mulsd(xmm1, xmm5);
+ masm.pshufd(xmm6, xmm5, 238);
+ masm.mulpd(xmm0, xmm3);
+ masm.addsd(xmm1, xmm6);
+ masm.pshufd(xmm3, xmm0, 238);
+ masm.mulsd(xmm0, xmm5);
+ masm.mulsd(xmm3, xmm5);
+ masm.shll(rax, 4);
+ masm.xorpd(xmm4, xmm4);
+ masm.addl(rax, 16368);
+ masm.pinsrw(xmm4, rax, 3);
+ masm.addsd(xmm0, xmm1);
+ masm.addsd(xmm0, xmm3);
+ masm.movdqu(xmm1, xmm0);
+ masm.addsd(xmm0, xmm5);
+ masm.mulsd(xmm0, xmm4);
+ masm.pextrw(rax, xmm0, 3);
+ masm.andl(rax, 32752);
+ masm.jcc(AMD64Assembler.ConditionFlag.Equal, block13);
+ masm.cmpl(rax, 32752);
+ masm.jcc(AMD64Assembler.ConditionFlag.Equal, block14);
+ masm.jmp(block56);
+
+ masm.bind(block6);
+ masm.movq(xmm1, new AMD64Address(rsp, 16));
+ masm.movq(xmm0, new AMD64Address(rsp, 8));
+ masm.movdqu(xmm2, xmm0);
+ masm.movdl(rax, xmm2);
+ masm.psrlq(xmm2, 20);
+ masm.movdl(rdx, xmm2);
+ masm.orl(rax, rdx);
+ masm.jcc(AMD64Assembler.ConditionFlag.Equal, block15);
+ masm.movdl(rax, xmm1);
+ masm.psrlq(xmm1, 32);
+ masm.movdl(rdx, xmm1);
+ masm.movl(rcx, rdx);
+ masm.addl(rdx, rdx);
+ masm.orl(rax, rdx);
+ masm.jcc(AMD64Assembler.ConditionFlag.Equal, block16);
+ masm.addsd(xmm0, xmm0);
+ masm.jmp(block56);
+
+ masm.bind(block16);
+ masm.xorpd(xmm0, xmm0);
+ masm.movl(rax, 16368);
+ masm.pinsrw(xmm0, rax, 3);
+ masm.movl(new AMD64Address(rsp, 0), 29);
+ masm.jmp(block17);
+
+ masm.bind(block18);
+ masm.movq(xmm0, new AMD64Address(rsp, 16));
+ masm.addpd(xmm0, xmm0);
+ masm.jmp(block56);
+
+ masm.bind(block15);
+ masm.movdl(rax, xmm1);
+ masm.movdqu(xmm2, xmm1);
+ masm.psrlq(xmm1, 32);
+ masm.movdl(rdx, xmm1);
+ masm.movl(rcx, rdx);
+ masm.addl(rdx, rdx);
+ masm.orl(rax, rdx);
+ masm.jcc(AMD64Assembler.ConditionFlag.Equal, block19);
+ masm.pextrw(rax, xmm2, 3);
+ masm.andl(rax, 32752);
+ masm.cmpl(rax, 32752);
+ masm.jcc(AMD64Assembler.ConditionFlag.NotEqual, block20);
+ masm.movdl(rax, xmm2);
+ masm.psrlq(xmm2, 20);
+ masm.movdl(rdx, xmm2);
+ masm.orl(rax, rdx);
+ masm.jcc(AMD64Assembler.ConditionFlag.NotEqual, block18);
+
+ masm.bind(block20);
+ masm.pextrw(rax, xmm0, 3);
+ masm.testl(rax, 32768);
+ masm.jcc(AMD64Assembler.ConditionFlag.NotEqual, block21);
+ masm.testl(rcx, Integer.MIN_VALUE);
+ masm.jcc(AMD64Assembler.ConditionFlag.NotEqual, block22);
+ masm.jmp(block56);
+
+ masm.bind(block23);
+ masm.movq(xmm1, new AMD64Address(rsp, 16));
+ masm.movdl(rax, xmm1);
+ masm.testl(rax, 1);
+ masm.jcc(AMD64Assembler.ConditionFlag.NotEqual, block24);
+ masm.testl(rax, 2);
+ masm.jcc(AMD64Assembler.ConditionFlag.NotEqual, block25);
+ masm.jmp(block24);
+
+ masm.bind(block21);
+ masm.shrl(rcx, 20);
+ masm.andl(rcx, 2047);
+ masm.cmpl(rcx, 1075);
+ masm.jcc(AMD64Assembler.ConditionFlag.Above, block24);
+ masm.jcc(AMD64Assembler.ConditionFlag.Equal, block26);
+ masm.cmpl(rcx, 1074);
+ masm.jcc(AMD64Assembler.ConditionFlag.Above, block23);
+ masm.cmpl(rcx, 1023);
+ masm.jcc(AMD64Assembler.ConditionFlag.Below, block24);
+ masm.movq(xmm1, new AMD64Address(rsp, 16));
+ masm.movl(rax, 17208);
+ masm.xorpd(xmm3, xmm3);
+ masm.pinsrw(xmm3, rax, 3);
+ masm.movdqu(xmm4, xmm3);
+ masm.addsd(xmm3, xmm1);
+ masm.subsd(xmm4, xmm3);
+ masm.addsd(xmm1, xmm4);
+ masm.pextrw(rax, xmm1, 3);
+ masm.andl(rax, 32752);
+ masm.jcc(AMD64Assembler.ConditionFlag.NotEqual, block24);
+ masm.movdl(rax, xmm3);
+ masm.andl(rax, 1);
+ masm.jcc(AMD64Assembler.ConditionFlag.Equal, block24);
+
+ masm.bind(block25);
+ masm.movq(xmm1, new AMD64Address(rsp, 16));
+ masm.pextrw(rax, xmm1, 3);
+ masm.andl(rax, 32768);
+ masm.jcc(AMD64Assembler.ConditionFlag.NotEqual, block27);
+ masm.jmp(block56);
+
+ masm.bind(block27);
+ masm.xorpd(xmm0, xmm0);
+ masm.movl(rax, 32768);
+ masm.pinsrw(xmm0, rax, 3);
+ masm.jmp(block56);
+
+ masm.bind(block24);
+ masm.movq(xmm1, new AMD64Address(rsp, 16));
+ masm.pextrw(rax, xmm1, 3);
+ masm.andl(rax, 32768);
+ masm.jcc(AMD64Assembler.ConditionFlag.NotEqual, block22);
+ masm.xorpd(xmm0, xmm0);
+ masm.movl(rax, 32752);
+ masm.pinsrw(xmm0, rax, 3);
+ masm.jmp(block56);
+
+ masm.bind(block26);
+ masm.movq(xmm1, new AMD64Address(rsp, 16));
+ masm.movdl(rax, xmm1);
+ masm.andl(rax, 1);
+ masm.jcc(AMD64Assembler.ConditionFlag.Equal, block24);
+ masm.jmp(block25);
+
+ masm.bind(block28);
+ masm.movdl(rax, xmm1);
+ masm.psrlq(xmm1, 20);
+ masm.movdl(rdx, xmm1);
+ masm.orl(rax, rdx);
+ masm.jcc(AMD64Assembler.ConditionFlag.Equal, block29);
+ masm.movq(xmm0, new AMD64Address(rsp, 16));
+ masm.addsd(xmm0, xmm0);
+ masm.jmp(block56);
+
+ masm.bind(block29);
+ masm.movq(xmm0, new AMD64Address(rsp, 8));
+ masm.pextrw(rax, xmm0, 3);
+ masm.cmpl(rax, 49136);
+ masm.jcc(AMD64Assembler.ConditionFlag.NotEqual, block30);
+ masm.movdl(rcx, xmm0);
+ masm.psrlq(xmm0, 20);
+ masm.movdl(rdx, xmm0);
+ masm.orl(rcx, rdx);
+ masm.jcc(AMD64Assembler.ConditionFlag.NotEqual, block30);
+ masm.xorpd(xmm0, xmm0);
+ masm.movl(rax, 32760);
+ masm.pinsrw(xmm0, rax, 3);
+ masm.jmp(block56);
+
+ masm.bind(block30);
+ masm.movq(xmm1, new AMD64Address(rsp, 16));
+ masm.andl(rax, 32752);
+ masm.subl(rax, 16368);
+ masm.pextrw(rdx, xmm1, 3);
+ masm.xorpd(xmm0, xmm0);
+ masm.xorl(rax, rdx);
+ masm.andl(rax, 32768);
+ masm.jcc(AMD64Assembler.ConditionFlag.Equal, block31);
+ masm.jmp(block56);
+
+ masm.bind(block31);
+ masm.movl(rcx, 32752);
+ masm.pinsrw(xmm0, rcx, 3);
+ masm.jmp(block56);
+
+ masm.bind(block32);
+ masm.movdl(rax, xmm1);
+ masm.cmpl(rdx, 17184);
+ masm.jcc(AMD64Assembler.ConditionFlag.Above, block33);
+ masm.testl(rax, 1);
+ masm.jcc(AMD64Assembler.ConditionFlag.NotEqual, block34);
+ masm.testl(rax, 2);
+ masm.jcc(AMD64Assembler.ConditionFlag.Equal, block35);
+ masm.jmp(block36);
+
+ masm.bind(block33);
+ masm.testl(rax, 1);
+ masm.jcc(AMD64Assembler.ConditionFlag.Equal, block35);
+ masm.jmp(block36);
+
+ masm.bind(block7);
+ masm.movq(xmm2, new AMD64Address(rsp, 8));
+ masm.movdl(rax, xmm2);
+ masm.psrlq(xmm2, 31);
+ masm.movdl(rcx, xmm2);
+ masm.orl(rax, rcx);
+ masm.jcc(AMD64Assembler.ConditionFlag.Equal, block9);
+ masm.movq(xmm1, new AMD64Address(rsp, 16));
+ masm.pextrw(rdx, xmm1, 3);
+ masm.movdl(rax, xmm1);
+ masm.movdqu(xmm2, xmm1);
+ masm.psrlq(xmm2, 32);
+ masm.movdl(rcx, xmm2);
+ masm.addl(rcx, rcx);
+ masm.orl(rcx, rax);
+ masm.jcc(AMD64Assembler.ConditionFlag.Equal, block37);
+ masm.andl(rdx, 32752);
+ masm.cmpl(rdx, 32752);
+ masm.jcc(AMD64Assembler.ConditionFlag.Equal, block28);
+ masm.cmpl(rdx, 17200);
+ masm.jcc(AMD64Assembler.ConditionFlag.Above, block35);
+ masm.cmpl(rdx, 17184);
+ masm.jcc(AMD64Assembler.ConditionFlag.AboveEqual, block32);
+ masm.cmpl(rdx, 16368);
+ masm.jcc(AMD64Assembler.ConditionFlag.Below, block34);
+ masm.movl(rax, 17208);
+ masm.xorpd(xmm2, xmm2);
+ masm.pinsrw(xmm2, rax, 3);
+ masm.movdqu(xmm4, xmm2);
+ masm.addsd(xmm2, xmm1);
+ masm.subsd(xmm4, xmm2);
+ masm.addsd(xmm1, xmm4);
+ masm.pextrw(rax, xmm1, 3);
+ masm.andl(rax, 32767);
+ masm.jcc(AMD64Assembler.ConditionFlag.NotEqual, block34);
+ masm.movdl(rax, xmm2);
+ masm.andl(rax, 1);
+ masm.jcc(AMD64Assembler.ConditionFlag.Equal, block35);
+
+ masm.bind(block36);
+ masm.xorpd(xmm1, xmm1);
+ masm.movl(rdx, 30704);
+ masm.pinsrw(xmm1, rdx, 3);
+ masm.movq(xmm2, recordExternalAddress(crb, log2E)); // 0x00000000, 0x3ff72000,
+ // 0x161bb241, 0xbf5dabe1
+ masm.movq(xmm4, new AMD64Address(rsp, 8));
+ masm.pextrw(rax, xmm4, 3);
+ masm.movl(rdx, 8192);
+ masm.movdl(xmm4, rdx);
+ masm.andl(rax, 32767);
+ masm.subl(rax, 16);
+ masm.jcc(AMD64Assembler.ConditionFlag.Less, block10);
+ masm.movl(rdx, rax);
+ masm.andl(rdx, 32752);
+ masm.subl(rdx, 16368);
+ masm.movl(rcx, rdx);
+ masm.sarl(rdx, 31);
+ masm.addl(rcx, rdx);
+ masm.xorl(rcx, rdx);
+ masm.addl(rcx, 16);
+ masm.bsrl(rcx, rcx);
+ masm.movl(tmp1, Integer.MIN_VALUE);
+ masm.jmp(block1);
+
+ masm.bind(block34);
+ masm.xorpd(xmm1, xmm1);
+ masm.movl(rax, 32752);
+ masm.pinsrw(xmm1, rax, 3);
+ masm.xorpd(xmm0, xmm0);
+ masm.mulsd(xmm0, xmm1);
+ masm.movl(new AMD64Address(rsp, 0), 28);
+ masm.jmp(block17);
+
+ masm.bind(block35);
+ masm.xorpd(xmm1, xmm1);
+ masm.movl(rdx, 30704);
+ masm.pinsrw(xmm1, rdx, 3);
+ masm.movq(xmm2, recordExternalAddress(crb, log2E)); // 0x00000000, 0x3ff72000,
+ // 0x161bb241, 0xbf5dabe1
+ masm.movq(xmm4, new AMD64Address(rsp, 8));
+ masm.pextrw(rax, xmm4, 3);
+ masm.movl(rdx, 8192);
+ masm.movdl(xmm4, rdx);
+ masm.andl(rax, 32767);
+ masm.subl(rax, 16);
+ masm.jcc(AMD64Assembler.ConditionFlag.Less, block8);
+ masm.movl(rdx, rax);
+ masm.andl(rdx, 32752);
+ masm.subl(rdx, 16368);
+ masm.movl(rcx, rdx);
+ masm.sarl(rdx, 31);
+ masm.addl(rcx, rdx);
+ masm.xorl(rcx, rdx);
+ masm.addl(rcx, 16);
+ masm.bsrl(rcx, rcx);
+ masm.movl(tmp1, 0);
+ masm.jmp(block1);
+
+ masm.bind(block19);
+ masm.xorpd(xmm0, xmm0);
+ masm.movl(rax, 16368);
+ masm.pinsrw(xmm0, rax, 3);
+ masm.jmp(block56);
+
+ masm.bind(block22);
+ masm.xorpd(xmm0, xmm0);
+ masm.jmp(block56);
+
+ masm.bind(block11);
+ masm.addl(rax, 384);
+ masm.cmpl(rax, 0);
+ masm.jcc(AMD64Assembler.ConditionFlag.Less, block38);
+ masm.mulsd(xmm5, xmm1);
+ masm.addsd(xmm0, xmm7);
+ masm.shrl(tmp1, 31);
+ masm.addpd(xmm3, xmm0);
+ masm.pshufd(xmm0, xmm3, 238);
+ masm.addsd(xmm3, xmm0);
+ masm.leaq(tmp4, recordExternalAddress(crb, log2)); // 0xfefa39ef, 0x3fe62e42,
+ // 0xfefa39ef, 0xbfe62e42
+ masm.movq(xmm4, new AMD64Address(tmp4, tmp1, AMD64Address.Scale.Times8, 0));
+ masm.mulsd(xmm1, xmm3);
+ masm.xorpd(xmm0, xmm0);
+ masm.movl(rax, 16368);
+ masm.shll(tmp1, 15);
+ masm.orl(rax, tmp1);
+ masm.pinsrw(xmm0, rax, 3);
+ masm.addsd(xmm5, xmm1);
+ masm.mulsd(xmm5, xmm4);
+ masm.addsd(xmm0, xmm5);
+ masm.jmp(block56);
+
+ masm.bind(block38);
+
+ masm.bind(block37);
+ masm.xorpd(xmm0, xmm0);
+ masm.movl(rax, 16368);
+ masm.pinsrw(xmm0, rax, 3);
+ masm.jmp(block56);
+
+ masm.bind(block39);
+ masm.xorpd(xmm0, xmm0);
+ masm.movl(rax, 16368);
+ masm.pinsrw(xmm0, rax, 3);
+ masm.movl(new AMD64Address(rsp, 0), 26);
+ masm.jmp(block17);
+
+ masm.bind(block9);
+ masm.movq(xmm1, new AMD64Address(rsp, 16));
+ masm.movdqu(xmm2, xmm1);
+ masm.pextrw(rax, xmm1, 3);
+ masm.andl(rax, 32752);
+ masm.cmpl(rax, 32752);
+ masm.jcc(AMD64Assembler.ConditionFlag.NotEqual, block40);
+ masm.movdl(rax, xmm2);
+ masm.psrlq(xmm2, 20);
+ masm.movdl(rdx, xmm2);
+ masm.orl(rax, rdx);
+ masm.jcc(AMD64Assembler.ConditionFlag.NotEqual, block18);
+
+ masm.bind(block40);
+ masm.movdl(rax, xmm1);
+ masm.psrlq(xmm1, 32);
+ masm.movdl(rdx, xmm1);
+ masm.movl(rcx, rdx);
+ masm.addl(rdx, rdx);
+ masm.orl(rax, rdx);
+ masm.jcc(AMD64Assembler.ConditionFlag.Equal, block39);
+ masm.shrl(rdx, 21);
+ masm.cmpl(rdx, 1075);
+ masm.jcc(AMD64Assembler.ConditionFlag.Above, block41);
+ masm.jcc(AMD64Assembler.ConditionFlag.Equal, block42);
+ masm.cmpl(rdx, 1023);
+ masm.jcc(AMD64Assembler.ConditionFlag.Below, block41);
+ masm.movq(xmm1, new AMD64Address(rsp, 16));
+ masm.movl(rax, 17208);
+ masm.xorpd(xmm3, xmm3);
+ masm.pinsrw(xmm3, rax, 3);
+ masm.movdqu(xmm4, xmm3);
+ masm.addsd(xmm3, xmm1);
+ masm.subsd(xmm4, xmm3);
+ masm.addsd(xmm1, xmm4);
+ masm.pextrw(rax, xmm1, 3);
+ masm.andl(rax, 32752);
+ masm.jcc(AMD64Assembler.ConditionFlag.NotEqual, block41);
+ masm.movdl(rax, xmm3);
+ masm.andl(rax, 1);
+ masm.jcc(AMD64Assembler.ConditionFlag.Equal, block41);
+
+ masm.bind(block43);
+ masm.movq(xmm0, new AMD64Address(rsp, 8));
+ masm.testl(rcx, Integer.MIN_VALUE);
+ masm.jcc(AMD64Assembler.ConditionFlag.NotEqual, block44);
+ masm.jmp(block56);
+
+ masm.bind(block42);
+ masm.movq(xmm1, new AMD64Address(rsp, 16));
+ masm.movdl(rax, xmm1);
+ masm.testl(rax, 1);
+ masm.jcc(AMD64Assembler.ConditionFlag.NotEqual, block43);
+
+ masm.bind(block41);
+ masm.testl(rcx, Integer.MIN_VALUE);
+ masm.jcc(AMD64Assembler.ConditionFlag.Equal, block22);
+ masm.xorpd(xmm0, xmm0);
+
+ masm.bind(block44);
+ masm.movl(rax, 16368);
+ masm.xorpd(xmm1, xmm1);
+ masm.pinsrw(xmm1, rax, 3);
+ masm.divsd(xmm1, xmm0);
+ masm.movdqu(xmm0, xmm1);
+ masm.movl(new AMD64Address(rsp, 0), 27);
+ masm.jmp(block17);
+
+ masm.bind(block12);
+ masm.movq(xmm2, new AMD64Address(rsp, 8));
+ masm.movq(xmm6, new AMD64Address(rsp, 16));
+ masm.pextrw(rax, xmm2, 3);
+ masm.pextrw(rdx, xmm6, 3);
+ masm.movl(rcx, 32752);
+ masm.andl(rcx, rdx);
+ masm.cmpl(rcx, 32752);
+ masm.jcc(AMD64Assembler.ConditionFlag.Equal, block45);
+ masm.andl(rax, 32752);
+ masm.subl(rax, 16368);
+ masm.xorl(rdx, rax);
+ masm.testl(rdx, 32768);
+ masm.jcc(AMD64Assembler.ConditionFlag.NotEqual, block46);
+
+ masm.bind(block47);
+ masm.movl(rax, 32736);
+ masm.pinsrw(xmm0, rax, 3);
+ masm.shrl(tmp1, 16);
+ masm.orl(rax, tmp1);
+ masm.pinsrw(xmm1, rax, 3);
+ masm.mulsd(xmm0, xmm1);
+
+ masm.bind(block14);
+ masm.movl(new AMD64Address(rsp, 0), 24);
+ masm.jmp(block17);
+
+ masm.bind(block46);
+ masm.movl(rax, 16);
+ masm.pinsrw(xmm0, rax, 3);
+ masm.mulsd(xmm0, xmm0);
+ masm.testl(tmp1, Integer.MIN_VALUE);
+ masm.jcc(AMD64Assembler.ConditionFlag.Equal, block48);
+ masm.movq(tmp2, 0x8000000000000000L);
+ masm.movdq(xmm2, tmp2);
+ masm.xorpd(xmm0, xmm2);
+
+ masm.bind(block48);
+ masm.movl(new AMD64Address(rsp, 0), 25);
+ masm.jmp(block17);
+
+ masm.bind(block13);
+ masm.pextrw(rcx, xmm5, 3);
+ masm.pextrw(rdx, xmm4, 3);
+ masm.movl(rax, -1);
+ masm.andl(rcx, 32752);
+ masm.subl(rcx, 16368);
+ masm.andl(rdx, 32752);
+ masm.addl(rdx, rcx);
+ masm.movl(rcx, -31);
+ masm.sarl(rdx, 4);
+ masm.subl(rcx, rdx);
+ masm.jcc(AMD64Assembler.ConditionFlag.LessEqual, block49);
+ masm.cmpl(rcx, 20);
+ masm.jcc(AMD64Assembler.ConditionFlag.Above, block50);
+ masm.shll(rax);
+
+ masm.bind(block49);
+ masm.movdl(xmm0, rax);
+ masm.psllq(xmm0, 32);
+ masm.pand(xmm0, xmm5);
+ masm.subsd(xmm5, xmm0);
+ masm.addsd(xmm5, xmm1);
+ masm.mulsd(xmm0, xmm4);
+ masm.mulsd(xmm5, xmm4);
+ masm.addsd(xmm0, xmm5);
+
+ masm.bind(block50);
+ masm.jmp(block48);
+
+ masm.bind(block2);
+ masm.movw(rcx, new AMD64Address(rsp, 22));
+ masm.movl(rdx, Integer.MIN_VALUE);
+ masm.movdl(xmm1, rdx);
+ masm.xorpd(xmm7, xmm7);
+ masm.paddd(xmm0, xmm4);
+ masm.movdl(rdx, xmm0);
+ masm.psllq(xmm0, 29);
+ masm.paddq(xmm1, xmm3);
+ masm.pand(xmm5, xmm1);
+ masm.andl(rcx, 32752);
+ masm.cmpl(rcx, 16560);
+ masm.jcc(AMD64Assembler.ConditionFlag.Less, block3);
+ masm.pand(xmm0, xmm6);
+ masm.subsd(xmm3, xmm5);
+ masm.addl(rax, 16351);
+ masm.shrl(rax, 4);
+ masm.subl(rax, 1022);
+ masm.cvtsi2sdl(xmm7, rax);
+ masm.mulpd(xmm5, xmm0);
+ masm.leaq(r11, recordExternalAddress(crb, lTbl));
+ masm.movq(xmm4, recordExternalAddress(crb, coeffH)); // 0x00000000, 0xbfd61a00,
+ // 0x00000000, 0xbf5dabe1
+ masm.mulsd(xmm3, xmm0);
+ masm.movq(xmm6, recordExternalAddress(crb, coeffH)); // 0x00000000, 0xbfd61a00,
+ // 0x00000000, 0xbf5dabe1
+ masm.subsd(xmm5, xmm2);
+ masm.movq(xmm1, recordExternalAddress(crb, coeffH8)); // 0x00000000, 0xbf5dabe1
+ masm.pshufd(xmm2, xmm3, 68);
+ masm.unpcklpd(xmm5, xmm3);
+ masm.addsd(xmm3, xmm5);
+ masm.movq(xmm0, recordExternalAddress(crb, coeffH8)); // 0x00000000, 0xbf5dabe1
+ masm.andl(rdx, 16760832);
+ masm.shrl(rdx, 10);
+ masm.addpd(xmm7, new AMD64Address(tmp4, rdx, AMD64Address.Scale.Times1, -3648));
+ masm.mulsd(xmm4, xmm5);
+ masm.mulsd(xmm0, xmm5);
+ masm.mulsd(xmm6, xmm2);
+ masm.mulsd(xmm1, xmm2);
+ masm.movdqu(xmm2, xmm5);
+ masm.mulsd(xmm4, xmm5);
+ masm.addsd(xmm5, xmm0);
+ masm.movdqu(xmm0, xmm7);
+ masm.addsd(xmm2, xmm3);
+ masm.addsd(xmm7, xmm5);
+ masm.mulsd(xmm6, xmm2);
+ masm.subsd(xmm0, xmm7);
+ masm.movdqu(xmm2, xmm7);
+ masm.addsd(xmm7, xmm4);
+ masm.addsd(xmm0, xmm5);
+ masm.subsd(xmm2, xmm7);
+ masm.addsd(xmm4, xmm2);
+ masm.pshufd(xmm2, xmm5, 238);
+ masm.movdqu(xmm5, xmm7);
+ masm.addsd(xmm7, xmm2);
+ masm.addsd(xmm4, xmm0);
+ masm.movdqu(xmm0, recordExternalAddress(crb, coeff)); // 0x6dc96112, 0xbf836578,
+ // 0xee241472, 0xbf9b0301
+ masm.subsd(xmm5, xmm7);
+ masm.addsd(xmm6, xmm4);
+ masm.movdqu(xmm4, xmm7);
+ masm.addsd(xmm5, xmm2);
+ masm.addsd(xmm7, xmm1);
+ masm.movdqu(xmm2, recordExternalAddress(crb, coeff64)); // 0x486ececc, 0x3fc4635e,
+ // 0x161bb241, 0xbf5dabe1
+ masm.subsd(xmm4, xmm7);
+ masm.addsd(xmm6, xmm5);
+ masm.addsd(xmm4, xmm1);
+ masm.pshufd(xmm5, xmm7, 238);
+ masm.movapd(xmm1, xmm7);
+ masm.addsd(xmm7, xmm5);
+ masm.subsd(xmm1, xmm7);
+ masm.addsd(xmm1, xmm5);
+ masm.movdqu(xmm5, recordExternalAddress(crb, coeff80)); // 0x9f95985a, 0xbfb528db,
+ // 0xf8b5787d, 0x3ef2531e
+ masm.pshufd(xmm3, xmm3, 68);
+ masm.addsd(xmm6, xmm4);
+ masm.addsd(xmm6, xmm1);
+ masm.movdqu(xmm1, recordExternalAddress(crb, coeff32)); // 0x9f95985a, 0xbfb528db,
+ // 0xb3841d2a, 0xbfd619b6
+ masm.mulpd(xmm0, xmm3);
+ masm.mulpd(xmm2, xmm3);
+ masm.pshufd(xmm4, xmm3, 68);
+ masm.mulpd(xmm3, xmm3);
+ masm.addpd(xmm0, xmm1);
+ masm.addpd(xmm5, xmm2);
+ masm.mulsd(xmm4, xmm3);
+ masm.movq(xmm2, recordExternalAddress(crb, highmaskLogX)); // 0xf8000000, 0xffffffff,
+ // 0x00000000, 0xfffff800
+ masm.mulpd(xmm3, xmm3);
+ masm.movq(xmm1, new AMD64Address(rsp, 16));
+ masm.movw(rcx, new AMD64Address(rsp, 22));
+ masm.mulpd(xmm0, xmm4);
+ masm.pextrw(rax, xmm7, 3);
+ masm.mulpd(xmm5, xmm4);
+ masm.mulpd(xmm0, xmm3);
+ masm.movq(xmm4, recordExternalAddress(crb, highmaskY8)); // 0x00000000, 0xffffffff
+ masm.pand(xmm2, xmm7);
+ masm.addsd(xmm5, xmm6);
+ masm.subsd(xmm7, xmm2);
+ masm.addpd(xmm5, xmm0);
+ masm.andl(rax, 32752);
+ masm.subl(rax, 16368);
+ masm.andl(rcx, 32752);
+ masm.cmpl(rcx, 32752);
+ masm.jcc(AMD64Assembler.ConditionFlag.Equal, block45);
+ masm.addl(rcx, rax);
+ masm.cmpl(rcx, 16576);
+ masm.jcc(AMD64Assembler.ConditionFlag.AboveEqual, block51);
+ masm.pshufd(xmm0, xmm5, 238);
+ masm.pand(xmm4, xmm1);
+ masm.movdqu(xmm3, xmm1);
+ masm.addsd(xmm5, xmm0);
+ masm.subsd(xmm1, xmm4);
+ masm.xorpd(xmm6, xmm6);
+ masm.movl(rdx, 17080);
+ masm.pinsrw(xmm6, rdx, 3);
+ masm.addsd(xmm7, xmm5);
+ masm.mulsd(xmm4, xmm2);
+ masm.mulsd(xmm1, xmm2);
+ masm.movdqu(xmm5, xmm6);
+ masm.mulsd(xmm3, xmm7);
+ masm.addsd(xmm6, xmm4);
+ masm.addsd(xmm1, xmm3);
+ masm.movdqu(xmm7, recordExternalAddress(crb, eCoeff)); // 0xe78a6731, 0x3f55d87f,
+ // 0xd704a0c0, 0x3fac6b08
+ masm.movdl(rdx, xmm6);
+ masm.subsd(xmm6, xmm5);
+ masm.leaq(tmp4, recordExternalAddress(crb, tExp));
+ masm.movdqu(xmm3, recordExternalAddress(crb, eCoeff16)); // 0x6fba4e77, 0x3f83b2ab,
+ // 0xff82c58f, 0x3fcebfbd
+ masm.movq(xmm2, recordExternalAddress(crb, eCoeff32)); // 0xfefa39ef, 0x3fe62e42,
+ // 0x00000000, 0x00000000
+ masm.subsd(xmm4, xmm6);
+ masm.movl(rcx, rdx);
+ masm.andl(rdx, 255);
+ masm.addl(rdx, rdx);
+ masm.movdqu(xmm5, new AMD64Address(tmp4, rdx, AMD64Address.Scale.Times8, 0));
+ masm.addsd(xmm4, xmm1);
+ masm.pextrw(rdx, xmm6, 3);
+ masm.shrl(rcx, 8);
+ masm.movl(rax, rcx);
+ masm.shrl(rcx, 1);
+ masm.subl(rax, rcx);
+ masm.shll(rcx, 20);
+ masm.movdl(xmm6, rcx);
+ masm.pshufd(xmm0, xmm4, 68);
+ masm.pshufd(xmm1, xmm4, 68);
+ masm.mulpd(xmm0, xmm0);
+ masm.mulpd(xmm7, xmm1);
+ masm.pshufd(xmm6, xmm6, 17);
+ masm.mulsd(xmm2, xmm4);
+ masm.andl(rdx, 32767);
+ masm.cmpl(rdx, 16529);
+ masm.jcc(AMD64Assembler.ConditionFlag.Above, block12);
+ masm.mulsd(xmm0, xmm0);
+ masm.paddd(xmm5, xmm6);
+ masm.addpd(xmm3, xmm7);
+ masm.mulsd(xmm2, xmm5);
+ masm.pshufd(xmm6, xmm5, 238);
+ masm.mulpd(xmm0, xmm3);
+ masm.addsd(xmm2, xmm6);
+ masm.pshufd(xmm3, xmm0, 238);
+ masm.addl(rax, 1023);
+ masm.shll(rax, 20);
+ masm.orl(rax, tmp1);
+ masm.movdl(xmm4, rax);
+ masm.mulsd(xmm0, xmm5);
+ masm.mulsd(xmm3, xmm5);
+ masm.addsd(xmm0, xmm2);
+ masm.psllq(xmm4, 32);
+ masm.addsd(xmm0, xmm3);
+ masm.movdqu(xmm1, xmm0);
+ masm.addsd(xmm0, xmm5);
+ masm.mulsd(xmm0, xmm4);
+ masm.pextrw(rax, xmm0, 3);
+ masm.andl(rax, 32752);
+ masm.jcc(AMD64Assembler.ConditionFlag.Equal, block13);
+ masm.cmpl(rax, 32752);
+ masm.jcc(AMD64Assembler.ConditionFlag.Equal, block14);
+
+ masm.bind(block52);
+ masm.jmp(block56);
+
+ masm.bind(block45);
+ masm.movq(xmm0, new AMD64Address(rsp, 8));
+ masm.xorpd(xmm2, xmm2);
+ masm.movl(rax, 49136);
+ masm.pinsrw(xmm2, rax, 3);
+ masm.addsd(xmm2, xmm0);
+ masm.pextrw(rax, xmm2, 3);
+ masm.cmpl(rax, 0);
+ masm.jcc(AMD64Assembler.ConditionFlag.NotEqual, block53);
+ masm.xorpd(xmm0, xmm0);
+ masm.movl(rax, 32760);
+ masm.pinsrw(xmm0, rax, 3);
+ masm.jmp(block56);
+
+ masm.bind(block53);
+ masm.movq(xmm1, new AMD64Address(rsp, 16));
+ masm.movdl(rdx, xmm1);
+ masm.movdqu(xmm3, xmm1);
+ masm.psrlq(xmm3, 20);
+ masm.movdl(rcx, xmm3);
+ masm.orl(rcx, rdx);
+ masm.jcc(AMD64Assembler.ConditionFlag.Equal, block54);
+ masm.addsd(xmm1, xmm1);
+ masm.movdqu(xmm0, xmm1);
+ masm.jmp(block56);
+
+ masm.bind(block51);
+ masm.pextrw(rax, xmm1, 3);
+ masm.pextrw(rcx, xmm2, 3);
+ masm.xorl(rax, rcx);
+ masm.testl(rax, 32768);
+ masm.jcc(AMD64Assembler.ConditionFlag.Equal, block47);
+ masm.jmp(block46);
+
+ masm.bind(block54);
+ masm.pextrw(rax, xmm0, 3);
+ masm.andl(rax, 32752);
+ masm.pextrw(rdx, xmm1, 3);
+ masm.xorpd(xmm0, xmm0);
+ masm.subl(rax, 16368);
+ masm.xorl(rax, rdx);
+ masm.testl(rax, 32768);
+ masm.jcc(AMD64Assembler.ConditionFlag.Equal, block55);
+ masm.jmp(block56);
+
+ masm.bind(block55);
+ masm.movl(rdx, 32752);
+ masm.pinsrw(xmm0, rdx, 3);
+ masm.jmp(block56);
+
+ masm.bind(block17);
+ masm.movq(new AMD64Address(rsp, 24), xmm0);
+
+ masm.movq(xmm0, new AMD64Address(rsp, 24));
+
+ masm.bind(block56);
+ masm.addq(rsp, 40);
+ }
+}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir.amd64/src/org/graalvm/compiler/lir/amd64/AMD64MathSinOp.java Sat Mar 16 21:00:45 2019 +0000
@@ -0,0 +1,902 @@
+/*
+ * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, Intel Corporation. All rights reserved.
+ * Intel Math Library (LIBM) Source Code
+ * 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.
+ */
+
+
+package org.graalvm.compiler.lir.amd64;
+
+import static jdk.vm.ci.amd64.AMD64.r10;
+import static jdk.vm.ci.amd64.AMD64.r11;
+import static jdk.vm.ci.amd64.AMD64.r8;
+import static jdk.vm.ci.amd64.AMD64.r9;
+import static jdk.vm.ci.amd64.AMD64.rax;
+import static jdk.vm.ci.amd64.AMD64.rbx;
+import static jdk.vm.ci.amd64.AMD64.rcx;
+import static jdk.vm.ci.amd64.AMD64.rdi;
+import static jdk.vm.ci.amd64.AMD64.rdx;
+import static jdk.vm.ci.amd64.AMD64.rsi;
+import static jdk.vm.ci.amd64.AMD64.rsp;
+import static jdk.vm.ci.amd64.AMD64.xmm0;
+import static jdk.vm.ci.amd64.AMD64.xmm1;
+import static jdk.vm.ci.amd64.AMD64.xmm2;
+import static jdk.vm.ci.amd64.AMD64.xmm3;
+import static jdk.vm.ci.amd64.AMD64.xmm4;
+import static jdk.vm.ci.amd64.AMD64.xmm5;
+import static jdk.vm.ci.amd64.AMD64.xmm6;
+import static jdk.vm.ci.amd64.AMD64.xmm7;
+import static org.graalvm.compiler.lir.amd64.AMD64HotSpotHelper.pointerConstant;
+import static org.graalvm.compiler.lir.amd64.AMD64HotSpotHelper.recordExternalAddress;
+
+import org.graalvm.compiler.asm.Label;
+import org.graalvm.compiler.asm.amd64.AMD64Address;
+import org.graalvm.compiler.asm.amd64.AMD64Assembler.ConditionFlag;
+import org.graalvm.compiler.asm.amd64.AMD64MacroAssembler;
+import org.graalvm.compiler.lir.LIRInstructionClass;
+import org.graalvm.compiler.lir.asm.ArrayDataPointerConstant;
+import org.graalvm.compiler.lir.asm.CompilationResultBuilder;
+
+import jdk.vm.ci.amd64.AMD64;
+
+/**
+ * <pre>
+ * ALGORITHM DESCRIPTION - SIN()
+ * ---------------------
+ *
+ * 1. RANGE REDUCTION
+ *
+ * We perform an initial range reduction from X to r with
+ *
+ * X =~= N * pi/32 + r
+ *
+ * so that |r| <= pi/64 + epsilon. We restrict inputs to those
+ * where |N| <= 932560. Beyond this, the range reduction is
+ * insufficiently accurate. For extremely small inputs,
+ * denormalization can occur internally, impacting performance.
+ * This means that the main path is actually only taken for
+ * 2^-252 <= |X| < 90112.
+ *
+ * To avoid branches, we perform the range reduction to full
+ * accuracy each time.
+ *
+ * X - N * (P_1 + P_2 + P_3)
+ *
+ * where P_1 and P_2 are 32-bit numbers (so multiplication by N
+ * is exact) and P_3 is a 53-bit number. Together, these
+ * approximate pi well enough for all cases in the restricted
+ * range.
+ *
+ * The main reduction sequence is:
+ *
+ * y = 32/pi * x
+ * N = integer(y)
+ * (computed by adding and subtracting off SHIFTER)
+ *
+ * m_1 = N * P_1
+ * m_2 = N * P_2
+ * r_1 = x - m_1
+ * r = r_1 - m_2
+ * (this r can be used for most of the calculation)
+ *
+ * c_1 = r_1 - r
+ * m_3 = N * P_3
+ * c_2 = c_1 - m_2
+ * c = c_2 - m_3
+ *
+ * 2. MAIN ALGORITHM
+ *
+ * The algorithm uses a table lookup based on B = M * pi / 32
+ * where M = N mod 64. The stored values are:
+ * sigma closest power of 2 to cos(B)
+ * C_hl 53-bit cos(B) - sigma
+ * S_hi + S_lo 2 * 53-bit sin(B)
+ *
+ * The computation is organized as follows:
+ *
+ * sin(B + r + c) = [sin(B) + sigma * r] +
+ * r * (cos(B) - sigma) +
+ * sin(B) * [cos(r + c) - 1] +
+ * cos(B) * [sin(r + c) - r]
+ *
+ * which is approximately:
+ *
+ * [S_hi + sigma * r] +
+ * C_hl * r +
+ * S_lo + S_hi * [(cos(r) - 1) - r * c] +
+ * (C_hl + sigma) * [(sin(r) - r) + c]
+ *
+ * and this is what is actually computed. We separate this sum
+ * into four parts:
+ *
+ * hi + med + pols + corr
+ *
+ * where
+ *
+ * hi = S_hi + sigma r
+ * med = C_hl * r
+ * pols = S_hi * (cos(r) - 1) + (C_hl + sigma) * (sin(r) - r)
+ * corr = S_lo + c * ((C_hl + sigma) - S_hi * r)
+ *
+ * 3. POLYNOMIAL
+ *
+ * The polynomial S_hi * (cos(r) - 1) + (C_hl + sigma) *
+ * (sin(r) - r) can be rearranged freely, since it is quite
+ * small, so we exploit parallelism to the fullest.
+ *
+ * psc4 = SC_4 * r_1
+ * msc4 = psc4 * r
+ * r2 = r * r
+ * msc2 = SC_2 * r2
+ * r4 = r2 * r2
+ * psc3 = SC_3 + msc4
+ * psc1 = SC_1 + msc2
+ * msc3 = r4 * psc3
+ * sincospols = psc1 + msc3
+ * pols = sincospols *
+ * <S_hi * r^2 | (C_hl + sigma) * r^3>
+ *
+ * 4. CORRECTION TERM
+ *
+ * This is where the "c" component of the range reduction is
+ * taken into account; recall that just "r" is used for most of
+ * the calculation.
+ *
+ * -c = m_3 - c_2
+ * -d = S_hi * r - (C_hl + sigma)
+ * corr = -c * -d + S_lo
+ *
+ * 5. COMPENSATED SUMMATIONS
+ *
+ * The two successive compensated summations add up the high
+ * and medium parts, leaving just the low parts to add up at
+ * the end.
+ *
+ * rs = sigma * r
+ * res_int = S_hi + rs
+ * k_0 = S_hi - res_int
+ * k_2 = k_0 + rs
+ * med = C_hl * r
+ * res_hi = res_int + med
+ * k_1 = res_int - res_hi
+ * k_3 = k_1 + med
+ *
+ * 6. FINAL SUMMATION
+ *
+ * We now add up all the small parts:
+ *
+ * res_lo = pols(hi) + pols(lo) + corr + k_1 + k_3
+ *
+ * Now the overall result is just:
+ *
+ * res_hi + res_lo
+ *
+ * 7. SMALL ARGUMENTS
+ *
+ * If |x| < SNN (SNN meaning the smallest normal number), we
+ * simply perform 0.1111111 cdots 1111 * x. For SNN <= |x|, we
+ * do 2^-55 * (2^55 * x - x).
+ *
+ * Special cases:
+ * sin(NaN) = quiet NaN, and raise invalid exception
+ * sin(INF) = NaN and raise invalid exception
+ * sin(+/-0) = +/-0
+ * </pre>
+ */
+public final class AMD64MathSinOp extends AMD64MathIntrinsicUnaryOp {
+
+ public static final LIRInstructionClass<AMD64MathSinOp> TYPE = LIRInstructionClass.create(AMD64MathSinOp.class);
+
+ public AMD64MathSinOp() {
+ super(TYPE, /* GPR */ rax, rcx, rdx, rbx, rsi, rdi, r8, r9, r10, r11,
+ /* XMM */ xmm1, xmm2, xmm3, xmm4, xmm5, xmm6, xmm7);
+ }
+
+ private ArrayDataPointerConstant onehalf = pointerConstant(16, new int[]{
+ // @formatter:off
+ 0x00000000, 0x3fe00000, 0x00000000, 0x3fe00000
+ // @formatter:on
+ });
+
+ private ArrayDataPointerConstant p2 = pointerConstant(16, new int[]{
+ // @formatter:off
+ 0x1a600000, 0x3d90b461, 0x1a600000, 0x3d90b461
+ // @formatter:on
+ });
+
+ private ArrayDataPointerConstant sc4 = pointerConstant(16, new int[]{
+ // @formatter:off
+ 0xa556c734, 0x3ec71de3, 0x1a01a01a, 0x3efa01a0
+ // @formatter:on
+ });
+
+ private ArrayDataPointerConstant ctable = pointerConstant(16, new int[]{
+ // @formatter:off
+ 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+ 0x00000000, 0x00000000, 0x3ff00000, 0x176d6d31, 0xbf73b92e,
+ 0xbc29b42c, 0x3fb917a6, 0xe0000000, 0xbc3e2718, 0x00000000,
+ 0x3ff00000, 0x011469fb, 0xbf93ad06, 0x3c69a60b, 0x3fc8f8b8,
+ 0xc0000000, 0xbc626d19, 0x00000000, 0x3ff00000, 0x939d225a,
+ 0xbfa60bea, 0x2ed59f06, 0x3fd29406, 0xa0000000, 0xbc75d28d,
+ 0x00000000, 0x3ff00000, 0x866b95cf, 0xbfb37ca1, 0xa6aea963,
+ 0x3fd87de2, 0xe0000000, 0xbc672ced, 0x00000000, 0x3ff00000,
+ 0x73fa1279, 0xbfbe3a68, 0x3806f63b, 0x3fde2b5d, 0x20000000,
+ 0x3c5e0d89, 0x00000000, 0x3ff00000, 0x5bc57974, 0xbfc59267,
+ 0x39ae68c8, 0x3fe1c73b, 0x20000000, 0x3c8b25dd, 0x00000000,
+ 0x3ff00000, 0x53aba2fd, 0xbfcd0dfe, 0x25091dd6, 0x3fe44cf3,
+ 0x20000000, 0x3c68076a, 0x00000000, 0x3ff00000, 0x99fcef32,
+ 0x3fca8279, 0x667f3bcd, 0x3fe6a09e, 0x20000000, 0xbc8bdd34,
+ 0x00000000, 0x3fe00000, 0x94247758, 0x3fc133cc, 0x6b151741,
+ 0x3fe8bc80, 0x20000000, 0xbc82c5e1, 0x00000000, 0x3fe00000,
+ 0x9ae68c87, 0x3fac73b3, 0x290ea1a3, 0x3fea9b66, 0xe0000000,
+ 0x3c39f630, 0x00000000, 0x3fe00000, 0x7f909c4e, 0xbf9d4a2c,
+ 0xf180bdb1, 0x3fec38b2, 0x80000000, 0xbc76e0b1, 0x00000000,
+ 0x3fe00000, 0x65455a75, 0xbfbe0875, 0xcf328d46, 0x3fed906b,
+ 0x20000000, 0x3c7457e6, 0x00000000, 0x3fe00000, 0x76acf82d,
+ 0x3fa4a031, 0x56c62dda, 0x3fee9f41, 0xe0000000, 0x3c8760b1,
+ 0x00000000, 0x3fd00000, 0x0e5967d5, 0xbfac1d1f, 0xcff75cb0,
+ 0x3fef6297, 0x20000000, 0x3c756217, 0x00000000, 0x3fd00000,
+ 0x0f592f50, 0xbf9ba165, 0xa3d12526, 0x3fefd88d, 0x40000000,
+ 0xbc887df6, 0x00000000, 0x3fc00000, 0x00000000, 0x00000000,
+ 0x00000000, 0x3ff00000, 0x00000000, 0x00000000, 0x00000000,
+ 0x00000000, 0x0f592f50, 0x3f9ba165, 0xa3d12526, 0x3fefd88d,
+ 0x40000000, 0xbc887df6, 0x00000000, 0xbfc00000, 0x0e5967d5,
+ 0x3fac1d1f, 0xcff75cb0, 0x3fef6297, 0x20000000, 0x3c756217,
+ 0x00000000, 0xbfd00000, 0x76acf82d, 0xbfa4a031, 0x56c62dda,
+ 0x3fee9f41, 0xe0000000, 0x3c8760b1, 0x00000000, 0xbfd00000,
+ 0x65455a75, 0x3fbe0875, 0xcf328d46, 0x3fed906b, 0x20000000,
+ 0x3c7457e6, 0x00000000, 0xbfe00000, 0x7f909c4e, 0x3f9d4a2c,
+ 0xf180bdb1, 0x3fec38b2, 0x80000000, 0xbc76e0b1, 0x00000000,
+ 0xbfe00000, 0x9ae68c87, 0xbfac73b3, 0x290ea1a3, 0x3fea9b66,
+ 0xe0000000, 0x3c39f630, 0x00000000, 0xbfe00000, 0x94247758,
+ 0xbfc133cc, 0x6b151741, 0x3fe8bc80, 0x20000000, 0xbc82c5e1,
+ 0x00000000, 0xbfe00000, 0x99fcef32, 0xbfca8279, 0x667f3bcd,
+ 0x3fe6a09e, 0x20000000, 0xbc8bdd34, 0x00000000, 0xbfe00000,
+ 0x53aba2fd, 0x3fcd0dfe, 0x25091dd6, 0x3fe44cf3, 0x20000000,
+ 0x3c68076a, 0x00000000, 0xbff00000, 0x5bc57974, 0x3fc59267,
+ 0x39ae68c8, 0x3fe1c73b, 0x20000000, 0x3c8b25dd, 0x00000000,
+ 0xbff00000, 0x73fa1279, 0x3fbe3a68, 0x3806f63b, 0x3fde2b5d,
+ 0x20000000, 0x3c5e0d89, 0x00000000, 0xbff00000, 0x866b95cf,
+ 0x3fb37ca1, 0xa6aea963, 0x3fd87de2, 0xe0000000, 0xbc672ced,
+ 0x00000000, 0xbff00000, 0x939d225a, 0x3fa60bea, 0x2ed59f06,
+ 0x3fd29406, 0xa0000000, 0xbc75d28d, 0x00000000, 0xbff00000,
+ 0x011469fb, 0x3f93ad06, 0x3c69a60b, 0x3fc8f8b8, 0xc0000000,
+ 0xbc626d19, 0x00000000, 0xbff00000, 0x176d6d31, 0x3f73b92e,
+ 0xbc29b42c, 0x3fb917a6, 0xe0000000, 0xbc3e2718, 0x00000000,
+ 0xbff00000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+ 0x00000000, 0x00000000, 0x00000000, 0xbff00000, 0x176d6d31,
+ 0x3f73b92e, 0xbc29b42c, 0xbfb917a6, 0xe0000000, 0x3c3e2718,
+ 0x00000000, 0xbff00000, 0x011469fb, 0x3f93ad06, 0x3c69a60b,
+ 0xbfc8f8b8, 0xc0000000, 0x3c626d19, 0x00000000, 0xbff00000,
+ 0x939d225a, 0x3fa60bea, 0x2ed59f06, 0xbfd29406, 0xa0000000,
+ 0x3c75d28d, 0x00000000, 0xbff00000, 0x866b95cf, 0x3fb37ca1,
+ 0xa6aea963, 0xbfd87de2, 0xe0000000, 0x3c672ced, 0x00000000,
+ 0xbff00000, 0x73fa1279, 0x3fbe3a68, 0x3806f63b, 0xbfde2b5d,
+ 0x20000000, 0xbc5e0d89, 0x00000000, 0xbff00000, 0x5bc57974,
+ 0x3fc59267, 0x39ae68c8, 0xbfe1c73b, 0x20000000, 0xbc8b25dd,
+ 0x00000000, 0xbff00000, 0x53aba2fd, 0x3fcd0dfe, 0x25091dd6,
+ 0xbfe44cf3, 0x20000000, 0xbc68076a, 0x00000000, 0xbff00000,
+ 0x99fcef32, 0xbfca8279, 0x667f3bcd, 0xbfe6a09e, 0x20000000,
+ 0x3c8bdd34, 0x00000000, 0xbfe00000, 0x94247758, 0xbfc133cc,
+ 0x6b151741, 0xbfe8bc80, 0x20000000, 0x3c82c5e1, 0x00000000,
+ 0xbfe00000, 0x9ae68c87, 0xbfac73b3, 0x290ea1a3, 0xbfea9b66,
+ 0xe0000000, 0xbc39f630, 0x00000000, 0xbfe00000, 0x7f909c4e,
+ 0x3f9d4a2c, 0xf180bdb1, 0xbfec38b2, 0x80000000, 0x3c76e0b1,
+ 0x00000000, 0xbfe00000, 0x65455a75, 0x3fbe0875, 0xcf328d46,
+ 0xbfed906b, 0x20000000, 0xbc7457e6, 0x00000000, 0xbfe00000,
+ 0x76acf82d, 0xbfa4a031, 0x56c62dda, 0xbfee9f41, 0xe0000000,
+ 0xbc8760b1, 0x00000000, 0xbfd00000, 0x0e5967d5, 0x3fac1d1f,
+ 0xcff75cb0, 0xbfef6297, 0x20000000, 0xbc756217, 0x00000000,
+ 0xbfd00000, 0x0f592f50, 0x3f9ba165, 0xa3d12526, 0xbfefd88d,
+ 0x40000000, 0x3c887df6, 0x00000000, 0xbfc00000, 0x00000000,
+ 0x00000000, 0x00000000, 0xbff00000, 0x00000000, 0x00000000,
+ 0x00000000, 0x00000000, 0x0f592f50, 0xbf9ba165, 0xa3d12526,
+ 0xbfefd88d, 0x40000000, 0x3c887df6, 0x00000000, 0x3fc00000,
+ 0x0e5967d5, 0xbfac1d1f, 0xcff75cb0, 0xbfef6297, 0x20000000,
+ 0xbc756217, 0x00000000, 0x3fd00000, 0x76acf82d, 0x3fa4a031,
+ 0x56c62dda, 0xbfee9f41, 0xe0000000, 0xbc8760b1, 0x00000000,
+ 0x3fd00000, 0x65455a75, 0xbfbe0875, 0xcf328d46, 0xbfed906b,
+ 0x20000000, 0xbc7457e6, 0x00000000, 0x3fe00000, 0x7f909c4e,
+ 0xbf9d4a2c, 0xf180bdb1, 0xbfec38b2, 0x80000000, 0x3c76e0b1,
+ 0x00000000, 0x3fe00000, 0x9ae68c87, 0x3fac73b3, 0x290ea1a3,
+ 0xbfea9b66, 0xe0000000, 0xbc39f630, 0x00000000, 0x3fe00000,
+ 0x94247758, 0x3fc133cc, 0x6b151741, 0xbfe8bc80, 0x20000000,
+ 0x3c82c5e1, 0x00000000, 0x3fe00000, 0x99fcef32, 0x3fca8279,
+ 0x667f3bcd, 0xbfe6a09e, 0x20000000, 0x3c8bdd34, 0x00000000,
+ 0x3fe00000, 0x53aba2fd, 0xbfcd0dfe, 0x25091dd6, 0xbfe44cf3,
+ 0x20000000, 0xbc68076a, 0x00000000, 0x3ff00000, 0x5bc57974,
+ 0xbfc59267, 0x39ae68c8, 0xbfe1c73b, 0x20000000, 0xbc8b25dd,
+ 0x00000000, 0x3ff00000, 0x73fa1279, 0xbfbe3a68, 0x3806f63b,
+ 0xbfde2b5d, 0x20000000, 0xbc5e0d89, 0x00000000, 0x3ff00000,
+ 0x866b95cf, 0xbfb37ca1, 0xa6aea963, 0xbfd87de2, 0xe0000000,
+ 0x3c672ced, 0x00000000, 0x3ff00000, 0x939d225a, 0xbfa60bea,
+ 0x2ed59f06, 0xbfd29406, 0xa0000000, 0x3c75d28d, 0x00000000,
+ 0x3ff00000, 0x011469fb, 0xbf93ad06, 0x3c69a60b, 0xbfc8f8b8,
+ 0xc0000000, 0x3c626d19, 0x00000000, 0x3ff00000, 0x176d6d31,
+ 0xbf73b92e, 0xbc29b42c, 0xbfb917a6, 0xe0000000, 0x3c3e2718,
+ 0x00000000, 0x3ff00000
+ // @formatter:on
+ });
+
+ private ArrayDataPointerConstant sc2 = pointerConstant(16, new int[]{
+ // @formatter:off
+ 0x11111111, 0x3f811111, 0x55555555, 0x3fa55555
+ // @formatter:on
+ });
+
+ private ArrayDataPointerConstant sc3 = pointerConstant(16, new int[]{
+ // @formatter:off
+ 0x1a01a01a, 0xbf2a01a0, 0x16c16c17, 0xbf56c16c
+ // @formatter:on
+ });
+
+ private ArrayDataPointerConstant sc1 = pointerConstant(16, new int[]{
+ // @formatter:off
+ 0x55555555, 0xbfc55555, 0x00000000, 0xbfe00000
+ // @formatter:on
+ });
+
+ private ArrayDataPointerConstant piInvTable = pointerConstant(16, new int[]{
+ // @formatter:off
+ 0x00000000, 0x00000000, 0xa2f9836e, 0x4e441529, 0xfc2757d1,
+ 0xf534ddc0, 0xdb629599, 0x3c439041, 0xfe5163ab, 0xdebbc561,
+ 0xb7246e3a, 0x424dd2e0, 0x06492eea, 0x09d1921c, 0xfe1deb1c,
+ 0xb129a73e, 0xe88235f5, 0x2ebb4484, 0xe99c7026, 0xb45f7e41,
+ 0x3991d639, 0x835339f4, 0x9c845f8b, 0xbdf9283b, 0x1ff897ff,
+ 0xde05980f, 0xef2f118b, 0x5a0a6d1f, 0x6d367ecf, 0x27cb09b7,
+ 0x4f463f66, 0x9e5fea2d, 0x7527bac7, 0xebe5f17b, 0x3d0739f7,
+ 0x8a5292ea, 0x6bfb5fb1, 0x1f8d5d08, 0x56033046, 0xfc7b6bab,
+ 0xf0cfbc21
+ // @formatter:on
+ });
+
+ private ArrayDataPointerConstant pi4 = pointerConstant(8, new int[]{
+ // @formatter:off
+ 0x40000000, 0x3fe921fb,
+ });
+ private ArrayDataPointerConstant pi48 = pointerConstant(8, new int[]{
+ 0x18469899, 0x3e64442d
+ // @formatter:on
+ });
+
+ private ArrayDataPointerConstant pi32Inv = pointerConstant(8, new int[]{
+ // @formatter:off
+ 0x6dc9c883, 0x40245f30
+ // @formatter:on
+ });
+
+ private ArrayDataPointerConstant shifter = pointerConstant(8, new int[]{
+ // @formatter:off
+ 0x00000000, 0x43380000
+ // @formatter:on
+ });
+
+ private ArrayDataPointerConstant signMask = pointerConstant(8, new int[]{
+ // @formatter:off
+ 0x00000000, 0x80000000
+ // @formatter:on
+ });
+
+ private ArrayDataPointerConstant p3 = pointerConstant(8, new int[]{
+ // @formatter:off
+ 0x2e037073, 0x3b63198a
+ // @formatter:on
+ });
+
+ private ArrayDataPointerConstant allOnes = pointerConstant(8, new int[]{
+ // @formatter:off
+ 0xffffffff, 0x3fefffff
+ // @formatter:on
+ });
+
+ private ArrayDataPointerConstant twoPow55 = pointerConstant(8, new int[]{
+ // @formatter:off
+ 0x00000000, 0x43600000
+ // @formatter:on
+ });
+
+ private ArrayDataPointerConstant twoPowM55 = pointerConstant(8, new int[]{
+ // @formatter:off
+ 0x00000000, 0x3c800000
+ // @formatter:on
+ });
+
+ private ArrayDataPointerConstant p1 = pointerConstant(8, new int[]{
+ // @formatter:off
+ 0x54400000, 0x3fb921fb
+ // @formatter:on
+ });
+
+ private ArrayDataPointerConstant negZero = pointerConstant(8, new int[]{
+ // @formatter:off
+ 0x00000000, 0x80000000
+ // @formatter:on
+ });
+
+ @Override
+ public void emitCode(CompilationResultBuilder crb, AMD64MacroAssembler masm) {
+ Label block0 = new Label();
+ Label block1 = new Label();
+ Label block2 = new Label();
+ Label block3 = new Label();
+ Label block4 = new Label();
+ Label block5 = new Label();
+ Label block6 = new Label();
+ Label block7 = new Label();
+ Label block8 = new Label();
+ Label block9 = new Label();
+ Label block10 = new Label();
+ Label block11 = new Label();
+ Label block12 = new Label();
+ Label block13 = new Label();
+ Label block14 = new Label();
+
+ masm.push(AMD64.rbx);
+ masm.subq(rsp, 16);
+ masm.movsd(new AMD64Address(rsp, 8), xmm0);
+ masm.movl(rax, new AMD64Address(rsp, 12));
+ masm.movq(xmm1, recordExternalAddress(crb, pi32Inv)); // 0x6dc9c883, 0x40245f30
+ masm.movq(xmm2, recordExternalAddress(crb, shifter)); // 0x00000000, 0x43380000
+ masm.andl(rax, 2147418112);
+ masm.subl(rax, 808452096);
+ masm.cmpl(rax, 281346048);
+ masm.jcc(ConditionFlag.Above, block0);
+ masm.mulsd(xmm1, xmm0);
+ masm.movdqu(xmm5, recordExternalAddress(crb, onehalf)); // 0x00000000, 0x3fe00000,
+ // 0x00000000, 0x3fe00000
+ masm.movq(xmm4, recordExternalAddress(crb, signMask)); // 0x00000000, 0x80000000
+ masm.pand(xmm4, xmm0);
+ masm.por(xmm5, xmm4);
+ masm.addpd(xmm1, xmm5);
+ masm.cvttsd2sil(rdx, xmm1);
+ masm.cvtsi2sdl(xmm1, rdx);
+ masm.movdqu(xmm6, recordExternalAddress(crb, p2)); // 0x1a600000, 0x3d90b461,
+ // 0x1a600000, 0x3d90b461
+ masm.movq(r8, 0x3fb921fb54400000L);
+ masm.movdq(xmm3, r8);
+ masm.movdqu(xmm5, recordExternalAddress(crb, sc4)); // 0xa556c734, 0x3ec71de3,
+ // 0x1a01a01a, 0x3efa01a0
+ masm.pshufd(xmm4, xmm0, 68);
+ masm.mulsd(xmm3, xmm1);
+ if (masm.supports(AMD64.CPUFeature.SSE3)) {
+ masm.movddup(xmm1, xmm1);
+ } else {
+ masm.movlhps(xmm1, xmm1);
+ }
+ masm.andl(rdx, 63);
+ masm.shll(rdx, 5);
+ masm.leaq(AMD64.rax, recordExternalAddress(crb, ctable));
+ masm.addq(AMD64.rax, AMD64.rdx);
+ masm.mulpd(xmm6, xmm1);
+ masm.mulsd(xmm1, recordExternalAddress(crb, p3)); // 0x2e037073, 0x3b63198a
+ masm.subsd(xmm4, xmm3);
+ masm.movq(xmm7, new AMD64Address(AMD64.rax, 8));
+ masm.subsd(xmm0, xmm3);
+ if (masm.supports(AMD64.CPUFeature.SSE3)) {
+ masm.movddup(xmm3, xmm4);
+ } else {
+ masm.movdqu(xmm3, xmm4);
+ masm.movlhps(xmm3, xmm3);
+ }
+ masm.subsd(xmm4, xmm6);
+ masm.pshufd(xmm0, xmm0, 68);
+ masm.movdqu(xmm2, new AMD64Address(AMD64.rax, 0));
+ masm.mulpd(xmm5, xmm0);
+ masm.subpd(xmm0, xmm6);
+ masm.mulsd(xmm7, xmm4);
+ masm.subsd(xmm3, xmm4);
+ masm.mulpd(xmm5, xmm0);
+ masm.mulpd(xmm0, xmm0);
+ masm.subsd(xmm3, xmm6);
+ masm.movdqu(xmm6, recordExternalAddress(crb, sc2)); // 0x11111111, 0x3f811111,
+ // 0x55555555, 0x3fa55555
+ masm.subsd(xmm1, xmm3);
+ masm.movq(xmm3, new AMD64Address(AMD64.rax, 24));
+ masm.addsd(xmm2, xmm3);
+ masm.subsd(xmm7, xmm2);
+ masm.mulsd(xmm2, xmm4);
+ masm.mulpd(xmm6, xmm0);
+ masm.mulsd(xmm3, xmm4);
+ masm.mulpd(xmm2, xmm0);
+ masm.mulpd(xmm0, xmm0);
+ masm.addpd(xmm5, recordExternalAddress(crb, sc3)); // 0x1a01a01a, 0xbf2a01a0,
+ // 0x16c16c17, 0xbf56c16c
+ masm.mulsd(xmm4, new AMD64Address(AMD64.rax, 0));
+ masm.addpd(xmm6, recordExternalAddress(crb, sc1)); // 0x55555555, 0xbfc55555,
+ // 0x00000000, 0xbfe00000
+ masm.mulpd(xmm5, xmm0);
+ masm.movdqu(xmm0, xmm3);
+ masm.addsd(xmm3, new AMD64Address(AMD64.rax, 8));
+ masm.mulpd(xmm1, xmm7);
+ masm.movdqu(xmm7, xmm4);
+ masm.addsd(xmm4, xmm3);
+ masm.addpd(xmm6, xmm5);
+ masm.movq(xmm5, new AMD64Address(AMD64.rax, 8));
+ masm.subsd(xmm5, xmm3);
+ masm.subsd(xmm3, xmm4);
+ masm.addsd(xmm1, new AMD64Address(AMD64.rax, 16));
+ masm.mulpd(xmm6, xmm2);
+ masm.addsd(xmm5, xmm0);
+ masm.addsd(xmm3, xmm7);
+ masm.addsd(xmm1, xmm5);
+ masm.addsd(xmm1, xmm3);
+ masm.addsd(xmm1, xmm6);
+ masm.unpckhpd(xmm6, xmm6);
+ masm.movdqu(xmm0, xmm4);
+ masm.addsd(xmm1, xmm6);
+ masm.addsd(xmm0, xmm1);
+ masm.jmp(block14);
+
+ masm.bind(block0);
+ masm.jcc(ConditionFlag.Greater, block1);
+ masm.shrl(rax, 20);
+ masm.cmpl(rax, 3325);
+ masm.jcc(ConditionFlag.NotEqual, block2);
+ masm.mulsd(xmm0, recordExternalAddress(crb, allOnes)); // 0xffffffff, 0x3fefffff
+ masm.jmp(block14);
+
+ masm.bind(block2);
+ masm.movq(xmm3, recordExternalAddress(crb, twoPow55)); // 0x00000000, 0x43600000
+ masm.mulsd(xmm3, xmm0);
+ masm.subsd(xmm3, xmm0);
+ masm.mulsd(xmm3, recordExternalAddress(crb, twoPowM55)); // 0x00000000, 0x3c800000
+ masm.jmp(block14);
+
+ masm.bind(block1);
+ masm.pextrw(rax, xmm0, 3);
+ masm.andl(rax, 32752);
+ masm.cmpl(rax, 32752);
+ masm.jcc(ConditionFlag.Equal, block3);
+ masm.pextrw(rcx, xmm0, 3);
+ masm.andl(rcx, 32752);
+ masm.subl(rcx, 16224);
+ masm.shrl(rcx, 7);
+ masm.andl(rcx, 65532);
+ masm.leaq(r11, recordExternalAddress(crb, piInvTable));
+ masm.addq(AMD64.rcx, r11);
+ masm.movdq(AMD64.rax, xmm0);
+ masm.movl(r10, new AMD64Address(AMD64.rcx, 20));
+ masm.movl(r8, new AMD64Address(AMD64.rcx, 24));
+ masm.movl(rdx, rax);
+ masm.shrq(AMD64.rax, 21);
+ masm.orl(rax, Integer.MIN_VALUE);
+ masm.shrl(rax, 11);
+ masm.movl(r9, r10);
+ masm.imulq(r10, AMD64.rdx);
+ masm.imulq(r9, AMD64.rax);
+ masm.imulq(r8, AMD64.rax);
+ masm.movl(rsi, new AMD64Address(AMD64.rcx, 16));
+ masm.movl(rdi, new AMD64Address(AMD64.rcx, 12));
+ masm.movl(r11, r10);
+ masm.shrq(r10, 32);
+ masm.addq(r9, r10);
+ masm.addq(r11, r8);
+ masm.movl(r8, r11);
+ masm.shrq(r11, 32);
+ masm.addq(r9, r11);
+ masm.movl(r10, rsi);
+ masm.imulq(rsi, AMD64.rdx);
+ masm.imulq(r10, AMD64.rax);
+ masm.movl(r11, rdi);
+ masm.imulq(rdi, AMD64.rdx);
+ masm.movl(rbx, rsi);
+ masm.shrq(rsi, 32);
+ masm.addq(r9, AMD64.rbx);
+ masm.movl(rbx, r9);
+ masm.shrq(r9, 32);
+ masm.addq(r10, rsi);
+ masm.addq(r10, r9);
+ masm.shlq(AMD64.rbx, 32);
+ masm.orq(r8, AMD64.rbx);
+ masm.imulq(r11, AMD64.rax);
+ masm.movl(r9, new AMD64Address(AMD64.rcx, 8));
+ masm.movl(rsi, new AMD64Address(AMD64.rcx, 4));
+ masm.movl(rbx, rdi);
+ masm.shrq(rdi, 32);
+ masm.addq(r10, AMD64.rbx);
+ masm.movl(rbx, r10);
+ masm.shrq(r10, 32);
+ masm.addq(r11, rdi);
+ masm.addq(r11, r10);
+ masm.movq(rdi, r9);
+ masm.imulq(r9, AMD64.rdx);
+ masm.imulq(rdi, AMD64.rax);
+ masm.movl(r10, r9);
+ masm.shrq(r9, 32);
+ masm.addq(r11, r10);
+ masm.movl(r10, r11);
+ masm.shrq(r11, 32);
+ masm.addq(rdi, r9);
+ masm.addq(rdi, r11);
+ masm.movq(r9, rsi);
+ masm.imulq(rsi, AMD64.rdx);
+ masm.imulq(r9, AMD64.rax);
+ masm.shlq(r10, 32);
+ masm.orq(r10, AMD64.rbx);
+ masm.movl(rax, new AMD64Address(AMD64.rcx, 0));
+ masm.movl(r11, rsi);
+ masm.shrq(rsi, 32);
+ masm.addq(rdi, r11);
+ masm.movl(r11, rdi);
+ masm.shrq(rdi, 32);
+ masm.addq(r9, rsi);
+ masm.addq(r9, rdi);
+ masm.imulq(AMD64.rdx, AMD64.rax);
+ masm.pextrw(rbx, xmm0, 3);
+ masm.leaq(rdi, recordExternalAddress(crb, piInvTable));
+ masm.subq(AMD64.rcx, rdi);
+ masm.addl(rcx, rcx);
+ masm.addl(rcx, rcx);
+ masm.addl(rcx, rcx);
+ masm.addl(rcx, 19);
+ masm.movl(rsi, 32768);
+ masm.andl(rsi, rbx);
+ masm.shrl(rbx, 4);
+ masm.andl(rbx, 2047);
+ masm.subl(rbx, 1023);
+ masm.subl(rcx, rbx);
+ masm.addq(r9, AMD64.rdx);
+ masm.movl(rdx, rcx);
+ masm.addl(rdx, 32);
+ masm.cmpl(rcx, 1);
+ masm.jcc(ConditionFlag.Less, block4);
+ masm.negl(rcx);
+ masm.addl(rcx, 29);
+ masm.shll(r9);
+ masm.movl(rdi, r9);
+ masm.andl(r9, 536870911);
+ masm.testl(r9, 268435456);
+ masm.jcc(ConditionFlag.NotEqual, block5);
+ masm.shrl(r9);
+ masm.movl(rbx, 0);
+ masm.shlq(r9, 32);
+ masm.orq(r9, r11);
+
+ masm.bind(block6);
+
+ masm.bind(block7);
+
+ masm.cmpq(r9, 0);
+ masm.jcc(ConditionFlag.Equal, block8);
+
+ masm.bind(block9);
+ masm.bsrq(r11, r9);
+ masm.movl(rcx, 29);
+ masm.subl(rcx, r11);
+ masm.jcc(ConditionFlag.LessEqual, block10);
+ masm.shlq(r9);
+ masm.movq(AMD64.rax, r10);
+ masm.shlq(r10);
+ masm.addl(rdx, rcx);
+ masm.negl(rcx);
+ masm.addl(rcx, 64);
+ masm.shrq(AMD64.rax);
+ masm.shrq(r8);
+ masm.orq(r9, AMD64.rax);
+ masm.orq(r10, r8);
+
+ masm.bind(block11);
+ masm.cvtsi2sdq(xmm0, r9);
+ masm.shrq(r10, 1);
+ masm.cvtsi2sdq(xmm3, r10);
+ masm.xorpd(xmm4, xmm4);
+ masm.shll(rdx, 4);
+ masm.negl(rdx);
+ masm.addl(rdx, 16368);
+ masm.orl(rdx, rsi);
+ masm.xorl(rdx, rbx);
+ masm.pinsrw(xmm4, rdx, 3);
+ masm.movq(xmm2, recordExternalAddress(crb, pi4)); // 0x40000000, 0x3fe921fb,
+ // 0x18469899, 0x3e64442d
+ masm.movq(xmm6, recordExternalAddress(crb, pi48)); // 0x3fe921fb, 0x18469899,
+ // 0x3e64442d
+ masm.xorpd(xmm5, xmm5);
+ masm.subl(rdx, 1008);
+ masm.pinsrw(xmm5, rdx, 3);
+ masm.mulsd(xmm0, xmm4);
+ masm.shll(rsi, 16);
+ masm.sarl(rsi, 31);
+ masm.mulsd(xmm3, xmm5);
+ masm.movdqu(xmm1, xmm0);
+ masm.mulsd(xmm0, xmm2);
+ masm.shrl(rdi, 29);
+ masm.addsd(xmm1, xmm3);
+ masm.mulsd(xmm3, xmm2);
+ masm.addl(rdi, rsi);
+ masm.xorl(rdi, rsi);
+ masm.mulsd(xmm6, xmm1);
+ masm.movl(rax, rdi);
+ masm.addsd(xmm6, xmm3);
+ masm.movdqu(xmm2, xmm0);
+ masm.addsd(xmm0, xmm6);
+ masm.subsd(xmm2, xmm0);
+ masm.addsd(xmm6, xmm2);
+
+ masm.bind(block12);
+ masm.movq(xmm1, recordExternalAddress(crb, pi32Inv)); // 0x6dc9c883, 0x40245f30
+ masm.mulsd(xmm1, xmm0);
+ masm.movq(xmm5, recordExternalAddress(crb, onehalf)); // 0x00000000, 0x3fe00000,
+ // 0x00000000, 0x3fe00000
+ masm.movq(xmm4, recordExternalAddress(crb, signMask)); // 0x00000000, 0x80000000
+ masm.pand(xmm4, xmm0);
+ masm.por(xmm5, xmm4);
+ masm.addpd(xmm1, xmm5);
+ masm.cvttsd2sil(rdx, xmm1);
+ masm.cvtsi2sdl(xmm1, rdx);
+ masm.movq(xmm3, recordExternalAddress(crb, p1)); // 0x54400000, 0x3fb921fb
+ masm.movdqu(xmm2, recordExternalAddress(crb, p2)); // 0x1a600000, 0x3d90b461,
+ // 0x1a600000, 0x3d90b461
+ masm.mulsd(xmm3, xmm1);
+ masm.unpcklpd(xmm1, xmm1);
+ masm.shll(rax, 3);
+ masm.addl(rdx, 1865216);
+ masm.movdqu(xmm4, xmm0);
+ masm.addl(rdx, rax);
+ masm.andl(rdx, 63);
+ masm.movdqu(xmm5, recordExternalAddress(crb, sc4)); // 0x54400000, 0x3fb921fb
+ masm.leaq(AMD64.rax, recordExternalAddress(crb, ctable));
+ masm.shll(rdx, 5);
+ masm.addq(AMD64.rax, AMD64.rdx);
+ masm.mulpd(xmm2, xmm1);
+ masm.subsd(xmm0, xmm3);
+ masm.mulsd(xmm1, recordExternalAddress(crb, p3)); // 0x2e037073, 0x3b63198a
+ masm.subsd(xmm4, xmm3);
+ masm.movq(xmm7, new AMD64Address(AMD64.rax, 8));
+ masm.unpcklpd(xmm0, xmm0);
+ masm.movdqu(xmm3, xmm4);
+ masm.subsd(xmm4, xmm2);
+ masm.mulpd(xmm5, xmm0);
+ masm.subpd(xmm0, xmm2);
+ masm.mulsd(xmm7, xmm4);
+ masm.subsd(xmm3, xmm4);
+ masm.mulpd(xmm5, xmm0);
+ masm.mulpd(xmm0, xmm0);
+ masm.subsd(xmm3, xmm2);
+ masm.movdqu(xmm2, new AMD64Address(AMD64.rax, 0));
+ masm.subsd(xmm1, xmm3);
+ masm.movq(xmm3, new AMD64Address(AMD64.rax, 24));
+ masm.addsd(xmm2, xmm3);
+ masm.subsd(xmm7, xmm2);
+ masm.subsd(xmm1, xmm6);
+ masm.movdqu(xmm6, recordExternalAddress(crb, sc2)); // 0x11111111, 0x3f811111,
+ // 0x55555555, 0x3fa55555
+ masm.mulsd(xmm2, xmm4);
+ masm.mulpd(xmm6, xmm0);
+ masm.mulsd(xmm3, xmm4);
+ masm.mulpd(xmm2, xmm0);
+ masm.mulpd(xmm0, xmm0);
+ masm.addpd(xmm5, recordExternalAddress(crb, sc3)); // 0x1a01a01a, 0xbf2a01a0,
+ // 0x16c16c17, 0xbf56c16c
+ masm.mulsd(xmm4, new AMD64Address(AMD64.rax, 0));
+ masm.addpd(xmm6, recordExternalAddress(crb, sc1)); // 0x55555555, 0xbfc55555,
+ // 0x00000000, 0xbfe00000
+ masm.mulpd(xmm5, xmm0);
+ masm.movdqu(xmm0, xmm3);
+ masm.addsd(xmm3, new AMD64Address(AMD64.rax, 8));
+ masm.mulpd(xmm1, xmm7);
+ masm.movdqu(xmm7, xmm4);
+ masm.addsd(xmm4, xmm3);
+ masm.addpd(xmm6, xmm5);
+ masm.movq(xmm5, new AMD64Address(AMD64.rax, 8));
+ masm.subsd(xmm5, xmm3);
+ masm.subsd(xmm3, xmm4);
+ masm.addsd(xmm1, new AMD64Address(AMD64.rax, 16));
+ masm.mulpd(xmm6, xmm2);
+ masm.addsd(xmm5, xmm0);
+ masm.addsd(xmm3, xmm7);
+ masm.addsd(xmm1, xmm5);
+ masm.addsd(xmm1, xmm3);
+ masm.addsd(xmm1, xmm6);
+ masm.unpckhpd(xmm6, xmm6);
+ masm.movdqu(xmm0, xmm4);
+ masm.addsd(xmm1, xmm6);
+ masm.addsd(xmm0, xmm1);
+ masm.jmp(block14);
+
+ masm.bind(block8);
+ masm.addl(rdx, 64);
+ masm.movq(r9, r10);
+ masm.movq(r10, r8);
+ masm.movl(r8, 0);
+ masm.cmpq(r9, 0);
+ masm.jcc(ConditionFlag.NotEqual, block9);
+ masm.addl(rdx, 64);
+ masm.movq(r9, r10);
+ masm.movq(r10, r8);
+ masm.cmpq(r9, 0);
+ masm.jcc(ConditionFlag.NotEqual, block9);
+ masm.xorpd(xmm0, xmm0);
+ masm.xorpd(xmm6, xmm6);
+ masm.jmp(block12);
+
+ masm.bind(block10);
+ masm.jcc(ConditionFlag.Equal, block11);
+ masm.negl(rcx);
+ masm.shrq(r10);
+ masm.movq(AMD64.rax, r9);
+ masm.shrq(r9);
+ masm.subl(rdx, rcx);
+ masm.negl(rcx);
+ masm.addl(rcx, 64);
+ masm.shlq(AMD64.rax);
+ masm.orq(r10, AMD64.rax);
+ masm.jmp(block11);
+
+ masm.bind(block4);
+ masm.negl(rcx);
+ masm.shlq(r9, 32);
+ masm.orq(r9, r11);
+ masm.shlq(r9);
+ masm.movq(rdi, r9);
+ masm.testl(r9, Integer.MIN_VALUE);
+ masm.jcc(ConditionFlag.NotEqual, block13);
+ masm.shrl(r9);
+ masm.movl(rbx, 0);
+ masm.shrq(rdi, 3);
+ masm.jmp(block7);
+
+ masm.bind(block5);
+ masm.shrl(r9);
+ masm.movl(rbx, 536870912);
+ masm.shrl(rbx);
+ masm.shlq(r9, 32);
+ masm.orq(r9, r11);
+ masm.shlq(AMD64.rbx, 32);
+ masm.addl(rdi, 536870912);
+ masm.movl(AMD64.rcx, 0);
+ masm.movl(r11, 0);
+ masm.subq(AMD64.rcx, r8);
+ masm.sbbq(r11, r10);
+ masm.sbbq(AMD64.rbx, r9);
+ masm.movq(r8, AMD64.rcx);
+ masm.movq(r10, r11);
+ masm.movq(r9, AMD64.rbx);
+ masm.movl(rbx, 32768);
+ masm.jmp(block6);
+
+ masm.bind(block13);
+ masm.shrl(r9);
+ masm.movq(AMD64.rbx, 0x100000000L);
+ masm.shrq(AMD64.rbx);
+ masm.movl(AMD64.rcx, 0);
+ masm.movl(r11, 0);
+ masm.subq(AMD64.rcx, r8);
+ masm.sbbq(r11, r10);
+ masm.sbbq(AMD64.rbx, r9);
+ masm.movq(r8, AMD64.rcx);
+ masm.movq(r10, r11);
+ masm.movq(r9, AMD64.rbx);
+ masm.movl(rbx, 32768);
+ masm.shrq(rdi, 3);
+ masm.addl(rdi, 536870912);
+ masm.jmp(block7);
+
+ masm.bind(block3);
+ masm.movq(xmm0, new AMD64Address(rsp, 8));
+ masm.mulsd(xmm0, recordExternalAddress(crb, negZero)); // 0x00000000, 0x80000000
+ masm.movq(new AMD64Address(rsp, 0), xmm0);
+
+ masm.bind(block14);
+ masm.addq(rsp, 16);
+ masm.pop(AMD64.rbx);
+ }
+}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir.amd64/src/org/graalvm/compiler/lir/amd64/AMD64MathTanOp.java Sat Mar 16 21:00:45 2019 +0000
@@ -0,0 +1,1119 @@
+/*
+ * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, Intel Corporation. All rights reserved.
+ * Intel Math Library (LIBM) Source Code
+ * 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.
+ */
+
+
+package org.graalvm.compiler.lir.amd64;
+
+import static jdk.vm.ci.amd64.AMD64.r10;
+import static jdk.vm.ci.amd64.AMD64.r11;
+import static jdk.vm.ci.amd64.AMD64.r8;
+import static jdk.vm.ci.amd64.AMD64.r9;
+import static jdk.vm.ci.amd64.AMD64.rax;
+import static jdk.vm.ci.amd64.AMD64.rbx;
+import static jdk.vm.ci.amd64.AMD64.rcx;
+import static jdk.vm.ci.amd64.AMD64.rdi;
+import static jdk.vm.ci.amd64.AMD64.rdx;
+import static jdk.vm.ci.amd64.AMD64.rsi;
+import static jdk.vm.ci.amd64.AMD64.rsp;
+import static jdk.vm.ci.amd64.AMD64.xmm0;
+import static jdk.vm.ci.amd64.AMD64.xmm1;
+import static jdk.vm.ci.amd64.AMD64.xmm2;
+import static jdk.vm.ci.amd64.AMD64.xmm3;
+import static jdk.vm.ci.amd64.AMD64.xmm4;
+import static jdk.vm.ci.amd64.AMD64.xmm5;
+import static jdk.vm.ci.amd64.AMD64.xmm6;
+import static jdk.vm.ci.amd64.AMD64.xmm7;
+import static org.graalvm.compiler.lir.amd64.AMD64HotSpotHelper.pointerConstant;
+import static org.graalvm.compiler.lir.amd64.AMD64HotSpotHelper.recordExternalAddress;
+
+import org.graalvm.compiler.asm.Label;
+import org.graalvm.compiler.asm.amd64.AMD64Address;
+import org.graalvm.compiler.asm.amd64.AMD64Assembler;
+import org.graalvm.compiler.asm.amd64.AMD64MacroAssembler;
+import org.graalvm.compiler.lir.LIRInstructionClass;
+import org.graalvm.compiler.lir.asm.ArrayDataPointerConstant;
+import org.graalvm.compiler.lir.asm.CompilationResultBuilder;
+
+import jdk.vm.ci.amd64.AMD64;
+
+/**
+ * <pre>
+ * ALGORITHM DESCRIPTION - TAN()
+ * ---------------------
+ *
+ * Polynomials coefficients and other constants.
+ *
+ * Note that in this algorithm, there is a different polynomial for
+ * each breakpoint, so there are 32 sets of polynomial coefficients
+ * as well as 32 instances of the other constants.
+ *
+ * The polynomial coefficients and constants are offset from the start
+ * of the main block as follows:
+ *
+ * 0: c8 | c0
+ * 16: c9 | c1
+ * 32: c10 | c2
+ * 48: c11 | c3
+ * 64: c12 | c4
+ * 80: c13 | c5
+ * 96: c14 | c6
+ * 112: c15 | c7
+ * 128: T_hi
+ * 136: T_lo
+ * 144: Sigma
+ * 152: T_hl
+ * 160: Tau
+ * 168: Mask
+ * 176: (end of block)
+ *
+ * The total table size is therefore 5632 bytes.
+ *
+ * Note that c0 and c1 are always zero. We could try storing
+ * other constants here, and just loading the low part of the
+ * SIMD register in these cases, after ensuring the high part
+ * is zero.
+ *
+ * The higher terms of the polynomial are computed in the *low*
+ * part of the SIMD register. This is so we can overlap the
+ * multiplication by r^8 and the unpacking of the other part.
+ *
+ * The constants are:
+ * T_hi + T_lo = accurate constant term in power series
+ * Sigma + T_hl = accurate coefficient of r in power series (Sigma=1 bit)
+ * Tau = multiplier for the reciprocal, always -1 or 0
+ *
+ * The basic reconstruction formula using these constants is:
+ *
+ * High = tau * recip_hi + t_hi
+ * Med = (sgn * r + t_hl * r)_hi
+ * Low = (sgn * r + t_hl * r)_lo +
+ * tau * recip_lo + T_lo + (T_hl + sigma) * c + pol
+ *
+ * where pol = c0 + c1 * r + c2 * r^2 + ... + c15 * r^15
+ *
+ * (c0 = c1 = 0, but using them keeps SIMD regularity)
+ *
+ * We then do a compensated sum High + Med, add the low parts together
+ * and then do the final sum.
+ *
+ * Here recip_hi + recip_lo is an accurate reciprocal of the remainder
+ * modulo pi/2
+ *
+ * Special cases:
+ * tan(NaN) = quiet NaN, and raise invalid exception
+ * tan(INF) = NaN and raise invalid exception
+ * tan(+/-0) = +/-0
+ * </pre>
+ */
+public final class AMD64MathTanOp extends AMD64MathIntrinsicUnaryOp {
+
+ public static final LIRInstructionClass<AMD64MathTanOp> TYPE = LIRInstructionClass.create(AMD64MathTanOp.class);
+
+ public AMD64MathTanOp() {
+ super(TYPE, /* GPR */ rax, rcx, rdx, rbx, rsi, rdi, r8, r9, r10, r11,
+ /* XMM */ xmm1, xmm2, xmm3, xmm4, xmm5, xmm6, xmm7);
+ }
+
+ private ArrayDataPointerConstant onehalf = pointerConstant(16, new int[]{
+ // @formatter:off
+ 0x00000000, 0x3fe00000, 0x00000000, 0x3fe00000
+ // @formatter:on
+ });
+
+ private ArrayDataPointerConstant mul16 = pointerConstant(16, new int[]{
+ // @formatter:off
+ 0x00000000, 0x40300000, 0x00000000, 0x3ff00000
+ // @formatter:on
+ });
+
+ private ArrayDataPointerConstant signMask = pointerConstant(16, new int[]{
+ // @formatter:off
+ 0x00000000, 0x80000000, 0x00000000, 0x80000000
+ // @formatter:on
+ });
+
+ private ArrayDataPointerConstant pi32Inv = pointerConstant(16, new int[]{
+ // @formatter:off
+ 0x6dc9c883, 0x3fe45f30, 0x6dc9c883, 0x40245f30
+ // @formatter:on
+ });
+
+ private ArrayDataPointerConstant p1 = pointerConstant(16, new int[]{
+ // @formatter:off
+ 0x54444000, 0x3fb921fb, 0x54440000, 0x3fb921fb
+ // @formatter:on
+ });
+
+ private ArrayDataPointerConstant p2 = pointerConstant(16, new int[]{
+ // @formatter:off
+ 0x67674000, 0xbd32e7b9, 0x4c4c0000, 0x3d468c23
+ // @formatter:on
+ });
+
+ private ArrayDataPointerConstant p3 = pointerConstant(16, new int[]{
+ // @formatter:off
+ 0x3707344a, 0x3aa8a2e0, 0x03707345, 0x3ae98a2e
+ // @formatter:on
+ });
+
+ private ArrayDataPointerConstant ctable = pointerConstant(16, new int[]{
+ // @formatter:off
+ 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x882c10fa,
+ 0x3f9664f4, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+ 0x00000000, 0x00000000, 0x55e6c23d, 0x3f8226e3, 0x55555555,
+ 0x3fd55555, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+ 0x0e157de0, 0x3f6d6d3d, 0x11111111, 0x3fc11111, 0x00000000,
+ 0x00000000, 0x00000000, 0x00000000, 0x452b75e3, 0x3f57da36,
+ 0x1ba1ba1c, 0x3faba1ba, 0x00000000, 0x00000000, 0x00000000,
+ 0x00000000, 0x00000000, 0x3ff00000, 0x00000000, 0x00000000,
+ 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x4e435f9b,
+ 0x3f953f83, 0x00000000, 0x00000000, 0x3c6e8e46, 0x3f9b74ea,
+ 0x00000000, 0x00000000, 0xda5b7511, 0x3f85ad63, 0xdc230b9b,
+ 0x3fb97558, 0x26cb3788, 0x3f881308, 0x76fc4985, 0x3fd62ac9,
+ 0x77bb08ba, 0x3f757c85, 0xb6247521, 0x3fb1381e, 0x5922170c,
+ 0x3f754e95, 0x8746482d, 0x3fc27f83, 0x11055b30, 0x3f64e391,
+ 0x3e666320, 0x3fa3e609, 0x0de9dae3, 0x3f6301df, 0x1f1dca06,
+ 0x3fafa8ae, 0x8c5b2da2, 0x3fb936bb, 0x4e88f7a5, 0x3c587d05,
+ 0x00000000, 0x3ff00000, 0xa8935dd9, 0x3f83dde2, 0x00000000,
+ 0x00000000, 0x00000000, 0x00000000, 0x5a279ea3, 0x3faa3407,
+ 0x00000000, 0x00000000, 0x432d65fa, 0x3fa70153, 0x00000000,
+ 0x00000000, 0x891a4602, 0x3f9d03ef, 0xd62ca5f8, 0x3fca77d9,
+ 0xb35f4628, 0x3f97a265, 0x433258fa, 0x3fd8cf51, 0xb58fd909,
+ 0x3f8f88e3, 0x01771cea, 0x3fc2b154, 0xf3562f8e, 0x3f888f57,
+ 0xc028a723, 0x3fc7370f, 0x20b7f9f0, 0x3f80f44c, 0x214368e9,
+ 0x3fb6dfaa, 0x28891863, 0x3f79b4b6, 0x172dbbf0, 0x3fb6cb8e,
+ 0xe0553158, 0x3fc975f5, 0x593fe814, 0x3c2ef5d3, 0x00000000,
+ 0x3ff00000, 0x03dec550, 0x3fa44203, 0x00000000, 0x00000000,
+ 0x00000000, 0x00000000, 0x9314533e, 0x3fbb8ec5, 0x00000000,
+ 0x00000000, 0x09aa36d0, 0x3fb6d3f4, 0x00000000, 0x00000000,
+ 0xdcb427fd, 0x3fb13950, 0xd87ab0bb, 0x3fd5335e, 0xce0ae8a5,
+ 0x3fabb382, 0x79143126, 0x3fddba41, 0x5f2b28d4, 0x3fa552f1,
+ 0x59f21a6d, 0x3fd015ab, 0x22c27d95, 0x3fa0e984, 0xe19fc6aa,
+ 0x3fd0576c, 0x8f2c2950, 0x3f9a4898, 0xc0b3f22c, 0x3fc59462,
+ 0x1883a4b8, 0x3f94b61c, 0x3f838640, 0x3fc30eb8, 0x355c63dc,
+ 0x3fd36a08, 0x1dce993d, 0xbc6d704d, 0x00000000, 0x3ff00000,
+ 0x2b82ab63, 0x3fb78e92, 0x00000000, 0x00000000, 0x00000000,
+ 0x00000000, 0x56f37042, 0x3fccfc56, 0x00000000, 0x00000000,
+ 0xaa563951, 0x3fc90125, 0x00000000, 0x00000000, 0x3d0e7c5d,
+ 0x3fc50533, 0x9bed9b2e, 0x3fdf0ed9, 0x5fe7c47c, 0x3fc1f250,
+ 0x96c125e5, 0x3fe2edd9, 0x5a02bbd8, 0x3fbe5c71, 0x86362c20,
+ 0x3fda08b7, 0x4b4435ed, 0x3fb9d342, 0x4b494091, 0x3fd911bd,
+ 0xb56658be, 0x3fb5e4c7, 0x93a2fd76, 0x3fd3c092, 0xda271794,
+ 0x3fb29910, 0x3303df2b, 0x3fd189be, 0x99fcef32, 0x3fda8279,
+ 0xb68c1467, 0x3c708b2f, 0x00000000, 0x3ff00000, 0x980c4337,
+ 0x3fc5f619, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+ 0xcc03e501, 0x3fdff10f, 0x00000000, 0x00000000, 0x44a4e845,
+ 0x3fddb63b, 0x00000000, 0x00000000, 0x3768ad9f, 0x3fdb72a4,
+ 0x3dd01cca, 0x3fe5fdb9, 0xa61d2811, 0x3fd972b2, 0x5645ad0b,
+ 0x3fe977f9, 0xd013b3ab, 0x3fd78ca3, 0xbf0bf914, 0x3fe4f192,
+ 0x4d53e730, 0x3fd5d060, 0x3f8b9000, 0x3fe49933, 0xe2b82f08,
+ 0x3fd4322a, 0x5936a835, 0x3fe27ae1, 0xb1c61c9b, 0x3fd2b3fb,
+ 0xef478605, 0x3fe1659e, 0x190834ec, 0x3fe11ab7, 0xcdb625ea,
+ 0xbc8e564b, 0x00000000, 0x3ff00000, 0xb07217e3, 0x3fd248f1,
+ 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x2b2c49d0,
+ 0x3ff2de9c, 0x00000000, 0x00000000, 0x2655bc98, 0x3ff33e58,
+ 0x00000000, 0x00000000, 0xff691fa2, 0x3ff3972e, 0xe93463bd,
+ 0x3feeed87, 0x070e10a0, 0x3ff3f5b2, 0xf4d790a4, 0x3ff20c10,
+ 0xa04e8ea3, 0x3ff4541a, 0x386accd3, 0x3ff1369e, 0x222a66dd,
+ 0x3ff4b521, 0x22a9777e, 0x3ff20817, 0x52a04a6e, 0x3ff5178f,
+ 0xddaa0031, 0x3ff22137, 0x4447d47c, 0x3ff57c01, 0x1e9c7f1d,
+ 0x3ff29311, 0x2ab7f990, 0x3fe561b8, 0x209c7df1, 0x3c87a8c5,
+ 0x00000000, 0x3ff00000, 0x4170bcc6, 0x3fdc92d8, 0x00000000,
+ 0x00000000, 0x00000000, 0x00000000, 0xc7ab4d5a, 0x40085e24,
+ 0x00000000, 0x00000000, 0xe93ea75d, 0x400b963d, 0x00000000,
+ 0x00000000, 0x94a7f25a, 0x400f37e2, 0x4b6261cb, 0x3ff5f984,
+ 0x5a9dd812, 0x4011aab0, 0x74c30018, 0x3ffaf5a5, 0x7f2ce8e3,
+ 0x4013fe8b, 0xfe8e54fa, 0x3ffd7334, 0x670d618d, 0x4016a10c,
+ 0x4db97058, 0x4000e012, 0x24df44dd, 0x40199c5f, 0x697d6ece,
+ 0x4003006e, 0x83298b82, 0x401cfc4d, 0x19d490d6, 0x40058c19,
+ 0x2ae42850, 0x3fea4300, 0x118e20e6, 0xbc7a6db8, 0x00000000,
+ 0x40000000, 0xe33345b8, 0xbfd4e526, 0x00000000, 0x00000000,
+ 0x00000000, 0x00000000, 0x65965966, 0x40219659, 0x00000000,
+ 0x00000000, 0x882c10fa, 0x402664f4, 0x00000000, 0x00000000,
+ 0x83cd3723, 0x402c8342, 0x00000000, 0x40000000, 0x55e6c23d,
+ 0x403226e3, 0x55555555, 0x40055555, 0x34451939, 0x40371c96,
+ 0xaaaaaaab, 0x400aaaaa, 0x0e157de0, 0x403d6d3d, 0x11111111,
+ 0x40111111, 0xa738201f, 0x4042bbce, 0x05b05b06, 0x4015b05b,
+ 0x452b75e3, 0x4047da36, 0x1ba1ba1c, 0x401ba1ba, 0x00000000,
+ 0x3ff00000, 0x00000000, 0x00000000, 0x00000000, 0x40000000,
+ 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+ 0x00000000, 0x4f48b8d3, 0xbf33eaf9, 0x00000000, 0x00000000,
+ 0x0cf7586f, 0x3f20b8ea, 0x00000000, 0x00000000, 0xd0258911,
+ 0xbf0abaf3, 0x23e49fe9, 0xbfab5a8c, 0x2d53222e, 0x3ef60d15,
+ 0x21169451, 0x3fa172b2, 0xbb254dbc, 0xbee1d3b5, 0xdbf93b8e,
+ 0xbf84c7db, 0x05b4630b, 0x3ecd3364, 0xee9aada7, 0x3f743924,
+ 0x794a8297, 0xbeb7b7b9, 0xe015f797, 0xbf5d41f5, 0xe41a4a56,
+ 0x3ea35dfb, 0xe4c2a251, 0x3f49a2ab, 0x5af9e000, 0xbfce49ce,
+ 0x8c743719, 0x3d1eb860, 0x00000000, 0x00000000, 0x1b4863cf,
+ 0x3fd78294, 0x00000000, 0x3ff00000, 0x00000000, 0xfffffff8,
+ 0x535ad890, 0xbf2b9320, 0x00000000, 0x00000000, 0x018fdf1f,
+ 0x3f16d61d, 0x00000000, 0x00000000, 0x0359f1be, 0xbf0139e4,
+ 0xa4317c6d, 0xbfa67e17, 0x82672d0f, 0x3eebb405, 0x2f1b621e,
+ 0x3f9f455b, 0x51ccf238, 0xbed55317, 0xf437b9ac, 0xbf804bee,
+ 0xc791a2b5, 0x3ec0e993, 0x919a1db2, 0x3f7080c2, 0x336a5b0e,
+ 0xbeaa48a2, 0x0a268358, 0xbf55a443, 0xdfd978e4, 0x3e94b61f,
+ 0xd7767a58, 0x3f431806, 0x2aea0000, 0xbfc9bbe8, 0x7723ea61,
+ 0xbd3a2369, 0x00000000, 0x00000000, 0xdf7796ff, 0x3fd6e642,
+ 0x00000000, 0x3ff00000, 0x00000000, 0xfffffff8, 0xb9ff07ce,
+ 0xbf231c78, 0x00000000, 0x00000000, 0xa5517182, 0x3f0ff0e0,
+ 0x00000000, 0x00000000, 0x790b4cbc, 0xbef66191, 0x848a46c6,
+ 0xbfa21ac0, 0xb16435fa, 0x3ee1d3ec, 0x2a1aa832, 0x3f9c71ea,
+ 0xfdd299ef, 0xbec9dd1a, 0x3f8dbaaf, 0xbf793363, 0x309fc6ea,
+ 0x3eb415d6, 0xbee60471, 0x3f6b83ba, 0x94a0a697, 0xbe9dae11,
+ 0x3e5c67b3, 0xbf4fd07b, 0x9a8f3e3e, 0x3e86bd75, 0xa4beb7a4,
+ 0x3f3d1eb1, 0x29cfc000, 0xbfc549ce, 0xbf159358, 0xbd397b33,
+ 0x00000000, 0x00000000, 0x871fee6c, 0x3fd666f0, 0x00000000,
+ 0x3ff00000, 0x00000000, 0xfffffff8, 0x7d98a556, 0xbf1a3958,
+ 0x00000000, 0x00000000, 0x9d88dc01, 0x3f0704c2, 0x00000000,
+ 0x00000000, 0x73742a2b, 0xbeed054a, 0x58844587, 0xbf9c2a13,
+ 0x55688a79, 0x3ed7a326, 0xee33f1d6, 0x3f9a48f4, 0xa8dc9888,
+ 0xbebf8939, 0xaad4b5b8, 0xbf72f746, 0x9102efa1, 0x3ea88f82,
+ 0xdabc29cf, 0x3f678228, 0x9289afb8, 0xbe90f456, 0x741fb4ed,
+ 0xbf46f3a3, 0xa97f6663, 0x3e79b4bf, 0xca89ff3f, 0x3f36db70,
+ 0xa8a2a000, 0xbfc0ee13, 0x3da24be1, 0xbd338b9f, 0x00000000,
+ 0x00000000, 0x11cd6c69, 0x3fd601fd, 0x00000000, 0x3ff00000,
+ 0x00000000, 0xfffffff8, 0x1a154b97, 0xbf116b01, 0x00000000,
+ 0x00000000, 0x2d427630, 0x3f0147bf, 0x00000000, 0x00000000,
+ 0xb93820c8, 0xbee264d4, 0xbb6cbb18, 0xbf94ab8c, 0x888d4d92,
+ 0x3ed0568b, 0x60730f7c, 0x3f98b19b, 0xe4b1fb11, 0xbeb2f950,
+ 0x22cf9f74, 0xbf6b21cd, 0x4a3ff0a6, 0x3e9f499e, 0xfd2b83ce,
+ 0x3f64aad7, 0x637b73af, 0xbe83487c, 0xe522591a, 0xbf3fc092,
+ 0xa158e8bc, 0x3e6e3aae, 0xe5e82ffa, 0x3f329d2f, 0xd636a000,
+ 0xbfb9477f, 0xc2c2d2bc, 0xbd135ef9, 0x00000000, 0x00000000,
+ 0xf2fdb123, 0x3fd5b566, 0x00000000, 0x3ff00000, 0x00000000,
+ 0xfffffff8, 0xc41acb64, 0xbf05448d, 0x00000000, 0x00000000,
+ 0xdbb03d6f, 0x3efb7ad2, 0x00000000, 0x00000000, 0x9e42962d,
+ 0xbed5aea5, 0x2579f8ef, 0xbf8b2398, 0x288a1ed9, 0x3ec81441,
+ 0xb0198dc5, 0x3f979a3a, 0x2fdfe253, 0xbea57cd3, 0x5766336f,
+ 0xbf617caa, 0x600944c3, 0x3e954ed6, 0xa4e0aaf8, 0x3f62c646,
+ 0x6b8fb29c, 0xbe74e3a3, 0xdc4c0409, 0xbf33f952, 0x9bffe365,
+ 0x3e6301ec, 0xb8869e44, 0x3f2fc566, 0xe1e04000, 0xbfb0cc62,
+ 0x016b907f, 0xbd119cbc, 0x00000000, 0x00000000, 0xe6b9d8fa,
+ 0x3fd57fb3, 0x00000000, 0x3ff00000, 0x00000000, 0xfffffff8,
+ 0x5daf22a6, 0xbef429d7, 0x00000000, 0x00000000, 0x06bca545,
+ 0x3ef7a27d, 0x00000000, 0x00000000, 0x7211c19a, 0xbec41c3e,
+ 0x956ed53e, 0xbf7ae3f4, 0xee750e72, 0x3ec3901b, 0x91d443f5,
+ 0x3f96f713, 0x36661e6c, 0xbe936e09, 0x506f9381, 0xbf5122e8,
+ 0xcb6dd43f, 0x3e9041b9, 0x6698b2ff, 0x3f61b0c7, 0x576bf12b,
+ 0xbe625a8a, 0xe5a0e9dc, 0xbf23499d, 0x110384dd, 0x3e5b1c2c,
+ 0x68d43db6, 0x3f2cb899, 0x6ecac000, 0xbfa0c414, 0xcd7dd58c,
+ 0x3d13500f, 0x00000000, 0x00000000, 0x85a2c8fb, 0x3fd55fe0,
+ 0x00000000, 0x3ff00000, 0x00000000, 0xfffffff8, 0x00000000,
+ 0x00000000, 0x00000000, 0x00000000, 0x2bf70ebe, 0x3ef66a8f,
+ 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+ 0x00000000, 0xd644267f, 0x3ec22805, 0x16c16c17, 0x3f96c16c,
+ 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0xc4e09162,
+ 0x3e8d6db2, 0xbc011567, 0x3f61566a, 0x00000000, 0x00000000,
+ 0x00000000, 0x00000000, 0x1f79955c, 0x3e57da4e, 0x9334ef0b,
+ 0x3f2bbd77, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+ 0x00000000, 0x00000000, 0x55555555, 0x3fd55555, 0x00000000,
+ 0x3ff00000, 0x00000000, 0xfffffff8, 0x5daf22a6, 0x3ef429d7,
+ 0x00000000, 0x00000000, 0x06bca545, 0x3ef7a27d, 0x00000000,
+ 0x00000000, 0x7211c19a, 0x3ec41c3e, 0x956ed53e, 0x3f7ae3f4,
+ 0xee750e72, 0x3ec3901b, 0x91d443f5, 0x3f96f713, 0x36661e6c,
+ 0x3e936e09, 0x506f9381, 0x3f5122e8, 0xcb6dd43f, 0x3e9041b9,
+ 0x6698b2ff, 0x3f61b0c7, 0x576bf12b, 0x3e625a8a, 0xe5a0e9dc,
+ 0x3f23499d, 0x110384dd, 0x3e5b1c2c, 0x68d43db6, 0x3f2cb899,
+ 0x6ecac000, 0x3fa0c414, 0xcd7dd58c, 0xbd13500f, 0x00000000,
+ 0x00000000, 0x85a2c8fb, 0x3fd55fe0, 0x00000000, 0x3ff00000,
+ 0x00000000, 0xfffffff8, 0xc41acb64, 0x3f05448d, 0x00000000,
+ 0x00000000, 0xdbb03d6f, 0x3efb7ad2, 0x00000000, 0x00000000,
+ 0x9e42962d, 0x3ed5aea5, 0x2579f8ef, 0x3f8b2398, 0x288a1ed9,
+ 0x3ec81441, 0xb0198dc5, 0x3f979a3a, 0x2fdfe253, 0x3ea57cd3,
+ 0x5766336f, 0x3f617caa, 0x600944c3, 0x3e954ed6, 0xa4e0aaf8,
+ 0x3f62c646, 0x6b8fb29c, 0x3e74e3a3, 0xdc4c0409, 0x3f33f952,
+ 0x9bffe365, 0x3e6301ec, 0xb8869e44, 0x3f2fc566, 0xe1e04000,
+ 0x3fb0cc62, 0x016b907f, 0x3d119cbc, 0x00000000, 0x00000000,
+ 0xe6b9d8fa, 0x3fd57fb3, 0x00000000, 0x3ff00000, 0x00000000,
+ 0xfffffff8, 0x1a154b97, 0x3f116b01, 0x00000000, 0x00000000,
+ 0x2d427630, 0x3f0147bf, 0x00000000, 0x00000000, 0xb93820c8,
+ 0x3ee264d4, 0xbb6cbb18, 0x3f94ab8c, 0x888d4d92, 0x3ed0568b,
+ 0x60730f7c, 0x3f98b19b, 0xe4b1fb11, 0x3eb2f950, 0x22cf9f74,
+ 0x3f6b21cd, 0x4a3ff0a6, 0x3e9f499e, 0xfd2b83ce, 0x3f64aad7,
+ 0x637b73af, 0x3e83487c, 0xe522591a, 0x3f3fc092, 0xa158e8bc,
+ 0x3e6e3aae, 0xe5e82ffa, 0x3f329d2f, 0xd636a000, 0x3fb9477f,
+ 0xc2c2d2bc, 0x3d135ef9, 0x00000000, 0x00000000, 0xf2fdb123,
+ 0x3fd5b566, 0x00000000, 0x3ff00000, 0x00000000, 0xfffffff8,
+ 0x7d98a556, 0x3f1a3958, 0x00000000, 0x00000000, 0x9d88dc01,
+ 0x3f0704c2, 0x00000000, 0x00000000, 0x73742a2b, 0x3eed054a,
+ 0x58844587, 0x3f9c2a13, 0x55688a79, 0x3ed7a326, 0xee33f1d6,
+ 0x3f9a48f4, 0xa8dc9888, 0x3ebf8939, 0xaad4b5b8, 0x3f72f746,
+ 0x9102efa1, 0x3ea88f82, 0xdabc29cf, 0x3f678228, 0x9289afb8,
+ 0x3e90f456, 0x741fb4ed, 0x3f46f3a3, 0xa97f6663, 0x3e79b4bf,
+ 0xca89ff3f, 0x3f36db70, 0xa8a2a000, 0x3fc0ee13, 0x3da24be1,
+ 0x3d338b9f, 0x00000000, 0x00000000, 0x11cd6c69, 0x3fd601fd,
+ 0x00000000, 0x3ff00000, 0x00000000, 0xfffffff8, 0xb9ff07ce,
+ 0x3f231c78, 0x00000000, 0x00000000, 0xa5517182, 0x3f0ff0e0,
+ 0x00000000, 0x00000000, 0x790b4cbc, 0x3ef66191, 0x848a46c6,
+ 0x3fa21ac0, 0xb16435fa, 0x3ee1d3ec, 0x2a1aa832, 0x3f9c71ea,
+ 0xfdd299ef, 0x3ec9dd1a, 0x3f8dbaaf, 0x3f793363, 0x309fc6ea,
+ 0x3eb415d6, 0xbee60471, 0x3f6b83ba, 0x94a0a697, 0x3e9dae11,
+ 0x3e5c67b3, 0x3f4fd07b, 0x9a8f3e3e, 0x3e86bd75, 0xa4beb7a4,
+ 0x3f3d1eb1, 0x29cfc000, 0x3fc549ce, 0xbf159358, 0x3d397b33,
+ 0x00000000, 0x00000000, 0x871fee6c, 0x3fd666f0, 0x00000000,
+ 0x3ff00000, 0x00000000, 0xfffffff8, 0x535ad890, 0x3f2b9320,
+ 0x00000000, 0x00000000, 0x018fdf1f, 0x3f16d61d, 0x00000000,
+ 0x00000000, 0x0359f1be, 0x3f0139e4, 0xa4317c6d, 0x3fa67e17,
+ 0x82672d0f, 0x3eebb405, 0x2f1b621e, 0x3f9f455b, 0x51ccf238,
+ 0x3ed55317, 0xf437b9ac, 0x3f804bee, 0xc791a2b5, 0x3ec0e993,
+ 0x919a1db2, 0x3f7080c2, 0x336a5b0e, 0x3eaa48a2, 0x0a268358,
+ 0x3f55a443, 0xdfd978e4, 0x3e94b61f, 0xd7767a58, 0x3f431806,
+ 0x2aea0000, 0x3fc9bbe8, 0x7723ea61, 0x3d3a2369, 0x00000000,
+ 0x00000000, 0xdf7796ff, 0x3fd6e642, 0x00000000, 0x3ff00000,
+ 0x00000000, 0xfffffff8, 0x4f48b8d3, 0x3f33eaf9, 0x00000000,
+ 0x00000000, 0x0cf7586f, 0x3f20b8ea, 0x00000000, 0x00000000,
+ 0xd0258911, 0x3f0abaf3, 0x23e49fe9, 0x3fab5a8c, 0x2d53222e,
+ 0x3ef60d15, 0x21169451, 0x3fa172b2, 0xbb254dbc, 0x3ee1d3b5,
+ 0xdbf93b8e, 0x3f84c7db, 0x05b4630b, 0x3ecd3364, 0xee9aada7,
+ 0x3f743924, 0x794a8297, 0x3eb7b7b9, 0xe015f797, 0x3f5d41f5,
+ 0xe41a4a56, 0x3ea35dfb, 0xe4c2a251, 0x3f49a2ab, 0x5af9e000,
+ 0x3fce49ce, 0x8c743719, 0xbd1eb860, 0x00000000, 0x00000000,
+ 0x1b4863cf, 0x3fd78294, 0x00000000, 0x3ff00000, 0x00000000,
+ 0xfffffff8, 0x65965966, 0xc0219659, 0x00000000, 0x00000000,
+ 0x882c10fa, 0x402664f4, 0x00000000, 0x00000000, 0x83cd3723,
+ 0xc02c8342, 0x00000000, 0xc0000000, 0x55e6c23d, 0x403226e3,
+ 0x55555555, 0x40055555, 0x34451939, 0xc0371c96, 0xaaaaaaab,
+ 0xc00aaaaa, 0x0e157de0, 0x403d6d3d, 0x11111111, 0x40111111,
+ 0xa738201f, 0xc042bbce, 0x05b05b06, 0xc015b05b, 0x452b75e3,
+ 0x4047da36, 0x1ba1ba1c, 0x401ba1ba, 0x00000000, 0xbff00000,
+ 0x00000000, 0x00000000, 0x00000000, 0x40000000, 0x00000000,
+ 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+ 0xc7ab4d5a, 0xc0085e24, 0x00000000, 0x00000000, 0xe93ea75d,
+ 0x400b963d, 0x00000000, 0x00000000, 0x94a7f25a, 0xc00f37e2,
+ 0x4b6261cb, 0xbff5f984, 0x5a9dd812, 0x4011aab0, 0x74c30018,
+ 0x3ffaf5a5, 0x7f2ce8e3, 0xc013fe8b, 0xfe8e54fa, 0xbffd7334,
+ 0x670d618d, 0x4016a10c, 0x4db97058, 0x4000e012, 0x24df44dd,
+ 0xc0199c5f, 0x697d6ece, 0xc003006e, 0x83298b82, 0x401cfc4d,
+ 0x19d490d6, 0x40058c19, 0x2ae42850, 0xbfea4300, 0x118e20e6,
+ 0x3c7a6db8, 0x00000000, 0x40000000, 0xe33345b8, 0xbfd4e526,
+ 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x2b2c49d0,
+ 0xbff2de9c, 0x00000000, 0x00000000, 0x2655bc98, 0x3ff33e58,
+ 0x00000000, 0x00000000, 0xff691fa2, 0xbff3972e, 0xe93463bd,
+ 0xbfeeed87, 0x070e10a0, 0x3ff3f5b2, 0xf4d790a4, 0x3ff20c10,
+ 0xa04e8ea3, 0xbff4541a, 0x386accd3, 0xbff1369e, 0x222a66dd,
+ 0x3ff4b521, 0x22a9777e, 0x3ff20817, 0x52a04a6e, 0xbff5178f,
+ 0xddaa0031, 0xbff22137, 0x4447d47c, 0x3ff57c01, 0x1e9c7f1d,
+ 0x3ff29311, 0x2ab7f990, 0xbfe561b8, 0x209c7df1, 0xbc87a8c5,
+ 0x00000000, 0x3ff00000, 0x4170bcc6, 0x3fdc92d8, 0x00000000,
+ 0x00000000, 0x00000000, 0x00000000, 0xcc03e501, 0xbfdff10f,
+ 0x00000000, 0x00000000, 0x44a4e845, 0x3fddb63b, 0x00000000,
+ 0x00000000, 0x3768ad9f, 0xbfdb72a4, 0x3dd01cca, 0xbfe5fdb9,
+ 0xa61d2811, 0x3fd972b2, 0x5645ad0b, 0x3fe977f9, 0xd013b3ab,
+ 0xbfd78ca3, 0xbf0bf914, 0xbfe4f192, 0x4d53e730, 0x3fd5d060,
+ 0x3f8b9000, 0x3fe49933, 0xe2b82f08, 0xbfd4322a, 0x5936a835,
+ 0xbfe27ae1, 0xb1c61c9b, 0x3fd2b3fb, 0xef478605, 0x3fe1659e,
+ 0x190834ec, 0xbfe11ab7, 0xcdb625ea, 0x3c8e564b, 0x00000000,
+ 0x3ff00000, 0xb07217e3, 0x3fd248f1, 0x00000000, 0x00000000,
+ 0x00000000, 0x00000000, 0x56f37042, 0xbfccfc56, 0x00000000,
+ 0x00000000, 0xaa563951, 0x3fc90125, 0x00000000, 0x00000000,
+ 0x3d0e7c5d, 0xbfc50533, 0x9bed9b2e, 0xbfdf0ed9, 0x5fe7c47c,
+ 0x3fc1f250, 0x96c125e5, 0x3fe2edd9, 0x5a02bbd8, 0xbfbe5c71,
+ 0x86362c20, 0xbfda08b7, 0x4b4435ed, 0x3fb9d342, 0x4b494091,
+ 0x3fd911bd, 0xb56658be, 0xbfb5e4c7, 0x93a2fd76, 0xbfd3c092,
+ 0xda271794, 0x3fb29910, 0x3303df2b, 0x3fd189be, 0x99fcef32,
+ 0xbfda8279, 0xb68c1467, 0xbc708b2f, 0x00000000, 0x3ff00000,
+ 0x980c4337, 0x3fc5f619, 0x00000000, 0x00000000, 0x00000000,
+ 0x00000000, 0x9314533e, 0xbfbb8ec5, 0x00000000, 0x00000000,
+ 0x09aa36d0, 0x3fb6d3f4, 0x00000000, 0x00000000, 0xdcb427fd,
+ 0xbfb13950, 0xd87ab0bb, 0xbfd5335e, 0xce0ae8a5, 0x3fabb382,
+ 0x79143126, 0x3fddba41, 0x5f2b28d4, 0xbfa552f1, 0x59f21a6d,
+ 0xbfd015ab, 0x22c27d95, 0x3fa0e984, 0xe19fc6aa, 0x3fd0576c,
+ 0x8f2c2950, 0xbf9a4898, 0xc0b3f22c, 0xbfc59462, 0x1883a4b8,
+ 0x3f94b61c, 0x3f838640, 0x3fc30eb8, 0x355c63dc, 0xbfd36a08,
+ 0x1dce993d, 0x3c6d704d, 0x00000000, 0x3ff00000, 0x2b82ab63,
+ 0x3fb78e92, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+ 0x5a279ea3, 0xbfaa3407, 0x00000000, 0x00000000, 0x432d65fa,
+ 0x3fa70153, 0x00000000, 0x00000000, 0x891a4602, 0xbf9d03ef,
+ 0xd62ca5f8, 0xbfca77d9, 0xb35f4628, 0x3f97a265, 0x433258fa,
+ 0x3fd8cf51, 0xb58fd909, 0xbf8f88e3, 0x01771cea, 0xbfc2b154,
+ 0xf3562f8e, 0x3f888f57, 0xc028a723, 0x3fc7370f, 0x20b7f9f0,
+ 0xbf80f44c, 0x214368e9, 0xbfb6dfaa, 0x28891863, 0x3f79b4b6,
+ 0x172dbbf0, 0x3fb6cb8e, 0xe0553158, 0xbfc975f5, 0x593fe814,
+ 0xbc2ef5d3, 0x00000000, 0x3ff00000, 0x03dec550, 0x3fa44203,
+ 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x4e435f9b,
+ 0xbf953f83, 0x00000000, 0x00000000, 0x3c6e8e46, 0x3f9b74ea,
+ 0x00000000, 0x00000000, 0xda5b7511, 0xbf85ad63, 0xdc230b9b,
+ 0xbfb97558, 0x26cb3788, 0x3f881308, 0x76fc4985, 0x3fd62ac9,
+ 0x77bb08ba, 0xbf757c85, 0xb6247521, 0xbfb1381e, 0x5922170c,
+ 0x3f754e95, 0x8746482d, 0x3fc27f83, 0x11055b30, 0xbf64e391,
+ 0x3e666320, 0xbfa3e609, 0x0de9dae3, 0x3f6301df, 0x1f1dca06,
+ 0x3fafa8ae, 0x8c5b2da2, 0xbfb936bb, 0x4e88f7a5, 0xbc587d05,
+ 0x00000000, 0x3ff00000, 0xa8935dd9, 0x3f83dde2, 0x00000000,
+ 0x00000000, 0x00000000, 0x00000000
+ // @formatter:on
+ });
+
+ private ArrayDataPointerConstant mask35 = pointerConstant(16, new int[]{
+ // @formatter:off
+ 0xfffc0000, 0xffffffff, 0x00000000, 0x00000000
+ // @formatter:on
+ });
+
+ private ArrayDataPointerConstant q11 = pointerConstant(16, new int[]{
+ // @formatter:off
+ 0xb8fe4d77, 0x3f82609a
+ // @formatter:on
+ });
+
+ private ArrayDataPointerConstant q9 = pointerConstant(16, new int[]{
+ // @formatter:off
+ 0xbf847a43, 0x3f9664a0
+ // @formatter:on
+ });
+
+ private ArrayDataPointerConstant q7 = pointerConstant(16, new int[]{
+ // @formatter:off
+ 0x52c4c8ab, 0x3faba1ba
+ // @formatter:on
+ });
+
+ private ArrayDataPointerConstant q5 = pointerConstant(16, new int[]{
+ // @formatter:off
+ 0x11092746, 0x3fc11111
+ // @formatter:on
+ });
+
+ private ArrayDataPointerConstant q3 = pointerConstant(16, new int[]{
+ // @formatter:off
+ 0x55555612, 0x3fd55555
+ // @formatter:on
+ });
+
+ private ArrayDataPointerConstant piInvTable = pointerConstant(16, new int[]{
+ // @formatter:off
+ 0x00000000, 0x00000000, 0xa2f9836e, 0x4e441529, 0xfc2757d1,
+ 0xf534ddc0, 0xdb629599, 0x3c439041, 0xfe5163ab, 0xdebbc561,
+ 0xb7246e3a, 0x424dd2e0, 0x06492eea, 0x09d1921c, 0xfe1deb1c,
+ 0xb129a73e, 0xe88235f5, 0x2ebb4484, 0xe99c7026, 0xb45f7e41,
+ 0x3991d639, 0x835339f4, 0x9c845f8b, 0xbdf9283b, 0x1ff897ff,
+ 0xde05980f, 0xef2f118b, 0x5a0a6d1f, 0x6d367ecf, 0x27cb09b7,
+ 0x4f463f66, 0x9e5fea2d, 0x7527bac7, 0xebe5f17b, 0x3d0739f7,
+ 0x8a5292ea, 0x6bfb5fb1, 0x1f8d5d08, 0x56033046, 0xfc7b6bab,
+ 0xf0cfbc21
+ // @formatter:on
+ });
+
+ private ArrayDataPointerConstant pi4 = pointerConstant(8, new int[]{
+ // @formatter:off
+ 0x00000000, 0x3fe921fb,
+ });
+ private ArrayDataPointerConstant pi48 = pointerConstant(8, new int[]{
+ 0x4611a626, 0x3e85110b
+ // @formatter:on
+ });
+
+ private ArrayDataPointerConstant qq2 = pointerConstant(8, new int[]{
+ // @formatter:off
+ 0x676733af, 0x3d32e7b9
+ // @formatter:on
+ });
+
+ private ArrayDataPointerConstant one = pointerConstant(8, new int[]{
+ // @formatter:off
+ 0x00000000, 0x3ff00000
+ // @formatter:on
+ });
+
+ private ArrayDataPointerConstant twoPow55 = pointerConstant(8, new int[]{
+ // @formatter:off
+ 0x00000000, 0x43600000
+ // @formatter:on
+ });
+
+ private ArrayDataPointerConstant twoPowM55 = pointerConstant(4, new int[]{
+ // @formatter:off
+ 0x00000000, 0x3c800000
+ // @formatter:on
+ });
+
+ private ArrayDataPointerConstant negZero = pointerConstant(4, new int[]{
+ // @formatter:off
+ 0x00000000, 0x80000000
+ // @formatter:on
+ });
+
+ @Override
+ public void emitCode(CompilationResultBuilder crb, AMD64MacroAssembler masm) {
+ Label block0 = new Label();
+ Label block1 = new Label();
+ Label block2 = new Label();
+ Label block3 = new Label();
+ Label block4 = new Label();
+ Label block5 = new Label();
+ Label block6 = new Label();
+ Label block7 = new Label();
+ Label block8 = new Label();
+ Label block9 = new Label();
+ Label block10 = new Label();
+ Label block11 = new Label();
+ Label block12 = new Label();
+ Label block13 = new Label();
+ Label block14 = new Label();
+
+ masm.push(rbx);
+ masm.subq(rsp, 16);
+ masm.movsd(new AMD64Address(rsp, 8), xmm0);
+
+ masm.pextrw(rax, xmm0, 3);
+ masm.andl(rax, 32767);
+ masm.subl(rax, 16314);
+ masm.cmpl(rax, 270);
+ masm.jcc(AMD64Assembler.ConditionFlag.Above, block0);
+ masm.movdqu(xmm5, recordExternalAddress(crb, onehalf)); // 0x00000000, 0x3fe00000,
+ // 0x00000000, 0x3fe00000
+ masm.movdqu(xmm6, recordExternalAddress(crb, mul16)); // 0x00000000, 0x40300000,
+ // 0x00000000, 0x3ff00000
+ masm.unpcklpd(xmm0, xmm0);
+ masm.movdqu(xmm4, recordExternalAddress(crb, signMask)); // 0x00000000, 0x80000000,
+ // 0x00000000, 0x80000000
+ masm.andpd(xmm4, xmm0);
+ masm.movdqu(xmm1, recordExternalAddress(crb, pi32Inv)); // 0x6dc9c883, 0x3fe45f30,
+ // 0x6dc9c883, 0x40245f30
+ masm.mulpd(xmm1, xmm0);
+ masm.por(xmm5, xmm4);
+ masm.addpd(xmm1, xmm5);
+ masm.movdqu(xmm7, xmm1);
+ masm.unpckhpd(xmm7, xmm7);
+ masm.cvttsd2sil(rdx, xmm7);
+ masm.cvttpd2dq(xmm1, xmm1);
+ masm.cvtdq2pd(xmm1, xmm1);
+ masm.mulpd(xmm1, xmm6);
+ masm.movdqu(xmm3, recordExternalAddress(crb, p1)); // 0x54444000, 0x3fb921fb,
+ // 0x54440000, 0x3fb921fb
+ masm.movq(xmm5, recordExternalAddress(crb, qq2)); // 0x676733af, 0x3d32e7b9
+ masm.addq(rdx, 469248);
+ masm.movdqu(xmm4, recordExternalAddress(crb, p2)); // 0x67674000, 0xbd32e7b9,
+ // 0x4c4c0000, 0x3d468c23
+ masm.mulpd(xmm3, xmm1);
+ masm.andq(rdx, 31);
+ masm.mulsd(xmm5, xmm1);
+ masm.movq(rcx, rdx);
+ masm.mulpd(xmm4, xmm1);
+ masm.shlq(rcx, 1);
+ masm.subpd(xmm0, xmm3);
+ masm.mulpd(xmm1, recordExternalAddress(crb, p3)); // 0x3707344a, 0x3aa8a2e0,
+ // 0x03707345, 0x3ae98a2e
+ masm.addq(rdx, rcx);
+ masm.shlq(rcx, 2);
+ masm.addq(rdx, rcx);
+ masm.addsd(xmm5, xmm0);
+ masm.movdqu(xmm2, xmm0);
+ masm.subpd(xmm0, xmm4);
+ masm.movq(xmm6, recordExternalAddress(crb, one)); // 0x00000000, 0x3ff00000
+ masm.shlq(rdx, 4);
+ masm.leaq(rax, recordExternalAddress(crb, ctable));
+ masm.andpd(xmm5, recordExternalAddress(crb, mask35)); // 0xfffc0000, 0xffffffff,
+ // 0x00000000, 0x00000000
+ masm.movdqu(xmm3, xmm0);
+ masm.addq(rax, rdx);
+ masm.subpd(xmm2, xmm0);
+ masm.unpckhpd(xmm0, xmm0);
+ masm.divsd(xmm6, xmm5);
+ masm.subpd(xmm2, xmm4);
+ masm.movdqu(xmm7, new AMD64Address(rax, 16));
+ masm.subsd(xmm3, xmm5);
+ masm.mulpd(xmm7, xmm0);
+ masm.subpd(xmm2, xmm1);
+ masm.movdqu(xmm1, new AMD64Address(rax, 48));
+ masm.mulpd(xmm1, xmm0);
+ masm.movdqu(xmm4, new AMD64Address(rax, 96));
+ masm.mulpd(xmm4, xmm0);
+ masm.addsd(xmm2, xmm3);
+ masm.movdqu(xmm3, xmm0);
+ masm.mulpd(xmm0, xmm0);
+ masm.addpd(xmm7, new AMD64Address(rax, 0));
+ masm.addpd(xmm1, new AMD64Address(rax, 32));
+ masm.mulpd(xmm1, xmm0);
+ masm.addpd(xmm4, new AMD64Address(rax, 80));
+ masm.addpd(xmm7, xmm1);
+ masm.movdqu(xmm1, new AMD64Address(rax, 112));
+ masm.mulpd(xmm1, xmm0);
+ masm.mulpd(xmm0, xmm0);
+ masm.addpd(xmm4, xmm1);
+ masm.movdqu(xmm1, new AMD64Address(rax, 64));
+ masm.mulpd(xmm1, xmm0);
+ masm.addpd(xmm7, xmm1);
+ masm.movdqu(xmm1, xmm3);
+ masm.mulpd(xmm3, xmm0);
+ masm.mulsd(xmm0, xmm0);
+ masm.mulpd(xmm1, new AMD64Address(rax, 144));
+ masm.mulpd(xmm4, xmm3);
+ masm.movdqu(xmm3, xmm1);
+ masm.addpd(xmm7, xmm4);
+ masm.movdqu(xmm4, xmm1);
+ masm.mulsd(xmm0, xmm7);
+ masm.unpckhpd(xmm7, xmm7);
+ masm.addsd(xmm0, xmm7);
+ masm.unpckhpd(xmm1, xmm1);
+ masm.addsd(xmm3, xmm1);
+ masm.subsd(xmm4, xmm3);
+ masm.addsd(xmm1, xmm4);
+ masm.movdqu(xmm4, xmm2);
+ masm.movq(xmm7, new AMD64Address(rax, 144));
+ masm.unpckhpd(xmm2, xmm2);
+ masm.addsd(xmm7, new AMD64Address(rax, 152));
+ masm.mulsd(xmm7, xmm2);
+ masm.addsd(xmm7, new AMD64Address(rax, 136));
+ masm.addsd(xmm7, xmm1);
+ masm.addsd(xmm0, xmm7);
+ masm.movq(xmm7, recordExternalAddress(crb, one)); // 0x00000000, 0x3ff00000
+ masm.mulsd(xmm4, xmm6);
+ masm.movq(xmm2, new AMD64Address(rax, 168));
+ masm.andpd(xmm2, xmm6);
+ masm.mulsd(xmm5, xmm2);
+ masm.mulsd(xmm6, new AMD64Address(rax, 160));
+ masm.subsd(xmm7, xmm5);
+ masm.subsd(xmm2, new AMD64Address(rax, 128));
+ masm.subsd(xmm7, xmm4);
+ masm.mulsd(xmm7, xmm6);
+ masm.movdqu(xmm4, xmm3);
+ masm.subsd(xmm3, xmm2);
+ masm.addsd(xmm2, xmm3);
+ masm.subsd(xmm4, xmm2);
+ masm.addsd(xmm0, xmm4);
+ masm.subsd(xmm0, xmm7);
+ masm.addsd(xmm0, xmm3);
+ masm.jmp(block14);
+
+ masm.bind(block0);
+ masm.jcc(AMD64Assembler.ConditionFlag.Greater, block1);
+ masm.pextrw(rax, xmm0, 3);
+ masm.movl(rdx, rax);
+ masm.andl(rax, 32752);
+ masm.jcc(AMD64Assembler.ConditionFlag.Equal, block2);
+ masm.andl(rdx, 32767);
+ masm.cmpl(rdx, 15904);
+ masm.jcc(AMD64Assembler.ConditionFlag.Below, block3);
+ masm.movdqu(xmm2, xmm0);
+ masm.movdqu(xmm3, xmm0);
+ masm.movq(xmm1, recordExternalAddress(crb, q11)); // 0xb8fe4d77, 0x3f82609a
+ masm.mulsd(xmm2, xmm0);
+ masm.mulsd(xmm3, xmm2);
+ masm.mulsd(xmm1, xmm2);
+ masm.addsd(xmm1, recordExternalAddress(crb, q9)); // 0xbf847a43, 0x3f9664a0
+ masm.mulsd(xmm1, xmm2);
+ masm.addsd(xmm1, recordExternalAddress(crb, q7)); // 0x52c4c8ab, 0x3faba1ba
+ masm.mulsd(xmm1, xmm2);
+ masm.addsd(xmm1, recordExternalAddress(crb, q5)); // 0x11092746, 0x3fc11111
+ masm.mulsd(xmm1, xmm2);
+ masm.addsd(xmm1, recordExternalAddress(crb, q3)); // 0x55555612, 0x3fd55555
+ masm.mulsd(xmm1, xmm3);
+ masm.addsd(xmm0, xmm1);
+ masm.jmp(block14);
+
+ masm.bind(block3);
+ masm.movq(xmm3, recordExternalAddress(crb, twoPow55)); // 0x00000000, 0x43600000
+ masm.mulsd(xmm3, xmm0);
+ masm.addsd(xmm0, xmm3);
+ masm.mulsd(xmm0, recordExternalAddress(crb, twoPowM55)); // 0x00000000, 0x3c800000
+ masm.jmp(block14);
+
+ masm.bind(block2);
+ masm.movdqu(xmm1, xmm0);
+ masm.mulsd(xmm1, xmm1);
+ masm.jmp(block14);
+
+ masm.bind(block1);
+ masm.pextrw(rax, xmm0, 3);
+ masm.andl(rax, 32752);
+ masm.cmpl(rax, 32752);
+ masm.jcc(AMD64Assembler.ConditionFlag.Equal, block4);
+ masm.pextrw(rcx, xmm0, 3);
+ masm.andl(rcx, 32752);
+ masm.subl(rcx, 16224);
+ masm.shrl(rcx, 7);
+ masm.andl(rcx, 65532);
+ masm.leaq(r11, recordExternalAddress(crb, piInvTable));
+ masm.addq(rcx, r11);
+ masm.movdq(rax, xmm0);
+ masm.movl(r10, new AMD64Address(rcx, 20));
+ masm.movl(r8, new AMD64Address(rcx, 24));
+ masm.movl(rdx, rax);
+ masm.shrq(rax, 21);
+ masm.orl(rax, Integer.MIN_VALUE);
+ masm.shrl(rax, 11);
+ masm.movl(r9, r10);
+ masm.imulq(r10, rdx);
+ masm.imulq(r9, rax);
+ masm.imulq(r8, rax);
+ masm.movl(rsi, new AMD64Address(rcx, 16));
+ masm.movl(rdi, new AMD64Address(rcx, 12));
+ masm.movl(r11, r10);
+ masm.shrq(r10, 32);
+ masm.addq(r9, r10);
+ masm.addq(r11, r8);
+ masm.movl(r8, r11);
+ masm.shrq(r11, 32);
+ masm.addq(r9, r11);
+ masm.movl(r10, rsi);
+ masm.imulq(rsi, rdx);
+ masm.imulq(r10, rax);
+ masm.movl(r11, rdi);
+ masm.imulq(rdi, rdx);
+ masm.movl(rbx, rsi);
+ masm.shrq(rsi, 32);
+ masm.addq(r9, rbx);
+ masm.movl(rbx, r9);
+ masm.shrq(r9, 32);
+ masm.addq(r10, rsi);
+ masm.addq(r10, r9);
+ masm.shlq(rbx, 32);
+ masm.orq(r8, rbx);
+ masm.imulq(r11, rax);
+ masm.movl(r9, new AMD64Address(rcx, 8));
+ masm.movl(rsi, new AMD64Address(rcx, 4));
+ masm.movl(rbx, rdi);
+ masm.shrq(rdi, 32);
+ masm.addq(r10, rbx);
+ masm.movl(rbx, r10);
+ masm.shrq(r10, 32);
+ masm.addq(r11, rdi);
+ masm.addq(r11, r10);
+ masm.movq(rdi, r9);
+ masm.imulq(r9, rdx);
+ masm.imulq(rdi, rax);
+ masm.movl(r10, r9);
+ masm.shrq(r9, 32);
+ masm.addq(r11, r10);
+ masm.movl(r10, r11);
+ masm.shrq(r11, 32);
+ masm.addq(rdi, r9);
+ masm.addq(rdi, r11);
+ masm.movq(r9, rsi);
+ masm.imulq(rsi, rdx);
+ masm.imulq(r9, rax);
+ masm.shlq(r10, 32);
+ masm.orq(r10, rbx);
+ masm.movl(rax, new AMD64Address(rcx, 0));
+ masm.movl(r11, rsi);
+ masm.shrq(rsi, 32);
+ masm.addq(rdi, r11);
+ masm.movl(r11, rdi);
+ masm.shrq(rdi, 32);
+ masm.addq(r9, rsi);
+ masm.addq(r9, rdi);
+ masm.imulq(rdx, rax);
+ masm.pextrw(rbx, xmm0, 3);
+ masm.leaq(rdi, recordExternalAddress(crb, piInvTable));
+ masm.subq(rcx, rdi);
+ masm.addl(rcx, rcx);
+ masm.addl(rcx, rcx);
+ masm.addl(rcx, rcx);
+ masm.addl(rcx, 19);
+ masm.movl(rsi, 32768);
+ masm.andl(rsi, rbx);
+ masm.shrl(rbx, 4);
+ masm.andl(rbx, 2047);
+ masm.subl(rbx, 1023);
+ masm.subl(rcx, rbx);
+ masm.addq(r9, rdx);
+ masm.movl(rdx, rcx);
+ masm.addl(rdx, 32);
+ masm.cmpl(rcx, 0);
+ masm.jcc(AMD64Assembler.ConditionFlag.Less, block5);
+ masm.negl(rcx);
+ masm.addl(rcx, 29);
+ masm.shll(r9);
+ masm.movl(rdi, r9);
+ masm.andl(r9, 1073741823);
+ masm.testl(r9, 536870912);
+ masm.jcc(AMD64Assembler.ConditionFlag.NotEqual, block6);
+ masm.shrl(r9);
+ masm.movl(rbx, 0);
+ masm.shlq(r9, 32);
+ masm.orq(r9, r11);
+
+ masm.bind(block7);
+
+ masm.bind(block8);
+ masm.cmpq(r9, 0);
+ masm.jcc(AMD64Assembler.ConditionFlag.Equal, block9);
+
+ masm.bind(block10);
+ masm.bsrq(r11, r9);
+ masm.movl(rcx, 29);
+ masm.subl(rcx, r11);
+ masm.jcc(AMD64Assembler.ConditionFlag.LessEqual, block11);
+ masm.shlq(r9);
+ masm.movq(rax, r10);
+ masm.shlq(r10);
+ masm.addl(rdx, rcx);
+ masm.negl(rcx);
+ masm.addl(rcx, 64);
+ masm.shrq(rax);
+ masm.shrq(r8);
+ masm.orq(r9, rax);
+ masm.orq(r10, r8);
+
+ masm.bind(block12);
+ masm.cvtsi2sdq(xmm0, r9);
+ masm.shrq(r10, 1);
+ masm.cvtsi2sdq(xmm3, r10);
+ masm.xorpd(xmm4, xmm4);
+ masm.shll(rdx, 4);
+ masm.negl(rdx);
+ masm.addl(rdx, 16368);
+ masm.orl(rdx, rsi);
+ masm.xorl(rdx, rbx);
+ masm.pinsrw(xmm4, rdx, 3);
+ masm.movq(xmm2, recordExternalAddress(crb, pi4)); // 0x00000000, 0x3fe921fb,
+ // 0x4611a626, 0x3e85110b
+ masm.movq(xmm7, recordExternalAddress(crb, pi48)); // 0x3fe921fb, 0x4611a626,
+ // 0x3e85110b
+ masm.xorpd(xmm5, xmm5);
+ masm.subl(rdx, 1008);
+ masm.pinsrw(xmm5, rdx, 3);
+ masm.mulsd(xmm0, xmm4);
+ masm.shll(rsi, 16);
+ masm.sarl(rsi, 31);
+ masm.mulsd(xmm3, xmm5);
+ masm.movdqu(xmm1, xmm0);
+ masm.mulsd(xmm0, xmm2);
+ masm.shrl(rdi, 30);
+ masm.addsd(xmm1, xmm3);
+ masm.mulsd(xmm3, xmm2);
+ masm.addl(rdi, rsi);
+ masm.xorl(rdi, rsi);
+ masm.mulsd(xmm7, xmm1);
+ masm.movl(rax, rdi);
+ masm.addsd(xmm7, xmm3);
+ masm.movdqu(xmm2, xmm0);
+ masm.addsd(xmm0, xmm7);
+ masm.subsd(xmm2, xmm0);
+ masm.addsd(xmm7, xmm2);
+ masm.movdqu(xmm1, recordExternalAddress(crb, pi32Inv)); // 0x6dc9c883, 0x3fe45f30,
+ // 0x6dc9c883, 0x40245f30
+ if (masm.supports(AMD64.CPUFeature.SSE3)) {
+ masm.movddup(xmm0, xmm0);
+ } else {
+ masm.movlhps(xmm0, xmm0);
+ }
+ masm.movdqu(xmm4, recordExternalAddress(crb, signMask)); // 0x00000000, 0x80000000,
+ // 0x00000000, 0x80000000
+ masm.andpd(xmm4, xmm0);
+ masm.mulpd(xmm1, xmm0);
+ if (masm.supports(AMD64.CPUFeature.SSE3)) {
+ masm.movddup(xmm7, xmm7);
+ } else {
+ masm.movlhps(xmm7, xmm7);
+ }
+ masm.movdqu(xmm5, recordExternalAddress(crb, onehalf)); // 0x00000000, 0x3fe00000,
+ // 0x00000000, 0x3fe00000
+ masm.movdqu(xmm6, recordExternalAddress(crb, mul16)); // 0x00000000, 0x40300000,
+ // 0x00000000, 0x3ff00000
+ masm.por(xmm5, xmm4);
+ masm.addpd(xmm1, xmm5);
+ masm.movdqu(xmm5, xmm1);
+ masm.unpckhpd(xmm5, xmm5);
+ masm.cvttsd2sil(rdx, xmm5);
+ masm.cvttpd2dq(xmm1, xmm1);
+ masm.cvtdq2pd(xmm1, xmm1);
+ masm.mulpd(xmm1, xmm6);
+ masm.movdqu(xmm3, recordExternalAddress(crb, p1)); // 0x54444000, 0x3fb921fb,
+ // 0x54440000, 0x3fb921fb
+ masm.movq(xmm5, recordExternalAddress(crb, qq2)); // 0x676733af, 0x3d32e7b9
+ masm.shll(rax, 4);
+ masm.addl(rdx, 469248);
+ masm.movdqu(xmm4, recordExternalAddress(crb, p2)); // 0x67674000, 0xbd32e7b9,
+ // 0x4c4c0000, 0x3d468c23
+ masm.mulpd(xmm3, xmm1);
+ masm.addl(rdx, rax);
+ masm.andl(rdx, 31);
+ masm.mulsd(xmm5, xmm1);
+ masm.movl(rcx, rdx);
+ masm.mulpd(xmm4, xmm1);
+ masm.shll(rcx, 1);
+ masm.subpd(xmm0, xmm3);
+ masm.mulpd(xmm1, recordExternalAddress(crb, p3)); // 0x3707344a, 0x3aa8a2e0,
+ // 0x03707345, 0x3ae98a2e
+ masm.addl(rdx, rcx);
+ masm.shll(rcx, 2);
+ masm.addl(rdx, rcx);
+ masm.addsd(xmm5, xmm0);
+ masm.movdqu(xmm2, xmm0);
+ masm.subpd(xmm0, xmm4);
+ masm.movq(xmm6, recordExternalAddress(crb, one)); // 0x00000000, 0x3ff00000
+ masm.shll(rdx, 4);
+ masm.leaq(rax, recordExternalAddress(crb, ctable));
+ masm.andpd(xmm5, recordExternalAddress(crb, mask35)); // 0xfffc0000, 0xffffffff,
+ // 0x00000000, 0x00000000
+ masm.movdqu(xmm3, xmm0);
+ masm.addq(rax, rdx);
+ masm.subpd(xmm2, xmm0);
+ masm.unpckhpd(xmm0, xmm0);
+ masm.divsd(xmm6, xmm5);
+ masm.subpd(xmm2, xmm4);
+ masm.subsd(xmm3, xmm5);
+ masm.subpd(xmm2, xmm1);
+ masm.movdqu(xmm1, new AMD64Address(rax, 48));
+ masm.addpd(xmm2, xmm7);
+ masm.movdqu(xmm7, new AMD64Address(rax, 16));
+ masm.mulpd(xmm7, xmm0);
+ masm.movdqu(xmm4, new AMD64Address(rax, 96));
+ masm.mulpd(xmm1, xmm0);
+ masm.mulpd(xmm4, xmm0);
+ masm.addsd(xmm2, xmm3);
+ masm.movdqu(xmm3, xmm0);
+ masm.mulpd(xmm0, xmm0);
+ masm.addpd(xmm7, new AMD64Address(rax, 0));
+ masm.addpd(xmm1, new AMD64Address(rax, 32));
+ masm.mulpd(xmm1, xmm0);
+ masm.addpd(xmm4, new AMD64Address(rax, 80));
+ masm.addpd(xmm7, xmm1);
+ masm.movdqu(xmm1, new AMD64Address(rax, 112));
+ masm.mulpd(xmm1, xmm0);
+ masm.mulpd(xmm0, xmm0);
+ masm.addpd(xmm4, xmm1);
+ masm.movdqu(xmm1, new AMD64Address(rax, 64));
+ masm.mulpd(xmm1, xmm0);
+ masm.addpd(xmm7, xmm1);
+ masm.movdqu(xmm1, xmm3);
+ masm.mulpd(xmm3, xmm0);
+ masm.mulsd(xmm0, xmm0);
+ masm.mulpd(xmm1, new AMD64Address(rax, 144));
+ masm.mulpd(xmm4, xmm3);
+ masm.movdqu(xmm3, xmm1);
+ masm.addpd(xmm7, xmm4);
+ masm.movdqu(xmm4, xmm1);
+ masm.mulsd(xmm0, xmm7);
+ masm.unpckhpd(xmm7, xmm7);
+ masm.addsd(xmm0, xmm7);
+ masm.unpckhpd(xmm1, xmm1);
+ masm.addsd(xmm3, xmm1);
+ masm.subsd(xmm4, xmm3);
+ masm.addsd(xmm1, xmm4);
+ masm.movdqu(xmm4, xmm2);
+ masm.movq(xmm7, new AMD64Address(rax, 144));
+ masm.unpckhpd(xmm2, xmm2);
+ masm.addsd(xmm7, new AMD64Address(rax, 152));
+ masm.mulsd(xmm7, xmm2);
+ masm.addsd(xmm7, new AMD64Address(rax, 136));
+ masm.addsd(xmm7, xmm1);
+ masm.addsd(xmm0, xmm7);
+ masm.movq(xmm7, recordExternalAddress(crb, one)); // 0x00000000, 0x3ff00000
+ masm.mulsd(xmm4, xmm6);
+ masm.movq(xmm2, new AMD64Address(rax, 168));
+ masm.andpd(xmm2, xmm6);
+ masm.mulsd(xmm5, xmm2);
+ masm.mulsd(xmm6, new AMD64Address(rax, 160));
+ masm.subsd(xmm7, xmm5);
+ masm.subsd(xmm2, new AMD64Address(rax, 128));
+ masm.subsd(xmm7, xmm4);
+ masm.mulsd(xmm7, xmm6);
+ masm.movdqu(xmm4, xmm3);
+ masm.subsd(xmm3, xmm2);
+ masm.addsd(xmm2, xmm3);
+ masm.subsd(xmm4, xmm2);
+ masm.addsd(xmm0, xmm4);
+ masm.subsd(xmm0, xmm7);
+ masm.addsd(xmm0, xmm3);
+ masm.jmp(block14);
+
+ masm.bind(block9);
+ masm.addl(rdx, 64);
+ masm.movq(r9, r10);
+ masm.movq(r10, r8);
+ masm.movl(r8, 0);
+ masm.cmpq(r9, 0);
+ masm.jcc(AMD64Assembler.ConditionFlag.NotEqual, block10);
+ masm.addl(rdx, 64);
+ masm.movq(r9, r10);
+ masm.movq(r10, r8);
+ masm.cmpq(r9, 0);
+ masm.jcc(AMD64Assembler.ConditionFlag.NotEqual, block10);
+ masm.jmp(block12);
+
+ masm.bind(block11);
+ masm.jcc(AMD64Assembler.ConditionFlag.Equal, block12);
+ masm.negl(rcx);
+ masm.shrq(r10);
+ masm.movq(rax, r9);
+ masm.shrq(r9);
+ masm.subl(rdx, rcx);
+ masm.negl(rcx);
+ masm.addl(rcx, 64);
+ masm.shlq(rax);
+ masm.orq(r10, rax);
+ masm.jmp(block12);
+
+ masm.bind(block5);
+ masm.notl(rcx);
+ masm.shlq(r9, 32);
+ masm.orq(r9, r11);
+ masm.shlq(r9);
+ masm.movq(rdi, r9);
+ masm.testl(r9, Integer.MIN_VALUE);
+ masm.jcc(AMD64Assembler.ConditionFlag.NotEqual, block13);
+ masm.shrl(r9);
+ masm.movl(rbx, 0);
+ masm.shrq(rdi, 2);
+ masm.jmp(block8);
+
+ masm.bind(block6);
+ masm.shrl(r9);
+ masm.movl(rbx, 1073741824);
+ masm.shrl(rbx);
+ masm.shlq(r9, 32);
+ masm.orq(r9, r11);
+ masm.shlq(rbx, 32);
+ masm.addl(rdi, 1073741824);
+ masm.movl(rcx, 0);
+ masm.movl(r11, 0);
+ masm.subq(rcx, r8);
+ masm.sbbq(r11, r10);
+ masm.sbbq(rbx, r9);
+ masm.movq(r8, rcx);
+ masm.movq(r10, r11);
+ masm.movq(r9, rbx);
+ masm.movl(rbx, 32768);
+ masm.jmp(block7);
+
+ masm.bind(block13);
+ masm.shrl(r9);
+ masm.movq(rbx, 0x100000000L);
+ masm.shrq(rbx);
+ masm.movl(rcx, 0);
+ masm.movl(r11, 0);
+ masm.subq(rcx, r8);
+ masm.sbbq(r11, r10);
+ masm.sbbq(rbx, r9);
+ masm.movq(r8, rcx);
+ masm.movq(r10, r11);
+ masm.movq(r9, rbx);
+ masm.movl(rbx, 32768);
+ masm.shrq(rdi, 2);
+ masm.addl(rdi, 1073741824);
+ masm.jmp(block8);
+
+ masm.bind(block4);
+ masm.movq(xmm0, new AMD64Address(rsp, 8));
+ masm.mulsd(xmm0, recordExternalAddress(crb, negZero)); // 0x00000000, 0x80000000
+ masm.movq(new AMD64Address(rsp, 0), xmm0);
+
+ masm.bind(block14);
+ masm.addq(rsp, 16);
+ masm.pop(rbx);
+ }
+}
--- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir.amd64/src/org/graalvm/compiler/lir/amd64/AMD64Move.java Tue Mar 12 09:49:10 2019 +0000
+++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir.amd64/src/org/graalvm/compiler/lir/amd64/AMD64Move.java Sat Mar 16 21:00:45 2019 +0000
@@ -698,7 +698,7 @@
if (crb.mustReplaceWithNullRegister(input)) {
masm.movq(result, crb.nullRegister);
} else {
- masm.movq(result, 0x0L);
+ masm.movslq(result, 0);
}
} else if (crb.target.inlineObjects) {
crb.recordInlineDataInCode(input);
--- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir.jtt/src/org/graalvm/compiler/lir/jtt/SPARCBranchBailoutTest.java Tue Mar 12 09:49:10 2019 +0000
+++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir.jtt/src/org/graalvm/compiler/lir/jtt/SPARCBranchBailoutTest.java Sat Mar 16 21:00:45 2019 +0000
@@ -25,17 +25,15 @@
package org.graalvm.compiler.lir.jtt;
import org.graalvm.compiler.api.directives.GraalDirectives;
-import org.graalvm.compiler.core.common.PermanentBailoutException;
+import org.graalvm.compiler.asm.BranchTargetOutOfBoundsException;
import org.graalvm.compiler.debug.DebugContext;
import org.graalvm.compiler.debug.DebugContext.Scope;
-import org.graalvm.compiler.debug.GraalError;
import org.graalvm.compiler.lir.LIRInstruction;
import org.graalvm.compiler.lir.LIRInstructionClass;
import org.graalvm.compiler.lir.asm.CompilationResultBuilder;
import org.graalvm.compiler.lir.gen.LIRGeneratorTool;
import org.graalvm.compiler.nodes.StructuredGraph;
import org.graalvm.compiler.nodes.StructuredGraph.AllowAssumptions;
-import org.junit.Assert;
import org.junit.Assume;
import org.junit.Test;
@@ -82,18 +80,14 @@
}
@SuppressWarnings("try")
- @Test
+ @Test(expected = BranchTargetOutOfBoundsException.class)
public void testBailoutOnBranchOverflow() throws Throwable {
Assume.assumeTrue(getBackend().getTarget().arch instanceof SPARC);
ResolvedJavaMethod m = getResolvedJavaMethod("testBranch");
DebugContext debug = getDebugContext();
- try {
- try (Scope s = debug.disable()) {
- StructuredGraph graph = parseEager(m, AllowAssumptions.YES, debug);
- compile(m, graph);
- }
- } catch (GraalError e) {
- Assert.assertEquals(PermanentBailoutException.class, e.getCause().getClass());
+ try (Scope s = debug.disable()) {
+ StructuredGraph graph = parseEager(m, AllowAssumptions.YES, debug);
+ compile(m, graph);
}
}
--- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir/src/org/graalvm/compiler/lir/LIR.java Tue Mar 12 09:49:10 2019 +0000
+++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir/src/org/graalvm/compiler/lir/LIR.java Sat Mar 16 21:00:45 2019 +0000
@@ -28,12 +28,14 @@
import java.util.Arrays;
import java.util.List;
+import org.graalvm.compiler.asm.Label;
import org.graalvm.compiler.core.common.cfg.AbstractBlockBase;
import org.graalvm.compiler.core.common.cfg.AbstractControlFlowGraph;
import org.graalvm.compiler.core.common.cfg.BlockMap;
import org.graalvm.compiler.debug.DebugContext;
import org.graalvm.compiler.lir.StandardOp.BlockEndOp;
import org.graalvm.compiler.lir.StandardOp.LabelOp;
+import org.graalvm.compiler.lir.StandardOp.LabelHoldingOp;
import org.graalvm.compiler.lir.gen.LIRGenerator;
import org.graalvm.compiler.options.OptionValues;
@@ -233,8 +235,11 @@
continue;
}
for (LIRInstruction inst : lirInstructions.get(block)) {
- if (inst instanceof LabelOp) {
- ((LabelOp) inst).getLabel().reset();
+ if (inst instanceof LabelHoldingOp) {
+ Label label = ((LabelHoldingOp) inst).getLabel();
+ if (label != null) {
+ label.reset();
+ }
}
}
}
--- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir/src/org/graalvm/compiler/lir/LIRValueUtil.java Tue Mar 12 09:49:10 2019 +0000
+++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir/src/org/graalvm/compiler/lir/LIRValueUtil.java Sat Mar 16 21:00:45 2019 +0000
@@ -71,6 +71,11 @@
return asConstantValue(value).getJavaConstant();
}
+ public static boolean isNullConstant(Value value) {
+ assert value != null;
+ return isJavaConstant(value) && asJavaConstant(value).isNull();
+ }
+
public static boolean isIntConstant(Value value, long expected) {
if (isJavaConstant(value)) {
JavaConstant javaConstant = asJavaConstant(value);
--- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir/src/org/graalvm/compiler/lir/StandardOp.java Tue Mar 12 09:49:10 2019 +0000
+++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir/src/org/graalvm/compiler/lir/StandardOp.java Sat Mar 16 21:00:45 2019 +0000
@@ -70,10 +70,14 @@
boolean makeNullCheckFor(Value value, LIRFrameState nullCheckState, int implicitNullCheckLimit);
}
+ public interface LabelHoldingOp {
+ Label getLabel();
+ }
+
/**
* LIR operation that defines the position of a label.
*/
- public static final class LabelOp extends LIRInstruction {
+ public static final class LabelOp extends LIRInstruction implements LabelHoldingOp {
public static final LIRInstructionClass<LabelOp> TYPE = LIRInstructionClass.create(LabelOp.class);
public static final EnumSet<OperandFlag> incomingFlags = EnumSet.of(REG, STACK);
@@ -155,6 +159,7 @@
crb.asm.bind(label);
}
+ @Override
public Label getLabel() {
return label;
}
--- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir/src/org/graalvm/compiler/lir/Variable.java Tue Mar 12 09:49:10 2019 +0000
+++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir/src/org/graalvm/compiler/lir/Variable.java Sat Mar 16 21:00:45 2019 +0000
@@ -33,7 +33,7 @@
* Represents a value that is yet to be bound to a machine location (such as a {@link RegisterValue}
* or {@link StackSlot}) by a register allocator.
*/
-public final class Variable extends AllocatableValue {
+public class Variable extends AllocatableValue {
/**
* The identifier of the variable. This is a non-zero index in a contiguous 0-based name space.
--- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir/src/org/graalvm/compiler/lir/alloc/lsra/LinearScanLifetimeAnalysisPhase.java Tue Mar 12 09:49:10 2019 +0000
+++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir/src/org/graalvm/compiler/lir/alloc/lsra/LinearScanLifetimeAnalysisPhase.java Sat Mar 16 21:00:45 2019 +0000
@@ -176,7 +176,7 @@
ValueConsumer useConsumer = (operand, mode, flags) -> {
if (isVariable(operand)) {
- int operandNum = allocator.operandNumber(operand);
+ int operandNum = getOperandNumber(operand);
if (!liveKillScratch.get(operandNum)) {
liveGenScratch.set(operandNum);
if (debug.isLogEnabled()) {
@@ -194,7 +194,7 @@
};
ValueConsumer stateConsumer = (operand, mode, flags) -> {
if (LinearScan.isVariableOrRegister(operand)) {
- int operandNum = allocator.operandNumber(operand);
+ int operandNum = getOperandNumber(operand);
if (!liveKillScratch.get(operandNum)) {
liveGenScratch.set(operandNum);
if (debug.isLogEnabled()) {
@@ -205,7 +205,7 @@
};
ValueConsumer defConsumer = (operand, mode, flags) -> {
if (isVariable(operand)) {
- int varNum = allocator.operandNumber(operand);
+ int varNum = getOperandNumber(operand);
liveKillScratch.set(varNum);
if (debug.isLogEnabled()) {
debug.log("liveKill for operand %d(%s)", varNum, operand);
@@ -268,7 +268,7 @@
*/
if (isRegister(operand)) {
if (allocator.isProcessed(operand)) {
- liveKill.set(allocator.operandNumber(operand));
+ liveKill.set(getOperandNumber(operand));
}
}
}
@@ -281,11 +281,15 @@
*/
if (isRegister(operand) && block != allocator.getLIR().getControlFlowGraph().getStartBlock()) {
if (allocator.isProcessed(operand)) {
- assert liveKill.get(allocator.operandNumber(operand)) : "using fixed register " + asRegister(operand) + " that is not defined in this block " + block;
+ assert liveKill.get(getOperandNumber(operand)) : "using fixed register " + asRegister(operand) + " that is not defined in this block " + block;
}
}
}
+ protected int getOperandNumber(Value operand) {
+ return allocator.operandNumber(operand);
+ }
+
/**
* Performs a backward dataflow analysis to compute global live sets (i.e.
* {@link BlockData#liveIn} and {@link BlockData#liveOut}) for each block.
--- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir/src/org/graalvm/compiler/lir/alloc/lsra/ssa/SSALinearScanLifetimeAnalysisPhase.java Tue Mar 12 09:49:10 2019 +0000
+++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir/src/org/graalvm/compiler/lir/alloc/lsra/ssa/SSALinearScanLifetimeAnalysisPhase.java Sat Mar 16 21:00:45 2019 +0000
@@ -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
@@ -24,14 +24,17 @@
package org.graalvm.compiler.lir.alloc.lsra.ssa;
+import java.util.BitSet;
import java.util.EnumSet;
+import org.graalvm.compiler.core.common.cfg.AbstractBlockBase;
import org.graalvm.compiler.debug.DebugContext;
+import org.graalvm.compiler.lir.LIR;
import org.graalvm.compiler.lir.LIRInstruction;
import org.graalvm.compiler.lir.LIRInstruction.OperandFlag;
import org.graalvm.compiler.lir.LIRInstruction.OperandMode;
+import org.graalvm.compiler.lir.StandardOp;
import org.graalvm.compiler.lir.StandardOp.LabelOp;
-import org.graalvm.compiler.lir.ValueConsumer;
import org.graalvm.compiler.lir.alloc.lsra.Interval;
import org.graalvm.compiler.lir.alloc.lsra.Interval.RegisterPriority;
import org.graalvm.compiler.lir.alloc.lsra.LinearScan;
@@ -53,17 +56,39 @@
if (hintAtDef && op instanceof LabelOp) {
LabelOp label = (LabelOp) op;
+ if (!label.isPhiIn()) {
+ return;
+ }
Interval to = allocator.getOrCreateInterval((AllocatableValue) targetValue);
- SSAUtil.forEachPhiRegisterHint(allocator.getLIR(), allocator.blockForId(label.id()), label, targetValue, mode, (ValueConsumer) (registerHint, valueMode, valueFlags) -> {
- if (LinearScan.isVariableOrRegister(registerHint)) {
- Interval from = allocator.getOrCreateInterval((AllocatableValue) registerHint);
+ LIR lir = allocator.getLIR();
+ AbstractBlockBase<?> block = allocator.blockForId(label.id());
+ assert mode == OperandMode.DEF : "Wrong operand mode: " + mode;
+ assert lir.getLIRforBlock(block).get(0).equals(label) : String.format("Block %s and Label %s do not match!", block, label);
+
+ int idx = SSAUtil.indexOfValue(label, targetValue);
+ assert idx >= 0 : String.format("Value %s not in label %s", targetValue, label);
+
+ BitSet blockLiveIn = allocator.getBlockData(block).liveIn;
- setHint(debug, op, to, from);
- setHint(debug, op, from, to);
+ AbstractBlockBase<?> selectedPredecessor = null;
+ AllocatableValue selectedSource = null;
+ for (AbstractBlockBase<?> pred : block.getPredecessors()) {
+ if (selectedPredecessor == null || pred.getRelativeFrequency() > selectedPredecessor.getRelativeFrequency()) {
+ StandardOp.JumpOp jump = SSAUtil.phiOut(lir, pred);
+ Value sourceValue = jump.getOutgoingValue(idx);
+ if (LinearScan.isVariableOrRegister(sourceValue) && !blockLiveIn.get(getOperandNumber(sourceValue))) {
+ selectedSource = (AllocatableValue) sourceValue;
+ selectedPredecessor = pred;
+ }
}
- });
+ }
+ if (selectedSource != null) {
+ Interval from = allocator.getOrCreateInterval(selectedSource);
+ setHint(debug, op, to, from);
+ setHint(debug, op, from, to);
+ }
}
}
--- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir/src/org/graalvm/compiler/lir/asm/CompilationResultBuilder.java Tue Mar 12 09:49:10 2019 +0000
+++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir/src/org/graalvm/compiler/lir/asm/CompilationResultBuilder.java Sat Mar 16 21:00:45 2019 +0000
@@ -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
@@ -38,6 +38,7 @@
import jdk.internal.vm.compiler.collections.Equivalence;
import org.graalvm.compiler.asm.AbstractAddress;
import org.graalvm.compiler.asm.Assembler;
+import org.graalvm.compiler.asm.Label;
import org.graalvm.compiler.code.CompilationResult;
import org.graalvm.compiler.code.CompilationResult.CodeAnnotation;
import org.graalvm.compiler.code.DataSection.Data;
@@ -46,7 +47,6 @@
import org.graalvm.compiler.core.common.cfg.AbstractBlockBase;
import org.graalvm.compiler.core.common.spi.ForeignCallsProvider;
import org.graalvm.compiler.core.common.type.DataPointerConstant;
-import org.graalvm.compiler.debug.Assertions;
import org.graalvm.compiler.debug.DebugContext;
import org.graalvm.compiler.debug.GraalError;
import org.graalvm.compiler.graph.NodeSourcePosition;
@@ -54,12 +54,14 @@
import org.graalvm.compiler.lir.LIRFrameState;
import org.graalvm.compiler.lir.LIRInstruction;
import org.graalvm.compiler.lir.LabelRef;
+import org.graalvm.compiler.lir.StandardOp.LabelHoldingOp;
import org.graalvm.compiler.lir.framemap.FrameMap;
import org.graalvm.compiler.options.Option;
import org.graalvm.compiler.options.OptionKey;
import org.graalvm.compiler.options.OptionType;
import org.graalvm.compiler.options.OptionValues;
+import jdk.vm.ci.code.BailoutException;
import jdk.vm.ci.code.CodeCacheProvider;
import jdk.vm.ci.code.DebugInfo;
import jdk.vm.ci.code.Register;
@@ -155,6 +157,20 @@
private Consumer<LIRInstruction> beforeOp;
private Consumer<LIRInstruction> afterOp;
+ /**
+ * These position maps are used for estimating offsets of forward branches. Used for
+ * architectures where certain branch instructions have limited displacement such as ARM tbz or
+ * SPARC cbcond.
+ */
+ private EconomicMap<Label, Integer> labelBindLirPositions;
+ private EconomicMap<LIRInstruction, Integer> lirPositions;
+ /**
+ * This flag is for setting the
+ * {@link CompilationResultBuilder#labelWithinRange(LIRInstruction, Label, int)} into a
+ * conservative mode and always answering false.
+ */
+ private boolean conservativeLabelOffsets = false;
+
public final boolean mustReplaceWithNullRegister(JavaConstant nullConstant) {
return !nullRegister.equals(Register.None) && JavaConstant.NULL_POINTER.equals(nullConstant);
}
@@ -179,14 +195,6 @@
this.debug = debug;
assert frameContext != null;
this.dataCache = dataCache;
-
- if (dataBuilder.needDetailedPatchingInformation() || Assertions.assertionsEnabled()) {
- /*
- * Always enabled in debug mode, even when the VM does not request detailed information,
- * to increase test coverage.
- */
- asm.setCodePatchingAnnotationConsumer(assemblerCodeAnnotation -> compilationResult.addAnnotation(new AssemblerAnnotation(assemblerCodeAnnotation)));
- }
}
public void setTotalFrameSize(int frameSize) {
@@ -543,6 +551,8 @@
if (op.getPosition() != null) {
crb.recordSourceMapping(start, crb.asm.position(), op.getPosition());
}
+ } catch (BailoutException e) {
+ throw e;
} catch (AssertionError t) {
throw new GraalError(t);
} catch (RuntimeException t) {
@@ -559,6 +569,8 @@
if (dataCache != null) {
dataCache.clear();
}
+ lir = null;
+ currentBlockIndex = 0;
}
public void setOpCallback(Consumer<LIRInstruction> beforeOp, Consumer<LIRInstruction> afterOp) {
@@ -570,4 +582,57 @@
return options;
}
+ /**
+ * Builds up a map for label and LIR instruction positions where labels are or labels pointing
+ * to.
+ */
+ public void buildLabelOffsets(LIR generatedLIR) {
+ labelBindLirPositions = EconomicMap.create(Equivalence.IDENTITY);
+ lirPositions = EconomicMap.create(Equivalence.IDENTITY);
+ int instructionPosition = 0;
+ for (AbstractBlockBase<?> block : generatedLIR.codeEmittingOrder()) {
+ if (block != null) {
+ for (LIRInstruction op : generatedLIR.getLIRforBlock(block)) {
+ if (op instanceof LabelHoldingOp) {
+ Label label = ((LabelHoldingOp) op).getLabel();
+ if (label != null) {
+ labelBindLirPositions.put(label, instructionPosition);
+ }
+ lirPositions.put(op, instructionPosition);
+ }
+ instructionPosition++;
+ }
+ }
+ }
+ }
+
+ /**
+ * Answers the code generator whether the jump from instruction to label is within disp LIR
+ * instructions.
+ *
+ * @param disp Maximum number of LIR instructions between label and instruction
+ */
+ public boolean labelWithinRange(LIRInstruction instruction, Label label, int disp) {
+ if (conservativeLabelOffsets) {
+ return false;
+ }
+ Integer labelPosition = labelBindLirPositions.get(label);
+ Integer instructionPosition = lirPositions.get(instruction);
+ boolean result;
+ if (labelPosition != null && instructionPosition != null) {
+ result = Math.abs(labelPosition - instructionPosition) < disp;
+ } else {
+ result = false;
+ }
+ return result;
+ }
+
+ /**
+ * Sets this CompilationResultBuilder into conservative mode. If set,
+ * {@link CompilationResultBuilder#labelWithinRange(LIRInstruction, Label, int)} always returns
+ * false.
+ */
+ public void setConservativeLabelRanges() {
+ this.conservativeLabelOffsets = true;
+ }
}
--- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir/src/org/graalvm/compiler/lir/asm/DataBuilder.java Tue Mar 12 09:49:10 2019 +0000
+++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir/src/org/graalvm/compiler/lir/asm/DataBuilder.java Sat Mar 16 21:00:45 2019 +0000
@@ -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
@@ -29,13 +29,5 @@
import jdk.vm.ci.meta.Constant;
public abstract class DataBuilder {
-
- /**
- * When the method returns true, then Graal must produce detailed information that allows code
- * patching without decoding instructions, i.e., Graal must produce annotations for the machine
- * code that describe the exact locations of operands within instructions.
- */
- public abstract boolean needDetailedPatchingInformation();
-
public abstract Data createDataItem(Constant c);
}
--- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir/src/org/graalvm/compiler/lir/gen/ArithmeticLIRGenerator.java Tue Mar 12 09:49:10 2019 +0000
+++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir/src/org/graalvm/compiler/lir/gen/ArithmeticLIRGenerator.java Sat Mar 16 21:00:45 2019 +0000
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2009, 2018, 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
@@ -110,4 +110,9 @@
return isAdd ? emitAdd(resultKind, a, b, setFlags) : emitSub(resultKind, a, b, setFlags);
}
+ public Value emitRor(Value value, Value distance) {
+ // (value >>> distance) | (value << -distance)
+ return emitOr(emitUShr(value, distance), emitShl(value, emitNegate(distance)));
+ }
+
}
--- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir/src/org/graalvm/compiler/lir/gen/LIRGenerator.java Tue Mar 12 09:49:10 2019 +0000
+++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir/src/org/graalvm/compiler/lir/gen/LIRGenerator.java Sat Mar 16 21:00:45 2019 +0000
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2009, 2018, 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
@@ -35,8 +35,8 @@
import java.util.ArrayList;
import java.util.List;
+import java.util.Optional;
-import jdk.vm.ci.code.RegisterConfig;
import org.graalvm.compiler.asm.Label;
import org.graalvm.compiler.core.common.LIRKind;
import org.graalvm.compiler.core.common.calc.Condition;
@@ -59,6 +59,7 @@
import org.graalvm.compiler.lir.StandardOp.BlockEndOp;
import org.graalvm.compiler.lir.StandardOp.LabelOp;
import org.graalvm.compiler.lir.StandardOp.SaveRegistersOp;
+import org.graalvm.compiler.lir.hashing.Hasher;
import org.graalvm.compiler.lir.SwitchStrategy;
import org.graalvm.compiler.lir.Variable;
import org.graalvm.compiler.options.Option;
@@ -70,6 +71,7 @@
import jdk.vm.ci.code.CodeCacheProvider;
import jdk.vm.ci.code.Register;
import jdk.vm.ci.code.RegisterAttributes;
+import jdk.vm.ci.code.RegisterConfig;
import jdk.vm.ci.code.StackSlot;
import jdk.vm.ci.code.TargetDescription;
import jdk.vm.ci.meta.AllocatableValue;
@@ -449,29 +451,51 @@
@Override
public void emitStrategySwitch(JavaConstant[] keyConstants, double[] keyProbabilities, LabelRef[] keyTargets, LabelRef defaultTarget, Variable value) {
+ SwitchStrategy strategy = SwitchStrategy.getBestStrategy(keyProbabilities, keyConstants, keyTargets);
+
int keyCount = keyConstants.length;
- SwitchStrategy strategy = SwitchStrategy.getBestStrategy(keyProbabilities, keyConstants, keyTargets);
+ double minDensity = 1 / Math.sqrt(strategy.getAverageEffort());
+ Optional<Hasher> hasher = hasherFor(keyConstants, minDensity);
+ double hashTableSwitchDensity = hasher.map(h -> keyCount / (double) h.cardinality()).orElse(0d);
long valueRange = keyConstants[keyCount - 1].asLong() - keyConstants[0].asLong() + 1;
double tableSwitchDensity = keyCount / (double) valueRange;
+
/*
* This heuristic tries to find a compromise between the effort for the best switch strategy
* and the density of a tableswitch. If the effort for the strategy is at least 4, then a
* tableswitch is preferred if better than a certain value that starts at 0.5 and lowers
* gradually with additional effort.
*/
- if (strategy.getAverageEffort() < 4 || tableSwitchDensity < (1 / Math.sqrt(strategy.getAverageEffort()))) {
+ if (strategy.getAverageEffort() < 4d || (tableSwitchDensity < minDensity && hashTableSwitchDensity < minDensity)) {
emitStrategySwitch(strategy, value, keyTargets, defaultTarget);
} else {
- int minValue = keyConstants[0].asInt();
- assert valueRange < Integer.MAX_VALUE;
- LabelRef[] targets = new LabelRef[(int) valueRange];
- for (int i = 0; i < valueRange; i++) {
- targets[i] = defaultTarget;
+ if (hashTableSwitchDensity > tableSwitchDensity) {
+ Hasher h = hasher.get();
+ int cardinality = h.cardinality();
+ LabelRef[] targets = new LabelRef[cardinality];
+ JavaConstant[] keys = new JavaConstant[cardinality];
+ for (int i = 0; i < cardinality; i++) {
+ keys[i] = JavaConstant.INT_0;
+ targets[i] = defaultTarget;
+ }
+ for (int i = 0; i < keyCount; i++) {
+ int idx = h.hash(keyConstants[i].asLong());
+ keys[idx] = keyConstants[i];
+ targets[idx] = keyTargets[i];
+ }
+ emitHashTableSwitch(h, keys, defaultTarget, targets, value);
+ } else {
+ int minValue = keyConstants[0].asInt();
+ assert valueRange < Integer.MAX_VALUE;
+ LabelRef[] targets = new LabelRef[(int) valueRange];
+ for (int i = 0; i < valueRange; i++) {
+ targets[i] = defaultTarget;
+ }
+ for (int i = 0; i < keyCount; i++) {
+ targets[keyConstants[i].asInt() - minValue] = keyTargets[i];
+ }
+ emitTableSwitch(minValue, defaultTarget, targets, value);
}
- for (int i = 0; i < keyCount; i++) {
- targets[keyConstants[i].asInt() - minValue] = keyTargets[i];
- }
- emitTableSwitch(minValue, defaultTarget, targets, value);
}
}
@@ -480,6 +504,16 @@
protected abstract void emitTableSwitch(int lowKey, LabelRef defaultTarget, LabelRef[] targets, Value key);
+ @SuppressWarnings("unused")
+ protected Optional<Hasher> hasherFor(JavaConstant[] keyConstants, double minDensity) {
+ return Optional.empty();
+ }
+
+ @SuppressWarnings("unused")
+ protected void emitHashTableSwitch(Hasher hasher, JavaConstant[] keys, LabelRef defaultTarget, LabelRef[] targets, Value value) {
+ throw new UnsupportedOperationException(getClass().getSimpleName() + " doesn't support hash table switches");
+ }
+
@Override
public void beforeRegisterAllocation() {
}
--- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir/src/org/graalvm/compiler/lir/gen/LIRGeneratorTool.java Tue Mar 12 09:49:10 2019 +0000
+++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir/src/org/graalvm/compiler/lir/gen/LIRGeneratorTool.java Sat Mar 16 21:00:45 2019 +0000
@@ -24,6 +24,9 @@
package org.graalvm.compiler.lir.gen;
+import java.util.BitSet;
+import java.util.List;
+
import org.graalvm.compiler.core.common.CompressEncoding;
import org.graalvm.compiler.core.common.LIRKind;
import org.graalvm.compiler.core.common.calc.Condition;
@@ -39,11 +42,13 @@
import org.graalvm.compiler.lir.LabelRef;
import org.graalvm.compiler.lir.SwitchStrategy;
import org.graalvm.compiler.lir.Variable;
+import org.graalvm.compiler.lir.VirtualStackSlot;
import jdk.vm.ci.code.CodeCacheProvider;
import jdk.vm.ci.code.Register;
import jdk.vm.ci.code.RegisterAttributes;
import jdk.vm.ci.code.RegisterConfig;
+import jdk.vm.ci.code.StackSlot;
import jdk.vm.ci.code.TargetDescription;
import jdk.vm.ci.code.ValueKindFactory;
import jdk.vm.ci.meta.AllocatableValue;
@@ -264,6 +269,11 @@
Variable emitArrayEquals(JavaKind kind, Value array1, Value array2, Value length, int constantLength, boolean directPointers);
@SuppressWarnings("unused")
+ default Variable emitArrayEquals(JavaKind kind1, JavaKind kind2, Value array1, Value array2, Value length, int constantLength, boolean directPointers) {
+ throw GraalError.unimplemented("Array.equals with different types substitution is not implemented on this architecture");
+ }
+
+ @SuppressWarnings("unused")
default Variable emitArrayIndexOf(JavaKind kind, boolean findTwoConsecutive, Value sourcePointer, Value sourceCount, Value... searchValues) {
throw GraalError.unimplemented("String.indexOf substitution is not implemented on this architecture");
}
@@ -313,4 +323,21 @@
* after this fence will execute until all previous instructions have retired.
*/
void emitSpeculationFence();
+
+ default VirtualStackSlot allocateStackSlots(int slots, BitSet objects, List<VirtualStackSlot> outObjectStackSlots) {
+ return getResult().getFrameMapBuilder().allocateStackSlots(slots, objects, outObjectStackSlots);
+ }
+
+ default Value emitReadCallerStackPointer(Stamp wordStamp) {
+ /*
+ * We do not know the frame size yet. So we load the address of the first spill slot
+ * relative to the beginning of the frame, which is equivalent to the stack pointer of the
+ * caller.
+ */
+ return emitAddress(StackSlot.get(getLIRKind(wordStamp), 0, true));
+ }
+
+ default Value emitReadReturnAddress(Stamp wordStamp, int returnAddressSize) {
+ return emitMove(StackSlot.get(getLIRKind(wordStamp), -returnAddressSize, true));
+ }
}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir/src/org/graalvm/compiler/lir/hashing/HashFunction.java Sat Mar 16 21:00:45 2019 +0000
@@ -0,0 +1,156 @@
+/*
+ * 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
+ * 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.
+ */
+
+
+package org.graalvm.compiler.lir.hashing;
+
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+import java.util.function.BiFunction;
+import java.util.function.Function;
+
+import org.graalvm.compiler.lir.gen.ArithmeticLIRGenerator;
+
+import jdk.vm.ci.meta.JavaConstant;
+import jdk.vm.ci.meta.Value;
+
+/**
+ * This class provides a set of cheap imperfect hash functions based on the paper "Improving Switch
+ * Statement Performance with Hashing Optimized at Compile Time".
+ * (http://programming.sirrida.de/hashsuper.pdf)
+ */
+public abstract class HashFunction {
+
+ /**
+ * Applies the hash function.
+ *
+ * @param value the value to be hashed
+ * @param min {@code value} is guaranteed to be greater or equal to this minimum
+ * @return the hash value within int range
+ */
+ public abstract int apply(long value, long min);
+
+ /**
+ * Generates LIR that implements the hash function in terms of value and min.
+ *
+ * @param value the value to be hashed
+ * @param min the lowest key
+ * @param gen the lir generator
+ * @return new lir value with the hash function applied
+ */
+ public abstract Value gen(Value value, Value min, ArithmeticLIRGenerator gen);
+
+ /**
+ * Returns an estimate of number of CPU cycles necessary to apply the hash function.
+ */
+ public abstract int effort();
+
+ /**
+ * @return a list of all available hash functions
+ */
+ public static final List<HashFunction> instances() {
+ return Collections.unmodifiableList(instances);
+ }
+
+ private static List<HashFunction> instances = new ArrayList<>();
+
+ private static int[] mersennePrimes = {3, 7, 31, 127, 8191, 131071, 524287, 2147483647};
+
+ static {
+ //@formatter:off
+
+ add("val", 0,
+ (val, min) -> val,
+ gen -> (val, min) -> val);
+
+ add("val - min", 1,
+ (val, min) -> val - min,
+ gen -> (val, min) -> gen.emitSub(val, min, false));
+
+ add("val >> min", 1,
+ (val, min) -> val >> min,
+ gen -> (val, min) -> gen.emitShr(val, min));
+
+ add("val >> (val & min)", 2,
+ (val, min) -> val >> (val & min),
+ gen -> (val, min) -> gen.emitShr(val, gen.emitAnd(val, min)));
+
+ add("(val >> min) ^ val", 2,
+ (val, min) -> (val >> min) ^ val,
+ gen -> (val, min) -> gen.emitXor(gen.emitShr(val, min), val));
+
+ add("(val >> min) * val", 3,
+ (val, min) -> (val >> min) * val,
+ gen -> (val, min) -> gen.emitMul(gen.emitShr(val, min), val, false));
+
+ addWithPrimes("(val * prime) >> min", 3,
+ prime -> (val, min) -> (val * prime) >> min,
+ (gen, prime) -> (val, min) -> gen.emitShr(gen.emitMul(val, prime, false), min));
+
+ addWithPrimes("rotateRight(val, prime)", 3,
+ prime -> (val, min) -> Long.rotateRight(val, prime),
+ (gen, prime) -> (val, min) -> gen.emitRor(val, prime));
+
+ addWithPrimes("rotateRight(val, prime) + val", 4,
+ prime -> (val, min) -> Long.rotateRight(val, prime) + val,
+ (gen, prime) -> (val, min) -> gen.emitAdd(gen.emitRor(val, prime), val, false));
+
+ addWithPrimes("rotateRight(val, prime) ^ val", 4,
+ prime -> (val, min) -> Long.rotateRight(val, prime) ^ val,
+ (gen, prime) -> (val, min) -> gen.emitXor(gen.emitRor(val, prime), val));
+ //@formatter:on
+ }
+
+ private static void add(String toString, int effort, BiFunction<Long, Long, Long> f, Function<ArithmeticLIRGenerator, BiFunction<Value, Value, Value>> gen) {
+ instances.add(new HashFunction() {
+
+ @Override
+ public int apply(long value, long min) {
+ return f.apply(value, min).intValue();
+ }
+
+ @Override
+ public int effort() {
+ return effort;
+ }
+
+ @Override
+ public String toString() {
+ return toString;
+ }
+
+ @Override
+ public Value gen(Value val, Value min, ArithmeticLIRGenerator t) {
+ return gen.apply(t).apply(t.emitNarrow(val, 32), t.emitNarrow(min, 32));
+ }
+ });
+ }
+
+ private static void addWithPrimes(String toString, int effort, Function<Integer, BiFunction<Long, Long, Long>> f,
+ BiFunction<ArithmeticLIRGenerator, Value, BiFunction<Value, Value, Value>> gen) {
+ for (int p : mersennePrimes) {
+ add(toString, effort, f.apply(p), g -> gen.apply(g, g.getLIRGen().emitJavaConstant(JavaConstant.forInt(p))));
+ }
+ }
+}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir/src/org/graalvm/compiler/lir/hashing/Hasher.java Sat Mar 16 21:00:45 2019 +0000
@@ -0,0 +1,161 @@
+/*
+ * 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
+ * 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.
+ */
+
+
+package org.graalvm.compiler.lir.hashing;
+
+import java.util.Comparator;
+import java.util.HashSet;
+import java.util.Optional;
+import java.util.Set;
+import java.util.TreeSet;
+
+import org.graalvm.compiler.lir.gen.ArithmeticLIRGenerator;
+
+import jdk.vm.ci.meta.JavaConstant;
+import jdk.vm.ci.meta.Value;
+
+/**
+ * This class holds a hash function at a specific cardinality and min value (lowest key). The
+ * cardinality is the required size of the hash table to make the hasher injective for the provided
+ * keys.
+ */
+public final class Hasher {
+
+ /**
+ * Tries to find a hash function without conflicts for the provided keys.
+ *
+ * @param keys the keys
+ * @param minDensity the minimum density of the switch table. Used to determine the maximum
+ * cardinality of the hash function
+ * @return an optional hasher
+ */
+ public static Optional<Hasher> forKeys(JavaConstant[] keys, double minDensity) {
+ if (keys.length <= 2) {
+ return Optional.empty();
+ } else {
+ int maxCardinality = (int) Math.round(keys.length / minDensity);
+ assertSorted(keys);
+ TreeSet<Hasher> candidates = new TreeSet<>(new Comparator<Hasher>() {
+ @Override
+ public int compare(Hasher o1, Hasher o2) {
+ int d = o1.cardinality - o2.cardinality;
+ if (d != 0) {
+ return d;
+ } else {
+ return o1.effort() - o2.effort();
+ }
+ }
+ });
+ long min = keys[0].asLong();
+ for (HashFunction f : HashFunction.instances()) {
+ for (int cardinality = keys.length; cardinality < maxCardinality; cardinality++) {
+ if (isValid(keys, min, f, cardinality)) {
+ candidates.add(new Hasher(f, cardinality, min));
+ break;
+ }
+ }
+ }
+ if (candidates.isEmpty()) {
+ return Optional.empty();
+ } else {
+ return Optional.of(candidates.first());
+ }
+ }
+ }
+
+ private static void assertSorted(JavaConstant[] keys) {
+ for (int i = 1; i < keys.length; i++) {
+ assert keys[i - 1].asLong() < keys[i].asLong();
+ }
+ }
+
+ private static boolean isValid(JavaConstant[] keys, long min, HashFunction function, int cardinality) {
+ Set<Integer> seen = new HashSet<>(keys.length);
+ for (JavaConstant key : keys) {
+ int hash = function.apply(key.asLong(), min) & (cardinality - 1);
+ if (!seen.add(hash)) {
+ return false;
+ }
+ }
+ return true;
+ }
+
+ private final HashFunction function;
+ private final int cardinality;
+ private final long min;
+
+ private Hasher(HashFunction function, int cardinality, long min) {
+ this.function = function;
+ this.cardinality = cardinality;
+ this.min = min;
+ }
+
+ /**
+ * Applies the hash function.
+ *
+ * @param value the value to be hashed
+ * @return the hash value
+ */
+ public int hash(long value) {
+ return function.apply(value, min) & (cardinality - 1);
+ }
+
+ /**
+ * Applies the hash function to a lir value.
+ *
+ * @param value the value to be hashed
+ * @param gen the lir generator
+ * @return the hashed lir value
+ */
+ public Value hash(Value value, ArithmeticLIRGenerator gen) {
+ Value h = function.gen(value, gen.getLIRGen().emitJavaConstant(JavaConstant.forLong(min)), gen);
+ return gen.emitAnd(h, gen.getLIRGen().emitJavaConstant(JavaConstant.forInt(cardinality - 1)));
+ }
+
+ /**
+ * @return the hashing effort
+ */
+ public int effort() {
+ return function.effort() + 1;
+ }
+
+ /**
+ * @return the cardinality of the hash function that should match the size of the table switch.
+ */
+ public int cardinality() {
+ return cardinality;
+ }
+
+ /**
+ * @return the hash function
+ */
+ public HashFunction function() {
+ return function;
+ }
+
+ @Override
+ public String toString() {
+ return "Hasher[function=" + function + ", effort=" + effort() + ", cardinality=" + cardinality + "]";
+ }
+}
--- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir/src/org/graalvm/compiler/lir/ssa/SSAUtil.java Tue Mar 12 09:49:10 2019 +0000
+++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir/src/org/graalvm/compiler/lir/ssa/SSAUtil.java Sat Mar 16 21:00:45 2019 +0000
@@ -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,11 +31,9 @@
import org.graalvm.compiler.core.common.cfg.AbstractBlockBase;
import org.graalvm.compiler.lir.LIR;
import org.graalvm.compiler.lir.LIRInstruction;
-import org.graalvm.compiler.lir.LIRInstruction.OperandMode;
import org.graalvm.compiler.lir.StandardOp.BlockEndOp;
import org.graalvm.compiler.lir.StandardOp.JumpOp;
import org.graalvm.compiler.lir.StandardOp.LabelOp;
-import org.graalvm.compiler.lir.ValueConsumer;
import jdk.vm.ci.meta.Value;
@@ -114,13 +112,6 @@
return (JumpOp) op;
}
- public static JumpOp phiOutOrNull(LIR lir, AbstractBlockBase<?> block) {
- if (block.getSuccessorCount() != 1) {
- return null;
- }
- return phiOut(lir, block);
- }
-
public static int phiOutIndex(LIR lir, AbstractBlockBase<?> block) {
assert block.getSuccessorCount() == 1;
ArrayList<LIRInstruction> instructions = lir.getLIRforBlock(block);
@@ -149,10 +140,6 @@
return new SSAVerifier(lir).verify();
}
- public static boolean isMerge(AbstractBlockBase<?> block) {
- return block.getPredecessorCount() > 1;
- }
-
public static void verifyPhi(LIR lir, AbstractBlockBase<?> merge) {
assert merge.getPredecessorCount() > 1;
for (AbstractBlockBase<?> pred : merge.getPredecessors()) {
@@ -163,25 +150,7 @@
}
}
- public static void forEachPhiRegisterHint(LIR lir, AbstractBlockBase<?> block, LabelOp label, Value targetValue, OperandMode mode, ValueConsumer valueConsumer) {
- assert mode == OperandMode.DEF : "Wrong operand mode: " + mode;
- assert lir.getLIRforBlock(block).get(0).equals(label) : String.format("Block %s and Label %s do not match!", block, label);
-
- if (!label.isPhiIn()) {
- return;
- }
- int idx = indexOfValue(label, targetValue);
- assert idx >= 0 : String.format("Value %s not in label %s", targetValue, label);
-
- for (AbstractBlockBase<?> pred : block.getPredecessors()) {
- JumpOp jump = phiOut(lir, pred);
- Value sourceValue = jump.getOutgoingValue(idx);
- valueConsumer.visitValue(jump, sourceValue, null, null);
- }
-
- }
-
- private static int indexOfValue(LabelOp label, Value value) {
+ public static int indexOfValue(LabelOp label, Value value) {
for (int i = 0; i < label.getIncomingSize(); i++) {
if (label.getIncomingValue(i).equals(value)) {
return i;
@@ -189,20 +158,4 @@
}
return -1;
}
-
- public static int numPhiOut(LIR lir, AbstractBlockBase<?> block) {
- if (block.getSuccessorCount() != 1) {
- // cannot be a phi_out block
- return 0;
- }
- return numPhiIn(lir, block.getSuccessors()[0]);
- }
-
- private static int numPhiIn(LIR lir, AbstractBlockBase<?> block) {
- if (!isMerge(block)) {
- return 0;
- }
- return phiIn(lir, block).getPhiSize();
- }
-
}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.loop.phases/src/org/graalvm/compiler/loop/phases/ConvertDeoptimizeToGuardPhase.java Sat Mar 16 21:00:45 2019 +0000
@@ -0,0 +1,272 @@
+/*
+ * Copyright (c) 2011, 2018, Oracle and/or its affiliates. All rights reserved.
+ * 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.
+ */
+
+
+package org.graalvm.compiler.loop.phases;
+
+import static org.graalvm.compiler.phases.common.DeadCodeEliminationPhase.Optionality.Optional;
+
+import java.util.List;
+
+import org.graalvm.compiler.core.common.GraalOptions;
+import org.graalvm.compiler.core.common.cfg.Loop;
+import org.graalvm.compiler.debug.DebugCloseable;
+import org.graalvm.compiler.graph.Node;
+import org.graalvm.compiler.graph.NodeSourcePosition;
+import org.graalvm.compiler.graph.spi.SimplifierTool;
+import org.graalvm.compiler.loop.LoopEx;
+import org.graalvm.compiler.loop.LoopsData;
+import org.graalvm.compiler.nodeinfo.InputType;
+import org.graalvm.compiler.nodes.AbstractBeginNode;
+import org.graalvm.compiler.nodes.AbstractEndNode;
+import org.graalvm.compiler.nodes.AbstractMergeNode;
+import org.graalvm.compiler.nodes.ConstantNode;
+import org.graalvm.compiler.nodes.ControlSplitNode;
+import org.graalvm.compiler.nodes.DeoptimizeNode;
+import org.graalvm.compiler.nodes.EndNode;
+import org.graalvm.compiler.nodes.FixedGuardNode;
+import org.graalvm.compiler.nodes.FixedNode;
+import org.graalvm.compiler.nodes.FixedWithNextNode;
+import org.graalvm.compiler.nodes.GuardNode;
+import org.graalvm.compiler.nodes.IfNode;
+import org.graalvm.compiler.nodes.LogicNode;
+import org.graalvm.compiler.nodes.LoopExitNode;
+import org.graalvm.compiler.nodes.ProxyNode;
+import org.graalvm.compiler.nodes.StartNode;
+import org.graalvm.compiler.nodes.StaticDeoptimizingNode;
+import org.graalvm.compiler.nodes.StructuredGraph;
+import org.graalvm.compiler.nodes.ValueNode;
+import org.graalvm.compiler.nodes.ValuePhiNode;
+import org.graalvm.compiler.nodes.calc.CompareNode;
+import org.graalvm.compiler.nodes.cfg.Block;
+import org.graalvm.compiler.nodes.spi.LoweringProvider;
+import org.graalvm.compiler.nodes.util.GraphUtil;
+import org.graalvm.compiler.phases.BasePhase;
+import org.graalvm.compiler.phases.common.DeadCodeEliminationPhase;
+import org.graalvm.compiler.phases.common.LazyValue;
+import org.graalvm.compiler.phases.tiers.PhaseContext;
+
+import jdk.vm.ci.meta.Constant;
+import jdk.vm.ci.meta.DeoptimizationAction;
+
+/**
+ * This phase will find branches which always end with a {@link DeoptimizeNode} and replace their
+ * {@link ControlSplitNode ControlSplitNodes} with {@link FixedGuardNode FixedGuardNodes}.
+ *
+ * This is useful because {@link FixedGuardNode FixedGuardNodes} will be lowered to {@link GuardNode
+ * GuardNodes} which can later be optimized more aggressively than control-flow constructs.
+ *
+ * This is currently only done for branches that start from a {@link IfNode}. If it encounters a
+ * branch starting at an other kind of {@link ControlSplitNode}, it will only bring the
+ * {@link DeoptimizeNode} as close to the {@link ControlSplitNode} as possible.
+ *
+ */
+public class ConvertDeoptimizeToGuardPhase extends BasePhase<PhaseContext> {
+ @Override
+ @SuppressWarnings("try")
+ protected void run(final StructuredGraph graph, PhaseContext context) {
+ assert graph.hasValueProxies() : "ConvertDeoptimizeToGuardPhase always creates proxies";
+ assert !graph.getGuardsStage().areFrameStatesAtDeopts() : graph.getGuardsStage();
+ LazyValue<LoopsData> lazyLoops = new LazyValue<>(() -> new LoopsData(graph));
+
+ for (DeoptimizeNode d : graph.getNodes(DeoptimizeNode.TYPE)) {
+ assert d.isAlive();
+ if (d.getAction() == DeoptimizationAction.None) {
+ continue;
+ }
+ try (DebugCloseable closable = d.withNodeSourcePosition()) {
+ propagateFixed(d, d, context != null ? context.getLowerer() : null, lazyLoops);
+ }
+ }
+
+ if (context != null) {
+ for (FixedGuardNode fixedGuard : graph.getNodes(FixedGuardNode.TYPE)) {
+ try (DebugCloseable closable = fixedGuard.withNodeSourcePosition()) {
+ trySplitFixedGuard(fixedGuard, context, lazyLoops);
+ }
+ }
+ }
+
+ new DeadCodeEliminationPhase(Optional).apply(graph);
+ }
+
+ private static void trySplitFixedGuard(FixedGuardNode fixedGuard, PhaseContext context, LazyValue<LoopsData> lazyLoops) {
+ LogicNode condition = fixedGuard.condition();
+ if (condition instanceof CompareNode) {
+ CompareNode compare = (CompareNode) condition;
+ ValueNode x = compare.getX();
+ ValuePhiNode xPhi = (x instanceof ValuePhiNode) ? (ValuePhiNode) x : null;
+ if (x instanceof ConstantNode || xPhi != null) {
+ ValueNode y = compare.getY();
+ ValuePhiNode yPhi = (y instanceof ValuePhiNode) ? (ValuePhiNode) y : null;
+ if (y instanceof ConstantNode || yPhi != null) {
+ processFixedGuardAndPhis(fixedGuard, context, compare, x, xPhi, y, yPhi, lazyLoops);
+ }
+ }
+ }
+ }
+
+ private static void processFixedGuardAndPhis(FixedGuardNode fixedGuard, PhaseContext context, CompareNode compare, ValueNode x, ValuePhiNode xPhi, ValueNode y, ValuePhiNode yPhi,
+ LazyValue<LoopsData> lazyLoops) {
+ AbstractBeginNode pred = AbstractBeginNode.prevBegin(fixedGuard);
+ if (pred instanceof AbstractMergeNode) {
+ AbstractMergeNode merge = (AbstractMergeNode) pred;
+ if (xPhi != null && xPhi.merge() != merge) {
+ return;
+ }
+ if (yPhi != null && yPhi.merge() != merge) {
+ return;
+ }
+
+ processFixedGuardAndMerge(fixedGuard, context, compare, x, xPhi, y, yPhi, merge, lazyLoops);
+ }
+ }
+
+ @SuppressWarnings("try")
+ private static void processFixedGuardAndMerge(FixedGuardNode fixedGuard, PhaseContext context, CompareNode compare, ValueNode x, ValuePhiNode xPhi, ValueNode y, ValuePhiNode yPhi,
+ AbstractMergeNode merge, LazyValue<LoopsData> lazyLoops) {
+ List<EndNode> mergePredecessors = merge.cfgPredecessors().snapshot();
+ for (AbstractEndNode mergePredecessor : mergePredecessors) {
+ if (!mergePredecessor.isAlive()) {
+ break;
+ }
+ Constant xs;
+ if (xPhi == null) {
+ xs = x.asConstant();
+ } else {
+ xs = xPhi.valueAt(mergePredecessor).asConstant();
+ }
+ Constant ys;
+ if (yPhi == null) {
+ ys = y.asConstant();
+ } else {
+ ys = yPhi.valueAt(mergePredecessor).asConstant();
+ }
+ if (xs != null && ys != null && compare.condition().foldCondition(xs, ys, context.getConstantReflection(), compare.unorderedIsTrue()) == fixedGuard.isNegated()) {
+ try (DebugCloseable position = fixedGuard.withNodeSourcePosition()) {
+ propagateFixed(mergePredecessor, fixedGuard, context.getLowerer(), lazyLoops);
+ }
+ }
+ }
+ }
+
+ @SuppressWarnings("try")
+ private static void propagateFixed(FixedNode from, StaticDeoptimizingNode deopt, LoweringProvider loweringProvider, LazyValue<LoopsData> lazyLoops) {
+ Node current = from;
+ while (current != null) {
+ if (GraalOptions.GuardPriorities.getValue(from.getOptions()) && current instanceof FixedGuardNode) {
+ FixedGuardNode otherGuard = (FixedGuardNode) current;
+ if (otherGuard.computePriority().isHigherPriorityThan(deopt.computePriority())) {
+ moveAsDeoptAfter(otherGuard, deopt);
+ return;
+ }
+ } else if (current instanceof AbstractBeginNode) {
+ if (current instanceof AbstractMergeNode) {
+ AbstractMergeNode mergeNode = (AbstractMergeNode) current;
+ FixedNode next = mergeNode.next();
+ while (mergeNode.isAlive()) {
+ AbstractEndNode end = mergeNode.forwardEnds().first();
+ propagateFixed(end, deopt, loweringProvider, lazyLoops);
+ }
+ if (next.isAlive()) {
+ propagateFixed(next, deopt, loweringProvider, lazyLoops);
+ }
+ return;
+ } else if (current.predecessor() instanceof IfNode) {
+ AbstractBeginNode begin = (AbstractBeginNode) current;
+ IfNode ifNode = (IfNode) current.predecessor();
+ if (isOsrLoopExit(begin) || isCountedLoopExit(ifNode, lazyLoops)) {
+ moveAsDeoptAfter(begin, deopt);
+ } else {
+ // Prioritize the source position of the IfNode
+ try (DebugCloseable closable = ifNode.withNodeSourcePosition()) {
+ StructuredGraph graph = ifNode.graph();
+ LogicNode conditionNode = ifNode.condition();
+ boolean negateGuardCondition = current == ifNode.trueSuccessor();
+ NodeSourcePosition survivingSuccessorPosition = negateGuardCondition ? ifNode.falseSuccessor().getNodeSourcePosition() : ifNode.trueSuccessor().getNodeSourcePosition();
+ FixedGuardNode guard = graph.add(
+ new FixedGuardNode(conditionNode, deopt.getReason(), deopt.getAction(), deopt.getSpeculation(), negateGuardCondition, survivingSuccessorPosition));
+ FixedWithNextNode pred = (FixedWithNextNode) ifNode.predecessor();
+ AbstractBeginNode survivingSuccessor;
+ if (negateGuardCondition) {
+ survivingSuccessor = ifNode.falseSuccessor();
+ } else {
+ survivingSuccessor = ifNode.trueSuccessor();
+ }
+ graph.removeSplitPropagate(ifNode, survivingSuccessor);
+
+ Node newGuard = guard;
+ if (survivingSuccessor instanceof LoopExitNode) {
+ newGuard = ProxyNode.forGuard(guard, (LoopExitNode) survivingSuccessor, graph);
+ }
+ survivingSuccessor.replaceAtUsages(InputType.Guard, newGuard);
+
+ graph.getDebug().log("Converting deopt on %-5s branch of %s to guard for remaining branch %s.", negateGuardCondition, ifNode, survivingSuccessor);
+ FixedNode next = pred.next();
+ pred.setNext(guard);
+ guard.setNext(next);
+ SimplifierTool simplifierTool = GraphUtil.getDefaultSimplifier(null, null, null, false, graph.getAssumptions(), graph.getOptions(), loweringProvider);
+ survivingSuccessor.simplify(simplifierTool);
+ }
+ }
+ return;
+ } else if (current.predecessor() == null || current.predecessor() instanceof ControlSplitNode) {
+ assert current.predecessor() != null || (current instanceof StartNode && current == ((AbstractBeginNode) current).graph().start());
+ moveAsDeoptAfter((AbstractBeginNode) current, deopt);
+ return;
+ }
+ }
+ current = current.predecessor();
+ }
+ }
+
+ @SuppressWarnings("try")
+ private static void moveAsDeoptAfter(FixedWithNextNode node, StaticDeoptimizingNode deopt) {
+ try (DebugCloseable position = deopt.asNode().withNodeSourcePosition()) {
+ FixedNode next = node.next();
+ if (next != deopt.asNode()) {
+ node.setNext(node.graph().add(new DeoptimizeNode(deopt.getAction(), deopt.getReason(), deopt.getSpeculation())));
+ GraphUtil.killCFG(next);
+ }
+ }
+ }
+
+ private static boolean isOsrLoopExit(AbstractBeginNode node) {
+ if (!(node instanceof LoopExitNode)) {
+ return false;
+ }
+ return ((LoopExitNode) node).loopBegin().isOsrLoop();
+ }
+
+ private static boolean isCountedLoopExit(IfNode ifNode, LazyValue<LoopsData> lazyLoops) {
+ LoopsData loopsData = lazyLoops.get();
+ Loop<Block> loop = loopsData.getCFG().getNodeToBlock().get(ifNode).getLoop();
+ if (loop != null) {
+ LoopEx loopEx = loopsData.loop(loop);
+ if (loopEx.detectCounted()) {
+ return ifNode == loopEx.counted().getLimitTest();
+ }
+ }
+ return false;
+ }
+}
--- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.loop.phases/src/org/graalvm/compiler/loop/phases/LoopTransformations.java Tue Mar 12 09:49:10 2019 +0000
+++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.loop.phases/src/org/graalvm/compiler/loop/phases/LoopTransformations.java Sat Mar 16 21:00:45 2019 +0000
@@ -54,7 +54,6 @@
import org.graalvm.compiler.nodes.IfNode;
import org.graalvm.compiler.nodes.LogicNode;
import org.graalvm.compiler.nodes.LoopBeginNode;
-import org.graalvm.compiler.nodes.LoopExitNode;
import org.graalvm.compiler.nodes.NodeView;
import org.graalvm.compiler.nodes.PhiNode;
import org.graalvm.compiler.nodes.SafepointNode;
@@ -231,11 +230,11 @@
graph.getDebug().log("LoopTransformations.insertPrePostLoops %s", loop);
LoopFragmentWhole preLoop = loop.whole();
CountedLoopInfo preCounted = loop.counted();
- IfNode preLimit = preCounted.getLimitTest();
- assert preLimit != null;
LoopBeginNode preLoopBegin = loop.loopBegin();
- LoopExitNode preLoopExitNode = preLoopBegin.getSingleLoopExit();
- FixedNode continuationNode = preLoopExitNode.next();
+ AbstractBeginNode preLoopExitNode = preCounted.getCountedExit();
+
+ assert preLoop.nodes().contains(preLoopBegin);
+ assert preLoop.nodes().contains(preLoopExitNode);
// Each duplication is inserted after the original, ergo create the post loop first
LoopFragmentWhole mainLoop = preLoop.duplicate();
@@ -249,9 +248,9 @@
LoopBeginNode postLoopBegin = postLoop.getDuplicatedNode(preLoopBegin);
postLoopBegin.setPostLoop();
- EndNode postEndNode = getBlockEndAfterLoopExit(postLoopBegin);
+ AbstractBeginNode postLoopExitNode = postLoop.getDuplicatedNode(preLoopExitNode);
+ EndNode postEndNode = getBlockEndAfterLoopExit(postLoopExitNode);
AbstractMergeNode postMergeNode = postEndNode.merge();
- LoopExitNode postLoopExitNode = postLoopBegin.getSingleLoopExit();
// Update the main loop phi initialization to carry from the pre loop
for (PhiNode prePhiNode : preLoopBegin.phis()) {
@@ -259,13 +258,16 @@
mainPhiNode.setValueAt(0, prePhiNode);
}
- EndNode mainEndNode = getBlockEndAfterLoopExit(mainLoopBegin);
+ AbstractBeginNode mainLoopExitNode = mainLoop.getDuplicatedNode(preLoopExitNode);
+ EndNode mainEndNode = getBlockEndAfterLoopExit(mainLoopExitNode);
AbstractMergeNode mainMergeNode = mainEndNode.merge();
AbstractEndNode postEntryNode = postLoopBegin.forwardEnd();
+ // Exits have been merged, find the continuation below the merge
+ FixedNode continuationNode = mainMergeNode.next();
+
// In the case of no Bounds tests, we just flow right into the main loop
AbstractBeginNode mainLandingNode = BeginNode.begin(postEntryNode);
- LoopExitNode mainLoopExitNode = mainLoopBegin.getSingleLoopExit();
mainLoopExitNode.setNext(mainLandingNode);
preLoopExitNode.setNext(mainLoopBegin.forwardEnd());
@@ -337,8 +339,8 @@
/**
* Find the end of the block following the LoopExit.
*/
- private static EndNode getBlockEndAfterLoopExit(LoopBeginNode curLoopBegin) {
- FixedNode node = curLoopBegin.getSingleLoopExit().next();
+ private static EndNode getBlockEndAfterLoopExit(AbstractBeginNode exit) {
+ FixedNode node = exit.next();
// Find the last node after the exit blocks starts
return getBlockEnd(node);
}
@@ -423,6 +425,9 @@
condition.getDebug().log(DebugContext.VERBOSE_LEVEL, "isUnrollableLoop %s doubling the stride overflows %d", loopBegin, stride);
return false;
}
+ if (!loop.canDuplicateLoop()) {
+ return false;
+ }
if (loopBegin.isMainLoop() || loopBegin.isSimpleLoop()) {
// Flow-less loops to partial unroll for now. 3 blocks corresponds to an if that either
// exits or continues the loop. There might be fixed and floating work within the loop
--- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.loop/src/org/graalvm/compiler/loop/BasicInductionVariable.java Tue Mar 12 09:49:10 2019 +0000
+++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.loop/src/org/graalvm/compiler/loop/BasicInductionVariable.java Sat Mar 16 21:00:45 2019 +0000
@@ -143,7 +143,7 @@
}
@Override
- public ValueNode extremumNode(boolean assumePositiveTripCount, Stamp stamp) {
+ public ValueNode extremumNode(boolean assumeLoopEntered, Stamp stamp) {
Stamp fromStamp = phi.stamp(NodeView.DEFAULT);
StructuredGraph graph = graph();
ValueNode stride = strideNode();
@@ -152,7 +152,7 @@
stride = IntegerConvertNode.convert(stride, stamp, graph(), NodeView.DEFAULT);
initNode = IntegerConvertNode.convert(initNode, stamp, graph(), NodeView.DEFAULT);
}
- ValueNode maxTripCount = loop.counted().maxTripCountNode(assumePositiveTripCount);
+ ValueNode maxTripCount = loop.counted().maxTripCountNode(assumeLoopEntered);
if (!maxTripCount.stamp(NodeView.DEFAULT).isCompatible(stamp)) {
maxTripCount = IntegerConvertNode.convert(maxTripCount, stamp, graph(), NodeView.DEFAULT);
}
--- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.loop/src/org/graalvm/compiler/loop/CountedLoopInfo.java Tue Mar 12 09:49:10 2019 +0000
+++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.loop/src/org/graalvm/compiler/loop/CountedLoopInfo.java Sat Mar 16 21:00:45 2019 +0000
@@ -24,10 +24,12 @@
package org.graalvm.compiler.loop;
-import static org.graalvm.compiler.loop.MathUtil.add;
-import static org.graalvm.compiler.loop.MathUtil.sub;
+import static java.lang.Math.abs;
import static org.graalvm.compiler.loop.MathUtil.unsignedDivBefore;
+import static org.graalvm.compiler.nodes.calc.BinaryArithmeticNode.add;
+import static org.graalvm.compiler.nodes.calc.BinaryArithmeticNode.sub;
+import org.graalvm.compiler.core.common.NumUtil;
import org.graalvm.compiler.core.common.type.IntegerStamp;
import org.graalvm.compiler.core.common.type.Stamp;
import org.graalvm.compiler.core.common.util.UnsignedLong;
@@ -37,16 +39,16 @@
import org.graalvm.compiler.nodes.ConstantNode;
import org.graalvm.compiler.nodes.GuardNode;
import org.graalvm.compiler.nodes.IfNode;
+import org.graalvm.compiler.nodes.LogicNode;
import org.graalvm.compiler.nodes.NodeView;
import org.graalvm.compiler.nodes.StructuredGraph;
import org.graalvm.compiler.nodes.ValueNode;
-import org.graalvm.compiler.nodes.calc.CompareNode;
import org.graalvm.compiler.nodes.calc.ConditionalNode;
import org.graalvm.compiler.nodes.calc.IntegerLessThanNode;
import org.graalvm.compiler.nodes.calc.NegateNode;
import org.graalvm.compiler.nodes.extended.GuardingNode;
+import org.graalvm.compiler.nodes.util.GraphUtil;
-import jdk.vm.ci.code.CodeUtil;
import jdk.vm.ci.meta.DeoptimizationAction;
import jdk.vm.ci.meta.DeoptimizationReason;
import jdk.vm.ci.meta.SpeculationLog;
@@ -92,42 +94,41 @@
*
* THIS VALUE SHOULD BE TREATED AS UNSIGNED.
*
- * @param assumePositive if true the check that the loop is entered at all will be omitted.
+ * @param assumeLoopEntered if true the check that the loop is entered at all will be omitted.
*/
- public ValueNode maxTripCountNode(boolean assumePositive) {
+ public ValueNode maxTripCountNode(boolean assumeLoopEntered) {
StructuredGraph graph = iv.valueNode().graph();
Stamp stamp = iv.valueNode().stamp(NodeView.DEFAULT);
ValueNode max;
ValueNode min;
- ValueNode range;
ValueNode absStride;
if (iv.direction() == Direction.Up) {
absStride = iv.strideNode();
- range = sub(graph, end, iv.initNode());
max = end;
min = iv.initNode();
} else {
assert iv.direction() == Direction.Down;
- absStride = graph.maybeAddOrUnique(NegateNode.create(iv.strideNode(), NodeView.DEFAULT));
- range = sub(graph, iv.initNode(), end);
+ absStride = NegateNode.create(iv.strideNode(), NodeView.DEFAULT);
max = iv.initNode();
min = end;
}
+ ValueNode range = sub(max, min);
- ConstantNode one = ConstantNode.forIntegerStamp(stamp, 1, graph);
+ ConstantNode one = ConstantNode.forIntegerStamp(stamp, 1);
if (oneOff) {
- range = add(graph, range, one);
+ range = add(range, one);
}
// round-away-from-zero divison: (range + stride -/+ 1) / stride
- ValueNode denominator = add(graph, range, sub(graph, absStride, one));
+ ValueNode denominator = add(range, sub(absStride, one));
ValueNode div = unsignedDivBefore(graph, loop.entryPoint(), denominator, absStride, null);
- if (assumePositive) {
- return div;
+ if (assumeLoopEntered) {
+ return graph.addOrUniqueWithInputs(div);
}
- ConstantNode zero = ConstantNode.forIntegerStamp(stamp, 0, graph);
- return graph.unique(new ConditionalNode(graph.unique(new IntegerLessThanNode(max, min)), zero, div));
+ ConstantNode zero = ConstantNode.forIntegerStamp(stamp, 0);
+ LogicNode noEntryCheck = IntegerLessThanNode.create(max, min, NodeView.DEFAULT);
+ return graph.addOrUniqueWithInputs(ConditionalNode.create(noEntryCheck, zero, div, NodeView.DEFAULT));
}
/**
@@ -173,7 +174,7 @@
}
public boolean isExactTripCount() {
- return loop.loopBegin().loopExits().count() == 1;
+ return loop.loop().getNaturalExits().size() == 1;
}
public ValueNode exactTripCountNode() {
@@ -216,6 +217,15 @@
return body;
}
+ public AbstractBeginNode getCountedExit() {
+ if (getLimitTest().trueSuccessor() == getBody()) {
+ return getLimitTest().falseSuccessor();
+ } else {
+ assert getLimitTest().falseSuccessor() == getBody();
+ return getLimitTest().trueSuccessor();
+ }
+ }
+
public Direction getDirection() {
return iv.direction();
}
@@ -228,30 +238,48 @@
return loop.loopBegin().getOverflowGuard();
}
+ public boolean counterNeverOverflows() {
+ if (iv.isConstantStride() && abs(iv.constantStride()) == 1) {
+ return true;
+ }
+ IntegerStamp endStamp = (IntegerStamp) end.stamp(NodeView.DEFAULT);
+ ValueNode strideNode = iv.strideNode();
+ IntegerStamp strideStamp = (IntegerStamp) strideNode.stamp(NodeView.DEFAULT);
+ GraphUtil.tryKillUnused(strideNode);
+ if (getDirection() == Direction.Up) {
+ long max = NumUtil.maxValue(endStamp.getBits());
+ return endStamp.upperBound() <= max - (strideStamp.upperBound() - 1) - (oneOff ? 1 : 0);
+ } else if (getDirection() == Direction.Down) {
+ long min = NumUtil.minValue(endStamp.getBits());
+ return min + (1 - strideStamp.lowerBound()) + (oneOff ? 1 : 0) <= endStamp.lowerBound();
+ }
+ return false;
+ }
+
@SuppressWarnings("try")
public GuardingNode createOverFlowGuard() {
GuardingNode overflowGuard = getOverFlowGuard();
- if (overflowGuard != null) {
+ if (overflowGuard != null || counterNeverOverflows()) {
return overflowGuard;
}
try (DebugCloseable position = loop.loopBegin().withNodeSourcePosition()) {
IntegerStamp stamp = (IntegerStamp) iv.valueNode().stamp(NodeView.DEFAULT);
StructuredGraph graph = iv.valueNode().graph();
- CompareNode cond; // we use a negated guard with a < condition to achieve a >=
+ LogicNode cond; // we use a negated guard with a < condition to achieve a >=
ConstantNode one = ConstantNode.forIntegerStamp(stamp, 1, graph);
if (iv.direction() == Direction.Up) {
- ValueNode v1 = sub(graph, ConstantNode.forIntegerStamp(stamp, CodeUtil.maxValue(stamp.getBits()), graph), sub(graph, iv.strideNode(), one));
+ ValueNode v1 = sub(ConstantNode.forIntegerStamp(stamp, NumUtil.maxValue(stamp.getBits())), sub(iv.strideNode(), one));
if (oneOff) {
- v1 = sub(graph, v1, one);
+ v1 = sub(v1, one);
}
- cond = graph.unique(new IntegerLessThanNode(v1, end));
+ cond = graph.addOrUniqueWithInputs(IntegerLessThanNode.create(v1, end, NodeView.DEFAULT));
} else {
assert iv.direction() == Direction.Down;
- ValueNode v1 = add(graph, ConstantNode.forIntegerStamp(stamp, CodeUtil.minValue(stamp.getBits()), graph), sub(graph, one, iv.strideNode()));
+ ValueNode v1 = add(ConstantNode.forIntegerStamp(stamp, NumUtil.minValue(stamp.getBits())), sub(one, iv.strideNode()));
if (oneOff) {
- v1 = add(graph, v1, one);
+ v1 = add(v1, one);
}
- cond = graph.unique(new IntegerLessThanNode(end, v1));
+ cond = graph.addOrUniqueWithInputs(IntegerLessThanNode.create(end, v1, NodeView.DEFAULT));
}
assert graph.getGuardsStage().allowsFloatingGuards();
overflowGuard = graph.unique(new GuardNode(cond, AbstractBeginNode.prevBegin(loop.entryPoint()), DeoptimizationReason.LoopLimitCheck, DeoptimizationAction.InvalidateRecompile, true,
--- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.loop/src/org/graalvm/compiler/loop/DefaultLoopPolicies.java Tue Mar 12 09:49:10 2019 +0000
+++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.loop/src/org/graalvm/compiler/loop/DefaultLoopPolicies.java Sat Mar 16 21:00:45 2019 +0000
@@ -33,6 +33,7 @@
import org.graalvm.compiler.core.common.util.UnsignedLong;
import org.graalvm.compiler.debug.CounterKey;
import org.graalvm.compiler.debug.DebugContext;
+import org.graalvm.compiler.debug.GraalError;
import org.graalvm.compiler.graph.Node;
import org.graalvm.compiler.graph.NodeBitMap;
import org.graalvm.compiler.nodes.AbstractBeginNode;
@@ -46,6 +47,7 @@
import org.graalvm.compiler.nodes.StructuredGraph;
import org.graalvm.compiler.nodes.VirtualState;
import org.graalvm.compiler.nodes.VirtualState.VirtualClosure;
+import org.graalvm.compiler.nodes.calc.CompareNode;
import org.graalvm.compiler.nodes.cfg.Block;
import org.graalvm.compiler.nodes.cfg.ControlFlowGraph;
import org.graalvm.compiler.nodes.debug.ControlFlowAnchorNode;
@@ -64,9 +66,10 @@
@Option(help = "", type = OptionType.Expert) public static final OptionKey<Integer> LoopUnswitchTrivial = new OptionKey<>(10);
@Option(help = "", type = OptionType.Expert) public static final OptionKey<Double> LoopUnswitchFrequencyBoost = new OptionKey<>(10.0);
- @Option(help = "", type = OptionType.Expert) public static final OptionKey<Integer> FullUnrollMaxNodes = new OptionKey<>(300);
+ @Option(help = "", type = OptionType.Expert) public static final OptionKey<Integer> FullUnrollMaxNodes = new OptionKey<>(400);
+ @Option(help = "", type = OptionType.Expert) public static final OptionKey<Integer> FullUnrollConstantCompareBoost = new OptionKey<>(15);
@Option(help = "", type = OptionType.Expert) public static final OptionKey<Integer> FullUnrollMaxIterations = new OptionKey<>(600);
- @Option(help = "", type = OptionType.Expert) public static final OptionKey<Integer> ExactFullUnrollMaxNodes = new OptionKey<>(1200);
+ @Option(help = "", type = OptionType.Expert) public static final OptionKey<Integer> ExactFullUnrollMaxNodes = new OptionKey<>(800);
@Option(help = "", type = OptionType.Expert) public static final OptionKey<Integer> ExactPartialUnrollMaxNodes = new OptionKey<>(200);
@Option(help = "", type = OptionType.Expert) public static final OptionKey<Integer> UnrollMaxIterations = new OptionKey<>(16);
@@ -87,7 +90,7 @@
@Override
public boolean shouldFullUnroll(LoopEx loop) {
- if (!loop.isCounted() || !loop.counted().isConstantMaxTripCount()) {
+ if (!loop.isCounted() || !loop.counted().isConstantMaxTripCount() || !loop.counted().counterNeverOverflows()) {
return false;
}
OptionValues options = loop.entryPoint().getOptions();
@@ -96,9 +99,27 @@
if (maxTrips.equals(0)) {
return loop.canDuplicateLoop();
}
- int maxNodes = (counted.isExactTripCount() && counted.isConstantExactTripCount()) ? Options.ExactFullUnrollMaxNodes.getValue(options) : Options.FullUnrollMaxNodes.getValue(options);
- maxNodes = Math.min(maxNodes, Math.max(0, MaximumDesiredSize.getValue(options) - loop.loopBegin().graph().getNodeCount()));
- int size = Math.max(1, loop.size() - 1 - loop.loopBegin().phis().count());
+ if (maxTrips.isGreaterThan(Options.FullUnrollMaxIterations.getValue(options))) {
+ return false;
+ }
+ int globalMax = MaximumDesiredSize.getValue(options) - loop.loopBegin().graph().getNodeCount();
+ if (globalMax <= 0) {
+ return false;
+ }
+ int maxNodes = counted.isExactTripCount() ? Options.ExactFullUnrollMaxNodes.getValue(options) : Options.FullUnrollMaxNodes.getValue(options);
+ for (Node usage : counted.getCounter().valueNode().usages()) {
+ if (usage instanceof CompareNode) {
+ CompareNode compare = (CompareNode) usage;
+ if (compare.getY().isConstant()) {
+ maxNodes += Options.FullUnrollConstantCompareBoost.getValue(options);
+ }
+ }
+ }
+ maxNodes = Math.min(maxNodes, globalMax);
+ int size = loop.inside().nodes().count();
+ size -= 2; // remove the counted if and its non-exit begin
+ size -= loop.loopBegin().loopEnds().count();
+ GraalError.guarantee(size >= 0, "Wrong size");
/* @formatter:off
* The check below should not throw ArithmeticException because:
* maxTrips is guaranteed to be >= 1 by the check above
@@ -107,7 +128,7 @@
* - 1 <= size <= Integer.MAX_VALUE
* @formatter:on
*/
- if (maxTrips.isLessOrEqualTo(Options.FullUnrollMaxIterations.getValue(options)) && maxTrips.minus(1).times(size).isLessOrEqualTo(maxNodes)) {
+ if (maxTrips.minus(1).times(size).isLessOrEqualTo(maxNodes)) {
// check whether we're allowed to unroll this loop
return loop.canDuplicateLoop();
} else {
@@ -240,5 +261,4 @@
return false;
}
}
-
}
--- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.loop/src/org/graalvm/compiler/loop/DerivedConvertedInductionVariable.java Tue Mar 12 09:49:10 2019 +0000
+++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.loop/src/org/graalvm/compiler/loop/DerivedConvertedInductionVariable.java Sat Mar 16 21:00:45 2019 +0000
@@ -81,8 +81,8 @@
}
@Override
- public ValueNode extremumNode(boolean assumePositiveTripCount, Stamp s) {
- return base.extremumNode(assumePositiveTripCount, s);
+ public ValueNode extremumNode(boolean assumeLoopEntered, Stamp s) {
+ return base.extremumNode(assumeLoopEntered, s);
}
@Override
--- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.loop/src/org/graalvm/compiler/loop/DerivedOffsetInductionVariable.java Tue Mar 12 09:49:10 2019 +0000
+++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.loop/src/org/graalvm/compiler/loop/DerivedOffsetInductionVariable.java Sat Mar 16 21:00:45 2019 +0000
@@ -99,8 +99,8 @@
}
@Override
- public ValueNode extremumNode(boolean assumePositiveTripCount, Stamp stamp) {
- return op(base.extremumNode(assumePositiveTripCount, stamp), IntegerConvertNode.convert(offset, stamp, graph(), NodeView.DEFAULT));
+ public ValueNode extremumNode(boolean assumeLoopEntered, Stamp stamp) {
+ return op(base.extremumNode(assumeLoopEntered, stamp), IntegerConvertNode.convert(offset, stamp, graph(), NodeView.DEFAULT));
}
@Override
--- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.loop/src/org/graalvm/compiler/loop/DerivedScaledInductionVariable.java Tue Mar 12 09:49:10 2019 +0000
+++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.loop/src/org/graalvm/compiler/loop/DerivedScaledInductionVariable.java Sat Mar 16 21:00:45 2019 +0000
@@ -110,8 +110,8 @@
}
@Override
- public ValueNode extremumNode(boolean assumePositiveTripCount, Stamp stamp) {
- return mul(graph(), base.extremumNode(assumePositiveTripCount, stamp), IntegerConvertNode.convert(scale, stamp, graph(), NodeView.DEFAULT));
+ public ValueNode extremumNode(boolean assumeLoopEntered, Stamp stamp) {
+ return mul(graph(), base.extremumNode(assumeLoopEntered, stamp), IntegerConvertNode.convert(scale, stamp, graph(), NodeView.DEFAULT));
}
@Override
--- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.loop/src/org/graalvm/compiler/loop/InductionVariable.java Tue Mar 12 09:49:10 2019 +0000
+++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.loop/src/org/graalvm/compiler/loop/InductionVariable.java Sat Mar 16 21:00:45 2019 +0000
@@ -99,7 +99,7 @@
return extremumNode(false, valueNode().stamp(NodeView.DEFAULT));
}
- public abstract ValueNode extremumNode(boolean assumePositiveTripCount, Stamp stamp);
+ public abstract ValueNode extremumNode(boolean assumeLoopEntered, Stamp stamp);
public abstract boolean isConstantExtremum();
--- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.loop/src/org/graalvm/compiler/loop/LoopEx.java Tue Mar 12 09:49:10 2019 +0000
+++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.loop/src/org/graalvm/compiler/loop/LoopEx.java Sat Mar 16 21:00:45 2019 +0000
@@ -76,8 +76,6 @@
import org.graalvm.compiler.nodes.extended.ValueAnchorNode;
import org.graalvm.compiler.nodes.util.GraphUtil;
-import jdk.vm.ci.code.BytecodeFrame;
-
public class LoopEx {
private final Loop<Block> loop;
private LoopFragmentInside inside;
@@ -85,6 +83,7 @@
private CountedLoopInfo counted;
private LoopsData data;
private EconomicMap<Node, InductionVariable> ivs;
+ private boolean countedLoopChecked;
LoopEx(Loop<Block> loop, LoopsData data) {
this.loop = loop;
@@ -143,10 +142,12 @@
}
public boolean isCounted() {
+ assert countedLoopChecked;
return counted != null;
}
public CountedLoopInfo counted() {
+ assert countedLoopChecked;
return counted;
}
@@ -211,6 +212,10 @@
}
public boolean detectCounted() {
+ if (countedLoopChecked) {
+ return isCounted();
+ }
+ countedLoopChecked = true;
LoopBeginNode loopBegin = loopBegin();
FixedNode next = loopBegin.next();
while (next instanceof FixedGuardNode || next instanceof ValueAnchorNode || next instanceof FullInfopointNode) {
@@ -219,8 +224,8 @@
if (next instanceof IfNode) {
IfNode ifNode = (IfNode) next;
boolean negated = false;
- if (!loopBegin.isLoopExit(ifNode.falseSuccessor())) {
- if (!loopBegin.isLoopExit(ifNode.trueSuccessor())) {
+ if (!isCfgLoopExit(ifNode.falseSuccessor())) {
+ if (!isCfgLoopExit(ifNode.trueSuccessor())) {
return false;
}
negated = true;
@@ -301,7 +306,7 @@
}
break;
default:
- throw GraalError.shouldNotReachHere();
+ throw GraalError.shouldNotReachHere(condition.toString());
}
counted = new CountedLoopInfo(this, iv, ifNode, limit, oneOff, negated ? ifNode.falseSuccessor() : ifNode.trueSuccessor());
return true;
@@ -309,6 +314,11 @@
return false;
}
+ private boolean isCfgLoopExit(AbstractBeginNode begin) {
+ Block block = data.getCFG().blockFor(begin);
+ return loop.getDepth() > block.getLoopDepth() || loop.isNaturalExit(block);
+ }
+
public LoopsData loopsData() {
return data;
}
@@ -321,7 +331,7 @@
work.add(cfg.blockFor(branch));
while (!work.isEmpty()) {
Block b = work.remove();
- if (loop().getExits().contains(b)) {
+ if (loop().isLoopExit(b)) {
assert !exits.contains(b.getBeginNode());
exits.add(b.getBeginNode());
} else if (blocks.add(b.getBeginNode())) {
@@ -465,7 +475,7 @@
}
if (node instanceof FrameState) {
FrameState frameState = (FrameState) node;
- if (frameState.bci == BytecodeFrame.AFTER_EXCEPTION_BCI || frameState.bci == BytecodeFrame.UNWIND_BCI) {
+ if (frameState.isExceptionHandlingBCI()) {
return false;
}
}
--- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.loop/src/org/graalvm/compiler/loop/LoopFragment.java Tue Mar 12 09:49:10 2019 +0000
+++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.loop/src/org/graalvm/compiler/loop/LoopFragment.java Sat Mar 16 21:00:45 2019 +0000
@@ -56,6 +56,7 @@
import org.graalvm.compiler.nodes.ValueProxyNode;
import org.graalvm.compiler.nodes.VirtualState;
import org.graalvm.compiler.nodes.cfg.Block;
+import org.graalvm.compiler.nodes.cfg.ControlFlowGraph;
import org.graalvm.compiler.nodes.java.MonitorEnterNode;
import org.graalvm.compiler.nodes.spi.NodeWithState;
import org.graalvm.compiler.nodes.virtual.CommitAllocationNode;
@@ -144,7 +145,18 @@
protected abstract void beforeDuplication();
- protected abstract void finishDuplication();
+ protected void finishDuplication() {
+ LoopEx originalLoopEx = original().loop();
+ ControlFlowGraph cfg = originalLoopEx.loopsData().getCFG();
+ for (LoopExitNode exit : originalLoopEx.loopBegin().loopExits().snapshot()) {
+ if (!originalLoopEx.loop().isLoopExit(cfg.blockFor(exit))) {
+ // this LoopExitNode is too low, we need to remove it otherwise it will be below
+ // merged exits
+ exit.removeExit();
+ }
+ }
+
+ }
protected void patchNodes(final DuplicationReplacement dataFix) {
if (isDuplicate() && !nodesReady) {
@@ -388,42 +400,6 @@
};
}
- public static NodeIterable<AbstractBeginNode> toHirExits(final Iterable<Block> blocks) {
- return new NodeIterable<AbstractBeginNode>() {
-
- @Override
- public Iterator<AbstractBeginNode> iterator() {
- final Iterator<Block> it = blocks.iterator();
- return new Iterator<AbstractBeginNode>() {
-
- @Override
- public void remove() {
- throw new UnsupportedOperationException();
- }
-
- /**
- * Return the true LoopExitNode for this loop or the BeginNode for the block.
- */
- @Override
- public AbstractBeginNode next() {
- Block next = it.next();
- LoopExitNode exit = next.getLoopExit();
- if (exit != null) {
- return exit;
- }
- return next.getBeginNode();
- }
-
- @Override
- public boolean hasNext() {
- return it.hasNext();
- }
- };
- }
-
- };
- }
-
/**
* Merges the early exits (i.e. loop exits) that were duplicated as part of this fragment, with
* the original fragment's exits.
@@ -431,13 +407,12 @@
protected void mergeEarlyExits() {
assert isDuplicate();
StructuredGraph graph = graph();
- for (AbstractBeginNode earlyExit : LoopFragment.toHirBlocks(original().loop().loop().getExits())) {
- LoopExitNode loopEarlyExit = (LoopExitNode) earlyExit;
- FixedNode next = loopEarlyExit.next();
- if (loopEarlyExit.isDeleted() || !this.original().contains(loopEarlyExit)) {
+ for (AbstractBeginNode earlyExit : LoopFragment.toHirBlocks(original().loop().loop().getLoopExits())) {
+ FixedNode next = earlyExit.next();
+ if (earlyExit.isDeleted() || !this.original().contains(earlyExit)) {
continue;
}
- AbstractBeginNode newEarlyExit = getDuplicatedNode(loopEarlyExit);
+ AbstractBeginNode newEarlyExit = getDuplicatedNode(earlyExit);
if (newEarlyExit == null) {
continue;
}
@@ -446,72 +421,79 @@
EndNode newEnd = graph.add(new EndNode());
merge.addForwardEnd(originalEnd);
merge.addForwardEnd(newEnd);
- loopEarlyExit.setNext(originalEnd);
+ earlyExit.setNext(originalEnd);
newEarlyExit.setNext(newEnd);
merge.setNext(next);
- FrameState exitState = loopEarlyExit.stateAfter();
- if (exitState != null) {
- FrameState originalExitState = exitState;
- exitState = exitState.duplicateWithVirtualState();
- loopEarlyExit.setStateAfter(exitState);
- merge.setStateAfter(originalExitState);
- /*
- * Using the old exit's state as the merge's state is necessary because some of the
- * VirtualState nodes contained in the old exit's state may be shared by other
- * dominated VirtualStates. Those dominated virtual states need to see the
- * proxy->phi update that are applied below.
- *
- * We now update the original fragment's nodes accordingly:
- */
- originalExitState.applyToVirtual(node -> original.nodes.clearAndGrow(node));
- exitState.applyToVirtual(node -> original.nodes.markAndGrow(node));
+ FrameState exitState = null;
+ if (earlyExit instanceof LoopExitNode) {
+ LoopExitNode earlyLoopExit = (LoopExitNode) earlyExit;
+ exitState = earlyLoopExit.stateAfter();
+ if (exitState != null) {
+ FrameState originalExitState = exitState;
+ exitState = exitState.duplicateWithVirtualState();
+ earlyLoopExit.setStateAfter(exitState);
+ merge.setStateAfter(originalExitState);
+ /*
+ * Using the old exit's state as the merge's state is necessary because some of
+ * the VirtualState nodes contained in the old exit's state may be shared by
+ * other dominated VirtualStates. Those dominated virtual states need to see the
+ * proxy->phi update that are applied below.
+ *
+ * We now update the original fragment's nodes accordingly:
+ */
+ originalExitState.applyToVirtual(node -> original.nodes.clearAndGrow(node));
+ exitState.applyToVirtual(node -> original.nodes.markAndGrow(node));
+ }
}
- FrameState finalExitState = exitState;
- for (Node anchored : loopEarlyExit.anchored().snapshot()) {
- anchored.replaceFirstInput(loopEarlyExit, merge);
+ for (Node anchored : earlyExit.anchored().snapshot()) {
+ anchored.replaceFirstInput(earlyExit, merge);
}
- boolean newEarlyExitIsLoopExit = newEarlyExit instanceof LoopExitNode;
- for (ProxyNode vpn : loopEarlyExit.proxies().snapshot()) {
- if (vpn.hasNoUsages()) {
- continue;
- }
- if (vpn.value() == null) {
- assert vpn instanceof GuardProxyNode;
- vpn.replaceAtUsages(null);
- continue;
- }
- final ValueNode replaceWith;
- ValueNode newVpn = prim(newEarlyExitIsLoopExit ? vpn : vpn.value());
- if (newVpn != null) {
- PhiNode phi;
- if (vpn instanceof ValueProxyNode) {
- phi = graph.addWithoutUnique(new ValuePhiNode(vpn.stamp(NodeView.DEFAULT), merge));
- } else if (vpn instanceof GuardProxyNode) {
- phi = graph.addWithoutUnique(new GuardPhiNode(merge));
+ if (earlyExit instanceof LoopExitNode) {
+ LoopExitNode earlyLoopExit = (LoopExitNode) earlyExit;
+ FrameState finalExitState = exitState;
+ boolean newEarlyExitIsLoopExit = newEarlyExit instanceof LoopExitNode;
+ for (ProxyNode vpn : earlyLoopExit.proxies().snapshot()) {
+ if (vpn.hasNoUsages()) {
+ continue;
+ }
+ if (vpn.value() == null) {
+ assert vpn instanceof GuardProxyNode;
+ vpn.replaceAtUsages(null);
+ continue;
+ }
+ final ValueNode replaceWith;
+ ValueNode newVpn = prim(newEarlyExitIsLoopExit ? vpn : vpn.value());
+ if (newVpn != null) {
+ PhiNode phi;
+ if (vpn instanceof ValueProxyNode) {
+ phi = graph.addWithoutUnique(new ValuePhiNode(vpn.stamp(NodeView.DEFAULT), merge));
+ } else if (vpn instanceof GuardProxyNode) {
+ phi = graph.addWithoutUnique(new GuardPhiNode(merge));
+ } else {
+ throw GraalError.shouldNotReachHere();
+ }
+ phi.addInput(vpn);
+ phi.addInput(newVpn);
+ replaceWith = phi;
} else {
- throw GraalError.shouldNotReachHere();
+ replaceWith = vpn.value();
}
- phi.addInput(vpn);
- phi.addInput(newVpn);
- replaceWith = phi;
- } else {
- replaceWith = vpn.value();
- }
- vpn.replaceAtMatchingUsages(replaceWith, usage -> {
- if (merge.isPhiAtMerge(usage)) {
- return false;
- }
- if (usage instanceof VirtualState) {
- VirtualState stateUsage = (VirtualState) usage;
- if (finalExitState != null && finalExitState.isPartOfThisState(stateUsage)) {
+ vpn.replaceAtMatchingUsages(replaceWith, usage -> {
+ if (merge.isPhiAtMerge(usage)) {
return false;
}
- }
- return true;
- });
+ if (usage instanceof VirtualState) {
+ VirtualState stateUsage = (VirtualState) usage;
+ if (finalExitState != null && finalExitState.isPartOfThisState(stateUsage)) {
+ return false;
+ }
+ }
+ return true;
+ });
+ }
}
}
}
--- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.loop/src/org/graalvm/compiler/loop/LoopFragmentInside.java Tue Mar 12 09:49:10 2019 +0000
+++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.loop/src/org/graalvm/compiler/loop/LoopFragmentInside.java Sat Mar 16 21:00:45 2019 +0000
@@ -391,11 +391,6 @@
}
@Override
- protected void finishDuplication() {
- // TODO (gd) ?
- }
-
- @Override
protected void beforeDuplication() {
// Nothing to do
}
--- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.loop/src/org/graalvm/compiler/loop/LoopFragmentWhole.java Tue Mar 12 09:49:10 2019 +0000
+++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.loop/src/org/graalvm/compiler/loop/LoopFragmentWhole.java Sat Mar 16 21:00:45 2019 +0000
@@ -24,9 +24,7 @@
package org.graalvm.compiler.loop;
-import jdk.internal.vm.compiler.collections.EconomicSet;
import org.graalvm.compiler.core.common.cfg.Loop;
-import org.graalvm.compiler.debug.DebugContext;
import org.graalvm.compiler.graph.Graph;
import org.graalvm.compiler.graph.Graph.DuplicationReplacement;
import org.graalvm.compiler.graph.Node;
@@ -34,8 +32,6 @@
import org.graalvm.compiler.nodes.EndNode;
import org.graalvm.compiler.nodes.FixedNode;
import org.graalvm.compiler.nodes.LoopBeginNode;
-import org.graalvm.compiler.nodes.LoopExitNode;
-import org.graalvm.compiler.nodes.StructuredGraph;
import org.graalvm.compiler.nodes.ValueNode;
import org.graalvm.compiler.nodes.cfg.Block;
@@ -68,7 +64,7 @@
public NodeBitMap nodes() {
if (nodes == null) {
Loop<Block> loop = loop().loop();
- nodes = LoopFragment.computeNodes(graph(), LoopFragment.toHirBlocks(loop.getBlocks()), LoopFragment.toHirExits(loop.getExits()));
+ nodes = LoopFragment.computeNodes(graph(), LoopFragment.toHirBlocks(loop.getBlocks()), LoopFragment.toHirBlocks(loop.getLoopExits()));
}
return nodes;
}
@@ -108,46 +104,8 @@
}
@Override
- protected void finishDuplication() {
- // TODO (gd) ?
- }
-
- void cleanupLoopExits() {
- LoopBeginNode loopBegin = original().loop().loopBegin();
- assert nodes == null || nodes.contains(loopBegin);
- StructuredGraph graph = loopBegin.graph();
- if (graph.getGuardsStage() == StructuredGraph.GuardsStage.AFTER_FSA) {
- // After FrameStateAssignment ControlFlowGraph treats loop exits differently which means
- // that the LoopExitNodes can be in a block which post dominates the true loop exit. For
- // cloning to work right they must agree.
- EconomicSet<LoopExitNode> exits = EconomicSet.create();
- for (Block exitBlock : original().loop().loop().getExits()) {
- LoopExitNode exitNode = exitBlock.getLoopExit();
- if (exitNode == null) {
- exitNode = graph.add(new LoopExitNode(loopBegin));
- graph.addAfterFixed(exitBlock.getBeginNode(), exitNode);
- if (nodes != null) {
- nodes.mark(exitNode);
- }
- graph.getDebug().dump(DebugContext.VERBOSE_LEVEL, graph, "Adjusting loop exit node for %s", loopBegin);
- }
- exits.add(exitNode);
- }
- for (LoopExitNode exitNode : loopBegin.loopExits()) {
- if (!exits.contains(exitNode)) {
- if (nodes != null) {
- nodes.clear(exitNode);
- }
- graph.removeFixed(exitNode);
- }
- }
- }
-
- }
-
- @Override
protected void beforeDuplication() {
- cleanupLoopExits();
+ // nothing to do
}
@Override
--- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.loop/src/org/graalvm/compiler/loop/MathUtil.java Tue Mar 12 09:49:10 2019 +0000
+++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.loop/src/org/graalvm/compiler/loop/MathUtil.java Sat Mar 16 21:00:45 2019 +0000
@@ -88,7 +88,7 @@
if (isConstantOne(divisor)) {
return dividend;
}
- ValueNode div = graph.addOrUniqueWithInputs(createDiv.apply(dividend, divisor));
+ ValueNode div = createDiv.apply(dividend, divisor);
if (div instanceof FixedBinaryNode) {
FixedBinaryNode fixedDiv = (FixedBinaryNode) div;
if (before.predecessor() instanceof FixedBinaryNode) {
@@ -98,7 +98,7 @@
return binaryPredecessor;
}
}
- graph.addBeforeFixed(before, fixedDiv);
+ graph.addBeforeFixed(before, graph.addOrUniqueWithInputs(fixedDiv));
}
return div;
}
--- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.microbenchmarks/src/org/graalvm/compiler/microbenchmarks/lir/GraalCompilerState.java Tue Mar 12 09:49:10 2019 +0000
+++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.microbenchmarks/src/org/graalvm/compiler/microbenchmarks/lir/GraalCompilerState.java Sat Mar 16 21:00:45 2019 +0000
@@ -46,12 +46,13 @@
import org.graalvm.compiler.core.common.CompilationIdentifier;
import org.graalvm.compiler.core.common.alloc.ComputeBlockOrder;
import org.graalvm.compiler.core.common.cfg.AbstractBlockBase;
+import org.graalvm.compiler.core.gen.LIRCompilerBackend;
+import org.graalvm.compiler.core.gen.LIRGenerationProvider;
import org.graalvm.compiler.core.target.Backend;
+import org.graalvm.compiler.debug.DebugContext;
import org.graalvm.compiler.debug.DebugHandlersFactory;
-import org.graalvm.compiler.debug.DebugContext;
import org.graalvm.compiler.lir.LIR;
import org.graalvm.compiler.lir.asm.CompilationResultBuilderFactory;
-import org.graalvm.compiler.lir.framemap.FrameMapBuilder;
import org.graalvm.compiler.lir.gen.LIRGenerationResult;
import org.graalvm.compiler.lir.gen.LIRGeneratorTool;
import org.graalvm.compiler.lir.phases.AllocationPhase.AllocationContext;
@@ -88,6 +89,7 @@
import jdk.vm.ci.meta.ConstantReflectionProvider;
import jdk.vm.ci.meta.MetaAccessProvider;
import jdk.vm.ci.meta.ResolvedJavaMethod;
+import jdk.vm.ci.meta.SpeculationLog;
/**
* State providing a new copy of a graph for each invocation of a benchmark. Subclasses of this
@@ -374,10 +376,10 @@
linearScanOrder = ComputeBlockOrder.computeLinearScanOrder(blocks.length, startBlock);
LIR lir = new LIR(cfg, linearScanOrder, codeEmittingOrder, getGraphOptions(), getGraphDebug());
- FrameMapBuilder frameMapBuilder = request.backend.newFrameMapBuilder(registerConfig);
- lirGenRes = request.backend.newLIRGenerationResult(graph.compilationId(), lir, frameMapBuilder, request.graph, stub);
- lirGenTool = request.backend.newLIRGenerator(lirGenRes);
- nodeLirGen = request.backend.newNodeLIRBuilder(request.graph, lirGenTool);
+ LIRGenerationProvider lirBackend = (LIRGenerationProvider) request.backend;
+ lirGenRes = lirBackend.newLIRGenerationResult(graph.compilationId(), lir, registerConfig, request.graph, stub);
+ lirGenTool = lirBackend.newLIRGenerator(lirGenRes);
+ nodeLirGen = lirBackend.newNodeLIRBuilder(request.graph, lirGenTool);
}
protected OptionValues getGraphOptions() {
@@ -460,8 +462,10 @@
*/
protected final void emitCode() {
int bytecodeSize = request.graph.method() == null ? 0 : request.graph.getBytecodeSize();
+ SpeculationLog speculationLog = null;
request.compilationResult.setHasUnsafeAccess(request.graph.hasUnsafeAccess());
- GraalCompiler.emitCode(request.backend, request.graph.getAssumptions(), request.graph.method(), request.graph.getMethods(), request.graph.getFields(), bytecodeSize, lirGenRes,
+ LIRCompilerBackend.emitCode(request.backend, request.graph.getAssumptions(), request.graph.method(), request.graph.getMethods(), request.graph.getFields(),
+ speculationLog, bytecodeSize, lirGenRes,
request.compilationResult, request.installedCodeOwner, request.factory);
}
--- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes.test/src/org/graalvm/compiler/nodes/test/IfNodeCanonicalizationTest.java Tue Mar 12 09:49:10 2019 +0000
+++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes.test/src/org/graalvm/compiler/nodes/test/IfNodeCanonicalizationTest.java Sat Mar 16 21:00:45 2019 +0000
@@ -37,7 +37,7 @@
import org.graalvm.compiler.nodes.StructuredGraph.AllowAssumptions;
import org.graalvm.compiler.nodes.calc.SubNode;
import org.graalvm.compiler.phases.common.CanonicalizerPhase;
-import org.graalvm.compiler.phases.common.ConvertDeoptimizeToGuardPhase;
+import org.graalvm.compiler.loop.phases.ConvertDeoptimizeToGuardPhase;
import org.graalvm.compiler.phases.common.IterativeConditionalEliminationPhase;
import org.graalvm.compiler.phases.tiers.PhaseContext;
--- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/AbstractFixedGuardNode.java Tue Mar 12 09:49:10 2019 +0000
+++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/AbstractFixedGuardNode.java Sat Mar 16 21:00:45 2019 +0000
@@ -126,6 +126,14 @@
try (DebugCloseable position = this.withNodeSourcePosition()) {
FixedNode currentNext = next();
setNext(null);
+ if (currentNext instanceof AbstractBeginNode && currentNext instanceof StateSplit && ((StateSplit) currentNext).stateAfter() != null) {
+ // Force an extra BeginNode in case any guarded Nodes are inputs to the StateSplit
+ BeginNode begin = graph().add(new BeginNode());
+ begin.setNodeSourcePosition(getNoDeoptSuccessorPosition());
+ begin.setNext(currentNext);
+ currentNext = begin;
+ }
+
DeoptimizeNode deopt = graph().add(new DeoptimizeNode(action, reason, speculation));
deopt.setStateBefore(stateBefore());
IfNode ifNode;
--- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/ComputeObjectAddressNode.java Tue Mar 12 09:49:10 2019 +0000
+++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/ComputeObjectAddressNode.java Sat Mar 16 21:00:45 2019 +0000
@@ -30,6 +30,7 @@
import org.graalvm.compiler.graph.NodeClass;
import org.graalvm.compiler.nodeinfo.NodeInfo;
import org.graalvm.compiler.nodeinfo.NodeSize;
+import org.graalvm.compiler.nodes.calc.SignExtendNode;
import org.graalvm.compiler.nodes.debug.ControlFlowAnchored;
import org.graalvm.compiler.nodes.spi.Lowerable;
import org.graalvm.compiler.nodes.spi.LoweringTool;
@@ -50,7 +51,7 @@
public ComputeObjectAddressNode(ValueNode obj, ValueNode offset) {
super(TYPE, StampFactory.forKind(JavaKind.Long));
this.object = obj;
- this.offset = offset;
+ this.offset = SignExtendNode.create(offset, 64, NodeView.DEFAULT);
}
@NodeIntrinsic
--- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/ConstantNode.java Tue Mar 12 09:49:10 2019 +0000
+++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/ConstantNode.java Sat Mar 16 21:00:45 2019 +0000
@@ -54,6 +54,7 @@
import jdk.vm.ci.meta.JavaKind;
import jdk.vm.ci.meta.MetaAccessProvider;
import jdk.vm.ci.meta.PrimitiveConstant;
+import jdk.vm.ci.meta.ResolvedJavaType;
/**
* The {@code ConstantNode} represents a {@link Constant constant}.
@@ -99,6 +100,10 @@
}
}
+ public ConstantNode(@InjectedNodeParameter Stamp stamp, @InjectedNodeParameter ConstantReflectionProvider constantReflection, @ConstantNodeParameter ResolvedJavaType type) {
+ this(constantReflection.asJavaClass(type), stamp);
+ }
+
/**
* @return the constant value represented by this node
*/
@@ -546,4 +551,7 @@
}
return ConstantNode.forInt(length);
}
+
+ @NodeIntrinsic
+ public static native Class<?> forClass(@ConstantNodeParameter ResolvedJavaType type);
}
--- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/EncodedGraph.java Tue Mar 12 09:49:10 2019 +0000
+++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/EncodedGraph.java Sat Mar 16 21:00:45 2019 +0000
@@ -82,7 +82,7 @@
return startOffset;
}
- protected Object[] getObjects() {
+ public Object[] getObjects() {
return objects;
}
--- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/FrameState.java Tue Mar 12 09:49:10 2019 +0000
+++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/FrameState.java Sat Mar 16 21:00:45 2019 +0000
@@ -681,4 +681,8 @@
}
return false;
}
+
+ public boolean isExceptionHandlingBCI() {
+ return bci == BytecodeFrame.AFTER_EXCEPTION_BCI || bci == BytecodeFrame.UNWIND_BCI;
+ }
}
--- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/GraphDecoder.java Tue Mar 12 09:49:10 2019 +0000
+++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/GraphDecoder.java Sat Mar 16 21:00:45 2019 +0000
@@ -132,6 +132,7 @@
nodeStartOffsets[i] = encodedGraph.getStartOffset() - reader.getUVInt();
}
encodedGraph.nodeStartOffsets = nodeStartOffsets;
+ graph.setGuardsStage((StructuredGraph.GuardsStage) readObject(this));
}
} else {
reader = null;
@@ -1322,7 +1323,7 @@
}
protected Object readObject(MethodScope methodScope) {
- return methodScope.encodedGraph.getObjects()[methodScope.reader.getUVInt()];
+ return methodScope.encodedGraph.getObject(methodScope.reader.getUVInt());
}
/**
--- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/GraphEncoder.java Tue Mar 12 09:49:10 2019 +0000
+++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/GraphEncoder.java Sat Mar 16 21:00:45 2019 +0000
@@ -112,9 +112,13 @@
*/
public class GraphEncoder {
- /** The orderId that always represents {@code null}. */
+ /**
+ * The orderId that always represents {@code null}.
+ */
public static final int NULL_ORDER_ID = 0;
- /** The orderId of the {@link StructuredGraph#start() start node} of the encoded graph. */
+ /**
+ * The orderId of the {@link StructuredGraph#start() start node} of the encoded graph.
+ */
public static final int START_NODE_ORDER_ID = 1;
/**
* The orderId of the first actual node after the {@link StructuredGraph#start() start node}.
@@ -148,6 +152,8 @@
/** The last snapshot of {@link #nodeClasses} that was retrieved. */
protected NodeClass<?>[] nodeClassesArray;
+ protected DebugContext debug;
+
/**
* Utility method that does everything necessary to encode a single graph.
*/
@@ -160,7 +166,12 @@
}
public GraphEncoder(Architecture architecture) {
+ this(architecture, null);
+ }
+
+ public GraphEncoder(Architecture architecture, DebugContext debug) {
this.architecture = architecture;
+ this.debug = debug;
objects = FrequencyEncoder.createEqualityEncoder();
nodeClasses = FrequencyEncoder.createIdentityEncoder();
writer = UnsafeArrayTypeWriter.create(architecture.supportsUnalignedMemoryAccess());
@@ -170,6 +181,7 @@
* Must be invoked before {@link #finishPrepare()} and {@link #encode}.
*/
public void prepare(StructuredGraph graph) {
+ objects.addObject(graph.getGuardsStage());
for (Node node : graph.getNodes()) {
NodeClass<? extends Node> nodeClass = node.getNodeClass();
nodeClasses.addObject(nodeClass);
@@ -288,9 +300,10 @@
for (int i = 0; i < nodeCount; i++) {
writer.putUV(metadataStart - nodeStartOffsets[i]);
}
+ writeObjectId(graph.getGuardsStage());
/* Check that the decoding of the encode graph is the same as the input. */
- assert verifyEncoding(graph, new EncodedGraph(getEncoding(), metadataStart, getObjects(), getNodeClasses(), graph), architecture);
+ assert verifyEncoding(graph, new EncodedGraph(getEncoding(), metadataStart, getObjects(), getNodeClasses(), graph));
return metadataStart;
}
@@ -434,10 +447,10 @@
* original graph.
*/
@SuppressWarnings("try")
- public static boolean verifyEncoding(StructuredGraph originalGraph, EncodedGraph encodedGraph, Architecture architecture) {
- DebugContext debug = originalGraph.getDebug();
+ public boolean verifyEncoding(StructuredGraph originalGraph, EncodedGraph encodedGraph) {
+ DebugContext debugContext = debug != null ? debug : originalGraph.getDebug();
// @formatter:off
- StructuredGraph decodedGraph = new StructuredGraph.Builder(originalGraph.getOptions(), debug, AllowAssumptions.YES).
+ StructuredGraph decodedGraph = new StructuredGraph.Builder(originalGraph.getOptions(), debugContext, AllowAssumptions.YES).
method(originalGraph.method()).
setIsSubstitution(originalGraph.isSubstitution()).
trackNodeSourcePosition(originalGraph.trackNodeSourcePosition()).
@@ -451,9 +464,9 @@
GraphComparison.verifyGraphsEqual(originalGraph, decodedGraph);
} catch (Throwable ex) {
originalGraph.getDebug();
- try (DebugContext.Scope scope = debug.scope("GraphEncoder")) {
- debug.dump(DebugContext.VERBOSE_LEVEL, originalGraph, "Original Graph");
- debug.dump(DebugContext.VERBOSE_LEVEL, decodedGraph, "Decoded Graph");
+ try (DebugContext.Scope scope = debugContext.scope("GraphEncoder")) {
+ debugContext.dump(DebugContext.VERBOSE_LEVEL, originalGraph, "Original Graph");
+ debugContext.dump(DebugContext.VERBOSE_LEVEL, decodedGraph, "Decoded Graph");
}
throw ex;
}
--- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/IfNode.java Tue Mar 12 09:49:10 2019 +0000
+++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/IfNode.java Sat Mar 16 21:00:45 2019 +0000
@@ -78,6 +78,7 @@
import jdk.vm.ci.meta.PrimitiveConstant;
import jdk.vm.ci.meta.ResolvedJavaMethod;
import jdk.vm.ci.meta.ResolvedJavaType;
+import jdk.vm.ci.meta.TriState;
/**
* The {@code IfNode} represents a branch that can go one of two directions depending on the outcome
@@ -868,6 +869,30 @@
}
}
+ private ValueNode canonicalizeConditionalViaImplies(ValueNode trueValue, ValueNode falseValue) {
+ ValueNode collapsedTrue = trueValue;
+ ValueNode collapsedFalse = falseValue;
+ boolean simplify = false;
+ if (trueValue instanceof ConditionalNode) {
+ TriState result = condition().implies(false, ((ConditionalNode) trueValue).condition());
+ if (result.isKnown()) {
+ simplify = true;
+ collapsedTrue = result.toBoolean() ? ((ConditionalNode) trueValue).trueValue() : ((ConditionalNode) trueValue).falseValue();
+ }
+ }
+ if (falseValue instanceof ConditionalNode) {
+ TriState result = condition().implies(true, ((ConditionalNode) falseValue).condition());
+ if (result.isKnown()) {
+ simplify = true;
+ collapsedFalse = result.toBoolean() ? ((ConditionalNode) falseValue).trueValue() : ((ConditionalNode) falseValue).falseValue();
+ }
+ }
+ if (simplify) {
+ return graph().unique(new ConditionalNode(condition(), collapsedTrue, collapsedFalse));
+ }
+ return null;
+ }
+
private ValueNode canonicalizeConditionalCascade(SimplifierTool tool, ValueNode trueValue, ValueNode falseValue) {
if (trueValue.getStackKind() != falseValue.getStackKind()) {
return null;
@@ -877,7 +902,16 @@
}
if (trueValue.isConstant() && falseValue.isConstant()) {
return graph().unique(new ConditionalNode(condition(), trueValue, falseValue));
- } else if (!graph().isAfterExpandLogic()) {
+ }
+ ValueNode value = canonicalizeConditionalViaImplies(trueValue, falseValue);
+ if (value != null) {
+ return value;
+ }
+ if (!graph().isAfterExpandLogic()) {
+ /*
+ * !isAfterExpandLogic() => Cannot spawn NormalizeCompareNodes after lowering in the
+ * ExpandLogicPhase.
+ */
ConditionalNode conditional = null;
ValueNode constant = null;
boolean negateCondition;
@@ -905,8 +939,11 @@
double shortCutProbability = probability(trueSuccessor());
LogicNode newCondition = LogicNode.or(condition(), negateCondition, conditional.condition(), negateConditionalCondition, shortCutProbability);
return graph().unique(new ConditionalNode(newCondition, constant, otherValue));
- } else if (constant.isJavaConstant() && conditional.trueValue().isJavaConstant() && conditional.falseValue().isJavaConstant() && condition() instanceof CompareNode &&
+ }
+
+ if (constant.isJavaConstant() && conditional.trueValue().isJavaConstant() && conditional.falseValue().isJavaConstant() && condition() instanceof CompareNode &&
conditional.condition() instanceof CompareNode) {
+
Condition cond1 = ((CompareNode) condition()).condition().asCondition();
if (negateCondition) {
cond1 = cond1.negate();
@@ -923,27 +960,19 @@
sameVars = true;
cond2 = cond2.mirror();
}
- // cond2 is EQ, LT, or GT
if (sameVars) {
JavaKind stackKind = conditional.trueValue().stamp(NodeView.from(tool)).getStackKind();
assert !stackKind.isNumericFloat();
- long c1 = constant.asJavaConstant().asLong();
- long c2 = conditional.trueValue().asJavaConstant().asLong();
- long c3 = conditional.falseValue().asJavaConstant().asLong();
- // `x cond1 y ? c1 : (x cond2 y ? c2 : c3)`
- if (cond1 == Condition.GE && cond2 == Condition.LT) {
- // x >= y ? v1 : (x < y ? v2 : v3) => x >= y ? v1 : v2
- return graph().unique(new ConditionalNode(condition(), conditional.trueValue(), constant));
- } else if (cond1 == Condition.GE && cond2 == Condition.GT) {
- // x >= y ? v1 : (x > y ? v2 : v3) => x >= y ? v1 : v3
- return graph().unique(new ConditionalNode(condition(), conditional.falseValue(), constant));
- } else if (cond1 == Condition.EQ && cond2 == Condition.EQ) {
- // x == y ? v1 : (x == y ? v2 : v3) => x == y ? v1 : v3
- return graph().unique(new ConditionalNode(condition(), conditional.falseValue(), constant));
- } else if (cond1 == Condition.NE && cond2 == Condition.LT) {
- // x != y ? v1 : (x < y ? v2 : v3) => x != y ? v1 : v3
- return graph().unique(new ConditionalNode(condition(), conditional.falseValue(), constant));
- } else if (cond1 == Condition.LT && cond2 == Condition.EQ && c1 == -1 && c2 == 0 && c3 == 1) {
+
+ ValueNode v1 = constant;
+ ValueNode v2 = conditional.trueValue();
+ ValueNode v3 = conditional.falseValue();
+
+ long c1 = v1.asJavaConstant().asLong();
+ long c2 = v2.asJavaConstant().asLong();
+ long c3 = v3.asJavaConstant().asLong();
+
+ if (cond1 == Condition.LT && cond2 == Condition.EQ && c1 == -1 && c2 == 0 && c3 == 1) {
// x < y ? -1 : (x == y ? 0 : 1) => x cmp y
return graph().unique(new NormalizeCompareNode(x, y, stackKind, false));
} else if (cond1 == Condition.LT && cond2 == Condition.EQ && c1 == 1 && c2 == 0 && c3 == -1) {
--- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/LogicNode.java Tue Mar 12 09:49:10 2019 +0000
+++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/LogicNode.java Sat Mar 16 21:00:45 2019 +0000
@@ -91,6 +91,18 @@
* @param other the other condition.
*/
public TriState implies(boolean thisNegated, LogicNode other) {
+ if (this == other) {
+ return TriState.get(!thisNegated);
+ }
+ if (other instanceof LogicNegationNode) {
+ return flip(this.implies(thisNegated, ((LogicNegationNode) other).getValue()));
+ }
return TriState.UNKNOWN;
}
+
+ private static TriState flip(TriState triState) {
+ return triState.isUnknown()
+ ? triState
+ : TriState.get(!triState.toBoolean());
+ }
}
--- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/LoopBeginNode.java Tue Mar 12 09:49:10 2019 +0000
+++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/LoopBeginNode.java Sat Mar 16 21:00:45 2019 +0000
@@ -53,6 +53,7 @@
protected int inversionCount;
protected LoopType loopType;
protected int unrollFactor;
+ protected boolean osrLoop;
public enum LoopType {
SIMPLE_LOOP,
@@ -303,11 +304,6 @@
return begin instanceof LoopExitNode && ((LoopExitNode) begin).loopBegin() == this;
}
- public LoopExitNode getSingleLoopExit() {
- assert loopExits().count() == 1;
- return loopExits().first();
- }
-
public LoopEndNode getSingleLoopEnd() {
assert loopEnds().count() == 1;
return loopEnds().first();
@@ -317,12 +313,7 @@
public void removeExits() {
for (LoopExitNode loopexit : loopExits().snapshot()) {
try (DebugCloseable position = graph().withNodeSourcePosition(loopexit)) {
- loopexit.removeProxies();
- FrameState loopStateAfter = loopexit.stateAfter();
- graph().replaceFixedWithFixed(loopexit, graph().add(new BeginNode()));
- if (loopStateAfter != null) {
- GraphUtil.tryKillUnused(loopStateAfter);
- }
+ loopexit.removeExit();
}
}
}
@@ -415,4 +406,12 @@
}
}
}
+
+ public void markOsrLoop() {
+ osrLoop = true;
+ }
+
+ public boolean isOsrLoop() {
+ return osrLoop;
+ }
}
--- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/LoopExitNode.java Tue Mar 12 09:49:10 2019 +0000
+++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/LoopExitNode.java Sat Mar 16 21:00:45 2019 +0000
@@ -35,6 +35,7 @@
import org.graalvm.compiler.graph.spi.Simplifiable;
import org.graalvm.compiler.graph.spi.SimplifierTool;
import org.graalvm.compiler.nodeinfo.NodeInfo;
+import org.graalvm.compiler.nodes.util.GraphUtil;
@NodeInfo(allowedUsageTypes = {Association}, cycles = CYCLES_0, size = SIZE_0)
public final class LoopExitNode extends BeginStateSplitNode implements IterableNodeType, Simplifiable {
@@ -102,6 +103,15 @@
});
}
+ public void removeExit() {
+ this.removeProxies();
+ FrameState loopStateAfter = this.stateAfter();
+ graph().replaceFixedWithFixed(this, graph().add(new BeginNode()));
+ if (loopStateAfter != null) {
+ GraphUtil.tryKillUnused(loopStateAfter);
+ }
+ }
+
@Override
public void simplify(SimplifierTool tool) {
Node prev = this.predecessor();
--- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/PiNode.java Tue Mar 12 09:49:10 2019 +0000
+++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/PiNode.java Sat Mar 16 21:00:45 2019 +0000
@@ -32,6 +32,7 @@
import org.graalvm.compiler.core.common.type.Stamp;
import org.graalvm.compiler.core.common.type.StampFactory;
import org.graalvm.compiler.core.common.type.TypeReference;
+import org.graalvm.compiler.debug.DebugContext;
import org.graalvm.compiler.graph.IterableNodeType;
import org.graalvm.compiler.graph.Node;
import org.graalvm.compiler.graph.NodeClass;
@@ -100,7 +101,7 @@
}
public static ValueNode create(ValueNode object, Stamp stamp) {
- ValueNode value = canonical(object, stamp, null);
+ ValueNode value = canonical(object, stamp, null, null);
if (value != null) {
return value;
}
@@ -108,7 +109,7 @@
}
public static ValueNode create(ValueNode object, Stamp stamp, ValueNode guard) {
- ValueNode value = canonical(object, stamp, (GuardingNode) guard);
+ ValueNode value = canonical(object, stamp, (GuardingNode) guard, null);
if (value != null) {
return value;
}
@@ -117,7 +118,7 @@
public static ValueNode create(ValueNode object, ValueNode guard) {
Stamp stamp = AbstractPointerStamp.pointerNonNull(object.stamp(NodeView.DEFAULT));
- ValueNode value = canonical(object, stamp, (GuardingNode) guard);
+ ValueNode value = canonical(object, stamp, (GuardingNode) guard, null);
if (value != null) {
return value;
}
@@ -127,7 +128,7 @@
@SuppressWarnings("unused")
public static boolean intrinsify(GraphBuilderContext b, ResolvedJavaMethod method, ValueNode object, ValueNode guard) {
Stamp stamp = AbstractPointerStamp.pointerNonNull(object.stamp(NodeView.DEFAULT));
- ValueNode value = canonical(object, stamp, (GuardingNode) guard);
+ ValueNode value = canonical(object, stamp, (GuardingNode) guard, null);
if (value == null) {
value = new PiNode(object, stamp, guard);
}
@@ -139,7 +140,7 @@
public static boolean intrinsify(GraphBuilderContext b, ResolvedJavaMethod method, ValueNode object, ResolvedJavaType toType, boolean exactType, boolean nonNull) {
Stamp stamp = StampFactory.object(exactType ? TypeReference.createExactTrusted(toType) : TypeReference.createWithoutAssumptions(toType),
nonNull || StampTool.isPointerNonNull(object.stamp(NodeView.DEFAULT)));
- ValueNode value = canonical(object, stamp, null);
+ ValueNode value = canonical(object, stamp, null, null);
if (value == null) {
value = new PiNode(object, stamp);
}
@@ -177,13 +178,16 @@
ValueNode alias = tool.getAlias(object());
if (alias instanceof VirtualObjectNode) {
VirtualObjectNode virtual = (VirtualObjectNode) alias;
- if (StampTool.typeOrNull(this) != null && StampTool.typeOrNull(this).isAssignableFrom(virtual.type())) {
+ ResolvedJavaType type = StampTool.typeOrNull(this, tool.getMetaAccess());
+ if (type != null && type.isAssignableFrom(virtual.type())) {
tool.replaceWithVirtual(virtual);
+ } else {
+ tool.getDebug().log(DebugContext.INFO_LEVEL, "could not virtualize Pi because of type mismatch: %s %s vs %s", this, type, virtual.type());
}
}
}
- public static ValueNode canonical(ValueNode object, Stamp stamp, GuardingNode guard) {
+ public static ValueNode canonical(ValueNode object, Stamp stamp, GuardingNode guard, PiNode self) {
// Use most up to date stamp.
Stamp computedStamp = stamp.improveWith(object.stamp(NodeView.DEFAULT));
@@ -201,8 +205,9 @@
}
} else {
for (Node n : guard.asNode().usages()) {
- if (n instanceof PiNode) {
+ if (n instanceof PiNode && n != self) {
PiNode otherPi = (PiNode) n;
+ assert otherPi.guard == guard;
if (object == otherPi.object() && computedStamp.equals(otherPi.stamp(NodeView.DEFAULT))) {
/*
* Two PiNodes with the same guard and same result, so return the one with
@@ -221,7 +226,7 @@
@Override
public Node canonical(CanonicalizerTool tool) {
- Node value = canonical(object(), stamp(NodeView.DEFAULT), getGuard());
+ Node value = canonical(object(), piStamp(), getGuard(), this);
if (value != null) {
return value;
}
--- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/calc/BinaryArithmeticNode.java Tue Mar 12 09:49:10 2019 +0000
+++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/calc/BinaryArithmeticNode.java Sat Mar 16 21:00:45 2019 +0000
@@ -90,6 +90,26 @@
if (result != null) {
return result;
}
+ if (forX instanceof ConditionalNode && forY.isConstant() && forX.hasExactlyOneUsage()) {
+ ConditionalNode conditionalNode = (ConditionalNode) forX;
+ BinaryOp<OP> arithmeticOp = getArithmeticOp();
+ ConstantNode trueConstant = tryConstantFold(arithmeticOp, conditionalNode.trueValue(), forY, this.stamp(view), view);
+ if (trueConstant != null) {
+ ConstantNode falseConstant = tryConstantFold(arithmeticOp, conditionalNode.falseValue(), forY, this.stamp(view), view);
+ if (falseConstant != null) {
+ // @formatter:off
+ /* The arithmetic is folded into a constant on both sides of the conditional.
+ * Example:
+ * (cond ? -5 : 5) + 100
+ * canonicalizes to:
+ * (cond ? 95 : 105)
+ */
+ // @formatter:on
+ return ConditionalNode.create(conditionalNode.condition, trueConstant,
+ falseConstant, view);
+ }
+ }
+ }
return this;
}
@@ -118,6 +138,10 @@
return AddNode.create(v1, v2, view);
}
+ public static ValueNode add(ValueNode v1, ValueNode v2) {
+ return add(v1, v2, NodeView.DEFAULT);
+ }
+
public static ValueNode mul(StructuredGraph graph, ValueNode v1, ValueNode v2, NodeView view) {
return graph.addOrUniqueWithInputs(MulNode.create(v1, v2, view));
}
@@ -126,6 +150,10 @@
return MulNode.create(v1, v2, view);
}
+ public static ValueNode mul(ValueNode v1, ValueNode v2) {
+ return mul(v1, v2, NodeView.DEFAULT);
+ }
+
public static ValueNode sub(StructuredGraph graph, ValueNode v1, ValueNode v2, NodeView view) {
return graph.addOrUniqueWithInputs(SubNode.create(v1, v2, view));
}
@@ -134,6 +162,10 @@
return SubNode.create(v1, v2, view);
}
+ public static ValueNode sub(ValueNode v1, ValueNode v2) {
+ return sub(v1, v2, NodeView.DEFAULT);
+ }
+
public static ValueNode branchlessMin(ValueNode v1, ValueNode v2, NodeView view) {
if (v1.isDefaultConstant() && !v2.isDefaultConstant()) {
return branchlessMin(v2, v1, view);
--- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/calc/IntegerDivRemNode.java Tue Mar 12 09:49:10 2019 +0000
+++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/calc/IntegerDivRemNode.java Sat Mar 16 21:00:45 2019 +0000
@@ -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
--- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/calc/IntegerEqualsNode.java Tue Mar 12 09:49:10 2019 +0000
+++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/calc/IntegerEqualsNode.java Sat Mar 16 21:00:45 2019 +0000
@@ -165,15 +165,19 @@
ValueNode v1 = null;
ValueNode v2 = null;
if (addX.getX() == addY.getX()) {
+ // (x + y) == (x + z) => y == z
v1 = addX.getY();
v2 = addY.getY();
} else if (addX.getX() == addY.getY()) {
+ // (x + y) == (z + x) => y == z
v1 = addX.getY();
v2 = addY.getX();
} else if (addX.getY() == addY.getX()) {
+ // (y + x) == (x + z) => y == z
v1 = addX.getX();
v2 = addY.getY();
} else if (addX.getY() == addY.getY()) {
+ // (y + x) == (z + x) => y == z
v1 = addX.getX();
v2 = addY.getX();
}
@@ -183,6 +187,64 @@
}
}
+ if (forX instanceof SubNode && forY instanceof SubNode) {
+ SubNode subX = (SubNode) forX;
+ SubNode subY = (SubNode) forY;
+ ValueNode v1 = null;
+ ValueNode v2 = null;
+ if (subX.getX() == subY.getX()) {
+ // (x - y) == (x - z) => y == z
+ v1 = subX.getY();
+ v2 = subY.getY();
+ } else if (subX.getY() == subY.getY()) {
+ // (y - x) == (z - x) => y == z
+ v1 = subX.getX();
+ v2 = subY.getX();
+ }
+ if (v1 != null) {
+ assert v2 != null;
+ return create(v1, v2, view);
+ }
+ }
+
+ if (forX instanceof AddNode) {
+ AddNode addNode = (AddNode) forX;
+ if (addNode.getX() == forY) {
+ // (x + y) == x => y == 0
+ return create(addNode.getY(), ConstantNode.forIntegerStamp(view.stamp(addNode), 0), view);
+ } else if (addNode.getY() == forY) {
+ // (x + y) == y => x == 0
+ return create(addNode.getX(), ConstantNode.forIntegerStamp(view.stamp(addNode), 0), view);
+ }
+ }
+
+ if (forY instanceof AddNode) {
+ AddNode addNode = (AddNode) forY;
+ if (addNode.getX() == forX) {
+ // x == (x + y) => y == 0
+ return create(addNode.getY(), ConstantNode.forIntegerStamp(view.stamp(addNode), 0), view);
+ } else if (addNode.getY() == forX) {
+ // y == (x + y) => x == 0
+ return create(addNode.getX(), ConstantNode.forIntegerStamp(view.stamp(addNode), 0), view);
+ }
+ }
+
+ if (forX instanceof SubNode) {
+ SubNode subNode = (SubNode) forX;
+ if (subNode.getX() == forY) {
+ // (x - y) == x => y == 0
+ return create(subNode.getY(), ConstantNode.forIntegerStamp(view.stamp(subNode), 0), view);
+ }
+ }
+
+ if (forY instanceof SubNode) {
+ SubNode subNode = (SubNode) forY;
+ if (forX == subNode.getX()) {
+ // x == (x - y) => y == 0
+ return create(subNode.getY(), ConstantNode.forIntegerStamp(view.stamp(subNode), 0), view);
+ }
+ }
+
return super.canonical(constantReflection, metaAccess, options, smallestCompareWidth, condition, unorderedIsTrue, forX, forY, view);
}
@@ -306,4 +368,19 @@
}
return TriState.UNKNOWN;
}
+
+ @Override
+ public TriState implies(boolean thisNegated, LogicNode other) {
+ // x == y => !(x < y)
+ // x == y => !(y < x)
+ if (!thisNegated && other instanceof IntegerLessThanNode) {
+ ValueNode otherX = ((IntegerLessThanNode) other).getX();
+ ValueNode otherY = ((IntegerLessThanNode) other).getY();
+ if ((getX() == otherX && getY() == otherY) || (getX() == otherY && getY() == otherX)) {
+ return TriState.FALSE;
+ }
+ }
+
+ return super.implies(thisNegated, other);
+ }
}
--- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/calc/IntegerLessThanNode.java Tue Mar 12 09:49:10 2019 +0000
+++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/calc/IntegerLessThanNode.java Sat Mar 16 21:00:45 2019 +0000
@@ -50,6 +50,7 @@
import jdk.vm.ci.meta.JavaKind;
import jdk.vm.ci.meta.MetaAccessProvider;
import jdk.vm.ci.meta.PrimitiveConstant;
+import jdk.vm.ci.meta.TriState;
@NodeInfo(shortName = "<")
public final class IntegerLessThanNode extends IntegerLowerThanNode {
@@ -225,7 +226,6 @@
}
}
}
-
}
}
@@ -296,4 +296,29 @@
return StampFactory.forInteger(bits, cast(min, bits), cast(max, bits));
}
}
+
+ @Override
+ public TriState implies(boolean thisNegated, LogicNode other) {
+ if (!thisNegated) {
+ if (other instanceof IntegerLessThanNode) {
+ ValueNode otherX = ((IntegerLessThanNode) other).getX();
+ ValueNode otherY = ((IntegerLessThanNode) other).getY();
+ // x < y => !y < x
+ if (getX() == otherY && getY() == otherX) {
+ return TriState.FALSE;
+ }
+ }
+
+ // x < y => !x == y
+ // x < y => !y == x
+ if (other instanceof IntegerEqualsNode) {
+ ValueNode otherX = ((IntegerEqualsNode) other).getX();
+ ValueNode otherY = ((IntegerEqualsNode) other).getY();
+ if ((getX() == otherX && getY() == otherY) || (getX() == otherY && getY() == otherX)) {
+ return TriState.FALSE;
+ }
+ }
+ }
+ return super.implies(thisNegated, other);
+ }
}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/calc/IntegerMulHighNode.java Sat Mar 16 21:00:45 2019 +0000
@@ -0,0 +1,92 @@
+/*
+ * 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
+ * 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.
+ */
+
+
+package org.graalvm.compiler.nodes.calc;
+
+import static org.graalvm.compiler.nodeinfo.NodeCycles.CYCLES_2;
+import static org.graalvm.compiler.nodeinfo.NodeSize.SIZE_2;
+
+import org.graalvm.compiler.core.common.type.ArithmeticOpTable;
+import org.graalvm.compiler.core.common.type.ArithmeticOpTable.BinaryOp.MulHigh;
+import org.graalvm.compiler.graph.NodeClass;
+import org.graalvm.compiler.graph.spi.Canonicalizable;
+import org.graalvm.compiler.graph.spi.CanonicalizerTool;
+import org.graalvm.compiler.lir.gen.ArithmeticLIRGeneratorTool;
+import org.graalvm.compiler.nodeinfo.NodeInfo;
+import org.graalvm.compiler.nodes.ConstantNode;
+import org.graalvm.compiler.nodes.NodeView;
+import org.graalvm.compiler.nodes.ValueNode;
+import org.graalvm.compiler.nodes.spi.NodeLIRBuilderTool;
+
+import jdk.vm.ci.meta.Constant;
+import jdk.vm.ci.meta.PrimitiveConstant;
+import jdk.vm.ci.meta.Value;
+
+@NodeInfo(shortName = "*H", cycles = CYCLES_2, size = SIZE_2)
+public final class IntegerMulHighNode extends BinaryArithmeticNode<MulHigh> implements Canonicalizable.BinaryCommutative<ValueNode> {
+ public static final NodeClass<IntegerMulHighNode> TYPE = NodeClass.create(IntegerMulHighNode.class);
+
+ public IntegerMulHighNode(ValueNode x, ValueNode y) {
+ super(TYPE, ArithmeticOpTable::getMulHigh, x, y);
+ }
+
+ @Override
+ public void generate(NodeLIRBuilderTool nodeValueMap, ArithmeticLIRGeneratorTool gen) {
+ Value a = nodeValueMap.operand(getX());
+ Value b = nodeValueMap.operand(getY());
+ nodeValueMap.setResult(this, gen.emitMulHigh(a, b));
+ }
+
+ @Override
+ public ValueNode canonical(CanonicalizerTool tool, ValueNode forX, ValueNode forY) {
+ ValueNode ret = super.canonical(tool, forX, forY);
+ if (ret != this) {
+ return ret;
+ }
+
+ if (forX.isConstant() && !forY.isConstant()) {
+ // we try to swap and canonicalize
+ ValueNode improvement = canonical(tool, forY, forX);
+ if (improvement != this) {
+ return improvement;
+ }
+ // if this fails we only swap
+ return new IntegerMulHighNode(forY, forX);
+ }
+ return canonical(this, forY);
+ }
+
+ private static ValueNode canonical(IntegerMulHighNode self, ValueNode forY) {
+ if (forY.isConstant()) {
+ Constant c = forY.asConstant();
+ if (c instanceof PrimitiveConstant && ((PrimitiveConstant) c).getJavaKind().isNumericInteger()) {
+ long i = ((PrimitiveConstant) c).asLong();
+ if (i == 0 || i == 1) {
+ return ConstantNode.forIntegerStamp(self.stamp(NodeView.DEFAULT), 0);
+ }
+ }
+ }
+ return self;
+ }
+}
--- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/calc/IsNullNode.java Tue Mar 12 09:49:10 2019 +0000
+++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/calc/IsNullNode.java Sat Mar 16 21:00:45 2019 +0000
@@ -35,7 +35,6 @@
import org.graalvm.compiler.nodes.LogicConstantNode;
import org.graalvm.compiler.nodes.LogicNode;
import org.graalvm.compiler.nodes.NodeView;
-import org.graalvm.compiler.nodes.PiNode;
import org.graalvm.compiler.nodes.UnaryOpLogicNode;
import org.graalvm.compiler.nodes.ValueNode;
import org.graalvm.compiler.nodes.spi.LIRLowerable;
@@ -43,7 +42,6 @@
import org.graalvm.compiler.nodes.spi.Virtualizable;
import org.graalvm.compiler.nodes.spi.VirtualizerTool;
import org.graalvm.compiler.nodes.type.StampTool;
-import org.graalvm.compiler.nodes.util.GraphUtil;
import jdk.vm.ci.meta.JavaConstant;
import jdk.vm.ci.meta.TriState;
@@ -106,11 +104,6 @@
return LogicConstantNode.contradiction();
}
- if (value instanceof PiNode) {
- value = GraphUtil.skipPi(value);
- continue;
- }
-
if (value instanceof ConvertNode) {
ConvertNode convertNode = (ConvertNode) value;
if (convertNode.mayNullCheckSkipConversion()) {
--- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/calc/RightShiftNode.java Tue Mar 12 09:49:10 2019 +0000
+++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/calc/RightShiftNode.java Sat Mar 16 21:00:45 2019 +0000
@@ -83,6 +83,15 @@
return new UnsignedRightShiftNode(forX, forY);
}
+ Stamp xStampGeneric = forX.stamp(view);
+ if (xStampGeneric instanceof IntegerStamp) {
+ IntegerStamp xStamp = (IntegerStamp) xStampGeneric;
+ if (xStamp.lowerBound() >= -1 && xStamp.upperBound() <= 0) {
+ // Right shift by any amount does not change any bit.
+ return forX;
+ }
+ }
+
if (forY.isConstant()) {
int amount = forY.asJavaConstant().asInt();
int originalAmout = amount;
@@ -91,6 +100,16 @@
if (amount == 0) {
return forX;
}
+
+ if (xStampGeneric instanceof IntegerStamp) {
+ IntegerStamp xStamp = (IntegerStamp) xStampGeneric;
+
+ if (xStamp.lowerBound() >> amount == xStamp.upperBound() >> amount) {
+ // Right shift turns the result of the expression into a constant.
+ return ConstantNode.forIntegerKind(stamp.getStackKind(), xStamp.lowerBound() >> amount);
+ }
+ }
+
if (forX instanceof ShiftNode) {
ShiftNode<?> other = (ShiftNode<?>) forX;
if (other.getY().isConstant()) {
--- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/calc/SignedDivNode.java Tue Mar 12 09:49:10 2019 +0000
+++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/calc/SignedDivNode.java Sat Mar 16 21:00:45 2019 +0000
@@ -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
@@ -44,7 +44,7 @@
public static final NodeClass<SignedDivNode> TYPE = NodeClass.create(SignedDivNode.class);
- protected SignedDivNode(ValueNode x, ValueNode y, GuardingNode zeroCheck) {
+ public SignedDivNode(ValueNode x, ValueNode y, GuardingNode zeroCheck) {
this(TYPE, x, y, zeroCheck);
}
@@ -118,8 +118,8 @@
}
long abs = Math.abs(c);
if (CodeUtil.isPowerOf2(abs) && forX.stamp(view) instanceof IntegerStamp) {
+ IntegerStamp stampX = (IntegerStamp) forX.stamp(view);
ValueNode dividend = forX;
- IntegerStamp stampX = (IntegerStamp) forX.stamp(view);
int log2 = CodeUtil.log2(abs);
// no rounding if dividend is positive or if its low bits are always 0
if (stampX.canBeNegative() || (stampX.upMask() & (abs - 1)) != 0) {
--- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/calc/SignedRemNode.java Tue Mar 12 09:49:10 2019 +0000
+++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/calc/SignedRemNode.java Sat Mar 16 21:00:45 2019 +0000
@@ -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
@@ -26,6 +26,7 @@
import org.graalvm.compiler.core.common.type.IntegerStamp;
import org.graalvm.compiler.core.common.type.Stamp;
+import org.graalvm.compiler.graph.Node;
import org.graalvm.compiler.graph.NodeClass;
import org.graalvm.compiler.graph.spi.CanonicalizerTool;
import org.graalvm.compiler.nodeinfo.NodeInfo;
@@ -37,13 +38,15 @@
import org.graalvm.compiler.nodes.spi.NodeLIRBuilderTool;
import jdk.vm.ci.code.CodeUtil;
+import jdk.vm.ci.meta.Constant;
+import jdk.vm.ci.meta.PrimitiveConstant;
@NodeInfo(shortName = "%")
public class SignedRemNode extends IntegerDivRemNode implements LIRLowerable {
public static final NodeClass<SignedRemNode> TYPE = NodeClass.create(SignedRemNode.class);
- protected SignedRemNode(ValueNode x, ValueNode y, GuardingNode zeroCheck) {
+ public SignedRemNode(ValueNode x, ValueNode y, GuardingNode zeroCheck) {
this(TYPE, x, y, zeroCheck);
}
@@ -53,7 +56,7 @@
public static ValueNode create(ValueNode x, ValueNode y, GuardingNode zeroCheck, NodeView view) {
Stamp stamp = IntegerStamp.OPS.getRem().foldStamp(x.stamp(view), y.stamp(view));
- return canonical(null, x, y, zeroCheck, stamp, view);
+ return canonical(null, x, y, zeroCheck, stamp, view, null);
}
@Override
@@ -64,10 +67,10 @@
@Override
public ValueNode canonical(CanonicalizerTool tool, ValueNode forX, ValueNode forY) {
NodeView view = NodeView.from(tool);
- return canonical(this, forX, forY, getZeroCheck(), stamp(view), view);
+ return canonical(this, forX, forY, getZeroCheck(), stamp(view), view, tool);
}
- private static ValueNode canonical(SignedRemNode self, ValueNode forX, ValueNode forY, GuardingNode zeroCheck, Stamp stamp, NodeView view) {
+ private static ValueNode canonical(SignedRemNode self, ValueNode forX, ValueNode forY, GuardingNode zeroCheck, Stamp stamp, NodeView view, CanonicalizerTool tool) {
if (forX.isConstant() && forY.isConstant()) {
long y = forY.asJavaConstant().asLong();
if (y == 0) {
@@ -81,27 +84,52 @@
IntegerStamp yStamp = (IntegerStamp) forY.stamp(view);
if (constY < 0 && constY != CodeUtil.minValue(yStamp.getBits())) {
Stamp newStamp = IntegerStamp.OPS.getRem().foldStamp(forX.stamp(view), forY.stamp(view));
- return canonical(null, forX, ConstantNode.forIntegerStamp(yStamp, -constY), zeroCheck, newStamp, view);
+ return canonical(null, forX, ConstantNode.forIntegerStamp(yStamp, -constY), zeroCheck, newStamp, view, tool);
}
if (constY == 1) {
return ConstantNode.forIntegerStamp(stamp, 0);
- } else if (CodeUtil.isPowerOf2(constY)) {
- if (xStamp.isPositive()) {
- // x & (y - 1)
- return new AndNode(forX, ConstantNode.forIntegerStamp(stamp, constY - 1));
- } else if (xStamp.isNegative()) {
- // -((-x) & (y - 1))
- return new NegateNode(new AndNode(new NegateNode(forX), ConstantNode.forIntegerStamp(stamp, constY - 1)));
+ } else if (CodeUtil.isPowerOf2(constY) && tool != null && tool.allUsagesAvailable()) {
+ if (allUsagesCompareAgainstZero(self)) {
+ // x % y == 0 <=> (x & (y-1)) == 0
+ return new AndNode(forX, ConstantNode.forIntegerStamp(yStamp, constY - 1));
} else {
- // x - ((x / y) << log2(y))
- return SubNode.create(forX, LeftShiftNode.create(SignedDivNode.canonical(forX, constY, view), ConstantNode.forInt(CodeUtil.log2(constY)), view), view);
+ if (xStamp.isPositive()) {
+ // x & (y - 1)
+ return new AndNode(forX, ConstantNode.forIntegerStamp(stamp, constY - 1));
+ } else if (xStamp.isNegative()) {
+ // -((-x) & (y - 1))
+ return new NegateNode(new AndNode(new NegateNode(forX), ConstantNode.forIntegerStamp(stamp, constY - 1)));
+ }
}
}
}
return self != null ? self : new SignedRemNode(forX, forY, zeroCheck);
}
+ private static boolean allUsagesCompareAgainstZero(SignedRemNode self) {
+ int compareAgainstZero = 0;
+ int usageCount = self.getUsageCount();
+ for (int i = 0; i < usageCount; i++) {
+ Node usage = self.getUsageAt(i);
+ if (usage instanceof IntegerEqualsNode) {
+ IntegerEqualsNode equalsNode = (IntegerEqualsNode) usage;
+ ValueNode node = equalsNode.getY();
+ if (node == self) {
+ node = equalsNode.getX();
+ }
+ if (node instanceof ConstantNode) {
+ ConstantNode constantNode = (ConstantNode) node;
+ Constant constant = constantNode.asConstant();
+ if (constant instanceof PrimitiveConstant && ((PrimitiveConstant) constant).asLong() == 0) {
+ compareAgainstZero++;
+ }
+ }
+ }
+ }
+ return compareAgainstZero == usageCount;
+ }
+
@Override
public void generate(NodeLIRBuilderTool gen) {
gen.setResult(this, gen.getLIRGeneratorTool().getArithmetic().emitRem(gen.operand(getX()), gen.operand(getY()), gen.state(this)));
--- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/calc/UnsignedRightShiftNode.java Tue Mar 12 09:49:10 2019 +0000
+++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/calc/UnsignedRightShiftNode.java Sat Mar 16 21:00:45 2019 +0000
@@ -80,6 +80,22 @@
if (amount == 0) {
return forX;
}
+
+ Stamp xStampGeneric = forX.stamp(view);
+ if (xStampGeneric instanceof IntegerStamp) {
+ IntegerStamp xStamp = (IntegerStamp) xStampGeneric;
+
+ if (xStamp.lowerBound() >>> amount == xStamp.upperBound() >>> amount) {
+ // The result of the shift is constant.
+ return ConstantNode.forIntegerKind(stamp.getStackKind(), xStamp.lowerBound() >>> amount);
+ }
+
+ if (amount == xStamp.getBits() - 1 && xStamp.lowerBound() == -1 && xStamp.upperBound() == 0) {
+ // Shift is equivalent to a negation, i.e., turns -1 into 1 and keeps 0 at 0.
+ return NegateNode.create(forX, view);
+ }
+ }
+
if (forX instanceof ShiftNode) {
ShiftNode<?> other = (ShiftNode<?>) forX;
if (other.getY().isConstant()) {
--- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/cfg/Block.java Tue Mar 12 09:49:10 2019 +0000
+++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/cfg/Block.java Sat Mar 16 21:00:45 2019 +0000
@@ -33,13 +33,11 @@
import org.graalvm.compiler.graph.Node;
import org.graalvm.compiler.nodeinfo.Verbosity;
import org.graalvm.compiler.nodes.AbstractBeginNode;
-import org.graalvm.compiler.nodes.BeginNode;
import org.graalvm.compiler.nodes.FixedNode;
import org.graalvm.compiler.nodes.FixedWithNextNode;
import org.graalvm.compiler.nodes.InvokeWithExceptionNode;
import org.graalvm.compiler.nodes.LoopBeginNode;
import org.graalvm.compiler.nodes.LoopEndNode;
-import org.graalvm.compiler.nodes.LoopExitNode;
import org.graalvm.compiler.nodes.memory.MemoryCheckpoint;
import jdk.internal.vm.compiler.word.LocationIdentity;
@@ -69,21 +67,6 @@
return endNode;
}
- /**
- * Return the {@link LoopExitNode} for this block if it exists.
- */
- public LoopExitNode getLoopExit() {
- if (beginNode instanceof BeginNode) {
- if (beginNode.next() instanceof LoopExitNode) {
- return (LoopExitNode) beginNode.next();
- }
- }
- if (beginNode instanceof LoopExitNode) {
- return (LoopExitNode) beginNode;
- }
- return null;
- }
-
@Override
public Loop<Block> getLoop() {
return loop;
--- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/cfg/ControlFlowGraph.java Tue Mar 12 09:49:10 2019 +0000
+++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/cfg/ControlFlowGraph.java Sat Mar 16 21:00:45 2019 +0000
@@ -24,6 +24,8 @@
package org.graalvm.compiler.nodes.cfg;
+import static org.graalvm.compiler.core.common.cfg.AbstractBlockBase.BLOCK_ID_COMPARATOR;
+
import java.util.ArrayList;
import java.util.Arrays;
import java.util.BitSet;
@@ -49,7 +51,6 @@
import org.graalvm.compiler.nodes.LoopExitNode;
import org.graalvm.compiler.nodes.MergeNode;
import org.graalvm.compiler.nodes.StructuredGraph;
-import org.graalvm.compiler.nodes.StructuredGraph.GuardsStage;
public final class ControlFlowGraph implements AbstractControlFlowGraph<Block> {
/**
@@ -614,13 +615,26 @@
computeLoopBlocks(endBlock, loop, stack, true);
}
- if (graph.getGuardsStage() != GuardsStage.AFTER_FSA) {
+ // Note that at this point, due to traversal order, child loops of `loop` have
+ // not been discovered yet.
+ for (Block b : loop.getBlocks()) {
+ for (Block sux : b.getSuccessors()) {
+ if (sux.getLoop() != loop) {
+ assert sux.getLoopDepth() < loop.getDepth();
+ loop.getNaturalExits().add(sux);
+ }
+ }
+ }
+ loop.getNaturalExits().sort(BLOCK_ID_COMPARATOR);
+
+ if (!graph.getGuardsStage().areFrameStatesAtDeopts()) {
for (LoopExitNode exit : loopBegin.loopExits()) {
Block exitBlock = nodeToBlock.get(exit);
assert exitBlock.getPredecessorCount() == 1;
computeLoopBlocks(exitBlock.getFirstPredecessor(), loop, stack, true);
- loop.addExit(exitBlock);
+ loop.getLoopExits().add(exitBlock);
}
+ loop.getLoopExits().sort(BLOCK_ID_COMPARATOR);
// The following loop can add new blocks to the end of the loop's block
// list.
@@ -630,65 +644,21 @@
for (Block sux : b.getSuccessors()) {
if (sux.getLoop() != loop) {
AbstractBeginNode begin = sux.getBeginNode();
- if (!(begin instanceof LoopExitNode && ((LoopExitNode) begin).loopBegin() == loopBegin)) {
+ if (!loopBegin.isLoopExit(begin)) {
+ assert !(begin instanceof LoopBeginNode);
+ assert sux.getLoopDepth() < loop.getDepth();
graph.getDebug().log(DebugContext.VERBOSE_LEVEL, "Unexpected loop exit with %s, including whole branch in the loop", sux);
computeLoopBlocks(sux, loop, stack, false);
}
}
}
}
+ } else {
+ loop.getLoopExits().addAll(loop.getNaturalExits());
}
}
}
}
-
- /*
- * Compute the loop exit blocks after FSA.
- */
- if (graph.getGuardsStage() == GuardsStage.AFTER_FSA) {
- for (Block b : reversePostOrder) {
- if (b.getLoop() != null) {
- for (Block succ : b.getSuccessors()) {
- // if the loop of the succ is a different one (or none)
- if (b.getLoop() != succ.getLoop()) {
- // and the succ loop is not a child loop of the curr one
- if (succ.getLoop() == null) {
- // we might exit multiple loops if b.loops is not a loop at depth 0
- Loop<Block> curr = b.getLoop();
- while (curr != null) {
- curr.addExit(succ);
- curr = curr.getParent();
- }
- } else {
- /*
- * succ also has a loop, might be a child loop
- *
- * if it is a child loop we do not exit a loop. if it is a loop
- * different than b.loop and not a child loop it must be a parent
- * loop, thus we exit all loops between b.loop and succ.loop
- *
- * if we exit multiple loops immediately after each other the
- * bytecode parser might generate loop exit nodes after another and
- * the CFG will identify them as separate blocks, we just take the
- * first one and exit all loops at this one
- */
- if (succ.getLoop().getParent() != b.getLoop()) {
- assert succ.getLoop().getDepth() < b.getLoop().getDepth();
- // b.loop must not be a transitive parent of succ.loop
- assert !Loop.transitiveParentLoop(succ.getLoop(), b.getLoop());
- Loop<Block> curr = b.getLoop();
- while (curr != null && curr != succ.getLoop()) {
- curr.addExit(succ);
- curr = curr.getParent();
- }
- }
- }
- }
- }
- }
- }
- }
-
}
private static void computeLoopBlocks(Block start, Loop<Block> loop, Block[] stack, boolean usePred) {
--- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/extended/JavaReadNode.java Tue Mar 12 09:49:10 2019 +0000
+++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/extended/JavaReadNode.java Sat Mar 16 21:00:45 2019 +0000
@@ -27,6 +27,7 @@
import static org.graalvm.compiler.nodeinfo.NodeCycles.CYCLES_2;
import static org.graalvm.compiler.nodeinfo.NodeSize.SIZE_1;
+import org.graalvm.compiler.core.common.type.Stamp;
import org.graalvm.compiler.core.common.type.StampFactory;
import org.graalvm.compiler.graph.Node;
import org.graalvm.compiler.graph.NodeClass;
@@ -54,7 +55,11 @@
protected final boolean compressible;
public JavaReadNode(JavaKind readKind, AddressNode address, LocationIdentity location, BarrierType barrierType, boolean compressible) {
- super(TYPE, address, location, StampFactory.forKind(readKind), barrierType);
+ this(StampFactory.forKind(readKind), readKind, address, location, barrierType, compressible);
+ }
+
+ public JavaReadNode(Stamp stamp, JavaKind readKind, AddressNode address, LocationIdentity location, BarrierType barrierType, boolean compressible) {
+ super(TYPE, address, location, stamp, barrierType);
this.readKind = readKind;
this.compressible = compressible;
}
--- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/graphbuilderconf/GeneratedInvocationPlugin.java Tue Mar 12 09:49:10 2019 +0000
+++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/graphbuilderconf/GeneratedInvocationPlugin.java Sat Mar 16 21:00:45 2019 +0000
@@ -24,6 +24,9 @@
package org.graalvm.compiler.nodes.graphbuilderconf;
+import static jdk.vm.ci.services.Services.IS_BUILDING_NATIVE_IMAGE;
+import static jdk.vm.ci.services.Services.IS_IN_NATIVE_IMAGE;
+
import java.lang.annotation.Annotation;
import java.lang.reflect.Method;
@@ -66,6 +69,11 @@
return true;
}
+ if (IS_IN_NATIVE_IMAGE || IS_BUILDING_NATIVE_IMAGE) {
+ // The reflection here is problematic for SVM.
+ return true;
+ }
+
MetaAccessProvider metaAccess = b.getMetaAccess();
ResolvedJavaMethod executeMethod = metaAccess.lookupJavaMethod(getExecuteMethod());
ResolvedJavaType thisClass = metaAccess.lookupJavaType(getClass());
--- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/graphbuilderconf/GraphBuilderConfiguration.java Tue Mar 12 09:49:10 2019 +0000
+++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/graphbuilderconf/GraphBuilderConfiguration.java Sat Mar 16 21:00:45 2019 +0000
@@ -25,13 +25,15 @@
package org.graalvm.compiler.nodes.graphbuilderconf;
import java.util.Arrays;
+import java.util.Collections;
+import java.util.List;
import org.graalvm.compiler.core.common.type.StampPair;
import jdk.vm.ci.meta.JavaType;
import jdk.vm.ci.meta.ResolvedJavaType;
-public class GraphBuilderConfiguration {
+public final class GraphBuilderConfiguration {
public static class Plugins {
private final InvocationPlugins invocationPlugins;
@@ -39,7 +41,6 @@
private ParameterPlugin[] parameterPlugins;
private TypePlugin[] typePlugins;
private InlineInvokePlugin[] inlineInvokePlugins;
- private LoopExplosionPlugin loopExplosionPlugin;
private ClassInitializationPlugin classInitializationPlugin;
private InvokeDynamicPlugin invokeDynamicPlugin;
private ProfilingPlugin profilingPlugin;
@@ -49,18 +50,21 @@
* {@code copyFrom} become the {@linkplain InvocationPlugins#getParent() default}
* {@linkplain #getInvocationPlugins() invocation plugins} in this object.
*/
- public Plugins(Plugins copyFrom) {
- this.invocationPlugins = new InvocationPlugins(copyFrom.invocationPlugins);
+ public Plugins(Plugins copyFrom, InvocationPlugins invocationPlugins) {
+ this.invocationPlugins = invocationPlugins != null ? invocationPlugins : new InvocationPlugins(copyFrom.invocationPlugins);
this.nodePlugins = copyFrom.nodePlugins;
this.parameterPlugins = copyFrom.parameterPlugins;
this.typePlugins = copyFrom.typePlugins;
this.inlineInvokePlugins = copyFrom.inlineInvokePlugins;
- this.loopExplosionPlugin = copyFrom.loopExplosionPlugin;
this.classInitializationPlugin = copyFrom.classInitializationPlugin;
this.invokeDynamicPlugin = copyFrom.invokeDynamicPlugin;
this.profilingPlugin = copyFrom.profilingPlugin;
}
+ public Plugins(Plugins copyFrom) {
+ this(copyFrom, null);
+ }
+
/**
* Creates a new set of plugins.
*
@@ -155,14 +159,6 @@
inlineInvokePlugins = new InlineInvokePlugin[0];
}
- public LoopExplosionPlugin getLoopExplosionPlugin() {
- return loopExplosionPlugin;
- }
-
- public void setLoopExplosionPlugin(LoopExplosionPlugin plugin) {
- this.loopExplosionPlugin = plugin;
- }
-
public ClassInitializationPlugin getClassInitializationPlugin() {
return classInitializationPlugin;
}
@@ -198,13 +194,11 @@
}
}
- private static final ResolvedJavaType[] EMPTY = new ResolvedJavaType[]{};
-
private final boolean eagerResolving;
private final boolean unresolvedIsError;
private final BytecodeExceptionMode bytecodeExceptionMode;
private final boolean omitAssertions;
- private final ResolvedJavaType[] skippedExceptionTypes;
+ private final List<ResolvedJavaType> skippedExceptionTypes;
private final boolean insertFullInfopoints;
private final boolean trackNodeSourcePosition;
private final Plugins plugins;
@@ -229,8 +223,14 @@
Profile
}
- protected GraphBuilderConfiguration(boolean eagerResolving, boolean unresolvedIsError, BytecodeExceptionMode bytecodeExceptionMode, boolean omitAssertions, boolean insertFullInfopoints,
- boolean trackNodeSourcePosition, ResolvedJavaType[] skippedExceptionTypes, Plugins plugins) {
+ private GraphBuilderConfiguration(boolean eagerResolving,
+ boolean unresolvedIsError,
+ BytecodeExceptionMode bytecodeExceptionMode,
+ boolean omitAssertions,
+ boolean insertFullInfopoints,
+ boolean trackNodeSourcePosition,
+ List<ResolvedJavaType> skippedExceptionTypes,
+ Plugins plugins) {
this.eagerResolving = eagerResolving;
this.unresolvedIsError = unresolvedIsError;
this.bytecodeExceptionMode = bytecodeExceptionMode;
@@ -248,8 +248,15 @@
*/
public GraphBuilderConfiguration copy() {
Plugins newPlugins = new Plugins(plugins);
- GraphBuilderConfiguration result = new GraphBuilderConfiguration(eagerResolving, unresolvedIsError, bytecodeExceptionMode, omitAssertions, insertFullInfopoints, trackNodeSourcePosition,
- skippedExceptionTypes, newPlugins);
+ GraphBuilderConfiguration result = new GraphBuilderConfiguration(
+ eagerResolving,
+ unresolvedIsError,
+ bytecodeExceptionMode,
+ omitAssertions,
+ insertFullInfopoints,
+ trackNodeSourcePosition,
+ skippedExceptionTypes,
+ newPlugins);
return result;
}
@@ -260,43 +267,89 @@
* eagerly resolving elements.
*/
public GraphBuilderConfiguration withUnresolvedIsError(boolean newUnresolvedIsError) {
- return new GraphBuilderConfiguration(eagerResolving, newUnresolvedIsError, bytecodeExceptionMode, omitAssertions, insertFullInfopoints, trackNodeSourcePosition, skippedExceptionTypes,
+ return new GraphBuilderConfiguration(
+ eagerResolving,
+ newUnresolvedIsError,
+ bytecodeExceptionMode,
+ omitAssertions,
+ insertFullInfopoints,
+ trackNodeSourcePosition,
+ skippedExceptionTypes,
plugins);
}
public GraphBuilderConfiguration withEagerResolving(boolean newEagerResolving) {
- return new GraphBuilderConfiguration(newEagerResolving, unresolvedIsError, bytecodeExceptionMode, omitAssertions, insertFullInfopoints, trackNodeSourcePosition, skippedExceptionTypes,
+ return new GraphBuilderConfiguration(
+ newEagerResolving,
+ unresolvedIsError,
+ bytecodeExceptionMode,
+ omitAssertions,
+ insertFullInfopoints,
+ trackNodeSourcePosition,
+ skippedExceptionTypes,
plugins);
}
public GraphBuilderConfiguration withSkippedExceptionTypes(ResolvedJavaType[] newSkippedExceptionTypes) {
- return new GraphBuilderConfiguration(eagerResolving, unresolvedIsError, bytecodeExceptionMode, omitAssertions, insertFullInfopoints, trackNodeSourcePosition, newSkippedExceptionTypes,
+ return new GraphBuilderConfiguration(
+ eagerResolving,
+ unresolvedIsError,
+ bytecodeExceptionMode,
+ omitAssertions,
+ insertFullInfopoints,
+ trackNodeSourcePosition,
+ Collections.unmodifiableList(Arrays.asList(newSkippedExceptionTypes)),
plugins);
}
public GraphBuilderConfiguration withBytecodeExceptionMode(BytecodeExceptionMode newBytecodeExceptionMode) {
- return new GraphBuilderConfiguration(eagerResolving, unresolvedIsError, newBytecodeExceptionMode, omitAssertions, insertFullInfopoints, trackNodeSourcePosition, skippedExceptionTypes,
+ return new GraphBuilderConfiguration(eagerResolving,
+ unresolvedIsError,
+ newBytecodeExceptionMode,
+ omitAssertions,
+ insertFullInfopoints,
+ trackNodeSourcePosition,
+ skippedExceptionTypes,
plugins);
}
public GraphBuilderConfiguration withOmitAssertions(boolean newOmitAssertions) {
- return new GraphBuilderConfiguration(eagerResolving, unresolvedIsError, bytecodeExceptionMode, newOmitAssertions, insertFullInfopoints, trackNodeSourcePosition, skippedExceptionTypes,
+ return new GraphBuilderConfiguration(
+ eagerResolving,
+ unresolvedIsError,
+ bytecodeExceptionMode,
+ newOmitAssertions,
+ insertFullInfopoints,
+ trackNodeSourcePosition,
+ skippedExceptionTypes,
plugins);
}
public GraphBuilderConfiguration withFullInfopoints(boolean newInsertFullInfopoints) {
- ResolvedJavaType[] newSkippedExceptionTypes = skippedExceptionTypes == EMPTY ? EMPTY : Arrays.copyOf(skippedExceptionTypes, skippedExceptionTypes.length);
- return new GraphBuilderConfiguration(eagerResolving, unresolvedIsError, bytecodeExceptionMode, omitAssertions, newInsertFullInfopoints, trackNodeSourcePosition, newSkippedExceptionTypes,
+ return new GraphBuilderConfiguration(
+ eagerResolving,
+ unresolvedIsError,
+ bytecodeExceptionMode,
+ omitAssertions,
+ newInsertFullInfopoints,
+ trackNodeSourcePosition,
+ skippedExceptionTypes,
plugins);
}
public GraphBuilderConfiguration withNodeSourcePosition(boolean newTrackNodeSourcePosition) {
- ResolvedJavaType[] newSkippedExceptionTypes = skippedExceptionTypes == EMPTY ? EMPTY : Arrays.copyOf(skippedExceptionTypes, skippedExceptionTypes.length);
- return new GraphBuilderConfiguration(eagerResolving, unresolvedIsError, bytecodeExceptionMode, omitAssertions, insertFullInfopoints, newTrackNodeSourcePosition, newSkippedExceptionTypes,
+ return new GraphBuilderConfiguration(
+ eagerResolving,
+ unresolvedIsError,
+ bytecodeExceptionMode,
+ omitAssertions,
+ insertFullInfopoints,
+ newTrackNodeSourcePosition,
+ skippedExceptionTypes,
plugins);
}
- public ResolvedJavaType[] getSkippedExceptionTypes() {
+ public List<ResolvedJavaType> getSkippedExceptionTypes() {
return skippedExceptionTypes;
}
@@ -321,11 +374,27 @@
}
public static GraphBuilderConfiguration getDefault(Plugins plugins) {
- return new GraphBuilderConfiguration(false, false, BytecodeExceptionMode.Profile, false, false, false, EMPTY, plugins);
+ return new GraphBuilderConfiguration(
+ /* eagerResolving: */ false,
+ /* unresolvedIsError: */ false,
+ BytecodeExceptionMode.Profile,
+ /* omitAssertions: */ false,
+ /* insertFullInfopoints: */ false,
+ /* trackNodeSourcePosition: */ false,
+ Collections.emptyList(),
+ plugins);
}
public static GraphBuilderConfiguration getSnippetDefault(Plugins plugins) {
- return new GraphBuilderConfiguration(true, true, BytecodeExceptionMode.OmitAll, false, false, false, EMPTY, plugins);
+ return new GraphBuilderConfiguration(
+ /* eagerResolving: */ true,
+ /* unresolvedIsError: */ true,
+ BytecodeExceptionMode.OmitAll,
+ /* omitAssertions: */ false,
+ /* insertFullInfopoints: */ false,
+ /* trackNodeSourcePosition: */ false,
+ Collections.emptyList(),
+ plugins);
}
/** Returns {@code true} if it is an error for a class/field/method resolution to fail. */
--- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/graphbuilderconf/GraphBuilderContext.java Tue Mar 12 09:49:10 2019 +0000
+++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/graphbuilderconf/GraphBuilderContext.java Sat Mar 16 21:00:45 2019 +0000
@@ -31,7 +31,6 @@
import org.graalvm.compiler.bytecode.Bytecode;
import org.graalvm.compiler.bytecode.BytecodeProvider;
import org.graalvm.compiler.core.common.type.AbstractPointerStamp;
-import org.graalvm.compiler.core.common.type.ObjectStamp;
import org.graalvm.compiler.core.common.type.Stamp;
import org.graalvm.compiler.core.common.type.StampFactory;
import org.graalvm.compiler.core.common.type.StampPair;
@@ -43,6 +42,7 @@
import org.graalvm.compiler.nodes.ConstantNode;
import org.graalvm.compiler.nodes.DynamicPiNode;
import org.graalvm.compiler.nodes.FixedGuardNode;
+import org.graalvm.compiler.nodes.Invoke;
import org.graalvm.compiler.nodes.LogicNode;
import org.graalvm.compiler.nodes.NodeView;
import org.graalvm.compiler.nodes.PiNode;
@@ -92,9 +92,9 @@
}
/**
- * Adds a node to the graph. If the node is in the graph, returns immediately. If the node is a
- * {@link StateSplit} with a null {@linkplain StateSplit#stateAfter() frame state}, the frame
- * state is initialized.
+ * Adds a node and all its inputs to the graph. If the node is in the graph, returns
+ * immediately. If the node is a {@link StateSplit} with a null
+ * {@linkplain StateSplit#stateAfter() frame state} , the frame state is initialized.
*
* @param value the value to add to the graph and push to the stack. The
* {@code value.getJavaKind()} kind is used when type checking this operation.
@@ -108,23 +108,6 @@
return GraphBuilderContextUtil.setStateAfterIfNecessary(this, append(value));
}
- /**
- * Adds a node and its inputs to the graph. If the node is in the graph, returns immediately. If
- * the node is a {@link StateSplit} with a null {@linkplain StateSplit#stateAfter() frame state}
- * , the frame state is initialized.
- *
- * @param value the value to add to the graph and push to the stack. The
- * {@code value.getJavaKind()} kind is used when type checking this operation.
- * @return a node equivalent to {@code value} in the graph
- */
- default <T extends ValueNode> T addWithInputs(T value) {
- if (value.graph() != null) {
- assert !(value instanceof StateSplit) || ((StateSplit) value).stateAfter() != null;
- return value;
- }
- return GraphBuilderContextUtil.setStateAfterIfNecessary(this, append(value));
- }
-
default ValueNode addNonNullCast(ValueNode value) {
AbstractPointerStamp valueStamp = (AbstractPointerStamp) value.stamp(NodeView.DEFAULT);
if (valueStamp.nonNull()) {
@@ -163,7 +146,7 @@
* @param forceInlineEverything specifies if all invocations encountered in the scope of
* handling the replaced invoke are to be force inlined
*/
- void handleReplacedInvoke(InvokeKind invokeKind, ResolvedJavaMethod targetMethod, ValueNode[] args, boolean forceInlineEverything);
+ Invoke handleReplacedInvoke(InvokeKind invokeKind, ResolvedJavaMethod targetMethod, ValueNode[] args, boolean forceInlineEverything);
void handleReplacedInvoke(CallTargetNode callTarget, JavaKind resultType);
@@ -279,10 +262,8 @@
default ValueNode nullCheckedValue(ValueNode value, DeoptimizationAction action) {
if (!StampTool.isPointerNonNull(value)) {
LogicNode condition = getGraph().unique(IsNullNode.create(value));
- ObjectStamp receiverStamp = (ObjectStamp) value.stamp(NodeView.DEFAULT);
- Stamp stamp = receiverStamp.join(objectNonNull());
FixedGuardNode fixedGuard = append(new FixedGuardNode(condition, NullCheckException, action, true));
- ValueNode nonNullReceiver = getGraph().addOrUniqueWithInputs(PiNode.create(value, stamp, fixedGuard));
+ ValueNode nonNullReceiver = getGraph().addOrUniqueWithInputs(PiNode.create(value, objectNonNull(), fixedGuard));
// TODO: Propogating the non-null into the frame state would
// remove subsequent null-checks on the same value. However,
// it currently causes an assertion failure when merging states.
--- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/graphbuilderconf/InvocationPlugins.java Tue Mar 12 09:49:10 2019 +0000
+++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/graphbuilderconf/InvocationPlugins.java Sat Mar 16 21:00:45 2019 +0000
@@ -25,6 +25,8 @@
package org.graalvm.compiler.nodes.graphbuilderconf;
import static java.lang.String.format;
+import static jdk.vm.ci.services.Services.IS_BUILDING_NATIVE_IMAGE;
+import static jdk.vm.ci.services.Services.IS_IN_NATIVE_IMAGE;
import static org.graalvm.compiler.nodes.graphbuilderconf.InvocationPlugins.LateClassPlugins.CLOSED_LATE_CLASS_PLUGIN;
import java.lang.reflect.Constructor;
@@ -144,6 +146,9 @@
OptionalLazySymbol(String name) {
this.name = name;
+ if (IS_BUILDING_NATIVE_IMAGE) {
+ resolve();
+ }
}
@Override
@@ -156,7 +161,7 @@
* resolution fails.
*/
public Class<?> resolve() {
- if (resolved == null) {
+ if (!IS_IN_NATIVE_IMAGE && resolved == null) {
Class<?> resolvedOrNull = resolveClass(name, true);
resolved = resolvedOrNull == null ? MASK_NULL : resolvedOrNull;
}
@@ -222,6 +227,20 @@
* @param plugins where to register the plugins
* @param declaringClassName the name of the class class declaring the methods for which
* plugins will be registered via this object
+ */
+ public Registration(InvocationPlugins plugins, String declaringClassName) {
+ this.plugins = plugins;
+ this.declaringType = new OptionalLazySymbol(declaringClassName);
+ this.methodSubstitutionBytecodeProvider = null;
+ }
+
+ /**
+ * Creates an object for registering {@link InvocationPlugin}s for methods declared by a
+ * given class.
+ *
+ * @param plugins where to register the plugins
+ * @param declaringClassName the name of the class class declaring the methods for which
+ * plugins will be registered via this object
* @param methodSubstitutionBytecodeProvider provider used to get the bytecodes to parse for
* method substitutions
*/
@@ -452,8 +471,8 @@
Binding binding = new Binding(plugin, isStatic, name, argumentTypes);
bindings.add(binding);
- assert Checks.check(this.plugins, declaringType, binding);
- assert Checks.checkResolvable(false, declaringType, binding);
+ assert IS_IN_NATIVE_IMAGE || Checks.check(this.plugins, declaringType, binding);
+ assert IS_IN_NATIVE_IMAGE || Checks.checkResolvable(false, declaringType, binding);
}
@Override
@@ -736,8 +755,8 @@
}
@SuppressWarnings("serial")
- static class InvocationPlugRegistrationError extends GraalError {
- InvocationPlugRegistrationError(Throwable cause) {
+ static class InvocationPluginRegistrationError extends GraalError {
+ InvocationPluginRegistrationError(Throwable cause) {
super(cause);
}
}
@@ -751,7 +770,7 @@
deferrable.run();
}
deferredRegistrations = null;
- } catch (InvocationPlugRegistrationError t) {
+ } catch (InvocationPluginRegistrationError t) {
throw t;
} catch (Throwable t) {
/*
@@ -765,7 +784,7 @@
Runnable rethrow = new Runnable() {
@Override
public void run() {
- throw new InvocationPlugRegistrationError(t);
+ throw new InvocationPluginRegistrationError(t);
}
};
deferredRegistrations.add(rethrow);
@@ -960,8 +979,8 @@
argumentTypes[0] = declaringClass;
}
Binding binding = put(plugin, isStatic, allowOverwrite, declaringClass, name, argumentTypes);
- assert Checks.check(this, declaringClass, binding);
- assert Checks.checkResolvable(isOptional, declaringClass, binding);
+ assert IS_IN_NATIVE_IMAGE || Checks.check(this, declaringClass, binding);
+ assert IS_IN_NATIVE_IMAGE || Checks.checkResolvable(isOptional, declaringClass, binding);
}
/**
@@ -1004,10 +1023,19 @@
if (parent != null) {
InvocationPlugin plugin = parent.lookupInvocation(method);
if (plugin != null) {
+ if (IS_IN_NATIVE_IMAGE && plugin instanceof MethodSubstitutionPlugin) {
+ // Disable method substitutions until GR-13607
+ return null;
+ }
return plugin;
}
}
- return get(method);
+ InvocationPlugin invocationPlugin = get(method);
+ if (IS_IN_NATIVE_IMAGE && invocationPlugin instanceof MethodSubstitutionPlugin) {
+ // Disable method substitutions until GR-13607
+ return null;
+ }
+ return invocationPlugin;
}
/**
@@ -1141,25 +1169,27 @@
static final Class<?>[][] SIGS;
static {
- if (!Assertions.assertionsEnabled()) {
+ if (!Assertions.assertionsEnabled() && !IS_BUILDING_NATIVE_IMAGE) {
throw new GraalError("%s must only be used in assertions", Checks.class.getName());
}
ArrayList<Class<?>[]> sigs = new ArrayList<>(MAX_ARITY);
- for (Method method : InvocationPlugin.class.getDeclaredMethods()) {
- if (!Modifier.isStatic(method.getModifiers()) && method.getName().equals("apply")) {
- Class<?>[] sig = method.getParameterTypes();
- assert sig[0] == GraphBuilderContext.class;
- assert sig[1] == ResolvedJavaMethod.class;
- assert sig[2] == InvocationPlugin.Receiver.class;
- assert Arrays.asList(sig).subList(3, sig.length).stream().allMatch(c -> c == ValueNode.class);
- while (sigs.size() < sig.length - 2) {
- sigs.add(null);
+ if (!IS_IN_NATIVE_IMAGE) {
+ for (Method method : InvocationPlugin.class.getDeclaredMethods()) {
+ if (!Modifier.isStatic(method.getModifiers()) && method.getName().equals("apply")) {
+ Class<?>[] sig = method.getParameterTypes();
+ assert sig[0] == GraphBuilderContext.class;
+ assert sig[1] == ResolvedJavaMethod.class;
+ assert sig[2] == InvocationPlugin.Receiver.class;
+ assert Arrays.asList(sig).subList(3, sig.length).stream().allMatch(c -> c == ValueNode.class);
+ while (sigs.size() < sig.length - 2) {
+ sigs.add(null);
+ }
+ sigs.set(sig.length - 3, sig);
}
- sigs.set(sig.length - 3, sig);
}
+ assert sigs.indexOf(null) == -1 : format("need to add an apply() method to %s that takes %d %s arguments ", InvocationPlugin.class.getName(), sigs.indexOf(null),
+ ValueNode.class.getSimpleName());
}
- assert sigs.indexOf(null) == -1 : format("need to add an apply() method to %s that takes %d %s arguments ", InvocationPlugin.class.getName(), sigs.indexOf(null),
- ValueNode.class.getSimpleName());
SIGS = sigs.toArray(new Class<?>[sigs.size()][]);
}
@@ -1276,6 +1306,9 @@
if (type instanceof OptionalLazySymbol) {
return ((OptionalLazySymbol) type).resolve();
}
+ if (IS_IN_NATIVE_IMAGE) {
+ throw new GraalError("Unresolved type in native image image:" + type.getTypeName());
+ }
return resolveClass(type.getTypeName(), optional);
}
--- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/graphbuilderconf/MethodSubstitutionPlugin.java Tue Mar 12 09:49:10 2019 +0000
+++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/graphbuilderconf/MethodSubstitutionPlugin.java Sat Mar 16 21:00:45 2019 +0000
@@ -24,6 +24,7 @@
package org.graalvm.compiler.nodes.graphbuilderconf;
+import static jdk.vm.ci.services.Services.IS_IN_NATIVE_IMAGE;
import static org.graalvm.compiler.nodes.graphbuilderconf.InvocationPlugins.resolveType;
import java.lang.reflect.Method;
@@ -177,6 +178,10 @@
@Override
public boolean execute(GraphBuilderContext b, ResolvedJavaMethod targetMethod, InvocationPlugin.Receiver receiver, ValueNode[] argsIncludingReceiver) {
+ if (IS_IN_NATIVE_IMAGE) {
+ // these are currently unimplemented
+ return false;
+ }
ResolvedJavaMethod subst = getSubstitute(b.getMetaAccess());
return b.intrinsify(bytecodeProvider, targetMethod, subst, receiver, argsIncludingReceiver);
}
--- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/graphbuilderconf/NodePlugin.java Tue Mar 12 09:49:10 2019 +0000
+++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/graphbuilderconf/NodePlugin.java Sat Mar 16 21:00:45 2019 +0000
@@ -221,6 +221,9 @@
* nodes) and fixed nodes must be manually {@linkplain FixedWithNextNode#setNext added} as
* successors of {@code afterExceptionLoaded}.
*
+ * The reason for this constraint is that when this plugin runs, it's inserting instructions
+ * into a different block than the one currently being parsed.
+ *
* @param graph the graph being parsed
* @param afterExceptionLoaded the last fixed node after loading the exception
* @return the last fixed node after instrumentation
--- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/java/NewArrayNode.java Tue Mar 12 09:49:10 2019 +0000
+++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/java/NewArrayNode.java Sat Mar 16 21:00:45 2019 +0000
@@ -98,7 +98,7 @@
ValueNode lengthAlias = tool.getAlias(length());
if (lengthAlias.asConstant() != null) {
int constantLength = lengthAlias.asJavaConstant().asInt();
- if (constantLength >= 0 && constantLength < tool.getMaximumEntryCount()) {
+ if (constantLength >= 0 && constantLength <= tool.getMaximumEntryCount()) {
ValueNode[] state = new ValueNode[constantLength];
ConstantNode defaultForKind = constantLength == 0 ? null : defaultElementValue();
for (int i = 0; i < constantLength; i++) {
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/memory/address/IndexAddressNode.java Sat Mar 16 21:00:45 2019 +0000
@@ -0,0 +1,82 @@
+/*
+ * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved.
+ * 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.
+ */
+
+
+package org.graalvm.compiler.nodes.memory.address;
+
+import org.graalvm.compiler.graph.NodeClass;
+import org.graalvm.compiler.nodeinfo.InputType;
+import org.graalvm.compiler.nodeinfo.NodeInfo;
+import org.graalvm.compiler.nodes.ValueNode;
+import org.graalvm.compiler.nodes.spi.Lowerable;
+import org.graalvm.compiler.nodes.spi.LoweringTool;
+
+import jdk.vm.ci.meta.JavaKind;
+
+/**
+ * Represents an address that points to an element of a Java array.
+ */
+@NodeInfo(allowedUsageTypes = InputType.Association)
+public class IndexAddressNode extends AddressNode implements Lowerable {
+ public static final NodeClass<IndexAddressNode> TYPE = NodeClass.create(IndexAddressNode.class);
+
+ @Input ValueNode array;
+ @Input ValueNode index;
+
+ private final JavaKind elementKind;
+
+ public IndexAddressNode(ValueNode array, ValueNode index, JavaKind elementKind) {
+ super(TYPE);
+ this.array = array;
+ this.index = index;
+ this.elementKind = elementKind;
+ }
+
+ @Override
+ public ValueNode getBase() {
+ return array;
+ }
+
+ public ValueNode getArray() {
+ return array;
+ }
+
+ @Override
+ public ValueNode getIndex() {
+ return index;
+ }
+
+ @Override
+ public long getMaxConstantDisplacement() {
+ return Long.MAX_VALUE;
+ }
+
+ public JavaKind getElementKind() {
+ return elementKind;
+ }
+
+ @Override
+ public void lower(LoweringTool tool) {
+ tool.getLowerer().lower(this, tool);
+ }
+}
--- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/spi/NodeLIRBuilderTool.java Tue Mar 12 09:49:10 2019 +0000
+++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/spi/NodeLIRBuilderTool.java Sat Mar 16 21:00:45 2019 +0000
@@ -94,4 +94,6 @@
default OptionValues getOptions() {
return getLIRGeneratorTool().getResult().getLIR().getOptions();
}
+
+ void emitReadExceptionObject(ValueNode node);
}
--- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/spi/Replacements.java Tue Mar 12 09:49:10 2019 +0000
+++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/spi/Replacements.java Sat Mar 16 21:00:45 2019 +0000
@@ -64,7 +64,9 @@
* @param trackNodeSourcePosition
* @return the snippet graph, if any, that is derived from {@code method}
*/
- StructuredGraph getSnippet(ResolvedJavaMethod method, Object[] args, boolean trackNodeSourcePosition, NodeSourcePosition replaceePosition);
+ default StructuredGraph getSnippet(ResolvedJavaMethod method, Object[] args, boolean trackNodeSourcePosition, NodeSourcePosition replaceePosition) {
+ return getSnippet(method, null, args, trackNodeSourcePosition, replaceePosition);
+ }
/**
* Gets the snippet graph derived from a given method.
--- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/type/NarrowOopStamp.java Tue Mar 12 09:49:10 2019 +0000
+++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/type/NarrowOopStamp.java Sat Mar 16 21:00:45 2019 +0000
@@ -45,6 +45,13 @@
}
@Override
+ public void accept(Visitor v) {
+ super.accept(v);
+ v.visitLong(encoding.getBase());
+ v.visitInt(encoding.getShift());
+ }
+
+ @Override
protected abstract AbstractObjectStamp copyWith(ResolvedJavaType type, boolean exactType, boolean nonNull, boolean alwaysNull);
public Stamp uncompressed() {
--- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/util/GraphUtil.java Tue Mar 12 09:49:10 2019 +0000
+++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/util/GraphUtil.java Sat Mar 16 21:00:45 2019 +0000
@@ -1039,7 +1039,7 @@
return;
}
- if (newLengthInt >= tool.getMaximumEntryCount()) {
+ if (newLengthInt > tool.getMaximumEntryCount()) {
/* The new array size is higher than maximum allowed size of virtualized objects. */
return;
}
--- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.options.processor/src/org/graalvm/compiler/options/processor/OptionProcessor.java Tue Mar 12 09:49:10 2019 +0000
+++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.options.processor/src/org/graalvm/compiler/options/processor/OptionProcessor.java Sat Mar 16 21:00:45 2019 +0000
@@ -174,7 +174,7 @@
}
enclosing = enclosing.getEnclosingElement();
}
- if (enclosingPackage == null) {
+ if (enclosingPackage == null || enclosingPackage.isUnnamed()) {
processingEnv.getMessager().printMessage(Kind.ERROR, "Option field cannot be declared in the unnamed package", element);
return;
}
--- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.options/src/org/graalvm/compiler/options/OptionDescriptor.java Tue Mar 12 09:49:10 2019 +0000
+++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.options/src/org/graalvm/compiler/options/OptionDescriptor.java Sat Mar 16 21:00:45 2019 +0000
@@ -34,14 +34,14 @@
*/
public final class OptionDescriptor {
- protected final String name;
- protected final OptionType optionType;
- protected final Class<?> optionValueType;
- protected final String help;
- protected final List<String> extraHelp;
- protected final OptionKey<?> optionKey;
- protected final Class<?> declaringClass;
- protected final String fieldName;
+ private final String name;
+ private final OptionType optionType;
+ private final Class<?> optionValueType;
+ private final String help;
+ private final List<String> extraHelp;
+ private final OptionKey<?> optionKey;
+ private final Class<?> declaringClass;
+ private final String fieldName;
private static final String[] NO_EXTRA_HELP = {};
--- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.options/src/org/graalvm/compiler/options/OptionKey.java Tue Mar 12 09:49:10 2019 +0000
+++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.options/src/org/graalvm/compiler/options/OptionKey.java Sat Mar 16 21:00:45 2019 +0000
@@ -141,6 +141,18 @@
}
/**
+ * Gets the value of this option in {@code values} if it is present, otherwise
+ * {@link #getDefaultValue()}.
+ */
+ @SuppressWarnings("unchecked")
+ public T getValueOrDefault(EconomicMap<OptionKey<?>, Object> values) {
+ if (!values.containsKey(this)) {
+ return defaultValue;
+ }
+ return (T) values.get(this);
+ }
+
+ /**
* Sets the value of this option in a given map. The
* {@link #onValueUpdate(EconomicMap, Object, Object)} method is called once the value is set.
*
--- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.options/src/org/graalvm/compiler/options/OptionValues.java Tue Mar 12 09:49:10 2019 +0000
+++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.options/src/org/graalvm/compiler/options/OptionValues.java Sat Mar 16 21:00:45 2019 +0000
@@ -213,7 +213,7 @@
}
String name = namePrefix + e.getKey();
- String assign = containsKey(desc.optionKey) ? ":=" : "=";
+ String assign = containsKey(desc.getOptionKey()) ? ":=" : "=";
String typeName = desc.getOptionKey() instanceof EnumOptionKey ? "String" : desc.getOptionValueType().getSimpleName();
String linePrefix = String.format("%s %s %s ", name, assign, value);
int typeStartPos = PROPERTY_LINE_WIDTH - typeName.length();
--- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.options/src/org/graalvm/compiler/options/OptionsParser.java Tue Mar 12 09:49:10 2019 +0000
+++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.options/src/org/graalvm/compiler/options/OptionsParser.java Sat Mar 16 21:00:45 2019 +0000
@@ -24,6 +24,9 @@
package org.graalvm.compiler.options;
+import static jdk.vm.ci.services.Services.IS_BUILDING_NATIVE_IMAGE;
+import static jdk.vm.ci.services.Services.IS_IN_NATIVE_IMAGE;
+
import java.util.ArrayList;
import java.util.Collection;
import java.util.Formatter;
@@ -39,11 +42,15 @@
*/
public class OptionsParser {
+ private static volatile List<OptionDescriptors> cachedOptionDescriptors;
+
/**
- * Gets an iterable composed of the {@link ServiceLoader}s to be used when looking for
- * {@link OptionDescriptors} providers.
+ * Gets an iterable of available {@link OptionDescriptors}.
*/
public static Iterable<OptionDescriptors> getOptionsLoader() {
+ if (IS_IN_NATIVE_IMAGE || cachedOptionDescriptors != null) {
+ return cachedOptionDescriptors;
+ }
boolean java8OrEarlier = System.getProperty("java.specification.version").compareTo("1.9") < 0;
ClassLoader loader;
if (java8OrEarlier) {
@@ -58,7 +65,15 @@
*/
loader = ClassLoader.getSystemClassLoader();
}
- return ServiceLoader.load(OptionDescriptors.class, loader);
+ Iterable<OptionDescriptors> result = ServiceLoader.load(OptionDescriptors.class, loader);
+ if (IS_BUILDING_NATIVE_IMAGE) {
+ ArrayList<OptionDescriptors> optionDescriptors = new ArrayList<>();
+ for (OptionDescriptors descriptors : result) {
+ optionDescriptors.add(descriptors);
+ }
+ OptionsParser.cachedOptionDescriptors = optionDescriptors;
+ }
+ return result;
}
/**
@@ -178,7 +193,7 @@
}
}
- desc.optionKey.update(values, value);
+ desc.getOptionKey().update(values, value);
}
private static long parseLong(String v) {
--- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.phases.common/src/org/graalvm/compiler/phases/common/ConvertDeoptimizeToGuardPhase.java Tue Mar 12 09:49:10 2019 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,242 +0,0 @@
-/*
- * Copyright (c) 2011, 2018, Oracle and/or its affiliates. All rights reserved.
- * 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.
- */
-
-
-package org.graalvm.compiler.phases.common;
-
-import static org.graalvm.compiler.phases.common.DeadCodeEliminationPhase.Optionality.Optional;
-
-import java.util.List;
-
-import org.graalvm.compiler.core.common.GraalOptions;
-import org.graalvm.compiler.debug.DebugCloseable;
-import org.graalvm.compiler.graph.Node;
-import org.graalvm.compiler.graph.NodeSourcePosition;
-import org.graalvm.compiler.graph.spi.SimplifierTool;
-import org.graalvm.compiler.nodeinfo.InputType;
-import org.graalvm.compiler.nodes.AbstractBeginNode;
-import org.graalvm.compiler.nodes.AbstractEndNode;
-import org.graalvm.compiler.nodes.AbstractMergeNode;
-import org.graalvm.compiler.nodes.ConstantNode;
-import org.graalvm.compiler.nodes.ControlSplitNode;
-import org.graalvm.compiler.nodes.DeoptimizeNode;
-import org.graalvm.compiler.nodes.EndNode;
-import org.graalvm.compiler.nodes.FixedGuardNode;
-import org.graalvm.compiler.nodes.FixedNode;
-import org.graalvm.compiler.nodes.FixedWithNextNode;
-import org.graalvm.compiler.nodes.GuardNode;
-import org.graalvm.compiler.nodes.IfNode;
-import org.graalvm.compiler.nodes.LogicNode;
-import org.graalvm.compiler.nodes.LoopExitNode;
-import org.graalvm.compiler.nodes.ProxyNode;
-import org.graalvm.compiler.nodes.StartNode;
-import org.graalvm.compiler.nodes.StaticDeoptimizingNode;
-import org.graalvm.compiler.nodes.StructuredGraph;
-import org.graalvm.compiler.nodes.ValueNode;
-import org.graalvm.compiler.nodes.ValuePhiNode;
-import org.graalvm.compiler.nodes.calc.CompareNode;
-import org.graalvm.compiler.nodes.spi.LoweringProvider;
-import org.graalvm.compiler.nodes.util.GraphUtil;
-import org.graalvm.compiler.phases.BasePhase;
-import org.graalvm.compiler.phases.tiers.PhaseContext;
-
-import jdk.vm.ci.meta.Constant;
-import jdk.vm.ci.meta.DeoptimizationAction;
-
-/**
- * This phase will find branches which always end with a {@link DeoptimizeNode} and replace their
- * {@link ControlSplitNode ControlSplitNodes} with {@link FixedGuardNode FixedGuardNodes}.
- *
- * This is useful because {@link FixedGuardNode FixedGuardNodes} will be lowered to {@link GuardNode
- * GuardNodes} which can later be optimized more aggressively than control-flow constructs.
- *
- * This is currently only done for branches that start from a {@link IfNode}. If it encounters a
- * branch starting at an other kind of {@link ControlSplitNode}, it will only bring the
- * {@link DeoptimizeNode} as close to the {@link ControlSplitNode} as possible.
- *
- */
-public class ConvertDeoptimizeToGuardPhase extends BasePhase<PhaseContext> {
- @Override
- @SuppressWarnings("try")
- protected void run(final StructuredGraph graph, PhaseContext context) {
- assert graph.hasValueProxies() : "ConvertDeoptimizeToGuardPhase always creates proxies";
- assert !graph.getGuardsStage().areFrameStatesAtDeopts() : graph.getGuardsStage();
-
- for (DeoptimizeNode d : graph.getNodes(DeoptimizeNode.TYPE)) {
- assert d.isAlive();
- if (d.getAction() == DeoptimizationAction.None) {
- continue;
- }
- try (DebugCloseable closable = d.withNodeSourcePosition()) {
- propagateFixed(d, d, context != null ? context.getLowerer() : null);
- }
- }
-
- if (context != null) {
- for (FixedGuardNode fixedGuard : graph.getNodes(FixedGuardNode.TYPE)) {
- try (DebugCloseable closable = fixedGuard.withNodeSourcePosition()) {
- trySplitFixedGuard(fixedGuard, context);
- }
- }
- }
-
- new DeadCodeEliminationPhase(Optional).apply(graph);
- }
-
- private void trySplitFixedGuard(FixedGuardNode fixedGuard, PhaseContext context) {
- LogicNode condition = fixedGuard.condition();
- if (condition instanceof CompareNode) {
- CompareNode compare = (CompareNode) condition;
- ValueNode x = compare.getX();
- ValuePhiNode xPhi = (x instanceof ValuePhiNode) ? (ValuePhiNode) x : null;
- if (x instanceof ConstantNode || xPhi != null) {
- ValueNode y = compare.getY();
- ValuePhiNode yPhi = (y instanceof ValuePhiNode) ? (ValuePhiNode) y : null;
- if (y instanceof ConstantNode || yPhi != null) {
- processFixedGuardAndPhis(fixedGuard, context, compare, x, xPhi, y, yPhi);
- }
- }
- }
- }
-
- private void processFixedGuardAndPhis(FixedGuardNode fixedGuard, PhaseContext context, CompareNode compare, ValueNode x, ValuePhiNode xPhi, ValueNode y, ValuePhiNode yPhi) {
- AbstractBeginNode pred = AbstractBeginNode.prevBegin(fixedGuard);
- if (pred instanceof AbstractMergeNode) {
- AbstractMergeNode merge = (AbstractMergeNode) pred;
- if (xPhi != null && xPhi.merge() != merge) {
- return;
- }
- if (yPhi != null && yPhi.merge() != merge) {
- return;
- }
-
- processFixedGuardAndMerge(fixedGuard, context, compare, x, xPhi, y, yPhi, merge);
- }
- }
-
- @SuppressWarnings("try")
- private void processFixedGuardAndMerge(FixedGuardNode fixedGuard, PhaseContext context, CompareNode compare, ValueNode x, ValuePhiNode xPhi, ValueNode y, ValuePhiNode yPhi,
- AbstractMergeNode merge) {
- List<EndNode> mergePredecessors = merge.cfgPredecessors().snapshot();
- for (int i = 0; i < mergePredecessors.size(); ++i) {
- AbstractEndNode mergePredecessor = mergePredecessors.get(i);
- if (!mergePredecessor.isAlive()) {
- break;
- }
- Constant xs;
- if (xPhi == null) {
- xs = x.asConstant();
- } else {
- xs = xPhi.valueAt(mergePredecessor).asConstant();
- }
- Constant ys;
- if (yPhi == null) {
- ys = y.asConstant();
- } else {
- ys = yPhi.valueAt(mergePredecessor).asConstant();
- }
- if (xs != null && ys != null && compare.condition().foldCondition(xs, ys, context.getConstantReflection(), compare.unorderedIsTrue()) == fixedGuard.isNegated()) {
- try (DebugCloseable position = fixedGuard.withNodeSourcePosition()) {
- propagateFixed(mergePredecessor, fixedGuard, context.getLowerer());
- }
- }
- }
- }
-
- @SuppressWarnings("try")
- private void propagateFixed(FixedNode from, StaticDeoptimizingNode deopt, LoweringProvider loweringProvider) {
- Node current = from;
- while (current != null) {
- if (GraalOptions.GuardPriorities.getValue(from.getOptions()) && current instanceof FixedGuardNode) {
- FixedGuardNode otherGuard = (FixedGuardNode) current;
- if (otherGuard.computePriority().isHigherPriorityThan(deopt.computePriority())) {
- moveAsDeoptAfter(otherGuard, deopt);
- return;
- }
- } else if (current instanceof AbstractBeginNode) {
- if (current instanceof AbstractMergeNode) {
- AbstractMergeNode mergeNode = (AbstractMergeNode) current;
- FixedNode next = mergeNode.next();
- while (mergeNode.isAlive()) {
- AbstractEndNode end = mergeNode.forwardEnds().first();
- propagateFixed(end, deopt, loweringProvider);
- }
- if (next.isAlive()) {
- propagateFixed(next, deopt, loweringProvider);
- }
- return;
- } else if (current.predecessor() instanceof IfNode) {
- IfNode ifNode = (IfNode) current.predecessor();
- // Prioritize the source position of the IfNode
- try (DebugCloseable closable = ifNode.withNodeSourcePosition()) {
- StructuredGraph graph = ifNode.graph();
- LogicNode conditionNode = ifNode.condition();
- boolean negateGuardCondition = current == ifNode.trueSuccessor();
- NodeSourcePosition survivingSuccessorPosition = negateGuardCondition ? ifNode.falseSuccessor().getNodeSourcePosition() : ifNode.trueSuccessor().getNodeSourcePosition();
- FixedGuardNode guard = graph.add(
- new FixedGuardNode(conditionNode, deopt.getReason(), deopt.getAction(), deopt.getSpeculation(), negateGuardCondition, survivingSuccessorPosition));
-
- FixedWithNextNode pred = (FixedWithNextNode) ifNode.predecessor();
- AbstractBeginNode survivingSuccessor;
- if (negateGuardCondition) {
- survivingSuccessor = ifNode.falseSuccessor();
- } else {
- survivingSuccessor = ifNode.trueSuccessor();
- }
- graph.removeSplitPropagate(ifNode, survivingSuccessor);
-
- Node newGuard = guard;
- if (survivingSuccessor instanceof LoopExitNode) {
- newGuard = ProxyNode.forGuard(guard, (LoopExitNode) survivingSuccessor, graph);
- }
- survivingSuccessor.replaceAtUsages(InputType.Guard, newGuard);
-
- graph.getDebug().log("Converting deopt on %-5s branch of %s to guard for remaining branch %s.", negateGuardCondition, ifNode, survivingSuccessor);
- FixedNode next = pred.next();
- pred.setNext(guard);
- guard.setNext(next);
- SimplifierTool simplifierTool = GraphUtil.getDefaultSimplifier(null, null, null, false, graph.getAssumptions(), graph.getOptions(), loweringProvider);
- survivingSuccessor.simplify(simplifierTool);
- return;
- }
- } else if (current.predecessor() == null || current.predecessor() instanceof ControlSplitNode) {
- assert current.predecessor() != null || (current instanceof StartNode && current == ((AbstractBeginNode) current).graph().start());
- moveAsDeoptAfter((AbstractBeginNode) current, deopt);
- return;
- }
- }
- current = current.predecessor();
- }
- }
-
- @SuppressWarnings("try")
- private static void moveAsDeoptAfter(FixedWithNextNode node, StaticDeoptimizingNode deopt) {
- try (DebugCloseable position = deopt.asNode().withNodeSourcePosition()) {
- FixedNode next = node.next();
- if (next != deopt.asNode()) {
- node.setNext(node.graph().add(new DeoptimizeNode(deopt.getAction(), deopt.getReason(), deopt.getSpeculation())));
- GraphUtil.killCFG(next);
- }
- }
- }
-}
--- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.phases.common/src/org/graalvm/compiler/phases/common/FixReadsPhase.java Tue Mar 12 09:49:10 2019 +0000
+++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.phases.common/src/org/graalvm/compiler/phases/common/FixReadsPhase.java Sat Mar 16 21:00:45 2019 +0000
@@ -28,6 +28,7 @@
import jdk.internal.vm.compiler.collections.MapCursor;
import org.graalvm.compiler.core.common.GraalOptions;
import org.graalvm.compiler.core.common.cfg.BlockMap;
+import org.graalvm.compiler.core.common.spi.ConstantFieldProvider;
import org.graalvm.compiler.core.common.type.FloatStamp;
import org.graalvm.compiler.core.common.type.Stamp;
import org.graalvm.compiler.core.common.type.StampFactory;
@@ -37,6 +38,7 @@
import org.graalvm.compiler.graph.NodeMap;
import org.graalvm.compiler.graph.NodeStack;
import org.graalvm.compiler.graph.Position;
+import org.graalvm.compiler.graph.spi.CanonicalizerTool;
import org.graalvm.compiler.nodeinfo.InputType;
import org.graalvm.compiler.nodes.AbstractBeginNode;
import org.graalvm.compiler.nodes.AbstractMergeNode;
@@ -68,6 +70,7 @@
import org.graalvm.compiler.nodes.memory.MemoryAccess;
import org.graalvm.compiler.nodes.memory.MemoryPhiNode;
import org.graalvm.compiler.nodes.util.GraphUtil;
+import org.graalvm.compiler.options.OptionValues;
import org.graalvm.compiler.phases.BasePhase;
import org.graalvm.compiler.phases.Phase;
import org.graalvm.compiler.phases.graph.ScheduledNodeIterator;
@@ -76,7 +79,9 @@
import org.graalvm.compiler.phases.tiers.LowTierContext;
import org.graalvm.compiler.phases.tiers.PhaseContext;
+import jdk.vm.ci.meta.Assumptions;
import jdk.vm.ci.meta.Constant;
+import jdk.vm.ci.meta.ConstantReflectionProvider;
import jdk.vm.ci.meta.MetaAccessProvider;
import jdk.vm.ci.meta.TriState;
@@ -136,7 +141,7 @@
}
- protected static class RawConditionalEliminationVisitor implements RecursiveVisitor<Integer> {
+ public static class RawConditionalEliminationVisitor implements RecursiveVisitor<Integer> {
protected final NodeMap<StampElement> stampMap;
protected final NodeStack undoOperations;
@@ -147,8 +152,58 @@
private final BlockMap<Integer> blockActionStart;
private final EconomicMap<MergeNode, EconomicMap<ValueNode, Stamp>> endMaps;
private final DebugContext debug;
+ private final RawCanonicalizerTool rawCanonicalizerTool = new RawCanonicalizerTool();
- protected RawConditionalEliminationVisitor(StructuredGraph graph, ScheduleResult schedule, MetaAccessProvider metaAccess, boolean replaceInputsWithConstants) {
+ private class RawCanonicalizerTool implements NodeView, CanonicalizerTool {
+
+ @Override
+ public Assumptions getAssumptions() {
+ return graph.getAssumptions();
+ }
+
+ @Override
+ public MetaAccessProvider getMetaAccess() {
+ return metaAccess;
+ }
+
+ @Override
+ public ConstantReflectionProvider getConstantReflection() {
+ return null;
+ }
+
+ @Override
+ public ConstantFieldProvider getConstantFieldProvider() {
+ return null;
+ }
+
+ @Override
+ public boolean canonicalizeReads() {
+ return false;
+ }
+
+ @Override
+ public boolean allUsagesAvailable() {
+ return true;
+ }
+
+ @Override
+ public Integer smallestCompareWidth() {
+ return null;
+ }
+
+ @Override
+ public OptionValues getOptions() {
+ return graph.getOptions();
+ }
+
+ @Override
+ public Stamp stamp(ValueNode node) {
+ return getBestStamp(node);
+ }
+
+ }
+
+ public RawConditionalEliminationVisitor(StructuredGraph graph, ScheduleResult schedule, MetaAccessProvider metaAccess, boolean replaceInputsWithConstants) {
this.graph = graph;
this.debug = graph.getDebug();
this.schedule = schedule;
@@ -326,8 +381,22 @@
}
protected void processUnary(UnaryNode node) {
- Stamp newStamp = node.foldStamp(getBestStamp(node.getValue()));
+ ValueNode value = node.getValue();
+ Stamp bestStamp = getBestStamp(value);
+ Stamp newStamp = node.foldStamp(bestStamp);
if (!checkReplaceWithConstant(newStamp, node)) {
+ if (!bestStamp.equals(value.stamp(NodeView.DEFAULT))) {
+ ValueNode newNode = node.canonical(rawCanonicalizerTool);
+ if (newNode != node) {
+ // Canonicalization successfully triggered.
+ if (newNode != null && !newNode.isAlive()) {
+ newNode = graph.addWithoutUniqueWithInputs(newNode);
+ }
+ node.replaceAndDelete(newNode);
+ GraphUtil.tryKillUnused(value);
+ return;
+ }
+ }
registerNewValueStamp(node, newStamp);
}
}
@@ -346,10 +415,31 @@
}
protected void processBinary(BinaryNode node) {
- Stamp xStamp = getBestStamp(node.getX());
- Stamp yStamp = getBestStamp(node.getY());
+
+ ValueNode x = node.getX();
+ ValueNode y = node.getY();
+
+ Stamp xStamp = getBestStamp(x);
+ Stamp yStamp = getBestStamp(y);
Stamp newStamp = node.foldStamp(xStamp, yStamp);
if (!checkReplaceWithConstant(newStamp, node)) {
+
+ if (!xStamp.equals(x.stamp(NodeView.DEFAULT)) || !yStamp.equals(y.stamp(NodeView.DEFAULT))) {
+ // At least one of the inputs has an improved stamp => attempt to canonicalize
+ // based on that improvement.
+ ValueNode newNode = node.canonical(rawCanonicalizerTool);
+ if (newNode != node) {
+ // Canonicalization successfully triggered.
+ if (newNode != null && !newNode.isAlive()) {
+ newNode = graph.addWithoutUniqueWithInputs(newNode);
+ }
+ node.replaceAndDelete(newNode);
+ GraphUtil.tryKillUnused(x);
+ GraphUtil.tryKillUnused(y);
+ return;
+ }
+ }
+
registerNewValueStamp(node, newStamp);
}
}
@@ -469,6 +559,10 @@
protected Stamp getBestStamp(ValueNode value) {
ValueNode originalNode = value;
+ if (!value.isAlive()) {
+ return value.stamp(NodeView.DEFAULT);
+ }
+
StampElement currentStamp = stampMap.getAndGrow(originalNode);
if (currentStamp == null) {
return value.stamp(NodeView.DEFAULT);
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.phases.common/src/org/graalvm/compiler/phases/common/OptimizeDivPhase.java Sat Mar 16 21:00:45 2019 +0000
@@ -0,0 +1,208 @@
+/*
+ * 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.
+ */
+
+
+package org.graalvm.compiler.phases.common;
+
+import jdk.internal.vm.compiler.collections.Pair;
+import org.graalvm.compiler.core.common.type.IntegerStamp;
+import org.graalvm.compiler.nodes.ConstantNode;
+import org.graalvm.compiler.nodes.FixedNode;
+import org.graalvm.compiler.nodes.NodeView;
+import org.graalvm.compiler.nodes.StructuredGraph;
+import org.graalvm.compiler.nodes.ValueNode;
+import org.graalvm.compiler.nodes.calc.BinaryArithmeticNode;
+import org.graalvm.compiler.nodes.calc.IntegerDivRemNode;
+import org.graalvm.compiler.nodes.calc.IntegerMulHighNode;
+import org.graalvm.compiler.nodes.calc.MulNode;
+import org.graalvm.compiler.nodes.calc.NarrowNode;
+import org.graalvm.compiler.nodes.calc.RightShiftNode;
+import org.graalvm.compiler.nodes.calc.SignExtendNode;
+import org.graalvm.compiler.nodes.calc.SignedDivNode;
+import org.graalvm.compiler.nodes.calc.SignedRemNode;
+import org.graalvm.compiler.nodes.calc.UnsignedRightShiftNode;
+import org.graalvm.compiler.phases.Phase;
+
+import jdk.vm.ci.code.CodeUtil;
+
+public class OptimizeDivPhase extends Phase {
+
+ @Override
+ protected void run(StructuredGraph graph) {
+ for (IntegerDivRemNode rem : graph.getNodes().filter(IntegerDivRemNode.class)) {
+ if (rem instanceof SignedRemNode && divByNonZeroConstant(rem)) {
+ optimizeRem(rem);
+ }
+ }
+ for (IntegerDivRemNode div : graph.getNodes().filter(IntegerDivRemNode.class)) {
+ if (div instanceof SignedDivNode && divByNonZeroConstant(div)) {
+ optimizeSignedDiv((SignedDivNode) div);
+ }
+ }
+ }
+
+ @Override
+ public float codeSizeIncrease() {
+ return 5.0f;
+ }
+
+ protected static boolean divByNonZeroConstant(IntegerDivRemNode divRemNode) {
+ return divRemNode.getY().isConstant() && divRemNode.getY().asJavaConstant().asLong() != 0;
+ }
+
+ protected final void optimizeRem(IntegerDivRemNode rem) {
+ assert rem.getOp() == IntegerDivRemNode.Op.REM;
+ // Java spec 15.17.3.: (a/b)*b+(a%b) == a
+ // so a%b == a-(a/b)*b
+ StructuredGraph graph = rem.graph();
+ ValueNode div = findDivForRem(rem);
+ ValueNode mul = BinaryArithmeticNode.mul(graph, div, rem.getY(), NodeView.DEFAULT);
+ ValueNode result = BinaryArithmeticNode.sub(graph, rem.getX(), mul, NodeView.DEFAULT);
+ graph.replaceFixedWithFloating(rem, result);
+ }
+
+ private ValueNode findDivForRem(IntegerDivRemNode rem) {
+ if (rem.next() instanceof IntegerDivRemNode) {
+ IntegerDivRemNode div = (IntegerDivRemNode) rem.next();
+ if (div.getOp() == IntegerDivRemNode.Op.DIV && div.getType() == rem.getType() && div.getX() == rem.getX() && div.getY() == rem.getY()) {
+ return div;
+ }
+ }
+ if (rem.predecessor() instanceof IntegerDivRemNode) {
+ IntegerDivRemNode div = (IntegerDivRemNode) rem.predecessor();
+ if (div.getOp() == IntegerDivRemNode.Op.DIV && div.getType() == rem.getType() && div.getX() == rem.getX() && div.getY() == rem.getY()) {
+ return div;
+ }
+ }
+
+ // not found, create a new one (will be optimized away later)
+ ValueNode div = rem.graph().addOrUniqueWithInputs(createDiv(rem));
+ if (div instanceof FixedNode) {
+ rem.graph().addAfterFixed(rem, (FixedNode) div);
+ }
+ return div;
+ }
+
+ protected ValueNode createDiv(IntegerDivRemNode rem) {
+ assert rem instanceof SignedRemNode;
+ return SignedDivNode.create(rem.getX(), rem.getY(), rem.getZeroCheck(), NodeView.DEFAULT);
+ }
+
+ protected static void optimizeSignedDiv(SignedDivNode div) {
+ ValueNode forX = div.getX();
+ long c = div.getY().asJavaConstant().asLong();
+ assert c != 1 && c != -1 && c != 0;
+
+ IntegerStamp dividendStamp = (IntegerStamp) forX.stamp(NodeView.DEFAULT);
+ int bitSize = dividendStamp.getBits();
+ Pair<Long, Integer> nums = magicDivideConstants(c, bitSize);
+ long magicNum = nums.getLeft().longValue();
+ int shiftNum = nums.getRight().intValue();
+ assert shiftNum >= 0;
+ ConstantNode m = ConstantNode.forLong(magicNum);
+
+ ValueNode value;
+ if (bitSize == 32) {
+ value = new MulNode(new SignExtendNode(forX, 64), m);
+ if ((c > 0 && magicNum < 0) || (c < 0 && magicNum > 0)) {
+ // Get upper 32-bits of the result
+ value = NarrowNode.create(new RightShiftNode(value, ConstantNode.forInt(32)), 32, NodeView.DEFAULT);
+ if (c > 0) {
+ value = BinaryArithmeticNode.add(value, forX, NodeView.DEFAULT);
+ } else {
+ value = BinaryArithmeticNode.sub(value, forX, NodeView.DEFAULT);
+ }
+ if (shiftNum > 0) {
+ value = new RightShiftNode(value, ConstantNode.forInt(shiftNum));
+ }
+ } else {
+ value = new RightShiftNode(value, ConstantNode.forInt(32 + shiftNum));
+ value = new NarrowNode(value, Integer.SIZE);
+ }
+ } else {
+ assert bitSize == 64;
+ value = new IntegerMulHighNode(forX, m);
+ if (c > 0 && magicNum < 0) {
+ value = BinaryArithmeticNode.add(value, forX, NodeView.DEFAULT);
+ } else if (c < 0 && magicNum > 0) {
+ value = BinaryArithmeticNode.sub(value, forX, NodeView.DEFAULT);
+ }
+ if (shiftNum > 0) {
+ value = new RightShiftNode(value, ConstantNode.forInt(shiftNum));
+ }
+ }
+
+ if (c < 0) {
+ ConstantNode s = ConstantNode.forInt(bitSize - 1);
+ ValueNode sign = UnsignedRightShiftNode.create(value, s, NodeView.DEFAULT);
+ value = BinaryArithmeticNode.add(value, sign, NodeView.DEFAULT);
+ } else if (dividendStamp.canBeNegative()) {
+ ConstantNode s = ConstantNode.forInt(bitSize - 1);
+ ValueNode sign = UnsignedRightShiftNode.create(forX, s, NodeView.DEFAULT);
+ value = BinaryArithmeticNode.add(value, sign, NodeView.DEFAULT);
+ }
+
+ StructuredGraph graph = div.graph();
+ graph.replaceFixed(div, graph.addOrUniqueWithInputs(value));
+ }
+
+ /**
+ * Borrowed from Hacker's Delight by Henry S. Warren, Jr. Figure 10-1.
+ */
+ private static Pair<Long, Integer> magicDivideConstants(long divisor, int size) {
+ final long twoW = 1L << (size - 1); // 2 ^ (size - 1).
+ long t = twoW + (divisor >>> 63);
+ long ad = Math.abs(divisor);
+ long anc = t - 1 - Long.remainderUnsigned(t, ad); // Absolute value of nc.
+ long q1 = Long.divideUnsigned(twoW, anc); // Init. q1 = 2**p/|nc|.
+ long r1 = Long.remainderUnsigned(twoW, anc); // Init. r1 = rem(2**p, |nc|).
+ long q2 = Long.divideUnsigned(twoW, ad); // Init. q2 = 2**p/|d|.
+ long r2 = Long.remainderUnsigned(twoW, ad); // Init. r2 = rem(2**p, |d|).
+ long delta;
+
+ int p = size - 1; // Init. p.
+ do {
+ p = p + 1;
+ q1 = 2 * q1; // Update q1 = 2**p/|nc|.
+ r1 = 2 * r1; // Update r1 = rem(2**p, |nc|).
+ if (Long.compareUnsigned(r1, anc) >= 0) { // Must be an unsigned comparison.
+ q1 = q1 + 1;
+ r1 = r1 - anc;
+ }
+ q2 = 2 * q2; // Update q2 = 2**p/|d|.
+ r2 = 2 * r2; // Update r2 = rem(2**p, |d|).
+ if (Long.compareUnsigned(r2, ad) >= 0) { // Must be an unsigned comparison.
+ q2 = q2 + 1;
+ r2 = r2 - ad;
+ }
+ delta = ad - r2;
+ } while (Long.compareUnsigned(q1, delta) < 0 || (q1 == delta && r1 == 0));
+
+ long magic = CodeUtil.signExtend(q2 + 1, size);
+ if (divisor < 0) {
+ magic = -magic;
+ }
+ return Pair.create(magic, p - size);
+ }
+
+}
--- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.phases.common/src/org/graalvm/compiler/phases/common/RemoveValueProxyPhase.java Tue Mar 12 09:49:10 2019 +0000
+++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.phases.common/src/org/graalvm/compiler/phases/common/RemoveValueProxyPhase.java Sat Mar 16 21:00:45 2019 +0000
@@ -26,7 +26,6 @@
import org.graalvm.compiler.nodes.FrameState;
import org.graalvm.compiler.nodes.LoopExitNode;
-import org.graalvm.compiler.nodes.ProxyNode;
import org.graalvm.compiler.nodes.StructuredGraph;
import org.graalvm.compiler.nodes.util.GraphUtil;
import org.graalvm.compiler.phases.Phase;
@@ -36,15 +35,14 @@
@Override
protected void run(StructuredGraph graph) {
for (LoopExitNode exit : graph.getNodes(LoopExitNode.TYPE)) {
- for (ProxyNode vpn : exit.proxies().snapshot()) {
- vpn.replaceAtUsagesAndDelete(vpn.value());
- }
- FrameState stateAfter = exit.stateAfter();
- if (stateAfter != null) {
+ exit.removeProxies();
+ FrameState frameState = exit.stateAfter();
+ if (frameState != null && frameState.isExceptionHandlingBCI()) {
+ // The parser will create loop exits with such BCIs on the exception handling path.
+ // Loop optimizations must avoid duplicating such exits
+ // We clean them up here otherwise they could survive until code generation
exit.setStateAfter(null);
- if (stateAfter.hasNoUsages()) {
- GraphUtil.killWithUnusedFloatingInputs(stateAfter);
- }
+ GraphUtil.tryKillUnused(frameState);
}
}
graph.setHasValueProxies(false);
--- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.phases/src/org/graalvm/compiler/phases/graph/ReentrantBlockIterator.java Tue Mar 12 09:49:10 2019 +0000
+++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.phases/src/org/graalvm/compiler/phases/graph/ReentrantBlockIterator.java Sat Mar 16 21:00:45 2019 +0000
@@ -77,13 +77,13 @@
EconomicMap<FixedNode, StateT> blockEndStates = apply(closure, loop.getHeader(), initialState, block -> !(block.getLoop() == loop || block.isLoopHeader()));
Block[] predecessors = loop.getHeader().getPredecessors();
- LoopInfo<StateT> info = new LoopInfo<>(predecessors.length - 1, loop.getExits().size());
+ LoopInfo<StateT> info = new LoopInfo<>(predecessors.length - 1, loop.getLoopExits().size());
for (int i = 1; i < predecessors.length; i++) {
StateT endState = blockEndStates.get(predecessors[i].getEndNode());
// make sure all end states are unique objects
info.endStates.add(closure.cloneState(endState));
}
- for (Block loopExit : loop.getExits()) {
+ for (Block loopExit : loop.getLoopExits()) {
assert loopExit.getPredecessorCount() == 1;
assert blockEndStates.containsKey(loopExit.getBeginNode()) : loopExit.getBeginNode() + " " + blockEndStates;
StateT exitState = blockEndStates.get(loopExit.getBeginNode());
@@ -210,8 +210,8 @@
List<StateT> exitStates = closure.processLoop(loop, state);
int i = 0;
- assert loop.getExits().size() == exitStates.size();
- for (Block exit : loop.getExits()) {
+ assert loop.getLoopExits().size() == exitStates.size();
+ for (Block exit : loop.getLoopExits()) {
states.put(exit.getBeginNode(), exitStates.get(i++));
blockQueue.addFirst(exit);
}
--- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.phases/src/org/graalvm/compiler/phases/util/GraphOrder.java Tue Mar 12 09:49:10 2019 +0000
+++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.phases/src/org/graalvm/compiler/phases/util/GraphOrder.java Sat Mar 16 21:00:45 2019 +0000
@@ -30,6 +30,7 @@
import jdk.internal.vm.compiler.collections.EconomicMap;
import jdk.internal.vm.compiler.collections.Equivalence;
import org.graalvm.compiler.core.common.cfg.Loop;
+import org.graalvm.compiler.debug.DebugContext;
import org.graalvm.compiler.debug.GraalError;
import org.graalvm.compiler.graph.GraalGraphError;
import org.graalvm.compiler.graph.Node;
@@ -153,9 +154,10 @@
* This method schedules the graph and makes sure that, for every node, all inputs are available
* at the position where it is scheduled. This is a very expensive assertion.
*/
+ @SuppressWarnings("try")
public static boolean assertSchedulableGraph(final StructuredGraph graph) {
assert graph.getGuardsStage() != GuardsStage.AFTER_FSA : "Cannot use the BlockIteratorClosure after FrameState Assignment, HIR Loop Data Structures are no longer valid.";
- try {
+ try (DebugContext.Scope s = graph.getDebug().scope("AssertSchedulableGraph")) {
final SchedulePhase schedulePhase = new SchedulePhase(SchedulingStrategy.LATEST_OUT_OF_LOOPS, true);
final EconomicMap<LoopBeginNode, NodeBitMap> loopEntryStates = EconomicMap.create(Equivalence.IDENTITY);
schedulePhase.apply(graph, false);
--- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.printer/src/org/graalvm/compiler/printer/GraphPrinterDumpHandler.java Tue Mar 12 09:49:10 2019 +0000
+++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.printer/src/org/graalvm/compiler/printer/GraphPrinterDumpHandler.java Sat Mar 16 21:00:45 2019 +0000
@@ -43,6 +43,7 @@
import org.graalvm.compiler.debug.DebugOptions;
import org.graalvm.compiler.debug.GraalError;
import org.graalvm.compiler.debug.TTY;
+import org.graalvm.compiler.debug.DebugOptions.PrintGraphTarget;
import org.graalvm.compiler.graph.Graph;
import org.graalvm.compiler.nodes.StructuredGraph;
import org.graalvm.compiler.options.OptionValues;
@@ -124,7 +125,7 @@
@SuppressWarnings("try")
public void dump(DebugContext debug, Object object, final String format, Object... arguments) {
OptionValues options = debug.getOptions();
- if (object instanceof Graph && DebugOptions.PrintGraph.getValue(options)) {
+ if (object instanceof Graph && DebugOptions.PrintGraph.getValue(options) != PrintGraphTarget.Disable) {
final Graph graph = (Graph) object;
ensureInitialized(debug, graph);
if (printer == null) {
--- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements.aarch64/src/org/graalvm/compiler/replacements/aarch64/AArch64GraphBuilderPlugins.java Tue Mar 12 09:49:10 2019 +0000
+++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements.aarch64/src/org/graalvm/compiler/replacements/aarch64/AArch64GraphBuilderPlugins.java Sat Mar 16 21:00:45 2019 +0000
@@ -31,9 +31,9 @@
import static org.graalvm.compiler.replacements.nodes.UnaryMathIntrinsicNode.UnaryOperation.LOG10;
import static org.graalvm.compiler.replacements.nodes.UnaryMathIntrinsicNode.UnaryOperation.SIN;
import static org.graalvm.compiler.replacements.nodes.UnaryMathIntrinsicNode.UnaryOperation.TAN;
-import static org.graalvm.compiler.serviceprovider.GraalServices.JAVA_SPECIFICATION_VERSION;
-import static org.graalvm.compiler.serviceprovider.GraalServices.Java11OrEarlier;
-import static org.graalvm.compiler.serviceprovider.GraalServices.Java8OrEarlier;
+import static org.graalvm.compiler.serviceprovider.JavaVersionUtil.JAVA_SPECIFICATION_VERSION;
+import static org.graalvm.compiler.serviceprovider.JavaVersionUtil.Java11OrEarlier;
+import static org.graalvm.compiler.serviceprovider.JavaVersionUtil.Java8OrEarlier;
import org.graalvm.compiler.bytecode.BytecodeProvider;
import org.graalvm.compiler.lir.aarch64.AArch64ArithmeticLIRGeneratorTool.RoundingMode;
--- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements.amd64/src/org/graalvm/compiler/replacements/amd64/AMD64GraphBuilderPlugins.java Tue Mar 12 09:49:10 2019 +0000
+++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements.amd64/src/org/graalvm/compiler/replacements/amd64/AMD64GraphBuilderPlugins.java Sat Mar 16 21:00:45 2019 +0000
@@ -32,9 +32,9 @@
import static org.graalvm.compiler.replacements.nodes.UnaryMathIntrinsicNode.UnaryOperation.LOG10;
import static org.graalvm.compiler.replacements.nodes.UnaryMathIntrinsicNode.UnaryOperation.SIN;
import static org.graalvm.compiler.replacements.nodes.UnaryMathIntrinsicNode.UnaryOperation.TAN;
-import static org.graalvm.compiler.serviceprovider.GraalServices.JAVA_SPECIFICATION_VERSION;
-import static org.graalvm.compiler.serviceprovider.GraalServices.Java11OrEarlier;
-import static org.graalvm.compiler.serviceprovider.GraalServices.Java8OrEarlier;
+import static org.graalvm.compiler.serviceprovider.JavaVersionUtil.JAVA_SPECIFICATION_VERSION;
+import static org.graalvm.compiler.serviceprovider.JavaVersionUtil.Java11OrEarlier;
+import static org.graalvm.compiler.serviceprovider.JavaVersionUtil.Java8OrEarlier;
import java.util.Arrays;
@@ -71,7 +71,7 @@
public class AMD64GraphBuilderPlugins {
- public static void register(Plugins plugins, BytecodeProvider replacementsBytecodeProvider, AMD64 arch, boolean arithmeticStubs, boolean explicitUnsafeNullChecks) {
+ public static void register(Plugins plugins, BytecodeProvider replacementsBytecodeProvider, AMD64 arch, boolean explicitUnsafeNullChecks) {
InvocationPlugins invocationPlugins = plugins.getInvocationPlugins();
invocationPlugins.defer(new Runnable() {
@Override
@@ -82,10 +82,10 @@
registerPlatformSpecificUnsafePlugins(invocationPlugins, replacementsBytecodeProvider, explicitUnsafeNullChecks,
new JavaKind[]{JavaKind.Int, JavaKind.Long, JavaKind.Object, JavaKind.Boolean, JavaKind.Byte, JavaKind.Short, JavaKind.Char, JavaKind.Float, JavaKind.Double});
registerUnsafePlugins(invocationPlugins, replacementsBytecodeProvider, explicitUnsafeNullChecks);
- registerStringPlugins(invocationPlugins, arch, replacementsBytecodeProvider);
- registerStringLatin1Plugins(invocationPlugins, arch, replacementsBytecodeProvider);
- registerStringUTF16Plugins(invocationPlugins, arch, replacementsBytecodeProvider);
- registerMathPlugins(invocationPlugins, arch, arithmeticStubs, replacementsBytecodeProvider);
+ registerStringPlugins(invocationPlugins, replacementsBytecodeProvider);
+ registerStringLatin1Plugins(invocationPlugins, replacementsBytecodeProvider);
+ registerStringUTF16Plugins(invocationPlugins, replacementsBytecodeProvider);
+ registerMathPlugins(invocationPlugins, arch, replacementsBytecodeProvider);
registerArraysEqualsPlugins(invocationPlugins, replacementsBytecodeProvider);
}
});
@@ -155,21 +155,15 @@
}
}
- private static void registerMathPlugins(InvocationPlugins plugins, AMD64 arch, boolean arithmeticStubs, BytecodeProvider bytecodeProvider) {
+ private static void registerMathPlugins(InvocationPlugins plugins, AMD64 arch, BytecodeProvider bytecodeProvider) {
Registration r = new Registration(plugins, Math.class, bytecodeProvider);
registerUnaryMath(r, "log", LOG);
registerUnaryMath(r, "log10", LOG10);
registerUnaryMath(r, "exp", EXP);
registerBinaryMath(r, "pow", POW);
- if (arithmeticStubs) {
- registerUnaryMath(r, "sin", SIN);
- registerUnaryMath(r, "cos", COS);
- registerUnaryMath(r, "tan", TAN);
- } else {
- r.registerMethodSubstitution(AMD64MathSubstitutions.class, "sin", double.class);
- r.registerMethodSubstitution(AMD64MathSubstitutions.class, "cos", double.class);
- r.registerMethodSubstitution(AMD64MathSubstitutions.class, "tan", double.class);
- }
+ registerUnaryMath(r, "sin", SIN);
+ registerUnaryMath(r, "cos", COS);
+ registerUnaryMath(r, "tan", TAN);
if (arch.getFeatures().contains(CPUFeature.SSE4_1)) {
registerRound(r, "rint", RoundingMode.NEAREST);
@@ -208,23 +202,19 @@
});
}
- private static void registerStringPlugins(InvocationPlugins plugins, AMD64 arch, BytecodeProvider replacementsBytecodeProvider) {
+ private static void registerStringPlugins(InvocationPlugins plugins, BytecodeProvider replacementsBytecodeProvider) {
if (Java8OrEarlier) {
Registration r;
r = new Registration(plugins, String.class, replacementsBytecodeProvider);
r.setAllowOverwrite(true);
- if (arch.getFeatures().contains(CPUFeature.SSE4_2)) {
- r.registerMethodSubstitution(AMD64StringSubstitutions.class, "indexOf", char[].class, int.class,
- int.class, char[].class, int.class, int.class, int.class);
- }
- if (arch.getFeatures().contains(CPUFeature.SSSE3)) {
- r.registerMethodSubstitution(AMD64StringSubstitutions.class, "indexOf", Receiver.class, int.class, int.class);
- }
+ r.registerMethodSubstitution(AMD64StringSubstitutions.class, "indexOf", char[].class, int.class,
+ int.class, char[].class, int.class, int.class, int.class);
+ r.registerMethodSubstitution(AMD64StringSubstitutions.class, "indexOf", Receiver.class, int.class, int.class);
r.registerMethodSubstitution(AMD64StringSubstitutions.class, "compareTo", Receiver.class, String.class);
}
}
- private static void registerStringLatin1Plugins(InvocationPlugins plugins, AMD64 arch, BytecodeProvider replacementsBytecodeProvider) {
+ private static void registerStringLatin1Plugins(InvocationPlugins plugins, BytecodeProvider replacementsBytecodeProvider) {
if (JAVA_SPECIFICATION_VERSION >= 9) {
Registration r = new Registration(plugins, "java.lang.StringLatin1", replacementsBytecodeProvider);
r.setAllowOverwrite(true);
@@ -232,14 +222,12 @@
r.registerMethodSubstitution(AMD64StringLatin1Substitutions.class, "compareToUTF16", byte[].class, byte[].class);
r.registerMethodSubstitution(AMD64StringLatin1Substitutions.class, "inflate", byte[].class, int.class, char[].class, int.class, int.class);
r.registerMethodSubstitution(AMD64StringLatin1Substitutions.class, "inflate", byte[].class, int.class, byte[].class, int.class, int.class);
-
- if (arch.getFeatures().contains(CPUFeature.SSSE3)) {
- r.registerMethodSubstitution(AMD64StringLatin1Substitutions.class, "indexOf", byte[].class, int.class, int.class);
- }
+ r.registerMethodSubstitution(AMD64StringLatin1Substitutions.class, "indexOf", byte[].class, int.class, int.class);
+ r.registerMethodSubstitution(AMD64StringLatin1Substitutions.class, "indexOf", byte[].class, int.class, byte[].class, int.class, int.class);
}
}
- private static void registerStringUTF16Plugins(InvocationPlugins plugins, AMD64 arch, BytecodeProvider replacementsBytecodeProvider) {
+ private static void registerStringUTF16Plugins(InvocationPlugins plugins, BytecodeProvider replacementsBytecodeProvider) {
if (JAVA_SPECIFICATION_VERSION >= 9) {
Registration r = new Registration(plugins, "java.lang.StringUTF16", replacementsBytecodeProvider);
r.setAllowOverwrite(true);
@@ -247,10 +235,9 @@
r.registerMethodSubstitution(AMD64StringUTF16Substitutions.class, "compareToLatin1", byte[].class, byte[].class);
r.registerMethodSubstitution(AMD64StringUTF16Substitutions.class, "compress", char[].class, int.class, byte[].class, int.class, int.class);
r.registerMethodSubstitution(AMD64StringUTF16Substitutions.class, "compress", byte[].class, int.class, byte[].class, int.class, int.class);
-
- if (arch.getFeatures().contains(CPUFeature.SSSE3)) {
- r.registerMethodSubstitution(AMD64StringUTF16Substitutions.class, "indexOfCharUnsafe", byte[].class, int.class, int.class, int.class);
- }
+ r.registerMethodSubstitution(AMD64StringUTF16Substitutions.class, "indexOfCharUnsafe", byte[].class, int.class, int.class, int.class);
+ r.registerMethodSubstitution(AMD64StringUTF16Substitutions.class, "indexOfUnsafe", byte[].class, int.class, byte[].class, int.class, int.class);
+ r.registerMethodSubstitution(AMD64StringUTF16Substitutions.class, "indexOfLatin1Unsafe", byte[].class, int.class, byte[].class, int.class, int.class);
}
}
--- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements.amd64/src/org/graalvm/compiler/replacements/amd64/AMD64MathSubstitutions.java Tue Mar 12 09:49:10 2019 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,85 +0,0 @@
-/*
- * Copyright (c) 2011, 2018, Oracle and/or its affiliates. All rights reserved.
- * 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.
- */
-
-
-package org.graalvm.compiler.replacements.amd64;
-
-import org.graalvm.compiler.api.replacements.ClassSubstitution;
-import org.graalvm.compiler.api.replacements.MethodSubstitution;
-import org.graalvm.compiler.core.common.spi.ForeignCallDescriptor;
-import org.graalvm.compiler.graph.Node.ConstantNodeParameter;
-import org.graalvm.compiler.graph.Node.NodeIntrinsic;
-import org.graalvm.compiler.nodes.extended.ForeignCallNode;
-import org.graalvm.compiler.replacements.nodes.UnaryMathIntrinsicNode;
-import org.graalvm.compiler.replacements.nodes.UnaryMathIntrinsicNode.UnaryOperation;
-
-// JaCoCo Exclude
-
-/**
- * Substitutions for some {@link java.lang.Math} methods that leverage AMD64 instructions for
- * selected input values.
- */
-@ClassSubstitution(Math.class)
-public class AMD64MathSubstitutions {
-
- private static final double PI_4 = Math.PI / 4;
-
- // NOTE on snippets below:
- // Math.sin(), .cos() and .tan() guarantee a value within 1 ULP of the
- // exact result, but x87 trigonometric FPU instructions are only that
- // accurate within [-pi/4, pi/4]. Examine the passed value and provide
- // a slow path for inputs outside of that interval.
-
- @MethodSubstitution
- public static double sin(double x) {
- if (Math.abs(x) < PI_4) {
- return UnaryMathIntrinsicNode.compute(x, UnaryOperation.SIN);
- } else {
- return callDouble1(UnaryOperation.SIN.foreignCallDescriptor, x);
- }
- }
-
- @MethodSubstitution
- public static double cos(double x) {
- if (Math.abs(x) < PI_4) {
- return UnaryMathIntrinsicNode.compute(x, UnaryOperation.COS);
- } else {
- return callDouble1(UnaryOperation.COS.foreignCallDescriptor, x);
- }
- }
-
- @MethodSubstitution
- public static double tan(double x) {
- if (Math.abs(x) < PI_4) {
- return UnaryMathIntrinsicNode.compute(x, UnaryOperation.TAN);
- } else {
- return callDouble1(UnaryOperation.TAN.foreignCallDescriptor, x);
- }
- }
-
- @NodeIntrinsic(value = ForeignCallNode.class)
- private static native double callDouble1(@ConstantNodeParameter ForeignCallDescriptor descriptor, double value);
-
- @NodeIntrinsic(value = ForeignCallNode.class)
- private static native double callDouble2(@ConstantNodeParameter ForeignCallDescriptor descriptor, double a, double b);
-}
--- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements.amd64/src/org/graalvm/compiler/replacements/amd64/AMD64StringLatin1Substitutions.java Tue Mar 12 09:49:10 2019 +0000
+++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements.amd64/src/org/graalvm/compiler/replacements/amd64/AMD64StringLatin1Substitutions.java Sat Mar 16 21:00:45 2019 +0000
@@ -30,6 +30,7 @@
import org.graalvm.compiler.api.replacements.MethodSubstitution;
import org.graalvm.compiler.nodes.DeoptimizeNode;
import org.graalvm.compiler.replacements.nodes.ArrayCompareToNode;
+import org.graalvm.compiler.replacements.nodes.ArrayRegionEqualsNode;
import org.graalvm.compiler.word.Word;
import jdk.internal.vm.compiler.word.Pointer;
@@ -89,7 +90,15 @@
return ArrayCompareToNode.compareTo(value, other, value.length, other.length, JavaKind.Byte, JavaKind.Char);
}
- @MethodSubstitution(optional = true)
+ private static Word pointer(byte[] target) {
+ return Word.objectToTrackedPointer(target).add(byteArrayBaseOffset(INJECTED));
+ }
+
+ private static Word byteOffsetPointer(byte[] source, int offset) {
+ return pointer(source).add(offset * byteArrayIndexScale(INJECTED));
+ }
+
+ @MethodSubstitution
public static int indexOf(byte[] value, int ch, int origFromIndex) {
int fromIndex = origFromIndex;
if (ch >>> 8 != 0) {
@@ -103,7 +112,7 @@
// Note: fromIndex might be near -1>>>1.
return -1;
}
- Pointer sourcePointer = Word.objectToTrackedPointer(value).add(byteArrayBaseOffset(INJECTED)).add(fromIndex);
+ Pointer sourcePointer = byteOffsetPointer(value, fromIndex);
int result = AMD64ArrayIndexOf.indexOf1Byte(sourcePointer, length - fromIndex, (byte) ch);
if (result != -1) {
return result + fromIndex;
@@ -111,6 +120,59 @@
return result;
}
+ @MethodSubstitution
+ public static int indexOf(byte[] source, int sourceCount, byte[] target, int targetCount, int origFromIndex) {
+ int fromIndex = origFromIndex;
+ if (fromIndex >= sourceCount) {
+ return (targetCount == 0 ? sourceCount : -1);
+ }
+ if (fromIndex < 0) {
+ fromIndex = 0;
+ }
+ if (targetCount == 0) {
+ // The empty string is in every string.
+ return fromIndex;
+ }
+ if (sourceCount - fromIndex < targetCount) {
+ // The empty string contains nothing except the empty string.
+ return -1;
+ }
+ int totalOffset = fromIndex;
+ if (targetCount == 1) {
+ Pointer sourcePointer = byteOffsetPointer(source, totalOffset);
+ int indexOfResult = AMD64ArrayIndexOf.indexOf1Byte(sourcePointer, sourceCount - fromIndex, target[0]);
+ if (indexOfResult >= 0) {
+ return indexOfResult + totalOffset;
+ }
+ return indexOfResult;
+ } else if (targetCount == 2) {
+ Pointer sourcePointer = byteOffsetPointer(source, totalOffset);
+ int indexOfResult = AMD64ArrayIndexOf.indexOfTwoConsecutiveBytes(sourcePointer, sourceCount - fromIndex, target[0], target[1]);
+ if (indexOfResult >= 0) {
+ return indexOfResult + totalOffset;
+ }
+ return indexOfResult;
+ } else {
+ int haystackLength = sourceCount - (fromIndex + (targetCount - 2));
+ while (haystackLength > 0) {
+ Pointer sourcePointer = byteOffsetPointer(source, totalOffset);
+ int indexOfResult = AMD64ArrayIndexOf.indexOfTwoConsecutiveBytes(sourcePointer, haystackLength, target[0], target[1]);
+ if (indexOfResult < 0) {
+ return -1;
+ }
+ totalOffset += indexOfResult;
+ haystackLength -= (indexOfResult + 1);
+ Pointer cmpSourcePointer = byteOffsetPointer(source, totalOffset);
+ Pointer targetPointer = pointer(target);
+ if (ArrayRegionEqualsNode.regionEquals(cmpSourcePointer, targetPointer, targetCount, JavaKind.Byte)) {
+ return totalOffset;
+ }
+ totalOffset++;
+ }
+ return -1;
+ }
+ }
+
/**
* Intrinsic for {@code java.lang.StringLatin1.inflate([BI[CII)V}.
*
--- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements.amd64/src/org/graalvm/compiler/replacements/amd64/AMD64StringSubstitutions.java Tue Mar 12 09:49:10 2019 +0000
+++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements.amd64/src/org/graalvm/compiler/replacements/amd64/AMD64StringSubstitutions.java Sat Mar 16 21:00:45 2019 +0000
@@ -82,7 +82,6 @@
// The empty string contains nothing except the empty string.
return -1;
}
- assert sourceCount - fromIndex > 0 && targetCount > 0;
if (targetCount == 1) {
Pointer sourcePointer = Word.objectToTrackedPointer(source).add(charArrayBaseOffset(INJECTED)).add(totalOffset * charArrayIndexScale(INJECTED));
--- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements.amd64/src/org/graalvm/compiler/replacements/amd64/AMD64StringUTF16Substitutions.java Tue Mar 12 09:49:10 2019 +0000
+++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements.amd64/src/org/graalvm/compiler/replacements/amd64/AMD64StringUTF16Substitutions.java Sat Mar 16 21:00:45 2019 +0000
@@ -24,25 +24,27 @@
package org.graalvm.compiler.replacements.amd64;
+import jdk.vm.ci.meta.DeoptimizationAction;
+import jdk.vm.ci.meta.DeoptimizationReason;
+import jdk.vm.ci.meta.JavaKind;
+import jdk.vm.ci.meta.MetaAccessProvider;
import org.graalvm.compiler.api.replacements.ClassSubstitution;
import org.graalvm.compiler.api.replacements.Fold;
import org.graalvm.compiler.api.replacements.Fold.InjectedParameter;
import org.graalvm.compiler.api.replacements.MethodSubstitution;
import org.graalvm.compiler.nodes.DeoptimizeNode;
+import org.graalvm.compiler.replacements.ReplacementsUtil;
+import org.graalvm.compiler.replacements.StringUTF16Substitutions;
import org.graalvm.compiler.replacements.nodes.ArrayCompareToNode;
+import org.graalvm.compiler.replacements.nodes.ArrayRegionEqualsNode;
import org.graalvm.compiler.word.Word;
import jdk.internal.vm.compiler.word.Pointer;
-import jdk.vm.ci.meta.DeoptimizationAction;
-import jdk.vm.ci.meta.DeoptimizationReason;
-import jdk.vm.ci.meta.JavaKind;
-import jdk.vm.ci.meta.MetaAccessProvider;
-
// JaCoCo Exclude
/**
* Substitutions for {@code java.lang.StringUTF16} methods.
- *
+ * <p>
* Since JDK 9.
*/
@ClassSubstitution(className = "java.lang.StringUTF16", optional = true)
@@ -68,9 +70,15 @@
return metaAccess.getArrayIndexScale(JavaKind.Char);
}
- /** Marker value for the {@link InjectedParameter} injected parameter. */
+ /**
+ * Marker value for the {@link InjectedParameter} injected parameter.
+ */
static final MetaAccessProvider INJECTED = null;
+ public static int length(byte[] value) {
+ return value.length >> 1;
+ }
+
/**
* @param value is char[]
* @param other is char[]
@@ -93,9 +101,9 @@
return ArrayCompareToNode.compareTo(other, value, other.length, value.length, JavaKind.Char, JavaKind.Byte);
}
- @MethodSubstitution(optional = true)
+ @MethodSubstitution
public static int indexOfCharUnsafe(byte[] value, int ch, int fromIndex, int max) {
- Pointer sourcePointer = Word.objectToTrackedPointer(value).add(byteArrayBaseOffset(INJECTED)).add(fromIndex * charArrayIndexScale(INJECTED));
+ Pointer sourcePointer = charOffsetPointer(value, fromIndex);
int result = AMD64ArrayIndexOf.indexOf1Char(sourcePointer, max - fromIndex, (char) ch);
if (result != -1) {
return result + fromIndex;
@@ -103,6 +111,100 @@
return result;
}
+ private static Word pointer(byte[] target) {
+ return Word.objectToTrackedPointer(target).add(byteArrayBaseOffset(INJECTED));
+ }
+
+ private static Word charOffsetPointer(byte[] value, int offset) {
+ return pointer(value).add(offset * charArrayIndexScale(INJECTED));
+ }
+
+ @MethodSubstitution
+ public static int indexOfUnsafe(byte[] source, int sourceCount, byte[] target, int targetCount, int fromIndex) {
+ ReplacementsUtil.runtimeAssert(fromIndex >= 0, "StringUTF16.indexOfUnsafe invalid args: fromIndex negative");
+ ReplacementsUtil.runtimeAssert(targetCount > 0, "StringUTF16.indexOfUnsafe invalid args: targetCount <= 0");
+ ReplacementsUtil.runtimeAssert(targetCount <= length(target), "StringUTF16.indexOfUnsafe invalid args: targetCount > length(target)");
+ ReplacementsUtil.runtimeAssert(sourceCount >= targetCount, "StringUTF16.indexOfUnsafe invalid args: sourceCount < targetCount");
+ int totalOffset = fromIndex;
+ if (targetCount == 1) {
+ Pointer sourcePointer = charOffsetPointer(source, totalOffset);
+ int indexOfResult = AMD64ArrayIndexOf.indexOf1Char(sourcePointer, sourceCount - fromIndex, StringUTF16Substitutions.getChar(target, 0));
+ if (indexOfResult >= 0) {
+ return indexOfResult + totalOffset;
+ }
+ return indexOfResult;
+ } else if (targetCount == 2) {
+ Pointer sourcePointer = charOffsetPointer(source, totalOffset);
+ int indexOfResult = AMD64ArrayIndexOf.indexOfTwoConsecutiveChars(sourcePointer, sourceCount - fromIndex, StringUTF16Substitutions.getChar(target, 0),
+ StringUTF16Substitutions.getChar(target, 1));
+ if (indexOfResult >= 0) {
+ return indexOfResult + totalOffset;
+ }
+ return indexOfResult;
+ } else {
+ int haystackLength = sourceCount - (fromIndex + (targetCount - 2));
+ while (haystackLength > 0) {
+ Pointer sourcePointer = charOffsetPointer(source, totalOffset);
+ int indexOfResult = AMD64ArrayIndexOf.indexOfTwoConsecutiveChars(sourcePointer, haystackLength, StringUTF16Substitutions.getChar(target, 0),
+ StringUTF16Substitutions.getChar(target, 1));
+ if (indexOfResult < 0) {
+ return -1;
+ }
+ totalOffset += indexOfResult;
+ haystackLength -= (indexOfResult + 1);
+ Pointer cmpSourcePointer = charOffsetPointer(source, totalOffset);
+ Pointer targetPointer = pointer(target);
+ if (ArrayRegionEqualsNode.regionEquals(cmpSourcePointer, targetPointer, targetCount, JavaKind.Char)) {
+ return totalOffset;
+ }
+ totalOffset++;
+ }
+ return -1;
+ }
+ }
+
+ @MethodSubstitution
+ public static int indexOfLatin1Unsafe(byte[] source, int sourceCount, byte[] target, int targetCount, int fromIndex) {
+ ReplacementsUtil.runtimeAssert(fromIndex >= 0, "StringUTF16.indexOfLatin1Unsafe invalid args: fromIndex negative");
+ ReplacementsUtil.runtimeAssert(targetCount > 0, "StringUTF16.indexOfLatin1Unsafe invalid args: targetCount <= 0");
+ ReplacementsUtil.runtimeAssert(targetCount <= target.length, "StringUTF16.indexOfLatin1Unsafe invalid args: targetCount > length(target)");
+ ReplacementsUtil.runtimeAssert(sourceCount >= targetCount, "StringUTF16.indexOfLatin1Unsafe invalid args: sourceCount < targetCount");
+ int totalOffset = fromIndex;
+ if (targetCount == 1) {
+ Pointer sourcePointer = charOffsetPointer(source, totalOffset);
+ int indexOfResult = AMD64ArrayIndexOf.indexOf1Char(sourcePointer, sourceCount - fromIndex, (char) Byte.toUnsignedInt(target[0]));
+ if (indexOfResult >= 0) {
+ return indexOfResult + totalOffset;
+ }
+ return indexOfResult;
+ } else if (targetCount == 2) {
+ Pointer sourcePointer = charOffsetPointer(source, totalOffset);
+ int indexOfResult = AMD64ArrayIndexOf.indexOfTwoConsecutiveChars(sourcePointer, sourceCount - fromIndex, (char) Byte.toUnsignedInt(target[0]), (char) Byte.toUnsignedInt(target[1]));
+ if (indexOfResult >= 0) {
+ return indexOfResult + totalOffset;
+ }
+ return indexOfResult;
+ } else {
+ int haystackLength = sourceCount - (fromIndex + (targetCount - 2));
+ while (haystackLength > 0) {
+ Pointer sourcePointer = charOffsetPointer(source, totalOffset);
+ int indexOfResult = AMD64ArrayIndexOf.indexOfTwoConsecutiveChars(sourcePointer, haystackLength, (char) Byte.toUnsignedInt(target[0]), (char) Byte.toUnsignedInt(target[1]));
+ if (indexOfResult < 0) {
+ return -1;
+ }
+ totalOffset += indexOfResult;
+ haystackLength -= (indexOfResult + 1);
+ Pointer cmpSourcePointer = charOffsetPointer(source, totalOffset);
+ Pointer targetPointer = pointer(target);
+ if (ArrayRegionEqualsNode.regionEquals(cmpSourcePointer, targetPointer, targetCount, JavaKind.Char, JavaKind.Byte)) {
+ return totalOffset;
+ }
+ totalOffset++;
+ }
+ return -1;
+ }
+ }
+
/**
* Intrinsic for {@code java.lang.StringUTF16.compress([CI[BII)I}.
*
@@ -129,7 +231,7 @@
* @HotSpotIntrinsicCandidate
* public static int compress(byte[] src, int src_indx, byte[] dst, int dst_indx, int len)
* </pre>
- *
+ * <p>
* In this variant {@code dest} refers to a byte array containing 2 byte per char so
* {@code srcIndex} and {@code len} are in terms of char elements and have to be scaled by 2
* when referring to {@code src}.
--- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements.processor/src/org/graalvm/compiler/replacements/processor/GeneratedPlugin.java Tue Mar 12 09:49:10 2019 +0000
+++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements.processor/src/org/graalvm/compiler/replacements/processor/GeneratedPlugin.java Sat Mar 16 21:00:45 2019 +0000
@@ -208,7 +208,11 @@
out.printf(" %s arg%d;\n", getErasedType(type), argIdx);
out.printf(" if (args[%d].isConstant()) {\n", nodeIdx);
if (type.equals(processor.getType("jdk.vm.ci.meta.ResolvedJavaType"))) {
- out.printf(" arg%d = %s.asJavaType(args[%d].asConstant());\n", argIdx, deps.use(WellKnownDependency.CONSTANT_REFLECTION), nodeIdx);
+ out.printf(" jdk.vm.ci.meta.JavaConstant cst = args[%d].asJavaConstant();\n", nodeIdx);
+ out.printf(" arg%d = %s.asJavaType(cst);\n", argIdx, deps.use(WellKnownDependency.CONSTANT_REFLECTION));
+ out.printf(" if (arg%d == null) {\n", argIdx);
+ out.printf(" arg%d = %s.asObject(jdk.vm.ci.meta.ResolvedJavaType.class, cst);\n", argIdx, deps.use(WellKnownDependency.SNIPPET_REFLECTION));
+ out.printf(" }\n");
} else {
switch (type.getKind()) {
case BOOLEAN:
--- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements.test/src/org/graalvm/compiler/replacements/test/DeoptimizeOnIntegerExactTest.java Tue Mar 12 09:49:10 2019 +0000
+++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements.test/src/org/graalvm/compiler/replacements/test/DeoptimizeOnIntegerExactTest.java Sat Mar 16 21:00:45 2019 +0000
@@ -134,6 +134,7 @@
@Override
protected InstalledCode addMethod(DebugContext debug, final ResolvedJavaMethod method, final CompilationResult compilationResult) {
- return getBackend().createInstalledCode(debug, method, compilationResult, speculationLog, null, false);
+ assert speculationLog == compilationResult.getSpeculationLog();
+ return getBackend().createInstalledCode(debug, method, compilationResult, null, false);
}
}
--- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements.test/src/org/graalvm/compiler/replacements/test/IntegerExactFoldTest.java Tue Mar 12 09:49:10 2019 +0000
+++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements.test/src/org/graalvm/compiler/replacements/test/IntegerExactFoldTest.java Sat Mar 16 21:00:45 2019 +0000
@@ -40,23 +40,21 @@
import org.graalvm.compiler.nodes.ReturnNode;
import org.graalvm.compiler.nodes.StructuredGraph;
import org.graalvm.compiler.nodes.StructuredGraph.AllowAssumptions;
-import org.graalvm.compiler.nodes.StructuredGraph.GuardsStage;
import org.graalvm.compiler.nodes.ValueNode;
import org.graalvm.compiler.nodes.spi.LoweringTool;
import org.graalvm.compiler.phases.common.CanonicalizerPhase;
+import org.graalvm.compiler.phases.common.GuardLoweringPhase;
import org.graalvm.compiler.phases.common.LoweringPhase;
import org.graalvm.compiler.phases.tiers.HighTierContext;
-import org.graalvm.compiler.phases.tiers.PhaseContext;
+import org.graalvm.compiler.phases.tiers.MidTierContext;
import org.graalvm.compiler.replacements.nodes.arithmetic.IntegerExactArithmeticNode;
import org.graalvm.compiler.replacements.nodes.arithmetic.IntegerExactArithmeticSplitNode;
import org.junit.Assert;
-import org.junit.Ignore;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.junit.runners.Parameterized;
import org.junit.runners.Parameterized.Parameters;
-@Ignore
@RunWith(Parameterized.class)
public class IntegerExactFoldTest extends GraalCompilerTest {
private final long lowerBoundA;
@@ -97,6 +95,7 @@
assertNotNull("original node must be in the graph", originalNode);
new CanonicalizerPhase().apply(graph, getDefaultHighTierContext());
+
ValueNode node = findNode(graph);
boolean overflowExpected = node instanceof IntegerExactArithmeticNode;
@@ -110,17 +109,19 @@
Node originalNode = graph.getNodes().filter(x -> x instanceof IntegerExactArithmeticNode).first();
assertNotNull("original node must be in the graph", originalNode);
+ CanonicalizerPhase canonicalizer = new CanonicalizerPhase();
+ HighTierContext highTierContext = getDefaultHighTierContext();
+ new LoweringPhase(canonicalizer, LoweringTool.StandardLoweringStage.HIGH_TIER).apply(graph, highTierContext);
+ MidTierContext midTierContext = getDefaultMidTierContext();
+ new GuardLoweringPhase().apply(graph, midTierContext);
+ new CanonicalizerPhase().apply(graph, midTierContext);
- graph.setGuardsStage(GuardsStage.FIXED_DEOPTS);
- CanonicalizerPhase canonicalizer = new CanonicalizerPhase();
- PhaseContext context = new PhaseContext(getProviders());
- new LoweringPhase(canonicalizer, LoweringTool.StandardLoweringStage.HIGH_TIER).apply(graph, context);
IntegerExactArithmeticSplitNode loweredNode = graph.getNodes().filter(IntegerExactArithmeticSplitNode.class).first();
assertNotNull("the lowered node must be in the graph", loweredNode);
loweredNode.getX().setStamp(StampFactory.forInteger(bits, lowerBoundA, upperBoundA));
loweredNode.getY().setStamp(StampFactory.forInteger(bits, lowerBoundB, upperBoundB));
- new CanonicalizerPhase().apply(graph, context);
+ new CanonicalizerPhase().apply(graph, midTierContext);
ValueNode node = findNode(graph);
boolean overflowExpected = node instanceof IntegerExactArithmeticSplitNode;
--- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements.test/src/org/graalvm/compiler/replacements/test/ReplacementsParseTest.java Tue Mar 12 09:49:10 2019 +0000
+++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements.test/src/org/graalvm/compiler/replacements/test/ReplacementsParseTest.java Sat Mar 16 21:00:45 2019 +0000
@@ -24,6 +24,7 @@
package org.graalvm.compiler.replacements.test;
+import static org.graalvm.compiler.debug.DebugOptions.DumpOnError;
import static org.graalvm.compiler.java.BytecodeParserOptions.InlinePartialIntrinsicExitDuringParsing;
import java.util.function.Function;
@@ -40,15 +41,19 @@
import org.graalvm.compiler.core.common.type.Stamp;
import org.graalvm.compiler.core.common.type.StampFactory;
import org.graalvm.compiler.debug.DebugContext;
+import org.graalvm.compiler.debug.GraalError;
import org.graalvm.compiler.graph.GraalGraphError;
import org.graalvm.compiler.graph.Node.ConstantNodeParameter;
import org.graalvm.compiler.graph.Node.NodeIntrinsic;
+import org.graalvm.compiler.java.BytecodeParser.BytecodeParserError;
import org.graalvm.compiler.nodes.FrameState;
import org.graalvm.compiler.nodes.PiNode;
import org.graalvm.compiler.nodes.StructuredGraph;
+import org.graalvm.compiler.nodes.StructuredGraph.AllowAssumptions;
+import org.graalvm.compiler.nodes.StructuredGraph.Builder;
import org.graalvm.compiler.nodes.ValueNode;
+import org.graalvm.compiler.nodes.extended.ForeignCallNode;
import org.graalvm.compiler.nodes.extended.OpaqueNode;
-import org.graalvm.compiler.nodes.extended.ForeignCallNode;
import org.graalvm.compiler.nodes.graphbuilderconf.GraphBuilderContext;
import org.graalvm.compiler.nodes.graphbuilderconf.InlineInvokePlugin;
import org.graalvm.compiler.nodes.graphbuilderconf.InvocationPlugin.Receiver;
@@ -64,8 +69,10 @@
import org.graalvm.compiler.phases.common.GuardLoweringPhase;
import org.graalvm.compiler.phases.common.LoweringPhase;
import org.graalvm.compiler.phases.tiers.HighTierContext;
+import org.graalvm.compiler.test.GraalTest;
import jdk.internal.vm.compiler.word.LocationIdentity;
import org.junit.Assert;
+import org.junit.Assume;
import org.junit.BeforeClass;
import org.junit.Test;
@@ -190,6 +197,10 @@
static int nonVoidIntrinsicWithOptimizedSplit(int x) {
return x;
}
+
+ static int div(int x, int y) {
+ return x / y;
+ }
}
@ClassSubstitution(TestObject.class)
@@ -287,6 +298,12 @@
return x;
}
+ @MethodSubstitution
+ static int div(int x, int y) {
+ assert y != 0;
+ return x / y;
+ }
+
public static void nonVoidIntrinsicWithCallStub(int zLen) {
nonVoidIntrinsicWithCallStub(STUB_CALL, zLen);
}
@@ -311,6 +328,7 @@
r.registerMethodSubstitution(TestObjectSubstitutions.class, "copyFirstL2R", byte[].class, byte[].class);
r.registerMethodSubstitution(TestObjectSubstitutions.class, "nonVoidIntrinsicWithCall", int.class, int.class);
r.registerMethodSubstitution(TestObjectSubstitutions.class, "nonVoidIntrinsicWithOptimizedSplit", int.class);
+ r.registerMethodSubstitution(TestObjectSubstitutions.class, "div", int.class, int.class);
if (replacementBytecodeProvider.supportsInvokedynamic()) {
r.registerMethodSubstitution(TestObjectSubstitutions.class, "identity", String.class);
@@ -357,6 +375,7 @@
@Test
public void testNextAfter() {
+ Assume.assumeFalse(GraalTest.Java8OrEarlier);
double[] inArray = new double[1024];
double[] outArray = new double[1024];
for (int i = 0; i < inArray.length; i++) {
@@ -590,6 +609,23 @@
testGraph("nonVoidIntrinsicWithOptimizedSplit");
}
+ public static int div(int x, int y) {
+ return TestObject.div(x, y);
+ }
+
+ @Test
+ public void testAssertionInMethodSubstitution() {
+ try {
+ ResolvedJavaMethod method = getResolvedJavaMethod("div");
+ // avoid dumping graphs and printing exception since and exception is expected
+ OptionValues options = new OptionValues(getInitialOptions(), DumpOnError, false);
+ parse(new Builder(options, getDebugContext(options, null, method), AllowAssumptions.YES).method(method).compilationId(getCompilationId(method)), getEagerGraphBuilderSuite());
+ throw GraalError.shouldNotReachHere("BytecodeParser should have complained about using assertion in an intrinsic.");
+ } catch (BytecodeParserError e) {
+ // Expected behavior
+ }
+ }
+
@SuppressWarnings("try")
private void testGraph(String name) {
StructuredGraph graph = parseEager(name, StructuredGraph.AllowAssumptions.YES);
--- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements.test/src/org/graalvm/compiler/replacements/test/StringCompareToTest.java Tue Mar 12 09:49:10 2019 +0000
+++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements.test/src/org/graalvm/compiler/replacements/test/StringCompareToTest.java Sat Mar 16 21:00:45 2019 +0000
@@ -24,21 +24,23 @@
package org.graalvm.compiler.replacements.test;
-import jdk.vm.ci.aarch64.AArch64;
-import jdk.vm.ci.amd64.AMD64;
-import jdk.vm.ci.meta.ResolvedJavaMethod;
+import static org.graalvm.compiler.core.common.GraalOptions.RemoveNeverExecutedCode;
+
+import java.util.List;
+
import org.graalvm.compiler.graph.Node;
import org.graalvm.compiler.nodes.StructuredGraph;
import org.graalvm.compiler.options.OptionValues;
import org.graalvm.compiler.replacements.nodes.ArrayCompareToNode;
import org.graalvm.compiler.serviceprovider.GraalServices;
+import org.graalvm.compiler.serviceprovider.JavaVersionUtil;
import org.junit.Assert;
import org.junit.Assume;
import org.junit.Test;
-import java.util.List;
-
-import static org.graalvm.compiler.core.common.GraalOptions.RemoveNeverExecutedCode;
+import jdk.vm.ci.aarch64.AArch64;
+import jdk.vm.ci.amd64.AMD64;
+import jdk.vm.ci.meta.ResolvedJavaMethod;
/**
* Tests compareTo method intrinsic.
@@ -89,7 +91,7 @@
OptionValues options;
boolean needCheckNode = true;
- if (GraalServices.Java8OrEarlier) {
+ if (JavaVersionUtil.Java8OrEarlier) {
needCheckNode = false;
} else {
List<String> vmArgs = GraalServices.getInputArguments();
--- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements.test/src/org/graalvm/compiler/replacements/test/StringIndexOfTestBase.java Tue Mar 12 09:49:10 2019 +0000
+++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements.test/src/org/graalvm/compiler/replacements/test/StringIndexOfTestBase.java Sat Mar 16 21:00:45 2019 +0000
@@ -24,6 +24,8 @@
package org.graalvm.compiler.replacements.test;
+import static org.junit.Assume.assumeFalse;
+
import org.graalvm.compiler.core.test.GraalCompilerTest;
import org.junit.Test;
import org.junit.runner.RunWith;
@@ -31,6 +33,7 @@
import java.util.ArrayList;
import java.util.Collection;
+import jdk.vm.ci.aarch64.AArch64;
@RunWith(value = Parameterized.class)
public abstract class StringIndexOfTestBase extends GraalCompilerTest {
@@ -44,6 +47,25 @@
String[] utf16targets = new String[]{"grga " + ((char) 0x10D) + "varak", "grga", ((char) 0x10D) + "varak"};
addTargets(tests, targets);
addTargets(tests, utf16targets);
+
+ // Check long targets
+ // Checkstyle: stop
+ String lipsum = "Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat, sed diam voluptua. At vero eos et accusam et justo duo dolores et ea rebum. Stet clita kasd gubergren, no sea takimata ";
+ // Checkstyle: resume
+ String lipsumUTF16 = lipsum + ((char) 0x10D);
+ int[] subStringLengths = {7, 8, 15, 16, 31, 32, 63, 64};
+ for (int len : subStringLengths) {
+ String target = lipsum.substring(50, 50 + len);
+ tests.add(new Object[]{lipsum, target});
+ tests.add(new Object[]{lipsum, target + "X"});
+ tests.add(new Object[]{lipsumUTF16, target});
+ tests.add(new Object[]{lipsumUTF16, target + "X"});
+ tests.add(new Object[]{lipsumUTF16, target + ((char) 0x10D)});
+ }
+ tests.add(new Object[]{
+ "\u0100\u0101\u0102\u0103\u0104\u0105\u0106\u0107\u00f9\u00fa\u00fb\u00fc\u00fd\u00fe\u00ff\u0108\u0109\u010a\u010b\u010c",
+ "\u00f9\u00fa\u00fb\u00fc\u00fd\u00fe\u00ff"});
+
return tests;
}
@@ -99,6 +121,7 @@
@Test
public void testStringBuilderIndexOfConstant() {
+ assumeFalse("Disabled on AArch64 due to issues on AArch64; see GR-13100 or JDK-8215792", getTarget().arch instanceof AArch64);
/*
* Put a copy of the target string in the space after the current string to detect cases
* where we search too far.
@@ -111,6 +134,7 @@
@Test
public void testStringBuilderIndexOfConstantOffset() {
+ assumeFalse("Disabled on AArch64 due to issues on AArch64; see GR-13100 or JDK-8215792", getTarget().arch instanceof AArch64);
/*
* Put a copy of the target string in the space after the current string to detect cases
* where we search too far.
--- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements.test/src/org/graalvm/compiler/replacements/test/classfile/ClassfileBytecodeProviderTest.java Tue Mar 12 09:49:10 2019 +0000
+++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements.test/src/org/graalvm/compiler/replacements/test/classfile/ClassfileBytecodeProviderTest.java Sat Mar 16 21:00:45 2019 +0000
@@ -195,6 +195,10 @@
}
protected void checkClass(MetaAccessProvider metaAccess, SnippetReflectionProvider snippetReflection, String className) throws ClassNotFoundException {
+ if (className.equals("jdk.vm.ci.services.JVMCIClassLoaderFactory")) {
+ // JVMCIClassLoaderFactory must only be initialized by the VM
+ return;
+ }
Class<?> c = Class.forName(className, true, getClass().getClassLoader());
ClassfileBytecodeProvider cbp = new ClassfileBytecodeProvider(metaAccess, snippetReflection);
for (Method method : c.getDeclaredMethods()) {
@@ -205,15 +209,21 @@
private static void checkMethod(ClassfileBytecodeProvider cbp, MetaAccessProvider metaAccess, Executable executable) {
ResolvedJavaMethod method = metaAccess.lookupJavaMethod(executable);
if (method.hasBytecodes()) {
- ResolvedJavaMethodBytecode expected = new ResolvedJavaMethodBytecode(method);
Bytecode actual = getBytecode(cbp, method);
- new BytecodeComparer(expected, actual).compare();
+ if (actual != null) {
+ ResolvedJavaMethodBytecode expected = new ResolvedJavaMethodBytecode(method);
+ new BytecodeComparer(expected, actual).compare();
+ }
}
}
protected static Bytecode getBytecode(ClassfileBytecodeProvider cbp, ResolvedJavaMethod method) {
try {
return cbp.getBytecode(method);
+ } catch (UnsupportedClassVersionError e) {
+ // This can happen when a library containing old class files
+ // is bundled into a Graal jar (GR-12672).
+ return null;
} catch (Throwable e) {
throw new AssertionError(String.format("Error getting bytecode for %s", method.format("%H.%n(%p)")), e);
}
--- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/CachingPEGraphDecoder.java Tue Mar 12 09:49:10 2019 +0000
+++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/CachingPEGraphDecoder.java Sat Mar 16 21:00:45 2019 +0000
@@ -44,7 +44,7 @@
import org.graalvm.compiler.nodes.graphbuilderconf.ParameterPlugin;
import org.graalvm.compiler.phases.OptimisticOptimizations;
import org.graalvm.compiler.phases.common.CanonicalizerPhase;
-import org.graalvm.compiler.phases.common.ConvertDeoptimizeToGuardPhase;
+import org.graalvm.compiler.loop.phases.ConvertDeoptimizeToGuardPhase;
import org.graalvm.compiler.phases.tiers.PhaseContext;
import org.graalvm.compiler.phases.util.Providers;
--- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/DefaultJavaLoweringProvider.java Tue Mar 12 09:49:10 2019 +0000
+++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/DefaultJavaLoweringProvider.java Sat Mar 16 21:00:45 2019 +0000
@@ -47,7 +47,6 @@
import org.graalvm.compiler.api.replacements.Snippet;
import org.graalvm.compiler.api.replacements.SnippetReflectionProvider;
import org.graalvm.compiler.core.common.LIRKind;
-import org.graalvm.compiler.core.common.spi.ForeignCallDescriptor;
import org.graalvm.compiler.core.common.spi.ForeignCallsProvider;
import org.graalvm.compiler.core.common.type.IntegerStamp;
import org.graalvm.compiler.core.common.type.ObjectStamp;
@@ -123,6 +122,7 @@
import org.graalvm.compiler.nodes.memory.ReadNode;
import org.graalvm.compiler.nodes.memory.WriteNode;
import org.graalvm.compiler.nodes.memory.address.AddressNode;
+import org.graalvm.compiler.nodes.memory.address.IndexAddressNode;
import org.graalvm.compiler.nodes.memory.address.OffsetAddressNode;
import org.graalvm.compiler.nodes.spi.Lowerable;
import org.graalvm.compiler.nodes.spi.LoweringProvider;
@@ -138,9 +138,7 @@
import org.graalvm.compiler.phases.util.Providers;
import org.graalvm.compiler.replacements.SnippetLowerableMemoryNode.SnippetLowering;
import org.graalvm.compiler.replacements.nodes.BinaryMathIntrinsicNode;
-import org.graalvm.compiler.replacements.nodes.BinaryMathIntrinsicNode.BinaryOperation;
import org.graalvm.compiler.replacements.nodes.UnaryMathIntrinsicNode;
-import org.graalvm.compiler.replacements.nodes.UnaryMathIntrinsicNode.UnaryOperation;
import jdk.internal.vm.compiler.word.LocationIdentity;
import jdk.vm.ci.code.CodeUtil;
@@ -206,6 +204,8 @@
lowerLoadIndexedNode((LoadIndexedNode) n, tool);
} else if (n instanceof StoreIndexedNode) {
lowerStoreIndexedNode((StoreIndexedNode) n, tool);
+ } else if (n instanceof IndexAddressNode) {
+ lowerIndexAddressNode((IndexAddressNode) n);
} else if (n instanceof ArrayLengthNode) {
lowerArrayLengthNode((ArrayLengthNode) n, tool);
} else if (n instanceof LoadHubNode) {
@@ -321,27 +321,20 @@
ResolvedJavaMethod method = math.graph().method();
if (method != null) {
if (method.getAnnotation(Snippet.class) != null) {
- /*
- * In the context of the snippet use the LIR lowering instead of the Node lowering.
- */
+ // In the context of SnippetStub, i.e., Graal-generated stubs, use the LIR
+ // lowering to emit the stub assembly code instead of the Node lowering.
return;
}
if (method.getName().equalsIgnoreCase(math.getOperation().name()) && tool.getMetaAccess().lookupJavaType(Math.class).equals(method.getDeclaringClass())) {
- /*
- * A root compilation of the intrinsic method should emit the full assembly
- * implementation.
- */
+ // A root compilation of the intrinsic method should emit the full assembly
+ // implementation.
return;
}
-
}
- ForeignCallDescriptor foreignCall = toForeignCall(math.getOperation());
- if (foreignCall != null) {
- StructuredGraph graph = math.graph();
- ForeignCallNode call = graph.add(new ForeignCallNode(foreignCalls, toForeignCall(math.getOperation()), math.getX(), math.getY()));
- graph.addAfterFixed(tool.lastFixedNode(), call);
- math.replaceAtUsages(call);
- }
+ StructuredGraph graph = math.graph();
+ ForeignCallNode call = graph.add(new ForeignCallNode(foreignCalls, math.getOperation().foreignCallDescriptor, math.getX(), math.getY()));
+ graph.addAfterFixed(tool.lastFixedNode(), call);
+ math.replaceAtUsages(call);
}
private void lowerUnaryMath(UnaryMathIntrinsicNode math, LoweringTool tool) {
@@ -350,36 +343,16 @@
}
ResolvedJavaMethod method = math.graph().method();
if (method != null) {
- if (method.getAnnotation(Snippet.class) != null) {
- /*
- * In the context of the snippet use the LIR lowering instead of the Node lowering.
- */
- return;
- }
if (method.getName().equalsIgnoreCase(math.getOperation().name()) && tool.getMetaAccess().lookupJavaType(Math.class).equals(method.getDeclaringClass())) {
- /*
- * A root compilation of the intrinsic method should emit the full assembly
- * implementation.
- */
+ // A root compilation of the intrinsic method should emit the full assembly
+ // implementation.
return;
}
-
}
- ForeignCallDescriptor foreignCall = toForeignCall(math.getOperation());
- if (foreignCall != null) {
- StructuredGraph graph = math.graph();
- ForeignCallNode call = math.graph().add(new ForeignCallNode(foreignCalls, foreignCall, math.getValue()));
- graph.addAfterFixed(tool.lastFixedNode(), call);
- math.replaceAtUsages(call);
- }
- }
-
- protected ForeignCallDescriptor toForeignCall(UnaryOperation operation) {
- return operation.foreignCallDescriptor;
- }
-
- protected ForeignCallDescriptor toForeignCall(BinaryOperation operation) {
- return operation.foreignCallDescriptor;
+ StructuredGraph graph = math.graph();
+ ForeignCallNode call = math.graph().add(new ForeignCallNode(foreignCalls, math.getOperation().foreignCallDescriptor, math.getValue()));
+ graph.addAfterFixed(tool.lastFixedNode(), call);
+ math.replaceAtUsages(call);
}
protected void lowerVerifyHeap(VerifyHeapNode n) {
@@ -476,6 +449,11 @@
return graph.unique(new OffsetAddressNode(array, offset));
}
+ protected void lowerIndexAddressNode(IndexAddressNode indexAddress) {
+ AddressNode lowered = createArrayAddress(indexAddress.graph(), indexAddress.getArray(), indexAddress.getElementKind(), indexAddress.getIndex());
+ indexAddress.replaceAndDelete(lowered);
+ }
+
protected void lowerLoadIndexedNode(LoadIndexedNode loadIndexed, LoweringTool tool) {
StructuredGraph graph = loadIndexed.graph();
ValueNode array = loadIndexed.array();
--- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/GraphKit.java Tue Mar 12 09:49:10 2019 +0000
+++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/GraphKit.java Sat Mar 16 21:00:45 2019 +0000
@@ -24,6 +24,7 @@
package org.graalvm.compiler.replacements;
+import static jdk.vm.ci.services.Services.IS_IN_NATIVE_IMAGE;
import static org.graalvm.compiler.nodes.graphbuilderconf.IntrinsicContext.CompilationContext.INLINE_AFTER_PARSING;
import java.lang.reflect.Method;
@@ -358,13 +359,18 @@
Plugins plugins = new Plugins(graphBuilderPlugins);
GraphBuilderConfiguration config = GraphBuilderConfiguration.getSnippetDefault(plugins);
- StructuredGraph calleeGraph = new StructuredGraph.Builder(invoke.getOptions(), invoke.getDebug()).method(method).trackNodeSourcePosition(
- invoke.graph().trackNodeSourcePosition()).setIsSubstitution(true).build();
- IntrinsicContext initialReplacementContext = new IntrinsicContext(method, method, providers.getReplacements().getDefaultReplacementBytecodeProvider(), INLINE_AFTER_PARSING);
- GraphBuilderPhase.Instance instance = createGraphBuilderInstance(metaAccess, providers.getStampProvider(), providers.getConstantReflection(), providers.getConstantFieldProvider(), config,
- OptimisticOptimizations.NONE,
- initialReplacementContext);
- instance.apply(calleeGraph);
+ StructuredGraph calleeGraph;
+ if (IS_IN_NATIVE_IMAGE) {
+ calleeGraph = providers.getReplacements().getSnippet(method, null, false, null);
+ } else {
+ calleeGraph = new StructuredGraph.Builder(invoke.getOptions(), invoke.getDebug()).method(method).trackNodeSourcePosition(invoke.graph().trackNodeSourcePosition()).setIsSubstitution(
+ true).build();
+ IntrinsicContext initialReplacementContext = new IntrinsicContext(method, method, providers.getReplacements().getDefaultReplacementBytecodeProvider(), INLINE_AFTER_PARSING);
+ GraphBuilderPhase.Instance instance = createGraphBuilderInstance(metaAccess, providers.getStampProvider(), providers.getConstantReflection(), providers.getConstantFieldProvider(), config,
+ OptimisticOptimizations.NONE,
+ initialReplacementContext);
+ instance.apply(calleeGraph);
+ }
// Remove all frame states from inlinee
calleeGraph.clearAllStateAfter();
--- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/IntrinsicGraphBuilder.java Tue Mar 12 09:49:10 2019 +0000
+++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/IntrinsicGraphBuilder.java Sat Mar 16 21:00:45 2019 +0000
@@ -40,6 +40,7 @@
import org.graalvm.compiler.nodes.FixedNode;
import org.graalvm.compiler.nodes.FixedWithNextNode;
import org.graalvm.compiler.nodes.FrameState;
+import org.graalvm.compiler.nodes.Invoke;
import org.graalvm.compiler.nodes.ParameterNode;
import org.graalvm.compiler.nodes.ReturnNode;
import org.graalvm.compiler.nodes.StateSplit;
@@ -163,7 +164,7 @@
}
@Override
- public void handleReplacedInvoke(InvokeKind invokeKind, ResolvedJavaMethod targetMethod, ValueNode[] args, boolean forceInlineEverything) {
+ public Invoke handleReplacedInvoke(InvokeKind invokeKind, ResolvedJavaMethod targetMethod, ValueNode[] args, boolean forceInlineEverything) {
throw GraalError.shouldNotReachHere();
}
--- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/PEGraphDecoder.java Tue Mar 12 09:49:10 2019 +0000
+++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/PEGraphDecoder.java Sat Mar 16 21:00:45 2019 +0000
@@ -353,7 +353,7 @@
}
@Override
- public void handleReplacedInvoke(InvokeKind invokeKind, ResolvedJavaMethod targetMethod, ValueNode[] args, boolean inlineEverything) {
+ public Invoke handleReplacedInvoke(InvokeKind invokeKind, ResolvedJavaMethod targetMethod, ValueNode[] args, boolean inlineEverything) {
throw unimplemented();
}
@@ -589,13 +589,19 @@
}
}
+ @SuppressWarnings("try")
public void decode(ResolvedJavaMethod method, boolean isSubstitution, boolean trackNodeSourcePosition) {
- PEMethodScope methodScope = new PEMethodScope(graph, null, null, lookupEncodedGraph(method, null, null, isSubstitution, trackNodeSourcePosition), method, null, 0, loopExplosionPlugin, null);
- decode(createInitialLoopScope(methodScope, null));
- cleanupGraph(methodScope);
+ try (DebugContext.Scope scope = debug.scope("PEGraphDecode", graph)) {
+ EncodedGraph encodedGraph = lookupEncodedGraph(method, null, null, isSubstitution, trackNodeSourcePosition);
+ PEMethodScope methodScope = new PEMethodScope(graph, null, null, encodedGraph, method, null, 0, loopExplosionPlugin, null);
+ decode(createInitialLoopScope(methodScope, null));
+ cleanupGraph(methodScope);
- debug.dump(DebugContext.VERBOSE_LEVEL, graph, "After graph cleanup");
- assert graph.verify();
+ debug.dump(DebugContext.VERBOSE_LEVEL, graph, "After graph cleanup");
+ assert graph.verify();
+ } catch (Throwable t) {
+ throw debug.handle(t);
+ }
try {
/* Check that the control flow graph can be computed, to catch problems early. */
@@ -737,11 +743,19 @@
Invoke invoke = invokeData.invoke;
ResolvedJavaMethod targetMethod = callTarget.targetMethod();
+ if (loopScope.methodScope.encodedGraph.isCallToOriginal(targetMethod)) {
+ return false;
+ }
+
InvocationPlugin invocationPlugin = getInvocationPlugin(targetMethod);
if (invocationPlugin == null) {
return false;
}
+ if (loopScope.methodScope.encodedGraph.isCallToOriginal(targetMethod)) {
+ return false;
+ }
+
ValueNode[] arguments = callTarget.arguments().toArray(new ValueNode[0]);
FixedWithNextNode invokePredecessor = (FixedWithNextNode) invoke.asNode().predecessor();
--- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/ReplacementsImpl.java Tue Mar 12 09:49:10 2019 +0000
+++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/ReplacementsImpl.java Sat Mar 16 21:00:45 2019 +0000
@@ -81,10 +81,13 @@
import org.graalvm.compiler.nodes.java.MethodCallTargetNode;
import org.graalvm.compiler.nodes.spi.Replacements;
import org.graalvm.compiler.nodes.spi.StampProvider;
+import org.graalvm.compiler.options.Option;
+import org.graalvm.compiler.options.OptionKey;
+import org.graalvm.compiler.options.OptionType;
import org.graalvm.compiler.options.OptionValues;
import org.graalvm.compiler.phases.OptimisticOptimizations;
import org.graalvm.compiler.phases.common.CanonicalizerPhase;
-import org.graalvm.compiler.phases.common.ConvertDeoptimizeToGuardPhase;
+import org.graalvm.compiler.loop.phases.ConvertDeoptimizeToGuardPhase;
import org.graalvm.compiler.phases.common.DeadCodeEliminationPhase;
import org.graalvm.compiler.phases.tiers.PhaseContext;
import org.graalvm.compiler.phases.util.Providers;
@@ -99,6 +102,13 @@
public class ReplacementsImpl implements Replacements, InlineInvokePlugin {
+ public static class Options {
+ // @formatter:off
+ @Option(help = "This is a testing option to exercise the SymbolicSnippetEncoder", type = OptionType.Expert)
+ public static final OptionKey<Boolean> UseEncodedSnippets = new OptionKey<>(false);
+ // @formatter:on
+ }
+
protected final OptionValues options;
public Providers getProviders() {
@@ -223,11 +233,6 @@
private static final TimerKey SnippetPreparationTime = DebugContext.timer("SnippetPreparationTime");
- @Override
- public StructuredGraph getSnippet(ResolvedJavaMethod method, Object[] args, boolean trackNodeSourcePosition, NodeSourcePosition replaceePosition) {
- return getSnippet(method, null, args, trackNodeSourcePosition, replaceePosition);
- }
-
private static final AtomicInteger nextDebugContextId = new AtomicInteger();
public DebugContext openDebugContext(String idPrefix, ResolvedJavaMethod method) {
--- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/SnippetCounter.java Tue Mar 12 09:49:10 2019 +0000
+++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/SnippetCounter.java Sat Mar 16 21:00:45 2019 +0000
@@ -35,6 +35,9 @@
* snippet specific metrics.
*/
public final class SnippetCounter implements Comparable<SnippetCounter> {
+
+ public static final SnippetCounter DISABLED_COUNTER = new SnippetCounter(null, "Disabled", "Disabled");
+
/**
* A group of related counters.
*/
@@ -130,7 +133,7 @@
* compile-time constant {@link SnippetCounter} object.
*/
public void inc() {
- if (group != null) {
+ if (getGroup() != null) {
SnippetCounterNode.increment(this);
}
}
@@ -140,7 +143,7 @@
* compile-time constant {@link SnippetCounter} object.
*/
public void add(int increment) {
- if (group != null) {
+ if (getGroup() != null) {
SnippetCounterNode.add(this, increment);
}
}
--- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/SnippetIntegerHistogram.java Tue Mar 12 09:49:10 2019 +0000
+++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/SnippetIntegerHistogram.java Sat Mar 16 21:00:45 2019 +0000
@@ -29,6 +29,8 @@
* gathering snippet specific metrics.
*/
public final class SnippetIntegerHistogram {
+ public static final SnippetIntegerHistogram DISABLED_COUNTER = new SnippetIntegerHistogram(null, 1, "Disabled", "Disabled");
+
private final SnippetCounter.Group group;
private final String name;
--- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/SnippetTemplate.java Tue Mar 12 09:49:10 2019 +0000
+++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/SnippetTemplate.java Sat Mar 16 21:00:45 2019 +0000
@@ -25,6 +25,7 @@
package org.graalvm.compiler.replacements;
import static java.util.FormattableFlags.ALTERNATE;
+import static jdk.vm.ci.services.Services.IS_IN_NATIVE_IMAGE;
import static org.graalvm.compiler.debug.DebugContext.DEFAULT_LOG_STREAM;
import static org.graalvm.compiler.debug.DebugContext.applyFormattingFlagsAndWidth;
import static org.graalvm.compiler.debug.DebugOptions.DebugStubsAndSnippets;
@@ -212,8 +213,9 @@
constantParameters[0] = true;
}
- // Retrieve the names only when assertions are turned on.
- assert initNames(method, count);
+ // Retrieve the names only when assertions are turned on. Parameter annotations are
+ // unsupported in the native image.
+ assert IS_IN_NATIVE_IMAGE || initNames(method, count);
}
final boolean[] constantParameters;
--- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/StandardGraphBuilderPlugins.java Tue Mar 12 09:49:10 2019 +0000
+++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/StandardGraphBuilderPlugins.java Sat Mar 16 21:00:45 2019 +0000
@@ -33,8 +33,8 @@
import static jdk.vm.ci.code.MemoryBarriers.STORE_LOAD;
import static jdk.vm.ci.code.MemoryBarriers.STORE_STORE;
import static org.graalvm.compiler.nodes.NamedLocationIdentity.OFF_HEAP_LOCATION;
-import static org.graalvm.compiler.serviceprovider.GraalServices.Java11OrEarlier;
-import static org.graalvm.compiler.serviceprovider.GraalServices.Java8OrEarlier;
+import static org.graalvm.compiler.serviceprovider.JavaVersionUtil.Java11OrEarlier;
+import static org.graalvm.compiler.serviceprovider.JavaVersionUtil.Java8OrEarlier;
import java.lang.reflect.Array;
import java.lang.reflect.Field;
@@ -54,8 +54,6 @@
import org.graalvm.compiler.graph.Edges;
import org.graalvm.compiler.graph.Node;
import org.graalvm.compiler.graph.NodeList;
-import org.graalvm.compiler.java.IntegerExactOpSpeculation;
-import org.graalvm.compiler.java.IntegerExactOpSpeculation.IntegerExactOp;
import org.graalvm.compiler.nodes.AbstractBeginNode;
import org.graalvm.compiler.nodes.BeginNode;
import org.graalvm.compiler.nodes.ConstantNode;
@@ -66,6 +64,7 @@
import org.graalvm.compiler.nodes.IfNode;
import org.graalvm.compiler.nodes.LogicNode;
import org.graalvm.compiler.nodes.MergeNode;
+import org.graalvm.compiler.nodes.NamedLocationIdentity;
import org.graalvm.compiler.nodes.NodeView;
import org.graalvm.compiler.nodes.StateSplit;
import org.graalvm.compiler.nodes.StructuredGraph;
@@ -93,6 +92,9 @@
import org.graalvm.compiler.nodes.extended.BranchProbabilityNode;
import org.graalvm.compiler.nodes.extended.BytecodeExceptionNode.BytecodeExceptionKind;
import org.graalvm.compiler.nodes.extended.GetClassNode;
+import org.graalvm.compiler.nodes.extended.GuardingNode;
+import org.graalvm.compiler.nodes.extended.JavaReadNode;
+import org.graalvm.compiler.nodes.extended.JavaWriteNode;
import org.graalvm.compiler.nodes.extended.MembarNode;
import org.graalvm.compiler.nodes.extended.OpaqueNode;
import org.graalvm.compiler.nodes.extended.RawLoadNode;
@@ -113,6 +115,8 @@
import org.graalvm.compiler.nodes.java.RegisterFinalizerNode;
import org.graalvm.compiler.nodes.java.UnsafeCompareAndExchangeNode;
import org.graalvm.compiler.nodes.java.UnsafeCompareAndSwapNode;
+import org.graalvm.compiler.nodes.memory.HeapAccess;
+import org.graalvm.compiler.nodes.memory.address.IndexAddressNode;
import org.graalvm.compiler.nodes.type.StampTool;
import org.graalvm.compiler.nodes.util.GraphUtil;
import org.graalvm.compiler.nodes.virtual.EnsureVirtualizedNode;
@@ -120,13 +124,16 @@
import org.graalvm.compiler.replacements.nodes.ReverseBytesNode;
import org.graalvm.compiler.replacements.nodes.VirtualizableInvokeMacroNode;
import org.graalvm.compiler.replacements.nodes.arithmetic.IntegerAddExactNode;
+import org.graalvm.compiler.replacements.nodes.arithmetic.IntegerAddExactOverflowNode;
import org.graalvm.compiler.replacements.nodes.arithmetic.IntegerAddExactSplitNode;
-import org.graalvm.compiler.replacements.nodes.arithmetic.IntegerExactArithmeticNode;
import org.graalvm.compiler.replacements.nodes.arithmetic.IntegerExactArithmeticSplitNode;
import org.graalvm.compiler.replacements.nodes.arithmetic.IntegerMulExactNode;
+import org.graalvm.compiler.replacements.nodes.arithmetic.IntegerMulExactOverflowNode;
import org.graalvm.compiler.replacements.nodes.arithmetic.IntegerMulExactSplitNode;
import org.graalvm.compiler.replacements.nodes.arithmetic.IntegerSubExactNode;
+import org.graalvm.compiler.replacements.nodes.arithmetic.IntegerSubExactOverflowNode;
import org.graalvm.compiler.replacements.nodes.arithmetic.IntegerSubExactSplitNode;
+import org.graalvm.compiler.serviceprovider.SpeculationReasonGroup;
import jdk.internal.vm.compiler.word.LocationIdentity;
import jdk.vm.ci.code.BytecodePosition;
@@ -197,8 +204,10 @@
public boolean apply(GraphBuilderContext b, ResolvedJavaMethod targetMethod, Receiver receiver) {
if (receiver.isConstant()) {
String s = snippetReflection.asObject(String.class, (JavaConstant) receiver.get().asConstant());
- b.addPush(JavaKind.Int, b.add(ConstantNode.forInt(s.hashCode())));
- return true;
+ if (s != null) {
+ b.addPush(JavaKind.Int, b.add(ConstantNode.forInt(s.hashCode())));
+ return true;
+ }
}
return false;
}
@@ -221,12 +230,32 @@
});
} else {
r.registerMethodSubstitution(JDK9StringSubstitutions.class, "equals", Receiver.class, Object.class);
+ Registration utf16sub = new Registration(plugins, StringUTF16Substitutions.class, bytecodeProvider);
+ utf16sub.register2("getCharDirect", byte[].class, int.class, new InvocationPlugin() {
+ @Override
+ public boolean apply(GraphBuilderContext b, ResolvedJavaMethod targetMethod, Receiver receiver, ValueNode arg1, ValueNode arg2) {
+ b.addPush(JavaKind.Char, new JavaReadNode(JavaKind.Char, new IndexAddressNode(arg1, arg2, JavaKind.Byte), NamedLocationIdentity.getArrayLocation(JavaKind.Byte),
+ HeapAccess.BarrierType.NONE, false));
+ return true;
+ }
+ });
+ utf16sub.register3("putCharDirect", byte[].class, int.class, int.class, new InvocationPlugin() {
+ @Override
+ public boolean apply(GraphBuilderContext b, ResolvedJavaMethod targetMethod, Receiver receiver, ValueNode arg1, ValueNode arg2, ValueNode arg3) {
+ b.add(new JavaWriteNode(JavaKind.Char, new IndexAddressNode(arg1, arg2, JavaKind.Byte), NamedLocationIdentity.getArrayLocation(JavaKind.Byte), arg3,
+ HeapAccess.BarrierType.NONE, false));
+ return true;
+ }
+ });
final Registration latin1r = new Registration(plugins, "java.lang.StringLatin1", bytecodeProvider);
latin1r.register5("indexOf", byte[].class, int.class, byte[].class, int.class, int.class, new StringLatin1IndexOfConstantPlugin());
final Registration utf16r = new Registration(plugins, "java.lang.StringUTF16", bytecodeProvider);
utf16r.register5("indexOfUnsafe", byte[].class, int.class, byte[].class, int.class, int.class, new StringUTF16IndexOfConstantPlugin());
+ utf16r.setAllowOverwrite(true);
+ utf16r.registerMethodSubstitution(StringUTF16Substitutions.class, "getChar", byte[].class, int.class);
+ utf16r.registerMethodSubstitution(StringUTF16Substitutions.class, "putChar", byte[].class, int.class, int.class);
Registration sr = new Registration(plugins, JDK9StringSubstitutions.class);
sr.register1("getValue", String.class, new InvocationPlugin() {
@@ -529,16 +558,47 @@
});
}
- private static ValueNode createIntegerExactArithmeticNode(ValueNode x, ValueNode y, SpeculationReason speculation, IntegerExactOp op) {
+ public enum IntegerExactOp {
+ INTEGER_ADD_EXACT,
+ INTEGER_INCREMENT_EXACT,
+ INTEGER_SUBTRACT_EXACT,
+ INTEGER_DECREMENT_EXACT,
+ INTEGER_MULTIPLY_EXACT
+ }
+
+ private static GuardingNode createIntegerExactArithmeticGuardNode(GraphBuilderContext b, ValueNode x, ValueNode y, IntegerExactOp op) {
+ LogicNode overflowCheck;
+ switch (op) {
+ case INTEGER_ADD_EXACT:
+ case INTEGER_INCREMENT_EXACT: {
+ overflowCheck = new IntegerAddExactOverflowNode(x, y);
+ break;
+ }
+ case INTEGER_SUBTRACT_EXACT:
+ case INTEGER_DECREMENT_EXACT: {
+ overflowCheck = new IntegerSubExactOverflowNode(x, y);
+ break;
+ }
+ case INTEGER_MULTIPLY_EXACT: {
+ overflowCheck = new IntegerMulExactOverflowNode(x, y);
+ break;
+ }
+ default:
+ throw GraalError.shouldNotReachHere("Unknown integer exact operation.");
+ }
+ return b.add(new FixedGuardNode(overflowCheck, DeoptimizationReason.ArithmeticException, DeoptimizationAction.InvalidateRecompile, true));
+ }
+
+ private static ValueNode createIntegerExactArithmeticNode(GraphBuilderContext b, ValueNode x, ValueNode y, IntegerExactOp op) {
switch (op) {
case INTEGER_ADD_EXACT:
case INTEGER_INCREMENT_EXACT:
- return new IntegerAddExactNode(x, y, speculation);
+ return new IntegerAddExactNode(x, y, createIntegerExactArithmeticGuardNode(b, x, y, op));
case INTEGER_SUBTRACT_EXACT:
case INTEGER_DECREMENT_EXACT:
- return new IntegerSubExactNode(x, y, speculation);
+ return new IntegerSubExactNode(x, y, createIntegerExactArithmeticGuardNode(b, x, y, op));
case INTEGER_MULTIPLY_EXACT:
- return new IntegerMulExactNode(x, y, speculation);
+ return new IntegerMulExactNode(x, y, createIntegerExactArithmeticGuardNode(b, x, y, op));
default:
throw GraalError.shouldNotReachHere("Unknown integer exact operation.");
}
@@ -559,15 +619,15 @@
}
}
- private static boolean createIntegerExactOperation(GraphBuilderContext b, JavaKind kind, ValueNode x, ValueNode y, IntegerExactOp op) {
- BytecodeExceptionKind exceptionKind = kind == JavaKind.Int ? BytecodeExceptionKind.INTEGER_EXACT_OVERFLOW : BytecodeExceptionKind.LONG_EXACT_OVERFLOW;
- AbstractBeginNode exceptionEdge = b.genExplicitExceptionEdge(exceptionKind);
- if (exceptionEdge != null) {
+ private static void createIntegerExactOperation(GraphBuilderContext b, JavaKind kind, ValueNode x, ValueNode y, IntegerExactOp op) {
+ if (b.needsExplicitException()) {
+ BytecodeExceptionKind exceptionKind = kind == JavaKind.Int ? BytecodeExceptionKind.INTEGER_EXACT_OVERFLOW : BytecodeExceptionKind.LONG_EXACT_OVERFLOW;
+ AbstractBeginNode exceptionEdge = b.genExplicitExceptionEdge(exceptionKind);
IntegerExactArithmeticSplitNode split = b.addPush(kind, createIntegerExactSplit(x, y, exceptionEdge, op));
split.setNext(b.add(new BeginNode()));
- return true;
+ } else {
+ b.addPush(kind, createIntegerExactArithmeticNode(b, x, y, op));
}
- return false;
}
private static void registerMathPlugins(InvocationPlugins plugins, boolean allowDeoptimization) {
@@ -575,12 +635,12 @@
if (allowDeoptimization) {
for (JavaKind kind : new JavaKind[]{JavaKind.Int, JavaKind.Long}) {
Class<?> type = kind.toJavaClass();
-
r.register1("decrementExact", type, new InvocationPlugin() {
@Override
public boolean apply(GraphBuilderContext b, ResolvedJavaMethod targetMethod, Receiver receiver, ValueNode x) {
ConstantNode y = b.add(ConstantNode.forIntegerKind(kind, 1));
- return createIntegerExactOperation(b, kind, x, y, IntegerExactOp.INTEGER_DECREMENT_EXACT);
+ createIntegerExactOperation(b, kind, x, y, IntegerExactOp.INTEGER_DECREMENT_EXACT);
+ return true;
}
});
@@ -588,29 +648,31 @@
@Override
public boolean apply(GraphBuilderContext b, ResolvedJavaMethod targetMethod, Receiver receiver, ValueNode x) {
ConstantNode y = b.add(ConstantNode.forIntegerKind(kind, 1));
- return createIntegerExactOperation(b, kind, x, y, IntegerExactOp.INTEGER_INCREMENT_EXACT);
+ createIntegerExactOperation(b, kind, x, y, IntegerExactOp.INTEGER_INCREMENT_EXACT);
+ return true;
}
});
-
r.register2("addExact", type, type, new InvocationPlugin() {
@Override
public boolean apply(GraphBuilderContext b, ResolvedJavaMethod targetMethod, Receiver receiver, ValueNode x, ValueNode y) {
- return createIntegerExactOperation(b, kind, x, y, IntegerExactOp.INTEGER_ADD_EXACT);
+ createIntegerExactOperation(b, kind, x, y, IntegerExactOp.INTEGER_ADD_EXACT);
+ return true;
}
});
-
r.register2("subtractExact", type, type, new InvocationPlugin() {
@Override
public boolean apply(GraphBuilderContext b, ResolvedJavaMethod targetMethod, Receiver receiver, ValueNode x, ValueNode y) {
- return createIntegerExactOperation(b, kind, x, y, IntegerExactOp.INTEGER_SUBTRACT_EXACT);
+ createIntegerExactOperation(b, kind, x, y, IntegerExactOp.INTEGER_SUBTRACT_EXACT);
+ return true;
}
});
r.register2("multiplyExact", type, type, new InvocationPlugin() {
@Override
public boolean apply(GraphBuilderContext b, ResolvedJavaMethod targetMethod, Receiver receiver, ValueNode x, ValueNode y) {
- return createIntegerExactOperation(b, kind, x, y, IntegerExactOp.INTEGER_MULTIPLY_EXACT);
- }
+ createIntegerExactOperation(b, kind, x, y, IntegerExactOp.INTEGER_MULTIPLY_EXACT);
+ return true;
+ }
});
}
}
@@ -1100,23 +1162,7 @@
}
}
- private static final class DirectiveSpeculationReason implements SpeculationLog.SpeculationReason {
- private final BytecodePosition pos;
-
- private DirectiveSpeculationReason(BytecodePosition pos) {
- this.pos = pos;
- }
-
- @Override
- public int hashCode() {
- return pos.hashCode();
- }
-
- @Override
- public boolean equals(Object obj) {
- return obj instanceof DirectiveSpeculationReason && ((DirectiveSpeculationReason) obj).pos.equals(this.pos);
- }
- }
+ private static final SpeculationReasonGroup DIRECTIVE_SPECULATIONS = new SpeculationReasonGroup("GraalDirective", BytecodePosition.class);
private static void registerGraalDirectivesPlugins(InvocationPlugins plugins) {
Registration r = new Registration(plugins, GraalDirectives.class);
@@ -1139,9 +1185,9 @@
r.register0("deoptimizeAndInvalidateWithSpeculation", new InvocationPlugin() {
@Override
public boolean apply(GraphBuilderContext b, ResolvedJavaMethod targetMethod, Receiver receiver) {
- GraalError.guarantee(b.getGraph().getSpeculationLog() != null, "A speculation log is need to use `deoptimizeAndInvalidateWithSpeculation`");
+ GraalError.guarantee(b.getGraph().getSpeculationLog() != null, "A speculation log is needed to use `deoptimizeAndInvalidateWithSpeculation`");
BytecodePosition pos = new BytecodePosition(null, b.getMethod(), b.bci());
- DirectiveSpeculationReason reason = new DirectiveSpeculationReason(pos);
+ SpeculationReason reason = DIRECTIVE_SPECULATIONS.createSpeculationReason(pos);
Speculation speculation;
if (b.getGraph().getSpeculationLog().maySpeculate(reason)) {
speculation = b.getGraph().getSpeculationLog().speculate(reason);
@@ -1324,7 +1370,7 @@
b.add(new DeoptimizeNode(DeoptimizationAction.InvalidateReprofile, DeoptimizationReason.TransferToInterpreter));
} else if (falseCount == 0 || trueCount == 0) {
boolean expected = falseCount == 0;
- LogicNode condition = b.addWithInputs(
+ LogicNode condition = b.add(
IntegerEqualsNode.create(b.getConstantReflection(), b.getMetaAccess(), b.getOptions(), null, result, b.add(ConstantNode.forBoolean(!expected)),
NodeView.DEFAULT));
b.append(new FixedGuardNode(condition, DeoptimizationReason.UnreachedCode, DeoptimizationAction.InvalidateReprofile, true));
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/StringUTF16Substitutions.java Sat Mar 16 21:00:45 2019 +0000
@@ -0,0 +1,62 @@
+/*
+ * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved.
+ * 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.
+ */
+
+
+package org.graalvm.compiler.replacements;
+
+import org.graalvm.compiler.api.replacements.ClassSubstitution;
+import org.graalvm.compiler.api.replacements.MethodSubstitution;
+import org.graalvm.compiler.nodes.extended.JavaReadNode;
+import org.graalvm.compiler.nodes.extended.JavaWriteNode;
+import org.graalvm.compiler.nodes.graphbuilderconf.InvocationPlugin;
+
+// JaCoCo Exclude
+
+/**
+ * Substitutions for {@code StringUTF16} methods for JDK9 and later.
+ */
+@ClassSubstitution(className = "java.lang.StringUTF16", optional = true)
+public class StringUTF16Substitutions {
+
+ @MethodSubstitution
+ public static char getChar(byte[] value, int i) {
+ ReplacementsUtil.runtimeAssert((i << 1) + 1 < value.length, "Trusted caller missed bounds check");
+ return getCharDirect(value, i << 1);
+ }
+
+ /**
+ * Will be intrinsified with an {@link InvocationPlugin} to a {@link JavaReadNode}.
+ */
+ public static native char getCharDirect(byte[] value, int i);
+
+ @MethodSubstitution
+ public static void putChar(byte[] value, int i, int c) {
+ ReplacementsUtil.runtimeAssert((i << 1) + 1 < value.length, "Trusted caller missed bounds check");
+ putCharDirect(value, i << 1, c);
+ }
+
+ /**
+ * Will be intrinsified with an {@link InvocationPlugin} to a {@link JavaWriteNode}.
+ */
+ public static native void putCharDirect(byte[] value, int i, int c);
+}
--- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/arraycopy/ArrayCopyCallNode.java Tue Mar 12 09:49:10 2019 +0000
+++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/arraycopy/ArrayCopyCallNode.java Sat Mar 16 21:00:45 2019 +0000
@@ -201,14 +201,19 @@
arraycopy(src, srcPos, dest, destPos, length, JavaKind.Object, LocationIdentity.any(), false, false, false, heapWordSize);
}
- public static void arraycopy(Object src, int srcPos, Object dest, int destPos, int length, @ConstantNodeParameter JavaKind elementKind, @ConstantNodeParameter int heapWordSize) {
- arraycopy(src, srcPos, dest, destPos, length, elementKind, false, false, false, heapWordSize);
+ public static void arraycopy(Object src, int srcPos, Object dest, int destPos, int length, @ConstantNodeParameter JavaKind elementKind, @ConstantNodeParameter LocationIdentity locationIdentity,
+ @ConstantNodeParameter int heapWordSize) {
+ arraycopy(src, srcPos, dest, destPos, length, elementKind, locationIdentity, false, false, false, heapWordSize);
}
public static void disjointArraycopy(Object src, int srcPos, Object dest, int destPos, int length, @ConstantNodeParameter JavaKind elementKind, @ConstantNodeParameter int heapWordSize) {
arraycopy(src, srcPos, dest, destPos, length, elementKind, false, true, false, heapWordSize);
}
+ public static void disjointArraycopyKillsAny(Object src, int srcPos, Object dest, int destPos, int length, @ConstantNodeParameter JavaKind elementKind, @ConstantNodeParameter int heapWordSize) {
+ arraycopy(src, srcPos, dest, destPos, length, elementKind, LocationIdentity.any(), false, true, false, heapWordSize);
+ }
+
public static void disjointUninitializedArraycopy(Object src, int srcPos, Object dest, int destPos, int length, @ConstantNodeParameter JavaKind elementKind,
@ConstantNodeParameter int heapWordSize) {
arraycopy(src, srcPos, dest, destPos, length, elementKind, false, true, true, heapWordSize);
--- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/arraycopy/ArrayCopyNode.java Tue Mar 12 09:49:10 2019 +0000
+++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/arraycopy/ArrayCopyNode.java Sat Mar 16 21:00:45 2019 +0000
@@ -35,23 +35,30 @@
import org.graalvm.compiler.replacements.nodes.BasicArrayCopyNode;
import jdk.internal.vm.compiler.word.LocationIdentity;
-import jdk.vm.ci.meta.JavaKind;
-
@NodeInfo
public final class ArrayCopyNode extends BasicArrayCopyNode implements Lowerable {
public static final NodeClass<ArrayCopyNode> TYPE = NodeClass.create(ArrayCopyNode.class);
- private JavaKind elementKind;
+ protected final boolean forceAnyLocation;
public ArrayCopyNode(int bci, ValueNode src, ValueNode srcPos, ValueNode dst, ValueNode dstPos, ValueNode length) {
+ this(bci, src, srcPos, dst, dstPos, length, false);
+ }
+
+ public ArrayCopyNode(int bci, ValueNode src, ValueNode srcPos, ValueNode dst, ValueNode dstPos, ValueNode length, boolean forceAnyLocation) {
super(TYPE, src, srcPos, dst, dstPos, length, null, bci);
- elementKind = ArrayCopySnippets.Templates.selectComponentKind(this);
+ this.forceAnyLocation = forceAnyLocation;
+ if (!forceAnyLocation) {
+ elementKind = ArrayCopySnippets.Templates.selectComponentKind(this);
+ } else {
+ assert elementKind == null;
+ }
}
@Override
public LocationIdentity getLocationIdentity() {
- if (elementKind == null) {
+ if (!forceAnyLocation && elementKind == null) {
elementKind = ArrayCopySnippets.Templates.selectComponentKind(this);
}
if (elementKind != null) {
@@ -64,4 +71,8 @@
public void lower(LoweringTool tool) {
tool.getLowerer().lower(this, tool);
}
+
+ public boolean killsAnyLocation() {
+ return forceAnyLocation;
+ }
}
--- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/arraycopy/ArrayCopySnippets.java Tue Mar 12 09:49:10 2019 +0000
+++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/arraycopy/ArrayCopySnippets.java Sat Mar 16 21:00:45 2019 +0000
@@ -24,6 +24,7 @@
package org.graalvm.compiler.replacements.arraycopy;
+import static jdk.vm.ci.services.Services.IS_BUILDING_NATIVE_IMAGE;
import static org.graalvm.compiler.nodes.extended.BranchProbabilityNode.FREQUENT_PROBABILITY;
import static org.graalvm.compiler.nodes.extended.BranchProbabilityNode.LIKELY_PROBABILITY;
import static org.graalvm.compiler.nodes.extended.BranchProbabilityNode.NOT_FREQUENT_PROBABILITY;
@@ -34,7 +35,6 @@
import jdk.internal.vm.compiler.collections.UnmodifiableEconomicMap;
import org.graalvm.compiler.api.directives.GraalDirectives;
-import org.graalvm.compiler.api.replacements.Fold;
import org.graalvm.compiler.api.replacements.Fold.InjectedParameter;
import org.graalvm.compiler.api.replacements.Snippet;
import org.graalvm.compiler.api.replacements.Snippet.ConstantParameter;
@@ -120,8 +120,8 @@
@Snippet
public void arraycopyExactSnippet(Object src, int srcPos, Object dest, int destPos, int length, @ConstantParameter ArrayCopyTypeCheck arrayTypeCheck,
- @ConstantParameter JavaKind elementKind, @ConstantParameter SnippetCounter elementKindCounter, @ConstantParameter SnippetCounter elementKindCopiedCounter,
- @ConstantParameter Counters counters) {
+ @ConstantParameter JavaKind elementKind, @ConstantParameter LocationIdentity locationIdentity,
+ @ConstantParameter SnippetCounter elementKindCounter, @ConstantParameter SnippetCounter elementKindCopiedCounter, @ConstantParameter Counters counters) {
Object nonNullSrc = GraalDirectives.guardingNonNull(src);
Object nonNullDest = GraalDirectives.guardingNonNull(dest);
checkArrayTypes(nonNullSrc, nonNullDest, arrayTypeCheck);
@@ -130,19 +130,19 @@
elementKindCounter.inc();
elementKindCopiedCounter.add(length);
- ArrayCopyCallNode.arraycopy(nonNullSrc, srcPos, nonNullDest, destPos, length, elementKind, heapWordSize());
+ ArrayCopyCallNode.arraycopy(nonNullSrc, srcPos, nonNullDest, destPos, length, elementKind, locationIdentity, heapWordSize());
}
@Snippet
public void arraycopyUnrolledSnippet(Object src, int srcPos, Object dest, int destPos, int length, @ConstantParameter ArrayCopyTypeCheck arrayTypeCheck,
- @ConstantParameter JavaKind elementKind, @ConstantParameter int unrolledLength, @ConstantParameter Counters counters) {
+ @ConstantParameter JavaKind elementKind, @ConstantParameter LocationIdentity locationIdentity, @ConstantParameter int unrolledLength, @ConstantParameter Counters counters) {
Object nonNullSrc = GraalDirectives.guardingNonNull(src);
Object nonNullDest = GraalDirectives.guardingNonNull(dest);
checkArrayTypes(nonNullSrc, nonNullDest, arrayTypeCheck);
checkLimits(nonNullSrc, srcPos, nonNullDest, destPos, length, counters);
incrementLengthCounter(length, counters);
- unrolledArraycopyWork(nonNullSrc, srcPos, nonNullDest, destPos, unrolledLength, elementKind);
+ unrolledArraycopyWork(nonNullSrc, srcPos, nonNullDest, destPos, unrolledLength, elementKind, locationIdentity);
}
@Snippet
@@ -179,15 +179,9 @@
System.arraycopy(src, srcPos, dest, destPos, length);
}
- @Fold
- static LocationIdentity getArrayLocation(JavaKind kind) {
- return NamedLocationIdentity.getArrayLocation(kind);
- }
-
- private static void unrolledArraycopyWork(Object nonNullSrc, int srcPos, Object nonNullDest, int destPos, int length, JavaKind elementKind) {
+ private static void unrolledArraycopyWork(Object nonNullSrc, int srcPos, Object nonNullDest, int destPos, int length, JavaKind elementKind, LocationIdentity arrayLocation) {
int scale = ReplacementsUtil.arrayIndexScale(INJECTED_META_ACCESS, elementKind);
int arrayBaseOffset = ReplacementsUtil.getArrayBaseOffset(INJECTED_META_ACCESS, elementKind);
- LocationIdentity arrayLocation = getArrayLocation(elementKind);
long sourceOffset = arrayBaseOffset + (long) srcPos * scale;
long destOffset = arrayBaseOffset + (long) destPos * scale;
@@ -258,7 +252,9 @@
}
private static void incrementLengthCounter(int length, Counters counters) {
- counters.lengthHistogram.inc(length);
+ if (!IS_BUILDING_NATIVE_IMAGE) {
+ counters.lengthHistogram.inc(length);
+ }
}
private static void checkLimits(Object src, int srcPos, Object dest, int destPos, int length, Counters counters) {
@@ -466,13 +462,16 @@
assert arrayTypeCheck != ArrayCopyTypeCheck.UNDEFINED_ARRAY_TYPE_CHECK;
args.addConst("arrayTypeCheck", arrayTypeCheck);
}
+ Object locationIdentity = arraycopy.killsAnyLocation() ? LocationIdentity.any() : NamedLocationIdentity.getArrayLocation(elementKind);
if (snippetInfo == arraycopyUnrolledSnippet) {
args.addConst("elementKind", elementKind != null ? elementKind : JavaKind.Illegal);
+ args.addConst("locationIdentity", locationIdentity);
args.addConst("unrolledLength", arraycopy.getLength().asJavaConstant().asInt());
}
if (snippetInfo == arraycopyExactSnippet) {
assert elementKind != null;
args.addConst("elementKind", elementKind);
+ args.addConst("locationIdentity", locationIdentity);
args.addConst("elementKindCounter", counters.arraycopyCallCounters.get(elementKind));
args.addConst("elementKindCopiedCounter", counters.arraycopyCallCopiedCounters.get(elementKind));
}
--- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/nodes/ArrayCompareToNode.java Tue Mar 12 09:49:10 2019 +0000
+++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/nodes/ArrayCompareToNode.java Sat Mar 16 21:00:45 2019 +0000
@@ -125,7 +125,7 @@
@Override
public LocationIdentity getLocationIdentity() {
- return NamedLocationIdentity.getArrayLocation(kind1);
+ return kind1 != kind2 ? LocationIdentity.ANY_LOCATION : NamedLocationIdentity.getArrayLocation(kind1);
}
@Override
--- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/nodes/ArrayRegionEqualsNode.java Tue Mar 12 09:49:10 2019 +0000
+++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/nodes/ArrayRegionEqualsNode.java Sat Mar 16 21:00:45 2019 +0000
@@ -55,7 +55,8 @@
public static final NodeClass<ArrayRegionEqualsNode> TYPE = NodeClass.create(ArrayRegionEqualsNode.class);
/** {@link JavaKind} of the arrays to compare. */
- private final JavaKind kind;
+ private final JavaKind kind1;
+ private final JavaKind kind2;
/** Pointer to first array region to be tested for equality. */
@Input private ValueNode array1;
@@ -68,16 +69,21 @@
@OptionalInput(Memory) private MemoryNode lastLocationAccess;
- public ArrayRegionEqualsNode(ValueNode array1, ValueNode array2, ValueNode length, @ConstantNodeParameter JavaKind kind) {
+ public ArrayRegionEqualsNode(ValueNode array1, ValueNode array2, ValueNode length, @ConstantNodeParameter JavaKind kind1, @ConstantNodeParameter JavaKind kind2) {
super(TYPE, StampFactory.forKind(JavaKind.Boolean));
- this.kind = kind;
+ this.kind1 = kind1;
+ this.kind2 = kind2;
this.array1 = array1;
this.array2 = array2;
this.length = length;
}
+ public static boolean regionEquals(Pointer array1, Pointer array2, int length, @ConstantNodeParameter JavaKind kind) {
+ return regionEquals(array1, array2, length, kind, kind);
+ }
+
@NodeIntrinsic
- public static native boolean regionEquals(Pointer array1, Pointer array2, int length, @ConstantNodeParameter JavaKind kind);
+ public static native boolean regionEquals(Pointer array1, Pointer array2, int length, @ConstantNodeParameter JavaKind kind1, @ConstantNodeParameter JavaKind kind2);
@Override
public void generate(NodeLIRBuilderTool gen) {
@@ -85,13 +91,18 @@
if (length.isConstant()) {
constantLength = length.asJavaConstant().asInt();
}
- Value result = gen.getLIRGeneratorTool().emitArrayEquals(kind, gen.operand(array1), gen.operand(array2), gen.operand(length), constantLength, true);
+ Value result;
+ if (kind1 == kind2) {
+ result = gen.getLIRGeneratorTool().emitArrayEquals(kind1, gen.operand(array1), gen.operand(array2), gen.operand(length), constantLength, true);
+ } else {
+ result = gen.getLIRGeneratorTool().emitArrayEquals(kind1, kind2, gen.operand(array1), gen.operand(array2), gen.operand(length), constantLength, true);
+ }
gen.setResult(this, result);
}
@Override
public LocationIdentity getLocationIdentity() {
- return NamedLocationIdentity.getArrayLocation(kind);
+ return kind1 != kind2 ? LocationIdentity.ANY_LOCATION : NamedLocationIdentity.getArrayLocation(kind1);
}
@Override
--- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/nodes/BasicArrayCopyNode.java Tue Mar 12 09:49:10 2019 +0000
+++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/nodes/BasicArrayCopyNode.java Sat Mar 16 21:00:45 2019 +0000
@@ -83,15 +83,12 @@
public BasicArrayCopyNode(NodeClass<? extends AbstractMemoryCheckpoint> type, ValueNode src, ValueNode srcPos, ValueNode dest, ValueNode destPos, ValueNode length, JavaKind elementKind, int bci) {
super(type, StampFactory.forKind(JavaKind.Void));
this.bci = bci;
- args = new NodeInputList<>(this, new ValueNode[]{src, srcPos, dest, destPos, length});
+ this.args = new NodeInputList<>(this, new ValueNode[]{src, srcPos, dest, destPos, length});
this.elementKind = elementKind != JavaKind.Illegal ? elementKind : null;
}
public BasicArrayCopyNode(NodeClass<? extends AbstractMemoryCheckpoint> type, ValueNode src, ValueNode srcPos, ValueNode dest, ValueNode destPos, ValueNode length, JavaKind elementKind) {
- super(type, StampFactory.forKind(JavaKind.Void));
- this.bci = BytecodeFrame.INVALID_FRAMESTATE_BCI;
- args = new NodeInputList<>(this, new ValueNode[]{src, srcPos, dest, destPos, length});
- this.elementKind = elementKind != JavaKind.Illegal ? elementKind : null;
+ this(type, src, srcPos, dest, destPos, length, elementKind, BytecodeFrame.INVALID_FRAMESTATE_BCI);
}
public ValueNode getSource() {
--- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/nodes/BasicObjectCloneNode.java Tue Mar 12 09:49:10 2019 +0000
+++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/nodes/BasicObjectCloneNode.java Sat Mar 16 21:00:45 2019 +0000
@@ -154,7 +154,7 @@
return;
}
int constantLength = lengthAlias.asJavaConstant().asInt();
- if (constantLength >= 0 && constantLength < tool.getMaximumEntryCount()) {
+ if (constantLength >= 0 && constantLength <= tool.getMaximumEntryCount()) {
ValueNode[] state = new ValueNode[constantLength];
ResolvedJavaType componentType = type.getComponentType();
for (int i = 0; i < constantLength; i++) {
--- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/nodes/BinaryMathIntrinsicNode.java Tue Mar 12 09:49:10 2019 +0000
+++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/nodes/BinaryMathIntrinsicNode.java Sat Mar 16 21:00:45 2019 +0000
@@ -26,6 +26,8 @@
import static org.graalvm.compiler.nodeinfo.NodeCycles.CYCLES_UNKNOWN;
import static org.graalvm.compiler.nodeinfo.NodeSize.SIZE_1;
+
+import jdk.vm.ci.meta.Value;
import org.graalvm.compiler.core.common.spi.ForeignCallDescriptor;
import org.graalvm.compiler.core.common.type.FloatStamp;
import org.graalvm.compiler.core.common.type.PrimitiveStamp;
@@ -46,10 +48,9 @@
import org.graalvm.compiler.nodes.spi.ArithmeticLIRLowerable;
import org.graalvm.compiler.nodes.spi.Lowerable;
import org.graalvm.compiler.nodes.spi.LoweringTool;
-import org.graalvm.compiler.nodes.spi.NodeLIRBuilderTool;
import jdk.vm.ci.meta.JavaKind;
-import jdk.vm.ci.meta.Value;
+import org.graalvm.compiler.nodes.spi.NodeLIRBuilderTool;
@NodeInfo(nameTemplate = "MathIntrinsic#{p#operation/s}", cycles = CYCLES_UNKNOWN, size = SIZE_1)
public final class BinaryMathIntrinsicNode extends BinaryNode implements ArithmeticLIRLowerable, Lowerable {
@@ -106,6 +107,7 @@
@Override
public void generate(NodeLIRBuilderTool nodeValueMap, ArithmeticLIRGeneratorTool gen) {
+ // We can only reach here in the math stubs
Value xValue = nodeValueMap.operand(getX());
Value yValue = nodeValueMap.operand(getY());
Value result;
--- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/nodes/MacroNode.java Tue Mar 12 09:49:10 2019 +0000
+++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/nodes/MacroNode.java Sat Mar 16 21:00:45 2019 +0000
@@ -25,6 +25,7 @@
package org.graalvm.compiler.replacements.nodes;
import static jdk.vm.ci.code.BytecodeFrame.isPlaceholderBci;
+import static jdk.vm.ci.services.Services.IS_IN_NATIVE_IMAGE;
import static org.graalvm.compiler.nodeinfo.NodeCycles.CYCLES_UNKNOWN;
import static org.graalvm.compiler.nodeinfo.NodeSize.SIZE_UNKNOWN;
@@ -205,13 +206,15 @@
if (invoke.stateAfter() == null) {
ResolvedJavaMethod method = graph().method();
- if (method.getAnnotation(MethodSubstitution.class) != null || method.getAnnotation(Snippet.class) != null) {
- // One cause for this is that a MacroNode is created for a method that
- // no longer needs a MacroNode. For example, Class.getComponentType()
- // only needs a MacroNode prior to JDK9 as it was given a non-native
- // implementation in JDK9.
- throw new GraalError("%s macro created for call to %s in %s must be lowerable to a snippet or intrinsic graph. " +
- "Maybe a macro node is not needed for this method in the current JDK?", getClass().getSimpleName(), targetMethod.format("%h.%n(%p)"), graph());
+ if (!IS_IN_NATIVE_IMAGE) {
+ if (method.getAnnotation(MethodSubstitution.class) != null || method.getAnnotation(Snippet.class) != null) {
+ // One cause for this is that a MacroNode is created for a method that
+ // no longer needs a MacroNode. For example, Class.getComponentType()
+ // only needs a MacroNode prior to JDK9 as it was given a non-native
+ // implementation in JDK9.
+ throw new GraalError("%s macro created for call to %s in %s must be lowerable to a snippet or intrinsic graph. " +
+ "Maybe a macro node is not needed for this method in the current JDK?", getClass().getSimpleName(), targetMethod.format("%h.%n(%p)"), graph());
+ }
}
throw new GraalError("%s: cannot lower to invoke without state: %s", graph(), this);
}
--- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/nodes/UnaryMathIntrinsicNode.java Tue Mar 12 09:49:10 2019 +0000
+++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/nodes/UnaryMathIntrinsicNode.java Sat Mar 16 21:00:45 2019 +0000
@@ -27,6 +27,7 @@
import static org.graalvm.compiler.nodeinfo.NodeCycles.CYCLES_64;
import static org.graalvm.compiler.nodeinfo.NodeSize.SIZE_1;
+import jdk.vm.ci.meta.Value;
import org.graalvm.compiler.core.common.spi.ForeignCallDescriptor;
import org.graalvm.compiler.core.common.type.FloatStamp;
import org.graalvm.compiler.core.common.type.PrimitiveStamp;
@@ -44,10 +45,9 @@
import org.graalvm.compiler.nodes.spi.ArithmeticLIRLowerable;
import org.graalvm.compiler.nodes.spi.Lowerable;
import org.graalvm.compiler.nodes.spi.LoweringTool;
-import org.graalvm.compiler.nodes.spi.NodeLIRBuilderTool;
import jdk.vm.ci.meta.JavaKind;
-import jdk.vm.ci.meta.Value;
+import org.graalvm.compiler.nodes.spi.NodeLIRBuilderTool;
@NodeInfo(nameTemplate = "MathIntrinsic#{p#operation/s}", cycles = CYCLES_64, size = SIZE_1)
public final class UnaryMathIntrinsicNode extends UnaryNode implements ArithmeticLIRLowerable, Lowerable {
@@ -87,6 +87,43 @@
throw new GraalError("unknown op %s", this);
}
}
+
+ public Stamp computeStamp(Stamp valueStamp) {
+ if (valueStamp instanceof FloatStamp) {
+ FloatStamp floatStamp = (FloatStamp) valueStamp;
+ switch (this) {
+ case COS:
+ case SIN: {
+ boolean nonNaN = floatStamp.lowerBound() != Double.NEGATIVE_INFINITY && floatStamp.upperBound() != Double.POSITIVE_INFINITY && floatStamp.isNonNaN();
+ return StampFactory.forFloat(JavaKind.Double, -1.0, 1.0, nonNaN);
+ }
+ case TAN: {
+ boolean nonNaN = floatStamp.lowerBound() != Double.NEGATIVE_INFINITY && floatStamp.upperBound() != Double.POSITIVE_INFINITY && floatStamp.isNonNaN();
+ return StampFactory.forFloat(JavaKind.Double, Double.NEGATIVE_INFINITY, Double.POSITIVE_INFINITY, nonNaN);
+ }
+ case LOG:
+ case LOG10: {
+ double lowerBound = compute(floatStamp.lowerBound());
+ double upperBound = compute(floatStamp.upperBound());
+ if (floatStamp.contains(0.0)) {
+ // 0.0 and -0.0 infinity produces -Inf
+ lowerBound = Double.NEGATIVE_INFINITY;
+ }
+ boolean nonNaN = floatStamp.lowerBound() >= 0.0 && floatStamp.isNonNaN();
+ return StampFactory.forFloat(JavaKind.Double, lowerBound, upperBound, nonNaN);
+ }
+ case EXP: {
+ double lowerBound = Math.exp(floatStamp.lowerBound());
+ double upperBound = Math.exp(floatStamp.upperBound());
+ boolean nonNaN = floatStamp.isNonNaN();
+ return StampFactory.forFloat(JavaKind.Double, lowerBound, upperBound, nonNaN);
+ }
+
+ }
+ }
+ return StampFactory.forKind(JavaKind.Double);
+ }
+
}
public UnaryOperation getOperation() {
@@ -109,50 +146,14 @@
}
protected UnaryMathIntrinsicNode(ValueNode value, UnaryOperation op) {
- super(TYPE, computeStamp(value.stamp(NodeView.DEFAULT), op), value);
+ super(TYPE, op.computeStamp(value.stamp(NodeView.DEFAULT)), value);
assert value.stamp(NodeView.DEFAULT) instanceof FloatStamp && PrimitiveStamp.getBits(value.stamp(NodeView.DEFAULT)) == 64;
this.operation = op;
}
@Override
public Stamp foldStamp(Stamp valueStamp) {
- return computeStamp(valueStamp, getOperation());
- }
-
- static Stamp computeStamp(Stamp valueStamp, UnaryOperation op) {
- if (valueStamp instanceof FloatStamp) {
- FloatStamp floatStamp = (FloatStamp) valueStamp;
- switch (op) {
- case COS:
- case SIN: {
- boolean nonNaN = floatStamp.lowerBound() != Double.NEGATIVE_INFINITY && floatStamp.upperBound() != Double.POSITIVE_INFINITY && floatStamp.isNonNaN();
- return StampFactory.forFloat(JavaKind.Double, -1.0, 1.0, nonNaN);
- }
- case TAN: {
- boolean nonNaN = floatStamp.lowerBound() != Double.NEGATIVE_INFINITY && floatStamp.upperBound() != Double.POSITIVE_INFINITY && floatStamp.isNonNaN();
- return StampFactory.forFloat(JavaKind.Double, Double.NEGATIVE_INFINITY, Double.POSITIVE_INFINITY, nonNaN);
- }
- case LOG:
- case LOG10: {
- double lowerBound = op.compute(floatStamp.lowerBound());
- double upperBound = op.compute(floatStamp.upperBound());
- if (floatStamp.contains(0.0)) {
- // 0.0 and -0.0 infinity produces -Inf
- lowerBound = Double.NEGATIVE_INFINITY;
- }
- boolean nonNaN = floatStamp.lowerBound() >= 0.0 && floatStamp.isNonNaN();
- return StampFactory.forFloat(JavaKind.Double, lowerBound, upperBound, nonNaN);
- }
- case EXP: {
- double lowerBound = Math.exp(floatStamp.lowerBound());
- double upperBound = Math.exp(floatStamp.upperBound());
- boolean nonNaN = floatStamp.isNonNaN();
- return StampFactory.forFloat(JavaKind.Double, lowerBound, upperBound, nonNaN);
- }
-
- }
- }
- return StampFactory.forKind(JavaKind.Double);
+ return getOperation().computeStamp(valueStamp);
}
@Override
@@ -162,6 +163,7 @@
@Override
public void generate(NodeLIRBuilderTool nodeValueMap, ArithmeticLIRGeneratorTool gen) {
+ // We can only reach here in the math stubs
Value input = nodeValueMap.operand(getValue());
Value result;
switch (getOperation()) {
--- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/nodes/arithmetic/IntegerAddExactNode.java Tue Mar 12 09:49:10 2019 +0000
+++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/nodes/arithmetic/IntegerAddExactNode.java Sat Mar 16 21:00:45 2019 +0000
@@ -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
@@ -37,35 +37,32 @@
import org.graalvm.compiler.graph.spi.CanonicalizerTool;
import org.graalvm.compiler.nodeinfo.InputType;
import org.graalvm.compiler.nodeinfo.NodeInfo;
-import org.graalvm.compiler.nodes.AbstractBeginNode;
import org.graalvm.compiler.nodes.ConstantNode;
import org.graalvm.compiler.nodes.NodeView;
import org.graalvm.compiler.nodes.ValueNode;
import org.graalvm.compiler.nodes.calc.AddNode;
-import org.graalvm.compiler.nodes.extended.AnchoringNode;
-import org.graalvm.compiler.nodes.spi.LoweringTool;
import jdk.vm.ci.code.CodeUtil;
import jdk.vm.ci.meta.JavaConstant;
import jdk.vm.ci.meta.JavaKind;
-import jdk.vm.ci.meta.SpeculationLog.SpeculationReason;
+import org.graalvm.compiler.nodes.extended.GuardedNode;
+import org.graalvm.compiler.nodes.extended.GuardingNode;
/**
* Node representing an exact integer addition that will throw an {@link ArithmeticException} in
* case the addition would overflow the 32 bit range.
*/
@NodeInfo(cycles = CYCLES_2, size = SIZE_2)
-public final class IntegerAddExactNode extends AddNode implements IntegerExactArithmeticNode {
+public final class IntegerAddExactNode extends AddNode implements GuardedNode, IntegerExactArithmeticNode {
public static final NodeClass<IntegerAddExactNode> TYPE = NodeClass.create(IntegerAddExactNode.class);
- @OptionalInput(InputType.Anchor) protected AnchoringNode anchor;
- protected final SpeculationReason speculation;
+ @Input(InputType.Guard) protected GuardingNode guard;
- public IntegerAddExactNode(ValueNode x, ValueNode y, SpeculationReason speculation) {
+ public IntegerAddExactNode(ValueNode x, ValueNode y, GuardingNode guard) {
super(TYPE, x, y);
setStamp(x.stamp(NodeView.DEFAULT).unrestricted());
assert x.stamp(NodeView.DEFAULT).isCompatible(y.stamp(NodeView.DEFAULT)) && x.stamp(NodeView.DEFAULT) instanceof IntegerStamp;
- this.speculation = speculation;
+ this.guard = guard;
}
@Override
@@ -129,13 +126,10 @@
@Override
public ValueNode canonical(CanonicalizerTool tool, ValueNode forX, ValueNode forY) {
if (forX.isConstant() && !forY.isConstant()) {
- return new IntegerAddExactNode(forY, forX, speculation).canonical(tool);
+ return new IntegerAddExactNode(forY, forX, guard).canonical(tool);
}
- if (forX.isConstant()) {
- ConstantNode constantNode = canonicalXconstant(forX, forY);
- if (constantNode != null) {
- return constantNode;
- }
+ if (forX.isConstant() && forY.isConstant()) {
+ return canonicalXYconstant(forX, forY);
} else if (forY.isConstant()) {
long c = forY.asJavaConstant().asLong();
if (c == 0) {
@@ -148,48 +142,31 @@
return this;
}
- private static ConstantNode canonicalXconstant(ValueNode forX, ValueNode forY) {
+ private ValueNode canonicalXYconstant(ValueNode forX, ValueNode forY) {
JavaConstant xConst = forX.asJavaConstant();
JavaConstant yConst = forY.asJavaConstant();
- if (xConst != null && yConst != null) {
- assert xConst.getJavaKind() == yConst.getJavaKind();
- try {
- if (xConst.getJavaKind() == JavaKind.Int) {
- return ConstantNode.forInt(Math.addExact(xConst.asInt(), yConst.asInt()));
- } else {
- assert xConst.getJavaKind() == JavaKind.Long;
- return ConstantNode.forLong(Math.addExact(xConst.asLong(), yConst.asLong()));
- }
- } catch (ArithmeticException ex) {
- // The operation will result in an overflow exception, so do not canonicalize.
+ assert xConst.getJavaKind() == yConst.getJavaKind();
+ try {
+ if (xConst.getJavaKind() == JavaKind.Int) {
+ return ConstantNode.forInt(Math.addExact(xConst.asInt(), yConst.asInt()));
+ } else {
+ assert xConst.getJavaKind() == JavaKind.Long;
+ return ConstantNode.forLong(Math.addExact(xConst.asLong(), yConst.asLong()));
}
+ } catch (ArithmeticException ex) {
+ // The operation will result in an overflow exception, so do not canonicalize.
}
- return null;
+ return this;
}
@Override
- public IntegerExactArithmeticSplitNode createSplit(AbstractBeginNode next, AbstractBeginNode deopt) {
- return graph().add(new IntegerAddExactSplitNode(stamp(NodeView.DEFAULT), getX(), getY(), next, deopt));
- }
-
- @Override
- public SpeculationReason getSpeculation() {
- return speculation;
+ public GuardingNode getGuard() {
+ return guard;
}
@Override
- public AnchoringNode getAnchor() {
- return anchor;
- }
-
- @Override
- public void setAnchor(AnchoringNode x) {
- updateUsagesInterface(this.anchor, x);
- this.anchor = x;
- }
-
- @Override
- public void lower(LoweringTool tool) {
- IntegerExactArithmeticSplitNode.lower(tool, this);
+ public void setGuard(GuardingNode guard) {
+ updateUsagesInterface(this.guard, guard);
+ this.guard = guard;
}
}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/nodes/arithmetic/IntegerAddExactOverflowNode.java Sat Mar 16 21:00:45 2019 +0000
@@ -0,0 +1,101 @@
+/*
+ * 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.
+ */
+
+
+
+package org.graalvm.compiler.replacements.nodes.arithmetic;
+
+import jdk.vm.ci.meta.JavaConstant;
+import jdk.vm.ci.meta.JavaKind;
+import org.graalvm.compiler.core.common.type.IntegerStamp;
+import org.graalvm.compiler.core.common.type.Stamp;
+import org.graalvm.compiler.graph.NodeClass;
+import org.graalvm.compiler.graph.spi.Canonicalizable.BinaryCommutative;
+import org.graalvm.compiler.graph.spi.CanonicalizerTool;
+import org.graalvm.compiler.graph.spi.Simplifiable;
+import org.graalvm.compiler.nodeinfo.NodeInfo;
+import org.graalvm.compiler.nodes.AbstractBeginNode;
+import org.graalvm.compiler.nodes.LogicConstantNode;
+import org.graalvm.compiler.nodes.NodeView;
+import org.graalvm.compiler.nodes.ValueNode;
+import org.graalvm.compiler.nodes.calc.BinaryNode;
+
+import static org.graalvm.compiler.nodeinfo.NodeCycles.CYCLES_2;
+import static org.graalvm.compiler.nodeinfo.NodeSize.SIZE_2;
+
+@NodeInfo(cycles = CYCLES_2, size = SIZE_2)
+public final class IntegerAddExactOverflowNode extends IntegerExactOverflowNode implements Simplifiable, BinaryCommutative<ValueNode> {
+ public static final NodeClass<IntegerAddExactOverflowNode> TYPE = NodeClass.create(IntegerAddExactOverflowNode.class);
+
+ public IntegerAddExactOverflowNode(ValueNode x, ValueNode y) {
+ super(TYPE, x, y);
+ }
+
+ @Override
+ public ValueNode canonical(CanonicalizerTool tool, ValueNode forX, ValueNode forY) {
+ if (forX.isConstant() && !forY.isConstant()) {
+ return new IntegerAddExactOverflowNode(forY, forX).canonical(tool);
+ }
+ if (forX.isConstant() && forY.isConstant()) {
+ return canonicalXYconstant(forX, forY);
+ } else if (forY.isConstant()) {
+ long c = forY.asJavaConstant().asLong();
+ if (c == 0) {
+ return LogicConstantNode.forBoolean(false);
+ }
+ }
+ if (!IntegerStamp.addCanOverflow((IntegerStamp) forX.stamp(NodeView.DEFAULT), (IntegerStamp) forY.stamp(NodeView.DEFAULT))) {
+ return LogicConstantNode.forBoolean(false);
+ }
+ return this;
+ }
+
+ private static LogicConstantNode canonicalXYconstant(ValueNode forX, ValueNode forY) {
+ JavaConstant xConst = forX.asJavaConstant();
+ JavaConstant yConst = forY.asJavaConstant();
+ assert xConst.getJavaKind() == yConst.getJavaKind();
+ try {
+ if (xConst.getJavaKind() == JavaKind.Int) {
+ Math.addExact(xConst.asInt(), yConst.asInt());
+ } else {
+ assert xConst.getJavaKind() == JavaKind.Long;
+ Math.addExact(xConst.asLong(), yConst.asLong());
+ }
+ } catch (ArithmeticException ex) {
+ // Always overflows
+ return LogicConstantNode.forBoolean(true);
+ }
+ // Never overflows
+ return LogicConstantNode.forBoolean(false);
+ }
+
+ @Override
+ protected IntegerExactArithmeticSplitNode createSplit(Stamp splitStamp, AbstractBeginNode next, AbstractBeginNode overflow) {
+ return new IntegerAddExactSplitNode(splitStamp, x, y, next, overflow);
+ }
+
+ @Override
+ protected Class<? extends BinaryNode> getCoupledType() {
+ return IntegerAddExactNode.class;
+ }
+}
--- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/nodes/arithmetic/IntegerExactArithmeticNode.java Tue Mar 12 09:49:10 2019 +0000
+++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/nodes/arithmetic/IntegerExactArithmeticNode.java Sat Mar 16 21:00:45 2019 +0000
@@ -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
@@ -24,20 +24,5 @@
package org.graalvm.compiler.replacements.nodes.arithmetic;
-import org.graalvm.compiler.nodes.AbstractBeginNode;
-import org.graalvm.compiler.nodes.extended.AnchoringNode;
-import org.graalvm.compiler.nodes.spi.Lowerable;
-
-import jdk.vm.ci.meta.SpeculationLog.SpeculationReason;
-
-public interface IntegerExactArithmeticNode extends Lowerable {
-
- IntegerExactArithmeticSplitNode createSplit(AbstractBeginNode next, AbstractBeginNode deopt);
-
- SpeculationReason getSpeculation();
-
- AnchoringNode getAnchor();
-
- void setAnchor(AnchoringNode x);
-
+public interface IntegerExactArithmeticNode {
}
--- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/nodes/arithmetic/IntegerExactArithmeticSplitNode.java Tue Mar 12 09:49:10 2019 +0000
+++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/nodes/arithmetic/IntegerExactArithmeticSplitNode.java Sat Mar 16 21:00:45 2019 +0000
@@ -32,21 +32,11 @@
import org.graalvm.compiler.graph.spi.Simplifiable;
import org.graalvm.compiler.nodeinfo.NodeInfo;
import org.graalvm.compiler.nodes.AbstractBeginNode;
-import org.graalvm.compiler.nodes.BeginNode;
import org.graalvm.compiler.nodes.ControlSplitNode;
-import org.graalvm.compiler.nodes.DeoptimizeNode;
-import org.graalvm.compiler.nodes.FixedNode;
-import org.graalvm.compiler.nodes.FixedWithNextNode;
-import org.graalvm.compiler.nodes.StructuredGraph;
import org.graalvm.compiler.nodes.ValueNode;
-import org.graalvm.compiler.nodes.calc.FloatingNode;
import org.graalvm.compiler.nodes.spi.LIRLowerable;
-import org.graalvm.compiler.nodes.spi.LoweringTool;
import org.graalvm.compiler.nodes.spi.NodeLIRBuilderTool;
-import jdk.vm.ci.meta.DeoptimizationAction;
-import jdk.vm.ci.meta.DeoptimizationReason;
-import jdk.vm.ci.meta.SpeculationLog;
import jdk.vm.ci.meta.Value;
@NodeInfo(cycles = CYCLES_2, cyclesRationale = "add+cmp", size = SIZE_2)
@@ -117,23 +107,6 @@
protected abstract Value generateArithmetic(NodeLIRBuilderTool generator);
- static void lower(LoweringTool tool, IntegerExactArithmeticNode node) {
- if (node.asNode().graph().getGuardsStage() == StructuredGraph.GuardsStage.FIXED_DEOPTS) {
- FloatingNode floatingNode = (FloatingNode) node;
- FixedWithNextNode previous = tool.lastFixedNode();
- FixedNode next = previous.next();
- previous.setNext(null);
- StructuredGraph graph = floatingNode.graph();
- DeoptimizeNode deopt = graph.add(new DeoptimizeNode(DeoptimizationAction.InvalidateReprofile, DeoptimizationReason.ArithmeticException,
- node.getSpeculation() == null ? SpeculationLog.NO_SPECULATION : graph.getSpeculationLog().speculate(node.getSpeculation())));
- AbstractBeginNode normalBegin = graph.add(new BeginNode());
- normalBegin.setNext(next);
- IntegerExactArithmeticSplitNode split = node.createSplit(normalBegin, BeginNode.begin(deopt));
- previous.setNext(split);
- floatingNode.replaceAndDelete(split);
- }
- }
-
@Override
public int getSuccessorCount() {
return 2;
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/nodes/arithmetic/IntegerExactOverflowNode.java Sat Mar 16 21:00:45 2019 +0000
@@ -0,0 +1,124 @@
+/*
+ * 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.
+ */
+
+
+
+package org.graalvm.compiler.replacements.nodes.arithmetic;
+
+import org.graalvm.compiler.core.common.type.Stamp;
+import org.graalvm.compiler.graph.NodeClass;
+import org.graalvm.compiler.graph.spi.Canonicalizable;
+import org.graalvm.compiler.graph.spi.Simplifiable;
+import org.graalvm.compiler.graph.spi.SimplifierTool;
+import org.graalvm.compiler.nodeinfo.NodeInfo;
+import org.graalvm.compiler.nodes.AbstractBeginNode;
+import org.graalvm.compiler.nodes.IfNode;
+import org.graalvm.compiler.nodes.LogicNode;
+import org.graalvm.compiler.nodes.NodeView;
+import org.graalvm.compiler.nodes.ValueNode;
+import org.graalvm.compiler.nodes.calc.BinaryNode;
+
+import java.util.List;
+
+import static org.graalvm.compiler.nodeinfo.NodeCycles.CYCLES_2;
+import static org.graalvm.compiler.nodeinfo.NodeSize.SIZE_2;
+
+@NodeInfo(cycles = CYCLES_2, size = SIZE_2)
+public abstract class IntegerExactOverflowNode extends LogicNode implements Canonicalizable.Binary<ValueNode>, Simplifiable {
+ public static final NodeClass<IntegerExactOverflowNode> TYPE = NodeClass.create(IntegerExactOverflowNode.class);
+ @Input protected ValueNode x;
+ @Input protected ValueNode y;
+
+ public IntegerExactOverflowNode(NodeClass<? extends IntegerExactOverflowNode> c, ValueNode x, ValueNode y) {
+ super(c);
+ assert x != null && y != null;
+ this.x = x;
+ this.y = y;
+ }
+
+ @Override
+ public ValueNode getX() {
+ return x;
+ }
+
+ @Override
+ public ValueNode getY() {
+ return y;
+ }
+
+ /**
+ * Make sure the overflow detection nodes have the same order of inputs as the exact arithmetic
+ * nodes.
+ *
+ * @return the original node or another node with the same inputs, ignoring ordering.
+ */
+ @SuppressWarnings("deprecation")
+ public LogicNode maybeCommuteInputs() {
+ assert this instanceof BinaryCommutative;
+ if (!y.isConstant() && (x.isConstant() || x.getId() > y.getId())) {
+ ValueNode tmp = x;
+ x = y;
+ y = tmp;
+ if (graph() != null) {
+ // See if this node already exists
+ LogicNode duplicate = graph().findDuplicate(this);
+ if (duplicate != null) {
+ return duplicate;
+ }
+ }
+ }
+ return this;
+ }
+
+ protected abstract IntegerExactArithmeticSplitNode createSplit(Stamp splitStamp, AbstractBeginNode next, AbstractBeginNode overflow);
+
+ protected abstract Class<? extends BinaryNode> getCoupledType();
+
+ @Override
+ public void simplify(SimplifierTool tool) {
+ // Find all ifs that this node feeds into
+ for (IfNode ifNode : usages().filter(IfNode.class).snapshot()) {
+ // Replace the if with exact split
+ AbstractBeginNode next = ifNode.falseSuccessor();
+ AbstractBeginNode overflow = ifNode.trueSuccessor();
+ ifNode.clearSuccessors();
+
+ // Try to find corresponding exact nodes that could be combined with the split. They
+ // would be directly
+ // linked to the BeginNode of the false branch.
+ List<? extends BinaryNode> coupledNodes = next.usages().filter(getCoupledType()).filter(n -> {
+ BinaryNode exact = (BinaryNode) n;
+ return exact.getX() == getX() && exact.getY() == getY();
+ }).snapshot();
+
+ Stamp splitStamp = x.stamp(NodeView.DEFAULT).unrestricted();
+ if (!coupledNodes.isEmpty()) {
+ splitStamp = coupledNodes.iterator().next().stamp(NodeView.DEFAULT);
+ }
+ IntegerExactArithmeticSplitNode split = graph().add(createSplit(splitStamp, next, overflow));
+ ifNode.replaceAndDelete(split);
+
+ coupledNodes.forEach(n -> n.replaceAndDelete(split));
+ }
+ }
+}
--- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/nodes/arithmetic/IntegerMulExactNode.java Tue Mar 12 09:49:10 2019 +0000
+++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/nodes/arithmetic/IntegerMulExactNode.java Sat Mar 16 21:00:45 2019 +0000
@@ -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
@@ -32,34 +32,31 @@
import org.graalvm.compiler.graph.spi.CanonicalizerTool;
import org.graalvm.compiler.nodeinfo.InputType;
import org.graalvm.compiler.nodeinfo.NodeInfo;
-import org.graalvm.compiler.nodes.AbstractBeginNode;
import org.graalvm.compiler.nodes.ConstantNode;
import org.graalvm.compiler.nodes.NodeView;
import org.graalvm.compiler.nodes.ValueNode;
import org.graalvm.compiler.nodes.calc.MulNode;
-import org.graalvm.compiler.nodes.extended.AnchoringNode;
-import org.graalvm.compiler.nodes.spi.LoweringTool;
+import org.graalvm.compiler.nodes.extended.GuardedNode;
+import org.graalvm.compiler.nodes.extended.GuardingNode;
import jdk.vm.ci.meta.JavaConstant;
import jdk.vm.ci.meta.JavaKind;
-import jdk.vm.ci.meta.SpeculationLog.SpeculationReason;
/**
* Node representing an exact integer multiplication that will throw an {@link ArithmeticException}
* in case the addition would overflow the 32 bit range.
*/
@NodeInfo(cycles = CYCLES_4, cyclesRationale = "mul+cmp", size = SIZE_2)
-public final class IntegerMulExactNode extends MulNode implements IntegerExactArithmeticNode {
+public final class IntegerMulExactNode extends MulNode implements GuardedNode, IntegerExactArithmeticNode {
public static final NodeClass<IntegerMulExactNode> TYPE = NodeClass.create(IntegerMulExactNode.class);
- @OptionalInput(InputType.Anchor) protected AnchoringNode anchor;
- protected final SpeculationReason speculation;
+ @Input(InputType.Guard) protected GuardingNode guard;
- public IntegerMulExactNode(ValueNode x, ValueNode y, SpeculationReason speculation) {
+ public IntegerMulExactNode(ValueNode x, ValueNode y, GuardingNode guard) {
super(TYPE, x, y);
setStamp(x.stamp(NodeView.DEFAULT).unrestricted());
assert x.stamp(NodeView.DEFAULT).isCompatible(y.stamp(NodeView.DEFAULT)) && x.stamp(NodeView.DEFAULT) instanceof IntegerStamp;
- this.speculation = speculation;
+ this.guard = guard;
}
@Override
@@ -76,10 +73,10 @@
@Override
public ValueNode canonical(CanonicalizerTool tool, ValueNode forX, ValueNode forY) {
if (forX.isConstant() && !forY.isConstant()) {
- return new IntegerMulExactNode(forY, forX, speculation).canonical(tool);
+ return new IntegerMulExactNode(forY, forX, guard).canonical(tool);
}
- if (forX.isConstant()) {
- return canonicalXconstant(forX, forY);
+ if (forX.isConstant() && forY.isConstant()) {
+ return canonicalXYconstant(forX, forY);
} else if (forY.isConstant()) {
long c = forY.asJavaConstant().asLong();
if (c == 1) {
@@ -95,7 +92,7 @@
return this;
}
- private ValueNode canonicalXconstant(ValueNode forX, ValueNode forY) {
+ private ValueNode canonicalXYconstant(ValueNode forX, ValueNode forY) {
JavaConstant xConst = forX.asJavaConstant();
JavaConstant yConst = forY.asJavaConstant();
assert xConst.getJavaKind() == yConst.getJavaKind();
@@ -113,28 +110,13 @@
}
@Override
- public IntegerExactArithmeticSplitNode createSplit(AbstractBeginNode next, AbstractBeginNode deopt) {
- return graph().add(new IntegerMulExactSplitNode(stamp(NodeView.DEFAULT), getX(), getY(), next, deopt));
- }
-
- @Override
- public SpeculationReason getSpeculation() {
- return speculation;
+ public GuardingNode getGuard() {
+ return guard;
}
@Override
- public AnchoringNode getAnchor() {
- return anchor;
- }
-
- @Override
- public void setAnchor(AnchoringNode x) {
- updateUsagesInterface(this.anchor, x);
- this.anchor = x;
- }
-
- @Override
- public void lower(LoweringTool tool) {
- IntegerExactArithmeticSplitNode.lower(tool, this);
+ public void setGuard(GuardingNode guard) {
+ updateUsagesInterface(this.guard, guard);
+ this.guard = guard;
}
}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/nodes/arithmetic/IntegerMulExactOverflowNode.java Sat Mar 16 21:00:45 2019 +0000
@@ -0,0 +1,100 @@
+/*
+ * 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.
+ */
+
+
+
+package org.graalvm.compiler.replacements.nodes.arithmetic;
+
+import jdk.vm.ci.meta.JavaConstant;
+import jdk.vm.ci.meta.JavaKind;
+import org.graalvm.compiler.core.common.type.IntegerStamp;
+import org.graalvm.compiler.core.common.type.Stamp;
+import org.graalvm.compiler.graph.NodeClass;
+import org.graalvm.compiler.graph.spi.Canonicalizable;
+import org.graalvm.compiler.graph.spi.CanonicalizerTool;
+import org.graalvm.compiler.graph.spi.Simplifiable;
+import org.graalvm.compiler.nodeinfo.NodeInfo;
+import org.graalvm.compiler.nodes.AbstractBeginNode;
+import org.graalvm.compiler.nodes.LogicConstantNode;
+import org.graalvm.compiler.nodes.NodeView;
+import org.graalvm.compiler.nodes.ValueNode;
+import org.graalvm.compiler.nodes.calc.BinaryNode;
+
+import static org.graalvm.compiler.nodeinfo.NodeCycles.CYCLES_4;
+import static org.graalvm.compiler.nodeinfo.NodeSize.SIZE_2;
+
+@NodeInfo(cycles = CYCLES_4, cyclesRationale = "mul+cmp", size = SIZE_2)
+public class IntegerMulExactOverflowNode extends IntegerExactOverflowNode implements Simplifiable, Canonicalizable.BinaryCommutative<ValueNode> {
+ public static final NodeClass<IntegerMulExactOverflowNode> TYPE = NodeClass.create(IntegerMulExactOverflowNode.class);
+
+ public IntegerMulExactOverflowNode(ValueNode x, ValueNode y) {
+ super(TYPE, x, y);
+ }
+
+ @Override
+ public ValueNode canonical(CanonicalizerTool tool, ValueNode forX, ValueNode forY) {
+ if (forX.isConstant() && !forY.isConstant()) {
+ return new IntegerMulExactOverflowNode(forY, forX).canonical(tool);
+ }
+ if (forX.isConstant() && forY.isConstant()) {
+ return canonicalXYconstant(forX, forY);
+ } else if (forY.isConstant()) {
+ long c = forY.asJavaConstant().asLong();
+ if (c == 1 || c == 0) {
+ return LogicConstantNode.forBoolean(false);
+ }
+ }
+ if (!IntegerStamp.multiplicationCanOverflow((IntegerStamp) x.stamp(NodeView.DEFAULT), (IntegerStamp) y.stamp(NodeView.DEFAULT))) {
+ return LogicConstantNode.forBoolean(false);
+ }
+ return this;
+ }
+
+ private static LogicConstantNode canonicalXYconstant(ValueNode forX, ValueNode forY) {
+ JavaConstant xConst = forX.asJavaConstant();
+ JavaConstant yConst = forY.asJavaConstant();
+ assert xConst.getJavaKind() == yConst.getJavaKind();
+ try {
+ if (xConst.getJavaKind() == JavaKind.Int) {
+ Math.multiplyExact(xConst.asInt(), yConst.asInt());
+ } else {
+ assert xConst.getJavaKind() == JavaKind.Long;
+ Math.multiplyExact(xConst.asLong(), yConst.asLong());
+ }
+ } catch (ArithmeticException ex) {
+ return LogicConstantNode.forBoolean(true);
+ }
+ return LogicConstantNode.forBoolean(false);
+ }
+
+ @Override
+ protected IntegerExactArithmeticSplitNode createSplit(Stamp splitStamp, AbstractBeginNode next, AbstractBeginNode overflow) {
+ return new IntegerMulExactSplitNode(splitStamp, x, y, next, overflow);
+ }
+
+ @Override
+ protected Class<? extends BinaryNode> getCoupledType() {
+ return IntegerMulExactNode.class;
+ }
+
+}
--- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/nodes/arithmetic/IntegerMulHighNode.java Tue Mar 12 09:49:10 2019 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,93 +0,0 @@
-/*
- * Copyright (c) 2014, 2018, Oracle and/or its affiliates. All rights reserved.
- * 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.
- */
-
-
-package org.graalvm.compiler.replacements.nodes.arithmetic;
-
-import static org.graalvm.compiler.nodeinfo.NodeCycles.CYCLES_2;
-import static org.graalvm.compiler.nodeinfo.NodeSize.SIZE_2;
-
-import org.graalvm.compiler.core.common.type.ArithmeticOpTable;
-import org.graalvm.compiler.core.common.type.ArithmeticOpTable.BinaryOp.MulHigh;
-import org.graalvm.compiler.graph.NodeClass;
-import org.graalvm.compiler.graph.spi.Canonicalizable;
-import org.graalvm.compiler.graph.spi.CanonicalizerTool;
-import org.graalvm.compiler.lir.gen.ArithmeticLIRGeneratorTool;
-import org.graalvm.compiler.nodeinfo.NodeInfo;
-import org.graalvm.compiler.nodes.ConstantNode;
-import org.graalvm.compiler.nodes.NodeView;
-import org.graalvm.compiler.nodes.ValueNode;
-import org.graalvm.compiler.nodes.calc.BinaryArithmeticNode;
-import org.graalvm.compiler.nodes.spi.NodeLIRBuilderTool;
-
-import jdk.vm.ci.meta.Constant;
-import jdk.vm.ci.meta.PrimitiveConstant;
-import jdk.vm.ci.meta.Value;
-
-@NodeInfo(shortName = "*H", cycles = CYCLES_2, size = SIZE_2)
-public final class IntegerMulHighNode extends BinaryArithmeticNode<MulHigh> implements Canonicalizable.BinaryCommutative<ValueNode> {
- public static final NodeClass<IntegerMulHighNode> TYPE = NodeClass.create(IntegerMulHighNode.class);
-
- public IntegerMulHighNode(ValueNode x, ValueNode y) {
- super(TYPE, ArithmeticOpTable::getMulHigh, x, y);
- }
-
- @Override
- public void generate(NodeLIRBuilderTool nodeValueMap, ArithmeticLIRGeneratorTool gen) {
- Value a = nodeValueMap.operand(getX());
- Value b = nodeValueMap.operand(getY());
- nodeValueMap.setResult(this, gen.emitMulHigh(a, b));
- }
-
- @Override
- public ValueNode canonical(CanonicalizerTool tool, ValueNode forX, ValueNode forY) {
- ValueNode ret = super.canonical(tool, forX, forY);
- if (ret != this) {
- return ret;
- }
-
- if (forX.isConstant() && !forY.isConstant()) {
- // we try to swap and canonicalize
- ValueNode improvement = canonical(tool, forY, forX);
- if (improvement != this) {
- return improvement;
- }
- // if this fails we only swap
- return new IntegerMulHighNode(forY, forX);
- }
- return canonical(this, forY);
- }
-
- private static ValueNode canonical(IntegerMulHighNode self, ValueNode forY) {
- if (forY.isConstant()) {
- Constant c = forY.asConstant();
- if (c instanceof PrimitiveConstant && ((PrimitiveConstant) c).getJavaKind().isNumericInteger()) {
- long i = ((PrimitiveConstant) c).asLong();
- if (i == 0 || i == 1) {
- return ConstantNode.forIntegerStamp(self.stamp(NodeView.DEFAULT), 0);
- }
- }
- }
- return self;
- }
-}
--- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/nodes/arithmetic/IntegerSubExactNode.java Tue Mar 12 09:49:10 2019 +0000
+++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/nodes/arithmetic/IntegerSubExactNode.java Sat Mar 16 21:00:45 2019 +0000
@@ -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
@@ -32,35 +32,32 @@
import org.graalvm.compiler.graph.spi.CanonicalizerTool;
import org.graalvm.compiler.nodeinfo.InputType;
import org.graalvm.compiler.nodeinfo.NodeInfo;
-import org.graalvm.compiler.nodes.AbstractBeginNode;
import org.graalvm.compiler.nodes.ConstantNode;
import org.graalvm.compiler.nodes.NodeView;
import org.graalvm.compiler.nodes.ValueNode;
import org.graalvm.compiler.nodes.calc.SubNode;
-import org.graalvm.compiler.nodes.extended.AnchoringNode;
-import org.graalvm.compiler.nodes.spi.LoweringTool;
+import org.graalvm.compiler.nodes.extended.GuardedNode;
+import org.graalvm.compiler.nodes.extended.GuardingNode;
import org.graalvm.compiler.nodes.util.GraphUtil;
import jdk.vm.ci.meta.JavaConstant;
import jdk.vm.ci.meta.JavaKind;
-import jdk.vm.ci.meta.SpeculationLog.SpeculationReason;
/**
* Node representing an exact integer substraction that will throw an {@link ArithmeticException} in
* case the addition would overflow the 32 bit range.
*/
@NodeInfo(cycles = CYCLES_2, size = SIZE_2)
-public final class IntegerSubExactNode extends SubNode implements IntegerExactArithmeticNode {
+public final class IntegerSubExactNode extends SubNode implements GuardedNode, IntegerExactArithmeticNode {
public static final NodeClass<IntegerSubExactNode> TYPE = NodeClass.create(IntegerSubExactNode.class);
- @OptionalInput(InputType.Anchor) protected AnchoringNode anchor;
- protected final SpeculationReason speculation;
+ @Input(InputType.Guard) protected GuardingNode guard;
- public IntegerSubExactNode(ValueNode x, ValueNode y, SpeculationReason speculation) {
+ public IntegerSubExactNode(ValueNode x, ValueNode y, GuardingNode guard) {
super(TYPE, x, y);
setStamp(x.stamp(NodeView.DEFAULT).unrestricted());
assert x.stamp(NodeView.DEFAULT).isCompatible(y.stamp(NodeView.DEFAULT)) && x.stamp(NodeView.DEFAULT) instanceof IntegerStamp;
- this.speculation = speculation;
+ this.guard = guard;
}
@Override
@@ -111,28 +108,13 @@
}
@Override
- public IntegerExactArithmeticSplitNode createSplit(AbstractBeginNode next, AbstractBeginNode deopt) {
- return graph().add(new IntegerSubExactSplitNode(stamp(NodeView.DEFAULT), getX(), getY(), next, deopt));
- }
-
- @Override
- public SpeculationReason getSpeculation() {
- return speculation;
+ public GuardingNode getGuard() {
+ return guard;
}
@Override
- public AnchoringNode getAnchor() {
- return anchor;
- }
-
- @Override
- public void setAnchor(AnchoringNode x) {
- updateUsagesInterface(this.anchor, x);
- this.anchor = x;
- }
-
- @Override
- public void lower(LoweringTool tool) {
- IntegerExactArithmeticSplitNode.lower(tool, this);
+ public void setGuard(GuardingNode guard) {
+ updateUsagesInterface(this.guard, guard);
+ this.guard = guard;
}
}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/nodes/arithmetic/IntegerSubExactOverflowNode.java Sat Mar 16 21:00:45 2019 +0000
@@ -0,0 +1,102 @@
+/*
+ * 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.
+ */
+
+
+
+package org.graalvm.compiler.replacements.nodes.arithmetic;
+
+import jdk.vm.ci.meta.JavaConstant;
+import jdk.vm.ci.meta.JavaKind;
+import org.graalvm.compiler.core.common.type.IntegerStamp;
+import org.graalvm.compiler.core.common.type.Stamp;
+import org.graalvm.compiler.graph.NodeClass;
+import org.graalvm.compiler.graph.spi.CanonicalizerTool;
+import org.graalvm.compiler.graph.spi.Simplifiable;
+import org.graalvm.compiler.nodeinfo.NodeInfo;
+import org.graalvm.compiler.nodes.AbstractBeginNode;
+import org.graalvm.compiler.nodes.LogicConstantNode;
+import org.graalvm.compiler.nodes.NodeView;
+import org.graalvm.compiler.nodes.ValueNode;
+import org.graalvm.compiler.nodes.calc.BinaryNode;
+import org.graalvm.compiler.nodes.util.GraphUtil;
+
+import static org.graalvm.compiler.nodeinfo.NodeCycles.CYCLES_2;
+import static org.graalvm.compiler.nodeinfo.NodeSize.SIZE_2;
+
+@NodeInfo(cycles = CYCLES_2, size = SIZE_2)
+public class IntegerSubExactOverflowNode extends IntegerExactOverflowNode implements Simplifiable {
+ public static final NodeClass<IntegerSubExactOverflowNode> TYPE = NodeClass.create(IntegerSubExactOverflowNode.class);
+
+ public IntegerSubExactOverflowNode(ValueNode x, ValueNode y) {
+ super(TYPE, x, y);
+ }
+
+ @Override
+ public ValueNode canonical(CanonicalizerTool tool, ValueNode forX, ValueNode forY) {
+ if (GraphUtil.unproxify(forX) == GraphUtil.unproxify(forY)) {
+ return LogicConstantNode.forBoolean(false);
+ }
+ if (forX.isConstant() && forY.isConstant()) {
+ return canonicalXYconstant(forX, forY);
+ } else if (forY.isConstant()) {
+ long c = forY.asJavaConstant().asLong();
+ if (c == 0) {
+ return LogicConstantNode.forBoolean(false);
+ }
+ }
+ if (!IntegerStamp.subtractionCanOverflow((IntegerStamp) x.stamp(NodeView.DEFAULT), (IntegerStamp) y.stamp(NodeView.DEFAULT))) {
+ return LogicConstantNode.forBoolean(false);
+ }
+ return this;
+ }
+
+ private static LogicConstantNode canonicalXYconstant(ValueNode forX, ValueNode forY) {
+ JavaConstant xConst = forX.asJavaConstant();
+ JavaConstant yConst = forY.asJavaConstant();
+ assert xConst.getJavaKind() == yConst.getJavaKind();
+ try {
+ if (xConst.getJavaKind() == JavaKind.Int) {
+ Math.subtractExact(xConst.asInt(), yConst.asInt());
+ } else {
+ assert xConst.getJavaKind() == JavaKind.Long;
+ Math.subtractExact(xConst.asLong(), yConst.asLong());
+ }
+ } catch (ArithmeticException ex) {
+ // Always overflows
+ return LogicConstantNode.forBoolean(true);
+ }
+ // Never overflows
+ return LogicConstantNode.forBoolean(false);
+ }
+
+ @Override
+ protected IntegerExactArithmeticSplitNode createSplit(Stamp splitStamp, AbstractBeginNode next, AbstractBeginNode overflow) {
+ return new IntegerSubExactSplitNode(splitStamp, x, y, next, overflow);
+ }
+
+ @Override
+ protected Class<? extends BinaryNode> getCoupledType() {
+ return IntegerSubExactNode.class;
+ }
+
+}
--- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.serviceprovider/src/org/graalvm/compiler/serviceprovider/GraalServices.java Tue Mar 12 09:49:10 2019 +0000
+++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.serviceprovider/src/org/graalvm/compiler/serviceprovider/GraalServices.java Sat Mar 16 21:00:45 2019 +0000
@@ -28,12 +28,14 @@
import java.io.IOException;
import java.io.InputStream;
+import java.util.Arrays;
import java.util.Iterator;
import java.util.List;
import java.util.ServiceConfigurationError;
import java.util.ServiceLoader;
import java.util.concurrent.atomic.AtomicLong;
+import jdk.vm.ci.meta.SpeculationLog.SpeculationReason;
import jdk.vm.ci.runtime.JVMCI;
import jdk.vm.ci.services.JVMCIPermission;
import jdk.vm.ci.services.Services;
@@ -43,30 +45,6 @@
*/
public final class GraalServices {
- private static int getJavaSpecificationVersion() {
- String value = System.getProperty("java.specification.version");
- if (value.startsWith("1.")) {
- value = value.substring(2);
- }
- return Integer.parseInt(value);
- }
-
- /**
- * The integer value corresponding to the value of the {@code java.specification.version} system
- * property after any leading {@code "1."} has been stripped.
- */
- public static final int JAVA_SPECIFICATION_VERSION = getJavaSpecificationVersion();
-
- /**
- * Determines if the Java runtime is version 8 or earlier.
- */
- public static final boolean Java8OrEarlier = JAVA_SPECIFICATION_VERSION <= 8;
-
- /**
- * Determines if the Java runtime is version 11 or earlier.
- */
- public static final boolean Java11OrEarlier = JAVA_SPECIFICATION_VERSION <= 11;
-
private GraalServices() {
}
@@ -195,6 +173,44 @@
}
/**
+ * An implementation of {@link SpeculationReason} based on direct, unencoded values.
+ */
+ static final class DirectSpeculationReason implements SpeculationReason {
+ final int groupId;
+ final String groupName;
+ final Object[] context;
+
+ DirectSpeculationReason(int groupId, String groupName, Object[] context) {
+ this.groupId = groupId;
+ this.groupName = groupName;
+ this.context = context;
+ }
+
+ @Override
+ public boolean equals(Object obj) {
+ if (obj instanceof DirectSpeculationReason) {
+ DirectSpeculationReason that = (DirectSpeculationReason) obj;
+ return this.groupId == that.groupId && Arrays.equals(this.context, that.context);
+ }
+ return false;
+ }
+
+ @Override
+ public int hashCode() {
+ return groupId + Arrays.hashCode(this.context);
+ }
+
+ @Override
+ public String toString() {
+ return String.format("%s@%d%s", groupName, groupId, Arrays.toString(context));
+ }
+ }
+
+ static SpeculationReason createSpeculationReason(int groupId, String groupName, Object... context) {
+ return new DirectSpeculationReason(groupId, groupName, context);
+ }
+
+ /**
* Gets a unique identifier for this execution such as a process ID or a
* {@linkplain #getGlobalTimeStamp() fixed timestamp}.
*/
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.serviceprovider/src/org/graalvm/compiler/serviceprovider/JavaVersionUtil.java Sat Mar 16 21:00:45 2019 +0000
@@ -0,0 +1,58 @@
+/*
+ * 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.
+ */
+
+
+package org.graalvm.compiler.serviceprovider;
+
+/**
+ * Interface to query which JDK version Graal is running on.
+ */
+public final class JavaVersionUtil {
+
+ private static int getJavaSpecificationVersion() {
+ String value = System.getProperty("java.specification.version");
+ if (value.startsWith("1.")) {
+ value = value.substring(2);
+ }
+ return Integer.parseInt(value);
+ }
+
+ /**
+ * The integer value corresponding to the value of the {@code java.specification.version} system
+ * property after any leading {@code "1."} has been stripped.
+ */
+ public static final int JAVA_SPECIFICATION_VERSION = getJavaSpecificationVersion();
+
+ /**
+ * Determines if the Java runtime is version 8 or earlier.
+ */
+ public static final boolean Java8OrEarlier = JAVA_SPECIFICATION_VERSION <= 8;
+
+ /**
+ * Determines if the Java runtime is version 11 or earlier.
+ */
+ public static final boolean Java11OrEarlier = JAVA_SPECIFICATION_VERSION <= 11;
+
+ private JavaVersionUtil() {
+ }
+}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.serviceprovider/src/org/graalvm/compiler/serviceprovider/SpeculationReasonGroup.java Sat Mar 16 21:00:45 2019 +0000
@@ -0,0 +1,169 @@
+/*
+ * 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.
+ */
+
+
+package org.graalvm.compiler.serviceprovider;
+
+import java.util.Arrays;
+import java.util.HashSet;
+import java.util.Set;
+import java.util.concurrent.atomic.AtomicInteger;
+
+import jdk.vm.ci.code.BytecodePosition;
+import jdk.vm.ci.meta.ResolvedJavaMethod;
+import jdk.vm.ci.meta.ResolvedJavaType;
+import jdk.vm.ci.meta.SpeculationLog.SpeculationReason;
+
+/**
+ * Facility for creating speculation reasons partitioned in groups.
+ */
+public final class SpeculationReasonGroup {
+
+ private final int id;
+ private final String name;
+ private final Class<?>[] signature;
+
+ private static final AtomicInteger nextId = new AtomicInteger(1);
+
+ /**
+ * Creates speculation group whose context will always match {@code signature}.
+ */
+ public SpeculationReasonGroup(String name, Class<?>... signature) {
+ this.id = nextId.get();
+ this.name = name;
+ this.signature = signature;
+ for (Class<?> c : signature) {
+ if (!isOfSupportedType(c)) {
+ throw new IllegalArgumentException("Unsupported speculation context type: " + c.getName());
+ }
+ }
+ }
+
+ @Override
+ public String toString() {
+ return String.format("%s{id:%d, sig=%s}", name, id, Arrays.toString(signature));
+ }
+
+ /**
+ * Creates a speculation reason described by this group.
+ *
+ * @param context the components of the reason instance being created
+ */
+ public SpeculationReason createSpeculationReason(Object... context) {
+ assert checkSignature(context);
+ return GraalServices.createSpeculationReason(id, name, context);
+ }
+
+ private static final Set<Class<?>> SUPPORTED_EXACT_TYPES = new HashSet<>(Arrays.asList(
+ String.class,
+ int.class,
+ long.class,
+ float.class,
+ double.class,
+ BytecodePosition.class));
+
+ private static boolean isOfSupportedType(Class<?> c) {
+ if (SUPPORTED_EXACT_TYPES.contains(c)) {
+ return true;
+ }
+ if (Enum.class.isAssignableFrom(c)) {
+ // Trust the ordinal of an Enum to be unique
+ return true;
+ }
+ if (SpeculationContextObject.class.isAssignableFrom(c)) {
+ return true;
+ }
+ if (ResolvedJavaMethod.class.isAssignableFrom(c) || ResolvedJavaType.class.isAssignableFrom(c)) {
+ // Only the JVMCI implementation specific concrete subclasses
+ // of these types will be accepted but we cannot test for that
+ // here since we are in JVMCI implementation agnostic code.
+ return true;
+ }
+ return false;
+ }
+
+ static Class<?> toBox(Class<?> c) {
+ if (c == int.class) {
+ return Integer.class;
+ }
+ if (c == long.class) {
+ return Long.class;
+ }
+ if (c == float.class) {
+ return Float.class;
+ }
+ if (c == double.class) {
+ return Double.class;
+ }
+ return c;
+ }
+
+ private boolean checkSignature(Object[] context) {
+ assert signature.length == context.length : name + ": Incorrect number of context arguments. Expected " + signature.length + ", got " + context.length;
+ for (int i = 0; i < context.length; i++) {
+ Object o = context[i];
+ Class<?> c = signature[i];
+ if (o != null) {
+ if (c == ResolvedJavaMethod.class || c == ResolvedJavaType.class || SpeculationContextObject.class.isAssignableFrom(c)) {
+ c.cast(o);
+ } else {
+ Class<?> oClass = o.getClass();
+ assert toBox(c) == oClass : name + ": Context argument " + i + " is not a " + c.getName() + " but a " + oClass.getName();
+ }
+ } else {
+ if (c.isPrimitive() || Enum.class.isAssignableFrom(c)) {
+ throw new AssertionError(name + ": Cannot pass null for argument " + i);
+ }
+ }
+ }
+ return true;
+ }
+
+ /**
+ * Denotes part of a {@linkplain SpeculationReasonGroup#createSpeculationReason(Object...)
+ * reason} that can have its attributes {@linkplain #accept(Visitor) visited}.
+ */
+ public interface SpeculationContextObject {
+ void accept(Visitor v);
+
+ public interface Visitor {
+ void visitBoolean(boolean v);
+
+ void visitByte(byte v);
+
+ void visitChar(char v);
+
+ void visitShort(short v);
+
+ void visitInt(int v);
+
+ void visitLong(long v);
+
+ void visitFloat(float v);
+
+ void visitDouble(double v);
+
+ void visitObject(Object v);
+ }
+ }
+}
--- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.test/src/org/graalvm/compiler/test/GraalTest.java Tue Mar 12 09:49:10 2019 +0000
+++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.test/src/org/graalvm/compiler/test/GraalTest.java Sat Mar 16 21:00:45 2019 +0000
@@ -44,6 +44,7 @@
import org.graalvm.compiler.debug.GlobalMetrics;
import org.graalvm.compiler.options.OptionValues;
import org.graalvm.compiler.serviceprovider.GraalServices;
+import org.graalvm.compiler.serviceprovider.JavaVersionUtil;
import org.junit.After;
import org.junit.Assert;
import org.junit.AssumptionViolatedException;
@@ -72,8 +73,8 @@
}
}
- public static final boolean Java8OrEarlier = GraalServices.Java8OrEarlier;
- public static final boolean Java11OrEarlier = GraalServices.Java11OrEarlier;
+ public static final boolean Java8OrEarlier = JavaVersionUtil.Java8OrEarlier;
+ public static final boolean Java11OrEarlier = JavaVersionUtil.Java11OrEarlier;
protected Method getMethod(String methodName) {
return getMethod(getClass(), methodName);
--- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.test/src/org/graalvm/compiler/test/SubprocessUtil.java Tue Mar 12 09:49:10 2019 +0000
+++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.test/src/org/graalvm/compiler/test/SubprocessUtil.java Sat Mar 16 21:00:45 2019 +0000
@@ -37,7 +37,7 @@
import java.util.regex.Matcher;
import java.util.regex.Pattern;
-import org.graalvm.compiler.serviceprovider.GraalServices;
+import org.graalvm.compiler.serviceprovider.JavaVersionUtil;
import org.graalvm.util.CollectionsUtil;
import org.junit.Assume;
@@ -249,7 +249,7 @@
return new Subprocess(command, process.waitFor(), output);
}
- private static final boolean isJava8OrEarlier = GraalServices.Java8OrEarlier;
+ private static final boolean isJava8OrEarlier = JavaVersionUtil.Java8OrEarlier;
private static boolean hasArg(String optionName) {
if (optionName.equals("-cp") || optionName.equals("-classpath")) {
--- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.virtual/src/org/graalvm/compiler/virtual/phases/ea/EffectsClosure.java Tue Mar 12 09:49:10 2019 +0000
+++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.virtual/src/org/graalvm/compiler/virtual/phases/ea/EffectsClosure.java Sat Mar 16 21:00:45 2019 +0000
@@ -295,7 +295,7 @@
protected final List<BlockT> processLoop(Loop<Block> loop, BlockT initialState) {
if (initialState.isDead()) {
ArrayList<BlockT> states = new ArrayList<>();
- for (int i = 0; i < loop.getExits().size(); i++) {
+ for (int i = 0; i < loop.getLoopExits().size(); i++) {
states.add(initialState);
}
return states;
@@ -347,7 +347,7 @@
blockEffects.get(loop.getHeader()).insertAll(mergeProcessor.mergeEffects, 0);
loopMergeEffects.put(loop, mergeProcessor.afterMergeEffects);
- assert info.exitStates.size() == loop.getExits().size();
+ assert info.exitStates.size() == loop.getLoopExits().size();
loopEntryStates.put((LoopBeginNode) loop.getHeader().getBeginNode(), loopEntryState);
assert assertExitStatesNonEmpty(loop, info);
@@ -412,8 +412,8 @@
}
private boolean assertExitStatesNonEmpty(Loop<Block> loop, LoopInfo<BlockT> info) {
- for (int i = 0; i < loop.getExits().size(); i++) {
- assert info.exitStates.get(i) != null : "no loop exit state at " + loop.getExits().get(i) + " / " + loop.getHeader();
+ for (int i = 0; i < loop.getLoopExits().size(); i++) {
+ assert info.exitStates.get(i) != null : "no loop exit state at " + loop.getLoopExits().get(i) + " / " + loop.getHeader();
}
return true;
}
--- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.graphio/src/org/graalvm/graphio/GraphOutput.java Tue Mar 12 09:49:10 2019 +0000
+++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.graphio/src/org/graalvm/graphio/GraphOutput.java Sat Mar 16 21:00:45 2019 +0000
@@ -28,6 +28,7 @@
import java.io.IOException;
import java.net.URI;
import java.net.URISyntaxException;
+import java.nio.ByteBuffer;
import java.nio.channels.WritableByteChannel;
import java.util.Collections;
import java.util.Map;
@@ -37,8 +38,9 @@
*
* @param <G> the type of graph this instance handles
* @param <M> the type of methods this instance handles
+ * @since 1.0 a {@link WritableByteChannel} is implemented
*/
-public final class GraphOutput<G, M> implements Closeable {
+public final class GraphOutput<G, M> implements Closeable, WritableByteChannel {
private final GraphProtocol<G, ?, ?, ?, ?, M, ?, ?, ?, ?> printer;
private GraphOutput(GraphProtocol<G, ?, ?, ?, ?, M, ?, ?, ?, ?> p) {
@@ -107,6 +109,30 @@
}
/**
+ * Checks if the {@link GraphOutput} is open.
+ *
+ * @return true if the {@link GraphOutput} is open.
+ * @since 1.0
+ */
+ @Override
+ public boolean isOpen() {
+ return printer.isOpen();
+ }
+
+ /**
+ * Writes raw bytes into {@link GraphOutput}.
+ *
+ * @param src the bytes to write
+ * @return the number of bytes written, possibly zero
+ * @throws IOException in case of IO error
+ * @since 1.0
+ */
+ @Override
+ public int write(ByteBuffer src) throws IOException {
+ return printer.write(src);
+ }
+
+ /**
* Builder to configure and create an instance of {@link GraphOutput}.
*
* @param <G> the type of the (root element of) graph
@@ -121,6 +147,7 @@
private GraphBlocks<G, ?, N> blocks = DefaultGraphBlocks.empty();
private int major = 4;
private int minor = 0;
+ private boolean embeddedGraphOutput;
Builder(GraphStructure<G, N, ?, ?> structure) {
this.structure = structure;
@@ -143,6 +170,22 @@
}
/**
+ * Sets {@link GraphOutput} as embedded. The embedded {@link GraphOutput} shares
+ * {@link WritableByteChannel channel} with another already open non parent
+ * {@link GraphOutput}. The embedded {@link GraphOutput} flushes data after each
+ * {@link GraphOutput#print print}, {@link GraphOutput#beginGroup beginGroup} and
+ * {@link GraphOutput#endGroup endGroup} call.
+ *
+ * @param embedded if {@code true} the builder creates an embedded {@link GraphOutput}
+ * @return this builder
+ * @since 1.0
+ */
+ public Builder<G, N, M> embedded(boolean embedded) {
+ this.embeddedGraphOutput = embedded;
+ return this;
+ }
+
+ /**
* Associates different implementation of types.
*
* @param graphTypes implementation of types and enum recognition
@@ -226,7 +269,7 @@
private <L, P> GraphOutput<G, M> buildImpl(ElementsAndLocations<M, L, P> e, WritableByteChannel channel) throws IOException {
// @formatter:off
ProtocolImpl<G, N, ?, ?, ?, M, ?, ?, ?, ?> p = new ProtocolImpl<>(
- major, minor, structure, types, blocks,
+ major, minor, embeddedGraphOutput, structure, types, blocks,
e == null ? null : e.elements,
e == null ? null : e.locations, channel
);
--- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.graphio/src/org/graalvm/graphio/GraphProtocol.java Tue Mar 12 09:49:10 2019 +0000
+++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.graphio/src/org/graalvm/graphio/GraphProtocol.java Sat Mar 16 21:00:45 2019 +0000
@@ -78,10 +78,12 @@
private final ConstantPool constantPool;
private final ByteBuffer buffer;
private final WritableByteChannel channel;
+ private final boolean embedded;
final int versionMajor;
final int versionMinor;
+ private boolean printing;
- GraphProtocol(WritableByteChannel channel, int major, int minor) throws IOException {
+ GraphProtocol(WritableByteChannel channel, int major, int minor, boolean embedded) throws IOException {
if (major > 6 || (major == 6 && minor > 0)) {
throw new IllegalArgumentException("Unrecognized version " + major + "." + minor);
}
@@ -90,7 +92,11 @@
this.constantPool = new ConstantPool();
this.buffer = ByteBuffer.allocateDirect(256 * 1024);
this.channel = channel;
- writeVersion();
+ this.embedded = embedded;
+ if (!embedded) {
+ writeVersion();
+ flushEmbedded();
+ }
}
GraphProtocol(GraphProtocol<?, ?, ?, ?, ?, ?, ?, ?, ?, ?> parent) {
@@ -99,36 +105,67 @@
this.constantPool = parent.constantPool;
this.buffer = parent.buffer;
this.channel = parent.channel;
+ this.embedded = parent.embedded;
}
@SuppressWarnings("all")
public final void print(Graph graph, Map<? extends Object, ? extends Object> properties, int id, String format, Object... args) throws IOException {
- writeByte(BEGIN_GRAPH);
- if (versionMajor >= 3) {
- writeInt(id);
- writeString(format);
- writeInt(args.length);
- for (Object a : args) {
- writePropertyObject(graph, a);
+ printing = true;
+ try {
+ writeByte(BEGIN_GRAPH);
+ if (versionMajor >= 3) {
+ writeInt(id);
+ writeString(format);
+ writeInt(args.length);
+ for (Object a : args) {
+ writePropertyObject(graph, a);
+ }
+ } else {
+ writePoolObject(formatTitle(graph, id, format, args));
}
- } else {
- writePoolObject(formatTitle(graph, id, format, args));
+ writeGraph(graph, properties);
+ flushEmbedded();
+ flush();
+ } finally {
+ printing = false;
}
- writeGraph(graph, properties);
- flush();
}
public final void beginGroup(Graph noGraph, String name, String shortName, ResolvedJavaMethod method, int bci, Map<? extends Object, ? extends Object> properties) throws IOException {
- writeByte(BEGIN_GROUP);
- writePoolObject(name);
- writePoolObject(shortName);
- writePoolObject(method);
- writeInt(bci);
- writeProperties(noGraph, properties);
+ printing = true;
+ try {
+ writeByte(BEGIN_GROUP);
+ writePoolObject(name);
+ writePoolObject(shortName);
+ writePoolObject(method);
+ writeInt(bci);
+ writeProperties(noGraph, properties);
+ flushEmbedded();
+ } finally {
+ printing = false;
+ }
}
public final void endGroup() throws IOException {
- writeByte(CLOSE_GROUP);
+ printing = true;
+ try {
+ writeByte(CLOSE_GROUP);
+ flushEmbedded();
+ } finally {
+ printing = false;
+ }
+ }
+
+ final int write(ByteBuffer src) throws IOException {
+ if (printing) {
+ throw new IllegalStateException("Trying to write during graph print.");
+ }
+ constantPool.reset();
+ return writeBytesRaw(src);
+ }
+
+ final boolean isOpen() {
+ return channel.isOpen();
}
@Override
@@ -280,6 +317,13 @@
writeByte(versionMinor);
}
+ private void flushEmbedded() throws IOException {
+ if (embedded) {
+ flush();
+ constantPool.reset();
+ }
+ }
+
private void flush() throws IOException {
buffer.flip();
/*
@@ -358,6 +402,23 @@
}
}
+ private int writeBytesRaw(ByteBuffer b) throws IOException {
+ int limit = b.limit();
+ int written = 0;
+ while (b.position() < limit) {
+ int toWrite = Math.min(limit - b.position(), buffer.capacity());
+ ensureAvailable(toWrite);
+ b.limit(b.position() + toWrite);
+ try {
+ buffer.put(b);
+ written += toWrite;
+ } finally {
+ b.limit(limit);
+ }
+ }
+ return written;
+ }
+
private void writeInts(int[] b) throws IOException {
if (b == null) {
writeInt(-1);
@@ -818,6 +879,12 @@
put(obj, id);
return id;
}
+
+ void reset() {
+ clear();
+ availableIds.clear();
+ nextId = 0;
+ }
}
}
--- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.graphio/src/org/graalvm/graphio/ProtocolImpl.java Tue Mar 12 09:49:10 2019 +0000
+++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.graphio/src/org/graalvm/graphio/ProtocolImpl.java Sat Mar 16 21:00:45 2019 +0000
@@ -40,11 +40,11 @@
private final GraphElements<ResolvedJavaMethod, ResolvedJavaField, Signature, NodeSourcePosition> elements;
private final GraphLocations<ResolvedJavaMethod, NodeSourcePosition, Location> locations;
- ProtocolImpl(int major, int minor, GraphStructure<Graph, Node, NodeClass, Port> structure, GraphTypes enums, GraphBlocks<Graph, Block, Node> blocks,
+ ProtocolImpl(int major, int minor, boolean embedded, GraphStructure<Graph, Node, NodeClass, Port> structure, GraphTypes enums, GraphBlocks<Graph, Block, Node> blocks,
GraphElements<ResolvedJavaMethod, ResolvedJavaField, Signature, NodeSourcePosition> elements,
GraphLocations<ResolvedJavaMethod, NodeSourcePosition, Location> locs,
WritableByteChannel channel) throws IOException {
- super(channel, major, minor);
+ super(channel, major, minor, embedded);
this.structure = structure;
this.types = enums;
this.blocks = blocks;
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.util/src/org/graalvm/util/DirectAnnotationAccess.java Sat Mar 16 21:00:45 2019 +0000
@@ -0,0 +1,47 @@
+/*
+ * 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.
+ */
+
+
+package org.graalvm.util;
+
+//Checkstyle: allow reflection
+import java.lang.annotation.Annotation;
+import java.lang.reflect.AnnotatedElement;
+
+/**
+ * Wrapper class for annotation access. The purpose of this class is to encapsulate the
+ * AnnotatedElement.getAnnotation() to avoid the use of the "Checkstyle: allow direct annotation
+ * access " and "Checkstyle: disallow direct annotation access" comments for situations where the
+ * annotation access doesn't need to guarded, i.e., in runtime code or code that accesses annotation
+ * on non-user types. See {@link GuardedAnnotationAccess} for details on these checkstyle rules.
+ */
+public class DirectAnnotationAccess {
+
+ public static <T extends Annotation> boolean isAnnotationPresent(AnnotatedElement element, Class<T> annotationClass) {
+ return element.getAnnotation(annotationClass) != null;
+ }
+
+ public static <T extends Annotation> T getAnnotation(AnnotatedElement element, Class<T> annotationType) {
+ return element.getAnnotation(annotationType);
+ }
+}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.util/src/org/graalvm/util/GuardedAnnotationAccess.java Sat Mar 16 21:00:45 2019 +0000
@@ -0,0 +1,108 @@
+/*
+ * 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.
+ */
+
+
+package org.graalvm.util;
+
+import java.lang.annotation.Annotation;
+import java.lang.reflect.AnnotatedElement;
+
+/**
+ * Wrapper class for annotation access that defends against
+ * https://bugs.openjdk.java.net/browse/JDK-7183985: when an annotation declares a Class<?> array
+ * parameter and one of the referenced classes is not present on the classpath parsing the
+ * annotations will result in an ArrayStoreException instead of caching of a
+ * TypeNotPresentExceptionProxy. This is a problem in JDK8 but was fixed in JDK11+. This wrapper
+ * class also defends against incomplete class path issues. If the element for which annotations are
+ * queried is a JMVCI value, i.e., a HotSpotResolvedJavaField, or HotSpotResolvedJavaMethod, the
+ * annotations are read via HotSpotJDKReflection using the
+ * getFieldAnnotation()/getMethodAnnotation() methods which first construct the field/method object
+ * via CompilerToVM.asReflectionField()/CompilerToVM.asReflectionExecutable() which eagerly try to
+ * resolve the types referenced in the element signature. If a field declared type or a method
+ * return type is missing then JVMCI throws a NoClassDefFoundError.
+ */
+public final class GuardedAnnotationAccess {
+
+ public static boolean isAnnotationPresent(AnnotatedElement element, Class<? extends Annotation> annotationClass) {
+ return getAnnotation(element, annotationClass) != null;
+ }
+
+ public static <T extends Annotation> T getAnnotation(AnnotatedElement element, Class<T> annotationType) {
+ try {
+ return element.getAnnotation(annotationType);
+ } catch (ArrayStoreException | NoClassDefFoundError e) {
+ /*
+ * Returning null essentially means that the element doesn't declare the annotationType,
+ * but we cannot know that since the annotation parsing failed. However, this allows us
+ * to defend against crashing the image builder if the above JDK bug is encountered in
+ * user code or if the user code references types missing from the classpath.
+ */
+ return null;
+ }
+ }
+
+ public static Annotation[] getAnnotations(AnnotatedElement element) {
+ try {
+ return element.getAnnotations();
+ } catch (ArrayStoreException | NoClassDefFoundError e) {
+ /*
+ * Returning an empty array essentially means that the element doesn't declare any
+ * annotations, but we know that it is not true since the reason the annotation parsing
+ * failed is because some annotation referenced a missing class. However, this allows us
+ * to defend against crashing the image builder if the above JDK bug is encountered in
+ * user code or if the user code references types missing from the classpath.
+ */
+ return new Annotation[0];
+ }
+ }
+
+ public static <T extends Annotation> T getDeclaredAnnotation(AnnotatedElement element, Class<T> annotationType) {
+ try {
+ return element.getDeclaredAnnotation(annotationType);
+ } catch (ArrayStoreException | NoClassDefFoundError e) {
+ /*
+ * Returning null essentially means that the element doesn't declare the annotationType,
+ * but we cannot know that since the annotation parsing failed. However, this allows us
+ * to defend against crashing the image builder if the above JDK bug is encountered in
+ * user code or if the user code references types missing from the classpath.
+ */
+ return null;
+ }
+ }
+
+ public static Annotation[] getDeclaredAnnotations(AnnotatedElement element) {
+ try {
+ return element.getDeclaredAnnotations();
+ } catch (ArrayStoreException | NoClassDefFoundError e) {
+ /*
+ * Returning an empty array essentially means that the element doesn't declare any
+ * annotations, but we know that it is not true since the reason the annotation parsing
+ * failed is because it at least one annotation referenced a missing class. However,
+ * this allows us to defend against crashing the image builder if the above JDK bug is
+ * encountered in user code or if the user code references types missing from the
+ * classpath.
+ */
+ return new Annotation[0];
+ }
+ }
+}
--- a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/AbstractExecutableMemberWriter.java Tue Mar 12 09:49:10 2019 +0000
+++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/AbstractExecutableMemberWriter.java Sat Mar 16 21:00:45 2019 +0000
@@ -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
@@ -78,8 +78,8 @@
protected void addTypeParameters(ExecutableElement member, Content htmltree) {
Content typeParameters = getTypeParameters(member);
if (!typeParameters.isEmpty()) {
- htmltree.addContent(typeParameters);
- htmltree.addContent(Contents.SPACE);
+ htmltree.add(typeParameters);
+ htmltree.add(Contents.SPACE);
}
}
@@ -100,16 +100,16 @@
@Override
protected Content getDeprecatedLink(Element member) {
Content deprecatedLinkContent = new ContentBuilder();
- deprecatedLinkContent.addContent(utils.getFullyQualifiedName(member));
+ deprecatedLinkContent.add(utils.getFullyQualifiedName(member));
if (!utils.isConstructor(member)) {
- deprecatedLinkContent.addContent(".");
- deprecatedLinkContent.addContent(member.getSimpleName());
+ deprecatedLinkContent.add(".");
+ deprecatedLinkContent.add(member.getSimpleName());
}
String signature = utils.flatSignature((ExecutableElement) member);
if (signature.length() > 2) {
- deprecatedLinkContent.addContent(Contents.ZERO_WIDTH_SPACE);
+ deprecatedLinkContent.add(Contents.ZERO_WIDTH_SPACE);
}
- deprecatedLinkContent.addContent(signature);
+ deprecatedLinkContent.add(signature);
return writer.getDocLink(MEMBER, utils.getEnclosingTypeElement(member), member, deprecatedLinkContent);
}
@@ -131,7 +131,7 @@
name(ee), false));
Content code = HtmlTree.CODE(memberLink);
addParameters(ee, false, code, name(ee).length() - 1);
- tdSummary.addContent(code);
+ tdSummary.add(code);
}
/**
@@ -143,7 +143,7 @@
*/
@Override
protected void addInheritedSummaryLink(TypeElement te, Element member, Content linksTree) {
- linksTree.addContent(writer.getDocLink(MEMBER, te, member, name(member), false));
+ linksTree.add(writer.getDocLink(MEMBER, te, member, name(member), false));
}
/**
@@ -158,10 +158,10 @@
boolean isVarArg, Content tree) {
Content link = writer.getLink(new LinkInfoImpl(configuration, EXECUTABLE_MEMBER_PARAM,
param.asType()).varargs(isVarArg));
- tree.addContent(link);
+ tree.add(link);
if(name(param).length() > 0) {
- tree.addContent(Contents.SPACE);
- tree.addContent(name(param));
+ tree.add(Contents.SPACE);
+ tree.add(name(param));
}
}
@@ -176,12 +176,12 @@
protected void addReceiverAnnotations(ExecutableElement member, TypeMirror rcvrType,
List<? extends AnnotationMirror> annotationMirrors, Content tree) {
writer.addReceiverAnnotationInfo(member, rcvrType, annotationMirrors, tree);
- tree.addContent(Contents.SPACE);
- tree.addContent(utils.getTypeName(rcvrType, false));
+ tree.add(Contents.SPACE);
+ tree.add(utils.getTypeName(rcvrType, false));
LinkInfoImpl linkInfo = new LinkInfoImpl(configuration, RECEIVER_TYPE, rcvrType);
- tree.addContent(writer.getTypeParameterLinks(linkInfo));
- tree.addContent(Contents.SPACE);
- tree.addContent("this");
+ tree.add(writer.getTypeParameterLinks(linkInfo));
+ tree.add(Contents.SPACE);
+ tree.add("this");
}
@@ -216,7 +216,7 @@
}
int paramstart;
for (paramstart = 0; paramstart < parameters.size(); paramstart++) {
- paramTree.addContent(sep);
+ paramTree.add(sep);
VariableElement param = parameters.get(paramstart);
if (param.getKind() != ElementKind.INSTANCE_INIT) {
@@ -225,8 +225,8 @@
writer.addAnnotationInfo(indent.length(),
member, param, paramTree);
if (foundAnnotations) {
- paramTree.addContent(DocletConstants.NL);
- paramTree.addContent(indent);
+ paramTree.add(DocletConstants.NL);
+ paramTree.add(indent);
}
}
addParam(member, param,
@@ -236,28 +236,28 @@
}
for (int i = paramstart + 1; i < parameters.size(); i++) {
- paramTree.addContent(",");
- paramTree.addContent(DocletConstants.NL);
- paramTree.addContent(indent);
+ paramTree.add(",");
+ paramTree.add(DocletConstants.NL);
+ paramTree.add(indent);
if (includeAnnotations) {
boolean foundAnnotations =
writer.addAnnotationInfo(indent.length(), member, parameters.get(i),
paramTree);
if (foundAnnotations) {
- paramTree.addContent(DocletConstants.NL);
- paramTree.addContent(indent);
+ paramTree.add(DocletConstants.NL);
+ paramTree.add(indent);
}
}
addParam(member, parameters.get(i), (i == parameters.size() - 1) && member.isVarArgs(),
paramTree);
}
if (paramTree.isEmpty()) {
- htmltree.addContent("()");
+ htmltree.add("()");
} else {
- htmltree.addContent(Contents.ZERO_WIDTH_SPACE);
- htmltree.addContent("(");
- htmltree.addContent(paramTree);
- paramTree.addContent(")");
+ htmltree.add(Contents.ZERO_WIDTH_SPACE);
+ htmltree.add("(");
+ htmltree.add(paramTree);
+ paramTree.add(")");
}
}
@@ -271,19 +271,19 @@
List<? extends TypeMirror> exceptions = member.getThrownTypes();
if (!exceptions.isEmpty()) {
CharSequence indent = makeSpace(indentSize + 1 - 7);
- htmltree.addContent(DocletConstants.NL);
- htmltree.addContent(indent);
- htmltree.addContent("throws ");
+ htmltree.add(DocletConstants.NL);
+ htmltree.add(indent);
+ htmltree.add("throws ");
indent = makeSpace(indentSize + 1);
Content link = writer.getLink(new LinkInfoImpl(configuration, MEMBER, exceptions.get(0)));
- htmltree.addContent(link);
+ htmltree.add(link);
for(int i = 1; i < exceptions.size(); i++) {
- htmltree.addContent(",");
- htmltree.addContent(DocletConstants.NL);
- htmltree.addContent(indent);
+ htmltree.add(",");
+ htmltree.add(DocletConstants.NL);
+ htmltree.add(indent);
Content exceptionLink = writer.getLink(new LinkInfoImpl(configuration, MEMBER,
exceptions.get(i)));
- htmltree.addContent(exceptionLink);
+ htmltree.add(exceptionLink);
}
}
}
--- a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/AbstractIndexWriter.java Tue Mar 12 09:49:10 2019 +0000
+++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/AbstractIndexWriter.java Sat Mar 16 21:00:45 2019 +0000
@@ -107,7 +107,7 @@
for (Element element : memberlist) {
addDescription(dl, element);
}
- contentTree.addContent(dl);
+ contentTree.add(dl);
}
}
@@ -120,7 +120,7 @@
for (SearchIndexItem sii : searchList) {
addDescription(sii, dl);
}
- contentTree.addContent(dl);
+ contentTree.add(dl);
}
}
@@ -161,16 +161,16 @@
i++;
}
}
- contentTree.addContent(dl);
+ contentTree.add(dl);
}
protected void addHeading(Character uc, Content contentTree) {
String unicode = uc.toString();
- contentTree.addContent(getMarkerAnchorForIndex(unicode));
+ contentTree.add(getMarkerAnchorForIndex(unicode));
Content headContent = new StringContent(unicode);
Content heading = HtmlTree.HEADING(Headings.CONTENT_HEADING, false,
HtmlStyle.title, headContent);
- contentTree.addContent(heading);
+ contentTree.add(heading);
}
protected void addDescription(Content dl, Element element) {
@@ -223,13 +223,13 @@
si.setLabel(moduleName);
si.setCategory(SearchIndexItem.Category.MODULES);
Content dt = HtmlTree.DT(link);
- dt.addContent(" - ");
- dt.addContent(contents.module_);
- dt.addContent(" " + moduleName);
- dlTree.addContent(dt);
+ dt.add(" - ");
+ dt.add(contents.module_);
+ dt.add(" " + moduleName);
+ dlTree.add(dt);
Content dd = new HtmlTree(HtmlTag.DD);
addSummaryComment(mdle, dd);
- dlTree.addContent(dd);
+ dlTree.add(dd);
}
/**
@@ -247,13 +247,13 @@
si.setLabel(utils.getPackageName(pkg));
si.setCategory(SearchIndexItem.Category.PACKAGES);
Content dt = HtmlTree.DT(link);
- dt.addContent(" - ");
- dt.addContent(contents.package_);
- dt.addContent(" " + utils.getPackageName(pkg));
- dlTree.addContent(dt);
+ dt.add(" - ");
+ dt.add(contents.package_);
+ dt.add(" " + utils.getPackageName(pkg));
+ dlTree.add(dt);
Content dd = new HtmlTree(HtmlTag.DD);
addSummaryComment(pkg, dd);
- dlTree.addContent(dd);
+ dlTree.add(dd);
}
/**
@@ -270,12 +270,12 @@
si.setLabel(utils.getSimpleName(typeElement));
si.setCategory(SearchIndexItem.Category.TYPES);
Content dt = HtmlTree.DT(link);
- dt.addContent(" - ");
+ dt.add(" - ");
addClassInfo(typeElement, dt);
- dlTree.addContent(dt);
+ dlTree.add(dt);
Content dd = new HtmlTree(HtmlTag.DD);
addComment(typeElement, dd);
- dlTree.addContent(dd);
+ dlTree.add(dd);
}
/**
@@ -286,7 +286,7 @@
* @param contentTree the content tree to which the class info will be added
*/
protected void addClassInfo(TypeElement te, Content contentTree) {
- contentTree.addContent(contents.getContent("doclet.in",
+ contentTree.add(contents.getContent("doclet.in",
utils.getTypeElementName(te, false),
getPackageLink(utils.containingPackage(te),
utils.getPackageName(utils.containingPackage(te)))
@@ -320,12 +320,12 @@
Content span = HtmlTree.SPAN(HtmlStyle.memberNameLink,
getDocLink(LinkInfoImpl.Kind.INDEX, member, name));
Content dt = HtmlTree.DT(span);
- dt.addContent(" - ");
+ dt.add(" - ");
addMemberDesc(member, dt);
- dlTree.addContent(dt);
+ dlTree.add(dt);
Content dd = new HtmlTree(HtmlTag.DD);
addComment(member, dd);
- dlTree.addContent(dd);
+ dlTree.add(dd);
}
protected void addDescription(SearchIndexItem sii, Content dlTree) {
@@ -333,16 +333,16 @@
siiPath += sii.getUrl();
HtmlTree labelLink = HtmlTree.A(siiPath, new StringContent(sii.getLabel()));
Content dt = HtmlTree.DT(HtmlTree.SPAN(HtmlStyle.searchTagLink, labelLink));
- dt.addContent(" - ");
- dt.addContent(contents.getContent("doclet.Search_tag_in", sii.getHolder()));
- dlTree.addContent(dt);
+ dt.add(" - ");
+ dt.add(contents.getContent("doclet.Search_tag_in", sii.getHolder()));
+ dlTree.add(dt);
Content dd = new HtmlTree(HtmlTag.DD);
if (sii.getDescription().isEmpty()) {
- dd.addContent(Contents.SPACE);
+ dd.add(Contents.SPACE);
} else {
- dd.addContent(sii.getDescription());
+ dd.add(sii.getDescription());
}
- dlTree.addContent(dd);
+ dlTree.add(dd);
}
/**
@@ -360,17 +360,17 @@
HtmlTree div = new HtmlTree(HtmlTag.DIV);
div.setStyle(HtmlStyle.deprecationBlock);
if (utils.isDeprecated(element)) {
- div.addContent(span);
+ div.add(span);
tags = utils.getBlockTags(element, DocTree.Kind.DEPRECATED);
if (!tags.isEmpty())
addInlineDeprecatedComment(element, tags.get(0), div);
- contentTree.addContent(div);
+ contentTree.add(div);
} else {
TypeElement encl = utils.getEnclosingTypeElement(element);
while (encl != null) {
if (utils.isDeprecated(encl)) {
- div.addContent(span);
- contentTree.addContent(div);
+ div.add(span);
+ contentTree.add(div);
break;
}
encl = utils.getEnclosingTypeElement(encl);
@@ -393,15 +393,15 @@
Content resource = contents.getContent(utils.isStatic(member)
? "doclet.Static_variable_in"
: "doclet.Variable_in", classdesc);
- contentTree.addContent(resource);
+ contentTree.add(resource);
} else if (utils.isConstructor(member)) {
- contentTree.addContent(
+ contentTree.add(
contents.getContent("doclet.Constructor_for", classdesc));
} else if (utils.isMethod(member)) {
Content resource = contents.getContent(utils.isStatic(member)
? "doclet.Static_method_in"
: "doclet.Method_in", classdesc);
- contentTree.addContent(resource);
+ contentTree.add(resource);
}
addPreQualifiedClassLink(LinkInfoImpl.Kind.INDEX, containing,
false, contentTree);
--- a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/AbstractMemberWriter.java Tue Mar 12 09:49:10 2019 +0000
+++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/AbstractMemberWriter.java Sat Mar 16 21:00:45 2019 +0000
@@ -218,7 +218,7 @@
* @param htmltree the content tree to which the name will be added.
*/
protected void addName(String name, Content htmltree) {
- htmltree.addContent(name);
+ htmltree.add(name);
}
/**
@@ -255,8 +255,8 @@
}
if (!set.isEmpty()) {
String mods = set.stream().map(Modifier::toString).collect(Collectors.joining(" "));
- htmltree.addContent(mods);
- htmltree.addContent(Contents.SPACE);
+ htmltree.add(mods);
+ htmltree.add(Contents.SPACE);
}
}
@@ -283,8 +283,8 @@
HtmlTree code = new HtmlTree(HtmlTag.CODE);
addModifier(member, code);
if (type == null) {
- code.addContent(utils.isClass(member) ? "class" : "interface");
- code.addContent(Contents.SPACE);
+ code.add(utils.isClass(member) ? "class" : "interface");
+ code.add(Contents.SPACE);
} else {
List<? extends TypeParameterElement> list = utils.isExecutableElement(member)
? ((ExecutableElement)member).getTypeParameters()
@@ -292,24 +292,24 @@
if (list != null && !list.isEmpty()) {
Content typeParameters = ((AbstractExecutableMemberWriter) this)
.getTypeParameters((ExecutableElement)member);
- code.addContent(typeParameters);
+ code.add(typeParameters);
//Code to avoid ugly wrapping in member summary table.
if (typeParameters.charCount() > 10) {
- code.addContent(new HtmlTree(HtmlTag.BR));
+ code.add(new HtmlTree(HtmlTag.BR));
} else {
- code.addContent(Contents.SPACE);
+ code.add(Contents.SPACE);
}
- code.addContent(
+ code.add(
writer.getLink(new LinkInfoImpl(configuration,
LinkInfoImpl.Kind.SUMMARY_RETURN_TYPE, type)));
} else {
- code.addContent(
+ code.add(
writer.getLink(new LinkInfoImpl(configuration,
LinkInfoImpl.Kind.SUMMARY_RETURN_TYPE, type)));
}
}
- tdSummaryType.addContent(code);
+ tdSummaryType.add(code);
}
/**
@@ -320,24 +320,24 @@
*/
private void addModifier(Element member, Content code) {
if (utils.isProtected(member)) {
- code.addContent("protected ");
+ code.add("protected ");
} else if (utils.isPrivate(member)) {
- code.addContent("private ");
+ code.add("private ");
} else if (!utils.isPublic(member)) { // Package private
- code.addContent(resources.getText("doclet.Package_private"));
- code.addContent(" ");
+ code.add(resources.getText("doclet.Package_private"));
+ code.add(" ");
}
boolean isAnnotatedTypeElement = utils.isAnnotationType(member.getEnclosingElement());
if (!isAnnotatedTypeElement && utils.isMethod(member)) {
if (!utils.isInterface(member.getEnclosingElement()) && utils.isAbstract(member)) {
- code.addContent("abstract ");
+ code.add("abstract ");
}
if (utils.isDefault(member)) {
- code.addContent("default ");
+ code.add("default ");
}
}
if (utils.isStatic(member)) {
- code.addContent("static ");
+ code.add("static ");
}
}
@@ -353,7 +353,7 @@
if (!output.isEmpty()) {
Content deprecatedContent = output;
Content div = HtmlTree.DIV(HtmlStyle.deprecationBlock, deprecatedContent);
- contentTree.addContent(div);
+ contentTree.add(div);
}
}
@@ -424,8 +424,8 @@
&& !utils.isAnnotationType(element)) {
HtmlTree name = new HtmlTree(HtmlTag.SPAN);
name.setStyle(HtmlStyle.typeNameLabel);
- name.addContent(name(te) + ".");
- typeContent.addContent(name);
+ name.add(name(te) + ".");
+ typeContent.add(name);
}
addSummaryLink(utils.isClass(element) || utils.isInterface(element)
? LinkInfoImpl.Kind.CLASS_USE
@@ -435,7 +435,7 @@
writer.addSummaryLinkComment(this, element, desc);
useTable.addRow(summaryType, typeContent, desc);
}
- contentTree.addContent(useTable.toContent());
+ contentTree.add(useTable.toContent());
}
}
--- a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/AbstractModuleIndexWriter.java Tue Mar 12 09:49:10 2019 +0000
+++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/AbstractModuleIndexWriter.java Sat Mar 16 21:00:45 2019 +0000
@@ -139,9 +139,9 @@
addOverview(main);
Content footer = HtmlTree.FOOTER();
addNavigationBarFooter(footer);
- body.addContent(header);
- body.addContent(main);
- body.addContent(footer);
+ body.add(header);
+ body.add(main);
+ body.add(footer);
printHtmlDocument(
configuration.metakeywords.getOverviewMetaKeywords(title, configuration.doctitle),
description,
@@ -171,9 +171,9 @@
addOverview(main);
Content footer = HtmlTree.FOOTER();
addNavigationBarFooter(footer);
- body.addContent(header);
- body.addContent(main);
- body.addContent(footer);
+ body.add(header);
+ body.add(main);
+ body.add(footer);
printHtmlDocument(
configuration.metakeywords.getOverviewMetaKeywords(title, configuration.doctitle),
description,
@@ -231,8 +231,8 @@
HtmlTree ul = new HtmlTree(HtmlTag.UL);
addAllClassesLink(ul);
addAllPackagesLink(ul);
- htmlTree.addContent(ul);
- header.addContent(htmlTree);
+ htmlTree.add(ul);
+ header.add(htmlTree);
addModulesList(main);
}
@@ -254,8 +254,8 @@
addAllClassesLink(ul);
addAllPackagesLink(ul);
addAllModulesLink(ul);
- htmlTree.addContent(ul);
- header.addContent(htmlTree);
+ htmlTree.add(ul);
+ header.add(htmlTree);
addModulePackagesList(modules, text, tableSummary, main, mdle);
}
@@ -270,7 +270,7 @@
Content heading = HtmlTree.HEADING(Headings.PAGE_TITLE_HEADING,
HtmlStyle.title, title);
Content div = HtmlTree.DIV(HtmlStyle.header, heading);
- body.addContent(div);
+ body.add(div);
}
}
--- a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/AbstractPackageIndexWriter.java Tue Mar 12 09:49:10 2019 +0000
+++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/AbstractPackageIndexWriter.java Sat Mar 16 21:00:45 2019 +0000
@@ -124,9 +124,9 @@
addOverview(main);
Content footer = HtmlTree.FOOTER();
addNavigationBarFooter(footer);
- body.addContent(header);
- body.addContent(main);
- body.addContent(footer);
+ body.add(header);
+ body.add(main);
+ body.add(footer);
printHtmlDocument(
configuration.metakeywords.getOverviewMetaKeywords(title, configuration.doctitle),
description, body);
@@ -165,8 +165,8 @@
if (configuration.showModules && configuration.modules.size() > 1) {
addAllModulesLink(ul);
}
- htmlTree.addContent(ul);
- header.addContent(htmlTree);
+ htmlTree.add(ul);
+ header.add(htmlTree);
addPackagesList(main);
}
}
@@ -182,7 +182,7 @@
Content heading = HtmlTree.HEADING(Headings.PAGE_TITLE_HEADING,
HtmlStyle.title, title);
Content div = HtmlTree.DIV(HtmlStyle.header, heading);
- body.addContent(div);
+ body.add(div);
}
}
--- a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/AbstractTreeWriter.java Tue Mar 12 09:49:10 2019 +0000
+++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/AbstractTreeWriter.java Sat Mar 16 21:00:45 2019 +0000
@@ -92,9 +92,9 @@
addExtendsImplements(parent, local, li);
addLevelInfo(local, classtree.directSubClasses(local, isEnum),
isEnum, li); // Recurse
- ul.addContent(li);
+ ul.add(li);
}
- contentTree.addContent(ul);
+ contentTree.add(ul);
}
}
@@ -121,7 +121,7 @@
HtmlTree htmlTree = HtmlTree.SECTION(sectionHeading);
addLevelInfo(!utils.isInterface(firstTypeElement) ? firstTypeElement : null,
sset, isEnums, htmlTree);
- div.addContent(htmlTree);
+ div.add(htmlTree);
}
}
@@ -147,21 +147,21 @@
if (isFirst) {
isFirst = false;
if (utils.isInterface(typeElement)) {
- contentTree.addContent(" (");
- contentTree.addContent(contents.also);
- contentTree.addContent(" extends ");
+ contentTree.add(" (");
+ contentTree.add(contents.also);
+ contentTree.add(" extends ");
} else {
- contentTree.addContent(" (implements ");
+ contentTree.add(" (implements ");
}
} else {
- contentTree.addContent(", ");
+ contentTree.add(", ");
}
addPreQualifiedClassLink(LinkInfoImpl.Kind.TREE, intf, contentTree);
}
}
}
if (!isFirst) {
- contentTree.addContent(")");
+ contentTree.add(")");
}
}
}
--- a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/AllClassesFrameWriter.java Tue Mar 12 09:49:10 2019 +0000
+++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/AllClassesFrameWriter.java Sat Mar 16 21:00:45 2019 +0000
@@ -113,13 +113,13 @@
Content htmlTree = HtmlTree.MAIN();
Content heading = HtmlTree.HEADING(Headings.PAGE_TITLE_HEADING,
HtmlStyle.bar, contents.allClassesLabel);
- htmlTree.addContent(heading);
+ htmlTree.add(heading);
Content ul = new HtmlTree(HtmlTag.UL);
// Generate the class links and add it to the tdFont tree.
addAllClasses(ul, wantFrames);
HtmlTree div = HtmlTree.DIV(HtmlStyle.indexContainer, ul);
- htmlTree.addContent(div);
- body.addContent(htmlTree);
+ htmlTree.add(div);
+ body.add(htmlTree);
printHtmlDocument(null, "all classes (frame)", body);
}
@@ -163,7 +163,7 @@
linkContent = getLink(new LinkInfoImpl(configuration, LinkInfoImpl.Kind.DEFAULT, typeElement).label(label));
}
Content li = HtmlTree.LI(linkContent);
- content.addContent(li);
+ content.add(li);
}
}
}
--- a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/AllClassesIndexWriter.java Tue Mar 12 09:49:10 2019 +0000
+++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/AllClassesIndexWriter.java Sat Mar 16 21:00:45 2019 +0000
@@ -105,17 +105,17 @@
HtmlTree header = HtmlTree.HEADER();
addTop(header);
navBar.setUserHeader(getUserHeaderFooter(true));
- header.addContent(navBar.getContent(true));
- bodyTree.addContent(header);
+ header.add(navBar.getContent(true));
+ bodyTree.add(header);
Content allClassesContent = new ContentBuilder();
addContents(allClassesContent);
- mainTree.addContent(allClassesContent);
- bodyTree.addContent(mainTree);
+ mainTree.add(allClassesContent);
+ bodyTree.add(mainTree);
Content footer = HtmlTree.FOOTER();
navBar.setUserFooter(getUserHeaderFooter(false));
- footer.addContent(navBar.getContent(false));
+ footer.add(navBar.getContent(false));
addBottom(footer);
- bodyTree.addContent(footer);
+ bodyTree.add(footer);
printHtmlDocument(null, "class index", bodyTree);
}
@@ -150,14 +150,14 @@
Content pHeading = HtmlTree.HEADING(Headings.PAGE_TITLE_HEADING, true,
HtmlStyle.title, titleContent);
Content headerDiv = HtmlTree.DIV(HtmlStyle.header, pHeading);
- content.addContent(headerDiv);
+ content.add(headerDiv);
if (!table.isEmpty()) {
HtmlTree li = HtmlTree.LI(HtmlStyle.blockList, table.toContent());
HtmlTree ul = HtmlTree.UL(HtmlStyle.blockList, li);
HtmlTree div = new HtmlTree(HtmlTag.DIV);
div.setStyle(HtmlStyle.allClassesContainer);
- div.addContent(ul);
- content.addContent(div);
+ div.add(ul);
+ content.add(div);
if (table.needsScript()) {
getMainBodyScript().append(table.getScript());
}
@@ -176,7 +176,7 @@
configuration, LinkInfoImpl.Kind.INDEX, klass));
ContentBuilder description = new ContentBuilder();
if (utils.isDeprecated(klass)) {
- description.addContent(getDeprecatedPhrase(klass));
+ description.add(getDeprecatedPhrase(klass));
List<? extends DocTree> tags = utils.getDeprecatedTrees(klass);
if (!tags.isEmpty()) {
addSummaryDeprecatedComment(klass, tags.get(0), description);
--- a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/AllPackagesIndexWriter.java Tue Mar 12 09:49:10 2019 +0000
+++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/AllPackagesIndexWriter.java Sat Mar 16 21:00:45 2019 +0000
@@ -87,8 +87,8 @@
HtmlTree header = HtmlTree.HEADER();
addTop(header);
navBar.setUserHeader(getUserHeaderFooter(true));
- header.addContent(navBar.getContent(true));
- bodyTree.addContent(header);
+ header.add(navBar.getContent(true));
+ bodyTree.add(header);
HtmlTree div = new HtmlTree(HtmlTag.DIV);
div.setStyle(HtmlStyle.allPackagesContainer);
addPackages(div);
@@ -96,14 +96,14 @@
Content pHeading = HtmlTree.HEADING(Headings.PAGE_TITLE_HEADING, true,
HtmlStyle.title, titleContent);
Content headerDiv = HtmlTree.DIV(HtmlStyle.header, pHeading);
- mainTree.addContent(headerDiv);
- mainTree.addContent(div);
- bodyTree.addContent(mainTree);
+ mainTree.add(headerDiv);
+ mainTree.add(div);
+ bodyTree.add(mainTree);
Content footer = HtmlTree.FOOTER();
navBar.setUserFooter(getUserHeaderFooter(false));
- footer.addContent(navBar.getContent(false));
+ footer.add(navBar.getContent(false));
addBottom(footer);
- bodyTree.addContent(footer);
+ bodyTree.add(footer);
printHtmlDocument(null, "package index", bodyTree);
}
@@ -126,6 +126,6 @@
}
}
HtmlTree li = HtmlTree.LI(HtmlStyle.blockList, table.toContent());
- content.addContent(HtmlTree.UL(HtmlStyle.blockList, li));
+ content.add(HtmlTree.UL(HtmlStyle.blockList, li));
}
}
--- a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/AnnotationTypeFieldWriterImpl.java Tue Mar 12 09:49:10 2019 +0000
+++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/AnnotationTypeFieldWriterImpl.java Sat Mar 16 21:00:45 2019 +0000
@@ -70,7 +70,7 @@
*/
public Content getMemberSummaryHeader(TypeElement typeElement,
Content memberSummaryTree) {
- memberSummaryTree.addContent(
+ memberSummaryTree.add(
MarkerComments.START_OF_ANNOTATION_TYPE_FIELD_SUMMARY);
Content memberTree = writer.getMemberTreeHeader();
writer.addSummaryHeader(this, typeElement, memberTree);
@@ -95,7 +95,7 @@
* {@inheritDoc}
*/
public void addAnnotationFieldDetailsMarker(Content memberDetails) {
- memberDetails.addContent(MarkerComments.START_OF_ANNOTATION_TYPE_FIELD_DETAILS);
+ memberDetails.add(MarkerComments.START_OF_ANNOTATION_TYPE_FIELD_DETAILS);
}
/**
@@ -104,11 +104,11 @@
public void addAnnotationDetailsTreeHeader(TypeElement typeElement,
Content memberDetailsTree) {
if (!writer.printedAnnotationFieldHeading) {
- memberDetailsTree.addContent(links.createAnchor(
+ memberDetailsTree.add(links.createAnchor(
SectionName.ANNOTATION_TYPE_FIELD_DETAIL));
Content heading = HtmlTree.HEADING(Headings.TypeDeclaration.DETAILS_HEADING,
contents.fieldDetailsLabel);
- memberDetailsTree.addContent(heading);
+ memberDetailsTree.add(heading);
writer.printedAnnotationFieldHeading = true;
}
}
@@ -118,11 +118,11 @@
*/
public Content getAnnotationDocTreeHeader(Element member,
Content annotationDetailsTree) {
- annotationDetailsTree.addContent(links.createAnchor(name(member)));
+ annotationDetailsTree.add(links.createAnchor(name(member)));
Content annotationDocTree = writer.getMemberTreeHeader();
Content heading = new HtmlTree(Headings.TypeDeclaration.MEMBER_HEADING);
- heading.addContent(name(member));
- annotationDocTree.addContent(heading);
+ heading.add(name(member));
+ annotationDocTree.add(heading);
return annotationDocTree;
}
@@ -136,8 +136,8 @@
Content link =
writer.getLink(new LinkInfoImpl(configuration,
LinkInfoImpl.Kind.MEMBER, getType(member)));
- pre.addContent(link);
- pre.addContent(Contents.SPACE);
+ pre.add(link);
+ pre.add(Contents.SPACE);
if (configuration.linksource) {
Content memberName = new StringContent(name(member));
writer.addSrcLink(member, memberName, pre);
@@ -189,7 +189,7 @@
public void addSummaryLabel(Content memberTree) {
Content label = HtmlTree.HEADING(Headings.TypeDeclaration.SUMMARY_HEADING,
contents.fieldSummaryLabel);
- memberTree.addContent(label);
+ memberTree.add(label);
}
/**
@@ -220,7 +220,7 @@
*/
@Override
public void addSummaryAnchor(TypeElement typeElement, Content memberTree) {
- memberTree.addContent(links.createAnchor(
+ memberTree.add(links.createAnchor(
SectionName.ANNOTATION_TYPE_FIELD_SUMMARY));
}
@@ -247,7 +247,7 @@
Content memberLink = HtmlTree.SPAN(HtmlStyle.memberNameLink,
writer.getDocLink(context, member, name(member), false));
Content code = HtmlTree.CODE(memberLink);
- tdSummary.addContent(code);
+ tdSummary.add(code);
}
/**
--- a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/AnnotationTypeOptionalMemberWriterImpl.java Tue Mar 12 09:49:10 2019 +0000
+++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/AnnotationTypeOptionalMemberWriterImpl.java Sat Mar 16 21:00:45 2019 +0000
@@ -72,7 +72,7 @@
@Override
public Content getMemberSummaryHeader(TypeElement typeElement,
Content memberSummaryTree) {
- memberSummaryTree.addContent(
+ memberSummaryTree.add(
MarkerComments.START_OF_ANNOTATION_TYPE_OPTIONAL_MEMBER_SUMMARY);
Content memberTree = writer.getMemberTreeHeader();
writer.addSummaryHeader(this, typeElement, memberTree);
@@ -99,8 +99,8 @@
Content dt = HtmlTree.DT(contents.default_);
Content dl = HtmlTree.DL(dt);
Content dd = HtmlTree.DD(new StringContent(value.toString()));
- dl.addContent(dd);
- annotationDocTree.addContent(dl);
+ dl.add(dd);
+ annotationDocTree.add(dl);
}
}
}
@@ -112,7 +112,7 @@
public void addSummaryLabel(Content memberTree) {
Content label = HtmlTree.HEADING(Headings.TypeDeclaration.SUMMARY_HEADING,
contents.annotateTypeOptionalMemberSummaryLabel);
- memberTree.addContent(label);
+ memberTree.add(label);
}
/**
@@ -137,7 +137,7 @@
*/
@Override
public void addSummaryAnchor(TypeElement typeElement, Content memberTree) {
- memberTree.addContent(links.createAnchor(
+ memberTree.add(links.createAnchor(
SectionName.ANNOTATION_TYPE_OPTIONAL_ELEMENT_SUMMARY));
}
}
--- a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/AnnotationTypeRequiredMemberWriterImpl.java Tue Mar 12 09:49:10 2019 +0000
+++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/AnnotationTypeRequiredMemberWriterImpl.java Sat Mar 16 21:00:45 2019 +0000
@@ -72,7 +72,7 @@
*/
public Content getMemberSummaryHeader(TypeElement typeElement,
Content memberSummaryTree) {
- memberSummaryTree.addContent(
+ memberSummaryTree.add(
MarkerComments.START_OF_ANNOTATION_TYPE_REQUIRED_MEMBER_SUMMARY);
Content memberTree = writer.getMemberTreeHeader();
writer.addSummaryHeader(this, typeElement, memberTree);
@@ -97,7 +97,7 @@
* {@inheritDoc}
*/
public void addAnnotationDetailsMarker(Content memberDetails) {
- memberDetails.addContent(MarkerComments.START_OF_ANNOTATION_TYPE_DETAILS);
+ memberDetails.add(MarkerComments.START_OF_ANNOTATION_TYPE_DETAILS);
}
/**
@@ -106,11 +106,11 @@
public void addAnnotationDetailsTreeHeader(TypeElement te,
Content memberDetailsTree) {
if (!writer.printedAnnotationHeading) {
- memberDetailsTree.addContent(links.createAnchor(
+ memberDetailsTree.add(links.createAnchor(
SectionName.ANNOTATION_TYPE_ELEMENT_DETAIL));
Content heading = HtmlTree.HEADING(Headings.TypeDeclaration.DETAILS_HEADING,
contents.annotationTypeDetailsLabel);
- memberDetailsTree.addContent(heading);
+ memberDetailsTree.add(heading);
writer.printedAnnotationHeading = true;
}
}
@@ -121,12 +121,12 @@
@Override
public Content getAnnotationDocTreeHeader(Element member, Content annotationDetailsTree) {
String simpleName = name(member);
- annotationDetailsTree.addContent(links.createAnchor(
+ annotationDetailsTree.add(links.createAnchor(
simpleName + utils.signature((ExecutableElement) member)));
Content annotationDocTree = writer.getMemberTreeHeader();
Content heading = new HtmlTree(Headings.TypeDeclaration.MEMBER_HEADING);
- heading.addContent(simpleName);
- annotationDocTree.addContent(heading);
+ heading.add(simpleName);
+ annotationDocTree.add(heading);
return annotationDocTree;
}
@@ -140,8 +140,8 @@
Content link =
writer.getLink(new LinkInfoImpl(configuration,
LinkInfoImpl.Kind.MEMBER, getType(member)));
- pre.addContent(link);
- pre.addContent(Contents.SPACE);
+ pre.add(link);
+ pre.add(Contents.SPACE);
if (configuration.linksource) {
Content memberName = new StringContent(name(member));
writer.addSrcLink(member, memberName, pre);
@@ -193,7 +193,7 @@
public void addSummaryLabel(Content memberTree) {
Content label = HtmlTree.HEADING(Headings.TypeDeclaration.SUMMARY_HEADING,
contents.annotateTypeRequiredMemberSummaryLabel);
- memberTree.addContent(label);
+ memberTree.add(label);
}
/**
@@ -230,7 +230,7 @@
* {@inheritDoc}
*/
public void addSummaryAnchor(TypeElement typeElement, Content memberTree) {
- memberTree.addContent(links.createAnchor(
+ memberTree.add(links.createAnchor(
SectionName.ANNOTATION_TYPE_REQUIRED_ELEMENT_SUMMARY));
}
@@ -254,7 +254,7 @@
Content memberLink = HtmlTree.SPAN(HtmlStyle.memberNameLink,
writer.getDocLink(context, member, name(member), false));
Content code = HtmlTree.CODE(memberLink);
- tdSummary.addContent(code);
+ tdSummary.add(code);
}
/**
--- a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/AnnotationTypeWriterImpl.java Tue Mar 12 09:49:10 2019 +0000
+++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/AnnotationTypeWriterImpl.java Sat Mar 16 21:00:45 2019 +0000
@@ -92,36 +92,36 @@
navBar.setNavLinkModule(linkContent);
navBar.setMemberSummaryBuilder(configuration.getBuilderFactory().getMemberSummaryBuilder(this));
navBar.setUserHeader(getUserHeaderFooter(true));
- htmlTree.addContent(navBar.getContent(true));
- bodyTree.addContent(htmlTree);
- bodyTree.addContent(MarkerComments.START_OF_CLASS_DATA);
+ htmlTree.add(navBar.getContent(true));
+ bodyTree.add(htmlTree);
+ bodyTree.add(MarkerComments.START_OF_CLASS_DATA);
HtmlTree div = new HtmlTree(HtmlTag.DIV);
div.setStyle(HtmlStyle.header);
if (configuration.showModules) {
ModuleElement mdle = configuration.docEnv.getElementUtils().getModuleOf(annotationType);
Content typeModuleLabel = HtmlTree.SPAN(HtmlStyle.moduleLabelInType, contents.moduleLabel);
Content moduleNameDiv = HtmlTree.DIV(HtmlStyle.subTitle, typeModuleLabel);
- moduleNameDiv.addContent(Contents.SPACE);
- moduleNameDiv.addContent(getModuleLink(mdle, new StringContent(mdle.getQualifiedName())));
- div.addContent(moduleNameDiv);
+ moduleNameDiv.add(Contents.SPACE);
+ moduleNameDiv.add(getModuleLink(mdle, new StringContent(mdle.getQualifiedName())));
+ div.add(moduleNameDiv);
}
PackageElement pkg = utils.containingPackage(annotationType);
if (!pkg.isUnnamed()) {
Content typePackageLabel = HtmlTree.SPAN(HtmlStyle.packageLabelInType, contents.packageLabel);
Content pkgNameDiv = HtmlTree.DIV(HtmlStyle.subTitle, typePackageLabel);
- pkgNameDiv.addContent(Contents.SPACE);
+ pkgNameDiv.add(Contents.SPACE);
Content pkgNameContent = getPackageLink(pkg, new StringContent(utils.getPackageName(pkg)));
- pkgNameDiv.addContent(pkgNameContent);
- div.addContent(pkgNameDiv);
+ pkgNameDiv.add(pkgNameContent);
+ div.add(pkgNameDiv);
}
LinkInfoImpl linkInfo = new LinkInfoImpl(configuration,
LinkInfoImpl.Kind.CLASS_HEADER, annotationType);
Content headerContent = new StringContent(header);
Content heading = HtmlTree.HEADING(Headings.PAGE_TITLE_HEADING, true,
HtmlStyle.title, headerContent);
- heading.addContent(getTypeParameterLinks(linkInfo));
- div.addContent(heading);
- mainTree.addContent(div);
+ heading.add(getTypeParameterLinks(linkInfo));
+ div.add(heading);
+ mainTree.add(div);
return bodyTree;
}
@@ -138,12 +138,12 @@
*/
@Override
public void addFooter(Content contentTree) {
- contentTree.addContent(MarkerComments.END_OF_CLASS_DATA);
+ contentTree.add(MarkerComments.END_OF_CLASS_DATA);
Content htmlTree = HtmlTree.FOOTER();
navBar.setUserFooter(getUserHeaderFooter(false));
- htmlTree.addContent(navBar.getContent(false));
+ htmlTree.add(navBar.getContent(false));
addBottom(htmlTree);
- contentTree.addContent(htmlTree);
+ contentTree.add(htmlTree);
}
/**
@@ -180,23 +180,23 @@
@Override
public void addAnnotationTypeSignature(String modifiers, Content annotationInfoTree) {
Content hr = new HtmlTree(HtmlTag.HR);
- annotationInfoTree.addContent(hr);
+ annotationInfoTree.add(hr);
Content pre = new HtmlTree(HtmlTag.PRE);
addAnnotationInfo(annotationType, pre);
- pre.addContent(modifiers);
+ pre.add(modifiers);
LinkInfoImpl linkInfo = new LinkInfoImpl(configuration,
LinkInfoImpl.Kind.CLASS_SIGNATURE, annotationType);
Content annotationName = new StringContent(utils.getSimpleName(annotationType));
Content parameterLinks = getTypeParameterLinks(linkInfo);
if (configuration.linksource) {
addSrcLink(annotationType, annotationName, pre);
- pre.addContent(parameterLinks);
+ pre.add(parameterLinks);
} else {
Content span = HtmlTree.SPAN(HtmlStyle.memberNameLabel, annotationName);
- span.addContent(parameterLinks);
- pre.addContent(span);
+ span.add(parameterLinks);
+ pre.add(span);
}
- annotationInfoTree.addContent(pre);
+ annotationInfoTree.add(pre);
}
/**
@@ -238,7 +238,7 @@
addInlineDeprecatedComment(annotationType, deprs.get(0), div);
}
}
- annotationInfoTree.addContent(div);
+ annotationInfoTree.add(div);
}
}
--- a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/ClassUseWriter.java Tue Mar 12 09:49:10 2019 +0000
+++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/ClassUseWriter.java Sat Mar 16 21:00:45 2019 +0000
@@ -229,16 +229,16 @@
if (pkgSet.size() > 0) {
addClassUse(div);
} else {
- div.addContent(contents.getContent("doclet.ClassUse_No.usage.of.0",
+ div.add(contents.getContent("doclet.ClassUse_No.usage.of.0",
utils.getFullyQualifiedName(typeElement)));
}
- mainTree.addContent(div);
- body.addContent(mainTree);
+ mainTree.add(div);
+ body.add(mainTree);
HtmlTree footer = HtmlTree.FOOTER();
navBar.setUserFooter(getUserHeaderFooter(false));
- footer.addContent(navBar.getContent(false));
+ footer.add(navBar.getContent(false));
addBottom(footer);
- body.addContent(footer);
+ body.add(footer);
String description = getDescription("use", typeElement);
printHtmlDocument(null, description, body);
}
@@ -256,7 +256,7 @@
addPackageAnnotationList(ul);
}
addClassList(ul);
- contentTree.addContent(ul);
+ contentTree.add(ul);
}
/**
@@ -277,7 +277,7 @@
addPackageUse(pkg, table);
}
Content li = HtmlTree.LI(HtmlStyle.blockList, table.toContent());
- contentTree.addContent(li);
+ contentTree.add(li);
}
/**
@@ -306,7 +306,7 @@
table.addRow(getPackageLink(pkg), summary);
}
Content li = HtmlTree.LI(HtmlStyle.blockList, table.toContent());
- contentTree.addContent(li);
+ contentTree.add(li);
}
/**
@@ -325,12 +325,12 @@
typeElement)),
getPackageLink(pkg, utils.getPackageName(pkg)));
Content heading = HtmlTree.HEADING(Headings.TypeUse.SUMMARY_HEADING, link);
- htmlTree.addContent(heading);
+ htmlTree.add(heading);
addClassUse(pkg, htmlTree);
- ul.addContent(HtmlTree.LI(HtmlStyle.blockList, htmlTree));
+ ul.add(HtmlTree.LI(HtmlStyle.blockList, htmlTree));
}
Content li = HtmlTree.LI(HtmlStyle.blockList, ul);
- contentTree.addContent(li);
+ contentTree.add(li);
}
/**
@@ -445,16 +445,16 @@
.label(resources.getText("doclet.Class")));
navBar.setNavLinkClass(classLinkContent);
navBar.setUserHeader(getUserHeaderFooter(true));
- htmlTree.addContent(navBar.getContent(true));
- bodyTree.addContent(htmlTree);
+ htmlTree.add(navBar.getContent(true));
+ bodyTree.add(htmlTree);
ContentBuilder headContent = new ContentBuilder();
- headContent.addContent(contents.getContent("doclet.ClassUse_Title", cltype));
- headContent.addContent(new HtmlTree(HtmlTag.BR));
- headContent.addContent(clname);
+ headContent.add(contents.getContent("doclet.ClassUse_Title", cltype));
+ headContent.add(new HtmlTree(HtmlTag.BR));
+ headContent.add(clname);
Content heading = HtmlTree.HEADING(Headings.PAGE_TITLE_HEADING,
true, HtmlStyle.title, headContent);
Content div = HtmlTree.DIV(HtmlStyle.header, heading);
- mainTree.addContent(div);
+ mainTree.add(div);
return bodyTree;
}
}
--- a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/ClassWriterImpl.java Tue Mar 12 09:49:10 2019 +0000
+++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/ClassWriterImpl.java Sat Mar 16 21:00:45 2019 +0000
@@ -113,29 +113,29 @@
navBar.setNavLinkModule(linkContent);
navBar.setMemberSummaryBuilder(configuration.getBuilderFactory().getMemberSummaryBuilder(this));
navBar.setUserHeader(getUserHeaderFooter(true));
- htmlTree.addContent(navBar.getContent(true));
- bodyTree.addContent(htmlTree);
- bodyTree.addContent(MarkerComments.START_OF_CLASS_DATA);
+ htmlTree.add(navBar.getContent(true));
+ bodyTree.add(htmlTree);
+ bodyTree.add(MarkerComments.START_OF_CLASS_DATA);
HtmlTree div = new HtmlTree(HtmlTag.DIV);
div.setStyle(HtmlStyle.header);
if (configuration.showModules) {
ModuleElement mdle = configuration.docEnv.getElementUtils().getModuleOf(typeElement);
Content classModuleLabel = HtmlTree.SPAN(HtmlStyle.moduleLabelInType, contents.moduleLabel);
Content moduleNameDiv = HtmlTree.DIV(HtmlStyle.subTitle, classModuleLabel);
- moduleNameDiv.addContent(Contents.SPACE);
- moduleNameDiv.addContent(getModuleLink(mdle,
+ moduleNameDiv.add(Contents.SPACE);
+ moduleNameDiv.add(getModuleLink(mdle,
new StringContent(mdle.getQualifiedName())));
- div.addContent(moduleNameDiv);
+ div.add(moduleNameDiv);
}
PackageElement pkg = utils.containingPackage(typeElement);
if (!pkg.isUnnamed()) {
Content classPackageLabel = HtmlTree.SPAN(HtmlStyle.packageLabelInType, contents.packageLabel);
Content pkgNameDiv = HtmlTree.DIV(HtmlStyle.subTitle, classPackageLabel);
- pkgNameDiv.addContent(Contents.SPACE);
+ pkgNameDiv.add(Contents.SPACE);
Content pkgNameContent = getPackageLink(pkg,
new StringContent(utils.getPackageName(pkg)));
- pkgNameDiv.addContent(pkgNameContent);
- div.addContent(pkgNameDiv);
+ pkgNameDiv.add(pkgNameContent);
+ div.add(pkgNameDiv);
}
LinkInfoImpl linkInfo = new LinkInfoImpl(configuration,
LinkInfoImpl.Kind.CLASS_HEADER, typeElement);
@@ -144,9 +144,9 @@
Content headerContent = new StringContent(header);
Content heading = HtmlTree.HEADING(Headings.PAGE_TITLE_HEADING, true,
HtmlStyle.title, headerContent);
- heading.addContent(getTypeParameterLinks(linkInfo));
- div.addContent(heading);
- mainTree.addContent(div);
+ heading.add(getTypeParameterLinks(linkInfo));
+ div.add(heading);
+ mainTree.add(div);
return bodyTree;
}
@@ -163,12 +163,12 @@
*/
@Override
public void addFooter(Content contentTree) {
- contentTree.addContent(MarkerComments.END_OF_CLASS_DATA);
+ contentTree.add(MarkerComments.END_OF_CLASS_DATA);
Content htmlTree = HtmlTree.FOOTER();
navBar.setUserFooter(getUserHeaderFooter(false));
- htmlTree.addContent(navBar.getContent(false));
+ htmlTree.add(navBar.getContent(false));
addBottom(htmlTree);
- contentTree.addContent(htmlTree);
+ contentTree.add(htmlTree);
}
/**
@@ -205,10 +205,10 @@
@Override
public void addClassSignature(String modifiers, Content classInfoTree) {
Content hr = new HtmlTree(HtmlTag.HR);
- classInfoTree.addContent(hr);
+ classInfoTree.add(hr);
Content pre = new HtmlTree(HtmlTag.PRE);
addAnnotationInfo(typeElement, pre);
- pre.addContent(modifiers);
+ pre.add(modifiers);
LinkInfoImpl linkInfo = new LinkInfoImpl(configuration,
LinkInfoImpl.Kind.CLASS_SIGNATURE, typeElement);
//Let's not link to ourselves in the signature.
@@ -217,21 +217,21 @@
Content parameterLinks = getTypeParameterLinks(linkInfo);
if (configuration.linksource) {
addSrcLink(typeElement, className, pre);
- pre.addContent(parameterLinks);
+ pre.add(parameterLinks);
} else {
Content span = HtmlTree.SPAN(HtmlStyle.typeNameLabel, className);
- span.addContent(parameterLinks);
- pre.addContent(span);
+ span.add(parameterLinks);
+ pre.add(span);
}
if (!utils.isInterface(typeElement)) {
TypeMirror superclass = utils.getFirstVisibleSuperClass(typeElement);
if (superclass != null) {
- pre.addContent(DocletConstants.NL);
- pre.addContent("extends ");
+ pre.add(DocletConstants.NL);
+ pre.add("extends ");
Content link = getLink(new LinkInfoImpl(configuration,
LinkInfoImpl.Kind.CLASS_SIGNATURE_PARENT_NAME,
superclass));
- pre.addContent(link);
+ pre.add(link);
}
}
List<? extends TypeMirror> interfaces = typeElement.getInterfaces();
@@ -243,19 +243,19 @@
continue;
}
if (isFirst) {
- pre.addContent(DocletConstants.NL);
- pre.addContent(utils.isInterface(typeElement) ? "extends " : "implements ");
+ pre.add(DocletConstants.NL);
+ pre.add(utils.isInterface(typeElement) ? "extends " : "implements ");
isFirst = false;
} else {
- pre.addContent(", ");
+ pre.add(", ");
}
Content link = getLink(new LinkInfoImpl(configuration,
LinkInfoImpl.Kind.CLASS_SIGNATURE_PARENT_NAME,
type));
- pre.addContent(link);
+ pre.add(link);
}
}
- classInfoTree.addContent(pre);
+ classInfoTree.add(pre);
}
/**
@@ -298,17 +298,17 @@
if (sup != null) {
HtmlTree ul = new HtmlTree(HtmlTag.UL);
ul.setStyle(HtmlStyle.inheritance);
- ul.addContent(getTreeForClassHelper(type));
+ ul.add(getTreeForClassHelper(type));
if (liTree != null)
- ul.addContent(liTree);
+ ul.add(liTree);
Content li = HtmlTree.LI(ul);
liTree = li;
type = sup;
} else
- classTreeUl.addContent(getTreeForClassHelper(type));
+ classTreeUl.add(getTreeForClassHelper(type));
} while (sup != null);
if (liTree != null)
- classTreeUl.addContent(liTree);
+ classTreeUl.add(liTree);
return classTreeUl;
}
@@ -325,17 +325,17 @@
new LinkInfoImpl(configuration, LinkInfoImpl.Kind.TREE,
typeElement));
if (configuration.shouldExcludeQualifier(utils.containingPackage(typeElement).toString())) {
- li.addContent(utils.asTypeElement(type).getSimpleName());
- li.addContent(typeParameters);
+ li.add(utils.asTypeElement(type).getSimpleName());
+ li.add(typeParameters);
} else {
- li.addContent(utils.asTypeElement(type).getQualifiedName());
- li.addContent(typeParameters);
+ li.add(utils.asTypeElement(type).getQualifiedName());
+ li.add(typeParameters);
}
} else {
Content link = getLink(new LinkInfoImpl(configuration,
LinkInfoImpl.Kind.CLASS_TREE_PARENT, type)
.label(configuration.getClassName(utils.asTypeElement(type))));
- li.addContent(link);
+ li.add(link);
}
return li;
}
@@ -348,7 +348,7 @@
if (!utils.isClass(typeElement)) {
return;
}
- classContentTree.addContent(getClassInheritenceTree(typeElement.asType()));
+ classContentTree.add(getClassInheritenceTree(typeElement.asType()));
}
/**
@@ -360,7 +360,7 @@
Content typeParam = (new ParamTaglet()).getTagletOutput(typeElement,
getTagletWriterInstance(false));
Content dl = HtmlTree.DL(typeParam);
- classInfoTree.addContent(dl);
+ classInfoTree.add(dl);
}
}
@@ -380,9 +380,9 @@
Content label = contents.subclassesLabel;
Content dt = HtmlTree.DT(label);
Content dl = HtmlTree.DL(dt);
- dl.addContent(getClassLinks(LinkInfoImpl.Kind.SUBCLASSES,
+ dl.add(getClassLinks(LinkInfoImpl.Kind.SUBCLASSES,
subclasses));
- classInfoTree.addContent(dl);
+ classInfoTree.add(dl);
}
}
}
@@ -398,9 +398,9 @@
Content label = contents.subinterfacesLabel;
Content dt = HtmlTree.DT(label);
Content dl = HtmlTree.DL(dt);
- dl.addContent(getClassLinks(LinkInfoImpl.Kind.SUBINTERFACES,
+ dl.add(getClassLinks(LinkInfoImpl.Kind.SUBINTERFACES,
subInterfaces));
- classInfoTree.addContent(dl);
+ classInfoTree.add(dl);
}
}
}
@@ -423,9 +423,9 @@
Content label = contents.implementingClassesLabel;
Content dt = HtmlTree.DT(label);
Content dl = HtmlTree.DL(dt);
- dl.addContent(getClassLinks(LinkInfoImpl.Kind.IMPLEMENTED_CLASSES,
+ dl.add(getClassLinks(LinkInfoImpl.Kind.IMPLEMENTED_CLASSES,
implcl));
- classInfoTree.addContent(dl);
+ classInfoTree.add(dl);
}
}
@@ -440,8 +440,8 @@
Content label = contents.allImplementedInterfacesLabel;
Content dt = HtmlTree.DT(label);
Content dl = HtmlTree.DL(dt);
- dl.addContent(getClassLinks(LinkInfoImpl.Kind.IMPLEMENTED_INTERFACES, interfaces));
- classInfoTree.addContent(dl);
+ dl.add(getClassLinks(LinkInfoImpl.Kind.IMPLEMENTED_INTERFACES, interfaces));
+ classInfoTree.add(dl);
}
}
@@ -458,8 +458,8 @@
Content label = contents.allSuperinterfacesLabel;
Content dt = HtmlTree.DT(label);
Content dl = HtmlTree.DL(dt);
- dl.addContent(getClassLinks(LinkInfoImpl.Kind.SUPER_INTERFACES, interfaces));
- classInfoTree.addContent(dl);
+ dl.add(getClassLinks(LinkInfoImpl.Kind.SUPER_INTERFACES, interfaces));
+ classInfoTree.add(dl);
}
}
@@ -480,10 +480,10 @@
Content dt = HtmlTree.DT(label);
Content dl = HtmlTree.DL(dt);
Content dd = new HtmlTree(HtmlTag.DD);
- dd.addContent(getLink(new LinkInfoImpl(configuration,
+ dd.add(getLink(new LinkInfoImpl(configuration,
LinkInfoImpl.Kind.CLASS, e)));
- dl.addContent(dd);
- classInfoTree.addContent(dl);
+ dl.add(dd);
+ classInfoTree.add(dl);
return null;
}
}.visit(outerClass);
@@ -498,9 +498,9 @@
Content dt = HtmlTree.DT(contents.functionalInterface);
Content dl = HtmlTree.DL(dt);
Content dd = new HtmlTree(HtmlTag.DD);
- dd.addContent(contents.functionalInterfaceMessage);
- dl.addContent(dd);
- classInfoTree.addContent(dl);
+ dd.add(contents.functionalInterfaceMessage);
+ dl.add(dd);
+ classInfoTree.add(dl);
}
}
@@ -532,7 +532,7 @@
addInlineDeprecatedComment(typeElement, deprs.get(0), div);
}
}
- classInfoTree.addContent(div);
+ classInfoTree.add(div);
}
}
@@ -549,7 +549,7 @@
for (Object type : list) {
if (!isFirst) {
Content separator = new StringContent(", ");
- dd.addContent(separator);
+ dd.add(separator);
} else {
isFirst = false;
}
@@ -557,11 +557,11 @@
if (type instanceof TypeElement) {
Content link = getLink(
new LinkInfoImpl(configuration, context, (TypeElement)(type)));
- dd.addContent(HtmlTree.CODE(link));
+ dd.add(HtmlTree.CODE(link));
} else {
Content link = getLink(
new LinkInfoImpl(configuration, context, ((TypeMirror)type)));
- dd.addContent(HtmlTree.CODE(link));
+ dd.add(HtmlTree.CODE(link));
}
}
return dd;
--- a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/ConstantsSummaryWriterImpl.java Tue Mar 12 09:49:10 2019 +0000
+++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/ConstantsSummaryWriterImpl.java Sat Mar 16 21:00:45 2019 +0000
@@ -109,8 +109,8 @@
HtmlTree htmlTree = HtmlTree.HEADER();
addTop(htmlTree);
navBar.setUserHeader(getUserHeaderFooter(true));
- htmlTree.addContent(navBar.getContent(true));
- bodyTree.addContent(htmlTree);
+ htmlTree.add(navBar.getContent(true));
+ bodyTree.add(htmlTree);
return bodyTree;
}
@@ -136,13 +136,13 @@
} else {
String parsedPackageName = utils.parsePackageName(pkg);
Content packageNameContent = getPackageLabel(parsedPackageName);
- packageNameContent.addContent(".*");
+ packageNameContent.add(".*");
link = links.createLink(DocLink.fragment(parsedPackageName),
packageNameContent, "", "");
PackageElement abbrevPkg = configuration.workArounds.getAbbreviatedPackageElement(pkg);
printedPackageHeaders.add(abbrevPkg);
}
- contentListTree.addContent(HtmlTree.LI(link));
+ contentListTree.add(HtmlTree.LI(link));
}
/**
@@ -158,9 +158,9 @@
Content heading = HtmlTree.HEADING(Headings.CONTENT_HEADING, true,
headingContent);
HtmlTree section = HtmlTree.SECTION(heading);
- section.addContent(contentListTree);
- div.addContent(section);
- mainTree.addContent(div);
+ section.add(contentListTree);
+ div.add(section);
+ mainTree.add(div);
}
/**
@@ -180,20 +180,20 @@
public void addPackageName(PackageElement pkg, Content summariesTree, boolean first) {
Content pkgNameContent;
if (!first) {
- summariesTree.addContent(summaryTree);
+ summariesTree.add(summaryTree);
}
if (pkg.isUnnamed()) {
- summariesTree.addContent(links.createAnchor(SectionName.UNNAMED_PACKAGE_ANCHOR));
+ summariesTree.add(links.createAnchor(SectionName.UNNAMED_PACKAGE_ANCHOR));
pkgNameContent = contents.defaultPackageLabel;
} else {
String parsedPackageName = utils.parsePackageName(pkg);
- summariesTree.addContent(links.createAnchor(parsedPackageName));
+ summariesTree.add(links.createAnchor(parsedPackageName));
pkgNameContent = getPackageLabel(parsedPackageName);
}
Content headingContent = new StringContent(".*");
Content heading = HtmlTree.HEADING(Headings.ConstantsSummary.PACKAGE_HEADING, true,
pkgNameContent);
- heading.addContent(headingContent);
+ heading.add(headingContent);
summaryTree = HtmlTree.SECTION(heading);
}
@@ -212,7 +212,7 @@
*/
@Override
public void addClassConstant(Content summariesTree, Content classConstantTree) {
- summaryTree.addContent(classConstantTree);
+ summaryTree.add(classConstantTree);
}
/**
@@ -232,10 +232,10 @@
PackageElement enclosingPackage = utils.containingPackage(typeElement);
Content caption = new ContentBuilder();
if (!enclosingPackage.isUnnamed()) {
- caption.addContent(enclosingPackage.getQualifiedName());
- caption.addContent(".");
+ caption.add(enclosingPackage.getQualifiedName());
+ caption.add(".");
}
- caption.addContent(classlink);
+ caption.add(classlink);
Table table = new Table(HtmlStyle.constantsSummary)
.setCaption(caption)
@@ -247,7 +247,7 @@
table.addRow(getTypeColumn(field), getNameColumn(field), getValue(field));
}
Content li = HtmlTree.LI(HtmlStyle.blockList, table.toContent());
- classConstantTree.addContent(li);
+ classConstantTree.add(li);
}
/**
@@ -260,17 +260,17 @@
Content anchor = links.createAnchor(
currentTypeElement.getQualifiedName() + "." + member.getSimpleName());
Content typeContent = new ContentBuilder();
- typeContent.addContent(anchor);
+ typeContent.add(anchor);
Content code = new HtmlTree(HtmlTag.CODE);
for (Modifier mod : member.getModifiers()) {
Content modifier = new StringContent(mod.toString());
- code.addContent(modifier);
- code.addContent(Contents.SPACE);
+ code.add(modifier);
+ code.add(Contents.SPACE);
}
Content type = getLink(new LinkInfoImpl(configuration,
LinkInfoImpl.Kind.CONSTANT_SUMMARY, member.asType()));
- code.addContent(type);
- typeContent.addContent(code);
+ code.add(type);
+ typeContent.add(code);
return typeContent;
}
@@ -304,10 +304,10 @@
@Override
public void addConstantSummaries(Content contentTree, Content summariesTree) {
if (summaryTree != null) {
- summariesTree.addContent(summaryTree);
+ summariesTree.add(summaryTree);
}
- mainTree.addContent(summariesTree);
- contentTree.addContent(mainTree);
+ mainTree.add(summariesTree);
+ contentTree.add(mainTree);
}
/**
@@ -317,9 +317,9 @@
public void addFooter(Content contentTree) {
Content htmlTree = HtmlTree.FOOTER();
navBar.setUserFooter(getUserHeaderFooter(false));
- htmlTree.addContent(navBar.getContent(false));
+ htmlTree.add(navBar.getContent(false));
addBottom(htmlTree);
- contentTree.addContent(htmlTree);
+ contentTree.add(htmlTree);
}
/**
--- a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/ConstructorWriterImpl.java Tue Mar 12 09:49:10 2019 +0000
+++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/ConstructorWriterImpl.java Sat Mar 16 21:00:45 2019 +0000
@@ -97,7 +97,7 @@
@Override
public Content getMemberSummaryHeader(TypeElement typeElement,
Content memberSummaryTree) {
- memberSummaryTree.addContent(MarkerComments.START_OF_CONSTRUCTOR_SUMMARY);
+ memberSummaryTree.add(MarkerComments.START_OF_CONSTRUCTOR_SUMMARY);
Content memberTree = writer.getMemberTreeHeader();
writer.addSummaryHeader(this, typeElement, memberTree);
return memberTree;
@@ -117,13 +117,13 @@
@Override
public Content getConstructorDetailsTreeHeader(TypeElement typeElement,
Content memberDetailsTree) {
- memberDetailsTree.addContent(MarkerComments.START_OF_CONSTRUCTOR_DETAILS);
+ memberDetailsTree.add(MarkerComments.START_OF_CONSTRUCTOR_DETAILS);
Content constructorDetailsTree = writer.getMemberTreeHeader();
- constructorDetailsTree.addContent(links.createAnchor(
+ constructorDetailsTree.add(links.createAnchor(
SectionName.CONSTRUCTOR_DETAIL));
Content heading = HtmlTree.HEADING(Headings.TypeDeclaration.DETAILS_HEADING,
contents.constructorDetailsLabel);
- constructorDetailsTree.addContent(heading);
+ constructorDetailsTree.add(heading);
return constructorDetailsTree;
}
@@ -135,13 +135,13 @@
Content constructorDetailsTree) {
String erasureAnchor;
if ((erasureAnchor = getErasureAnchor(constructor)) != null) {
- constructorDetailsTree.addContent(links.createAnchor((erasureAnchor)));
+ constructorDetailsTree.add(links.createAnchor((erasureAnchor)));
}
- constructorDetailsTree.addContent(links.createAnchor(writer.getAnchor(constructor)));
+ constructorDetailsTree.add(links.createAnchor(writer.getAnchor(constructor)));
Content constructorDocTree = writer.getMemberTreeHeader();
Content heading = new HtmlTree(Headings.TypeDeclaration.MEMBER_HEADING);
- heading.addContent(name(constructor));
- constructorDocTree.addContent(heading);
+ heading.add(name(constructor));
+ constructorDocTree.add(heading);
return constructorDocTree;
}
@@ -224,7 +224,7 @@
public void addSummaryLabel(Content memberTree) {
Content label = HtmlTree.HEADING(Headings.TypeDeclaration.SUMMARY_HEADING,
contents.constructorSummaryLabel);
- memberTree.addContent(label);
+ memberTree.add(label);
}
/**
@@ -266,7 +266,7 @@
*/
@Override
public void addSummaryAnchor(TypeElement typeElement, Content memberTree) {
- memberTree.addContent(links.createAnchor(SectionName.CONSTRUCTOR_SUMMARY));
+ memberTree.add(links.createAnchor(SectionName.CONSTRUCTOR_SUMMARY));
}
/**
@@ -291,16 +291,16 @@
if (foundNonPubConstructor) {
Content code = new HtmlTree(HtmlTag.CODE);
if (utils.isProtected(member)) {
- code.addContent("protected ");
+ code.add("protected ");
} else if (utils.isPrivate(member)) {
- code.addContent("private ");
+ code.add("private ");
} else if (utils.isPublic(member)) {
- code.addContent(Contents.SPACE);
+ code.add(Contents.SPACE);
} else {
- code.addContent(
+ code.add(
resources.getText("doclet.Package_private"));
}
- tdSummaryType.addContent(code);
+ tdSummaryType.add(code);
}
}
}
--- a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/Contents.java Tue Mar 12 09:49:10 2019 +0000
+++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/Contents.java Sat Mar 16 21:00:45 2019 +0000
@@ -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
@@ -360,7 +360,7 @@
Matcher m = p.matcher(text);
int start = 0;
while (m.find(start)) {
- c.addContent(text.substring(start, m.start()));
+ c.add(text.substring(start, m.start()));
Object o = null;
switch (m.group(1).charAt(0)) {
@@ -370,17 +370,17 @@
}
if (o == null) {
- c.addContent("{" + m.group(1) + "}");
+ c.add("{" + m.group(1) + "}");
} else if (o instanceof String) {
- c.addContent((String) o);
+ c.add((String) o);
} else if (o instanceof Content) {
- c.addContent((Content) o);
+ c.add((Content) o);
}
start = m.end();
}
- c.addContent(text.substring(start));
+ c.add(text.substring(start));
return c;
}
@@ -399,11 +399,11 @@
int start = 0;
int p;
while ((p = text.indexOf(" ", start)) != -1) {
- c.addContent(text.substring(start, p));
- c.addContent(RawHtml.nbsp);
+ c.add(text.substring(start, p));
+ c.add(RawHtml.nbsp);
start = p + 1;
}
- c.addContent(text.substring(start));
+ c.add(text.substring(start));
return c; // TODO: should be made immutable
}
--- a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/DeprecatedListWriter.java Tue Mar 12 09:49:10 2019 +0000
+++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/DeprecatedListWriter.java Sat Mar 16 21:00:45 2019 +0000
@@ -284,7 +284,7 @@
throws DocFileIOException {
HtmlTree body = getHeader();
HtmlTree htmlTree = HtmlTree.MAIN();
- htmlTree.addContent(getContentsList(deprapi));
+ htmlTree.add(getContentsList(deprapi));
String memberTableSummary;
HtmlTree div = new HtmlTree(HtmlTag.DIV);
div.setStyle(HtmlStyle.contentContainer);
@@ -300,13 +300,13 @@
getHeadingKey(kind), memberTableSummary, memberTableHeader, div);
}
}
- htmlTree.addContent(div);
- body.addContent(htmlTree);
+ htmlTree.add(div);
+ body.add(htmlTree);
htmlTree = HtmlTree.FOOTER();
navBar.setUserFooter(getUserHeaderFooter(false));
- htmlTree.addContent(navBar.getContent(false));
+ htmlTree.add(navBar.getContent(false));
addBottom(htmlTree);
- body.addContent(htmlTree);
+ body.add(htmlTree);
String description = "deprecated elements";
printHtmlDocument(null, description, body);
}
@@ -323,7 +323,7 @@
if (builder.hasDocumentation(kind)) {
Content li = HtmlTree.LI(links.createLink(getAnchorName(kind),
contents.getContent(getHeadingKey(kind))));
- contentTree.addContent(li);
+ contentTree.add(li);
}
}
@@ -339,13 +339,13 @@
HtmlStyle.title, headContent);
Content div = HtmlTree.DIV(HtmlStyle.header, heading);
Content headingContent = contents.contentsHeading;
- div.addContent(HtmlTree.HEADING(Headings.CONTENT_HEADING, true,
+ div.add(HtmlTree.HEADING(Headings.CONTENT_HEADING, true,
headingContent));
Content ul = new HtmlTree(HtmlTag.UL);
for (DeprElementKind kind : DeprElementKind.values()) {
addIndexLink(deprapi, kind, ul);
}
- div.addContent(ul);
+ div.add(ul);
return div;
}
@@ -358,7 +358,7 @@
*/
private void addAnchor(DeprecatedAPIListBuilder builder, DeprElementKind kind, Content htmlTree) {
if (builder.hasDocumentation(kind)) {
- htmlTree.addContent(links.createAnchor(getAnchorName(kind)));
+ htmlTree.add(links.createAnchor(getAnchorName(kind)));
}
}
@@ -373,8 +373,8 @@
HtmlTree htmlTree = HtmlTree.HEADER();
addTop(htmlTree);
navBar.setUserHeader(getUserHeaderFooter(true));
- htmlTree.addContent(navBar.getContent(true));
- bodyTree.addContent(htmlTree);
+ htmlTree.add(navBar.getContent(true));
+ bodyTree.add(htmlTree);
return bodyTree;
}
@@ -414,13 +414,13 @@
if (!tags.isEmpty()) {
addInlineDeprecatedComment(e, tags.get(0), desc);
} else {
- desc.addContent(HtmlTree.EMPTY);
+ desc.add(HtmlTree.EMPTY);
}
table.addRow(link, desc);
}
Content li = HtmlTree.LI(HtmlStyle.blockList, table.toContent());
Content ul = HtmlTree.UL(HtmlStyle.blockList, li);
- contentTree.addContent(ul);
+ contentTree.add(ul);
}
}
--- a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/DocFilesHandlerImpl.java Tue Mar 12 09:49:10 2019 +0000
+++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/DocFilesHandlerImpl.java Sat Mar 16 21:00:45 2019 +0000
@@ -191,21 +191,21 @@
navBar.setNavLinkPackage(pkgLinkContent);
navBar.setUserHeader(docletWriter.getUserHeaderFooter(true));
Content header = HtmlTree.HEADER();
- header.addContent(navBar.getContent(true));
- htmlContent.addContent(header);
+ header.add(navBar.getContent(true));
+ htmlContent.add(header);
List<? extends DocTree> fullBody = utils.getFullBody(dfElement);
Content bodyContent = docletWriter.commentTagsToContent(null, dfElement, fullBody, false);
docletWriter.addTagsInfo(dfElement, bodyContent);
Content main = HtmlTree.MAIN();
- main.addContent(bodyContent);
- htmlContent.addContent(main);
+ main.add(bodyContent);
+ htmlContent.add(main);
navBar.setUserFooter(docletWriter.getUserHeaderFooter(false));
Content footer = HtmlTree.FOOTER();
- footer.addContent(navBar.getContent(false));
+ footer.add(navBar.getContent(false));
docletWriter.addBottom(footer);
- htmlContent.addContent(footer);
+ htmlContent.add(footer);
docletWriter.printHtmlDocument(Collections.emptyList(), null, localTagsContent, htmlContent);
}
--- a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/EnumConstantWriterImpl.java Tue Mar 12 09:49:10 2019 +0000
+++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/EnumConstantWriterImpl.java Sat Mar 16 21:00:45 2019 +0000
@@ -69,7 +69,7 @@
@Override
public Content getMemberSummaryHeader(TypeElement typeElement,
Content memberSummaryTree) {
- memberSummaryTree.addContent(MarkerComments.START_OF_ENUM_CONSTANT_SUMMARY);
+ memberSummaryTree.add(MarkerComments.START_OF_ENUM_CONSTANT_SUMMARY);
Content memberTree = writer.getMemberTreeHeader();
writer.addSummaryHeader(this, typeElement, memberTree);
return memberTree;
@@ -89,13 +89,13 @@
@Override
public Content getEnumConstantsDetailsTreeHeader(TypeElement typeElement,
Content memberDetailsTree) {
- memberDetailsTree.addContent(MarkerComments.START_OF_ENUM_CONSTANT_DETAILS);
+ memberDetailsTree.add(MarkerComments.START_OF_ENUM_CONSTANT_DETAILS);
Content enumConstantsDetailsTree = writer.getMemberTreeHeader();
- enumConstantsDetailsTree.addContent(links.createAnchor(
+ enumConstantsDetailsTree.add(links.createAnchor(
SectionName.ENUM_CONSTANT_DETAIL));
Content heading = HtmlTree.HEADING(Headings.TypeDeclaration.DETAILS_HEADING,
contents.enumConstantDetailLabel);
- enumConstantsDetailsTree.addContent(heading);
+ enumConstantsDetailsTree.add(heading);
return enumConstantsDetailsTree;
}
@@ -105,11 +105,11 @@
@Override
public Content getEnumConstantsTreeHeader(VariableElement enumConstant,
Content enumConstantsDetailsTree) {
- enumConstantsDetailsTree.addContent(links.createAnchor(name(enumConstant)));
+ enumConstantsDetailsTree.add(links.createAnchor(name(enumConstant)));
Content enumConstantsTree = writer.getMemberTreeHeader();
Content heading = new HtmlTree(Headings.TypeDeclaration.MEMBER_HEADING);
- heading.addContent(name(enumConstant));
- enumConstantsTree.addContent(heading);
+ heading.add(name(enumConstant));
+ enumConstantsTree.add(heading);
return enumConstantsTree;
}
@@ -123,8 +123,8 @@
addModifiers(enumConstant, pre);
Content enumConstantLink = writer.getLink(new LinkInfoImpl(
configuration, LinkInfoImpl.Kind.MEMBER, enumConstant.asType()));
- pre.addContent(enumConstantLink);
- pre.addContent(" ");
+ pre.add(enumConstantLink);
+ pre.add(" ");
if (configuration.linksource) {
Content enumConstantName = new StringContent(name(enumConstant));
writer.addSrcLink(enumConstant, enumConstantName, pre);
@@ -182,7 +182,7 @@
public void addSummaryLabel(Content memberTree) {
Content label = HtmlTree.HEADING(Headings.TypeDeclaration.SUMMARY_HEADING,
contents.enumConstantSummary);
- memberTree.addContent(label);
+ memberTree.add(label);
}
/**
@@ -209,7 +209,7 @@
*/
@Override
public void addSummaryAnchor(TypeElement typeElement, Content memberTree) {
- memberTree.addContent(links.createAnchor(SectionName.ENUM_CONSTANT_SUMMARY));
+ memberTree.add(links.createAnchor(SectionName.ENUM_CONSTANT_SUMMARY));
}
/**
@@ -235,7 +235,7 @@
Content memberLink = HtmlTree.SPAN(HtmlStyle.memberNameLink,
writer.getDocLink(context, member, name(member), false));
Content code = HtmlTree.CODE(memberLink);
- tdSummary.addContent(code);
+ tdSummary.add(code);
}
/**
--- a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/FieldWriterImpl.java Tue Mar 12 09:49:10 2019 +0000
+++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/FieldWriterImpl.java Sat Mar 16 21:00:45 2019 +0000
@@ -73,7 +73,7 @@
@Override
public Content getMemberSummaryHeader(TypeElement typeElement,
Content memberSummaryTree) {
- memberSummaryTree.addContent(MarkerComments.START_OF_FIELD_SUMMARY);
+ memberSummaryTree.add(MarkerComments.START_OF_FIELD_SUMMARY);
Content memberTree = writer.getMemberTreeHeader();
writer.addSummaryHeader(this, typeElement, memberTree);
return memberTree;
@@ -92,13 +92,13 @@
*/
@Override
public Content getFieldDetailsTreeHeader(TypeElement typeElement, Content memberDetailsTree) {
- memberDetailsTree.addContent(MarkerComments.START_OF_FIELD_DETAILS);
+ memberDetailsTree.add(MarkerComments.START_OF_FIELD_DETAILS);
Content fieldDetailsTree = writer.getMemberTreeHeader();
- fieldDetailsTree.addContent(links.createAnchor(
+ fieldDetailsTree.add(links.createAnchor(
SectionName.FIELD_DETAIL));
Content heading = HtmlTree.HEADING(Headings.TypeDeclaration.DETAILS_HEADING,
contents.fieldDetailsLabel);
- fieldDetailsTree.addContent(heading);
+ fieldDetailsTree.add(heading);
return fieldDetailsTree;
}
@@ -107,11 +107,11 @@
*/
@Override
public Content getFieldDocTreeHeader(VariableElement field, Content fieldDetailsTree) {
- fieldDetailsTree.addContent(links.createAnchor(name(field)));
+ fieldDetailsTree.add(links.createAnchor(name(field)));
Content fieldTree = writer.getMemberTreeHeader();
Content heading = new HtmlTree(Headings.TypeDeclaration.MEMBER_HEADING);
- heading.addContent(name(field));
- fieldTree.addContent(heading);
+ heading.add(name(field));
+ fieldTree.add(heading);
return fieldTree;
}
@@ -125,8 +125,8 @@
addModifiers(field, pre);
Content fieldlink = writer.getLink(new LinkInfoImpl(
configuration, LinkInfoImpl.Kind.MEMBER, field.asType()));
- pre.addContent(fieldlink);
- pre.addContent(" ");
+ pre.add(fieldlink);
+ pre.add(" ");
if (configuration.linksource) {
Content fieldName = new StringContent(name(field));
writer.addSrcLink(field, fieldName, pre);
@@ -186,7 +186,7 @@
public void addSummaryLabel(Content memberTree) {
Content label = HtmlTree.HEADING(Headings.TypeDeclaration.SUMMARY_HEADING,
contents.fieldSummaryLabel);
- memberTree.addContent(label);
+ memberTree.add(label);
}
/**
@@ -215,7 +215,7 @@
*/
@Override
public void addSummaryAnchor(TypeElement typeElement, Content memberTree) {
- memberTree.addContent(links.createAnchor(
+ memberTree.add(links.createAnchor(
SectionName.FIELD_SUMMARY));
}
@@ -224,7 +224,7 @@
*/
@Override
public void addInheritedSummaryAnchor(TypeElement typeElement, Content inheritedTree) {
- inheritedTree.addContent(links.createAnchor(
+ inheritedTree.add(links.createAnchor(
SectionName.FIELDS_INHERITANCE, configuration.getClassName(typeElement)));
}
@@ -247,9 +247,9 @@
}
Content labelHeading = HtmlTree.HEADING(Headings.TypeDeclaration.INHERITED_SUMMARY_HEADING,
label);
- labelHeading.addContent(Contents.SPACE);
- labelHeading.addContent(classLink);
- inheritedTree.addContent(labelHeading);
+ labelHeading.add(Contents.SPACE);
+ labelHeading.add(classLink);
+ inheritedTree.add(labelHeading);
}
/**
@@ -261,7 +261,7 @@
Content memberLink = HtmlTree.SPAN(HtmlStyle.memberNameLink,
writer.getDocLink(context, typeElement , member, name(member), false));
Content code = HtmlTree.CODE(memberLink);
- tdSummary.addContent(code);
+ tdSummary.add(code);
}
/**
@@ -269,7 +269,7 @@
*/
@Override
protected void addInheritedSummaryLink(TypeElement typeElement, Element member, Content linksTree) {
- linksTree.addContent(
+ linksTree.add(
writer.getDocLink(LinkInfoImpl.Kind.MEMBER, typeElement, member,
name(member), false));
}
--- a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/FrameOutputWriter.java Tue Mar 12 09:49:10 2019 +0000
+++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/FrameOutputWriter.java Sat Mar 16 21:00:45 2019 +0000
@@ -26,7 +26,6 @@
package jdk.javadoc.internal.doclets.formats.html;
import jdk.javadoc.internal.doclets.formats.html.markup.Head;
-import jdk.javadoc.internal.doclets.formats.html.markup.DocType;
import jdk.javadoc.internal.doclets.formats.html.markup.HtmlAttr;
import jdk.javadoc.internal.doclets.formats.html.markup.HtmlDocument;
import jdk.javadoc.internal.doclets.formats.html.markup.HtmlStyle;
@@ -96,19 +95,19 @@
protected void generateFrameFile() throws DocFileIOException {
Content frame = getFrameDetails();
HtmlTree body = new HtmlTree(HtmlTag.BODY);
- body.addAttr(HtmlAttr.CLASS, "frames");
- body.addAttr(HtmlAttr.ONLOAD, "loadFrames()");
+ body.put(HtmlAttr.CLASS, "frames");
+ body.put(HtmlAttr.ONLOAD, "loadFrames()");
String topFilePath = configuration.topFile.getPath();
Script script = new Script(
"\nif (targetPage == \"\" || targetPage == \"undefined\")\n" +
" window.location.replace(")
.appendStringLiteral(topFilePath, '\'')
.append(");\n");
- body.addContent(script.asContent());
+ body.add(script.asContent());
Content noScript = HtmlTree.NOSCRIPT(contents.noScriptMessage);
- body.addContent(noScript);
+ body.add(noScript);
HtmlTree main = HtmlTree.MAIN(frame);
- body.addContent(main);
+ body.add(main);
if (configuration.windowtitle.length() > 0) {
printFramesDocument(configuration.windowtitle, body);
} else {
@@ -159,7 +158,7 @@
addAllClassesFrameTag(leftContainerDiv);
addClassFrameTag(rightContainerDiv);
HtmlTree mainContainer = HtmlTree.DIV(HtmlStyle.mainContainer, leftContainerDiv);
- mainContainer.addContent(rightContainerDiv);
+ mainContainer.add(rightContainerDiv);
return mainContainer;
}
@@ -172,7 +171,7 @@
HtmlTree frame = HtmlTree.IFRAME(DocPaths.MODULE_OVERVIEW_FRAME.getPath(),
"packageListFrame", resources.getText("doclet.All_Modules"));
HtmlTree leftTop = HtmlTree.DIV(HtmlStyle.leftTop, frame);
- contentTree.addContent(leftTop);
+ contentTree.add(leftTop);
}
/**
@@ -184,7 +183,7 @@
HtmlTree frame = HtmlTree.IFRAME(DocPaths.OVERVIEW_FRAME.getPath(),
"packageListFrame", resources.getText("doclet.All_Packages"));
HtmlTree leftTop = HtmlTree.DIV(HtmlStyle.leftTop, frame);
- contentTree.addContent(leftTop);
+ contentTree.add(leftTop);
}
/**
@@ -196,7 +195,7 @@
HtmlTree frame = HtmlTree.IFRAME(DocPaths.ALLCLASSES_FRAME.getPath(),
"packageFrame", resources.getText("doclet.All_classes_and_interfaces"));
HtmlTree leftBottom = HtmlTree.DIV(HtmlStyle.leftBottom, frame);
- contentTree.addContent(leftBottom);
+ contentTree.add(leftBottom);
}
/**
@@ -208,7 +207,7 @@
HtmlTree frame = HtmlTree.IFRAME(configuration.topFile.getPath(), "classFrame",
resources.getText("doclet.Package_class_and_interface_descriptions"));
frame.setStyle(HtmlStyle.rightIframe);
- contentTree.addContent(frame);
+ contentTree.add(frame);
}
/**
--- a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/HelpWriter.java Tue Mar 12 09:49:10 2019 +0000
+++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/HelpWriter.java Sat Mar 16 21:00:45 2019 +0000
@@ -91,14 +91,14 @@
HtmlTree htmlTree = HtmlTree.HEADER();
addTop(htmlTree);
navBar.setUserHeader(getUserHeaderFooter(true));
- htmlTree.addContent(navBar.getContent(true));
- body.addContent(htmlTree);
+ htmlTree.add(navBar.getContent(true));
+ body.add(htmlTree);
addHelpFileContents(body);
htmlTree = HtmlTree.FOOTER();
navBar.setUserFooter(getUserHeaderFooter(false));
- htmlTree.addContent(navBar.getContent(false));
+ htmlTree.add(navBar.getContent(false));
addBottom(htmlTree);
- body.addContent(htmlTree);
+ body.add(htmlTree);
printHtmlDocument(null, "help", body);
}
@@ -117,8 +117,8 @@
Content div = HtmlTree.DIV(HtmlStyle.header, heading);
Content intro = HtmlTree.DIV(HtmlStyle.subTitle,
contents.getContent("doclet.help.intro"));
- div.addContent(intro);
- mainTree.addContent(div);
+ div.add(intro);
+ mainTree.add(div);
HtmlTree htmlTree;
HtmlTree ul = new HtmlTree(HtmlTag.UL);
ul.setStyle(HtmlStyle.blockList);
@@ -136,8 +136,8 @@
resources.getText("doclet.Overview"));
Content overviewBody = contents.getContent(overviewKey, overviewLink);
Content overviewPara = HtmlTree.P(overviewBody);
- htmlTree.addContent(overviewPara);
- ul.addContent(HtmlTree.LI(HtmlStyle.blockList, htmlTree));
+ htmlTree.add(overviewPara);
+ ul.add(HtmlTree.LI(HtmlStyle.blockList, htmlTree));
}
// Module
@@ -147,13 +147,13 @@
htmlTree = HtmlTree.SECTION(moduleHead);
Content moduleIntro = contents.getContent("doclet.help.module.intro");
Content modulePara = HtmlTree.P(moduleIntro);
- htmlTree.addContent(modulePara);
+ htmlTree.add(modulePara);
HtmlTree ulModule = new HtmlTree(HtmlTag.UL);
- ulModule.addContent(HtmlTree.LI(contents.packagesLabel));
- ulModule.addContent(HtmlTree.LI(contents.modulesLabel));
- ulModule.addContent(HtmlTree.LI(contents.servicesLabel));
- htmlTree.addContent(ulModule);
- ul.addContent(HtmlTree.LI(HtmlStyle.blockList, htmlTree));
+ ulModule.add(HtmlTree.LI(contents.packagesLabel));
+ ulModule.add(HtmlTree.LI(contents.modulesLabel));
+ ulModule.add(HtmlTree.LI(contents.servicesLabel));
+ htmlTree.add(ulModule);
+ ul.add(HtmlTree.LI(HtmlStyle.blockList, htmlTree));
}
// Package
@@ -162,16 +162,16 @@
htmlTree = HtmlTree.SECTION(packageHead);
Content packageIntro = contents.getContent("doclet.help.package.intro");
Content packagePara = HtmlTree.P(packageIntro);
- htmlTree.addContent(packagePara);
+ htmlTree.add(packagePara);
HtmlTree ulPackage = new HtmlTree(HtmlTag.UL);
- ulPackage.addContent(HtmlTree.LI(contents.interfaces));
- ulPackage.addContent(HtmlTree.LI(contents.classes));
- ulPackage.addContent(HtmlTree.LI(contents.enums));
- ulPackage.addContent(HtmlTree.LI(contents.exceptions));
- ulPackage.addContent(HtmlTree.LI(contents.errors));
- ulPackage.addContent(HtmlTree.LI(contents.annotationTypes));
- htmlTree.addContent(ulPackage);
- ul.addContent(HtmlTree.LI(HtmlStyle.blockList, htmlTree));
+ ulPackage.add(HtmlTree.LI(contents.interfaces));
+ ulPackage.add(HtmlTree.LI(contents.classes));
+ ulPackage.add(HtmlTree.LI(contents.enums));
+ ulPackage.add(HtmlTree.LI(contents.exceptions));
+ ulPackage.add(HtmlTree.LI(contents.errors));
+ ulPackage.add(HtmlTree.LI(contents.annotationTypes));
+ htmlTree.add(ulPackage);
+ ul.add(HtmlTree.LI(HtmlStyle.blockList, htmlTree));
// Class/interface
Content classHead = HtmlTree.HEADING(Headings.CONTENT_HEADING,
@@ -179,34 +179,34 @@
htmlTree = HtmlTree.SECTION(classHead);
Content classIntro = contents.getContent("doclet.help.class_interface.intro");
Content classPara = HtmlTree.P(classIntro);
- htmlTree.addContent(classPara);
+ htmlTree.add(classPara);
HtmlTree ul1 = new HtmlTree(HtmlTag.UL);
- ul1.addContent(HtmlTree.LI(contents.getContent("doclet.help.class_interface.inheritance_diagram")));
- ul1.addContent(HtmlTree.LI(contents.getContent("doclet.help.class_interface.subclasses")));
- ul1.addContent(HtmlTree.LI(contents.getContent("doclet.help.class_interface.subinterfaces")));
- ul1.addContent(HtmlTree.LI(contents.getContent("doclet.help.class_interface.implementations")));
- ul1.addContent(HtmlTree.LI(contents.getContent("doclet.help.class_interface.declaration")));
- ul1.addContent(HtmlTree.LI(contents.getContent("doclet.help.class_interface.description")));
- htmlTree.addContent(ul1);
- htmlTree.addContent(new HtmlTree(HtmlTag.BR));
+ ul1.add(HtmlTree.LI(contents.getContent("doclet.help.class_interface.inheritance_diagram")));
+ ul1.add(HtmlTree.LI(contents.getContent("doclet.help.class_interface.subclasses")));
+ ul1.add(HtmlTree.LI(contents.getContent("doclet.help.class_interface.subinterfaces")));
+ ul1.add(HtmlTree.LI(contents.getContent("doclet.help.class_interface.implementations")));
+ ul1.add(HtmlTree.LI(contents.getContent("doclet.help.class_interface.declaration")));
+ ul1.add(HtmlTree.LI(contents.getContent("doclet.help.class_interface.description")));
+ htmlTree.add(ul1);
+ htmlTree.add(new HtmlTree(HtmlTag.BR));
HtmlTree ul2 = new HtmlTree(HtmlTag.UL);
- ul2.addContent(HtmlTree.LI(contents.nestedClassSummary));
- ul2.addContent(HtmlTree.LI(contents.fieldSummaryLabel));
- ul2.addContent(HtmlTree.LI(contents.propertySummaryLabel));
- ul2.addContent(HtmlTree.LI(contents.constructorSummaryLabel));
- ul2.addContent(HtmlTree.LI(contents.methodSummary));
- htmlTree.addContent(ul2);
- htmlTree.addContent(new HtmlTree(HtmlTag.BR));
+ ul2.add(HtmlTree.LI(contents.nestedClassSummary));
+ ul2.add(HtmlTree.LI(contents.fieldSummaryLabel));
+ ul2.add(HtmlTree.LI(contents.propertySummaryLabel));
+ ul2.add(HtmlTree.LI(contents.constructorSummaryLabel));
+ ul2.add(HtmlTree.LI(contents.methodSummary));
+ htmlTree.add(ul2);
+ htmlTree.add(new HtmlTree(HtmlTag.BR));
HtmlTree ul3 = new HtmlTree(HtmlTag.UL);
- ul3.addContent(HtmlTree.LI(contents.fieldDetailsLabel));
- ul3.addContent(HtmlTree.LI(contents.propertyDetailsLabel));
- ul3.addContent(HtmlTree.LI(contents.constructorDetailsLabel));
- ul3.addContent(HtmlTree.LI(contents.methodDetailLabel));
- htmlTree.addContent(ul3);
+ ul3.add(HtmlTree.LI(contents.fieldDetailsLabel));
+ ul3.add(HtmlTree.LI(contents.propertyDetailsLabel));
+ ul3.add(HtmlTree.LI(contents.constructorDetailsLabel));
+ ul3.add(HtmlTree.LI(contents.methodDetailLabel));
+ htmlTree.add(ul3);
Content classSummary = contents.getContent("doclet.help.class_interface.summary");
Content para = HtmlTree.P(classSummary);
- htmlTree.addContent(para);
- ul.addContent(HtmlTree.LI(HtmlStyle.blockList, htmlTree));
+ htmlTree.add(para);
+ ul.add(HtmlTree.LI(HtmlStyle.blockList, htmlTree));
// Annotation Types
Content aHead = HtmlTree.HEADING(Headings.CONTENT_HEADING,
@@ -214,29 +214,29 @@
htmlTree = HtmlTree.SECTION(aHead);
Content aIntro = contents.getContent("doclet.help.annotation_type.intro");
Content aPara = HtmlTree.P(aIntro);
- htmlTree.addContent(aPara);
+ htmlTree.add(aPara);
HtmlTree aul = new HtmlTree(HtmlTag.UL);
- aul.addContent(HtmlTree.LI(contents.getContent("doclet.help.annotation_type.declaration")));
- aul.addContent(HtmlTree.LI(contents.getContent("doclet.help.annotation_type.description")));
- aul.addContent(HtmlTree.LI(contents.annotateTypeRequiredMemberSummaryLabel));
- aul.addContent(HtmlTree.LI(contents.annotateTypeOptionalMemberSummaryLabel));
- aul.addContent(HtmlTree.LI(contents.annotationTypeMemberDetail));
- htmlTree.addContent(aul);
- ul.addContent(HtmlTree.LI(HtmlStyle.blockList, htmlTree));
+ aul.add(HtmlTree.LI(contents.getContent("doclet.help.annotation_type.declaration")));
+ aul.add(HtmlTree.LI(contents.getContent("doclet.help.annotation_type.description")));
+ aul.add(HtmlTree.LI(contents.annotateTypeRequiredMemberSummaryLabel));
+ aul.add(HtmlTree.LI(contents.annotateTypeOptionalMemberSummaryLabel));
+ aul.add(HtmlTree.LI(contents.annotationTypeMemberDetail));
+ htmlTree.add(aul);
+ ul.add(HtmlTree.LI(HtmlStyle.blockList, htmlTree));
// Enums
Content enumHead = HtmlTree.HEADING(Headings.CONTENT_HEADING, contents.enum_);
htmlTree = HtmlTree.SECTION(enumHead);
Content eIntro = contents.getContent("doclet.help.enum.intro");
Content enumPara = HtmlTree.P(eIntro);
- htmlTree.addContent(enumPara);
+ htmlTree.add(enumPara);
HtmlTree eul = new HtmlTree(HtmlTag.UL);
- eul.addContent(HtmlTree.LI(contents.getContent("doclet.help.enum.declaration")));
- eul.addContent(HtmlTree.LI(contents.getContent("doclet.help.enum.definition")));
- eul.addContent(HtmlTree.LI(contents.enumConstantSummary));
- eul.addContent(HtmlTree.LI(contents.enumConstantDetailLabel));
- htmlTree.addContent(eul);
- ul.addContent(HtmlTree.LI(HtmlStyle.blockList, htmlTree));
+ eul.add(HtmlTree.LI(contents.getContent("doclet.help.enum.declaration")));
+ eul.add(HtmlTree.LI(contents.getContent("doclet.help.enum.definition")));
+ eul.add(HtmlTree.LI(contents.enumConstantSummary));
+ eul.add(HtmlTree.LI(contents.enumConstantDetailLabel));
+ htmlTree.add(eul);
+ ul.add(HtmlTree.LI(HtmlStyle.blockList, htmlTree));
// Class Use
if (configuration.classuse) {
@@ -245,8 +245,8 @@
htmlTree = HtmlTree.SECTION(useHead);
Content useBody = contents.getContent("doclet.help.use.body");
Content usePara = HtmlTree.P(useBody);
- htmlTree.addContent(usePara);
- ul.addContent(HtmlTree.LI(HtmlStyle.blockList, htmlTree));
+ htmlTree.add(usePara);
+ ul.add(HtmlTree.LI(HtmlStyle.blockList, htmlTree));
}
// Tree
@@ -259,12 +259,12 @@
resources.getText("doclet.Class_Hierarchy")),
HtmlTree.CODE(new StringContent("java.lang.Object")));
Content treePara = HtmlTree.P(treeIntro);
- htmlTree.addContent(treePara);
+ htmlTree.add(treePara);
HtmlTree tul = new HtmlTree(HtmlTag.UL);
- tul.addContent(HtmlTree.LI(contents.getContent("doclet.help.tree.overview")));
- tul.addContent(HtmlTree.LI(contents.getContent("doclet.help.tree.package")));
- htmlTree.addContent(tul);
- ul.addContent(HtmlTree.LI(HtmlStyle.blockList, htmlTree));
+ tul.add(HtmlTree.LI(contents.getContent("doclet.help.tree.overview")));
+ tul.add(HtmlTree.LI(contents.getContent("doclet.help.tree.package")));
+ htmlTree.add(tul);
+ ul.add(HtmlTree.LI(HtmlStyle.blockList, htmlTree));
}
// Deprecated
@@ -276,8 +276,8 @@
links.createLink(DocPaths.DEPRECATED_LIST,
resources.getText("doclet.Deprecated_API")));
Content dPara = HtmlTree.P(deprBody);
- htmlTree.addContent(dPara);
- ul.addContent(HtmlTree.LI(HtmlStyle.blockList, htmlTree));
+ htmlTree.add(dPara);
+ ul.add(HtmlTree.LI(HtmlStyle.blockList, htmlTree));
}
// Index
@@ -295,8 +295,8 @@
htmlTree = HtmlTree.SECTION(indexHead);
Content indexBody = contents.getContent("doclet.help.index.body", indexlink);
Content indexPara = HtmlTree.P(indexBody);
- htmlTree.addContent(indexPara);
- ul.addContent(HtmlTree.LI(HtmlStyle.blockList, htmlTree));
+ htmlTree.add(indexPara);
+ ul.add(HtmlTree.LI(HtmlStyle.blockList, htmlTree));
}
// Frames
@@ -306,9 +306,9 @@
htmlTree = HtmlTree.SECTION(frameHead);
Content framesBody = contents.getContent("doclet.help.frames.body");
Content framePara = HtmlTree.P(framesBody);
- htmlTree.addContent(framePara);
+ htmlTree.add(framePara);
- ul.addContent(HtmlTree.LI(HtmlStyle.blockList, htmlTree));
+ ul.add(HtmlTree.LI(HtmlStyle.blockList, htmlTree));
}
// Serialized Form
@@ -317,8 +317,8 @@
htmlTree = HtmlTree.SECTION(sHead);
Content serialBody = contents.getContent("doclet.help.serial_form.body");
Content serialPara = HtmlTree.P(serialBody);
- htmlTree.addContent(serialPara);
- ul.addContent(HtmlTree.LI(HtmlStyle.blockList, htmlTree));
+ htmlTree.add(serialPara);
+ ul.add(HtmlTree.LI(HtmlStyle.blockList, htmlTree));
// Constant Field Values
Content constHead = HtmlTree.HEADING(Headings.CONTENT_HEADING,
@@ -328,8 +328,8 @@
links.createLink(DocPaths.CONSTANT_VALUES,
resources.getText("doclet.Constants_Summary")));
Content constPara = HtmlTree.P(constantsBody);
- htmlTree.addContent(constPara);
- ul.addContent(HtmlTree.LI(HtmlStyle.blockList, htmlTree));
+ htmlTree.add(constPara);
+ ul.add(HtmlTree.LI(HtmlStyle.blockList, htmlTree));
// Search
Content searchHead = HtmlTree.HEADING(Headings.CONTENT_HEADING,
@@ -337,15 +337,15 @@
htmlTree = HtmlTree.SECTION(searchHead);
Content searchBody = contents.getContent("doclet.help.search.body");
Content searchPara = HtmlTree.P(searchBody);
- htmlTree.addContent(searchPara);
- ul.addContent(HtmlTree.LI(HtmlStyle.blockList, htmlTree));
+ htmlTree.add(searchPara);
+ ul.add(HtmlTree.LI(HtmlStyle.blockList, htmlTree));
Content divContent = HtmlTree.DIV(HtmlStyle.contentContainer, ul);
- divContent.addContent(new HtmlTree(HtmlTag.HR));
+ divContent.add(new HtmlTree(HtmlTag.HR));
Content footnote = HtmlTree.SPAN(HtmlStyle.emphasizedPhrase,
contents.getContent("doclet.help.footnote"));
- divContent.addContent(footnote);
- mainTree.addContent(divContent);
- contentTree.addContent(mainTree);
+ divContent.add(footnote);
+ mainTree.add(divContent);
+ contentTree.add(mainTree);
}
}
--- a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/HtmlConfiguration.java Tue Mar 12 09:49:10 2019 +0000
+++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/HtmlConfiguration.java Sat Mar 16 21:00:45 2019 +0000
@@ -41,8 +41,6 @@
import jdk.javadoc.doclet.Doclet;
import jdk.javadoc.doclet.DocletEnvironment;
-import jdk.javadoc.internal.doclets.formats.html.markup.HtmlTag;
-import jdk.javadoc.internal.doclets.formats.html.markup.HtmlVersion;
import jdk.javadoc.internal.doclets.toolkit.BaseConfiguration;
import jdk.javadoc.internal.doclets.toolkit.DocletException;
import jdk.javadoc.internal.doclets.toolkit.Messages;
@@ -51,7 +49,6 @@
import jdk.javadoc.internal.doclets.toolkit.util.DocFile;
import jdk.javadoc.internal.doclets.toolkit.util.DocPath;
import jdk.javadoc.internal.doclets.toolkit.util.DocPaths;
-import jdk.javadoc.internal.doclets.toolkit.util.Utils;
import static javax.tools.Diagnostic.Kind.*;
@@ -359,8 +356,7 @@
docPaths = new DocPaths(utils, useModuleDirectories);
setCreateOverview();
setTopFile(docEnv);
- workArounds.initDocLint(doclintOpts.values(), tagletManager.getAllTagletNames(),
- Utils.toLowerCase(HtmlVersion.HTML5.name()));
+ workArounds.initDocLint(doclintOpts.values(), tagletManager.getAllTagletNames());
return true;
}
--- a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/HtmlDocletWriter.java Tue Mar 12 09:49:10 2019 +0000
+++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/HtmlDocletWriter.java Sat Mar 16 21:00:45 2019 +0000
@@ -30,7 +30,6 @@
import jdk.javadoc.internal.doclets.formats.html.markup.TableHeader;
import java.util.*;
-import java.util.function.Supplier;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
@@ -72,7 +71,6 @@
import com.sun.source.util.SimpleDocTreeVisitor;
import jdk.javadoc.internal.doclets.formats.html.markup.ContentBuilder;
-import jdk.javadoc.internal.doclets.formats.html.markup.DocType;
import jdk.javadoc.internal.doclets.formats.html.markup.HtmlDocument;
import jdk.javadoc.internal.doclets.formats.html.markup.HtmlStyle;
import jdk.javadoc.internal.doclets.formats.html.markup.HtmlTag;
@@ -287,7 +285,7 @@
Content div = HtmlTree.DIV(script.asContent());
Content div_noscript = HtmlTree.DIV(contents.noScriptMessage);
Content noScript = HtmlTree.NOSCRIPT(div_noscript);
- div.addContent(noScript);
+ div.add(noScript);
return div;
}
@@ -336,8 +334,8 @@
TagletWriter.genTagOutput(configuration.tagletManager, e,
configuration.tagletManager.getBlockTaglets(e),
getTagletWriterInstance(false), output);
- dl.addContent(output);
- htmltree.addContent(dl);
+ dl.add(output);
+ htmltree.add(dl);
}
/**
@@ -509,7 +507,7 @@
*/
public void addTop(Content htmlTree) {
Content top = new RawHtml(replaceDocRootDir(configuration.top));
- fixedNavDiv.addContent(top);
+ fixedNavDiv.add(top);
}
/**
@@ -521,7 +519,7 @@
Content bottom = new RawHtml(replaceDocRootDir(configuration.bottom));
Content small = HtmlTree.SMALL(bottom);
Content p = HtmlTree.P(HtmlStyle.legalCopy, small);
- htmlTree.addContent(p);
+ htmlTree.add(p);
}
/**
@@ -548,7 +546,7 @@
Content space = Contents.SPACE;
Content tabSpan = HtmlTree.SPAN(HtmlStyle.tabEnd, space);
Content caption = HtmlTree.CAPTION(captionSpan);
- caption.addContent(tabSpan);
+ caption.add(tabSpan);
return caption;
}
@@ -699,9 +697,9 @@
.resolve(docPaths.forClass(te));
Content content = links.createLink(href
.fragment(SourceToHTMLConverter.getAnchorName(utils, element)), label, "", "");
- htmltree.addContent(content);
+ htmltree.add(content);
} else {
- htmltree.addContent(label);
+ htmltree.add(label);
}
}
@@ -823,9 +821,9 @@
ContentBuilder classlink = new ContentBuilder();
PackageElement pkg = utils.containingPackage(typeElement);
if (pkg != null && ! configuration.shouldExcludeQualifier(pkg.getSimpleName().toString())) {
- classlink.addContent(getEnclosingPackageName(typeElement));
+ classlink.add(getEnclosingPackageName(typeElement));
}
- classlink.addContent(getLink(new LinkInfoImpl(configuration,
+ classlink.add(getLink(new LinkInfoImpl(configuration,
context, typeElement).label(utils.getSimpleName(typeElement)).strong(isStrong)));
return classlink;
}
@@ -844,13 +842,13 @@
TypeElement typeElement, boolean isStrong, Content contentTree) {
PackageElement pkg = utils.containingPackage(typeElement);
if(pkg != null && ! configuration.shouldExcludeQualifier(pkg.getSimpleName().toString())) {
- contentTree.addContent(getEnclosingPackageName(typeElement));
+ contentTree.add(getEnclosingPackageName(typeElement));
}
LinkInfoImpl linkinfo = new LinkInfoImpl(configuration, context, typeElement)
.label(utils.getSimpleName(typeElement))
.strong(isStrong);
Content link = getLink(linkinfo);
- contentTree.addContent(link);
+ contentTree.add(link);
}
/**
@@ -1262,14 +1260,14 @@
Content result = commentTagsToContent(null, element, tags, first, inSummary);
if (depr) {
div = HtmlTree.DIV(HtmlStyle.deprecationComment, result);
- htmltree.addContent(div);
+ htmltree.add(div);
}
else {
div = HtmlTree.DIV(HtmlStyle.block, result);
- htmltree.addContent(div);
+ htmltree.add(div);
}
if (tags.isEmpty()) {
- htmltree.addContent(Contents.SPACE);
+ htmltree.add(Contents.SPACE);
}
}
@@ -1341,8 +1339,8 @@
final Content result = new ContentBuilder() {
@Override
- public void addContent(CharSequence text) {
- super.addContent(utils.normalizeNewlines(text));
+ public void add(CharSequence text) {
+ super.add(utils.normalizeNewlines(text));
}
};
CommentHelper ch = utils.getCommentHelper(element);
@@ -1392,7 +1390,7 @@
public Boolean visitAttribute(AttributeTree node, Content c) {
StringBuilder sb = new StringBuilder(SPACER).append(node.getName());
if (node.getValueKind() == ValueKind.EMPTY) {
- result.addContent(sb);
+ result.add(sb);
return false;
}
sb.append("=");
@@ -1409,7 +1407,7 @@
break;
}
sb.append(quote);
- result.addContent(sb);
+ result.add(sb);
Content docRootContent = new ContentBuilder();
boolean isHRef = inAnAtag() && node.getName().toString().equalsIgnoreCase("href");
@@ -1417,16 +1415,16 @@
if (utils.isText(dt) && isHRef) {
String text = ((TextTree) dt).getBody();
if (text.startsWith("/..") && !configuration.docrootparent.isEmpty()) {
- result.addContent(configuration.docrootparent);
+ result.add(configuration.docrootparent);
docRootContent = new ContentBuilder();
- result.addContent(textCleanup(text.substring(3), isLastNode));
+ result.add(textCleanup(text.substring(3), isLastNode));
} else {
if (!docRootContent.isEmpty()) {
docRootContent = copyDocRootContent(docRootContent);
} else {
text = redirectRelativeLinks(element, (TextTree) dt);
}
- result.addContent(textCleanup(text, isLastNode));
+ result.add(textCleanup(text, isLastNode));
}
} else {
docRootContent = copyDocRootContent(docRootContent);
@@ -1434,19 +1432,19 @@
}
}
copyDocRootContent(docRootContent);
- result.addContent(quote);
+ result.add(quote);
return false;
}
@Override
public Boolean visitComment(CommentTree node, Content c) {
- result.addContent(new RawHtml(node.getBody()));
+ result.add(new RawHtml(node.getBody()));
return false;
}
private Content copyDocRootContent(Content content) {
if (!content.isEmpty()) {
- result.addContent(content);
+ result.add(content);
return new ContentBuilder();
}
return content;
@@ -1460,9 +1458,9 @@
node,
getTagletWriterInstance(isFirstSentence));
if (c != null) {
- c.addContent(docRootContent);
+ c.add(docRootContent);
} else {
- result.addContent(docRootContent);
+ result.add(docRootContent);
}
return false;
}
@@ -1470,13 +1468,13 @@
@Override
public Boolean visitEndElement(EndElementTree node, Content c) {
RawHtml rawHtml = new RawHtml("</" + node.getName() + ">");
- result.addContent(rawHtml);
+ result.add(rawHtml);
return false;
}
@Override
public Boolean visitEntity(EntityTree node, Content c) {
- result.addContent(new RawHtml(node.toString()));
+ result.add(new RawHtml(node.toString()));
return false;
}
@@ -1484,7 +1482,7 @@
public Boolean visitErroneous(ErroneousTree node, Content c) {
messages.warning(ch.getDocTreePath(node),
"doclet.tag.invalid_usage", node);
- result.addContent(new RawHtml(node.toString()));
+ result.add(new RawHtml(node.toString()));
return false;
}
@@ -1493,7 +1491,7 @@
Content output = TagletWriter.getInlineTagOutput(element,
configuration.tagletManager, holderTag,
tag, getTagletWriterInstance(isFirstSentence));
- result.addContent(output);
+ result.add(output);
// if we obtained the first sentence successfully, nothing more to do
return (isFirstSentence && !output.isEmpty());
}
@@ -1504,7 +1502,7 @@
configuration.tagletManager, holderTag, tag,
getTagletWriterInstance(isFirstSentence, inSummary));
if (output != null) {
- result.addContent(output);
+ result.add(output);
}
return false;
}
@@ -1512,7 +1510,7 @@
@Override
public Boolean visitLink(LinkTree node, Content c) {
// we need to pass the DocTreeImpl here, so ignore node
- result.addContent(seeTagToContent(element, tag));
+ result.add(seeTagToContent(element, tag));
return false;
}
@@ -1522,14 +1520,14 @@
Content content = new StringContent(utils.normalizeNewlines(s));
if (node.getKind() == CODE)
content = HtmlTree.CODE(content);
- result.addContent(content);
+ result.add(content);
return false;
}
@Override
public Boolean visitSee(SeeTree node, Content c) {
// we need to pass the DocTreeImpl here, so ignore node
- result.addContent(seeTagToContent(element, tag));
+ result.add(seeTagToContent(element, tag));
return false;
}
@@ -1537,12 +1535,12 @@
public Boolean visitStartElement(StartElementTree node, Content c) {
String text = "<" + node.getName();
RawHtml rawHtml = new RawHtml(utils.normalizeNewlines(text));
- result.addContent(rawHtml);
+ result.add(rawHtml);
for (DocTree dt : node.getAttributes()) {
dt.accept(this, null);
}
- result.addContent(new RawHtml(node.isSelfClosing() ? "/>" : ">"));
+ result.add(new RawHtml(node.isSelfClosing() ? "/>" : ">"));
return false;
}
@@ -1551,7 +1549,7 @@
Content output = TagletWriter.getInlineTagOutput(element,
configuration.tagletManager, holderTag, tag,
getTagletWriterInstance(isFirstSentence));
- result.addContent(output);
+ result.add(output);
return false;
}
@@ -1561,7 +1559,7 @@
configuration.tagletManager, holderTag, tag,
getTagletWriterInstance(isFirstSentence, inSummary));
if (output != null) {
- result.addContent(output);
+ result.add(output);
}
return false;
}
@@ -1584,7 +1582,7 @@
@Override
public Boolean visitText(TextTree node, Content c) {
String text = node.getBody();
- result.addContent(new RawHtml(textCleanup(text, isLastNode, commentRemoved)));
+ result.add(new RawHtml(textCleanup(text, isLastNode, commentRemoved)));
return false;
}
@@ -1594,7 +1592,7 @@
configuration.tagletManager, holderTag, tag,
getTagletWriterInstance(isFirstSentence));
if (output != null) {
- result.addContent(output);
+ result.add(output);
}
return false;
}
@@ -1804,8 +1802,8 @@
return false;
}
for (Content annotation: annotations) {
- htmltree.addContent(sep);
- htmltree.addContent(annotation);
+ htmltree.add(sep);
+ htmltree.add(annotation);
if (!lineBreak) {
sep = " ";
}
@@ -1894,8 +1892,8 @@
String sep = "";
for (AnnotationValue av : annotationTypeValues) {
- annotation.addContent(sep);
- annotation.addContent(annotationValueToContent(av));
+ annotation.add(sep);
+ annotation.add(annotationValueToContent(av));
sep = " ";
}
}
@@ -1918,8 +1916,8 @@
}
String sep = "";
for (AnnotationValue av : annotationTypeValues) {
- annotation.addContent(sep);
- annotation.addContent(annotationValueToContent(av));
+ annotation.add(sep);
+ annotation.add(annotationValueToContent(av));
sep = " ";
}
}
@@ -1934,7 +1932,7 @@
addAnnotations(annotationElement, linkInfo, annotation, pairs,
indent, linkBreak);
}
- annotation.addContent(linkBreak ? DocletConstants.NL : "");
+ annotation.add(linkBreak ? DocletConstants.NL : "");
results.add(annotation);
}
return results;
@@ -1955,10 +1953,10 @@
Map<? extends ExecutableElement, ? extends AnnotationValue> map,
int indent, boolean linkBreak) {
linkInfo.label = new StringContent("@");
- linkInfo.label.addContent(annotationDoc.getSimpleName());
- annotation.addContent(getLink(linkInfo));
+ linkInfo.label.add(annotationDoc.getSimpleName());
+ annotation.add(getLink(linkInfo));
if (!map.isEmpty()) {
- annotation.addContent("(");
+ annotation.add("(");
boolean isFirst = true;
Set<? extends ExecutableElement> keys = map.keySet();
boolean multipleValues = keys.size() > 1;
@@ -1966,20 +1964,20 @@
if (isFirst) {
isFirst = false;
} else {
- annotation.addContent(",");
+ annotation.add(",");
if (linkBreak) {
- annotation.addContent(DocletConstants.NL);
+ annotation.add(DocletConstants.NL);
int spaces = annotationDoc.getSimpleName().length() + 2;
for (int k = 0; k < (spaces + indent); k++) {
- annotation.addContent(" ");
+ annotation.add(" ");
}
}
}
String simpleName = element.getSimpleName().toString();
if (multipleValues || !"value".equals(simpleName)) { // Omit "value=" where unnecessary
- annotation.addContent(getDocLink(LinkInfoImpl.Kind.ANNOTATION,
+ annotation.add(getDocLink(LinkInfoImpl.Kind.ANNOTATION,
element, simpleName, false));
- annotation.addContent("=");
+ annotation.add("=");
}
AnnotationValue annotationValue = map.get(element);
List<AnnotationValue> annotationTypeValues = new ArrayList<>();
@@ -1995,17 +1993,17 @@
return null;
}
}.visit(annotationValue, annotationValue);
- annotation.addContent(annotationTypeValues.size() == 1 ? "" : "{");
+ annotation.add(annotationTypeValues.size() == 1 ? "" : "{");
String sep = "";
for (AnnotationValue av : annotationTypeValues) {
- annotation.addContent(sep);
- annotation.addContent(annotationValueToContent(av));
+ annotation.add(sep);
+ annotation.add(annotationValueToContent(av));
sep = ",";
}
- annotation.addContent(annotationTypeValues.size() == 1 ? "" : "}");
+ annotation.add(annotationTypeValues.size() == 1 ? "" : "}");
isContainerDocumented = false;
}
- annotation.addContent(")");
+ annotation.add(")");
}
}
@@ -2086,7 +2084,7 @@
List<Content> list = getAnnotations(0, a, false);
ContentBuilder buf = new ContentBuilder();
for (Content c : list) {
- buf.addContent(c);
+ buf.add(c);
}
return buf;
}
@@ -2100,8 +2098,8 @@
ContentBuilder buf = new ContentBuilder();
String sep = "";
for (AnnotationValue av : vals) {
- buf.addContent(sep);
- buf.addContent(visit(av));
+ buf.add(sep);
+ buf.add(visit(av));
sep = " ";
}
return buf;
@@ -2198,7 +2196,7 @@
*/
public HtmlTree getBody(boolean includeScript, String title) {
HtmlTree body = new HtmlTree(HtmlTag.BODY);
- body.addAttr(HtmlAttr.CLASS, getBodyClass());
+ body.put(HtmlAttr.CLASS, getBodyClass());
// Set window title string which is later printed
this.winTitle = title;
@@ -2206,9 +2204,9 @@
// and package-frame
if (includeScript) {
this.mainBodyScript = getWinTitleScript();
- body.addContent(mainBodyScript.asContent());
+ body.add(mainBodyScript.asContent());
Content noScript = HtmlTree.NOSCRIPT(HtmlTree.DIV(contents.noScriptMessage));
- body.addContent(noScript);
+ body.add(noScript);
}
return body;
}
@@ -2236,7 +2234,7 @@
configuration.localStylesheetMap.put(element, localStylesheets);
}
for (DocPath stylesheet : localStylesheets) {
- stylesheetContent.addContent(HtmlTree.LINK("stylesheet",
+ stylesheetContent.add(HtmlTree.LINK("stylesheet",
"text/css", stylesheet.getPath(), "Style"));
}
return stylesheetContent;
--- a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/HtmlSerialFieldWriter.java Tue Mar 12 09:49:10 2019 +0000
+++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/HtmlSerialFieldWriter.java Sat Mar 16 21:00:45 2019 +0000
@@ -108,8 +108,8 @@
if (serializableFieldsTree.isValid()) {
Content headingContent = new StringContent(heading);
Content serialHeading = HtmlTree.HEADING(Headings.SerializedForm.CLASS_SUBHEADING, headingContent);
- li.addContent(serialHeading);
- li.addContent(serializableFieldsTree);
+ li.add(serialHeading);
+ li.add(serializableFieldsTree);
}
return li;
}
@@ -119,32 +119,32 @@
String fieldDimensions, String fieldName, Content contentTree) {
Content nameContent = new StringContent(fieldName);
Content heading = HtmlTree.HEADING(Headings.SerializedForm.MEMBER_HEADING, nameContent);
- contentTree.addContent(heading);
+ contentTree.add(heading);
Content pre = new HtmlTree(HtmlTag.PRE);
if (fieldType == null) {
- pre.addContent(fieldTypeStr);
+ pre.add(fieldTypeStr);
} else {
Content fieldContent = writer.getLink(new LinkInfoImpl(
configuration, LinkInfoImpl.Kind.SERIAL_MEMBER, fieldType));
- pre.addContent(fieldContent);
+ pre.add(fieldContent);
}
- pre.addContent(fieldDimensions + " ");
- pre.addContent(fieldName);
- contentTree.addContent(pre);
+ pre.add(fieldDimensions + " ");
+ pre.add(fieldName);
+ contentTree.add(pre);
}
@Override
public void addMemberHeader(TypeMirror fieldType, String fieldName, Content contentTree) {
Content nameContent = new StringContent(fieldName);
Content heading = HtmlTree.HEADING(HtmlTag.H5, nameContent);
- contentTree.addContent(heading);
+ contentTree.add(heading);
Content pre = new HtmlTree(HtmlTag.PRE);
Content fieldContent = writer.getLink(new LinkInfoImpl(
configuration, LinkInfoImpl.Kind.SERIAL_MEMBER, fieldType));
- pre.addContent(fieldContent);
- pre.addContent(" ");
- pre.addContent(fieldName);
- contentTree.addContent(pre);
+ pre.add(fieldContent);
+ pre.add(" ");
+ pre.add(fieldName);
+ contentTree.add(pre);
}
/**
@@ -185,7 +185,7 @@
if (!description.isEmpty()) {
Content serialFieldContent = new RawHtml(ch.getText(description));
Content div = HtmlTree.DIV(HtmlStyle.block, serialFieldContent);
- contentTree.addContent(div);
+ contentTree.add(div);
}
}
@@ -201,8 +201,8 @@
configuration.tagletManager.getBlockTaglets(field),
writer.getTagletWriterInstance(false), tagContent);
Content dlTags = new HtmlTree(HtmlTag.DL);
- dlTags.addContent(tagContent);
- contentTree.addContent(dlTags); // TODO: what if empty?
+ dlTags.add(tagContent);
+ contentTree.add(dlTags); // TODO: what if empty?
}
/**
--- a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/HtmlSerialMethodWriter.java Tue Mar 12 09:49:10 2019 +0000
+++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/HtmlSerialMethodWriter.java Sat Mar 16 21:00:45 2019 +0000
@@ -96,7 +96,7 @@
Content headingContent = new StringContent(heading);
Content serialHeading = HtmlTree.HEADING(Headings.SerializedForm.CLASS_SUBHEADING, headingContent);
Content li = HtmlTree.LI(HtmlStyle.blockList, serialHeading);
- li.addContent(serializableMethodContent);
+ li.add(serializableMethodContent);
return li;
}
@@ -120,8 +120,8 @@
public void addMemberHeader(ExecutableElement member, Content methodsContentTree) {
Content memberContent = new StringContent(name(member));
Content heading = HtmlTree.HEADING(Headings.SerializedForm.MEMBER_HEADING, memberContent);
- methodsContentTree.addContent(heading);
- methodsContentTree.addContent(getSignature(member));
+ methodsContentTree.add(heading);
+ methodsContentTree.add(getSignature(member));
}
/**
@@ -158,8 +158,8 @@
tagletManager.getSerializedFormTaglets(),
writer.getTagletWriterInstance(false), tagContent);
Content dlTags = new HtmlTree(HtmlTag.DL);
- dlTags.addContent(tagContent);
- methodsContentTree.addContent(dlTags);
+ dlTags.add(tagContent);
+ methodsContentTree.add(dlTags);
if (name(member).compareTo("writeExternal") == 0
&& utils.getSerialDataTrees(member).isEmpty()) {
serialWarning(member, "doclet.MissingSerialDataTag",
--- a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/IndexRedirectWriter.java Tue Mar 12 09:49:10 2019 +0000
+++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/IndexRedirectWriter.java Sat Mar 16 21:00:45 2019 +0000
@@ -29,7 +29,6 @@
import jdk.javadoc.internal.doclets.formats.html.markup.Head;
import jdk.javadoc.internal.doclets.formats.html.markup.ContentBuilder;
-import jdk.javadoc.internal.doclets.formats.html.markup.DocType;
import jdk.javadoc.internal.doclets.formats.html.markup.HtmlAttr;
import jdk.javadoc.internal.doclets.formats.html.markup.HtmlDocument;
import jdk.javadoc.internal.doclets.formats.html.markup.HtmlTag;
@@ -42,8 +41,6 @@
import jdk.javadoc.internal.doclets.toolkit.util.DocPath;
import jdk.javadoc.internal.doclets.toolkit.util.DocPaths;
-import java.util.Collections;
-
/**
* Writes a file that tries to redirect to an alternate page.
* The redirect uses JavaScript, if enabled, falling back on
@@ -97,20 +94,20 @@
.appendStringLiteral(targetPath, '\'')
.append(")");
HtmlTree metaRefresh = new HtmlTree(HtmlTag.META)
- .addAttr(HtmlAttr.HTTP_EQUIV, "Refresh")
- .addAttr(HtmlAttr.CONTENT, "0;" + targetPath);
+ .put(HtmlAttr.HTTP_EQUIV, "Refresh")
+ .put(HtmlAttr.CONTENT, "0;" + targetPath);
head.addContent(script.asContent(), HtmlTree.NOSCRIPT(metaRefresh));
ContentBuilder bodyContent = new ContentBuilder();
- bodyContent.addContent(HtmlTree.NOSCRIPT(
+ bodyContent.add(HtmlTree.NOSCRIPT(
HtmlTree.P(contents.getContent("doclet.No_Script_Message"))));
- bodyContent.addContent(HtmlTree.P(HtmlTree.A(targetPath, new StringContent(targetPath))));
+ bodyContent.add(HtmlTree.P(HtmlTree.A(targetPath, new StringContent(targetPath))));
Content body = new HtmlTree(HtmlTag.BODY)
- .addAttr(HtmlAttr.CLASS, "index-redirect");
+ .put(HtmlAttr.CLASS, "index-redirect");
HtmlTree main = HtmlTree.MAIN(bodyContent);
- body.addContent(main);
+ body.add(main);
Content htmlTree = HtmlTree.HTML(configuration.getLocale().getLanguage(), head.toContent(), body);
HtmlDocument htmlDocument = new HtmlDocument(htmlComment, htmlTree);
--- a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/LinkFactoryImpl.java Tue Mar 12 09:49:10 2019 +0000
+++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/LinkFactoryImpl.java Sat Mar 16 21:00:45 2019 +0000
@@ -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
@@ -97,14 +97,14 @@
DocPath filename = getPath(classLinkInfo);
if (linkInfo.linkToSelf ||
!(docPaths.forName(typeElement)).equals(m_writer.filename)) {
- link.addContent(m_writer.links.createLink(
+ link.add(m_writer.links.createLink(
filename.fragment(classLinkInfo.where),
label,
classLinkInfo.isStrong,
title,
classLinkInfo.target));
if (noLabel && !classLinkInfo.excludeTypeParameterLinks) {
- link.addContent(getTypeParameterLinks(linkInfo));
+ link.add(getTypeParameterLinks(linkInfo));
}
return link;
}
@@ -114,17 +114,17 @@
typeElement, classLinkInfo.where,
label, classLinkInfo.isStrong, true);
if (crossLink != null) {
- link.addContent(crossLink);
+ link.add(crossLink);
if (noLabel && !classLinkInfo.excludeTypeParameterLinks) {
- link.addContent(getTypeParameterLinks(linkInfo));
+ link.add(getTypeParameterLinks(linkInfo));
}
return link;
}
}
// Can't link so just write label.
- link.addContent(label);
+ link.add(label);
if (noLabel && !classLinkInfo.excludeTypeParameterLinks) {
- link.addContent(getTypeParameterLinks(linkInfo));
+ link.add(getTypeParameterLinks(linkInfo));
}
return link;
}
@@ -157,17 +157,17 @@
}
if (((linkInfo.includeTypeInClassLinkLabel && isClassLabel)
|| (linkInfo.includeTypeAsSepLink && !isClassLabel)) && !vars.isEmpty()) {
- links.addContent("<");
+ links.add("<");
boolean many = false;
for (TypeMirror t : vars) {
if (many) {
- links.addContent(",");
- links.addContent(Contents.ZERO_WIDTH_SPACE);
+ links.add(",");
+ links.add(Contents.ZERO_WIDTH_SPACE);
}
- links.addContent(getTypeParameterLink(linkInfo, t));
+ links.add(getTypeParameterLink(linkInfo, t));
many = true;
}
- links.addContent(">");
+ links.add(">");
}
return links;
}
@@ -222,13 +222,13 @@
boolean isFirst = true;
for (Content anno : annos) {
if (!isFirst) {
- links.addContent(" ");
+ links.add(" ");
}
- links.addContent(anno);
+ links.add(anno);
isFirst = false;
}
if (!annos.isEmpty()) {
- links.addContent(" ");
+ links.add(" ");
}
return links;
--- a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/MethodWriterImpl.java Tue Mar 12 09:49:10 2019 +0000
+++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/MethodWriterImpl.java Sat Mar 16 21:00:45 2019 +0000
@@ -86,7 +86,7 @@
*/
@Override
public Content getMemberSummaryHeader(TypeElement typeElement, Content memberSummaryTree) {
- memberSummaryTree.addContent(MarkerComments.START_OF_METHOD_SUMMARY);
+ memberSummaryTree.add(MarkerComments.START_OF_METHOD_SUMMARY);
Content memberTree = writer.getMemberTreeHeader();
writer.addSummaryHeader(this, typeElement, memberTree);
return memberTree;
@@ -105,12 +105,12 @@
*/
@Override
public Content getMethodDetailsTreeHeader(TypeElement typeElement, Content memberDetailsTree) {
- memberDetailsTree.addContent(MarkerComments.START_OF_METHOD_DETAILS);
+ memberDetailsTree.add(MarkerComments.START_OF_METHOD_DETAILS);
Content methodDetailsTree = writer.getMemberTreeHeader();
- methodDetailsTree.addContent(links.createAnchor(SectionName.METHOD_DETAIL));
+ methodDetailsTree.add(links.createAnchor(SectionName.METHOD_DETAIL));
Content heading = HtmlTree.HEADING(Headings.TypeDeclaration.DETAILS_HEADING,
contents.methodDetailLabel);
- methodDetailsTree.addContent(heading);
+ methodDetailsTree.add(heading);
return methodDetailsTree;
}
@@ -121,13 +121,13 @@
public Content getMethodDocTreeHeader(ExecutableElement method, Content methodDetailsTree) {
String erasureAnchor;
if ((erasureAnchor = getErasureAnchor(method)) != null) {
- methodDetailsTree.addContent(links.createAnchor((erasureAnchor)));
+ methodDetailsTree.add(links.createAnchor((erasureAnchor)));
}
- methodDetailsTree.addContent(links.createAnchor(writer.getAnchor(method)));
+ methodDetailsTree.add(links.createAnchor(writer.getAnchor(method)));
Content methodDocTree = writer.getMemberTreeHeader();
Content heading = new HtmlTree(Headings.TypeDeclaration.MEMBER_HEADING);
- heading.addContent(name(method));
- methodDocTree.addContent(heading);
+ heading.add(name(method));
+ methodDocTree.add(heading);
return methodDocTree;
}
@@ -190,9 +190,9 @@
utils.isClass(holder)
? contents.descfrmClassLabel
: contents.descfrmInterfaceLabel);
- descfrmLabel.addContent(Contents.SPACE);
- descfrmLabel.addContent(codelLink);
- methodDocTree.addContent(HtmlTree.DIV(HtmlStyle.block, descfrmLabel));
+ descfrmLabel.add(Contents.SPACE);
+ descfrmLabel.add(codelLink);
+ methodDocTree.add(HtmlTree.DIV(HtmlStyle.block, descfrmLabel));
writer.addInlineComment(method, methodDocTree);
}
}
@@ -230,7 +230,7 @@
public void addSummaryLabel(Content memberTree) {
Content label = HtmlTree.HEADING(Headings.TypeDeclaration.SUMMARY_HEADING,
contents.methodSummary);
- memberTree.addContent(label);
+ memberTree.add(label);
}
/**
@@ -265,7 +265,7 @@
*/
@Override
public void addSummaryAnchor(TypeElement typeElement, Content memberTree) {
- memberTree.addContent(links.createAnchor(SectionName.METHOD_SUMMARY));
+ memberTree.add(links.createAnchor(SectionName.METHOD_SUMMARY));
}
/**
@@ -273,7 +273,7 @@
*/
@Override
public void addInheritedSummaryAnchor(TypeElement typeElement, Content inheritedTree) {
- inheritedTree.addContent(links.createAnchor(
+ inheritedTree.add(links.createAnchor(
SectionName.METHODS_INHERITANCE, configuration.getClassName(typeElement)));
}
@@ -296,9 +296,9 @@
}
Content labelHeading = HtmlTree.HEADING(Headings.TypeDeclaration.INHERITED_SUMMARY_HEADING,
label);
- labelHeading.addContent(Contents.SPACE);
- labelHeading.addContent(classLink);
- inheritedTree.addContent(labelHeading);
+ labelHeading.add(Contents.SPACE);
+ labelHeading.add(classLink);
+ inheritedTree.add(labelHeading);
}
/**
@@ -342,7 +342,7 @@
context = LinkInfoImpl.Kind.METHOD_SPECIFIED_BY;
}
Content dt = HtmlTree.DT(HtmlTree.SPAN(HtmlStyle.overrideSpecifyLabel, label));
- dl.addContent(dt);
+ dl.add(dt);
Content overriddenTypeLink =
writer.getLink(new LinkInfoImpl(writer.configuration, context, overriddenType));
Content codeOverridenTypeLink = HtmlTree.CODE(overriddenTypeLink);
@@ -352,11 +352,11 @@
.where(writer.links.getName(writer.getAnchor(method))).label(method.getSimpleName()));
Content codeMethLink = HtmlTree.CODE(methlink);
Content dd = HtmlTree.DD(codeMethLink);
- dd.addContent(Contents.SPACE);
- dd.addContent(writer.contents.inClass);
- dd.addContent(Contents.SPACE);
- dd.addContent(codeOverridenTypeLink);
- dl.addContent(dd);
+ dd.add(Contents.SPACE);
+ dd.add(writer.contents.inClass);
+ dd.add(Contents.SPACE);
+ dd.add(codeOverridenTypeLink);
+ dl.add(dd);
}
}
@@ -382,17 +382,17 @@
writer.configuration, LinkInfoImpl.Kind.METHOD_SPECIFIED_BY, intfac));
Content codeIntfacLink = HtmlTree.CODE(intfaclink);
Content dt = HtmlTree.DT(HtmlTree.SPAN(HtmlStyle.overrideSpecifyLabel, contents.specifiedByLabel));
- dl.addContent(dt);
+ dl.add(dt);
Content methlink = writer.getDocLink(
LinkInfoImpl.Kind.MEMBER, implementedMeth,
implementedMeth.getSimpleName(), false);
Content codeMethLink = HtmlTree.CODE(methlink);
Content dd = HtmlTree.DD(codeMethLink);
- dd.addContent(Contents.SPACE);
- dd.addContent(contents.inInterface);
- dd.addContent(Contents.SPACE);
- dd.addContent(codeIntfacLink);
- dl.addContent(dd);
+ dd.add(Contents.SPACE);
+ dd.add(contents.inInterface);
+ dd.add(Contents.SPACE);
+ dd.add(codeIntfacLink);
+ dl.add(dd);
}
}
@@ -407,8 +407,8 @@
if (type != null) {
Content linkContent = writer.getLink(
new LinkInfoImpl(configuration, LinkInfoImpl.Kind.RETURN_TYPE, type));
- htmltree.addContent(linkContent);
- htmltree.addContent(Contents.SPACE);
+ htmltree.add(linkContent);
+ htmltree.add(Contents.SPACE);
}
}
}
--- a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/ModuleFrameWriter.java Tue Mar 12 09:49:10 2019 +0000
+++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/ModuleFrameWriter.java Sat Mar 16 21:00:45 2019 +0000
@@ -102,12 +102,12 @@
: configuration.docPaths.moduleSummary(moduleElement);
Content heading = HtmlTree.HEADING(Headings.PAGE_TITLE_HEADING, HtmlStyle.bar,
mdlgen.links.createLink(moduleSummary, mdlLabel, "", "classFrame"));
- htmlTree.addContent(heading);
+ htmlTree.add(heading);
HtmlTree div = new HtmlTree(HtmlTag.DIV);
div.setStyle(HtmlStyle.indexContainer);
mdlgen.addClassListing(div);
- htmlTree.addContent(div);
- body.addContent(htmlTree);
+ htmlTree.add(div);
+ body.add(htmlTree);
mdlgen.printHtmlDocument(
configuration.metakeywords.getMetaKeywordsForModule(moduleElement),
"module summary (frame)",
@@ -172,7 +172,7 @@
if (!printedHeader) {
Content heading = HtmlTree.HEADING(Headings.CONTENT_HEADING,
true, labelContent);
- htmlTree.addContent(heading);
+ htmlTree.add(heading);
printedHeader = true;
}
Content arr_i_name = new StringContent(utils.getSimpleName(typeElement));
@@ -182,10 +182,10 @@
Content link = getLink(new LinkInfoImpl(configuration,
LinkInfoImpl.Kind.ALL_CLASSES_FRAME, typeElement).label(arr_i_name).target("classFrame"));
Content li = HtmlTree.LI(link);
- ul.addContent(li);
+ ul.add(li);
}
- htmlTree.addContent(ul);
- contentTree.addContent(htmlTree);
+ htmlTree.add(ul);
+ contentTree.add(htmlTree);
}
}
}
--- a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/ModuleIndexFrameWriter.java Tue Mar 12 09:49:10 2019 +0000
+++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/ModuleIndexFrameWriter.java Sat Mar 16 21:00:45 2019 +0000
@@ -96,10 +96,10 @@
HtmlTree ul = new HtmlTree(HtmlTag.UL);
ul.setTitle(contents.modulesLabel);
for (ModuleElement mdle: configuration.modules) {
- ul.addContent(getModuleLink(mdle));
+ ul.add(getModuleLink(mdle));
}
- htmlTree.addContent(ul);
- main.addContent(htmlTree);
+ htmlTree.add(ul);
+ main.add(htmlTree);
}
/**
@@ -122,8 +122,8 @@
DocLink cFrameLink = new DocLink(docPaths.moduleSummary(mdle));
HtmlTree anchor = HtmlTree.A(mdlLink.toString(), label);
String onclickStr = "updateModuleFrame('" + mtFrameLink + "','" + cFrameLink + "');";
- anchor.addAttr(HtmlAttr.TARGET, target);
- anchor.addAttr(HtmlAttr.ONCLICK, onclickStr);
+ anchor.put(HtmlAttr.TARGET, target);
+ anchor.put(HtmlAttr.ONCLICK, onclickStr);
return anchor;
}
@@ -136,7 +136,7 @@
if (!headerContent.isEmpty()) {
Content heading = HtmlTree.HEADING(Headings.PAGE_TITLE_HEADING, true,
HtmlStyle.bar, new RawHtml(replaceDocRootDir(headerContent)));
- header.addContent(heading);
+ header.add(heading);
moduleListHeading = Headings.IndexFrames.MODULE_HEADING;
} else {
moduleListHeading = Headings.PAGE_TITLE_HEADING;
@@ -159,7 +159,7 @@
Content linkContent = links.createLink(DocPaths.ALLCLASSES_FRAME,
contents.allClassesLabel, "", "packageFrame");
Content li = HtmlTree.LI(linkContent);
- ul.addContent(li);
+ ul.add(li);
}
/**
@@ -172,7 +172,7 @@
Content linkContent = links.createLink(DocPaths.OVERVIEW_FRAME,
contents.allPackagesLabel, "", "packageListFrame");
Content li = HtmlTree.LI(linkContent);
- ul.addContent(li);
+ ul.add(li);
}
/**
@@ -180,7 +180,7 @@
*/
protected void addNavigationBarFooter(Content footer) {
Content p = HtmlTree.P(Contents.SPACE);
- footer.addContent(p);
+ footer.add(p);
}
protected void addModulePackagesList(Map<ModuleElement, Set<PackageElement>> modules, String text,
--- a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/ModuleIndexWriter.java Tue Mar 12 09:49:10 2019 +0000
+++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/ModuleIndexWriter.java Sat Mar 16 21:00:45 2019 +0000
@@ -102,8 +102,8 @@
if (configuration.showModules) {
addAllModulesLink(ul);
}
- htmltree.addContent(ul);
- header.addContent(htmltree);
+ htmltree.add(ul);
+ header.add(htmltree);
addModulesList(main);
}
@@ -148,7 +148,7 @@
}
Content div = HtmlTree.DIV(HtmlStyle.contentContainer, table.toContent());
- main.addContent(div);
+ main.add(div);
if (table.needsScript()) {
mainBodyScript.append(table.getScript());
@@ -170,7 +170,7 @@
HtmlTree div = new HtmlTree(HtmlTag.DIV);
div.setStyle(HtmlStyle.contentContainer);
addOverviewComment(div);
- main.addContent(div);
+ main.add(div);
}
}
@@ -198,7 +198,7 @@
protected void addNavigationBarHeader(Content header) {
addTop(header);
navBar.setUserHeader(getUserHeaderFooter(true));
- header.addContent(navBar.getContent(true));
+ header.add(navBar.getContent(true));
}
/**
@@ -210,7 +210,7 @@
@Override
protected void addNavigationBarFooter(Content footer) {
navBar.setUserFooter(getUserHeaderFooter(false));
- footer.addContent(navBar.getContent(false));
+ footer.add(navBar.getContent(false));
addBottom(footer);
}
--- a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/ModulePackageIndexFrameWriter.java Tue Mar 12 09:49:10 2019 +0000
+++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/ModulePackageIndexFrameWriter.java Sat Mar 16 21:00:45 2019 +0000
@@ -96,19 +96,19 @@
Content profNameContent = new StringContent(mdle.getQualifiedName().toString());
Content heading = HtmlTree.HEADING(modulePackagesListHeading, true,
getTargetModuleLink("classFrame", profNameContent, mdle));
- heading.addContent(Contents.SPACE);
- heading.addContent(contents.packagesLabel);
+ heading.add(Contents.SPACE);
+ heading.add(contents.packagesLabel);
HtmlTree htmlTree = HtmlTree.DIV(HtmlStyle.indexContainer, heading);
HtmlTree ul = new HtmlTree(HtmlTag.UL);
ul.setTitle(contents.packagesLabel);
List<PackageElement> packages = new ArrayList<>(modules.get(mdle));
for (PackageElement pkg : packages) {
if ((!(configuration.nodeprecated && utils.isDeprecated(pkg)))) {
- ul.addContent(getPackage(pkg, mdle));
+ ul.add(getPackage(pkg, mdle));
}
}
- htmlTree.addContent(ul);
- main.addContent(htmlTree);
+ htmlTree.add(ul);
+ main.add(htmlTree);
}
/**
@@ -119,19 +119,19 @@
Content moduleNameContent = new StringContent(mdle.getQualifiedName().toString());
Content heading = HtmlTree.HEADING(modulePackagesListHeading, true,
getTargetModuleLink("classFrame", moduleNameContent, mdle));
- heading.addContent(Contents.SPACE);
- heading.addContent(contents.packagesLabel);
+ heading.add(Contents.SPACE);
+ heading.add(contents.packagesLabel);
HtmlTree htmlTree = HtmlTree.MAIN(HtmlStyle.indexContainer, heading);
HtmlTree ul = new HtmlTree(HtmlTag.UL);
ul.setTitle(contents.packagesLabel);
Set<PackageElement> modulePackages = configuration.modulePackages.get(mdle);
for (PackageElement pkg: modulePackages) {
if ((!(configuration.nodeprecated && utils.isDeprecated(pkg)))) {
- ul.addContent(getPackage(pkg, mdle));
+ ul.add(getPackage(pkg, mdle));
}
}
- htmlTree.addContent(ul);
- body.addContent(htmlTree);
+ htmlTree.add(ul);
+ body.add(htmlTree);
}
/**
@@ -167,7 +167,7 @@
if (!headerContent.isEmpty()) {
Content heading = HtmlTree.HEADING(Headings.PAGE_TITLE_HEADING, true,
HtmlStyle.bar, new RawHtml(replaceDocRootDir(headerContent)));
- header.addContent(heading);
+ header.add(heading);
modulePackagesListHeading = Headings.IndexFrames.PACKAGE_HEADING;
} else {
modulePackagesListHeading = Headings.PAGE_TITLE_HEADING;
@@ -200,7 +200,7 @@
Content linkContent = links.createLink(allClassesFrame,
contents.allClassesLabel, "", "packageFrame");
Content li = HtmlTree.LI(linkContent);
- ul.addContent(li);
+ ul.add(li);
}
/**
@@ -216,7 +216,7 @@
Content linkContent = links.createLink(overviewFrame,
contents.allPackagesLabel, "", "packageListFrame");
Content li = HtmlTree.LI(linkContent);
- ul.addContent(li);
+ ul.add(li);
}
/**
@@ -232,7 +232,7 @@
Content linkContent = links.createLink(moduleOverviewFrame,
contents.allModulesLabel, "", "packageListFrame");
Content li = HtmlTree.LI(linkContent);
- ul.addContent(li);
+ ul.add(li);
}
/**
@@ -240,6 +240,6 @@
*/
protected void addNavigationBarFooter(Content footer) {
Content p = HtmlTree.P(Contents.SPACE);
- footer.addContent(p);
+ footer.add(p);
}
}
--- a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/ModuleWriterImpl.java Tue Mar 12 09:49:10 2019 +0000
+++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/ModuleWriterImpl.java Sat Mar 16 21:00:45 2019 +0000
@@ -203,22 +203,22 @@
|| display(indirectOpenPackages));
navBar.setDisplaySummaryServicesLink(displayServices(uses, usesTrees) || displayServices(provides.keySet(), providesTrees));
navBar.setUserHeader(getUserHeaderFooter(true));
- htmlTree.addContent(navBar.getContent(true));
- bodyTree.addContent(htmlTree);
+ htmlTree.add(navBar.getContent(true));
+ bodyTree.add(htmlTree);
HtmlTree div = new HtmlTree(HtmlTag.DIV);
div.setStyle(HtmlStyle.header);
Content annotationContent = new HtmlTree(HtmlTag.P);
addAnnotationInfo(mdle, annotationContent);
- div.addContent(annotationContent);
+ div.add(annotationContent);
Content label = mdle.isOpen() && (configuration.docEnv.getModuleMode() == ModuleMode.ALL)
? contents.openModuleLabel : contents.moduleLabel;
Content tHeading = HtmlTree.HEADING(Headings.PAGE_TITLE_HEADING, true,
HtmlStyle.title, label);
- tHeading.addContent(Contents.SPACE);
+ tHeading.add(Contents.SPACE);
Content moduleHead = new RawHtml(heading);
- tHeading.addContent(moduleHead);
- div.addContent(tHeading);
- mainTree.addContent(div);
+ tHeading.add(moduleHead);
+ div.add(tHeading);
+ mainTree.add(div);
return bodyTree;
}
@@ -458,9 +458,9 @@
*/
public void addSummaryHeader(Content startMarker, SectionName markerAnchor, Content heading,
Content htmltree) {
- htmltree.addContent(startMarker);
- htmltree.addContent(links.createAnchor(markerAnchor));
- htmltree.addContent(HtmlTree.HEADING(Headings.ModuleDeclaration.SUMMARY_HEADING, heading));
+ htmltree.add(startMarker);
+ htmltree.add(links.createAnchor(markerAnchor));
+ htmltree.add(HtmlTree.HEADING(Headings.ModuleDeclaration.SUMMARY_HEADING, heading));
}
/**
@@ -519,7 +519,7 @@
Table table = getTable3(caption, tableSummary, HtmlStyle.requiresSummary,
requiresTableHeader);
addModulesList(requires, table);
- li.addContent(table.toContent());
+ li.add(table.toContent());
}
// Display indirect modules table in both "api" and "all" mode.
if (display(indirectModules)) {
@@ -531,10 +531,10 @@
Table amrTable = getTable3(amrCaption, amrTableSummary, HtmlStyle.requiresSummary,
requiresTableHeader);
addModulesList(indirectModules, amrTable);
- li.addContent(amrTable.toContent());
+ li.add(amrTable.toContent());
}
HtmlTree ul = HtmlTree.UL(HtmlStyle.blockList, li);
- summaryContentTree.addContent(ul);
+ summaryContentTree.add(ul);
}
}
@@ -572,17 +572,17 @@
Table aepTable = getTable2(new StringContent(aepText),
HtmlStyle.packagesSummary, indirectPackagesHeader);
addIndirectPackages(aepTable, indirectPackages);
- li.addContent(aepTable.toContent());
+ li.add(aepTable.toContent());
}
if (display(indirectOpenPackages)) {
String aopText = resources.getText("doclet.Indirect_Opens_Summary");
Table aopTable = getTable2(new StringContent(aopText), HtmlStyle.packagesSummary,
indirectPackagesHeader);
addIndirectPackages(aopTable, indirectOpenPackages);
- li.addContent(aopTable.toContent());
+ li.add(aopTable.toContent());
}
HtmlTree ul = HtmlTree.UL(HtmlStyle.blockList, li);
- summaryContentTree.addContent(ul);
+ summaryContentTree.add(ul);
}
}
@@ -667,7 +667,7 @@
table.addRow(pkg, row);
}
- li.addContent(table.toContent());
+ li.add(table.toContent());
if (table.needsScript()) {
mainBodyScript.append(table.getScript());
}
@@ -697,9 +697,9 @@
Content list = new ContentBuilder();
for (ModuleElement m : modules) {
if (!list.isEmpty()) {
- list.addContent(new StringContent(", "));
+ list.add(new StringContent(", "));
}
- list.addContent(getModuleLink(m, new StringContent(m.getQualifiedName())));
+ list.add(getModuleLink(m, new StringContent(m.getQualifiedName())));
}
return list;
}
@@ -719,8 +719,8 @@
Content list = new ContentBuilder();
String sep = "";
for (PackageElement pkg : pkgList) {
- list.addContent(sep);
- list.addContent(getPackageLink(pkg, new StringContent(utils.getPackageName(pkg))));
+ list.add(sep);
+ list.add(getPackageLink(pkg, new StringContent(utils.getPackageName(pkg))));
sep = " ";
}
table.addRow(moduleLinkContent, list);
@@ -749,7 +749,7 @@
usesProvidesTableHeader);
addProvidesList(table);
if (!table.isEmpty()) {
- li.addContent(table.toContent());
+ li.add(table.toContent());
}
}
if (haveUses){
@@ -758,11 +758,11 @@
usesProvidesTableHeader);
addUsesList(table);
if (!table.isEmpty()) {
- li.addContent(table.toContent());
+ li.add(table.toContent());
}
}
HtmlTree ul = HtmlTree.UL(HtmlStyle.blockList, li);
- summaryContentTree.addContent(ul);
+ summaryContentTree.add(ul);
}
}
@@ -783,12 +783,12 @@
if (display(usesTrees)) {
description = usesTrees.get(t);
if (description != null && !description.isEmpty()) {
- summary.addContent(HtmlTree.DIV(HtmlStyle.block, description));
+ summary.add(HtmlTree.DIV(HtmlStyle.block, description));
} else {
addSummaryComment(t, summary);
}
} else {
- summary.addContent(Contents.SPACE);
+ summary.add(Contents.SPACE);
}
table.addRow(typeLinkContent, summary);
}
@@ -812,26 +812,26 @@
Content desc = new ContentBuilder();
if (display(providesTrees)) {
description = providesTrees.get(srv);
- desc.addContent((description != null && !description.isEmpty())
+ desc.add((description != null && !description.isEmpty())
? HtmlTree.DIV(HtmlStyle.block, description)
: Contents.SPACE);
} else {
- desc.addContent(Contents.SPACE);
+ desc.add(Contents.SPACE);
}
// Only display the implementation details in the "all" mode.
if (moduleMode == ModuleMode.ALL && !implSet.isEmpty()) {
- desc.addContent(new HtmlTree(HtmlTag.BR));
- desc.addContent("(");
+ desc.add(new HtmlTree(HtmlTag.BR));
+ desc.add("(");
HtmlTree implSpan = HtmlTree.SPAN(HtmlStyle.implementationLabel, contents.implementation);
- desc.addContent(implSpan);
- desc.addContent(Contents.SPACE);
+ desc.add(implSpan);
+ desc.add(Contents.SPACE);
String sep = "";
for (TypeElement impl : implSet) {
- desc.addContent(sep);
- desc.addContent(getLink(new LinkInfoImpl(configuration, LinkInfoImpl.Kind.PACKAGE, impl)));
+ desc.add(sep);
+ desc.add(getLink(new LinkInfoImpl(configuration, LinkInfoImpl.Kind.PACKAGE, impl)));
sep = ", ";
}
- desc.addContent(")");
+ desc.add(")");
}
table.addRow(srvLinkContent, desc);
}
@@ -849,14 +849,14 @@
HtmlTree deprDiv = new HtmlTree(HtmlTag.DIV);
deprDiv.setStyle(HtmlStyle.deprecationBlock);
Content deprPhrase = HtmlTree.SPAN(HtmlStyle.deprecatedLabel, getDeprecatedPhrase(mdle));
- deprDiv.addContent(deprPhrase);
+ deprDiv.add(deprPhrase);
if (!deprs.isEmpty()) {
List<? extends DocTree> commentTags = ch.getDescription(configuration, deprs.get(0));
if (!commentTags.isEmpty()) {
addInlineDeprecatedComment(mdle, deprs.get(0), deprDiv);
}
}
- div.addContent(deprDiv);
+ div.add(deprDiv);
}
}
@@ -868,10 +868,10 @@
if (!utils.getFullBody(mdle).isEmpty()) {
Content tree = HtmlTree.SECTION();
addDeprecationInfo(tree);
- tree.addContent(MarkerComments.START_OF_MODULE_DESCRIPTION);
- tree.addContent(links.createAnchor(SectionName.MODULE_DESCRIPTION));
+ tree.add(MarkerComments.START_OF_MODULE_DESCRIPTION);
+ tree.add(links.createAnchor(SectionName.MODULE_DESCRIPTION));
addInlineComment(mdle, tree);
- moduleContentTree.addContent(tree);
+ moduleContentTree.add(tree);
}
}
@@ -882,7 +882,7 @@
public void addModuleTags(Content moduleContentTree) {
Content tree = HtmlTree.SECTION();
addTagsInfo(mdle, tree);
- moduleContentTree.addContent(tree);
+ moduleContentTree.add(tree);
}
/**
@@ -890,8 +890,8 @@
*/
@Override
public void addModuleContent(Content contentTree, Content moduleContentTree) {
- mainTree.addContent(moduleContentTree);
- contentTree.addContent(mainTree);
+ mainTree.add(moduleContentTree);
+ contentTree.add(mainTree);
}
/**
@@ -901,9 +901,9 @@
public void addModuleFooter(Content contentTree) {
Content htmlTree = HtmlTree.FOOTER();
navBar.setUserFooter(getUserHeaderFooter(false));
- htmlTree.addContent(navBar.getContent(false));
+ htmlTree.add(navBar.getContent(false));
addBottom(htmlTree);
- contentTree.addContent(htmlTree);
+ contentTree.add(htmlTree);
}
/**
@@ -931,7 +931,7 @@
HtmlTree deprDiv = new HtmlTree(HtmlTag.DIV);
deprDiv.setStyle(HtmlStyle.deprecationBlock);
Content deprPhrase = HtmlTree.SPAN(HtmlStyle.deprecatedLabel, getDeprecatedPhrase(pkg));
- deprDiv.addContent(deprPhrase);
+ deprDiv.add(deprPhrase);
if (!deprs.isEmpty()) {
CommentHelper ch = utils.getCommentHelper(pkg);
List<? extends DocTree> commentTags = ch.getDescription(configuration, deprs.get(0));
@@ -939,7 +939,7 @@
addInlineDeprecatedComment(pkg, deprs.get(0), deprDiv);
}
}
- li.addContent(deprDiv);
+ li.add(deprDiv);
}
}
}
--- a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/NestedClassWriterImpl.java Tue Mar 12 09:49:10 2019 +0000
+++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/NestedClassWriterImpl.java Sat Mar 16 21:00:45 2019 +0000
@@ -70,7 +70,7 @@
@Override
public Content getMemberSummaryHeader(TypeElement typeElement,
Content memberSummaryTree) {
- memberSummaryTree.addContent(MarkerComments.START_OF_NESTED_CLASS_SUMMARY);
+ memberSummaryTree.add(MarkerComments.START_OF_NESTED_CLASS_SUMMARY);
Content memberTree = writer.getMemberTreeHeader();
writer.addSummaryHeader(this, typeElement, memberTree);
return memberTree;
@@ -91,7 +91,7 @@
public void addSummaryLabel(Content memberTree) {
Content label = HtmlTree.HEADING(Headings.TypeDeclaration.SUMMARY_HEADING,
contents.nestedClassSummary);
- memberTree.addContent(label);
+ memberTree.add(label);
}
/**
@@ -122,7 +122,7 @@
*/
@Override
public void addSummaryAnchor(TypeElement typeElement, Content memberTree) {
- memberTree.addContent(links.createAnchor(
+ memberTree.add(links.createAnchor(
SectionName.NESTED_CLASS_SUMMARY));
}
@@ -131,7 +131,7 @@
*/
@Override
public void addInheritedSummaryAnchor(TypeElement typeElement, Content inheritedTree) {
- inheritedTree.addContent(links.createAnchor(
+ inheritedTree.add(links.createAnchor(
SectionName.NESTED_CLASSES_INHERITANCE,
utils.getFullyQualifiedName(typeElement)));
}
@@ -154,9 +154,9 @@
: resources.getText("doclet.Nested_Classes_Interfaces_Inherited_From_Class"));
}
Content labelHeading = HtmlTree.HEADING(Headings.TypeDeclaration.SUMMARY_HEADING, label);
- labelHeading.addContent(Contents.SPACE);
- labelHeading.addContent(classLink);
- inheritedTree.addContent(labelHeading);
+ labelHeading.add(Contents.SPACE);
+ labelHeading.add(classLink);
+ inheritedTree.add(labelHeading);
}
/**
@@ -168,7 +168,7 @@
Content memberLink = HtmlTree.SPAN(HtmlStyle.memberNameLink,
writer.getLink(new LinkInfoImpl(configuration, context, (TypeElement)member)));
Content code = HtmlTree.CODE(memberLink);
- tdSummary.addContent(code);
+ tdSummary.add(code);
}
/**
@@ -176,7 +176,7 @@
*/
@Override
protected void addInheritedSummaryLink(TypeElement typeElement, Element member, Content linksTree) {
- linksTree.addContent(
+ linksTree.add(
writer.getLink(new LinkInfoImpl(configuration, LinkInfoImpl.Kind.MEMBER,
(TypeElement)member)));
}
--- a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/PackageFrameWriter.java Tue Mar 12 09:49:10 2019 +0000
+++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/PackageFrameWriter.java Sat Mar 16 21:00:45 2019 +0000
@@ -103,12 +103,12 @@
HtmlTree htmlTree = HtmlTree.MAIN();
Content heading = HtmlTree.HEADING(Headings.PAGE_TITLE_HEADING, HtmlStyle.bar,
packgen.getTargetPackageLink(packageElement, "classFrame", pkgNameContent));
- htmlTree.addContent(heading);
+ htmlTree.add(heading);
HtmlTree div = new HtmlTree(HtmlTag.DIV);
div.setStyle(HtmlStyle.indexContainer);
packgen.addClassListing(div);
- htmlTree.addContent(div);
- body.addContent(htmlTree);
+ htmlTree.add(div);
+ body.add(htmlTree);
packgen.printHtmlDocument(
configuration.metakeywords.getMetaKeywords(packageElement),
getDescription("package summary (frame)", packageElement),
@@ -178,7 +178,7 @@
if (!printedHeader) {
Content heading = HtmlTree.HEADING(Headings.CONTENT_HEADING,
true, labelContent);
- htmlTree.addContent(heading);
+ htmlTree.add(heading);
printedHeader = true;
}
Content arr_i_name = new StringContent(utils.getSimpleName(typeElement));
@@ -187,10 +187,10 @@
Content link = getLink(new LinkInfoImpl(configuration,
LinkInfoImpl.Kind.PACKAGE_FRAME, typeElement).label(arr_i_name).target("classFrame"));
Content li = HtmlTree.LI(link);
- ul.addContent(li);
+ ul.add(li);
}
- htmlTree.addContent(ul);
- contentTree.addContent(htmlTree);
+ htmlTree.add(ul);
+ contentTree.add(htmlTree);
}
}
}
--- a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/PackageIndexFrameWriter.java Tue Mar 12 09:49:10 2019 +0000
+++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/PackageIndexFrameWriter.java Sat Mar 16 21:00:45 2019 +0000
@@ -94,11 +94,11 @@
// package is marked as deprecated.
if (aPackage != null &&
(!(configuration.nodeprecated && utils.isDeprecated(aPackage)))) {
- ul.addContent(getPackage(aPackage));
+ ul.add(getPackage(aPackage));
}
}
- htmlTree.addContent(ul);
- main.addContent(htmlTree);
+ htmlTree.add(ul);
+ main.add(htmlTree);
}
/**
@@ -138,7 +138,7 @@
if (!headerContent.isEmpty()) {
Content heading = HtmlTree.HEADING(Headings.PAGE_TITLE_HEADING, true,
HtmlStyle.bar, headerContent);
- header.addContent(heading);
+ header.add(heading);
packageListHeading = Headings.IndexFrames.PACKAGE_HEADING;
} else {
packageListHeading = Headings.PAGE_TITLE_HEADING;
@@ -163,7 +163,7 @@
Content linkContent = links.createLink(DocPaths.ALLCLASSES_FRAME,
contents.allClassesLabel, "", "packageFrame");
Content li = HtmlTree.LI(linkContent);
- ul.addContent(li);
+ ul.add(li);
}
/**
@@ -177,7 +177,7 @@
Content linkContent = links.createLink(DocPaths.MODULE_OVERVIEW_FRAME,
contents.allModulesLabel, "", "packageListFrame");
Content li = HtmlTree.LI(linkContent);
- ul.addContent(li);
+ ul.add(li);
}
/**
@@ -186,6 +186,6 @@
@Override
protected void addNavigationBarFooter(Content footer) {
Content p = HtmlTree.P(Contents.SPACE);
- footer.addContent(p);
+ footer.add(p);
}
}
--- a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/PackageIndexWriter.java Tue Mar 12 09:49:10 2019 +0000
+++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/PackageIndexWriter.java Sat Mar 16 21:00:45 2019 +0000
@@ -129,7 +129,7 @@
}
Content div = HtmlTree.DIV(HtmlStyle.contentContainer, table.toContent());
- main.addContent(div);
+ main.add(div);
if (table.needsScript()) {
getMainBodyScript().append(table.getScript());
@@ -151,7 +151,7 @@
HtmlTree div = new HtmlTree(HtmlTag.DIV);
div.setStyle(HtmlStyle.contentContainer);
addOverviewComment(div);
- main.addContent(div);
+ main.add(div);
}
}
@@ -179,7 +179,7 @@
protected void addNavigationBarHeader(Content header) {
addTop(header);
navBar.setUserHeader(getUserHeaderFooter(true));
- header.addContent(navBar.getContent(true));
+ header.add(navBar.getContent(true));
}
/**
@@ -191,7 +191,7 @@
@Override
protected void addNavigationBarFooter(Content footer) {
navBar.setUserFooter(getUserHeaderFooter(false));
- footer.addContent(navBar.getContent(false));
+ footer.add(navBar.getContent(false));
addBottom(footer);
}
}
--- a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/PackageTreeWriter.java Tue Mar 12 09:49:10 2019 +0000
+++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/PackageTreeWriter.java Sat Mar 16 21:00:45 2019 +0000
@@ -106,20 +106,20 @@
if (configuration.packages.size() > 1) {
addLinkToMainTree(div);
}
- mainTree.addContent(div);
+ mainTree.add(div);
HtmlTree divTree = new HtmlTree(HtmlTag.DIV);
divTree.setStyle(HtmlStyle.contentContainer);
addTree(classtree.baseClasses(), "doclet.Class_Hierarchy", divTree);
addTree(classtree.baseInterfaces(), "doclet.Interface_Hierarchy", divTree);
addTree(classtree.baseAnnotationTypes(), "doclet.Annotation_Type_Hierarchy", divTree);
addTree(classtree.baseEnums(), "doclet.Enum_Hierarchy", divTree, true);
- mainTree.addContent(divTree);
- body.addContent(mainTree);
+ mainTree.add(divTree);
+ body.add(mainTree);
HtmlTree footer = HtmlTree.FOOTER();
navBar.setUserFooter(getUserHeaderFooter(false));
- footer.addContent(navBar.getContent(false));
+ footer.add(navBar.getContent(false));
addBottom(footer);
- body.addContent(footer);
+ body.add(footer);
printHtmlDocument(null, getDescription("tree", packageElement), body);
}
@@ -138,8 +138,8 @@
contents.moduleLabel);
navBar.setNavLinkModule(linkContent);
navBar.setUserHeader(getUserHeaderFooter(true));
- htmlTree.addContent(navBar.getContent(true));
- bodyTree.addContent(htmlTree);
+ htmlTree.add(navBar.getContent(true));
+ bodyTree.add(htmlTree);
return bodyTree;
}
@@ -151,10 +151,10 @@
protected void addLinkToMainTree(Content div) {
Content span = HtmlTree.SPAN(HtmlStyle.packageHierarchyLabel,
contents.packageHierarchies);
- div.addContent(span);
+ div.add(span);
HtmlTree ul = new HtmlTree (HtmlTag.UL);
ul.setStyle(HtmlStyle.horizontal);
- ul.addContent(getNavLinkMainTree(resources.getText("doclet.All_Packages")));
- div.addContent(ul);
+ ul.add(getNavLinkMainTree(resources.getText("doclet.All_Packages")));
+ div.add(ul);
}
}
--- a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/PackageUseWriter.java Tue Mar 12 09:49:10 2019 +0000
+++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/PackageUseWriter.java Sat Mar 16 21:00:45 2019 +0000
@@ -129,17 +129,17 @@
HtmlTree div = new HtmlTree(HtmlTag.DIV);
div.setStyle(HtmlStyle.contentContainer);
if (usingPackageToUsedClasses.isEmpty()) {
- div.addContent(contents.getContent("doclet.ClassUse_No.usage.of.0", utils.getPackageName(packageElement)));
+ div.add(contents.getContent("doclet.ClassUse_No.usage.of.0", utils.getPackageName(packageElement)));
} else {
addPackageUse(div);
}
- mainTree.addContent(div);
- body.addContent(mainTree);
+ mainTree.add(div);
+ body.add(mainTree);
HtmlTree footer = HtmlTree.FOOTER();
navBar.setUserFooter(getUserHeaderFooter(false));
- footer.addContent(navBar.getContent(false));
+ footer.add(navBar.getContent(false));
addBottom(footer);
- body.addContent(footer);
+ body.add(footer);
printHtmlDocument(null,
getDescription("use", packageElement),
body);
@@ -157,7 +157,7 @@
addPackageList(ul);
}
addClassList(ul);
- contentTree.addContent(ul);
+ contentTree.add(ul);
}
/**
@@ -181,12 +181,12 @@
if (pkg != null && !pkg.isUnnamed()) {
addSummaryComment(pkg, summary);
} else {
- summary.addContent(Contents.SPACE);
+ summary.add(Contents.SPACE);
}
table.addRow(packageLink, summary);
}
Content li = HtmlTree.LI(HtmlStyle.blockList, table.toContent());
- contentTree.addContent(li);
+ contentTree.add(li);
}
/**
@@ -201,7 +201,7 @@
PackageElement usingPackage = utils.elementUtils.getPackageElement(packageName);
HtmlTree li = new HtmlTree(HtmlTag.LI);
li.setStyle(HtmlStyle.blockList);
- li.addContent(links.createAnchor(getPackageAnchorName(usingPackage)));
+ li.add(links.createAnchor(getPackageAnchorName(usingPackage)));
String tableSummary = resources.getText("doclet.Use_Table_Summary",
resources.getText("doclet.classes"));
Content caption = contents.getContent(
@@ -223,8 +223,8 @@
table.addRow(typeContent, summary);
}
- li.addContent(table.toContent());
- contentTree.addContent(li);
+ li.add(table.toContent());
+ contentTree.add(li);
}
}
@@ -244,16 +244,16 @@
contents.moduleLabel);
navBar.setNavLinkModule(linkContent);
navBar.setUserHeader(getUserHeaderFooter(true));
- htmlTree.addContent(navBar.getContent(true));
- bodyTree.addContent(htmlTree);
+ htmlTree.add(navBar.getContent(true));
+ bodyTree.add(htmlTree);
ContentBuilder headContent = new ContentBuilder();
- headContent.addContent(contents.getContent("doclet.ClassUse_Title", packageText));
- headContent.addContent(new HtmlTree(HtmlTag.BR));
- headContent.addContent(name);
+ headContent.add(contents.getContent("doclet.ClassUse_Title", packageText));
+ headContent.add(new HtmlTree(HtmlTag.BR));
+ headContent.add(name);
Content heading = HtmlTree.HEADING(Headings.PAGE_TITLE_HEADING, true,
HtmlStyle.title, headContent);
Content div = HtmlTree.DIV(HtmlStyle.header, heading);
- mainTree.addContent(div);
+ mainTree.add(div);
return bodyTree;
}
}
--- a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/PackageWriterImpl.java Tue Mar 12 09:49:10 2019 +0000
+++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/PackageWriterImpl.java Sat Mar 16 21:00:45 2019 +0000
@@ -112,29 +112,29 @@
contents.moduleLabel);
navBar.setNavLinkModule(linkContent);
navBar.setUserHeader(getUserHeaderFooter(true));
- htmlTree.addContent(navBar.getContent(true));
- bodyTree.addContent(htmlTree);
+ htmlTree.add(navBar.getContent(true));
+ bodyTree.add(htmlTree);
HtmlTree div = new HtmlTree(HtmlTag.DIV);
div.setStyle(HtmlStyle.header);
if (configuration.showModules) {
ModuleElement mdle = configuration.docEnv.getElementUtils().getModuleOf(packageElement);
Content classModuleLabel = HtmlTree.SPAN(HtmlStyle.moduleLabelInPackage, contents.moduleLabel);
Content moduleNameDiv = HtmlTree.DIV(HtmlStyle.subTitle, classModuleLabel);
- moduleNameDiv.addContent(Contents.SPACE);
- moduleNameDiv.addContent(getModuleLink(mdle,
+ moduleNameDiv.add(Contents.SPACE);
+ moduleNameDiv.add(getModuleLink(mdle,
new StringContent(mdle.getQualifiedName().toString())));
- div.addContent(moduleNameDiv);
+ div.add(moduleNameDiv);
}
Content annotationContent = new HtmlTree(HtmlTag.P);
addAnnotationInfo(packageElement, annotationContent);
- div.addContent(annotationContent);
+ div.add(annotationContent);
Content tHeading = HtmlTree.HEADING(Headings.PAGE_TITLE_HEADING, true,
HtmlStyle.title, contents.packageLabel);
- tHeading.addContent(Contents.SPACE);
+ tHeading.add(Contents.SPACE);
Content packageHead = new StringContent(heading);
- tHeading.addContent(packageHead);
- div.addContent(tHeading);
- mainTree.addContent(div);
+ tHeading.add(packageHead);
+ div.add(tHeading);
+ mainTree.add(div);
return bodyTree;
}
@@ -160,14 +160,14 @@
HtmlTree deprDiv = new HtmlTree(HtmlTag.DIV);
deprDiv.setStyle(HtmlStyle.deprecationBlock);
Content deprPhrase = HtmlTree.SPAN(HtmlStyle.deprecatedLabel, getDeprecatedPhrase(packageElement));
- deprDiv.addContent(deprPhrase);
+ deprDiv.add(deprPhrase);
if (!deprs.isEmpty()) {
List<? extends DocTree> commentTags = ch.getDescription(configuration, deprs.get(0));
if (!commentTags.isEmpty()) {
addInlineDeprecatedComment(packageElement, deprs.get(0), deprDiv);
}
}
- div.addContent(deprDiv);
+ div.add(deprDiv);
}
}
@@ -251,7 +251,7 @@
configuration, LinkInfoImpl.Kind.PACKAGE, klass));
ContentBuilder description = new ContentBuilder();
if (utils.isDeprecated(klass)) {
- description.addContent(getDeprecatedPhrase(klass));
+ description.add(getDeprecatedPhrase(klass));
List<? extends DocTree> tags = utils.getDeprecatedTrees(klass);
if (!tags.isEmpty()) {
addSummaryDeprecatedComment(klass, tags.get(0), description);
@@ -262,7 +262,7 @@
table.addRow(classLink, description);
}
Content li = HtmlTree.LI(HtmlStyle.blockList, table.toContent());
- summaryContentTree.addContent(li);
+ summaryContentTree.add(li);
}
}
@@ -273,7 +273,7 @@
public void addPackageDescription(Content packageContentTree) {
if (!utils.getBody(packageElement).isEmpty()) {
Content tree = sectionTree;
- tree.addContent(links.createAnchor(SectionName.PACKAGE_DESCRIPTION));
+ tree.add(links.createAnchor(SectionName.PACKAGE_DESCRIPTION));
addDeprecationInfo(tree);
addInlineComment(packageElement, tree);
}
@@ -286,7 +286,7 @@
public void addPackageTags(Content packageContentTree) {
Content htmlTree = sectionTree;
addTagsInfo(packageElement, htmlTree);
- packageContentTree.addContent(sectionTree);
+ packageContentTree.add(sectionTree);
}
/**
@@ -294,8 +294,8 @@
*/
@Override
public void addPackageContent(Content contentTree, Content packageContentTree) {
- mainTree.addContent(packageContentTree);
- contentTree.addContent(mainTree);
+ mainTree.add(packageContentTree);
+ contentTree.add(mainTree);
}
/**
@@ -305,9 +305,9 @@
public void addPackageFooter(Content contentTree) {
Content htmlTree = HtmlTree.FOOTER();
navBar.setUserFooter(getUserHeaderFooter(false));
- htmlTree.addContent(navBar.getContent(false));
+ htmlTree.add(navBar.getContent(false));
addBottom(htmlTree);
- contentTree.addContent(htmlTree);
+ contentTree.add(htmlTree);
}
/**
--- a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/PropertyWriterImpl.java Tue Mar 12 09:49:10 2019 +0000
+++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/PropertyWriterImpl.java Sat Mar 16 21:00:45 2019 +0000
@@ -67,7 +67,7 @@
*/
@Override
public Content getMemberSummaryHeader(TypeElement typeElement, Content memberSummaryTree) {
- memberSummaryTree.addContent(MarkerComments.START_OF_PROPERTY_SUMMARY);
+ memberSummaryTree.add(MarkerComments.START_OF_PROPERTY_SUMMARY);
Content memberTree = writer.getMemberTreeHeader();
writer.addSummaryHeader(this, typeElement, memberTree);
return memberTree;
@@ -87,12 +87,12 @@
@Override
public Content getPropertyDetailsTreeHeader(TypeElement typeElement,
Content memberDetailsTree) {
- memberDetailsTree.addContent(MarkerComments.START_OF_PROPERTY_DETAILS);
+ memberDetailsTree.add(MarkerComments.START_OF_PROPERTY_DETAILS);
Content propertyDetailsTree = writer.getMemberTreeHeader();
- propertyDetailsTree.addContent(links.createAnchor(SectionName.PROPERTY_DETAIL));
+ propertyDetailsTree.add(links.createAnchor(SectionName.PROPERTY_DETAIL));
Content heading = HtmlTree.HEADING(Headings.TypeDeclaration.DETAILS_HEADING,
contents.propertyDetailsLabel);
- propertyDetailsTree.addContent(heading);
+ propertyDetailsTree.add(heading);
return propertyDetailsTree;
}
@@ -102,11 +102,11 @@
@Override
public Content getPropertyDocTreeHeader(ExecutableElement property,
Content propertyDetailsTree) {
- propertyDetailsTree.addContent(links.createAnchor(name(property)));
+ propertyDetailsTree.add(links.createAnchor(name(property)));
Content propertyDocTree = writer.getMemberTreeHeader();
Content heading = new HtmlTree(Headings.TypeDeclaration.MEMBER_HEADING);
- heading.addContent(utils.getPropertyLabel(name(property)));
- propertyDocTree.addContent(heading);
+ heading.add(utils.getPropertyLabel(name(property)));
+ propertyDocTree.add(heading);
return propertyDocTree;
}
@@ -121,8 +121,8 @@
Content propertylink = writer.getLink(new LinkInfoImpl(
configuration, LinkInfoImpl.Kind.MEMBER,
utils.getReturnType(property)));
- pre.addContent(propertylink);
- pre.addContent(" ");
+ pre.add(propertylink);
+ pre.add(" ");
if (configuration.linksource) {
Content propertyName = new StringContent(name(property));
writer.addSrcLink(property, propertyName, pre);
@@ -161,9 +161,9 @@
utils.isClass(holder)
? contents.descfrmClassLabel
: contents.descfrmInterfaceLabel);
- descfrmLabel.addContent(Contents.SPACE);
- descfrmLabel.addContent(codeLink);
- propertyDocTree.addContent(HtmlTree.DIV(HtmlStyle.block, descfrmLabel));
+ descfrmLabel.add(Contents.SPACE);
+ descfrmLabel.add(codeLink);
+ propertyDocTree.add(HtmlTree.DIV(HtmlStyle.block, descfrmLabel));
writer.addInlineComment(property, propertyDocTree);
}
}
@@ -201,7 +201,7 @@
public void addSummaryLabel(Content memberTree) {
Content label = HtmlTree.HEADING(Headings.TypeDeclaration.SUMMARY_HEADING,
contents.propertySummaryLabel);
- memberTree.addContent(label);
+ memberTree.add(label);
}
/**
@@ -230,7 +230,7 @@
*/
@Override
public void addSummaryAnchor(TypeElement typeElement, Content memberTree) {
- memberTree.addContent(links.createAnchor(SectionName.PROPERTY_SUMMARY));
+ memberTree.add(links.createAnchor(SectionName.PROPERTY_SUMMARY));
}
/**
@@ -238,7 +238,7 @@
*/
@Override
public void addInheritedSummaryAnchor(TypeElement typeElement, Content inheritedTree) {
- inheritedTree.addContent(links.createAnchor(
+ inheritedTree.add(links.createAnchor(
SectionName.PROPERTIES_INHERITANCE,
configuration.getClassName(typeElement)));
}
@@ -262,9 +262,9 @@
}
Content labelHeading = HtmlTree.HEADING(Headings.TypeDeclaration.INHERITED_SUMMARY_HEADING,
label);
- labelHeading.addContent(Contents.SPACE);
- labelHeading.addContent(classLink);
- inheritedTree.addContent(labelHeading);
+ labelHeading.add(Contents.SPACE);
+ labelHeading.add(classLink);
+ inheritedTree.add(labelHeading);
}
/**
@@ -281,7 +281,7 @@
true));
Content code = HtmlTree.CODE(memberLink);
- tdSummary.addContent(code);
+ tdSummary.add(code);
}
/**
@@ -293,7 +293,7 @@
Content content = writer.getDocLink(LinkInfoImpl.Kind.MEMBER, typeElement, member,
utils.isProperty(mname) ? utils.getPropertyName(mname) : mname,
false, true);
- linksTree.addContent(content);
+ linksTree.add(content);
}
/**
--- a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/SerializedFormWriterImpl.java Tue Mar 12 09:49:10 2019 +0000
+++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/SerializedFormWriterImpl.java Sat Mar 16 21:00:45 2019 +0000
@@ -82,13 +82,13 @@
HtmlTree htmlTree = HtmlTree.HEADER();
addTop(htmlTree);
navBar.setUserHeader(getUserHeaderFooter(true));
- htmlTree.addContent(navBar.getContent(true));
- bodyTree.addContent(htmlTree);
+ htmlTree.add(navBar.getContent(true));
+ bodyTree.add(htmlTree);
Content h1Content = new StringContent(header);
Content heading = HtmlTree.HEADING(Headings.PAGE_TITLE_HEADING, true,
HtmlStyle.title, h1Content);
Content div = HtmlTree.DIV(HtmlStyle.header, heading);
- mainTree.addContent(div);
+ mainTree.add(div);
return bodyTree;
}
@@ -121,8 +121,8 @@
public Content getPackageHeader(String packageName) {
Content heading = HtmlTree.HEADING(Headings.SerializedForm.PACKAGE_HEADING, true,
contents.packageLabel);
- heading.addContent(Contents.SPACE);
- heading.addContent(packageName);
+ heading.add(Contents.SPACE);
+ heading.add(packageName);
return heading;
}
@@ -172,7 +172,7 @@
contents.getContent(
"doclet.Class_0_extends_implements_serializable", classLink,
superClassLink);
- li.addContent(HtmlTree.HEADING(Headings.SerializedForm.CLASS_HEADING, className));
+ li.add(HtmlTree.HEADING(Headings.SerializedForm.CLASS_HEADING, className));
return li;
}
@@ -198,9 +198,9 @@
public void addSerialUIDInfo(String header, String serialUID,
Content serialUidTree) {
Content headerContent = new StringContent(header);
- serialUidTree.addContent(HtmlTree.DT(headerContent));
+ serialUidTree.add(HtmlTree.DT(headerContent));
Content serialContent = new StringContent(serialUID);
- serialUidTree.addContent(HtmlTree.DD(serialContent));
+ serialUidTree.add(HtmlTree.DD(serialContent));
}
/**
@@ -223,7 +223,7 @@
public Content getSerializedContent(Content serializedTreeContent) {
HtmlTree divContent = HtmlTree.DIV(HtmlStyle.serializedFormContainer,
serializedTreeContent);
- mainTree.addContent(divContent);
+ mainTree.add(divContent);
return mainTree;
}
@@ -232,7 +232,7 @@
*/
public void addPackageSerializedTree(Content serializedSummariesTree,
Content packageSerializedTree) {
- serializedSummariesTree.addContent(HtmlTree.LI(HtmlStyle.blockList, packageSerializedTree));
+ serializedSummariesTree.add(HtmlTree.LI(HtmlStyle.blockList, packageSerializedTree));
}
/**
@@ -243,9 +243,9 @@
public void addFooter(Content serializedTree) {
Content htmlTree = HtmlTree.FOOTER();
navBar.setUserFooter(getUserHeaderFooter(false));
- htmlTree.addContent(navBar.getContent(false));
+ htmlTree.add(navBar.getContent(false));
addBottom(htmlTree);
- serializedTree.addContent(htmlTree);
+ serializedTree.add(htmlTree);
}
/**
--- a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/SingleIndexWriter.java Tue Mar 12 09:49:10 2019 +0000
+++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/SingleIndexWriter.java Sat Mar 16 21:00:45 2019 +0000
@@ -96,10 +96,10 @@
HtmlTree header = HtmlTree.HEADER();
addTop(header);
navBar.setUserHeader(getUserHeaderFooter(true));
- header.addContent(navBar.getContent(true));
- body.addContent(header);
+ header.add(navBar.getContent(true));
+ body.add(header);
HtmlTree main = HtmlTree.MAIN();
- main.addContent(HtmlTree.DIV(HtmlStyle.header,
+ main.add(HtmlTree.DIV(HtmlStyle.header,
HtmlTree.HEADING(Headings.PAGE_TITLE_HEADING,
contents.getContent("doclet.Index"))));
HtmlTree divTree = new HtmlTree(HtmlTag.DIV);
@@ -118,13 +118,13 @@
}
}
addLinksForIndexes(divTree);
- main.addContent(divTree);
- body.addContent(main);
+ main.add(divTree);
+ body.add(main);
HtmlTree footer = HtmlTree.FOOTER();
navBar.setUserFooter(getUserHeaderFooter(false));
- footer.addContent(navBar.getContent(false));
+ footer.add(navBar.getContent(false));
addBottom(footer);
- body.addContent(footer);
+ body.add(footer);
createSearchIndexFiles();
printHtmlDocument(null, "index", body);
}
@@ -137,17 +137,17 @@
protected void addLinksForIndexes(Content contentTree) {
for (Object ch : elements) {
String unicode = ch.toString();
- contentTree.addContent(
+ contentTree.add(
links.createLink(getNameForIndex(unicode),
new StringContent(unicode)));
- contentTree.addContent(Contents.SPACE);
+ contentTree.add(Contents.SPACE);
}
- contentTree.addContent(new HtmlTree(HtmlTag.BR));
- contentTree.addContent(links.createLink(DocPaths.ALLCLASSES_INDEX,
+ contentTree.add(new HtmlTree(HtmlTag.BR));
+ contentTree.add(links.createLink(DocPaths.ALLCLASSES_INDEX,
contents.allClassesLabel));
if (!configuration.packages.isEmpty()) {
- contentTree.addContent(Contents.SPACE);
- contentTree.addContent(links.createLink(DocPaths.ALLPACKAGES_INDEX,
+ contentTree.add(Contents.SPACE);
+ contentTree.add(links.createLink(DocPaths.ALLPACKAGES_INDEX,
contents.allPackagesLabel));
}
}
--- a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/SourceToHTMLConverter.java Tue Mar 12 09:49:10 2019 +0000
+++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/SourceToHTMLConverter.java Sat Mar 16 21:00:45 2019 +0000
@@ -36,7 +36,6 @@
import javax.tools.FileObject;
import jdk.javadoc.doclet.DocletEnvironment;
-import jdk.javadoc.internal.doclets.formats.html.markup.DocType;
import jdk.javadoc.internal.doclets.formats.html.markup.HtmlAttr;
import jdk.javadoc.internal.doclets.formats.html.markup.HtmlDocument;
import jdk.javadoc.internal.doclets.formats.html.markup.HtmlStyle;
@@ -196,7 +195,7 @@
}
addBlankLines(pre);
Content div = HtmlTree.DIV(HtmlStyle.sourceContainer, pre);
- body.addContent(HtmlTree.MAIN(div));
+ body.add(HtmlTree.MAIN(div));
writeToFile(body, outputdir.resolve(configuration.docPaths.forClass(te)), te);
} catch (IOException e) {
String message = resources.getText("doclet.exception.read.file", fo.getName());
@@ -242,7 +241,7 @@
}
DocPath p = relativePath.resolve(stylesheet);
HtmlTree link = HtmlTree.LINK("stylesheet", "text/css", p.getPath(), "Style");
- head.addContent(link);
+ head.add(link);
addStylesheets(head);
}
@@ -254,7 +253,7 @@
DocPath ssheetPath = DocPath.create(file.getName());
HtmlTree slink = HtmlTree.LINK("stylesheet", "text/css", relativePath.resolve(ssheetPath).getPath(),
"Style");
- tree.addContent(slink);
+ tree.add(slink);
});
}
}
@@ -265,7 +264,7 @@
* @return the header content for the HTML file
*/
private static Content getHeader() {
- return new HtmlTree(HtmlTag.BODY).addAttr(HtmlAttr.CLASS, "source");
+ return new HtmlTree(HtmlTag.BODY).put(HtmlAttr.CLASS, "source");
}
/**
@@ -278,13 +277,13 @@
HtmlTree span = new HtmlTree(HtmlTag.SPAN);
span.setStyle(HtmlStyle.sourceLineNo);
if (lineno < 10) {
- span.addContent("00" + Integer.toString(lineno));
+ span.add("00" + Integer.toString(lineno));
} else if (lineno < 100) {
- span.addContent("0" + Integer.toString(lineno));
+ span.add("0" + Integer.toString(lineno));
} else {
- span.addContent(Integer.toString(lineno));
+ span.add(Integer.toString(lineno));
}
- pre.addContent(span);
+ pre.add(span);
}
/**
@@ -299,8 +298,8 @@
Content anchor = HtmlTree.A_ID(
"line." + Integer.toString(currentLineNo),
new StringContent(utils.replaceTabs(line)));
- pre.addContent(anchor);
- pre.addContent(NEW_LINE);
+ pre.add(anchor);
+ pre.add(NEW_LINE);
}
}
@@ -311,7 +310,7 @@
*/
private static void addBlankLines(Content pre) {
for (int i = 0; i < NUM_BLANK_LINES; i++) {
- pre.addContent(NEW_LINE);
+ pre.add(NEW_LINE);
}
}
--- a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/SplitIndexWriter.java Tue Mar 12 09:49:10 2019 +0000
+++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/SplitIndexWriter.java Sat Mar 16 21:00:45 2019 +0000
@@ -124,10 +124,10 @@
HtmlTree header = HtmlTree.HEADER();
addTop(header);
navBar.setUserHeader(getUserHeaderFooter(true));
- header.addContent(navBar.getContent(true));
- body.addContent(header);
+ header.add(navBar.getContent(true));
+ body.add(header);
HtmlTree main = HtmlTree.MAIN();
- main.addContent(HtmlTree.DIV(HtmlStyle.header,
+ main.add(HtmlTree.DIV(HtmlStyle.header,
HtmlTree.HEADING(Headings.PAGE_TITLE_HEADING,
contents.getContent("doclet.Index"))));
HtmlTree divTree = new HtmlTree(HtmlTag.DIV);
@@ -142,13 +142,13 @@
configuration.tagSearchIndexMap.get(unicode), divTree);
}
addLinksForIndexes(divTree);
- main.addContent(divTree);
- body.addContent(main);
+ main.add(divTree);
+ body.add(main);
HtmlTree footer = HtmlTree.FOOTER();
navBar.setUserFooter(getUserHeaderFooter(false));
- footer.addContent(navBar.getContent(false));
+ footer.add(navBar.getContent(false));
addBottom(footer);
- body.addContent(footer);
+ body.add(footer);
String description = "index: " + unicode;
printHtmlDocument(null, description, body);
}
@@ -161,16 +161,16 @@
protected void addLinksForIndexes(Content contentTree) {
for (int i = 0; i < indexElements.size(); i++) {
int j = i + 1;
- contentTree.addContent(links.createLink(DocPaths.indexN(j),
+ contentTree.add(links.createLink(DocPaths.indexN(j),
new StringContent(indexElements.get(i).toString())));
- contentTree.addContent(Contents.SPACE);
+ contentTree.add(Contents.SPACE);
}
- contentTree.addContent(new HtmlTree(HtmlTag.BR));
- contentTree.addContent(links.createLink(pathToRoot.resolve(DocPaths.ALLCLASSES_INDEX),
+ contentTree.add(new HtmlTree(HtmlTag.BR));
+ contentTree.add(links.createLink(pathToRoot.resolve(DocPaths.ALLCLASSES_INDEX),
contents.allClassesLabel));
if (!configuration.packages.isEmpty()) {
- contentTree.addContent(Contents.SPACE);
- contentTree.addContent(links.createLink(pathToRoot.resolve(DocPaths.ALLPACKAGES_INDEX),
+ contentTree.add(Contents.SPACE);
+ contentTree.add(links.createLink(pathToRoot.resolve(DocPaths.ALLPACKAGES_INDEX),
contents.allPackagesLabel));
}
}
--- a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/SubWriterHolderWriter.java Tue Mar 12 09:49:10 2019 +0000
+++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/SubWriterHolderWriter.java Sat Mar 16 21:00:45 2019 +0000
@@ -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
@@ -122,14 +122,14 @@
if (!deprs.isEmpty()) {
addSummaryDeprecatedComment(member, deprs.get(0), div);
}
- tdSummary.addContent(div);
+ tdSummary.add(div);
return;
} else {
Element te = member.getEnclosingElement();
if (te != null && utils.isTypeElement(te) && utils.isDeprecated(te)) {
Content deprLabel = HtmlTree.SPAN(HtmlStyle.deprecatedLabel, getDeprecatedPhrase(te));
div = HtmlTree.DIV(HtmlStyle.block, deprLabel);
- tdSummary.addContent(div);
+ tdSummary.add(div);
}
}
addSummaryComment(member, firstSentenceTags, tdSummary);
@@ -172,7 +172,7 @@
public void addInheritedMemberSummary(AbstractMemberWriter mw, TypeElement typeElement,
Element member, boolean isFirst, Content linksTree) {
if (! isFirst) {
- linksTree.addContent(", ");
+ linksTree.add(", ");
}
mw.addInheritedSummaryLink(typeElement, member, linksTree);
}
@@ -195,8 +195,8 @@
* @param classContentTree class content tree which will be added to the content tree
*/
public void addClassContentTree(Content contentTree, Content classContentTree) {
- mainTree.addContent(classContentTree);
- contentTree.addContent(mainTree);
+ mainTree.add(classContentTree);
+ contentTree.add(mainTree);
}
/**
@@ -228,7 +228,7 @@
*/
public void addMemberTree(Content memberSummaryTree, Content memberTree) {
HtmlTree htmlTree = HtmlTree.SECTION(getMemberTree(memberTree));
- memberSummaryTree.addContent(htmlTree);
+ memberSummaryTree.add(htmlTree);
}
/**
--- a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/TagletWriterImpl.java Tue Mar 12 09:49:10 2019 +0000
+++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/TagletWriterImpl.java Sat Mar 16 21:00:45 2019 +0000
@@ -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
@@ -28,8 +28,6 @@
import java.util.List;
import javax.lang.model.element.Element;
-import javax.lang.model.element.ModuleElement;
-import javax.lang.model.element.PackageElement;
import javax.lang.model.element.TypeElement;
import javax.lang.model.element.VariableElement;
import javax.lang.model.type.TypeMirror;
@@ -140,29 +138,29 @@
List<? extends DocTree> deprs = utils.getBlockTags(element, DocTree.Kind.DEPRECATED);
if (utils.isTypeElement(element)) {
if (utils.isDeprecated(element)) {
- result.addContent(HtmlTree.SPAN(HtmlStyle.deprecatedLabel,
+ result.add(HtmlTree.SPAN(HtmlStyle.deprecatedLabel,
htmlWriter.getDeprecatedPhrase(element)));
if (!deprs.isEmpty()) {
List<? extends DocTree> commentTags = ch.getDescription(configuration, deprs.get(0));
if (!commentTags.isEmpty()) {
- result.addContent(commentTagsToOutput(null, element, commentTags, false));
+ result.add(commentTagsToOutput(null, element, commentTags, false));
}
}
}
} else {
if (utils.isDeprecated(element)) {
- result.addContent(HtmlTree.SPAN(HtmlStyle.deprecatedLabel,
+ result.add(HtmlTree.SPAN(HtmlStyle.deprecatedLabel,
htmlWriter.getDeprecatedPhrase(element)));
if (!deprs.isEmpty()) {
List<? extends DocTree> bodyTags = ch.getBody(configuration, deprs.get(0));
Content body = commentTagsToOutput(null, element, bodyTags, false);
if (!body.isEmpty())
- result.addContent(HtmlTree.DIV(HtmlStyle.deprecationComment, body));
+ result.add(HtmlTree.DIV(HtmlStyle.deprecationComment, body));
}
} else {
Element ee = utils.getEnclosingTypeElement(element);
if (utils.isDeprecated(ee)) {
- result.addContent(HtmlTree.SPAN(HtmlStyle.deprecatedLabel,
+ result.add(HtmlTree.SPAN(HtmlStyle.deprecatedLabel,
htmlWriter.getDeprecatedPhrase(ee)));
}
}
@@ -194,10 +192,10 @@
public Content paramTagOutput(Element element, DocTree paramTag, String paramName) {
ContentBuilder body = new ContentBuilder();
CommentHelper ch = utils.getCommentHelper(element);
- body.addContent(HtmlTree.CODE(new RawHtml(paramName)));
- body.addContent(" - ");
+ body.add(HtmlTree.CODE(new RawHtml(paramName)));
+ body.add(" - ");
List<? extends DocTree> description = ch.getDescription(configuration, paramTag);
- body.addContent(htmlWriter.commentTagsToContent(paramTag, element, description, false, inSummary));
+ body.add(htmlWriter.commentTagsToContent(paramTag, element, description, false, inSummary));
HtmlTree result = HtmlTree.DD(body);
return result;
}
@@ -208,10 +206,10 @@
public Content propertyTagOutput(Element element, DocTree tag, String prefix) {
Content body = new ContentBuilder();
CommentHelper ch = utils.getCommentHelper(element);
- body.addContent(new RawHtml(prefix));
- body.addContent(" ");
- body.addContent(HtmlTree.CODE(new RawHtml(ch.getText(tag))));
- body.addContent(".");
+ body.add(new RawHtml(prefix));
+ body.add(" ");
+ body.add(HtmlTree.CODE(new RawHtml(ch.getText(tag))));
+ body.add(".");
Content result = HtmlTree.P(body);
return result;
}
@@ -222,9 +220,9 @@
public Content returnTagOutput(Element element, DocTree returnTag) {
ContentBuilder result = new ContentBuilder();
CommentHelper ch = utils.getCommentHelper(element);
- result.addContent(HtmlTree.DT(HtmlTree.SPAN(HtmlStyle.returnLabel,
+ result.add(HtmlTree.DT(HtmlTree.SPAN(HtmlStyle.returnLabel,
new StringContent(resources.getText("doclet.Returns")))));
- result.addContent(HtmlTree.DD(htmlWriter.commentTagsToContent(
+ result.add(HtmlTree.DD(htmlWriter.commentTagsToContent(
returnTag, element, ch.getDescription(configuration, returnTag), false, inSummary)));
return result;
}
@@ -236,7 +234,7 @@
ContentBuilder body = new ContentBuilder();
for (DocTree dt : seeTags) {
appendSeparatorIfNotEmpty(body);
- body.addContent(htmlWriter.seeTagToContent(holder, dt));
+ body.add(htmlWriter.seeTagToContent(holder, dt));
}
if (utils.isVariableElement(holder) && ((VariableElement)holder).getConstantValue() != null &&
htmlWriter instanceof ClassWriterImpl) {
@@ -248,7 +246,7 @@
((ClassWriterImpl) htmlWriter).getTypeElement().getQualifiedName() + "." +
utils.getSimpleName(holder);
DocLink link = constantsPath.fragment(whichConstant);
- body.addContent(htmlWriter.links.createLink(link,
+ body.add(htmlWriter.links.createLink(link,
new StringContent(resources.getText("doclet.Constants_Summary"))));
}
if (utils.isClass(holder) && utils.isSerializable((TypeElement)holder)) {
@@ -258,7 +256,7 @@
appendSeparatorIfNotEmpty(body);
DocPath serialPath = htmlWriter.pathToRoot.resolve(DocPaths.SERIALIZED_FORM);
DocLink link = serialPath.fragment(utils.getFullyQualifiedName(holder));
- body.addContent(htmlWriter.links.createLink(link,
+ body.add(htmlWriter.links.createLink(link,
new StringContent(resources.getText("doclet.Serialized_Form"))));
}
}
@@ -266,17 +264,17 @@
return body;
ContentBuilder result = new ContentBuilder();
- result.addContent(HtmlTree.DT(HtmlTree.SPAN(HtmlStyle.seeLabel,
+ result.add(HtmlTree.DT(HtmlTree.SPAN(HtmlStyle.seeLabel,
new StringContent(resources.getText("doclet.See_Also")))));
- result.addContent(HtmlTree.DD(body));
+ result.add(HtmlTree.DD(body));
return result;
}
private void appendSeparatorIfNotEmpty(ContentBuilder body) {
if (!body.isEmpty()) {
- body.addContent(", ");
- body.addContent(DocletConstants.NL);
+ body.add(", ");
+ body.add(DocletConstants.NL);
}
}
@@ -286,18 +284,18 @@
public Content simpleTagOutput(Element element, List<? extends DocTree> simpleTags, String header) {
CommentHelper ch = utils.getCommentHelper(element);
ContentBuilder result = new ContentBuilder();
- result.addContent(HtmlTree.DT(HtmlTree.SPAN(HtmlStyle.simpleTagLabel, new RawHtml(header))));
+ result.add(HtmlTree.DT(HtmlTree.SPAN(HtmlStyle.simpleTagLabel, new RawHtml(header))));
ContentBuilder body = new ContentBuilder();
boolean many = false;
for (DocTree simpleTag : simpleTags) {
if (many) {
- body.addContent(", ");
+ body.add(", ");
}
List<? extends DocTree> bodyTags = ch.getBody(configuration, simpleTag);
- body.addContent(htmlWriter.commentTagsToContent(simpleTag, element, bodyTags, false, inSummary));
+ body.add(htmlWriter.commentTagsToContent(simpleTag, element, bodyTags, false, inSummary));
many = true;
}
- result.addContent(HtmlTree.DD(body));
+ result.add(HtmlTree.DD(body));
return result;
}
@@ -306,11 +304,11 @@
*/
public Content simpleTagOutput(Element element, DocTree simpleTag, String header) {
ContentBuilder result = new ContentBuilder();
- result.addContent(HtmlTree.DT(HtmlTree.SPAN(HtmlStyle.simpleTagLabel, new RawHtml(header))));
+ result.add(HtmlTree.DT(HtmlTree.SPAN(HtmlStyle.simpleTagLabel, new RawHtml(header))));
CommentHelper ch = utils.getCommentHelper(element);
List<? extends DocTree> description = ch.getDescription(configuration, simpleTag);
Content body = htmlWriter.commentTagsToContent(simpleTag, element, description, false, inSummary);
- result.addContent(HtmlTree.DD(body));
+ result.add(HtmlTree.DD(body));
return result;
}
@@ -351,12 +349,12 @@
link.excludeTypeBounds = true;
excName = htmlWriter.getLink(link);
}
- body.addContent(HtmlTree.CODE(excName));
+ body.add(HtmlTree.CODE(excName));
List<? extends DocTree> description = ch.getDescription(configuration, throwsTag);
Content desc = htmlWriter.commentTagsToContent(throwsTag, element, description, false, inSummary);
if (desc != null && !desc.isEmpty()) {
- body.addContent(" - ");
- body.addContent(desc);
+ body.add(" - ");
+ body.add(desc);
}
HtmlTree result = HtmlTree.DD(body);
return result;
--- a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/TreeWriter.java Tue Mar 12 09:49:10 2019 +0000
+++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/TreeWriter.java Sat Mar 16 21:00:45 2019 +0000
@@ -112,20 +112,20 @@
Content div = HtmlTree.DIV(HtmlStyle.header, heading);
addPackageTreeLinks(div);
HtmlTree htmlTree = HtmlTree.MAIN();
- htmlTree.addContent(div);
+ htmlTree.add(div);
HtmlTree divTree = new HtmlTree(HtmlTag.DIV);
divTree.setStyle(HtmlStyle.contentContainer);
addTree(classtree.baseClasses(), "doclet.Class_Hierarchy", divTree);
addTree(classtree.baseInterfaces(), "doclet.Interface_Hierarchy", divTree);
addTree(classtree.baseAnnotationTypes(), "doclet.Annotation_Type_Hierarchy", divTree);
addTree(classtree.baseEnums(), "doclet.Enum_Hierarchy", divTree, true);
- htmlTree.addContent(divTree);
- body.addContent(htmlTree);
+ htmlTree.add(divTree);
+ body.add(htmlTree);
htmlTree = HtmlTree.FOOTER();
navBar.setUserFooter(getUserHeaderFooter(false));
- htmlTree.addContent(navBar.getContent(false));
+ htmlTree.add(navBar.getContent(false));
addBottom(htmlTree);
- body.addContent(htmlTree);
+ body.add(htmlTree);
printHtmlDocument(null, "class tree", body);
}
@@ -142,7 +142,7 @@
if (!classesOnly) {
Content span = HtmlTree.SPAN(HtmlStyle.packageHierarchyLabel,
contents.packageHierarchies);
- contentTree.addContent(span);
+ contentTree.add(span);
HtmlTree ul = new HtmlTree(HtmlTag.UL);
ul.setStyle(HtmlStyle.horizontal);
int i = 0;
@@ -159,12 +159,12 @@
Content li = HtmlTree.LI(links.createLink(link,
new StringContent(utils.getPackageName(pkg))));
if (i < packages.size() - 1) {
- li.addContent(", ");
+ li.add(", ");
}
- ul.addContent(li);
+ ul.add(li);
i++;
}
- contentTree.addContent(ul);
+ contentTree.add(ul);
}
}
@@ -179,8 +179,8 @@
HtmlTree htmlTree = HtmlTree.HEADER();
addTop(htmlTree);
navBar.setUserHeader(getUserHeaderFooter(true));
- htmlTree.addContent(navBar.getContent(true));
- bodyTree.addContent(htmlTree);
+ htmlTree.add(navBar.getContent(true));
+ bodyTree.add(htmlTree);
return bodyTree;
}
--- a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/markup/Comment.java Tue Mar 12 09:49:10 2019 +0000
+++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/markup/Comment.java Sat Mar 16 21:00:45 2019 +0000
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2010, 2016, 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
@@ -60,7 +60,7 @@
* @param content content that needs to be added
* @throws UnsupportedOperationException always
*/
- public void addContent(Content content) {
+ public void add(Content content) {
throw new UnsupportedOperationException();
}
@@ -71,7 +71,7 @@
* @throws UnsupportedOperationException always
*/
@Override
- public void addContent(CharSequence stringContent) {
+ public void add(CharSequence stringContent) {
throw new UnsupportedOperationException();
}
--- a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/markup/ContentBuilder.java Tue Mar 12 09:49:10 2019 +0000
+++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/markup/ContentBuilder.java Sat Mar 16 21:00:45 2019 +0000
@@ -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
@@ -43,12 +43,12 @@
public ContentBuilder(Content... contents) {
for (Content c : contents) {
- addContent(c);
+ add(c);
}
}
@Override
- public void addContent(Content content) {
+ public void add(Content content) {
nullCheck(content);
ensureMutableContents();
if (content instanceof ContentBuilder) {
@@ -58,7 +58,7 @@
}
@Override
- public void addContent(CharSequence text) {
+ public void add(CharSequence text) {
if (text.length() == 0)
return;
ensureMutableContents();
@@ -69,7 +69,7 @@
} else {
contents.add(sc = new StringContent());
}
- sc.addContent(text);
+ sc.add(text);
}
@Override
--- a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/markup/DocType.java Tue Mar 12 09:49:10 2019 +0000
+++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/markup/DocType.java Sat Mar 16 21:00:45 2019 +0000
@@ -36,8 +36,6 @@
* @author Bhavesh Patel
*/
public enum DocType {
- HTML4_TRANSITIONAL("<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.01 Transitional//EN\" "
- + "\"http://www.w3.org/TR/html4/loose.dtd\">"),
HTML5("<!DOCTYPE HTML>");
public final String text;
--- a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/markup/FixedStringContent.java Tue Mar 12 09:49:10 2019 +0000
+++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/markup/FixedStringContent.java Sat Mar 16 21:00:45 2019 +0000
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2010, 2016, 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
@@ -59,7 +59,7 @@
* @throws UnsupportedOperationException always
*/
@Override
- public void addContent(Content content) {
+ public void add(Content content) {
throw new UnsupportedOperationException();
}
@@ -71,7 +71,7 @@
* @throws UnsupportedOperationException always
*/
@Override
- public void addContent(CharSequence strContent) {
+ public void add(CharSequence strContent) {
throw new UnsupportedOperationException();
}
--- a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/markup/Head.java Tue Mar 12 09:49:10 2019 +0000
+++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/markup/Head.java Sat Mar 16 21:00:45 2019 +0000
@@ -251,40 +251,40 @@
Date now = showTimestamp ? calendar.getTime() : null;
HtmlTree tree = new HtmlTree(HtmlTag.HEAD);
- tree.addContent(getGeneratedBy(showTimestamp, now));
- tree.addContent(HtmlTree.TITLE(title));
+ tree.add(getGeneratedBy(showTimestamp, now));
+ tree.add(HtmlTree.TITLE(title));
if (charset != null) { // compatibility; should this be allowed?
- tree.addContent(HtmlTree.META("Content-Type", "text/html", charset));
+ tree.add(HtmlTree.META("Content-Type", "text/html", charset));
}
if (showTimestamp) {
SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd");
- tree.addContent(HtmlTree.META("dc.created", dateFormat.format(now)));
+ tree.add(HtmlTree.META("dc.created", dateFormat.format(now)));
}
if (description != null) {
- tree.addContent(HtmlTree.META("description", description));
+ tree.add(HtmlTree.META("description", description));
}
if (generator != null) {
- tree.addContent(HtmlTree.META("generator", generator));
+ tree.add(HtmlTree.META("generator", generator));
}
for (String k : keywords) {
- tree.addContent(HtmlTree.META("keywords", k));
+ tree.add(HtmlTree.META("keywords", k));
}
if (canonicalLink != null) {
HtmlTree link = new HtmlTree(HtmlTag.LINK);
- link.addAttr(HtmlAttr.REL, "canonical");
- link.addAttr(HtmlAttr.HREF, canonicalLink.getPath());
- tree.addContent(link);
+ link.put(HtmlAttr.REL, "canonical");
+ link.put(HtmlAttr.HREF, canonicalLink.getPath());
+ tree.add(link);
}
addStylesheets(tree);
addScripts(tree);
- extraContent.forEach(tree::addContent);
+ extraContent.forEach(tree::add);
return tree;
}
@@ -316,13 +316,13 @@
}
private void addStylesheet(HtmlTree tree, DocPath stylesheet) {
- tree.addContent(HtmlTree.LINK("stylesheet", "text/css",
+ tree.add(HtmlTree.LINK("stylesheet", "text/css",
pathToRoot.resolve(stylesheet).getPath(), "Style"));
}
private void addScripts(HtmlTree tree) {
if (addDefaultScript) {
- tree.addContent(HtmlTree.SCRIPT(pathToRoot.resolve(DocPaths.JAVASCRIPT).getPath()));
+ tree.add(HtmlTree.SCRIPT(pathToRoot.resolve(DocPaths.JAVASCRIPT).getPath()));
}
if (index) {
if (pathToRoot != null && mainBodyScript != null) {
@@ -335,20 +335,20 @@
}
addJQueryFile(tree, DocPaths.JSZIP_MIN);
addJQueryFile(tree, DocPaths.JSZIPUTILS_MIN);
- tree.addContent(new RawHtml("<!--[if IE]>"));
+ tree.add(new RawHtml("<!--[if IE]>"));
addJQueryFile(tree, DocPaths.JSZIPUTILS_IE_MIN);
- tree.addContent(new RawHtml("<![endif]-->"));
+ tree.add(new RawHtml("<![endif]-->"));
addJQueryFile(tree, DocPaths.JQUERY_JS_3_3);
addJQueryFile(tree, DocPaths.JQUERY_MIGRATE);
addJQueryFile(tree, DocPaths.JQUERY_JS);
}
for (Script script : scripts) {
- tree.addContent(script.asContent());
+ tree.add(script.asContent());
}
}
private void addJQueryFile(HtmlTree tree, DocPath filePath) {
DocPath jqueryFile = pathToRoot.resolve(DocPaths.JQUERY_FILES.resolve(filePath));
- tree.addContent(HtmlTree.SCRIPT(jqueryFile.getPath()));
+ tree.add(HtmlTree.SCRIPT(jqueryFile.getPath()));
}
}
--- a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/markup/HtmlTag.java Tue Mar 12 09:49:10 2019 +0000
+++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/markup/HtmlTag.java Sat Mar 16 21:00:45 2019 +0000
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2010, 2015, 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
@@ -44,16 +44,13 @@
BODY(BlockType.OTHER, EndTag.END),
BR(BlockType.INLINE, EndTag.NOEND),
CAPTION,
- CENTER(HtmlVersion.HTML4),
CODE(BlockType.INLINE, EndTag.END),
DD,
- DIR(HtmlVersion.HTML4),
DIV,
DL,
DT,
EM(BlockType.INLINE, EndTag.END),
- FONT(HtmlVersion.HTML4, BlockType.INLINE, EndTag.END),
- FOOTER(HtmlVersion.HTML5),
+ FOOTER,
H1,
H2,
H3,
@@ -61,7 +58,7 @@
H5,
H6,
HEAD(BlockType.OTHER, EndTag.END),
- HEADER(HtmlVersion.HTML5),
+ HEADER,
HR(BlockType.BLOCK, EndTag.NOEND),
HTML(BlockType.OTHER, EndTag.END),
I(BlockType.INLINE, EndTag.END),
@@ -72,33 +69,32 @@
LI,
LISTING,
LINK(BlockType.OTHER, EndTag.NOEND),
- MAIN(HtmlVersion.HTML5),
+ MAIN,
MENU,
META(BlockType.OTHER, EndTag.NOEND),
- NAV(HtmlVersion.HTML5),
+ NAV,
NOSCRIPT(BlockType.OTHER, EndTag.END),
OL,
P,
PRE,
SCRIPT(BlockType.OTHER, EndTag.END),
- SECTION(HtmlVersion.HTML5),
+ SECTION,
SMALL(BlockType.INLINE, EndTag.END),
SPAN(BlockType.INLINE, EndTag.END),
STRONG(BlockType.INLINE, EndTag.END),
SUB(BlockType.INLINE, EndTag.END),
TABLE,
TBODY,
+ THEAD,
TD,
TH,
TITLE(BlockType.OTHER, EndTag.END),
TR,
- TT(HtmlVersion.HTML4, BlockType.INLINE, EndTag.END),
UL;
public final BlockType blockType;
public final EndTag endTag;
public final String value;
- public final HtmlVersion htmlVersion;
/**
* Enum representing the type of HTML element.
@@ -118,19 +114,10 @@
}
HtmlTag() {
- this(HtmlVersion.ALL, BlockType.BLOCK, EndTag.END);
- }
-
- HtmlTag(HtmlVersion htmlVersion) {
- this(htmlVersion, BlockType.BLOCK, EndTag.END);
+ this(BlockType.BLOCK, EndTag.END);
}
- HtmlTag(BlockType blockType, EndTag endTag ) {
- this(HtmlVersion.ALL, blockType, endTag);
- }
-
- HtmlTag(HtmlVersion htmlVersion, BlockType blockType, EndTag endTag ) {
- this.htmlVersion = htmlVersion;
+ HtmlTag(BlockType blockType, EndTag endTag) {
this.blockType = blockType;
this.endTag = endTag;
this.value = Utils.toLowerCase(name());
@@ -146,16 +133,6 @@
return (endTag == EndTag.END);
}
- /**
- * Returns true if the tag is allowed in the output HTML version of this javadoc run.
- *
- * @param htmlVer the output HTML version for this javadoc run
- * @return true if the tag is allowed
- */
- public boolean allowTag(HtmlVersion htmlVer) {
- return (this.htmlVersion == HtmlVersion.ALL || this.htmlVersion == htmlVer);
- }
-
public String toString() {
return value;
}
--- a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/markup/HtmlTree.java Tue Mar 12 09:49:10 2019 +0000
+++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/markup/HtmlTree.java Sat Mar 16 21:00:45 2019 +0000
@@ -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
@@ -75,7 +75,7 @@
public HtmlTree(HtmlTag tag, Content... contents) {
this(tag);
for (Content c: contents)
- addContent(c);
+ add(c);
}
/**
@@ -87,7 +87,7 @@
public HtmlTree(HtmlTag tag, List<Content> contents) {
this(tag);
for (Content c: contents)
- addContent(c);
+ add(c);
}
/**
@@ -97,7 +97,7 @@
* @param attrValue value of the attribute
* @return this object
*/
- public HtmlTree addAttr(HtmlAttr attrName, String attrValue) {
+ public HtmlTree put(HtmlAttr attrName, String attrValue) {
if (attrs.isEmpty())
attrs = new LinkedHashMap<>(3);
attrs.put(nullCheck(attrName), escapeHtmlChars(attrValue));
@@ -112,7 +112,7 @@
* @return this object
*/
public HtmlTree setTitle(Content body) {
- addAttr(HtmlAttr.TITLE, stripHtml(body));
+ put(HtmlAttr.TITLE, stripHtml(body));
return this;
}
@@ -123,7 +123,7 @@
* @return this object
*/
public HtmlTree setRole(Role role) {
- addAttr(HtmlAttr.ROLE, role.toString());
+ put(HtmlAttr.ROLE, role.toString());
return this;
}
@@ -134,7 +134,7 @@
* @return this object
*/
public HtmlTree setStyle(HtmlStyle style) {
- addAttr(HtmlAttr.CLASS, style.toString());
+ put(HtmlAttr.CLASS, style.toString());
return this;
}
@@ -144,10 +144,10 @@
* @param tagContent tag content to be added
*/
@Override
- public void addContent(Content tagContent) {
+ public void add(Content tagContent) {
if (tagContent instanceof ContentBuilder) {
for (Content c: ((ContentBuilder)tagContent).contents) {
- addContent(c);
+ add(c);
}
}
else if (tagContent == HtmlTree.EMPTY || tagContent.isValid()) {
@@ -165,16 +165,16 @@
* @param stringContent string content that needs to be added
*/
@Override
- public void addContent(CharSequence stringContent) {
+ public void add(CharSequence stringContent) {
if (!content.isEmpty()) {
Content lastContent = content.get(content.size() - 1);
if (lastContent instanceof StringContent)
- lastContent.addContent(stringContent);
+ lastContent.add(stringContent);
else
- addContent(new StringContent(stringContent));
+ add(new StringContent(stringContent));
}
else
- addContent(new StringContent(stringContent));
+ add(new StringContent(stringContent));
}
/**
@@ -294,7 +294,7 @@
*/
public static HtmlTree A(String ref, Content body) {
HtmlTree htmltree = new HtmlTree(HtmlTag.A, nullCheck(body));
- htmltree.addAttr(HtmlAttr.HREF, encodeURL(ref));
+ htmltree.put(HtmlAttr.HREF, encodeURL(ref));
return htmltree;
}
@@ -307,8 +307,8 @@
*/
public static HtmlTree A_ID(String id, Content body) {
HtmlTree htmltree = new HtmlTree(HtmlTag.A);
- htmltree.addAttr(HtmlAttr.ID, nullCheck(id));
- htmltree.addContent(nullCheck(body));
+ htmltree.put(HtmlAttr.ID, nullCheck(id));
+ htmltree.add(nullCheck(body));
return htmltree;
}
@@ -497,7 +497,7 @@
*/
public static HtmlTree HTML(String lang, Content head, Content body) {
HtmlTree htmltree = new HtmlTree(HtmlTag.HTML, nullCheck(head), nullCheck(body));
- htmltree.addAttr(HtmlAttr.LANG, nullCheck(lang));
+ htmltree.put(HtmlAttr.LANG, nullCheck(lang));
return htmltree;
}
@@ -511,9 +511,9 @@
*/
public static HtmlTree IFRAME(String src, String name, String title) {
HtmlTree htmltree = new HtmlTree(HtmlTag.IFRAME);
- htmltree.addAttr(HtmlAttr.SRC, nullCheck(src));
- htmltree.addAttr(HtmlAttr.NAME, nullCheck(name));
- htmltree.addAttr(HtmlAttr.TITLE, nullCheck(title));
+ htmltree.put(HtmlAttr.SRC, nullCheck(src));
+ htmltree.put(HtmlAttr.NAME, nullCheck(name));
+ htmltree.put(HtmlAttr.TITLE, nullCheck(title));
return htmltree;
}
@@ -527,10 +527,10 @@
*/
public static HtmlTree INPUT(String type, String id, String value) {
HtmlTree htmltree = new HtmlTree(HtmlTag.INPUT);
- htmltree.addAttr(HtmlAttr.TYPE, nullCheck(type));
- htmltree.addAttr(HtmlAttr.ID, nullCheck(id));
- htmltree.addAttr(HtmlAttr.VALUE, nullCheck(value));
- htmltree.addAttr(HtmlAttr.DISABLED, "disabled");
+ htmltree.put(HtmlAttr.TYPE, nullCheck(type));
+ htmltree.put(HtmlAttr.ID, nullCheck(id));
+ htmltree.put(HtmlAttr.VALUE, nullCheck(value));
+ htmltree.put(HtmlAttr.DISABLED, "disabled");
return htmltree;
}
@@ -543,7 +543,7 @@
*/
public static HtmlTree LABEL(String forLabel, Content body) {
HtmlTree htmltree = new HtmlTree(HtmlTag.LABEL, nullCheck(body));
- htmltree.addAttr(HtmlAttr.FOR, nullCheck(forLabel));
+ htmltree.put(HtmlAttr.FOR, nullCheck(forLabel));
return htmltree;
}
@@ -582,10 +582,10 @@
*/
public static HtmlTree LINK(String rel, String type, String href, String title) {
HtmlTree htmltree = new HtmlTree(HtmlTag.LINK);
- htmltree.addAttr(HtmlAttr.REL, nullCheck(rel));
- htmltree.addAttr(HtmlAttr.TYPE, nullCheck(type));
- htmltree.addAttr(HtmlAttr.HREF, nullCheck(href));
- htmltree.addAttr(HtmlAttr.TITLE, nullCheck(title));
+ htmltree.put(HtmlAttr.REL, nullCheck(rel));
+ htmltree.put(HtmlAttr.TYPE, nullCheck(type));
+ htmltree.put(HtmlAttr.HREF, nullCheck(href));
+ htmltree.put(HtmlAttr.TITLE, nullCheck(title));
return htmltree;
}
@@ -638,8 +638,8 @@
public static HtmlTree META(String httpEquiv, String content, String charSet) {
HtmlTree htmltree = new HtmlTree(HtmlTag.META);
String contentCharset = content + "; charset=" + charSet;
- htmltree.addAttr(HtmlAttr.HTTP_EQUIV, nullCheck(httpEquiv));
- htmltree.addAttr(HtmlAttr.CONTENT, contentCharset);
+ htmltree.put(HtmlAttr.HTTP_EQUIV, nullCheck(httpEquiv));
+ htmltree.put(HtmlAttr.CONTENT, contentCharset);
return htmltree;
}
@@ -652,8 +652,8 @@
*/
public static HtmlTree META(String name, String content) {
HtmlTree htmltree = new HtmlTree(HtmlTag.META);
- htmltree.addAttr(HtmlAttr.NAME, nullCheck(name));
- htmltree.addAttr(HtmlAttr.CONTENT, nullCheck(content));
+ htmltree.put(HtmlAttr.NAME, nullCheck(name));
+ htmltree.put(HtmlAttr.CONTENT, nullCheck(content));
return htmltree;
}
@@ -711,8 +711,8 @@
*/
public static HtmlTree SCRIPT(String src) {
HtmlTree htmltree = new HtmlTree(HtmlTag.SCRIPT);
- htmltree.addAttr(HtmlAttr.TYPE, "text/javascript");
- htmltree.addAttr(HtmlAttr.SRC, nullCheck(src));
+ htmltree.put(HtmlAttr.TYPE, "text/javascript");
+ htmltree.put(HtmlAttr.SRC, nullCheck(src));
return htmltree;
}
@@ -785,7 +785,7 @@
*/
public static HtmlTree SPAN(String id, HtmlStyle styleClass, Content body) {
HtmlTree htmltree = new HtmlTree(HtmlTag.SPAN, nullCheck(body));
- htmltree.addAttr(HtmlAttr.ID, nullCheck(id));
+ htmltree.put(HtmlAttr.ID, nullCheck(id));
if (styleClass != null)
htmltree.setStyle(styleClass);
return htmltree;
@@ -803,7 +803,7 @@
HtmlTree htmltree = new HtmlTree(HtmlTag.TABLE, nullCheck(body));
if (styleClass != null)
htmltree.setStyle(styleClass);
- htmltree.addAttr(HtmlAttr.SUMMARY, nullCheck(summary));
+ htmltree.put(HtmlAttr.SUMMARY, nullCheck(summary));
return htmltree;
}
@@ -858,7 +858,7 @@
HtmlTree htmltree = new HtmlTree(HtmlTag.TH, nullCheck(body));
if (styleClass != null)
htmltree.setStyle(styleClass);
- htmltree.addAttr(HtmlAttr.SCOPE, nullCheck(scope));
+ htmltree.put(HtmlAttr.SCOPE, nullCheck(scope));
return htmltree;
}
@@ -916,9 +916,9 @@
*/
public static HtmlTree UL(HtmlStyle styleClass, Content first, Content... more) {
HtmlTree htmlTree = new HtmlTree(HtmlTag.UL);
- htmlTree.addContent(nullCheck(first));
+ htmlTree.add(nullCheck(first));
for (Content c : more) {
- htmlTree.addContent(nullCheck(c));
+ htmlTree.add(nullCheck(c));
}
htmlTree.setStyle(nullCheck(styleClass));
return htmlTree;
--- a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/markup/HtmlVersion.java Tue Mar 12 09:49:10 2019 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,37 +0,0 @@
-/*
- * Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
- * 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.
- */
-
-package jdk.javadoc.internal.doclets.formats.html.markup;
-
-/**
- * Enum representing the version of HTML generated by javadoc.
- *
- * @author Bhavesh Patel
- */
-public enum HtmlVersion {
- HTML4,
- HTML5,
- ALL
-}
--- a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/markup/Links.java Tue Mar 12 09:49:10 2019 +0000
+++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/markup/Links.java Sat Mar 16 21:00:45 2019 +0000
@@ -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
@@ -62,7 +62,6 @@
/**
* Creates an anchor of the form {@code <a id="name"><!-- --></a>}.
- * In HTML4, a {@code name} attribute will be generated instead of an {@code id} attribute.
*
* @param name the value for the {@code id} or {@code name} attribute
* @return a content tree for the anchor
@@ -73,7 +72,6 @@
/**
* Creates an anchor of the form {@code <a id="sectionName"><!-- --></a>}.
- * In HTML4, a {@code name} attribute will be generated instead of an {@code id} attribute.
*
* @param sectionName the value for the {@code id} or {@code name} attribute
* @return a content tree for the anchor
@@ -84,7 +82,6 @@
/**
* Creates an anchor of the form {@code <a id="sectionNameName"><!-- --></a>}.
- * In HTML4, a {@code name} attribute will be generated instead of an {@code id} attribute.
*
* @param sectionName the first part of the value for the {@code id} or {@code name} attribute
* @param name the second part of the value for the {@code id} or {@code name} attribute
@@ -96,7 +93,6 @@
/**
* Creates an anchor of the form {@code <a id="anchorName">content</a>}.
- * In HTML4, a {@code name} attribute will be generated instead of an {@code id} attribute.
*
* @param name the value for the {@code id} or {@code name} attribute
* @param content the content that should be added to the anchor,
@@ -237,10 +233,10 @@
public Content createLink(DocLink link, Content label, String title, String target) {
HtmlTree anchor = HtmlTree.A(link.relativizeAgainst(file).toString(), label);
if (title != null && title.length() != 0) {
- anchor.addAttr(HtmlAttr.TITLE, title);
+ anchor.put(HtmlAttr.TITLE, title);
}
if (target != null && target.length() != 0) {
- anchor.addAttr(HtmlAttr.TARGET, target);
+ anchor.put(HtmlAttr.TARGET, target);
}
return anchor;
}
@@ -283,10 +279,10 @@
}
HtmlTree l = HtmlTree.A(link.relativizeAgainst(file).toString(), body);
if (title != null && title.length() != 0) {
- l.addAttr(HtmlAttr.TITLE, title);
+ l.put(HtmlAttr.TITLE, title);
}
if (target != null && target.length() != 0) {
- l.addAttr(HtmlAttr.TARGET, target);
+ l.put(HtmlAttr.TARGET, target);
}
if (isExternal) {
l.setStyle(HtmlStyle.externalLink);
--- a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/markup/Navigation.java Tue Mar 12 09:49:10 2019 +0000
+++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/markup/Navigation.java Sat Mar 16 21:00:45 2019 +0000
@@ -429,8 +429,8 @@
}
if (!listContents.isEmpty()) {
Content li = HtmlTree.LI(contents.summaryLabel);
- li.addContent(Contents.SPACE);
- tree.addContent(li);
+ li.add(Contents.SPACE);
+ tree.add(li);
addListToNav(listContents, tree);
}
break;
@@ -461,8 +461,8 @@
}
if (!listContents.isEmpty()) {
Content li = HtmlTree.LI(contents.moduleSubNavLabel);
- li.addContent(Contents.SPACE);
- tree.addContent(li);
+ li.add(Contents.SPACE);
+ tree.add(li);
addListToNav(listContents, tree);
}
break;
@@ -665,8 +665,8 @@
}
if (!listContents.isEmpty()) {
Content li = HtmlTree.LI(contents.detailLabel);
- li.addContent(Contents.SPACE);
- tree.addContent(li);
+ li.add(Contents.SPACE);
+ tree.add(li);
addListToNav(listContents, tree);
}
break;
@@ -794,37 +794,37 @@
}
private void addContentToTree(Content tree, Content content) {
- tree.addContent(HtmlTree.LI(content));
+ tree.add(HtmlTree.LI(content));
}
private void addListToNav(List<Content> listContents, Content tree) {
int count = 0;
for (Content liContent : listContents) {
if (count < listContents.size() - 1) {
- liContent.addContent(Contents.SPACE);
- liContent.addContent("|");
- liContent.addContent(Contents.SPACE);
+ liContent.add(Contents.SPACE);
+ liContent.add("|");
+ liContent.add(Contents.SPACE);
}
- tree.addContent(liContent);
+ tree.add(liContent);
count++;
}
}
private void addActivePageLink(Content tree, Content label, boolean display) {
if (display) {
- tree.addContent(HtmlTree.LI(HtmlStyle.navBarCell1Rev, label));
+ tree.add(HtmlTree.LI(HtmlStyle.navBarCell1Rev, label));
}
}
private void addPageLabel(Content tree, Content label, boolean display) {
if (display) {
- tree.addContent(HtmlTree.LI(label));
+ tree.add(HtmlTree.LI(label));
}
}
private void addOverviewLink(Content tree) {
if (configuration.createoverview) {
- tree.addContent(HtmlTree.LI(links.createLink(pathToRoot.resolve(DocPaths.overviewSummary(configuration.frames)),
+ tree.add(HtmlTree.LI(links.createLink(pathToRoot.resolve(DocPaths.overviewSummary(configuration.frames)),
contents.overviewLabel, "", "")));
}
}
@@ -834,7 +834,7 @@
if (configuration.modules.size() == 1) {
ModuleElement mdle = configuration.modules.first();
boolean included = configuration.utils.isIncluded(mdle);
- tree.addContent(HtmlTree.LI((included)
+ tree.add(HtmlTree.LI((included)
? links.createLink(pathToRoot.resolve(configuration.docPaths.moduleSummary(mdle)), contents.moduleLabel, "", "")
: contents.moduleLabel));
} else if (!configuration.modules.isEmpty()) {
@@ -845,7 +845,7 @@
private void addModuleOfElementLink(Content tree) {
if (configuration.showModules) {
- tree.addContent(HtmlTree.LI(navLinkModule));
+ tree.add(HtmlTree.LI(navLinkModule));
}
}
@@ -862,16 +862,16 @@
}
}
if (included || packageElement == null) {
- tree.addContent(HtmlTree.LI(links.createLink(
+ tree.add(HtmlTree.LI(links.createLink(
pathToRoot.resolve(configuration.docPaths.forPackage(packageElement).resolve(DocPaths.PACKAGE_SUMMARY)),
contents.packageLabel)));
} else {
DocLink crossPkgLink = configuration.extern.getExternalLink(
packageElement, pathToRoot, DocPaths.PACKAGE_SUMMARY.getPath());
if (crossPkgLink != null) {
- tree.addContent(HtmlTree.LI(links.createLink(crossPkgLink, contents.packageLabel)));
+ tree.add(HtmlTree.LI(links.createLink(crossPkgLink, contents.packageLabel)));
} else {
- tree.addContent(HtmlTree.LI(contents.packageLabel));
+ tree.add(HtmlTree.LI(contents.packageLabel));
}
}
} else if (!configuration.packages.isEmpty()) {
@@ -880,12 +880,12 @@
}
private void addPackageOfElementLink(Content tree) {
- tree.addContent(HtmlTree.LI(links.createLink(DocPath.parent.resolve(DocPaths.PACKAGE_SUMMARY),
+ tree.add(HtmlTree.LI(links.createLink(DocPath.parent.resolve(DocPaths.PACKAGE_SUMMARY),
contents.packageLabel)));
}
private void addPackageSummaryLink(Content tree) {
- tree.addContent(HtmlTree.LI(links.createLink(DocPaths.PACKAGE_SUMMARY, contents.packageLabel)));
+ tree.add(HtmlTree.LI(links.createLink(DocPaths.PACKAGE_SUMMARY, contents.packageLabel)));
}
private void addTreeLink(Content tree) {
@@ -894,20 +894,20 @@
DocPath docPath = packages.size() == 1 && configuration.getSpecifiedTypeElements().isEmpty()
? pathToRoot.resolve(configuration.docPaths.forPackage(packages.get(0)).resolve(DocPaths.PACKAGE_TREE))
: pathToRoot.resolve(DocPaths.OVERVIEW_TREE);
- tree.addContent(HtmlTree.LI(links.createLink(docPath, contents.treeLabel, "", "")));
+ tree.add(HtmlTree.LI(links.createLink(docPath, contents.treeLabel, "", "")));
}
}
private void addDeprecatedLink(Content tree) {
if (!(configuration.nodeprecated || configuration.nodeprecatedlist)) {
- tree.addContent(HtmlTree.LI(links.createLink(pathToRoot.resolve(DocPaths.DEPRECATED_LIST),
+ tree.add(HtmlTree.LI(links.createLink(pathToRoot.resolve(DocPaths.DEPRECATED_LIST),
contents.deprecatedLabel, "", "")));
}
}
private void addIndexLink(Content tree) {
if (configuration.createindex) {
- tree.addContent(HtmlTree.LI(links.createLink(pathToRoot.resolve(
+ tree.add(HtmlTree.LI(links.createLink(pathToRoot.resolve(
(configuration.splitindex
? DocPaths.INDEX_FILES.resolve(DocPaths.indexN(1))
: DocPaths.INDEX_ALL)),
@@ -925,7 +925,7 @@
DocFile file = DocFile.createFileForInput(configuration, helpfile);
helpfilenm = DocPath.create(file.getName());
}
- tree.addContent(HtmlTree.LI(links.createLink(pathToRoot.resolve(helpfilenm),
+ tree.add(HtmlTree.LI(links.createLink(pathToRoot.resolve(helpfilenm),
contents.helpLabel, "", "")));
}
}
@@ -938,7 +938,7 @@
private void addNavShowLists(Content tree) {
DocLink dl = new DocLink(pathToRoot.resolve(DocPaths.INDEX), path.getPath(), null);
Content framesContent = links.createLink(dl, contents.framesLabel, "", "_top");
- tree.addContent(HtmlTree.LI(framesContent));
+ tree.add(HtmlTree.LI(framesContent));
}
/**
@@ -948,7 +948,7 @@
*/
private void addNavHideLists(Content tree) {
Content noFramesContent = links.createLink(path.basename(), contents.noFramesLabel, "", "_top");
- tree.addContent(HtmlTree.LI(noFramesContent));
+ tree.add(HtmlTree.LI(noFramesContent));
}
private void addSearch(Content tree) {
@@ -957,14 +957,14 @@
HtmlTree inputText = HtmlTree.INPUT("text", searchValueId, searchValueId);
HtmlTree inputReset = HtmlTree.INPUT(reset, reset, reset);
HtmlTree liInput = HtmlTree.LI(HtmlTree.LABEL(searchValueId, searchLabel));
- liInput.addContent(inputText);
- liInput.addContent(inputReset);
+ liInput.add(inputText);
+ liInput.add(inputReset);
HtmlTree ulSearch = HtmlTree.UL(HtmlStyle.navListSearch, liInput);
- tree.addContent(ulSearch);
+ tree.add(ulSearch);
}
private void addFixedNavScript(Content tree) {
- tree.addContent(FIXED_NAV_SCRIPT.asContent());
+ tree.add(FIXED_NAV_SCRIPT.asContent());
}
/**
@@ -981,29 +981,29 @@
HtmlTree navDiv = new HtmlTree(HtmlTag.DIV);
if (top) {
queue = topBottomNavContents.get(Position.TOP);
- fixedNavDiv.addContent(Position.TOP.startOfNav());
+ fixedNavDiv.add(Position.TOP.startOfNav());
navDiv.setStyle(HtmlStyle.topNav);
} else {
queue = topBottomNavContents.get(Position.BOTTOM);
- tree.addContent(Position.BOTTOM.startOfNav());
+ tree.add(Position.BOTTOM.startOfNav());
navDiv.setStyle(HtmlStyle.bottomNav);
}
- navDiv.addContent(queue.poll());
+ navDiv.add(queue.poll());
HtmlTree skipLinkDiv = HtmlTree.DIV(HtmlStyle.skipNav, queue.poll());
- navDiv.addContent(skipLinkDiv);
- navDiv.addContent(queue.poll());
+ navDiv.add(skipLinkDiv);
+ navDiv.add(queue.poll());
HtmlTree navList = new HtmlTree(HtmlTag.UL);
navList.setStyle(HtmlStyle.navList);
- navList.addAttr(HtmlAttr.TITLE, rowListTitle);
+ navList.put(HtmlAttr.TITLE, rowListTitle);
fixedNavDiv.setStyle(HtmlStyle.fixedNav);
addMainNavLinks(navList);
- navDiv.addContent(navList);
+ navDiv.add(navList);
Content aboutDiv = HtmlTree.DIV(HtmlStyle.aboutLanguage, top ? userHeader : userFooter);
- navDiv.addContent(aboutDiv);
+ navDiv.add(aboutDiv);
if (top) {
- fixedNavDiv.addContent(navDiv);
+ fixedNavDiv.add(navDiv);
} else {
- tree.addContent(navDiv);
+ tree.add(navDiv);
}
HtmlTree subDiv = new HtmlTree(HtmlTag.DIV);
subDiv.setStyle(HtmlStyle.subNav);
@@ -1012,12 +1012,12 @@
HtmlTree ulNavSummary = new HtmlTree(HtmlTag.UL);
ulNavSummary.setStyle(HtmlStyle.subNavList);
addSummaryLinks(ulNavSummary);
- div.addContent(ulNavSummary);
+ div.add(ulNavSummary);
// Add the detail links if present.
HtmlTree ulNavDetail = new HtmlTree(HtmlTag.UL);
ulNavDetail.setStyle(HtmlStyle.subNavList);
addDetailLinks(ulNavDetail);
- div.addContent(ulNavDetail);
+ div.add(ulNavDetail);
HtmlTree ulFrames = new HtmlTree(HtmlTag.UL);
ulFrames.setStyle(HtmlStyle.navList);
if (!configuration.nonavbar) {
@@ -1026,23 +1026,23 @@
addNavHideLists(ulFrames);
}
}
- div.addContent(ulFrames);
- subDiv.addContent(div);
+ div.add(ulFrames);
+ subDiv.add(div);
if (top && configuration.createindex) {
addSearch(subDiv);
}
if (top) {
- fixedNavDiv.addContent(subDiv);
- fixedNavDiv.addContent(queue.poll());
- fixedNavDiv.addContent(Position.TOP.endOfNav());
- tree.addContent(fixedNavDiv);
+ fixedNavDiv.add(subDiv);
+ fixedNavDiv.add(queue.poll());
+ fixedNavDiv.add(Position.TOP.endOfNav());
+ tree.add(fixedNavDiv);
HtmlTree paddingDiv = HtmlTree.DIV(HtmlStyle.navPadding, Contents.SPACE);
- tree.addContent(paddingDiv);
+ tree.add(paddingDiv);
addFixedNavScript(tree);
} else {
- tree.addContent(subDiv);
- tree.addContent(queue.poll());
- tree.addContent(Position.BOTTOM.endOfNav());
+ tree.add(subDiv);
+ tree.add(queue.poll());
+ tree.add(Position.BOTTOM.endOfNav());
}
return tree;
}
--- a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/markup/RawHtml.java Tue Mar 12 09:49:10 2019 +0000
+++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/markup/RawHtml.java Sat Mar 16 21:00:45 2019 +0000
@@ -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
@@ -64,7 +64,7 @@
* @param content content that needs to be added
* @throws UnsupportedOperationException always
*/
- public void addContent(Content content) {
+ public void add(Content content) {
throw new UnsupportedOperationException();
}
@@ -75,7 +75,7 @@
* @throws UnsupportedOperationException always
*/
@Override
- public void addContent(CharSequence stringContent) {
+ public void add(CharSequence stringContent) {
throw new UnsupportedOperationException();
}
--- a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/markup/Script.java Tue Mar 12 09:49:10 2019 +0000
+++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/markup/Script.java Sat Mar 16 21:00:45 2019 +0000
@@ -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
@@ -108,19 +108,19 @@
ScriptContent scriptContent = new ScriptContent(sb);
HtmlTree tree = new HtmlTree(HtmlTag.SCRIPT) {
@Override
- public void addContent(CharSequence s) {
+ public void add(CharSequence s) {
throw new UnsupportedOperationException();
}
@Override
- public void addContent(Content c) {
+ public void add(Content c) {
if (c != scriptContent) {
throw new IllegalArgumentException();
}
- super.addContent(scriptContent);
+ super.add(scriptContent);
}
};
- tree.addAttr(HtmlAttr.TYPE, "text/javascript");
- tree.addContent(scriptContent);
+ tree.put(HtmlAttr.TYPE, "text/javascript");
+ tree.add(scriptContent);
return tree;
}
@@ -200,12 +200,12 @@
}
@Override
- public void addContent(Content content) {
+ public void add(Content content) {
throw new UnsupportedOperationException();
}
@Override
- public void addContent(CharSequence code) {
+ public void add(CharSequence code) {
sb.append(code);
}
--- a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/markup/StringContent.java Tue Mar 12 09:49:10 2019 +0000
+++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/markup/StringContent.java Sat Mar 16 21:00:45 2019 +0000
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2010, 2016, 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
@@ -69,7 +69,7 @@
* @throws UnsupportedOperationException always
*/
@Override
- public void addContent(Content content) {
+ public void add(Content content) {
throw new UnsupportedOperationException();
}
@@ -80,7 +80,7 @@
* @param strContent string content to be added
*/
@Override
- public void addContent(CharSequence strContent) {
+ public void add(CharSequence strContent) {
appendChars(strContent);
}
--- a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/markup/Table.java Tue Mar 12 09:49:10 2019 +0000
+++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/markup/Table.java Sat Mar 16 21:00:45 2019 +0000
@@ -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
@@ -40,7 +40,6 @@
import jdk.javadoc.internal.doclets.formats.html.Contents;
import jdk.javadoc.internal.doclets.toolkit.Content;
-import jdk.javadoc.internal.doclets.toolkit.util.DocletConstants;
/**
* A builder for HTML tables, such as the summary tables for various
@@ -191,7 +190,6 @@
*
* <p>Notes:
* <ul>
- * <li>This currently does not use a {@code <thead>} tag, but probably should, eventually
* <li>The column styles are not currently applied to the header, but probably should, eventually
* </ul>
*
@@ -347,7 +345,7 @@
if (stripedStyles != null) {
int rowIndex = bodyRows.size();
- row.addAttr(HtmlAttr.CLASS, stripedStyles.get(rowIndex % 2).name());
+ row.put(HtmlAttr.CLASS, stripedStyles.get(rowIndex % 2).name());
}
int colIndex = 0;
for (Content c : contents) {
@@ -357,14 +355,14 @@
HtmlTree cell = (colIndex == rowScopeColumnIndex)
? HtmlTree.TH(cellStyle, "row", c)
: HtmlTree.TD(cellStyle, c);
- row.addContent(cell);
+ row.add(cell);
colIndex++;
}
bodyRows.add(row);
if (tabMap != null) {
int index = bodyRows.size() - 1;
- row.addAttr(HtmlAttr.ID, (rowIdPrefix + index));
+ row.put(HtmlAttr.ID, (rowIdPrefix + index));
int mask = 0;
int maskBit = 1;
for (Map.Entry<String, Predicate<Element>> e : tabMap.entrySet()) {
@@ -401,60 +399,62 @@
HtmlTree table = new HtmlTree(HtmlTag.TABLE);
if (tabMap == null || tabs.size() == 1) {
if (tabMap == null) {
- table.addContent(caption);
+ table.add(caption);
} else if (tabs.size() == 1) {
String tabName = tabs.iterator().next();
- table.addContent(getCaption(new StringContent(tabName)));
+ table.add(getCaption(new StringContent(tabName)));
}
- table.addContent(getTableBody());
- mainDiv.addContent(table);
+ table.add(getTableBody());
+ mainDiv.add(table);
} else {
HtmlTree tablist = new HtmlTree(HtmlTag.DIV)
- .addAttr(HtmlAttr.ROLE, "tablist")
- .addAttr(HtmlAttr.ARIA_ORIENTATION, "horizontal");
+ .put(HtmlAttr.ROLE, "tablist")
+ .put(HtmlAttr.ARIA_ORIENTATION, "horizontal");
int tabIndex = 0;
- tablist.addContent(createTab(tabId.apply(tabIndex), activeTabStyle, true, defaultTab));
- table.addAttr(HtmlAttr.ARIA_LABELLEDBY, tabId.apply(tabIndex));
+ tablist.add(createTab(tabId.apply(tabIndex), activeTabStyle, true, defaultTab));
+ table.put(HtmlAttr.ARIA_LABELLEDBY, tabId.apply(tabIndex));
for (String tabName : tabMap.keySet()) {
tabIndex++;
if (tabs.contains(tabName)) {
String script = tabScript.apply(1 << (tabIndex - 1));
HtmlTree tab = createTab(tabId.apply(tabIndex), tabStyle, false, tabName);
- tab.addAttr(HtmlAttr.ONCLICK, script);
- tablist.addContent(tab);
+ tab.put(HtmlAttr.ONCLICK, script);
+ tablist.add(tab);
}
}
HtmlTree tabpanel = new HtmlTree(HtmlTag.DIV)
- .addAttr(HtmlAttr.ID, tableStyle + "_tabpanel")
- .addAttr(HtmlAttr.ROLE, "tabpanel");
- table.addContent(getTableBody());
- tabpanel.addContent(table);
- mainDiv.addContent(tablist);
- mainDiv.addContent(tabpanel);
+ .put(HtmlAttr.ID, tableStyle + "_tabpanel")
+ .put(HtmlAttr.ROLE, "tabpanel");
+ table.add(getTableBody());
+ tabpanel.add(table);
+ mainDiv.add(tablist);
+ mainDiv.add(tabpanel);
}
return mainDiv;
}
private HtmlTree createTab(String tabId, HtmlStyle style, boolean defaultTab, String tabName) {
HtmlTree tab = new HtmlTree(HtmlTag.BUTTON)
- .addAttr(HtmlAttr.ROLE, "tab")
- .addAttr(HtmlAttr.ARIA_SELECTED, defaultTab ? "true" : "false")
- .addAttr(HtmlAttr.ARIA_CONTROLS, tableStyle + "_tabpanel")
- .addAttr(HtmlAttr.TABINDEX, defaultTab ? "0" : "-1")
- .addAttr(HtmlAttr.ONKEYDOWN, "switchTab(event)")
- .addAttr(HtmlAttr.ID, tabId)
+ .put(HtmlAttr.ROLE, "tab")
+ .put(HtmlAttr.ARIA_SELECTED, defaultTab ? "true" : "false")
+ .put(HtmlAttr.ARIA_CONTROLS, tableStyle + "_tabpanel")
+ .put(HtmlAttr.TABINDEX, defaultTab ? "0" : "-1")
+ .put(HtmlAttr.ONKEYDOWN, "switchTab(event)")
+ .put(HtmlAttr.ID, tabId)
.setStyle(style);
- tab.addContent(tabName);
+ tab.add(tabName);
return tab;
}
private Content getTableBody() {
ContentBuilder tableContent = new ContentBuilder();
- tableContent.addContent(header.toContent());
+ Content thead = new HtmlTree(HtmlTag.THEAD);
+ thead.add(header.toContent());
+ tableContent.add(thead);
Content tbody = new HtmlTree(HtmlTag.TBODY);
- bodyRows.forEach(row -> tbody.addContent(row));
- tableContent.addContent(tbody);
+ bodyRows.forEach(row -> tbody.add(row));
+ tableContent.add(tbody);
return tableContent;
}
--- a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/markup/TableHeader.java Tue Mar 12 09:49:10 2019 +0000
+++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/markup/TableHeader.java Sat Mar 16 21:00:45 2019 +0000
@@ -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
@@ -127,7 +127,7 @@
: (i == 1) ? HtmlStyle.colSecond : null;
Content cell = (style == null) ? HtmlTree.TH(scope, cellContent)
: HtmlTree.TH(style, scope, cellContent);
- tr.addContent(cell);
+ tr.add(cell);
i++;
}
return tr;
--- a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/Content.java Tue Mar 12 09:49:10 2019 +0000
+++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/Content.java Sat Mar 16 21:00:45 2019 +0000
@@ -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
@@ -64,14 +64,14 @@
*
* @param content content that needs to be added
*/
- public abstract void addContent(Content content);
+ public abstract void add(Content content);
/**
* Adds a string content to the existing content.
*
* @param stringContent the string content to be added
*/
- public abstract void addContent(CharSequence stringContent);
+ public abstract void add(CharSequence stringContent);
/**
* Writes content to a writer.
--- a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/WorkArounds.java Tue Mar 12 09:49:10 2019 +0000
+++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/WorkArounds.java Sat Mar 16 21:00:45 2019 +0000
@@ -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
@@ -112,7 +112,7 @@
}
// TODO: fix this up correctly
- public void initDocLint(Collection<String> opts, Collection<String> customTagNames, String htmlVersion) {
+ public void initDocLint(Collection<String> opts, Collection<String> customTagNames) {
ArrayList<String> doclintOpts = new ArrayList<>();
boolean msgOptionSeen = false;
@@ -137,12 +137,10 @@
sep = DocLint.SEPARATOR;
}
doclintOpts.add(DocLint.XCUSTOM_TAGS_PREFIX + customTags.toString());
- doclintOpts.add(DocLint.XHTML_VERSION_PREFIX + htmlVersion);
+ doclintOpts.add(DocLint.XHTML_VERSION_PREFIX + "html5");
JavacTask t = BasicJavacTask.instance(toolEnv.context);
doclint = new DocLint();
- // standard doclet normally generates H1, H2
- doclintOpts.add(DocLint.XIMPLICIT_HEADERS + "2");
doclint.init(t, doclintOpts.toArray(new String[doclintOpts.size()]), false);
}
--- a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/builders/AnnotationTypeBuilder.java Tue Mar 12 09:49:10 2019 +0000
+++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/builders/AnnotationTypeBuilder.java Sat Mar 16 21:00:45 2019 +0000
@@ -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
@@ -156,7 +156,7 @@
buildAnnotationTypeDescription(annotationInfoTree);
buildAnnotationTypeTagInfo(annotationInfoTree);
- annotationContentTree.addContent(writer.getAnnotationInfo(annotationInfoTree));
+ annotationContentTree.add(writer.getAnnotationInfo(annotationInfoTree));
}
/**
@@ -205,7 +205,7 @@
protected void buildMemberSummary(Content annotationContentTree) throws DocletException {
Content memberSummaryTree = writer.getMemberTreeHeader();
builderFactory.getMemberSummaryBuilder(writer).build(memberSummaryTree);
- annotationContentTree.addContent(writer.getMemberSummaryTree(memberSummaryTree));
+ annotationContentTree.add(writer.getMemberSummaryTree(memberSummaryTree));
}
/**
@@ -223,7 +223,7 @@
buildAnnotationTypeOptionalMemberDetails(memberDetailsTree);
if (memberDetailsTree.isValid()) {
- annotationContentTree.addContent(writer.getMemberDetailsTree(memberDetailsTree));
+ annotationContentTree.add(writer.getMemberDetailsTree(memberDetailsTree));
}
}
--- a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/builders/AnnotationTypeFieldBuilder.java Tue Mar 12 09:49:10 2019 +0000
+++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/builders/AnnotationTypeFieldBuilder.java Sat Mar 16 21:00:45 2019 +0000
@@ -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
@@ -153,9 +153,9 @@
buildMemberComments(annotationDocTree);
buildTagInfo(annotationDocTree);
- detailsTree.addContent(writer.getAnnotationDoc(
+ detailsTree.add(writer.getAnnotationDoc(
annotationDocTree, currentMember == lastElement));
- memberDetailsTree.addContent(writer.getAnnotationDetails(detailsTree));
+ memberDetailsTree.add(writer.getAnnotationDetails(detailsTree));
}
}
}
@@ -166,7 +166,7 @@
* @param annotationDocTree the content tree to which the documentation will be added
*/
protected void buildSignature(Content annotationDocTree) {
- annotationDocTree.addContent(
+ annotationDocTree.add(
writer.getSignature(currentMember));
}
--- a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/builders/AnnotationTypeRequiredMemberBuilder.java Tue Mar 12 09:49:10 2019 +0000
+++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/builders/AnnotationTypeRequiredMemberBuilder.java Sat Mar 16 21:00:45 2019 +0000
@@ -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
@@ -152,9 +152,9 @@
buildAnnotationTypeMemberChildren(annotationDocTree);
- detailsTree.addContent(writer.getAnnotationDoc(
+ detailsTree.add(writer.getAnnotationDoc(
annotationDocTree, currentMember == lastMember));
- memberDetailsTree.addContent(writer.getAnnotationDetails(detailsTree));
+ memberDetailsTree.add(writer.getAnnotationDetails(detailsTree));
}
}
}
@@ -172,7 +172,7 @@
* @param annotationDocTree the content tree to which the documentation will be added
*/
protected void buildSignature(Content annotationDocTree) {
- annotationDocTree.addContent(writer.getSignature(currentMember));
+ annotationDocTree.add(writer.getSignature(currentMember));
}
/**
--- a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/builders/ClassBuilder.java Tue Mar 12 09:49:10 2019 +0000
+++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/builders/ClassBuilder.java Sat Mar 16 21:00:45 2019 +0000
@@ -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
@@ -181,7 +181,7 @@
buildClassDescription(classInfoTree);
buildClassTagInfo(classInfoTree);
- classContentTree.addContent(writer.getClassInfo(classInfoTree));
+ classContentTree.add(writer.getClassInfo(classInfoTree));
}
/**
@@ -322,7 +322,7 @@
protected void buildMemberSummary(Content classContentTree) throws DocletException {
Content memberSummaryTree = writer.getMemberTreeHeader();
builderFactory.getMemberSummaryBuilder(writer).build(memberSummaryTree);
- classContentTree.addContent(writer.getMemberSummaryTree(memberSummaryTree));
+ classContentTree.add(writer.getMemberSummaryTree(memberSummaryTree));
}
/**
@@ -340,7 +340,7 @@
buildConstructorDetails(memberDetailsTree);
buildMethodDetails(memberDetailsTree);
- classContentTree.addContent(writer.getMemberDetailsTree(memberDetailsTree));
+ classContentTree.add(writer.getMemberDetailsTree(memberDetailsTree));
}
/**
--- a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/builders/ConstructorBuilder.java Tue Mar 12 09:49:10 2019 +0000
+++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/builders/ConstructorBuilder.java Sat Mar 16 21:00:45 2019 +0000
@@ -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
@@ -148,10 +148,10 @@
buildConstructorComments(constructorDocTree);
buildTagInfo(constructorDocTree);
- constructorDetailsTree.addContent(writer.getConstructorDoc(constructorDocTree,
+ constructorDetailsTree.add(writer.getConstructorDoc(constructorDocTree,
currentConstructor == lastElement));
}
- memberDetailsTree.addContent(
+ memberDetailsTree.add(
writer.getConstructorDetails(constructorDetailsTree));
}
}
@@ -162,7 +162,7 @@
* @param constructorDocTree the content tree to which the documentation will be added
*/
protected void buildSignature(Content constructorDocTree) {
- constructorDocTree.addContent(writer.getSignature(currentConstructor));
+ constructorDocTree.add(writer.getSignature(currentConstructor));
}
/**
--- a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/builders/EnumConstantBuilder.java Tue Mar 12 09:49:10 2019 +0000
+++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/builders/EnumConstantBuilder.java Sat Mar 16 21:00:45 2019 +0000
@@ -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
@@ -136,10 +136,10 @@
buildEnumConstantComments(enumConstantsTree);
buildTagInfo(enumConstantsTree);
- enumConstantsDetailsTree.addContent(writer.getEnumConstants(
+ enumConstantsDetailsTree.add(writer.getEnumConstants(
enumConstantsTree, currentElement == lastElement));
}
- memberDetailsTree.addContent(
+ memberDetailsTree.add(
writer.getEnumConstantsDetails(enumConstantsDetailsTree));
}
}
@@ -150,7 +150,7 @@
* @param enumConstantsTree the content tree to which the documentation will be added
*/
protected void buildSignature(Content enumConstantsTree) {
- enumConstantsTree.addContent(writer.getSignature(currentElement));
+ enumConstantsTree.add(writer.getSignature(currentElement));
}
/**
--- a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/builders/FieldBuilder.java Tue Mar 12 09:49:10 2019 +0000
+++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/builders/FieldBuilder.java Sat Mar 16 21:00:45 2019 +0000
@@ -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
@@ -137,10 +137,10 @@
buildFieldComments(fieldDocTree);
buildTagInfo(fieldDocTree);
- fieldDetailsTree.addContent(writer.getFieldDoc(
+ fieldDetailsTree.add(writer.getFieldDoc(
fieldDocTree, currentElement == lastElement));
}
- memberDetailsTree.addContent(
+ memberDetailsTree.add(
writer.getFieldDetails(fieldDetailsTree));
}
}
@@ -151,7 +151,7 @@
* @param fieldDocTree the content tree to which the documentation will be added
*/
protected void buildSignature(Content fieldDocTree) {
- fieldDocTree.addContent(writer.getSignature(currentElement));
+ fieldDocTree.add(writer.getSignature(currentElement));
}
/**
--- a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/builders/MemberSummaryBuilder.java Tue Mar 12 09:49:10 2019 +0000
+++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/builders/MemberSummaryBuilder.java Sat Mar 16 21:00:45 2019 +0000
@@ -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
@@ -464,7 +464,7 @@
Content inheritedTree = writer.getInheritedSummaryHeader(inheritedClass);
Content linksTree = writer.getInheritedSummaryLinksTree();
addSummaryFootNote(inheritedClass, inheritedMembers, linksTree, writer);
- inheritedTree.addContent(linksTree);
+ inheritedTree.add(linksTree);
summaryTreeList.add(writer.getMemberTree(inheritedTree));
}
}
@@ -497,7 +497,7 @@
buildInheritedSummary(writer, kind, summaryTreeList);
if (!summaryTreeList.isEmpty()) {
Content memberTree = writer.getMemberSummaryHeader(typeElement, memberSummaryTree);
- summaryTreeList.stream().forEach(memberTree::addContent);
+ summaryTreeList.stream().forEach(memberTree::add);
writer.addMemberTree(memberSummaryTree, memberTree);
}
}
--- a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/builders/MethodBuilder.java Tue Mar 12 09:49:10 2019 +0000
+++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/builders/MethodBuilder.java Sat Mar 16 21:00:45 2019 +0000
@@ -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
@@ -139,10 +139,10 @@
buildMethodComments(methodDocTree);
buildTagInfo(methodDocTree);
- methodDetailsTree.addContent(writer.getMethodDoc(
+ methodDetailsTree.add(writer.getMethodDoc(
methodDocTree, currentMethod == lastElement));
}
- memberDetailsTree.addContent(writer.getMethodDetails(methodDetailsTree));
+ memberDetailsTree.add(writer.getMethodDetails(methodDetailsTree));
}
}
@@ -152,7 +152,7 @@
* @param methodDocTree the content tree to which the documentation will be added
*/
protected void buildSignature(Content methodDocTree) {
- methodDocTree.addContent(writer.getSignature(currentMethod));
+ methodDocTree.add(writer.getSignature(currentMethod));
}
/**
--- a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/builders/ModuleSummaryBuilder.java Tue Mar 12 09:49:10 2019 +0000
+++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/builders/ModuleSummaryBuilder.java Sat Mar 16 21:00:45 2019 +0000
@@ -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
@@ -152,7 +152,7 @@
buildModulesSummary(summaryContentTree);
buildServicesSummary(summaryContentTree);
- moduleContentTree.addContent(moduleWriter.getSummaryTree(summaryContentTree));
+ moduleContentTree.add(moduleWriter.getSummaryTree(summaryContentTree));
}
/**
--- a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/builders/PackageSummaryBuilder.java Tue Mar 12 09:49:10 2019 +0000
+++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/builders/PackageSummaryBuilder.java Sat Mar 16 21:00:45 2019 +0000
@@ -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
@@ -163,7 +163,7 @@
buildErrorSummary(summaryContentTree);
buildAnnotationTypeSummary(summaryContentTree);
- packageContentTree.addContent(summaryContentTree);
+ packageContentTree.add(summaryContentTree);
}
/**
--- a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/builders/PropertyBuilder.java Tue Mar 12 09:49:10 2019 +0000
+++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/builders/PropertyBuilder.java Sat Mar 16 21:00:45 2019 +0000
@@ -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
@@ -35,7 +35,6 @@
import jdk.javadoc.internal.doclets.toolkit.Content;
import jdk.javadoc.internal.doclets.toolkit.DocletException;
import jdk.javadoc.internal.doclets.toolkit.PropertyWriter;
-import jdk.javadoc.internal.doclets.toolkit.util.VisibleMemberTable;
import static jdk.javadoc.internal.doclets.toolkit.util.VisibleMemberTable.Kind.*;
@@ -138,10 +137,10 @@
buildPropertyComments(propertyDocTree);
buildTagInfo(propertyDocTree);
- propertyDetailsTree.addContent(writer.getPropertyDoc(
+ propertyDetailsTree.add(writer.getPropertyDoc(
propertyDocTree, currentProperty == lastElement));
}
- memberDetailsTree.addContent(
+ memberDetailsTree.add(
writer.getPropertyDetails(propertyDetailsTree));
}
}
@@ -152,7 +151,7 @@
* @param propertyDocTree the content tree to which the documentation will be added
*/
protected void buildSignature(Content propertyDocTree) {
- propertyDocTree.addContent(writer.getSignature(currentProperty));
+ propertyDocTree.add(writer.getSignature(currentProperty));
}
/**
--- a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/builders/SerializedFormBuilder.java Tue Mar 12 09:49:10 2019 +0000
+++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/builders/SerializedFormBuilder.java Sat Mar 16 21:00:45 2019 +0000
@@ -170,7 +170,7 @@
buildPackageSerializedForm(serializedSummariesTree);
}
- serializedTree.addContent(writer.getSerializedContent(
+ serializedTree.add(writer.getSerializedContent(
serializedSummariesTree));
}
@@ -205,7 +205,7 @@
* @param packageSerializedTree content tree to which the documentation will be added
*/
protected void buildPackageHeader(Content packageSerializedTree) {
- packageSerializedTree.addContent(writer.getPackageHeader(
+ packageSerializedTree.add(writer.getPackageHeader(
utils.getPackageName(currentPackage)));
}
@@ -232,10 +232,10 @@
buildSerialUIDInfo(classTree);
buildClassContent(classTree);
- classSerializedTree.addContent(classTree);
+ classSerializedTree.add(classTree);
}
}
- packageSerializedTree.addContent(classSerializedTree);
+ packageSerializedTree.add(classSerializedTree);
}
/**
@@ -254,7 +254,7 @@
break;
}
}
- classTree.addContent(serialUidTree);
+ classTree.add(serialUidTree);
}
/**
@@ -270,7 +270,7 @@
buildFieldHeader(classContentTree);
buildSerializableFields(classContentTree);
- classTree.addContent(classContentTree);
+ classTree.add(classContentTree);
}
/**
@@ -292,18 +292,18 @@
buildDeprecatedMethodInfo(methodsContentTree);
buildMethodInfo(methodsContentTree);
- serializableMethodTree.addContent(methodsContentTree);
+ serializableMethodTree.add(methodsContentTree);
}
}
if (!utils.serializationMethods(currentTypeElement).isEmpty()) {
- classContentTree.addContent(methodWriter.getSerializableMethods(
+ classContentTree.add(methodWriter.getSerializableMethods(
resources.getText("doclet.Serialized_Form_methods"),
serializableMethodTree));
if (utils.isSerializable(currentTypeElement) && !utils.isExternalizable(currentTypeElement)) {
if (utils.serializationMethods(currentTypeElement).isEmpty()) {
Content noCustomizationMsg = methodWriter.getNoCustomizationMsg(
resources.getText("doclet.Serializable_no_customization"));
- classContentTree.addContent(methodWriter.getSerializableMethods(
+ classContentTree.add(methodWriter.getSerializableMethods(
resources.getText("doclet.Serialized_Form_methods"),
noCustomizationMsg));
}
@@ -402,8 +402,8 @@
fieldWriter.addMemberDescription(ve, fieldsOverviewContentTree);
fieldWriter.addMemberTags(ve, fieldsOverviewContentTree);
}
- serializableFieldsTree.addContent(fieldsOverviewContentTree);
- classContentTree.addContent(fieldWriter.getSerializableFields(
+ serializableFieldsTree.add(fieldsOverviewContentTree);
+ classContentTree.add(fieldWriter.getSerializableFields(
resources.getText("doclet.Serialized_Form_class"),
serializableFieldsTree));
}
@@ -431,12 +431,12 @@
buildFieldDeprecationInfo(fieldsContentTree);
buildFieldInfo(fieldsContentTree);
- serializableFieldsTree.addContent(fieldsContentTree);
+ serializableFieldsTree.add(fieldsContentTree);
} else {
buildSerialFieldTagsInfo(serializableFieldsTree);
}
}
- classContentTree.addContent(fieldWriter.getSerializableFields(
+ classContentTree.add(fieldWriter.getSerializableFields(
resources.getText("doclet.Serialized_Form_fields"),
serializableFieldsTree));
}
@@ -511,7 +511,7 @@
fieldWriter.addMemberHeader(te, fieldType, "",
tag.getName().getName().toString(), fieldsContentTree);
fieldWriter.addMemberDescription(field, tag, fieldsContentTree);
- serializableFieldsTree.addContent(fieldsContentTree);
+ serializableFieldsTree.add(fieldsContentTree);
}
}
--- a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/taglets/ParamTaglet.java Tue Mar 12 09:49:10 2019 +0000
+++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/taglets/ParamTaglet.java Sat Mar 16 21:00:45 2019 +0000
@@ -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
@@ -134,7 +134,7 @@
ExecutableElement member = (ExecutableElement) holder;
Content output = getTagletOutput(false, member, writer,
member.getTypeParameters(), utils.getTypeParamTrees(member));
- output.addContent(getTagletOutput(true, member, writer,
+ output.add(getTagletOutput(true, member, writer,
member.getParameters(), utils.getParamTrees(member)));
return output;
} else {
@@ -160,7 +160,7 @@
Content result = writer.getOutputInstance();
Set<String> alreadyDocumented = new HashSet<>();
if (!paramTags.isEmpty()) {
- result.addContent(
+ result.add(
processParamTags(holder, isParameters, paramTags,
getRankMap(writer.configuration().utils, formalParameters), writer, alreadyDocumented)
);
@@ -168,7 +168,7 @@
if (alreadyDocumented.size() != formalParameters.size()) {
//Some parameters are missing corresponding @param tags.
//Try to inherit them.
- result.addContent(getInheritedTagletOutput(isParameters, holder,
+ result.add(getInheritedTagletOutput(isParameters, holder,
writer, formalParameters, alreadyDocumented));
}
return result;
@@ -204,7 +204,7 @@
inheritedDoc.holderTag,
lname,
alreadyDocumented.isEmpty());
- result.addContent(content);
+ result.add(content);
}
alreadyDocumented.add(String.valueOf(i));
}
@@ -256,7 +256,7 @@
: "doclet.Type_Parameters_dup_warn",
paramName);
}
- result.addContent(processParamTag(e, isParams, writer, dt,
+ result.add(processParamTag(e, isParams, writer, dt,
ch.getParameterName(dt), alreadyDocumented.isEmpty()));
alreadyDocumented.add(rank);
}
@@ -285,9 +285,9 @@
String header = writer.configuration().getResources().getText(
isParams ? "doclet.Parameters" : "doclet.TypeParameters");
if (isFirstParam) {
- result.addContent(writer.getParamHeader(header));
+ result.add(writer.getParamHeader(header));
}
- result.addContent(writer.paramTagOutput(e, paramTag, name));
+ result.add(writer.paramTagOutput(e, paramTag, name));
return result;
}
}
--- a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/taglets/TagletWriter.java Tue Mar 12 09:49:10 2019 +0000
+++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/taglets/TagletWriter.java Sat Mar 16 21:00:45 2019 +0000
@@ -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
@@ -259,7 +259,7 @@
}
if (currentOutput != null) {
tagletManager.seenCustomTag(taglet.getName());
- output.addContent(currentOutput);
+ output.add(currentOutput);
}
}
}
--- a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/taglets/ThrowsTaglet.java Tue Mar 12 09:49:10 2019 +0000
+++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/taglets/ThrowsTaglet.java Sat Mar 16 21:00:45 2019 +0000
@@ -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
@@ -104,9 +104,9 @@
!alreadyDocumented.contains(utils.getSimpleName(klass)) &&
!alreadyDocumented.contains(utils.getFullyQualifiedName(klass))) {
if (alreadyDocumented.isEmpty()) {
- result.addContent(writer.getThrowsHeader());
+ result.add(writer.getThrowsHeader());
}
- result.addContent(writer.throwsTagOutput(declaredExceptionType));
+ result.add(writer.throwsTagOutput(declaredExceptionType));
alreadyDocumented.add(utils.getSimpleName(klass));
}
}
@@ -140,7 +140,7 @@
declaredExceptionTags.put(inheritedDoc.tagList, (ExecutableElement)inheritedDoc.holder);
}
}
- result.addContent(throwsTagsOutput(declaredExceptionTags, writer, alreadyDocumented, false));
+ result.add(throwsTagsOutput(declaredExceptionTags, writer, alreadyDocumented, false));
}
return result;
}
@@ -156,11 +156,11 @@
Content result = writer.getOutputInstance();
HashSet<String> alreadyDocumented = new HashSet<>();
if (!tagsMap.isEmpty()) {
- result.addContent(throwsTagsOutput(tagsMap, writer, alreadyDocumented, true));
+ result.add(throwsTagsOutput(tagsMap, writer, alreadyDocumented, true));
}
- result.addContent(inheritThrowsDocumentation(holder,
+ result.add(inheritThrowsDocumentation(holder,
execHolder.getThrownTypes(), alreadyDocumented, writer));
- result.addContent(linkToUndocumentedDeclaredExceptions(
+ result.add(linkToUndocumentedDeclaredExceptions(
execHolder.getThrownTypes(), alreadyDocumented, writer));
return result;
}
@@ -192,9 +192,9 @@
continue;
}
if (alreadyDocumented.isEmpty()) {
- result.addContent(writer.getThrowsHeader());
+ result.add(writer.getThrowsHeader());
}
- result.addContent(writer.throwsTagOutput(e, dt));
+ result.add(writer.throwsTagOutput(e, dt));
alreadyDocumented.add(te != null
? utils.getFullyQualifiedName(te)
: excName);
--- a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/taglets/UserTaglet.java Tue Mar 12 09:49:10 2019 +0000
+++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/taglets/UserTaglet.java Sat Mar 16 21:00:45 2019 +0000
@@ -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
@@ -132,7 +132,7 @@
*/
public Content getTagletOutput(Element element, DocTree tag, TagletWriter writer){
Content output = writer.getOutputInstance();
- output.addContent(new RawHtml(userTaglet.toString(Collections.singletonList(tag), element)));
+ output.add(new RawHtml(userTaglet.toString(Collections.singletonList(tag), element)));
return output;
}
@@ -146,7 +146,7 @@
if (!tags.isEmpty()) {
String tagString = userTaglet.toString(tags, holder);
if (tagString != null) {
- output.addContent(new RawHtml(tagString));
+ output.add(new RawHtml(tagString));
}
}
return output;
--- a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/util/links/LinkFactory.java Tue Mar 12 09:49:10 2019 +0000
+++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/util/links/LinkFactory.java Sat Mar 16 21:00:45 2019 +0000
@@ -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
@@ -81,7 +81,7 @@
// handles primitives, no types and error types
@Override
protected Content defaultAction(TypeMirror type, LinkInfo linkInfo) {
- link.addContent(utils.getTypeName(type, false));
+ link.add(utils.getTypeName(type, false));
return link;
}
@@ -96,14 +96,14 @@
currentDepth--;
if (utils.isAnnotated(type)) {
linkInfo.type = type;
- link.addContent(" ");
- link.addContent(getTypeAnnotationLinks(linkInfo));
+ link.add(" ");
+ link.add(getTypeAnnotationLinks(linkInfo));
}
// use vararg if required
if (linkInfo.isVarArg && currentDepth == 0) {
- link.addContent("...");
+ link.add("...");
} else {
- link.addContent("[]");
+ link.add("[]");
}
return link;
}
@@ -111,25 +111,25 @@
@Override
public Content visitWildcard(WildcardType type, LinkInfo linkInfo) {
linkInfo.isTypeBound = true;
- link.addContent("?");
+ link.add("?");
TypeMirror extendsBound = type.getExtendsBound();
if (extendsBound != null) {
- link.addContent(" extends ");
+ link.add(" extends ");
setBoundsLinkInfo(linkInfo, extendsBound);
- link.addContent(getLink(linkInfo));
+ link.add(getLink(linkInfo));
}
TypeMirror superBound = type.getSuperBound();
if (superBound != null) {
- link.addContent(" super ");
+ link.add(" super ");
setBoundsLinkInfo(linkInfo, superBound);
- link.addContent(getLink(linkInfo));
+ link.add(getLink(linkInfo));
}
return link;
}
@Override
public Content visitTypeVariable(TypeVariable type, LinkInfo linkInfo) {
- link.addContent(getTypeAnnotationLinks(linkInfo));
+ link.add(getTypeAnnotationLinks(linkInfo));
linkInfo.isTypeBound = true;
TypeVariable typevariable = (utils.isArrayType(type))
? (TypeVariable) componentType
@@ -138,12 +138,12 @@
if ((!linkInfo.excludeTypeParameterLinks) && utils.isTypeElement(owner)) {
linkInfo.typeElement = (TypeElement) owner;
Content label = newContent();
- label.addContent(utils.getTypeName(type, false));
+ label.add(utils.getTypeName(type, false));
linkInfo.label = label;
- link.addContent(getClassLink(linkInfo));
+ link.add(getClassLink(linkInfo));
} else {
// No need to link method type parameters.
- link.addContent(utils.getTypeName(typevariable, false));
+ link.add(utils.getTypeName(typevariable, false));
}
if (!linkInfo.excludeTypeBounds) {
@@ -159,9 +159,9 @@
!utils.isAnnotated(bound)) {
continue;
}
- link.addContent(more ? " & " : " extends ");
+ link.add(more ? " & " : " extends ");
setBoundsLinkInfo(linkInfo, bound);
- link.addContent(getLink(linkInfo));
+ link.add(getLink(linkInfo));
more = true;
}
}
@@ -173,16 +173,16 @@
if (linkInfo.isTypeBound && linkInfo.excludeTypeBoundsLinks) {
// Since we are excluding type parameter links, we should not
// be linking to the type bound.
- link.addContent(utils.getTypeName(type, false));
- link.addContent(getTypeParameterLinks(linkInfo));
+ link.add(utils.getTypeName(type, false));
+ link.add(getTypeParameterLinks(linkInfo));
return link;
} else {
link = newContent();
- link.addContent(getTypeAnnotationLinks(linkInfo));
+ link.add(getTypeAnnotationLinks(linkInfo));
linkInfo.typeElement = utils.asTypeElement(type);
- link.addContent(getClassLink(linkInfo));
+ link.add(getClassLink(linkInfo));
if (linkInfo.includeTypeAsSepLink) {
- link.addContent(getTypeParameterLinks(linkInfo, false));
+ link.add(getTypeParameterLinks(linkInfo, false));
}
}
return link;
@@ -191,9 +191,9 @@
return linkVisitor.visit(linkInfo.type, linkInfo);
} else if (linkInfo.typeElement != null) {
Content link = newContent();
- link.addContent(getClassLink(linkInfo));
+ link.add(getClassLink(linkInfo));
if (linkInfo.includeTypeAsSepLink) {
- link.addContent(getTypeParameterLinks(linkInfo, false));
+ link.add(getTypeParameterLinks(linkInfo, false));
}
return link;
} else {
--- a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/util/links/LinkInfo.java Tue Mar 12 09:49:10 2019 +0000
+++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/util/links/LinkInfo.java Sat Mar 16 21:00:45 2019 +0000
@@ -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
@@ -145,11 +145,11 @@
return label;
} else if (isLinkable()) {
Content tlabel = newContent();
- tlabel.addContent(configuration.utils.getSimpleName(typeElement));
+ tlabel.add(configuration.utils.getSimpleName(typeElement));
return tlabel;
} else {
Content tlabel = newContent();
- tlabel.addContent(configuration.getClassName(typeElement));
+ tlabel.add(configuration.getClassName(typeElement));
return tlabel;
}
}
--- a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/tool/Start.java Tue Mar 12 09:49:10 2019 +0000
+++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/tool/Start.java Sat Mar 16 21:00:45 2019 +0000
@@ -756,13 +756,6 @@
}
String text = messager.getText("main.doclet_class_not_found", userDocletName);
throw new ToolException(CMDERR, text, cnfe);
- } catch (NoClassDefFoundError ncfe) {
- if (ncfe.getMessage().contains("com/sun/javadoc/Doclet")) {
- String text = messager.getText("main.not_a_doclet", userDocletName);
- throw new ToolException(ERROR, text, ncfe);
- } else {
- throw ncfe;
- }
}
}
--- a/src/jdk.jcmd/share/classes/sun/tools/jmap/JMap.java Tue Mar 12 09:49:10 2019 +0000
+++ b/src/jdk.jcmd/share/classes/sun/tools/jmap/JMap.java Sat Mar 16 21:00:45 2019 +0000
@@ -190,7 +190,7 @@
System.out.flush();
// inspectHeap is not the same as jcmd GC.class_histogram
- executeCommandForPid(pid, "inspectheap", filename, liveopt);
+ executeCommandForPid(pid, "inspectheap", liveopt, filename);
}
private static void dump(String pid, String options)
--- a/src/jdk.jdwp.agent/unix/native/libjdwp/linker_md.c Tue Mar 12 09:49:10 2019 +0000
+++ b/src/jdk.jdwp.agent/unix/native/libjdwp/linker_md.c Sat Mar 16 21:00:45 2019 +0000
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2013, 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
@@ -24,16 +24,8 @@
*/
/*
- * Adapted from JDK 1.2 linker_md.c v1.37. Note that we #define
- * NATIVE here, whether or not we're running solaris native threads.
- * Outside the VM, it's unclear how we can do the locking that is
- * done in the green threads version of the code below.
- */
-#define NATIVE
-
-/*
* Machine Dependent implementation of the dynamic linking support
- * for java. This routine is Solaris specific.
+ * for java. This routine is Unix specific.
*/
#include <stdio.h>
@@ -43,10 +35,6 @@
#include <string.h>
#include "path_md.h"
-#ifndef NATIVE
-#include "iomgr.h"
-#include "threads_md.h"
-#endif
#ifdef __APPLE__
#define LIB_SUFFIX "dylib"
@@ -85,7 +73,7 @@
int
dbgsysBuildFunName(char *name, int nameLen, int args_size, int encodingIndex)
{
- /* On Solaris, there is only one encoding method. */
+ // On Unix, there is only one encoding method.
if (encodingIndex == 0)
return 1;
return 0;
@@ -96,12 +84,13 @@
* appropriate pre and extensions to a filename and the path
*/
void
-dbgsysBuildLibName(char *holder, int holderlen, const char *pname, const char *fname)
+dbgsysBuildLibName(char *holder, int holderlen, const char *pname,
+ const char *fname)
{
const int pnamelen = pname ? strlen(pname) : 0;
*holder = '\0';
- /* Quietly truncate on buffer overflow. Should be an error. */
+ // Quietly truncate on buffer overflow. Should be an error.
if (pnamelen + (int)strlen(fname) + 10 > holderlen) {
return;
}
@@ -113,30 +102,11 @@
}
}
-#ifndef NATIVE
-extern int thr_main(void);
-#endif
-
void *
dbgsysLoadLibrary(const char *name, char *err_buf, int err_buflen)
{
void * result;
-#ifdef NATIVE
result = dlopen(name, RTLD_LAZY);
-#else
- sysMonitorEnter(greenThreadSelf(), &_dl_lock);
- result = dlopen(name, RTLD_NOW);
- sysMonitorExit(greenThreadSelf(), &_dl_lock);
- /*
- * This is a bit of bulletproofing to catch the commonly occurring
- * problem of people loading a library which depends on libthread into
- * the VM. thr_main() should always return -1 which means that libthread
- * isn't loaded.
- */
- if (thr_main() != -1) {
- VM_CALL(panic)("libthread loaded into green threads");
- }
-#endif
if (result == NULL) {
(void)strncpy(err_buf, dlerror(), err_buflen-2);
err_buf[err_buflen-1] = '\0';
@@ -146,24 +116,10 @@
void dbgsysUnloadLibrary(void *handle)
{
-#ifndef NATIVE
- sysMonitorEnter(greenThreadSelf(), &_dl_lock);
-#endif
(void)dlclose(handle);
-#ifndef NATIVE
- sysMonitorExit(greenThreadSelf(), &_dl_lock);
-#endif
}
void * dbgsysFindLibraryEntry(void *handle, const char *name)
{
- void * sym;
-#ifndef NATIVE
- sysMonitorEnter(greenThreadSelf(), &_dl_lock);
-#endif
- sym = dlsym(handle, name);
-#ifndef NATIVE
- sysMonitorExit(greenThreadSelf(), &_dl_lock);
-#endif
- return sym;
+ return dlsym(handle, name);
}
--- a/src/jdk.jfr/share/classes/jdk/jfr/internal/instrument/SocketInputStreamInstrumentor.java Tue Mar 12 09:49:10 2019 +0000
+++ b/src/jdk.jfr/share/classes/jdk/jfr/internal/instrument/SocketInputStreamInstrumentor.java Sat Mar 16 21:00:45 2019 +0000
@@ -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
--- a/src/jdk.jfr/share/classes/jdk/jfr/internal/instrument/SocketOutputStreamInstrumentor.java Tue Mar 12 09:49:10 2019 +0000
+++ b/src/jdk.jfr/share/classes/jdk/jfr/internal/instrument/SocketOutputStreamInstrumentor.java Sat Mar 16 21:00:45 2019 +0000
@@ -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
--- a/src/jdk.jfr/share/classes/jdk/jfr/internal/tool/Command.java Tue Mar 12 09:49:10 2019 +0000
+++ b/src/jdk.jfr/share/classes/jdk/jfr/internal/tool/Command.java Sat Mar 16 21:00:45 2019 +0000
@@ -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
@@ -243,7 +243,7 @@
}
rad.read(); // try to read 1 byte
} catch (FileNotFoundException e) {
- throw new UserDataException("could not find file '" + path + "'");
+ throw new UserDataException("could not open file " + e.getMessage());
} catch (IOException e) {
throw new UserDataException("i/o error reading file '" + path + "', " + e.getMessage());
}
--- a/src/jdk.net/linux/classes/jdk/net/LinuxSocketOptions.java Tue Mar 12 09:49:10 2019 +0000
+++ b/src/jdk.net/linux/classes/jdk/net/LinuxSocketOptions.java Sat Mar 16 21:00:45 2019 +0000
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2017, 2018 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 2018, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
--- a/src/jdk.net/macosx/classes/jdk/net/MacOSXSocketOptions.java Tue Mar 12 09:49:10 2019 +0000
+++ b/src/jdk.net/macosx/classes/jdk/net/MacOSXSocketOptions.java Sat Mar 16 21:00:45 2019 +0000
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
--- a/src/jdk.net/macosx/native/libextnet/MacOSXSocketOptions.c Tue Mar 12 09:49:10 2019 +0000
+++ b/src/jdk.net/macosx/native/libextnet/MacOSXSocketOptions.c Sat Mar 16 21:00:45 2019 +0000
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
--- a/src/jdk.sctp/unix/classes/sun/nio/ch/sctp/SctpServerChannelImpl.java Tue Mar 12 09:49:10 2019 +0000
+++ b/src/jdk.sctp/unix/classes/sun/nio/ch/sctp/SctpServerChannelImpl.java Sat Mar 16 21:00:45 2019 +0000
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2009, 2013, 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
@@ -230,7 +230,7 @@
return null;
thread = NativeThread.current();
for (;;) {
- n = accept0(fd, newfd, isaa);
+ n = Net.accept(fd, newfd, isaa);
if ((n == IOStatus.INTERRUPTED) && isOpen())
continue;
break;
@@ -412,22 +412,4 @@
return SctpNet.getLocalAddresses(fdVal);
}
}
-
- /* Native */
- private static native void initIDs();
-
- private static native int accept0(FileDescriptor ssfd,
- FileDescriptor newfd, InetSocketAddress[] isaa) throws IOException;
-
- static {
- IOUtil.load(); // loads nio & net native libraries
- java.security.AccessController.doPrivileged(
- new java.security.PrivilegedAction<Void>() {
- public Void run() {
- System.loadLibrary("sctp");
- return null;
- }
- });
- initIDs();
- }
}
--- a/src/jdk.sctp/unix/native/libsctp/SctpServerChannelImpl.c Tue Mar 12 09:49:10 2019 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,53 +0,0 @@
-/*
- * Copyright (c) 2009, 2012, Oracle and/or its affiliates. All rights reserved.
- * 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.
- */
-
-#include "sun_nio_ch_sctp_SctpServerChannelImpl.h"
-
-extern void Java_sun_nio_ch_ServerSocketChannelImpl_initIDs(JNIEnv* env,
- jclass c);
-
-extern jint Java_sun_nio_ch_ServerSocketChannelImpl_accept0(JNIEnv* env,
- jobject this, jobject ssfdo, jobject newfdo, jobjectArray isaa);
-
-/*
- * Class: sun_nio_ch_sctp_SctpServerChannelImpl
- * Method: initIDs
- * Signature: ()V
- */
-JNIEXPORT void JNICALL Java_sun_nio_ch_sctp_SctpServerChannelImpl_initIDs
- (JNIEnv* env, jclass c) {
- Java_sun_nio_ch_ServerSocketChannelImpl_initIDs(env, c);
-}
-
-/*
- * Class: sun_nio_ch_sctp_SctpServerChannelImpl
- * Method: accept0
- * Signature: (Ljava/io/FileDescriptor;Ljava/io/FileDescriptor;[Ljava/net/InetSocketAddress;)I
- */
-JNIEXPORT jint JNICALL Java_sun_nio_ch_sctp_SctpServerChannelImpl_accept0
- (JNIEnv* env, jobject this, jobject ssfdo, jobject newfdo, jobjectArray isaa) {
- return Java_sun_nio_ch_ServerSocketChannelImpl_accept0(env, this,
- ssfdo, newfdo, isaa);
-}
--- a/test/hotspot/gtest/gc/z/test_zPhysicalMemory.cpp Tue Mar 12 09:49:10 2019 +0000
+++ b/test/hotspot/gtest/gc/z/test_zPhysicalMemory.cpp Sat Mar 16 21:00:45 2019 +0000
@@ -22,6 +22,7 @@
*/
#include "precompiled.hpp"
+#include "gc/z/zGlobals.hpp"
#include "gc/z/zPhysicalMemory.inline.hpp"
#include "utilities/debug.hpp"
#include "unittest.hpp"
@@ -29,55 +30,51 @@
#if defined(AMD64)
TEST(ZPhysicalMemorySegmentTest, split) {
- const size_t SegmentSize = 2 * M;
-
- ZPhysicalMemorySegment seg(0, 10 * SegmentSize);
+ ZPhysicalMemorySegment seg(0, 10 * ZGranuleSize);
- ZPhysicalMemorySegment seg_split0 = seg.split(0 * SegmentSize);
- EXPECT_EQ(seg_split0.size(), 0 * SegmentSize);
- EXPECT_EQ( seg.size(), 10 * SegmentSize);
+ ZPhysicalMemorySegment seg_split0 = seg.split(0 * ZGranuleSize);
+ EXPECT_EQ(seg_split0.size(), 0 * ZGranuleSize);
+ EXPECT_EQ( seg.size(), 10 * ZGranuleSize);
- ZPhysicalMemorySegment seg_split1 = seg.split(5 * SegmentSize);
- EXPECT_EQ(seg_split1.size(), 5 * SegmentSize);
- EXPECT_EQ( seg.size(), 5 * SegmentSize);
+ ZPhysicalMemorySegment seg_split1 = seg.split(5 * ZGranuleSize);
+ EXPECT_EQ(seg_split1.size(), 5 * ZGranuleSize);
+ EXPECT_EQ( seg.size(), 5 * ZGranuleSize);
- ZPhysicalMemorySegment seg_split2 = seg.split(5 * SegmentSize);
- EXPECT_EQ(seg_split2.size(), 5 * SegmentSize);
- EXPECT_EQ( seg.size(), 0 * SegmentSize);
+ ZPhysicalMemorySegment seg_split2 = seg.split(5 * ZGranuleSize);
+ EXPECT_EQ(seg_split2.size(), 5 * ZGranuleSize);
+ EXPECT_EQ( seg.size(), 0 * ZGranuleSize);
- ZPhysicalMemorySegment seg_split3 = seg.split(0 * SegmentSize);
- EXPECT_EQ(seg_split3.size(), 0 * SegmentSize);
- EXPECT_EQ( seg.size(), 0 * SegmentSize);
+ ZPhysicalMemorySegment seg_split3 = seg.split(0 * ZGranuleSize);
+ EXPECT_EQ(seg_split3.size(), 0 * ZGranuleSize);
+ EXPECT_EQ( seg.size(), 0 * ZGranuleSize);
}
TEST(ZPhysicalMemoryTest, split) {
- const size_t SegmentSize = 2 * M;
-
- ZPhysicalMemoryManager pmem_manager(10 * SegmentSize, SegmentSize);
+ ZPhysicalMemoryManager pmem_manager(10 * ZGranuleSize);
- pmem_manager.try_ensure_unused_capacity(10 * SegmentSize);
- EXPECT_EQ(pmem_manager.unused_capacity(), 10 * SegmentSize);
+ pmem_manager.try_ensure_unused_capacity(10 * ZGranuleSize);
+ EXPECT_EQ(pmem_manager.unused_capacity(), 10 * ZGranuleSize);
- ZPhysicalMemory pmem = pmem_manager.alloc(8 * SegmentSize);
+ ZPhysicalMemory pmem = pmem_manager.alloc(8 * ZGranuleSize);
EXPECT_EQ(pmem.nsegments(), 1u) << "wrong number of segments";
- ZPhysicalMemory split0_pmem = pmem.split(SegmentSize);
+ ZPhysicalMemory split0_pmem = pmem.split(ZGranuleSize);
EXPECT_EQ(split0_pmem.nsegments(), 1u);
EXPECT_EQ( pmem.nsegments(), 1u);
- EXPECT_EQ(split0_pmem.size(), 1 * SegmentSize);
- EXPECT_EQ( pmem.size(), 7 * SegmentSize);
+ EXPECT_EQ(split0_pmem.size(), 1 * ZGranuleSize);
+ EXPECT_EQ( pmem.size(), 7 * ZGranuleSize);
- ZPhysicalMemory split1_pmem = pmem.split(2 * SegmentSize);
+ ZPhysicalMemory split1_pmem = pmem.split(2 * ZGranuleSize);
EXPECT_EQ(split1_pmem.nsegments(), 1u);
EXPECT_EQ( pmem.nsegments(), 1u);
- EXPECT_EQ(split1_pmem.size(), 2 * SegmentSize);
- EXPECT_EQ( pmem.size(), 5 * SegmentSize);
+ EXPECT_EQ(split1_pmem.size(), 2 * ZGranuleSize);
+ EXPECT_EQ( pmem.size(), 5 * ZGranuleSize);
- ZPhysicalMemory split2_pmem = pmem.split(5 * SegmentSize);
+ ZPhysicalMemory split2_pmem = pmem.split(5 * ZGranuleSize);
EXPECT_EQ(split2_pmem.nsegments(), 1u);
EXPECT_EQ( pmem.nsegments(), 1u);
- EXPECT_EQ(split2_pmem.size(), 5 * SegmentSize);
- EXPECT_EQ( pmem.size(), 0 * SegmentSize);
+ EXPECT_EQ(split2_pmem.size(), 5 * ZGranuleSize);
+ EXPECT_EQ( pmem.size(), 0 * ZGranuleSize);
}
#endif
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/test/hotspot/gtest/metaprogramming/test_isArray.cpp Sat Mar 16 21:00:45 2019 +0000
@@ -0,0 +1,71 @@
+/*
+ * 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 "memory/allocation.hpp"
+#include "metaprogramming/isArray.hpp"
+#include "utilities/debug.hpp"
+
+class IsArrayTest: AllStatic {
+ class A: AllStatic {};
+
+ static const bool ia_A = IsArray<A>::value;
+ STATIC_ASSERT(!ia_A);
+
+ static const bool ia_Aptr = IsArray<A*>::value;
+ STATIC_ASSERT(!ia_Aptr);
+
+ static const bool ia_Aarr = IsArray<A[]>::value;
+ STATIC_ASSERT(ia_Aarr);
+
+ static const bool ia_Aarr10 = IsArray<A[10]>::value;
+ STATIC_ASSERT(ia_Aarr10);
+
+ static const bool ia_Aptrarr10 = IsArray<A*[10]>::value;
+ STATIC_ASSERT(ia_Aptrarr10);
+
+ static const bool ia_Aarr10arr10 = IsArray<A[10][10]>::value;
+ STATIC_ASSERT(ia_Aarr10arr10);
+
+ static const bool ia_cAarr = IsArray<const A[]>::value;
+ STATIC_ASSERT(ia_cAarr);
+
+ static const bool ia_vAarr = IsArray<volatile A[]>::value;
+ STATIC_ASSERT(ia_vAarr);
+
+ static const bool ia_cAarr10 = IsArray<const A[10]>::value;
+ STATIC_ASSERT(ia_cAarr10);
+
+ static const bool ia_vAarr10 = IsArray<volatile A[10]>::value;
+ STATIC_ASSERT(ia_vAarr10);
+
+ static const bool ia_voidptr = IsArray<void*>::value;
+ STATIC_ASSERT(!ia_voidptr);
+
+ static const bool ia_intptrt = IsArray<intptr_t>::value;
+ STATIC_ASSERT(!ia_intptrt);
+
+ static const bool ia_char = IsArray<char>::value;
+ STATIC_ASSERT(!ia_char);
+};
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/test/hotspot/gtest/metaprogramming/test_removeExtent.cpp Sat Mar 16 21:00:45 2019 +0000
@@ -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.
+ *
+ */
+
+#include "precompiled.hpp"
+#include "memory/allocation.hpp"
+#include "metaprogramming/removeExtent.hpp"
+#include "metaprogramming/isSame.hpp"
+#include "utilities/debug.hpp"
+
+class RemoveExtentTest {
+ class A: AllStatic {};
+
+ typedef A* Aptr;
+ typedef A Aarr[];
+ typedef A Aarr10[10];
+ typedef const A cA;
+ typedef const A* cAptr;
+ typedef const A cAarr[];
+ typedef const A cAarr10[10];
+
+ typedef RemoveExtent<Aptr>::type ra_Aptr;
+ static const bool ra_Aptr_is_Aptr = IsSame<ra_Aptr, Aptr>::value;
+ STATIC_ASSERT(ra_Aptr_is_Aptr);
+
+ typedef RemoveExtent<Aarr>::type ra_Aarr;
+ static const bool ra_Aarr_is_A = IsSame<ra_Aarr, A>::value;
+ STATIC_ASSERT(ra_Aarr_is_A);
+
+ typedef RemoveExtent<Aarr10>::type ra_Aarr10;
+ static const bool ra_Aarr10_is_A = IsSame<ra_Aarr10, A>::value;
+ STATIC_ASSERT(ra_Aarr10_is_A);
+
+ typedef RemoveExtent<cAptr>::type ra_cAptr;
+ static const bool ra_cAptr_is_cAptr = IsSame<ra_cAptr, cAptr>::value;
+ STATIC_ASSERT(ra_cAptr_is_cAptr);
+
+ typedef RemoveExtent<cAarr>::type ra_cAarr;
+ static const bool ra_cAarr_is_cA = IsSame<ra_cAarr, cA>::value;
+ STATIC_ASSERT(ra_cAarr_is_cA);
+
+ typedef RemoveExtent<cAarr10>::type ra_cAarr10;
+ static const bool ra_cAarr10_is_cA = IsSame<ra_cAarr10, cA>::value;
+ STATIC_ASSERT(ra_cAarr10_is_cA);
+};
--- a/test/hotspot/jtreg/ProblemList-graal.txt Tue Mar 12 09:49:10 2019 +0000
+++ b/test/hotspot/jtreg/ProblemList-graal.txt Sat Mar 16 21:00:45 2019 +0000
@@ -36,6 +36,7 @@
compiler/compilercontrol/jcmd/AddExcludeTest.java 8181753 generic-all
compiler/compilercontrol/jcmd/AddLogTest.java 8181753 generic-all
compiler/compilercontrol/mixed/RandomValidCommandsTest.java 8181753 generic-all
+compiler/compilercontrol/mixed/RandomCommandsTest.java 8181753 generic-all
compiler/graalunit/JttThreadsTest.java 8208066 generic-all
@@ -207,8 +208,6 @@
runtime/RedefineObject/TestRedefineObject.java 8218399 generic-all
-vmTestbase/nsk/jvmti/scenarios/sampling/SP06/sp06t003/TestDescription.java 8218167 generic-all
-
vmTestbase/gc/lock/jvmti/alloc/jvmtialloclock02/TestDescription.java 8218700 generic-all
vmTestbase/nsk/jdb/unmonitor/unmonitor001/unmonitor001.java 8218701 generic-all
@@ -226,4 +225,3 @@
org.graalvm.compiler.hotspot.test.ReservedStackAccessTest 8213567 windows-all
-org.graalvm.compiler.hotspot.test.CheckGraalIntrinsics 8218074
--- a/test/hotspot/jtreg/ProblemList.txt Tue Mar 12 09:49:10 2019 +0000
+++ b/test/hotspot/jtreg/ProblemList.txt Sat Mar 16 21:00:45 2019 +0000
@@ -83,6 +83,7 @@
runtime/handshake/HandshakeWalkSuspendExitTest.java 8214174 generic-all
runtime/NMT/CheckForProperDetailStackTrace.java 8218458 generic-all
runtime/SharedArchiveFile/SASymbolTableTest.java 8193639 solaris-all
+runtime/containers/docker/TestCPUSets.java 8220672 generic-all
#############################################################################
@@ -158,8 +159,6 @@
vmTestbase/nsk/monitoring/ThreadMXBean/ThreadInfo/Deadlock/JavaDeadlock001/TestDescription.java 8060733 generic-all
vmTestbase/nsk/jdi/ThreadReference/stop/stop001/TestDescription.java 7034630 generic-all
-vmTestbase/nsk/jdi/BScenarios/hotswap/tc10x001/TestDescription.java 8013728 generic-all
-vmTestbase/nsk/jdi/EventRequest/setEnabled/setenabled003/TestDescription.java 8066993 generic-all
vmTestbase/nsk/jdi/VirtualMachine/redefineClasses/redefineclasses021/TestDescription.java 8065773 generic-all
vmTestbase/nsk/jdi/VirtualMachine/redefineClasses/redefineclasses023/TestDescription.java 8065773 generic-all
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/test/hotspot/jtreg/compiler/aot/cli/jaotc/CompileAbsoluteDirectoryTest.java Sat Mar 16 21:00:45 2019 +0000
@@ -0,0 +1,60 @@
+/*
+ * 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.
+ */
+
+/*
+ * @test
+ * @requires vm.aot
+ * @library / /test/lib /testlibrary
+ * @modules java.base/jdk.internal.misc
+ * @build compiler.aot.cli.jaotc.CompileAbsoluteDirectoryTest
+ * @run driver ClassFileInstaller compiler.aot.cli.jaotc.data.HelloWorldOne
+ * compiler.aot.cli.jaotc.data.HelloWorldTwo
+ * @run driver compiler.aot.cli.jaotc.CompileAbsoluteDirectoryTest
+ * @summary check jaotc can compile directory with classes where directory is specified by absolute path
+ * @bug 8218859
+ */
+package compiler.aot.cli.jaotc;
+
+import compiler.aot.cli.jaotc.data.HelloWorldOne;
+import compiler.aot.cli.jaotc.data.HelloWorldTwo;
+import java.io.File;
+import jdk.test.lib.Asserts;
+import jdk.test.lib.process.OutputAnalyzer;
+
+public class CompileAbsoluteDirectoryTest {
+ public static void main(String[] args) {
+ try {
+ String dir = new java.io.File(".").getAbsolutePath();
+ System.out.println("Do test --directory " + dir);
+ OutputAnalyzer oa = JaotcTestHelper.compileLibrary("--directory", dir);
+ oa.shouldHaveExitValue(0);
+ File compiledLibrary = new File(JaotcTestHelper.DEFAULT_LIB_PATH);
+ Asserts.assertTrue(compiledLibrary.exists(), "Compiled library file missing");
+ Asserts.assertGT(compiledLibrary.length(), 0L, "Unexpected compiled library size");
+ JaotcTestHelper.checkLibraryUsage(HelloWorldOne.class.getName());
+ JaotcTestHelper.checkLibraryUsage(HelloWorldTwo.class.getName());
+ } catch (Exception e) {
+ throw new Error("Can't get full path name for '.', got exception " + e, e);
+ }
+ }
+}
--- a/test/hotspot/jtreg/compiler/aot/cli/jaotc/CompileDirectoryTest.java Tue Mar 12 09:49:10 2019 +0000
+++ b/test/hotspot/jtreg/compiler/aot/cli/jaotc/CompileDirectoryTest.java Sat Mar 16 21:00:45 2019 +0000
@@ -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
@@ -30,7 +30,7 @@
* @run driver ClassFileInstaller compiler.aot.cli.jaotc.data.HelloWorldOne
* compiler.aot.cli.jaotc.data.HelloWorldTwo
* @run driver compiler.aot.cli.jaotc.CompileDirectoryTest
- * @summary check jaotc can compile directory with classes
+ * @summary check jaotc can compile directory with classes where directory is specified by relative path
*/
package compiler.aot.cli.jaotc;
--- a/test/hotspot/jtreg/compiler/classUnloading/methodUnloading/TestOverloadCompileQueues.java Tue Mar 12 09:49:10 2019 +0000
+++ b/test/hotspot/jtreg/compiler/classUnloading/methodUnloading/TestOverloadCompileQueues.java Sat Mar 16 21:00:45 2019 +0000
@@ -25,6 +25,7 @@
* @test TestOverloadCompileQueues
* @bug 8163511
* @summary Test overloading the C1 and C2 compile queues with tasks.
+ * @requires !vm.graal.enabled
* @run main/othervm -XX:-TieredCompilation -XX:CompileThreshold=2 -XX:CICompilerCount=1
* compiler.classUnloading.methodUnloading.TestOverloadCompileQueues
* @run main/othervm -XX:TieredCompileTaskTimeout=1000 -XX:CompileThresholdScaling=0.001 -XX:CICompilerCount=2
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/test/hotspot/jtreg/compiler/codegen/BadLogicCode.java Sat Mar 16 21:00:45 2019 +0000
@@ -0,0 +1,61 @@
+/*
+ * 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
+ * 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.
+ */
+
+/*
+ * @test
+ * @bug 4157675
+ * @summary Solaris JIT generates bad code for logic expression
+ * @author Tom Rodriguez
+ * @run main compiler.codegen.BadLogicCode
+ */
+
+package compiler.codegen;
+
+public class BadLogicCode {
+ static int values[] = {Integer.MIN_VALUE, -1, 0, 1, 4, 16, 31,
+ 32, 33, Integer.MAX_VALUE};
+ static char b[][] = {null, new char[32]};
+ static boolean nullPtr = false, indexOutBnd = false;
+ static boolean indexOutBnd2 = false;
+
+ public static void main(String args[]) throws Exception{
+ int i = 1, j = 4, k = 9;
+
+ nullPtr = (b[i] == null);
+
+ int bufLen = nullPtr ? 0 : b[i].length;
+ indexOutBnd = (values[j] < 0)
+ || (values[j] > bufLen)
+ || (values[k] < 0)
+ || ((values[j] + values[k]) > bufLen)
+ ||((values[j] + values[k]) < 0);
+
+ indexOutBnd2 = (values[j] < 0);
+ indexOutBnd2 = indexOutBnd2 || (values[j] > bufLen);
+ indexOutBnd2 = indexOutBnd2 || (values[k] < 0);
+ indexOutBnd2 = indexOutBnd2 || ((values[j] + values[k]) > bufLen);
+ indexOutBnd2 = indexOutBnd2 ||((values[j] + values[k]) < 0);
+ if (indexOutBnd != indexOutBnd2)
+ throw new Error("logic expression generate different results");
+ }
+}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/test/hotspot/jtreg/compiler/codegen/ShiftTest.java Sat Mar 16 21:00:45 2019 +0000
@@ -0,0 +1,69 @@
+/*
+ * 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
+ * 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.
+ */
+
+/*
+ * @test
+ * @bug 4093292
+ * @summary Test for correct code generation by the JIT
+ * @run main compiler.codegen.ShiftTest
+ */
+
+package compiler.codegen;
+
+public class ShiftTest {
+ static final int w = 32;
+
+ private static void doTest(long ct) throws Exception {
+ int S22 = 0xc46cf7c2;
+ int S23 = 0xcfda9162;
+ int S24 = 0xd029aa4c;
+ int S25 = 0x17cf1801;
+ int A = (int)(ct & 0xffffffffL);
+ int B = (int)(ct >>> 32);
+ int x, y;
+ x = B - S25;
+ y = A & (w-1);
+ B = ((x >>> y) | (x << (w-y))) ^ A;
+ x = A - S24;
+ y = B & (w-1);
+ A = ((x >>> y) | (x << (w-y))) ^ B;
+ x = B - S23;
+ y = A & (w-1);
+ B = ((x >>> y) | (x << (w-y))) ^ A;
+ x = A - S22;
+ y = B & (w-1);
+ A = ((x >>> y) | (x << (w-y))) ^ B;
+ String astr = Integer.toHexString(A);
+ String bstr = Integer.toHexString(B);
+ System.err.println("A = " + astr + " B = " + bstr);
+ if ((!astr.equals("dcb38144")) ||
+ (!bstr.equals("1916de73"))) {
+ throw new RuntimeException("Unexpected shift results!");
+ }
+ System.err.println("Test passed");
+ }
+
+ public static void main(String[] args) throws Exception {
+ doTest(0x496def29b74be041L);
+ }
+}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/test/hotspot/jtreg/compiler/escapeAnalysis/TestGetClass.java Sat Mar 16 21:00:45 2019 +0000
@@ -0,0 +1,52 @@
+/*
+ * 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.
+ */
+
+/*
+ * @test
+ * @bug 8218201
+ * @summary BCEscapeAnalyzer assigns wrong escape state to getClass return value.
+ * @run main/othervm -XX:-TieredCompilation -Xcomp -XX:+UnlockDiagnosticVMOptions -XX:DisableIntrinsic=_getClass
+ * -XX:CompileCommand=quiet -XX:CompileCommand=compileonly,compiler.escapeAnalysis.TestGetClass::test
+ * -XX:+PrintCompilation compiler.escapeAnalysis.TestGetClass
+ */
+
+package compiler.escapeAnalysis;
+
+public class TestGetClass {
+ static Object obj = new Object();
+
+ public static boolean test() {
+ if (obj.getClass() == Object.class) {
+ synchronized (obj) {
+ return true;
+ }
+ }
+ return false;
+ }
+
+ public static void main(String[] args) {
+ if (!test()) {
+ throw new RuntimeException("Test failed");
+ }
+ }
+}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/test/hotspot/jtreg/compiler/exceptions/ExceptionInInit.java Sat Mar 16 21:00:45 2019 +0000
@@ -0,0 +1,96 @@
+/*
+ * 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
+ * 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.
+ */
+
+/*
+ * @test
+ * @bug 4165973
+ * @summary Attempt to read inaccessible property can produce
+ * exception of the wrong type.
+ * @author Tom Rodriguez
+ *
+ * @modules java.rmi
+ * @run main compiler.exceptions.ExceptionInInit
+ */
+
+package compiler.exceptions;
+
+import java.security.AccessController;
+import java.security.PrivilegedAction;
+
+public class ExceptionInInit {
+
+ public static void main(String[] args) {
+
+ Test test = null;
+
+ try {
+ System.setSecurityManager(new java.rmi.RMISecurityManager());
+ Test.showTest();
+ } catch (ExceptionInInitializerError e) {
+ }
+ }
+
+ public static class FooBar {
+ static String test = "test";
+ FooBar(String test) {
+ this.test = test;
+ }
+ }
+
+ public static class Test extends FooBar {
+
+ /*
+ * An AccessControlException is thrown in the static initializer of the
+ * class FooBar. This exception should produce an ExceptionInInitializer
+ * error. Instead it causes a more cryptic ClassNotFound error.
+ *
+ * The following is an excerpt from the output from java.security.debug=all
+ *
+ * access: access denied (java.util.PropertyPermission test.src read)
+ * java.lang.Exception: Stack trace
+ * at java.lang.Thread.dumpStack(Thread.java:938)
+ * at java.security.AccessControlContext.checkPermission(AccessControlContext.java:184)
+ * at java.security.AccessController.checkPermission(AccessController.java:402)
+ * at java.lang.SecurityManager.checkPermission(SecurityManager.java:516)
+ * at java.lang.SecurityManager.checkPropertyAccess(SecurityManager.java:1035)
+ * at java.lang.System.getProperty(System.java:441)
+ * at sun.security.action.GetPropertyAction.run(GetPropertyAction.java:73)
+ * at java.security.AccessController.doPrivileged(Native Method)
+ * at ExceptionInInit$Test.<clinit>(ExceptionInInit.java:33)
+ * at ExceptionInInit.main(ExceptionInInit.java:18)
+ * access: domain that failed ProtectionDomain (file:/tmp/exceptionInInit/<no certificates>)
+ *
+ * The following exception is occurring when this test program tries
+ * to access the test.src property.
+ */
+ private static String test =
+ AccessController.doPrivileged((PrivilegedAction<String>)() -> System.getProperty("test.src", "."));
+
+ Test(String test) {
+ super(test);
+ }
+ public static void showTest() {
+ System.err.println(test);
+ }
+ }
+}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/test/hotspot/jtreg/compiler/graalunit/EA9Test.java Sat Mar 16 21:00:45 2019 +0000
@@ -0,0 +1,38 @@
+/*
+ * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved.
+ * 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.
+ */
+
+/*
+ * @test
+ * @summary
+ * @requires vm.opt.final.EnableJVMCI == true
+ *
+ * @modules jdk.internal.vm.compiler
+ *
+ * @library /test/lib /compiler/graalunit /
+ *
+ * @build compiler.graalunit.common.GraalUnitTestLauncher
+ *
+ * @run driver jdk.test.lib.FileInstaller ../../ProblemList-graal.txt ExcludeList.txt
+ *
+ * @run main/othervm compiler.graalunit.common.GraalUnitTestLauncher -prefix org.graalvm.compiler.core.jdk9.test.ea -exclude ExcludeList.txt
+ */
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/test/hotspot/jtreg/compiler/graalunit/HotspotJdk9Test.java Sat Mar 16 21:00:45 2019 +0000
@@ -0,0 +1,38 @@
+/*
+ * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved.
+ * 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.
+ */
+
+/*
+ * @test
+ * @summary
+ * @requires vm.opt.final.EnableJVMCI == true
+ *
+ * @modules jdk.internal.vm.compiler
+ *
+ * @library /test/lib /compiler/graalunit /
+ *
+ * @build compiler.graalunit.common.GraalUnitTestLauncher
+ *
+ * @run driver jdk.test.lib.FileInstaller ../../ProblemList-graal.txt ExcludeList.txt
+ *
+ * @run main/othervm compiler.graalunit.common.GraalUnitTestLauncher -prefix org.graalvm.compiler.hotspot.jdk9.test -exclude ExcludeList.txt
+ */
--- a/test/hotspot/jtreg/compiler/graalunit/TestPackages.txt Tue Mar 12 09:49:10 2019 +0000
+++ b/test/hotspot/jtreg/compiler/graalunit/TestPackages.txt Sat Mar 16 21:00:45 2019 +0000
@@ -11,6 +11,7 @@
Debug org.graalvm.compiler.debug.test
Graph org.graalvm.compiler.graph.test @requires vm.graal.enabled
HotspotAmd64 org.graalvm.compiler.hotspot.amd64.test
+HotspotJdk9 org.graalvm.compiler.hotspot.jdk9.test
HotspotSparc org.graalvm.compiler.hotspot.sparc.test @requires vm.simpleArch == "sparcv9"
HotspotLir org.graalvm.compiler.hotspot.lir.test
Hotspot org.graalvm.compiler.hotspot.test
--- a/test/hotspot/jtreg/compiler/intrinsics/math/TestFpMinMaxIntrinsics.java Tue Mar 12 09:49:10 2019 +0000
+++ b/test/hotspot/jtreg/compiler/intrinsics/math/TestFpMinMaxIntrinsics.java Sat Mar 16 21:00:45 2019 +0000
@@ -45,16 +45,6 @@
* -XX:CompileCommand=print,compiler/intrinsics/math/TestFpMinMaxIntrinsics.*Test*
* -XX:CompileCommand=compileonly,compiler/intrinsics/math/TestFpMinMaxIntrinsics.*Test*
* compiler.intrinsics.math.TestFpMinMaxIntrinsics reductionTests 100
- * @run main/othervm -XX:+IgnoreUnrecognizedVMOptions -XX:+UnlockDiagnosticVMOptions
- * -XX:+TieredCompilation
- * -XX:CompileCommand=print,compiler/intrinsics/math/TestFpMinMaxIntrinsics.min*
- * -XX:CompileCommand=dontinline,compiler/intrinsics/math/TestFpMinMaxIntrinsics.min*
- * compiler.intrinsics.math.TestFpMinMaxIntrinsics randomSearchTree 1
- * @run main/othervm -XX:+IgnoreUnrecognizedVMOptions -XX:+UnlockDiagnosticVMOptions
- * -XX:+TieredCompilation
- * -XX:CompileCommand=print,compiler/intrinsics/math/TestFpMinMaxIntrinsics.min*
- * -XX:CompileCommand=dontinline,compiler/intrinsics/math/TestFpMinMaxIntrinsics.min*
- * compiler.intrinsics.math.TestFpMinMaxIntrinsics sortedSearchTree 1
*/
package compiler.intrinsics.math;
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/test/hotspot/jtreg/compiler/loopstripmining/CheckLoopStripMining.java Sat Mar 16 21:00:45 2019 +0000
@@ -0,0 +1,53 @@
+/*
+ * Copyright (c) 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
+ * 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.
+ */
+
+/**
+ * @test
+ * @bug 8220374
+ * @summary C2: LoopStripMining doesn't strip as expected
+ * @requires vm.compiler2.enabled
+ *
+ * @run main/othervm -XX:+UnlockDiagnosticVMOptions -XX:+SafepointTimeout -XX:+SafepointALot
+ * -XX:+AbortVMOnSafepointTimeout -XX:SafepointTimeoutDelay=500 -XX:GuaranteedSafepointInterval=500
+ * -XX:-TieredCompilation -XX:+UseCountedLoopSafepoints -XX:LoopStripMiningIter=1000
+ * -XX:LoopUnrollLimit=0 -XX:CompileCommand=compileonly,CheckLoopStripMining::test_loop -Xcomp CheckLoopStripMining
+ *
+ */
+
+public class CheckLoopStripMining {
+
+ public static int test_loop(int x) {
+ int sum = 0;
+ if (x != 0) {
+ for (int y = 1; y < Integer.MAX_VALUE; ++y) {
+ if (y % x == 0) ++sum;
+ }
+ }
+ return sum;
+ }
+
+ public static void main(String args[]) {
+ int sum = test_loop(3);
+ System.out.println("sum: " + sum);
+ }
+}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/test/hotspot/jtreg/compiler/runtime/JITClassInit.java Sat Mar 16 21:00:45 2019 +0000
@@ -0,0 +1,77 @@
+/*
+ * 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
+ * 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.
+ */
+
+/*
+ * @test
+ * @bug 4154887
+ * @summary self-parser test causes JDK 1.2 Beta4K segmentation fault
+ * @author Tom Rodriguez
+ * @run main/othervm compiler.runtime.JITClassInit
+ */
+
+package compiler.runtime;
+
+public class JITClassInit {
+ public static void main(String[] args) {
+ Token t = new Token();
+ new TokenTable();
+ }
+
+}
+
+class TokenTable {
+ public TokenTable() {
+ new TokenTypeIterator(this);
+ }
+
+ public void for_token_type(Token t) {
+ t.keyword_character_class();
+ }
+}
+
+class Token {
+ public Object keyword_character_class() {
+ return new Object();
+ }
+}
+
+class NameOrKeywordToken extends Token {
+ static TokenTable kt = new TokenTable();
+ public Object keyword_character_class() {
+ return new Object();
+ }
+}
+
+class CapKeywordToken extends NameOrKeywordToken {
+ public Object keyword_character_class() {
+ return new Object();
+ }
+};
+
+
+class TokenTypeIterator {
+ public TokenTypeIterator(TokenTable c) {
+ c.for_token_type(new CapKeywordToken());
+ c.for_token_type(new NameOrKeywordToken());
+ }
+}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/test/hotspot/jtreg/gc/ArraySize.java Sat Mar 16 21:00:45 2019 +0000
@@ -0,0 +1,48 @@
+/*
+ * 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
+ * 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.
+ */
+
+/*
+ * @test
+ * @bug 4063078
+ * @summary Allocating a ridiculously large array should not crash the VM
+ * @run main/othervm -Xmx128m -Xms32m gc.ArraySize
+ */
+
+package gc;
+
+public class ArraySize {
+
+ public static void main(String[] args) throws Exception {
+ boolean thrown = false;
+ try {
+ byte[] buf = new byte[Integer.MAX_VALUE - 1];
+ System.out.print(buf[0]);
+ } catch (OutOfMemoryError x) {
+ thrown = true;
+ }
+ if (! thrown) {
+ throw new Exception("Didn't throw expected OutOfMemoryError");
+ }
+ }
+
+}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/test/hotspot/jtreg/gc/InfiniteList.java Sat Mar 16 21:00:45 2019 +0000
@@ -0,0 +1,52 @@
+/*
+ * 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
+ * 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.
+ */
+
+/*
+ * @test
+ * @bug 4098578
+ * @summary Check if the VM properly throws OutOfMemoryError
+ * @author Sheng Liang
+ * @run main/othervm -Xmx128m gc.InfiniteList
+ */
+
+package gc;
+
+public class InfiniteList {
+ InfiniteList next;
+ long data[] = new long[50000];
+ public static void main(String[] args) throws Exception {
+ InfiniteList p, q;
+ p = new InfiniteList ();
+ p.data[p.data.length -1 ] = 999;
+ try {
+ while (p != null) {
+ q = new InfiniteList ();
+ q.next = p;
+ p = q;
+ }
+ throw new Exception ("OutOfMemoryError not thrown as expected.");
+ } catch (OutOfMemoryError e) {
+ return;
+ }
+ }
+}
--- a/test/hotspot/jtreg/gc/shenandoah/compiler/TestMaybeNullUnsafeAccess.java Tue Mar 12 09:49:10 2019 +0000
+++ b/test/hotspot/jtreg/gc/shenandoah/compiler/TestMaybeNullUnsafeAccess.java Sat Mar 16 21:00:45 2019 +0000
@@ -28,7 +28,12 @@
* @requires vm.gc.Shenandoah
* @modules java.base/jdk.internal.misc:+open
*
- * @run main/othervm -XX:-UseOnStackReplacement -XX:-BackgroundCompilation -XX:-TieredCompilation TestMaybeNullUnsafeAccess
+ * @run main/othervm -XX:-UseOnStackReplacement -XX:-BackgroundCompilation -XX:-TieredCompilation
+ * TestMaybeNullUnsafeAccess
+ *
+ * @run main/othervm -XX:-UseOnStackReplacement -XX:-BackgroundCompilation -XX:-TieredCompilation
+ * -XX:+UnlockExperimentalVMOptions -XX:+UseShenandoahGC
+ * TestMaybeNullUnsafeAccess
*
*/
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/test/hotspot/jtreg/runtime/ErrorHandling/ExplicitArithmeticCheck.java Sat Mar 16 21:00:45 2019 +0000
@@ -0,0 +1,70 @@
+/*
+ * 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
+ * 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.
+ */
+
+/*
+ * @test
+ * @bug 4221448
+ * @summary Use explicit check for integer arithmetic exception on win32.
+ */
+
+public class ExplicitArithmeticCheck {
+ public static void main(String argv[]) throws Exception {
+ for (int i = 0; i < 64; i++) {
+ boolean result = false;
+ int n;
+ try {
+ n = 0 / 0;
+ } catch (ArithmeticException e) {
+ result = true;
+ }
+ if (result == false) {
+ throw new Error("Failed to throw correct exception!");
+ }
+ result = false;
+ try {
+ n = 0 % 0;
+ } catch (ArithmeticException e) {
+ result = true;
+ }
+ if (result == false) {
+ throw new Error("Failed to throw correct exception!");
+ }
+ try {
+ n = 0x80000000 / -1;
+ } catch (Throwable t) {
+ throw new Error("Failed to throw correct exception!");
+ }
+ if (n != 0x80000000) {
+ throw new Error("Incorrect integer arithmetic ! ");
+ }
+ try {
+ n = 0x80000000 % -1;
+ } catch (Throwable t) {
+ throw new Error("Failed to throw correct exception!");
+ }
+ if (n != 0) {
+ throw new Error("Incorrect integer arithmetic!");
+ }
+ }
+ }
+}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/test/hotspot/jtreg/runtime/Thread/MonitorCacheMaybeExpand_DeadLock.java Sat Mar 16 21:00:45 2019 +0000
@@ -0,0 +1,186 @@
+/*
+ * 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
+ * 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.
+ */
+
+/*
+ * @test
+ * @bug 4087516
+ * @summary Incorrect locking leads to deadlock in monitorCacheMaybeExpand.
+ * @author Anand Palaniswamy
+ * @build MonitorCacheMaybeExpand_DeadLock
+ * @run main/othervm MonitorCacheMaybeExpand_DeadLock
+ */
+
+/**
+ * Background on the bug:
+ *
+ * The thread local monitor cache had a locking bug (till
+ * 1.2beta1) where two threads trying to expand the monitor cache
+ * at the same time would cause deadlock. The code paths that the
+ * two threads must be executing for this to happen is described
+ * in the bug report.
+ *
+ * Caveat and red-flag:
+ *
+ * Since deadlocks are very timing dependent, there is a good
+ * chance this test case will not catch the bug most of the time
+ * -- on your machine and setting, it is _possible_ that the two
+ * threads might not try a monitorCacheExpand at the same
+ * time. But in practice, on Solaris native threads, this program
+ * deadlocks the VM in about 2 seconds pretty consistently,
+ * whether MP or not.
+ *
+ * The rationale for running this test despite this rather large
+ * caveat is that at worst, it can do no harm.
+ *
+ * The idea:
+ *
+ * Is to create two monitor hungry threads.
+ *
+ * Originally Tom Rodriguez and I suspected that this weird state
+ * of two threads trying to expand monitor cache can happen only
+ * if:
+ *
+ * Thread 1: Is in the middle of a monitorCacheMaybeExpand.
+ * Thread 2: Runs GC and tries to freeClasses(). This causes
+ * sysFree() to be invoked, which in turn needs a
+ * mutex_lock -- and oops, we end up deadlocking
+ * with 1 on green_threads.
+ *
+ * Which is why this test tries to cause class GC at regular
+ * intervals.
+ *
+ * Turns out that the GC is not required. Two instances of the
+ * monitor hungry threads deadlock the VM pretty quick. :-) Infact
+ * the static initializer in the forName'd classes running
+ * alongside one of the hungry threads is sufficient to
+ * deadlock. Still keep the GC stuff just-in-case (and also
+ * because I wrote it :-).
+ *
+ */
+public class MonitorCacheMaybeExpand_DeadLock {
+
+ /**
+ * A monitor-hungry thread.
+ */
+ static class LotsaMonitors extends Thread {
+
+ /** How many recursions? Could cause Java stack overflow. */
+ static final int MAX_DEPTH = 800;
+
+ /** What is our depth? */
+ int depth = 0;
+
+ /** Thread ID */
+ int tid;
+
+ /** So output will have thread number. */
+ public LotsaMonitors(int tid, int depth) {
+ super("LotsaMonitors #" + new Integer(tid).toString());
+ this.tid = tid;
+ this.depth = depth;
+ }
+
+ /** Start a recursion that grabs monitors. */
+ public void run() {
+ System.out.println(">>>Starting " + this.toString() + " ...");
+ Thread.currentThread().yield();
+ this.recurse();
+ System.out.println("<<<Finished " + this.toString());
+ }
+
+ /** Every call to this method grabs an extra monitor. */
+ synchronized void recurse() {
+ if (this.depth > 0) {
+ new LotsaMonitors(tid, depth-1).recurse();
+ }
+ }
+ }
+
+ /**
+ * The test.
+ */
+ public static void main(String[] args) {
+ /* Start the two of these crazy threads. */
+ new LotsaMonitors(1, LotsaMonitors.MAX_DEPTH).start();
+ new LotsaMonitors(2, LotsaMonitors.MAX_DEPTH).start();
+
+ /* And sit there and GC for good measure. */
+ for (int i = 0; i < MAX_GC_ITERATIONS; i++) {
+ new LotsaMonitors(i+3, LotsaMonitors.MAX_DEPTH).start();
+ System.out.println(">>>Loading 10 classes and gc'ing ...");
+ Class[] classes = new Class[10];
+ fillClasses(classes);
+ classes = null;
+ System.gc();
+ Thread.currentThread().yield();
+ System.out.println("<<<Finished loading 10 classes and gc'ing");
+ }
+ }
+
+ /** How many times to GC? */
+ static final int MAX_GC_ITERATIONS = 10;
+
+ /** Load some classes into the array. */
+ static void fillClasses(Class[] classes) {
+ for (int i = 0; i < classes.length; i++) {
+ try {
+ classes[i] = Class.forName(classnames[i]);
+ } catch (ClassNotFoundException cnfe) {
+ cnfe.printStackTrace();
+ }
+ }
+ }
+
+ /** Some random classes to load. */
+ private static String[] classnames = {
+ "java.text.DecimalFormat",
+ "java.text.MessageFormat",
+ "java.util.GregorianCalendar",
+ "java.util.ResourceBundle",
+ "java.text.Collator",
+ "java.util.Date",
+ "java.io.Reader",
+ "java.io.Writer",
+ "java.lang.IllegalAccessException",
+ "java.lang.InstantiationException",
+ "java.lang.ClassNotFoundException",
+ "java.lang.CloneNotSupportedException",
+ "java.lang.InterruptedException",
+ "java.lang.NoSuchFieldException",
+ "java.lang.NoSuchMethodException",
+ "java.lang.RuntimeException",
+ "java.lang.ArithmeticException",
+ "java.lang.ArrayStoreException",
+ "java.lang.ClassCastException",
+ "java.lang.StringIndexOutOfBoundsException",
+ "java.lang.NegativeArraySizeException",
+ "java.lang.IllegalStateException",
+ "java.lang.IllegalArgumentException",
+ "java.lang.NumberFormatException",
+ "java.lang.IllegalThreadStateException",
+ "java.lang.IllegalMonitorStateException",
+ "java.lang.SecurityException",
+ "java.lang.ExceptionInInitializerError"
+ };
+
+}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/test/hotspot/jtreg/runtime/interpreter/WideStrictInline.java Sat Mar 16 21:00:45 2019 +0000
@@ -0,0 +1,127 @@
+/*
+ * 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
+ * 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.
+ */
+
+/*
+ * @test
+ * @bug 4169183
+ * @summary Check for correct inlining by the interpreter (widefp and strictfp).
+ * The default is widefp. A strictfp method was getting inlined
+ * into a widefp method.
+ */
+
+import java.io.PrintStream;
+
+public class WideStrictInline {
+ static PrintStream out;
+ static float halfUlp;
+
+ static {
+ halfUlp = 1;
+ for ( int i = 127 - 24; i > 0; i-- )
+ halfUlp *= 2;
+ }
+
+ public static void main(String argv[]) throws Exception {
+ out = System.err;
+ pr(-1,"halfUlp",halfUlp);
+ WideStrictInline obj = new WideStrictInline();
+ for( int i=0; i<48; i++ )
+ obj.instanceMethod( i );
+ }
+
+ private static void pr(int i, String desc, float r) {
+ out.print(" i=("+i+") "+desc+" ; == "+r);
+ out.println(" , 0x"+Integer.toHexString(Float.floatToIntBits(r)));
+ }
+
+ private static strictfp float WideStrictInline(float par) {
+ return par;
+ }
+
+ public static strictfp float strictValue(int i) {
+ float r;
+ switch (i%4) {
+ case 0: r = -Float.MAX_VALUE; break;
+ case 1: r = Float.MAX_VALUE; break;
+ case 2: r = Float.MIN_VALUE; break;
+ default : r = 1L << 24;
+ }
+ return r;
+ }
+
+ void instanceMethod (int i) throws Exception {
+ float r;
+ switch (i%4) {
+ case 0:
+ if (!Float.isInfinite( WideStrictInline(strictValue(i)*2) +
+ Float.MAX_VALUE ))
+ {
+ pr(i,
+ "WideStrictInline(-Float.MAX_VALUE * 2) " +
+ "!= Float.NEGATIVE_INFINITY"
+ ,WideStrictInline(strictValue(i)*2) + Float.MAX_VALUE);
+ }
+ r = WideStrictInline(strictValue(i)*2) + Float.MAX_VALUE;
+ if ( !Float.isInfinite( r ) ) {
+ pr(i,"r != Float.NEGATIVE_INFINITY",r);
+ throw new RuntimeException();
+ }
+ break;
+ case 1:
+ if (!Float.isInfinite(WideStrictInline(strictValue(i)+halfUlp) -
+ Float.MAX_VALUE )) {
+ pr(i,"WideStrictInline(Float.MAX_VALUE+halfUlp) " +
+ "!= Float.POSITIVE_INFINITY"
+ ,WideStrictInline(strictValue(i)+halfUlp) - Float.MAX_VALUE);
+ }
+ r = WideStrictInline(strictValue(i)+halfUlp) - Float.MAX_VALUE;
+ if ( !Float.isInfinite( r ) ) {
+ pr(i,"r != Float.POSITIVE_INFINITY",r);
+ throw new RuntimeException();
+ }
+ break;
+ case 2:
+ if (WideStrictInline(strictValue(i)/2) != 0) {
+ pr(i,"WideStrictInline(Float.MIN_VALUE/2) != 0",
+ WideStrictInline(strictValue(i)/2));
+ }
+ r = WideStrictInline(strictValue(i)/2);
+ if ( r != 0 ) {
+ pr(i,"r != 0",r);
+ throw new RuntimeException();
+ }
+ break;
+ default:
+ if (WideStrictInline(strictValue(i)-0.5f) - strictValue(i) != 0) {
+ pr(i,"WideStrictInline(2^24-0.5) != 2^24",
+ WideStrictInline(strictValue(i)-0.5f));
+ }
+ r = WideStrictInline(strictValue(i)-0.5f);
+ if ( r - strictValue(i) != 0 ) {
+ pr(i,"r != 2^24",r);
+ throw new RuntimeException();
+ }
+ }
+ }
+
+}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/test/hotspot/jtreg/runtime/reflect/ReflectStackOverflow.java Sat Mar 16 21:00:45 2019 +0000
@@ -0,0 +1,67 @@
+/*
+ * 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
+ * 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.
+ */
+
+/*
+ * @test
+ * @bug 4185411
+ * @summary This program crashes in 1.1, but runs okay in 1.2.
+ * @run main/othervm -Xss512k ReflectStackOverflow
+ */
+import java.lang.reflect.*;
+
+public class ReflectStackOverflow {
+ private static final int COUNT = 11000;
+
+ public static void main(String[] cmdline) throws Throwable {
+ for (int i = 0; i < COUNT+1; i++) {
+ stuff(i);
+ }
+ }
+
+ private static void stuff(int count) throws Throwable {
+ if (count < COUNT)
+ return; // don't do anything the first COUNT times.
+
+ try {
+ final Method method =
+ Method.class.getMethod
+ ("invoke", new Class[] { Object.class, Object[].class });
+
+ final Object[] args = new Object[] { method, null };
+ args[1] = args;
+
+ method.invoke(method, args); // "recursive reflection"
+ // exception should have been thrown by now...
+ System.out.println("how did I get here?");
+ } catch(Throwable t) {
+ int layers;
+ for(layers = 0; t instanceof InvocationTargetException; layers++)
+ t = ((InvocationTargetException)t).getTargetException();
+
+ System.err.println("Found " + layers + " layers of wrappers.");
+ if (!(t instanceof StackOverflowError)) {
+ throw t;
+ }
+ }
+ }
+}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/test/hotspot/jtreg/runtime/verifier/BadSignatures.jcod Sat Mar 16 21:00:45 2019 +0000
@@ -0,0 +1,424 @@
+/*
+ * 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.
+ */
+
+/*
+ * In this case, the signature for the fieldRef for str is missing its closing ';'.
+ * public class BadFieldRef {
+ * static String str = new String("Hi");
+ * public static void m(String argv[]) {
+ * System.out.println(str);
+ * }
+ * }
+*/
+class BadFieldRef {
+ 0xCAFEBABE;
+ 0; // minor version
+ 57; // version
+ [38] { // Constant Pool
+ ; // first element is empty
+ Method #9 #21; // #1 at 0x0A
+ Field #22 #23; // #2 at 0x0F
+ Field #8 #24; // #3 at 0x14
+ Method #25 #26; // #4 at 0x19
+ class #27; // #5 at 0x1E
+ String #28; // #6 at 0x21
+ Method #5 #29; // #7 at 0x24
+ class #30; // #8 at 0x29
+ class #31; // #9 at 0x2C
+ Utf8 "str"; // #10 at 0x2F
+ Utf8 "Ljava/lang/String"; // #11 at 0x35 // Missing closing ';' !!
+ Utf8 "<init>"; // #12 at 0x4A
+ Utf8 "()V"; // #13 at 0x53
+ Utf8 "Code"; // #14 at 0x59
+ Utf8 "LineNumberTable"; // #15 at 0x60
+ Utf8 "m"; // #16 at 0x72
+ Utf8 "([Ljava/lang/String;)V"; // #17 at 0x76
+ Utf8 "<clinit>"; // #18 at 0x8F
+ Utf8 "SourceFile"; // #19 at 0x9A
+ Utf8 "BadFieldRef.java"; // #20 at 0xA7
+ NameAndType #12 #13; // #21 at 0xBA
+ class #32; // #22 at 0xBF
+ NameAndType #33 #34; // #23 at 0xC2
+ NameAndType #10 #11; // #24 at 0xC7
+ class #35; // #25 at 0xCC
+ NameAndType #36 #37; // #26 at 0xCF
+ Utf8 "java/lang/String"; // #27 at 0xD4
+ Utf8 "Hi"; // #28 at 0xE7
+ NameAndType #12 #37; // #29 at 0xEC
+ Utf8 "BadFieldRef"; // #30 at 0xF1
+ Utf8 "java/lang/Object"; // #31 at 0xFF
+ Utf8 "java/lang/System"; // #32 at 0x0112
+ Utf8 "out"; // #33 at 0x0125
+ Utf8 "Ljava/io/PrintStream;"; // #34 at 0x012B
+ Utf8 "java/io/PrintStream"; // #35 at 0x0143
+ Utf8 "println"; // #36 at 0x0159
+ Utf8 "(Ljava/lang/String;)V"; // #37 at 0x0163
+ } // Constant Pool
+
+ 0x0021; // access [ ACC_PUBLIC ACC_SUPER ]
+ #8;// this_cpx
+ #9;// super_cpx
+
+ [0] { // Interfaces
+ } // Interfaces
+
+ [1] { // fields
+ { // Member at 0x0185
+ 0x0008; // access
+ #10; // name_cpx
+ #11; // sig_cpx
+ [0] { // Attributes
+ } // Attributes
+ } // Member
+ } // fields
+
+ [3] { // methods
+ { // Member at 0x018F
+ 0x0001; // access
+ #12; // name_cpx
+ #13; // sig_cpx
+ [1] { // Attributes
+ Attr(#14, 29) { // Code at 0x0197
+ 1; // max_stack
+ 1; // max_locals
+ Bytes[5]{
+ 0x2AB70001B1;
+ };
+ [0] { // Traps
+ } // end Traps
+ [1] { // Attributes
+ Attr(#15, 6) { // LineNumberTable at 0x01AE
+ [1] { // LineNumberTable
+ 0 1; // at 0x01BA
+ }
+ } // end LineNumberTable
+ } // Attributes
+ } // end Code
+ } // Attributes
+ } // Member
+ ;
+ { // Member at 0x01BA
+ 0x0009; // access
+ #16; // name_cpx
+ #17; // sig_cpx
+ [1] { // Attributes
+ Attr(#14, 38) { // Code at 0x01C2
+ 2; // max_stack
+ 1; // max_locals
+ Bytes[10]{
+ 0xB20002B20003B600;
+ 0x04B1;
+ };
+ [0] { // Traps
+ } // end Traps
+ [1] { // Attributes
+ Attr(#15, 10) { // LineNumberTable at 0x01DE
+ [2] { // LineNumberTable
+ 0 6; // at 0x01EA
+ 9 7; // at 0x01EE
+ }
+ } // end LineNumberTable
+ } // Attributes
+ } // end Code
+ } // Attributes
+ } // Member
+ ;
+ { // Member at 0x01EE
+ 0x0008; // access
+ #18; // name_cpx
+ #13; // sig_cpx
+ [1] { // Attributes
+ Attr(#14, 37) { // Code at 0x01F6
+ 3; // max_stack
+ 0; // max_locals
+ Bytes[13]{
+ 0xBB0005591206B700;
+ 0x07B30003B1;
+ };
+ [0] { // Traps
+ } // end Traps
+ [1] { // Attributes
+ Attr(#15, 6) { // LineNumberTable at 0x0215
+ [1] { // LineNumberTable
+ 0 3; // at 0x0221
+ }
+ } // end LineNumberTable
+ } // Attributes
+ } // end Code
+ } // Attributes
+ } // Member
+ } // methods
+
+ [1] { // Attributes
+ Attr(#19, 2) { // SourceFile at 0x0223
+ #20;
+ } // end SourceFile
+ } // Attributes
+} // end class BadFieldRef
+
+
+
+/*
+ * In this case, the signature for the methodRef has an illegal embedded ';'.
+ * public class BadMethodRef {
+ * public static void main(java.la;ng.String argv[]) throws Throwable {
+ * System.out.println(" World");
+ * }
+ * }
+*/
+class BadMethodRef {
+ 0xCAFEBABE;
+ 0; // minor version
+ 57; // version
+ [32] { // Constant Pool
+ ; // first element is empty
+ Method #6 #17; // #1 at 0x0A
+ Field #18 #19; // #2 at 0x0F
+ String #20; // #3 at 0x14
+ Method #21 #22; // #4 at 0x17
+ class #23; // #5 at 0x1C
+ class #24; // #6 at 0x1F
+ Utf8 "<init>"; // #7 at 0x22
+ Utf8 "()V"; // #8 at 0x2B
+ Utf8 "Code"; // #9 at 0x31
+ Utf8 "LineNumberTable"; // #10 at 0x38
+ Utf8 "main"; // #11 at 0x4A
+ Utf8 "([Ljava/lang/String;)V"; // #12 at 0x51
+ Utf8 "Exceptions"; // #13 at 0x6A
+ class #25; // #14 at 0x77
+ Utf8 "SourceFile"; // #15 at 0x7A
+ Utf8 "BadMethodRef.java"; // #16 at 0x87
+ NameAndType #7 #8; // #17 at 0x9B
+ class #26; // #18 at 0xA0
+ NameAndType #27 #28; // #19 at 0xA3
+ Utf8 " World"; // #20 at 0xA8
+ class #29; // #21 at 0xB1
+ NameAndType #30 #31; // #22 at 0xB4
+ Utf8 "BadMethodRef"; // #23 at 0xB9
+ Utf8 "java/lang/Object"; // #24 at 0xC8
+ Utf8 "java/lang/Throwable"; // #25 at 0xDB
+ Utf8 "java/lang/System"; // #26 at 0xF1
+ Utf8 "out"; // #27 at 0x0104
+ Utf8 "Ljava/io/PrintStream;"; // #28 at 0x010A
+ Utf8 "java/io/PrintStream"; // #29 at 0x0122
+ Utf8 "println"; // #30 at 0x0138
+ Utf8 "(Ljava/la;ng/String;)V"; // #31 at 0x0142 // Illegal "la;ng"
+ } // Constant Pool
+
+ 0x0021; // access [ ACC_PUBLIC ACC_SUPER ]
+ #5;// this_cpx
+ #6;// super_cpx
+
+ [0] { // Interfaces
+ } // Interfaces
+
+ [0] { // fields
+ } // fields
+
+ [2] { // methods
+ { // Member at 0x0166
+ 0x0001; // access
+ #7; // name_cpx
+ #8; // sig_cpx
+ [1] { // Attributes
+ Attr(#9, 29) { // Code at 0x016E
+ 1; // max_stack
+ 1; // max_locals
+ Bytes[5]{
+ 0x2AB70001B1;
+ };
+ [0] { // Traps
+ } // end Traps
+ [1] { // Attributes
+ Attr(#10, 6) { // LineNumberTable at 0x0185
+ [1] { // LineNumberTable
+ 0 1; // at 0x0191
+ }
+ } // end LineNumberTable
+ } // Attributes
+ } // end Code
+ } // Attributes
+ } // Member
+ ;
+ { // Member at 0x0191
+ 0x0009; // access
+ #11; // name_cpx
+ #12; // sig_cpx
+ [2] { // Attributes
+ Attr(#9, 37) { // Code at 0x0199
+ 2; // max_stack
+ 1; // max_locals
+ Bytes[9]{
+ 0xB200021203B60004;
+ 0xB1;
+ };
+ [0] { // Traps
+ } // end Traps
+ [1] { // Attributes
+ Attr(#10, 10) { // LineNumberTable at 0x01B4
+ [2] { // LineNumberTable
+ 0 4; // at 0x01C0
+ 8 5; // at 0x01C4
+ }
+ } // end LineNumberTable
+ } // Attributes
+ } // end Code
+ ;
+ Attr(#13, 4) { // Exceptions at 0x01C4
+ [1] { // Exceptions
+ #14; // at 0x01CE
+ }
+ } // end Exceptions
+ } // Attributes
+ } // Member
+ } // methods
+
+ [1] { // Attributes
+ Attr(#15, 2) { // SourceFile at 0x01D0
+ #16;
+ } // end SourceFile
+ } // Attributes
+} // end class BadMethodRef
+
+
+/*
+ * In this case, the signature for myMethod has an illegal embedded '['.
+ * public class BadMethodSig {
+ * public static void myMethod(Str[ing argv[]) throws Throwable {
+ * System.out.println(" World");
+ * }
+ * }
+*/
+class BadMethodSig {
+ 0xCAFEBABE;
+ 0; // minor version
+ 57; // version
+ [32] { // Constant Pool
+ ; // first element is empty
+ Method #6 #17; // #1 at 0x0A
+ Field #18 #19; // #2 at 0x0F
+ String #20; // #3 at 0x14
+ Method #21 #22; // #4 at 0x17
+ class #23; // #5 at 0x1C
+ class #24; // #6 at 0x1F
+ Utf8 "<init>"; // #7 at 0x22
+ Utf8 "()V"; // #8 at 0x2B
+ Utf8 "Code"; // #9 at 0x31
+ Utf8 "LineNumberTable"; // #10 at 0x38
+ Utf8 "myMethod"; // #11 at 0x4A
+ Utf8 "([Ljava/lang/Str[ing;)V"; // #12 at 0x55 // Illegal "Str[ing"
+ Utf8 "Exceptions"; // #13 at 0x6E
+ class #25; // #14 at 0x7B
+ Utf8 "SourceFile"; // #15 at 0x7E
+ Utf8 "BadMethodSig.java"; // #16 at 0x8B
+ NameAndType #7 #8; // #17 at 0x9F
+ class #26; // #18 at 0xA4
+ NameAndType #27 #28; // #19 at 0xA7
+ Utf8 " World"; // #20 at 0xAC
+ class #29; // #21 at 0xB5
+ NameAndType #30 #31; // #22 at 0xB8
+ Utf8 "BadMethodSig"; // #23 at 0xBD
+ Utf8 "java/lang/Object"; // #24 at 0xCC
+ Utf8 "java/lang/Throwable"; // #25 at 0xDF
+ Utf8 "java/lang/System"; // #26 at 0xF5
+ Utf8 "out"; // #27 at 0x0108
+ Utf8 "Ljava/io/PrintStream;"; // #28 at 0x010E
+ Utf8 "java/io/PrintStream"; // #29 at 0x0126
+ Utf8 "println"; // #30 at 0x013C
+ Utf8 "(Ljava/lang/String;)V"; // #31 at 0x0146
+ } // Constant Pool
+
+ 0x0021; // access [ ACC_PUBLIC ACC_SUPER ]
+ #5;// this_cpx
+ #6;// super_cpx
+
+ [0] { // Interfaces
+ } // Interfaces
+
+ [0] { // fields
+ } // fields
+
+ [2] { // methods
+ { // Member at 0x016A
+ 0x0001; // access
+ #7; // name_cpx
+ #8; // sig_cpx
+ [1] { // Attributes
+ Attr(#9, 29) { // Code at 0x0172
+ 1; // max_stack
+ 1; // max_locals
+ Bytes[5]{
+ 0x2AB70001B1;
+ };
+ [0] { // Traps
+ } // end Traps
+ [1] { // Attributes
+ Attr(#10, 6) { // LineNumberTable at 0x0189
+ [1] { // LineNumberTable
+ 0 1; // at 0x0195
+ }
+ } // end LineNumberTable
+ } // Attributes
+ } // end Code
+ } // Attributes
+ } // Member
+ ;
+ { // Member at 0x0195
+ 0x0009; // access
+ #11; // name_cpx
+ #12; // sig_cpx
+ [2] { // Attributes
+ Attr(#9, 37) { // Code at 0x019D
+ 2; // max_stack
+ 1; // max_locals
+ Bytes[9]{
+ 0xB200021203B60004;
+ 0xB1;
+ };
+ [0] { // Traps
+ } // end Traps
+ [1] { // Attributes
+ Attr(#10, 10) { // LineNumberTable at 0x01B8
+ [2] { // LineNumberTable
+ 0 4; // at 0x01C4
+ 8 5; // at 0x01C8
+ }
+ } // end LineNumberTable
+ } // Attributes
+ } // end Code
+ ;
+ Attr(#13, 4) { // Exceptions at 0x01C8
+ [1] { // Exceptions
+ #14; // at 0x01D2
+ }
+ } // end Exceptions
+ } // Attributes
+ } // Member
+ } // methods
+
+ [1] { // Attributes
+ Attr(#15, 2) { // SourceFile at 0x01D4
+ #16;
+ } // end SourceFile
+ } // Attributes
+} // end class BadMethodSig
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/test/hotspot/jtreg/runtime/verifier/TestSigParse.java Sat Mar 16 21:00:45 2019 +0000
@@ -0,0 +1,72 @@
+/*
+ * 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.
+ */
+
+/*
+ * @test
+ * @bug 8129579
+ * @summary Test that signatures are properly parsed when verification of local
+ * classes is requested but verification of remote classes is not.
+ * @compile BadSignatures.jcod
+ * @run main/othervm -XX:+BytecodeVerificationLocal -XX:-BytecodeVerificationRemote TestSigParse
+ */
+
+public class TestSigParse {
+
+ public static void main(String args[]) throws Throwable {
+ System.out.println("Regression test for bug 819579");
+
+ // Test a FieldRef with a bad signature.
+ try {
+ Class newClass = Class.forName("BadFieldRef");
+ throw new RuntimeException("Expected ClasFormatError exception not thrown");
+ } catch (java.lang.ClassFormatError e) {
+ String eMsg = e.getMessage();
+ if (!eMsg.contains("Field") || !eMsg.contains("has illegal signature")) {
+ throw new RuntimeException("Unexpected exception: " + eMsg);
+ }
+ }
+
+ // Test a MethodRef with a bad signature.
+ try {
+ Class newClass = Class.forName("BadMethodRef");
+ throw new RuntimeException("Expected ClasFormatError exception not thrown");
+ } catch (java.lang.ClassFormatError e) {
+ String eMsg = e.getMessage();
+ if (!eMsg.contains("Method") || !eMsg.contains("has illegal signature")) {
+ throw new RuntimeException("Unexpected exception: " + eMsg);
+ }
+ }
+
+ // Test a method in a class with a bad signature.
+ try {
+ Class newClass = Class.forName("BadMethodSig");
+ throw new RuntimeException("Expected ClasFormatError exception not thrown");
+ } catch (java.lang.ClassFormatError e) {
+ String eMsg = e.getMessage();
+ if (!eMsg.contains("Class name contains illegal character")) {
+ throw new RuntimeException("Unexpected exception: " + eMsg);
+ }
+ }
+ }
+
+}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/test/hotspot/jtreg/runtime/verifier/TestStaticIF.java Sat Mar 16 21:00:45 2019 +0000
@@ -0,0 +1,44 @@
+/*
+ * 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
+ * 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.
+ *
+ */
+
+/*
+ * @test
+ * @bug 8007736
+ * @summary Test static interface method.
+ * @run main/othervm -Xverify:all TestStaticIF
+ */
+
+public class TestStaticIF implements StaticMethodInInterface {
+
+ public static void main(String[] args) {
+ System.out.printf("main: %s%n", StaticMethodInInterface.get());
+ }
+}
+
+interface StaticMethodInInterface {
+
+ public static String get() {
+ return "Hello from StaticMethodInInterface.get()";
+ }
+}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/test/hotspot/jtreg/runtime/verifier/VerifyProtectedConstructor.java Sat Mar 16 21:00:45 2019 +0000
@@ -0,0 +1,129 @@
+/*
+ * 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
+ * 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.
+ */
+
+
+/**
+ * @test
+
+ * @bug 6490436
+ * @summary Verify that protected constructor calls are not allowed for any classfile versions in either verifier.
+ * @author Keith McGuigan
+ */
+
+public class VerifyProtectedConstructor extends ClassLoader {
+ public static void main(String argv[]) throws Exception {
+ VerifyProtectedConstructor t = new VerifyProtectedConstructor();
+
+ t.loadSuperClass();
+
+ try {
+ t.checkClassVersion(49); // should not throw VerifyError
+ throw new Exception("FAIL: should be a VerifyError for CF version 49");
+ }
+ catch(VerifyError e) {
+ System.out.println("PASS for CF version 49");
+ }
+
+ try {
+ t.checkClassVersion(50); // should throw VerifyError
+ throw new Exception("FAIL: should be a VerifyError for CF version 50");
+ }
+ catch(VerifyError e) {
+ System.out.println("PASS");
+ }
+ }
+
+ private void loadSuperClass() {
+ /* -- code for super class A.A --
+ package A;
+ public class A {
+ protected A() {}
+ }
+ */
+ long[] cls_data = {
+ 0xcafebabe00000032L, 0x000a0a0003000707L,
+ 0x0008070009010006L, 0x3c696e69743e0100L,
+ 0x0328295601000443L, 0x6f64650c00040005L,
+ 0x010003412f410100L, 0x106a6176612f6c61L,
+ 0x6e672f4f626a6563L, 0x7400210002000300L,
+ 0x0000000001000400L, 0x0400050001000600L,
+ 0x0000110001000100L, 0x0000052ab70001b1L,
+ 0x0000000000000000L // 2 bytes extra
+ };
+ final int EXTRA = 2;
+ byte cf_bytes[] = toByteArray(cls_data);
+ defineClass("A.A", cf_bytes, 0, cf_bytes.length - EXTRA);
+ }
+
+ private int num_calls;
+ private static String classNames[] = { "B.B", "C.C" };
+
+ private void checkClassVersion(int version) throws VerifyError {
+ // This class is in violation of the spec since it accesses
+ // a protected constructor of a superclass while not being in the
+ // same package.
+ /* -- code for test class --
+ package B;
+ public class B extends A.A {
+ public static void f() { new A.A(); }
+ }
+ */
+ long[] cls_data = {
+ 0xcafebabe00000032L, 0x000b0a0002000807L,
+ 0x000907000a010006L, 0x3c696e69743e0100L,
+ 0x0328295601000443L, 0x6f6465010001660cL,
+ 0x0004000501000341L, 0x2f41010003422f42L,
+ 0x0021000300020000L, 0x0000000200010004L,
+ 0x0005000100060000L, 0x0011000100010000L,
+ 0x00052ab70001b100L, 0x0000000009000700L,
+ 0x0500010006000000L, 0x1500020000000000L,
+ 0x09bb000259b70001L, 0x57b1000000000000L // no extra bytes
+ };
+ final int EXTRA = 0;
+
+ byte cf_bytes[] = toByteArray(cls_data);
+
+ // set version
+ cf_bytes[7] = (byte)version;
+
+ // Change B.B to C.C, D.D, ... for subsequent calls so we can call this
+ // multiple times and define different classes.
+ cf_bytes[61] += num_calls;
+ cf_bytes[63] += num_calls;
+ String name = classNames[num_calls];
+ num_calls++;
+
+ Class c = defineClass(name, cf_bytes, 0, cf_bytes.length - EXTRA);
+
+ try { c.newInstance(); } // to force linking, thus verification
+ catch(InstantiationException e) {}
+ catch(IllegalAccessException e) {}
+ }
+
+ static private byte[] toByteArray(long arr[]) {
+ // convert long array to byte array
+ java.nio.ByteBuffer bbuf = java.nio.ByteBuffer.allocate(arr.length * 8);
+ bbuf.asLongBuffer().put(java.nio.LongBuffer.wrap(arr));
+ return bbuf.array();
+ }
+}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/test/hotspot/jtreg/runtime/verifier/VerifyStackForExceptionHandlers.java Sat Mar 16 21:00:45 2019 +0000
@@ -0,0 +1,130 @@
+/*
+ * 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
+ * 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.
+ */
+
+
+/**
+ * @test
+ * @bug 6547378
+ * @summary Verify that methods with max_stack==0 don't have exception handlers
+ * @author Keith McGuigan
+ */
+
+public class VerifyStackForExceptionHandlers extends ClassLoader {
+ public static void main(String argv[]) throws Exception {
+ VerifyStackForExceptionHandlers t =
+ new VerifyStackForExceptionHandlers();
+
+ try {
+ t.loadGoodClass();
+ } catch(VerifyError e) {
+ throw new Exception("FAIL: should be no VerifyError for class A");
+ }
+
+ try {
+ t.loadBadClass();
+ throw new Exception("FAIL: should be a VerifyError for class B");
+ } catch(VerifyError e) {
+ System.out.println("PASS");
+ }
+ }
+
+ private void loadGoodClass() {
+ /* -- code for class A --
+ public class A {
+ public static void f() {}
+ }
+ */
+ long[] cls_data = {
+ 0xcafebabe00000031L, 0x000e0a0003000b07L,
+ 0x000c07000d010006L, 0x3c696e69743e0100L,
+ 0x0328295601000443L, 0x6f646501000f4c69L,
+ 0x6e654e756d626572L, 0x5461626c65010001L,
+ 0x6601000a536f7572L, 0x636546696c650100L,
+ 0x06412e6a6176610cL, 0x0004000501000141L,
+ 0x0100106a6176612fL, 0x6c616e672f4f626aL,
+ 0x6563740021000200L, 0x0300000000000200L,
+ 0x0100040005000100L, 0x060000001d000100L,
+ 0x01000000052ab700L, 0x01b1000000010007L,
+ 0x0000000600010000L, 0x0001000900080005L,
+ 0x0001000600000019L, 0x0000000000000001L,
+ 0xb100000001000700L, 0x0000060001000000L,
+ 0x0200010009000000L, 0x02000a0000000000L
+ };
+ final int EXTRA = 5;
+
+ byte cf_bytes[] = toByteArray(cls_data);
+ Class c = defineClass("A", cf_bytes, 0, cf_bytes.length - EXTRA);
+
+ try { c.newInstance(); } // to force linking, thus verification
+ catch(InstantiationException e) {}
+ catch(IllegalAccessException e) {}
+ }
+
+ private void loadBadClass() throws VerifyError {
+ /* -- code for class B --
+ public class B {
+ public static void g() {}
+ public static void f() {
+ // bytecode modified to have a max_stack value of 0
+ try { g(); }
+ catch (NullPointerException e) {}
+ }
+ }
+ */
+ long[] cls_data = {
+ 0xcafebabe00000031L, 0x00120a000400060aL,
+ 0x000d00030c000f00L, 0x0a0700050100106aL,
+ 0x6176612f6c616e67L, 0x2f4f626a6563740cL,
+ 0x0011000a01000a53L, 0x6f7572636546696cL,
+ 0x6507000901001e6aL, 0x6176612f6c616e67L,
+ 0x2f4e756c6c506f69L, 0x6e74657245786365L,
+ 0x7074696f6e010003L, 0x282956010006422eL,
+ 0x6a61736d01000443L, 0x6f646507000e0100L,
+ 0x0142010001670100L, 0x01660100063c696eL,
+ 0x69743e0021000d00L, 0x0400000000000300L,
+ 0x010011000a000100L, 0x0c00000011000100L,
+ 0x01000000052ab700L, 0x01b1000000000009L,
+ 0x000f000a0001000cL, 0x0000000d00000000L,
+ 0x00000001b1000000L, 0x0000090010000a00L,
+ 0x01000c0000001c00L, 0x00000100000008b8L,
+ 0x0002a700044bb100L, 0x0100000003000600L,
+ 0x0800000001000700L, 0x000002000b000000L // 3 bytes extra
+
+ };
+ final int EXTRA = 3;
+
+ byte cf_bytes[] = toByteArray(cls_data);
+ Class c = defineClass("B", cf_bytes, 0, cf_bytes.length - EXTRA);
+
+ try { c.newInstance(); } // to force linking, thus verification
+ catch(InstantiationException e) {}
+ catch(IllegalAccessException e) {}
+ }
+
+ static private byte[] toByteArray(long arr[]) {
+ // convert long array to byte array
+ java.nio.ByteBuffer bbuf = java.nio.ByteBuffer.allocate(arr.length * 8);
+ bbuf.asLongBuffer().put(java.nio.LongBuffer.wrap(arr));
+ return bbuf.array();
+ }
+ }
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/test/hotspot/jtreg/runtime/verifier/defaultMethods/DefaultMethodRegressionTests.java Sat Mar 16 21:00:45 2019 +0000
@@ -0,0 +1,144 @@
+/*
+ * 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
+ * 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.
+ */
+
+/**
+ * @test
+ * @bug 8003639
+ * @summary defaultMethod resolution and verification
+ * @run main DefaultMethodRegressionTests
+ */
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+
+/**
+ * This set of classes/interfaces (K/I/C) is specially designed to expose a
+ * bug in the JVM where it did not find some overloaded methods in some
+ * specific situations. (fixed by hotspot changeset ffb9316fd9ed).
+ */
+interface K {
+ int bbb(Long l);
+}
+
+interface I extends K {
+ default void aaa() {}
+ default void aab() {}
+ default void aac() {}
+
+ default int bbb(Integer i) { return 22; }
+ default int bbb(Float f) { return 33; }
+ default int bbb(Long l) { return 44; }
+ default int bbb(Double d) { return 55; }
+ default int bbb(String s) { return 66; }
+
+ default void caa() {}
+ default void cab() {}
+ default void cac() {}
+}
+
+class C implements I {}
+
+public class DefaultMethodRegressionTests {
+ public static void main(String... args) {
+ new DefaultMethodRegressionTests().run(args);
+ }
+ void run(String... args) {
+ testLostOverloadedMethod();
+ System.out.println("testLostOverloadedMethod: OK");
+ testInferenceVerifier();
+ System.out.println("testInferenceVerifier: OK");
+ }
+ void testLostOverloadedMethod() {
+ C c = new C();
+ assertEquals(c.bbb(new Integer(1)), 22);
+ assertEquals(c.bbb(new Float(1.1)), 33);
+ assertEquals(c.bbb(new Long(1L)), 44);
+ assertEquals(c.bbb(new Double(0.01)), 55);
+ assertEquals(c.bbb(new String("")), 66);
+ }
+ // Test to ensure that the inference verifier accepts older classfiles
+ // with classes that implement interfaces with defaults.
+ void testInferenceVerifier() {
+ // interface I { int m() default { return 99; } }
+ byte I_bytes[] = {
+ (byte)0xca, (byte)0xfe, (byte)0xba, (byte)0xbe, 0x00, 0x00, 0x00, 0x34,
+ 0x00, 0x08, 0x07, 0x00, 0x06, 0x07, 0x00, 0x07,
+ 0x01, 0x00, 0x03, 0x66, 0x6f, 0x6f, 0x01, 0x00,
+ 0x03, 0x28, 0x29, 0x49, 0x01, 0x00, 0x04, 0x43,
+ 0x6f, 0x64, 0x65, 0x01, 0x00, 0x01, 0x49, 0x01,
+ 0x00, 0x10, 0x6a, 0x61, 0x76, 0x61, 0x2f, 0x6c,
+ 0x61, 0x6e, 0x67, 0x2f, 0x4f, 0x62, 0x6a, 0x65,
+ 0x63, 0x74, 0x06, 0x00, 0x00, 0x01, 0x00, 0x02,
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x02, 0x01,
+ 0x00, 0x03, 0x00, 0x04, 0x00, 0x01, 0x00, 0x05,
+ 0x00, 0x00, 0x00, 0x0f, 0x00, 0x01, 0x00, 0x01,
+ 0x00, 0x00, 0x00, 0x03, 0x10, 0x63, (byte)0xac, 0x00,
+ 0x00, 0x00, 0x00, 0x00, 0x00
+ };
+ // public class C implements I {} /* -target 1.5 */
+ byte C_bytes[] = {
+ (byte)0xca, (byte)0xfe, (byte)0xba, (byte)0xbe, 0x00, 0x00, 0x00, 0x31,
+ 0x00, 0x0c, 0x0a, 0x00, 0x03, 0x00, 0x08, 0x07,
+ 0x00, 0x09, 0x07, 0x00, 0x0a, 0x07, 0x00, 0x0b,
+ 0x01, 0x00, 0x06, 0x3c, 0x69, 0x6e, 0x69, 0x74,
+ 0x3e, 0x01, 0x00, 0x03, 0x28, 0x29, 0x56, 0x01,
+ 0x00, 0x04, 0x43, 0x6f, 0x64, 0x65, 0x0c, 0x00,
+ 0x05, 0x00, 0x06, 0x01, 0x00, 0x01, 0x43, 0x01,
+ 0x00, 0x10, 0x6a, 0x61, 0x76, 0x61, 0x2f, 0x6c,
+ 0x61, 0x6e, 0x67, 0x2f, 0x4f, 0x62, 0x6a, 0x65,
+ 0x63, 0x74, 0x01, 0x00, 0x01, 0x49, 0x00, 0x21,
+ 0x00, 0x02, 0x00, 0x03, 0x00, 0x01, 0x00, 0x04,
+ 0x00, 0x00, 0x00, 0x01, 0x00, 0x01, 0x00, 0x05,
+ 0x00, 0x06, 0x00, 0x01, 0x00, 0x07, 0x00, 0x00,
+ 0x00, 0x11, 0x00, 0x01, 0x00, 0x01, 0x00, 0x00,
+ 0x00, 0x05, 0x2a, (byte)0xb7, 0x00, 0x01, (byte)0xb1, 0x00,
+ 0x00, 0x00, 0x00, 0x00, 0x00
+ };
+
+ ClassLoader cl = new ClassLoader() {
+ protected Class<?> findClass(String name) {
+ if (name.equals("I")) {
+ return defineClass("I", I_bytes, 0, I_bytes.length);
+ } else if (name.equals("C")) {
+ return defineClass("C", C_bytes, 0, C_bytes.length);
+ } else {
+ return null;
+ }
+ }
+ };
+ try {
+ Class.forName("C", true, cl);
+ } catch (Exception e) {
+ // unmodified verifier will throw VerifyError
+ throw new RuntimeException(e);
+ }
+ }
+ void assertEquals(Object o1, Object o2) {
+ System.out.print("Expected: " + o1);
+ System.out.println(", Obtained: " + o2);
+ if (!o1.equals(o2)) {
+ throw new RuntimeException("got unexpected values");
+ }
+ }
+}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/test/hotspot/jtreg/runtime/verifier/defaultMethods/DefaultMethodRegressionTestsRun.java Sat Mar 16 21:00:45 2019 +0000
@@ -0,0 +1,73 @@
+/*
+ * 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
+ * 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.
+ */
+
+/**
+ * @test
+ * @bug 8003639
+ * @summary defaultMethod resolution and verification using an URLClassLoader
+ * @modules jdk.compiler
+ * jdk.zipfs
+ * @compile -XDignore.symbol.file=true DefaultMethodRegressionTestsRun.java
+ * @run main DefaultMethodRegressionTestsRun
+ */
+import java.io.File;
+import java.lang.reflect.Method;
+import java.net.URL;
+import java.net.URLClassLoader;
+import java.nio.file.DirectoryStream;
+import java.nio.file.Files;
+import java.nio.file.Path;
+/**
+ * This test is a variant of DefaultMethodRegressionTests, this one creates
+ * an URLClassLoader to load the support classes.
+ *
+ */
+public class DefaultMethodRegressionTestsRun {
+ public static void main(String... args) throws Exception {
+ File scratchDir = new File(".");
+ File testDir = new File(scratchDir, "testdir");
+ testDir.mkdirs();
+ File srcFile = new File(new File(System.getProperty("test.src")),
+ "DefaultMethodRegressionTests.java");
+ String[] javacargs = {
+ srcFile.getAbsolutePath(),
+ "-d",
+ testDir.getAbsolutePath()
+ };
+ com.sun.tools.javac.Main.compile(javacargs);
+ runClass(testDir, "DefaultMethodRegressionTests");
+ }
+ static void runClass(
+ File classPath,
+ String classname) throws Exception {
+ URL[] urls = {classPath.toURI().toURL()};
+ ClassLoader loader = new URLClassLoader(urls);
+ Class<?> c = loader.loadClass(classname);
+
+ Class<?>[] argTypes = new Class<?>[]{String[].class};
+ Object[] methodArgs = new Object[]{null};
+
+ Method method = c.getMethod("main", argTypes);
+ method.invoke(c, methodArgs);
+ }
+}
--- a/test/hotspot/jtreg/serviceability/jvmti/HeapMonitor/libHeapMonitorTest.c Tue Mar 12 09:49:10 2019 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1217 +0,0 @@
-/*
- * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved.
- * Copyright (c) 2018, Google and/or its affiliates. All rights reserved.
- * 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 <assert.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include "jvmti.h"
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#ifndef JNI_ENV_ARG
-
-#ifdef __cplusplus
-#define JNI_ENV_ARG(x)
-#define JNI_ENV_ARG2(x, y) y
-#define JNI_ENV_ARG3(x, y, z) y, z
-#define JNI_ENV_ARG4(x, y, z, w) y, z, w
-#define JNI_ENV_PTR(x) x
-#else
-#define JNI_ENV_ARG(x) x
-#define JNI_ENV_ARG2(x, y) x, y
-#define JNI_ENV_ARG3(x, y, z) x, y, z
-#define JNI_ENV_ARG4(x, y, z, w) x, y, z, w
-#define JNI_ENV_PTR(x) (*x)
-#endif
-
-#endif
-
-#define TRUE 1
-#define FALSE 0
-#define PRINT_OUT 0
-
-static jvmtiEnv *jvmti = NULL;
-static jvmtiEnv *second_jvmti = NULL;
-
-typedef struct _ObjectTrace{
- jweak object;
- jlong size;
- jvmtiFrameInfo* frames;
- size_t frame_count;
- jthread thread;
-} ObjectTrace;
-
-typedef struct _EventStorage {
- int live_object_additions;
- int live_object_size;
- int live_object_count;
- ObjectTrace** live_objects;
-
- int garbage_history_size;
- int garbage_history_index;
- ObjectTrace** garbage_collected_objects;
-
- // Two separate monitors to separate storage data race and the compaction field
- // data race.
- jrawMonitorID storage_monitor;
-
- int compaction_required;
- jrawMonitorID compaction_monitor;
-} EventStorage;
-
-typedef struct _ExpectedContentFrame {
- const char *name;
- const char *signature;
- const char *file_name;
- int line_number;
-} ExpectedContentFrame;
-
-static
-void event_storage_lock(EventStorage* storage) {
- (*jvmti)->RawMonitorEnter(jvmti, storage->storage_monitor);
-}
-
-static
-void event_storage_unlock(EventStorage* storage) {
- (*jvmti)->RawMonitorExit(jvmti, storage->storage_monitor);
-}
-
-static
-void event_storage_lock_compaction(EventStorage* storage) {
- (*jvmti)->RawMonitorEnter(jvmti, storage->compaction_monitor);
-}
-
-static
-void event_storage_unlock_compaction(EventStorage* storage) {
- (*jvmti)->RawMonitorExit(jvmti, storage->compaction_monitor);
-}
-
-// Given a method and a location, this method gets the line number.
-static
-jint get_line_number(jvmtiEnv* jvmti, jmethodID method,
- jlocation location) {
- // Read the line number table.
- jvmtiLineNumberEntry *table_ptr = 0;
- jint line_number_table_entries;
- int l;
- jlocation last_location;
- int jvmti_error = (*jvmti)->GetLineNumberTable(jvmti, method,
- &line_number_table_entries,
- &table_ptr);
-
- if (JVMTI_ERROR_NONE != jvmti_error) {
- return -1;
- }
- if (line_number_table_entries <= 0) {
- return -1;
- }
- if (line_number_table_entries == 1) {
- return table_ptr[0].line_number;
- }
-
- // Go through all the line numbers...
- last_location = table_ptr[0].start_location;
- for (l = 1; l < line_number_table_entries; l++) {
- // ... and if you see one that is in the right place for your
- // location, you've found the line number!
- if ((location < table_ptr[l].start_location) &&
- (location >= last_location)) {
- return table_ptr[l - 1].line_number;
- }
- last_location = table_ptr[l].start_location;
- }
-
- if (location >= last_location) {
- return table_ptr[line_number_table_entries - 1].line_number;
- } else {
- return -1;
- }
-}
-
-static void print_out_frames(JNIEnv* env, ObjectTrace* trace) {
- jvmtiFrameInfo* frames = trace->frames;
- size_t i;
- for (i = 0; i < trace->frame_count; i++) {
- // Get basic information out of the trace.
- jlocation bci = frames[i].location;
- jmethodID methodid = frames[i].method;
- char *name = NULL, *signature = NULL, *file_name = NULL;
- jclass declaring_class;
- int line_number;
- jvmtiError err;
-
- if (bci < 0) {
- fprintf(stderr, "\tNative frame\n");
- continue;
- }
-
- // Transform into usable information.
- line_number = get_line_number(jvmti, methodid, bci);
- if (JVMTI_ERROR_NONE !=
- (*jvmti)->GetMethodName(jvmti, methodid, &name, &signature, 0)) {
- fprintf(stderr, "\tUnknown method name\n");
- continue;
- }
-
- if (JVMTI_ERROR_NONE !=
- (*jvmti)->GetMethodDeclaringClass(jvmti, methodid, &declaring_class)) {
- fprintf(stderr, "\tUnknown class\n");
- continue;
- }
-
- err = (*jvmti)->GetSourceFileName(jvmti, declaring_class,
- &file_name);
- if (err != JVMTI_ERROR_NONE) {
- fprintf(stderr, "\tUnknown file\n");
- continue;
- }
-
- // Compare now, none should be NULL.
- if (name == NULL) {
- fprintf(stderr, "\tUnknown name\n");
- continue;
- }
-
- if (file_name == NULL) {
- fprintf(stderr, "\tUnknown file\n");
- continue;
- }
-
- if (signature == NULL) {
- fprintf(stderr, "\tUnknown signature\n");
- continue;
- }
-
- fprintf(stderr, "\t%s%s (%s: %d)\n",
- name, signature, file_name, line_number);
- }
-}
-
-static jboolean check_sample_content(JNIEnv* env,
- ObjectTrace* trace,
- ExpectedContentFrame *expected,
- size_t expected_count,
- jboolean check_lines,
- int print_out_comparisons) {
- jvmtiFrameInfo* frames;
- size_t i;
-
- if (expected_count > trace->frame_count) {
- return FALSE;
- }
-
- frames = trace->frames;
- for (i = 0; i < expected_count; i++) {
- // Get basic information out of the trace.
- jlocation bci = frames[i].location;
- jmethodID methodid = frames[i].method;
- char *name = NULL, *signature = NULL, *file_name = NULL;
- jclass declaring_class;
- int line_number;
- jboolean differ;
- jvmtiError err;
-
- if (bci < 0 && expected[i].line_number != -1) {
- return FALSE;
- }
-
- // Transform into usable information.
- line_number = get_line_number(jvmti, methodid, bci);
- (*jvmti)->GetMethodName(jvmti, methodid, &name, &signature, 0);
-
- if (JVMTI_ERROR_NONE !=
- (*jvmti)->GetMethodDeclaringClass(jvmti, methodid, &declaring_class)) {
- return FALSE;
- }
-
- err = (*jvmti)->GetSourceFileName(jvmti, declaring_class,
- &file_name);
- if (err != JVMTI_ERROR_NONE) {
- return FALSE;
- }
-
- // Compare now, none should be NULL.
- if (name == NULL) {
- return FALSE;
- }
-
- if (file_name == NULL) {
- return FALSE;
- }
-
- if (signature == NULL) {
- return FALSE;
- }
-
- differ = (strcmp(name, expected[i].name) ||
- strcmp(signature, expected[i].signature) ||
- strcmp(file_name, expected[i].file_name) ||
- (check_lines && line_number != expected[i].line_number));
-
- if (print_out_comparisons) {
- fprintf(stderr, "\tComparing: (check_lines: %d)\n", check_lines);
- fprintf(stderr, "\t\tNames: %s and %s\n", name, expected[i].name);
- fprintf(stderr, "\t\tSignatures: %s and %s\n", signature, expected[i].signature);
- fprintf(stderr, "\t\tFile name: %s and %s\n", file_name, expected[i].file_name);
- fprintf(stderr, "\t\tLines: %d and %d\n", line_number, expected[i].line_number);
- fprintf(stderr, "\t\tResult is %d\n", differ);
- }
-
- if (differ) {
- return FALSE;
- }
- }
-
- return TRUE;
-}
-
-// Static native API for various tests.
-static int fill_native_frames(JNIEnv* env, jobjectArray frames,
- ExpectedContentFrame* native_frames, size_t size) {
- size_t i;
- for (i = 0; i < size; i++) {
- jclass frame_class = NULL;
- jfieldID line_number_field_id = 0;
- int line_number = 0;
- jfieldID string_id = 0;
- jstring string_object = NULL;
- const char* method = NULL;
- const char* file_name = NULL;
- const char* signature = NULL;
-
- jobject obj = JNI_ENV_PTR(env)->GetObjectArrayElement(
- JNI_ENV_ARG3(env, frames, (jsize) i));
-
- if (JNI_ENV_PTR(env)->ExceptionOccurred(JNI_ENV_ARG(env))) {
- fprintf(stderr, "fill_native_frames: Exception in jni GetObjectArrayElement\n");
- return -1;
- }
-
- frame_class = JNI_ENV_PTR(env)->GetObjectClass(JNI_ENV_ARG2(env, obj));
-
- if (JNI_ENV_PTR(env)->ExceptionOccurred(JNI_ENV_ARG(env))) {
- fprintf(stderr, "fill_native_frames: Exception in jni GetObjectClass\n");
- return -1;
- }
-
- line_number_field_id =
- JNI_ENV_PTR(env)->GetFieldID(JNI_ENV_ARG4(env, frame_class, "lineNumber", "I"));
-
- if (JNI_ENV_PTR(env)->ExceptionOccurred(JNI_ENV_ARG(env))) {
- fprintf(stderr, "fill_native_frames: Exception in jni GetFieldID\n");
- return -1;
- }
-
- line_number = JNI_ENV_PTR(env)->GetIntField(JNI_ENV_ARG3(env, obj, line_number_field_id));
-
- if (JNI_ENV_PTR(env)->ExceptionOccurred(JNI_ENV_ARG(env))) {
- fprintf(stderr, "fill_native_frames: Exception in jni GetIntField\n");
- return -1;
- }
-
- string_id = JNI_ENV_PTR(env)->GetFieldID(
- JNI_ENV_ARG4(env, frame_class, "method", "Ljava/lang/String;"));
-
- if (JNI_ENV_PTR(env)->ExceptionOccurred(JNI_ENV_ARG(env))) {
- fprintf(stderr, "fill_native_frames: Exception in jni GetFieldID\n");
- return -1;
- }
-
- string_object = (jstring) JNI_ENV_PTR(env)->GetObjectField(
- JNI_ENV_ARG3(env, obj, string_id));
-
- if (JNI_ENV_PTR(env)->ExceptionOccurred(JNI_ENV_ARG(env))) {
- fprintf(stderr, "fill_native_frames: Exception in jni GetObjectField\n");
- return -1;
- }
-
- method = JNI_ENV_PTR(env)->GetStringUTFChars(JNI_ENV_ARG3(env, string_object, 0));
-
- if (JNI_ENV_PTR(env)->ExceptionOccurred(JNI_ENV_ARG(env))) {
- fprintf(stderr, "Exception in jni GetStringUTFChars\n");
- return -1;
- }
-
- string_id = JNI_ENV_PTR(env)->GetFieldID(
- JNI_ENV_ARG4(env, frame_class, "fileName", "Ljava/lang/String;"));
-
- if (JNI_ENV_PTR(env)->ExceptionOccurred(JNI_ENV_ARG(env))) {
- fprintf(stderr, "Exception in jni GetFieldID\n");
- return -1;
- }
-
- string_object =
- (jstring) (JNI_ENV_PTR(env)->GetObjectField(
- JNI_ENV_ARG3(env, obj, string_id)));
-
- if (JNI_ENV_PTR(env)->ExceptionOccurred(JNI_ENV_ARG(env))) {
- fprintf(stderr, "fill_native_frames: Exception in second jni GetObjectField\n");
- return -1;
- }
-
- file_name = JNI_ENV_PTR(env)->GetStringUTFChars(
- JNI_ENV_ARG3(env, string_object, 0));
-
- if (JNI_ENV_PTR(env)->ExceptionOccurred(JNI_ENV_ARG(env))) {
- fprintf(stderr, "fill_native_frames: Exception in jni GetStringUTFChars\n");
- return -1;
- }
-
- string_id = JNI_ENV_PTR(env)->GetFieldID(
- JNI_ENV_ARG4(env, frame_class, "signature", "Ljava/lang/String;"));
-
- if (JNI_ENV_PTR(env)->ExceptionOccurred(JNI_ENV_ARG(env))) {
- fprintf(stderr, "fill_native_frames: Exception in second jni GetFieldID\n");
- return -1;
- }
-
- string_object =
- (jstring) (JNI_ENV_PTR(env)->GetObjectField(
- JNI_ENV_ARG3(env, obj, string_id)));
-
- if (JNI_ENV_PTR(env)->ExceptionOccurred(JNI_ENV_ARG(env))) {
- fprintf(stderr, "fill_native_frames: Exception in third jni GetObjectField\n");
- return -1;
- }
-
- signature = JNI_ENV_PTR(env)->GetStringUTFChars(
- JNI_ENV_ARG3(env, string_object, 0));
-
- if (JNI_ENV_PTR(env)->ExceptionOccurred(JNI_ENV_ARG(env))) {
- fprintf(stderr, "fill_native_frames: Exception in jni GetStringUTFChars\n");
- return -1;
- }
-
- native_frames[i].name = method;
- native_frames[i].file_name = file_name;
- native_frames[i].signature = signature;
- native_frames[i].line_number = line_number;
- }
-
- return 0;
-}
-
-// Internal storage system implementation.
-static EventStorage global_event_storage;
-static EventStorage second_global_event_storage;
-
-static void event_storage_set_compaction_required(EventStorage* storage) {
- event_storage_lock_compaction(storage);
- storage->compaction_required = 1;
- event_storage_unlock_compaction(storage);
-}
-
-static int event_storage_get_compaction_required(EventStorage* storage) {
- int result;
- event_storage_lock_compaction(storage);
- result = storage->compaction_required;
- event_storage_unlock_compaction(storage);
- return result;
-}
-
-static void event_storage_set_garbage_history(EventStorage* storage, int value) {
- size_t size;
- event_storage_lock(storage);
- global_event_storage.garbage_history_size = value;
- free(global_event_storage.garbage_collected_objects);
- size = sizeof(*global_event_storage.garbage_collected_objects) * value;
- global_event_storage.garbage_collected_objects = malloc(size);
- memset(global_event_storage.garbage_collected_objects, 0, size);
- event_storage_unlock(storage);
-}
-
-// No mutex here, it is handled by the caller.
-static void event_storage_add_garbage_collected_object(EventStorage* storage,
- ObjectTrace* object) {
- int idx = storage->garbage_history_index;
- ObjectTrace* old_object = storage->garbage_collected_objects[idx];
- if (old_object != NULL) {
- free(old_object->frames);
- free(storage->garbage_collected_objects[idx]);
- }
-
- storage->garbage_collected_objects[idx] = object;
- storage->garbage_history_index = (idx + 1) % storage->garbage_history_size;
-}
-
-static int event_storage_get_count(EventStorage* storage) {
- int result;
- event_storage_lock(storage);
- result = storage->live_object_count;
- event_storage_unlock(storage);
- return result;
-}
-
-static double event_storage_get_average_size(EventStorage* storage) {
- double accumulation = 0;
- int max_size;
- int i;
-
- event_storage_lock(storage);
- max_size = storage->live_object_count;
-
- for (i = 0; i < max_size; i++) {
- accumulation += storage->live_objects[i]->size;
- }
-
- event_storage_unlock(storage);
- return accumulation / max_size;
-}
-
-static jboolean event_storage_contains(JNIEnv* env,
- EventStorage* storage,
- ExpectedContentFrame* frames,
- size_t size,
- jboolean check_lines) {
- int i;
- event_storage_lock(storage);
- fprintf(stderr, "Checking storage count %d\n", storage->live_object_count);
- for (i = 0; i < storage->live_object_count; i++) {
- ObjectTrace* trace = storage->live_objects[i];
-
- if (check_sample_content(env, trace, frames, size, check_lines, PRINT_OUT)) {
- event_storage_unlock(storage);
- return TRUE;
- }
- }
- event_storage_unlock(storage);
- return FALSE;
-}
-
-static jlong event_storage_get_size(JNIEnv* env,
- EventStorage* storage,
- ExpectedContentFrame* frames,
- size_t size,
- jboolean check_lines) {
- int i;
- event_storage_lock(storage);
- fprintf(stderr, "Getting element from storage count, size %d\n", storage->live_object_count);
- for (i = 0; i < storage->live_object_count; i++) {
- ObjectTrace* trace = storage->live_objects[i];
-
- if (check_sample_content(env, trace, frames, size, check_lines, PRINT_OUT)) {
- jlong result = trace->size;
- event_storage_unlock(storage);
- return result;
- }
- }
- event_storage_unlock(storage);
- return 0;
-}
-
-static jboolean event_storage_garbage_contains(JNIEnv* env,
- EventStorage* storage,
- ExpectedContentFrame* frames,
- size_t size,
- jboolean check_lines) {
- int i;
- event_storage_lock(storage);
- fprintf(stderr, "Checking garbage storage count %d\n",
- storage->garbage_history_size);
- for (i = 0; i < storage->garbage_history_size; i++) {
- ObjectTrace* trace = storage->garbage_collected_objects[i];
-
- if (trace == NULL) {
- continue;
- }
-
- if (check_sample_content(env, trace, frames, size, check_lines, PRINT_OUT)) {
- event_storage_unlock(storage);
- return TRUE;
- }
- }
- event_storage_unlock(storage);
- return FALSE;
-}
-
-// No mutex here, handled by the caller.
-static void event_storage_augment_storage(EventStorage* storage) {
- int new_max = (storage->live_object_size * 2) + 1;
- ObjectTrace** new_objects = malloc(new_max * sizeof(*new_objects));
-
- int current_count = storage->live_object_count;
- memcpy(new_objects, storage->live_objects, current_count * sizeof(*new_objects));
- free(storage->live_objects);
- storage->live_objects = new_objects;
- storage->live_object_size = new_max;
-}
-
-static void event_storage_add(EventStorage* storage,
- JNIEnv* jni,
- jthread thread,
- jobject object,
- jclass klass,
- jlong size) {
- jvmtiFrameInfo frames[64];
- jint count;
- jvmtiError err;
-
- err = (*jvmti)->GetStackTrace(jvmti, thread, 0, 64, frames, &count);
- if (err == JVMTI_ERROR_NONE && count >= 1) {
- ObjectTrace* live_object;
- jvmtiFrameInfo* allocated_frames = (jvmtiFrameInfo*) malloc(count * sizeof(*allocated_frames));
- memcpy(allocated_frames, frames, count * sizeof(*allocated_frames));
-
- live_object = (ObjectTrace*) malloc(sizeof(*live_object));
- live_object->frames = allocated_frames;
- live_object->frame_count = count;
- live_object->size = size;
- live_object->thread = thread;
- live_object->object = (*jni)->NewWeakGlobalRef(jni, object);
-
- if (JNI_ENV_PTR(jni)->ExceptionOccurred(JNI_ENV_ARG(jni))) {
- JNI_ENV_PTR(jni)->FatalError(
- JNI_ENV_ARG2(jni, "Error in event_storage_add: Exception in jni NewWeakGlobalRef"));
- }
-
- // Only now lock and get things done quickly.
- event_storage_lock(storage);
-
- storage->live_object_additions++;
-
- if (storage->live_object_count >= storage->live_object_size) {
- event_storage_augment_storage(storage);
- }
- assert(storage->live_object_count < storage->live_object_size);
-
- if (PRINT_OUT) {
- fprintf(stderr, "Adding trace for thread %p, frame_count %d, storage %p\n",
- thread, count, storage);
- print_out_frames(jni, live_object);
- }
- storage->live_objects[storage->live_object_count] = live_object;
- storage->live_object_count++;
-
- event_storage_unlock(storage);
- }
-}
-
-static void event_storage_compact(EventStorage* storage, JNIEnv* jni) {
- int max, i, dest;
- ObjectTrace** live_objects;
-
- event_storage_lock_compaction(storage);
- storage->compaction_required = 0;
- event_storage_unlock_compaction(storage);
-
- event_storage_lock(storage);
-
- max = storage->live_object_count;
- live_objects = storage->live_objects;
-
- for (i = 0, dest = 0; i < max; i++) {
- ObjectTrace* live_object = live_objects[i];
- jweak object = live_object->object;
-
- if (!(*jni)->IsSameObject(jni, object, NULL)) {
- if (dest != i) {
- live_objects[dest] = live_object;
- dest++;
- }
- } else {
- (*jni)->DeleteWeakGlobalRef(jni, object);
- live_object->object = NULL;
-
- event_storage_add_garbage_collected_object(storage, live_object);
- }
- }
-
- storage->live_object_count = dest;
- event_storage_unlock(storage);
-}
-
-static void event_storage_free_objects(ObjectTrace** array, int max) {
- int i;
- for (i = 0; i < max; i++) {
- free(array[i]), array[i] = NULL;
- }
-}
-
-static void event_storage_reset(EventStorage* storage) {
- event_storage_lock(storage);
-
- // Reset everything except the mutex and the garbage collection.
- event_storage_free_objects(storage->live_objects,
- storage->live_object_count);
- storage->live_object_additions = 0;
- storage->live_object_size = 0;
- storage->live_object_count = 0;
- free(storage->live_objects), storage->live_objects = NULL;
-
- event_storage_free_objects(storage->garbage_collected_objects,
- storage->garbage_history_size);
-
- storage->compaction_required = 0;
- storage->garbage_history_index = 0;
-
- event_storage_unlock(storage);
-}
-
-static int event_storage_number_additions(EventStorage* storage) {
- int result;
- event_storage_lock(storage);
- result = storage->live_object_additions;
- event_storage_unlock(storage);
- return result;
-}
-
-// Start of the JVMTI agent code.
-static const char *EXC_CNAME = "java/lang/Exception";
-
-static int check_error(jvmtiError err, const char *s) {
- if (err != JVMTI_ERROR_NONE) {
- printf(" ## %s error: %d\n", s, err);
- return 1;
- }
- return 0;
-}
-
-static int check_capability_error(jvmtiError err, const char *s) {
- if (err != JVMTI_ERROR_NONE) {
- if (err == JVMTI_ERROR_MUST_POSSESS_CAPABILITY) {
- return 0;
- }
- fprintf(stderr, " ## %s error: %d\n", s, err);
- }
- return 1;
-}
-
-static jint Agent_Initialize(JavaVM *jvm, char *options, void *reserved);
-
-JNIEXPORT
-jint JNICALL Agent_OnLoad(JavaVM *jvm, char *options, void *reserved) {
- return Agent_Initialize(jvm, options, reserved);
-}
-
-JNIEXPORT
-jint JNICALL Agent_OnAttach(JavaVM *jvm, char *options, void *reserved) {
- return Agent_Initialize(jvm, options, reserved);
-}
-
-JNIEXPORT
-jint JNICALL JNI_OnLoad(JavaVM *jvm, void *reserved) {
- return JNI_VERSION_1_8;
-}
-
-#define MAX_THREADS 500
-
-typedef struct ThreadStats {
- int thread_count;
- int counts[MAX_THREADS];
- char* threads[MAX_THREADS];
-} ThreadStats;
-
-static ThreadStats thread_stats;
-
-JNIEXPORT jboolean JNICALL
-Java_MyPackage_HeapMonitorThreadDisabledTest_checkThreadSamplesOnlyFrom(
- JNIEnv* env, jclass cls, jthread thread) {
- jvmtiThreadInfo info;
- jvmtiError err;
- char* expected_name;
- int found_thread = FALSE;
-
- err = (*jvmti)->GetThreadInfo(jvmti, thread, &info);
- expected_name = info.name;
-
- if (err != JVMTI_ERROR_NONE) {
- fprintf(stderr, "Failed to get thread information\n");
- return FALSE;
- }
-
- if (thread_stats.thread_count != 1) {
- fprintf(stderr, "Wrong thread number: %d (expected 1)\n",
- thread_stats.thread_count);
- return FALSE;
- }
-
- if (strcmp(expected_name, thread_stats.threads[0]) != 0) {
- fprintf(stderr, "Unexpected thread name: '%s' (expected '%s')\n",
- thread_stats.threads[0], expected_name);
- return FALSE;
- }
-
- return TRUE;
-}
-
-static void add_thread_count(jthread thread) {
- int i;
- jvmtiThreadInfo info;
- jvmtiError err;
-
- err = (*jvmti)->GetThreadInfo(jvmti, thread, &info);
- if (err != JVMTI_ERROR_NONE) {
- fprintf(stderr, "Thread info for %p failed, ignoring thread count\n",
- thread);
- return;
- }
-
- event_storage_lock(&global_event_storage);
- for (i = 0; i < thread_stats.thread_count; i++) {
- if (!strcmp(thread_stats.threads[i], info.name)) {
- thread_stats.counts[i]++;
- event_storage_unlock(&global_event_storage);
- return;
- }
- }
-
- thread_stats.threads[thread_stats.thread_count] = info.name;
- thread_stats.counts[thread_stats.thread_count]++;
- thread_stats.thread_count++;
- event_storage_unlock(&global_event_storage);
-}
-
-JNIEXPORT void JNICALL
-Java_MyPackage_HeapMonitorThreadDisabledTest_enableSamplingEvents(
- JNIEnv* env, jclass cls, jthread thread) {
- fprintf(stderr, "Enabling for %p\n", thread);
- check_error((*jvmti)->SetEventNotificationMode(
- jvmti, JVMTI_ENABLE, JVMTI_EVENT_SAMPLED_OBJECT_ALLOC, thread),
- "Set event notifications for a single thread");
-}
-
-static void print_thread_stats() {
- int i;
- event_storage_lock(&global_event_storage);
- fprintf(stderr, "Thread count:\n");
- for (i = 0; i < thread_stats.thread_count; i++) {
- fprintf(stderr, "\t%s: %d\n", thread_stats.threads[i], thread_stats.counts[i]);
- }
- event_storage_unlock(&global_event_storage);
-}
-
-JNIEXPORT
-void JNICALL SampledObjectAlloc(jvmtiEnv *jvmti_env,
- JNIEnv* jni_env,
- jthread thread,
- jobject object,
- jclass object_klass,
- jlong size) {
- add_thread_count(thread);
-
- if (event_storage_get_compaction_required(&global_event_storage)) {
- event_storage_compact(&global_event_storage, jni_env);
- }
-
- event_storage_add(&global_event_storage, jni_env, thread, object,
- object_klass, size);
-}
-
-JNIEXPORT
-void JNICALL VMObjectAlloc(jvmtiEnv *jvmti_env,
- JNIEnv* jni_env,
- jthread thread,
- jobject object,
- jclass object_klass,
- jlong size) {
- event_storage_add(&second_global_event_storage, jni_env, thread, object,
- object_klass, size);
-}
-
-JNIEXPORT
-void JNICALL GarbageCollectionFinish(jvmtiEnv *jvmti_env) {
- event_storage_set_compaction_required(&global_event_storage);
-}
-
-static int enable_notifications() {
- if (check_error((*jvmti)->SetEventNotificationMode(
- jvmti, JVMTI_ENABLE, JVMTI_EVENT_GARBAGE_COLLECTION_FINISH, NULL),
- "Set event notifications")) {
- return 1;
- }
-
- return check_error((*jvmti)->SetEventNotificationMode(
- jvmti, JVMTI_ENABLE, JVMTI_EVENT_SAMPLED_OBJECT_ALLOC, NULL),
- "Set event notifications");
-}
-
-static
-jint Agent_Initialize(JavaVM *jvm, char *options, void *reserved) {
- jint res;
- jvmtiEventCallbacks callbacks;
- jvmtiCapabilities caps;
-
- res = JNI_ENV_PTR(jvm)->GetEnv(JNI_ENV_ARG3(jvm, (void **) &jvmti,
- JVMTI_VERSION_9));
- if (res != JNI_OK || jvmti == NULL) {
- fprintf(stderr, "Error: wrong result of a valid call to GetEnv!\n");
- return JNI_ERR;
- }
-
- // Get second jvmti environment.
- res = JNI_ENV_PTR(jvm)->GetEnv(JNI_ENV_ARG3(jvm, (void **) &second_jvmti,
- JVMTI_VERSION_9));
- if (res != JNI_OK || second_jvmti == NULL) {
- fprintf(stderr, "Error: wrong result of a valid second call to GetEnv!\n");
- return JNI_ERR;
- }
-
- if (PRINT_OUT) {
- fprintf(stderr, "Storage is at %p, secondary is at %p\n",
- &global_event_storage, &second_global_event_storage);
- }
-
- (*jvmti)->CreateRawMonitor(jvmti, "storage_monitor",
- &global_event_storage.storage_monitor);
- (*jvmti)->CreateRawMonitor(jvmti, "second_storage_monitor",
- &second_global_event_storage.storage_monitor);
-
- (*jvmti)->CreateRawMonitor(jvmti, "compaction_monitor",
- &global_event_storage.compaction_monitor);
- (*jvmti)->CreateRawMonitor(jvmti, "second_compaction_monitor",
- &second_global_event_storage.compaction_monitor);
-
- event_storage_set_garbage_history(&global_event_storage, 200);
- event_storage_set_garbage_history(&second_global_event_storage, 200);
-
- memset(&callbacks, 0, sizeof(callbacks));
- callbacks.SampledObjectAlloc = &SampledObjectAlloc;
- callbacks.VMObjectAlloc = &VMObjectAlloc;
- callbacks.GarbageCollectionFinish = &GarbageCollectionFinish;
-
- memset(&caps, 0, sizeof(caps));
- // Get line numbers, sample events, filename, and gc events for the tests.
- caps.can_get_line_numbers = 1;
- caps.can_get_source_file_name = 1;
- caps.can_generate_garbage_collection_events = 1;
- caps.can_generate_sampled_object_alloc_events = 1;
- caps.can_generate_vm_object_alloc_events = 1;
- if (check_error((*jvmti)->AddCapabilities(jvmti, &caps), "Add capabilities")) {
- return JNI_ERR;
- }
-
- if (check_error((*jvmti)->SetEventCallbacks(jvmti, &callbacks,
- sizeof(jvmtiEventCallbacks)),
- " Set Event Callbacks")) {
- return JNI_ERR;
- }
- return JNI_OK;
-}
-
-JNIEXPORT void JNICALL
-Java_MyPackage_HeapMonitor_setSamplingInterval(JNIEnv* env, jclass cls, jint value) {
- (*jvmti)->SetHeapSamplingInterval(jvmti, value);
-}
-
-JNIEXPORT jboolean JNICALL
-Java_MyPackage_HeapMonitor_eventStorageIsEmpty(JNIEnv* env, jclass cls) {
- return event_storage_get_count(&global_event_storage) == 0;
-}
-
-JNIEXPORT jint JNICALL
-Java_MyPackage_HeapMonitor_getEventStorageElementCount(JNIEnv* env, jclass cls) {
- return event_storage_get_count(&global_event_storage);
-}
-
-JNIEXPORT void JNICALL
-Java_MyPackage_HeapMonitor_enableSamplingEvents(JNIEnv* env, jclass cls) {
- enable_notifications();
-}
-
-JNIEXPORT void JNICALL
-Java_MyPackage_HeapMonitor_disableSamplingEvents(JNIEnv* env, jclass cls) {
- check_error((*jvmti)->SetEventNotificationMode(
- jvmti, JVMTI_DISABLE, JVMTI_EVENT_SAMPLED_OBJECT_ALLOC, NULL),
- "Set event notifications");
-
- check_error((*jvmti)->SetEventNotificationMode(
- jvmti, JVMTI_DISABLE, JVMTI_EVENT_GARBAGE_COLLECTION_FINISH, NULL),
- "Garbage Collection Finish");
-}
-
-static ExpectedContentFrame *get_native_frames(JNIEnv* env, jclass cls,
- jobjectArray frames) {
- ExpectedContentFrame *native_frames;
- jsize size = JNI_ENV_PTR(env)->GetArrayLength(JNI_ENV_ARG2(env, frames));
-
- if (JNI_ENV_PTR(env)->ExceptionOccurred(JNI_ENV_ARG(env))) {
- JNI_ENV_PTR(env)->FatalError(
- JNI_ENV_ARG2(env, "get_native_frames failed with the GetArrayLength call"));
- }
-
- native_frames = malloc(size * sizeof(*native_frames));
-
- if (native_frames == NULL) {
- JNI_ENV_PTR(env)->FatalError(
- JNI_ENV_ARG2(env,
- "Error in get_native_frames: malloc returned NULL\n"));
- }
-
- if (fill_native_frames(env, frames, native_frames, size) != 0) {
- JNI_ENV_PTR(env)->FatalError(
- JNI_ENV_ARG2(env,
- "Error in get_native_frames: fill_native_frames returned failed status\n"));
- }
-
- return native_frames;
-}
-
-JNIEXPORT jboolean JNICALL
-Java_MyPackage_HeapMonitor_obtainedEvents(JNIEnv* env, jclass cls,
- jobjectArray frames,
- jboolean check_lines) {
- jboolean result;
- jsize size = JNI_ENV_PTR(env)->GetArrayLength(JNI_ENV_ARG2(env, frames));
- ExpectedContentFrame *native_frames = get_native_frames(env, cls, frames);
-
- result = event_storage_contains(env, &global_event_storage, native_frames,
- size, check_lines);
-
- free(native_frames), native_frames = NULL;
- return result;
-}
-
-JNIEXPORT jboolean JNICALL
-Java_MyPackage_HeapMonitor_garbageContains(JNIEnv* env, jclass cls,
- jobjectArray frames,
- jboolean check_lines) {
- jboolean result;
- jsize size = JNI_ENV_PTR(env)->GetArrayLength(JNI_ENV_ARG2(env, frames));
- ExpectedContentFrame *native_frames = get_native_frames(env, cls, frames);
-
- result = event_storage_garbage_contains(env, &global_event_storage,
- native_frames, size, check_lines);
-
- free(native_frames), native_frames = NULL;
- return result;
-}
-
-JNIEXPORT jlong JNICALL
-Java_MyPackage_HeapMonitor_getSize(JNIEnv* env, jclass cls,
- jobjectArray frames,
- jboolean check_lines) {
- jlong result = 0;
- jsize size = JNI_ENV_PTR(env)->GetArrayLength(JNI_ENV_ARG2(env, frames));
- ExpectedContentFrame *native_frames = get_native_frames(env, cls, frames);
-
- result = event_storage_get_size(env, &global_event_storage,
- native_frames, size, check_lines);
-
- free(native_frames), native_frames = NULL;
- return result;
-}
-
-JNIEXPORT void JNICALL
-Java_MyPackage_HeapMonitor_forceGarbageCollection(JNIEnv* env, jclass cls) {
- check_error((*jvmti)->ForceGarbageCollection(jvmti),
- "Forced Garbage Collection");
-}
-
-JNIEXPORT void JNICALL
-Java_MyPackage_HeapMonitor_resetEventStorage(JNIEnv* env, jclass cls) {
- event_storage_reset(&global_event_storage);
- event_storage_reset(&second_global_event_storage);
-}
-
-JNIEXPORT jboolean JNICALL
-Java_MyPackage_HeapMonitorNoCapabilityTest_allSamplingMethodsFail(JNIEnv *env,
- jclass cls) {
- jvmtiCapabilities caps;
- memset(&caps, 0, sizeof(caps));
- caps.can_generate_sampled_object_alloc_events = 1;
- if (check_error((*jvmti)->RelinquishCapabilities(jvmti, &caps),
- "Add capabilities\n")){
- return FALSE;
- }
-
- if (check_capability_error((*jvmti)->SetHeapSamplingInterval(jvmti, 1<<19),
- "Set Heap Sampling Interval")) {
- return FALSE;
- }
- return TRUE;
-}
-
-JNIEXPORT jboolean JNICALL
-Java_MyPackage_HeapMonitorIllegalArgumentTest_testIllegalArgument(JNIEnv *env,
- jclass cls) {
- if (check_error((*jvmti)->SetHeapSamplingInterval(jvmti, 0),
- "Sampling interval 0 failed\n")){
- return FALSE;
- }
-
- if (check_error((*jvmti)->SetHeapSamplingInterval(jvmti, 1024),
- "Sampling interval 1024 failed\n")){
- return FALSE;
- }
-
- if (!check_error((*jvmti)->SetHeapSamplingInterval(jvmti, -1),
- "Sampling interval -1 passed\n")){
- return FALSE;
- }
-
- if (!check_error((*jvmti)->SetHeapSamplingInterval(jvmti, -1024),
- "Sampling interval -1024 passed\n")){
- return FALSE;
- }
-
- return TRUE;
-}
-
-JNIEXPORT jdouble JNICALL
-Java_MyPackage_HeapMonitor_getAverageSize(JNIEnv *env, jclass cls) {
- return event_storage_get_average_size(&global_event_storage);
-}
-
-typedef struct sThreadsFound {
- jthread* threads;
- int num_threads;
-} ThreadsFound;
-
-JNIEXPORT jboolean JNICALL
-Java_MyPackage_HeapMonitorThreadTest_checkSamples(JNIEnv* env, jclass cls,
- jint num_threads) {
- print_thread_stats();
- // Ensure we got stacks from at least num_threads.
- return thread_stats.thread_count >= num_threads;
-}
-
-JNIEXPORT
-void JNICALL SampledObjectAlloc2(jvmtiEnv *jvmti_env,
- JNIEnv* jni_env,
- jthread thread,
- jobject object,
- jclass object_klass,
- jlong size) {
- // Nop for now, two agents are not yet implemented.
- assert(0);
-}
-
-JNIEXPORT jboolean JNICALL
-Java_MyPackage_HeapMonitorTwoAgentsTest_enablingSamplingInSecondaryAgent(
- JNIEnv* env, jclass cls) {
- // Currently this method should be failing directly at the AddCapability step
- // but the implementation is correct for when multi-agent support is enabled.
- jvmtiCapabilities caps;
- jvmtiEventCallbacks callbacks;
-
- memset(&caps, 0, sizeof(caps));
- caps.can_generate_sampled_object_alloc_events = 1;
- if (check_error((*second_jvmti)->AddCapabilities(second_jvmti, &caps),
- "Set the capability for second agent")) {
- return FALSE;
- }
-
- memset(&callbacks, 0, sizeof(callbacks));
- callbacks.SampledObjectAlloc = &SampledObjectAlloc2;
-
- if (check_error((*second_jvmti)->SetEventCallbacks(second_jvmti, &callbacks,
- sizeof(jvmtiEventCallbacks)),
- " Set Event Callbacks for second agent")) {
- return FALSE;
- }
-
- return TRUE;
-}
-
-JNIEXPORT void JNICALL
-Java_MyPackage_HeapMonitor_enableVMEvents(JNIEnv* env, jclass cls) {
- check_error((*jvmti)->SetEventNotificationMode(
- jvmti, JVMTI_ENABLE, JVMTI_EVENT_VM_OBJECT_ALLOC, NULL),
- "Set vm event notifications");
-}
-
-JNIEXPORT jint JNICALL
-Java_MyPackage_HeapMonitorVMEventsTest_vmEvents(JNIEnv* env, jclass cls) {
- return event_storage_number_additions(&second_global_event_storage);
-}
-
-JNIEXPORT jint JNICALL
-Java_MyPackage_HeapMonitor_sampledEvents(JNIEnv* env, jclass cls) {
- return event_storage_number_additions(&global_event_storage);
-}
-
-static jobject allocate_object(JNIEnv* env) {
- // Construct an Object.
- jclass cls = JNI_ENV_PTR(env)->FindClass(JNI_ENV_ARG2(env, "java/lang/Object"));
- jmethodID constructor;
- jobject result;
-
- if (JNI_ENV_PTR(env)->ExceptionOccurred(JNI_ENV_ARG(env)) || cls == NULL) {
- JNI_ENV_PTR(env)->FatalError(
- JNI_ENV_ARG2(env, "Error in jni FindClass: Cannot find Object class\n"));
- }
-
- constructor = JNI_ENV_PTR(env)->GetMethodID(JNI_ENV_ARG4(env, cls, "<init>", "()V"));
- if (JNI_ENV_PTR(env)->ExceptionOccurred(JNI_ENV_ARG(env)) || constructor == NULL) {
- JNI_ENV_PTR(env)->FatalError(
- JNI_ENV_ARG2(env, "Error in jni GetMethodID: Cannot find Object class constructor\n"));
- }
-
- // Call back constructor to allocate a new instance, with an int argument
- result = JNI_ENV_PTR(env)->NewObject(JNI_ENV_ARG3(env, cls, constructor));
-
- if (JNI_ENV_PTR(env)->ExceptionOccurred(JNI_ENV_ARG(env)) || result == NULL) {
- JNI_ENV_PTR(env)->FatalError(
- JNI_ENV_ARG2(env, "Error in jni NewObject: Cannot allocate an object\n"));
- }
- return result;
-}
-
-// Ensure we got a callback for the test.
-static int did_recursive_callback_test;
-
-JNIEXPORT
-void JNICALL RecursiveSampledObjectAlloc(jvmtiEnv *jvmti_env,
- JNIEnv* jni_env,
- jthread thread,
- jobject object,
- jclass object_klass,
- jlong size) {
- // Basically ensure that if we were to allocate objects, we would not have an
- // infinite recursion here.
- int i;
- for (i = 0; i < 1000; i++) {
- if (allocate_object(jni_env) == NULL) {
- JNI_ENV_PTR(jni_env)->FatalError(JNI_ENV_ARG2(jni_env, "allocate_object returned NULL\n"));
- }
- }
-
- did_recursive_callback_test = 1;
-}
-
-JNIEXPORT jboolean JNICALL
-Java_MyPackage_HeapMonitorRecursiveTest_didCallback(JNIEnv* env, jclass cls) {
- return did_recursive_callback_test != 0;
-}
-
-JNIEXPORT void JNICALL
-Java_MyPackage_HeapMonitorRecursiveTest_setCallbackToCallAllocateSomeMore(JNIEnv* env, jclass cls) {
- jvmtiEventCallbacks callbacks;
-
- memset(&callbacks, 0, sizeof(callbacks));
- callbacks.SampledObjectAlloc = &RecursiveSampledObjectAlloc;
-
- if (check_error((*jvmti)->SetEventCallbacks(jvmti, &callbacks,
- sizeof(jvmtiEventCallbacks)),
- " Set Event Callbacks")) {
- JNI_ENV_PTR(env)->FatalError(JNI_ENV_ARG2(env, "Cannot reset the callback."));
- }
-}
-
-#ifdef __cplusplus
-}
-#endif
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/test/hotspot/jtreg/serviceability/jvmti/HeapMonitor/libHeapMonitorTest.cpp Sat Mar 16 21:00:45 2019 +0000
@@ -0,0 +1,1165 @@
+/*
+ * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, Google and/or its affiliates. All rights reserved.
+ * 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 <assert.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include "jvmti.h"
+
+extern "C" {
+
+#define TRUE 1
+#define FALSE 0
+#define PRINT_OUT 0
+
+static jvmtiEnv *jvmti = NULL;
+static jvmtiEnv *second_jvmti = NULL;
+
+typedef struct _ObjectTrace{
+ jweak object;
+ jlong size;
+ jvmtiFrameInfo* frames;
+ size_t frame_count;
+ jthread thread;
+} ObjectTrace;
+
+typedef struct _EventStorage {
+ int live_object_additions;
+ int live_object_size;
+ int live_object_count;
+ ObjectTrace** live_objects;
+
+ int garbage_history_size;
+ int garbage_history_index;
+ ObjectTrace** garbage_collected_objects;
+
+ // Two separate monitors to separate storage data race and the compaction field
+ // data race.
+ jrawMonitorID storage_monitor;
+
+ int compaction_required;
+ jrawMonitorID compaction_monitor;
+} EventStorage;
+
+typedef struct _ExpectedContentFrame {
+ const char *name;
+ const char *signature;
+ const char *file_name;
+ int line_number;
+} ExpectedContentFrame;
+
+static
+void event_storage_lock(EventStorage* storage) {
+ jvmti->RawMonitorEnter(storage->storage_monitor);
+}
+
+static
+void event_storage_unlock(EventStorage* storage) {
+ jvmti->RawMonitorExit(storage->storage_monitor);
+}
+
+static
+void event_storage_lock_compaction(EventStorage* storage) {
+ jvmti->RawMonitorEnter(storage->compaction_monitor);
+}
+
+static
+void event_storage_unlock_compaction(EventStorage* storage) {
+ jvmti->RawMonitorExit(storage->compaction_monitor);
+}
+
+// Given a method and a location, this method gets the line number.
+static
+jint get_line_number(jmethodID method, jlocation location) {
+ // Read the line number table.
+ jvmtiLineNumberEntry *table_ptr = 0;
+ jint line_number_table_entries;
+ int l;
+ jlocation last_location;
+ int jvmti_error = jvmti->GetLineNumberTable(method,
+ &line_number_table_entries,
+ &table_ptr);
+
+ if (JVMTI_ERROR_NONE != jvmti_error) {
+ return -1;
+ }
+ if (line_number_table_entries <= 0) {
+ return -1;
+ }
+ if (line_number_table_entries == 1) {
+ return table_ptr[0].line_number;
+ }
+
+ // Go through all the line numbers...
+ last_location = table_ptr[0].start_location;
+ for (l = 1; l < line_number_table_entries; l++) {
+ // ... and if you see one that is in the right place for your
+ // location, you've found the line number!
+ if ((location < table_ptr[l].start_location) &&
+ (location >= last_location)) {
+ return table_ptr[l - 1].line_number;
+ }
+ last_location = table_ptr[l].start_location;
+ }
+
+ if (location >= last_location) {
+ return table_ptr[line_number_table_entries - 1].line_number;
+ } else {
+ return -1;
+ }
+}
+
+static void print_out_frames(JNIEnv* env, ObjectTrace* trace) {
+ jvmtiFrameInfo* frames = trace->frames;
+ size_t i;
+ for (i = 0; i < trace->frame_count; i++) {
+ // Get basic information out of the trace.
+ jlocation bci = frames[i].location;
+ jmethodID methodid = frames[i].method;
+ char *name = NULL, *signature = NULL, *file_name = NULL;
+ jclass declaring_class;
+ int line_number;
+ jvmtiError err;
+
+ if (bci < 0) {
+ fprintf(stderr, "\tNative frame\n");
+ continue;
+ }
+
+ // Transform into usable information.
+ line_number = get_line_number(methodid, bci);
+ if (JVMTI_ERROR_NONE != jvmti->GetMethodName(methodid, &name, &signature, 0)) {
+ fprintf(stderr, "\tUnknown method name\n");
+ continue;
+ }
+
+ if (JVMTI_ERROR_NONE != jvmti->GetMethodDeclaringClass(methodid, &declaring_class)) {
+ fprintf(stderr, "\tUnknown class\n");
+ continue;
+ }
+
+ err = jvmti->GetSourceFileName(declaring_class, &file_name);
+ if (err != JVMTI_ERROR_NONE) {
+ fprintf(stderr, "\tUnknown file\n");
+ continue;
+ }
+
+ // Compare now, none should be NULL.
+ if (name == NULL) {
+ fprintf(stderr, "\tUnknown name\n");
+ continue;
+ }
+
+ if (file_name == NULL) {
+ fprintf(stderr, "\tUnknown file\n");
+ continue;
+ }
+
+ if (signature == NULL) {
+ fprintf(stderr, "\tUnknown signature\n");
+ continue;
+ }
+
+ fprintf(stderr, "\t%s%s (%s: %d)\n", name, signature, file_name, line_number);
+ }
+}
+
+static jboolean check_sample_content(JNIEnv* env,
+ ObjectTrace* trace,
+ ExpectedContentFrame *expected,
+ size_t expected_count,
+ jboolean check_lines,
+ int print_out_comparisons) {
+ jvmtiFrameInfo* frames;
+ size_t i;
+
+ if (expected_count > trace->frame_count) {
+ return FALSE;
+ }
+
+ frames = trace->frames;
+ for (i = 0; i < expected_count; i++) {
+ // Get basic information out of the trace.
+ jlocation bci = frames[i].location;
+ jmethodID methodid = frames[i].method;
+ char *name = NULL, *signature = NULL, *file_name = NULL;
+ jclass declaring_class;
+ int line_number;
+ jboolean differ;
+ jvmtiError err;
+
+ if (bci < 0 && expected[i].line_number != -1) {
+ return FALSE;
+ }
+
+ // Transform into usable information.
+ line_number = get_line_number(methodid, bci);
+ jvmti->GetMethodName(methodid, &name, &signature, 0);
+
+ if (JVMTI_ERROR_NONE != jvmti->GetMethodDeclaringClass(methodid, &declaring_class)) {
+ return FALSE;
+ }
+
+ err = jvmti->GetSourceFileName(declaring_class, &file_name);
+ if (err != JVMTI_ERROR_NONE) {
+ return FALSE;
+ }
+
+ // Compare now, none should be NULL.
+ if (name == NULL) {
+ return FALSE;
+ }
+
+ if (file_name == NULL) {
+ return FALSE;
+ }
+
+ if (signature == NULL) {
+ return FALSE;
+ }
+
+ differ = (strcmp(name, expected[i].name) ||
+ strcmp(signature, expected[i].signature) ||
+ strcmp(file_name, expected[i].file_name) ||
+ (check_lines && line_number != expected[i].line_number));
+
+ if (print_out_comparisons) {
+ fprintf(stderr, "\tComparing: (check_lines: %d)\n", check_lines);
+ fprintf(stderr, "\t\tNames: %s and %s\n", name, expected[i].name);
+ fprintf(stderr, "\t\tSignatures: %s and %s\n", signature, expected[i].signature);
+ fprintf(stderr, "\t\tFile name: %s and %s\n", file_name, expected[i].file_name);
+ fprintf(stderr, "\t\tLines: %d and %d\n", line_number, expected[i].line_number);
+ fprintf(stderr, "\t\tResult is %d\n", differ);
+ }
+
+ if (differ) {
+ return FALSE;
+ }
+ }
+
+ return TRUE;
+}
+
+// Static native API for various tests.
+static int fill_native_frames(JNIEnv* env, jobjectArray frames,
+ ExpectedContentFrame* native_frames, size_t size) {
+ size_t i;
+ for (i = 0; i < size; i++) {
+ jclass frame_class = NULL;
+ jfieldID line_number_field_id = 0;
+ int line_number = 0;
+ jfieldID string_id = 0;
+ jstring string_object = NULL;
+ const char* method = NULL;
+ const char* file_name = NULL;
+ const char* signature = NULL;
+
+ jobject obj = env->GetObjectArrayElement(frames, (jsize) i);
+
+ if (env->ExceptionOccurred()) {
+ fprintf(stderr, "fill_native_frames: Exception in jni GetObjectArrayElement\n");
+ return -1;
+ }
+
+ frame_class = env->GetObjectClass(obj);
+
+ if (env->ExceptionOccurred()) {
+ fprintf(stderr, "fill_native_frames: Exception in jni GetObjectClass\n");
+ return -1;
+ }
+
+ line_number_field_id = env->GetFieldID(frame_class, "lineNumber", "I");
+
+ if (env->ExceptionOccurred()) {
+ fprintf(stderr, "fill_native_frames: Exception in jni GetFieldID\n");
+ return -1;
+ }
+
+ line_number = env->GetIntField(obj, line_number_field_id);
+
+ if (env->ExceptionOccurred()) {
+ fprintf(stderr, "fill_native_frames: Exception in jni GetIntField\n");
+ return -1;
+ }
+
+ string_id = env->GetFieldID(frame_class, "method", "Ljava/lang/String;");
+
+ if (env->ExceptionOccurred()) {
+ fprintf(stderr, "fill_native_frames: Exception in jni GetFieldID\n");
+ return -1;
+ }
+
+ string_object = (jstring) env->GetObjectField(obj, string_id);
+
+ if (env->ExceptionOccurred()) {
+ fprintf(stderr, "fill_native_frames: Exception in jni GetObjectField\n");
+ return -1;
+ }
+
+ method = env->GetStringUTFChars(string_object, 0);
+
+ if (env->ExceptionOccurred()) {
+ fprintf(stderr, "Exception in jni GetStringUTFChars\n");
+ return -1;
+ }
+
+ string_id = env->GetFieldID(frame_class, "fileName", "Ljava/lang/String;");
+
+ if (env->ExceptionOccurred()) {
+ fprintf(stderr, "Exception in jni GetFieldID\n");
+ return -1;
+ }
+
+ string_object = (jstring) (env->GetObjectField(obj, string_id));
+
+ if (env->ExceptionOccurred()) {
+ fprintf(stderr, "fill_native_frames: Exception in second jni GetObjectField\n");
+ return -1;
+ }
+
+ file_name = env->GetStringUTFChars(string_object, 0);
+
+ if (env->ExceptionOccurred()) {
+ fprintf(stderr, "fill_native_frames: Exception in jni GetStringUTFChars\n");
+ return -1;
+ }
+
+ string_id = env->GetFieldID(frame_class, "signature", "Ljava/lang/String;");
+
+ if (env->ExceptionOccurred()) {
+ fprintf(stderr, "fill_native_frames: Exception in second jni GetFieldID\n");
+ return -1;
+ }
+
+ string_object = (jstring) (env->GetObjectField(obj, string_id));
+
+ if (env->ExceptionOccurred()) {
+ fprintf(stderr, "fill_native_frames: Exception in third jni GetObjectField\n");
+ return -1;
+ }
+
+ signature = env->GetStringUTFChars(string_object, 0);
+
+ if (env->ExceptionOccurred()) {
+ fprintf(stderr, "fill_native_frames: Exception in jni GetStringUTFChars\n");
+ return -1;
+ }
+
+ native_frames[i].name = method;
+ native_frames[i].file_name = file_name;
+ native_frames[i].signature = signature;
+ native_frames[i].line_number = line_number;
+ }
+
+ return 0;
+}
+
+// Internal storage system implementation.
+static EventStorage global_event_storage;
+static EventStorage second_global_event_storage;
+
+static void event_storage_set_compaction_required(EventStorage* storage) {
+ event_storage_lock_compaction(storage);
+ storage->compaction_required = 1;
+ event_storage_unlock_compaction(storage);
+}
+
+static int event_storage_get_compaction_required(EventStorage* storage) {
+ int result;
+ event_storage_lock_compaction(storage);
+ result = storage->compaction_required;
+ event_storage_unlock_compaction(storage);
+ return result;
+}
+
+static void event_storage_set_garbage_history(EventStorage* storage, int value) {
+ size_t size;
+ event_storage_lock(storage);
+ global_event_storage.garbage_history_size = value;
+ free(global_event_storage.garbage_collected_objects);
+ size = sizeof(*global_event_storage.garbage_collected_objects) * value;
+ global_event_storage.garbage_collected_objects = reinterpret_cast<ObjectTrace**>(malloc(size));
+ memset(global_event_storage.garbage_collected_objects, 0, size);
+ event_storage_unlock(storage);
+}
+
+// No mutex here, it is handled by the caller.
+static void event_storage_add_garbage_collected_object(EventStorage* storage,
+ ObjectTrace* object) {
+ int idx = storage->garbage_history_index;
+ ObjectTrace* old_object = storage->garbage_collected_objects[idx];
+ if (old_object != NULL) {
+ free(old_object->frames);
+ free(storage->garbage_collected_objects[idx]);
+ }
+
+ storage->garbage_collected_objects[idx] = object;
+ storage->garbage_history_index = (idx + 1) % storage->garbage_history_size;
+}
+
+static int event_storage_get_count(EventStorage* storage) {
+ int result;
+ event_storage_lock(storage);
+ result = storage->live_object_count;
+ event_storage_unlock(storage);
+ return result;
+}
+
+static double event_storage_get_average_size(EventStorage* storage) {
+ double accumulation = 0;
+ int max_size;
+ int i;
+
+ event_storage_lock(storage);
+ max_size = storage->live_object_count;
+
+ for (i = 0; i < max_size; i++) {
+ accumulation += storage->live_objects[i]->size;
+ }
+
+ event_storage_unlock(storage);
+ return accumulation / max_size;
+}
+
+static jboolean event_storage_contains(JNIEnv* env,
+ EventStorage* storage,
+ ExpectedContentFrame* frames,
+ size_t size,
+ jboolean check_lines) {
+ int i;
+ event_storage_lock(storage);
+ fprintf(stderr, "Checking storage count %d\n", storage->live_object_count);
+ for (i = 0; i < storage->live_object_count; i++) {
+ ObjectTrace* trace = storage->live_objects[i];
+
+ if (check_sample_content(env, trace, frames, size, check_lines, PRINT_OUT)) {
+ event_storage_unlock(storage);
+ return TRUE;
+ }
+ }
+ event_storage_unlock(storage);
+ return FALSE;
+}
+
+static jlong event_storage_get_size(JNIEnv* env,
+ EventStorage* storage,
+ ExpectedContentFrame* frames,
+ size_t size,
+ jboolean check_lines) {
+ int i;
+ event_storage_lock(storage);
+ fprintf(stderr, "Getting element from storage count, size %d\n", storage->live_object_count);
+ for (i = 0; i < storage->live_object_count; i++) {
+ ObjectTrace* trace = storage->live_objects[i];
+
+ if (check_sample_content(env, trace, frames, size, check_lines, PRINT_OUT)) {
+ jlong result = trace->size;
+ event_storage_unlock(storage);
+ return result;
+ }
+ }
+ event_storage_unlock(storage);
+ return 0;
+}
+
+static jboolean event_storage_garbage_contains(JNIEnv* env,
+ EventStorage* storage,
+ ExpectedContentFrame* frames,
+ size_t size,
+ jboolean check_lines) {
+ int i;
+ event_storage_lock(storage);
+ fprintf(stderr, "Checking garbage storage count %d\n",
+ storage->garbage_history_size);
+ for (i = 0; i < storage->garbage_history_size; i++) {
+ ObjectTrace* trace = storage->garbage_collected_objects[i];
+
+ if (trace == NULL) {
+ continue;
+ }
+
+ if (check_sample_content(env, trace, frames, size, check_lines, PRINT_OUT)) {
+ event_storage_unlock(storage);
+ return TRUE;
+ }
+ }
+ event_storage_unlock(storage);
+ return FALSE;
+}
+
+// No mutex here, handled by the caller.
+static void event_storage_augment_storage(EventStorage* storage) {
+ int new_max = (storage->live_object_size * 2) + 1;
+ ObjectTrace** new_objects = reinterpret_cast<ObjectTrace**>(malloc(new_max * sizeof(*new_objects)));
+
+ int current_count = storage->live_object_count;
+ memcpy(new_objects, storage->live_objects, current_count * sizeof(*new_objects));
+ free(storage->live_objects);
+ storage->live_objects = new_objects;
+ storage->live_object_size = new_max;
+}
+
+static void event_storage_add(EventStorage* storage,
+ JNIEnv* jni,
+ jthread thread,
+ jobject object,
+ jclass klass,
+ jlong size) {
+ jvmtiFrameInfo frames[64];
+ jint count;
+ jvmtiError err;
+
+ err = jvmti->GetStackTrace(thread, 0, 64, frames, &count);
+ if (err == JVMTI_ERROR_NONE && count >= 1) {
+ ObjectTrace* live_object;
+ jvmtiFrameInfo* allocated_frames = (jvmtiFrameInfo*) malloc(count * sizeof(*allocated_frames));
+ memcpy(allocated_frames, frames, count * sizeof(*allocated_frames));
+
+ live_object = (ObjectTrace*) malloc(sizeof(*live_object));
+ live_object->frames = allocated_frames;
+ live_object->frame_count = count;
+ live_object->size = size;
+ live_object->thread = thread;
+ live_object->object = jni->NewWeakGlobalRef(object);
+
+ if (jni->ExceptionOccurred()) {
+ jni->FatalError("Error in event_storage_add: Exception in jni NewWeakGlobalRef");
+ }
+
+ // Only now lock and get things done quickly.
+ event_storage_lock(storage);
+
+ storage->live_object_additions++;
+
+ if (storage->live_object_count >= storage->live_object_size) {
+ event_storage_augment_storage(storage);
+ }
+ assert(storage->live_object_count < storage->live_object_size);
+
+ if (PRINT_OUT) {
+ fprintf(stderr, "Adding trace for thread %p, frame_count %d, storage %p\n",
+ thread, count, storage);
+ print_out_frames(jni, live_object);
+ }
+ storage->live_objects[storage->live_object_count] = live_object;
+ storage->live_object_count++;
+
+ event_storage_unlock(storage);
+ }
+}
+
+static void event_storage_compact(EventStorage* storage, JNIEnv* jni) {
+ int max, i, dest;
+ ObjectTrace** live_objects;
+
+ event_storage_lock_compaction(storage);
+ storage->compaction_required = 0;
+ event_storage_unlock_compaction(storage);
+
+ event_storage_lock(storage);
+
+ max = storage->live_object_count;
+ live_objects = storage->live_objects;
+
+ for (i = 0, dest = 0; i < max; i++) {
+ ObjectTrace* live_object = live_objects[i];
+ jweak object = live_object->object;
+
+ if (!jni->IsSameObject(object, NULL)) {
+ if (dest != i) {
+ live_objects[dest] = live_object;
+ dest++;
+ }
+ } else {
+ jni->DeleteWeakGlobalRef(object);
+ live_object->object = NULL;
+
+ event_storage_add_garbage_collected_object(storage, live_object);
+ }
+ }
+
+ storage->live_object_count = dest;
+ event_storage_unlock(storage);
+}
+
+static void event_storage_free_objects(ObjectTrace** array, int max) {
+ int i;
+ for (i = 0; i < max; i++) {
+ free(array[i]), array[i] = NULL;
+ }
+}
+
+static void event_storage_reset(EventStorage* storage) {
+ event_storage_lock(storage);
+
+ // Reset everything except the mutex and the garbage collection.
+ event_storage_free_objects(storage->live_objects,
+ storage->live_object_count);
+ storage->live_object_additions = 0;
+ storage->live_object_size = 0;
+ storage->live_object_count = 0;
+ free(storage->live_objects), storage->live_objects = NULL;
+
+ event_storage_free_objects(storage->garbage_collected_objects,
+ storage->garbage_history_size);
+
+ storage->compaction_required = 0;
+ storage->garbage_history_index = 0;
+
+ event_storage_unlock(storage);
+}
+
+static int event_storage_number_additions(EventStorage* storage) {
+ int result;
+ event_storage_lock(storage);
+ result = storage->live_object_additions;
+ event_storage_unlock(storage);
+ return result;
+}
+
+// Start of the JVMTI agent code.
+static const char *EXC_CNAME = "java/lang/Exception";
+
+static int check_error(jvmtiError err, const char *s) {
+ if (err != JVMTI_ERROR_NONE) {
+ printf(" ## %s error: %d\n", s, err);
+ return 1;
+ }
+ return 0;
+}
+
+static int check_capability_error(jvmtiError err, const char *s) {
+ if (err != JVMTI_ERROR_NONE) {
+ if (err == JVMTI_ERROR_MUST_POSSESS_CAPABILITY) {
+ return 0;
+ }
+ fprintf(stderr, " ## %s error: %d\n", s, err);
+ }
+ return 1;
+}
+
+static jint Agent_Initialize(JavaVM *jvm, char *options, void *reserved);
+
+JNIEXPORT
+jint JNICALL Agent_OnLoad(JavaVM *jvm, char *options, void *reserved) {
+ return Agent_Initialize(jvm, options, reserved);
+}
+
+JNIEXPORT
+jint JNICALL Agent_OnAttach(JavaVM *jvm, char *options, void *reserved) {
+ return Agent_Initialize(jvm, options, reserved);
+}
+
+JNIEXPORT
+jint JNICALL JNI_OnLoad(JavaVM *jvm, void *reserved) {
+ return JNI_VERSION_1_8;
+}
+
+#define MAX_THREADS 500
+
+typedef struct ThreadStats {
+ int thread_count;
+ int counts[MAX_THREADS];
+ char* threads[MAX_THREADS];
+} ThreadStats;
+
+static ThreadStats thread_stats;
+
+JNIEXPORT jboolean JNICALL
+Java_MyPackage_HeapMonitorThreadDisabledTest_checkThreadSamplesOnlyFrom(
+ JNIEnv* env, jclass cls, jthread thread) {
+ jvmtiThreadInfo info;
+ jvmtiError err;
+ char* expected_name;
+ int found_thread = FALSE;
+
+ err = jvmti->GetThreadInfo(thread, &info);
+ expected_name = info.name;
+
+ if (err != JVMTI_ERROR_NONE) {
+ fprintf(stderr, "Failed to get thread information\n");
+ return FALSE;
+ }
+
+ if (thread_stats.thread_count != 1) {
+ fprintf(stderr, "Wrong thread number: %d (expected 1)\n",
+ thread_stats.thread_count);
+ return FALSE;
+ }
+
+ if (strcmp(expected_name, thread_stats.threads[0]) != 0) {
+ fprintf(stderr, "Unexpected thread name: '%s' (expected '%s')\n",
+ thread_stats.threads[0], expected_name);
+ return FALSE;
+ }
+
+ return TRUE;
+}
+
+static void add_thread_count(jthread thread) {
+ int i;
+ jvmtiThreadInfo info;
+ jvmtiError err;
+
+ err = jvmti->GetThreadInfo(thread, &info);
+ if (err != JVMTI_ERROR_NONE) {
+ fprintf(stderr, "Thread info for %p failed, ignoring thread count\n",
+ thread);
+ return;
+ }
+
+ event_storage_lock(&global_event_storage);
+ for (i = 0; i < thread_stats.thread_count; i++) {
+ if (!strcmp(thread_stats.threads[i], info.name)) {
+ thread_stats.counts[i]++;
+ event_storage_unlock(&global_event_storage);
+ return;
+ }
+ }
+
+ thread_stats.threads[thread_stats.thread_count] = info.name;
+ thread_stats.counts[thread_stats.thread_count]++;
+ thread_stats.thread_count++;
+ event_storage_unlock(&global_event_storage);
+}
+
+JNIEXPORT void JNICALL
+Java_MyPackage_HeapMonitorThreadDisabledTest_enableSamplingEvents(
+ JNIEnv* env, jclass cls, jthread thread) {
+ fprintf(stderr, "Enabling for %p\n", thread);
+ check_error(jvmti->SetEventNotificationMode(
+ JVMTI_ENABLE, JVMTI_EVENT_SAMPLED_OBJECT_ALLOC, thread),
+ "Set event notifications for a single thread");
+}
+
+static void print_thread_stats() {
+ int i;
+ event_storage_lock(&global_event_storage);
+ fprintf(stderr, "Thread count:\n");
+ for (i = 0; i < thread_stats.thread_count; i++) {
+ fprintf(stderr, "\t%s: %d\n", thread_stats.threads[i], thread_stats.counts[i]);
+ }
+ event_storage_unlock(&global_event_storage);
+}
+
+JNIEXPORT
+void JNICALL SampledObjectAlloc(jvmtiEnv *jvmti_env,
+ JNIEnv* jni_env,
+ jthread thread,
+ jobject object,
+ jclass object_klass,
+ jlong size) {
+ add_thread_count(thread);
+
+ if (event_storage_get_compaction_required(&global_event_storage)) {
+ event_storage_compact(&global_event_storage, jni_env);
+ }
+
+ event_storage_add(&global_event_storage, jni_env, thread, object,
+ object_klass, size);
+}
+
+JNIEXPORT
+void JNICALL VMObjectAlloc(jvmtiEnv *jvmti_env,
+ JNIEnv* jni_env,
+ jthread thread,
+ jobject object,
+ jclass object_klass,
+ jlong size) {
+ event_storage_add(&second_global_event_storage, jni_env, thread, object,
+ object_klass, size);
+}
+
+JNIEXPORT
+void JNICALL GarbageCollectionFinish(jvmtiEnv *jvmti_env) {
+ event_storage_set_compaction_required(&global_event_storage);
+}
+
+static int enable_notifications() {
+ if (check_error(jvmti->SetEventNotificationMode(
+ JVMTI_ENABLE, JVMTI_EVENT_GARBAGE_COLLECTION_FINISH, NULL),
+ "Set event notifications")) {
+ return 1;
+ }
+
+ return check_error(jvmti->SetEventNotificationMode(
+ JVMTI_ENABLE, JVMTI_EVENT_SAMPLED_OBJECT_ALLOC, NULL),
+ "Set event notifications");
+}
+
+static
+jint Agent_Initialize(JavaVM *jvm, char *options, void *reserved) {
+ jint res;
+ jvmtiEventCallbacks callbacks;
+ jvmtiCapabilities caps;
+
+ res = jvm->GetEnv((void **) &jvmti, JVMTI_VERSION);
+ if (res != JNI_OK || jvmti == NULL) {
+ fprintf(stderr, "Error: wrong result of a valid call to GetEnv!\n");
+ return JNI_ERR;
+ }
+
+ // Get second jvmti environment.
+ res = jvm->GetEnv((void **) &second_jvmti, JVMTI_VERSION);
+ if (res != JNI_OK || second_jvmti == NULL) {
+ fprintf(stderr, "Error: wrong result of a valid second call to GetEnv!\n");
+ return JNI_ERR;
+ }
+
+ if (PRINT_OUT) {
+ fprintf(stderr, "Storage is at %p, secondary is at %p\n",
+ &global_event_storage, &second_global_event_storage);
+ }
+
+ jvmti->CreateRawMonitor("storage_monitor",
+ &global_event_storage.storage_monitor);
+ jvmti->CreateRawMonitor("second_storage_monitor",
+ &second_global_event_storage.storage_monitor);
+
+ jvmti->CreateRawMonitor("compaction_monitor",
+ &global_event_storage.compaction_monitor);
+ jvmti->CreateRawMonitor("second_compaction_monitor",
+ &second_global_event_storage.compaction_monitor);
+
+ event_storage_set_garbage_history(&global_event_storage, 200);
+ event_storage_set_garbage_history(&second_global_event_storage, 200);
+
+ memset(&callbacks, 0, sizeof(callbacks));
+ callbacks.SampledObjectAlloc = &SampledObjectAlloc;
+ callbacks.VMObjectAlloc = &VMObjectAlloc;
+ callbacks.GarbageCollectionFinish = &GarbageCollectionFinish;
+
+ memset(&caps, 0, sizeof(caps));
+ // Get line numbers, sample events, filename, and gc events for the tests.
+ caps.can_get_line_numbers = 1;
+ caps.can_get_source_file_name = 1;
+ caps.can_generate_garbage_collection_events = 1;
+ caps.can_generate_sampled_object_alloc_events = 1;
+ caps.can_generate_vm_object_alloc_events = 1;
+ if (check_error(jvmti->AddCapabilities(&caps), "Add capabilities")) {
+ return JNI_ERR;
+ }
+
+ if (check_error(jvmti->SetEventCallbacks(&callbacks,
+ sizeof(jvmtiEventCallbacks)),
+ " Set Event Callbacks")) {
+ return JNI_ERR;
+ }
+ return JNI_OK;
+}
+
+JNIEXPORT void JNICALL
+Java_MyPackage_HeapMonitor_setSamplingInterval(JNIEnv* env, jclass cls, jint value) {
+ jvmti->SetHeapSamplingInterval(value);
+}
+
+JNIEXPORT jboolean JNICALL
+Java_MyPackage_HeapMonitor_eventStorageIsEmpty(JNIEnv* env, jclass cls) {
+ return event_storage_get_count(&global_event_storage) == 0;
+}
+
+JNIEXPORT jint JNICALL
+Java_MyPackage_HeapMonitor_getEventStorageElementCount(JNIEnv* env, jclass cls) {
+ return event_storage_get_count(&global_event_storage);
+}
+
+JNIEXPORT void JNICALL
+Java_MyPackage_HeapMonitor_enableSamplingEvents(JNIEnv* env, jclass cls) {
+ enable_notifications();
+}
+
+JNIEXPORT void JNICALL
+Java_MyPackage_HeapMonitor_disableSamplingEvents(JNIEnv* env, jclass cls) {
+ check_error(jvmti->SetEventNotificationMode(
+ JVMTI_DISABLE, JVMTI_EVENT_SAMPLED_OBJECT_ALLOC, NULL),
+ "Set event notifications");
+
+ check_error(jvmti->SetEventNotificationMode(
+ JVMTI_DISABLE, JVMTI_EVENT_GARBAGE_COLLECTION_FINISH, NULL),
+ "Garbage Collection Finish");
+}
+
+static ExpectedContentFrame *get_native_frames(JNIEnv* env, jclass cls,
+ jobjectArray frames) {
+ ExpectedContentFrame *native_frames;
+ jsize size = env->GetArrayLength(frames);
+
+ if (env->ExceptionOccurred()) {
+ env->FatalError("get_native_frames failed with the GetArrayLength call");
+ }
+
+ native_frames = reinterpret_cast<ExpectedContentFrame*> (malloc(size * sizeof(*native_frames)));
+
+ if (native_frames == NULL) {
+ env->FatalError("Error in get_native_frames: malloc returned NULL\n");
+ }
+
+ if (fill_native_frames(env, frames, native_frames, size) != 0) {
+ env->FatalError("Error in get_native_frames: fill_native_frames returned failed status\n");
+ }
+
+ return native_frames;
+}
+
+JNIEXPORT jboolean JNICALL
+Java_MyPackage_HeapMonitor_obtainedEvents(JNIEnv* env, jclass cls,
+ jobjectArray frames,
+ jboolean check_lines) {
+ jboolean result;
+ jsize size = env->GetArrayLength(frames);
+ ExpectedContentFrame *native_frames = get_native_frames(env, cls, frames);
+
+ result = event_storage_contains(env, &global_event_storage, native_frames,
+ size, check_lines);
+
+ free(native_frames), native_frames = NULL;
+ return result;
+}
+
+JNIEXPORT jboolean JNICALL
+Java_MyPackage_HeapMonitor_garbageContains(JNIEnv* env, jclass cls,
+ jobjectArray frames,
+ jboolean check_lines) {
+ jboolean result;
+ jsize size = env->GetArrayLength(frames);
+ ExpectedContentFrame *native_frames = get_native_frames(env, cls, frames);
+
+ result = event_storage_garbage_contains(env, &global_event_storage,
+ native_frames, size, check_lines);
+
+ free(native_frames), native_frames = NULL;
+ return result;
+}
+
+JNIEXPORT jlong JNICALL
+Java_MyPackage_HeapMonitor_getSize(JNIEnv* env, jclass cls,
+ jobjectArray frames,
+ jboolean check_lines) {
+ jlong result = 0;
+ jsize size = env->GetArrayLength(frames);
+ ExpectedContentFrame *native_frames = get_native_frames(env, cls, frames);
+
+ result = event_storage_get_size(env, &global_event_storage,
+ native_frames, size, check_lines);
+
+ free(native_frames), native_frames = NULL;
+ return result;
+}
+
+JNIEXPORT void JNICALL
+Java_MyPackage_HeapMonitor_forceGarbageCollection(JNIEnv* env, jclass cls) {
+ check_error(jvmti->ForceGarbageCollection(),
+ "Forced Garbage Collection");
+}
+
+JNIEXPORT void JNICALL
+Java_MyPackage_HeapMonitor_resetEventStorage(JNIEnv* env, jclass cls) {
+ event_storage_reset(&global_event_storage);
+ event_storage_reset(&second_global_event_storage);
+}
+
+JNIEXPORT jboolean JNICALL
+Java_MyPackage_HeapMonitorNoCapabilityTest_allSamplingMethodsFail(JNIEnv *env,
+ jclass cls) {
+ jvmtiCapabilities caps;
+ memset(&caps, 0, sizeof(caps));
+ caps.can_generate_sampled_object_alloc_events = 1;
+ if (check_error(jvmti->RelinquishCapabilities(&caps),
+ "Add capabilities\n")){
+ return FALSE;
+ }
+
+ if (check_capability_error(jvmti->SetHeapSamplingInterval(1<<19),
+ "Set Heap Sampling Interval")) {
+ return FALSE;
+ }
+ return TRUE;
+}
+
+JNIEXPORT jboolean JNICALL
+Java_MyPackage_HeapMonitorIllegalArgumentTest_testIllegalArgument(JNIEnv *env,
+ jclass cls) {
+ if (check_error(jvmti->SetHeapSamplingInterval(0),
+ "Sampling interval 0 failed\n")){
+ return FALSE;
+ }
+
+ if (check_error(jvmti->SetHeapSamplingInterval(1024),
+ "Sampling interval 1024 failed\n")){
+ return FALSE;
+ }
+
+ if (!check_error(jvmti->SetHeapSamplingInterval(-1),
+ "Sampling interval -1 passed\n")){
+ return FALSE;
+ }
+
+ if (!check_error(jvmti->SetHeapSamplingInterval(-1024),
+ "Sampling interval -1024 passed\n")){
+ return FALSE;
+ }
+
+ return TRUE;
+}
+
+JNIEXPORT jdouble JNICALL
+Java_MyPackage_HeapMonitor_getAverageSize(JNIEnv *env, jclass cls) {
+ return event_storage_get_average_size(&global_event_storage);
+}
+
+typedef struct sThreadsFound {
+ jthread* threads;
+ int num_threads;
+} ThreadsFound;
+
+JNIEXPORT jboolean JNICALL
+Java_MyPackage_HeapMonitorThreadTest_checkSamples(JNIEnv* env, jclass cls,
+ jint num_threads) {
+ print_thread_stats();
+ // Ensure we got stacks from at least num_threads.
+ return thread_stats.thread_count >= num_threads;
+}
+
+JNIEXPORT
+void JNICALL SampledObjectAlloc2(jvmtiEnv *jvmti_env,
+ JNIEnv* jni_env,
+ jthread thread,
+ jobject object,
+ jclass object_klass,
+ jlong size) {
+ // Nop for now, two agents are not yet implemented.
+ assert(0);
+}
+
+JNIEXPORT jboolean JNICALL
+Java_MyPackage_HeapMonitorTwoAgentsTest_enablingSamplingInSecondaryAgent(
+ JNIEnv* env, jclass cls) {
+ // Currently this method should be failing directly at the AddCapability step
+ // but the implementation is correct for when multi-agent support is enabled.
+ jvmtiCapabilities caps;
+ jvmtiEventCallbacks callbacks;
+
+ memset(&caps, 0, sizeof(caps));
+ caps.can_generate_sampled_object_alloc_events = 1;
+ if (check_error(second_jvmti->AddCapabilities(&caps),
+ "Set the capability for second agent")) {
+ return FALSE;
+ }
+
+ memset(&callbacks, 0, sizeof(callbacks));
+ callbacks.SampledObjectAlloc = &SampledObjectAlloc2;
+
+ if (check_error(second_jvmti->SetEventCallbacks(&callbacks,
+ sizeof(jvmtiEventCallbacks)),
+ " Set Event Callbacks for second agent")) {
+ return FALSE;
+ }
+
+ return TRUE;
+}
+
+JNIEXPORT void JNICALL
+Java_MyPackage_HeapMonitor_enableVMEvents(JNIEnv* env, jclass cls) {
+ check_error(jvmti->SetEventNotificationMode(
+ JVMTI_ENABLE, JVMTI_EVENT_VM_OBJECT_ALLOC, NULL),
+ "Set vm event notifications");
+}
+
+JNIEXPORT jint JNICALL
+Java_MyPackage_HeapMonitorVMEventsTest_vmEvents(JNIEnv* env, jclass cls) {
+ return event_storage_number_additions(&second_global_event_storage);
+}
+
+JNIEXPORT jint JNICALL
+Java_MyPackage_HeapMonitor_sampledEvents(JNIEnv* env, jclass cls) {
+ return event_storage_number_additions(&global_event_storage);
+}
+
+static jobject allocate_object(JNIEnv* env) {
+ // Construct an Object.
+ jclass cls = env->FindClass("java/lang/Object");
+ jmethodID constructor;
+ jobject result;
+
+ if (env->ExceptionOccurred() || cls == NULL) {
+ env->FatalError("Error in jni FindClass: Cannot find Object class\n");
+ }
+
+ constructor = env->GetMethodID(cls, "<init>", "()V");
+ if (env->ExceptionOccurred() || constructor == NULL) {
+ env->FatalError("Error in jni GetMethodID: Cannot find Object class constructor\n");
+ }
+
+ // Call back constructor to allocate a new instance, with an int argument
+ result = env->NewObject(cls, constructor);
+
+ if (env->ExceptionOccurred() || result == NULL) {
+ env->FatalError("Error in jni NewObject: Cannot allocate an object\n");
+ }
+ return result;
+}
+
+// Ensure we got a callback for the test.
+static int did_recursive_callback_test;
+
+JNIEXPORT
+void JNICALL RecursiveSampledObjectAlloc(jvmtiEnv *jvmti_env,
+ JNIEnv* jni_env,
+ jthread thread,
+ jobject object,
+ jclass object_klass,
+ jlong size) {
+ // Basically ensure that if we were to allocate objects, we would not have an
+ // infinite recursion here.
+ int i;
+ for (i = 0; i < 1000; i++) {
+ if (allocate_object(jni_env) == NULL) {
+ jni_env->FatalError("allocate_object returned NULL\n");
+ }
+ }
+
+ did_recursive_callback_test = 1;
+}
+
+JNIEXPORT jboolean JNICALL
+Java_MyPackage_HeapMonitorRecursiveTest_didCallback(JNIEnv* env, jclass cls) {
+ return did_recursive_callback_test != 0;
+}
+
+JNIEXPORT void JNICALL
+Java_MyPackage_HeapMonitorRecursiveTest_setCallbackToCallAllocateSomeMore(JNIEnv* env, jclass cls) {
+ jvmtiEventCallbacks callbacks;
+
+ memset(&callbacks, 0, sizeof(callbacks));
+ callbacks.SampledObjectAlloc = &RecursiveSampledObjectAlloc;
+
+ if (check_error(jvmti->SetEventCallbacks(&callbacks,
+ sizeof(jvmtiEventCallbacks)),
+ "Set Event Callbacks")) {
+ env->FatalError("Cannot reset the callback.");
+ }
+}
+
+}
--- a/test/hotspot/jtreg/serviceability/sa/ClhsdbPrintStatics.java Tue Mar 12 09:49:10 2019 +0000
+++ b/test/hotspot/jtreg/serviceability/sa/ClhsdbPrintStatics.java Sat Mar 16 21:00:45 2019 +0000
@@ -60,8 +60,7 @@
"ClassLoaderDataGraph::_head",
"JNIHandles::_weak_global_handles", "PerfMemory::_top",
"ObjectSynchronizer::gBlockList",
- "java_lang_Class::_oop_size_offset",
- "CodeCache::_scavenge_root_nmethods"));
+ "java_lang_Class::_oop_size_offset"));
expStrMap.put("printstatics SystemDictionary", List.of(
"Static fields of SystemDictionary",
"SystemDictionary::Class_klass_knum",
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/BScenarios/hotswap/tc10x001.java Tue Mar 12 09:49:10 2019 +0000
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/BScenarios/hotswap/tc10x001.java Sat Mar 16 21:00:45 2019 +0000
@@ -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
@@ -62,6 +62,7 @@
*/
public class tc10x001 {
+ public final static String SGL_QUIT = "quit";
public final static String UNEXPECTED_STRING = "***Unexpected exception ";
@@ -299,6 +300,8 @@
} catch (Throwable e) {
complain(UNEXPECTED_STRING + e);
exitStatus = Consts.TEST_FAILED;
+ } finally {
+ debugee.sendSignal(tc10x001.SGL_QUIT); // Acknowledge debugee result received.
}
}
}
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/BScenarios/hotswap/tc10x001/newclass/tc10x001a.java Tue Mar 12 09:49:10 2019 +0000
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/BScenarios/hotswap/tc10x001/newclass/tc10x001a.java Sat Mar 16 21:00:45 2019 +0000
@@ -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
@@ -54,6 +54,7 @@
// brkpLineNumber // checkLastLine
System.err.println("i = " + i);
pipe.println("@" + i);
+ String instr = pipe.readln(); // Wait for debugger "quit"
System.exit(Consts.TEST_PASSED + Consts.JCK_STATUS_BASE);
}
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/BScenarios/hotswap/tc10x001a.java Tue Mar 12 09:49:10 2019 +0000
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/BScenarios/hotswap/tc10x001a.java Sat Mar 16 21:00:45 2019 +0000
@@ -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
@@ -54,6 +54,7 @@
System.err.println("i = " + i); // brkpLineNumber // checkLastLine
pipe.println("@" + i);
+ String instr = pipe.readln(); // Wait for debugger "quit"
System.exit(Consts.TEST_PASSED + Consts.JCK_STATUS_BASE);
}
--- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/MonitorWait/monitorwait001/monitorwait001.cpp Tue Mar 12 09:49:10 2019 +0000
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/MonitorWait/monitorwait001/monitorwait001.cpp Sat Mar 16 21:00:45 2019 +0000
@@ -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
@@ -147,10 +147,6 @@
jvmti->SetEventNotificationMode(JVMTI_DISABLE, JVMTI_EVENT_MONITOR_WAIT, NULL)))
nsk_jvmti_setFailStatus();
- /* dispose global references */
- jni->DeleteGlobalRef(object);
- jni->DeleteGlobalRef(thread);
-
return NSK_TRUE;
}
--- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/MonitorWaited/monitorwaited001/monitorwaited001.cpp Tue Mar 12 09:49:10 2019 +0000
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/MonitorWaited/monitorwaited001/monitorwaited001.cpp Sat Mar 16 21:00:45 2019 +0000
@@ -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
@@ -148,10 +148,6 @@
jvmti->SetEventNotificationMode(JVMTI_DISABLE, JVMTI_EVENT_MONITOR_WAITED, NULL)))
nsk_jvmti_setFailStatus();
- /* dispose global references */
- jni->DeleteGlobalRef(object);
- jni->DeleteGlobalRef(thread);
-
return NSK_TRUE;
}
--- a/test/hotspot/jtreg/vmTestbase/nsk/share/jvmti/jvmti_tools.cpp Tue Mar 12 09:49:10 2019 +0000
+++ b/test/hotspot/jtreg/vmTestbase/nsk/share/jvmti/jvmti_tools.cpp Sat Mar 16 21:00:45 2019 +0000
@@ -584,6 +584,10 @@
int isThreadExpected(jvmtiEnv *jvmti, jthread thread) {
static const char *vm_jfr_buffer_thread_name = "VM JFR Buffer Thread";
static const char *jfr_request_timer_thread_name = "JFR request timer";
+ static const char *graal_management_bean_registration_thread_name =
+ "HotSpotGraalManagement Bean Registration";
+ static const char *graal_compiler_thread_name_prefix = "JVMCI CompilerThread";
+ static const size_t prefixLength = strlen(graal_compiler_thread_name_prefix);
jvmtiThreadInfo threadinfo;
NSK_JVMTI_VERIFY(jvmti->GetThreadInfo(thread, &threadinfo));
@@ -594,6 +598,13 @@
if (strcmp(threadinfo.name, jfr_request_timer_thread_name) == 0)
return 0;
+ if (strcmp(threadinfo.name, graal_management_bean_registration_thread_name) == 0)
+ return 0;
+
+ if ((strlen(threadinfo.name) > prefixLength) &&
+ strncmp(threadinfo.name, graal_compiler_thread_name_prefix, prefixLength) == 0)
+ return 0;
+
return 1;
}
--- a/test/jaxp/TEST.ROOT Tue Mar 12 09:49:10 2019 +0000
+++ b/test/jaxp/TEST.ROOT Sat Mar 16 21:00:45 2019 +0000
@@ -23,7 +23,7 @@
groups=TEST.groups
# Minimum jtreg version
-requiredVersion=4.2 b14
+requiredVersion=4.2 b13
# Path to libraries in the topmost test directory. This is needed so @library
# does not need ../../ notation to reach them
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/test/jaxp/javax/xml/jaxp/unittest/transform/OutputPropertiesTest.java Sat Mar 16 21:00:45 2019 +0000
@@ -0,0 +1,73 @@
+/*
+ * 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.
+ */
+
+package transform;
+
+import java.io.StringReader;
+import java.util.Properties;
+import javax.xml.transform.Templates;
+import javax.xml.transform.TransformerFactory;
+import javax.xml.transform.stream.StreamSource;
+import org.testng.Assert;
+import org.testng.annotations.Test;
+
+/*
+ * @test
+ * @bug 8219705
+ * @library /javax/xml/jaxp/libs /javax/xml/jaxp/unittest
+ * @run testng transform.OutputPropertiesTest
+ * @summary Verifies the output properties are set correctly
+ */
+public class OutputPropertiesTest {
+ @Test
+ public void testOutputProperties() throws Exception {
+ String xslData = "<?xml version='1.0'?>"
+ + "<xsl:stylesheet"
+ + " xmlns:xsl='http://www.w3.org/1999/XSL/Transform'"
+ + " version='1.0'"
+ + ">\n"
+ + " <xsl:output method='html'/>\n"
+ + " <xsl:template match='/'>\n"
+ + " Hello World! \n"
+ + " </xsl:template>\n"
+ + "</xsl:stylesheet>";
+
+ System.out.println(xslData);
+
+ Templates templates = TransformerFactory.newInstance()
+ .newTemplates(new StreamSource(new StringReader(xslData)));
+
+ Properties properties = templates.getOutputProperties();
+ String[] prNames = new String[]{"method", "version", "indent", "media-type"};
+ String[] prValues = new String[]{"html", "4.0", "yes", "text/html"};
+
+ for (int i = 0; i < prNames.length; i++) {
+ String value = properties.getProperty(prNames[i]);
+ String msg = "The value of the property '" + prNames[i] + "' should be '"
+ + prValues[i] + "' when the method is '" + prValues[0] + "'. \n";
+ Assert.assertEquals(value, prValues[i], msg);
+ System.out.println(
+ prNames[i] + ": actual: " + value + ", expected: " + prValues[i]);
+ }
+ }
+}
--- a/test/jdk/ProblemList.txt Tue Mar 12 09:49:10 2019 +0000
+++ b/test/jdk/ProblemList.txt Sat Mar 16 21:00:45 2019 +0000
@@ -843,6 +843,8 @@
# jdk_util
+java/util/Arrays/TimSortStackSize2.java 8220613 generic-all
+
############################################################################
# jdk_instrument
--- a/test/jdk/TEST.groups Tue Mar 12 09:49:10 2019 +0000
+++ b/test/jdk/TEST.groups Sat Mar 16 21:00:45 2019 +0000
@@ -103,8 +103,7 @@
jdk/internal/ref \
jdk/internal/jimage \
jdk/internal/math \
- jdk/modules \
- vm
+ jdk/modules
# All of the java.util package
jdk_util = \
--- a/test/jdk/com/sun/jdi/SimulResumerTest.java Tue Mar 12 09:49:10 2019 +0000
+++ b/test/jdk/com/sun/jdi/SimulResumerTest.java Sat Mar 16 21:00:45 2019 +0000
@@ -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
@@ -210,7 +210,9 @@
}
} catch (IncompatibleThreadStateException ee) {
- // ignore
+ // ignore checks if thread was not suspended
+ } catch (ObjectCollectedException ee) {
+ // ignore ownedMonitors failure
} catch (VMDisconnectedException ee) {
// This is how we stop. The debuggee runs to completion
// and we get this exception.
@@ -249,7 +251,7 @@
public void run() {
while (true) {
iters++;
- System.out.println("bkpts = " + bkpts + ", iters = " + iters);
+ // System.out.println("bkpts = " + bkpts + ", iters = " + iters);
try {
Thread.sleep(waitTime);
check(debuggeeThread1);
--- a/test/jdk/com/sun/net/httpserver/TestLogging.java Tue Mar 12 09:49:10 2019 +0000
+++ b/test/jdk/com/sun/net/httpserver/TestLogging.java Sat Mar 16 21:00:45 2019 +0000
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2006, 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
@@ -79,7 +79,7 @@
System.out.println ("caught expected exception");
}
- Socket s = new Socket ("127.0.0.1", p1);
+ Socket s = new Socket (InetAddress.getLoopbackAddress(), p1);
OutputStream os = s.getOutputStream();
//os.write ("GET xxx HTTP/1.1\r\n".getBytes());
os.write ("HELLO WORLD\r\n".getBytes());
--- a/test/jdk/com/sun/net/httpserver/bugs/6725892/Test.java Tue Mar 12 09:49:10 2019 +0000
+++ b/test/jdk/com/sun/net/httpserver/bugs/6725892/Test.java Sat Mar 16 21:00:45 2019 +0000
@@ -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
@@ -96,7 +96,7 @@
static void test1() throws IOException {
failed = false;
- Socket s = new Socket ("127.0.0.1", port);
+ Socket s = new Socket (InetAddress.getLoopbackAddress(), port);
InputStream is = s.getInputStream();
// server should close connection after 2 seconds. We wait up to 10
s.setSoTimeout (10000);
--- a/test/jdk/com/sun/net/httpserver/bugs/B6361557.java Tue Mar 12 09:49:10 2019 +0000
+++ b/test/jdk/com/sun/net/httpserver/bugs/B6361557.java Sat Mar 16 21:00:45 2019 +0000
@@ -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
@@ -78,7 +78,7 @@
server.start ();
InetSocketAddress destaddr = new InetSocketAddress (
- "127.0.0.1", server.getAddress().getPort()
+ InetAddress.getLoopbackAddress(), server.getAddress().getPort()
);
System.out.println ("destaddr " + destaddr);
--- a/test/jdk/com/sun/net/httpserver/bugs/TruncatedRequestBody.java Tue Mar 12 09:49:10 2019 +0000
+++ b/test/jdk/com/sun/net/httpserver/bugs/TruncatedRequestBody.java Sat Mar 16 21:00:45 2019 +0000
@@ -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
@@ -34,6 +34,7 @@
import java.io.IOException;
import java.io.InputStream;
import java.io.OutputStream;
+import java.net.InetAddress;
import java.net.InetSocketAddress;
import java.net.Socket;
import java.nio.charset.StandardCharsets;
@@ -100,7 +101,7 @@
// Test 1: fixed length
- Socket sock = new Socket("127.0.0.1", port);
+ Socket sock = new Socket(InetAddress.getLoopbackAddress(), port);
String s1 = "POST /foo HTTP/1.1\r\nContent-length: 200000\r\n"
+ "\r\nfoo bar99";
@@ -114,7 +115,7 @@
String s2 = "POST /foo HTTP/1.1\r\nTransfer-encoding: chunked\r\n\r\n" +
"100\r\nFoo bar";
- sock = new Socket("127.0.0.1", port);
+ sock = new Socket(InetAddress.getLoopbackAddress(), port);
os = sock.getOutputStream();
os.write(s2.getBytes(StandardCharsets.ISO_8859_1));
Thread.sleep(500);
--- a/test/jdk/com/sun/nio/sctp/SctpMultiChannel/SendFailed.java Tue Mar 12 09:49:10 2019 +0000
+++ b/test/jdk/com/sun/nio/sctp/SctpMultiChannel/SendFailed.java Sat Mar 16 21:00:45 2019 +0000
@@ -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
@@ -28,6 +28,7 @@
import com.sun.nio.sctp.*;
import java.io.IOException;
+import java.net.InetAddress;
import java.net.InetSocketAddress;
import java.net.SocketAddress;
import java.nio.ByteBuffer;
@@ -36,7 +37,7 @@
public class SendFailed {
- static final SocketAddress remoteAddress = new InetSocketAddress("127.0.0.1", 3000);
+ static final SocketAddress remoteAddress = new InetSocketAddress(InetAddress.getLoopbackAddress(), 3000);
static final int[] bufferSizes =
{ 20, 49, 50, 51, 100, 101, 1024, 1025, 4095, 4096, 4097, 8191, 8192, 8193};
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/test/jdk/java/lang/ThreadGroup/Destroy.java Sat Mar 16 21:00:45 2019 +0000
@@ -0,0 +1,115 @@
+/*
+ * 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.
+ */
+
+/**
+ * @test
+ * @summary enumerate(list,n,recurse) may return 0 if the group is being destroyed,
+ * whereas it should never return a value < n. This lead to inconsistent
+ * results if ThreadGroup::enumerate is called concurrently at the same
+ * time that a child group is being destroyed. This is a race condition,
+ * and this test will not always fail without the fix, but it does fail
+ * often enough.
+ * @bug 8219197
+ *
+ */
+import java.util.concurrent.CountDownLatch;
+import java.util.concurrent.Semaphore;
+import java.util.concurrent.atomic.AtomicInteger;
+
+public class Destroy {
+
+ static final class Task implements Runnable {
+ final Semaphore sem;
+ final CountDownLatch count;
+
+ public Task(Semaphore sem, CountDownLatch count) {
+ this.sem = sem;
+ this.count = count;
+ }
+
+ @Override
+ public void run() {
+ try {
+ count.countDown();
+ sem.acquire();
+ } catch (Throwable t) {
+ t.printStackTrace();
+ } finally {
+ System.out.println(Thread.currentThread().getName()
+ + " exiting");
+ }
+ }
+ }
+
+ public static void main(String[] args) throws Exception {
+ testDestroyChild();
+ }
+
+ public static void testDestroyChild() throws Exception {
+ ThreadGroup root = new ThreadGroup("root");
+ ThreadGroup parent = new ThreadGroup(root,"parent");
+ ThreadGroup child1 = new ThreadGroup(parent, "child1");
+ CountDownLatch count = new CountDownLatch(2);
+ Semaphore sem1 = new Semaphore(1);
+ Semaphore sem2 = new Semaphore(1);
+ Thread t1 = new Thread(parent, new Task(sem1, count), "PT1");
+ Thread t2 = new Thread(parent, new Task(sem2, count), "PT2");
+ sem1.acquire();
+ sem2.acquire();
+ try {
+
+ t1.start();
+ t2.start();
+
+ System.out.println("\nAwaiting parent threads...");
+ count.await();
+ Thread[] threads = new Thread[2];
+ int nb = root.enumerate(threads, true);
+ if (nb != 2) {
+ throw new AssertionError("wrong number of threads: " + nb);
+ }
+
+ Thread t3 = new Thread(child1::destroy, "destroy");
+ AtomicInteger nbr = new AtomicInteger();
+ Thread t4 = new Thread("enumerate") {
+ public void run() {
+ Thread[] threads = new Thread[42];
+ nbr.addAndGet(root.enumerate(threads, true));
+ }
+ };
+ t4.start();
+ t3.start();
+ t4.join();
+ t3.join();
+ if (nbr.get() != nb) {
+ throw new AssertionError("wrong number of threads: " + nbr.get());
+ }
+
+ } finally {
+ sem1.release();
+ sem2.release();
+ }
+ t1.join();
+ t2.join();
+ }
+}
--- a/test/jdk/java/net/Authenticator/B6870935.java Tue Mar 12 09:49:10 2019 +0000
+++ b/test/jdk/java/net/Authenticator/B6870935.java Sat Mar 16 21:00:45 2019 +0000
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2001, 2009, 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
@@ -240,7 +240,7 @@
try {
Authenticator.setDefault (new MyAuthenticator ());
- SocketAddress addr = new InetSocketAddress ("127.0.0.1", port);
+ SocketAddress addr = new InetSocketAddress (InetAddress.getLoopbackAddress(), port);
Proxy proxy = new Proxy (Proxy.Type.HTTP, addr);
String s = "http://www.ibm.com";
URL url = new URL(s);
--- a/test/jdk/java/net/DatagramSocket/SendDatagramToBadAddress.java Tue Mar 12 09:49:10 2019 +0000
+++ b/test/jdk/java/net/DatagramSocket/SendDatagramToBadAddress.java Sat Mar 16 21:00:45 2019 +0000
@@ -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
@@ -114,8 +114,7 @@
if (OSsupportsFeature()) {
print ("running on OS that supports ICMP port unreachable");
}
- String host = "127.0.0.1";
- InetAddress addr = InetAddress.getByName(host);
+ InetAddress addr = InetAddress.getLoopbackAddress();
DatagramSocket sock = new DatagramSocket();
DatagramSocket serversock = new DatagramSocket(0);
DatagramPacket p;
--- a/test/jdk/java/net/HttpURLConnection/SetAuthenticator/HTTPTestServer.java Tue Mar 12 09:49:10 2019 +0000
+++ b/test/jdk/java/net/HttpURLConnection/SetAuthenticator/HTTPTestServer.java Sat Mar 16 21:00:45 2019 +0000
@@ -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
@@ -208,7 +208,8 @@
@Override
protected ServerSocket createBindable() throws IOException {
- return new ServerSocket(0, 0, InetAddress.getByName("127.0.0.1"));
+ InetAddress address = InetAddress.getLoopbackAddress();
+ return new ServerSocket(0, 0, address);
}
@Override
@@ -230,7 +231,8 @@
@Override
protected S createBindable() throws IOException {
S server = newHttpServer();
- server.bind(new InetSocketAddress("127.0.0.1", 0), 0);
+ InetAddress address = InetAddress.getLoopbackAddress();
+ server.bind(new InetSocketAddress(address, 0), 0);
return server;
}
--- a/test/jdk/java/net/Socket/UrgentDataTest.java Tue Mar 12 09:49:10 2019 +0000
+++ b/test/jdk/java/net/Socket/UrgentDataTest.java Sat Mar 16 21:00:45 2019 +0000
@@ -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
@@ -57,7 +57,7 @@
test.listener = new ServerSocket (0);
test.isClient = true;
test.isServer = true;
- test.clHost = "127.0.0.1";
+ test.clHost = InetAddress.getLoopbackAddress().getHostAddress();
test.clPort = test.listener.getLocalPort();
test.run();
} else if (args[0].equals ("-server")) {
--- a/test/jdk/java/net/SocketImpl/SocketImplCombinations.java Tue Mar 12 09:49:10 2019 +0000
+++ b/test/jdk/java/net/SocketImpl/SocketImplCombinations.java Sat Mar 16 21:00:45 2019 +0000
@@ -23,6 +23,7 @@
/*
* @test
+ * @bug 8220493
* @modules java.base/java.net:+open java.base/sun.nio.ch:+open
* @run testng/othervm SocketImplCombinations
* @run testng/othervm -Djdk.net.usePlainSocketImpl SocketImplCombinations
--- a/test/jdk/java/net/SocketOption/OptionsTest.java Tue Mar 12 09:49:10 2019 +0000
+++ b/test/jdk/java/net/SocketOption/OptionsTest.java Sat Mar 16 21:00:45 2019 +0000
@@ -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
@@ -100,7 +100,7 @@
static void doSocketTests() throws Exception {
try (
ServerSocket srv = new ServerSocket(0);
- Socket c = new Socket("127.0.0.1", srv.getLocalPort());
+ Socket c = new Socket(InetAddress.getLoopbackAddress(), srv.getLocalPort());
Socket s = srv.accept();
) {
Set<SocketOption<?>> options = c.supportedOptions();
--- a/test/jdk/java/net/SocketOption/TcpKeepAliveTest.java Tue Mar 12 09:49:10 2019 +0000
+++ b/test/jdk/java/net/SocketOption/TcpKeepAliveTest.java Sat Mar 16 21:00:45 2019 +0000
@@ -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
@@ -30,6 +30,7 @@
*/
import java.io.IOException;
import java.net.DatagramSocket;
+import java.net.InetAddress;
import java.net.MulticastSocket;
import java.net.ServerSocket;
import java.net.Socket;
@@ -37,7 +38,6 @@
public class TcpKeepAliveTest {
- private static final String LOCAL_HOST = "127.0.0.1";
private static final int DEFAULT_KEEP_ALIVE_PROBES = 7;
private static final int DEFAULT_KEEP_ALIVE_TIME = 1973;
private static final int DEFAULT_KEEP_ALIVE_INTVL = 53;
@@ -45,7 +45,7 @@
public static void main(String args[]) throws IOException {
try (ServerSocket ss = new ServerSocket(0);
- Socket s = new Socket(LOCAL_HOST, ss.getLocalPort());
+ Socket s = new Socket(InetAddress.getLoopbackAddress(), ss.getLocalPort());
DatagramSocket ds = new DatagramSocket(0);
MulticastSocket mc = new MulticastSocket(0)) {
if (ss.supportedOptions().contains(ExtendedSocketOptions.TCP_KEEPIDLE)) {
--- a/test/jdk/java/net/httpclient/UnknownBodyLengthTest.java Tue Mar 12 09:49:10 2019 +0000
+++ b/test/jdk/java/net/httpclient/UnknownBodyLengthTest.java Sat Mar 16 21:00:45 2019 +0000
@@ -22,6 +22,7 @@
*/
import java.io.InputStream;
import java.io.OutputStream;
+import java.net.InetAddress;
import java.net.InetSocketAddress;
import java.net.ServerSocket;
import java.net.Socket;
@@ -72,7 +73,7 @@
: ServerSocketFactory.getDefault();
ss = factory.createServerSocket();
ss.setReuseAddress(true);
- ss.bind(new InetSocketAddress("127.0.0.1", 0));
+ ss.bind(new InetSocketAddress(InetAddress.getLoopbackAddress(), 0));
System.out.println("ServerSocket = " + ss.getClass() + " " + ss);
port = ss.getLocalPort();
clientURL = (useSSL ? "https" : "http") + "://localhost:"
--- a/test/jdk/java/nio/channels/AsyncCloseAndInterrupt.java Tue Mar 12 09:49:10 2019 +0000
+++ b/test/jdk/java/nio/channels/AsyncCloseAndInterrupt.java Sat Mar 16 21:00:45 2019 +0000
@@ -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
@@ -182,7 +182,7 @@
= new ChannelFactory("DatagramChannel") {
InterruptibleChannel create() throws IOException {
DatagramChannel dc = DatagramChannel.open();
- InetAddress lb = InetAddress.getByName("127.0.0.1");
+ InetAddress lb = InetAddress.getLoopbackAddress();
dc.bind(new InetSocketAddress(lb, 0));
dc.connect(new InetSocketAddress(lb, 80));
return dc;
--- a/test/jdk/java/nio/channels/AsynchronousChannelGroup/bootlib/Attack.java Tue Mar 12 09:49:10 2019 +0000
+++ b/test/jdk/java/nio/channels/AsynchronousChannelGroup/bootlib/Attack.java Sat Mar 16 21:00:45 2019 +0000
@@ -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,6 +22,7 @@
*/
import java.io.IOException;
+import java.net.InetAddress;
import java.net.Socket;
import java.util.concurrent.CountDownLatch;
@@ -42,7 +43,7 @@
@Override
public void run() {
try {
- new Socket("127.0.0.1", 9999).close();
+ new Socket(InetAddress.getLoopbackAddress(), 9999).close();
throw new RuntimeException("Connected (not expected)");
} catch (IOException e) {
throw new RuntimeException("IOException (not expected)");
--- a/test/jdk/java/nio/channels/Selector/LotsOfCancels.java Tue Mar 12 09:49:10 2019 +0000
+++ b/test/jdk/java/nio/channels/Selector/LotsOfCancels.java Sat Mar 16 21:00:45 2019 +0000
@@ -1,5 +1,5 @@
/*
- * Copyright 2009 Google Inc. All Rights Reserved.
+ * Copyright 2009, 2019, Google 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
@@ -21,6 +21,7 @@
* questions.
*/
+import java.net.InetAddress;
import java.net.InetSocketAddress;
import java.net.SocketAddress;
import java.nio.channels.SelectionKey;
@@ -87,7 +88,7 @@
throws Exception {
testStartTime = System.nanoTime();
- InetSocketAddress address = new InetSocketAddress("127.0.0.1", 7359);
+ InetSocketAddress address = new InetSocketAddress(InetAddress.getLoopbackAddress(), 7359);
// Create server channel, add it to selector and run epoll_ctl.
log("Setting up server");
--- a/test/jdk/java/nio/channels/SocketChannel/AsyncCloseChannel.java Tue Mar 12 09:49:10 2019 +0000
+++ b/test/jdk/java/nio/channels/SocketChannel/AsyncCloseChannel.java Sat Mar 16 21:00:45 2019 +0000
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2006, 2018, 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
@@ -27,6 +27,7 @@
*/
import java.io.IOException;
+import java.net.InetAddress;
import java.net.InetSocketAddress;
import java.net.ServerSocket;
import java.net.Socket;
@@ -39,7 +40,6 @@
static volatile boolean keepGoing = true;
static int maxAcceptCount = 100;
static volatile int acceptCount = 0;
- static String host = "127.0.0.1";
static int sensorPort;
static int targetPort;
@@ -149,7 +149,7 @@
}
wake = false;
}
- s.connect(new InetSocketAddress(host, sensorPort));
+ s.connect(new InetSocketAddress(InetAddress.getLoopbackAddress(), sensorPort));
try {
Thread.sleep(10);
} catch (InterruptedException ex) { }
@@ -183,7 +183,7 @@
while(keepGoing) {
try {
final SocketChannel s = SocketChannel.open(
- new InetSocketAddress(host, targetPort));
+ new InetSocketAddress(InetAddress.getLoopbackAddress(), targetPort));
s.finishConnect();
s.socket().setSoLinger(false, 0);
ready = false;
--- a/test/jdk/java/nio/channels/SocketChannel/CloseRegisteredChannel.java Tue Mar 12 09:49:10 2019 +0000
+++ b/test/jdk/java/nio/channels/SocketChannel/CloseRegisteredChannel.java Sat Mar 16 21:00:45 2019 +0000
@@ -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
@@ -41,7 +41,7 @@
//System.out.println ("listening on port " + port);
SocketChannel client = SocketChannel.open ();
- client.connect (new InetSocketAddress ("127.0.0.1", port));
+ client.connect (new InetSocketAddress (InetAddress.getLoopbackAddress(), port));
SocketChannel slave = server.accept ();
slave.configureBlocking (true);
--- a/test/jdk/java/nio/channels/SocketChannel/CloseTimeoutChannel.java Tue Mar 12 09:49:10 2019 +0000
+++ b/test/jdk/java/nio/channels/SocketChannel/CloseTimeoutChannel.java Sat Mar 16 21:00:45 2019 +0000
@@ -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
@@ -51,7 +51,7 @@
try {
System.out.println("Establishing connection");
Socket socket=SocketChannel.open(
- new InetSocketAddress("127.0.0.1", port)).socket();
+ new InetSocketAddress(InetAddress.getLoopbackAddress(), port)).socket();
OutputStream out=socket.getOutputStream();
InputStream in=socket.getInputStream();
--- a/test/jdk/java/nio/channels/SocketChannel/SocketInheritance.java Tue Mar 12 09:49:10 2019 +0000
+++ b/test/jdk/java/nio/channels/SocketChannel/SocketInheritance.java Sat Mar 16 21:00:45 2019 +0000
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2007, 2010, 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
@@ -65,7 +65,7 @@
// connect to the given port
static SocketChannel connect(int port) throws IOException {
- InetAddress lh = InetAddress.getByName("127.0.0.1");
+ InetAddress lh = InetAddress.getLoopbackAddress();
InetSocketAddress isa = new InetSocketAddress(lh, port);
return SocketChannel.open(isa);
}
--- a/test/jdk/java/nio/channels/etc/AdaptorCloseAndInterrupt.java Tue Mar 12 09:49:10 2019 +0000
+++ b/test/jdk/java/nio/channels/etc/AdaptorCloseAndInterrupt.java Sat Mar 16 21:00:45 2019 +0000
@@ -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
@@ -93,7 +93,7 @@
void scReadAsyncClose() throws IOException {
try {
SocketChannel sc = SocketChannel.open(new InetSocketAddress(
- "127.0.0.1", port));
+ InetAddress.getLoopbackAddress(), port));
sc.socket().setSoTimeout(30*1000);
doAsyncClose(sc);
@@ -115,7 +115,7 @@
void scReadAsyncInterrupt() throws IOException {
try {
final SocketChannel sc = SocketChannel.open(new InetSocketAddress(
- "127.0.0.1", port));
+ InetAddress.getLoopbackAddress(), port));
sc.socket().setSoTimeout(30*1000);
doAsyncInterrupt();
@@ -141,7 +141,7 @@
void dcReceiveAsyncClose() throws IOException {
DatagramChannel dc = DatagramChannel.open();
dc.connect(new InetSocketAddress(
- "127.0.0.1", port));
+ InetAddress.getLoopbackAddress(), port));
dc.socket().setSoTimeout(30*1000);
doAsyncClose(dc);
@@ -159,7 +159,7 @@
void dcReceiveAsyncInterrupt() throws IOException {
DatagramChannel dc = DatagramChannel.open();
dc.connect(new InetSocketAddress(
- "127.0.0.1", port));
+ InetAddress.getLoopbackAddress(), port));
dc.socket().setSoTimeout(30*1000);
doAsyncInterrupt();
--- a/test/jdk/java/nio/channels/etc/Shadow.java Tue Mar 12 09:49:10 2019 +0000
+++ b/test/jdk/java/nio/channels/etc/Shadow.java Sat Mar 16 21:00:45 2019 +0000
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2001, 2010, 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
@@ -107,7 +107,7 @@
// connect client socket to port
SocketAddress connectAddr =
- new InetSocketAddress("127.0.0.1",
+ new InetSocketAddress(InetAddress.getLoopbackAddress(),
serverSocket.getLocalPort());
socket.connect(connectAddr);
log.println("connected Socket: " + socket);
--- a/test/jdk/java/nio/charset/coders/StreamTimeout.java Tue Mar 12 09:49:10 2019 +0000
+++ b/test/jdk/java/nio/charset/coders/StreamTimeout.java Sat Mar 16 21:00:45 2019 +0000
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2010, 2012, 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
@@ -36,6 +36,7 @@
import java.io.PrintStream;
import java.io.Reader;
import java.io.Writer;
+import java.net.InetAddress;
import java.net.ServerSocket;
import java.net.Socket;
@@ -47,7 +48,7 @@
private final Socket so;
Client(int port) throws IOException {
- so = new Socket("127.0.0.1", port);
+ so = new Socket(InetAddress.getLoopbackAddress(), port);
}
@Override
--- a/test/jdk/java/rmi/transport/readTimeout/ReadTimeoutTest.java Tue Mar 12 09:49:10 2019 +0000
+++ b/test/jdk/java/rmi/transport/readTimeout/ReadTimeoutTest.java Sat Mar 16 21:00:45 2019 +0000
@@ -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
@@ -82,9 +82,9 @@
// Now, connect to that port
//Thread.sleep(2000);
- System.err.println("(connecting to listening port on 127.0.0.1:" +
+ System.err.println("(connecting to listening port on localhost:" +
port + ")");
- DoS = new Socket("127.0.0.1", port);
+ DoS = new Socket(InetAddress.getLoopbackAddress(), port);
InputStream stream = DoS.getInputStream();
// Read on the socket in the background
--- a/test/jdk/java/text/Format/CompactNumberFormat/TestCompactNumber.java Tue Mar 12 09:49:10 2019 +0000
+++ b/test/jdk/java/text/Format/CompactNumberFormat/TestCompactNumber.java Sat Mar 16 21:00:45 2019 +0000
@@ -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,7 +22,7 @@
*/
/*
* @test
- * @bug 8177552
+ * @bug 8177552 8217721
* @summary Checks the functioning of compact number format
* @modules jdk.localedata
* @run testng/othervm TestCompactNumber
@@ -528,6 +528,11 @@
.getCompactNumberInstance(l, NumberFormat.Style.LONG).format(10000));
}
+ @Test(expectedExceptions = IllegalArgumentException.class)
+ public void testFormatWithNullParam() {
+ FORMAT_EN_US_SHORT.format(null);
+ }
+
@Test(dataProvider = "format")
public void testFormat(NumberFormat cnf, Object number,
String expected) {
--- a/test/jdk/java/text/Format/CompactNumberFormat/TestCompactPatternsValidity.java Tue Mar 12 09:49:10 2019 +0000
+++ b/test/jdk/java/text/Format/CompactNumberFormat/TestCompactPatternsValidity.java Sat Mar 16 21:00:45 2019 +0000
@@ -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,7 +22,7 @@
*/
/*
* @test
- * @bug 8177552
+ * @bug 8177552 8217254
* @summary Checks the validity of compact number patterns specified through
* CompactNumberFormat constructor
* @run testng/othervm TestCompactPatternsValidity
@@ -80,7 +80,9 @@
// A non empty pattern containing no 0s (min integer digits)
{new String[]{"K", "0K", "00K"}},
// 0s (min integer digits) exceeding for the range at index 3
- {new String[]{"", "", "0K", "00000K"}},};
+ {new String[]{"", "", "0K", "00000K"}},
+ // null as a compact pattern
+ {new String[]{"", "", null, "00K"}},};
}
@DataProvider(name = "validPatternsFormat")
@@ -124,7 +126,7 @@
}
@Test(dataProvider = "invalidPatterns",
- expectedExceptions = RuntimeException.class)
+ expectedExceptions = IllegalArgumentException.class)
public void testInvalidCompactPatterns(String[] compactPatterns) {
new CompactNumberFormat("#,##0.0#", DecimalFormatSymbols
.getInstance(Locale.US), compactPatterns);
--- a/test/jdk/java/util/Locale/LocaleProviders.java Tue Mar 12 09:49:10 2019 +0000
+++ b/test/jdk/java/util/Locale/LocaleProviders.java Sat Mar 16 21:00:45 2019 +0000
@@ -72,6 +72,10 @@
bug8027289Test(args[1]);
break;
+ case "bug8220227Test":
+ bug8220227Test();
+ break;
+
default:
throw new RuntimeException("Test method '"+methodName+"' not found.");
}
@@ -249,4 +253,15 @@
}
}
}
+
+ static void bug8220227Test() {
+ if (System.getProperty("os.name").startsWith("Windows")) {
+ Locale l = new Locale("xx","XX");
+ String country = l.getDisplayCountry();
+ if (country.endsWith("(XX)")) {
+ throw new RuntimeException(
+ "Unexpected Region name: " + country);
+ }
+ }
+ }
}
--- a/test/jdk/java/util/Locale/LocaleProvidersRun.java Tue Mar 12 09:49:10 2019 +0000
+++ b/test/jdk/java/util/Locale/LocaleProvidersRun.java Sat Mar 16 21:00:45 2019 +0000
@@ -25,7 +25,7 @@
* @test
* @bug 6336885 7196799 7197573 7198834 8000245 8000615 8001440 8008577
* 8010666 8013086 8013233 8013903 8015960 8028771 8054482 8062006
- * 8150432 8215913
+ * 8150432 8215913 8220227
* @summary tests for "java.locale.providers" system property
* @library /test/lib
* @build LocaleProviders
@@ -148,6 +148,12 @@
testRun("COMPAT,HOST", "bug8027289Test", "FFE5", "", "");
testRun("HOST", "bug8027289Test", "00A5", "", "");
}
+
+ //testing 8220227 fix. (Windows only)
+ if (!defLang.equals("en")) {
+ testRun("HOST", "bug8220227Test", "", "", "");
+ }
+
}
private static void testRun(String prefList, String methodName,
--- a/test/jdk/java/util/logging/TestLoggerWeakRefLeak.java Tue Mar 12 09:49:10 2019 +0000
+++ b/test/jdk/java/util/logging/TestLoggerWeakRefLeak.java Sat Mar 16 21:00:45 2019 +0000
@@ -123,7 +123,7 @@
}
/**
- * 'vm.heapHisto("", "-live")' will request a full GC
+ * 'vm.heapHisto("-live")' will request a full GC
*/
private static int getInstanceCountFromHeapHisto() throws AttachNotSupportedException, Exception {
int instanceCount = 0;
@@ -131,7 +131,7 @@
HotSpotVirtualMachine vm = (HotSpotVirtualMachine) VirtualMachine
.attach(Long.toString(ProcessTools.getProcessId()));
try {
- try (InputStream heapHistoStream = vm.heapHisto("", "-live");
+ try (InputStream heapHistoStream = vm.heapHisto("-live");
BufferedReader in = new BufferedReader(new InputStreamReader(heapHistoStream))) {
String inputLine;
while ((inputLine = in.readLine()) != null) {
--- a/test/jdk/jdk/jfr/event/io/TestInstrumentation.java Tue Mar 12 09:49:10 2019 +0000
+++ b/test/jdk/jdk/jfr/event/io/TestInstrumentation.java Sat Mar 16 21:00:45 2019 +0000
@@ -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
--- a/test/jdk/jdk/jfr/tool/TestPrint.java Tue Mar 12 09:49:10 2019 +0000
+++ b/test/jdk/jdk/jfr/tool/TestPrint.java Sat Mar 16 21:00:45 2019 +0000
@@ -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
@@ -48,7 +48,7 @@
output.shouldContain("missing file");
output = ExecuteHelper.jfr("print", "missing.jfr");
- output.shouldContain("could not find file ");
+ output.shouldContain("could not open file ");
Path file = Utils.createTempFile("faked-print-file", ".jfr");
FileWriter fw = new FileWriter(file.toFile());
--- a/test/jdk/jdk/modules/scenarios/overlappingpackages/OverlappingPackagesTest.java Tue Mar 12 09:49:10 2019 +0000
+++ b/test/jdk/jdk/modules/scenarios/overlappingpackages/OverlappingPackagesTest.java Sat Mar 16 21:00:45 2019 +0000
@@ -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
@@ -37,12 +37,13 @@
import java.util.Arrays;
import java.util.List;
-import jdk.test.lib.compiler.CompilerUtils;
-import static jdk.test.lib.process.ProcessTools.*;
-
import org.testng.annotations.BeforeTest;
import org.testng.annotations.Test;
-import static org.testng.Assert.*;
+
+import jdk.test.lib.compiler.CompilerUtils;
+
+import static jdk.test.lib.process.ProcessTools.executeTestJava;
+import static org.testng.Assert.assertTrue;
@Test
public class OverlappingPackagesTest {
@@ -93,7 +94,7 @@
public void testOverlapWithBaseModule() throws Exception {
int exitValue
= executeTestJava("--module-path", MODS_DIR.toString(),
- "-add-modules", "misc",
+ "--add-modules", "misc",
"-m", "test/test.Main")
.outputTo(System.out)
.errorTo(System.err)
--- a/test/jdk/jdk/net/Sockets/QuickAckTest.java Tue Mar 12 09:49:10 2019 +0000
+++ b/test/jdk/jdk/net/Sockets/QuickAckTest.java Sat Mar 16 21:00:45 2019 +0000
@@ -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
@@ -30,6 +30,7 @@
*/
import java.io.IOException;
import java.net.DatagramSocket;
+import java.net.InetAddress;
import java.net.MulticastSocket;
import java.net.ServerSocket;
import java.net.Socket;
@@ -38,12 +39,10 @@
public class QuickAckTest {
- private static final String LOCAL_HOST = "127.0.0.1";
-
public static void main(String args[]) throws IOException {
try (ServerSocket ss = new ServerSocket(0);
- Socket s = new Socket(LOCAL_HOST, ss.getLocalPort());
+ Socket s = new Socket(InetAddress.getLoopbackAddress(), ss.getLocalPort());
DatagramSocket ds = new DatagramSocket(0);
MulticastSocket mc = new MulticastSocket(0)) {
--- a/test/jdk/jdk/net/Sockets/Test.java Tue Mar 12 09:49:10 2019 +0000
+++ b/test/jdk/jdk/net/Sockets/Test.java Sat Mar 16 21:00:45 2019 +0000
@@ -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
@@ -79,14 +79,14 @@
DatagramSocket dg = new DatagramSocket(0)) {
int tcp_port = ss.getLocalPort();
- final InetAddress loop = InetAddress.getByName("127.0.0.1");
+ final InetAddress loop = InetAddress.getLoopbackAddress();
final InetSocketAddress loopad = new InetSocketAddress(loop, tcp_port);
final int udp_port = dg.getLocalPort();
- final Socket s = new Socket("127.0.0.1", tcp_port);
+ final Socket s = new Socket(loop, tcp_port);
final SocketChannel sc = SocketChannel.open();
- sc.connect(new InetSocketAddress("127.0.0.1", tcp_port));
+ sc.connect(new InetSocketAddress(loop, tcp_port));
doTest("Sockets.setOption Socket", () -> {
out.println(flowIn);
--- a/test/jdk/sun/management/jmxremote/bootstrap/JMXAgentInterfaceBinding.java Tue Mar 12 09:49:10 2019 +0000
+++ b/test/jdk/sun/management/jmxremote/bootstrap/JMXAgentInterfaceBinding.java Sat Mar 16 21:00:45 2019 +0000
@@ -28,10 +28,13 @@
import java.net.Socket;
import java.net.SocketAddress;
import java.net.UnknownHostException;
+import java.nio.charset.StandardCharsets;
import java.util.HashMap;
import java.util.Map;
import java.util.concurrent.CountDownLatch;
import java.util.concurrent.TimeUnit;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
import javax.management.remote.JMXConnector;
import javax.management.remote.JMXConnectorFactory;
@@ -135,9 +138,9 @@
private final int rmiPort;
private final boolean useSSL;
private final CountDownLatch latch;
- private boolean failed;
- private boolean jmxConnectWorked;
- private boolean rmiConnectWorked;
+ private volatile boolean failed;
+ private volatile boolean jmxConnectWorked;
+ private volatile boolean rmiConnectWorked;
private JMXConnectorThread(String addr,
int jmxPort,
@@ -156,6 +159,7 @@
try {
connect();
} catch (IOException e) {
+ e.printStackTrace();
failed = true;
}
}
@@ -223,14 +227,16 @@
private static class MainThread extends Thread {
- private static final int WAIT_FOR_JMX_AGENT_TIMEOUT_MS = 500;
+ private static final String EXP_TERM_MSG_REG = "Exit: ([0-9]+)";
+ private static final Pattern EXIT_PATTERN = Pattern.compile(EXP_TERM_MSG_REG);
+ private static final String COOP_EXIT = "MainThread: Cooperative Exit";
+ private static final int WAIT_FOR_JMX_AGENT_TIMEOUT_MS = 20_000;
private final String addr;
private final int jmxPort;
private final int rmiPort;
private final boolean useSSL;
- private boolean terminated = false;
private boolean jmxAgentStarted = false;
- private Exception excptn;
+ private volatile Exception excptn;
private MainThread(InetAddress bindAddress, int jmxPort, int rmiPort, boolean useSSL) {
this.addr = wrapAddress(bindAddress.getHostAddress());
@@ -243,14 +249,16 @@
public void run() {
try {
waitUntilReadyForConnections();
- // Do nothing, but wait for termination.
- try {
- while (!terminated) {
- Thread.sleep(100);
- }
- } catch (InterruptedException e) { // ignore
+
+ // Wait for termination message
+ String actualTerm = new String(System.in.readAllBytes(), StandardCharsets.UTF_8).trim();
+ System.err.println("DEBUG: MainThread: actualTerm: '" + actualTerm + "'");
+ Matcher matcher = EXIT_PATTERN.matcher(actualTerm);
+ if (matcher.matches()) {
+ int expExitCode = Integer.parseInt(matcher.group(1));
+ System.out.println(COOP_EXIT);
+ System.exit(expExitCode); // The main test expects this exit value
}
- System.out.println("MainThread: Thread stopped.");
} catch (Exception e) {
this.excptn = e;
}
--- a/test/jdk/sun/management/jmxremote/bootstrap/JMXInterfaceBindingTest.java Tue Mar 12 09:49:10 2019 +0000
+++ b/test/jdk/sun/management/jmxremote/bootstrap/JMXInterfaceBindingTest.java Sat Mar 16 21:00:45 2019 +0000
@@ -24,6 +24,7 @@
import java.io.File;
import java.net.InetAddress;
import java.net.NetworkInterface;
+import java.net.UnknownHostException;
import java.net.SocketException;
import java.util.ArrayList;
import java.util.List;
@@ -33,33 +34,32 @@
import jdk.test.lib.process.ProcessTools;
/**
- * NOTE:
- * This test requires at least a setup similar to the following in
- * /etc/hosts file (or the windows equivalent). I.e. it expects it to
- * be multi-homed and not both being the loop-back interface.
- * For example:
- * ----->8-------- /etc/hosts ----------->8---
- * 127.0.0.1 localhost
- * 192.168.0.1 localhost
- * ----->8-------- /etc/hosts ----------->8---
- *
* @test
* @bug 6425769
* @summary Test JMX agent host address binding. Same ports but different
- * interfaces to bind to (using plain sockets and SSL sockets).
+ * interfaces to bind to (selecting plain or SSL sockets at random
+ * @key intermittent
*
* @library /test/lib
* @modules java.management.rmi
*
* @build JMXAgentInterfaceBinding
- * @run main/timeout=5 JMXInterfaceBindingTest
+ * @run main/timeout=60 JMXInterfaceBindingTest
*/
public class JMXInterfaceBindingTest {
public static final int COMMUNICATION_ERROR_EXIT_VAL = 1;
- public static final int STOP_PROCESS_EXIT_VAL = 143;
- public static final int JMX_PORT = 9111;
- public static final int RMI_PORT = 9112;
+ public static final int STOP_PROCESS_EXIT_VAL = 10;
+ public static final int JMX_PORT_RANGE_LOWER = 9100;
+ public static final int JMX_PORT_RANGE_UPPER = 9200;
+ public static final int JMX_PORT = getRandomPortInRange(JMX_PORT_RANGE_LOWER,
+ JMX_PORT_RANGE_UPPER);
+ public static final int JMX_PORT_RANGE_LOWER_SSL = 9201; // 9200 might be RMI Port
+ public static final int JMX_PORT_RANGE_UPPER_SSL = 9300;
+ public static final int JMX_PORT_SSL = getRandomPortInRange(JMX_PORT_RANGE_LOWER_SSL,
+ JMX_PORT_RANGE_UPPER_SSL);
+ public static final int RMI_PORT = JMX_PORT + 1;
+ public static final int RMI_PORT_SSL = JMX_PORT_SSL + 1;
public static final String READY_MSG = "MainThread: Ready for connections";
public static final String TEST_CLASS = JMXAgentInterfaceBinding.class.getSimpleName();
public static final String KEYSTORE_LOC = System.getProperty("test.src", ".") +
@@ -89,8 +89,8 @@
System.out.println();
String msg = String.format("DEBUG: Launching java tester for triplet (HOSTNAME,JMX_PORT,RMI_PORT) == (%s,%d,%d)",
address,
- JMX_PORT,
- RMI_PORT);
+ useSSL ? JMX_PORT_SSL : JMX_PORT,
+ useSSL ? RMI_PORT_SSL : RMI_PORT);
System.out.println(msg);
ProcessThread jvm = runJMXBindingTest(address, useSSL);
jvms.add(jvm);
@@ -100,9 +100,9 @@
int failedProcesses = 0;
for (ProcessThread pt: jvms) {
try {
- pt.stopProcess();
+ pt.sendMessage("Exit: " + STOP_PROCESS_EXIT_VAL);
pt.join();
- } catch (InterruptedException e) {
+ } catch (Throwable e) {
System.err.println("Failed to stop process: " + pt.getName());
throw new RuntimeException("Test failed", e);
}
@@ -131,10 +131,12 @@
args.add("-classpath");
args.add(TEST_CLASSPATH);
args.add("-Dcom.sun.management.jmxremote.host=" + address);
- args.add("-Dcom.sun.management.jmxremote.port=" + JMX_PORT);
- args.add("-Dcom.sun.management.jmxremote.rmi.port=" + RMI_PORT);
+ args.add("-Dcom.sun.management.jmxremote.port=" + (useSSL ? JMX_PORT_SSL : JMX_PORT));
+ args.add("-Dcom.sun.management.jmxremote.rmi.port=" + (useSSL ? RMI_PORT_SSL : RMI_PORT));
args.add("-Dcom.sun.management.jmxremote.authenticate=false");
args.add("-Dcom.sun.management.jmxremote.ssl=" + Boolean.toString(useSSL));
+ // This is needed for testing on loopback
+ args.add("-Djava.rmi.server.hostname=" + address);
if (useSSL) {
args.add("-Dcom.sun.management.jmxremote.registry.ssl=true");
args.add("-Djavax.net.ssl.keyStore=" + KEYSTORE_LOC);
@@ -144,8 +146,8 @@
}
args.add(TEST_CLASS);
args.add(address);
- args.add(Integer.toString(JMX_PORT));
- args.add(Integer.toString(RMI_PORT));
+ args.add(Integer.toString(useSSL ? JMX_PORT_SSL : JMX_PORT));
+ args.add(Integer.toString(useSSL ? RMI_PORT_SSL : RMI_PORT));
args.add(Boolean.toString(useSSL));
try {
ProcessBuilder builder = ProcessTools.createJavaProcessBuilder(args.toArray(new String[] {}));
@@ -175,35 +177,42 @@
}
}
+ private static int getRandomPortInRange(int lower, int upper) {
+ if (upper <= lower) {
+ throw new IllegalArgumentException("upper <= lower");
+ }
+ int range = upper - lower;
+ int randPort = lower + (int)(Math.random() * range);
+ return randPort;
+ }
+
public static void main(String[] args) {
- List<InetAddress> addrs = getAddressesForLocalHost();
- if (addrs.size() < 2) {
- System.out.println("Ignoring manual test since no more than one IPs are configured for 'localhost'");
+ List<InetAddress> addrs = getNonLoopbackAddressesForLocalHost();
+ if (addrs.isEmpty()) {
+ System.out.println("Ignoring test since no non-loopback IPs are available to bind to " +
+ "in addition to the loopback interface.");
return;
}
JMXInterfaceBindingTest test = new JMXInterfaceBindingTest();
+ // Add loopback interface too as we'd like to verify whether it's
+ // possible to bind to multiple addresses on the same host. This
+ // wasn't possible prior JDK-6425769. It used to bind to *all* local
+ // interfaces. We add loopback here, since that eases test setup.
+ addrs.add(InetAddress.getLoopbackAddress());
test.run(addrs);
System.out.println("All tests PASSED.");
}
- private static List<InetAddress> getAddressesForLocalHost() {
-
+ private static List<InetAddress> getNonLoopbackAddressesForLocalHost() {
+ List<InetAddress> addrs = new ArrayList<>();
try {
- return NetworkInterface.networkInterfaces()
- .flatMap(NetworkInterface::inetAddresses)
- .filter(JMXInterfaceBindingTest::isNonloopbackLocalhost)
- .collect(Collectors.toList());
- } catch (SocketException e) {
+ InetAddress localHost = InetAddress.getLocalHost();
+ if (!localHost.isLoopbackAddress()) {
+ addrs.add(localHost);
+ }
+ return addrs;
+ } catch (UnknownHostException e) {
throw new RuntimeException("Test failed", e);
}
}
-
- // we need 'real' localhost addresses only (eg. not loopback ones)
- // so we can bind the remote JMX connector to them
- private static boolean isNonloopbackLocalhost(InetAddress i) {
- if (!i.isLoopbackAddress()) {
- return i.getHostName().toLowerCase().equals("localhost");
- }
- return false;
- }
}
--- a/test/jdk/sun/net/www/protocol/http/TunnelThroughProxy.java Tue Mar 12 09:49:10 2019 +0000
+++ b/test/jdk/sun/net/www/protocol/http/TunnelThroughProxy.java Sat Mar 16 21:00:45 2019 +0000
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2002, 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
@@ -64,8 +64,9 @@
int serverPort = server.getLocalPort();
Socket sock;
- sock = new Socket(new Proxy(Proxy.Type.HTTP, new InetSocketAddress("127.0.0.1", proxyPort)));
- InetSocketAddress dest = new InetSocketAddress("127.0.0.1", serverPort);
+ sock = new Socket(new Proxy(Proxy.Type.HTTP,
+ new InetSocketAddress(InetAddress.getLoopbackAddress(), proxyPort)));
+ InetSocketAddress dest = new InetSocketAddress(InetAddress.getLoopbackAddress(), serverPort);
sock.connect(dest);
int localPort = sock.getLocalPort();
if (localPort == proxyPort)
--- a/test/jdk/sun/nio/cs/TestIBMBugs.java Tue Mar 12 09:49:10 2019 +0000
+++ b/test/jdk/sun/nio/cs/TestIBMBugs.java Sat Mar 16 21:00:45 2019 +0000
@@ -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,7 +22,7 @@
*/
/* @test
- * @bug 6371437 6371422 6371416 6371619 5058184 6371431 6639450 6569191 6577466 8212794
+ * @bug 6371437 6371422 6371416 6371619 5058184 6371431 6639450 6569191 6577466 8212794 8220281
* @summary Check if the problems reported in above bugs have been fixed
* @modules jdk.charsets
*/
@@ -31,6 +31,8 @@
import java.nio.*;
import java.nio.charset.*;
import java.util.Arrays;
+import java.util.Locale;
+import java.util.HashSet;
public class TestIBMBugs {
@@ -250,6 +252,77 @@
}
}
+ private static void bug8220281 () throws Exception {
+ if (System.getProperty("os.name").contains("AIX")) {
+ /* Following AIX codesets are used for Java default charset. */
+ /* They should be in sun.nio.cs package on AIX platform. */
+ String[] codesets = new String[] {
+ "IBM-950", "BIG5-HKSCS", "GB18030", "IBM-1046",
+ "IBM-1124", "IBM-1129", "IBM-1252", "IBM-856",
+ "IBM-858", "IBM-921", "IBM-922", "IBM-932", "IBM-943C",
+ "IBM-eucCN", "IBM-eucJP", "IBM-eucKR", "IBM-eucTW",
+ "ISO8859-1", "ISO8859-15", "ISO8859-2", "ISO8859-4",
+ "ISO8859-5", "ISO8859-6", "ISO8859-7", "ISO8859-8",
+ "ISO8859-9", "TIS-620", "UTF-8", };
+ String[] charsets = new String[] {
+ "x-IBM950", "Big5-HKSCS", "GB18030", "x-IBM1046",
+ "x-IBM1124", "x-IBM1129", "windows-1252", "x-IBM856",
+ "IBM00858", "x-IBM921", "x-IBM922", "x-IBM942C",
+ "x-IBM943C", "x-IBM1383", "x-IBM29626C", "x-IBM970",
+ "x-IBM964", "ISO-8859-1", "ISO-8859-15", "ISO-8859-2",
+ "ISO-8859-4", "ISO-8859-5", "ISO-8859-6", "ISO-8859-7",
+ "ISO-8859-8", "ISO-8859-9", "TIS-620", "UTF-8", };
+ for(int i = 0; i < codesets.length; i++) {
+ Charset cs0 = Charset.forName(codesets[i]);
+ if (!"sun.nio.cs".equals(cs0.getClass().getPackage().getName())) {
+ throw new Exception(cs0.getClass().getCanonicalName()+" faild");
+ }
+ Charset cs1 = Charset.forName(charsets[i]);
+ if (!cs0.equals(cs1)) {
+ throw new Exception(codesets[i]+"("+cs0.name()+") failed");
+ }
+ }
+ }
+ for(Charset cs : Charset.availableCharsets().values()) {
+ String csName = cs.name().toLowerCase(Locale.ROOT);
+ String suffix = null;
+ HashSet<String> aliases = new HashSet<String>();
+ for(String s : cs.aliases()) {
+ aliases.add(s.toLowerCase(Locale.ROOT));
+ }
+ aliases.add(csName);
+ if (csName.startsWith("x-ibm-")) {
+ suffix = csName.replaceAll("x-ibm-0*", "");
+ } else if (csName.startsWith("x-ibm")) {
+ suffix = csName.replaceAll("x-ibm0*", "");
+ } else if (csName.startsWith("ibm-")) {
+ suffix = csName.replaceAll("ibm-0*", "");
+ } else if (csName.startsWith("ibm")) {
+ suffix = csName.replaceAll("ibm0*", "");
+ }
+ if ("ibm-thai".equals(csName)) {
+ suffix = "838";
+ }
+ if (null != suffix) {
+ while (suffix.length() < 3) {
+ suffix = "0"+suffix;
+ }
+ if (!aliases.contains("cp"+suffix)) {
+ throw new Exception(cs.name()+"\t"+"cp"+suffix);
+ }
+ if (!aliases.contains("ibm"+suffix)) {
+ throw new Exception(cs.name()+"\t"+"ibm"+suffix);
+ }
+ if (!aliases.contains("ibm-"+suffix)) {
+ throw new Exception(cs.name()+"\t"+"ibm-"+suffix);
+ }
+ if (!aliases.contains(suffix)) {
+ throw new Exception(cs.name()+"\t"+suffix);
+ }
+ }
+ }
+ }
+
public static void main (String[] args) throws Exception {
bug6577466();
// need to be tested before any other IBM949C test case
@@ -263,5 +336,6 @@
bug8202329();
bug8212794();
bug8213618();
+ bug8220281();
}
}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/test/jdk/tools/launcher/JniInvocationTest.java Sat Mar 16 21:00:45 2019 +0000
@@ -0,0 +1,56 @@
+/*
+ * 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
+ * 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.
+ *
+ */
+
+/**
+ * @test
+ * @bug 8213362
+ * @comment Test uses custom launcher that starts VM using JNI via libjli, only for MacOS
+ * @requires os.family == "mac"
+ * @library /test/lib
+ * @run main/native JniInvocationTest
+ */
+
+import java.util.Map;
+import jdk.test.lib.Platform;
+import jdk.test.lib.Utils;
+import jdk.test.lib.process.OutputAnalyzer;
+
+import java.io.IOException;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.nio.file.Paths;
+
+public class JniInvocationTest {
+ public static void main(String[] args) throws IOException {
+ Path launcher = Paths.get(System.getProperty("test.nativepath"), "JniInvocationTest");
+ System.out.println("Launcher = " + launcher + (Files.exists(launcher) ? " (exists)" : " (not exists)"));
+ ProcessBuilder pb = new ProcessBuilder(launcher.toString());
+ Map<String, String> env = pb.environment();
+ String libdir = Paths.get(Utils.TEST_JDK).resolve("lib").toAbsolutePath().toString();
+ env.compute(Platform.sharedLibraryPathVariableName(), (k, v) -> (k == null) ? libdir : v + ":" + libdir);
+ OutputAnalyzer outputf = new OutputAnalyzer(pb.start());
+ outputf.shouldHaveExitValue(0);
+ }
+}
+
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/test/jdk/tools/launcher/exeJniInvocationTest.c Sat Mar 16 21:00:45 2019 +0000
@@ -0,0 +1,62 @@
+/*
+ * 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
+ * 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 "jni.h"
+#include "stdio.h"
+#include "stdlib.h"
+
+int main(int argc, char** args) {
+ JavaVMInitArgs vm_args;
+ JNIEnv *env;
+ JavaVM *vm;
+ int i =0;
+ jint result;
+
+ vm_args.version = JNI_VERSION_1_2;
+ vm_args.ignoreUnrecognized = JNI_FALSE;
+
+ JavaVMOption option1[2];
+ option1[0].optionString="-XX:+PrintCommandLineFlags";
+ option1[1].optionString="-Xrs";
+
+ vm_args.options=option1;
+ vm_args.nOptions=2;
+
+ // Print the VM options in use
+ printf("initVM: numOptions = %d\n", vm_args.nOptions);
+ for (i = 0; i < vm_args.nOptions; i++)
+ {
+ printf("\tvm_args.options[%d].optionString = %s\n", i, vm_args.options[i].optionString);
+ }
+
+ // Initialize VM with given options
+ result = JNI_CreateJavaVM( &vm, (void **) &env, &vm_args );
+ if (result != 0) {
+ printf("ERROR: cannot create JAVA VM.\n");
+ exit(-1);
+ }
+
+ (*vm)->DestroyJavaVM(vm);
+}
+
--- a/test/jdk/vm/JniInvocationTest.java Tue Mar 12 09:49:10 2019 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,56 +0,0 @@
-/*
- * 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
- * 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.
- *
- */
-
-/**
- * @test
- * @bug 8213362
- * @comment Test uses custom launcher that starts VM using JNI via libjli, only for MacOS
- * @requires os.family == "mac"
- * @library /test/lib
- * @run main/native JniInvocationTest
- */
-
-import java.util.Map;
-import jdk.test.lib.Platform;
-import jdk.test.lib.Utils;
-import jdk.test.lib.process.OutputAnalyzer;
-
-import java.io.IOException;
-import java.nio.file.Files;
-import java.nio.file.Path;
-import java.nio.file.Paths;
-
-public class JniInvocationTest {
- public static void main(String[] args) throws IOException {
- Path launcher = Paths.get(System.getProperty("test.nativepath"), "JniInvocationTest");
- System.out.println("Launcher = " + launcher + (Files.exists(launcher) ? " (exists)" : " (not exists)"));
- ProcessBuilder pb = new ProcessBuilder(launcher.toString());
- Map<String, String> env = pb.environment();
- String libdir = Paths.get(Utils.TEST_JDK).resolve("lib").toAbsolutePath().toString();
- env.compute(Platform.sharedLibraryPathVariableName(), (k, v) -> (k == null) ? libdir : v + ":" + libdir);
- OutputAnalyzer outputf = new OutputAnalyzer(pb.start());
- outputf.shouldHaveExitValue(0);
- }
-}
-
--- a/test/jdk/vm/exeJniInvocationTest.c Tue Mar 12 09:49:10 2019 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,62 +0,0 @@
-/*
- * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved.
- * 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 "jni.h"
-#include "stdio.h"
-#include "stdlib.h"
-
-int main(int argc, char** args) {
- JavaVMInitArgs vm_args;
- JNIEnv *env;
- JavaVM *vm;
- int i =0;
- jint result;
-
- vm_args.version = JNI_VERSION_1_2;
- vm_args.ignoreUnrecognized = JNI_FALSE;
-
- JavaVMOption option1[2];
- option1[0].optionString="-XX:+PrintCommandLineFlags";
- option1[1].optionString="-Xrs";
-
- vm_args.options=option1;
- vm_args.nOptions=2;
-
- // Print the VM options in use
- printf("initVM: numOptions = %d\n", vm_args.nOptions);
- for (i = 0; i < vm_args.nOptions; i++)
- {
- printf("\tvm_args.options[%d].optionString = %s\n", i, vm_args.options[i].optionString);
- }
-
- // Initialize VM with given options
- result = JNI_CreateJavaVM( &vm, (void **) &env, &vm_args );
- if (result != 0) {
- printf("ERROR: cannot create JAVA VM.\n");
- exit(-1);
- }
-
- (*vm)->DestroyJavaVM(vm);
-}
-
--- a/test/jdk/vm/gc/ArraySize.java Tue Mar 12 09:49:10 2019 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,46 +0,0 @@
-/*
- * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved.
- * 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.
- */
-
-/*
- * @test
- * @bug 4063078
- * @summary Allocating a ridiculously large array should not crash the VM
- * @run main/othervm -Xmx32m -Xms32m ArraySize
- */
-
-public class ArraySize {
-
- public static void main(String[] args) throws Exception {
- boolean thrown = false;
- try {
- byte[] buf = new byte[Integer.MAX_VALUE - 1];
- System.out.print(buf[0]);
- } catch (OutOfMemoryError x) {
- thrown = true;
- }
- if (! thrown) {
- throw new Exception("Didn't throw expected OutOfMemoryError");
- }
- }
-
-}
--- a/test/jdk/vm/gc/InfiniteList.java Tue Mar 12 09:49:10 2019 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,49 +0,0 @@
-/*
- * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved.
- * 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.
- */
-
-/*
- * @test
- * @bug 4098578
- * @summary Check if the VM properly throws OutOfMemoryError
- * @author Sheng Liang
- * @run main/othervm -Xmx25M InfiniteList
- */
-public class InfiniteList {
- InfiniteList next;
- long data[] = new long[50000];
- public static void main(String[] args) throws Exception {
- InfiniteList p, q;
- p = new InfiniteList ();
- p.data[p.data.length -1 ] = 999;
- try {
- while (p != null) {
- q = new InfiniteList ();
- q.next = p;
- p = q;
- }
- throw new Exception ("OutOfMemoryError not thrown as expected.");
- } catch (OutOfMemoryError e) {
- return;
- }
- }
-}
--- a/test/jdk/vm/jit/BadLogicCode.java Tue Mar 12 09:49:10 2019 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,58 +0,0 @@
-/*
- * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved.
- * 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.
- */
-
-/*
- * @test
- * @bug 4157675
- * @summary Solaris JIT generates bad code for logic expression
- * @author Tom Rodriguez
- */
-
-public class BadLogicCode {
- static int values[] = {Integer.MIN_VALUE, -1, 0, 1, 4, 16, 31,
- 32, 33, Integer.MAX_VALUE};
- static char b[][] = {null, new char[32]};
- static boolean nullPtr = false, indexOutBnd = false;
- static boolean indexOutBnd2 = false;
-
- public static void main(String args[]) throws Exception{
- int i = 1, j = 4, k = 9;
-
- nullPtr = (b[i] == null);
-
- int bufLen = nullPtr ? 0 : b[i].length;
- indexOutBnd = (values[j] < 0)
- || (values[j] > bufLen)
- || (values[k] < 0)
- || ((values[j] + values[k]) > bufLen)
- ||((values[j] + values[k]) < 0);
-
- indexOutBnd2 = (values[j] < 0);
- indexOutBnd2 = indexOutBnd2 || (values[j] > bufLen);
- indexOutBnd2 = indexOutBnd2 || (values[k] < 0);
- indexOutBnd2 = indexOutBnd2 || ((values[j] + values[k]) > bufLen);
- indexOutBnd2 = indexOutBnd2 ||((values[j] + values[k]) < 0);
- if (indexOutBnd != indexOutBnd2)
- throw new Error("logic expression generate different results");
- }
-}
--- a/test/jdk/vm/jit/ExceptionInInit.java Tue Mar 12 09:49:10 2019 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,93 +0,0 @@
-/*
- * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved.
- * 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.
- */
-
-/*
- * @test
- * @bug 4165973
- * @summary Attempt to read inaccessible property can produce
- * exception of the wrong type.
- * @author Tom Rodriguez
- *
- * @modules java.rmi
- */
-
-import java.security.AccessController;
-import java.security.PrivilegedAction;
-
-public class ExceptionInInit {
-
- public static void main(String[] args) {
-
- Test test = null;
-
- try {
- System.setSecurityManager(new java.rmi.RMISecurityManager());
- Test.showTest();
- } catch (ExceptionInInitializerError e) {
- }
- }
-
- public static class FooBar {
- static String test = "test";
- FooBar(String test) {
- this.test = test;
- }
- }
-
- public static class Test extends FooBar {
-
- /*
- * An AccessControlException is thrown in the static initializer of the
- * class FooBar. This exception should produce an ExceptionInInitializer
- * error. Instead it causes a more cryptic ClassNotFound error.
- *
- * The following is an excerpt from the output from java.security.debug=all
- *
- * access: access denied (java.util.PropertyPermission test.src read)
- * java.lang.Exception: Stack trace
- * at java.lang.Thread.dumpStack(Thread.java:938)
- * at java.security.AccessControlContext.checkPermission(AccessControlContext.java:184)
- * at java.security.AccessController.checkPermission(AccessController.java:402)
- * at java.lang.SecurityManager.checkPermission(SecurityManager.java:516)
- * at java.lang.SecurityManager.checkPropertyAccess(SecurityManager.java:1035)
- * at java.lang.System.getProperty(System.java:441)
- * at sun.security.action.GetPropertyAction.run(GetPropertyAction.java:73)
- * at java.security.AccessController.doPrivileged(Native Method)
- * at ExceptionInInit$Test.<clinit>(ExceptionInInit.java:33)
- * at ExceptionInInit.main(ExceptionInInit.java:18)
- * access: domain that failed ProtectionDomain (file:/tmp/exceptionInInit/<no certificates>)
- *
- * The following exception is occurring when this test program tries
- * to access the test.src property.
- */
- private static String test =
- AccessController.doPrivileged((PrivilegedAction<String>)() -> System.getProperty("test.src", "."));
-
- Test(String test) {
- super(test);
- }
- public static void showTest() {
- System.err.println(test);
- }
- }
-}
--- a/test/jdk/vm/jit/JITClassInit.java Tue Mar 12 09:49:10 2019 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,75 +0,0 @@
-/*
- * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved.
- * 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.
- */
-
-/*
- * @test
- * @bug 4154887
- * @summary self-parser test causes JDK 1.2 Beta4K segmentation fault
- * @run main/othervm JITClassInit
- * @author Tom Rodriguez
- */
-
-public class JITClassInit {
- public static void main(String[] args) {
- Token t = new Token();
- new TokenTable();
- }
-
-}
-
-class TokenTable {
- public TokenTable() {
- new TokenTypeIterator(this);
- }
-
- public void for_token_type(Token t) {
- t.keyword_character_class();
- }
-}
-
-class Token {
- public Object keyword_character_class() {
- return new Object();
- }
-}
-
-class NameOrKeywordToken extends Token {
- static TokenTable kt = new TokenTable();
- public Object keyword_character_class() {
- return new Object();
- }
-}
-
-class CapKeywordToken extends NameOrKeywordToken {
- public Object keyword_character_class() {
- return new Object();
- }
-};
-
-
-class TokenTypeIterator {
- public TokenTypeIterator(TokenTable c) {
- c.for_token_type(new CapKeywordToken());
- c.for_token_type(new NameOrKeywordToken());
- }
-}
--- a/test/jdk/vm/runtime/ExplicitArithmeticCheck.java Tue Mar 12 09:49:10 2019 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,70 +0,0 @@
-/*
- * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved.
- * 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.
- */
-
-/*
- * @test
- * @bug 4221448
- * @summary Use explicit check for integer arithmetic exception on win32.
- */
-
-public class ExplicitArithmeticCheck {
- public static void main(String argv[]) throws Exception {
- for (int i = 0; i < 64; i++) {
- boolean result = false;
- int n;
- try {
- n = 0 / 0;
- } catch (ArithmeticException e) {
- result = true;
- }
- if (result == false) {
- throw new Error("Failed to throw correct exception!");
- }
- result = false;
- try {
- n = 0 % 0;
- } catch (ArithmeticException e) {
- result = true;
- }
- if (result == false) {
- throw new Error("Failed to throw correct exception!");
- }
- try {
- n = 0x80000000 / -1;
- } catch (Throwable t) {
- throw new Error("Failed to throw correct exception!");
- }
- if (n != 0x80000000) {
- throw new Error("Incorrect integer arithmetic ! ");
- }
- try {
- n = 0x80000000 % -1;
- } catch (Throwable t) {
- throw new Error("Failed to throw correct exception!");
- }
- if (n != 0) {
- throw new Error("Incorrect integer arithmetic!");
- }
- }
- }
-}
--- a/test/jdk/vm/runtime/MonitorCacheMaybeExpand_DeadLock.java Tue Mar 12 09:49:10 2019 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,186 +0,0 @@
-/*
- * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved.
- * 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.
- */
-
-/*
- * @test
- * @bug 4087516
- * @summary Incorrect locking leads to deadlock in monitorCacheMaybeExpand.
- * @author Anand Palaniswamy
- * @build MonitorCacheMaybeExpand_DeadLock
- * @run main/othervm MonitorCacheMaybeExpand_DeadLock
- */
-
-/**
- * Background on the bug:
- *
- * The thread local monitor cache had a locking bug (till
- * 1.2beta1) where two threads trying to expand the monitor cache
- * at the same time would cause deadlock. The code paths that the
- * two threads must be executing for this to happen is described
- * in the bug report.
- *
- * Caveat and red-flag:
- *
- * Since deadlocks are very timing dependent, there is a good
- * chance this test case will not catch the bug most of the time
- * -- on your machine and setting, it is _possible_ that the two
- * threads might not try a monitorCacheExpand at the same
- * time. But in practice, on Solaris native threads, this program
- * deadlocks the VM in about 2 seconds pretty consistently,
- * whether MP or not.
- *
- * The rationale for running this test despite this rather large
- * caveat is that at worst, it can do no harm.
- *
- * The idea:
- *
- * Is to create two monitor hungry threads.
- *
- * Originally Tom Rodriguez and I suspected that this weird state
- * of two threads trying to expand monitor cache can happen only
- * if:
- *
- * Thread 1: Is in the middle of a monitorCacheMaybeExpand.
- * Thread 2: Runs GC and tries to freeClasses(). This causes
- * sysFree() to be invoked, which in turn needs a
- * mutex_lock -- and oops, we end up deadlocking
- * with 1 on green_threads.
- *
- * Which is why this test tries to cause class GC at regular
- * intervals.
- *
- * Turns out that the GC is not required. Two instances of the
- * monitor hungry threads deadlock the VM pretty quick. :-) Infact
- * the static initializer in the forName'd classes running
- * alongside one of the hungry threads is sufficient to
- * deadlock. Still keep the GC stuff just-in-case (and also
- * because I wrote it :-).
- *
- */
-public class MonitorCacheMaybeExpand_DeadLock {
-
- /**
- * A monitor-hungry thread.
- */
- static class LotsaMonitors extends Thread {
-
- /** How many recursions? Could cause Java stack overflow. */
- static final int MAX_DEPTH = 800;
-
- /** What is our depth? */
- int depth = 0;
-
- /** Thread ID */
- int tid;
-
- /** So output will have thread number. */
- public LotsaMonitors(int tid, int depth) {
- super("LotsaMonitors #" + new Integer(tid).toString());
- this.tid = tid;
- this.depth = depth;
- }
-
- /** Start a recursion that grabs monitors. */
- public void run() {
- System.out.println(">>>Starting " + this.toString() + " ...");
- Thread.currentThread().yield();
- this.recurse();
- System.out.println("<<<Finished " + this.toString());
- }
-
- /** Every call to this method grabs an extra monitor. */
- synchronized void recurse() {
- if (this.depth > 0) {
- new LotsaMonitors(tid, depth-1).recurse();
- }
- }
- }
-
- /**
- * The test.
- */
- public static void main(String[] args) {
- /* Start the two of these crazy threads. */
- new LotsaMonitors(1, LotsaMonitors.MAX_DEPTH).start();
- new LotsaMonitors(2, LotsaMonitors.MAX_DEPTH).start();
-
- /* And sit there and GC for good measure. */
- for (int i = 0; i < MAX_GC_ITERATIONS; i++) {
- new LotsaMonitors(i+3, LotsaMonitors.MAX_DEPTH).start();
- System.out.println(">>>Loading 10 classes and gc'ing ...");
- Class[] classes = new Class[10];
- fillClasses(classes);
- classes = null;
- System.gc();
- Thread.currentThread().yield();
- System.out.println("<<<Finished loading 10 classes and gc'ing");
- }
- }
-
- /** How many times to GC? */
- static final int MAX_GC_ITERATIONS = 10;
-
- /** Load some classes into the array. */
- static void fillClasses(Class[] classes) {
- for (int i = 0; i < classes.length; i++) {
- try {
- classes[i] = Class.forName(classnames[i]);
- } catch (ClassNotFoundException cnfe) {
- cnfe.printStackTrace();
- }
- }
- }
-
- /** Some random classes to load. */
- private static String[] classnames = {
- "java.text.DecimalFormat",
- "java.text.MessageFormat",
- "java.util.GregorianCalendar",
- "java.util.ResourceBundle",
- "java.text.Collator",
- "java.util.Date",
- "java.io.Reader",
- "java.io.Writer",
- "java.lang.IllegalAccessException",
- "java.lang.InstantiationException",
- "java.lang.ClassNotFoundException",
- "java.lang.CloneNotSupportedException",
- "java.lang.InterruptedException",
- "java.lang.NoSuchFieldException",
- "java.lang.NoSuchMethodException",
- "java.lang.RuntimeException",
- "java.lang.ArithmeticException",
- "java.lang.ArrayStoreException",
- "java.lang.ClassCastException",
- "java.lang.StringIndexOutOfBoundsException",
- "java.lang.NegativeArraySizeException",
- "java.lang.IllegalStateException",
- "java.lang.IllegalArgumentException",
- "java.lang.NumberFormatException",
- "java.lang.IllegalThreadStateException",
- "java.lang.IllegalMonitorStateException",
- "java.lang.SecurityException",
- "java.lang.ExceptionInInitializerError"
- };
-
-}
--- a/test/jdk/vm/runtime/ReflectStackOverflow.java Tue Mar 12 09:49:10 2019 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,67 +0,0 @@
-/*
- * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved.
- * 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.
- */
-
-/*
- * @test
- * @bug 4185411
- * @summary This program crashes in 1.1, but runs okay in 1.2.
- * @run main/othervm -Xss512k ReflectStackOverflow
- */
-import java.lang.reflect.*;
-
-public class ReflectStackOverflow {
- private static final int COUNT = 11000;
-
- public static void main(String[] cmdline) throws Throwable {
- for (int i = 0; i < COUNT+1; i++) {
- stuff(i);
- }
- }
-
- private static void stuff(int count) throws Throwable {
- if (count < COUNT)
- return; // don't do anything the first COUNT times.
-
- try {
- final Method method =
- Method.class.getMethod
- ("invoke", new Class[] { Object.class, Object[].class });
-
- final Object[] args = new Object[] { method, null };
- args[1] = args;
-
- method.invoke(method, args); // "recursive reflection"
- // exception should have been thrown by now...
- System.out.println("how did I get here?");
- } catch(Throwable t) {
- int layers;
- for(layers = 0; t instanceof InvocationTargetException; layers++)
- t = ((InvocationTargetException)t).getTargetException();
-
- System.err.println("Found " + layers + " layers of wrappers.");
- if (!(t instanceof StackOverflowError)) {
- throw t;
- }
- }
- }
-}
--- a/test/jdk/vm/runtime/ShiftTest.java Tue Mar 12 09:49:10 2019 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,65 +0,0 @@
-/*
- * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved.
- * 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.
- */
-
-/*
- * @test
- * @bug 4093292
- * @summary Test for correct code generation by the JIT
- */
-public class ShiftTest {
- static final int w = 32;
-
- private static void doTest(long ct) throws Exception {
- int S22 = 0xc46cf7c2;
- int S23 = 0xcfda9162;
- int S24 = 0xd029aa4c;
- int S25 = 0x17cf1801;
- int A = (int)(ct & 0xffffffffL);
- int B = (int)(ct >>> 32);
- int x, y;
- x = B - S25;
- y = A & (w-1);
- B = ((x >>> y) | (x << (w-y))) ^ A;
- x = A - S24;
- y = B & (w-1);
- A = ((x >>> y) | (x << (w-y))) ^ B;
- x = B - S23;
- y = A & (w-1);
- B = ((x >>> y) | (x << (w-y))) ^ A;
- x = A - S22;
- y = B & (w-1);
- A = ((x >>> y) | (x << (w-y))) ^ B;
- String astr = Integer.toHexString(A);
- String bstr = Integer.toHexString(B);
- System.err.println("A = " + astr + " B = " + bstr);
- if ((!astr.equals("dcb38144")) ||
- (!bstr.equals("1916de73"))) {
- throw new RuntimeException("Unexpected shift results!");
- }
- System.err.println("Test passed");
- }
-
- public static void main(String[] args) throws Exception {
- doTest(0x496def29b74be041L);
- }
-}
--- a/test/jdk/vm/runtime/WideStrictInline.java Tue Mar 12 09:49:10 2019 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,127 +0,0 @@
-/*
- * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved.
- * 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.
- */
-
-/*
- * @test
- * @bug 4169183
- * @summary Check for correct inlining by the interpreter (widefp and strictfp).
- * The default is widefp. A strictfp method was getting inlined
- * into a widefp method.
- */
-
-import java.io.PrintStream;
-
-public class WideStrictInline {
- static PrintStream out;
- static float halfUlp;
-
- static {
- halfUlp = 1;
- for ( int i = 127 - 24; i > 0; i-- )
- halfUlp *= 2;
- }
-
- public static void main(String argv[]) throws Exception {
- out = System.err;
- pr(-1,"halfUlp",halfUlp);
- WideStrictInline obj = new WideStrictInline();
- for( int i=0; i<48; i++ )
- obj.instanceMethod( i );
- }
-
- private static void pr(int i, String desc, float r) {
- out.print(" i=("+i+") "+desc+" ; == "+r);
- out.println(" , 0x"+Integer.toHexString(Float.floatToIntBits(r)));
- }
-
- private static strictfp float WideStrictInline(float par) {
- return par;
- }
-
- public static strictfp float strictValue(int i) {
- float r;
- switch (i%4) {
- case 0: r = -Float.MAX_VALUE; break;
- case 1: r = Float.MAX_VALUE; break;
- case 2: r = Float.MIN_VALUE; break;
- default : r = 1L << 24;
- }
- return r;
- }
-
- void instanceMethod (int i) throws Exception {
- float r;
- switch (i%4) {
- case 0:
- if (!Float.isInfinite( WideStrictInline(strictValue(i)*2) +
- Float.MAX_VALUE ))
- {
- pr(i,
- "WideStrictInline(-Float.MAX_VALUE * 2) " +
- "!= Float.NEGATIVE_INFINITY"
- ,WideStrictInline(strictValue(i)*2) + Float.MAX_VALUE);
- }
- r = WideStrictInline(strictValue(i)*2) + Float.MAX_VALUE;
- if ( !Float.isInfinite( r ) ) {
- pr(i,"r != Float.NEGATIVE_INFINITY",r);
- throw new RuntimeException();
- }
- break;
- case 1:
- if (!Float.isInfinite(WideStrictInline(strictValue(i)+halfUlp) -
- Float.MAX_VALUE )) {
- pr(i,"WideStrictInline(Float.MAX_VALUE+halfUlp) " +
- "!= Float.POSITIVE_INFINITY"
- ,WideStrictInline(strictValue(i)+halfUlp) - Float.MAX_VALUE);
- }
- r = WideStrictInline(strictValue(i)+halfUlp) - Float.MAX_VALUE;
- if ( !Float.isInfinite( r ) ) {
- pr(i,"r != Float.POSITIVE_INFINITY",r);
- throw new RuntimeException();
- }
- break;
- case 2:
- if (WideStrictInline(strictValue(i)/2) != 0) {
- pr(i,"WideStrictInline(Float.MIN_VALUE/2) != 0",
- WideStrictInline(strictValue(i)/2));
- }
- r = WideStrictInline(strictValue(i)/2);
- if ( r != 0 ) {
- pr(i,"r != 0",r);
- throw new RuntimeException();
- }
- break;
- default:
- if (WideStrictInline(strictValue(i)-0.5f) - strictValue(i) != 0) {
- pr(i,"WideStrictInline(2^24-0.5) != 2^24",
- WideStrictInline(strictValue(i)-0.5f));
- }
- r = WideStrictInline(strictValue(i)-0.5f);
- if ( r - strictValue(i) != 0 ) {
- pr(i,"r != 2^24",r);
- throw new RuntimeException();
- }
- }
- }
-
-}
--- a/test/jdk/vm/verifier/TestStaticIF.java Tue Mar 12 09:49:10 2019 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,44 +0,0 @@
-/*
- * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
- * 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.
- *
- */
-
-/*
- * @test
- * @bug 8007736
- * @summary Test static interface method.
- * @run main/othervm -Xverify:all TestStaticIF
- */
-
-public class TestStaticIF implements StaticMethodInInterface {
-
- public static void main(String[] args) {
- System.out.printf("main: %s%n", StaticMethodInInterface.get());
- }
-}
-
-interface StaticMethodInInterface {
-
- public static String get() {
- return "Hello from StaticMethodInInterface.get()";
- }
-}
--- a/test/jdk/vm/verifier/VerifyProtectedConstructor.java Tue Mar 12 09:49:10 2019 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,129 +0,0 @@
-/*
- * Copyright (c) 2007, 2015, Oracle and/or its affiliates. All rights reserved.
- * 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.
- */
-
-
-/**
- * @test
-
- * @bug 6490436
- * @summary Verify that protected constructor calls are not allowed for any classfile versions in either verifier.
- * @author Keith McGuigan
- */
-
-public class VerifyProtectedConstructor extends ClassLoader {
- public static void main(String argv[]) throws Exception {
- VerifyProtectedConstructor t = new VerifyProtectedConstructor();
-
- t.loadSuperClass();
-
- try {
- t.checkClassVersion(49); // should not throw VerifyError
- throw new Exception("FAIL: should be a VerifyError for CF version 49");
- }
- catch(VerifyError e) {
- System.out.println("PASS for CF version 49");
- }
-
- try {
- t.checkClassVersion(50); // should throw VerifyError
- throw new Exception("FAIL: should be a VerifyError for CF version 50");
- }
- catch(VerifyError e) {
- System.out.println("PASS");
- }
- }
-
- private void loadSuperClass() {
- /* -- code for super class A.A --
- package A;
- public class A {
- protected A() {}
- }
- */
- long[] cls_data = {
- 0xcafebabe00000032L, 0x000a0a0003000707L,
- 0x0008070009010006L, 0x3c696e69743e0100L,
- 0x0328295601000443L, 0x6f64650c00040005L,
- 0x010003412f410100L, 0x106a6176612f6c61L,
- 0x6e672f4f626a6563L, 0x7400210002000300L,
- 0x0000000001000400L, 0x0400050001000600L,
- 0x0000110001000100L, 0x0000052ab70001b1L,
- 0x0000000000000000L // 2 bytes extra
- };
- final int EXTRA = 2;
- byte cf_bytes[] = toByteArray(cls_data);
- defineClass("A.A", cf_bytes, 0, cf_bytes.length - EXTRA);
- }
-
- private int num_calls;
- private static String classNames[] = { "B.B", "C.C" };
-
- private void checkClassVersion(int version) throws VerifyError {
- // This class is in violation of the spec since it accesses
- // a protected constructor of a superclass while not being in the
- // same package.
- /* -- code for test class --
- package B;
- public class B extends A.A {
- public static void f() { new A.A(); }
- }
- */
- long[] cls_data = {
- 0xcafebabe00000032L, 0x000b0a0002000807L,
- 0x000907000a010006L, 0x3c696e69743e0100L,
- 0x0328295601000443L, 0x6f6465010001660cL,
- 0x0004000501000341L, 0x2f41010003422f42L,
- 0x0021000300020000L, 0x0000000200010004L,
- 0x0005000100060000L, 0x0011000100010000L,
- 0x00052ab70001b100L, 0x0000000009000700L,
- 0x0500010006000000L, 0x1500020000000000L,
- 0x09bb000259b70001L, 0x57b1000000000000L // no extra bytes
- };
- final int EXTRA = 0;
-
- byte cf_bytes[] = toByteArray(cls_data);
-
- // set version
- cf_bytes[7] = (byte)version;
-
- // Change B.B to C.C, D.D, ... for subsequent calls so we can call this
- // multiple times and define different classes.
- cf_bytes[61] += num_calls;
- cf_bytes[63] += num_calls;
- String name = classNames[num_calls];
- num_calls++;
-
- Class c = defineClass(name, cf_bytes, 0, cf_bytes.length - EXTRA);
-
- try { c.newInstance(); } // to force linking, thus verification
- catch(InstantiationException e) {}
- catch(IllegalAccessException e) {}
- }
-
- static private byte[] toByteArray(long arr[]) {
- // convert long array to byte array
- java.nio.ByteBuffer bbuf = java.nio.ByteBuffer.allocate(arr.length * 8);
- bbuf.asLongBuffer().put(java.nio.LongBuffer.wrap(arr));
- return bbuf.array();
- }
-}
--- a/test/jdk/vm/verifier/VerifyStackForExceptionHandlers.java Tue Mar 12 09:49:10 2019 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,130 +0,0 @@
-/*
- * Copyright (c) 2007, Oracle and/or its affiliates. All rights reserved.
- * 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.
- */
-
-
-/**
- * @test
- * @bug 6547378
- * @summary Verify that methods with max_stack==0 don't have exception handlers
- * @author Keith McGuigan
- */
-
-public class VerifyStackForExceptionHandlers extends ClassLoader {
- public static void main(String argv[]) throws Exception {
- VerifyStackForExceptionHandlers t =
- new VerifyStackForExceptionHandlers();
-
- try {
- t.loadGoodClass();
- } catch(VerifyError e) {
- throw new Exception("FAIL: should be no VerifyError for class A");
- }
-
- try {
- t.loadBadClass();
- throw new Exception("FAIL: should be a VerifyError for class B");
- } catch(VerifyError e) {
- System.out.println("PASS");
- }
- }
-
- private void loadGoodClass() {
- /* -- code for class A --
- public class A {
- public static void f() {}
- }
- */
- long[] cls_data = {
- 0xcafebabe00000031L, 0x000e0a0003000b07L,
- 0x000c07000d010006L, 0x3c696e69743e0100L,
- 0x0328295601000443L, 0x6f646501000f4c69L,
- 0x6e654e756d626572L, 0x5461626c65010001L,
- 0x6601000a536f7572L, 0x636546696c650100L,
- 0x06412e6a6176610cL, 0x0004000501000141L,
- 0x0100106a6176612fL, 0x6c616e672f4f626aL,
- 0x6563740021000200L, 0x0300000000000200L,
- 0x0100040005000100L, 0x060000001d000100L,
- 0x01000000052ab700L, 0x01b1000000010007L,
- 0x0000000600010000L, 0x0001000900080005L,
- 0x0001000600000019L, 0x0000000000000001L,
- 0xb100000001000700L, 0x0000060001000000L,
- 0x0200010009000000L, 0x02000a0000000000L
- };
- final int EXTRA = 5;
-
- byte cf_bytes[] = toByteArray(cls_data);
- Class c = defineClass("A", cf_bytes, 0, cf_bytes.length - EXTRA);
-
- try { c.newInstance(); } // to force linking, thus verification
- catch(InstantiationException e) {}
- catch(IllegalAccessException e) {}
- }
-
- private void loadBadClass() throws VerifyError {
- /* -- code for class B --
- public class B {
- public static void g() {}
- public static void f() {
- // bytecode modified to have a max_stack value of 0
- try { g(); }
- catch (NullPointerException e) {}
- }
- }
- */
- long[] cls_data = {
- 0xcafebabe00000031L, 0x00120a000400060aL,
- 0x000d00030c000f00L, 0x0a0700050100106aL,
- 0x6176612f6c616e67L, 0x2f4f626a6563740cL,
- 0x0011000a01000a53L, 0x6f7572636546696cL,
- 0x6507000901001e6aL, 0x6176612f6c616e67L,
- 0x2f4e756c6c506f69L, 0x6e74657245786365L,
- 0x7074696f6e010003L, 0x282956010006422eL,
- 0x6a61736d01000443L, 0x6f646507000e0100L,
- 0x0142010001670100L, 0x01660100063c696eL,
- 0x69743e0021000d00L, 0x0400000000000300L,
- 0x010011000a000100L, 0x0c00000011000100L,
- 0x01000000052ab700L, 0x01b1000000000009L,
- 0x000f000a0001000cL, 0x0000000d00000000L,
- 0x00000001b1000000L, 0x0000090010000a00L,
- 0x01000c0000001c00L, 0x00000100000008b8L,
- 0x0002a700044bb100L, 0x0100000003000600L,
- 0x0800000001000700L, 0x000002000b000000L // 3 bytes extra
-
- };
- final int EXTRA = 3;
-
- byte cf_bytes[] = toByteArray(cls_data);
- Class c = defineClass("B", cf_bytes, 0, cf_bytes.length - EXTRA);
-
- try { c.newInstance(); } // to force linking, thus verification
- catch(InstantiationException e) {}
- catch(IllegalAccessException e) {}
- }
-
- static private byte[] toByteArray(long arr[]) {
- // convert long array to byte array
- java.nio.ByteBuffer bbuf = java.nio.ByteBuffer.allocate(arr.length * 8);
- bbuf.asLongBuffer().put(java.nio.LongBuffer.wrap(arr));
- return bbuf.array();
- }
- }
--- a/test/jdk/vm/verifier/defaultMethods/DefaultMethodRegressionTests.java Tue Mar 12 09:49:10 2019 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,144 +0,0 @@
-/*
- * Copyright (c) 2012, 2013, Oracle and/or its affiliates. All rights reserved.
- * 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.
- */
-
-/**
- * @test
- * @bug 8003639
- * @summary defaultMethod resolution and verification
- * @run main DefaultMethodRegressionTests
- */
-
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
-
-/**
- * This set of classes/interfaces (K/I/C) is specially designed to expose a
- * bug in the JVM where it did not find some overloaded methods in some
- * specific situations. (fixed by hotspot changeset ffb9316fd9ed).
- */
-interface K {
- int bbb(Long l);
-}
-
-interface I extends K {
- default void aaa() {}
- default void aab() {}
- default void aac() {}
-
- default int bbb(Integer i) { return 22; }
- default int bbb(Float f) { return 33; }
- default int bbb(Long l) { return 44; }
- default int bbb(Double d) { return 55; }
- default int bbb(String s) { return 66; }
-
- default void caa() {}
- default void cab() {}
- default void cac() {}
-}
-
-class C implements I {}
-
-public class DefaultMethodRegressionTests {
- public static void main(String... args) {
- new DefaultMethodRegressionTests().run(args);
- }
- void run(String... args) {
- testLostOverloadedMethod();
- System.out.println("testLostOverloadedMethod: OK");
- testInferenceVerifier();
- System.out.println("testInferenceVerifier: OK");
- }
- void testLostOverloadedMethod() {
- C c = new C();
- assertEquals(c.bbb(new Integer(1)), 22);
- assertEquals(c.bbb(new Float(1.1)), 33);
- assertEquals(c.bbb(new Long(1L)), 44);
- assertEquals(c.bbb(new Double(0.01)), 55);
- assertEquals(c.bbb(new String("")), 66);
- }
- // Test to ensure that the inference verifier accepts older classfiles
- // with classes that implement interfaces with defaults.
- void testInferenceVerifier() {
- // interface I { int m() default { return 99; } }
- byte I_bytes[] = {
- (byte)0xca, (byte)0xfe, (byte)0xba, (byte)0xbe, 0x00, 0x00, 0x00, 0x34,
- 0x00, 0x08, 0x07, 0x00, 0x06, 0x07, 0x00, 0x07,
- 0x01, 0x00, 0x03, 0x66, 0x6f, 0x6f, 0x01, 0x00,
- 0x03, 0x28, 0x29, 0x49, 0x01, 0x00, 0x04, 0x43,
- 0x6f, 0x64, 0x65, 0x01, 0x00, 0x01, 0x49, 0x01,
- 0x00, 0x10, 0x6a, 0x61, 0x76, 0x61, 0x2f, 0x6c,
- 0x61, 0x6e, 0x67, 0x2f, 0x4f, 0x62, 0x6a, 0x65,
- 0x63, 0x74, 0x06, 0x00, 0x00, 0x01, 0x00, 0x02,
- 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x02, 0x01,
- 0x00, 0x03, 0x00, 0x04, 0x00, 0x01, 0x00, 0x05,
- 0x00, 0x00, 0x00, 0x0f, 0x00, 0x01, 0x00, 0x01,
- 0x00, 0x00, 0x00, 0x03, 0x10, 0x63, (byte)0xac, 0x00,
- 0x00, 0x00, 0x00, 0x00, 0x00
- };
- // public class C implements I {} /* -target 1.5 */
- byte C_bytes[] = {
- (byte)0xca, (byte)0xfe, (byte)0xba, (byte)0xbe, 0x00, 0x00, 0x00, 0x31,
- 0x00, 0x0c, 0x0a, 0x00, 0x03, 0x00, 0x08, 0x07,
- 0x00, 0x09, 0x07, 0x00, 0x0a, 0x07, 0x00, 0x0b,
- 0x01, 0x00, 0x06, 0x3c, 0x69, 0x6e, 0x69, 0x74,
- 0x3e, 0x01, 0x00, 0x03, 0x28, 0x29, 0x56, 0x01,
- 0x00, 0x04, 0x43, 0x6f, 0x64, 0x65, 0x0c, 0x00,
- 0x05, 0x00, 0x06, 0x01, 0x00, 0x01, 0x43, 0x01,
- 0x00, 0x10, 0x6a, 0x61, 0x76, 0x61, 0x2f, 0x6c,
- 0x61, 0x6e, 0x67, 0x2f, 0x4f, 0x62, 0x6a, 0x65,
- 0x63, 0x74, 0x01, 0x00, 0x01, 0x49, 0x00, 0x21,
- 0x00, 0x02, 0x00, 0x03, 0x00, 0x01, 0x00, 0x04,
- 0x00, 0x00, 0x00, 0x01, 0x00, 0x01, 0x00, 0x05,
- 0x00, 0x06, 0x00, 0x01, 0x00, 0x07, 0x00, 0x00,
- 0x00, 0x11, 0x00, 0x01, 0x00, 0x01, 0x00, 0x00,
- 0x00, 0x05, 0x2a, (byte)0xb7, 0x00, 0x01, (byte)0xb1, 0x00,
- 0x00, 0x00, 0x00, 0x00, 0x00
- };
-
- ClassLoader cl = new ClassLoader() {
- protected Class<?> findClass(String name) {
- if (name.equals("I")) {
- return defineClass("I", I_bytes, 0, I_bytes.length);
- } else if (name.equals("C")) {
- return defineClass("C", C_bytes, 0, C_bytes.length);
- } else {
- return null;
- }
- }
- };
- try {
- Class.forName("C", true, cl);
- } catch (Exception e) {
- // unmodified verifier will throw VerifyError
- throw new RuntimeException(e);
- }
- }
- void assertEquals(Object o1, Object o2) {
- System.out.print("Expected: " + o1);
- System.out.println(", Obtained: " + o2);
- if (!o1.equals(o2)) {
- throw new RuntimeException("got unexpected values");
- }
- }
-}
--- a/test/jdk/vm/verifier/defaultMethods/DefaultMethodRegressionTestsRun.java Tue Mar 12 09:49:10 2019 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,73 +0,0 @@
-/*
- * Copyright (c) 2013, 2015, Oracle and/or its affiliates. All rights reserved.
- * 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.
- */
-
-/**
- * @test
- * @bug 8003639
- * @summary defaultMethod resolution and verification using an URLClassLoader
- * @modules jdk.compiler
- * jdk.zipfs
- * @compile -XDignore.symbol.file=true DefaultMethodRegressionTestsRun.java
- * @run main DefaultMethodRegressionTestsRun
- */
-import java.io.File;
-import java.lang.reflect.Method;
-import java.net.URL;
-import java.net.URLClassLoader;
-import java.nio.file.DirectoryStream;
-import java.nio.file.Files;
-import java.nio.file.Path;
-/**
- * This test is a variant of DefaultMethodRegressionTests, this one creates
- * an URLClassLoader to load the support classes.
- *
- */
-public class DefaultMethodRegressionTestsRun {
- public static void main(String... args) throws Exception {
- File scratchDir = new File(".");
- File testDir = new File(scratchDir, "testdir");
- testDir.mkdirs();
- File srcFile = new File(new File(System.getProperty("test.src")),
- "DefaultMethodRegressionTests.java");
- String[] javacargs = {
- srcFile.getAbsolutePath(),
- "-d",
- testDir.getAbsolutePath()
- };
- com.sun.tools.javac.Main.compile(javacargs);
- runClass(testDir, "DefaultMethodRegressionTests");
- }
- static void runClass(
- File classPath,
- String classname) throws Exception {
- URL[] urls = {classPath.toURI().toURL()};
- ClassLoader loader = new URLClassLoader(urls);
- Class<?> c = loader.loadClass(classname);
-
- Class<?>[] argTypes = new Class<?>[]{String[].class};
- Object[] methodArgs = new Object[]{null};
-
- Method method = c.getMethod("main", argTypes);
- method.invoke(c, methodArgs);
- }
-}
--- a/test/langtools/jdk/javadoc/doclet/InheritDocForUserTags/DocTest.java Tue Mar 12 09:49:10 2019 +0000
+++ b/test/langtools/jdk/javadoc/doclet/InheritDocForUserTags/DocTest.java Sat Mar 16 21:00:45 2019 +0000
@@ -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
@@ -32,6 +32,8 @@
* @run main DocTest
*/
+import javadoc.tester.JavadocTester;
+
/**
* DocTest documentation.
*
@@ -39,8 +41,6 @@
* @implSpec DocTest implementation spec.
* @implNote DocTest implementation note.
*/
-import javadoc.tester.JavadocTester;
-
public class DocTest extends JavadocTester {
public static void main(String... args) throws Exception {
DocTest tester = new DocTest();
@@ -51,6 +51,7 @@
public void test() {
javadoc("-verbose",
"-d", "DocTest",
+ "-sourcepath", System.getProperty("test.src.path"),
"-tag", "apiNote:optcm:<em>API Note</em>",
"-tag", "implSpec:optcm:<em>Implementation Requirements</em>:",
"-tag", "implNote:optcm:<em>Implementation Note</em>:",
--- a/test/langtools/jdk/javadoc/doclet/testDeprecatedDocs/TestDeprecatedDocs.java Tue Mar 12 09:49:10 2019 +0000
+++ b/test/langtools/jdk/javadoc/doclet/testDeprecatedDocs/TestDeprecatedDocs.java Sat Mar 16 21:00:45 2019 +0000
@@ -215,17 +215,21 @@
"<div class=\"deprecatedSummary\">\n"
+ "<table>\n"
+ "<caption><span>For Removal</span><span class=\"tabEnd\"> </span></caption>\n"
+ + "<thead>\n"
+ "<tr>\n"
+ "<th class=\"colFirst\" scope=\"col\">Element</th>\n"
+ "<th class=\"colLast\" scope=\"col\">Description</th>\n"
- + "</tr>",
+ + "</tr>\n"
+ + "</thead>",
"<div class=\"deprecatedSummary\">\n"
+ "<table>\n"
+ "<caption><span>Enums</span><span class=\"tabEnd\"> </span></caption>\n"
+ + "<thead>\n"
+ "<tr>\n"
+ "<th class=\"colFirst\" scope=\"col\">Enum</th>\n"
+ "<th class=\"colLast\" scope=\"col\">Description</th>\n"
+ "</tr>\n"
+ + "</thead>\n"
+ "<tbody>\n"
+ "<tr class=\"altColor\">\n"
+ "<th class=\"colDeprecatedItemName\" scope=\"row\"><a href=\"pkg/TestEnum.html\" title=\"enum in pkg\">pkg.TestEnum</a></th>\n"
@@ -239,10 +243,12 @@
"<div class=\"deprecatedSummary\">\n"
+ "<table>\n"
+ "<caption><span>Exceptions</span><span class=\"tabEnd\"> </span></caption>\n"
+ + "<thead>\n"
+ "<tr>\n"
+ "<th class=\"colFirst\" scope=\"col\">Exceptions</th>\n"
+ "<th class=\"colLast\" scope=\"col\">Description</th>\n"
+ "</tr>\n"
+ + "</thead>\n"
+ "<tbody>\n"
+ "<tr class=\"altColor\">\n"
+ "<th class=\"colDeprecatedItemName\" scope=\"row\"><a href=\"pkg/TestException.html\" title=\"class in pkg\">pkg.TestException</a></th>\n"
@@ -256,10 +262,12 @@
"<div class=\"deprecatedSummary\">\n"
+ "<table>\n"
+ "<caption><span>Fields</span><span class=\"tabEnd\"> </span></caption>\n"
+ + "<thead>\n"
+ "<tr>\n"
+ "<th class=\"colFirst\" scope=\"col\">Field</th>\n"
+ "<th class=\"colLast\" scope=\"col\">Description</th>\n"
+ "</tr>\n"
+ + "</thead>\n"
+ "<tbody>\n"
+ "<tr class=\"altColor\">\n"
+ "<th class=\"colDeprecatedItemName\" scope=\"row\"><a href=\"pkg/DeprecatedClassByAnnotation.html#field\">pkg.DeprecatedClassByAnnotation.field</a></th>\n"
--- a/test/langtools/jdk/javadoc/doclet/testHtmlDocument/TestHtmlDocument.java Tue Mar 12 09:49:10 2019 +0000
+++ b/test/langtools/jdk/javadoc/doclet/testHtmlDocument/TestHtmlDocument.java Sat Mar 16 21:00:45 2019 +0000
@@ -76,31 +76,31 @@
HtmlTree title = new HtmlTree(HtmlTag.TITLE);
// String content within the document
StringContent titleContent = new StringContent("Markup test");
- title.addContent(titleContent);
- head.addContent(title);
+ title.add(titleContent);
+ head.add(title);
// Test META tag
HtmlTree meta = new HtmlTree(HtmlTag.META);
- meta.addAttr(HtmlAttr.NAME, "keywords");
- meta.addAttr(HtmlAttr.CONTENT, "testContent");
- head.addContent(meta);
+ meta.put(HtmlAttr.NAME, "keywords");
+ meta.put(HtmlAttr.CONTENT, "testContent");
+ head.add(meta);
// Test invalid META tag
HtmlTree invmeta = new HtmlTree(HtmlTag.META);
- head.addContent(invmeta);
+ head.add(invmeta);
// Test LINK tag
HtmlTree link = new HtmlTree(HtmlTag.LINK);
- link.addAttr(HtmlAttr.REL, "testRel");
- link.addAttr(HtmlAttr.HREF, "testLink.html");
- head.addContent(link);
+ link.put(HtmlAttr.REL, "testRel");
+ link.put(HtmlAttr.HREF, "testLink.html");
+ head.add(link);
// Test invalid LINK tag
HtmlTree invlink = new HtmlTree(HtmlTag.LINK);
- head.addContent(invlink);
- html.addContent(head);
+ head.add(invlink);
+ html.add(head);
// Comment within the document
Comment bodyMarker = new Comment("======== START OF BODY ========");
- html.addContent(bodyMarker);
+ html.add(bodyMarker);
HtmlTree body = new HtmlTree(HtmlTag.BODY);
Comment pMarker = new Comment("======== START OF PARAGRAPH ========");
- body.addContent(pMarker);
+ body.add(pMarker);
HtmlTree p = new HtmlTree(HtmlTag.P);
StringContent bodyContent = new StringContent(
"This document is generated from sample source code and HTML " +
@@ -108,41 +108,41 @@
"subclasses, subinterfaces, nested classes, nested interfaces," +
"inheriting from other packages, constructors, fields," +
"methods, and so forth. ");
- p.addContent(bodyContent);
+ p.add(bodyContent);
StringContent anchorContent = new StringContent("Click Here");
- p.addContent(HtmlTree.A("testLink.html", anchorContent));
+ p.add(HtmlTree.A("testLink.html", anchorContent));
StringContent pContent = new StringContent(" to <test> out a link.");
- p.addContent(pContent);
- body.addContent(p);
+ p.add(pContent);
+ body.add(p);
HtmlTree p1 = new HtmlTree(HtmlTag.P);
// Test another version of A tag.
HtmlTree anchor = new HtmlTree(HtmlTag.A);
- anchor.addAttr(HtmlAttr.HREF, "testLink.html");
- anchor.addAttr(HtmlAttr.ID, "Another version of a tag");
- p1.addContent(anchor);
- body.addContent(p1);
+ anchor.put(HtmlAttr.HREF, "testLink.html");
+ anchor.put(HtmlAttr.ID, "Another version of a tag");
+ p1.add(anchor);
+ body.add(p1);
// Test for empty tags.
HtmlTree dl = new HtmlTree(HtmlTag.DL);
- html.addContent(dl);
+ html.add(dl);
// Test for empty nested tags.
HtmlTree dlTree = new HtmlTree(HtmlTag.DL);
- dlTree.addContent(new HtmlTree(HtmlTag.DT));
- dlTree.addContent(new HtmlTree (HtmlTag.DD));
- html.addContent(dlTree);
+ dlTree.add(new HtmlTree(HtmlTag.DT));
+ dlTree.add(new HtmlTree (HtmlTag.DD));
+ html.add(dlTree);
HtmlTree dlDisplay = new HtmlTree(HtmlTag.DL);
- dlDisplay.addContent(new HtmlTree(HtmlTag.DT));
+ dlDisplay.add(new HtmlTree(HtmlTag.DT));
HtmlTree dd = new HtmlTree (HtmlTag.DD);
StringContent ddContent = new StringContent("Test DD");
- dd.addContent(ddContent);
- dlDisplay.addContent(dd);
- body.addContent(dlDisplay);
+ dd.add(ddContent);
+ dlDisplay.add(dd);
+ body.add(dlDisplay);
StringContent emptyString = new StringContent("");
- body.addContent(emptyString);
+ body.add(emptyString);
Comment emptyComment = new Comment("");
- body.addContent(emptyComment);
+ body.add(emptyComment);
HtmlTree hr = new HtmlTree(HtmlTag.HR);
- body.addContent(hr);
- html.addContent(body);
+ body.add(hr);
+ html.add(body);
HtmlDocument htmlDoc = new HtmlDocument(html);
return htmlDoc.toString();
}
--- a/test/langtools/jdk/javadoc/doclet/testJavaFX/TestJavaFX.java Tue Mar 12 09:49:10 2019 +0000
+++ b/test/langtools/jdk/javadoc/doclet/testJavaFX/TestJavaFX.java Sat Mar 16 21:00:45 2019 +0000
@@ -252,10 +252,13 @@
checkExit(Exit.OK);
checkOutput("pkg2/Test.html", false, "<h2>Property Summary</h2>");
checkOutput("pkg2/Test.html", true,
- "<th class=\"colFirst\" scope=\"col\">Modifier and Type</th>\n"
+ "<thead>\n"
+ + "<tr>\n"
+ + "<th class=\"colFirst\" scope=\"col\">Modifier and Type</th>\n"
+ "<th class=\"colSecond\" scope=\"col\">Method</th>\n"
+ "<th class=\"colLast\" scope=\"col\">Description</th>\n"
+ "</tr>\n"
+ + "</thead>\n"
+ "<tbody>\n"
+ "<tr class=\"altColor\" id=\"i0\">\n"
+ "<td class=\"colFirst\"><code><T> java.lang.Object</code></td>\n"
--- a/test/langtools/jdk/javadoc/doclet/testModules/TestIndirectExportsOpens.java Tue Mar 12 09:49:10 2019 +0000
+++ b/test/langtools/jdk/javadoc/doclet/testModules/TestIndirectExportsOpens.java Sat Mar 16 21:00:45 2019 +0000
@@ -193,10 +193,12 @@
"<div class=\"packagesSummary\">\n"
+ "<table>\n"
+ "<caption><span>" + typeString + "</span><span class=\"tabEnd\"> </span></caption>\n"
+ + "<thead>\n"
+ "<tr>\n"
+ "<th class=\"colFirst\" scope=\"col\">From</th>\n"
+ "<th class=\"colLast\" scope=\"col\">Packages</th>\n"
+ "</tr>\n"
+ + "</thead>\n"
+ "<tbody>\n"
+ "<tr class=\"altColor\">\n"
+ "<th class=\"colFirst\" scope=\"row\"><a href=\"../m/module-summary.html\">m</a></th>\n"
--- a/test/langtools/jdk/javadoc/doclet/testModules/TestModuleServices.java Tue Mar 12 09:49:10 2019 +0000
+++ b/test/langtools/jdk/javadoc/doclet/testModules/TestModuleServices.java Sat Mar 16 21:00:45 2019 +0000
@@ -199,10 +199,12 @@
checkOutput("m/module-summary.html", true,
"<div class=\"usesSummary\">\n<table>\n" +
"<caption><span>Uses</span><span class=\"tabEnd\"> </span></caption>\n" +
+ "<thead>\n" +
"<tr>\n" +
"<th class=\"colFirst\" scope=\"col\">Type</th>\n" +
"<th class=\"colLast\" scope=\"col\">Description</th>\n" +
"</tr>\n" +
+ "</thead>\n" +
"<tbody>\n" +
"<tr class=\"altColor\">\n" +
"<th class=\"colFirst\" scope=\"row\"><a href=\"p1/A.html\" title=\"class in p1\">A</a></th>\n" +
@@ -240,10 +242,12 @@
checkOutput("m/module-summary.html", true,
"<div class=\"usesSummary\">\n<table>\n" +
"<caption><span>Uses</span><span class=\"tabEnd\"> </span></caption>\n" +
+ "<thead>\n" +
"<tr>\n" +
"<th class=\"colFirst\" scope=\"col\">Type</th>\n" +
"<th class=\"colLast\" scope=\"col\">Description</th>\n" +
"</tr>\n" +
+ "</thead>\n" +
"<tbody>\n" +
"<tr class=\"altColor\">\n" +
"<th class=\"colFirst\" scope=\"row\"><a href=\"p1/A.html\" title=\"class in p1\">A</a></th>\n" +
@@ -307,10 +311,12 @@
checkOutput("m/module-summary.html", true,
"<div class=\"providesSummary\">\n<table>\n" +
"<caption><span>Provides</span><span class=\"tabEnd\"> </span></caption>\n" +
+ "<thead>\n" +
"<tr>\n" +
"<th class=\"colFirst\" scope=\"col\">Type</th>\n" +
"<th class=\"colLast\" scope=\"col\">Description</th>\n" +
"</tr>\n" +
+ "</thead>\n" +
"<tbody>\n" +
"<tr class=\"altColor\">\n" +
"<th class=\"colFirst\" scope=\"row\"><a href=\"p1/A.html\" title=\"interface in p1\">A</a></th>\n" +
@@ -351,10 +357,12 @@
checkOutput("m/module-summary.html", true,
"<div class=\"providesSummary\">\n<table>\n" +
"<caption><span>Provides</span><span class=\"tabEnd\"> </span></caption>\n" +
+ "<thead>\n" +
"<tr>\n" +
"<th class=\"colFirst\" scope=\"col\">Type</th>\n" +
"<th class=\"colLast\" scope=\"col\">Description</th>\n" +
"</tr>\n" +
+ "</thead>\n" +
"<tbody>\n" +
"<tr class=\"altColor\">\n" +
"<th class=\"colFirst\" scope=\"row\"><a href=\"p1/A.html\" title=\"interface in p1\">A</a></th>\n" +
@@ -394,10 +402,12 @@
checkOutput("m/module-summary.html", true,
"<div class=\"providesSummary\">\n<table>\n" +
"<caption><span>Provides</span><span class=\"tabEnd\"> </span></caption>\n" +
+ "<thead>\n" +
"<tr>\n" +
"<th class=\"colFirst\" scope=\"col\">Type</th>\n" +
"<th class=\"colLast\" scope=\"col\">Description</th>\n" +
"</tr>\n" +
+ "</thead>\n" +
"<tbody>\n" +
"<tr class=\"altColor\">\n" +
"<th class=\"colFirst\" scope=\"row\"><a href=\"p1/A.html\" title=\"interface in p1\">A</a></th>\n" +
@@ -408,10 +418,12 @@
"</table>",
"<div class=\"usesSummary\">\n<table>\n" +
"<caption><span>Uses</span><span class=\"tabEnd\"> </span></caption>\n" +
+ "<thead>\n" +
"<tr>\n" +
"<th class=\"colFirst\" scope=\"col\">Type</th>\n" +
"<th class=\"colLast\" scope=\"col\">Description</th>\n" +
"</tr>\n" +
+ "</thead>\n" +
"<tbody>\n" +
"<tr class=\"altColor\">\n" +
"<th class=\"colFirst\" scope=\"row\"><a href=\"p2/B.html\" title=\"class in p2\">B</a></th>\n" +
--- a/test/langtools/jdk/javadoc/doclet/testModules/TestModules.java Tue Mar 12 09:49:10 2019 +0000
+++ b/test/langtools/jdk/javadoc/doclet/testModules/TestModules.java Sat Mar 16 21:00:45 2019 +0000
@@ -623,18 +623,22 @@
"<div class=\"overviewSummary\">\n"
+ "<table summary=\"Module Summary table, listing modules, and an explanation\">\n"
+ "<caption><span>Modules</span><span class=\"tabEnd\"> </span></caption>\n"
+ + "<thead>\n"
+ "<tr>\n"
+ "<th class=\"colFirst\" scope=\"col\">Module</th>\n"
+ "<th class=\"colLast\" scope=\"col\">Description</th>\n"
- + "</tr>");
+ + "</tr>\n"
+ + "</thead>");
checkOutput("overview-summary.html", false,
"<div class=\"overviewSummary\">\n"
+ "<table summary=\"Package Summary table, listing packages, and an explanation\">\n"
+ "<caption><span>Packages</span><span class=\"tabEnd\"> </span></caption>\n"
+ + "<thead>\n"
+ "<tr>\n"
+ "<th class=\"colFirst\" scope=\"col\">Package</th>\n"
+ "<th class=\"colLast\" scope=\"col\">Description</th>\n"
- + "</tr>");
+ + "</tr>\n"
+ + "</thead>");
}
void checkOverviewSummaryPackages() {
@@ -642,10 +646,12 @@
"<div class=\"overviewSummary\">\n"
+ "<table summary=\"Module Summary table, listing modules, and an explanation\">\n"
+ "<caption><span>Modules</span><span class=\"tabEnd\"> </span></caption>\n"
+ + "<thead>\n"
+ "<tr>\n"
+ "<th class=\"colFirst\" scope=\"col\">Module</th>\n"
+ "<th class=\"colLast\" scope=\"col\">Description</th>\n"
- + "</tr>",
+ + "</tr>\n"
+ + "</thead>",
"</table>\n"
+ "</div>\n"
+ "<div class=\"contentContainer\">\n"
@@ -659,10 +665,12 @@
"<div class=\"overviewSummary\">\n"
+ "<table summary=\"Package Summary table, listing packages, and an explanation\">\n"
+ "<caption><span>Packages</span><span class=\"tabEnd\"> </span></caption>\n"
+ + "<thead>n"
+ "<tr>\n"
+ "<th class=\"colFirst\" scope=\"col\">Package</th>\n"
+ "<th class=\"colLast\" scope=\"col\">Description</th>\n"
- + "</tr>",
+ + "</tr>\n"
+ + "</thead>\n",
"</script>\n"
+ "<div class=\"contentContainer\">\n"
+ "<div class=\"block\">The overview summary page header.</div>\n"
@@ -678,18 +686,22 @@
"<div class=\"overviewSummary\">\n"
+ "<table>\n"
+ "<caption><span>Modules</span><span class=\"tabEnd\"> </span></caption>\n"
+ + "<thead>\n"
+ "<tr>\n"
+ "<th class=\"colFirst\" scope=\"col\">Module</th>\n"
+ "<th class=\"colLast\" scope=\"col\">Description</th>\n"
- + "</tr>");
+ + "</tr>\n"
+ + "</thead>");
checkOutput("overview-summary.html", false,
"<div class=\"overviewSummary\">\n"
+ "<table>\n"
+ "<caption><span>Packages</span><span class=\"tabEnd\"> </span></caption>\n"
+ + "<thead>\n"
+ "<tr>\n"
+ "<th class=\"colFirst\" scope=\"col\">Package</th>\n"
+ "<th class=\"colLast\" scope=\"col\">Description</th>\n"
- + "</tr>");
+ + "</tr>\n"
+ + "</thead>");
}
void checkHtml5OverviewSummaryPackages() {
@@ -697,10 +709,12 @@
"<div class=\"overviewSummary\">\n"
+ "<table>\n"
+ "<caption><span>Modules</span><span class=\"tabEnd\"> </span></caption>\n"
+ + "<thead>\n"
+ "<tr>\n"
+ "<th class=\"colFirst\" scope=\"col\">Module</th>\n"
+ "<th class=\"colLast\" scope=\"col\">Description</th>\n"
- + "</tr>",
+ + "</tr>\n"
+ + "</thead>",
"</table>\n"
+ "</div>\n"
+ "</main>\n"
@@ -717,10 +731,12 @@
checkOutput("overview-summary.html", true,
"<div class=\"overviewSummary\">\n<table>\n"
+ "<caption><span>Packages</span><span class=\"tabEnd\"> </span></caption>\n"
+ + "<thead>\n"
+ "<tr>\n"
+ "<th class=\"colFirst\" scope=\"col\">Package</th>\n"
+ "<th class=\"colLast\" scope=\"col\">Description</th>\n"
- + "</tr>",
+ + "</tr>\n"
+ + "</thead>",
"</script>\n"
+ "</nav>\n"
+ "</header>\n"
@@ -788,20 +804,26 @@
+ "<div class=\"block\">With a test description for uses.</div>\n</td>\n"
+ "</tr>",
"<caption><span>Opens</span><span class=\"tabEnd\"> </span></caption>\n"
+ + "<thead>\n"
+ "<tr>\n"
+ "<th class=\"colFirst\" scope=\"col\">Package</th>\n"
+ "<th class=\"colLast\" scope=\"col\">Description</th>\n"
- + "</tr>",
+ + "</tr>\n"
+ + "</thead>",
"<caption><span>Uses</span><span class=\"tabEnd\"> </span></caption>\n"
+ + "<thead>\n"
+ "<tr>\n"
+ "<th class=\"colFirst\" scope=\"col\">Type</th>\n"
+ "<th class=\"colLast\" scope=\"col\">Description</th>\n"
- + "</tr>",
+ + "</tr>\n"
+ + "</thead>",
"<caption><span>Provides</span><span class=\"tabEnd\"> </span></caption>\n"
+ + "<thead>\n"
+ "<tr>\n"
+ "<th class=\"colFirst\" scope=\"col\">Type</th>\n"
+ "<th class=\"colLast\" scope=\"col\">Description</th>\n"
- + "</tr>");
+ + "</tr>\n"
+ + "</thead>");
}
void checkAggregatorModuleSummary() {
@@ -978,18 +1000,21 @@
+ "</td>",
"<div class=\"requiresSummary\">\n<table>\n"
+ "<caption><span>Requires</span><span class=\"tabEnd\"> </span></caption>\n"
+ + "<thead>\n"
+ "<tr>\n"
+ "<th class=\"colFirst\" scope=\"col\">Modifier</th>\n"
+ "<th class=\"colSecond\" scope=\"col\">Module</th>\n"
+ "<th class=\"colLast\" scope=\"col\">Description</th>",
"<div class=\"requiresSummary\">\n<table>\n"
+ "<caption><span>Indirect Requires</span><span class=\"tabEnd\"> </span></caption>\n"
+ + "<thead>\n"
+ "<tr>\n"
+ "<th class=\"colFirst\" scope=\"col\">Modifier</th>\n"
+ "<th class=\"colSecond\" scope=\"col\">Module</th>\n"
+ "<th class=\"colLast\" scope=\"col\">Description</th>",
"<div class=\"packagesSummary\">\n<table>\n"
+ "<caption><span>Indirect Opens</span><span class=\"tabEnd\"> </span></caption>\n"
+ + "<thead>\n"
+ "<tr>\n"
+ "<th class=\"colFirst\" scope=\"col\">From</th>\n"
+ "<th class=\"colLast\" scope=\"col\">Packages</th>\n"
@@ -1011,10 +1036,12 @@
+ "<td class=\"colLast\"> </td>",
"<div class=\"packagesSummary\">\n<table>\n"
+ "<caption><span>Opens</span><span class=\"tabEnd\"> </span></caption>\n"
+ + "<thead>\n"
+ "<tr>\n"
+ "<th class=\"colFirst\" scope=\"col\">Package</th>\n"
+ "<th class=\"colLast\" scope=\"col\">Description</th>\n"
+ "</tr>\n"
+ + "</thead>\n"
+ "<tbody>\n"
+ "<tr class=\"altColor\" id=\"i0\">\n"
+ "<th class=\"colFirst\" scope=\"row\"><a href=\"testpkgmdlB/package-summary.html\">testpkgmdlB</a></th>\n"
@@ -1081,11 +1108,13 @@
+ " class=\"tableTab\" onclick=\"show(2);\">Opens</button></div>");
checkOutput("moduleC/module-summary.html", found,
"<caption><span>Exports</span><span class=\"tabEnd\"> </span></caption>\n"
+ + "<thead>\n"
+ "<tr>\n"
+ "<th class=\"colFirst\" scope=\"col\">Package</th>\n"
+ "<th class=\"colSecond\" scope=\"col\">Exported To Modules</th>\n"
+ "<th class=\"colLast\" scope=\"col\">Description</th>\n"
- + "</tr>");
+ + "</tr>\n"
+ + "</thead>");
checkOutput("moduletags/module-summary.html", true,
"<th class=\"colFirst\" scope=\"row\"><a href=\"testpkgmdltags/package-summary.html\">testpkgmdltags</a></th>\n"
+ "<td class=\"colLast\"> </td>");
@@ -1301,16 +1330,20 @@
+ " onclick=\"show(2);\">Class Summary</button><button role=\"tab\" aria-selected=\"false\""
+ " aria-controls=\"typeSummary_tabpanel\" tabindex=\"-1\" onkeydown=\"switchTab(event)\""
+ " id=\"t6\" class=\"tableTab\" onclick=\"show(32);\">Annotation Types Summary</button></div>\n",
- "<tr>\n"
+ "<thead>\n"
+ + "<tr>\n"
+ "<th class=\"colFirst\" scope=\"col\">Class</th>\n"
+ "<th class=\"colLast\" scope=\"col\">Description</th>\n"
- + "</tr>");
+ + "</tr>\n"
+ + "</thead>\n");
checkOutput("allpackages-index.html", true,
"<caption><span>Package Summary</span><span class=\"tabEnd\"> </span></caption>\n"
+ + "<thead>\n"
+ "<tr>\n"
+ "<th class=\"colFirst\" scope=\"col\">Package</th>\n"
+ "<th class=\"colLast\" scope=\"col\">Description</th>\n"
- + "</tr>\n");
+ + "</tr>\n"
+ + "</thead>");
checkOutput("allclasses-index.html", found,
"<table aria-labelledby=\"t0\">\n");
checkOutput("allpackages-index.html", found,
--- a/test/langtools/jdk/javadoc/doclet/testNavigation/TestNavigation.java Tue Mar 12 09:49:10 2019 +0000
+++ b/test/langtools/jdk/javadoc/doclet/testNavigation/TestNavigation.java Sat Mar 16 21:00:45 2019 +0000
@@ -144,7 +144,7 @@
+ "</nav>");
}
- // Test to make sure that no extra padding for nav bar gets generated if -nonavbar is specified for HTML4.
+ // Test to make sure that no extra padding for nav bar gets generated if -nonavbar is specified.
@Test
public void test2(Path ignore) {
javadoc("-d", "out-2",
@@ -163,39 +163,6 @@
+ "$('.navPadding').css('padding-top', $('.fixedNav').css(\"height\"));\n"
+ "//-->\n"
+ "</script>\n"
- + "<!-- ======== START OF CLASS DATA ======== -->");
-
- checkOutput("pkg/package-summary.html", false,
- "<!-- ========= END OF TOP NAVBAR ========= -->\n"
- + "</div>\n"
- + "<div class=\"navPadding\"> </div>\n"
- + "<script type=\"text/javascript\"><!--\n"
- + "$('.navPadding').css('padding-top', $('.fixedNav').css(\"height\"));\n"
- + "//-->\n"
- + "</script>\n"
- + "<div class=\"header\">");
- }
-
- // Test to make sure that no extra padding for nav bar gets generated if -nonavbar is specified for HTML5.
- @Test
- public void test3(Path ignore) {
- javadoc("-d", "out-3",
- "-html5",
- "-nonavbar",
- "--frames",
- "-sourcepath", testSrc,
- "pkg");
- checkExit(Exit.OK);
- checkSubNav();
-
- checkOutput("pkg/A.html", false,
- "<!-- ========= END OF TOP NAVBAR ========= -->\n"
- + "</div>\n"
- + "<div class=\"navPadding\"> </div>\n"
- + "<script type=\"text/javascript\"><!--\n"
- + "$('.navPadding').css('padding-top', $('.fixedNav').css(\"height\"));\n"
- + "//-->\n"
- + "</script>\n"
+ "</nav>\n"
+ "</header>\n"
+ "<!-- ======== START OF CLASS DATA ======== -->");
@@ -212,7 +179,7 @@
}
@Test
- public void test4(Path base) throws IOException {
+ public void test3(Path base) throws IOException {
Path src = base.resolve("src");
tb.writeJavaFiles(src,
"package pkg1; public class A {\n"
@@ -255,7 +222,7 @@
"package pkg1; public interface InterfaceWithNoMembers {\n"
+ "}");
- javadoc("-d", "out-4",
+ javadoc("-d", "out-3",
"-sourcepath", src.toString(),
"pkg1");
checkExit(Exit.OK);
--- a/test/langtools/jdk/javadoc/doclet/testNewLanguageFeatures/TestNewLanguageFeatures.java Tue Mar 12 09:49:10 2019 +0000
+++ b/test/langtools/jdk/javadoc/doclet/testNewLanguageFeatures/TestNewLanguageFeatures.java Sat Mar 16 21:00:45 2019 +0000
@@ -426,11 +426,13 @@
+ "type <a href=\"../Foo4.html\" title=\"class in "
+ "pkg2\">Foo4</a></span><span class=\"tabEnd\"> "
+ "</span></caption>\n"
+ + "<thead>\n"
+ "<tr>\n"
+ "<th class=\"colFirst\" scope=\"col\">Modifier and Type</th>\n"
+ "<th class=\"colSecond\" scope=\"col\">Method</th>\n"
+ "<th class=\"colLast\" scope=\"col\">Description</th>\n"
+ "</tr>\n"
+ + "</thead>\n"
+ "<tbody>\n"
+ "<tr class=\"altColor\">\n"
+ "<td class=\"colFirst\"><code>void</code></td>\n"
--- a/test/langtools/jdk/javadoc/doclet/testPackagePage/TestPackagePage.java Tue Mar 12 09:49:10 2019 +0000
+++ b/test/langtools/jdk/javadoc/doclet/testPackagePage/TestPackagePage.java Sat Mar 16 21:00:45 2019 +0000
@@ -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
@@ -87,17 +87,21 @@
checkOutput("allclasses-index.html", true,
"<div class=\"typeSummary\">\n<table>\n"
+ "<caption><span>Class Summary</span><span class=\"tabEnd\"> </span></caption>\n"
+ + "<thead>\n"
+ "<tr>\n"
+ "<th class=\"colFirst\" scope=\"col\">Class</th>\n"
+ "<th class=\"colLast\" scope=\"col\">Description</th>\n"
- + "</tr>\n");
+ + "</tr>\n"
+ + "</thead>\n");
checkOutput("allpackages-index.html", true,
"<div class=\"packagesSummary\">\n<table>\n"
+ "<caption><span>Package Summary</span><span class=\"tabEnd\"> </span></caption>\n"
+ + "<thead>\n"
+ "<tr>\n"
+ "<th class=\"colFirst\" scope=\"col\">Package</th>\n"
+ "<th class=\"colLast\" scope=\"col\">Description</th>\n"
- + "</tr>\n");
+ + "</tr>\n"
+ + "</thead>\n");
checkOutput("type-search-index.js", true,
"{\"l\":\"All Classes\",\"url\":\"allclasses-index.html\"}");
checkOutput("package-search-index.js", true,
--- a/test/langtools/jdk/javadoc/doclet/testSearch/TestSearch.java Tue Mar 12 09:49:10 2019 +0000
+++ b/test/langtools/jdk/javadoc/doclet/testSearch/TestSearch.java Sat Mar 16 21:00:45 2019 +0000
@@ -717,6 +717,7 @@
+ " id=\"t6\" class=\"tableTab\" onclick=\"show(32);\">Annotation Types Summary</button></div>\n"
+ "<div id=\"typeSummary_tabpanel\" role=\"tabpanel\">\n"
+ "<table aria-labelledby=\"t0\">\n"
+ + "<thead>\n"
+ "<tr>\n"
+ "<th class=\"colFirst\" scope=\"col\">Class</th>\n"
+ "<th class=\"colLast\" scope=\"col\">Description</th>\n"
@@ -726,6 +727,7 @@
checkOutput("allpackages-index.html", true,
"<div class=\"packagesSummary\">\n<table>\n"
+ "<caption><span>Package Summary</span><span class=\"tabEnd\"> </span></caption>\n"
+ + "<thead>\n"
+ "<tr>\n"
+ "<th class=\"colFirst\" scope=\"col\">Package</th>\n"
+ "<th class=\"colLast\" scope=\"col\">Description</th>\n"
--- a/test/langtools/jdk/javadoc/doclet/testUnnamedPackage/TestUnnamedPackage.java Tue Mar 12 09:49:10 2019 +0000
+++ b/test/langtools/jdk/javadoc/doclet/testUnnamedPackage/TestUnnamedPackage.java Sat Mar 16 21:00:45 2019 +0000
@@ -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
@@ -69,10 +69,12 @@
checkOutput("allclasses-index.html", true,
"<div class=\"typeSummary\">\n<table>\n"
+ "<caption><span>Class Summary</span><span class=\"tabEnd\"> </span></caption>\n"
+ + "<thead>\n"
+ "<tr>\n"
+ "<th class=\"colFirst\" scope=\"col\">Class</th>\n"
+ "<th class=\"colLast\" scope=\"col\">Description</th>\n"
+ "</tr>\n"
+ + "</thead>\n"
+ "<tbody>\n"
+ "<tr class=\"altColor\" id=\"i0\">\n"
+ "<td class=\"colFirst\"><a href=\"C.html\" title=\"class in <Unnamed>\">C</a></td>\n"
@@ -86,10 +88,12 @@
checkOutput("allpackages-index.html", true,
"<div class=\"packagesSummary\">\n<table>\n"
+ "<caption><span>Package Summary</span><span class=\"tabEnd\"> </span></caption>\n"
+ + "<thead>\n"
+ "<tr>\n"
+ "<th class=\"colFirst\" scope=\"col\">Package</th>\n"
+ "<th class=\"colLast\" scope=\"col\">Description</th>\n"
+ "</tr>\n"
+ + "</thead>\n"
+ "<tbody>\n"
+ "<tr class=\"altColor\">\n"
+ "<th class=\"colFirst\" scope=\"row\"><a href=\"package-summary.html\"><Unnamed></a></th>\n"
--- a/test/langtools/jdk/javadoc/lib/javadoc/tester/JavadocTester.java Tue Mar 12 09:49:10 2019 +0000
+++ b/test/langtools/jdk/javadoc/lib/javadoc/tester/JavadocTester.java Sat Mar 16 21:00:45 2019 +0000
@@ -96,7 +96,7 @@
* }
*
* // test methods...
- * @Test
+ * {@literal @}Test
* void test() {
* javadoc(<i>args</i>);
* checkExit(Exit.OK);
--- a/test/langtools/jdk/javadoc/tool/doclint/ImplicitHeadersTest.java Tue Mar 12 09:49:10 2019 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,46 +0,0 @@
-/*
- * Copyright (c) 2013, 2016, Oracle and/or its affiliates. All rights reserved.
- * 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.
- */
-
-/*
- * @test
- * @bug 8006346
- * @summary doclint should make allowance for headers generated by standard doclet
- * @modules jdk.javadoc/jdk.javadoc.internal.tool
- */
-
-import java.io.File;
-
-/**
- * <h3> Header </h3>
- */
-public class ImplicitHeadersTest {
- public static void main(String... args) {
- File testSrc = new File(System.getProperty("test.src"));
- File testFile = new File(testSrc, ImplicitHeadersTest.class.getSimpleName() + ".java");
- String[] javadocArgs = { "-d", "out", testFile.getPath() };
- int rc = jdk.javadoc.internal.tool.Main.execute(javadocArgs);
- if (rc != 0)
- throw new Error("unexpected exit: rc=" + rc);
- }
-}
-
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/test/langtools/jdk/javadoc/tool/doclint/ImplicitHeadingsTest.java Sat Mar 16 21:00:45 2019 +0000
@@ -0,0 +1,50 @@
+/*
+ * 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
+ * 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.
+ */
+
+/*
+ * @test
+ * @bug 8006346
+ * @summary doclint should make allowance for headings generated by standard doclet
+ * @modules jdk.javadoc/jdk.javadoc.internal.tool
+ */
+
+import java.io.File;
+
+/**
+ * <h2> Class heading </h2>
+ */
+public class ImplicitHeadingsTest {
+ /**
+ * <h4>Method heading</h4>
+ * @param args command-line args
+ */
+ public static void main(String... args) {
+ File testSrc = new File(System.getProperty("test.src"));
+ File testFile = new File(testSrc, ImplicitHeadingsTest.class.getSimpleName() + ".java");
+ String[] javadocArgs = { "-d", "out", testFile.getPath() };
+ int rc = jdk.javadoc.internal.tool.Main.execute(javadocArgs);
+ if (rc != 0)
+ throw new Error("unexpected exit: rc=" + rc);
+ }
+}
+
--- a/test/langtools/jdk/javadoc/tool/removeOldDoclet/OldDoclet.jasm Tue Mar 12 09:49:10 2019 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,28 +0,0 @@
-
-super public class OldDoclet
- extends com/sun/javadoc/Doclet
- version 55:0
-{
-
-
-public Method "<init>":"()V"
- stack 1 locals 1
-{
- aload_0;
- invokespecial Method com/sun/javadoc/Doclet."<init>":"()V";
- return;
-
-}
-
-public static Method start:"(Lcom/sun/javadoc/RootDoc;)Z"
- stack 2 locals 1
-{
- getstatic Field java/lang/System.out:"Ljava/io/PrintStream;";
- ldc String "OLD_DOCLET_MARKER";
- invokevirtual Method java/io/PrintStream.println:"(Ljava/lang/String;)V";
- iconst_1;
- ireturn;
-
-}
-
-} // end Class OldDoclet
--- a/test/langtools/jdk/javadoc/tool/removeOldDoclet/RemoveOldDoclet.java Tue Mar 12 09:49:10 2019 +0000
+++ b/test/langtools/jdk/javadoc/tool/removeOldDoclet/RemoveOldDoclet.java Sat Mar 16 21:00:45 2019 +0000
@@ -28,7 +28,6 @@
* @library /tools/lib ../../lib
* @modules jdk.javadoc/jdk.javadoc.internal.tool
* @build javadoc.tester.* toolbox.ToolBox builder.ClassBuilder
- * @compile OldDoclet.jasm
* @run main RemoveOldDoclet
*/
@@ -44,6 +43,7 @@
public class RemoveOldDoclet extends JavadocTester {
final ToolBox tb;
+ static final String Doclet_CLASS_NAME = TestDoclet.class.getName();
public static void main(String... args) throws Exception {
RemoveOldDoclet tester = new RemoveOldDoclet();
@@ -55,7 +55,7 @@
}
@Test
- public void testInvokeOldDoclet(Path base) throws Exception {
+ public void testInvalidDoclet(Path base) throws Exception {
Path srcDir = base.resolve("src");
Path outDir = base.resolve("out");
@@ -64,14 +64,21 @@
.write(srcDir);
javadoc("-d", outDir.toString(),
- "-doclet", "OldDoclet",
+ "-doclet", Doclet_CLASS_NAME,
"-docletpath", System.getProperty("test.classes", "."),
"-sourcepath", srcDir.toString(),
"pkg");
checkExit(Exit.ERROR);
checkOutput(Output.OUT, true,
- "javadoc: error - Class OldDoclet is not a valid doclet.\n"
- + "Note: As of JDK 13, the com.sun.javadoc API is no longer supported.");
+ "javadoc: error - Class " + Doclet_CLASS_NAME + " is not a valid doclet.\n"
+ + "Note: As of JDK 13, the com.sun.javadoc API is no longer supported.");
+ }
+
+ static class TestDoclet {
+ public static boolean start() {
+ System.out.println("OLD_DOCLET_MARKER");
+ return true;
+ }
}
}
--- a/test/langtools/tools/doclint/AccessibilityTest.java Tue Mar 12 09:49:10 2019 +0000
+++ b/test/langtools/tools/doclint/AccessibilityTest.java Sat Mar 16 21:00:45 2019 +0000
@@ -10,17 +10,37 @@
/** */
public class AccessibilityTest {
+ /**
+ * <h1> ... </h1>
+ */
+ public class Bad_H1 { }
+
+ /**
+ * <h3> ... </h3>
+ */
+ public class Missing_H2 { }
+
+ /**
+ * <h2> ... </h2>
+ * <h4> ... </h4>
+ */
+ public class Missing_H3 { }
/**
* <h2> ... </h2>
*/
- public void missing_h1() { }
+ public void bad_h2() { }
/**
- * <h1> ... </h1>
+ * <h4> ... </h4>
+ */
+ public void missing_h3() { }
+
+ /**
* <h3> ... </h3>
+ * <h5> ... </h5>
*/
- public void missing_h2() { }
+ public void missing_h4() { }
/**
* <img src="x.jpg">
--- a/test/langtools/tools/doclint/AccessibilityTest.out Tue Mar 12 09:49:10 2019 +0000
+++ b/test/langtools/tools/doclint/AccessibilityTest.out Sat Mar 16 21:00:45 2019 +0000
@@ -1,13 +1,25 @@
-AccessibilityTest.java:15: error: header used out of sequence: <H2>
- * <h2> ... </h2>
+AccessibilityTest.java:14: error: unexpected heading used: <H1>, compared to implicit preceding heading: <H1>
+ * <h1> ... </h1>
^
-AccessibilityTest.java:21: error: header used out of sequence: <H3>
+AccessibilityTest.java:19: error: heading used out of sequence: <H3>, compared to implicit preceding heading: <H1>
* <h3> ... </h3>
^
-AccessibilityTest.java:26: error: no "alt" attribute for image
+AccessibilityTest.java:25: error: heading used out of sequence: <H4>, compared to previous heading: <H2>
+ * <h4> ... </h4>
+ ^
+AccessibilityTest.java:30: error: unexpected heading used: <H2>, compared to implicit preceding heading: <H3>
+ * <h2> ... </h2>
+ ^
+AccessibilityTest.java:40: error: unexpected heading used: <H3>, compared to implicit preceding heading: <H3>
+ * <h3> ... </h3>
+ ^
+AccessibilityTest.java:41: error: heading used out of sequence: <H5>, compared to previous heading: <H3>
+ * <h5> ... </h5>
+ ^
+AccessibilityTest.java:46: error: no "alt" attribute for image
* <img src="x.jpg">
^
-AccessibilityTest.java:41: error: no summary or caption for table
+AccessibilityTest.java:61: error: no summary or caption for table
* <table><tr><th>head<tr><td>data</table>
^
-4 errors
+8 errors
--- a/test/langtools/tools/doclint/html/BlockTagsTest.java Tue Mar 12 09:49:10 2019 +0000
+++ b/test/langtools/tools/doclint/html/BlockTagsTest.java Sat Mar 16 21:00:45 2019 +0000
@@ -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
@@ -28,7 +28,7 @@
* @library ..
* @modules jdk.compiler/com.sun.tools.doclint
* @build DocLintTester
- * @run main DocLintTester -Xmsgs BlockTagsTest.java
+ * @run main DocLintTester -Xmsgs:-accessibility BlockTagsTest.java
*/
/** */
--- a/test/langtools/tools/doclint/html/HtmlVersionTagsAttrsTest.java Tue Mar 12 09:49:10 2019 +0000
+++ b/test/langtools/tools/doclint/html/HtmlVersionTagsAttrsTest.java Sat Mar 16 21:00:45 2019 +0000
@@ -83,7 +83,7 @@
* </ol>
* <img src="testImg.jpg" alt="imgTest" crossorigin="anonymous">
* <div aria-labelledby="Topics" aria-describedby="t1">
- * <h1 id="Topics">Topics</h1>
+ * <h4 id="Topics">Topics</h4>
* <p id="t1">Aria attribute test</p>
* <p id="t2" aria-label="Label">Label test</p>
* </div>
@@ -98,8 +98,8 @@
* <p><tt>Teletype text</tt></p>
* <section>
* <hgroup>
- * <h1>Section</h1>
- * <h2> Another heading</h2>
+ * <h4>Section</h4>
+ * <h5> Another heading</h5>
* </hgroup>
* hgroup no longer supported in HTML5.
* </section>
@@ -113,12 +113,12 @@
/**
* <section>
* <p>Testing section tag</p>
- * <h1>Section</h1>
+ * <h4>Section</h4>
* Section text.
* </section>
* <article>
* <p>Testing article tag</p>
- * <h1>Article</h1>
+ * <h5>Article</h5>
* Article text.
* </article>
* <header>
@@ -133,7 +133,7 @@
* Main content
* </main>
* <aside>
- * <h2>Test aside</h2>
+ * <h4>Test aside</h4>
* <p>Description</p>
* </aside>
* <ul>
--- a/test/langtools/tools/doclint/tidy/AnchorAlreadyDefined.java Tue Mar 12 09:49:10 2019 +0000
+++ b/test/langtools/tools/doclint/tidy/AnchorAlreadyDefined.java Sat Mar 16 21:00:45 2019 +0000
@@ -13,6 +13,6 @@
/**
* <a name="here">valid</a>
* <a name="here">duplicate</a>
- * <h1 id="here">duplicate</h1>
+ * <h2 id="here">duplicate</h2>
*/
public class AnchorAlreadyDefined { }
--- a/test/langtools/tools/doclint/tidy/AnchorAlreadyDefined.out Tue Mar 12 09:49:10 2019 +0000
+++ b/test/langtools/tools/doclint/tidy/AnchorAlreadyDefined.out Sat Mar 16 21:00:45 2019 +0000
@@ -2,6 +2,6 @@
* <a name="here">duplicate</a>
^
AnchorAlreadyDefined.java:16: error: anchor already defined: "here"
- * <h1 id="here">duplicate</h1>
+ * <h2 id="here">duplicate</h2>
^
2 errors
--- a/test/langtools/tools/doclint/tidy/MissingTag.java Tue Mar 12 09:49:10 2019 +0000
+++ b/test/langtools/tools/doclint/tidy/MissingTag.java Sat Mar 16 21:00:45 2019 +0000
@@ -13,6 +13,6 @@
/**
* </p>
- * <h1> <b> text </h1>
+ * <h2> <b> text </h2>
*/
public class MissingTag { }
--- a/test/langtools/tools/doclint/tidy/MissingTag.out Tue Mar 12 09:49:10 2019 +0000
+++ b/test/langtools/tools/doclint/tidy/MissingTag.out Sat Mar 16 21:00:45 2019 +0000
@@ -2,6 +2,6 @@
* </p>
^
MissingTag.java:16: error: end tag missing: </b>
- * <h1> <b> text </h1>
+ * <h2> <b> text </h2>
^
2 errors
--- a/test/langtools/tools/javac/doclint/ImplicitHeadersTest.java Tue Mar 12 09:49:10 2019 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,35 +0,0 @@
-/*
- * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
- * 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.
- */
-
-/*
- * @test
- * @bug 8006346
- * @summary doclint should make allowance for headers generated by standard doclet
- * @compile -Xdoclint:all/public ImplicitHeadersTest.java
- */
-
-/**
- * <h3> Header </h3>
- */
-public class ImplicitHeadersTest { }
-
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/test/langtools/tools/javac/doclint/ImplicitHeadingsTest.java Sat Mar 16 21:00:45 2019 +0000
@@ -0,0 +1,40 @@
+/*
+ * 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
+ * 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.
+ */
+
+/*
+ * @test
+ * @bug 8006346
+ * @summary doclint should make allowance for headings generated by standard doclet
+ * @compile -Xdoclint:all/public ImplicitHeadingsTest.java
+ */
+
+/**
+ * <h2> Class heading </h2>
+ */
+public class ImplicitHeadingsTest {
+ /**
+ * <h4>Method heading</h4>
+ */
+ public void m() { }
+}
+
--- a/test/langtools/tools/javac/file/SymLinkArchiveTest.java Tue Mar 12 09:49:10 2019 +0000
+++ b/test/langtools/tools/javac/file/SymLinkArchiveTest.java Sat Mar 16 21:00:45 2019 +0000
@@ -33,6 +33,7 @@
* @run main SymLinkArchiveTest
*/
+import java.nio.file.FileSystemException;
import java.nio.file.Files;
import java.nio.file.Path;
import java.nio.file.Paths;
@@ -69,7 +70,13 @@
tb.writeFile(javaFile, "class T extends p.B {}");
Path jar = base.resolve("lib.jar");
- Files.createSymbolicLink(jar, classpath.getFileName());
+ try {
+ Files.createSymbolicLink(jar, classpath.getFileName());
+ } catch (FileSystemException fse) {
+ System.err.println("warning: test passes vacuously, sym-link could not be created");
+ System.err.println(fse.getMessage());
+ return;
+ }
Result result = new JavacTask(tb).files(javaFile).classpath(jar).run(Expect.FAIL);
String output = result.getOutput(OutputKind.DIRECT);
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/test/langtools/tools/javac/file/SymLinkShortNameTest.java Sat Mar 16 21:00:45 2019 +0000
@@ -0,0 +1,96 @@
+/*
+ * Copyright (c) 2019, Google LLC. All rights reserved.
+ * 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.
+ */
+
+/*
+ * @test
+ * @bug 8193277
+ * @summary SimpleFileObject inconsistency between getName and getShortName
+ * @library /tools/lib
+ * @modules jdk.compiler/com.sun.tools.javac.api
+ * jdk.compiler/com.sun.tools.javac.main
+ * jdk.jdeps/com.sun.tools.classfile
+ * @build toolbox.JavacTask toolbox.TestRunner toolbox.ToolBox
+ * @run main SymLinkShortNameTest
+ */
+
+import java.nio.file.FileSystemException;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.nio.file.Paths;
+import toolbox.JavacTask;
+import toolbox.Task.Expect;
+import toolbox.Task.OutputKind;
+import toolbox.Task.Result;
+import toolbox.TestRunner;
+import toolbox.TestRunner.Test;
+import toolbox.ToolBox;
+
+public class SymLinkShortNameTest extends TestRunner {
+ public static void main(String... args) throws Exception {
+ new SymLinkShortNameTest().runTests(m -> new Object[] {Paths.get(m.getName())});
+ }
+
+ private final ToolBox tb = new ToolBox();
+
+ public SymLinkShortNameTest() {
+ super(System.err);
+ }
+
+ @Test
+ public void testJarSymlink(Path base) throws Exception {
+ Files.createDirectories(base);
+ Path b = base.resolve("B.java");
+ tb.writeFile(b, "class B { int f() {} }");
+
+ Path a = base.resolve("A.java");
+ try {
+ Files.createSymbolicLink(a, b.getFileName());
+ } catch (FileSystemException fse) {
+ System.err.println("warning: test passes vacuously, sym-link could not be created");
+ System.err.println(fse.getMessage());
+ return;
+ }
+
+ {
+ Result result =
+ new JavacTask(tb).options("-XDrawDiagnostics").files(a).run(Expect.FAIL);
+ String output = result.getOutput(OutputKind.DIRECT);
+
+ String expected = "A.java:1:20: compiler.err.missing.ret.stmt";
+ if (!output.contains(expected)) {
+ throw new AssertionError(
+ "expected output to contain: " + expected + "\nwas:\n" + output);
+ }
+ }
+ {
+ Result result = new JavacTask(tb).files(a).run(Expect.FAIL);
+ String output = result.getOutput(OutputKind.DIRECT);
+
+ String expected = "A.java:1: error: missing return statement";
+ if (!output.contains(expected)) {
+ throw new AssertionError(
+ "expected output to contain: " + expected + "\nwas:\n" + output);
+ }
+ }
+ }
+}